diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-10-19 15:15:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-10-19 16:39:56 +0300 |
| commit | 10badd2c0e099c7611f6d23b3973e54f210bc172 (patch) | |
| tree | 3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/setup_video.cpp | |
| parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
| download | manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz manaverse-10badd2c0e099c7611f6d23b3973e54f210bc172.zip | |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/setup_video.cpp')
| -rw-r--r-- | src/gui/setup_video.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/setup_video.cpp b/src/gui/setup_video.cpp index c0a680116..d06a922ac 100644 --- a/src/gui/setup_video.cpp +++ b/src/gui/setup_video.cpp @@ -55,8 +55,6 @@ #include <guichan/key.hpp> #include <guichan/listmodel.hpp> -#include <guichan/widgets/button.hpp> - #include <SDL.h> #include <algorithm> @@ -223,7 +221,7 @@ public: Setup_Video::Setup_Video() : SetupTab(), - KeyListener(), + gcn::KeyListener(), mFullScreenEnabled(config.getBoolValue("screen")), mOpenGLEnabled(config.getIntValue("opengl")), mCustomCursorEnabled(config.getBoolValue("customcursor")), |