Fin qui tutto bene

10 files changed, 16 insertions, 16 deletions

diff --git a/engine/include/flatbound.h b/engine/include/flatbound.h
index a80cd6e..5028acc 100644
--- a/engine/include/flatbound.h
+++ b/engine/include/flatbound.h
@@ -1,12 +1,12 @@
 #ifndef __FLATBOUND_H__
 #define __FLATBOUND_H__
 
-#include "flatobject.h"
+#include "object.h"
 #include "svector.h"
 
 typedef SVector<int, 2> pixel;
 
-class FlatBound : virtual public FlatObject
+class FlatBound : virtual public flat::core::object
 {
     pixel location;
 
diff --git a/engine/include/flatcollector.h b/engine/include/flatcollector.h
index ed9a824..cef49db 100644
--- a/engine/include/flatcollector.h
+++ b/engine/include/flatcollector.h
@@ -1,10 +1,10 @@
 #ifndef __FLATCOLLECTOR_H__
 #define __FLATCOLLECTOR_H__
 
-#include "flatobject.h"
+#include "object.h"
 #include <set>
 
-class FlatCollector : virtual public FlatObject
+class FlatCollector : virtual public flat::core::object
 {
     FlatCollector * parent;
 
diff --git a/engine/include/flatcomponent.h b/engine/include/flatcomponent.h
index 8a14d90..9e596bf 100644
--- a/engine/include/flatcomponent.h
+++ b/engine/include/flatcomponent.h
@@ -1,10 +1,10 @@
 #ifndef __FLAT_COMPONENT_H__
 #define __FLAT_COMPONENT_H__
 
-#include "flatobject.h"
+#include "object.h"
 #include <string>
 
-class Component : virtual public FlatObject
+class Component : virtual public flat::core::object
 {
     
     Component * parent;
diff --git a/engine/include/flatevolvable.h b/engine/include/flatevolvable.h
index 71aaf0f..a9cc102 100644
--- a/engine/include/flatevolvable.h
+++ b/engine/include/flatevolvable.h
@@ -1,11 +1,11 @@
 #ifndef __FLATEVOLVABLE_H__
 #define __FLATEVOLVABLE_H__
 
-#include "flatobject.h"
+#include "object.h"
 
 class task_s;
 
-class FlatEvolvable : virtual public FlatObject
+class FlatEvolvable : virtual public flat::core::object
 {
     task_s * task;
 
diff --git a/engine/include/flatsurface.h b/engine/include/flatsurface.h
index bc04385..4c6ee1b 100644
--- a/engine/include/flatsurface.h
+++ b/engine/include/flatsurface.h
@@ -1,10 +1,10 @@
 #ifndef __FLATSURFACE_H__
 #define __FLATSURFACE_H__
 
-#include "flatobject.h"
+#include "object.h"
 #include <SDL2/SDL.h>
 
-class FlatSurface : public FlatObject
+class FlatSurface : public flat::core::object
 {
     SDL_Surface * surface;
     SDL_Surface * parent;
diff --git a/engine/include/flatwindow.h b/engine/include/flatwindow.h
index 11d7134..b3734f4 100644
--- a/engine/include/flatwindow.h
+++ b/engine/include/flatwindow.h
@@ -26,7 +26,7 @@ struct window_status
     unsigned char focus:1;
 };
 
-#include "flatobject.h"
+#include "object.h"
 #include "serial/keyfocusable.h"
 
 class SDL_Window;
@@ -34,7 +34,7 @@ class FlatLayer;
 
 class SDL_KeyEvent;
 
-class FlatWindow : virtual public FlatObject, public KeyFocusable
+class FlatWindow : virtual public flat::core::object, public KeyFocusable
 {
     std::string title;
     window_status status;
diff --git a/engine/include/object.h b/engine/include/object.hpp
index cb7ef36..cb7ef36 100644
--- a/engine/include/object.h
+++ b/engine/include/object.hpp
diff --git a/engine/include/serial/focusable.h b/engine/include/serial/focusable.h
index 6478ed4..a334e79 100644
--- a/engine/include/serial/focusable.h
+++ b/engine/include/serial/focusable.h
@@ -1,13 +1,13 @@
 #ifndef __FOCUSABLE_H__
 #define __FOCUSABLE_H__
 
-#include "flatobject.h"
+#include "object.h"
 #include "types.h"
 
 class task_s;
 union SDL_Event;
 
-class Focusable : virtual public FlatObject
+class Focusable : virtual public flat::core::object
 {
     bool focused;
 
diff --git a/engine/include/signal.h b/engine/include/signal.hpp
index 0f16726..24d240d 100644
--- a/engine/include/signal.h
+++ b/engine/include/signal.hpp
@@ -6,7 +6,7 @@
 #include <initializer_list>
 #include "object.hpp"
 #include "task.hpp"
-#include "types.h"
+#include "types.hpp"
 
 namespace flat
 {
diff --git a/engine/include/types.h b/engine/include/types.hpp
index 9482a46..87c4d26 100644
--- a/engine/include/types.h
+++ b/engine/include/types.hpp
@@ -3,7 +3,7 @@
 
 /* Flatland types */
 
-class FlatObject;
+class flat::core::object;
 
 class FlatActor;
 class FlatSprite;