From 10badd2c0e099c7611f6d23b3973e54f210bc172 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Fri, 19 Oct 2012 15:15:19 +0300 Subject: Fix namespace conflicts. --- src/gui/setup_video.h | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/gui/setup_video.h') 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; -- cgit v1.2.3-70-g09d2