Remove VCMI namespace macro

Removed almost all references to VCMI_NAMESPACE macro.

Kept transition macro definition in Global.h, so any upcoming PR that
creates new files won't fail due to no longer existing macro

AGENTS.md

@@ -89,16 +89,6 @@ All changes to game state must go through server via network packets. More detai
 
 See [`docs/developers/Code_Structure.md`](docs/developers/Code_Structure.md) for detailed threading information.
 
-### Namespace Wrapping (iOS/Android Considerations)
-
-On mobile systems, all binaries are built into a single executable & linked statically. The lib symbols are wrapped in a namespace to keep them isolated. This is handled by:
-
-- `VCMI_LIB_NAMESPACE_BEGIN` / `VCMI_LIB_NAMESPACE_END` macros in lib code
-- Forward declarations of lib symbols in external code must also use these macros
-- In new project parts, add `VCMI_LIB_USING_NAMESPACE` to `StdInc.h`
-
-See [`docs/developers/Code_Structure.md`](docs/developers/Code_Structure.md) for examples.
-
 ### Directory Structure
 
 - **lib/** - Core static library `vcmiMain` with core game logic and data structures.

AI/BattleAI/BattleAI.h

@@ -13,12 +13,8 @@
 #include "PossibleSpellcast.h"
 #include "PotentialTargets.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CSpell;
 
-VCMI_LIB_NAMESPACE_END
-
 /*
 struct CurrentOffensivePotential
 {

AI/BattleAI/BattleEvaluator.h

@@ -13,14 +13,10 @@
 #include "PotentialTargets.h"
 #include "BattleExchangeVariant.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CSpell;
 class CBattleCallback;
 class BattleAction;
 
-VCMI_LIB_NAMESPACE_END
-
 struct CachedAttack
 {
 	std::optional<AttackPossibility> ap;

AI/BattleAI/PossibleSpellcast.h

@@ -14,12 +14,8 @@
 
 #include "../../lib/battle/Destination.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CSpell;
 
-VCMI_LIB_NAMESPACE_END
-
 class PossibleSpellcast
 {
 public:

AI/BattleAI/StdInc.h

@@ -14,4 +14,3 @@
 
 // Here you can add specific libraries and macros which are specific to this project.
 
-VCMI_LIB_USING_NAMESPACE

AI/EmptyAI/StdInc.h

@@ -15,4 +15,3 @@
 
 // Here you can add specific libraries and macros which are specific to this project.
 
-VCMI_LIB_USING_NAMESPACE

AI/MMAI/StdInc.h

@@ -15,4 +15,3 @@
 
 // Here you can add specific libraries and macros which are specific to this project.
 
-VCMI_LIB_USING_NAMESPACE

AI/Nullkiller2/AIGateway.h

@@ -20,9 +20,7 @@
 #include "Pathfinding/AIPathfinder.h"
 #include "Engine/Nullkiller.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class AsyncRunner;
-VCMI_LIB_NAMESPACE_END
 
 namespace NK2AI
 {

AI/Nullkiller2/Engine/FuzzyHelper.h

@@ -9,11 +9,9 @@
 */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class int3;
 class CGObjectInstance;
 class CGHeroInstance;
-VCMI_LIB_NAMESPACE_END
 
 namespace NK2AI
 {

AI/Nullkiller2/Engine/Nullkiller.h

@@ -23,12 +23,8 @@
 
 #include "../../../lib/ConditionalWait.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class PathfinderCache;
 
-VCMI_LIB_NAMESPACE_END
-
 namespace NK2AI
 {
 

AI/Nullkiller2/Engine/PriorityEvaluator.h

@@ -11,10 +11,6 @@
 #include "../Goals/CGoal.h"
 #include "../Pathfinding/AIPathfinder.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
-VCMI_LIB_NAMESPACE_END
-
 namespace NK2AI
 {
 

AI/Nullkiller2/Engine/Settings.h

@@ -9,13 +9,9 @@
 */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class JsonNode;
 class ResourcePath;
 
-VCMI_LIB_NAMESPACE_END
-
 namespace NK2AI
 {
 	class Settings

AI/Nullkiller2/Helpers/ExplorationHelper.h

@@ -15,10 +15,8 @@
 #include "../../../lib/GameLibrary.h"
 #include "../Goals/AbstractGoal.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CSpell;
 class DimensionDoorEffect;
-VCMI_LIB_NAMESPACE_END
 
 namespace NK2AI
 {

AI/Nullkiller2/Pathfinding/AINodeStorage.h

@@ -20,10 +20,8 @@
 constexpr int NK2AI_GRAPH_TRACE_LEVEL = 0; // To actually enable graph visualization, enter `/vslog graph` in game chat
 #define NK2AI_TRACE_LEVEL 0
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CSpell;
 class DimensionDoorEffect;
-VCMI_LIB_NAMESPACE_END
 
 namespace NK2AI
 {

AI/Nullkiller2/Pathfinding/Actions/DimensionDoorAction.h

@@ -12,9 +12,7 @@
 
 #include "SpecialAction.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CSpell;
-VCMI_LIB_NAMESPACE_END
 
 namespace NK2AI::AIPathfinding
 {

AI/Nullkiller2/Pathfinding/Actions/SpecialAction.h

@@ -13,10 +13,8 @@
 #include "../../AIUtility.h"
 #include "../../Goals/AbstractGoal.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct PathNodeInfo;
 struct CDestinationNodeInfo;
-VCMI_LIB_NAMESPACE_END
 
 namespace NK2AI
 {

AI/Nullkiller2/StdInc.h

@@ -9,4 +9,3 @@
  */
 #pragma  once
 #include "../../Global.h"
-VCMI_LIB_USING_NAMESPACE

AI/StupidAI/StdInc.h

@@ -15,4 +15,3 @@
 
 // Here you can add specific libraries and macros which are specific to this project.
 
-VCMI_LIB_USING_NAMESPACE

Global.h

@@ -228,26 +228,18 @@ typedef int8_t si8; //signed int 8 bits (1 byte)
 #endif
 #endif // VCMI_IOS
 
-// single-process build makes 2 copies of the main lib by wrapping it in a namespace
-#ifdef VCMI_LIB_NAMESPACE
-#define VCMI_LIB_NAMESPACE_BEGIN namespace VCMI_LIB_NAMESPACE {
-#define VCMI_LIB_NAMESPACE_END }
-#define VCMI_LIB_USING_NAMESPACE using namespace VCMI_LIB_NAMESPACE;
-#define VCMI_LIB_WRAP_NAMESPACE(x) VCMI_LIB_NAMESPACE::x
-#else
+// Transition no-op macros: VCMI_LIB_NAMESPACE_* were removed from the codebase,
+// these stubs keep code from not-yet-merged branches compiling. Remove once stale.
 #define VCMI_LIB_NAMESPACE_BEGIN
 #define VCMI_LIB_NAMESPACE_END
 #define VCMI_LIB_USING_NAMESPACE
 #define VCMI_LIB_WRAP_NAMESPACE(x) ::x
-#endif
 
 /* ---------------------------------------------------------------------------- */
 /* VCMI standard library */
 /* ---------------------------------------------------------------------------- */
 #include <vstd/CLoggerBase.h>
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 namespace vstd
 {
 	// combine hashes. Present in boost but not in std
@@ -744,5 +736,3 @@ namespace vstd
 	}
 }
 using vstd::operator-=;
-
-VCMI_LIB_NAMESPACE_END

Version.cpp.in

@@ -9,8 +9,6 @@
  */
 #include "Version.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 namespace GameConstants
 {
 extern const char GIT_SHA1[] = "@GIT_SHA1@";
@@ -18,5 +16,3 @@ extern const char VCMI_VERSION[] = "@VCMI_VERSION_FULL@";
 extern const char VCMI_PROJECT_NAME[] = "@VCMI_PROJECT_NAME@";
 extern const char VCMI_PROJECT_NAME_VERSIONED[] = "@VCMI_PROJECT_NAME_VERSIONED@";
 }
-
-VCMI_LIB_NAMESPACE_END

Version.h

@@ -11,8 +11,6 @@
 
 #include "StdInc.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 namespace GameConstants
 {
 DLL_LINKAGE extern const char GIT_SHA1[];
@@ -20,5 +18,3 @@ DLL_LINKAGE extern const char VCMI_VERSION[];
 DLL_LINKAGE extern const char VCMI_PROJECT_NAME[];
 DLL_LINKAGE extern const char VCMI_PROJECT_NAME_VERSIONED[];
 }
-
-VCMI_LIB_NAMESPACE_END

client/ArtifactsUIController.h

@@ -12,12 +12,8 @@
 #include "../lib/constants/EntityIdentifiers.h"
 #include "../lib/networkPacks/ArtifactLocation.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CGHeroInstance;
 
-VCMI_LIB_NAMESPACE_END
-
 class ArtifactsUIController
 {
 	size_t numOfMovedArts;

client/CPlayerInterface.h

@@ -17,8 +17,6 @@
 #include "../lib/FunctionList.h"
 #include "gui/CIntObject.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class Artifact;
 struct TryMoveHero;
 class CStack;
@@ -31,8 +29,6 @@ class ConditionalWait;
 struct CPathsInfo;
 class PathfinderCache;
 
-VCMI_LIB_NAMESPACE_END
-
 class CButton;
 class AdventureMapInterface;
 class CCastleInterface;

client/CServerHandler.cpp

@@ -953,7 +953,7 @@ void CServerHandler::debugStartTest(std::string filename, bool save)
 	}
 }
 
-class ServerHandlerCPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor)
+class ServerHandlerCPackVisitor : public ::ICPackVisitor
 {
 private:
 	CServerHandler & handler;

client/CServerHandler.h

@@ -17,8 +17,6 @@
 #include "../lib/mapping/CMapHeader.h"
 #include "../lib/gameState/GameStatistics.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class GameConnection;
 class PlayerColor;
 struct StartInfo;
@@ -34,8 +32,6 @@ struct LobbyModsCheck;
 
 class HighScoreParameter;
 
-VCMI_LIB_NAMESPACE_END
-
 class NetworkLagCompensator;
 class CClient;
 class CBaseForLobbyApply;

client/Client.h

@@ -18,8 +18,6 @@
 #include "../lib/ResourceSet.h"
 
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 struct CPackForClient;
 struct CPackForServer;
 class IBattleEventsReceiver;
@@ -36,8 +34,6 @@ namespace events
 	class EventBus;
 }
 
-VCMI_LIB_NAMESPACE_END
-
 class CClient;
 class CBaseForCLApply;
 

client/ClientCommandManager.h

@@ -10,9 +10,7 @@
 
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class PlayerColor;
-VCMI_LIB_NAMESPACE_END
 class CIntObject;
 
 class ClientCommandManager //take mantis #2292 issue about account if thinking about handling cheats from command-line

client/ClientNetPackVisitors.h

@@ -13,13 +13,9 @@
 
 class CClient;
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CGameState;
 
-VCMI_LIB_NAMESPACE_END
-
-class ApplyClientNetPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor)
+class ApplyClientNetPackVisitor : public ::ICPackVisitor
 {
 private:
 	CClient & cl;
@@ -110,7 +106,7 @@ public:
 	void visitResponseStatistic(ResponseStatistic & pack) override;
 };
 
-class ApplyFirstClientNetPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor)
+class ApplyFirstClientNetPackVisitor : public ::ICPackVisitor
 {
 private:
 	CClient & cl;

client/Discord.h

@@ -11,10 +11,8 @@
 
 #include "StdInc.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct StartInfo;
 class CMap;
-VCMI_LIB_NAMESPACE_END
 
 class Discord : boost::noncopyable
 {

client/GameEngine.h

@@ -9,11 +9,9 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
 class AsyncRunner;
 class Rect;
-VCMI_LIB_NAMESPACE_END
 
 enum class MouseButton;
 class ShortcutHandler;

client/GameInstance.h

@@ -17,9 +17,7 @@ class CPlayerInterface;
 class CMapHandler;
 class CMainMenu;
 
-VCMI_LIB_NAMESPACE_BEGIN
 class INetworkHandler;
-VCMI_LIB_NAMESPACE_END
 
 class GameShutdownException final : public std::exception
 {

client/HeroMovementController.h

@@ -13,7 +13,6 @@
 #include "../lib/int3.h"
 #include "../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 using TTeleportExitsList = std::vector<std::pair<ObjectInstanceID, int3>>;
 
 class CGHeroInstance;
@@ -23,7 +22,6 @@ struct CGPathNode;
 struct CGPath;
 struct TryMoveHero;
 enum class EPathNodeAction : ui8;
-VCMI_LIB_NAMESPACE_END
 
 class HeroMovementController
 {

client/LobbyClientNetPackVisitors.h

@@ -14,11 +14,9 @@
 
 class CClient;
 class CLobbyScreen;
-VCMI_LIB_NAMESPACE_BEGIN
 class CGameState;
-VCMI_LIB_NAMESPACE_END
 
-class ApplyOnLobbyHandlerNetPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor)
+class ApplyOnLobbyHandlerNetPackVisitor : public ::ICPackVisitor
 {
 private:
 	CServerHandler & handler;
@@ -42,7 +40,7 @@ public:
 	void visitLobbyUpdateState(LobbyUpdateState & pack) override;
 };
 
-class ApplyOnLobbyScreenNetPackVisitor : public VCMI_LIB_WRAP_NAMESPACE(ICPackVisitor)
+class ApplyOnLobbyScreenNetPackVisitor : public ::ICPackVisitor
 {
 private:
 	CServerHandler & handler;

client/PlayerLocalState.h

@@ -11,8 +11,6 @@
 
 #include "../lib/constants/EntityIdentifiers.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CGHeroInstance;
 class CGTownInstance;
 class CArmedInstance;
@@ -21,8 +19,6 @@ struct CGPath;
 class int3;
 struct CPathsInfo;
 
-VCMI_LIB_NAMESPACE_END
-
 class CPlayerInterface;
 
 struct PlayerSpellbookSetting

client/ServerRunner.h

@@ -9,14 +9,10 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 struct StartInfo;
 class INetworkHandler;
 class INetworkClientListener;
 
-VCMI_LIB_NAMESPACE_END
-
 class CVCMIServer;
 
 class IServerRunner

client/StdInc.h

@@ -15,4 +15,3 @@
 
 // Here you can add specific libraries and macros which are specific to this project.
 
-VCMI_LIB_USING_NAMESPACE

client/UIHelper.h

@@ -14,16 +14,12 @@
 #include "../lib/CSoundBase.h"
 #include "../lib/texts/MetaString.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 struct MoveArtifactInfo;
 struct Component;
 class CArtifactSet;
 class CGHeroInstance;
 class CStackBasicDescriptor;
 
-VCMI_LIB_NAMESPACE_END
-
 namespace UIHelper
 {
     std::vector<Component> getArtifactsComponents(const CArtifactSet & artSet, const std::vector<MoveArtifactInfo> & movedPack);

client/adventureMap/AdventureMapInterface.h

@@ -12,8 +12,6 @@
 #include "../gui/CIntObject.h"
 #include "AdventureMapShortcuts.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CGObjectInstance;
 class CGHeroInstance;
 class CGTownInstance;
@@ -25,8 +23,6 @@ struct Component;
 class int3;
 using FowTilesType = std::set<int3>;
 
-VCMI_LIB_NAMESPACE_END
-
 class CButton;
 class IImage;
 class CAnimImage;

client/adventureMap/AdventureMapShortcuts.h

@@ -12,10 +12,8 @@
 
 #include "../../lib/constants/EntityIdentifiers.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
 class Rect;
-VCMI_LIB_NAMESPACE_END
 
 enum class EShortcut;
 class AdventureMapInterface;

client/adventureMap/CInfoBar.h

@@ -14,15 +14,11 @@
 #include "../../lib/filesystem/ResourcePath.h"
 #include "../../lib/networkPacks/Component.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CGHeroInstance;
 class CGTownInstance;
 struct Component;
 class PlayerColor;
 
-VCMI_LIB_NAMESPACE_END
-
 class CAnimImage;
 class CShowableAnim;
 class CComponent;

client/adventureMap/CList.h

@@ -12,13 +12,9 @@
 #include "../widgets/Scrollable.h"
 #include "../../lib/FunctionList.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CGHeroInstance;
 class CGTownInstance;
 
-VCMI_LIB_NAMESPACE_END
-
 class CListBox;
 class CButton;
 class CAnimImage;

client/adventureMap/CMinimap.h

@@ -11,10 +11,8 @@
 
 #include "../gui/CIntObject.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class ColorRGBA;
 using FowTilesType = std::set<int3>;
-VCMI_LIB_NAMESPACE_END
 
 class Canvas;
 class CMinimap;

client/adventureMap/MapAudioPlayer.h

@@ -12,11 +12,9 @@
 #include "../mapView/IMapRendererObserver.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class ObjectInstanceID;
 class CArmedInstance;
 class PlayerColor;
-VCMI_LIB_NAMESPACE_END
 
 class MapAudioPlayer : public IMapObjectObserver
 {

client/adventureMap/TurnTimerWidget.h

@@ -19,9 +19,7 @@ class CLabel;
 class CFilledTexture;
 class TransparentFilledRectangle;
 
-VCMI_LIB_NAMESPACE_BEGIN
 class PlayerColor;
-VCMI_LIB_NAMESPACE_END
 
 class VerticalPercentBar : public CIntObject
 {

client/battle/BattleActionsController.h

@@ -11,16 +11,12 @@
 
 #include "../../lib/battle/CBattleInfoCallback.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class BattleAction;
 namespace spells {
 class Caster;
 enum class Mode;
 }
 
-VCMI_LIB_NAMESPACE_END
-
 class BattleInterface;
 
 /// Class that controls actions that can be performed by player, e.g. moving stacks, attacking, etc

client/battle/BattleAnimationClasses.h

@@ -14,15 +14,11 @@
 #include "../../lib/Color.h"
 #include "BattleConstants.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CStack;
 class CCreature;
 class CSpell;
 class Point;
 
-VCMI_LIB_NAMESPACE_END
-
 class ColorFilter;
 class BattleHero;
 class CAnimation;

client/battle/BattleEffectsController.h

@@ -15,13 +15,9 @@
 #include "../../lib/filesystem/ResourcePath.h"
 #include "BattleConstants.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class BattleAction;
 struct BattleTriggerEffect;
 
-VCMI_LIB_NAMESPACE_END
-
 class CAnimation;
 class Canvas;
 class BattleInterface;

client/battle/BattleFieldController.h

@@ -13,10 +13,8 @@
 #include "../../lib/Point.h"
 #include "../gui/CIntObject.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CStack;
 class Rect;
-VCMI_LIB_NAMESPACE_END
 
 class BattleHero;
 class CAnimation;

client/battle/BattleHero.h

@@ -14,9 +14,7 @@
 #include "../gui/CIntObject.h"
 #include "../../lib/FunctionList.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CGHeroInstance;
-VCMI_LIB_NAMESPACE_END
 
 class CAnimation;
 class BattleInterface;

client/battle/BattleInterface.h

@@ -17,8 +17,6 @@
 #include "../../lib/spells/SpellAnimationItem.h"
 #include "../../lib/ConditionalWait.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CCreatureSet;
 class CGHeroInstance;
 class CStack;
@@ -35,8 +33,6 @@ class ObstacleChanges;
 class CPlayerBattleCallback;
 class MetaString;
 
-VCMI_LIB_NAMESPACE_END
-
 class BattleHero;
 class Canvas;
 class BattleResultWindow;

client/battle/BattleObstacleController.h

@@ -11,16 +11,12 @@
 
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class BattleHex;
 struct CObstacleInstance;
 class JsonNode;
 class ObstacleChanges;
 class Point;
 
-VCMI_LIB_NAMESPACE_END
-
 class IImage;
 class Canvas;
 class CAnimation;

client/battle/BattleProjectileController.h

@@ -13,13 +13,9 @@
 #include "../../lib/Point.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CStack;
 class CSpell;
 
-VCMI_LIB_NAMESPACE_END
-
 class CAnimation;
 class Canvas;
 class BattleInterface;

client/battle/BattleResultWindow.h

@@ -14,9 +14,7 @@
 #include "../../lib/texts/MetaString.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct BattleResult;
-VCMI_LIB_NAMESPACE_END
 
 class CLabel;
 class CButton;

client/battle/BattleSiegeController.h

@@ -13,16 +13,12 @@
 #include "../../lib/battle/BattleHex.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 struct CatapultAttack;
 class CCreature;
 class CStack;
 class CGTownInstance;
 class Point;
 
-VCMI_LIB_NAMESPACE_END
-
 class Canvas;
 class BattleInterface;
 class BattleRenderer;

client/battle/BattleStacksController.h

@@ -11,8 +11,6 @@
 
 #include "../../lib/Color.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class BattleHex;
 class BattleHexArray;
 class BattleAction;
@@ -21,8 +19,6 @@ class CSpell;
 class SpellID;
 class Point;
 
-VCMI_LIB_NAMESPACE_END
-
 struct StackAttackedInfo;
 struct StackAttackInfo;
 

client/battle/BattleWindow.h

@@ -14,12 +14,9 @@
 #include "../../lib/battle/CBattleInfoCallback.h"
 #include "../../lib/battle/PossiblePlayerBattleAction.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CStack;
 class CGTownInstance;
 
-VCMI_LIB_NAMESPACE_END
-
 class CButton;
 class BattleInterface;
 class BattleConsole;

client/battle/HeroInfoWindow.h

@@ -14,9 +14,7 @@
 class CLabel;
 class CAnimImage;
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct InfoAboutHero;
-VCMI_LIB_NAMESPACE_END
 
 class HeroInfoBasicPanel : public CIntObject //extracted from InfoWindow to fit better as non-popup embed element
 {

client/battle/StackInfoBasicPanel.h

@@ -11,9 +11,7 @@
 
 #include "../gui/CIntObject.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CStack;
-VCMI_LIB_NAMESPACE_END
 
 class CLabel;
 class CMultiLineLabel;

client/battle/StackQueue.h

@@ -11,12 +11,10 @@
 
 #include "../gui/CIntObject.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 namespace battle
 {
 class Unit;
 }
-VCMI_LIB_NAMESPACE_END
 
 class CLabel;
 class TransparentFilledRectangle;

client/eventsSDL/InputSourceText.h

@@ -10,9 +10,7 @@
 
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Rect;
-VCMI_LIB_NAMESPACE_END
 
 struct SDL_TextEditingEvent;
 struct SDL_TextInputEvent;

client/globalLobby/GlobalLobbyClient.h

@@ -12,9 +12,7 @@
 #include "GlobalLobbyDefines.h"
 #include "../../lib/network/NetworkInterface.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class JsonNode;
-VCMI_LIB_NAMESPACE_END
 
 class GlobalLobbyLoginWindow;
 class GlobalLobbyWindow;

client/globalLobby/GlobalLobbyRoomWindow.h

@@ -24,9 +24,7 @@ class CListBox;
 struct GlobalLobbyAccount;
 struct GlobalLobbyRoom;
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct ModVerificationInfo;
-VCMI_LIB_NAMESPACE_END
 
 struct GlobalLobbyRoomModInfo
 {

client/gui/CIntObject.h

@@ -19,9 +19,7 @@ class GameEngine;
 class CPicture;
 class Canvas;
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CArmedInstance;
-VCMI_LIB_NAMESPACE_END
 
 class IShowActivatable
 {

client/gui/EventDispatcher.h

@@ -9,9 +9,7 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
-VCMI_LIB_NAMESPACE_END
 
 class AEventsReceiver;
 enum class MouseButton;

client/gui/EventsReceiver.h

@@ -9,10 +9,8 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
 class Rect;
-VCMI_LIB_NAMESPACE_END
 
 class EventDispatcher;
 enum class EShortcut;

client/gui/ShortcutHandler.h

@@ -12,9 +12,7 @@
 
 enum class EShortcut;
 
-VCMI_LIB_NAMESPACE_BEGIN
 class JsonNode;
-VCMI_LIB_NAMESPACE_END
 
 class ShortcutHandler
 {

client/lobby/BattleOnlyModeTab.h

@@ -14,13 +14,11 @@
 #include "../../lib/mapping/CMap.h"
 
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CGHeroInstance;
 class CCreatureSet;
 class CMap;
 class EditorCallback;
 class BattleOnlyModeStartInfo;
-VCMI_LIB_NAMESPACE_END
 
 class FilledTexturePlayerColored;
 class CButton;

client/lobby/CBonusSelection.h

@@ -14,13 +14,9 @@
 #include "../../lib/campaign/CampaignConstants.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CampaignState;
 class CampaignRegions;
 
-VCMI_LIB_NAMESPACE_END
-
 class CButton;
 class CTextBox;
 class CToggleGroup;

client/lobby/CSavingScreen.h

@@ -11,13 +11,9 @@
 
 #include "CSelectionBase.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 struct StartInfo;
 class CMapInfo;
 
-VCMI_LIB_NAMESPACE_END
-
 class CSelectionBase;
 
 class CSavingScreen : public CSelectionBase

client/lobby/CSelectionBase.h

@@ -11,14 +11,10 @@
 
 #include "../mainmenu/CMainMenu.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CMapInfo;
 struct StartInfo;
 struct PlayerInfo;
 
-VCMI_LIB_NAMESPACE_END
-
 class CButton;
 class CTextBox;
 class CTextInput;

client/lobby/OptionsTab.h

@@ -13,11 +13,9 @@
 #include "../windows/CWindowObject.h"
 #include "../widgets/Scrollable.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct PlayerSettings;
 struct PlayerInfo;
 enum class PlayerStartingBonus : int8_t;
-VCMI_LIB_NAMESPACE_END
 
 class CLabel;
 class CMultiLineLabel;

client/lobby/OptionsTabBase.h

@@ -12,13 +12,9 @@
 #include "../gui/InterfaceObjectConfigurable.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 struct TurnTimerInfo;
 struct SimturnsInfo;
 
-VCMI_LIB_NAMESPACE_END
-
 /// The options tab which is shown at the map selection phase.
 class OptionsTabBase : public InterfaceObjectConfigurable
 {

client/lobby/RandomMapTab.h

@@ -18,12 +18,8 @@
 
 #include <optional>
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CMapGenOptions;
 
-VCMI_LIB_NAMESPACE_END
-
 class CToggleButton;
 class CLabel;
 class CLabelGroup;

client/lobby/SelectionTab.h

@@ -10,9 +10,7 @@
 #pragma once
 
 #include "CSelectionBase.h"
-VCMI_LIB_NAMESPACE_BEGIN
 class CMap;
-VCMI_LIB_NAMESPACE_END
 #include "../../lib/mapping/CMapInfo.h"
 #include "../../lib/filesystem/ResourcePath.h"
 

client/mainmenu/CCampaignScreen.h

@@ -11,12 +11,8 @@
 
 #include "../windows/CWindowObject.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class JsonNode;
 
-VCMI_LIB_NAMESPACE_END
-
 class CLabel;
 class CPicture;
 class CButton;

client/mainmenu/CMainMenu.h

@@ -14,12 +14,8 @@
 #include "../../lib/LoadProgress.h"
 #include "../../lib/network/NetworkInterface.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CampaignState;
 
-VCMI_LIB_NAMESPACE_END
-
 class CTextInput;
 class CGStatusBar;
 class CTextBox;

client/mapView/IMapRendererContext.h

@@ -9,8 +9,6 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class int3;
 class Point;
 class CGObjectInstance;
@@ -19,8 +17,6 @@ struct TerrainTile;
 class ColorRGBA;
 struct CGPath;
 
-VCMI_LIB_NAMESPACE_END
-
 class IMapRendererContext
 {
 public:

client/mapView/IMapRendererObserver.h

@@ -9,15 +9,11 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class int3;
 class CGObjectInstance;
 class CGHeroInstance;
 class PlayerColor;
 
-VCMI_LIB_NAMESPACE_END
-
 class IMapObjectObserver
 {
 public:

client/mapView/MapOverlayLogVisualizer.h

@@ -11,12 +11,8 @@
 
 #include "../../lib/logging/VisualLogger.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class int3;
 
-VCMI_LIB_NAMESPACE_END
-
 class Canvas;
 class MapViewModel;
 

client/mapView/MapRenderer.h

@@ -12,13 +12,9 @@
 #include "../../lib/int3.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class ObjectInstanceID;
 class CGObjectInstance;
 
-VCMI_LIB_NAMESPACE_END
-
 class CAnimation;
 class IImage;
 class Canvas;

client/mapView/MapRendererContextState.h

@@ -15,10 +15,8 @@
 
 #include <boost/container/small_vector.hpp>
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct ObjectPosInfo;
 class CGObjectInstance;
-VCMI_LIB_NAMESPACE_END
 
 class IMapRendererContext;
 

client/mapView/MapView.h

@@ -11,10 +11,8 @@
 
 #include "../gui/CIntObject.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct ObjectPosInfo;
 class CGObjectInstance;
-VCMI_LIB_NAMESPACE_END
 
 class Canvas;
 class MapViewActions;

client/mapView/MapViewCache.h

@@ -11,9 +11,7 @@
 
 #include "../../lib/Point.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class ObjectInstanceID;
-VCMI_LIB_NAMESPACE_END
 
 class IImage;
 class CAnimation;

client/mapView/MapViewController.h

@@ -13,10 +13,8 @@
 #include "../../lib/ConditionalWait.h"
 #include "../../lib/Point.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct ObjectPosInfo;
 class PlayerColor;
-VCMI_LIB_NAMESPACE_END
 
 struct MapRendererContextState;
 

client/mapView/mapHandler.h

@@ -23,14 +23,10 @@
 #	undef OUT
 #endif
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class CGObjectInstance;
 class CGHeroInstance;
 class CMap;
 
-VCMI_LIB_NAMESPACE_END
-
 class IMapObjectObserver;
 
 class CMapHandler

client/media/CVideoHandler.h

@@ -23,10 +23,8 @@ struct AVCodec;
 struct AVFrame;
 struct AVIOContext;
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CInputStream;
 class Point;
-VCMI_LIB_NAMESPACE_END
 
 class FFMpegStream : boost::noncopyable
 {

client/media/IVideoPlayer.h

@@ -13,9 +13,7 @@
 
 struct SDL_Surface;
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
-VCMI_LIB_NAMESPACE_END
 
 class IVideoInstance
 {

client/netlag/NetworkLagCompensator.h

@@ -12,11 +12,9 @@
 #include "../../lib/network/NetworkInterface.h"
 #include "../../server/IGameServer.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 struct CPackForServer;
 class CGameState;
 class GameConnection;
-VCMI_LIB_NAMESPACE_END
 
 class NetworkLagReplyPrediction;
 

client/render/AssetGenerator.h

@@ -11,9 +11,7 @@
 
 #include "ImageLocator.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class PlayerColor;
-VCMI_LIB_NAMESPACE_END
 
 class ISharedImage;
 class CanvasImage;

client/render/CAnimation.h

@@ -15,9 +15,7 @@
 #include "../../lib/GameConstants.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class JsonNode;
-VCMI_LIB_NAMESPACE_END
 
 class CDefFile;
 class RenderHandler;

client/render/CDefFile.h

@@ -12,9 +12,7 @@
 #include "../../lib/vcmi_endian.h"
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
-VCMI_LIB_NAMESPACE_END
 
 class IImageLoader;
 struct SDL_Color;

client/render/ColorFilter.h

@@ -10,10 +10,8 @@
 
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class JsonNode;
 class ColorRGBA;
-VCMI_LIB_NAMESPACE_END
 
 /// Base class for applying palette transformation on images
 class ColorFilter

client/render/ICursor.h

@@ -9,9 +9,7 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
-VCMI_LIB_NAMESPACE_END
 
 class IImage;
 

client/render/IFont.h

@@ -9,10 +9,8 @@
  */
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
 class ColorRGBA;
-VCMI_LIB_NAMESPACE_END
 
 struct SDL_Surface;
 

client/render/IImage.h

@@ -11,15 +11,11 @@
 
 #include "../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
-
 class PlayerColor;
 class Rect;
 class Point;
 class ColorRGBA;
 
-VCMI_LIB_NAMESPACE_END
-
 struct SDL_Surface;
 struct SDL_Palette;
 class ColorFilter;

client/render/IImageLoader.h

@@ -10,9 +10,7 @@
 
 #pragma once
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
-VCMI_LIB_NAMESPACE_END
 
 struct SDL_Color;
 

client/render/IRenderHandler.h

@@ -11,9 +11,7 @@
 
 #include "ImageLocator.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Services;
-VCMI_LIB_NAMESPACE_END
 
 struct SDL_Surface;
 

client/render/IScreenHandler.h

@@ -12,10 +12,8 @@
 
 #include "../../lib/constants/Enumerations.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
 class Rect;
-VCMI_LIB_NAMESPACE_END
 
 class Canvas;
 

client/render/hdEdition/DdsFormat.h

@@ -13,9 +13,7 @@
 
 struct SDL_Surface;
 
-VCMI_LIB_NAMESPACE_BEGIN
 class CInputStream;
-VCMI_LIB_NAMESPACE_END
 
 constexpr std::uint32_t FOURCC(char a, char b, char c, char d) noexcept
 {

client/render/hdEdition/HdImageLoader.h

@@ -15,10 +15,8 @@
 #include "../../../lib/constants/EntityIdentifiers.h"
 #include "../../../lib/filesystem/ResourcePath.h"
 
-VCMI_LIB_NAMESPACE_BEGIN
 class Point;
 class PlayerColor;
-VCMI_LIB_NAMESPACE_END
 
 struct SDL_Surface;
 class SDLImageShared;