Skip to content
Permalink
Browse files

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

Fix some headers style and remove them from whitelist
  • Loading branch information...
nerzhul committed Apr 1, 2017
1 parent 63ac62e commit 987eb2b7615104f3f70e56e51f1dd3df5b2a41eb
@@ -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 @@ class KeyType {

typedef KeyType::T GameKeyType;


#endif
@@ -29,10 +29,9 @@ class ClientSimpleObject
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

@@ -30,4 +30,3 @@ class INodeDefManager;
void add_legacy_abms(ServerEnvironment *env, INodeDefManager *nodedef);

#endif

@@ -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 @@ class Database_LevelDB : public Database
#endif // USE_LEVELDB

#endif

@@ -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 @@ class Database_Redis : public Database
#endif // USE_REDIS

#endif

@@ -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 @@ class Database_SQLite3 : public Database
// 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 @@ class Database_SQLite3 : public Database
};

#endif

@@ -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 @@ class Database
};

#endif

@@ -21,22 +21,20 @@ 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
{
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;

@@ -45,19 +45,18 @@ extern u32 getTime(TimePrecision prec);
Timestamp stuff
*/

#include <time.h>
#include <string>
#include <time.h>

inline std::string getTimestamp()
{
time_t t = time(NULL);
// 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
@@ -27,4 +27,3 @@ with this program; if not, write to the Free Software Foundation, Inc.,
typedef core::aabbox3d<f32> aabb3f;

#endif

@@ -31,4 +31,3 @@ typedef core::vector2d<u32> v2u32;
typedef core::vector2d<f32> v2f32;

#endif

@@ -30,4 +30,3 @@ typedef core::vector3d<u16> v3u16;
typedef core::vector3d<s32> v3s32;

#endif

@@ -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

0 comments on commit 987eb2b

Please sign in to comment.
You can’t perform that action at this time.