Add suffix _t to several classes

src/command-line-parser.cpp

@@ -392,7 +392,8 @@ options_t parse_command_line(int argc, char *argv[])
     app.add_flag_function("-l,--latlong",
                           [&](int64_t) {
                               options.projection =
-                                  reprojection::create_projection(PROJ_LATLONG);
+                                  reprojection_t::create_projection(
+                                      PROJ_LATLONG);
                           })
         ->description("Store data in degrees of latitude & longitude (WGS84).")
         ->group("Pgsql output options");
@@ -401,7 +402,7 @@ options_t parse_command_line(int argc, char *argv[])
     app.add_flag_function("-m,--merc",
                           [&](int64_t) {
                               options.projection =
-                                  reprojection::create_projection(
+                                  reprojection_t::create_projection(
                                       PROJ_SPHERE_MERC);
                           })
         ->description("Store data in Web Mercator [EPSG 3857]. This is the "
@@ -425,7 +426,7 @@ options_t parse_command_line(int argc, char *argv[])
 #ifdef HAVE_GENERIC_PROJ
                                  [&](int arg) {
                                      options.projection =
-                                         reprojection::create_projection(arg);
+                                         reprojection_t::create_projection(arg);
 #else
            [&](int) {
                throw std::runtime_error{
@@ -665,7 +666,8 @@ options_t parse_command_line(int argc, char *argv[])
     }
 
     if (!options.projection) {
-        options.projection = reprojection::create_projection(PROJ_SPHERE_MERC);
+        options.projection =
+            reprojection_t::create_projection(PROJ_SPHERE_MERC);
     }
 
     check_options_expire(&options);

src/expire-tiles.cpp

@@ -26,13 +26,13 @@
 #include "tile.hpp"
 #include "wkb.hpp"
 
-expire_tiles::expire_tiles(uint32_t max_zoom,
-                           std::shared_ptr<reprojection> projection)
+expire_tiles_t::expire_tiles_t(uint32_t max_zoom,
+                               std::shared_ptr<reprojection_t> projection)
 : m_projection(std::move(projection)), m_maxzoom(max_zoom),
   m_map_width(static_cast<int>(1U << m_maxzoom))
 {}
 
-void expire_tiles::expire_tile(uint32_t x, uint32_t y)
+void expire_tiles_t::expire_tile(uint32_t x, uint32_t y)
 {
     // Only try to insert to tile into the set if the last inserted tile
     // is different from this tile.
@@ -43,7 +43,7 @@ void expire_tiles::expire_tile(uint32_t x, uint32_t y)
     }
 }
 
-uint32_t expire_tiles::normalise_tile_x_coord(int x) const
+uint32_t expire_tiles_t::normalise_tile_x_coord(int x) const
 {
     x %= m_map_width;
     if (x < 0) {
@@ -52,46 +52,46 @@ uint32_t expire_tiles::normalise_tile_x_coord(int x) const
     return static_cast<uint32_t>(x);
 }
 
-geom::point_t expire_tiles::coords_to_tile(geom::point_t const &point)
+geom::point_t expire_tiles_t::coords_to_tile(geom::point_t const &point)
 {
     auto const c = m_projection->target_to_tile(point);
 
     return {m_map_width * (0.5 + c.x() / tile_t::EARTH_CIRCUMFERENCE),
             m_map_width * (0.5 - c.y() / tile_t::EARTH_CIRCUMFERENCE)};
 }
 
-void expire_tiles::from_point_list(geom::point_list_t const &list,
-                                   expire_config_t const &expire_config)
+void expire_tiles_t::from_point_list(geom::point_list_t const &list,
+                                     expire_config_t const &expire_config)
 {
     for_each_segment(list, [&](geom::point_t const &a, geom::point_t const &b) {
         from_line_segment(a, b, expire_config);
     });
 }
 
-void expire_tiles::from_geometry(geom::point_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::point_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     geom::box_t const box = geom::envelope(geom);
     from_bbox(box, expire_config);
 }
 
-void expire_tiles::from_geometry(geom::linestring_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::linestring_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     from_point_list(geom, expire_config);
 }
 
-void expire_tiles::from_polygon_boundary(geom::polygon_t const &geom,
-                                         expire_config_t const &expire_config)
+void expire_tiles_t::from_polygon_boundary(geom::polygon_t const &geom,
+                                           expire_config_t const &expire_config)
 {
     from_point_list(geom.outer(), expire_config);
     for (auto const &inner : geom.inners()) {
         from_point_list(inner, expire_config);
     }
 }
 
-void expire_tiles::from_geometry(geom::polygon_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::polygon_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     if (expire_config.mode == expire_mode::boundary_only) {
         from_polygon_boundary(geom, expire_config);
@@ -105,16 +105,16 @@ void expire_tiles::from_geometry(geom::polygon_t const &geom,
     }
 }
 
-void expire_tiles::from_polygon_boundary(geom::multipolygon_t const &geom,
-                                         expire_config_t const &expire_config)
+void expire_tiles_t::from_polygon_boundary(geom::multipolygon_t const &geom,
+                                           expire_config_t const &expire_config)
 {
     for (auto const &sgeom : geom) {
         from_polygon_boundary(sgeom, expire_config);
     }
 }
 
-void expire_tiles::from_geometry(geom::multipolygon_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::multipolygon_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     if (expire_config.mode == expire_mode::boundary_only) {
         from_polygon_boundary(geom, expire_config);
@@ -130,14 +130,14 @@ void expire_tiles::from_geometry(geom::multipolygon_t const &geom,
 
 // False positive: Apparently clang-tidy can not see through the visit()
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
-void expire_tiles::from_geometry(geom::geometry_t const &geom,
-                                 expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry(geom::geometry_t const &geom,
+                                   expire_config_t const &expire_config)
 {
     geom.visit([&](auto const &g) { from_geometry(g, expire_config); });
 }
 
-void expire_tiles::from_geometry_if_3857(geom::geometry_t const &geom,
-                                         expire_config_t const &expire_config)
+void expire_tiles_t::from_geometry_if_3857(geom::geometry_t const &geom,
+                                           expire_config_t const &expire_config)
 {
     if (geom.srid() == PROJ_SPHERE_MERC) {
         from_geometry(geom, expire_config);
@@ -147,9 +147,9 @@ void expire_tiles::from_geometry_if_3857(geom::geometry_t const &geom,
 /*
  * Expire tiles that a line crosses
  */
-void expire_tiles::from_line_segment(geom::point_t const &a,
-                                     geom::point_t const &b,
-                                     expire_config_t const &expire_config)
+void expire_tiles_t::from_line_segment(geom::point_t const &a,
+                                       geom::point_t const &b,
+                                       expire_config_t const &expire_config)
 {
     auto tilec_a = coords_to_tile(a);
     auto tilec_b = coords_to_tile(b);
@@ -207,8 +207,8 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
 /*
  * Expire tiles within a bounding box
  */
-int expire_tiles::from_bbox(geom::box_t const &box,
-                            expire_config_t const &expire_config)
+int expire_tiles_t::from_bbox(geom::box_t const &box,
+                              expire_config_t const &expire_config)
 {
     if (!enabled()) {
         return 0;
@@ -257,7 +257,7 @@ int expire_tiles::from_bbox(geom::box_t const &box,
     return 0;
 }
 
-quadkey_list_t expire_tiles::get_tiles()
+quadkey_list_t expire_tiles_t::get_tiles()
 {
     quadkey_list_t tiles;
     tiles.reserve(m_dirty_tiles.size());
@@ -267,7 +267,7 @@ quadkey_list_t expire_tiles::get_tiles()
     return tiles;
 }
 
-void expire_tiles::merge_and_destroy(expire_tiles *other)
+void expire_tiles_t::merge_and_destroy(expire_tiles_t *other)
 {
     if (m_map_width != other->m_map_width) {
         throw fmt_error("Unable to merge tile expiry sets when "
@@ -285,7 +285,7 @@ void expire_tiles::merge_and_destroy(expire_tiles *other)
     }
 }
 
-int expire_from_result(expire_tiles *expire, pg_result_t const &result,
+int expire_from_result(expire_tiles_t *expire, pg_result_t const &result,
                        expire_config_t const &expire_config)
 {
     auto const num_tuples = result.num_tuples();

src/expire-tiles.hpp

@@ -25,12 +25,13 @@
 #include "pgsql.hpp"
 #include "tile.hpp"
 
-class reprojection;
+class reprojection_t;
 
-class expire_tiles
+class expire_tiles_t
 {
 public:
-    expire_tiles(uint32_t max_zoom, std::shared_ptr<reprojection> projection);
+    expire_tiles_t(uint32_t max_zoom,
+                   std::shared_ptr<reprojection_t> projection);
 
     bool empty() const noexcept { return m_dirty_tiles.empty(); }
 
@@ -76,7 +77,7 @@ class expire_tiles
     int from_bbox(geom::box_t const &box, expire_config_t const &expire_config);
 
     /**
-     * Get tiles as a vector of quadkeys and remove them from the expire_tiles
+     * Get tiles as a vector of quadkeys and remove them from the expire_tiles_t
      * object.
      */
     quadkey_list_t get_tiles();
@@ -85,7 +86,7 @@ class expire_tiles
      * Merge the list of expired tiles in the other object into this
      * object, destroying the list in the other object.
      */
-    void merge_and_destroy(expire_tiles *other);
+    void merge_and_destroy(expire_tiles_t *other);
 
 private:
     /**
@@ -115,12 +116,12 @@ class expire_tiles
     /// The tile which has been added last to the unordered set.
     tile_t m_prev_tile;
 
-    std::shared_ptr<reprojection> m_projection;
+    std::shared_ptr<reprojection_t> m_projection;
 
     uint32_t m_maxzoom;
     int m_map_width;
 
-}; // class expire_tiles
+}; // class expire_tiles_t
 
 /**
  * Expire tiles based on an osm id.
@@ -132,7 +133,7 @@ class expire_tiles
  * \param expire_config Configuration for expiry.
  * \return The number of tuples in the result or -1 if expire is disabled.
  */
-int expire_from_result(expire_tiles *expire, pg_result_t const &result,
+int expire_from_result(expire_tiles_t *expire, pg_result_t const &result,
                        expire_config_t const &expire_config);
 
 #endif // OSM2PGSQL_EXPIRE_TILES_HPP

src/flex-table-column.cpp

@@ -203,7 +203,7 @@ void flex_table_column_t::add_expire(expire_config_t const &config)
 }
 
 void flex_table_column_t::do_expire(geom::geometry_t const &geom,
-                                    std::vector<expire_tiles> *expire) const
+                                    std::vector<expire_tiles_t> *expire) const
 {
     assert(expire);
     for (auto const &expire_config : m_expires) {

src/flex-table-column.hpp

@@ -132,7 +132,7 @@ class flex_table_column_t
     }
 
     void do_expire(geom::geometry_t const &geom,
-                   std::vector<expire_tiles> *expire) const;
+                   std::vector<expire_tiles_t> *expire) const;
 
 private:
     std::vector<expire_config_t> m_expires;

src/flex-table.hpp

@@ -278,7 +278,7 @@ class table_connection_t
 public:
     table_connection_t(flex_table_t *table,
                        std::shared_ptr<db_copy_thread_t> const &copy_thread)
-    : m_proj(reprojection::create_projection(table->srid())), m_table(table),
+    : m_proj(reprojection_t::create_projection(table->srid())), m_table(table),
       m_target(std::make_shared<db_target_descr_t>(
           table->schema(), table->name(), table->id_column_names(),
           table->build_sql_column_list())),
@@ -314,7 +314,7 @@ class table_connection_t
 
     void delete_rows_with(osmium::item_type type, osmid_t id);
 
-    reprojection const &proj() const noexcept
+    reprojection_t const &proj() const noexcept
     {
         assert(m_proj);
         return *m_proj;
@@ -335,7 +335,7 @@ class table_connection_t
     }
 
 private:
-    std::shared_ptr<reprojection> m_proj;
+    std::shared_ptr<reprojection_t> m_proj;
 
     flex_table_t *m_table;
 

src/flex-write.cpp

@@ -39,7 +39,7 @@ void write_null(db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                 flex_table_column_t const &column)
 {
     if (column.not_null()) {
-        throw not_null_exception{
+        throw not_null_exception_t{
             fmt::format("Can not add NULL to column '{}' declared NOT NULL.",
                         column.name()),
             &column};
@@ -258,7 +258,7 @@ bool is_compatible(geom::geometry_t const &geom,
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column,
-                       std::vector<expire_tiles> *expire)
+                       std::vector<expire_tiles_t> *expire)
 {
     lua_getfield(lua_state, -1, column.name().c_str());
     int const ltype = lua_type(lua_state, -1);

src/flex-write.hpp

@@ -18,12 +18,12 @@
 #include <string>
 #include <vector>
 
-class expire_tiles;
+class expire_tiles_t;
 
-class not_null_exception : public std::runtime_error
+class not_null_exception_t : public std::runtime_error
 {
 public:
-    not_null_exception(std::string const &message,
+    not_null_exception_t(std::string const &message,
                        flex_table_column_t const *column)
     : std::runtime_error(message), m_column(column)
     {}
@@ -32,11 +32,11 @@ class not_null_exception : public std::runtime_error
 
 private:
     flex_table_column_t const *m_column;
-}; // class not_null_exception
+}; // class not_null_exception_t
 
 void flex_write_column(lua_State *lua_state,
                        db_copy_mgr_t<db_deleter_by_type_and_id_t> *copy_mgr,
                        flex_table_column_t const &column,
-                       std::vector<expire_tiles> *expire);
+                       std::vector<expire_tiles_t> *expire);
 
 #endif // OSM2PGSQL_FLEX_WRITE_HPP

src/gen/gen-rivers.cpp

@@ -345,7 +345,8 @@ SELECT "{id_column}", "{width_column}", "{name_column}", "{geom_column}"
         geom::geometry_t const geom{std::move(edge.points), PROJ_SPHERE_MERC};
         auto const wkb = geom_to_ewkb(geom);
         connection().exec_prepared("ins", edge.id, edge.width,
-                                   get_name(names, edge.id), binary_param(wkb));
+                                   get_name(names, edge.id),
+                                   binary_param_t(wkb));
     }
     connection().exec("COMMIT");
     timer(m_timer_write).stop();

src/gen/gen-tile-raster.cpp

@@ -237,7 +237,7 @@ void gen_tile_raster_union_t::process(tile_t const &tile)
         timer(m_timer_write).start();
         for (auto const &geom : geometries) {
             auto const wkb = geom_to_ewkb(geom);
-            connection().exec_prepared("insert_geoms", binary_param{wkb},
+            connection().exec_prepared("insert_geoms", binary_param_t{wkb},
                                        tile.x(), tile.y(), param);
         }
         timer(m_timer_write).stop();

src/gen/osm2pgsql-gen.cpp

@@ -224,7 +224,7 @@ void run_tile_gen(std::atomic_flag *error_flag,
                   std::mutex *mut, unsigned int n)
 {
     try {
-        logger::init_thread(n);
+        logger_t::init_thread(n);
 
         log_debug("Started generalizer thread for '{}'.",
                   master_generalizer->strategy());