From 66ce745be0e13d626469d6d59e433d0266d61c2b Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 27 Sep 2015 16:28:11 +0200 Subject: [PATCH] Introduce forward declarations as suggested by colobot-lint --- src/app/input.h | 5 +- src/graphics/core/device.h | 19 +++++-- src/graphics/core/nulldevice.h | 6 ++- src/graphics/engine/camera.cpp | 8 ++- src/graphics/engine/camera.h | 6 +-- src/graphics/engine/engine.cpp | 1 + src/graphics/engine/engine.h | 1 - src/graphics/engine/lightman.h | 4 +- src/graphics/engine/oldmodelmanager.h | 1 - src/graphics/engine/pyro.h | 3 +- src/graphics/engine/terrain.h | 2 +- src/graphics/engine/water.h | 4 +- src/graphics/model/model_mesh.h | 2 - src/graphics/opengl/gl21device.cpp | 2 + src/graphics/opengl/gl21device.h | 6 ++- src/graphics/opengl/gl33device.cpp | 2 + src/graphics/opengl/gl33device.h | 4 ++ src/graphics/opengl/gldevice.cpp | 2 + src/graphics/opengl/gldevice.h | 6 ++- src/level/mainmovie.h | 6 +-- src/level/robotmain.cpp | 1 + src/level/robotmain.h | 1 + src/object/auto/auto.h | 8 ++- src/object/auto/autolabo.h | 2 - .../implementation/power_container_impl.h | 1 - src/object/interface/programmable_object.h | 4 +- src/object/interface/task_executor_object.h | 2 - src/object/motion/motion.h | 7 +-- src/object/motion/motionlevelcontroller.cpp | 2 - src/object/motion/motiontoto.h | 2 +- src/object/object.h | 2 +- src/object/old_object.h | 2 + src/object/old_object_interface.cpp | 1 - src/object/old_object_interface.h | 5 +- src/object/task/task.h | 4 +- src/object/task/taskgoto.h | 6 ++- src/object/task/tasktake.h | 3 +- src/physics/physics.h | 3 +- src/sound/oalsound/channel.cpp | 2 + src/sound/oalsound/channel.h | 31 ++++++------ src/sound/sound.h | 7 ++- src/ui/controls/check.h | 8 +-- src/ui/controls/color.h | 7 +-- src/ui/controls/editvalue.h | 8 +-- src/ui/controls/group.h | 12 +---- src/ui/controls/image.h | 10 +--- src/ui/controls/interface.cpp | 19 +++++++ src/ui/controls/interface.h | 50 ++++++++++--------- src/ui/controls/label.h | 4 +- src/ui/controls/list.h | 2 - src/ui/controls/scroll.h | 3 +- src/ui/controls/target.h | 12 ++--- src/ui/controls/window.cpp | 20 +++++++- src/ui/controls/window.h | 39 ++++++++------- src/ui/displayinfo.h | 5 +- src/ui/maindialog.cpp | 1 + src/ui/maindialog.h | 8 +-- src/ui/mainmap.cpp | 6 +++ src/ui/mainmap.h | 13 +++-- src/ui/mainshort.cpp | 3 ++ src/ui/mainshort.h | 15 ++++-- src/ui/mainui.cpp | 1 + src/ui/mainui.h | 2 +- src/ui/object_interface.cpp | 8 +++ src/ui/object_interface.h | 1 - src/ui/screen/screen_apperance.cpp | 2 + src/ui/screen/screen_io.cpp | 3 ++ src/ui/screen/screen_io_read.cpp | 2 + src/ui/screen/screen_io_write.cpp | 2 + src/ui/screen/screen_loading.cpp | 1 + src/ui/screen/screen_main_menu.cpp | 1 + src/ui/screen/screen_main_menu.h | 2 - src/ui/screen/screen_player_select.cpp | 3 ++ src/ui/screen/screen_quit.cpp | 2 + src/ui/screen/screen_setup.cpp | 1 + src/ui/screen/screen_setup_controls.cpp | 1 + src/ui/screen/screen_setup_controls.h | 7 --- src/ui/screen/screen_setup_display.cpp | 1 + src/ui/screen/screen_setup_display.h | 7 --- src/ui/screen/screen_setup_game.cpp | 1 + src/ui/screen/screen_setup_game.h | 7 --- src/ui/screen/screen_setup_graphics.cpp | 1 + src/ui/screen/screen_setup_graphics.h | 7 --- src/ui/screen/screen_setup_sound.cpp | 1 + src/ui/screen/screen_setup_sound.h | 7 --- src/ui/studio.cpp | 2 + src/ui/studio.h | 3 +- 87 files changed, 276 insertions(+), 231 deletions(-) diff --git a/src/app/input.h b/src/app/input.h index 2fcee839..771267b8 100644 --- a/src/app/input.h +++ b/src/app/input.h @@ -24,14 +24,17 @@ #pragma once -#include "common/event.h" #include "common/key.h" #include "common/singleton.h" #include "math/intpoint.h" +#include "math/point.h" +#include "math/vector.h" #include +struct Event; + /** * \struct InputBinding * \brief Binding for input slot diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h index 5c1acdcb..36ba9580 100644 --- a/src/graphics/core/device.h +++ b/src/graphics/core/device.h @@ -25,14 +25,9 @@ #pragma once #include "graphics/core/color.h" -#include "graphics/core/framebuffer.h" -#include "graphics/core/light.h" -#include "graphics/core/material.h" #include "graphics/core/texture.h" -#include "graphics/core/vertex.h" #include "math/intpoint.h" -#include "math/matrix.h" #include #include @@ -41,11 +36,25 @@ class CImage; struct ImageData; +namespace Math +{ +struct Matrix; +struct Vector; +} // namespace Math + // Graphics module namespace namespace Gfx { +class CFramebuffer; +struct FramebufferParams; +struct Light; +struct Material; +struct Vertex; +struct VertexCol; +struct VertexTex2; + /** * \struct DeviceConfig * \brief General config for graphics device diff --git a/src/graphics/core/nulldevice.h b/src/graphics/core/nulldevice.h index 7395261e..3ca387ba 100644 --- a/src/graphics/core/nulldevice.h +++ b/src/graphics/core/nulldevice.h @@ -24,9 +24,13 @@ #pragma once - #include "graphics/core/device.h" +#include "graphics/core/light.h" +#include "graphics/core/material.h" + +#include "math/matrix.h" + // Graphics module namespace namespace Gfx { diff --git a/src/graphics/engine/camera.cpp b/src/graphics/engine/camera.cpp index 400b256b..62e6edb9 100644 --- a/src/graphics/engine/camera.cpp +++ b/src/graphics/engine/camera.cpp @@ -23,6 +23,8 @@ #include "app/app.h" #include "app/input.h" +#include "common/event.h" + #include "graphics/engine/engine.h" #include "graphics/engine/terrain.h" #include "graphics/engine/water.h" @@ -1086,7 +1088,7 @@ bool CCamera::EventProcess(const Event &event) break; case EVENT_MOUSE_WHEEL: - EventMouseWheel(event.GetData()->y); + EventMouseWheel(event); break; default: @@ -1101,8 +1103,10 @@ bool CCamera::EventMouseMove(const Event &event) return true; } -void CCamera::EventMouseWheel(int dir) +void CCamera::EventMouseWheel(const Event &event) { + auto dir = event.GetData()->y; + if (m_type == CAM_TYPE_BACK) { m_backDist -= 8.0f*dir; diff --git a/src/graphics/engine/camera.h b/src/graphics/engine/camera.h index 52f84cd9..453f9947 100644 --- a/src/graphics/engine/camera.h +++ b/src/graphics/engine/camera.h @@ -24,15 +24,13 @@ #pragma once - -#include "common/event.h" - #include "graphics/engine/engine.h" class CObject; class CRobotMain; class CInput; +struct Event; // Graphics module namespace @@ -226,7 +224,7 @@ protected: //! Changes the camera according to the mouse moved bool EventMouseMove(const Event &event); //! Mouse wheel operation - void EventMouseWheel(int dir); + void EventMouseWheel(const Event& event); //! Changes the camera according to the time elapsed bool EventFrame(const Event &event); //! Moves the point of view diff --git a/src/graphics/engine/engine.cpp b/src/graphics/engine/engine.cpp index 7cb4ed3e..daa0f39d 100644 --- a/src/graphics/engine/engine.cpp +++ b/src/graphics/engine/engine.cpp @@ -34,6 +34,7 @@ #include "common/thread/resource_owning_thread.h" #include "graphics/core/device.h" +#include "graphics/core/framebuffer.h" #include "graphics/engine/camera.h" #include "graphics/engine/cloud.h" diff --git a/src/graphics/engine/engine.h b/src/graphics/engine/engine.h index 3d5fbbe5..67f2c408 100644 --- a/src/graphics/engine/engine.h +++ b/src/graphics/engine/engine.h @@ -46,7 +46,6 @@ class CApplication; -class CObject; class CSoundInterface; class CImage; class CPauseManager; diff --git a/src/graphics/engine/lightman.h b/src/graphics/engine/lightman.h index 53f3d41b..9d1eb5ea 100644 --- a/src/graphics/engine/lightman.h +++ b/src/graphics/engine/lightman.h @@ -24,8 +24,6 @@ #pragma once - -#include "graphics/core/color.h" #include "graphics/core/light.h" #include "graphics/engine/engine.h" @@ -37,6 +35,8 @@ namespace Gfx { +struct Color; + /** * \struct LightProgression * \brief Describes the progression of light parameters change diff --git a/src/graphics/engine/oldmodelmanager.h b/src/graphics/engine/oldmodelmanager.h index 08bee6da..64cbb681 100644 --- a/src/graphics/engine/oldmodelmanager.h +++ b/src/graphics/engine/oldmodelmanager.h @@ -31,7 +31,6 @@ namespace Gfx { class CEngine; -class CModelFile; /** * \class COldModelManager diff --git a/src/graphics/engine/pyro.h b/src/graphics/engine/pyro.h index b90a0b94..2289b78f 100644 --- a/src/graphics/engine/pyro.h +++ b/src/graphics/engine/pyro.h @@ -25,7 +25,6 @@ #pragma once -#include "common/event.h" #include "common/error.h" #include "graphics/core/color.h" @@ -41,6 +40,7 @@ class CObject; class CRobotMain; class CSoundInterface; +struct Event; // Graphics module namespace @@ -51,7 +51,6 @@ class CEngine; class CTerrain; class CCamera; class CParticle; -class CLight; class CLightManager; /** diff --git a/src/graphics/engine/terrain.h b/src/graphics/engine/terrain.h index 3b182648..3235f401 100644 --- a/src/graphics/engine/terrain.h +++ b/src/graphics/engine/terrain.h @@ -24,7 +24,6 @@ #pragma once -#include "graphics/core/material.h" #include "graphics/core/vertex.h" #include "math/const.h" @@ -41,6 +40,7 @@ namespace Gfx class CEngine; class CWater; +struct Material; //! Limit of slope considered a flat piece of land diff --git a/src/graphics/engine/water.h b/src/graphics/engine/water.h index 77ce8da9..2be10447 100644 --- a/src/graphics/engine/water.h +++ b/src/graphics/engine/water.h @@ -24,13 +24,11 @@ #pragma once - -#include "common/event.h" - #include "graphics/engine/particle.h" class CSoundInterface; +struct Event; // Graphics module namespace diff --git a/src/graphics/model/model_mesh.h b/src/graphics/model/model_mesh.h index 4908e722..fa52d3fa 100644 --- a/src/graphics/model/model_mesh.h +++ b/src/graphics/model/model_mesh.h @@ -28,8 +28,6 @@ namespace Gfx { -struct ModelTriangle; - /** * \class CModelMesh * \brief Mesh data saved in model file diff --git a/src/graphics/opengl/gl21device.cpp b/src/graphics/opengl/gl21device.cpp index 1c63deb6..1a86fade 100644 --- a/src/graphics/opengl/gl21device.cpp +++ b/src/graphics/opengl/gl21device.cpp @@ -26,6 +26,8 @@ #include "common/image.h" #include "common/logger.h" +#include "graphics/core/light.h" + #include "graphics/engine/engine.h" #include "graphics/opengl/glframebuffer.h" diff --git a/src/graphics/opengl/gl21device.h b/src/graphics/opengl/gl21device.h index c6d1c8ad..9e8a18f6 100644 --- a/src/graphics/opengl/gl21device.h +++ b/src/graphics/opengl/gl21device.h @@ -26,8 +26,12 @@ #include "graphics/core/device.h" +#include "graphics/core/material.h" + #include "graphics/opengl/glutil.h" +#include "math/matrix.h" + #include #include #include @@ -38,8 +42,6 @@ namespace Gfx { -struct GLDevicePrivate; - /** \class CGL21Device \brief Implementation of CDevice interface in OpenGL diff --git a/src/graphics/opengl/gl33device.cpp b/src/graphics/opengl/gl33device.cpp index a3cc6254..1246564d 100644 --- a/src/graphics/opengl/gl33device.cpp +++ b/src/graphics/opengl/gl33device.cpp @@ -26,6 +26,8 @@ #include "common/logger.h" #include "common/make_unique.h" +#include "graphics/core/light.h" + #include "graphics/engine/engine.h" #include "graphics/opengl/glframebuffer.h" diff --git a/src/graphics/opengl/gl33device.h b/src/graphics/opengl/gl33device.h index 2e6382f8..b872bb0c 100644 --- a/src/graphics/opengl/gl33device.h +++ b/src/graphics/opengl/gl33device.h @@ -26,9 +26,13 @@ #include "graphics/core/device.h" +#include "graphics/core/material.h" + #include "graphics/opengl/glframebuffer.h" #include "graphics/opengl/glutil.h" +#include "math/matrix.h" + #include #include #include diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp index f283a0aa..6070acdf 100644 --- a/src/graphics/opengl/gldevice.cpp +++ b/src/graphics/opengl/gldevice.cpp @@ -25,6 +25,8 @@ #include "common/image.h" #include "common/logger.h" +#include "graphics/core/light.h" + #include "graphics/engine/engine.h" #include "graphics/opengl/glframebuffer.h" diff --git a/src/graphics/opengl/gldevice.h b/src/graphics/opengl/gldevice.h index f510e6b8..664bdc51 100644 --- a/src/graphics/opengl/gldevice.h +++ b/src/graphics/opengl/gldevice.h @@ -26,9 +26,13 @@ #include "graphics/core/device.h" +#include "graphics/core/material.h" + #include "graphics/opengl/glframebuffer.h" #include "graphics/opengl/glutil.h" +#include "math/matrix.h" + #include #include #include @@ -57,8 +61,6 @@ enum ShadowMappingSupport SMS_CORE //! Core support }; -struct GLDevicePrivate; - /** \class CGLDevice \brief Implementation of CDevice interface in OpenGL diff --git a/src/level/mainmovie.h b/src/level/mainmovie.h index 81d5113c..955e6f78 100644 --- a/src/level/mainmovie.h +++ b/src/level/mainmovie.h @@ -24,20 +24,18 @@ #pragma once - -#include "common/event.h" - #include "math/vector.h" class CRobotMain; class CSoundInterface; +struct Event; namespace Gfx { class CCamera; class CEngine; -} +} // namespace Gfx enum MainMovieType { diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp index 674fca40..98da4e84 100644 --- a/src/level/robotmain.cpp +++ b/src/level/robotmain.cpp @@ -95,6 +95,7 @@ #include "ui/controls/button.h" #include "ui/controls/edit.h" +#include "ui/controls/group.h" #include "ui/controls/interface.h" #include "ui/controls/label.h" #include "ui/controls/map.h" diff --git a/src/level/robotmain.h b/src/level/robotmain.h index dbe319b5..9ce4a1b7 100644 --- a/src/level/robotmain.h +++ b/src/level/robotmain.h @@ -27,6 +27,7 @@ #include "app/pausemanager.h" #include "common/error.h" +#include "common/event.h" #include "common/singleton.h" #include "level/build_type.h" diff --git a/src/object/auto/auto.h b/src/object/auto/auto.h index a305a61b..c685e261 100644 --- a/src/object/auto/auto.h +++ b/src/object/auto/auto.h @@ -35,22 +35,20 @@ namespace Ui { class CInterface; class CWindow; -} /* Ui */ +} // namespace Ui namespace Gfx { class CEngine; class CParticle; -class CLightManager; -class CTarrain; +class CTerrain; class CWater; class CCloud; class CCamera; class CPlanet; class CLightning; -class CTerrain; -} /* Gfx */ +} // namespace Gfx class CAuto diff --git a/src/object/auto/autolabo.h b/src/object/auto/autolabo.h index 83fbee8e..5723bb24 100644 --- a/src/object/auto/autolabo.h +++ b/src/object/auto/autolabo.h @@ -25,8 +25,6 @@ #include "level/research_type.h" -class CPoweredObject; - enum AutoLaboPhase { ALAP_WAIT = 1, diff --git a/src/object/implementation/power_container_impl.h b/src/object/implementation/power_container_impl.h index a20c8e2f..2392c422 100644 --- a/src/object/implementation/power_container_impl.h +++ b/src/object/implementation/power_container_impl.h @@ -21,7 +21,6 @@ #include "object/interface/power_container_object.h" -class CObject; class CPowerContainerObjectImpl : public CPowerContainerObject { diff --git a/src/object/interface/programmable_object.h b/src/object/interface/programmable_object.h index 2affb795..0c44421c 100644 --- a/src/object/interface/programmable_object.h +++ b/src/object/interface/programmable_object.h @@ -21,12 +21,12 @@ #include "object/object_interface_type.h" -#include "object/interface/program_storage_object.h" - #include #include #include +struct Program; + /** * \class CProgrammableObject * \brief Interface for programmable objects diff --git a/src/object/interface/task_executor_object.h b/src/object/interface/task_executor_object.h index ece8cd6e..8b33d9ad 100644 --- a/src/object/interface/task_executor_object.h +++ b/src/object/interface/task_executor_object.h @@ -29,8 +29,6 @@ #include "object/task/taskmanip.h" #include "object/task/taskshield.h" -class CTask; - /** * \class CTaskExecutorObject * \brief Interface for objects that can execute tasks diff --git a/src/object/motion/motion.h b/src/object/motion/motion.h index 1a206158..c0d8225b 100644 --- a/src/object/motion/motion.h +++ b/src/object/motion/motion.h @@ -19,10 +19,10 @@ #pragma once - -#include "common/event.h" #include "common/error.h" +#include "math/vector.h" + #include "object/object_type.h" namespace Gfx @@ -33,7 +33,7 @@ class CTerrain; class CWater; class CCamera; class COldModelManager; -} +} // namespace Gfx class CApplication; class CPhysics; @@ -41,6 +41,7 @@ class COldObject; class CRobotMain; class CSoundInterface; class CLevelParserLine; +struct Event; class CMotion diff --git a/src/object/motion/motionlevelcontroller.cpp b/src/object/motion/motionlevelcontroller.cpp index 494f2aa5..d8cd11d1 100644 --- a/src/object/motion/motionlevelcontroller.cpp +++ b/src/object/motion/motionlevelcontroller.cpp @@ -20,8 +20,6 @@ #include "object/motion/motionlevelcontroller.h" -#include "graphics/engine/oldmodelmanager.h" - #include "object/old_object.h" #include "physics/physics.h" diff --git a/src/object/motion/motiontoto.h b/src/object/motion/motiontoto.h index e5460f69..2325b01a 100644 --- a/src/object/motion/motiontoto.h +++ b/src/object/motion/motiontoto.h @@ -19,9 +19,9 @@ #pragma once - #include "object/motion/motion.h" +#include "math/point.h" enum MotionTotoAction diff --git a/src/object/object.h b/src/object/object.h index 03baceb5..be71b46f 100644 --- a/src/object/object.h +++ b/src/object/object.h @@ -25,9 +25,9 @@ #pragma once #include "object/crash_sphere.h" +#include "object/object_create_params.h" #include "object/object_interface_type.h" #include "object/old_object_interface.h" -#include "object/object_create_params.h" #include diff --git a/src/object/old_object.h b/src/object/old_object.h index 513892e5..a44458b4 100644 --- a/src/object/old_object.h +++ b/src/object/old_object.h @@ -24,6 +24,8 @@ #pragma once +#include "common/event.h" + #include "object/object.h" #include "object/interface/carrier_object.h" diff --git a/src/object/old_object_interface.cpp b/src/object/old_object_interface.cpp index 9e47c2eb..eee183cf 100644 --- a/src/object/old_object_interface.cpp +++ b/src/object/old_object_interface.cpp @@ -21,7 +21,6 @@ #include - void COldObjectInterface::Simplify() { throw std::logic_error("Simplify: not implemented!"); diff --git a/src/object/old_object_interface.h b/src/object/old_object_interface.h index 22f50fdb..b8e55581 100644 --- a/src/object/old_object_interface.h +++ b/src/object/old_object_interface.h @@ -24,11 +24,14 @@ #pragma once -#include "math/matrix.h" #include "math/vector.h" #include "object/object_type.h" +namespace Math +{ +struct Matrix; +} // namespace Math class CAuto; diff --git a/src/object/task/task.h b/src/object/task/task.h index 671b02a0..7d0552ef 100644 --- a/src/object/task/task.h +++ b/src/object/task/task.h @@ -19,8 +19,6 @@ #pragma once - -#include "common/event.h" #include "common/error.h" #include "math/const.h" @@ -32,7 +30,7 @@ class COldObject; class CProgrammableObject; class CRobotMain; class CSoundInterface; - +struct Event; namespace Gfx { diff --git a/src/object/task/taskgoto.h b/src/object/task/taskgoto.h index e49f7830..80536209 100644 --- a/src/object/task/taskgoto.h +++ b/src/object/task/taskgoto.h @@ -19,13 +19,17 @@ #pragma once - #include "object/task/task.h" #include "math/vector.h" #include +namespace Math +{ +struct Point; +} // namespace Math; + class CObject; diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h index fa7c2b8f..7d994f54 100644 --- a/src/object/task/tasktake.h +++ b/src/object/task/tasktake.h @@ -19,9 +19,10 @@ #pragma once - #include "object/task/task.h" +#include "math/vector.h" + #include "object/object_type.h" diff --git a/src/physics/physics.h b/src/physics/physics.h index 3b63b4b1..d6f987c0 100644 --- a/src/physics/physics.h +++ b/src/physics/physics.h @@ -46,12 +46,11 @@ namespace Gfx { class CCamera; class CEngine; -class CLight; class CParticle; class CTerrain; class CWater; class CLightManager; -} +} // namespace Gfx enum PhysicsMode diff --git a/src/sound/oalsound/channel.cpp b/src/sound/oalsound/channel.cpp index f86c5332..4b3b5593 100644 --- a/src/sound/oalsound/channel.cpp +++ b/src/sound/oalsound/channel.cpp @@ -20,6 +20,8 @@ #include "sound/oalsound/channel.h" +#include "sound/oalsound/buffer.h" + Channel::Channel() : m_buffer(nullptr), m_source(0), diff --git a/src/sound/oalsound/channel.h b/src/sound/oalsound/channel.h index eb499bd2..b6050062 100644 --- a/src/sound/oalsound/channel.h +++ b/src/sound/oalsound/channel.h @@ -24,9 +24,10 @@ #pragma once +#include "math/vector.h" + #include "sound/sound.h" -#include "sound/oalsound/buffer.h" #include "sound/oalsound/check.h" #include @@ -36,6 +37,8 @@ #include #include +class Buffer; + struct SoundOper { float finalAmplitude = 0.0f; @@ -56,47 +59,47 @@ public: bool Pause(); bool Stop(); - bool SetPosition(const Math::Vector &); + bool SetPosition(const Math::Vector &pos); - bool SetFrequency(float); + bool SetFrequency(float freq); float GetFrequency(); float GetCurrentTime(); - void SetCurrentTime(float); + void SetCurrentTime(float current); float GetDuration(); - bool SetVolume(float); + bool SetVolume(float vol); float GetVolume(); - void SetVolumeAtrib(float); + void SetVolumeAtrib(float volume); float GetVolumeAtrib(); bool IsPlaying(); bool IsReady(); bool IsLoaded(); - bool SetBuffer(Buffer *); + bool SetBuffer(Buffer *buffer); bool HasEnvelope(); SoundOper& GetEnvelope(); void PopEnvelope(); int GetPriority(); - void SetPriority(int); + void SetPriority(int pri); - void SetStartAmplitude(float); - void SetStartFrequency(float); - void SetChangeFrequency(float); + void SetStartAmplitude(float gain); + void SetStartFrequency(float freq); + void SetChangeFrequency(float freq); float GetStartAmplitude(); float GetStartFrequency(); float GetChangeFrequency(); float GetInitFrequency(); - void AddOper(SoundOper); + void AddOper(SoundOper oper); void ResetOper(); SoundType GetSoundType(); - void SetLoop(bool); - void Mute(bool); + void SetLoop(bool loop); + void Mute(bool mute); bool IsMuted(); void Reset(); diff --git a/src/sound/sound.h b/src/sound/sound.h index e378aa86..cb37e08b 100644 --- a/src/sound/sound.h +++ b/src/sound/sound.h @@ -24,12 +24,15 @@ #pragma once -#include "math/vector.h" - #include "sound/sound_type.h" #include +namespace Math +{ +struct Vector; +} // namespace Math + /*! * Maximum possible audio volume */ diff --git a/src/ui/controls/check.h b/src/ui/controls/check.h index 8bef2eb4..c4341e45 100644 --- a/src/ui/controls/check.h +++ b/src/ui/controls/check.h @@ -21,12 +21,6 @@ #include "ui/controls/control.h" - -namespace Gfx -{ -class CEngine; -} - namespace Ui { @@ -43,4 +37,4 @@ public: void Draw() override; }; -} +} // namespace Ui diff --git a/src/ui/controls/color.h b/src/ui/controls/color.h index 9bb285a9..9b489dfc 100644 --- a/src/ui/controls/color.h +++ b/src/ui/controls/color.h @@ -21,12 +21,7 @@ #include "ui/controls/control.h" - -namespace Gfx -{ -class CEngine; -struct Color; -} +#include "graphics/core/color.h" namespace Ui { diff --git a/src/ui/controls/editvalue.h b/src/ui/controls/editvalue.h index c11b36b3..acac7542 100644 --- a/src/ui/controls/editvalue.h +++ b/src/ui/controls/editvalue.h @@ -19,16 +19,10 @@ #pragma once - #include "ui/controls/control.h" #include -namespace Gfx -{ -class CEngine; -} - namespace Ui { @@ -91,4 +85,4 @@ protected: }; -} +} // namespace Ui diff --git a/src/ui/controls/group.h b/src/ui/controls/group.h index e6746206..bfb59f49 100644 --- a/src/ui/controls/group.h +++ b/src/ui/controls/group.h @@ -19,14 +19,8 @@ #pragma once - #include "ui/controls/control.h" -namespace Gfx -{ -class CEngine; -} - namespace Ui { @@ -41,11 +35,7 @@ public: bool EventProcess(const Event &event) override; void Draw() override; - -protected: - -protected: }; -} +} // namespace Ui diff --git a/src/ui/controls/image.h b/src/ui/controls/image.h index 1d8a697c..7b1bd4b5 100644 --- a/src/ui/controls/image.h +++ b/src/ui/controls/image.h @@ -19,15 +19,8 @@ #pragma once - #include "ui/controls/control.h" -namespace Gfx -{ -class CEngine; -} - - namespace Ui { @@ -49,5 +42,4 @@ protected: std::string m_filename; }; - -} +} // namespace Ui diff --git a/src/ui/controls/interface.cpp b/src/ui/controls/interface.cpp index 939bd0b4..3d8c1aca 100644 --- a/src/ui/controls/interface.cpp +++ b/src/ui/controls/interface.cpp @@ -24,6 +24,25 @@ #include "level/robotmain.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/color.h" +#include "ui/controls/control.h" +#include "ui/controls/edit.h" +#include "ui/controls/editvalue.h" +#include "ui/controls/enumslider.h" +#include "ui/controls/group.h" +#include "ui/controls/image.h" +#include "ui/controls/key.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/map.h" +#include "ui/controls/scroll.h" +#include "ui/controls/shortcut.h" +#include "ui/controls/slider.h" +#include "ui/controls/target.h" +#include "ui/controls/window.h" + #include diff --git a/src/ui/controls/interface.h b/src/ui/controls/interface.h index 39474a23..93131472 100644 --- a/src/ui/controls/interface.h +++ b/src/ui/controls/interface.h @@ -20,39 +20,41 @@ #pragma once #include "common/event.h" -#include "common/misc.h" - -#include "graphics/engine/camera.h" -#include "graphics/engine/engine.h" #include "math/point.h" -#include "ui/controls/button.h" -#include "ui/controls/check.h" -#include "ui/controls/color.h" -#include "ui/controls/control.h" -#include "ui/controls/edit.h" -#include "ui/controls/editvalue.h" -#include "ui/controls/enumslider.h" -#include "ui/controls/group.h" -#include "ui/controls/image.h" -#include "ui/controls/key.h" -#include "ui/controls/label.h" -#include "ui/controls/list.h" -#include "ui/controls/map.h" -#include "ui/controls/scroll.h" -#include "ui/controls/shortcut.h" -#include "ui/controls/slider.h" -#include "ui/controls/target.h" -#include "ui/controls/window.h" - +#include #include #include -#include + +namespace Gfx +{ +class CCamera; +class CEngine; +} // namespace Gfx namespace Ui { +class CButton; +class CCheck; +class CColor; +class CControl; +class CEdit; +class CEditValue; +class CEnumSlider; +class CGroup; +class CImage; +class CKey; +class CLabel; +class CList; +class CMap; +class CScroll; +class CShortcut; +class CSlider; +class CTarget; +class CWindow; + const int MAXCONTROL = 100; class CInterface diff --git a/src/ui/controls/label.h b/src/ui/controls/label.h index f935ed65..113f3cf2 100644 --- a/src/ui/controls/label.h +++ b/src/ui/controls/label.h @@ -19,11 +19,9 @@ #pragma once - #include "ui/controls/control.h" #include "common/event.h" -#include "common/misc.h" namespace Ui { @@ -41,4 +39,4 @@ public: }; -} +} // namespace Ui diff --git a/src/ui/controls/list.h b/src/ui/controls/list.h index 0509ecb4..abf90b22 100644 --- a/src/ui/controls/list.h +++ b/src/ui/controls/list.h @@ -19,11 +19,9 @@ #pragma once - #include "ui/controls/control.h" #include "common/event.h" -#include "common/misc.h" #include "graphics/engine/text.h" diff --git a/src/ui/controls/scroll.h b/src/ui/controls/scroll.h index 30561bff..46f82848 100644 --- a/src/ui/controls/scroll.h +++ b/src/ui/controls/scroll.h @@ -19,11 +19,10 @@ #pragma once +#include "ui/controls/control.h" #include "common/event.h" -#include "ui/controls/control.h" - #include namespace Ui diff --git a/src/ui/controls/target.h b/src/ui/controls/target.h index 8ba69ad3..b7d70494 100644 --- a/src/ui/controls/target.h +++ b/src/ui/controls/target.h @@ -19,16 +19,14 @@ #pragma once -#include "common/event.h" -#include "common/misc.h" -#include "common/restext.h" - -#include "graphics/engine/engine.h" - #include "ui/controls/control.h" +#include "common/event.h" + #include +class CObject; + namespace Ui { @@ -50,4 +48,4 @@ protected: }; -} +} // namespace Ui diff --git a/src/ui/controls/window.cpp b/src/ui/controls/window.cpp index d5840007..6f8c8614 100644 --- a/src/ui/controls/window.cpp +++ b/src/ui/controls/window.cpp @@ -17,9 +17,27 @@ * along with this program. If not, see http://gnu.org/licenses */ - #include "ui/controls/window.h" +#include "ui/controls/button.h" +#include "ui/controls/check.h" +#include "ui/controls/color.h" +#include "ui/controls/control.h" +#include "ui/controls/edit.h" +#include "ui/controls/editvalue.h" +#include "ui/controls/enumslider.h" +#include "ui/controls/gauge.h" +#include "ui/controls/group.h" +#include "ui/controls/image.h" +#include "ui/controls/key.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" +#include "ui/controls/map.h" +#include "ui/controls/scroll.h" +#include "ui/controls/shortcut.h" +#include "ui/controls/slider.h" +#include "ui/controls/target.h" + #include diff --git a/src/ui/controls/window.h b/src/ui/controls/window.h index 4c8b3dea..9b1659f3 100644 --- a/src/ui/controls/window.h +++ b/src/ui/controls/window.h @@ -21,24 +21,7 @@ #include "ui/controls/control.h" -#include "ui/controls/button.h" -#include "ui/controls/check.h" -#include "ui/controls/color.h" -#include "ui/controls/control.h" -#include "ui/controls/edit.h" -#include "ui/controls/editvalue.h" -#include "ui/controls/enumslider.h" -#include "ui/controls/gauge.h" -#include "ui/controls/group.h" -#include "ui/controls/image.h" -#include "ui/controls/key.h" -#include "ui/controls/label.h" -#include "ui/controls/list.h" -#include "ui/controls/map.h" -#include "ui/controls/scroll.h" -#include "ui/controls/shortcut.h" -#include "ui/controls/slider.h" -#include "ui/controls/target.h" +#include "graphics/engine/engine.h" // TODO: only needed for EngineMouseType #include #include @@ -47,6 +30,24 @@ namespace Ui { +class CButton; +class CColor; +class CCheck; +class CKey; +class CGroup; +class CImage; +class CLabel; +class CEdit; +class CEditValue; +class CScroll; +class CSlider; +class CEnumSlider; +class CList; +class CShortcut; +class CMap; +class CGauge; +class CTarget; + class CWindow : public CControl { public: @@ -150,4 +151,4 @@ protected: }; -} +} // namespace Ui diff --git a/src/ui/displayinfo.h b/src/ui/displayinfo.h index c269921d..935cafbb 100644 --- a/src/ui/displayinfo.h +++ b/src/ui/displayinfo.h @@ -19,8 +19,6 @@ #pragma once -#include "common/event.h" - #include "graphics/engine/camera.h" #include @@ -30,7 +28,6 @@ class CObject; class CEventQueue; class CPauseManager; struct ActivePause; - struct Event; namespace Gfx @@ -38,7 +35,7 @@ namespace Gfx class CEngine; class CParticle; class CLightManager; -} +} // namespace Gfx namespace Ui { diff --git a/src/ui/maindialog.cpp b/src/ui/maindialog.cpp index def29925..31e5ebbb 100644 --- a/src/ui/maindialog.cpp +++ b/src/ui/maindialog.cpp @@ -35,6 +35,7 @@ #include "sound/sound.h" #include "ui/controls/button.h" +#include "ui/controls/label.h" #include "ui/controls/interface.h" #include "ui/controls/window.h" diff --git a/src/ui/maindialog.h b/src/ui/maindialog.h index a9d186d1..84829b1c 100644 --- a/src/ui/maindialog.h +++ b/src/ui/maindialog.h @@ -19,9 +19,10 @@ #pragma once -#include "common/event.h" #include "common/restext.h" +#include "math/point.h" + #include #include @@ -29,12 +30,13 @@ class CSettings; class CSoundInterface; class CRobotMain; +struct Event; namespace Gfx { class CEngine; class CParticle; -} +} // namespace Gfx namespace Ui { @@ -50,7 +52,7 @@ public: bool EventProcess(const Event &event); - typedef std::function DialogCallback; + using DialogCallback = std::function; void StartQuestion(const std::string& text, bool warningYes = false, bool warningNo = false, bool fireParticles = false, diff --git a/src/ui/mainmap.cpp b/src/ui/mainmap.cpp index b5ea2a2d..f80c27d7 100644 --- a/src/ui/mainmap.cpp +++ b/src/ui/mainmap.cpp @@ -24,6 +24,12 @@ #include "level/robotmain.h" +#include "ui/controls/interface.h" +#include "ui/controls/map.h" +#include "ui/controls/scroll.h" +#include "ui/controls/slider.h" +#include "ui/controls/window.h" + namespace Ui { diff --git a/src/ui/mainmap.h b/src/ui/mainmap.h index d3f1b2a1..b80e9a47 100644 --- a/src/ui/mainmap.h +++ b/src/ui/mainmap.h @@ -19,18 +19,23 @@ #pragma once -#include "common/event.h" - #include "graphics/core/color.h" #include "math/point.h" -#include "ui/controls/interface.h" +class CObject; +class CEventQueue; +namespace Gfx +{ +class CEngine; +} // namespace Gfx namespace Ui { +class CInterface; + class CMainMap { public: @@ -64,4 +69,4 @@ protected: bool m_bFixImage; }; -} +} // namespace Ui diff --git a/src/ui/mainshort.cpp b/src/ui/mainshort.cpp index c74dbaba..13b111a4 100644 --- a/src/ui/mainshort.cpp +++ b/src/ui/mainshort.cpp @@ -33,6 +33,9 @@ #include "object/interface/controllable_object.h" #include "object/interface/programmable_object.h" +#include "ui/controls/interface.h" +#include "ui/controls/shortcut.h" + #include diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h index c2f4aaf7..58df5773 100644 --- a/src/ui/mainshort.h +++ b/src/ui/mainshort.h @@ -21,17 +21,24 @@ #include "common/event.h" -#include "graphics/engine/engine.h" - #include "math/point.h" #include "object/object_type.h" -#include "ui/controls/interface.h" +#include + +class CRobotMain; +class CObject; + +namespace Gfx +{ +class CEngine; +} // namespace Gfx namespace Ui { +class CInterface; class CMainShort { @@ -60,4 +67,4 @@ protected: bool m_bBuilding; }; -} +} // namespace Ui diff --git a/src/ui/mainui.cpp b/src/ui/mainui.cpp index cbccba20..c61dd033 100644 --- a/src/ui/mainui.cpp +++ b/src/ui/mainui.cpp @@ -52,6 +52,7 @@ #include "ui/screen/screen_welcome.h" #include "ui/controls/interface.h" +#include "ui/controls/group.h" #include "ui/controls/label.h" #include "ui/controls/window.h" diff --git a/src/ui/mainui.h b/src/ui/mainui.h index b0c962af..da41a1de 100644 --- a/src/ui/mainui.h +++ b/src/ui/mainui.h @@ -34,7 +34,7 @@ namespace Gfx { class CEngine; class CParticle; -} +} // namespace Gfx namespace Ui { diff --git a/src/ui/object_interface.cpp b/src/ui/object_interface.cpp index 7d8bc9b4..4a29ac5d 100644 --- a/src/ui/object_interface.cpp +++ b/src/ui/object_interface.cpp @@ -22,6 +22,7 @@ #include "app/app.h" #include "common/global.h" +#include "common/restext.h" #include "graphics/core/color.h" @@ -52,8 +53,15 @@ #include "ui/studio.h" +#include "ui/controls/button.h" +#include "ui/controls/color.h" +#include "ui/controls/gauge.h" +#include "ui/controls/group.h" #include "ui/controls/interface.h" +#include "ui/controls/label.h" +#include "ui/controls/list.h" #include "ui/controls/slider.h" +#include "ui/controls/target.h" #include "ui/controls/window.h" diff --git a/src/ui/object_interface.h b/src/ui/object_interface.h index c1ddb8cc..2e991d76 100644 --- a/src/ui/object_interface.h +++ b/src/ui/object_interface.h @@ -29,7 +29,6 @@ class CPhysics; class CMotion; class CRobotMain; class CSoundInterface; -class CLevelParserLine; struct Program; namespace Gfx diff --git a/src/ui/screen/screen_apperance.cpp b/src/ui/screen/screen_apperance.cpp index 0a9b3202..2dc4ebe8 100644 --- a/src/ui/screen/screen_apperance.cpp +++ b/src/ui/screen/screen_apperance.cpp @@ -21,6 +21,8 @@ #include "app/app.h" +#include "common/restext.h" + #include "graphics/engine/camera.h" #include "level/player_profile.h" diff --git a/src/ui/screen/screen_io.cpp b/src/ui/screen/screen_io.cpp index f9c6b28d..fbae0483 100644 --- a/src/ui/screen/screen_io.cpp +++ b/src/ui/screen/screen_io.cpp @@ -20,6 +20,8 @@ #include "ui/screen/screen_io.h" #include "common/logger.h" +#include "common/misc.h" +#include "common/restext.h" #include "common/stringutils.h" #include "level/player_profile.h" @@ -35,6 +37,7 @@ #include "ui/controls/edit.h" #include "ui/controls/interface.h" #include "ui/controls/image.h" +#include "ui/controls/list.h" #include "ui/controls/window.h" #include diff --git a/src/ui/screen/screen_io_read.cpp b/src/ui/screen/screen_io_read.cpp index a9b8a01e..5ce9753e 100644 --- a/src/ui/screen/screen_io_read.cpp +++ b/src/ui/screen/screen_io_read.cpp @@ -21,6 +21,8 @@ #include "app/app.h" +#include "common/restext.h" + #include "level/robotmain.h" #include "ui/controls/button.h" diff --git a/src/ui/screen/screen_io_write.cpp b/src/ui/screen/screen_io_write.cpp index 3a373248..f5dcaca2 100644 --- a/src/ui/screen/screen_io_write.cpp +++ b/src/ui/screen/screen_io_write.cpp @@ -21,6 +21,8 @@ #include "app/app.h" +#include "common/restext.h" + #include "level/robotmain.h" #include "ui/controls/button.h" diff --git a/src/ui/screen/screen_loading.cpp b/src/ui/screen/screen_loading.cpp index 4f68f036..7bf9cea7 100644 --- a/src/ui/screen/screen_loading.cpp +++ b/src/ui/screen/screen_loading.cpp @@ -24,6 +24,7 @@ #include "ui/controls/button.h" #include "ui/controls/edit.h" #include "ui/controls/gauge.h" +#include "ui/controls/group.h" #include "ui/controls/interface.h" #include "ui/controls/label.h" #include "ui/controls/window.h" diff --git a/src/ui/screen/screen_main_menu.cpp b/src/ui/screen/screen_main_menu.cpp index 3c582fe2..fcab0623 100644 --- a/src/ui/screen/screen_main_menu.cpp +++ b/src/ui/screen/screen_main_menu.cpp @@ -22,6 +22,7 @@ #include "app/app.h" #include "common/logger.h" +#include "common/restext.h" #include "level/parser/parser.h" diff --git a/src/ui/screen/screen_main_menu.h b/src/ui/screen/screen_main_menu.h index 0527c788..b0350c01 100644 --- a/src/ui/screen/screen_main_menu.h +++ b/src/ui/screen/screen_main_menu.h @@ -24,8 +24,6 @@ namespace Ui { -class CScreenSetup; - class CScreenMainMenu : public CScreen { public: diff --git a/src/ui/screen/screen_player_select.cpp b/src/ui/screen/screen_player_select.cpp index 295aa924..680af0c6 100644 --- a/src/ui/screen/screen_player_select.cpp +++ b/src/ui/screen/screen_player_select.cpp @@ -24,6 +24,7 @@ #include "level/robotmain.h" #include "common/logger.h" +#include "common/misc.h" #include "common/stringutils.h" #include "level/player_profile.h" @@ -34,6 +35,8 @@ #include "ui/controls/button.h" #include "ui/controls/edit.h" +#include "ui/controls/gauge.h" +#include "ui/controls/group.h" #include "ui/controls/interface.h" #include "ui/controls/label.h" #include "ui/controls/list.h" diff --git a/src/ui/screen/screen_quit.cpp b/src/ui/screen/screen_quit.cpp index 96ff97de..6086a835 100644 --- a/src/ui/screen/screen_quit.cpp +++ b/src/ui/screen/screen_quit.cpp @@ -21,6 +21,8 @@ #include "app/app.h" +#include "common/restext.h" + #include "level/robotmain.h" #include "ui/controls/button.h" diff --git a/src/ui/screen/screen_setup.cpp b/src/ui/screen/screen_setup.cpp index 6ee8967a..e1b91822 100644 --- a/src/ui/screen/screen_setup.cpp +++ b/src/ui/screen/screen_setup.cpp @@ -23,6 +23,7 @@ #include "app/app.h" +#include "common/restext.h" #include "common/settings.h" #include "common/stringutils.h" diff --git a/src/ui/screen/screen_setup_controls.cpp b/src/ui/screen/screen_setup_controls.cpp index 264b2e02..2436107f 100644 --- a/src/ui/screen/screen_setup_controls.cpp +++ b/src/ui/screen/screen_setup_controls.cpp @@ -27,6 +27,7 @@ #include "graphics/engine/camera.h" #include "ui/controls/button.h" +#include "ui/controls/check.h" #include "ui/controls/group.h" #include "ui/controls/interface.h" #include "ui/controls/key.h" diff --git a/src/ui/screen/screen_setup_controls.h b/src/ui/screen/screen_setup_controls.h index 90d0f653..b7c614c8 100644 --- a/src/ui/screen/screen_setup_controls.h +++ b/src/ui/screen/screen_setup_controls.h @@ -21,13 +21,6 @@ #include "ui/screen/screen_setup.h" -class CSettings; - -namespace Gfx -{ -class CCamera; -} - namespace Ui { diff --git a/src/ui/screen/screen_setup_display.cpp b/src/ui/screen/screen_setup_display.cpp index f9cd2cc9..aa46f8e4 100644 --- a/src/ui/screen/screen_setup_display.cpp +++ b/src/ui/screen/screen_setup_display.cpp @@ -23,6 +23,7 @@ #include "app/app.h" +#include "common/restext.h" #include "common/settings.h" #include "common/stringutils.h" diff --git a/src/ui/screen/screen_setup_display.h b/src/ui/screen/screen_setup_display.h index c93df652..97b2d50b 100644 --- a/src/ui/screen/screen_setup_display.h +++ b/src/ui/screen/screen_setup_display.h @@ -21,13 +21,6 @@ #include "ui/screen/screen_setup.h" -class CSettings; - -namespace Gfx -{ -class CCamera; -} - namespace Ui { diff --git a/src/ui/screen/screen_setup_game.cpp b/src/ui/screen/screen_setup_game.cpp index 90afee16..f59dc9f1 100644 --- a/src/ui/screen/screen_setup_game.cpp +++ b/src/ui/screen/screen_setup_game.cpp @@ -21,6 +21,7 @@ #include "app/app.h" +#include "common/restext.h" #include "common/settings.h" #include "common/stringutils.h" diff --git a/src/ui/screen/screen_setup_game.h b/src/ui/screen/screen_setup_game.h index 937f02f1..13d31233 100644 --- a/src/ui/screen/screen_setup_game.h +++ b/src/ui/screen/screen_setup_game.h @@ -21,13 +21,6 @@ #include "ui/screen/screen_setup.h" -class CSettings; - -namespace Gfx -{ -class CCamera; -} - namespace Ui { diff --git a/src/ui/screen/screen_setup_graphics.cpp b/src/ui/screen/screen_setup_graphics.cpp index 327f04f1..5a05dac7 100644 --- a/src/ui/screen/screen_setup_graphics.cpp +++ b/src/ui/screen/screen_setup_graphics.cpp @@ -23,6 +23,7 @@ #include "app/app.h" +#include "common/restext.h" #include "common/settings.h" #include "common/stringutils.h" diff --git a/src/ui/screen/screen_setup_graphics.h b/src/ui/screen/screen_setup_graphics.h index c2e836bf..29578659 100644 --- a/src/ui/screen/screen_setup_graphics.h +++ b/src/ui/screen/screen_setup_graphics.h @@ -21,13 +21,6 @@ #include "ui/screen/screen_setup.h" -class CSettings; - -namespace Gfx -{ -class CCamera; -} - namespace Ui { diff --git a/src/ui/screen/screen_setup_sound.cpp b/src/ui/screen/screen_setup_sound.cpp index d613b474..feb784e4 100644 --- a/src/ui/screen/screen_setup_sound.cpp +++ b/src/ui/screen/screen_setup_sound.cpp @@ -21,6 +21,7 @@ #include "app/app.h" +#include "common/restext.h" #include "common/settings.h" #include "common/stringutils.h" diff --git a/src/ui/screen/screen_setup_sound.h b/src/ui/screen/screen_setup_sound.h index 5d7fef22..4ea58937 100644 --- a/src/ui/screen/screen_setup_sound.h +++ b/src/ui/screen/screen_setup_sound.h @@ -21,13 +21,6 @@ #include "ui/screen/screen_setup.h" -class CSettings; - -namespace Gfx -{ -class CCamera; -} - namespace Ui { diff --git a/src/ui/studio.cpp b/src/ui/studio.cpp index cd446a5d..31f4bc6e 100644 --- a/src/ui/studio.cpp +++ b/src/ui/studio.cpp @@ -40,6 +40,7 @@ #include "object/object.h" +#include "object/interface/program_storage_object.h" #include "object/interface/programmable_object.h" #include "script/cbottoken.h" @@ -59,6 +60,7 @@ #include "ui/controls/list.h" #include "ui/controls/map.h" #include "ui/controls/shortcut.h" +#include "ui/controls/slider.h" #include "ui/controls/target.h" #include "ui/controls/window.h" diff --git a/src/ui/studio.h b/src/ui/studio.h index 3b2b2088..cdb8cf08 100644 --- a/src/ui/studio.h +++ b/src/ui/studio.h @@ -19,8 +19,6 @@ #pragma once -#include "common/event.h" - #include "graphics/engine/camera.h" #include @@ -32,6 +30,7 @@ class CSettings; struct Program; class CPauseManager; struct ActivePause; +struct Event; namespace Ui {