Fix lint since recent player to db merge

diff --git a/src/database-files.cpp b/src/database-files.cpp
index 08a1f2d0380d143eebe2e99a8ad97c8ae0f3f80b..3b130f91b88923c4837fd011ed8f2d23e7224fbd 100644 (file)
--- a/src/database-files.cpp
+++ b/src/database-files.cpp
@@ -27,8 +27,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filesys.h"
 
 // !!! WARNING !!!
-// This backend is intended to be used on Minetest 0.4.16 only for the transition backend for
-// player files
+// This backend is intended to be used on Minetest 0.4.16 only for the transition backend
+// for player files
 
 void PlayerDatabaseFiles::serialize(std::ostringstream &os, RemotePlayer *player)
 {

diff --git a/src/database-files.h b/src/database-files.h
index d23069c2a856e973d2a0331d2f1fe021dd35d34d..8883622496aa9b4b40772bac694a020c5ceeec09 100644 (file)
--- a/src/database-files.h
+++ b/src/database-files.h
@@ -21,8 +21,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define DATABASE_FILES_HEADER
 
 // !!! WARNING !!!
-// This backend is intended to be used on Minetest 0.4.16 only for the transition backend for
-// player files
+// This backend is intended to be used on Minetest 0.4.16 only for the transition backend
+// for player files
 
 #include "database.h"
 

diff --git a/src/remoteplayer.h b/src/remoteplayer.h
index ce7db56081f41a7048feac2c21ca8171482107cd..4b96835fcf8df09906da277a152a2da8dfba96b3 100644 (file)
--- a/src/remoteplayer.h
+++ b/src/remoteplayer.h
@@ -38,6 +38,7 @@ enum RemotePlayerChatResult
 class RemotePlayer : public Player
 {
        friend class PlayerDatabaseFiles;
+
 public:
        RemotePlayer(const char *name, IItemDefManager *idef);
        virtual ~RemotePlayer() {}

diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index e9ff56cf583e1895edc420e1aa74784cec0a9044..9f5612b788d0fd6062bc567e86f30cb5326d2028 100644 (file)
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -51,11 +51,13 @@ src/craftdef.cpp
 src/craftdef.h
 src/database.cpp
 src/database-dummy.cpp
+src/database-files.cpp
 src/database-leveldb.cpp
 src/database-postgresql.cpp
 src/database-postgresql.h
 src/database-redis.cpp
 src/database-sqlite3.cpp
+src/database-sqlite3.h
 src/daynightratio.h
 src/debug.cpp
 src/debug.h