diff --git a/AI/EmptyAI/StdInc.cpp b/AI/EmptyAI/StdInc.cpp index dd7f66cb8..277dd9af0 100644 --- a/AI/EmptyAI/StdInc.cpp +++ b/AI/EmptyAI/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" diff --git a/AI/EmptyAI/StdInc.h b/AI/EmptyAI/StdInc.h index 020481377..595b4be08 100644 --- a/AI/EmptyAI/StdInc.h +++ b/AI/EmptyAI/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../../Global.h" diff --git a/AI/Nullkiller/Goals/Build.cpp b/AI/Nullkiller/Goals/Build.cpp index f5180e491..3a6b1438b 100644 --- a/AI/Nullkiller/Goals/Build.cpp +++ b/AI/Nullkiller/Goals/Build.cpp @@ -1,6 +1,3 @@ -namespace Nullkiller -{ - /* * Build.cpp, part of VCMI engine * @@ -23,6 +20,8 @@ namespace Nullkiller #include "../../../lib/CPathfinder.h" #include "../../../lib/StringConstants.h" +namespace Nullkiller +{ extern boost::thread_specific_ptr cb; extern boost::thread_specific_ptr ai; diff --git a/AI/Nullkiller/Goals/Build.h b/AI/Nullkiller/Goals/Build.h index cb69dc9b1..fb6e39fbe 100644 --- a/AI/Nullkiller/Goals/Build.h +++ b/AI/Nullkiller/Goals/Build.h @@ -1,6 +1,3 @@ -namespace Nullkiller -{ - /* * Build.h, part of VCMI engine * @@ -14,6 +11,9 @@ namespace Nullkiller #include "CGoal.h" +namespace Nullkiller +{ + struct HeroPtr; class AIGateway; class FuzzyHelper; diff --git a/AI/Nullkiller/Goals/GatherArmy.cpp b/AI/Nullkiller/Goals/GatherArmy.cpp index 4551e322f..1827cbaab 100644 --- a/AI/Nullkiller/Goals/GatherArmy.cpp +++ b/AI/Nullkiller/Goals/GatherArmy.cpp @@ -1,6 +1,3 @@ -namespace Nullkiller -{ - /* * GatherArmy.cpp, part of VCMI engine * @@ -22,6 +19,8 @@ namespace Nullkiller #include "../../../lib/CPathfinder.h" #include "../../../lib/StringConstants.h" +namespace Nullkiller +{ extern boost::thread_specific_ptr cb; extern boost::thread_specific_ptr ai; diff --git a/AI/Nullkiller/Goals/GatherArmy.h b/AI/Nullkiller/Goals/GatherArmy.h index 804a159c3..313f376d5 100644 --- a/AI/Nullkiller/Goals/GatherArmy.h +++ b/AI/Nullkiller/Goals/GatherArmy.h @@ -1,6 +1,3 @@ -namespace Nullkiller -{ - /* * GatherArmy.h, part of VCMI engine * @@ -14,6 +11,9 @@ namespace Nullkiller #include "CGoal.h" +namespace Nullkiller +{ + struct HeroPtr; class AIGateway; class FuzzyHelper; diff --git a/AI/Nullkiller/StdInc.cpp b/AI/Nullkiller/StdInc.cpp index 6237e6e6f..349697611 100644 --- a/AI/Nullkiller/StdInc.cpp +++ b/AI/Nullkiller/StdInc.cpp @@ -1 +1,10 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" diff --git a/AI/Nullkiller/StdInc.h b/AI/Nullkiller/StdInc.h index 50855f6e5..c444578e2 100644 --- a/AI/Nullkiller/StdInc.h +++ b/AI/Nullkiller/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../../Global.h" VCMI_LIB_USING_NAMESPACE diff --git a/AI/StupidAI/StdInc.cpp b/AI/StupidAI/StdInc.cpp index dd7f66cb8..277dd9af0 100644 --- a/AI/StupidAI/StdInc.cpp +++ b/AI/StupidAI/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" diff --git a/AI/StupidAI/StdInc.h b/AI/StupidAI/StdInc.h index 020481377..595b4be08 100644 --- a/AI/StupidAI/StdInc.h +++ b/AI/StupidAI/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../../Global.h" diff --git a/AI/VCAI/AIhelper.cpp b/AI/VCAI/AIhelper.cpp index 60c769445..4413f7a79 100644 --- a/AI/VCAI/AIhelper.cpp +++ b/AI/VCAI/AIhelper.cpp @@ -1,5 +1,5 @@ /* -* AIhelper.h, part of VCMI engine +* AIhelper.cpp, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * diff --git a/AI/VCAI/MapObjectsEvaluator.cpp b/AI/VCAI/MapObjectsEvaluator.cpp index fc7c575c2..3d6382559 100644 --- a/AI/VCAI/MapObjectsEvaluator.cpp +++ b/AI/VCAI/MapObjectsEvaluator.cpp @@ -1,3 +1,12 @@ +/* + * MapObjectsEvaluator.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" #include "MapObjectsEvaluator.h" #include "../../lib/GameConstants.h" diff --git a/AI/VCAI/StdInc.cpp b/AI/VCAI/StdInc.cpp index 6237e6e6f..349697611 100644 --- a/AI/VCAI/StdInc.cpp +++ b/AI/VCAI/StdInc.cpp @@ -1 +1,10 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" diff --git a/AI/VCAI/StdInc.h b/AI/VCAI/StdInc.h index 0c0f05a6b..1673fa5df 100644 --- a/AI/VCAI/StdInc.h +++ b/AI/VCAI/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../../Global.h" diff --git a/client/CFocusableHelper.cpp b/client/CFocusableHelper.cpp index c668f825b..383551346 100644 --- a/client/CFocusableHelper.cpp +++ b/client/CFocusableHelper.cpp @@ -7,9 +7,9 @@ * Full text of license available in license.txt file, in main folder * */ +#include "StdInc.h" #include "CFocusableHelper.h" #include "../Global.h" -#include "StdInc.h" #include "widgets/TextControls.h" void removeFocusFromActiveInput() diff --git a/client/CFocusableHelper.h b/client/CFocusableHelper.h index 6ee0927a3..547ca396f 100644 --- a/client/CFocusableHelper.h +++ b/client/CFocusableHelper.h @@ -7,5 +7,6 @@ * Full text of license available in license.txt file, in main folder * */ +#pragma once void removeFocusFromActiveInput(); diff --git a/client/Client.cpp b/client/Client.cpp index ee14b9dae..d34b904c3 100644 --- a/client/Client.cpp +++ b/client/Client.cpp @@ -7,8 +7,8 @@ * Full text of license available in license.txt file, in main folder * */ -#include "Global.h" #include "StdInc.h" +#include "Global.h" #include "Client.h" #include "CGameInfo.h" diff --git a/client/StdInc.cpp b/client/StdInc.cpp index c17377322..b419d2697 100644 --- a/client/StdInc.cpp +++ b/client/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" \ No newline at end of file diff --git a/client/StdInc.h b/client/StdInc.h index 90fdbd301..ec5a30d9d 100644 --- a/client/StdInc.h +++ b/client/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../Global.h" diff --git a/client/gui/FramerateManager.cpp b/client/gui/FramerateManager.cpp index cc6b7d64c..6c785ed1f 100644 --- a/client/gui/FramerateManager.cpp +++ b/client/gui/FramerateManager.cpp @@ -1,5 +1,5 @@ /* - * FramerateManager.h, part of VCMI engine + * FramerateManager.cpp, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * diff --git a/client/ios/GameChatKeyboardHandler.h b/client/ios/GameChatKeyboardHandler.h index 6d8f23c87..d0de6cec8 100644 --- a/client/ios/GameChatKeyboardHandler.h +++ b/client/ios/GameChatKeyboardHandler.h @@ -7,6 +7,7 @@ * Full text of license available in license.txt file, in main folder * */ +#pragma once #import diff --git a/client/ios/startSDL.mm b/client/ios/startSDL.mm index 0b3b8028e..46563017d 100644 --- a/client/ios/startSDL.mm +++ b/client/ios/startSDL.mm @@ -7,8 +7,8 @@ * Full text of license available in license.txt file, in main folder * */ -#import "startSDL.h" #include "StdInc.h" +#import "startSDL.h" #import "GameChatKeyboardHandler.h" #include "../Global.h" diff --git a/client/render/Colors.h b/client/render/Colors.h index 7d890bc7e..ef046bd8f 100644 --- a/client/render/Colors.h +++ b/client/render/Colors.h @@ -1,5 +1,5 @@ /* - * ICursor.h, part of VCMI engine + * Colors.h, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * diff --git a/client/widgets/CExchangeController.h b/client/widgets/CExchangeController.h index 928725f1b..e5aa53b8c 100644 --- a/client/widgets/CExchangeController.h +++ b/client/widgets/CExchangeController.h @@ -7,10 +7,10 @@ * Full text of license available in license.txt file, in main folder * */ - #pragma once +#pragma once - #include "../windows/CWindowObject.h" - #include "CWindowWithArtifacts.h" +#include "../windows/CWindowObject.h" +#include "CWindowWithArtifacts.h" class CCallback; diff --git a/launcher/StdInc.cpp b/launcher/StdInc.cpp index 6237e6e6f..349697611 100644 --- a/launcher/StdInc.cpp +++ b/launcher/StdInc.cpp @@ -1 +1,10 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" diff --git a/launcher/StdInc.h b/launcher/StdInc.h index def7e8ba4..2d2eadc9f 100644 --- a/launcher/StdInc.h +++ b/launcher/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../Global.h" diff --git a/launcher/modManager/cmodlist.h b/launcher/modManager/cmodlist.h index 05aaa4f6b..b786b8a01 100644 --- a/launcher/modManager/cmodlist.h +++ b/launcher/modManager/cmodlist.h @@ -9,18 +9,10 @@ */ #pragma once -#include "StdInc.h" - #include #include #include -VCMI_LIB_NAMESPACE_BEGIN - -class JsonNode; - -VCMI_LIB_NAMESPACE_END - namespace ModStatus { enum EModStatus diff --git a/launcher/modManager/imageviewer_moc.h b/launcher/modManager/imageviewer_moc.h index 5c0c1e674..11394e4de 100644 --- a/launcher/modManager/imageviewer_moc.h +++ b/launcher/modManager/imageviewer_moc.h @@ -7,8 +7,7 @@ * Full text of license available in license.txt file, in main folder * */ -#ifndef IMAGEVIEWER_H -#define IMAGEVIEWER_H +#pragma once #include @@ -38,5 +37,3 @@ protected: private: Ui::ImageViewer * ui; }; - -#endif // IMAGEVIEWER_H diff --git a/lib/StdInc.cpp b/lib/StdInc.cpp index dd7f66cb8..277dd9af0 100644 --- a/lib/StdInc.cpp +++ b/lib/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" diff --git a/lib/StdInc.h b/lib/StdInc.h index 82dfac8ad..0c2379a85 100644 --- a/lib/StdInc.h +++ b/lib/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../Global.h" diff --git a/lib/battle/PossiblePlayerBattleAction.h b/lib/battle/PossiblePlayerBattleAction.h index db5249567..401c18d00 100644 --- a/lib/battle/PossiblePlayerBattleAction.h +++ b/lib/battle/PossiblePlayerBattleAction.h @@ -1,5 +1,5 @@ /* - * CBattleInfoCallback.h, part of VCMI engine + * PossiblePlayerBattleAction.h, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * @@ -7,6 +7,7 @@ * Full text of license available in license.txt file, in main folder * */ +#pragma once #include "../GameConstants.h" diff --git a/lib/bonuses/IBonusBearer.h b/lib/bonuses/IBonusBearer.h index cae96f06a..559752a69 100644 --- a/lib/bonuses/IBonusBearer.h +++ b/lib/bonuses/IBonusBearer.h @@ -1,4 +1,3 @@ - /* * IBonusBearer.h, part of VCMI engine * diff --git a/lib/modding/CModVersion.cpp b/lib/modding/CModVersion.cpp index 3ed3640a8..ab8a8e55e 100644 --- a/lib/modding/CModVersion.cpp +++ b/lib/modding/CModVersion.cpp @@ -1,5 +1,5 @@ /* - * CModVersion.h, part of VCMI engine + * CModVersion.cpp, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * diff --git a/lib/spells/ObstacleCasterProxy.h b/lib/spells/ObstacleCasterProxy.h index cd1c540d5..890264d5e 100644 --- a/lib/spells/ObstacleCasterProxy.h +++ b/lib/spells/ObstacleCasterProxy.h @@ -7,6 +7,7 @@ * Full text of license available in license.txt file, in main folder * */ +#pragma once #include "ProxyCaster.h" #include "../battle/BattleHex.h" diff --git a/lib/spells/ViewSpellInt.h b/lib/spells/ViewSpellInt.h index a4c589daa..3fbc21064 100644 --- a/lib/spells/ViewSpellInt.h +++ b/lib/spells/ViewSpellInt.h @@ -8,10 +8,10 @@ * */ - #pragma once +#pragma once - #include "../int3.h" - #include "../GameConstants.h" +#include "../int3.h" +#include "../GameConstants.h" VCMI_LIB_NAMESPACE_BEGIN diff --git a/lib/vstd/DateUtils.cpp b/lib/vstd/DateUtils.cpp index a9800ab3d..f2f202522 100644 --- a/lib/vstd/DateUtils.cpp +++ b/lib/vstd/DateUtils.cpp @@ -1,3 +1,12 @@ +/* + * DateUtils.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" #include diff --git a/lib/vstd/StringUtils.cpp b/lib/vstd/StringUtils.cpp index 3d86609f8..9202ee35e 100644 --- a/lib/vstd/StringUtils.cpp +++ b/lib/vstd/StringUtils.cpp @@ -1,3 +1,12 @@ +/* + * StringUtils.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" #include diff --git a/lobby/StdInc.cpp b/lobby/StdInc.cpp index dd7f66cb8..277dd9af0 100644 --- a/lobby/StdInc.cpp +++ b/lobby/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" diff --git a/mapeditor/StdInc.cpp b/mapeditor/StdInc.cpp index 6237e6e6f..349697611 100644 --- a/mapeditor/StdInc.cpp +++ b/mapeditor/StdInc.cpp @@ -1 +1,10 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" diff --git a/mapeditor/StdInc.h b/mapeditor/StdInc.h index f877c4191..9f51e8a29 100644 --- a/mapeditor/StdInc.h +++ b/mapeditor/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../Global.h" diff --git a/mapeditor/main.cpp b/mapeditor/main.cpp index 1d44c5f72..1b6914b24 100644 --- a/mapeditor/main.cpp +++ b/mapeditor/main.cpp @@ -7,8 +7,8 @@ * Full text of license available in license.txt file, in main folder * */ -#include #include "StdInc.h" +#include #include "mainwindow.h" int main(int argc, char * argv[]) diff --git a/mapeditor/mapsettings/victoryconditions.cpp b/mapeditor/mapsettings/victoryconditions.cpp index 5b4efe9e6..dff348fea 100644 --- a/mapeditor/mapsettings/victoryconditions.cpp +++ b/mapeditor/mapsettings/victoryconditions.cpp @@ -1,5 +1,5 @@ /* - * victoryconditions.h, part of VCMI engine + * victoryconditions.cpp, part of VCMI engine * * Authors: listed in file AUTHORS in main folder * diff --git a/scripting/erm/StdInc.cpp b/scripting/erm/StdInc.cpp index c17377322..b419d2697 100644 --- a/scripting/erm/StdInc.cpp +++ b/scripting/erm/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" \ No newline at end of file diff --git a/scripting/erm/StdInc.h b/scripting/erm/StdInc.h index 020481377..595b4be08 100644 --- a/scripting/erm/StdInc.h +++ b/scripting/erm/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../../Global.h" diff --git a/scripting/lua/StdInc.cpp b/scripting/lua/StdInc.cpp index dd7f66cb8..277dd9af0 100644 --- a/scripting/lua/StdInc.cpp +++ b/scripting/lua/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" diff --git a/scripting/lua/StdInc.h b/scripting/lua/StdInc.h index f31580688..852e0bb41 100644 --- a/scripting/lua/StdInc.h +++ b/scripting/lua/StdInc.h @@ -1,3 +1,12 @@ +/* + * StdInc.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "../../Global.h" diff --git a/server/ServerSpellCastEnvironment.h b/server/ServerSpellCastEnvironment.h index 8894160d3..c6f7e124b 100644 --- a/server/ServerSpellCastEnvironment.h +++ b/server/ServerSpellCastEnvironment.h @@ -7,6 +7,7 @@ * Full text of license available in license.txt file, in main folder * */ +#pragma once #include "../lib/spells/ISpellMechanics.h" diff --git a/server/StdInc.cpp b/server/StdInc.cpp index dd7f66cb8..277dd9af0 100644 --- a/server/StdInc.cpp +++ b/server/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" diff --git a/server/battles/ServerBattleCallback.cpp b/server/battles/ServerBattleCallback.cpp deleted file mode 100644 index e69de29bb..000000000 diff --git a/server/battles/ServerBattleCallback.h b/server/battles/ServerBattleCallback.h deleted file mode 100644 index e69de29bb..000000000 diff --git a/serverapp/StdInc.cpp b/serverapp/StdInc.cpp index dd7f66cb8..277dd9af0 100644 --- a/serverapp/StdInc.cpp +++ b/serverapp/StdInc.cpp @@ -1,2 +1,11 @@ +/* + * StdInc.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ // Creates the precompiled header #include "StdInc.h" diff --git a/test/mock/ZoneOptionsFake.h b/test/mock/ZoneOptionsFake.h index e371b2519..dded9dca5 100644 --- a/test/mock/ZoneOptionsFake.h +++ b/test/mock/ZoneOptionsFake.h @@ -7,12 +7,12 @@ * Full text of license available in license.txt file, in main folder * */ +#pragma once + #include "../../../lib/mapping/CMap.h" #include "../../../lib/rmg/CMapGenOptions.h" #include "../../../lib/rmg/CMapGenerator.h" -#pragma once - class ZoneOptionsFake : public rmg::ZoneOptions { public: diff --git a/test/spells/targetConditions/SpellEffectConditionTest.cpp b/test/spells/targetConditions/SpellEffectConditionTest.cpp index af887798a..99c5ef554 100644 --- a/test/spells/targetConditions/SpellEffectConditionTest.cpp +++ b/test/spells/targetConditions/SpellEffectConditionTest.cpp @@ -9,8 +9,6 @@ */ #include "StdInc.h" -#include "StdInc.h" - #include "TargetConditionItemFixture.h" namespace test diff --git a/test/vcai/mock_ResourceManager.cpp b/test/vcai/mock_ResourceManager.cpp index 8ab8db966..577a6efe4 100644 --- a/test/vcai/mock_ResourceManager.cpp +++ b/test/vcai/mock_ResourceManager.cpp @@ -1,3 +1,12 @@ +/* + * mock_ResourceManager.cpp, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #include "StdInc.h" #include "mock_ResourceManager.h" diff --git a/test/vcai/mock_ResourceManager.h b/test/vcai/mock_ResourceManager.h index f1027345f..3d5a317c8 100644 --- a/test/vcai/mock_ResourceManager.h +++ b/test/vcai/mock_ResourceManager.h @@ -1,3 +1,12 @@ +/* + * mock_ResourceManager.h, part of VCMI engine + * + * Authors: listed in file AUTHORS in main folder + * + * License: GNU General Public License v2.0 or later + * Full text of license available in license.txt file, in main folder + * + */ #pragma once #include "gtest/gtest.h"