Adds header for forward declarations of CStr.

This was SVN commit r25905.
2021-09-09 17:39:08 +00:00 · 2021-09-09 17:39:08 +00:00 · 96708cc6a5
commit 96708cc6a5
parent a5c82a4ef6
23 changed files with 61 additions and 45 deletions
--- a/source/graphics/Color.h
+++ b/source/graphics/Color.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -21,6 +21,7 @@
 #include "graphics/SColor.h"
 #include "maths/Vector3D.h"
 #include "maths/Vector4D.h"
+#include "ps/CStrForward.h"

 // Simple defines for 3 and 4 component floating point colors - just map to
 // corresponding vector types.
@ -37,8 +38,6 @@ extern SColor4ub (*ConvertRGBColorTo4ub)(const RGBColor& src);
 */
 extern void ColorActivateFastImpl();

-class CStr8;
-
 struct CColor
 {
 	CColor() : r(-1.f), g(-1.f), b(-1.f), a(1.f) {}
--- a/source/graphics/Terrain.h
+++ b/source/graphics/Terrain.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -26,11 +26,11 @@
 #include "graphics/SColor.h"
 #include "maths/Fixed.h"
 #include "maths/Vector3D.h"
+#include "ps/CStr.h"

 class CPatch;
 class CMiniPatch;
 class CFixedVector3D;
-class CStr8;
 class CBoundingBoxAligned;

 ///////////////////////////////////////////////////////////////////////////////
--- a/source/graphics/UnitManager.h
+++ b/source/graphics/UnitManager.h
@ -22,12 +22,13 @@
 #ifndef INCLUDED_UNITMANAGER
 #define INCLUDED_UNITMANAGER

+#include "ps/CStrForward.h"
+
 #include <vector>
 #include <set>

 class CUnit;
 class CObjectManager;
-class CStrW;

 ///////////////////////////////////////////////////////////////////////////////
 // CUnitManager: simple container class holding all units within the world
--- a/source/gui/GUIRenderer.h
+++ b/source/gui/GUIRenderer.h
@ -23,6 +23,7 @@
 #include "graphics/Texture.h"
 #include "lib/res/handle.h"
 #include "maths/Rect.h"
+#include "ps/CStrForward.h"
 #include "ps/CStrIntern.h"

 #include <map>
@ -31,7 +32,6 @@
 class CCanvas2D;
 class CGUI;
 class CGUISprite;
-class CStr8;
 struct CGUIColor;
 struct SGUIImage;

--- a/source/gui/ObjectBases/IGUIScrollBarOwner.h
+++ b/source/gui/ObjectBases/IGUIScrollBarOwner.h
@ -18,11 +18,12 @@
 #ifndef INCLUDED_IGUISCROLLBAROWNER
 #define INCLUDED_IGUISCROLLBAROWNER

+#include "ps/CStrForward.h"
+
 #include <memory>
 #include <vector>

 class CCanvas2D;
-class CStr8;
 struct SGUIMessage;
 struct SGUIScrollBarStyle;
 class IGUIScrollBar;
--- a/source/gui/ObjectBases/IGUITextOwner.h
+++ b/source/gui/ObjectBases/IGUITextOwner.h
@ -33,6 +33,7 @@ GUI Object Base - Text Owner
 #include "gui/CGUISetting.h"
 #include "gui/SettingTypes/EAlign.h"
 #include "maths/Rect.h"
+#include "ps/CStrForward.h"

 #include <vector>

@ -43,7 +44,6 @@ class CGUIText;
 class CGUIString;
 class IGUIObject;

-class CStrW;
 class CVector2D;

 /**
--- a/source/gui/SettingTypes/CGUIColor.h
+++ b/source/gui/SettingTypes/CGUIColor.h
@ -19,9 +19,9 @@
 #define INCLUDED_GUICOLOR

 #include "graphics/Color.h"
+#include "ps/CStrForward.h"

 class CGUI;
-class CStr8;

 /**
 * Same as the CColor class, but this one can also parse colors predefined in the GUI page (such as "yellow").
--- a/source/gui/SettingTypes/CGUISize.h
+++ b/source/gui/SettingTypes/CGUISize.h
@ -19,10 +19,9 @@
 #define INCLUDED_CGUISIZE

 #include "maths/Rect.h"
+#include "ps/CStrForward.h"
 #include "scriptinterface/ScriptForward.h"

-class CStr8;
-
 /**
 * This class represents a rectangle relative to a parent rectangle
 * The value can be initialized from a string or JS object.
--- a/source/maths/Fixed.h
+++ b/source/maths/Fixed.h
@ -20,9 +20,7 @@

 #include "lib/types.h"
 #include "maths/Sqrt.h"
-
-class CStr8;
-class CStrW;
+#include "ps/CStrForward.h"

 #ifndef NDEBUG
 #define USE_FIXED_OVERFLOW_CHECKS
--- a/source/network/StunClient.h
+++ b/source/network/StunClient.h
@ -19,10 +19,11 @@
 #ifndef STUNCLIENT_H
 #define STUNCLIENT_H

+#include "ps/CStrForward.h"
+
 #include <string>

 typedef struct _ENetHost ENetHost;
-class CStr8;

 namespace StunClient
 {
--- a/source/ps/CStr.h
+++ b/source/ps/CStr.h
@ -50,11 +50,10 @@ enum PS_TRIM_MODE
 #define CSTR_H_A
 #endif

-#include <string>
 #include "ps/utf16string.h"
+#include "ps/CStrForward.h"

-class CStr8;
-class CStrW;
+#include <string>

 /**
 * The base class of all strings
@ -351,4 +350,4 @@ struct hash<CStr>
 };
 }

-#endif
+#endif // INCLUDED_CSTR
--- a/source/ps/CStrForward.h
+++ b/source/ps/CStrForward.h
@ -0,0 +1,24 @@
+/* Copyright (C) 2021 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 0 A.D. is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef INCLUDED_CSTR_FORWARD
+#define INCLUDED_CSTR_FORWARD
+
+class CStr8;
+class CStrW;
+
+#endif // INCLUDED_CSTR_FORWARD
--- a/source/ps/FileIo.h
+++ b/source/ps/FileIo.h
@ -31,11 +31,9 @@
 #define INCLUDED_FILEPACKER

 #include "lib/file/vfs/vfs_path.h"
-#include "ps/Filesystem.h"	// WriteBuffer
-
+#include "ps/CStrForward.h"
 #include "ps/Errors.h"
-
-class CStr8;
+#include "ps/Filesystem.h"	// WriteBuffer

 ERROR_GROUP(File);
 ERROR_TYPE(File, OpenFailed);
--- a/source/ps/Filesystem.h
+++ b/source/ps/Filesystem.h
@ -21,11 +21,9 @@
 #include "lib/file/file.h"
 #include "lib/file/io/write_buffer.h"
 #include "lib/file/vfs/vfs_util.h"
-
+#include "ps/CStrForward.h"
 #include "ps/Errors.h"

-class CStr8;
-
 extern PIVFS g_VFS;

 extern bool VfsFileExists(const VfsPath& pathname);
--- a/source/ps/GUID.h
+++ b/source/ps/GUID.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2013 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -18,7 +18,7 @@
 #ifndef INCLUDED_GUID
 #define INCLUDED_GUID

-class CStr8;
+#include "ps/CStr.h"

 CStr8 ps_generate_guid(void);

--- a/source/ps/Hashing.h
+++ b/source/ps/Hashing.h
@ -18,7 +18,7 @@
 #ifndef INCLUDED_HASHING
 #define INCLUDED_HASHING

-class CStr8;
+#include "ps/CStr.h"

 /**
 * Hash a string in a cryptographically secure manner.
--- a/source/ps/KeyName.h
+++ b/source/ps/KeyName.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2017 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -20,8 +20,7 @@

 // Need SDLK_* enum values.
 #include "lib/external_libraries/libsdl.h"
-
-class CStr8;
+#include "ps/CStr.h"

 extern SDL_Scancode FindScancode(const CStr8& keyname);
 // Map a scancode to a locale-independent scancode name.
--- a/source/ps/VisualReplay.h
+++ b/source/ps/VisualReplay.h
@ -19,10 +19,9 @@
 #define INCLUDED_VISUAL_REPLAY

 #include "lib/os_path.h"
+#include "ps/CStrForward.h"
 #include "scriptinterface/ScriptTypes.h"

-class CStrW;
-
 class ScriptInterface;

 /**
--- a/source/ps/World.h
+++ b/source/ps/World.h
@ -24,6 +24,7 @@
 #ifndef INCLUDED_WORLD
 #define INCLUDED_WORLD

+#include "ps/CStrForward.h"
 #include "ps/Errors.h"

 #ifndef ERROR_GROUP_GAME_DEFINED
@ -36,7 +37,6 @@ ERROR_TYPE(Game_World, MapLoadFailed);
 class CGame;
 class CUnitManager;
 class CTerrain;
-class CStrW;
 class CMapReader;
 class ScriptContext;

--- a/source/renderer/RenderingOptions.h
+++ b/source/renderer/RenderingOptions.h
@ -27,10 +27,12 @@
 #ifndef INCLUDED_RENDERINGOPTIONS
 #define INCLUDED_RENDERINGOPTIONS

-class CStr8;
+#include "ps/CStr.h"
+
 class CRenderer;

-enum RenderPath {
+enum RenderPath
+{
 	// If no rendering path is configured explicitly, the renderer
 	// will choose the path when Open() is called.
 	DEFAULT,
--- a/source/soundmanager/ISoundManager.h
+++ b/source/soundmanager/ISoundManager.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -20,9 +20,9 @@

 #include "lib/config2.h"
 #include "lib/file/vfs/vfs_path.h"
+#include "ps/CStr.h"
 #include "simulation2/system/Entity.h"

-class CStr8;
 class CVector3D;

 class ISoundManager
--- a/source/soundmanager/SoundManager.h
+++ b/source/soundmanager/SoundManager.h
@ -29,6 +29,7 @@

 #include "lib/external_libraries/openal.h"
 #include "lib/file/vfs/vfs_path.h"
+#include "ps/CStr.h"
 #include "ps/Profiler2.h"
 #include "simulation2/system/Entity.h"

@ -36,8 +37,6 @@
 #include <mutex>
 #include <vector>

-class CStr8;
-
 #define AL_CHECK CSoundManager::al_check(__func__, __LINE__)

 struct ALSourceHolder
--- a/source/tools/atlas/GameInterface/ActorViewer.h
+++ b/source/tools/atlas/GameInterface/ActorViewer.h
@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2021 Wildfire Games.
 * This file is part of 0 A.D.
 *
 * 0 A.D. is free software: you can redistribute it and/or modify
@ -18,14 +18,13 @@
 #ifndef INCLUDED_ACTORVIEWER
 #define INCLUDED_ACTORVIEWER

+#include "ps/CStrForward.h"
 #include "simulation2/helpers/Player.h"
 #include "simulation2/system/Entity.h"

 struct ActorViewerImpl;
 struct SColor4ub;
 class CSimulation2;
-class CStr8;
-class CStrW;

 class ActorViewer
 {