From 495d3eac408c7915f0ebe8116fa67830f5405ce1 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Thu, 8 Dec 2011 15:25:06 +0000 Subject: [PATCH] rename to reflect 'generator' bit --- .../{geometry_to_svg.hpp => geometry_svg_generator.hpp} | 6 +++--- .../{geometry_to_wkt.hpp => geometry_wkt_generator.hpp} | 9 +++------ 2 files changed, 6 insertions(+), 9 deletions(-) rename include/mapnik/util/{geometry_to_svg.hpp => geometry_svg_generator.hpp} (94%) rename include/mapnik/util/{geometry_to_wkt.hpp => geometry_wkt_generator.hpp} (95%) diff --git a/include/mapnik/util/geometry_to_svg.hpp b/include/mapnik/util/geometry_svg_generator.hpp similarity index 94% rename from include/mapnik/util/geometry_to_svg.hpp rename to include/mapnik/util/geometry_svg_generator.hpp index fd18e3e97..e69070148 100644 --- a/include/mapnik/util/geometry_to_svg.hpp +++ b/include/mapnik/util/geometry_svg_generator.hpp @@ -22,8 +22,8 @@ //$Id$ -#ifndef MAPNIK_GEOMETRY_TO_SVG_HPP -#define MAPNIK_GEOMETRY_TO_SVG_HPP +#ifndef MAPNIK_GEOMETRY_SVG_GENERATOR_HPP +#define MAPNIK_GEOMETRY_SVG_GENERATOR_HPP // mapnik #include @@ -62,4 +62,4 @@ bool generate_svg (OutputIterator sink, mapnik::geometry_type const& geom) }} -#endif // MAPNIK_GEOMETRY_TO_SVG_HPP +#endif // MAPNIK_GEOMETRY_SVG_GENERATOR_HPP diff --git a/include/mapnik/util/geometry_to_wkt.hpp b/include/mapnik/util/geometry_wkt_generator.hpp similarity index 95% rename from include/mapnik/util/geometry_to_wkt.hpp rename to include/mapnik/util/geometry_wkt_generator.hpp index c48e8179a..ba4e4a86e 100644 --- a/include/mapnik/util/geometry_to_wkt.hpp +++ b/include/mapnik/util/geometry_wkt_generator.hpp @@ -22,8 +22,8 @@ //$Id$ -#ifndef MAPNIK_GEOMETRY_TO_WKT_HPP -#define MAPNIK_GEOMETRY_TO_WKT_HPP +#ifndef MAPNIK_GEOMETRY_WKT_GENERATOR_HPP +#define MAPNIK_GEOMETRY_WKT_GENERATOR_HPP // mapnik #include @@ -89,14 +89,11 @@ struct wkt_generator : wkt_generator() : wkt_generator::base_type(wkt) { - using boost::spirit::karma::double_; using boost::spirit::karma::uint_; using boost::spirit::karma::_val; using boost::spirit::karma::_1; - using boost::spirit::karma::_2; using boost::spirit::karma::lit; using boost::spirit::karma::_a; - using boost::spirit::karma::_r0; using boost::spirit::karma::_r1; using boost::spirit::karma::eps; @@ -159,4 +156,4 @@ struct wkt_generator : }} -#endif // MAPNIK_GEOMETRY_TO_WKT_HPP +#endif // MAPNIK_GEOMETRY_WKT_GENERATOR_HPP