From 62af2e6765ce4a68fc41d2dcbac8b7198ac8d347 Mon Sep 17 00:00:00 2001 From: artemp Date: Fri, 20 Sep 2013 14:13:23 +0100 Subject: [PATCH] + replace with --- benchmark/run.cpp | 2 +- bindings/python/mapnik_wkt_reader.cpp | 2 +- boost/geometry/extensions/index/rtree/rtree.hpp | 2 +- boost/geometry/extensions/index/rtree/rtree_leaf.hpp | 2 +- boost/geometry/extensions/index/rtree/rtree_node.hpp | 2 +- demo/viewer/mapwidget.hpp | 2 +- include/mapnik/agg_renderer.hpp | 2 +- include/mapnik/cairo_context.hpp | 2 +- include/mapnik/char_info.hpp | 2 +- include/mapnik/datasource.hpp | 2 +- include/mapnik/datasource_cache.hpp | 2 +- include/mapnik/expression.hpp | 2 +- include/mapnik/expression_string.hpp | 2 +- include/mapnik/feature.hpp | 2 +- include/mapnik/font_engine_freetype.hpp | 2 +- include/mapnik/geometry.hpp | 2 +- include/mapnik/grid/grid_renderer.hpp | 2 +- include/mapnik/mapped_memory_cache.hpp | 2 +- include/mapnik/marker.hpp | 2 +- include/mapnik/marker_cache.hpp | 2 +- include/mapnik/path_expression.hpp | 2 +- include/mapnik/pool.hpp | 2 +- include/mapnik/raster_colorizer.hpp | 2 +- include/mapnik/svg/output/svg_path_iterator.hpp | 2 +- include/mapnik/svg/output/svg_renderer.hpp | 2 +- include/mapnik/symbolizer.hpp | 2 +- include/mapnik/text_path.hpp | 2 +- include/mapnik/text_symbolizer.hpp | 2 +- include/mapnik/transform_expression.hpp | 2 +- plugins/input/geojson/geojson_datasource.hpp | 2 +- plugins/input/occi/occi_datasource.hpp | 2 +- plugins/input/occi/occi_featureset.hpp | 2 +- plugins/input/ogr/ogr_datasource.hpp | 4 ++-- plugins/input/osm/osm_datasource.hpp | 2 +- plugins/input/postgis/connection_manager.hpp | 2 +- plugins/input/postgis/postgis_datasource.hpp | 2 +- plugins/input/raster/raster_datasource.hpp | 2 +- plugins/input/rasterlite/rasterlite_datasource.hpp | 2 +- plugins/input/shape/shape_datasource.hpp | 2 +- plugins/input/shape/shape_io.hpp | 2 +- plugins/input/sqlite/sqlite_connection.hpp | 2 +- plugins/input/sqlite/sqlite_datasource.hpp | 2 +- plugins/input/sqlite/sqlite_featureset.hpp | 2 +- plugins/input/sqlite/sqlite_prepared.hpp | 2 +- plugins/input/sqlite/sqlite_utils.hpp | 2 +- plugins/input/templates/helloworld/hello_datasource.hpp | 2 +- src/jpeg_reader.cpp | 2 +- src/placement_finder.cpp | 2 +- src/rule.cpp | 2 +- src/tiff_reader.cpp | 2 +- utils/pgsql2sqlite/main.cpp | 2 +- utils/pgsql2sqlite/pgsql2sqlite.hpp | 2 +- utils/pgsql2sqlite/sqlite.hpp | 2 +- 53 files changed, 54 insertions(+), 54 deletions(-) diff --git a/benchmark/run.cpp b/benchmark/run.cpp index baa21d738..03ab9e5f7 100644 --- a/benchmark/run.cpp +++ b/benchmark/run.cpp @@ -16,7 +16,7 @@ // boost #include -#include +#include #include #include diff --git a/bindings/python/mapnik_wkt_reader.cpp b/bindings/python/mapnik_wkt_reader.cpp index 2c041412b..14465a0b9 100644 --- a/bindings/python/mapnik_wkt_reader.cpp +++ b/bindings/python/mapnik_wkt_reader.cpp @@ -23,7 +23,7 @@ // boost #include #include -#include +#include #include #include // mapnik diff --git a/boost/geometry/extensions/index/rtree/rtree.hpp b/boost/geometry/extensions/index/rtree/rtree.hpp index 4b9c50886..2cf579658 100644 --- a/boost/geometry/extensions/index/rtree/rtree.hpp +++ b/boost/geometry/extensions/index/rtree/rtree.hpp @@ -17,7 +17,7 @@ #include #include -#include +#include #include diff --git a/boost/geometry/extensions/index/rtree/rtree_leaf.hpp b/boost/geometry/extensions/index/rtree/rtree_leaf.hpp index 1309c4188..733e1819d 100644 --- a/boost/geometry/extensions/index/rtree/rtree_leaf.hpp +++ b/boost/geometry/extensions/index/rtree/rtree_leaf.hpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/boost/geometry/extensions/index/rtree/rtree_node.hpp b/boost/geometry/extensions/index/rtree/rtree_node.hpp index f0eaff9c9..ec9efad98 100644 --- a/boost/geometry/extensions/index/rtree/rtree_node.hpp +++ b/boost/geometry/extensions/index/rtree/rtree_node.hpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include diff --git a/demo/viewer/mapwidget.hpp b/demo/viewer/mapwidget.hpp index 873d659eb..73c8e12e8 100644 --- a/demo/viewer/mapwidget.hpp +++ b/demo/viewer/mapwidget.hpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #ifndef Q_MOC_RUN diff --git a/include/mapnik/agg_renderer.hpp b/include/mapnik/agg_renderer.hpp index adfdb3dd4..59005c2f6 100644 --- a/include/mapnik/agg_renderer.hpp +++ b/include/mapnik/agg_renderer.hpp @@ -38,7 +38,7 @@ // boost #include -#include +#include // fwd declaration to avoid depedence on agg headers namespace agg { struct trans_affine; } diff --git a/include/mapnik/cairo_context.hpp b/include/mapnik/cairo_context.hpp index e71d200df..6c9596255 100644 --- a/include/mapnik/cairo_context.hpp +++ b/include/mapnik/cairo_context.hpp @@ -37,7 +37,7 @@ #include // boost -#include +#include // cairo #include diff --git a/include/mapnik/char_info.hpp b/include/mapnik/char_info.hpp index e5a6a5baa..bd21aeab3 100644 --- a/include/mapnik/char_info.hpp +++ b/include/mapnik/char_info.hpp @@ -23,7 +23,7 @@ #ifndef MAPNIK_CHAR_INFO_HPP #define MAPNIK_CHAR_INFO_HPP -#include +#include namespace mapnik { struct char_properties; diff --git a/include/mapnik/datasource.hpp b/include/mapnik/datasource.hpp index ee205e186..cb9cec0e7 100644 --- a/include/mapnik/datasource.hpp +++ b/include/mapnik/datasource.hpp @@ -32,7 +32,7 @@ #include // boost -#include +#include #include // stl diff --git a/include/mapnik/datasource_cache.hpp b/include/mapnik/datasource_cache.hpp index b42a1985c..5e1fbc72e 100644 --- a/include/mapnik/datasource_cache.hpp +++ b/include/mapnik/datasource_cache.hpp @@ -30,7 +30,7 @@ #include // boost -#include +#include // stl #include diff --git a/include/mapnik/expression.hpp b/include/mapnik/expression.hpp index 25eccc863..9f8009b89 100644 --- a/include/mapnik/expression.hpp +++ b/include/mapnik/expression.hpp @@ -28,7 +28,7 @@ #include // boost -#include +#include // stl #include diff --git a/include/mapnik/expression_string.hpp b/include/mapnik/expression_string.hpp index 2f445755d..14a017a38 100644 --- a/include/mapnik/expression_string.hpp +++ b/include/mapnik/expression_string.hpp @@ -28,7 +28,7 @@ #include // boost -#include +#include // stl #include diff --git a/include/mapnik/feature.hpp b/include/mapnik/feature.hpp index 46192cefd..bf2c547ab 100644 --- a/include/mapnik/feature.hpp +++ b/include/mapnik/feature.hpp @@ -33,7 +33,7 @@ #include // boost -#include +#include #include // stl diff --git a/include/mapnik/font_engine_freetype.hpp b/include/mapnik/font_engine_freetype.hpp index 85bd2c881..1e046e4bc 100644 --- a/include/mapnik/font_engine_freetype.hpp +++ b/include/mapnik/font_engine_freetype.hpp @@ -39,7 +39,7 @@ #include // boost -#include +#include #include #include diff --git a/include/mapnik/geometry.hpp b/include/mapnik/geometry.hpp index 073439cee..92927a3a5 100644 --- a/include/mapnik/geometry.hpp +++ b/include/mapnik/geometry.hpp @@ -29,7 +29,7 @@ #include // boost -#include +#include #include namespace mapnik { diff --git a/include/mapnik/grid/grid_renderer.hpp b/include/mapnik/grid/grid_renderer.hpp index fc8ad08b6..f56180a2c 100644 --- a/include/mapnik/grid/grid_renderer.hpp +++ b/include/mapnik/grid/grid_renderer.hpp @@ -38,7 +38,7 @@ // boost #include -#include +#include // fwd declaration to avoid depedence on agg headers namespace agg { struct trans_affine; } diff --git a/include/mapnik/mapped_memory_cache.hpp b/include/mapnik/mapped_memory_cache.hpp index b6260d12d..7f876a88e 100644 --- a/include/mapnik/mapped_memory_cache.hpp +++ b/include/mapnik/mapped_memory_cache.hpp @@ -30,7 +30,7 @@ // boost #include -#include +#include #include #include diff --git a/include/mapnik/marker.hpp b/include/mapnik/marker.hpp index c5371ef30..40c418972 100644 --- a/include/mapnik/marker.hpp +++ b/include/mapnik/marker.hpp @@ -36,7 +36,7 @@ // boost #include -#include +#include #include #include diff --git a/include/mapnik/marker_cache.hpp b/include/mapnik/marker_cache.hpp index 00ce350bb..e7f7be267 100644 --- a/include/mapnik/marker_cache.hpp +++ b/include/mapnik/marker_cache.hpp @@ -30,7 +30,7 @@ // boost #include -#include +#include #include namespace mapnik diff --git a/include/mapnik/path_expression.hpp b/include/mapnik/path_expression.hpp index c13e54b50..9fa0767b3 100644 --- a/include/mapnik/path_expression.hpp +++ b/include/mapnik/path_expression.hpp @@ -25,7 +25,7 @@ // boost #include -#include +#include // stl #include diff --git a/include/mapnik/pool.hpp b/include/mapnik/pool.hpp index 7ed6b841f..707103d98 100644 --- a/include/mapnik/pool.hpp +++ b/include/mapnik/pool.hpp @@ -29,7 +29,7 @@ #include // boost -#include +#include #ifdef MAPNIK_THREADSAFE #include #endif diff --git a/include/mapnik/raster_colorizer.hpp b/include/mapnik/raster_colorizer.hpp index 2628348ef..e36d54608 100644 --- a/include/mapnik/raster_colorizer.hpp +++ b/include/mapnik/raster_colorizer.hpp @@ -43,7 +43,7 @@ #include // boost -#include +#include // stl #include diff --git a/include/mapnik/svg/output/svg_path_iterator.hpp b/include/mapnik/svg/output/svg_path_iterator.hpp index 4e7f69db9..c27f61bd9 100644 --- a/include/mapnik/svg/output/svg_path_iterator.hpp +++ b/include/mapnik/svg/output/svg_path_iterator.hpp @@ -30,7 +30,7 @@ // boost #include #include -#include +#include #include namespace mapnik { diff --git a/include/mapnik/svg/output/svg_renderer.hpp b/include/mapnik/svg/output/svg_renderer.hpp index c82078d53..a6f0db439 100644 --- a/include/mapnik/svg/output/svg_renderer.hpp +++ b/include/mapnik/svg/output/svg_renderer.hpp @@ -41,7 +41,7 @@ // boost #include #include -#include +#include // stl #include diff --git a/include/mapnik/symbolizer.hpp b/include/mapnik/symbolizer.hpp index 9b6cfd2f4..9d6a7843f 100644 --- a/include/mapnik/symbolizer.hpp +++ b/include/mapnik/symbolizer.hpp @@ -30,7 +30,7 @@ #include // boost -#include +#include // stl #include diff --git a/include/mapnik/text_path.hpp b/include/mapnik/text_path.hpp index cb565af92..b28a3ad19 100644 --- a/include/mapnik/text_path.hpp +++ b/include/mapnik/text_path.hpp @@ -33,7 +33,7 @@ #include // boost -#include +#include namespace mapnik { diff --git a/include/mapnik/text_symbolizer.hpp b/include/mapnik/text_symbolizer.hpp index b2f46ec1f..8aa17848a 100644 --- a/include/mapnik/text_symbolizer.hpp +++ b/include/mapnik/text_symbolizer.hpp @@ -31,7 +31,7 @@ #include // boost -#include +#include #include // stl diff --git a/include/mapnik/transform_expression.hpp b/include/mapnik/transform_expression.hpp index 5362d5822..d36c5bcf3 100644 --- a/include/mapnik/transform_expression.hpp +++ b/include/mapnik/transform_expression.hpp @@ -28,7 +28,7 @@ // boost #include -#include +#include #include // fusion diff --git a/plugins/input/geojson/geojson_datasource.hpp b/plugins/input/geojson/geojson_datasource.hpp index 131750c87..b6314db37 100644 --- a/plugins/input/geojson/geojson_datasource.hpp +++ b/plugins/input/geojson/geojson_datasource.hpp @@ -35,7 +35,7 @@ // boost #include -#include +#include #include #include #include diff --git a/plugins/input/occi/occi_datasource.hpp b/plugins/input/occi/occi_datasource.hpp index 10261f19a..0aa6f3891 100644 --- a/plugins/input/occi/occi_datasource.hpp +++ b/plugins/input/occi/occi_datasource.hpp @@ -35,7 +35,7 @@ // boost #include -#include +#include // stl #include diff --git a/plugins/input/occi/occi_featureset.hpp b/plugins/input/occi/occi_featureset.hpp index e81e24071..c43707c95 100644 --- a/plugins/input/occi/occi_featureset.hpp +++ b/plugins/input/occi/occi_featureset.hpp @@ -31,7 +31,7 @@ // boost #include -#include +#include // oci #include "occi_types.hpp" diff --git a/plugins/input/ogr/ogr_datasource.hpp b/plugins/input/ogr/ogr_datasource.hpp index ebff6c548..7be996c4d 100644 --- a/plugins/input/ogr/ogr_datasource.hpp +++ b/plugins/input/ogr/ogr_datasource.hpp @@ -34,7 +34,7 @@ // boost #include -#include +#include // stl #include @@ -56,7 +56,7 @@ public: mapnik::box2d envelope() const; boost::optional get_geometry_type() const; mapnik::layer_descriptor get_descriptor() const; - + private: void init(mapnik::parameters const& params); mapnik::box2d extent_; diff --git a/plugins/input/osm/osm_datasource.hpp b/plugins/input/osm/osm_datasource.hpp index efdd20d68..fb9fcb3fa 100644 --- a/plugins/input/osm/osm_datasource.hpp +++ b/plugins/input/osm/osm_datasource.hpp @@ -34,7 +34,7 @@ // boost #include -#include +#include // stl #include diff --git a/plugins/input/postgis/connection_manager.hpp b/plugins/input/postgis/connection_manager.hpp index 30a15abb1..f0404d841 100644 --- a/plugins/input/postgis/connection_manager.hpp +++ b/plugins/input/postgis/connection_manager.hpp @@ -30,7 +30,7 @@ #include // boost -#include +#include #include #include diff --git a/plugins/input/postgis/postgis_datasource.hpp b/plugins/input/postgis/postgis_datasource.hpp index 3f1ea34ee..fe93f5525 100644 --- a/plugins/input/postgis/postgis_datasource.hpp +++ b/plugins/input/postgis/postgis_datasource.hpp @@ -36,7 +36,7 @@ // boost #include -#include +#include #include // stl diff --git a/plugins/input/raster/raster_datasource.hpp b/plugins/input/raster/raster_datasource.hpp index 381a6568f..96bcaf16b 100644 --- a/plugins/input/raster/raster_datasource.hpp +++ b/plugins/input/raster/raster_datasource.hpp @@ -34,7 +34,7 @@ // boost #include -#include +#include // stl #include diff --git a/plugins/input/rasterlite/rasterlite_datasource.hpp b/plugins/input/rasterlite/rasterlite_datasource.hpp index f5b46584b..da5257766 100644 --- a/plugins/input/rasterlite/rasterlite_datasource.hpp +++ b/plugins/input/rasterlite/rasterlite_datasource.hpp @@ -34,7 +34,7 @@ // boost #include -#include +#include // stl #include diff --git a/plugins/input/shape/shape_datasource.hpp b/plugins/input/shape/shape_datasource.hpp index acb2cf32f..f4821bde6 100644 --- a/plugins/input/shape/shape_datasource.hpp +++ b/plugins/input/shape/shape_datasource.hpp @@ -35,7 +35,7 @@ // boost #include -#include +#include // stl #include diff --git a/plugins/input/shape/shape_io.hpp b/plugins/input/shape/shape_io.hpp index 3cb5e1831..24111f655 100644 --- a/plugins/input/shape/shape_io.hpp +++ b/plugins/input/shape/shape_io.hpp @@ -29,7 +29,7 @@ #include // boost -#include +#include #include "dbfile.hpp" #include "shapefile.hpp" diff --git a/plugins/input/sqlite/sqlite_connection.hpp b/plugins/input/sqlite/sqlite_connection.hpp index c095bbb85..e508740bd 100644 --- a/plugins/input/sqlite/sqlite_connection.hpp +++ b/plugins/input/sqlite/sqlite_connection.hpp @@ -32,7 +32,7 @@ #include // boost -#include +#include #include #include diff --git a/plugins/input/sqlite/sqlite_datasource.hpp b/plugins/input/sqlite/sqlite_datasource.hpp index 27c22ff33..db0bcfa07 100644 --- a/plugins/input/sqlite/sqlite_datasource.hpp +++ b/plugins/input/sqlite/sqlite_datasource.hpp @@ -36,7 +36,7 @@ // boost #include -#include +#include // stl #include diff --git a/plugins/input/sqlite/sqlite_featureset.hpp b/plugins/input/sqlite/sqlite_featureset.hpp index 3e52b4e85..463063dce 100644 --- a/plugins/input/sqlite/sqlite_featureset.hpp +++ b/plugins/input/sqlite/sqlite_featureset.hpp @@ -30,7 +30,7 @@ // boost #include -#include +#include // sqlite #include "sqlite_resultset.hpp" diff --git a/plugins/input/sqlite/sqlite_prepared.hpp b/plugins/input/sqlite/sqlite_prepared.hpp index de7e31c35..e05e5db62 100644 --- a/plugins/input/sqlite/sqlite_prepared.hpp +++ b/plugins/input/sqlite/sqlite_prepared.hpp @@ -31,7 +31,7 @@ #include // boost -#include +#include // stl #include diff --git a/plugins/input/sqlite/sqlite_utils.hpp b/plugins/input/sqlite/sqlite_utils.hpp index 3ccd72202..bfb511870 100644 --- a/plugins/input/sqlite/sqlite_utils.hpp +++ b/plugins/input/sqlite/sqlite_utils.hpp @@ -38,7 +38,7 @@ #include // boost -#include +#include #include #include diff --git a/plugins/input/templates/helloworld/hello_datasource.hpp b/plugins/input/templates/helloworld/hello_datasource.hpp index 018ff6f2f..432489dbe 100644 --- a/plugins/input/templates/helloworld/hello_datasource.hpp +++ b/plugins/input/templates/helloworld/hello_datasource.hpp @@ -12,7 +12,7 @@ // boost #include -#include +#include // stl #include diff --git a/src/jpeg_reader.cpp b/src/jpeg_reader.cpp index 36aa63ac4..60e7e601d 100644 --- a/src/jpeg_reader.cpp +++ b/src/jpeg_reader.cpp @@ -31,7 +31,7 @@ extern "C" } // boost -#include +#include #include #include #include diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp index 9a9089450..d9b3614ce 100644 --- a/src/placement_finder.cpp +++ b/src/placement_finder.cpp @@ -33,7 +33,7 @@ #include "agg_path_length.h" // boost -#include +#include #include #include diff --git a/src/rule.cpp b/src/rule.cpp index f13bfa562..be34121f3 100644 --- a/src/rule.cpp +++ b/src/rule.cpp @@ -41,7 +41,7 @@ #include // boost -#include +#include #include #include diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp index c694181da..7b3fad6a3 100644 --- a/src/tiff_reader.cpp +++ b/src/tiff_reader.cpp @@ -25,7 +25,7 @@ #include // boost -#include +#include // iostreams #include diff --git a/utils/pgsql2sqlite/main.cpp b/utils/pgsql2sqlite/main.cpp index 204e8e88e..632500115 100644 --- a/utils/pgsql2sqlite/main.cpp +++ b/utils/pgsql2sqlite/main.cpp @@ -28,7 +28,7 @@ // boost #include -#include +#include #include //stl diff --git a/utils/pgsql2sqlite/pgsql2sqlite.hpp b/utils/pgsql2sqlite/pgsql2sqlite.hpp index a1370aa85..24e34f03e 100644 --- a/utils/pgsql2sqlite/pgsql2sqlite.hpp +++ b/utils/pgsql2sqlite/pgsql2sqlite.hpp @@ -36,7 +36,7 @@ // boost #include #include -#include +#include #include //stl diff --git a/utils/pgsql2sqlite/sqlite.hpp b/utils/pgsql2sqlite/sqlite.hpp index 5f4f3041b..75d711fff 100644 --- a/utils/pgsql2sqlite/sqlite.hpp +++ b/utils/pgsql2sqlite/sqlite.hpp @@ -22,7 +22,7 @@ #include // boost -#include +#include #include //sqlite3