diff --git a/src/BuildTiles/Main/tgconstruct_poly.cxx b/src/BuildTiles/Main/tgconstruct_poly.cxx index 90d52634..2200cc64 100644 --- a/src/BuildTiles/Main/tgconstruct_poly.cxx +++ b/src/BuildTiles/Main/tgconstruct_poly.cxx @@ -24,8 +24,6 @@ # include #endif -#include - #include #include @@ -61,7 +59,7 @@ int TGConstruct::LoadLandclassPolys( void ) { simgear::PathList files = d.children(simgear::Dir::TYPE_FILE); SG_LOG( SG_CLIPPER, SG_DEBUG, files.size() << " Polys in " << d.path() ); - BOOST_FOREACH(const SGPath& p, files) { + for (const SGPath& p : files) { if (p.file_base() != tile_str) { continue; } diff --git a/src/BuildTiles/Parallel/client.cxx b/src/BuildTiles/Parallel/client.cxx index d07fafa8..f674a271 100644 --- a/src/BuildTiles/Parallel/client.cxx +++ b/src/BuildTiles/Parallel/client.cxx @@ -41,8 +41,6 @@ #include #include -#include - #include #include #include @@ -222,7 +220,7 @@ static bool must_generate( const SGBucket& b ) { continue; } - BOOST_FOREACH(const SGPath& c, loadDir.children(simgear::Dir::TYPE_FILE)) { + for (const SGPath& c : loadDir.children(simgear::Dir::TYPE_FILE)) { if (!simgear::strutils::starts_with(c.file(), prefix)) { continue; } diff --git a/src/Prep/DemChop/srtmchop.cxx b/src/Prep/DemChop/srtmchop.cxx index b1ea4016..bd5539e2 100644 --- a/src/Prep/DemChop/srtmchop.cxx +++ b/src/Prep/DemChop/srtmchop.cxx @@ -42,7 +42,6 @@ #include #include -#include #include #include #include @@ -150,7 +149,7 @@ bool TGSrtmTiff::open( const SGPath &f ) { string command = "unzip -d \"" + tmp_dir.path().str() + "\" " + file_name.base(); if ( system( command.c_str() ) != -1 ) { simgear::PathList files = tmp_dir.children(simgear::Dir::TYPE_FILE | simgear::Dir::NO_DOT_OR_DOTDOT); - BOOST_FOREACH(const SGPath& file, files) { + for (const SGPath& file : files) { string ext = file.lower_extension(); if ( (ext == "tif") || (ext == "tiff") ) { file_name = file; diff --git a/src/Prep/TerraFit/terrafit.cc b/src/Prep/TerraFit/terrafit.cc index 4743133c..b77f108e 100644 --- a/src/Prep/TerraFit/terrafit.cc +++ b/src/Prep/TerraFit/terrafit.cc @@ -43,7 +43,6 @@ #endif #include -#include #include #include @@ -245,7 +244,7 @@ void walk_path(const SGPath& path) { } else if (path.isDir()) { Dir d(path); int flags = Dir::TYPE_DIR | Dir::TYPE_FILE | Dir::NO_DOT_OR_DOTDOT; - BOOST_FOREACH(const SGPath& p, d.children(flags)) { + for (const SGPath& p : d.children(flags)) { walk_path(p); } } diff --git a/src/Utils/poly2ogr/poly2ogr.cxx b/src/Utils/poly2ogr/poly2ogr.cxx index 089a08bf..00c834ef 100644 --- a/src/Utils/poly2ogr/poly2ogr.cxx +++ b/src/Utils/poly2ogr/poly2ogr.cxx @@ -35,7 +35,6 @@ # include #endif -#include #include #include @@ -415,7 +414,7 @@ void process_file(const SGPath& path) simgear::Dir d(path); int flags = simgear::Dir::TYPE_FILE | simgear::Dir::TYPE_DIR | simgear::Dir::NO_DOT_OR_DOTDOT; - BOOST_FOREACH(const SGPath& c, d.children(flags)) { + for (const SGPath& c : d.children(flags)) { process_file(c); }