LINT: Add files to whitelist, fix detected indent errors

diff --git a/src/client/render/core.cpp b/src/client/render/core.cpp
index 7a4230c846b05456a4c5c6e6ce0fb75b12a774d4..89b7371f1e128323c77ca9ff0bed64cd24c652b0 100644 (file)
--- a/src/client/render/core.cpp
+++ b/src/client/render/core.cpp
@@ -26,9 +26,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "minimap.h"
 
 RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud)
-    : device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()),
-      guienv(device->getGUIEnvironment()), client(_client), camera(client->getCamera()),
-      mapper(client->getMinimap()), hud(_hud)
+       : device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()),
+       guienv(device->getGUIEnvironment()), client(_client), camera(client->getCamera()),
+       mapper(client->getMinimap()), hud(_hud)
 {
        screensize = driver->getScreenSize();
        virtual_size = screensize;

diff --git a/src/client/render/interlaced.cpp b/src/client/render/interlaced.cpp
index ccd4e60cfe37799a229967d5e08c5de13384c756..aac9284751a3c3838ec253abe126a42be5d023e8 100644 (file)
--- a/src/client/render/interlaced.cpp
+++ b/src/client/render/interlaced.cpp
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "client/tile.h"
 
 RenderingCoreInterlaced::RenderingCoreInterlaced(
-               IrrlichtDevice *_device, Client *_client, Hud *_hud)
-    : RenderingCoreStereo(_device, _client, _hud)
+       IrrlichtDevice *_device, Client *_client, Hud *_hud)
+       : RenderingCoreStereo(_device, _client, _hud)
 {
        initMaterial();
 }

diff --git a/src/client/render/plain.cpp b/src/client/render/plain.cpp
index 94921245b38e910db36903b36750c35f32019c43..cb87c6b30a79e9bb412782965709d8d5e272d39a 100644 (file)
--- a/src/client/render/plain.cpp
+++ b/src/client/render/plain.cpp
@@ -27,8 +27,8 @@ inline u32 scaledown(u32 coef, u32 size)
 }
 
 RenderingCorePlain::RenderingCorePlain(
-               IrrlichtDevice *_device, Client *_client, Hud *_hud)
-    : RenderingCore(_device, _client, _hud)
+       IrrlichtDevice *_device, Client *_client, Hud *_hud)
+       : RenderingCore(_device, _client, _hud)
 {
        scale = g_settings->getU16("undersampling");
 }

diff --git a/src/client/render/sidebyside.cpp b/src/client/render/sidebyside.cpp
index 2af09ee33ab92a0376d7ff086ba321950b0ff54c..d2c1717947c065ae9d0b913d0d0fd460f42b0a76 100644 (file)
--- a/src/client/render/sidebyside.cpp
+++ b/src/client/render/sidebyside.cpp
@@ -23,8 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "hud.h"
 
 RenderingCoreSideBySide::RenderingCoreSideBySide(
-               IrrlichtDevice *_device, Client *_client, Hud *_hud, bool _horizontal)
-    : RenderingCoreStereo(_device, _client, _hud), horizontal(_horizontal)
+       IrrlichtDevice *_device, Client *_client, Hud *_hud, bool _horizontal)
+       : RenderingCoreStereo(_device, _client, _hud), horizontal(_horizontal)
 {
 }
 

diff --git a/src/client/render/stereo.cpp b/src/client/render/stereo.cpp
index eec9f8ced94a6c4a91ac231a7f285fa34ea627ce..1fa72d0fa76148ae951c6587bf0536c3e8339136 100644 (file)
--- a/src/client/render/stereo.cpp
+++ b/src/client/render/stereo.cpp
@@ -24,8 +24,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 
 RenderingCoreStereo::RenderingCoreStereo(
-               IrrlichtDevice *_device, Client *_client, Hud *_hud)
-    : RenderingCore(_device, _client, _hud)
+       IrrlichtDevice *_device, Client *_client, Hud *_hud)
+       : RenderingCore(_device, _client, _hud)
 {
        eye_offset = BS * g_settings->getFloat("3d_paralax_strength");
 }

diff --git a/util/travis/clang-format-whitelist.txt b/util/travis/clang-format-whitelist.txt
index 3fb9da1412c0f7a8afd028a43037a081597d7725..f86d7ecb3c6041245660752f60b9ff868f5cbf95 100644 (file)
--- a/util/travis/clang-format-whitelist.txt
+++ b/util/travis/clang-format-whitelist.txt
@@ -3,26 +3,32 @@ src/ban.cpp
 src/camera.cpp
 src/camera.h
 src/cavegen.cpp
+src/cavegen.h
 src/chat.cpp
 src/chat.h
 src/chat_interface.h
-src/client/clientlauncher.cpp
-src/client/clientlauncher.h
 src/client.cpp
+src/client.h
 src/clientenvironment.cpp
 src/clientenvironment.h
-src/client.h
 src/clientiface.cpp
 src/clientiface.h
-src/client/joystick_controller.cpp
-src/client/joystick_controller.h
-src/client/renderingengine.cpp
 src/clientmap.cpp
 src/clientmap.h
 src/clientmedia.cpp
 src/clientmedia.h
 src/clientobject.cpp
 src/clientobject.h
+src/client/clientlauncher.cpp
+src/client/clientlauncher.h
+src/client/joystick_controller.cpp
+src/client/joystick_controller.h
+src/client/renderingengine.cpp
+src/client/render/core.cpp
+src/client/render/interlaced.cpp
+src/client/render/plain.cpp
+src/client/render/sidebyside.cpp
+src/client/render/stereo.cpp
 src/client/tile.cpp
 src/client/tile.h
 src/clouds.cpp
@@ -74,8 +80,8 @@ src/filesys.h
 src/fontengine.cpp
 src/fontengine.h
 src/game.cpp
-src/gamedef.h
 src/game.h
+src/gamedef.h
 src/genericobject.cpp
 src/genericobject.h
 src/gettext.cpp
@@ -131,21 +137,25 @@ src/mapblock.h
 src/mapblock_mesh.cpp
 src/mapblock_mesh.h
 src/map.cpp
+src/map.h
 src/mapgen.cpp
+src/mapgen.h
 src/mapgen_carpathian.cpp
 src/mapgen_carpathian.h
 src/mapgen_flat.cpp
+src/mapgen_flat.h
 src/mapgen_fractal.cpp
-src/mapgen.h
+src/mapgen_fractal.h
 src/mapgen_singlenode.cpp
+src/mapgen_singlenode.h
 src/mapgen_v5.cpp
+src/mapgen_v5.h
 src/mapgen_v6.cpp
 src/mapgen_v6.h
 src/mapgen_v7.cpp
 src/mapgen_v7.h
 src/mapgen_valleys.cpp
 src/mapgen_valleys.h
-src/map.h
 src/mapnode.cpp
 src/mapnode.h
 src/mapsector.cpp
@@ -267,6 +277,7 @@ src/script/lua_api/l_localplayer.cpp
 src/script/lua_api/l_mainmenu.cpp
 src/script/lua_api/l_mainmenu.h
 src/script/lua_api/l_mapgen.cpp
+src/script/lua_api/l_mapgen.h
 src/script/lua_api/l_metadata.cpp
 src/script/lua_api/l_minimap.cpp
 src/script/lua_api/l_nodemeta.cpp
@@ -294,9 +305,11 @@ src/script/scripting_server.h
 src/serialization.cpp
 src/serialization.h
 src/server.cpp
+src/server.h
+src/serveractiveobjectmap.cpp
+src/serveractiveobjectmap.h
 src/serverenvironment.cpp
 src/serverenvironment.h
-src/server.h
 src/serverlist.cpp
 src/serverlist.h
 src/serverobject.cpp
@@ -332,13 +345,13 @@ src/touchscreengui.cpp
 src/translation.cpp
 src/treegen.cpp
 src/treegen.h
+src/unittest/test.cpp
+src/unittest/test.h
 src/unittest/test_areastore.cpp
 src/unittest/test_collision.cpp
 src/unittest/test_compression.cpp
 src/unittest/test_connection.cpp
-src/unittest/test.cpp
 src/unittest/test_filepath.cpp
-src/unittest/test.h
 src/unittest/test_inventory.cpp
 src/unittest/test_keycode.cpp
 src/unittest/test_map_settings_manager.cpp