clean up includes and remove unused rb.cpp

Includes cleaned according to the results of include-what-you-use.

Author: lonvia

Makefile.am

@@ -4,33 +4,7 @@ AUTOMAKE_OPTIONS = subdir-objects
 bin_PROGRAMS = osm2pgsql nodecachefilereader
 noinst_LTLIBRARIES = libosm2pgsql.la
 
-osm2pgsql_SOURCES = osm2pgsql.cpp \
-	geometry-builder.hpp \
-	expire-tiles.hpp \
-	input.hpp \
-	middle-pgsql.hpp \
-	middle-ram.hpp \
-	middle.hpp \
-	node-persistent-cache.hpp \
-	node-ram-cache.hpp \
-	options.hpp \
-	osmdata.hpp \
-	osmtypes.hpp \
-	output-gazetteer.hpp \
-	output-null.hpp \
-	output-pgsql.hpp \
-	output.hpp \
-	parse.hpp \
-	parse-o5m.hpp \
-	parse-pbf.hpp \
-	parse-xml2.hpp \
-	pgsql.hpp \
-	rb.hpp \
-	reprojection.hpp \
-	sanitizer.hpp \
-	sprompt.hpp \
-	table.hpp \
-	util.hpp
+osm2pgsql_SOURCES = osm2pgsql.cpp
 
 osm2pgsql_LDADD = libosm2pgsql.la
 
@@ -62,7 +36,6 @@ libosm2pgsql_la_SOURCES = \
 	processor-line.cpp \
 	processor-point.cpp \
 	processor-polygon.cpp \
-	rb.cpp \
 	reprojection.cpp \
 	sprompt.cpp \
 	table.cpp \

UTF8sanitizer.cpp

@@ -1,10 +1,6 @@
-#include <stdio.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <zlib.h>
-#include <bzlib.h>
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
 
 #include "sanitizer.hpp"
 #include "input.hpp"

expire-tiles.cpp

@@ -8,15 +8,15 @@
  * https://subversion.nexusuk.org/trac/browser/openpistemap/trunk/scripts/expire_tiles.py
  */
 
-#include <libpq-fe.h>
-#include <math.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include "output.hpp"
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <cerrno>
+#include <string>
+
+#include "expire-tiles.hpp"
 #include "options.hpp"
 #include "geometry-builder.hpp"
-#include "pgsql.hpp"
 #include "reprojection.hpp"
 #include "table.hpp"
 

expire-tiles.hpp

@@ -1,15 +1,15 @@
 #ifndef EXPIRE_TILES_H
 #define EXPIRE_TILES_H
 
-#include "options.hpp"
+#include "osmtypes.hpp"
 
 #include <boost/noncopyable.hpp>
-#include <boost/shared_ptr.hpp>
 
 class table_t;
+struct options_t;
 
 struct expire_tiles : public boost::noncopyable {
-    explicit expire_tiles(const struct options_t *options);
+    explicit expire_tiles(const options_t *options);
     ~expire_tiles();
 
     //TODO: copy constructor
@@ -57,7 +57,7 @@ struct expire_tiles : public boost::noncopyable {
 
     int map_width;
     double tile_width;
-    const struct options_t *Options;
+    const options_t *Options;
     struct tile *dirty;
 };
 

geometry-builder.cpp

@@ -22,26 +22,29 @@
 
 #include <iostream>
 #include <algorithm>
-#include <cstring>
-#include <cstdlib>
 #include <cmath>
-#include <exception>
+#include <cstddef>
+#include <stdexcept>
+#include <memory>
+#include <new>
 
 #if defined(__CYGWIN__)
 #define GEOS_INLINE
 #endif
 
+#include <geos/geom/prep/PreparedGeometry.h>
 #include <geos/geom/prep/PreparedGeometryFactory.h>
-#include <geos/geom/prep/PreparedPolygon.h>
 #include <geos/geom/GeometryFactory.h>
+#include <geos/geom/Coordinate.h>
+#include <geos/geom/CoordinateSequence.h>
 #include <geos/geom/CoordinateSequenceFactory.h>
 #include <geos/geom/Geometry.h>
+#include <geos/geom/GeometryCollection.h>
 #include <geos/geom/LineString.h>
 #include <geos/geom/LinearRing.h>
 #include <geos/geom/MultiLineString.h>
 #include <geos/geom/Polygon.h>
 #include <geos/geom/MultiPolygon.h>
-#include <geos/geom/Point.h>
 #include <geos/io/WKTReader.h>
 #include <geos/io/WKTWriter.h>
 #include <geos/util/GEOSException.h>

geometry-processor.cpp

@@ -2,10 +2,13 @@
 #include "processor-line.hpp"
 #include "processor-point.hpp"
 #include "processor-polygon.hpp"
-
+#include "middle.hpp"
+#include "options.hpp"
+#include "reprojection.hpp"
 
 #include <boost/make_shared.hpp>
 #include <boost/format.hpp>
+#include <boost/optional.hpp>
 #include <stdexcept>
 
 boost::shared_ptr<geometry_processor> geometry_processor::create(const std::string &type,

geometry-processor.hpp

@@ -1,10 +1,16 @@
 #ifndef GEOMETRY_PROCESSOR_HPP
 #define GEOMETRY_PROCESSOR_HPP
 
-#include "middle.hpp"
-#include "geometry-builder.hpp"
+#include <cstddef>
 #include <string>
-#include <boost/optional.hpp>
+#include <vector>
+#include <boost/shared_ptr.hpp>
+#include "geometry-builder.hpp"
+#include "osmtypes.hpp"
+
+struct middle_query_t;
+struct middle_t;
+struct options_t;
 
 struct geometry_processor {
     // factory method for creating various types of geometry processors either by name or by geometry column type

input.cpp

@@ -6,18 +6,15 @@
 #include <io.h>
 #define STDIN_FILENO 0
 #else
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+#include <cstdio>
 #endif
 
+#include <cstdlib>
+#include <cstring>
 #include <fcntl.h>
 #include <zlib.h>
 #include <bzlib.h>
-#include <string.h>
 
-#include "sanitizer.hpp"
 #include "input.hpp"
 
 struct Input {

input.hpp

@@ -1,6 +1,7 @@
 #ifndef INPUT_H
 #define INPUT_H
 
+#include <libxml/xmlreader.h>
 struct Input;
 
 int readFile(struct Input *context, char * buffer, int len);

middle-ram.cpp

@@ -9,16 +9,13 @@
 
 #include <stdexcept>
 #include <cstdio>
-#include <cstdlib>
 #include <cstring>
 #include <cassert>
 
-#include "osmtypes.hpp"
 #include "middle-ram.hpp"
 #include "node-ram-cache.hpp"
-#include "output-pgsql.hpp"
 #include "options.hpp"
-#include "util.hpp"
+#include "id-tracker.hpp"
 
 /* Store +-20,000km Mercator co-ordinates as fixed point 32bit number with maximum precision */
 /* Scale is chosen such that 40,000 * SCALE < 2^32          */

middle-ram.hpp

@@ -9,10 +9,14 @@
 #ifndef MIDDLE_RAM_H
 #define MIDDLE_RAM_H
 
+#include <memory>
+
 #include "middle.hpp"
-#include "node-ram-cache.hpp"
 #include <vector>
 
+struct node_ram_cache;
+struct options_t;
+
 struct middle_ram_t : public middle_t {
     middle_ram_t();
     virtual ~middle_ram_t();

middle.hpp

@@ -8,8 +8,11 @@
 #define MIDDLE_H
 
 #include "osmtypes.hpp"
-#include "options.hpp"
-#include <vector>
+
+#include <cstddef>
+#include <boost/shared_ptr.hpp>
+
+struct options_t;
 
 struct middle_query_t {
     virtual ~middle_query_t() {}

node-persistent-cache-reader.cpp

@@ -1,18 +1,12 @@
-#include <stdio.h>
-#include <stdlib.h>
+#include <cstdio>
+#include <cstdlib>
 #include <unistd.h>
-#include <string.h>
-#include <errno.h>
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <math.h>
+#include <cstring>
 #include <sys/wait.h>
 #include <sys/time.h>
+#include <boost/shared_ptr.hpp>
 
 #include "osmtypes.hpp"
-#include "output.hpp"
 #include "options.hpp"
 #include "node-persistent-cache.hpp"
 #include "node-ram-cache.hpp"

node-ram-cache.cpp

@@ -5,21 +5,14 @@
 
 #include "config.h"
 
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 
 #include "osmtypes.hpp"
-#include "middle.hpp"
 #include "node-ram-cache.hpp"
 #include "util.hpp"
 
-
-
-
-
 /* Here we use a similar storage structure as middle-ram, except we allow
  * the array to be lossy so we can cap the total memory usage. Hence it is a
  * combination of a sparse array with a priority queue

node-ram-cache.hpp

@@ -10,6 +10,8 @@
 
 #include "osmtypes.hpp"
 
+#include <cstddef>
+#include <cstdint>
 #include <boost/noncopyable.hpp>
 
 #define ALLOC_SPARSE 1

osm2pgsql.cpp

@@ -24,17 +24,21 @@
 */
 
 #include "config.h"
+#include "osmtypes.hpp"
+#include "reprojection.hpp"
 #include "options.hpp"
 #include "parse.hpp"
 #include "middle.hpp"
 #include "output.hpp"
 #include "osmdata.hpp"
 #include "util.hpp"
 
-#include <unistd.h>
-#include <assert.h>
 #include <time.h>
 #include <stdexcept>
+#include <string>
+#include <vector>
+#include <cstdio>
+#include <cstdlib>
 
 #include <libpq-fe.h>
 #include <boost/format.hpp>

output-multi.cpp

@@ -1,9 +1,13 @@
 #include "output-multi.hpp"
 #include "taginfo_impl.hpp"
+#include "table.hpp"
+#include "tagtransform.hpp"
+#include "options.hpp"
+#include "middle.hpp"
+#include "id-tracker.hpp"
+#include "geometry-builder.hpp"
+#include "expire-tiles.hpp"
 
-#include <boost/format.hpp>
-#include <boost/foreach.hpp>
-#include <boost/make_shared.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <vector>
 

output-multi.hpp

@@ -7,22 +7,28 @@
 #ifndef OUTPUT_MULTI_HPP
 #define OUTPUT_MULTI_HPP
 
+#include "osmtypes.hpp"
 #include "output.hpp"
-#include "tagtransform.hpp"
-#include "table.hpp"
 #include "geometry-processor.hpp"
-#include "id-tracker.hpp"
-#include "expire-tiles.hpp"
 
-#include <vector>
+#include <cstddef>
+#include <string>
 #include <boost/scoped_ptr.hpp>
-#include <boost/variant.hpp>
+#include <boost/shared_ptr.hpp>
+
+class table_t;
+class tagtransform;
+struct expire_tiles;
+struct export_list;
+struct id_tracker;
+struct middle_query_t;
+struct options_t;
 
 class output_multi_t : public output_t {
 public:
     output_multi_t(const std::string &name,
                    boost::shared_ptr<geometry_processor> processor_,
-                   const struct export_list &export_list_,
+                   const export_list &export_list_,
                    const middle_query_t* mid_, const options_t &options_);
     output_multi_t(const output_multi_t& other);
     virtual ~output_multi_t();