summaryrefslogtreecommitdiff
path: root/src/guichan
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/guichan
parent876e370925a021bb6731703c3db2db2945f62f85 (diff)
downloadmv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.gz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.bz2
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.tar.xz
mv-10badd2c0e099c7611f6d23b3973e54f210bc172.zip
Fix namespace conflicts.
Diffstat (limited to 'src/guichan')
-rw-r--r--src/guichan/widgets/button.cpp16
-rw-r--r--src/guichan/widgets/checkbox.cpp12
-rw-r--r--src/guichan/widgets/dropdown.cpp12
-rw-r--r--src/guichan/widgets/label.cpp4
-rw-r--r--src/guichan/widgets/listbox.cpp14
-rw-r--r--src/guichan/widgets/radiobutton.cpp12
-rw-r--r--src/guichan/widgets/scrollarea.cpp12
-rw-r--r--src/guichan/widgets/slider.cpp12
-rw-r--r--src/guichan/widgets/textbox.cpp12
-rw-r--r--src/guichan/widgets/textfield.cpp12
-rw-r--r--src/guichan/widgets/window.cpp4
11 files changed, 61 insertions, 61 deletions
diff --git a/src/guichan/widgets/button.cpp b/src/guichan/widgets/button.cpp
index 585b30f13..08370b07a 100644
--- a/src/guichan/widgets/button.cpp
+++ b/src/guichan/widgets/button.cpp
@@ -60,10 +60,10 @@
namespace gcn
{
Button::Button() :
- Widget(),
- MouseListener(),
- KeyListener(),
- FocusListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
+ gcn::FocusListener(),
mHasMouse(false),
mKeyPressed(false),
mMousePressed(false),
@@ -80,10 +80,10 @@ namespace gcn
}
Button::Button(const std::string& caption) :
- Widget(),
- MouseListener(),
- KeyListener(),
- FocusListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
+ gcn::FocusListener(),
mCaption(caption),
mHasMouse(false),
mKeyPressed(false),
diff --git a/src/guichan/widgets/checkbox.cpp b/src/guichan/widgets/checkbox.cpp
index dcac59d17..cd135e8c7 100644
--- a/src/guichan/widgets/checkbox.cpp
+++ b/src/guichan/widgets/checkbox.cpp
@@ -59,9 +59,9 @@ namespace gcn
{
CheckBox::CheckBox() :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mSelected(false)
{
setFocusable(true);
@@ -70,9 +70,9 @@ namespace gcn
}
CheckBox::CheckBox(const std::string &caption, bool selected) :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mSelected(selected)
{
setCaption(caption);
diff --git a/src/guichan/widgets/dropdown.cpp b/src/guichan/widgets/dropdown.cpp
index bb470fdeb..fda433e51 100644
--- a/src/guichan/widgets/dropdown.cpp
+++ b/src/guichan/widgets/dropdown.cpp
@@ -60,12 +60,12 @@ namespace gcn
DropDown::DropDown(ListModel *const listModel,
ScrollArea *const scrollArea,
ListBox *const listBox) :
- ActionListener(),
- BasicContainer(),
- KeyListener(),
- MouseListener(),
- FocusListener(),
- SelectionListener(),
+ gcn::ActionListener(),
+ gcn::BasicContainer(),
+ gcn::KeyListener(),
+ gcn::MouseListener(),
+ gcn::FocusListener(),
+ gcn::SelectionListener(),
mDroppedDown(false),
mPushed(false),
mFoldedUpHeight(0),
diff --git a/src/guichan/widgets/label.cpp b/src/guichan/widgets/label.cpp
index 8879407f7..669898100 100644
--- a/src/guichan/widgets/label.cpp
+++ b/src/guichan/widgets/label.cpp
@@ -57,13 +57,13 @@
namespace gcn
{
Label::Label() :
- Widget(),
+ gcn::Widget(),
mAlignment(Graphics::LEFT)
{
}
Label::Label(const std::string& caption) :
- Widget(),
+ gcn::Widget(),
mCaption(caption),
mAlignment(Graphics::LEFT)
{
diff --git a/src/guichan/widgets/listbox.cpp b/src/guichan/widgets/listbox.cpp
index 42f2d8d8b..2a20a792e 100644
--- a/src/guichan/widgets/listbox.cpp
+++ b/src/guichan/widgets/listbox.cpp
@@ -61,9 +61,9 @@
namespace gcn
{
ListBox::ListBox() :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mSelected(-1),
mListModel(nullptr),
mWrappingEnabled(false)
@@ -76,9 +76,9 @@ namespace gcn
}
ListBox::ListBox(ListModel *listModel) :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mSelected(-1),
mListModel(listModel),
mWrappingEnabled(false)
@@ -191,7 +191,7 @@ namespace gcn
{
mWrappingEnabled = wrappingEnabled;
}
-
+
void ListBox::addSelectionListener(SelectionListener* selectionListener)
{
mSelectionListeners.push_back(selectionListener);
diff --git a/src/guichan/widgets/radiobutton.cpp b/src/guichan/widgets/radiobutton.cpp
index 8cca3feac..ac8da2382 100644
--- a/src/guichan/widgets/radiobutton.cpp
+++ b/src/guichan/widgets/radiobutton.cpp
@@ -60,9 +60,9 @@ namespace gcn
RadioButton::GroupMap RadioButton::mGroupMap;
RadioButton::RadioButton() :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mSelected(false),
mCaption(""),
mGroup("")
@@ -77,9 +77,9 @@ namespace gcn
RadioButton::RadioButton(const std::string &caption,
const std::string &group,
bool selected) :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mSelected(false),
mGroup("")
{
diff --git a/src/guichan/widgets/scrollarea.cpp b/src/guichan/widgets/scrollarea.cpp
index 6fa2db863..f79bd32eb 100644
--- a/src/guichan/widgets/scrollarea.cpp
+++ b/src/guichan/widgets/scrollarea.cpp
@@ -56,8 +56,8 @@
namespace gcn
{
ScrollArea::ScrollArea() :
- BasicContainer(),
- MouseListener(),
+ gcn::BasicContainer(),
+ gcn::MouseListener(),
mVScroll(0),
mHScroll(0),
mScrollbarWidth(12),
@@ -83,8 +83,8 @@ namespace gcn
}
ScrollArea::ScrollArea(Widget *const content) :
- BasicContainer(),
- MouseListener(),
+ gcn::BasicContainer(),
+ gcn::MouseListener(),
mVScroll(0),
mHScroll(0),
mScrollbarWidth(12),
@@ -113,8 +113,8 @@ namespace gcn
ScrollArea::ScrollArea(Widget *content,
ScrollPolicy hPolicy,
ScrollPolicy vPolicy) :
- BasicContainer(),
- MouseListener(),
+ gcn::BasicContainer(),
+ gcn::MouseListener(),
mVScroll(0),
mHScroll(0),
mScrollbarWidth(12),
diff --git a/src/guichan/widgets/slider.cpp b/src/guichan/widgets/slider.cpp
index 790560c7c..dc522f098 100644
--- a/src/guichan/widgets/slider.cpp
+++ b/src/guichan/widgets/slider.cpp
@@ -57,9 +57,9 @@
namespace gcn
{
Slider::Slider(const double scaleEnd) :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mDragged(false),
mScaleStart(0),
mScaleEnd(scaleEnd)
@@ -76,9 +76,9 @@ namespace gcn
}
Slider::Slider(const double scaleStart, const double scaleEnd) :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mDragged(false),
mScaleStart(scaleStart),
mScaleEnd(scaleEnd)
diff --git a/src/guichan/widgets/textbox.cpp b/src/guichan/widgets/textbox.cpp
index 1f56ed322..0c8f4451a 100644
--- a/src/guichan/widgets/textbox.cpp
+++ b/src/guichan/widgets/textbox.cpp
@@ -59,9 +59,9 @@
namespace gcn
{
TextBox::TextBox() :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mCaretColumn(0),
mCaretRow(0),
mEditable(true),
@@ -76,9 +76,9 @@ namespace gcn
}
TextBox::TextBox(const std::string& text) :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mCaretColumn(0),
mCaretRow(0),
mEditable(true),
diff --git a/src/guichan/widgets/textfield.cpp b/src/guichan/widgets/textfield.cpp
index 94bf208fe..64d647631 100644
--- a/src/guichan/widgets/textfield.cpp
+++ b/src/guichan/widgets/textfield.cpp
@@ -58,9 +58,9 @@
namespace gcn
{
TextField::TextField() :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mCaretPosition(0),
mXScroll(0)
{
@@ -71,9 +71,9 @@ namespace gcn
}
TextField::TextField(const std::string& text) :
- Widget(),
- MouseListener(),
- KeyListener(),
+ gcn::Widget(),
+ gcn::MouseListener(),
+ gcn::KeyListener(),
mText(text),
mCaretPosition(0),
mXScroll(0)
diff --git a/src/guichan/widgets/window.cpp b/src/guichan/widgets/window.cpp
index e82758e5f..89f128bfa 100644
--- a/src/guichan/widgets/window.cpp
+++ b/src/guichan/widgets/window.cpp
@@ -59,7 +59,7 @@ namespace gcn
{
Window::Window() :
Container(),
- MouseListener(),
+ gcn::MouseListener(),
mAlignment(Graphics::CENTER),
mPadding(2),
mTitleBarHeight(16),
@@ -73,7 +73,7 @@ namespace gcn
Window::Window(const std::string& caption) :
Container(),
- MouseListener(),
+ gcn::MouseListener(),
mCaption(caption),
mAlignment(Graphics::CENTER),
mPadding(2),