From 52702d3a203ee6364cc43ad70527a62f45f518b5 Mon Sep 17 00:00:00 2001
From: Hermann Kraus <hermr2d2@gmail.com>
Date: Sun, 12 Feb 2012 12:46:07 +0100
Subject: [PATCH] Rename filter_factory to expression.

---
 bindings/python/mapnik_expression.cpp                    | 2 +-
 bindings/python/mapnik_rule.cpp                          | 2 +-
 demo/c++/rundemo.cpp                                     | 3 +--
 include/mapnik/building_symbolizer.hpp                   | 2 +-
 include/mapnik/config_error.hpp                          | 2 +-
 include/mapnik/{filter_factory.hpp => expression.hpp}    | 6 +++---
 include/mapnik/formating/base.hpp                        | 2 +-
 include/mapnik/polygon_symbolizer.hpp                    | 1 -
 include/mapnik/rule.hpp                                  | 2 +-
 include/mapnik/text_properties.hpp                       | 2 +-
 src/build.py                                             | 2 +-
 src/deepcopy.cpp                                         | 1 -
 src/{filter_factory.cpp => expression.cpp}               | 6 +++---
 src/load_map.cpp                                         | 2 +-
 src/text_processing.cpp                                  | 1 -
 tests/cpp_tests/svg_renderer_tests/path_element_test.cpp | 2 +-
 16 files changed, 17 insertions(+), 21 deletions(-)
 rename include/mapnik/{filter_factory.hpp => expression.hpp} (92%)
 rename src/{filter_factory.cpp => expression.cpp} (95%)

diff --git a/bindings/python/mapnik_expression.cpp b/bindings/python/mapnik_expression.cpp
index c685da2f0..d95d5879b 100644
--- a/bindings/python/mapnik_expression.cpp
+++ b/bindings/python/mapnik_expression.cpp
@@ -24,7 +24,7 @@
 #include <boost/python.hpp>
 // mapnik
 #include <mapnik/feature.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/parse_path.hpp>
diff --git a/bindings/python/mapnik_rule.cpp b/bindings/python/mapnik_rule.cpp
index 62de4e5f7..528a87a63 100644
--- a/bindings/python/mapnik_rule.cpp
+++ b/bindings/python/mapnik_rule.cpp
@@ -27,7 +27,7 @@
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 
 #include <mapnik/rule.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/expression_string.hpp>
 
 using mapnik::rule;
diff --git a/demo/c++/rundemo.cpp b/demo/c++/rundemo.cpp
index 6f9f5ab0a..cb6c26c90 100644
--- a/demo/c++/rundemo.cpp
+++ b/demo/c++/rundemo.cpp
@@ -19,13 +19,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-// $Id$
 
 #include <mapnik/map.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/font_engine_freetype.hpp>
 #include <mapnik/agg_renderer.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/color_factory.hpp>
 #include <mapnik/image_util.hpp>
 #include <mapnik/config_error.hpp>
diff --git a/include/mapnik/building_symbolizer.hpp b/include/mapnik/building_symbolizer.hpp
index c2fe8ffb4..3214b7a2a 100644
--- a/include/mapnik/building_symbolizer.hpp
+++ b/include/mapnik/building_symbolizer.hpp
@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/color.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 
 namespace mapnik
 {
diff --git a/include/mapnik/config_error.hpp b/include/mapnik/config_error.hpp
index 8b80430f1..b25ae07f1 100644
--- a/include/mapnik/config_error.hpp
+++ b/include/mapnik/config_error.hpp
@@ -37,7 +37,7 @@ public:
         what_( what )
     {
     }
-    virtual ~config_error() throw() {};
+    virtual ~config_error() throw() {}
 
     virtual const char * what() const throw()
     {
diff --git a/include/mapnik/filter_factory.hpp b/include/mapnik/expression.hpp
similarity index 92%
rename from include/mapnik/filter_factory.hpp
rename to include/mapnik/expression.hpp
index b9b2481b4..9ec1222dc 100644
--- a/include/mapnik/filter_factory.hpp
+++ b/include/mapnik/expression.hpp
@@ -20,8 +20,8 @@
  *
  *****************************************************************************/
 
-#ifndef MAPNIK_FILTER_FACTORY_HPP
-#define MAPNIK_FILTER_FACTORY_HPP
+#ifndef MAPNIK_EXPRESSION_HPP
+#define MAPNIK_EXPRESSION_HPP
 
 // mapnik
 #include <mapnik/config.hpp>
@@ -40,4 +40,4 @@ MAPNIK_DECL expression_ptr parse_expression (std::string const& wkt);
 
 }
 
-#endif // MAPNIK_FILTER_FACTORY_HPP
+#endif // MAPNIK_EXPRESSION_HPP
diff --git a/include/mapnik/formating/base.hpp b/include/mapnik/formating/base.hpp
index 73ffededb..e45d95d3c 100644
--- a/include/mapnik/formating/base.hpp
+++ b/include/mapnik/formating/base.hpp
@@ -24,7 +24,7 @@
 
 // mapnik
 #include <mapnik/feature.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 
 // stl
 #include <set>
diff --git a/include/mapnik/polygon_symbolizer.hpp b/include/mapnik/polygon_symbolizer.hpp
index d39e1b867..a4f8706d5 100644
--- a/include/mapnik/polygon_symbolizer.hpp
+++ b/include/mapnik/polygon_symbolizer.hpp
@@ -26,7 +26,6 @@
 // mapnik
 #include <mapnik/color.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/filter_factory.hpp>
 #include <mapnik/enumeration.hpp>
 #include <mapnik/gamma_method.hpp>
 
diff --git a/include/mapnik/rule.hpp b/include/mapnik/rule.hpp
index 7de464703..23cf62a0d 100644
--- a/include/mapnik/rule.hpp
+++ b/include/mapnik/rule.hpp
@@ -35,7 +35,7 @@
 #include <mapnik/text_symbolizer.hpp>
 #include <mapnik/markers_symbolizer.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/expression_string.hpp>
 
 // boost
diff --git a/include/mapnik/text_properties.hpp b/include/mapnik/text_properties.hpp
index f5a355e1b..7f7190c51 100644
--- a/include/mapnik/text_properties.hpp
+++ b/include/mapnik/text_properties.hpp
@@ -26,7 +26,7 @@
 #include <mapnik/color.hpp>
 #include <mapnik/font_set.hpp>
 #include <mapnik/enumeration.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/formating/base.hpp>
 
 // stl
diff --git a/src/build.py b/src/build.py
index ac0f902ca..f3e512299 100644
--- a/src/build.py
+++ b/src/build.py
@@ -109,7 +109,7 @@ source = Split(
     datasource_cache.cpp
     deepcopy.cpp
     expression_string.cpp
-    filter_factory.cpp
+    expression.cpp
     feature_kv_iterator.cpp
     feature_type_style.cpp 
     font_engine_freetype.cpp
diff --git a/src/deepcopy.cpp b/src/deepcopy.cpp
index dec79bdfc..68174cc30 100644
--- a/src/deepcopy.cpp
+++ b/src/deepcopy.cpp
@@ -28,7 +28,6 @@
 #include <mapnik/rule.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/params.hpp>
-#include <mapnik/filter_factory.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/util/deepcopy.hpp>
 
diff --git a/src/filter_factory.cpp b/src/expression.cpp
similarity index 95%
rename from src/filter_factory.cpp
rename to src/expression.cpp
index 05f99239a..b4b8719d0 100644
--- a/src/filter_factory.cpp
+++ b/src/expression.cpp
@@ -21,7 +21,7 @@
  *****************************************************************************/
 //$Id$
 
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/expression_grammar.hpp>
 #include <mapnik/config_error.hpp>
 #include <mapnik/unicode.hpp>
@@ -32,7 +32,7 @@
 namespace mapnik
 {
 
-class filter_factory
+class expression_factory
 {
 public:
     static expression_ptr compile(std::string const& str,transcoder const& tr)
@@ -58,7 +58,7 @@ public:
 expression_ptr parse_expression (std::string const& wkt,std::string const& encoding)
 {
     transcoder tr(encoding);
-    return filter_factory::compile(wkt,tr);
+    return expression_factory::compile(wkt,tr);
 }
 
 expression_ptr parse_expression (std::string const& wkt)
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 12cf7fee8..95500058c 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -39,7 +39,7 @@
 #include <mapnik/libxml2_loader.hpp>
 #endif
 
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/parse_path.hpp>
 #include <mapnik/raster_colorizer.hpp>
 
diff --git a/src/text_processing.cpp b/src/text_processing.cpp
index 494770473..f9b74f3f3 100644
--- a/src/text_processing.cpp
+++ b/src/text_processing.cpp
@@ -26,7 +26,6 @@
 #include <mapnik/color.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/expression_evaluator.hpp>
-#include <mapnik/filter_factory.hpp>
 #include <mapnik/expression_string.hpp>
 #include <mapnik/ptree_helpers.hpp>
 
diff --git a/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp b/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
index 8f875abb9..317227430 100644
--- a/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
+++ b/tests/cpp_tests/svg_renderer_tests/path_element_test.cpp
@@ -14,7 +14,7 @@
 #include <mapnik/svg_renderer.hpp>
 #include <mapnik/datasource_cache.hpp>
 #include <mapnik/font_engine_freetype.hpp>
-#include <mapnik/filter_factory.hpp>
+#include <mapnik/expression.hpp>
 #include <mapnik/color_factory.hpp>
 
 // stl