Fix ios compile

client/battle/BattleAnimationClasses.h

@@ -17,6 +17,7 @@ VCMI_LIB_NAMESPACE_BEGIN
 class CStack;
 class CCreature;
 class CSpell;
+class Point;
 
 VCMI_LIB_NAMESPACE_END
 
@@ -27,7 +28,6 @@ class CAnimation;
 class BattleInterface;
 class CreatureAnimation;
 struct StackAttackedInfo;
-class Point;
 
 /// Base class of battle animations
 class BattleAnimation

client/battle/BattleFieldController.h

@@ -15,12 +15,11 @@
 VCMI_LIB_NAMESPACE_BEGIN
 
 class CStack;
-
-VCMI_LIB_NAMESPACE_END
-
 class Rect;
 class Point;
 
+VCMI_LIB_NAMESPACE_END
+
 class ClickableHex;
 class BattleHero;
 class Canvas;

client/battle/BattleObstacleController.h

@@ -13,6 +13,7 @@ VCMI_LIB_NAMESPACE_BEGIN
 
 struct BattleHex;
 struct CObstacleInstance;
+class Point;
 
 VCMI_LIB_NAMESPACE_END
 
@@ -21,7 +22,6 @@ class Canvas;
 class CAnimation;
 class BattleInterface;
 class BattleRenderer;
-class Point;
 
 /// Controls all currently active projectiles on the battlefield
 /// (with exception of moat, which is apparently handled by siege controller)

client/battle/BattleSiegeController.h

@@ -18,10 +18,10 @@ struct CatapultAttack;
 class CCreature;
 class CStack;
 class CGTownInstance;
+class Point;
 
 VCMI_LIB_NAMESPACE_END
 
-class Point;
 class Canvas;
 class BattleInterface;
 class BattleRenderer;

client/battle/BattleStacksController.h

@@ -18,6 +18,7 @@ class BattleAction;
 class CStack;
 class CSpell;
 class SpellID;
+class Point;
 
 VCMI_LIB_NAMESPACE_END
 
@@ -32,7 +33,6 @@ class CreatureAnimation;
 class BattleAnimation;
 class BattleRenderer;
 class IImage;
-class Point;
 
 struct BattleStackFilterEffect
 {

client/gui/CAnimation.h

@@ -23,6 +23,8 @@
 VCMI_LIB_NAMESPACE_BEGIN
 
 class JsonNode;
+class Rect;
+class Point;
 
 VCMI_LIB_NAMESPACE_END
 
@@ -30,8 +32,6 @@ struct SDL_Surface;
 struct SDL_Color;
 class CDefFile;
 class ColorFilter;
-class Rect;
-class Point;
 
 /*
  * Base class for images, can be used for non-animation pictures as well

client/gui/Fonts.h

@@ -12,10 +12,10 @@
 VCMI_LIB_NAMESPACE_BEGIN
 
 class JsonNode;
+class Point;
 
 VCMI_LIB_NAMESPACE_END
 
-class Point;
 struct SDL_Surface;
 struct SDL_Color;
 

client/gui/SDL_Extensions.h

@@ -25,9 +25,13 @@ extern SDL_Renderer * mainRenderer;
 extern SDL_Texture * screenTexture;
 extern SDL_Surface * screen, *screen2, *screenBuf;
 
+VCMI_LIB_NAMESPACE_BEGIN
+
 class Rect;
 class Point;
 
+VCMI_LIB_NAMESPACE_END
+
 /**
  * The colors class defines color constants of type SDL_Color.
  */

client/widgets/Buttons.h

@@ -19,11 +19,11 @@ namespace config
 {
 struct ButtonInfo;
 }
+class Rect;
 
 VCMI_LIB_NAMESPACE_END
 
 struct SDL_Surface;
-class Rect;
 class CAnimImage;
 class CLabel;
 class CAnimation;

client/widgets/Images.h

@@ -14,8 +14,11 @@
 
 #include <SDL_render.h>
 
-struct SDL_Surface;
+VCMI_LIB_NAMESPACE_BEGIN
 class Rect;
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
 class CAnimImage;
 class CLabel;
 class CAnimation;

client/widgets/ObjectLists.h

@@ -11,8 +11,11 @@
 
 #include "../gui/CIntObject.h"
 
-struct SDL_Surface;
+VCMI_LIB_NAMESPACE_BEGIN
 class Rect;
+VCMI_LIB_NAMESPACE_END
+
+struct SDL_Surface;
 class CAnimImage;
 class CSlider;
 class CLabel;

client/windows/InfoWindows.h

@@ -16,11 +16,11 @@
 VCMI_LIB_NAMESPACE_BEGIN
 
 class CGGarrison;
+class Rect;
 
 VCMI_LIB_NAMESPACE_END
 
 struct SDL_Surface;
-class Rect;
 class CAnimImage;
 class CLabel;
 class CAnimation;