diff --git a/toonz/sources/toonz/loadfoldercommand.cpp b/toonz/sources/toonz/loadfoldercommand.cpp index 772a1a5..47fb11d 100644 --- a/toonz/sources/toonz/loadfoldercommand.cpp +++ b/toonz/sources/toonz/loadfoldercommand.cpp @@ -37,7 +37,6 @@ #include -#include #include #include @@ -50,8 +49,7 @@ // STD includes #include - -namespace ba = boost::algorithm; +#include //************************************************************************ // Local namespace structures @@ -493,8 +491,8 @@ QString OverwriteDialog::acceptResolution(void *obj_, int resolution, } static bool existsResource(const TFilePath &dstDir, const Resource &rsrc) { - return ba::any_of(rsrc.m_components.begin(), rsrc.m_components.end(), - boost::bind(existsComponent, boost::cref(dstDir), _1)); + return std::any_of(rsrc.m_components.begin(), rsrc.m_components.end(), + boost::bind(existsComponent, boost::cref(dstDir), _1)); } }; // locals @@ -547,7 +545,7 @@ int IoCmd::loadResourceFolders(LoadResourceArguments &args, // Deal with import decision bool import = false; { - if (ba::any_of( + if (std::any_of( args.resourceDatas.begin(), args.resourceDatas.end(), boost::bind(locals::isExternPath, boost::cref(*scene), _1))) { // Ask for data import in this case diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index 8821724..9683e49 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -28,8 +28,7 @@ #include #include -// boost includes -#include +#include using namespace DVGui; @@ -1433,7 +1432,7 @@ int DVGui::eraseStylesInDemand(TPalette *palette, std::vector styleIds, // Inform the user that case 2 will not produce an undo if a raster-based // level is detected - if (boost::algorithm::any_of(levels, locals::isRasterLevel)) { + if (std::any_of(levels.begin(), levels.end(), locals::isRasterLevel)) { std::vector buttons(2); buttons[0] = QObject::tr("Ok"), buttons[1] = QObject::tr("Cancel");