iwyu

include/mapnik/agg_renderer.hpp

@@ -26,7 +26,6 @@
 // mapnik
 #include <mapnik/config.hpp>            // for MAPNIK_DECL
 #include <mapnik/feature_style_processor.hpp>
-#include <mapnik/font_engine_freetype.hpp>  // for face_manager, etc
 #include <mapnik/noncopyable.hpp>       // for noncopyable
 #include <mapnik/rule.hpp>              // for rule, symbolizers
 #include <mapnik/box2d.hpp>     // for box2d

include/mapnik/datasource.hpp

@@ -28,6 +28,7 @@
 #include <mapnik/params.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/query.hpp>
+#include <mapnik/featureset.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/noncopyable.hpp>
 #include <mapnik/feature_style_processor_context.hpp>
@@ -42,14 +43,6 @@
 
 namespace mapnik {
 
-struct MAPNIK_DECL Featureset : private mapnik::noncopyable
-{
-    virtual feature_ptr next() = 0;
-    virtual ~Featureset() {}
-};
-
-using featureset_ptr = std::shared_ptr<Featureset>;
-
 class MAPNIK_DECL datasource_exception : public std::exception
 {
 public:

include/mapnik/feature_style_processor.hpp

@@ -24,14 +24,14 @@
 #define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
 
 // mapnik
-#include <mapnik/datasource.hpp> // for featureset_ptr
+#include <mapnik/box2d.hpp>
+#include <mapnik/featureset.hpp>
 #include <mapnik/config.hpp>
-
+#include <mapnik/feature_style_processor_context.hpp>
 
 // stl
 #include <set>
 #include <string>
-#include <vector>
 
 namespace mapnik
 {

include/mapnik/featureset.hpp

@@ -0,0 +1,48 @@
+/*****************************************************************************
+ *
+ * This file is part of Mapnik (c++ mapping toolkit)
+ *
+ * Copyright (C) 2011 Artem Pavlenko
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ *****************************************************************************/
+
+#ifndef MAPNIK_FEATURESET_HPP
+#define MAPNIK_FEATURESET_HPP
+
+// mapnik
+#include <mapnik/config.hpp>
+#include <mapnik/noncopyable.hpp>
+
+// boost
+#include <memory>
+
+namespace mapnik {
+
+class feature_impl;
+using feature_ptr = std::shared_ptr<feature_impl>;
+
+struct MAPNIK_DECL Featureset : private mapnik::noncopyable
+{
+    virtual feature_ptr next() = 0;
+    virtual ~Featureset() {}
+};
+
+using featureset_ptr = std::shared_ptr<Featureset>;
+
+}
+
+#endif // MAPNIK_FEATURESET_HPP

include/mapnik/filter_featureset.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_FILTER_FEATURESET_HPP
 
 // mapnik
-#include <mapnik/datasource.hpp>  // for featureset_ptr
+#include <mapnik/featureset.hpp>
 #include <mapnik/feature.hpp>
 
 namespace mapnik {

include/mapnik/grid/grid_view.hpp

@@ -28,7 +28,6 @@
 #include <mapnik/global.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/feature.hpp>
-#include <mapnik/datasource.hpp> // for feature_ptr
 
 // stl
 #include <cstdint>

include/mapnik/util/featureset_buffer.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_FEATURESET_BUFFER_HPP
 
 // mapnik
-#include <mapnik/datasource.hpp>
+#include <mapnik/featureset.hpp>
 
 #include <vector>
 

src/layer.cpp

@@ -21,9 +21,9 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/layer.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
+#include <mapnik/layer.hpp>
 
 // stl
 #include <string>