rename source files to reflect class name e.g layout -> text_layout

bindings/python/mapnik_text_placement.cpp

@@ -33,7 +33,7 @@
 #include <mapnik/text/formatting/list.hpp>
 #include <mapnik/text/formatting/format.hpp>
 #include <mapnik/text/formatting/layout.hpp>
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 #include <mapnik/symbolizer.hpp>
 
 #include "mapnik_enumeration.hpp"

include/mapnik/text/placement_finder.hpp

@@ -25,7 +25,7 @@
 //mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/pixel_position.hpp>
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements_list.hpp>
 #include <mapnik/text/rotation.hpp>

src/build.py

@@ -203,7 +203,7 @@ source = Split(
     warp.cpp
     css_color_grammar.cpp
     text/vertex_cache.cpp
-    text/layout.cpp
+    text/text_layout.cpp
     text/text_line.cpp
     text/itemizer.cpp
     text/scrptrun.cpp

src/text/formatting/layout.cpp

@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/text/text_properties.hpp>
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/ptree_helpers.hpp>

src/text/formatting/text.cpp

@@ -26,7 +26,7 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/text/text_properties.hpp>
 #include <mapnik/xml_node.hpp>
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 
 // boost
 #include <boost/property_tree/ptree.hpp>

src/text/placement_finder.cpp

@@ -25,7 +25,7 @@
 #include <mapnik/ctrans.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/text/placement_finder.hpp>
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 #include <mapnik/text/text_properties.hpp>
 #include <mapnik/text/placements_list.hpp>
 #include <mapnik/text/vertex_cache.hpp>
@@ -57,9 +57,7 @@ placement_finder::placement_finder(feature_impl const& feature,
       placements_(),
       has_marker_(false),
       marker_(),
-      marker_box_()
+      marker_box_() {}
-{
-}
 
 bool placement_finder::next_position()
 {

src/text/symbolizer_helpers.cpp

@@ -24,7 +24,7 @@
 #include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/label_collision_detector.hpp>
 #include <mapnik/font_engine_freetype.hpp>
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/parse_path.hpp>
 #include <mapnik/debug.hpp>

src/text/text_layout.cpp

@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 #include <mapnik/text/text_properties.hpp>
 #include <mapnik/expression_evaluator.hpp>
 #include <mapnik/debug.hpp>

src/text/text_properties.cpp

@@ -21,7 +21,7 @@
  *****************************************************************************/
 // mapnik
 #include <mapnik/text/text_properties.hpp>
-#include <mapnik/text/layout.hpp>
+#include <mapnik/text/text_layout.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/ptree_helpers.hpp>