diff options
| author | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-22 02:06:45 +0100 |
|---|---|---|
| committer | ancarola <raffaele.ancarola@epfl.ch> | 2019-01-22 02:06:45 +0100 |
| commit | d5ac28424554a94f6f21527c2f393a3e595cbc59 (patch) | |
| tree | 689516f3031c6805d00e09dc120980af7184f585 | |
| parent | Soos (diff) | |
| download | flatland-d5ac28424554a94f6f21527c2f393a3e595cbc59.tar.gz flatland-d5ac28424554a94f6f21527c2f393a3e595cbc59.zip | |
Sed
| -rw-r--r-- | engine/flatwindow.cpp | 6 | ||||
| -rw-r--r-- | engine/include/signal.hpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/engine/flatwindow.cpp b/engine/flatwindow.cpp index 2fa051b..40cf1e3 100644 --- a/engine/flatwindow.cpp +++ b/engine/flatwindow.cpp @@ -3,7 +3,7 @@ #include <SDL2/SDL.h> #include <iostream> #include "flatlayer.h" -#include "signal.h" +#include "signal.hpp" using namespace std; @@ -15,7 +15,7 @@ FlatWindow::FlatWindow( int x, int y, : title(title), status(status), sdl_window(0), screen(0) { - setID(title.c_str()); + set_id(title); bounds = new SDL_Rect; @@ -166,7 +166,7 @@ void FlatWindow::key_cb(const SDL_KeyboardEvent *event) close(); /* Say flatland to quit */ - FlatSignal quit(this, "quit", 0, 0xff); + flat::core::signal quit(this, "quit", 0, 0xff); quit.emit("core"); } } diff --git a/engine/include/signal.hpp b/engine/include/signal.hpp index ab0467a..24d240d 100644 --- a/engine/include/signal.hpp +++ b/engine/include/signal.hpp @@ -4,9 +4,9 @@ #include <list> #include <set> #include <initializer_list> -#include "object.hpppp" +#include "object.hpp" #include "task.hpp" -#include "types.hpppp" +#include "types.hpp" namespace flat { |