[colobot] 17/377: Introduce forward declarations as suggested by colobot-lint
Didier Raboud
odyx at moszumanska.debian.org
Wed Mar 30 13:33:53 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 66ce745be0e13d626469d6d59e433d0266d61c2b
Author: Piotr Dziwinski <piotrdz at gmail.com>
Date: Sun Sep 27 16:28:11 2015 +0200
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 -
src/object/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 2fcee83..771267b 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 <map>
+struct Event;
+
/**
* \struct InputBinding
* \brief Binding for input slot
diff --git a/src/graphics/core/device.h b/src/graphics/core/device.h
index 5c1acdc..36ba958 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 <memory>
#include <string>
@@ -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 7395261..3ca387b 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 400b256..62e6edb 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<MouseWheelEventData>()->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<MouseWheelEventData>()->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 52f84cd..453f994 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 7cb4ed3..daa0f39 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 3d5fbbe..67f2c40 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 53f3d41..9d1eb5e 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 08bee6d..64cbb68 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 b90a0b9..2289b78 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 3b18264..3235f40 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 77ce8da..2be1044 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 4908e72..fa52d3f 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 1c63deb..1a86fad 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 c6d1c8a..9e8a18f 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 <string>
#include <vector>
#include <set>
@@ -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 a3cc625..1246564 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 2e6382f..b872bb0 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 <map>
#include <memory>
#include <set>
diff --git a/src/graphics/opengl/gldevice.cpp b/src/graphics/opengl/gldevice.cpp
index f283a0a..6070acd 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 f510e6b..664bdc5 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 <string>
#include <vector>
#include <set>
@@ -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 81d5113..955e6f7 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 674fca4..98da4e8 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 dbe319b..9ce4a1b 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 a305a61..c685e26 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 83fbee8..5723bb2 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 a20c8e2..2392c42 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 2affb79..0c44421 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 <memory>
#include <string>
#include <vector>
+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 ece8cd6..8b33d9a 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 1a20615..c0d8225 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 494f2aa..d8cd11d 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 e5460f6..2325b01 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 03baceb..be71b46 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 <vector>
diff --git a/src/object/old_object.h b/src/object/old_object.h
index 513892e..a44458b 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 9e47c2e..eee183c 100644
--- a/src/object/old_object_interface.cpp
+++ b/src/object/old_object_interface.cpp
@@ -21,7 +21,6 @@
#include <stdexcept>
-
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 22f50fd..b8e5558 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 671b02a..7d0552e 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 e49f783..8053620 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 <memory>
+namespace Math
+{
+struct Point;
+} // namespace Math;
+
class CObject;
diff --git a/src/object/task/tasktake.h b/src/object/task/tasktake.h
index fa7c2b8..7d994f5 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 3b63b4b..d6f987c 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 f86c533..4b3b559 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 eb499bd..b605006 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 <string>
@@ -36,6 +37,8 @@
#include <al.h>
#include <alc.h>
+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 e378aa8..cb37e08 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 <string>
+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 8bef2eb..c4341e4 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 9bb285a..9b489df 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 c11b36b..acac754 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 <memory>
-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 e674620..bfb59f4 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 1d8a697..7b1bd4b 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 939bd0b..3d8c1ac 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 <boost/range/adaptor/reversed.hpp>
diff --git a/src/ui/controls/interface.h b/src/ui/controls/interface.h
index 39474a2..9313147 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 <array>
#include <memory>
#include <string>
-#include <vector>
+
+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 f935ed6..113f3cf 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 0509ecb..abf90b2 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 30561bf..46f8284 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 <memory>
namespace Ui
diff --git a/src/ui/controls/target.h b/src/ui/controls/target.h
index 8ba69ad..b7d7049 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 <string>
+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 d584000..6f8c861 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 <algorithm>
diff --git a/src/ui/controls/window.h b/src/ui/controls/window.h
index 4c8b3de..9b1659f 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 <memory>
#include <string>
@@ -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 c269921..935cafb 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 <string>
@@ -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 def2992..31e5ebb 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 a9d186d..84829b1 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 <vector>
#include <functional>
@@ -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<void()> DialogCallback;
+ using DialogCallback = std::function<void()>;
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 b5ea2a2..f80c27d 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 d3f1b2a..b80e9a4 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 c74dbab..13b111a 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 <algorithm>
diff --git a/src/ui/mainshort.h b/src/ui/mainshort.h
index c2f4aaf..58df577 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 <vector>
+
+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 cbccba2..c61dd03 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 b0c962a..da41a1d 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 7d8bc9b..4a29ac5 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 c1ddb8c..2e991d7 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 0a9b320..2dc4ebe 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 f9c6b28..fbae048 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 <ctime>
diff --git a/src/ui/screen/screen_io_read.cpp b/src/ui/screen/screen_io_read.cpp
index a9b8a01..5ce9753 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 3a37324..f5dcaca 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 4f68f03..7bf9cea 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 3c582fe..fcab062 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 0527c78..b0350c0 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 295aa92..680af0c 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 96ff97d..6086a83 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 6ee8967..e1b9182 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 264b2e0..2436107 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 90d0f65..b7c614c 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 f9cd2cc..aa46f8e 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 c93df65..97b2d50 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 90afee1..f59dc9f 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 937f02f..13d3123 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 327f04f..5a05dac 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 c2e836b..2957865 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 d613b47..feb784e 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 5d7fef2..4ea5893 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 cd446a5..31f4bc6 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 3b2b208..cdb8cf0 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 <string>
@@ -32,6 +30,7 @@ class CSettings;
struct Program;
class CPauseManager;
struct ActivePause;
+struct Event;
namespace Ui
{
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list