Clang-format: trivial fix on some headers (#5495)

Fix some headers style and remove them from whitelist

diff --git a/src/client/keys.h b/src/client/keys.h
index 25f3e44d2ddb66cbc168dc47def8d6bfe92316cb..b446d3a1e87e5408ad19d737b1f68401d594ee9d 100644 (file)
--- a/src/client/keys.h
+++ b/src/client/keys.h
@@ -20,9 +20,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef KEYS_HEADER
 #define KEYS_HEADER
 
-#include<list>
+#include <list>
 
-class KeyType {
+class KeyType
+{
 public:
        enum T {
                // Player movement
@@ -83,5 +84,4 @@ public:
 
 typedef KeyType::T GameKeyType;
 
-
 #endif

diff --git a/src/clientsimpleobject.h b/src/clientsimpleobject.h
index c94db22f158c04c79398002aaabc3b08cb19a14f..f5b79b64f27cbf4f82c8532a177f8a77bb161538 100644 (file)
--- a/src/clientsimpleobject.h
+++ b/src/clientsimpleobject.h
@@ -29,10 +29,9 @@ protected:
 public:
        bool m_to_be_removed;
 
-       ClientSimpleObject(): m_to_be_removed(false) {}
-       virtual ~ClientSimpleObject(){}
-       virtual void step(float dtime){}
+       ClientSimpleObject() : m_to_be_removed(false) {}
+       virtual ~ClientSimpleObject() {}
+       virtual void step(float dtime) {}
 };
 
 #endif
-

diff --git a/src/content_abm.h b/src/content_abm.h
index 0a91a96a2f3a7ddb1bcfb9c8bd021b3421ff6ef8..0fb3a0413d68c1d1dbb575db25c8ac5243caaae9 100644 (file)
--- a/src/content_abm.h
+++ b/src/content_abm.h
@@ -30,4 +30,3 @@ class INodeDefManager;
 void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef);
 
 #endif
-

diff --git a/src/database-leveldb.h b/src/database-leveldb.h
index 3993db0c3ae7559b02b86ba6d7c7fd62bcb105bd..17194674131e86627f81b229a5de00879a1d66c1 100644 (file)
--- a/src/database-leveldb.h
+++ b/src/database-leveldb.h
@@ -24,9 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #if USE_LEVELDB
 
+#include <string>
 #include "database.h"
 #include "leveldb/db.h"
-#include <string>
 
 class Database_LevelDB : public Database
 {
@@ -46,4 +46,3 @@ private:
 #endif // USE_LEVELDB
 
 #endif
-

diff --git a/src/database-redis.h b/src/database-redis.h
index 3addaa20a7ad0c8e6e01fd997f03973d28353dc5..214bc8dd69e637ce544485c4db254857b0c48e70 100644 (file)
--- a/src/database-redis.h
+++ b/src/database-redis.h
@@ -24,9 +24,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #if USE_REDIS
 
-#include "database.h"
 #include <hiredis.h>
 #include <string>
+#include "database.h"
 
 class Settings;
 
@@ -52,4 +52,3 @@ private:
 #endif // USE_REDIS
 
 #endif
-

diff --git a/src/database-sqlite3.h b/src/database-sqlite3.h
index debbc9d8bfb6d5287cb5ab0812abd8b2e4bd2b36..2ab4c8ee9af8267b94e3b5b4b7ab94dba18189e3 100644 (file)
--- a/src/database-sqlite3.h
+++ b/src/database-sqlite3.h
@@ -20,11 +20,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef DATABASE_SQLITE3_HEADER
 #define DATABASE_SQLITE3_HEADER
 
-#include "database.h"
 #include <string>
+#include "database.h"
 
 extern "C" {
-       #include "sqlite3.h"
+#include "sqlite3.h"
 }
 
 class Database_SQLite3 : public Database
@@ -50,7 +50,7 @@ private:
        // Open and initialize the database if needed
        void verifyDatabase();
 
-       void bindPos(sqlite3_stmt *stmt, const v3s16 &pos, int index=1);
+       void bindPos(sqlite3_stmt *stmt, const v3s16 &pos, int index = 1);
 
        bool m_initialized;
 
@@ -70,4 +70,3 @@ private:
 };
 
 #endif
-

diff --git a/src/database.h b/src/database.h
index 45978930691013f27b25158e85e67aa916ef0236..7213f088a9fcede0cdacabe0db066762c583a824 100644 (file)
--- a/src/database.h
+++ b/src/database.h
@@ -20,8 +20,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef DATABASE_HEADER
 #define DATABASE_HEADER
 
-#include <vector>
 #include <string>
+#include <vector>
 #include "irr_v3d.h"
 #include "irrlichttypes.h"
 #include "util/basic_macros.h"
@@ -47,4 +47,3 @@ public:
 };
 
 #endif
-

diff --git a/src/filecache.h b/src/filecache.h
index a913a06ac3e60ed6e62578718478f54b7219bb80..f390f71b724977afd1fe8b01c91c13f4fc750aae 100644 (file)
--- a/src/filecache.h
+++ b/src/filecache.h
@@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef FILECACHE_HEADER
 #define FILECACHE_HEADER
 
-#include <string>
 #include <iostream>
+#include <string>
 
 class FileCache
 {
@@ -30,13 +30,11 @@ public:
        /*
                'dir' is the file cache directory to use.
        */
-       FileCache(std::string dir):
-               m_dir(dir)
-       {
-       }
-       
+       FileCache(std::string dir) : m_dir(dir) {}
+
        bool update(const std::string &name, const std::string &data);
        bool load(const std::string &name, std::ostream &os);
+
 private:
        std::string m_dir;
 

diff --git a/src/gettime.h b/src/gettime.h
index 44c1590262290546aa5b5dc2a465936856276f3c..6e70b85338b7a72b55bd20376dcef6a9a785a68c 100644 (file)
--- a/src/gettime.h
+++ b/src/gettime.h
@@ -45,8 +45,8 @@ extern u32 getTime(TimePrecision prec);
        Timestamp stuff
 */
 
-#include <time.h>
 #include <string>
+#include <time.h>
 
 inline std::string getTimestamp()
 {
@@ -54,10 +54,9 @@ inline std::string getTimestamp()
        // This is not really thread-safe but it won't break anything
        // except its own output, so just go with it.
        struct tm *tm = localtime(&t);
-       char cs[20]; //YYYY-MM-DD HH:MM:SS + '\0'
+       char cs[20]; // YYYY-MM-DD HH:MM:SS + '\0'
        strftime(cs, 20, "%Y-%m-%d %H:%M:%S", tm);
        return cs;
 }
 
-
 #endif

diff --git a/src/irr_aabb3d.h b/src/irr_aabb3d.h
index 7ac401837ef1564fd487d71413f3c1b8c534c966..4c6b3f5e6531bc0619c13076149dd8e3883ff054 100644 (file)
--- a/src/irr_aabb3d.h
+++ b/src/irr_aabb3d.h
@@ -27,4 +27,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 typedef core::aabbox3d<f32> aabb3f;
 
 #endif
-

diff --git a/src/irr_v2d.h b/src/irr_v2d.h
index 5c0d65a30877491a5607b0dbcccd4b758191f59b..617491cf070301c40c2fe22affe6c32938bb3363 100644 (file)
--- a/src/irr_v2d.h
+++ b/src/irr_v2d.h
@@ -31,4 +31,3 @@ typedef core::vector2d<u32> v2u32;
 typedef core::vector2d<f32> v2f32;
 
 #endif
-

diff --git a/src/irr_v3d.h b/src/irr_v3d.h
index f74d601e8d548036fa74fc4837eb7844474f9569..fa6af36611c79d4285ce04a3ccd80e68b8193bce 100644 (file)
--- a/src/irr_v3d.h
+++ b/src/irr_v3d.h
@@ -30,4 +30,3 @@ typedef core::vector3d<u16> v3u16;
 typedef core::vector3d<s32> v3s32;
 
 #endif
-

diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 0d99793b445c0d7010a59632b686846913750aab..352fe29734ed0deec7ba3a616db77e39514cf8f7 100644 (file)
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -23,14 +23,12 @@ src/clientiface.h
 src/client/inputhandler.h
 src/client/joystick_controller.cpp
 src/client/joystick_controller.h
-src/client/keys.h
 src/clientmap.cpp
 src/clientmap.h
 src/clientmedia.cpp
 src/clientmedia.h
 src/clientobject.cpp
 src/clientobject.h
-src/clientsimpleobject.h
 src/client/tile.cpp
 src/client/tile.h
 src/clouds.cpp
@@ -40,7 +38,6 @@ src/collision.h
 src/config.h
 src/constants.h
 src/content_abm.cpp
-src/content_abm.h
 src/content_cao.cpp
 src/content_cao.h
 src/content_cso.cpp
@@ -59,15 +56,11 @@ src/craftdef.h
 src/database.cpp
 src/database-dummy.cpp
 src/database-dummy.h
-src/database.h
 src/database-leveldb.cpp
-src/database-leveldb.h
 src/database-postgresql.cpp
 src/database-postgresql.h
 src/database-redis.cpp
-src/database-redis.h
 src/database-sqlite3.cpp
-src/database-sqlite3.h
 src/daynightratio.h
 src/debug.cpp
 src/debug.h
@@ -85,7 +78,6 @@ src/event.h
 src/event_manager.h
 src/exceptions.h
 src/filecache.cpp
-src/filecache.h
 src/filesys.cpp
 src/filesys.h
 src/fontengine.cpp
@@ -97,7 +89,6 @@ src/genericobject.cpp
 src/genericobject.h
 src/gettext.cpp
 src/gettext.h
-src/gettime.h
 src/guiChatConsole.cpp
 src/guiChatConsole.h
 src/guiEngine.cpp
@@ -129,14 +120,11 @@ src/inventory.cpp
 src/inventory.h
 src/inventorymanager.cpp
 src/inventorymanager.h
-src/irr_aabb3d.h
 src/irrlicht_changes/static_text.cpp
 src/irrlicht_changes/static_text.h
 src/irrlichttypes_bloated.h
 src/irrlichttypes_extrabloated.h
 src/irrlichttypes.h
-src/irr_v2d.h
-src/irr_v3d.h
 src/itemdef.cpp
 src/itemdef.h
 src/itemgroup.h