summaryrefslogtreecommitdiff
path: root/src/gui/sdlinput.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 23:27:30 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 23:27:30 +0300
commitd0bc46cd38aa82777621a99005a90d085e9821c3 (patch)
tree65c5345a70bf12779209c3bc9d3dc4851e93b76c /src/gui/sdlinput.h
parent9fc5e9b475388ef57de62143438eae6d0af7da3c (diff)
downloadmv-d0bc46cd38aa82777621a99005a90d085e9821c3.tar.gz
mv-d0bc46cd38aa82777621a99005a90d085e9821c3.tar.bz2
mv-d0bc46cd38aa82777621a99005a90d085e9821c3.tar.xz
mv-d0bc46cd38aa82777621a99005a90d085e9821c3.zip
Combine keyinput into one file.
Diffstat (limited to 'src/gui/sdlinput.h')
-rw-r--r--src/gui/sdlinput.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gui/sdlinput.h b/src/gui/sdlinput.h
index 345e939c5..73e2896d5 100644
--- a/src/gui/sdlinput.h
+++ b/src/gui/sdlinput.h
@@ -85,7 +85,6 @@
#include <SDL_events.h>
#include "gui/base/input.hpp"
-#include "gui/base/keyinput.hpp"
#include "gui/base/mouseinput.hpp"
#include <queue>
@@ -176,8 +175,8 @@ public:
KeyInput dequeueKeyInput2() A_WARN_UNUSED;
- gcn::KeyInput dequeueKeyInput() override final A_WARN_UNUSED
- { return gcn::KeyInput(); }
+ KeyInput dequeueKeyInput() override final A_WARN_UNUSED
+ { return KeyInput(); }
// Inherited from Input