diff options
-rw-r--r-- | engine/actor.cpp | 4 | ||||
-rw-r--r-- | engine/collector.cpp | 2 | ||||
-rw-r--r-- | engine/component.cpp | 2 | ||||
-rw-r--r-- | engine/exception.cpp | 2 | ||||
-rw-r--r-- | engine/flatland.cpp | 8 | ||||
-rw-r--r-- | engine/focusable.cpp | 4 | ||||
-rw-r--r-- | engine/include/actor.hpp | 2 | ||||
-rw-r--r-- | engine/include/layer.hpp | 2 | ||||
-rw-r--r-- | engine/include/serial/keyfocusable.hpp | 2 | ||||
-rw-r--r-- | engine/include/window.hpp | 2 | ||||
-rw-r--r-- | engine/keyfocusable.cpp | 2 | ||||
-rw-r--r-- | engine/layer.cpp | 2 | ||||
-rw-r--r-- | engine/serial.cpp | 2 | ||||
-rw-r--r-- | engine/signal.cpp | 2 | ||||
-rw-r--r-- | engine/surface.cpp | 2 | ||||
-rw-r--r-- | engine/window.cpp | 6 | ||||
-rw-r--r-- | test/main.cpp | 10 | ||||
-rw-r--r-- | test/test1.cpp | 4 | ||||
-rw-r--r-- | test/test2.cpp | 6 | ||||
-rw-r--r-- | test/test3.cpp | 10 |
20 files changed, 38 insertions, 38 deletions
diff --git a/engine/actor.cpp b/engine/actor.cpp index 525939d..dd4bc96 100644 --- a/engine/actor.cpp +++ b/engine/actor.cpp @@ -1,6 +1,6 @@ -#include "flatactor.h" +#include "actor.hpp" -#include "flatland.h" +#include "flatland.hpp" FlatActor::FlatActor(FlatCollector *parent, FlatBound *bounds) diff --git a/engine/collector.cpp b/engine/collector.cpp index f2e614f..6365de2 100644 --- a/engine/collector.cpp +++ b/engine/collector.cpp @@ -1,4 +1,4 @@ -#include "flatcollector.h" +#include "collector.hpp" using namespace std; diff --git a/engine/component.cpp b/engine/component.cpp index 925feaa..961854c 100644 --- a/engine/component.cpp +++ b/engine/component.cpp @@ -1,4 +1,4 @@ -#include "flatcomponent.h" +#include "component.hpp" #include "signal.h" using namespace flat; diff --git a/engine/exception.cpp b/engine/exception.cpp index 0216dd5..8dd70d6 100644 --- a/engine/exception.cpp +++ b/engine/exception.cpp @@ -1,4 +1,4 @@ -#include "flatexception.h" +#include "exception.hpp" #include <stdio.h> FlatException::FlatException(const char* error) : error(error) {} diff --git a/engine/flatland.cpp b/engine/flatland.cpp index badc8a2..306d094 100644 --- a/engine/flatland.cpp +++ b/engine/flatland.cpp @@ -1,4 +1,4 @@ -#include "flatland.h" +#include "flatland.hpp" #include <set> #include <iostream> @@ -11,9 +11,9 @@ using namespace std; #include "core/task.hpp" #include "core/signal.hpp" -#include "flatwindow.h" -#include "flatexception.h" -#include "exceptions/forcequit.h" +#include "window.hpp" +#include "exception.hpp" +#include "exceptions/forcequit.hpp" float flatland_dt; diff --git a/engine/focusable.cpp b/engine/focusable.cpp index 5638621..29a7274 100644 --- a/engine/focusable.cpp +++ b/engine/focusable.cpp @@ -1,6 +1,6 @@ -#include "serial/focusable.h" +#include "serial/focusable.hpp" #include "core/task.hpp" -#include "flatserial.h" +#include "serial.hpp" Focusable::Focusable(bool focused) : focused(focused) { diff --git a/engine/include/actor.hpp b/engine/include/actor.hpp index 306ce49..b5a8285 100644 --- a/engine/include/actor.hpp +++ b/engine/include/actor.hpp @@ -1,7 +1,7 @@ #ifndef __FLATACTOR_H__ #define __FLATACTOR_H__ -#include "flatcollector.h" +#include "collector.hpp" class FlatBound; diff --git a/engine/include/layer.hpp b/engine/include/layer.hpp index f4f6734..c3294e4 100644 --- a/engine/include/layer.hpp +++ b/engine/include/layer.hpp @@ -1,7 +1,7 @@ #ifndef __FLATLAYER_H__ #define __FLATLAYER_H__ -#include "flatcollector.h" +#include "collector.hpp" class FlatLayer : public FlatCollector { diff --git a/engine/include/serial/keyfocusable.hpp b/engine/include/serial/keyfocusable.hpp index 44c1f1b..e28e333 100644 --- a/engine/include/serial/keyfocusable.hpp +++ b/engine/include/serial/keyfocusable.hpp @@ -1,7 +1,7 @@ #ifndef __KEYFOCUSABLE_H__ #define __KEYFOCUSABLE_H__ -#include "focusable.h" +#include "focusable.hpp" struct SDL_KeyboardEvent; diff --git a/engine/include/window.hpp b/engine/include/window.hpp index 37e834d..7b3fa9a 100644 --- a/engine/include/window.hpp +++ b/engine/include/window.hpp @@ -27,7 +27,7 @@ struct window_status }; #include "core/object.hpp" -#include "serial/keyfocusable.h" +#include "serial/keyfocusable.hpp" class SDL_Window; class FlatLayer; diff --git a/engine/keyfocusable.cpp b/engine/keyfocusable.cpp index 29271dc..59e97b3 100644 --- a/engine/keyfocusable.cpp +++ b/engine/keyfocusable.cpp @@ -1,4 +1,4 @@ -#include "serial/keyfocusable.h" +#include "serial/keyfocusable.hpp" #include "SDL2/SDL.h" void KeyFocusable::serial_cb(const SDL_Event *event) diff --git a/engine/layer.cpp b/engine/layer.cpp index 06185e2..07a9270 100644 --- a/engine/layer.cpp +++ b/engine/layer.cpp @@ -1,4 +1,4 @@ -#include "flatlayer.h" +#include "layer.hpp" FlatLayer::FlatLayer(FlatLayer *parent) { diff --git a/engine/serial.cpp b/engine/serial.cpp index 2413bb5..fdbb79e 100644 --- a/engine/serial.cpp +++ b/engine/serial.cpp @@ -1,4 +1,4 @@ -#include "flatserial.h" +#include "serial.hpp" #include "core/task.hpp" SDL_EventCollector::SDL_EventCollector() diff --git a/engine/signal.cpp b/engine/signal.cpp index 08d69fa..8546094 100644 --- a/engine/signal.cpp +++ b/engine/signal.cpp @@ -1,6 +1,6 @@ #include "core/signal.hpp" #include <functional> -#include "flatland.h" +#include "flatland.hpp" using namespace std; using namespace flat::core; diff --git a/engine/surface.cpp b/engine/surface.cpp index baf63e8..2533022 100644 --- a/engine/surface.cpp +++ b/engine/surface.cpp @@ -1,4 +1,4 @@ -#include "flatsurface.h" +#include "surface.hpp" #include <iostream> diff --git a/engine/window.cpp b/engine/window.cpp index 40cf1e3..a460328 100644 --- a/engine/window.cpp +++ b/engine/window.cpp @@ -1,9 +1,9 @@ -#include "flatwindow.h" +#include "window.hpp" #include <SDL2/SDL.h> #include <iostream> -#include "flatlayer.h" -#include "signal.hpp" +#include "layer.hpp" +#include "core/signal.hpp" using namespace std; diff --git a/test/main.cpp b/test/main.cpp index 0edd682..570bced 100644 --- a/test/main.cpp +++ b/test/main.cpp @@ -1,14 +1,14 @@ -#include "flatland.h" -#include "flatwindow.h" -#include "exceptions/forcequit.h" +#include "flatland.hpp" +#include "window.hpp" +#include "exceptions/forcequit.hpp" -#include "serial/keyfocusable.h" +#include "serial/keyfocusable.hpp" #include <SDL2/SDL.h> #include <iostream> #include <string> -#include "flatsignal.h" +#include "core/signal.hpp" using namespace std; diff --git a/test/test1.cpp b/test/test1.cpp index 4d7c71f..847e1ab 100644 --- a/test/test1.cpp +++ b/test/test1.cpp @@ -1,5 +1,5 @@ -#include "flatland.h" -#include "flatwindow.h" +#include "flatland.hpp" +#include "window.hpp" int count = 0; diff --git a/test/test2.cpp b/test/test2.cpp index 2b16838..ca14ac7 100644 --- a/test/test2.cpp +++ b/test/test2.cpp @@ -1,6 +1,6 @@ -#include "flatland.h" -#include "flatwindow.h" -#include "exceptions/forcequit.h" +#include "flatland.hpp" +#include "window.hpp" +#include "exceptions/forcequit.hpp" int count = 0; diff --git a/test/test3.cpp b/test/test3.cpp index 0edd682..570bced 100644 --- a/test/test3.cpp +++ b/test/test3.cpp @@ -1,14 +1,14 @@ -#include "flatland.h" -#include "flatwindow.h" -#include "exceptions/forcequit.h" +#include "flatland.hpp" +#include "window.hpp" +#include "exceptions/forcequit.hpp" -#include "serial/keyfocusable.h" +#include "serial/keyfocusable.hpp" #include <SDL2/SDL.h> #include <iostream> #include <string> -#include "flatsignal.h" +#include "core/signal.hpp" using namespace std; |