summaryrefslogtreecommitdiff
path: root/src/gui/setup_video.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2012-10-19 15:15:19 +0300
committerAndrei Karas <akaras@inbox.ru>2012-10-19 16:39:56 +0300
commit10badd2c0e099c7611f6d23b3973e54f210bc172 (patch)
tree3689c22c252c2fed2f7e3d4cbd57d330fc2bf839 /src/gui/setup_video.h
parent876e370925a021bb6731703c3db2db2945f62f85 (diff)
downloadplus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz
plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2
plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz
plus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip
Fix namespace conflicts.
Diffstat (limited to 'src/gui/setup_video.h')
-rw-r--r--src/gui/setup_video.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/gui/setup_video.h b/src/gui/setup_video.h
index 0955910da..5adcec8b6 100644
--- a/src/gui/setup_video.h
+++ b/src/gui/setup_video.h
@@ -37,13 +37,9 @@ class Label;
class ListBox;
class ModeListModel;
class OpenGLListModel;
+class Slider;
class TextDialog;
-namespace gcn
-{
- class Slider;
-}
-
class Setup_Video final : public SetupTab, public gcn::KeyListener
{
public:
@@ -86,9 +82,9 @@ class Setup_Video final : public SetupTab, public gcn::KeyListener
CheckBox *mNoFrameCheckBox;
CheckBox *mFpsCheckBox;
- gcn::Slider *mFpsSlider;
+ Slider *mFpsSlider;
Label *mFpsLabel;
- gcn::Slider *mAltFpsSlider;
+ Slider *mAltFpsSlider;
Label *mAltFpsLabel;
Button *mDetectButton;