From c2464d4c71bbc0154287f0b0441aef05e27cf084 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Fri, 17 Aug 2012 22:43:07 +0200
Subject: * changes to ui classes

---
 src/ui/target.h | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'src/ui/target.h')

diff --git a/src/ui/target.h b/src/ui/target.h
index ae0c7af..a2615b4 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -19,30 +19,25 @@
 #pragma once
 
 
-#include "ui/control.h"
-
-
-class CD3DEngine;
-class CObject;
+#include <ui/control.h>
 
+#include <common/event.h>
 
 
 class CTarget : public CControl
 {
-public:
-    CTarget(CInstanceManager* iMan);
-    ~CTarget();
-
-    bool        Create(Math::Point pos, Math::Point dim, int icon, EventMsg eventMsg);
+    public:
+        CTarget();
+        ~CTarget();
 
-    bool        EventProcess(const Event &event);
-    void        Draw();
-    bool        GetTooltip(Math::Point pos, char* name);
+        bool        Create(Math::Point pos, Math::Point dim, int icon, EventType eventMsg);
 
-protected:
-    CObject*    DetectFriendObject(Math::Point pos);
+        bool        EventProcess(const Event &event);
+        void        Draw();
+        bool        GetTooltip(Math::Point pos, char* name);
 
-protected:
+    protected:
+        CObject*    DetectFriendObject(Math::Point pos);
 };
 
 
-- 
cgit v1.2.3-1-g7c22


From 02dc368a385fb493a87486aa929d9460ce40c31b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Konopacki?= <konopacki.m@gmail.com>
Date: Mon, 20 Aug 2012 21:31:16 +0200
Subject: added ui/target.*

---
 src/ui/target.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/ui/target.h')

diff --git a/src/ui/target.h b/src/ui/target.h
index a2615b4..0b5b67d 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -23,6 +23,7 @@
 
 #include <common/event.h>
 
+namespace Ui {
 
 class CTarget : public CControl
 {
@@ -41,3 +42,4 @@ class CTarget : public CControl
 };
 
 
+}
-- 
cgit v1.2.3-1-g7c22


From 6ba0f42f22a170625f15879e01b4653a4ac153a1 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Fri, 31 Aug 2012 22:28:07 +0200
Subject: latest changes; few more classes should compile now

---
 src/ui/target.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/ui/target.h')

diff --git a/src/ui/target.h b/src/ui/target.h
index 0b5b67d..47b9760 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -18,6 +18,7 @@
 
 #pragma once
 
+#include <string>
 
 #include <ui/control.h>
 
@@ -35,7 +36,7 @@ class CTarget : public CControl
 
         bool        EventProcess(const Event &event);
         void        Draw();
-        bool        GetTooltip(Math::Point pos, char* name);
+        bool        GetTooltip(Math::Point pos, std::string &name);
 
     protected:
         CObject*    DetectFriendObject(Math::Point pos);
-- 
cgit v1.2.3-1-g7c22


From 01cc0fbc49696a19a56dfdd8359d4bb77e868925 Mon Sep 17 00:00:00 2001
From: erihel <erihel@gmail.com>
Date: Tue, 11 Sep 2012 12:49:41 +0200
Subject: * latest changes * all files except studio, map and maindialog should
 compile * did some code cleanup

---
 src/ui/target.h | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'src/ui/target.h')

diff --git a/src/ui/target.h b/src/ui/target.h
index 47b9760..1f7f256 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -22,8 +22,17 @@
 
 #include <ui/control.h>
 
+#include <common/misc.h>
+#include <common/iman.h>
+#include <common/restext.h>
 #include <common/event.h>
 
+#include <graphics/engine/engine.h>
+
+#include <object/robotmain.h>
+#include <object/object.h>
+
+
 namespace Ui {
 
 class CTarget : public CControl
-- 
cgit v1.2.3-1-g7c22


From 4a639cf543c15d45a37674d7eadaf09c23c2203d Mon Sep 17 00:00:00 2001
From: Zaba999 <zaba.marcin@gmail.com>
Date: Wed, 19 Sep 2012 00:04:21 +0200
Subject: Fixed includes in ui.

---
 src/ui/target.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/ui/target.h')

diff --git a/src/ui/target.h b/src/ui/target.h
index 1f7f256..05a3651 100644
--- a/src/ui/target.h
+++ b/src/ui/target.h
@@ -20,17 +20,17 @@
 
 #include <string>
 
-#include <ui/control.h>
+#include "ui/control.h"
 
-#include <common/misc.h>
-#include <common/iman.h>
-#include <common/restext.h>
-#include <common/event.h>
+#include "common/misc.h"
+#include "common/iman.h"
+#include "common/restext.h"
+#include "common/event.h"
 
-#include <graphics/engine/engine.h>
+#include "graphics/engine/engine.h"
 
-#include <object/robotmain.h>
-#include <object/object.h>
+#include "object/robotmain.h"
+#include "object/object.h"
 
 
 namespace Ui {
-- 
cgit v1.2.3-1-g7c22