mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-06-21 01:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix headers for gui/ObjectTypes

Browse Source 
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 <ralph.sennhauser@gmail.com>
This commit is contained in:
Ralph Sennhauser
2025-06-20 00:06:41 +02:00
parent d888b10931
commit 49863da3b4
34 changed files with 271 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/gui/GUIObjectTypes.cpp
+1
View File
@@ -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"
source/gui/ObjectTypes/CButton.cpp
+5
View File
@@ -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 <vector>
CButton::CButton(CGUI& pGUI)
: IGUIObject(pGUI),
source/gui/ObjectTypes/CButton.h
+6
View File
@@ -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
{
source/gui/ObjectTypes/CChart.cpp
+10 -1
View File
@@ -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 <cmath>
#include <limits>
#include <optional>
#include <string>
#include <wchar.h>
class CGUI;
CChart::CChart(CGUI& pGUI)
: IGUIObject(pGUI),
source/gui/ObjectTypes/CChart.h
+8 -1
View File
@@ -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 <vector>
class CCanvas2D;
class CGUI;
class CRect;
class CSize2D;
struct CChartData
{
// Avoid copying the container.
source/gui/ObjectTypes/CCheckBox.cpp
+2
View File
@@ -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),
source/gui/ObjectTypes/CCheckBox.h
+4 -1
View File
@@ -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
{
source/gui/ObjectTypes/CDropDown.cpp
+9 -1
View File
@@ -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 <SDL_events.h>
#include <SDL_keycode.h>
#include <algorithm>
#include <cstdlib>
#include <vector>
CDropDown::CDropDown(CGUI& pGUI)
: CList(pGUI),
source/gui/ObjectTypes/CDropDown.h
+8
View File
@@ -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 <string>
class CGUI;
/**
* Drop Down
*
source/gui/ObjectTypes/CGUIDummyObject.h
+2
View File
@@ -25,6 +25,8 @@
#include "gui/ObjectBases/IGUIObject.h"
class CGUI;
/**
* Dummy object are used for the base object and objects of type "empty".
*/
source/gui/ObjectTypes/CHotkeyPicker.cpp
+13 -1
View File
@@ -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 <SDL_events.h>
#include <SDL_mouse.h>
#include <algorithm>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <js/ValueArray.h>
#include <memory>
const CStr CHotkeyPicker::EventNameCombination = "Combination";
source/gui/ObjectTypes/CHotkeyPicker.h
+5 -2
View File
@@ -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 <SDL_scancode.h>
#include <vector>
class CGUI;
/**
* When in focus, returns all currently pressed keys.
* After a set time without changes, it will trigger a "combination" event.
source/gui/ObjectTypes/CImage.cpp
+1
View File
@@ -20,6 +20,7 @@
#include "CImage.h"
#include "gui/CGUI.h"
#include "ps/CStr.h"
CImage::CImage(CGUI& pGUI)
: IGUIObject(pGUI),
source/gui/ObjectTypes/CImage.h
+3
View File
@@ -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.
source/gui/ObjectTypes/CInput.cpp
+22 -4
View File
@@ -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 <sstream>
#include <maths/Size2D.h>
#include <SDL_clipboard.h>
#include <SDL_events.h>
#include <SDL_keyboard.h>
#include <SDL_mouse.h>
#include <SDL_rect.h>
#include <SDL_scancode.h>
#include <SDL_stdinc.h>
#include <algorithm>
#include <bits/wctype-wchar.h>
#include <cstdlib>
#include <cstring>
#include <maths/Size2D.h>
#include <memory>
#include <string>
#include <unordered_map>
#include <utility>
extern int g_yres;
source/gui/ObjectTypes/CInput.h
+12 -1
View File
@@ -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 <SDL_keycode.h>
#include <list>
#include <vector>
class CCanvas2D;
class CGUI;
struct SDL_Event_;
/**
* Text field where you can input and edit the text.
*
source/gui/ObjectTypes/CList.cpp
+16
View File
@@ -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 <SDL_events.h>
#include <SDL_keycode.h>
#include <cstddef>
#include <memory>
#include <string>
#include <utility>
class CCanvas2D;
const CStr CList::EventNameSelectionChange = "SelectionChange";
const CStr CList::EventNameHoverChange = "HoverChange";
source/gui/ObjectTypes/CList.h
+10
View File
@@ -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 <vector>
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
source/gui/ObjectTypes/CMiniMap.cpp
+26 -13
View File
@@ -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 <SDL_mouse.h>
#include <algorithm>
#include <array>
#include <cmath>
#include <utility>
#include <fmt/base.h>
#include <fmt/printf.h>
#include <js/GCVector.h>
#include <js/RootingAPI.h>
#include <js/TypeDecls.h>
#include <js/Value.h>
#include <memory>
#include <stddef.h>
#include <string>
#include <tuple>
#include <vector>
class CSimulation2;
namespace
{
source/gui/ObjectTypes/CMiniMap.h
+8 -2
View File
@@ -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 <deque>
#include <sys/types.h>
#include <vector>
class CMatrix3D;
class CCanvas2D;
class CGUI;
class CRect;
class CVector3D;
class CMiniMap : public IGUIObject
{
source/gui/ObjectTypes/COList.cpp
+15
View File
@@ -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 <algorithm>
#include <cstddef>
#include <string_view>
#include <utility>
const float SORT_SPRITE_DIM = 16.0f;
const CVector2D COLUMN_SHIFT = CVector2D(0, 4);
source/gui/ObjectTypes/COList.h
+10
View File
@@ -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 <string>
#include <vector>
class CGUI;
/**
* Represents a column.
*/
source/gui/ObjectTypes/CProgressBar.cpp
+5
View File
@@ -20,6 +20,11 @@
#include "CProgressBar.h"
#include "gui/CGUI.h"
#include "gui/SGUIMessage.h"
#include "maths/Rect.h"
#include "ps/CStr.h"
#include <string>
CProgressBar::CProgressBar(CGUI& pGUI)
: IGUIObject(pGUI),
source/gui/ObjectTypes/CProgressBar.h
+4 -1
View File
@@ -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.
source/gui/ObjectTypes/CRadioButton.cpp
+9
View File
@@ -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 <vector>
class CGUI;
CRadioButton::CRadioButton(CGUI& pGUI)
: CCheckBox(pGUI)
{
source/gui/ObjectTypes/CRadioButton.h
+3
View File
@@ -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.
source/gui/ObjectTypes/CScrollPanel.cpp
+11 -2
View File
@@ -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 <algorithm>
#include <memory>
#include <string>
#include <utility>
class CGUI;
CScrollPanel::CScrollPanel(CGUI& pGUI)
: IGUIPanel(pGUI),
source/gui/ObjectTypes/CScrollPanel.h
+6
View File
@@ -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 <vector>
class CGUI;
class CScrollPanel : public IGUIPanel, public IGUIScrollBarOwner
{
GUI_OBJECT(CScrollPanel)
source/gui/ObjectTypes/CSlider.cpp
+2
View File
@@ -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";
source/gui/ObjectTypes/CSlider.h
+5
View File
@@ -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
{
source/gui/ObjectTypes/CText.cpp
+9
View File
@@ -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 <memory>
#include <string>
#include <utility>
#include <vector>
CText::CText(CGUI& pGUI)
: IGUIObject(pGUI),
source/gui/ObjectTypes/CText.h
+7
View File
@@ -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.
source/gui/ObjectTypes/CTooltip.cpp
+7 -2
View File
@@ -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 <algorithm>
#include <vector>
CTooltip::CTooltip(CGUI& pGUI)
: IGUIObject(pGUI),
source/gui/ObjectTypes/CTooltip.h
+7
View File
@@ -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.