Merge pull request #2388 from joto/cleanup-naming

Cleanup naming and formatting

Author: lonvia

.clang-format

@@ -1,9 +1,10 @@
 ---
-Language:        Cpp
-BasedOnStyle:  LLVM
+Language: Cpp
+BasedOnStyle: LLVM
 AccessModifierOffset: -4
 BreakBeforeBraces: Mozilla
-IndentWidth:     4
+IndentWidth: 4
 ConstructorInitializerIndentWidth: 0
 ReflowComments: false
 AlwaysBreakTemplateDeclarations: true
+QualifierAlignment: Right

src/command-line-parser.cpp

@@ -225,7 +225,8 @@ void check_options(options_t *options)
     }
 }
 
-void check_options_expire(options_t *options) {
+void check_options_expire(options_t *options)
+{
     // Zoom level 31 is the technical limit because we use 32-bit integers for
     // the x and y index of a tile ID.
     if (options->expire_tiles_zoom_min > 31) {

src/db-copy-mgr.hpp

@@ -248,7 +248,7 @@ class db_copy_mgr_t
      * following the delete_object() are inserted.
      */
     template <typename... ARGS>
-    void delete_object(ARGS &&... args)
+    void delete_object(ARGS &&...args)
     {
         assert(m_current);
         m_current.add_deletable(std::forward<ARGS>(args)...);

src/db-copy.hpp

@@ -197,7 +197,7 @@ class db_cmd_copy_delete_t : public db_cmd_copy_t
     }
 
     template <typename... ARGS>
-    void add_deletable(ARGS &&... args)
+    void add_deletable(ARGS &&...args)
     {
         m_deleter.add(std::forward<ARGS>(args)...);
     }

src/expire-tiles.cpp

@@ -177,7 +177,8 @@ void expire_tiles::from_line_segment(geom::point_t const &a,
     }
 
     double const y_len = tilec_b.y() - tilec_a.y();
-    double const hyp_len = std::sqrt(x_len * x_len + y_len * y_len); /* Pythagoras */
+    double const hyp_len =
+        std::sqrt(x_len * x_len + y_len * y_len); /* Pythagoras */
     double const x_step = x_len / hyp_len;
     double const y_step = y_len / hyp_len;
 

src/flex-index.hpp

@@ -50,10 +50,7 @@ class flex_index_t
 
     std::string const &name() const noexcept { return m_name; }
 
-    void set_name(std::string name)
-    {
-        m_name = std::move(name);
-    }
+    void set_name(std::string name) { m_name = std::move(name); }
 
     std::string const &expression() const noexcept { return m_expression; }
 

src/flex-lua-locator.cpp

@@ -140,7 +140,7 @@ int lua_wrapper_locator::all_intersecting()
     auto const names = self().all_intersecting(*geometry);
     lua_createtable(lua_state(), (int)names.size(), 0);
     int n = 0;
-    for (auto const& name : names) {
+    for (auto const &name : names) {
         lua_pushinteger(lua_state(), ++n);
         luaX_pushstring(lua_state(), name);
         lua_rawset(lua_state(), -3);

src/flex-lua-table.cpp

@@ -26,10 +26,9 @@ namespace {
 void check_tablespace(std::string const &tablespace)
 {
     if (!has_tablespace(tablespace)) {
-        throw fmt_error(
-            "Tablespace '{0}' not available."
-            " Use 'CREATE TABLESPACE \"{0}\" ...;' to create it.",
-            tablespace);
+        throw fmt_error("Tablespace '{0}' not available."
+                        " Use 'CREATE TABLESPACE \"{0}\" ...;' to create it.",
+                        tablespace);
     }
 }
 

src/flex-table.hpp

@@ -37,12 +37,13 @@
  * output. This is not a real primary key, because the values are not
  * necessarily unique.
  */
-enum class flex_table_index_type : uint8_t {
+enum class flex_table_index_type : uint8_t
+{
     no_index,
-    node, // index by node id
-    way, // index by way id
-    relation, // index by relation id
-    area, // index by way (positive) or relation (negative) id
+    node,       // index by node id
+    way,        // index by way id
+    relation,   // index by relation id
+    area,       // index by way (positive) or relation (negative) id
     any_object, // any OSM object, two columns for type and id
     tile // index by tile with x and y columns (used for generalized data)
 };
@@ -54,12 +55,12 @@ class flex_table_t
 {
 
 public:
-
     /**
      * Table creation type: interim tables are created as UNLOGGED and with
      * autovacuum disabled.
      */
-    enum class table_type : uint8_t {
+    enum class table_type : uint8_t
+    {
         interim,
         permanent
     };

src/geom-area-assembler.hpp

@@ -58,7 +58,7 @@ class area_assembler_t : public osmium::area::detail::BasicAssembler
 private:
     bool make_area();
 
-    osmium::memory::Buffer* m_buffer;
+    osmium::memory::Buffer *m_buffer;
 
 }; // class area_assembler_t