Sort GUI files into ObjectTypes ObjectBases SettingTypes subdirectories
ClosedPublic
Actions

Authored by elexis on Oct 1 2019, 11:40 PM.

Details

Reviewers: None
Commits: rP23028: Sort GUI Object types, GUI Object bases and GUI Setting value types into three…

Summary

There are 15 instantiable GUI Object types (defined in 29 files),
four different abstract GUI Object base classes (defined in 8 files),
six different GUI Setting types (defined in 9 files)
that are not commonly used in other GUI contexts.

There are the following advantages of gruping these files into folders:

Allows identification of all files of one group immediately.
It's easier to get an overview of which components are present that are not Objects nor Settings (neglected types).
Differences between the types within a group stick out more.
One can traverse all files of one group when wanting to read or modify that group. For example when changing the virtual methods of the multiple GUI Object base classes, all GUI object types need to be checked and possibly updated. Then one is happy if there is a subfolder with all these files.

Discussion with Vladislav on http://irclogs.wildfiregames.com/2019-10/2019-10-01-QuakeNet-%230ad-dev.log.

Test Plan

Notice there are only renamed files (finally MiniMap -> CMiniMap!). Notice it compiles.
Notice that alphabetic order of headers is correct.
Verify that premake has all changed and that nothing else needs to keep track of source directories.

Diff Detail

Repository

rP 0 A.D. Public Repository

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

elexis created this revision.Oct 1 2019, 11:40 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/docker-differential/891/display/redirect

Harbormaster failed remote builds in B9685: Diff 10041!Oct 1 2019, 11:40 PM

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/375/display/redirect

Build failure - The Moirai have given mortals hearts that can endure.

Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/381/display/redirect

Jenkins doesn't apply the pathc on gcc nor VS2015.
VS2015 on my end doesnt apply the patch generated from svn diff, nor the one downloaded from this page.

The svn diff format is very fishy with regards to moved files, I often had bad experience with this.

This is what I have in my working copy (that I rather not lose knowing that the patches derive from the working copy dont apply):

M       build/premake/premake5.lua
D       source/gui/CButton.cpp
        > moved to source/gui/ObjectTypes/CButton.cpp
D       source/gui/CButton.h
        > moved to source/gui/ObjectTypes/CButton.h
D       source/gui/CChart.cpp
        > moved to source/gui/ObjectTypes/CChart.cpp
D       source/gui/CChart.h
        > moved to source/gui/ObjectTypes/CChart.h
D       source/gui/CCheckBox.cpp
        > moved to source/gui/ObjectTypes/CCheckBox.cpp
D       source/gui/CCheckBox.h
        > moved to source/gui/ObjectTypes/CCheckBox.h
D       source/gui/CDropDown.cpp
        > moved to source/gui/ObjectTypes/CDropDown.cpp
D       source/gui/CDropDown.h
        > moved to source/gui/ObjectTypes/CDropDown.h
M       source/gui/CGUI.cpp
M       source/gui/CGUI.h
D       source/gui/CGUIColor.cpp
        > moved to source/gui/SettingTypes/CGUIColor.cpp
D       source/gui/CGUIColor.h
        > moved to source/gui/SettingTypes/CGUIColor.h
D       source/gui/CGUIDummyObject.h
        > moved to source/gui/ObjectTypes/CGUIDummyObject.h
D       source/gui/CGUIList.h
        > moved to source/gui/SettingTypes/CGUIList.h
D       source/gui/CGUISeries.h
        > moved to source/gui/SettingTypes/CGUISeries.h
M       source/gui/CGUISetting.cpp
M       source/gui/CGUISetting.h
D       source/gui/CGUISize.cpp
        > moved to source/gui/SettingTypes/CGUISize.cpp
D       source/gui/CGUISize.h
        > moved to source/gui/SettingTypes/CGUISize.h
M       source/gui/CGUISprite.h
D       source/gui/CGUIString.cpp
        > moved to source/gui/SettingTypes/CGUIString.cpp
D       source/gui/CGUIString.h
        > moved to source/gui/SettingTypes/CGUIString.h
M       source/gui/CGUIText.cpp
M       source/gui/CGUIText.h
D       source/gui/CImage.cpp
        > moved to source/gui/ObjectTypes/CImage.cpp
D       source/gui/CImage.h
        > moved to source/gui/ObjectTypes/CImage.h
D       source/gui/CInput.cpp
        > moved to source/gui/ObjectTypes/CInput.cpp
D       source/gui/CInput.h
        > moved to source/gui/ObjectTypes/CInput.h
D       source/gui/CList.cpp
        > moved to source/gui/ObjectTypes/CList.cpp
D       source/gui/CList.h
        > moved to source/gui/ObjectTypes/CList.h
D       source/gui/COList.cpp
        > moved to source/gui/ObjectTypes/COList.cpp
D       source/gui/COList.h
        > moved to source/gui/ObjectTypes/COList.h
D       source/gui/CProgressBar.cpp
        > moved to source/gui/ObjectTypes/CProgressBar.cpp
D       source/gui/CProgressBar.h
        > moved to source/gui/ObjectTypes/CProgressBar.h
D       source/gui/CRadioButton.cpp
        > moved to source/gui/ObjectTypes/CRadioButton.cpp
D       source/gui/CRadioButton.h
        > moved to source/gui/ObjectTypes/CRadioButton.h
D       source/gui/CSlider.cpp
        > moved to source/gui/ObjectTypes/CSlider.cpp
D       source/gui/CSlider.h
        > moved to source/gui/ObjectTypes/CSlider.h
D       source/gui/CText.cpp
        > moved to source/gui/ObjectTypes/CText.cpp
D       source/gui/CText.h
        > moved to source/gui/ObjectTypes/CText.h
D       source/gui/CTooltip.cpp
        > moved to source/gui/ObjectTypes/CTooltip.cpp
D       source/gui/CTooltip.h
        > moved to source/gui/ObjectTypes/CTooltip.h
D       source/gui/EAlign.h
        > moved to source/gui/SettingTypes/EAlign.h
M       source/gui/GUIRenderer.cpp
M       source/gui/GUIRenderer.h
A  +    source/gui/GUISettingTypes.h
        > moved from source/gui/GUItypes.h
M       source/gui/GUIStringConversions.cpp
M       source/gui/GUITooltip.cpp
D       source/gui/GUItypes.h
        > moved to source/gui/GUISettingTypes.h
D       source/gui/IGUIButtonBehavior.cpp
        > moved to source/gui/ObjectBases/IGUIButtonBehavior.cpp
D       source/gui/IGUIButtonBehavior.h
        > moved to source/gui/ObjectBases/IGUIButtonBehavior.h
D       source/gui/IGUIObject.cpp
        > moved to source/gui/ObjectBases/IGUIObject.cpp
D       source/gui/IGUIObject.h
        > moved to source/gui/ObjectBases/IGUIObject.h
M       source/gui/IGUIScrollBar.cpp
D       source/gui/IGUIScrollBarOwner.cpp
        > moved to source/gui/ObjectBases/IGUIScrollBarOwner.cpp
D       source/gui/IGUIScrollBarOwner.h
        > moved to source/gui/ObjectBases/IGUIScrollBarOwner.h
D       source/gui/IGUITextOwner.cpp
        > moved to source/gui/ObjectBases/IGUITextOwner.cpp
D       source/gui/IGUITextOwner.h
        > moved to source/gui/ObjectBases/IGUITextOwner.h
D       source/gui/MiniMap.cpp
        > moved to source/gui/ObjectTypes/CMiniMap.cpp
D       source/gui/MiniMap.h
        > moved to source/gui/ObjectTypes/CMiniMap.h
A       source/gui/ObjectBases
A  +    source/gui/ObjectBases/IGUIButtonBehavior.cpp
        > moved from source/gui/IGUIButtonBehavior.cpp
A  +    source/gui/ObjectBases/IGUIButtonBehavior.h
        > moved from source/gui/IGUIButtonBehavior.h
A  +    source/gui/ObjectBases/IGUIObject.cpp
        > moved from source/gui/IGUIObject.cpp
A  +    source/gui/ObjectBases/IGUIObject.h
        > moved from source/gui/IGUIObject.h
A  +    source/gui/ObjectBases/IGUIScrollBarOwner.cpp
        > moved from source/gui/IGUIScrollBarOwner.cpp
A  +    source/gui/ObjectBases/IGUIScrollBarOwner.h
        > moved from source/gui/IGUIScrollBarOwner.h
A  +    source/gui/ObjectBases/IGUITextOwner.cpp
        > moved from source/gui/IGUITextOwner.cpp
A  +    source/gui/ObjectBases/IGUITextOwner.h
        > moved from source/gui/IGUITextOwner.h
A       source/gui/ObjectTypes
A  +    source/gui/ObjectTypes/CButton.cpp
        > moved from source/gui/CButton.cpp
A  +    source/gui/ObjectTypes/CButton.h
        > moved from source/gui/CButton.h
A  +    source/gui/ObjectTypes/CChart.cpp
        > moved from source/gui/CChart.cpp
A  +    source/gui/ObjectTypes/CChart.h
        > moved from source/gui/CChart.h
A  +    source/gui/ObjectTypes/CCheckBox.cpp
        > moved from source/gui/CCheckBox.cpp
A  +    source/gui/ObjectTypes/CCheckBox.h
        > moved from source/gui/CCheckBox.h
A  +    source/gui/ObjectTypes/CDropDown.cpp
        > moved from source/gui/CDropDown.cpp
A  +    source/gui/ObjectTypes/CDropDown.h
        > moved from source/gui/CDropDown.h
A  +    source/gui/ObjectTypes/CGUIDummyObject.h
        > moved from source/gui/CGUIDummyObject.h
A  +    source/gui/ObjectTypes/CImage.cpp
        > moved from source/gui/CImage.cpp
A  +    source/gui/ObjectTypes/CImage.h
        > moved from source/gui/CImage.h
A  +    source/gui/ObjectTypes/CInput.cpp
        > moved from source/gui/CInput.cpp
A  +    source/gui/ObjectTypes/CInput.h
        > moved from source/gui/CInput.h
A  +    source/gui/ObjectTypes/CList.cpp
        > moved from source/gui/CList.cpp
A  +    source/gui/ObjectTypes/CList.h
        > moved from source/gui/CList.h
A  +    source/gui/ObjectTypes/CMiniMap.cpp
        > moved from source/gui/MiniMap.cpp
A  +    source/gui/ObjectTypes/CMiniMap.h
        > moved from source/gui/MiniMap.h
A  +    source/gui/ObjectTypes/COList.cpp
        > moved from source/gui/COList.cpp
A  +    source/gui/ObjectTypes/COList.h
        > moved from source/gui/COList.h
A  +    source/gui/ObjectTypes/CProgressBar.cpp
        > moved from source/gui/CProgressBar.cpp
A  +    source/gui/ObjectTypes/CProgressBar.h
        > moved from source/gui/CProgressBar.h
A  +    source/gui/ObjectTypes/CRadioButton.cpp
        > moved from source/gui/CRadioButton.cpp
A  +    source/gui/ObjectTypes/CRadioButton.h
        > moved from source/gui/CRadioButton.h
A  +    source/gui/ObjectTypes/CSlider.cpp
        > moved from source/gui/CSlider.cpp
A  +    source/gui/ObjectTypes/CSlider.h
        > moved from source/gui/CSlider.h
A  +    source/gui/ObjectTypes/CText.cpp
        > moved from source/gui/CText.cpp
A  +    source/gui/ObjectTypes/CText.h
        > moved from source/gui/CText.h
A  +    source/gui/ObjectTypes/CTooltip.cpp
        > moved from source/gui/CTooltip.cpp
A  +    source/gui/ObjectTypes/CTooltip.h
        > moved from source/gui/CTooltip.h
A  +    source/gui/Scripting
        > moved from source/gui/scripting
M  +    source/gui/Scripting/GuiScriptConversions.cpp
M  +    source/gui/Scripting/JSInterface_GUIManager.cpp
M  +    source/gui/Scripting/JSInterface_IGUIObject.cpp
M  +    source/gui/Scripting/ScriptFunctions.cpp
A       source/gui/SettingTypes
A  +    source/gui/SettingTypes/CGUIColor.cpp
        > moved from source/gui/CGUIColor.cpp
A  +    source/gui/SettingTypes/CGUIColor.h
        > moved from source/gui/CGUIColor.h
A  +    source/gui/SettingTypes/CGUIList.h
        > moved from source/gui/CGUIList.h
A  +    source/gui/SettingTypes/CGUISeries.h
        > moved from source/gui/CGUISeries.h
A  +    source/gui/SettingTypes/CGUISize.cpp
        > moved from source/gui/CGUISize.cpp
A  +    source/gui/SettingTypes/CGUISize.h
        > moved from source/gui/CGUISize.h
A  +    source/gui/SettingTypes/CGUIString.cpp
        > moved from source/gui/CGUIString.cpp
A  +    source/gui/SettingTypes/CGUIString.h
        > moved from source/gui/CGUIString.h
A  +    source/gui/SettingTypes/EAlign.h
        > moved from source/gui/EAlign.h
D       source/gui/scripting
        > moved to source/gui/Scripting
M       source/gui/tests/test_ParseString.h
M       source/pch/gui/precompiled.h

Here the folder after sorting:

./CGUI.cpp
./CGUI.h
./CGUIScrollBarVertical.cpp
./CGUIScrollBarVertical.h
./CGUISetting.cpp
./CGUISetting.h
./CGUISprite.cpp
./CGUISprite.h
./CGUIText.cpp
./CGUIText.h
./GUIManager.cpp
./GUIManager.h
./GUIMatrix.cpp
./GUIMatrix.h
./GUIRenderer.cpp
./GUIRenderer.h
./GUISettingTypes.h
./GUIStringConversions.cpp
./GUITooltip.cpp
./GUITooltip.h
./IGUIScrollBar.cpp
./IGUIScrollBar.h
./ObjectBases/IGUIButtonBehavior.cpp
./ObjectBases/IGUIButtonBehavior.h
./ObjectBases/IGUIObject.cpp
./ObjectBases/IGUIObject.h
./ObjectBases/IGUIScrollBarOwner.cpp
./ObjectBases/IGUIScrollBarOwner.h
./ObjectBases/IGUITextOwner.cpp
./ObjectBases/IGUITextOwner.h
./ObjectTypes/CButton.cpp
./ObjectTypes/CButton.h
./ObjectTypes/CChart.cpp
./ObjectTypes/CChart.h
./ObjectTypes/CCheckBox.cpp
./ObjectTypes/CCheckBox.h
./ObjectTypes/CDropDown.cpp
./ObjectTypes/CDropDown.h
./ObjectTypes/CGUIDummyObject.h
./ObjectTypes/CImage.cpp
./ObjectTypes/CImage.h
./ObjectTypes/CInput.cpp
./ObjectTypes/CInput.h
./ObjectTypes/CList.cpp
./ObjectTypes/CList.h
./ObjectTypes/CMiniMap.cpp
./ObjectTypes/CMiniMap.h
./ObjectTypes/COList.cpp
./ObjectTypes/COList.h
./ObjectTypes/CProgressBar.cpp
./ObjectTypes/CProgressBar.h
./ObjectTypes/CRadioButton.cpp
./ObjectTypes/CRadioButton.h
./ObjectTypes/CSlider.cpp
./ObjectTypes/CSlider.h
./ObjectTypes/CText.cpp
./ObjectTypes/CText.h
./ObjectTypes/CTooltip.cpp
./ObjectTypes/CTooltip.h
./Scripting/GuiScriptConversions.cpp
./Scripting/JSInterface_GUIManager.cpp
./Scripting/JSInterface_GUIManager.h
./Scripting/JSInterface_GUISize.cpp
./Scripting/JSInterface_GUISize.h
./Scripting/JSInterface_IGUIObject.cpp
./Scripting/JSInterface_IGUIObject.h
./Scripting/ScriptFunctions.cpp
./Scripting/ScriptFunctions.h
./SettingTypes/CGUIColor.cpp
./SettingTypes/CGUIColor.h
./SettingTypes/CGUIList.h
./SettingTypes/CGUISeries.h
./SettingTypes/CGUISize.cpp
./SettingTypes/CGUISize.h
./SettingTypes/CGUIString.cpp
./SettingTypes/CGUIString.h
./SettingTypes/EAlign.h
./SGUIIcon.h
./SGUIMessage.h
./SGUIStyle.h
./tests/test_GuiManager.h
./tests/test_ParseString.h

That the patch doesnt delete a file is shown with svn status:

[user@user gui]$ svn status | grep -v '^?' | grep ^A | wc -l
51
[user@user gui]$ svn status | grep -v '^?' | grep ^D | wc -l
48
[user@user gui]$ svn status | grep -v '^?' | grep ^A | grep -v '/'
A  +    GUISettingTypes.h
A       ObjectBases
A       ObjectTypes
A  +    Scripting
A       SettingTypes

Did a make clean, clean-workspaces.sh --preserve-libs, update-workspaces.sh, make -j3 (gcc), to test again.
Created the patch originally with clang if Im not mistaken.
Always testing without precompiled headers.

Here the diff cleaned of deletes:

Index: build/premake/premake5.lua
===================================================================
--- build/premake/premake5.lua	(revision 23026)
+++ build/premake/premake5.lua	(working copy)
@@ -757,11 +757,14 @@ function setup_all_libs ()
 	setup_static_lib_project("atlas", source_dirs, extern_libs, {})
 
 
 	source_dirs = {
 		"gui",
-		"gui/scripting",
+		"gui/ObjectTypes",
+		"gui/ObjectBases",
+		"gui/Scripting",
+		"gui/SettingTypes",
 		"i18n"
 	}
 	extern_libs = {
 		"spidermonkey",
 		"sdl",	-- key definitions
Index: source/gui/CGUI.cpp
===================================================================
--- source/gui/CGUI.cpp	(revision 23026)
+++ source/gui/CGUI.cpp	(working copy)
@@ -17,27 +17,26 @@
 
 #include "precompiled.h"
 
 #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"
 #include "lib/sysdep/sysdep.h"
 #include "lib/timer.h"
@@ -49,11 +48,10 @@
 #include "ps/Hotkey.h"
 #include "ps/Profile.h"
 #include "ps/Pyrogenesis.h"
 #include "ps/XML/Xeromyces.h"
 #include "renderer/Renderer.h"
-#include "scripting/ScriptFunctions.h"
 #include "scriptinterface/ScriptInterface.h"
 
 #include <string>
 
 extern int g_yres;
Index: source/gui/CGUI.h
===================================================================
--- source/gui/CGUI.h	(revision 23026)
+++ source/gui/CGUI.h	(working copy)
@@ -21,13 +21,13 @@
  */
 
 #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"
 #include "ps/Shapes.h"
 #include "ps/XML/Xeromyces.h"
Index: source/gui/CGUISetting.cpp
===================================================================
--- source/gui/CGUISetting.cpp	(revision 23026)
+++ source/gui/CGUISetting.cpp	(working copy)
@@ -82,7 +82,7 @@ void CGUISetting<T>::ToJSVal(JSContext*
 };
 
 #define TYPE(T) \
 	template class CGUISetting<T>; \
 
-#include "GUItypes.h"
+#include "gui/GUISettingTypes.h"
 #undef TYPE
Index: source/gui/CGUISetting.h
===================================================================
--- source/gui/CGUISetting.h	(revision 23026)
+++ source/gui/CGUISetting.h	(working copy)
@@ -16,11 +16,11 @@
  */
 
 #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.
  * This is fact is used for setting the value from a JS value or XML value (string) and when deleting the setting,
  * when the type of the setting value is not known in advance.
Index: source/gui/CGUIText.cpp
===================================================================
--- source/gui/CGUIText.cpp	(revision 23026)
+++ source/gui/CGUIText.cpp	(working copy)
@@ -21,12 +21,12 @@
 
 #include "graphics/FontMetrics.h"
 #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 <math.h>
 
 extern int g_xres, g_yres;
Index: source/gui/CGUIText.h
===================================================================
--- source/gui/CGUIText.h	(revision 23026)
+++ source/gui/CGUIText.h	(working copy)
@@ -16,13 +16,13 @@
  */
 
 #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"
 
 #include <array>
 #include <list>
Index: source/gui/GUIRenderer.cpp
===================================================================
--- source/gui/GUIRenderer.cpp	(revision 23026)
+++ source/gui/GUIRenderer.cpp	(working copy)
@@ -20,13 +20,13 @@
 #include "GUIRenderer.h"
 
 #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"
 #include "lib/tex/tex.h"
 #include "lib/utf8.h"
Index: source/gui/GUIRenderer.h
===================================================================
--- source/gui/GUIRenderer.h	(revision 23026)
+++ source/gui/GUIRenderer.h	(working copy)
@@ -18,11 +18,11 @@
 #ifndef INCLUDED_GUIRENDERER
 #define INCLUDED_GUIRENDERER
 
 #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"
 
 #include <map>
Index: source/gui/GUISettingTypes.h
===================================================================
--- source/gui/GUISettingTypes.h	(revision 23026)
+++ source/gui/GUISettingTypes.h	(working copy)
@@ -18,29 +18,29 @@
 /*
 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)
 TYPE(float)
 TYPE(EAlign)
 TYPE(EVAlign)
 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)
 TYPE(CGUISeries)
 TYPE(CGUISpriteInstance)
Index: source/gui/GUIStringConversions.cpp
===================================================================
--- source/gui/GUIStringConversions.cpp	(revision 23026)
+++ source/gui/GUIStringConversions.cpp	(working copy)
@@ -16,11 +16,11 @@
  */
 
 #include "precompiled.h"
 
 #include "gui/CGUI.h"
-#include "gui/CGUIString.h"
+#include "gui/SettingTypes/CGUIString.h"
 #include "ps/CLogger.h"
 
 class CGUIList;
 class CGUISeries;
 
Index: source/gui/GUITooltip.cpp
===================================================================
--- source/gui/GUITooltip.cpp	(revision 23026)
+++ source/gui/GUITooltip.cpp	(working copy)
@@ -18,11 +18,11 @@
 #include "precompiled.h"
 
 #include "GUITooltip.h"
 
 #include "gui/CGUI.h"
-#include "gui/IGUIObject.h"
+#include "gui/ObjectBases/IGUIObject.h"
 #include "lib/timer.h"
 #include "ps/CLogger.h"
 
 /*
 	Tooltips:
Index: source/gui/IGUIScrollBar.cpp
===================================================================
--- source/gui/IGUIScrollBar.cpp	(revision 23026)
+++ source/gui/IGUIScrollBar.cpp	(working copy)
@@ -17,12 +17,12 @@
 
 #include "precompiled.h"
 
 #include "IGUIScrollBar.h"
 
-#include "gui/IGUIScrollBarOwner.h"
 #include "gui/CGUI.h"
+#include "gui/ObjectBases/IGUIScrollBarOwner.h"
 #include "maths/MathUtil.h"
 
 IGUIScrollBar::IGUIScrollBar(CGUI& pGUI)
 	: m_pGUI(pGUI),
 	 m_pStyle(nullptr),
Index: source/gui/ObjectBases/IGUIButtonBehavior.cpp
===================================================================
Index: source/gui/ObjectBases/IGUIButtonBehavior.h
===================================================================
--- source/gui/ObjectBases/IGUIButtonBehavior.h	(revision 23026)
+++ source/gui/ObjectBases/IGUIButtonBehavior.h	(working copy)
@@ -24,11 +24,11 @@
 */
 
 #ifndef INCLUDED_IGUIBUTTONBEHAVIOR
 #define INCLUDED_IGUIBUTTONBEHAVIOR
 
-#include "gui/IGUIObject.h"
+#include "gui/ObjectBases/IGUIObject.h"
 
 class CGUISpriteInstance;
 
 /**
  * Appends button behaviours to the IGUIObject.
Index: source/gui/ObjectBases/IGUIObject.cpp
===================================================================
--- source/gui/ObjectBases/IGUIObject.cpp	(revision 23026)
+++ source/gui/ObjectBases/IGUIObject.cpp	(working copy)
@@ -535,16 +535,16 @@ void IGUIObject::TraceMember(JSTracer* t
 	template void IGUIObject::RegisterSetting<T>(const CStr& Name, T& Value); \
 	template T& IGUIObject::GetSetting<T>(const CStr& Setting); \
 	template const T& IGUIObject::GetSetting<T>(const CStr& Setting) const; \
 	template void IGUIObject::SetSetting<T>(const CStr& Setting, T& Value, const bool SendMessage); \
 
-#include "gui/GUItypes.h"
+#include "gui/GUISettingTypes.h"
 #undef TYPE
 
 // Copying functions - discouraged except for primitives.
 #define TYPE(T) \
 	template void IGUIObject::SetSetting<T>(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
Index: source/gui/ObjectBases/IGUIObject.h
===================================================================
--- source/gui/ObjectBases/IGUIObject.h	(revision 23026)
+++ source/gui/ObjectBases/IGUIObject.h	(working copy)
@@ -23,12 +23,12 @@
  */
 
 #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"
 
 #include <map>
Index: source/gui/ObjectBases/IGUIScrollBarOwner.cpp
===================================================================
Index: source/gui/ObjectBases/IGUIScrollBarOwner.h
===================================================================
--- source/gui/ObjectBases/IGUIScrollBarOwner.h	(revision 23026)
+++ source/gui/ObjectBases/IGUIScrollBarOwner.h	(working copy)
@@ -16,11 +16,11 @@
  */
 
 #ifndef INCLUDED_IGUISCROLLBAROWNER
 #define INCLUDED_IGUISCROLLBAROWNER
 
-#include "gui/IGUIObject.h"
+#include "gui/ObjectBases/IGUIObject.h"
 
 #include <vector>
 
 struct SGUIScrollBarStyle;
 class IGUIScrollBar;
Index: source/gui/ObjectBases/IGUITextOwner.cpp
===================================================================
--- source/gui/ObjectBases/IGUITextOwner.cpp	(revision 23026)
+++ source/gui/ObjectBases/IGUITextOwner.cpp	(working copy)
@@ -18,11 +18,11 @@
 #include "precompiled.h"
 
 #include "IGUITextOwner.h"
 
 #include "gui/CGUI.h"
-#include "gui/CGUIString.h"
+#include "gui/SettingTypes/CGUIString.h"
 
 #include <math.h>
 
 IGUITextOwner::IGUITextOwner(IGUIObject& pObject)
 	: m_pObject(pObject),
Index: source/gui/ObjectBases/IGUITextOwner.h
===================================================================
--- source/gui/ObjectBases/IGUITextOwner.h	(revision 23026)
+++ source/gui/ObjectBases/IGUITextOwner.h	(working copy)
@@ -28,11 +28,11 @@ GUI Object Base - Text Owner
 */
 
 #ifndef INCLUDED_IGUITEXTOWNER
 #define INCLUDED_IGUITEXTOWNER
 
-#include "gui/IGUIObject.h"
+#include "gui/ObjectBases/IGUIObject.h"
 
 #include <vector>
 
 struct CGUIColor;
 class CGUIText;
Index: source/gui/ObjectTypes/CButton.cpp
===================================================================
--- source/gui/ObjectTypes/CButton.cpp	(revision 23026)
+++ source/gui/ObjectTypes/CButton.cpp	(working copy)
@@ -18,12 +18,12 @@
 #include "precompiled.h"
 
 #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),
 	  IGUIButtonBehavior(*static_cast<IGUIObject*>(this)),
 	  IGUITextOwner(*static_cast<IGUIObject*>(this)),
Index: source/gui/ObjectTypes/CButton.h
===================================================================
--- source/gui/ObjectTypes/CButton.h	(revision 23026)
+++ source/gui/ObjectTypes/CButton.h	(working copy)
@@ -16,15 +16,15 @@
  */
 
 #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
 {
 	GUI_OBJECT(CButton)
 
Index: source/gui/ObjectTypes/CChart.cpp
===================================================================
--- source/gui/ObjectTypes/CChart.cpp	(revision 23026)
+++ source/gui/ObjectTypes/CChart.cpp	(working copy)
@@ -18,14 +18,14 @@
 #include "precompiled.h"
 
 #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"
 
 #include <cmath>
Index: source/gui/ObjectTypes/CChart.h
===================================================================
--- source/gui/ObjectTypes/CChart.h	(revision 23026)
+++ source/gui/ObjectTypes/CChart.h	(working copy)
@@ -17,14 +17,14 @@
 
 #ifndef INCLUDED_CCHART
 #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 <vector>
 
 struct CChartData
Index: source/gui/ObjectTypes/CCheckBox.cpp
===================================================================
Index: source/gui/ObjectTypes/CCheckBox.h
===================================================================
--- source/gui/ObjectTypes/CCheckBox.h	(revision 23026)
+++ source/gui/ObjectTypes/CCheckBox.h	(working copy)
@@ -17,11 +17,11 @@
 
 #ifndef INCLUDED_CCHECKBOX
 #define INCLUDED_CCHECKBOX
 
 #include "gui/CGUISprite.h"
-#include "gui/IGUIButtonBehavior.h"
+#include "gui/ObjectBases/IGUIButtonBehavior.h"
 
 class CCheckBox : public IGUIObject, public IGUIButtonBehavior
 {
 	GUI_OBJECT(CCheckBox)
 
Index: source/gui/ObjectTypes/CDropDown.cpp
===================================================================
--- source/gui/ObjectTypes/CDropDown.cpp	(revision 23026)
+++ source/gui/ObjectTypes/CDropDown.cpp	(working copy)
@@ -18,13 +18,13 @@
 #include "precompiled.h"
 
 #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"
 
 CDropDown::CDropDown(CGUI& pGUI)
Index: source/gui/ObjectTypes/CDropDown.h
===================================================================
--- source/gui/ObjectTypes/CDropDown.h	(revision 23026)
+++ source/gui/ObjectTypes/CDropDown.h	(working copy)
@@ -27,11 +27,11 @@ GUI Object - Drop Down (list)
 
 #ifndef INCLUDED_CDROPDOWN
 #define INCLUDED_CDROPDOWN
 
 #include "gui/CGUISprite.h"
-#include "gui/CList.h"
+#include "gui/ObjectTypes/CList.h"
 
 #include <string>
 
 /**
  * Drop Down
Index: source/gui/ObjectTypes/CGUIDummyObject.h
===================================================================
--- source/gui/ObjectTypes/CGUIDummyObject.h	(revision 23026)
+++ source/gui/ObjectTypes/CGUIDummyObject.h	(working copy)
@@ -21,11 +21,11 @@
  */
 
 #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".
  */
 class CGUIDummyObject : public IGUIObject
Index: source/gui/ObjectTypes/CImage.cpp
===================================================================
Index: source/gui/ObjectTypes/CImage.h
===================================================================
--- source/gui/ObjectTypes/CImage.h	(revision 23026)
+++ source/gui/ObjectTypes/CImage.h	(working copy)
@@ -17,11 +17,11 @@
 
 #ifndef INCLUDED_CIMAGE
 #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
  * possibility to draw text.
  *
Index: source/gui/ObjectTypes/CInput.cpp
===================================================================
--- source/gui/ObjectTypes/CInput.cpp	(revision 23026)
+++ source/gui/ObjectTypes/CInput.cpp	(working copy)
@@ -17,15 +17,15 @@
 
 #include "precompiled.h"
 
 #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"
 #include "ps/ConfigDB.h"
 #include "ps/GameSetup/Config.h"
Index: source/gui/ObjectTypes/CInput.h
===================================================================
--- source/gui/ObjectTypes/CInput.h	(revision 23026)
+++ source/gui/ObjectTypes/CInput.h	(working copy)
@@ -16,12 +16,12 @@
  */
 
 #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 <vector>
 
 /**
Index: source/gui/ObjectTypes/CList.cpp
===================================================================
--- source/gui/ObjectTypes/CList.cpp	(revision 23026)
+++ source/gui/ObjectTypes/CList.cpp	(working copy)
@@ -18,13 +18,13 @@
 #include "precompiled.h"
 
 #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"
 
 CList::CList(CGUI& pGUI)
 	: IGUIObject(pGUI),
Index: source/gui/ObjectTypes/CList.h
===================================================================
--- source/gui/ObjectTypes/CList.h	(revision 23026)
+++ source/gui/ObjectTypes/CList.h	(working copy)
@@ -16,14 +16,14 @@
  */
 
 #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 <vector>
 
 /**
  * Create a list of elements, where one can be selected
Index: source/gui/ObjectTypes/CMiniMap.cpp
===================================================================
--- source/gui/ObjectTypes/CMiniMap.cpp	(revision 23026)
+++ source/gui/ObjectTypes/CMiniMap.cpp	(working copy)
@@ -15,11 +15,11 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "precompiled.h"
 
-#include "MiniMap.h"
+#include "CMiniMap.h"
 
 #include "graphics/GameView.h"
 #include "graphics/LOSTexture.h"
 #include "graphics/MiniPatch.h"
 #include "graphics/Terrain.h"
Index: source/gui/ObjectTypes/CMiniMap.h
===================================================================
--- source/gui/ObjectTypes/CMiniMap.h	(revision 23026)
+++ source/gui/ObjectTypes/CMiniMap.h	(working copy)
@@ -16,12 +16,12 @@
  */
 
 #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;
 class CMatrix3D;
 class CTerrain;
Index: source/gui/ObjectTypes/COList.cpp
===================================================================
--- source/gui/ObjectTypes/COList.cpp	(revision 23026)
+++ source/gui/ObjectTypes/COList.cpp	(working copy)
@@ -18,13 +18,13 @@
 #include "precompiled.h"
 
 #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"
 
 const float SORT_SPRITE_DIM = 16.0f;
 const CPos COLUMN_SHIFT = CPos(0, 4);
Index: source/gui/ObjectTypes/COList.h
===================================================================
--- source/gui/ObjectTypes/COList.h	(revision 23026)
+++ source/gui/ObjectTypes/COList.h	(working copy)
@@ -15,12 +15,12 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 #ifndef INCLUDED_COLIST
 #define INCLUDED_COLIST
 
-#include "CList.h"
-#include "gui/CGUIColor.h"
+#include "gui/ObjectTypes/CList.h"
+#include "gui/SettingTypes/CGUIColor.h"
 
 #include <vector>
 
 /**
  * Represents a column.
Index: source/gui/ObjectTypes/CProgressBar.cpp
===================================================================
Index: source/gui/ObjectTypes/CProgressBar.h
===================================================================
--- source/gui/ObjectTypes/CProgressBar.h	(revision 23026)
+++ source/gui/ObjectTypes/CProgressBar.h	(working copy)
@@ -16,11 +16,11 @@
  */
 
 #ifndef INCLUDED_CPROGRESSBAR
 #define INCLUDED_CPROGRESSBAR
 
-#include "gui/IGUIObject.h"
+#include "gui/ObjectBases/IGUIObject.h"
 #include "gui/CGUISprite.h"
 
 /**
  * Object used to draw a value (e.g. progress) from 0 to 100 visually.
  */
Index: source/gui/ObjectTypes/CRadioButton.cpp
===================================================================
Index: source/gui/ObjectTypes/CRadioButton.h
===================================================================
--- source/gui/ObjectTypes/CRadioButton.h	(revision 23026)
+++ source/gui/ObjectTypes/CRadioButton.h	(working copy)
@@ -16,11 +16,11 @@
  */
 
 #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),
  * and it won't switch itself.
  *
Index: source/gui/ObjectTypes/CSlider.cpp
===================================================================
Index: source/gui/ObjectTypes/CSlider.h
===================================================================
--- source/gui/ObjectTypes/CSlider.h	(revision 23026)
+++ source/gui/ObjectTypes/CSlider.h	(working copy)
@@ -16,12 +16,12 @@
  */
 
 #ifndef INCLUDED_CSLIDER
 #define INCLUDED_CSLIDER
 
-#include "gui/IGUIObject.h"
 #include "gui/CGUISprite.h"
+#include "gui/ObjectBases/IGUIObject.h"
 
 class CSlider : public IGUIObject
 {
 	GUI_OBJECT(CSlider)
 
Index: source/gui/ObjectTypes/CText.cpp
===================================================================
Index: source/gui/ObjectTypes/CText.h
===================================================================
--- source/gui/ObjectTypes/CText.h	(revision 23026)
+++ source/gui/ObjectTypes/CText.h	(working copy)
@@ -17,13 +17,13 @@
 
 #ifndef INCLUDED_CTEXT
 #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.
  */
 class CText : public IGUIObject, public IGUIScrollBarOwner, public IGUITextOwner
Index: source/gui/ObjectTypes/CTooltip.cpp
===================================================================
--- source/gui/ObjectTypes/CTooltip.cpp	(revision 23026)
+++ source/gui/ObjectTypes/CTooltip.cpp	(working copy)
@@ -18,11 +18,11 @@
 #include "precompiled.h"
 
 #include "CTooltip.h"
 
 #include "gui/CGUI.h"
-#include "gui/CGUIString.h"
+#include "gui/SettingTypes/CGUIString.h"
 #include "gui/CGUIText.h"
 
 #include <algorithm>
 
 CTooltip::CTooltip(CGUI& pGUI)
Index: source/gui/ObjectTypes/CTooltip.h
===================================================================
--- source/gui/ObjectTypes/CTooltip.h	(revision 23026)
+++ source/gui/ObjectTypes/CTooltip.h	(working copy)
@@ -16,13 +16,13 @@
  */
 
 #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.
  */
 class CTooltip : public IGUIObject, public IGUITextOwner
Index: source/gui/Scripting/GuiScriptConversions.cpp
===================================================================
--- source/gui/Scripting/GuiScriptConversions.cpp	(revision 23026)
+++ source/gui/Scripting/GuiScriptConversions.cpp	(working copy)
@@ -15,15 +15,15 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #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"
 #include "scriptinterface/ScriptConversions.h"
 
Index: source/gui/Scripting/JSInterface_GUIManager.cpp
===================================================================
--- source/gui/Scripting/JSInterface_GUIManager.cpp	(revision 23026)
+++ source/gui/Scripting/JSInterface_GUIManager.cpp	(working copy)
@@ -19,11 +19,11 @@
 
 #include "JSInterface_GUIManager.h"
 
 #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"
 
 // Note that the initData argument may only contain clonable data.
 // Functions aren't supported for example!
Index: source/gui/Scripting/JSInterface_GUIManager.h
===================================================================
Index: source/gui/Scripting/JSInterface_GUISize.cpp
===================================================================
Index: source/gui/Scripting/JSInterface_GUISize.h
===================================================================
Index: source/gui/Scripting/JSInterface_IGUIObject.cpp
===================================================================
--- source/gui/Scripting/JSInterface_IGUIObject.cpp	(revision 23026)
+++ source/gui/Scripting/JSInterface_IGUIObject.cpp	(working copy)
@@ -19,11 +19,11 @@
 
 #include "JSInterface_IGUIObject.h"
 
 #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"
 
 JSClass JSI_IGUIObject::JSI_class = {
 	"GUIObject", JSCLASS_HAS_PRIVATE,
Index: source/gui/Scripting/JSInterface_IGUIObject.h
===================================================================
Index: source/gui/Scripting/ScriptFunctions.cpp
===================================================================
--- source/gui/Scripting/ScriptFunctions.cpp	(revision 23026)
+++ source/gui/Scripting/ScriptFunctions.cpp	(working copy)
@@ -18,13 +18,13 @@
 #include "precompiled.h"
 
 #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"
 #include "ps/scripting/JSInterface_ConfigDB.h"
 #include "ps/scripting/JSInterface_Console.h"
Index: source/gui/Scripting/ScriptFunctions.h
===================================================================
Index: source/gui/SettingTypes/CGUIColor.cpp
===================================================================
Index: source/gui/SettingTypes/CGUIColor.h
===================================================================
Index: source/gui/SettingTypes/CGUIList.h
===================================================================
--- source/gui/SettingTypes/CGUIList.h	(revision 23026)
+++ source/gui/SettingTypes/CGUIList.h	(working copy)
@@ -16,11 +16,11 @@
  */
 
 #ifndef INCLUDED_CGUILIST
 #define INCLUDED_CGUILIST
 
-#include "gui/CGUIString.h"
+#include "gui/SettingTypes/CGUIString.h"
 
 #include <vector>
 
 class CGUIList
 {
Index: source/gui/SettingTypes/CGUISeries.h
===================================================================
Index: source/gui/SettingTypes/CGUISize.cpp
===================================================================
--- source/gui/SettingTypes/CGUISize.cpp	(revision 23026)
+++ source/gui/SettingTypes/CGUISize.cpp	(working copy)
@@ -17,11 +17,11 @@
 
 #include "precompiled.h"
 
 #include "CGUISize.h"
 
-#include "gui/scripting/JSInterface_GUISize.h"
+#include "gui/Scripting/JSInterface_GUISize.h"
 #include "ps/CLogger.h"
 
 CGUISize::CGUISize()
 	: pixel(), percent()
 {
Index: source/gui/SettingTypes/CGUISize.h
===================================================================
Index: source/gui/SettingTypes/CGUIString.cpp
===================================================================
Index: source/gui/SettingTypes/CGUIString.h
===================================================================
Index: source/gui/SettingTypes/EAlign.h
===================================================================
Index: source/gui/tests/test_ParseString.h
===================================================================
--- source/gui/tests/test_ParseString.h	(revision 23026)
+++ source/gui/tests/test_ParseString.h	(working copy)
@@ -15,11 +15,11 @@
  * along with 0 A.D.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "lib/self_test.h"
 
-#include "gui/CGUISize.h"
+#include "gui/SettingTypes/CGUISize.h"
 #include "gui/CGUI.h"
 #include "ps/CLogger.h"
 
 class TestGuiParseString : public CxxTest::TestSuite
 {
Index: source/pch/gui/precompiled.h
===================================================================
--- source/pch/gui/precompiled.h	(revision 23026)
+++ source/pch/gui/precompiled.h	(working copy)
@@ -23,10 +23,10 @@
 #endif
 
 #if HAVE_PCH
 
 #include "gui/CGUI.h"
-#include "gui/IGUIObject.h"
+#include "gui/ObjectBases/IGUIObject.h"
 #include "ps/CStr.h"
 #include "scriptinterface/ScriptInterface.h"
 
 #endif // HAVE_PCH