From 8cf9a5a082da4fe73c14ad07c5f5d0b8cbd74941 Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 11 Jul 2012 10:32:08 +0100 Subject: [PATCH] + more const correctness --- include/mapnik/metawriter.hpp | 2 +- include/mapnik/metawriter_inmem.hpp | 2 +- include/mapnik/metawriter_json.hpp | 2 +- include/mapnik/placement_finder.hpp | 2 +- include/mapnik/symbolizer_helpers.hpp | 2 +- src/metawriter.cpp | 7 ++++--- src/metawriter_inmem.cpp | 3 +-- src/symbolizer_helpers.cpp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/mapnik/metawriter.hpp b/include/mapnik/metawriter.hpp index ac518d28e..7041286d1 100644 --- a/include/mapnik/metawriter.hpp +++ b/include/mapnik/metawriter.hpp @@ -110,7 +110,7 @@ public: virtual void add_box(box2d const& box, Feature const& feature, CoordTransform const& t, metawriter_properties const& properties)=0; - virtual void add_text(boost::ptr_vector &placements, + virtual void add_text(boost::ptr_vector const& placements, box2d const& extents, Feature const& feature, CoordTransform const& t, diff --git a/include/mapnik/metawriter_inmem.hpp b/include/mapnik/metawriter_inmem.hpp index ee57f2a6b..6b77bf728 100644 --- a/include/mapnik/metawriter_inmem.hpp +++ b/include/mapnik/metawriter_inmem.hpp @@ -65,7 +65,7 @@ public: virtual void add_box(box2d const& box, Feature const& feature, CoordTransform const& t, metawriter_properties const& properties); - virtual void add_text(boost::ptr_vector &placements, + virtual void add_text(boost::ptr_vector const& placements, box2d const& extents, Feature const& feature, CoordTransform const& t, diff --git a/include/mapnik/metawriter_json.hpp b/include/mapnik/metawriter_json.hpp index 693824921..ab02d81b4 100644 --- a/include/mapnik/metawriter_json.hpp +++ b/include/mapnik/metawriter_json.hpp @@ -45,7 +45,7 @@ public: virtual void add_box(box2d const& box, Feature const& feature, CoordTransform const& t, metawriter_properties const& properties); - virtual void add_text(boost::ptr_vector &placements, + virtual void add_text(boost::ptr_vector const& placements, box2d const& extents, Feature const& feature, CoordTransform const& t, diff --git a/include/mapnik/placement_finder.hpp b/include/mapnik/placement_finder.hpp index dcc207ade..5be68bcbd 100644 --- a/include/mapnik/placement_finder.hpp +++ b/include/mapnik/placement_finder.hpp @@ -80,7 +80,7 @@ public: /** Remove old placements. */ void clear_placements(); - inline placements_type &get_results() { return placements_; } + inline placements_type const& get_results() { return placements_; } /** Additional boxes to take into account when finding placement. * Used for finding line placements where multiple placements are returned. diff --git a/include/mapnik/symbolizer_helpers.hpp b/include/mapnik/symbolizer_helpers.hpp index aafb8864b..60aa93778 100644 --- a/include/mapnik/symbolizer_helpers.hpp +++ b/include/mapnik/symbolizer_helpers.hpp @@ -85,7 +85,7 @@ public: bool next(); /** Get current placement. next() has to be called before! */ - placements_type & placements() const; + placements_type const& placements() const; protected: bool next_point_placement(); bool next_line_placement(); diff --git a/src/metawriter.cpp b/src/metawriter.cpp index f55298807..e37dfa976 100644 --- a/src/metawriter.cpp +++ b/src/metawriter.cpp @@ -177,7 +177,7 @@ void metawriter_json_stream::add_box(box2d const &box, Feature const& fe } void metawriter_json_stream::add_text( - boost::ptr_vector &placements, box2d const& extents, + boost::ptr_vector const& placements, box2d const& extents, Feature const& feature, CoordTransform const& t, metawriter_properties const& properties) { @@ -195,14 +195,15 @@ void metawriter_json_stream::add_text( */ for (unsigned n = 0; n < placements.size(); n++) { - text_path ¤t_placement = placements[n]; + text_path const& current_placement = placements[n]; bool inside = false; /* Part of text is inside rendering region */ bool straight = true; char_info_ptr c; double x, y, angle; current_placement.rewind(); - for (int i = 0; i < current_placement.num_nodes(); ++i) { + for (int i = 0; i < current_placement.num_nodes(); ++i) + { int cx = current_placement.center.x; int cy = current_placement.center.y; current_placement.vertex(&c, &x, &y, &angle); diff --git a/src/metawriter_inmem.cpp b/src/metawriter_inmem.cpp index 744b910dc..7cf0645be 100644 --- a/src/metawriter_inmem.cpp +++ b/src/metawriter_inmem.cpp @@ -71,7 +71,7 @@ metawriter_inmem::add_box(box2d const& box, Feature const& feature, void metawriter_inmem::add_text( - boost::ptr_vector & /*text*/, + boost::ptr_vector const& /*text*/, box2d const& extents, Feature const& feature, CoordTransform const& /*t*/, @@ -146,4 +146,3 @@ metawriter_inmem::inst_end() const { } - diff --git a/src/symbolizer_helpers.cpp b/src/symbolizer_helpers.cpp index 3312ac4c8..0c386c3b8 100644 --- a/src/symbolizer_helpers.cpp +++ b/src/symbolizer_helpers.cpp @@ -247,7 +247,7 @@ bool text_symbolizer_helper::next_placement() } template -placements_type &text_symbolizer_helper::placements() const +placements_type const& text_symbolizer_helper::placements() const { return finder_->get_results(); }