From 6db0f91823f2f4deac9ceff180fbd619b19add95 Mon Sep 17 00:00:00 2001 From: elexis Date: Wed, 2 Oct 2019 09:44:00 +0000 Subject: [PATCH] Sort GUI Object types, GUI Object bases and GUI Setting value types into three new folders. Differential Revision: https://code.wildfiregames.com/D2345 Tested on: gcc 9.1.0 Comments By: Vladislav This was SVN commit r23028. --- build/premake/premake5.lua | 5 ++- source/gui/CGUI.cpp | 32 +++++++++---------- source/gui/CGUI.h | 4 +-- source/gui/CGUISetting.cpp | 2 +- source/gui/CGUISetting.h | 2 +- source/gui/CGUISprite.h | 2 +- source/gui/CGUIText.cpp | 4 +-- source/gui/CGUIText.h | 4 +-- source/gui/GUIRenderer.cpp | 2 +- source/gui/GUIRenderer.h | 2 +- source/gui/{GUItypes.h => GUISettingTypes.h} | 8 ++--- source/gui/GUIStringConversions.cpp | 2 +- source/gui/GUITooltip.cpp | 2 +- source/gui/IGUIScrollBar.cpp | 2 +- .../{ => ObjectBases}/IGUIButtonBehavior.cpp | 0 .../{ => ObjectBases}/IGUIButtonBehavior.h | 2 +- source/gui/{ => ObjectBases}/IGUIObject.cpp | 4 +-- source/gui/{ => ObjectBases}/IGUIObject.h | 4 +-- .../{ => ObjectBases}/IGUIScrollBarOwner.cpp | 0 .../{ => ObjectBases}/IGUIScrollBarOwner.h | 2 +- .../gui/{ => ObjectBases}/IGUITextOwner.cpp | 2 +- source/gui/{ => ObjectBases}/IGUITextOwner.h | 2 +- source/gui/{ => ObjectTypes}/CButton.cpp | 2 +- source/gui/{ => ObjectTypes}/CButton.h | 8 ++--- source/gui/{ => ObjectTypes}/CChart.cpp | 6 ++-- source/gui/{ => ObjectTypes}/CChart.h | 8 ++--- source/gui/{ => ObjectTypes}/CCheckBox.cpp | 0 source/gui/{ => ObjectTypes}/CCheckBox.h | 2 +- source/gui/{ => ObjectTypes}/CDropDown.cpp | 4 +-- source/gui/{ => ObjectTypes}/CDropDown.h | 2 +- .../gui/{ => ObjectTypes}/CGUIDummyObject.h | 2 +- source/gui/{ => ObjectTypes}/CImage.cpp | 0 source/gui/{ => ObjectTypes}/CImage.h | 2 +- source/gui/{ => ObjectTypes}/CInput.cpp | 4 +-- source/gui/{ => ObjectTypes}/CInput.h | 2 +- source/gui/{ => ObjectTypes}/CList.cpp | 4 +-- source/gui/{ => ObjectTypes}/CList.h | 6 ++-- .../{MiniMap.cpp => ObjectTypes/CMiniMap.cpp} | 2 +- .../gui/{MiniMap.h => ObjectTypes/CMiniMap.h} | 2 +- source/gui/{ => ObjectTypes}/COList.cpp | 4 +-- source/gui/{ => ObjectTypes}/COList.h | 4 +-- source/gui/{ => ObjectTypes}/CProgressBar.cpp | 0 source/gui/{ => ObjectTypes}/CProgressBar.h | 2 +- source/gui/{ => ObjectTypes}/CRadioButton.cpp | 0 source/gui/{ => ObjectTypes}/CRadioButton.h | 2 +- source/gui/{ => ObjectTypes}/CSlider.cpp | 0 source/gui/{ => ObjectTypes}/CSlider.h | 2 +- source/gui/{ => ObjectTypes}/CText.cpp | 0 source/gui/{ => ObjectTypes}/CText.h | 6 ++-- source/gui/{ => ObjectTypes}/CTooltip.cpp | 2 +- source/gui/{ => ObjectTypes}/CTooltip.h | 4 +-- .../GuiScriptConversions.cpp | 10 +++--- .../JSInterface_GUIManager.cpp | 2 +- .../JSInterface_GUIManager.h | 0 .../JSInterface_GUISize.cpp | 0 .../JSInterface_GUISize.h | 0 .../JSInterface_IGUIObject.cpp | 2 +- .../JSInterface_IGUIObject.h | 0 .../ScriptFunctions.cpp | 6 ++-- .../ScriptFunctions.h | 0 source/gui/{ => SettingTypes}/CGUIColor.cpp | 0 source/gui/{ => SettingTypes}/CGUIColor.h | 0 source/gui/{ => SettingTypes}/CGUIList.h | 2 +- source/gui/{ => SettingTypes}/CGUISeries.h | 0 source/gui/{ => SettingTypes}/CGUISize.cpp | 2 +- source/gui/{ => SettingTypes}/CGUISize.h | 0 source/gui/{ => SettingTypes}/CGUIString.cpp | 0 source/gui/{ => SettingTypes}/CGUIString.h | 0 source/gui/{ => SettingTypes}/EAlign.h | 0 source/gui/tests/test_ParseString.h | 2 +- source/pch/gui/precompiled.h | 2 +- 71 files changed, 100 insertions(+), 99 deletions(-) rename source/gui/{GUItypes.h => GUISettingTypes.h} (88%) rename source/gui/{ => ObjectBases}/IGUIButtonBehavior.cpp (100%) rename source/gui/{ => ObjectBases}/IGUIButtonBehavior.h (98%) rename source/gui/{ => ObjectBases}/IGUIObject.cpp (99%) rename source/gui/{ => ObjectBases}/IGUIObject.h (99%) rename source/gui/{ => ObjectBases}/IGUIScrollBarOwner.cpp (100%) rename source/gui/{ => ObjectBases}/IGUIScrollBarOwner.h (98%) rename source/gui/{ => ObjectBases}/IGUITextOwner.cpp (98%) rename source/gui/{ => ObjectBases}/IGUITextOwner.h (98%) rename source/gui/{ => ObjectTypes}/CButton.cpp (98%) rename source/gui/{ => ObjectTypes}/CButton.h (91%) rename source/gui/{ => ObjectTypes}/CChart.cpp (98%) rename source/gui/{ => ObjectTypes}/CChart.h (94%) rename source/gui/{ => ObjectTypes}/CCheckBox.cpp (100%) rename source/gui/{ => ObjectTypes}/CCheckBox.h (97%) rename source/gui/{ => ObjectTypes}/CDropDown.cpp (99%) rename source/gui/{ => ObjectTypes}/CDropDown.h (99%) rename source/gui/{ => ObjectTypes}/CGUIDummyObject.h (96%) rename source/gui/{ => ObjectTypes}/CImage.cpp (100%) rename source/gui/{ => ObjectTypes}/CImage.h (97%) rename source/gui/{ => ObjectTypes}/CInput.cpp (100%) rename source/gui/{ => ObjectTypes}/CInput.h (99%) rename source/gui/{ => ObjectTypes}/CList.cpp (99%) rename source/gui/{ => ObjectTypes}/CList.h (96%) rename source/gui/{MiniMap.cpp => ObjectTypes/CMiniMap.cpp} (99%) rename source/gui/{MiniMap.h => ObjectTypes/CMiniMap.h} (98%) rename source/gui/{ => ObjectTypes}/COList.cpp (99%) rename source/gui/{ => ObjectTypes}/COList.h (96%) rename source/gui/{ => ObjectTypes}/CProgressBar.cpp (100%) rename source/gui/{ => ObjectTypes}/CProgressBar.h (97%) rename source/gui/{ => ObjectTypes}/CRadioButton.cpp (100%) rename source/gui/{ => ObjectTypes}/CRadioButton.h (96%) rename source/gui/{ => ObjectTypes}/CSlider.cpp (100%) rename source/gui/{ => ObjectTypes}/CSlider.h (97%) rename source/gui/{ => ObjectTypes}/CText.cpp (100%) rename source/gui/{ => ObjectTypes}/CText.h (94%) rename source/gui/{ => ObjectTypes}/CTooltip.cpp (99%) rename source/gui/{ => ObjectTypes}/CTooltip.h (94%) rename source/gui/{scripting => Scripting}/GuiScriptConversions.cpp (97%) rename source/gui/{scripting => Scripting}/JSInterface_GUIManager.cpp (99%) rename source/gui/{scripting => Scripting}/JSInterface_GUIManager.h (100%) rename source/gui/{scripting => Scripting}/JSInterface_GUISize.cpp (100%) rename source/gui/{scripting => Scripting}/JSInterface_GUISize.h (100%) rename source/gui/{scripting => Scripting}/JSInterface_IGUIObject.cpp (99%) rename source/gui/{scripting => Scripting}/JSInterface_IGUIObject.h (100%) rename source/gui/{scripting => Scripting}/ScriptFunctions.cpp (95%) rename source/gui/{scripting => Scripting}/ScriptFunctions.h (100%) rename source/gui/{ => SettingTypes}/CGUIColor.cpp (100%) rename source/gui/{ => SettingTypes}/CGUIColor.h (100%) rename source/gui/{ => SettingTypes}/CGUIList.h (96%) rename source/gui/{ => SettingTypes}/CGUISeries.h (100%) rename source/gui/{ => SettingTypes}/CGUISize.cpp (99%) rename source/gui/{ => SettingTypes}/CGUISize.h (100%) rename source/gui/{ => SettingTypes}/CGUIString.cpp (100%) rename source/gui/{ => SettingTypes}/CGUIString.h (100%) rename source/gui/{ => SettingTypes}/EAlign.h (100%) diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua index 02254d7253..7d2c4920b9 100644 --- a/build/premake/premake5.lua +++ b/build/premake/premake5.lua @@ -759,7 +759,10 @@ function setup_all_libs () source_dirs = { "gui", - "gui/scripting", + "gui/ObjectTypes", + "gui/ObjectBases", + "gui/Scripting", + "gui/SettingTypes", "i18n" } extern_libs = { diff --git a/source/gui/CGUI.cpp b/source/gui/CGUI.cpp index 3a5721389c..ee5ba30d0a 100644 --- a/source/gui/CGUI.cpp +++ b/source/gui/CGUI.cpp @@ -19,23 +19,22 @@ #include "CGUI.h" -// Types - when including them into the engine. -#include "CButton.h" -#include "CChart.h" -#include "CCheckBox.h" -#include "CDropDown.h" -#include "CImage.h" -#include "CInput.h" -#include "CList.h" -#include "COList.h" -#include "CProgressBar.h" -#include "CRadioButton.h" -#include "CSlider.h" -#include "CText.h" -#include "CTooltip.h" -#include "MiniMap.h" - #include "gui/IGUIScrollBar.h" +#include "gui/ObjectTypes/CButton.h" +#include "gui/ObjectTypes/CChart.h" +#include "gui/ObjectTypes/CCheckBox.h" +#include "gui/ObjectTypes/CDropDown.h" +#include "gui/ObjectTypes/CImage.h" +#include "gui/ObjectTypes/CInput.h" +#include "gui/ObjectTypes/CList.h" +#include "gui/ObjectTypes/CMiniMap.h" +#include "gui/ObjectTypes/COList.h" +#include "gui/ObjectTypes/CProgressBar.h" +#include "gui/ObjectTypes/CRadioButton.h" +#include "gui/ObjectTypes/CSlider.h" +#include "gui/ObjectTypes/CText.h" +#include "gui/ObjectTypes/CTooltip.h" +#include "gui/Scripting/ScriptFunctions.h" #include "i18n/L10n.h" #include "lib/bits.h" #include "lib/input.h" @@ -51,7 +50,6 @@ #include "ps/Pyrogenesis.h" #include "ps/XML/Xeromyces.h" #include "renderer/Renderer.h" -#include "scripting/ScriptFunctions.h" #include "scriptinterface/ScriptInterface.h" #include diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h index 191d79e31b..4d8e96e79f 100644 --- a/source/gui/CGUI.h +++ b/source/gui/CGUI.h @@ -23,9 +23,9 @@ #ifndef INCLUDED_CGUI #define INCLUDED_CGUI -#include "gui/CGUIColor.h" -#include "gui/CGUIDummyObject.h" #include "gui/GUITooltip.h" +#include "gui/ObjectTypes/CGUIDummyObject.h" +#include "gui/SettingTypes/CGUIColor.h" #include "gui/SGUIIcon.h" #include "gui/SGUIStyle.h" #include "lib/input.h" diff --git a/source/gui/CGUISetting.cpp b/source/gui/CGUISetting.cpp index afbeccf0b3..1b5a095e62 100644 --- a/source/gui/CGUISetting.cpp +++ b/source/gui/CGUISetting.cpp @@ -84,5 +84,5 @@ void CGUISetting::ToJSVal(JSContext* cx, JS::MutableHandleValue Value) #define TYPE(T) \ template class CGUISetting; \ -#include "GUItypes.h" +#include "gui/GUISettingTypes.h" #undef TYPE diff --git a/source/gui/CGUISetting.h b/source/gui/CGUISetting.h index 68e2014c64..0a1373e930 100644 --- a/source/gui/CGUISetting.h +++ b/source/gui/CGUISetting.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_CGUISETTINGS #define INCLUDED_CGUISETTINGS -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" /** * This setting interface allows GUI objects to call setting function functions without having to know the setting type. diff --git a/source/gui/CGUISprite.h b/source/gui/CGUISprite.h index 5855abd961..938bf80d4d 100644 --- a/source/gui/CGUISprite.h +++ b/source/gui/CGUISprite.h @@ -23,8 +23,8 @@ #ifndef INCLUDED_CGUISPRITE #define INCLUDED_CGUISPRITE -#include "gui/CGUISize.h" #include "gui/GUIRenderer.h" +#include "gui/SettingTypes/CGUISize.h" #include #include diff --git a/source/gui/CGUIText.cpp b/source/gui/CGUIText.cpp index 59618d11f2..dcb1630fca 100644 --- a/source/gui/CGUIText.cpp +++ b/source/gui/CGUIText.cpp @@ -23,8 +23,8 @@ #include "graphics/ShaderManager.h" #include "graphics/TextRenderer.h" #include "gui/CGUI.h" -#include "gui/CGUIString.h" -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" +#include "gui/SettingTypes/CGUIString.h" #include "renderer/Renderer.h" #include diff --git a/source/gui/CGUIText.h b/source/gui/CGUIText.h index 5cf72e67b6..c01df548e7 100644 --- a/source/gui/CGUIText.h +++ b/source/gui/CGUIText.h @@ -18,9 +18,9 @@ #ifndef INCLUDED_GUITEXT #define INCLUDED_GUITEXT -#include "gui/CGUIColor.h" #include "gui/CGUISprite.h" -#include "gui/EAlign.h" +#include "gui/SettingTypes/CGUIColor.h" +#include "gui/SettingTypes/EAlign.h" #include "ps/CStrIntern.h" #include "ps/Shapes.h" diff --git a/source/gui/GUIRenderer.cpp b/source/gui/GUIRenderer.cpp index 20f48844e4..d76c2ecabe 100644 --- a/source/gui/GUIRenderer.cpp +++ b/source/gui/GUIRenderer.cpp @@ -22,9 +22,9 @@ #include "graphics/ShaderManager.h" #include "graphics/TextureManager.h" #include "gui/CGUI.h" -#include "gui/CGUIColor.h" #include "gui/CGUISprite.h" #include "gui/GUIMatrix.h" +#include "gui/SettingTypes/CGUIColor.h" #include "i18n/L10n.h" #include "lib/ogl.h" #include "lib/res/h_mgr.h" diff --git a/source/gui/GUIRenderer.h b/source/gui/GUIRenderer.h index b5d465520f..a4a2572b6d 100644 --- a/source/gui/GUIRenderer.h +++ b/source/gui/GUIRenderer.h @@ -20,7 +20,7 @@ #include "graphics/ShaderTechnique.h" #include "graphics/Texture.h" -#include "gui/CGUIColor.h" +#include "gui/SettingTypes/CGUIColor.h" #include "lib/res/handle.h" #include "ps/CStr.h" #include "ps/Shapes.h" diff --git a/source/gui/GUItypes.h b/source/gui/GUISettingTypes.h similarity index 88% rename from source/gui/GUItypes.h rename to source/gui/GUISettingTypes.h index 96a34b13c6..400026eb7c 100644 --- a/source/gui/GUItypes.h +++ b/source/gui/GUISettingTypes.h @@ -20,13 +20,13 @@ This file is used by all bits of GUI code that need to repeat some code for a variety of types (to avoid repeating the list of types in half a dozen places, and to make it much easier to add a new type). Just do #define TYPE(T) your_code_involving_T; - #include "GUItypes.h" + #include "gui/SettingTypes/GUISettingTypes.h" #undef TYPE to handle every possible type. */ #ifndef GUITYPE_IGNORE_COPYABLE -#include "gui/EAlign.h" +#include "gui/SettingTypes/EAlign.h" TYPE(bool) TYPE(i32) TYPE(u32) @@ -37,8 +37,8 @@ TYPE(CPos) #endif #ifndef GUITYPE_IGNORE_NONCOPYABLE -#include "gui/CGUIList.h" -#include "gui/CGUISeries.h" +#include "gui/SettingTypes/CGUIList.h" +#include "gui/SettingTypes/CGUISeries.h" TYPE(CGUISize) TYPE(CGUIColor) TYPE(CGUIList) diff --git a/source/gui/GUIStringConversions.cpp b/source/gui/GUIStringConversions.cpp index 81ff32c680..976703f48d 100644 --- a/source/gui/GUIStringConversions.cpp +++ b/source/gui/GUIStringConversions.cpp @@ -18,7 +18,7 @@ #include "precompiled.h" #include "gui/CGUI.h" -#include "gui/CGUIString.h" +#include "gui/SettingTypes/CGUIString.h" #include "ps/CLogger.h" class CGUIList; diff --git a/source/gui/GUITooltip.cpp b/source/gui/GUITooltip.cpp index fe55ea39fe..6947f7f48e 100644 --- a/source/gui/GUITooltip.cpp +++ b/source/gui/GUITooltip.cpp @@ -20,7 +20,7 @@ #include "GUITooltip.h" #include "gui/CGUI.h" -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" #include "lib/timer.h" #include "ps/CLogger.h" diff --git a/source/gui/IGUIScrollBar.cpp b/source/gui/IGUIScrollBar.cpp index 6e1dba1987..e1994e6525 100644 --- a/source/gui/IGUIScrollBar.cpp +++ b/source/gui/IGUIScrollBar.cpp @@ -19,8 +19,8 @@ #include "IGUIScrollBar.h" -#include "gui/IGUIScrollBarOwner.h" #include "gui/CGUI.h" +#include "gui/ObjectBases/IGUIScrollBarOwner.h" #include "maths/MathUtil.h" IGUIScrollBar::IGUIScrollBar(CGUI& pGUI) diff --git a/source/gui/IGUIButtonBehavior.cpp b/source/gui/ObjectBases/IGUIButtonBehavior.cpp similarity index 100% rename from source/gui/IGUIButtonBehavior.cpp rename to source/gui/ObjectBases/IGUIButtonBehavior.cpp diff --git a/source/gui/IGUIButtonBehavior.h b/source/gui/ObjectBases/IGUIButtonBehavior.h similarity index 98% rename from source/gui/IGUIButtonBehavior.h rename to source/gui/ObjectBases/IGUIButtonBehavior.h index a0932c1ff9..6ff2bdb38e 100644 --- a/source/gui/IGUIButtonBehavior.h +++ b/source/gui/ObjectBases/IGUIButtonBehavior.h @@ -26,7 +26,7 @@ #ifndef INCLUDED_IGUIBUTTONBEHAVIOR #define INCLUDED_IGUIBUTTONBEHAVIOR -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" class CGUISpriteInstance; diff --git a/source/gui/IGUIObject.cpp b/source/gui/ObjectBases/IGUIObject.cpp similarity index 99% rename from source/gui/IGUIObject.cpp rename to source/gui/ObjectBases/IGUIObject.cpp index 90a1bd291d..572a1958a6 100644 --- a/source/gui/IGUIObject.cpp +++ b/source/gui/ObjectBases/IGUIObject.cpp @@ -537,7 +537,7 @@ void IGUIObject::TraceMember(JSTracer* trc) template const T& IGUIObject::GetSetting(const CStr& Setting) const; \ template void IGUIObject::SetSetting(const CStr& Setting, T& Value, const bool SendMessage); \ -#include "gui/GUItypes.h" +#include "gui/GUISettingTypes.h" #undef TYPE // Copying functions - discouraged except for primitives. @@ -545,6 +545,6 @@ void IGUIObject::TraceMember(JSTracer* trc) template void IGUIObject::SetSetting(const CStr& Setting, const T& Value, const bool SendMessage); \ #define GUITYPE_IGNORE_NONCOPYABLE -#include "gui/GUItypes.h" +#include "gui/GUISettingTypes.h" #undef GUITYPE_IGNORE_NONCOPYABLE #undef TYPE diff --git a/source/gui/IGUIObject.h b/source/gui/ObjectBases/IGUIObject.h similarity index 99% rename from source/gui/IGUIObject.h rename to source/gui/ObjectBases/IGUIObject.h index 9e79da00b0..ea85f1a50a 100644 --- a/source/gui/IGUIObject.h +++ b/source/gui/ObjectBases/IGUIObject.h @@ -25,8 +25,8 @@ #ifndef INCLUDED_IGUIOBJECT #define INCLUDED_IGUIOBJECT -#include "gui/CGUISize.h" -#include "gui/scripting/JSInterface_IGUIObject.h" +#include "gui/Scripting/JSInterface_IGUIObject.h" +#include "gui/SettingTypes/CGUISize.h" #include "gui/SGUIMessage.h" #include "lib/input.h" // just for IN_PASS #include "ps/XML/Xeromyces.h" diff --git a/source/gui/IGUIScrollBarOwner.cpp b/source/gui/ObjectBases/IGUIScrollBarOwner.cpp similarity index 100% rename from source/gui/IGUIScrollBarOwner.cpp rename to source/gui/ObjectBases/IGUIScrollBarOwner.cpp diff --git a/source/gui/IGUIScrollBarOwner.h b/source/gui/ObjectBases/IGUIScrollBarOwner.h similarity index 98% rename from source/gui/IGUIScrollBarOwner.h rename to source/gui/ObjectBases/IGUIScrollBarOwner.h index 39c58d9094..5b35ae96d9 100644 --- a/source/gui/IGUIScrollBarOwner.h +++ b/source/gui/ObjectBases/IGUIScrollBarOwner.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_IGUISCROLLBAROWNER #define INCLUDED_IGUISCROLLBAROWNER -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" #include diff --git a/source/gui/IGUITextOwner.cpp b/source/gui/ObjectBases/IGUITextOwner.cpp similarity index 98% rename from source/gui/IGUITextOwner.cpp rename to source/gui/ObjectBases/IGUITextOwner.cpp index 23cccf3f38..093fabc3c1 100644 --- a/source/gui/IGUITextOwner.cpp +++ b/source/gui/ObjectBases/IGUITextOwner.cpp @@ -20,7 +20,7 @@ #include "IGUITextOwner.h" #include "gui/CGUI.h" -#include "gui/CGUIString.h" +#include "gui/SettingTypes/CGUIString.h" #include diff --git a/source/gui/IGUITextOwner.h b/source/gui/ObjectBases/IGUITextOwner.h similarity index 98% rename from source/gui/IGUITextOwner.h rename to source/gui/ObjectBases/IGUITextOwner.h index b7e0610e0d..e0b18e0d3a 100644 --- a/source/gui/IGUITextOwner.h +++ b/source/gui/ObjectBases/IGUITextOwner.h @@ -30,7 +30,7 @@ GUI Object Base - Text Owner #ifndef INCLUDED_IGUITEXTOWNER #define INCLUDED_IGUITEXTOWNER -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" #include diff --git a/source/gui/CButton.cpp b/source/gui/ObjectTypes/CButton.cpp similarity index 98% rename from source/gui/CButton.cpp rename to source/gui/ObjectTypes/CButton.cpp index d2b979cbc1..6483cadca6 100644 --- a/source/gui/CButton.cpp +++ b/source/gui/ObjectTypes/CButton.cpp @@ -20,8 +20,8 @@ #include "CButton.h" #include "gui/CGUI.h" -#include "gui/CGUIColor.h" #include "gui/CGUIText.h" +#include "gui/SettingTypes/CGUIColor.h" CButton::CButton(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/CButton.h b/source/gui/ObjectTypes/CButton.h similarity index 91% rename from source/gui/CButton.h rename to source/gui/ObjectTypes/CButton.h index 6838465199..aaededc6f2 100644 --- a/source/gui/CButton.h +++ b/source/gui/ObjectTypes/CButton.h @@ -18,11 +18,11 @@ #ifndef INCLUDED_CBUTTON #define INCLUDED_CBUTTON -#include "gui/IGUIButtonBehavior.h" -#include "gui/IGUIObject.h" -#include "gui/IGUITextOwner.h" #include "gui/CGUISprite.h" -#include "gui/CGUIString.h" +#include "gui/ObjectBases/IGUIButtonBehavior.h" +#include "gui/ObjectBases/IGUIObject.h" +#include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIString.h" class CButton : public IGUIObject, public IGUITextOwner, public IGUIButtonBehavior { diff --git a/source/gui/CChart.cpp b/source/gui/ObjectTypes/CChart.cpp similarity index 98% rename from source/gui/CChart.cpp rename to source/gui/ObjectTypes/CChart.cpp index b028682a4d..a7a8ac812e 100644 --- a/source/gui/CChart.cpp +++ b/source/gui/ObjectTypes/CChart.cpp @@ -20,10 +20,10 @@ #include "CChart.h" #include "graphics/ShaderManager.h" -#include "gui/CGUIList.h" -#include "gui/CGUISeries.h" -#include "gui/CGUIString.h" #include "gui/GUIMatrix.h" +#include "gui/SettingTypes/CGUIList.h" +#include "gui/SettingTypes/CGUISeries.h" +#include "gui/SettingTypes/CGUIString.h" #include "ps/CLogger.h" #include "ps/Profile.h" #include "renderer/Renderer.h" diff --git a/source/gui/CChart.h b/source/gui/ObjectTypes/CChart.h similarity index 94% rename from source/gui/CChart.h rename to source/gui/ObjectTypes/CChart.h index 34788c6ef0..281d1cc9ea 100644 --- a/source/gui/CChart.h +++ b/source/gui/ObjectTypes/CChart.h @@ -19,10 +19,10 @@ #define INCLUDED_CCHART #include "graphics/ShaderProgramPtr.h" -#include "gui/CGUIColor.h" -#include "gui/CGUIList.h" -#include "gui/CGUISeries.h" -#include "gui/IGUITextOwner.h" +#include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIColor.h" +#include "gui/SettingTypes/CGUIList.h" +#include "gui/SettingTypes/CGUISeries.h" #include "maths/Vector2D.h" #include diff --git a/source/gui/CCheckBox.cpp b/source/gui/ObjectTypes/CCheckBox.cpp similarity index 100% rename from source/gui/CCheckBox.cpp rename to source/gui/ObjectTypes/CCheckBox.cpp diff --git a/source/gui/CCheckBox.h b/source/gui/ObjectTypes/CCheckBox.h similarity index 97% rename from source/gui/CCheckBox.h rename to source/gui/ObjectTypes/CCheckBox.h index b1479d2d14..ca244c77f8 100644 --- a/source/gui/CCheckBox.h +++ b/source/gui/ObjectTypes/CCheckBox.h @@ -19,7 +19,7 @@ #define INCLUDED_CCHECKBOX #include "gui/CGUISprite.h" -#include "gui/IGUIButtonBehavior.h" +#include "gui/ObjectBases/IGUIButtonBehavior.h" class CCheckBox : public IGUIObject, public IGUIButtonBehavior { diff --git a/source/gui/CDropDown.cpp b/source/gui/ObjectTypes/CDropDown.cpp similarity index 99% rename from source/gui/CDropDown.cpp rename to source/gui/ObjectTypes/CDropDown.cpp index 911580426b..69ad8c08a6 100644 --- a/source/gui/CDropDown.cpp +++ b/source/gui/ObjectTypes/CDropDown.cpp @@ -20,9 +20,9 @@ #include "CDropDown.h" #include "gui/CGUI.h" -#include "gui/CGUIColor.h" -#include "gui/CGUIList.h" #include "gui/IGUIScrollBar.h" +#include "gui/SettingTypes/CGUIColor.h" +#include "gui/SettingTypes/CGUIList.h" #include "lib/external_libraries/libsdl.h" #include "lib/timer.h" #include "ps/Profile.h" diff --git a/source/gui/CDropDown.h b/source/gui/ObjectTypes/CDropDown.h similarity index 99% rename from source/gui/CDropDown.h rename to source/gui/ObjectTypes/CDropDown.h index 67798841fe..d89f1559b2 100644 --- a/source/gui/CDropDown.h +++ b/source/gui/ObjectTypes/CDropDown.h @@ -29,7 +29,7 @@ GUI Object - Drop Down (list) #define INCLUDED_CDROPDOWN #include "gui/CGUISprite.h" -#include "gui/CList.h" +#include "gui/ObjectTypes/CList.h" #include diff --git a/source/gui/CGUIDummyObject.h b/source/gui/ObjectTypes/CGUIDummyObject.h similarity index 96% rename from source/gui/CGUIDummyObject.h rename to source/gui/ObjectTypes/CGUIDummyObject.h index 2574e51f37..be4f306978 100644 --- a/source/gui/CGUIDummyObject.h +++ b/source/gui/ObjectTypes/CGUIDummyObject.h @@ -23,7 +23,7 @@ #ifndef INCLUDED_CGUIDUMMYOBJECT #define INCLUDED_CGUIDUMMYOBJECT -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" /** * Dummy object are used for the base object and objects of type "empty". diff --git a/source/gui/CImage.cpp b/source/gui/ObjectTypes/CImage.cpp similarity index 100% rename from source/gui/CImage.cpp rename to source/gui/ObjectTypes/CImage.cpp diff --git a/source/gui/CImage.h b/source/gui/ObjectTypes/CImage.h similarity index 97% rename from source/gui/CImage.h rename to source/gui/ObjectTypes/CImage.h index a47b26234c..94cedb0b42 100644 --- a/source/gui/CImage.h +++ b/source/gui/ObjectTypes/CImage.h @@ -19,7 +19,7 @@ #define INCLUDED_CIMAGE #include "gui/CGUISprite.h" -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" /** * Object just for drawing a sprite. Like CText, without the diff --git a/source/gui/CInput.cpp b/source/gui/ObjectTypes/CInput.cpp similarity index 100% rename from source/gui/CInput.cpp rename to source/gui/ObjectTypes/CInput.cpp index b5e00cb5e9..4ccf5477fd 100644 --- a/source/gui/CInput.cpp +++ b/source/gui/ObjectTypes/CInput.cpp @@ -19,11 +19,11 @@ #include "CInput.h" -#include "gui/CGUI.h" -#include "gui/CGUIScrollBarVertical.h" #include "graphics/FontMetrics.h" #include "graphics/ShaderManager.h" #include "graphics/TextRenderer.h" +#include "gui/CGUI.h" +#include "gui/CGUIScrollBarVertical.h" #include "lib/sysdep/clipboard.h" #include "lib/timer.h" #include "lib/utf8.h" diff --git a/source/gui/CInput.h b/source/gui/ObjectTypes/CInput.h similarity index 99% rename from source/gui/CInput.h rename to source/gui/ObjectTypes/CInput.h index a1d27b8c4d..724b5fe25a 100644 --- a/source/gui/CInput.h +++ b/source/gui/ObjectTypes/CInput.h @@ -18,8 +18,8 @@ #ifndef INCLUDED_CINPUT #define INCLUDED_CINPUT -#include "gui/IGUIScrollBarOwner.h" #include "gui/CGUISprite.h" +#include "gui/ObjectBases/IGUIScrollBarOwner.h" #include "lib/external_libraries/libsdl.h" #include diff --git a/source/gui/CList.cpp b/source/gui/ObjectTypes/CList.cpp similarity index 99% rename from source/gui/CList.cpp rename to source/gui/ObjectTypes/CList.cpp index 6db326e4bf..fcaa5f5bf9 100644 --- a/source/gui/CList.cpp +++ b/source/gui/ObjectTypes/CList.cpp @@ -20,9 +20,9 @@ #include "CList.h" #include "gui/CGUI.h" -#include "gui/CGUIColor.h" -#include "gui/CGUIList.h" #include "gui/CGUIScrollBarVertical.h" +#include "gui/SettingTypes/CGUIColor.h" +#include "gui/SettingTypes/CGUIList.h" #include "lib/external_libraries/libsdl.h" #include "lib/timer.h" diff --git a/source/gui/CList.h b/source/gui/ObjectTypes/CList.h similarity index 96% rename from source/gui/CList.h rename to source/gui/ObjectTypes/CList.h index baa4a94244..3bcfbedd3d 100644 --- a/source/gui/CList.h +++ b/source/gui/ObjectTypes/CList.h @@ -18,10 +18,10 @@ #ifndef INCLUDED_CLIST #define INCLUDED_CLIST -#include "gui/CGUIList.h" #include "gui/CGUISprite.h" -#include "gui/IGUIScrollBarOwner.h" -#include "gui/IGUITextOwner.h" +#include "gui/ObjectBases/IGUIScrollBarOwner.h" +#include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIList.h" #include diff --git a/source/gui/MiniMap.cpp b/source/gui/ObjectTypes/CMiniMap.cpp similarity index 99% rename from source/gui/MiniMap.cpp rename to source/gui/ObjectTypes/CMiniMap.cpp index 785757c820..66f7467152 100644 --- a/source/gui/MiniMap.cpp +++ b/source/gui/ObjectTypes/CMiniMap.cpp @@ -17,7 +17,7 @@ #include "precompiled.h" -#include "MiniMap.h" +#include "CMiniMap.h" #include "graphics/GameView.h" #include "graphics/LOSTexture.h" diff --git a/source/gui/MiniMap.h b/source/gui/ObjectTypes/CMiniMap.h similarity index 98% rename from source/gui/MiniMap.h rename to source/gui/ObjectTypes/CMiniMap.h index b8f6f35bbd..7278e43262 100644 --- a/source/gui/MiniMap.h +++ b/source/gui/ObjectTypes/CMiniMap.h @@ -18,8 +18,8 @@ #ifndef INCLUDED_MINIMAP #define INCLUDED_MINIMAP -#include "gui/IGUIObject.h" #include "graphics/ShaderProgramPtr.h" +#include "gui/ObjectBases/IGUIObject.h" #include "renderer/VertexArray.h" class CCamera; diff --git a/source/gui/COList.cpp b/source/gui/ObjectTypes/COList.cpp similarity index 99% rename from source/gui/COList.cpp rename to source/gui/ObjectTypes/COList.cpp index a373c66000..cdf4401e84 100644 --- a/source/gui/COList.cpp +++ b/source/gui/ObjectTypes/COList.cpp @@ -20,9 +20,9 @@ #include "COList.h" #include "gui/CGUI.h" -#include "gui/CGUIColor.h" -#include "gui/CGUIList.h" #include "gui/IGUIScrollBar.h" +#include "gui/SettingTypes/CGUIColor.h" +#include "gui/SettingTypes/CGUIList.h" #include "i18n/L10n.h" #include "ps/CLogger.h" diff --git a/source/gui/COList.h b/source/gui/ObjectTypes/COList.h similarity index 96% rename from source/gui/COList.h rename to source/gui/ObjectTypes/COList.h index b10c10d859..d1412862c6 100644 --- a/source/gui/COList.h +++ b/source/gui/ObjectTypes/COList.h @@ -17,8 +17,8 @@ #ifndef INCLUDED_COLIST #define INCLUDED_COLIST -#include "CList.h" -#include "gui/CGUIColor.h" +#include "gui/ObjectTypes/CList.h" +#include "gui/SettingTypes/CGUIColor.h" #include diff --git a/source/gui/CProgressBar.cpp b/source/gui/ObjectTypes/CProgressBar.cpp similarity index 100% rename from source/gui/CProgressBar.cpp rename to source/gui/ObjectTypes/CProgressBar.cpp diff --git a/source/gui/CProgressBar.h b/source/gui/ObjectTypes/CProgressBar.h similarity index 97% rename from source/gui/CProgressBar.h rename to source/gui/ObjectTypes/CProgressBar.h index 83faab19ec..1423784ee4 100644 --- a/source/gui/CProgressBar.h +++ b/source/gui/ObjectTypes/CProgressBar.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_CPROGRESSBAR #define INCLUDED_CPROGRESSBAR -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" #include "gui/CGUISprite.h" /** diff --git a/source/gui/CRadioButton.cpp b/source/gui/ObjectTypes/CRadioButton.cpp similarity index 100% rename from source/gui/CRadioButton.cpp rename to source/gui/ObjectTypes/CRadioButton.cpp diff --git a/source/gui/CRadioButton.h b/source/gui/ObjectTypes/CRadioButton.h similarity index 96% rename from source/gui/CRadioButton.h rename to source/gui/ObjectTypes/CRadioButton.h index cffc412b4c..189d86590b 100644 --- a/source/gui/CRadioButton.h +++ b/source/gui/ObjectTypes/CRadioButton.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_CRADIOBUTTON #define INCLUDED_CRADIOBUTTON -#include "CCheckBox.h" +#include "gui/ObjectTypes/CCheckBox.h" /** * Just like a check box, but it'll nullify its siblings (of the same kind), diff --git a/source/gui/CSlider.cpp b/source/gui/ObjectTypes/CSlider.cpp similarity index 100% rename from source/gui/CSlider.cpp rename to source/gui/ObjectTypes/CSlider.cpp diff --git a/source/gui/CSlider.h b/source/gui/ObjectTypes/CSlider.h similarity index 97% rename from source/gui/CSlider.h rename to source/gui/ObjectTypes/CSlider.h index c647ba11cf..6ed68da247 100644 --- a/source/gui/CSlider.h +++ b/source/gui/ObjectTypes/CSlider.h @@ -18,8 +18,8 @@ #ifndef INCLUDED_CSLIDER #define INCLUDED_CSLIDER -#include "gui/IGUIObject.h" #include "gui/CGUISprite.h" +#include "gui/ObjectBases/IGUIObject.h" class CSlider : public IGUIObject { diff --git a/source/gui/CText.cpp b/source/gui/ObjectTypes/CText.cpp similarity index 100% rename from source/gui/CText.cpp rename to source/gui/ObjectTypes/CText.cpp diff --git a/source/gui/CText.h b/source/gui/ObjectTypes/CText.h similarity index 94% rename from source/gui/CText.h rename to source/gui/ObjectTypes/CText.h index 22b32f1025..36cb5abfd3 100644 --- a/source/gui/CText.h +++ b/source/gui/ObjectTypes/CText.h @@ -19,9 +19,9 @@ #define INCLUDED_CTEXT #include "gui/CGUISprite.h" -#include "gui/CGUIString.h" -#include "gui/IGUIScrollBarOwner.h" -#include "gui/IGUITextOwner.h" +#include "gui/ObjectBases/IGUIScrollBarOwner.h" +#include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIString.h" /** * Text field that just displays static text. diff --git a/source/gui/CTooltip.cpp b/source/gui/ObjectTypes/CTooltip.cpp similarity index 99% rename from source/gui/CTooltip.cpp rename to source/gui/ObjectTypes/CTooltip.cpp index 7e41be3b28..869f37b372 100644 --- a/source/gui/CTooltip.cpp +++ b/source/gui/ObjectTypes/CTooltip.cpp @@ -20,7 +20,7 @@ #include "CTooltip.h" #include "gui/CGUI.h" -#include "gui/CGUIString.h" +#include "gui/SettingTypes/CGUIString.h" #include "gui/CGUIText.h" #include diff --git a/source/gui/CTooltip.h b/source/gui/ObjectTypes/CTooltip.h similarity index 94% rename from source/gui/CTooltip.h rename to source/gui/ObjectTypes/CTooltip.h index a9f2f6e206..51305cd696 100644 --- a/source/gui/CTooltip.h +++ b/source/gui/ObjectTypes/CTooltip.h @@ -18,9 +18,9 @@ #ifndef INCLUDED_CTOOLTIP #define INCLUDED_CTOOLTIP -#include "gui/IGUITextOwner.h" +#include "gui/ObjectBases/IGUITextOwner.h" #include "gui/CGUISprite.h" -#include "gui/CGUIString.h" +#include "gui/SettingTypes/CGUIString.h" /** * Dynamic tooltips. Similar to CText. diff --git a/source/gui/scripting/GuiScriptConversions.cpp b/source/gui/Scripting/GuiScriptConversions.cpp similarity index 97% rename from source/gui/scripting/GuiScriptConversions.cpp rename to source/gui/Scripting/GuiScriptConversions.cpp index 26a217000b..ac6b36d039 100644 --- a/source/gui/scripting/GuiScriptConversions.cpp +++ b/source/gui/Scripting/GuiScriptConversions.cpp @@ -17,11 +17,11 @@ #include "precompiled.h" -#include "gui/CGUIColor.h" -#include "gui/CGUIList.h" -#include "gui/CGUISeries.h" -#include "gui/CGUISize.h" -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" +#include "gui/SettingTypes/CGUIColor.h" +#include "gui/SettingTypes/CGUIList.h" +#include "gui/SettingTypes/CGUISeries.h" +#include "gui/SettingTypes/CGUISize.h" #include "lib/external_libraries/libsdl.h" #include "maths/Vector2D.h" #include "ps/Hotkey.h" diff --git a/source/gui/scripting/JSInterface_GUIManager.cpp b/source/gui/Scripting/JSInterface_GUIManager.cpp similarity index 99% rename from source/gui/scripting/JSInterface_GUIManager.cpp rename to source/gui/Scripting/JSInterface_GUIManager.cpp index 315b0d2f24..ab51075e30 100644 --- a/source/gui/scripting/JSInterface_GUIManager.cpp +++ b/source/gui/Scripting/JSInterface_GUIManager.cpp @@ -21,7 +21,7 @@ #include "gui/CGUI.h" #include "gui/GUIManager.h" -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" #include "ps/GameSetup/Config.h" #include "scriptinterface/ScriptInterface.h" diff --git a/source/gui/scripting/JSInterface_GUIManager.h b/source/gui/Scripting/JSInterface_GUIManager.h similarity index 100% rename from source/gui/scripting/JSInterface_GUIManager.h rename to source/gui/Scripting/JSInterface_GUIManager.h diff --git a/source/gui/scripting/JSInterface_GUISize.cpp b/source/gui/Scripting/JSInterface_GUISize.cpp similarity index 100% rename from source/gui/scripting/JSInterface_GUISize.cpp rename to source/gui/Scripting/JSInterface_GUISize.cpp diff --git a/source/gui/scripting/JSInterface_GUISize.h b/source/gui/Scripting/JSInterface_GUISize.h similarity index 100% rename from source/gui/scripting/JSInterface_GUISize.h rename to source/gui/Scripting/JSInterface_GUISize.h diff --git a/source/gui/scripting/JSInterface_IGUIObject.cpp b/source/gui/Scripting/JSInterface_IGUIObject.cpp similarity index 99% rename from source/gui/scripting/JSInterface_IGUIObject.cpp rename to source/gui/Scripting/JSInterface_IGUIObject.cpp index 746049b236..79a17a0928 100644 --- a/source/gui/scripting/JSInterface_IGUIObject.cpp +++ b/source/gui/Scripting/JSInterface_IGUIObject.cpp @@ -21,7 +21,7 @@ #include "gui/CGUI.h" #include "gui/CGUISetting.h" -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" #include "scriptinterface/ScriptExtraHeaders.h" #include "scriptinterface/ScriptInterface.h" diff --git a/source/gui/scripting/JSInterface_IGUIObject.h b/source/gui/Scripting/JSInterface_IGUIObject.h similarity index 100% rename from source/gui/scripting/JSInterface_IGUIObject.h rename to source/gui/Scripting/JSInterface_IGUIObject.h diff --git a/source/gui/scripting/ScriptFunctions.cpp b/source/gui/Scripting/ScriptFunctions.cpp similarity index 95% rename from source/gui/scripting/ScriptFunctions.cpp rename to source/gui/Scripting/ScriptFunctions.cpp index 90d8232802..6b692dead6 100644 --- a/source/gui/scripting/ScriptFunctions.cpp +++ b/source/gui/Scripting/ScriptFunctions.cpp @@ -20,9 +20,9 @@ #include "ScriptFunctions.h" #include "graphics/scripting/JSInterface_GameView.h" -#include "gui/scripting/JSInterface_GUIManager.h" -#include "gui/scripting/JSInterface_GUISize.h" -#include "gui/scripting/JSInterface_IGUIObject.h" +#include "gui/Scripting/JSInterface_GUIManager.h" +#include "gui/Scripting/JSInterface_GUISize.h" +#include "gui/Scripting/JSInterface_IGUIObject.h" #include "i18n/scripting/JSInterface_L10n.h" #include "lobby/scripting/JSInterface_Lobby.h" #include "network/scripting/JSInterface_Network.h" diff --git a/source/gui/scripting/ScriptFunctions.h b/source/gui/Scripting/ScriptFunctions.h similarity index 100% rename from source/gui/scripting/ScriptFunctions.h rename to source/gui/Scripting/ScriptFunctions.h diff --git a/source/gui/CGUIColor.cpp b/source/gui/SettingTypes/CGUIColor.cpp similarity index 100% rename from source/gui/CGUIColor.cpp rename to source/gui/SettingTypes/CGUIColor.cpp diff --git a/source/gui/CGUIColor.h b/source/gui/SettingTypes/CGUIColor.h similarity index 100% rename from source/gui/CGUIColor.h rename to source/gui/SettingTypes/CGUIColor.h diff --git a/source/gui/CGUIList.h b/source/gui/SettingTypes/CGUIList.h similarity index 96% rename from source/gui/CGUIList.h rename to source/gui/SettingTypes/CGUIList.h index 676c80324a..a46644c610 100644 --- a/source/gui/CGUIList.h +++ b/source/gui/SettingTypes/CGUIList.h @@ -18,7 +18,7 @@ #ifndef INCLUDED_CGUILIST #define INCLUDED_CGUILIST -#include "gui/CGUIString.h" +#include "gui/SettingTypes/CGUIString.h" #include diff --git a/source/gui/CGUISeries.h b/source/gui/SettingTypes/CGUISeries.h similarity index 100% rename from source/gui/CGUISeries.h rename to source/gui/SettingTypes/CGUISeries.h diff --git a/source/gui/CGUISize.cpp b/source/gui/SettingTypes/CGUISize.cpp similarity index 99% rename from source/gui/CGUISize.cpp rename to source/gui/SettingTypes/CGUISize.cpp index a9c95f9b5f..343e98ed18 100644 --- a/source/gui/CGUISize.cpp +++ b/source/gui/SettingTypes/CGUISize.cpp @@ -19,7 +19,7 @@ #include "CGUISize.h" -#include "gui/scripting/JSInterface_GUISize.h" +#include "gui/Scripting/JSInterface_GUISize.h" #include "ps/CLogger.h" CGUISize::CGUISize() diff --git a/source/gui/CGUISize.h b/source/gui/SettingTypes/CGUISize.h similarity index 100% rename from source/gui/CGUISize.h rename to source/gui/SettingTypes/CGUISize.h diff --git a/source/gui/CGUIString.cpp b/source/gui/SettingTypes/CGUIString.cpp similarity index 100% rename from source/gui/CGUIString.cpp rename to source/gui/SettingTypes/CGUIString.cpp diff --git a/source/gui/CGUIString.h b/source/gui/SettingTypes/CGUIString.h similarity index 100% rename from source/gui/CGUIString.h rename to source/gui/SettingTypes/CGUIString.h diff --git a/source/gui/EAlign.h b/source/gui/SettingTypes/EAlign.h similarity index 100% rename from source/gui/EAlign.h rename to source/gui/SettingTypes/EAlign.h diff --git a/source/gui/tests/test_ParseString.h b/source/gui/tests/test_ParseString.h index 9b887cd3a6..f579914296 100644 --- a/source/gui/tests/test_ParseString.h +++ b/source/gui/tests/test_ParseString.h @@ -17,7 +17,7 @@ #include "lib/self_test.h" -#include "gui/CGUISize.h" +#include "gui/SettingTypes/CGUISize.h" #include "gui/CGUI.h" #include "ps/CLogger.h" diff --git a/source/pch/gui/precompiled.h b/source/pch/gui/precompiled.h index 61ff4379e8..9a0da39aa6 100644 --- a/source/pch/gui/precompiled.h +++ b/source/pch/gui/precompiled.h @@ -25,7 +25,7 @@ #if HAVE_PCH #include "gui/CGUI.h" -#include "gui/IGUIObject.h" +#include "gui/ObjectBases/IGUIObject.h" #include "ps/CStr.h" #include "scriptinterface/ScriptInterface.h"