From 950aeffff8d641a0855fbd9a9b2993d9dfd7d2c3 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Thu, 26 Jul 2018 22:24:36 +0100 Subject: CheckBasicStyle: Check number of empty lines between functions (#4267) Add check for number of empty lines between functions and fix the corresponding failures --- src/Bindings/LuaServerHandle.cpp | 1 - src/Bindings/LuaState.cpp | 3 +-- src/Bindings/ManualBindings.cpp | 2 +- src/Bindings/ManualBindings_BlockArea.cpp | 1 - src/Bindings/ManualBindings_World.cpp | 1 - src/Bindings/Plugin.cpp | 1 + src/Bindings/PluginManager.cpp | 6 ++++++ 7 files changed, 9 insertions(+), 6 deletions(-) (limited to 'src/Bindings') diff --git a/src/Bindings/LuaServerHandle.cpp b/src/Bindings/LuaServerHandle.cpp index d32b8fe03..357d31bd5 100644 --- a/src/Bindings/LuaServerHandle.cpp +++ b/src/Bindings/LuaServerHandle.cpp @@ -22,7 +22,6 @@ cLuaServerHandle::cLuaServerHandle(UInt16 a_Port, cLuaState::cTableRefPtr && a_C - cLuaServerHandle::~cLuaServerHandle() { // If the server handle is still open, close it explicitly: diff --git a/src/Bindings/LuaState.cpp b/src/Bindings/LuaState.cpp index 0a7579ed8..7ec099982 100644 --- a/src/Bindings/LuaState.cpp +++ b/src/Bindings/LuaState.cpp @@ -50,7 +50,6 @@ extern "C" - const cLuaState::cRet cLuaState::Return = {}; const cLuaState::cNil cLuaState::Nil = {}; @@ -58,7 +57,6 @@ const cLuaState::cNil cLuaState::Nil = {}; - //////////////////////////////////////////////////////////////////////////////// // cCanonLuaStates: @@ -135,6 +133,7 @@ void cLuaStateTracker::Add(cLuaState & a_LuaState) + void cLuaStateTracker::Del(cLuaState & a_LuaState) { auto & Instance = Get(); diff --git a/src/Bindings/ManualBindings.cpp b/src/Bindings/ManualBindings.cpp index 519023fa6..90251a4b2 100644 --- a/src/Bindings/ManualBindings.cpp +++ b/src/Bindings/ManualBindings.cpp @@ -2454,6 +2454,7 @@ static int tolua_cClientHandle_IsUUIDOnline(lua_State * tolua_S) + static int tolua_cMobHeadEntity_SetOwner(lua_State * tolua_S) { // Check params: @@ -3493,7 +3494,6 @@ static int tolua_cHopperEntity_GetOutputBlockPos(lua_State * tolua_S) - static int tolua_cBoundingBox_CalcLineIntersection(lua_State * a_LuaState) { /* Function signatures: diff --git a/src/Bindings/ManualBindings_BlockArea.cpp b/src/Bindings/ManualBindings_BlockArea.cpp index 126b35386..72d9f7497 100644 --- a/src/Bindings/ManualBindings_BlockArea.cpp +++ b/src/Bindings/ManualBindings_BlockArea.cpp @@ -15,7 +15,6 @@ - /** Reads params that together form a Cuboid. These can be: - 6 numbers (MinX, MaxX, MinY, MaxY, MinZ, MaxZ) diff --git a/src/Bindings/ManualBindings_World.cpp b/src/Bindings/ManualBindings_World.cpp index e98e13c47..f5b846dde 100644 --- a/src/Bindings/ManualBindings_World.cpp +++ b/src/Bindings/ManualBindings_World.cpp @@ -620,7 +620,6 @@ static int tolua_cWorld_ScheduleTask(lua_State * tolua_S) - static int tolua_cWorld_TryGetHeight(lua_State * tolua_S) { /* Exported manually, because tolua would require the out-only param a_Height to be used when calling diff --git a/src/Bindings/Plugin.cpp b/src/Bindings/Plugin.cpp index 2f2771e38..de82fbca2 100644 --- a/src/Bindings/Plugin.cpp +++ b/src/Bindings/Plugin.cpp @@ -51,6 +51,7 @@ AString cPlugin::GetLocalFolder(void) const + void cPlugin::SetLoadError(const AString & a_LoadError) { m_Status = cPluginManager::psError; diff --git a/src/Bindings/PluginManager.cpp b/src/Bindings/PluginManager.cpp index 4cbc36767..257ad7c07 100644 --- a/src/Bindings/PluginManager.cpp +++ b/src/Bindings/PluginManager.cpp @@ -479,6 +479,7 @@ bool cPluginManager::CallHookEntityTeleport(cEntity & a_Entity, const Vector3d & + bool cPluginManager::CallHookEntityChangingWorld(cEntity & a_Entity, cWorld & a_World) { return GenericCallHook(HOOK_ENTITY_CHANGING_WORLD, [&](cPlugin * a_Plugin) @@ -491,6 +492,7 @@ bool cPluginManager::CallHookEntityChangingWorld(cEntity & a_Entity, cWorld & a_ + bool cPluginManager::CallHookEntityChangedWorld(cEntity & a_Entity, cWorld & a_World) { return GenericCallHook(HOOK_ENTITY_CHANGED_WORLD, [&](cPlugin * a_Plugin) @@ -503,6 +505,7 @@ bool cPluginManager::CallHookEntityChangedWorld(cEntity & a_Entity, cWorld & a_W + bool cPluginManager::CallHookExecuteCommand(cPlayer * a_Player, const AStringVector & a_Split, const AString & a_EntireCommand, CommandResult & a_Result) { // Output the command being executed to log (for troubleshooting deadlocks-in-commands): @@ -643,6 +646,7 @@ bool cPluginManager::CallHookLogin(cClientHandle & a_Client, UInt32 a_ProtocolVe + bool cPluginManager::CallHookLoginForge(cClientHandle & a_Client, AStringMap & a_Mods) { return GenericCallHook(HOOK_LOGIN_FORGE, [&](cPlugin * a_Plugin) @@ -1068,6 +1072,7 @@ bool cPluginManager::CallHookSpawnedEntity(cWorld & a_World, cEntity & a_Entity) + bool cPluginManager::CallHookSpawnedMonster(cWorld & a_World, cMonster & a_Monster) { return GenericCallHook(HOOK_SPAWNED_MONSTER, [&](cPlugin * a_Plugin) @@ -1080,6 +1085,7 @@ bool cPluginManager::CallHookSpawnedMonster(cWorld & a_World, cMonster & a_Monst + bool cPluginManager::CallHookSpawningEntity(cWorld & a_World, cEntity & a_Entity) { return GenericCallHook(HOOK_SPAWNING_ENTITY, [&](cPlugin * a_Plugin) -- cgit v1.2.3