Various small cleanups found by clang-tidy

Author: joto

src/expire-tiles.cpp

@@ -116,7 +116,7 @@ void expire_tiles::expire_tile(uint32_t x, uint32_t y)
     }
 }
 
-uint32_t expire_tiles::normalise_tile_x_coord(int x)
+uint32_t expire_tiles::normalise_tile_x_coord(int x) const
 {
     x %= map_width;
     if (x < 0) {

src/expire-tiles.hpp

@@ -20,9 +20,10 @@
 class reprojection;
 class table_t;
 class tile;
+
 namespace ewkb {
 class parser_t;
-}
+} // namespace ewkb
 
 /**
  * \brief Simple struct for the x and y index of a tile ID.
@@ -114,11 +115,10 @@ struct expire_tiles
          * (larger than largest possible quadkey). */
         uint64_t last_quadkey = 1ULL << (2 * maxzoom);
         std::size_t count = 0;
-        for (std::vector<uint64_t>::const_iterator it = tiles_maxzoom.cbegin();
-             it != tiles_maxzoom.cend(); ++it) {
+        for (auto const quadkey : tiles_maxzoom) {
             for (uint32_t dz = 0; dz <= maxzoom - minzoom; ++dz) {
                 // scale down to the current zoom level
-                uint64_t qt_current = *it >> (dz * 2);
+                uint64_t qt_current = quadkey >> (dz * 2);
                 /* If dz > 0, there are propably multiple elements whose quadkey
                  * is equal because they are all sub-tiles of the same tile at the current
                  * zoom level. We skip all of them after we have written the first sibling.
@@ -130,7 +130,7 @@ struct expire_tiles
                 output_writer.output_dirty_tile(xy.x, xy.y, maxzoom - dz);
                 ++count;
             }
-            last_quadkey = *it;
+            last_quadkey = quadkey;
         }
         log_info("Wrote {} entries to expired tiles list", count);
     }
@@ -178,7 +178,7 @@ struct expire_tiles
      * \param y y index of the tile to be expired.
      */
     void expire_tile(uint32_t x, uint32_t y);
-    uint32_t normalise_tile_x_coord(int x);
+    uint32_t normalise_tile_x_coord(int x) const;
     void from_line(double lon_a, double lat_a, double lon_b, double lat_b);
 
     void from_wkb_point(ewkb::parser_t *wkb);

src/geom.cpp

@@ -95,9 +95,8 @@ void split_linestring(linestring_t const &line, double split_at,
                     dist = 0;
                     prev_pt = this_pt;
                     continue;
-                } else {
-                    dist = distance(this_pt, ipoint);
                 }
+                dist = distance(this_pt, ipoint);
             } else {
                 dist += delta;
             }

src/geom.hpp

@@ -69,7 +69,7 @@ class linestring_t
 
     void add_point(osmium::geom::Coordinates coordinates)
     {
-        m_coordinates.emplace_back(std::move(coordinates));
+        m_coordinates.emplace_back(coordinates);
     }
 
     iterator begin() noexcept { return m_coordinates.begin(); }

src/osmdata.cpp

@@ -263,7 +263,7 @@ class multithreaded_processor
      * Runs in the worker threads: As long as there are any, get ids from
      * the queue and let the output process it by calling "func".
      */
-    static void run(std::shared_ptr<output_t> output, idlist_t *queue,
+    static void run(std::shared_ptr<output_t> const &output, idlist_t *queue,
                     std::mutex *mutex, output_member_fn_ptr func)
     {
         while (osmid_t const id = pop_id(queue, mutex)) {

src/osmtypes.hpp

@@ -40,7 +40,7 @@ struct member
 
     explicit operator osmium::builder::attr::member_type() const
     {
-        return osmium::builder::attr::member_type(type, id, role.c_str());
+        return {type, id, role.c_str()};
     }
 
     member(osmium::item_type t, osmid_t i, std::string r)
@@ -73,10 +73,9 @@ struct tag_t
     std::string key;
     std::string value;
 
-    operator std::pair<char const *, char const *>() const noexcept
+    explicit operator std::pair<char const *, char const *>() const noexcept
     {
-        return std::pair<char const *, char const *>(key.c_str(),
-                                                     value.c_str());
+        return {key.c_str(), value.c_str()};
     }
 
     tag_t(std::string k, std::string v) : key(std::move(k)), value(std::move(v))

src/output-flex.cpp

@@ -363,11 +363,7 @@ static bool is_lua_array(lua_State *lua_state)
 
     // An empty lua table could be both, we decide here that it is not stored
     // as a JSON array but as a JSON object.
-    if (n == 1) {
-        return false;
-    }
-
-    return true;
+    return n != 1;
 }
 
 static void write_json(json_writer_type *writer, lua_State *lua_state,

src/output.cpp

@@ -38,18 +38,21 @@ output_t::create_output(std::shared_ptr<middle_query_t> const &mid,
     if (options.output_backend == "pgsql") {
         return std::make_shared<output_pgsql_t>(mid, std::move(thread_pool),
                                                 options, copy_thread);
+    }
 
 #ifdef HAVE_LUA
-    } else if (options.output_backend == "flex") {
+    if (options.output_backend == "flex") {
         return std::make_shared<output_flex_t>(mid, std::move(thread_pool),
                                                options, copy_thread);
+    }
 #endif
 
-    } else if (options.output_backend == "gazetteer") {
+    if (options.output_backend == "gazetteer") {
         return std::make_shared<output_gazetteer_t>(mid, std::move(thread_pool),
                                                     options, copy_thread);
+    }
 
-    } else if (options.output_backend == "null") {
+    if (options.output_backend == "null") {
         return std::make_shared<output_null_t>(mid, std::move(thread_pool),
                                                options);
     }

src/reprojection-generic-proj6.cpp

@@ -97,6 +97,7 @@ class generic_reprojection_t : public reprojection
 
         auto const c_out = proj_trans(transformation, PJ_FWD, c_in);
 
+        // NOLINTNEXTLINE(cppcoreguidelines-pro-type-union-access)
         return osmium::geom::Coordinates{c_out.xy.x, c_out.xy.y};
     }
 

src/tagtransform-lua.hpp

@@ -25,7 +25,8 @@ class lua_tagtransform_t : public tagtransform_t
 
 public:
     explicit lua_tagtransform_t(options_t const *options);
-    ~lua_tagtransform_t();
+
+    ~lua_tagtransform_t() override;
 
     std::unique_ptr<tagtransform_t> clone() const override;