From 10badd2c0e099c7611f6d23b3973e54f210bc172 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 19 Oct 2012 15:15:19 +0300
Subject: Fix namespace conflicts.

---
 src/gui/setup_video.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'src/gui/setup_video.cpp')

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")),
-- 
cgit v1.2.3-70-g09d2