Add _t suffix to class export_list

Author: joto

src/output-pgsql.cpp

@@ -469,7 +469,7 @@ output_pgsql_t::output_pgsql_t(std::shared_ptr<middle_query_t> const &mid,
     log_debug("Using projection SRS {} ({})", options.projection->target_srs(),
               options.projection->target_desc());
 
-    export_list exlist;
+    export_list_t exlist;
 
     m_enable_way_area = read_style_file(options.style, &exlist);
 

src/taginfo-impl.hpp

@@ -53,7 +53,7 @@ struct taginfo
 };
 
 /* list of exported tags */
-class export_list
+class export_list_t
 {
 public:
     void add(osmium::item_type type, taginfo const &info);
@@ -76,6 +76,6 @@ unsigned parse_tag_flags(std::string const &flags, int lineno);
  * Returns `true` if the 'way_area' column should (implicitly) exist, or
  * `false` if it should be suppressed.
  */
-bool read_style_file(std::string const &filename, export_list *exlist);
+bool read_style_file(std::string const &filename, export_list_t *exlist);
 
 #endif // OSM2PGSQL_TAGINFO_IMPL_HPP

src/taginfo.cpp

@@ -19,18 +19,18 @@
 
 #include <osmium/util/string.hpp>
 
-void export_list::add(osmium::item_type type, taginfo const &info)
+void export_list_t::add(osmium::item_type type, taginfo const &info)
 {
     m_export_list(type).push_back(info);
 }
 
 std::vector<taginfo> const &
-export_list::get(osmium::item_type type) const noexcept
+export_list_t::get(osmium::item_type type) const noexcept
 {
     return m_export_list(type);
 }
 
-columns_t export_list::normal_columns(osmium::item_type type) const
+columns_t export_list_t::normal_columns(osmium::item_type type) const
 {
     columns_t columns;
 
@@ -89,7 +89,7 @@ unsigned get_tag_type(std::string const &tag)
 
 // NOLINTBEGIN(cppcoreguidelines-avoid-c-arrays,hicpp-avoid-c-arrays,modernize-avoid-c-arrays)
 // This is legacy code which will be removed anyway.
-bool read_style_file(std::string const &filename, export_list *exlist)
+bool read_style_file(std::string const &filename, export_list_t *exlist)
 {
     bool enable_way_area = true;
 

src/tagtransform-c.cpp

@@ -96,7 +96,8 @@ bool starts_with(char const *input, std::string const &test) noexcept
 
 } // anonymous namespace
 
-c_tagtransform_t::c_tagtransform_t(options_t const *options, export_list exlist)
+c_tagtransform_t::c_tagtransform_t(options_t const *options,
+                                   export_list_t exlist)
 : m_options(options), m_export_list(std::move(exlist))
 {}
 

src/tagtransform-c.hpp

@@ -16,7 +16,7 @@
 class c_tagtransform_t : public tagtransform_t
 {
 public:
-    c_tagtransform_t(options_t const *options, export_list exlist);
+    c_tagtransform_t(options_t const *options, export_list_t exlist);
 
     std::unique_ptr<tagtransform_t> clone() const override;
 
@@ -34,7 +34,7 @@ class c_tagtransform_t : public tagtransform_t
                    bool *filter, unsigned int *flags);
 
     options_t const *m_options;
-    export_list m_export_list;
+    export_list_t m_export_list;
 };
 
 #endif // OSM2PGSQL_TAGTRANSFORM_C_HPP

src/tagtransform.cpp

@@ -19,7 +19,7 @@
 
 std::unique_ptr<tagtransform_t>
 tagtransform_t::make_tagtransform(options_t const *options,
-                                  export_list const &exlist)
+                                  export_list_t const &exlist)
 {
     if (!options->tag_transform_script.empty()) {
         log_debug("Using lua based tag transformations with script {}",

src/tagtransform.hpp

@@ -16,14 +16,14 @@
 
 #include "osmtypes.hpp"
 
-class export_list;
+class export_list_t;
 struct options_t;
 
 class tagtransform_t
 {
 public:
     static std::unique_ptr<tagtransform_t>
-    make_tagtransform(options_t const *options, export_list const &exlist);
+    make_tagtransform(options_t const *options, export_list_t const &exlist);
 
     tagtransform_t() noexcept = default;
 

tests/test-output-pgsql-style-file.cpp

@@ -14,7 +14,7 @@
 
 TEST_CASE("Parse default style file")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "default.style", &exlist);
 
@@ -26,7 +26,7 @@ TEST_CASE("Parse default style file")
 
 TEST_CASE("Parse empty style file")
 {
-    export_list exlist;
+    export_list_t exlist;
 
     REQUIRE_THROWS_WITH(
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/empty.style", &exlist),
@@ -35,15 +35,15 @@ TEST_CASE("Parse empty style file")
 
 TEST_CASE("Parse style file with invalid osm type")
 {
-    export_list exlist;
+    export_list_t exlist;
 
     REQUIRE_THROWS(read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/invalid-osm-type.style", &exlist));
 }
 
 TEST_CASE("Parse style file with comments only")
 {
-    export_list exlist;
+    export_list_t exlist;
 
     REQUIRE_THROWS_WITH(
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/comments.style",
@@ -53,7 +53,7 @@ TEST_CASE("Parse style file with comments only")
 
 TEST_CASE("Parse style file with single node entry")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/node.style", &exlist);
 
@@ -71,7 +71,7 @@ TEST_CASE("Parse style file with single node entry")
 
 TEST_CASE("Parse style file with a few valid entries")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/valid.style", &exlist);
 
@@ -109,7 +109,7 @@ TEST_CASE("Parse style file with a few valid entries")
 
 TEST_CASE("Parse style file with missing fields")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area =
         read_style_file(OSM2PGSQLDATA_DIR "tests/style/missing.style", &exlist);
 
@@ -138,7 +138,7 @@ TEST_CASE("Parse style file with missing fields")
 
 TEST_CASE("Parse style file with way_area")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area = read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/way-area.style", &exlist);
 
@@ -168,7 +168,7 @@ TEST_CASE("Parse style file with way_area")
 
 TEST_CASE("Parse style file with different data types")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area = read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/data-types.style", &exlist);
 
@@ -211,7 +211,7 @@ TEST_CASE("Parse style file with different data types")
 
 TEST_CASE("Parse style file with invalid data types")
 {
-    export_list exlist;
+    export_list_t exlist;
     auto const enable_way_area = read_style_file(
         OSM2PGSQLDATA_DIR "tests/style/invalid-data-type.style", &exlist);