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/charcreatedialog.h | |
| parent | 876e370925a021bb6731703c3db2db2945f62f85 (diff) | |
| download | plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2 plus-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz plus-10badd2c0e099c7611f6d23b3973e54f210bc172.zip | |
Fix namespace conflicts.
Diffstat (limited to 'src/gui/charcreatedialog.h')
| -rw-r--r-- | src/gui/charcreatedialog.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gui/charcreatedialog.h b/src/gui/charcreatedialog.h index f14746605..d2bd57c61 100644 --- a/src/gui/charcreatedialog.h +++ b/src/gui/charcreatedialog.h @@ -34,13 +34,9 @@ class Label; class LocalPlayer; class PlayerBox; class RadioButton; +class Slider; class TextField; -namespace gcn -{ - class Slider; -} - /** * Character creation dialog. * @@ -126,7 +122,7 @@ class CharCreateDialog final : public Window, RadioButton *mFemale; RadioButton *mOther; - std::vector<gcn::Slider*> mAttributeSlider; + std::vector<Slider*> mAttributeSlider; std::vector<Label*> mAttributeLabel; std::vector<Label*> mAttributeValue; Label *mAttributesLeft; |