From 844926711489c4f87c68ceab3ea245161228ad78 Mon Sep 17 00:00:00 2001 From: ancarola Date: Tue, 22 Jan 2019 01:56:51 +0100 Subject: Fin qui tutto bene --- engine/include/flatwindow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/include/flatwindow.h') 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; -- cgit v1.2.1 From 35c5c0551edfe786a5d05969df85cef544ebeea6 Mon Sep 17 00:00:00 2001 From: ancarola Date: Tue, 22 Jan 2019 02:01:43 +0100 Subject: Soos --- engine/include/flatwindow.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'engine/include/flatwindow.h') diff --git a/engine/include/flatwindow.h b/engine/include/flatwindow.h index b3734f4..c03a3a9 100644 --- a/engine/include/flatwindow.h +++ b/engine/include/flatwindow.h @@ -26,7 +26,7 @@ struct window_status unsigned char focus:1; }; -#include "object.h" +#include "object.hpp" #include "serial/keyfocusable.h" class SDL_Window; @@ -91,7 +91,7 @@ public: void setWindowStatus(window_status); - static Uint32 winstatus_to_flags(window_status); + static uint32_t winstatus_to_flags(window_status); }; #endif -- cgit v1.2.1