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_colors.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_colors.cpp')
| -rw-r--r-- | src/gui/setup_colors.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/setup_colors.cpp b/src/gui/setup_colors.cpp index b8ccc7bf2..3332c1d73 100644 --- a/src/gui/setup_colors.cpp +++ b/src/gui/setup_colors.cpp @@ -50,7 +50,7 @@ const std::string Setup_Colors::rawmsg = Setup_Colors::Setup_Colors() : SetupTab(), - SelectionListener(), + gcn::SelectionListener(), mColorBox(new ListBox(userPalette)), mScroll(new ScrollArea(mColorBox, true, "setup_colors_background.xml")), mPreview(new BrowserBox(BrowserBox::AUTO_WRAP)), @@ -340,7 +340,7 @@ void Setup_Colors::valueChanged(const gcn::SelectionEvent &event A_UNUSED) mGradTypeSlider->setEnabled(true); } -void Setup_Colors::setEntry(gcn::Slider *const s, TextField *const t, +void Setup_Colors::setEntry(Slider *const s, TextField *const t, const int value) { if (s) |