From 49863da3b477d747e564270c714ffc9ce802162e Mon Sep 17 00:00:00 2001 From: Ralph Sennhauser Date: Fri, 20 Jun 2025 00:06:41 +0200 Subject: [PATCH] Fix headers for gui/ObjectTypes Make include-what-you-use happy with files in source/gui/ObjectTypes and fix what needs to be fixed after. Ref: #8086 Signed-off-by: Ralph Sennhauser --- source/gui/GUIObjectTypes.cpp | 1 + source/gui/ObjectTypes/CButton.cpp | 5 +++ source/gui/ObjectTypes/CButton.h | 6 ++++ source/gui/ObjectTypes/CChart.cpp | 11 ++++++- source/gui/ObjectTypes/CChart.h | 9 +++++- source/gui/ObjectTypes/CCheckBox.cpp | 2 ++ source/gui/ObjectTypes/CCheckBox.h | 5 ++- source/gui/ObjectTypes/CDropDown.cpp | 10 +++++- source/gui/ObjectTypes/CDropDown.h | 8 +++++ source/gui/ObjectTypes/CGUIDummyObject.h | 2 ++ source/gui/ObjectTypes/CHotkeyPicker.cpp | 14 ++++++++- source/gui/ObjectTypes/CHotkeyPicker.h | 7 +++-- source/gui/ObjectTypes/CImage.cpp | 1 + source/gui/ObjectTypes/CImage.h | 3 ++ source/gui/ObjectTypes/CInput.cpp | 26 +++++++++++++--- source/gui/ObjectTypes/CInput.h | 13 +++++++- source/gui/ObjectTypes/CList.cpp | 16 ++++++++++ source/gui/ObjectTypes/CList.h | 10 ++++++ source/gui/ObjectTypes/CMiniMap.cpp | 39 ++++++++++++++++-------- source/gui/ObjectTypes/CMiniMap.h | 10 ++++-- source/gui/ObjectTypes/COList.cpp | 15 +++++++++ source/gui/ObjectTypes/COList.h | 10 ++++++ source/gui/ObjectTypes/CProgressBar.cpp | 5 +++ source/gui/ObjectTypes/CProgressBar.h | 5 ++- source/gui/ObjectTypes/CRadioButton.cpp | 9 ++++++ source/gui/ObjectTypes/CRadioButton.h | 3 ++ source/gui/ObjectTypes/CScrollPanel.cpp | 13 ++++++-- source/gui/ObjectTypes/CScrollPanel.h | 6 ++++ source/gui/ObjectTypes/CSlider.cpp | 2 ++ source/gui/ObjectTypes/CSlider.h | 5 +++ source/gui/ObjectTypes/CText.cpp | 9 ++++++ source/gui/ObjectTypes/CText.h | 7 +++++ source/gui/ObjectTypes/CTooltip.cpp | 9 ++++-- source/gui/ObjectTypes/CTooltip.h | 7 +++++ 34 files changed, 271 insertions(+), 32 deletions(-) diff --git a/source/gui/GUIObjectTypes.cpp b/source/gui/GUIObjectTypes.cpp index ddd4d4b7c1..1c3a26db07 100644 --- a/source/gui/GUIObjectTypes.cpp +++ b/source/gui/GUIObjectTypes.cpp @@ -17,6 +17,7 @@ #include "precompiled.h" +#include "gui/CGUI.h" #include "gui/ObjectTypes/CButton.h" #include "gui/ObjectTypes/CChart.h" #include "gui/ObjectTypes/CCheckBox.h" diff --git a/source/gui/ObjectTypes/CButton.cpp b/source/gui/ObjectTypes/CButton.cpp index 5a74cba4d0..1c782f18be 100644 --- a/source/gui/ObjectTypes/CButton.cpp +++ b/source/gui/ObjectTypes/CButton.cpp @@ -22,6 +22,11 @@ #include "gui/CGUI.h" #include "gui/CGUIText.h" #include "gui/SettingTypes/CGUIColor.h" +#include "lib/debug.h" +#include "maths/Rect.h" +#include "maths/Size2D.h" + +#include CButton::CButton(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/ObjectTypes/CButton.h b/source/gui/ObjectTypes/CButton.h index 37ec9ef070..8bb97e18d7 100644 --- a/source/gui/ObjectTypes/CButton.h +++ b/source/gui/ObjectTypes/CButton.h @@ -18,13 +18,19 @@ #ifndef INCLUDED_CBUTTON #define INCLUDED_CBUTTON +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" #include "gui/ObjectBases/IGUIButtonBehavior.h" #include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIString.h" #include "gui/SettingTypes/MouseEventMask.h" #include "maths/Vector2D.h" +#include "ps/CStr.h" + +class CGUI; +class CSize2D; class CButton : public IGUIObject, public IGUITextOwner, public IGUIButtonBehavior { diff --git a/source/gui/ObjectTypes/CChart.cpp b/source/gui/ObjectTypes/CChart.cpp index 7cef684a4d..c563e61194 100644 --- a/source/gui/ObjectTypes/CChart.cpp +++ b/source/gui/ObjectTypes/CChart.cpp @@ -20,15 +20,24 @@ #include "CChart.h" #include "graphics/Canvas2D.h" +#include "gui/CGUIText.h" +#include "gui/SGUIMessage.h" #include "gui/SettingTypes/CGUIList.h" #include "gui/SettingTypes/CGUISeries.h" #include "gui/SettingTypes/CGUIString.h" +#include "lib/utf8.h" +#include "maths/Rect.h" +#include "maths/Size2D.h" #include "ps/CLogger.h" -#include "ps/CStrInternStatic.h" #include "ps/Profile.h" #include +#include #include +#include +#include + +class CGUI; CChart::CChart(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/ObjectTypes/CChart.h b/source/gui/ObjectTypes/CChart.h index 2cc79a7a98..b24e4e8406 100644 --- a/source/gui/ObjectTypes/CChart.h +++ b/source/gui/ObjectTypes/CChart.h @@ -18,16 +18,23 @@ #ifndef INCLUDED_CCHART #define INCLUDED_CCHART +#include "gui/CGUISetting.h" #include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUITextOwner.h" #include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIList.h" #include "gui/SettingTypes/CGUISeries.h" -#include "maths/Size2D.h" +#include "lib/code_annotation.h" #include "maths/Vector2D.h" +#include "ps/CStr.h" #include +class CCanvas2D; +class CGUI; +class CRect; +class CSize2D; + struct CChartData { // Avoid copying the container. diff --git a/source/gui/ObjectTypes/CCheckBox.cpp b/source/gui/ObjectTypes/CCheckBox.cpp index bbb31e596d..ae2da3e304 100644 --- a/source/gui/ObjectTypes/CCheckBox.cpp +++ b/source/gui/ObjectTypes/CCheckBox.cpp @@ -20,6 +20,8 @@ #include "CCheckBox.h" #include "gui/CGUI.h" +#include "gui/SGUIMessage.h" +#include "ps/CStr.h" CCheckBox::CCheckBox(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/ObjectTypes/CCheckBox.h b/source/gui/ObjectTypes/CCheckBox.h index 2267f44fcc..92e0877850 100644 --- a/source/gui/ObjectTypes/CCheckBox.h +++ b/source/gui/ObjectTypes/CCheckBox.h @@ -18,9 +18,12 @@ #ifndef INCLUDED_CCHECKBOX #define INCLUDED_CCHECKBOX +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" -#include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUIButtonBehavior.h" +#include "gui/ObjectBases/IGUIObject.h" + +class CGUI; class CCheckBox : public IGUIObject, public IGUIButtonBehavior { diff --git a/source/gui/ObjectTypes/CDropDown.cpp b/source/gui/ObjectTypes/CDropDown.cpp index 2f52578e9c..b80acc868d 100644 --- a/source/gui/ObjectTypes/CDropDown.cpp +++ b/source/gui/ObjectTypes/CDropDown.cpp @@ -21,11 +21,19 @@ #include "gui/CGUI.h" #include "gui/IGUIScrollBar.h" +#include "gui/SGUIMessage.h" #include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIList.h" +#include "gui/SettingTypes/CGUIString.h" #include "lib/external_libraries/libsdl.h" #include "lib/timer.h" -#include "ps/Profile.h" +#include "maths/Size2D.h" + +#include +#include +#include +#include +#include CDropDown::CDropDown(CGUI& pGUI) : CList(pGUI), diff --git a/source/gui/ObjectTypes/CDropDown.h b/source/gui/ObjectTypes/CDropDown.h index 42d2b07e6a..ab20597447 100644 --- a/source/gui/ObjectTypes/CDropDown.h +++ b/source/gui/ObjectTypes/CDropDown.h @@ -28,13 +28,21 @@ GUI Object - Drop Down (list) #ifndef INCLUDED_CDROPDOWN #define INCLUDED_CDROPDOWN +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" #include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectTypes/CList.h" +#include "gui/SettingTypes/CGUIColor.h" +#include "lib/input.h" +#include "lib/types.h" +#include "maths/Rect.h" #include "maths/Vector2D.h" +#include "ps/CStr.h" #include +class CGUI; + /** * Drop Down * diff --git a/source/gui/ObjectTypes/CGUIDummyObject.h b/source/gui/ObjectTypes/CGUIDummyObject.h index 70fedb17ab..ad12fb1aaf 100644 --- a/source/gui/ObjectTypes/CGUIDummyObject.h +++ b/source/gui/ObjectTypes/CGUIDummyObject.h @@ -25,6 +25,8 @@ #include "gui/ObjectBases/IGUIObject.h" +class CGUI; + /** * Dummy object are used for the base object and objects of type "empty". */ diff --git a/source/gui/ObjectTypes/CHotkeyPicker.cpp b/source/gui/ObjectTypes/CHotkeyPicker.cpp index 08445357df..8d60c28a6e 100644 --- a/source/gui/ObjectTypes/CHotkeyPicker.cpp +++ b/source/gui/ObjectTypes/CHotkeyPicker.cpp @@ -19,12 +19,24 @@ #include "CHotkeyPicker.h" +#include "gui/CGUI.h" #include "gui/ObjectBases/IGUIObject.h" +#include "gui/SGUIMessage.h" +#include "lib/external_libraries/libsdl.h" #include "lib/timer.h" #include "ps/CLogger.h" -#include "ps/Hotkey.h" #include "ps/KeyName.h" #include "scriptinterface/ScriptConversions.h" +#include "scriptinterface/ScriptRequest.h" + +#include +#include +#include +#include +#include +#include +#include +#include const CStr CHotkeyPicker::EventNameCombination = "Combination"; diff --git a/source/gui/ObjectTypes/CHotkeyPicker.h b/source/gui/ObjectTypes/CHotkeyPicker.h index c3f6391f49..f5e39c5616 100644 --- a/source/gui/ObjectTypes/CHotkeyPicker.h +++ b/source/gui/ObjectTypes/CHotkeyPicker.h @@ -18,13 +18,16 @@ #ifndef INCLUDED_CHOTKEYPICKER #define INCLUDED_CHOTKEYPICKER -#include "gui/CGUI.h" +#include "gui/CGUISetting.h" #include "gui/ObjectBases/IGUIObject.h" -#include "lib/external_libraries/libsdl.h" +#include "lib/input.h" #include "ps/CStr.h" +#include #include +class CGUI; + /** * When in focus, returns all currently pressed keys. * After a set time without changes, it will trigger a "combination" event. diff --git a/source/gui/ObjectTypes/CImage.cpp b/source/gui/ObjectTypes/CImage.cpp index a7a79fa41c..7493457c03 100644 --- a/source/gui/ObjectTypes/CImage.cpp +++ b/source/gui/ObjectTypes/CImage.cpp @@ -20,6 +20,7 @@ #include "CImage.h" #include "gui/CGUI.h" +#include "ps/CStr.h" CImage::CImage(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/ObjectTypes/CImage.h b/source/gui/ObjectTypes/CImage.h index f7fcc3cd1d..03e0b10882 100644 --- a/source/gui/ObjectTypes/CImage.h +++ b/source/gui/ObjectTypes/CImage.h @@ -18,9 +18,12 @@ #ifndef INCLUDED_CIMAGE #define INCLUDED_CIMAGE +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" #include "gui/ObjectBases/IGUIObject.h" +class CGUI; + /** * Object just for drawing a sprite. Like CText, without the * possibility to draw text. diff --git a/source/gui/ObjectTypes/CInput.cpp b/source/gui/ObjectTypes/CInput.cpp index c3abb84fb5..43afb50415 100644 --- a/source/gui/ObjectTypes/CInput.cpp +++ b/source/gui/ObjectTypes/CInput.cpp @@ -24,17 +24,35 @@ #include "graphics/TextRenderer.h" #include "gui/CGUI.h" #include "gui/CGUIScrollBarVertical.h" +#include "gui/IGUIScrollBar.h" +#include "gui/SGUIMessage.h" +#include "gui/SettingTypes/EAlign.h" +#include "lib/debug.h" +#include "lib/external_libraries/libsdl.h" #include "lib/timer.h" #include "lib/utf8.h" +#include "maths/Vector2D.h" +#include "ps/CStrIntern.h" #include "ps/ConfigDB.h" -#include "ps/CStrInternStatic.h" -#include "ps/GameSetup/Config.h" #include "ps/Globals.h" #include "ps/Hotkey.h" -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include extern int g_yres; diff --git a/source/gui/ObjectTypes/CInput.h b/source/gui/ObjectTypes/CInput.h index 5a2bfea493..85dbc57e86 100644 --- a/source/gui/ObjectTypes/CInput.h +++ b/source/gui/ObjectTypes/CInput.h @@ -18,15 +18,26 @@ #ifndef INCLUDED_CINPUT #define INCLUDED_CINPUT +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" +#include "gui/CGUIText.h" #include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUIScrollBarOwner.h" +#include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIString.h" -#include "lib/external_libraries/libsdl.h" +#include "lib/input.h" +#include "lib/types.h" +#include "maths/Rect.h" +#include "ps/CStr.h" +#include #include #include +class CCanvas2D; +class CGUI; +struct SDL_Event_; + /** * Text field where you can input and edit the text. * diff --git a/source/gui/ObjectTypes/CList.cpp b/source/gui/ObjectTypes/CList.cpp index c857c2ff48..2954ef7141 100644 --- a/source/gui/ObjectTypes/CList.cpp +++ b/source/gui/ObjectTypes/CList.cpp @@ -21,10 +21,26 @@ #include "gui/CGUI.h" #include "gui/CGUIScrollBarVertical.h" +#include "gui/CGUIText.h" +#include "gui/IGUIScrollBar.h" +#include "gui/SGUIMessage.h" #include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIList.h" +#include "gui/SettingTypes/CGUIString.h" #include "lib/external_libraries/libsdl.h" #include "lib/timer.h" +#include "maths/Size2D.h" +#include "maths/Vector2D.h" +#include "ps/XMB/XMBData.h" + +#include +#include +#include +#include +#include +#include + +class CCanvas2D; const CStr CList::EventNameSelectionChange = "SelectionChange"; const CStr CList::EventNameHoverChange = "HoverChange"; diff --git a/source/gui/ObjectTypes/CList.h b/source/gui/ObjectTypes/CList.h index 03076350a1..c915181c08 100644 --- a/source/gui/ObjectTypes/CList.h +++ b/source/gui/ObjectTypes/CList.h @@ -18,14 +18,24 @@ #ifndef INCLUDED_CLIST #define INCLUDED_CLIST +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" #include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUIScrollBarOwner.h" #include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIList.h" +#include "lib/input.h" +#include "lib/types.h" +#include "maths/Rect.h" +#include "ps/CStr.h" #include +class CCanvas2D; +class CGUI; +class CGUIString; + /** * Create a list of elements, where one can be selected * by the user. The control will use a pre-processed diff --git a/source/gui/ObjectTypes/CMiniMap.cpp b/source/gui/ObjectTypes/CMiniMap.cpp index a32f294241..ebf801de9a 100644 --- a/source/gui/ObjectTypes/CMiniMap.cpp +++ b/source/gui/ObjectTypes/CMiniMap.cpp @@ -19,42 +19,55 @@ #include "CMiniMap.h" +#include "graphics/Camera.h" #include "graphics/Canvas2D.h" #include "graphics/GameView.h" #include "graphics/MiniMapTexture.h" -#include "graphics/MiniPatch.h" #include "graphics/Terrain.h" -#include "graphics/TerrainTextureEntry.h" -#include "graphics/TerrainTextureManager.h" #include "graphics/TextureManager.h" #include "gui/CGUI.h" #include "gui/GUIManager.h" -#include "lib/bits.h" -#include "lib/external_libraries/libsdl.h" +#include "gui/SGUIMessage.h" +#include "lib/debug.h" +#include "lib/path.h" #include "lib/timer.h" #include "maths/MathUtil.h" +#include "maths/Matrix3D.h" +#include "maths/Rect.h" +#include "maths/Size2D.h" +#include "maths/Vector3D.h" #include "ps/CLogger.h" -#include "ps/ConfigDB.h" -#include "ps/Filesystem.h" #include "ps/Game.h" -#include "ps/GameSetup/Config.h" #include "ps/Profile.h" #include "ps/World.h" #include "renderer/Renderer.h" #include "renderer/SceneRenderer.h" #include "renderer/WaterManager.h" #include "scriptinterface/Object.h" -#include "simulation2/Simulation2.h" -#include "simulation2/components/ICmpMinimap.h" +#include "scriptinterface/ScriptConversions.h" +#include "scriptinterface/ScriptRequest.h" #include "simulation2/components/ICmpRangeManager.h" -#include "simulation2/helpers/Los.h" -#include "simulation2/system/ParamNode.h" +#include "simulation2/system/CmpPtr.h" +#include "simulation2/system/Entity.h" +#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +class CSimulation2; + namespace { diff --git a/source/gui/ObjectTypes/CMiniMap.h b/source/gui/ObjectTypes/CMiniMap.h index 66df4ba9ef..e14e8de303 100644 --- a/source/gui/ObjectTypes/CMiniMap.h +++ b/source/gui/ObjectTypes/CMiniMap.h @@ -20,14 +20,20 @@ #include "graphics/Color.h" #include "graphics/Texture.h" +#include "gui/CGUISetting.h" #include "gui/ObjectBases/IGUIObject.h" +#include "lib/types.h" #include "maths/Vector2D.h" -#include "renderer/VertexArray.h" +#include "ps/CStr.h" #include +#include #include -class CMatrix3D; +class CCanvas2D; +class CGUI; +class CRect; +class CVector3D; class CMiniMap : public IGUIObject { diff --git a/source/gui/ObjectTypes/COList.cpp b/source/gui/ObjectTypes/COList.cpp index 58577f5dca..113ecbd29f 100644 --- a/source/gui/ObjectTypes/COList.cpp +++ b/source/gui/ObjectTypes/COList.cpp @@ -20,11 +20,26 @@ #include "COList.h" #include "gui/CGUI.h" +#include "gui/CGUIText.h" #include "gui/IGUIScrollBar.h" +#include "gui/ObjectBases/IGUIScrollBarOwner.h" +#include "gui/SGUIMessage.h" #include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIList.h" +#include "gui/SettingTypes/CGUIString.h" #include "i18n/L10n.h" +#include "lib/debug.h" +#include "maths/Rect.h" +#include "maths/Size2D.h" +#include "maths/Vector2D.h" #include "ps/CLogger.h" +#include "ps/XMB/XMBData.h" +#include "ps/XML/Xeromyces.h" + +#include +#include +#include +#include const float SORT_SPRITE_DIM = 16.0f; const CVector2D COLUMN_SHIFT = CVector2D(0, 4); diff --git a/source/gui/ObjectTypes/COList.h b/source/gui/ObjectTypes/COList.h index cd729e39bf..4810be9e35 100644 --- a/source/gui/ObjectTypes/COList.h +++ b/source/gui/ObjectTypes/COList.h @@ -17,11 +17,21 @@ #ifndef INCLUDED_COLIST #define INCLUDED_COLIST +#include "gui/CGUISetting.h" +#include "gui/CGUISprite.h" +#include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectTypes/CList.h" #include "gui/SettingTypes/CGUIColor.h" +#include "gui/SettingTypes/CGUIList.h" +#include "lib/code_annotation.h" +#include "lib/types.h" +#include "ps/CStr.h" +#include #include +class CGUI; + /** * Represents a column. */ diff --git a/source/gui/ObjectTypes/CProgressBar.cpp b/source/gui/ObjectTypes/CProgressBar.cpp index 062c11d8da..afafd3af27 100644 --- a/source/gui/ObjectTypes/CProgressBar.cpp +++ b/source/gui/ObjectTypes/CProgressBar.cpp @@ -20,6 +20,11 @@ #include "CProgressBar.h" #include "gui/CGUI.h" +#include "gui/SGUIMessage.h" +#include "maths/Rect.h" +#include "ps/CStr.h" + +#include CProgressBar::CProgressBar(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/ObjectTypes/CProgressBar.h b/source/gui/ObjectTypes/CProgressBar.h index 8fb91654e0..d7703b1d35 100644 --- a/source/gui/ObjectTypes/CProgressBar.h +++ b/source/gui/ObjectTypes/CProgressBar.h @@ -18,8 +18,11 @@ #ifndef INCLUDED_CPROGRESSBAR #define INCLUDED_CPROGRESSBAR -#include "gui/ObjectBases/IGUIObject.h" +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" +#include "gui/ObjectBases/IGUIObject.h" + +class CGUI; /** * Object used to draw a value (e.g. progress) from 0 to 100 visually. diff --git a/source/gui/ObjectTypes/CRadioButton.cpp b/source/gui/ObjectTypes/CRadioButton.cpp index d29712dc40..6a7c9bea26 100644 --- a/source/gui/ObjectTypes/CRadioButton.cpp +++ b/source/gui/ObjectTypes/CRadioButton.cpp @@ -19,6 +19,15 @@ #include "CRadioButton.h" +#include "gui/CGUISetting.h" +#include "gui/ObjectBases/IGUIButtonBehavior.h" +#include "gui/SGUIMessage.h" +#include "ps/CStr.h" + +#include + +class CGUI; + CRadioButton::CRadioButton(CGUI& pGUI) : CCheckBox(pGUI) { diff --git a/source/gui/ObjectTypes/CRadioButton.h b/source/gui/ObjectTypes/CRadioButton.h index a0e0d95888..072b962a9e 100644 --- a/source/gui/ObjectTypes/CRadioButton.h +++ b/source/gui/ObjectTypes/CRadioButton.h @@ -18,8 +18,11 @@ #ifndef INCLUDED_CRADIOBUTTON #define INCLUDED_CRADIOBUTTON +#include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectTypes/CCheckBox.h" +class CGUI; + /** * Just like a check box, but it'll nullify its siblings, * and it won't switch itself. diff --git a/source/gui/ObjectTypes/CScrollPanel.cpp b/source/gui/ObjectTypes/CScrollPanel.cpp index 069ad7fbd6..0b34fbe9f3 100644 --- a/source/gui/ObjectTypes/CScrollPanel.cpp +++ b/source/gui/ObjectTypes/CScrollPanel.cpp @@ -19,10 +19,19 @@ #include "CScrollPanel.h" -#include "gui/GUIObjectEventBroadcaster.h" - #include "gui/CGUIScrollBarHorizontal.h" #include "gui/CGUIScrollBarVertical.h" +#include "gui/GUIObjectEventBroadcaster.h" +#include "gui/IGUIScrollBar.h" +#include "gui/SGUIMessage.h" +#include "maths/Rect.h" + +#include +#include +#include +#include + +class CGUI; CScrollPanel::CScrollPanel(CGUI& pGUI) : IGUIPanel(pGUI), diff --git a/source/gui/ObjectTypes/CScrollPanel.h b/source/gui/ObjectTypes/CScrollPanel.h index e6ba2845ab..2a39aa09af 100644 --- a/source/gui/ObjectTypes/CScrollPanel.h +++ b/source/gui/ObjectTypes/CScrollPanel.h @@ -18,11 +18,17 @@ #ifndef INCLUDED_CSCROLLPANEL #define INCLUDED_CSCROLLPANEL +#include "gui/CGUISetting.h" +#include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUIPanel.h" #include "gui/ObjectBases/IGUIScrollBarOwner.h" #include "gui/SettingTypes/EScrollOrientation.h" #include "ps/CStr.h" +#include + +class CGUI; + class CScrollPanel : public IGUIPanel, public IGUIScrollBarOwner { GUI_OBJECT(CScrollPanel) diff --git a/source/gui/ObjectTypes/CSlider.cpp b/source/gui/ObjectTypes/CSlider.cpp index aad08a0543..f68ed25c74 100644 --- a/source/gui/ObjectTypes/CSlider.cpp +++ b/source/gui/ObjectTypes/CSlider.cpp @@ -20,7 +20,9 @@ #include "CSlider.h" #include "gui/CGUI.h" +#include "gui/SGUIMessage.h" #include "maths/MathUtil.h" +#include "maths/Rect.h" const CStr CSlider::EventNameValueChange = "ValueChange"; diff --git a/source/gui/ObjectTypes/CSlider.h b/source/gui/ObjectTypes/CSlider.h index 95237c1179..87c47c6d8b 100644 --- a/source/gui/ObjectTypes/CSlider.h +++ b/source/gui/ObjectTypes/CSlider.h @@ -18,10 +18,15 @@ #ifndef INCLUDED_CSLIDER #define INCLUDED_CSLIDER +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" #include "gui/ObjectBases/IGUIButtonBehavior.h" #include "gui/ObjectBases/IGUIObject.h" #include "maths/Vector2D.h" +#include "ps/CStr.h" + +class CGUI; +class CRect; class CSlider : public IGUIObject, public IGUIButtonBehavior { diff --git a/source/gui/ObjectTypes/CText.cpp b/source/gui/ObjectTypes/CText.cpp index cfb7c073ab..a1f909fe08 100644 --- a/source/gui/ObjectTypes/CText.cpp +++ b/source/gui/ObjectTypes/CText.cpp @@ -22,6 +22,15 @@ #include "gui/CGUI.h" #include "gui/CGUIScrollBarVertical.h" #include "gui/CGUIText.h" +#include "gui/IGUIScrollBar.h" +#include "gui/SGUIMessage.h" +#include "maths/Rect.h" +#include "maths/Size2D.h" + +#include +#include +#include +#include CText::CText(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/ObjectTypes/CText.h b/source/gui/ObjectTypes/CText.h index 261369ebd5..bdaaf6fc90 100644 --- a/source/gui/ObjectTypes/CText.h +++ b/source/gui/ObjectTypes/CText.h @@ -18,11 +18,18 @@ #ifndef INCLUDED_CTEXT #define INCLUDED_CTEXT +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" #include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUIScrollBarOwner.h" #include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIString.h" +#include "maths/Vector2D.h" +#include "ps/CStr.h" + +class CGUI; +class CSize2D; /** * Text field that just displays static text. diff --git a/source/gui/ObjectTypes/CTooltip.cpp b/source/gui/ObjectTypes/CTooltip.cpp index d46e6e8d91..9ae769f6e3 100644 --- a/source/gui/ObjectTypes/CTooltip.cpp +++ b/source/gui/ObjectTypes/CTooltip.cpp @@ -20,10 +20,15 @@ #include "CTooltip.h" #include "gui/CGUI.h" -#include "gui/SettingTypes/CGUIString.h" #include "gui/CGUIText.h" +#include "gui/SettingTypes/CGUISize.h" +#include "gui/SettingTypes/CGUIString.h" +#include "gui/SettingTypes/EAlign.h" +#include "lib/debug.h" +#include "maths/Rect.h" +#include "maths/Size2D.h" -#include +#include CTooltip::CTooltip(CGUI& pGUI) : IGUIObject(pGUI), diff --git a/source/gui/ObjectTypes/CTooltip.h b/source/gui/ObjectTypes/CTooltip.h index 7cddcad972..9fec951582 100644 --- a/source/gui/ObjectTypes/CTooltip.h +++ b/source/gui/ObjectTypes/CTooltip.h @@ -18,11 +18,18 @@ #ifndef INCLUDED_CTOOLTIP #define INCLUDED_CTOOLTIP +#include "gui/CGUISetting.h" #include "gui/CGUISprite.h" #include "gui/ObjectBases/IGUIObject.h" #include "gui/ObjectBases/IGUITextOwner.h" +#include "gui/SettingTypes/CGUIColor.h" #include "gui/SettingTypes/CGUIString.h" +#include "lib/types.h" #include "maths/Vector2D.h" +#include "ps/CStr.h" + +class CGUI; +enum class EVAlign; /** * Dynamic tooltips. Similar to CText.