Merge branch 'dev-ui' into dev

Conflicts:
	src/CMakeLists.txt
	src/common/misc.cpp
	src/common/misc.h
	src/object/robotmain.cpp
	src/object/robotmain.h
	src/script/cbottoken.cpp
	src/script/cbottoken.h
	src/ui/button.cpp
	src/ui/button.h
	src/ui/check.cpp
	src/ui/check.h
	src/ui/color.cpp
	src/ui/color.h
	src/ui/compass.cpp
	src/ui/compass.h
	src/ui/control.cpp
	src/ui/control.h
	src/ui/displayinfo.cpp
	src/ui/displayinfo.h
	src/ui/displaytext.cpp
	src/ui/displaytext.h
	src/ui/edit.cpp
	src/ui/edit.h
	src/ui/gauge.cpp
	src/ui/gauge.h
	src/ui/interface.cpp
	src/ui/interface.h
	src/ui/key.cpp
	src/ui/map.h
	src/ui/shortcut.h
	src/ui/slider.h
	src/ui/target.cpp
	src/ui/target.h
	src/ui/window.cpp
	src/ui/window.h

1 files changed, 17 insertions, 16 deletions

diff --git a/src/ui/gauge.h b/src/ui/gauge.h
index b745834..8b7ef66 100644
--- a/src/ui/gauge.h
+++ b/src/ui/gauge.h
@@ -19,35 +19,36 @@
 
 #pragma once
 
+#include <graphics/engine/engine.h>
 
-#include "ui/control.h"
+#include <common/event.h>
+#include <common/misc.h>
+
+#include <ui/control.h>
 
-namespace Gfx{
-class CEngine;
-};
 
 namespace Ui {
 
 class CGauge : public CControl
 {
-public:
-//    CGauge(CInstanceManager* iMan);
-    CGauge();
-    virtual ~CGauge();
+    public:
+    //    CGauge(CInstanceManager* iMan);
+        CGauge();
+        virtual ~CGauge();
 
-    bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
+        bool    Create(Math::Point pos, Math::Point dim, int icon, EventType eventType);
 
-    bool    EventProcess(const Event &event);
+        bool    EventProcess(const Event &event);
 
-    void    Draw();
+        void    Draw();
 
-    void    SetLevel(float level);
-    float   GetLevel();
+        void    SetLevel(float level);
+        float   GetLevel();
 
-protected:
+    protected:
 
-protected:
-    float   m_level;
+    protected:
+        float   m_level;
 };