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/widgets/avatarlistbox.cpp | 2 +- src/gui/widgets/browserbox.cpp | 2 +- src/gui/widgets/button.cpp | 8 ++++---- src/gui/widgets/desktop.cpp | 2 +- src/gui/widgets/extendednamesmodel.cpp | 1 - src/gui/widgets/flowcontainer.cpp | 2 +- src/gui/widgets/flowcontainer.h | 2 +- src/gui/widgets/guitable.cpp | 2 +- src/gui/widgets/horizontcontainer.cpp | 2 +- src/gui/widgets/icon.cpp | 4 ++-- src/gui/widgets/itemcontainer.cpp | 11 ++++------- src/gui/widgets/layouthelper.cpp | 2 +- src/gui/widgets/popup.cpp | 4 ++-- src/gui/widgets/progressbar.cpp | 2 +- src/gui/widgets/progressindicator.cpp | 2 -- src/gui/widgets/setupitem.cpp | 4 ++-- src/gui/widgets/tab.cpp | 4 ---- src/gui/widgets/tab.h | 3 --- src/gui/widgets/tabbedarea.cpp | 6 ++---- 19 files changed, 25 insertions(+), 40 deletions(-) (limited to 'src/gui/widgets') diff --git a/src/gui/widgets/avatarlistbox.cpp b/src/gui/widgets/avatarlistbox.cpp index f8a025142..486b6fd2e 100644 --- a/src/gui/widgets/avatarlistbox.cpp +++ b/src/gui/widgets/avatarlistbox.cpp @@ -107,7 +107,7 @@ void AvatarListBox::draw(gcn::Graphics *gcnGraphics) const int fontHeight = getFont()->getHeight(); - const Widget *const parent = mParent; + const gcn::Widget *const parent = mParent; const std::string name = player_node->getName(); diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index e338ab009..8c27d7b23 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -47,7 +47,7 @@ BrowserBox::BrowserBox(const unsigned int mode, const bool opaque) : gcn::Widget(), - MouseListener(), + gcn::MouseListener(), mLinkHandler(nullptr), mMode(mode), mHighMode(UNDERLINE | BACKGROUND), diff --git a/src/gui/widgets/button.cpp b/src/gui/widgets/button.cpp index 4cba0b535..235f72f5c 100644 --- a/src/gui/widgets/button.cpp +++ b/src/gui/widgets/button.cpp @@ -66,7 +66,7 @@ Skin *Button::button[BUTTON_COUNT]; Button::Button() : gcn::Button(), - WidgetListener(), + gcn::WidgetListener(), mDescription(""), mClickCount(0), mTag(0), mVertexes(new GraphicsVertexes()), @@ -88,7 +88,7 @@ Button::Button() : Button::Button(const std::string &caption, const std::string &actionEventId, gcn::ActionListener *const listener) : gcn::Button(caption), - WidgetListener(), + gcn::WidgetListener(), mDescription(""), mClickCount(0), mTag(0), @@ -117,7 +117,7 @@ Button::Button(const std::string &caption, const std::string &imageName, const std::string &actionEventId, gcn::ActionListener *const listener) : gcn::Button(caption), - WidgetListener(), + gcn::WidgetListener(), mDescription(""), mClickCount(0), mTag(0), @@ -147,7 +147,7 @@ Button::Button(const std::string &imageName, const std::string &actionEventId, gcn::ActionListener *const listener) : gcn::Button(""), - WidgetListener(), + gcn::WidgetListener(), mDescription(""), mClickCount(0), mTag(0), diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index 7cf6b2608..275f57363 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -40,7 +40,7 @@ Desktop::Desktop() : Container(), - WidgetListener(), + gcn::WidgetListener(), mWallpaper(nullptr), mBackgroundColor(Theme::getThemeColor(Theme::BACKGROUND, 128)), mBackgroundGrayColor(Theme::getThemeColor(Theme::BACKGROUND_GRAY)) diff --git a/src/gui/widgets/extendednamesmodel.cpp b/src/gui/widgets/extendednamesmodel.cpp index 083ce938e..0a01df626 100644 --- a/src/gui/widgets/extendednamesmodel.cpp +++ b/src/gui/widgets/extendednamesmodel.cpp @@ -24,7 +24,6 @@ #include "utils/gettext.h" -#include #include #include "debug.h" diff --git a/src/gui/widgets/flowcontainer.cpp b/src/gui/widgets/flowcontainer.cpp index 240ec41f7..753fea2ea 100644 --- a/src/gui/widgets/flowcontainer.cpp +++ b/src/gui/widgets/flowcontainer.cpp @@ -25,7 +25,7 @@ FlowContainer::FlowContainer(const int boxWidth, const int boxHeight) : Container(), - WidgetListener(), + gcn::WidgetListener(), mBoxWidth(boxWidth), mBoxHeight(boxHeight), mGridWidth(1), diff --git a/src/gui/widgets/flowcontainer.h b/src/gui/widgets/flowcontainer.h index a56b0e2e8..2279a6376 100644 --- a/src/gui/widgets/flowcontainer.h +++ b/src/gui/widgets/flowcontainer.h @@ -22,7 +22,7 @@ #ifndef FLOWCONTAINER_H #define FLOWCONTAINER_H -#include "container.h" +#include "gui/widgets/container.h" #include diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 18e7c37d7..e5e56cbf3 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -62,7 +62,7 @@ protected: GuiTableActionListener::GuiTableActionListener(GuiTable *table, gcn::Widget *widget, int row, int column) : - ActionListener(), + gcn::ActionListener(), mTable(table), mRow(row), mColumn(column), diff --git a/src/gui/widgets/horizontcontainer.cpp b/src/gui/widgets/horizontcontainer.cpp index 83a430b47..d08b8adcc 100644 --- a/src/gui/widgets/horizontcontainer.cpp +++ b/src/gui/widgets/horizontcontainer.cpp @@ -25,7 +25,7 @@ HorizontContainer::HorizontContainer(const int height, const int spacing) : Container(), - WidgetListener(), + gcn::WidgetListener(), mSpacing(spacing), mCount(0), mLastX(spacing) diff --git a/src/gui/widgets/icon.cpp b/src/gui/widgets/icon.cpp index 0236cde6a..e8893a5f7 100644 --- a/src/gui/widgets/icon.cpp +++ b/src/gui/widgets/icon.cpp @@ -30,7 +30,7 @@ #include "debug.h" Icon::Icon(const std::string &file) : - Widget(), + gcn::Widget(), mImage(ResourceManager::getInstance()->getImage(file)) { if (mImage) @@ -38,7 +38,7 @@ Icon::Icon(const std::string &file) : } Icon::Icon(Image *const image) : - Widget(), + gcn::Widget(), mImage(image) { if (mImage) diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index e12a15a6b..d950b28c6 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -49,9 +49,6 @@ #include "debug.h" -// TODO: Add support for adding items to the item shortcut window (global -// itemShortcut). - static const int BOX_WIDTH = 35; static const int BOX_HEIGHT = 43; @@ -156,10 +153,10 @@ class SortItemTypeFunctor final ItemContainer::ItemContainer(Inventory *const inventory, const bool forceQuantity) : - Widget(), - KeyListener(), - MouseListener(), - WidgetListener(), + gcn::Widget(), + gcn::KeyListener(), + gcn::MouseListener(), + gcn::WidgetListener(), mInventory(inventory), mGridColumns(1), mGridRows(1), diff --git a/src/gui/widgets/layouthelper.cpp b/src/gui/widgets/layouthelper.cpp index c3b219415..4f082f4b2 100644 --- a/src/gui/widgets/layouthelper.cpp +++ b/src/gui/widgets/layouthelper.cpp @@ -25,7 +25,7 @@ #include "debug.h" LayoutHelper::LayoutHelper(gcn::Container *const container) : - WidgetListener(), + gcn::WidgetListener(), mContainer(container) { mContainer->addWidgetListener(this); diff --git a/src/gui/widgets/popup.cpp b/src/gui/widgets/popup.cpp index 9a16d8530..eb3bcd64b 100644 --- a/src/gui/widgets/popup.cpp +++ b/src/gui/widgets/popup.cpp @@ -38,8 +38,8 @@ Popup::Popup(const std::string &name, std::string skin) : Container(), - MouseListener(), - WidgetListener(), + gcn::MouseListener(), + gcn::WidgetListener(), mPopupName(name), mMinWidth(100), mMinHeight(40), diff --git a/src/gui/widgets/progressbar.cpp b/src/gui/widgets/progressbar.cpp index 5ab6d1280..7667d399e 100644 --- a/src/gui/widgets/progressbar.cpp +++ b/src/gui/widgets/progressbar.cpp @@ -44,7 +44,7 @@ ProgressBar::ProgressBar(float progress, const int width, const int height, const int color): gcn::Widget(), - WidgetListener(), + gcn::WidgetListener(), mProgress(progress), mProgressToGo(progress), mSmoothProgress(true), diff --git a/src/gui/widgets/progressindicator.cpp b/src/gui/widgets/progressindicator.cpp index 6ff31fd0e..9b6726ce9 100644 --- a/src/gui/widgets/progressindicator.cpp +++ b/src/gui/widgets/progressindicator.cpp @@ -30,8 +30,6 @@ #include "resources/imageset.h" #include "resources/resourcemanager.h" -#include - #include "debug.h" ProgressIndicator::ProgressIndicator() : diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 82d5132a3..3a1db94bd 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -50,7 +50,7 @@ SetupItem::SetupItem(std::string text, std::string description, std::string keyName, SetupTabScroll *const parent, std::string eventName, const bool mainConfig) : - ActionListener(), + gcn::ActionListener(), mText(text), mDescription(description), mKeyName(keyName), @@ -69,7 +69,7 @@ SetupItem::SetupItem(std::string text, std::string description, std::string keyName, SetupTabScroll *const parent, std::string eventName, std::string def, const bool mainConfig) : - ActionListener(), + gcn::ActionListener(), mText(text), mDescription(description), mKeyName(keyName), diff --git a/src/gui/widgets/tab.cpp b/src/gui/widgets/tab.cpp index af3a18560..b6133af0e 100644 --- a/src/gui/widgets/tab.cpp +++ b/src/gui/widgets/tab.cpp @@ -36,8 +36,6 @@ #include "utils/dtor.h" -#include - #include "debug.h" int Tab::mInstances = 0; @@ -66,11 +64,9 @@ Tab::Tab() : gcn::BasicContainer(), gcn::MouseListener(), gcn::WidgetListener(), - mLabel(new Label), mHasMouse(false), mTabbedArea(nullptr), - mTabColor(&Theme::getThemeColor(Theme::TAB)), mTabHighlightedColor(&Theme::getThemeColor(Theme::TAB_HIGHLIGHTED)), mTabSelectedColor(&Theme::getThemeColor(Theme::TAB_SELECTED)), diff --git a/src/gui/widgets/tab.h b/src/gui/widgets/tab.h index fd3353707..fe9fd3b32 100644 --- a/src/gui/widgets/tab.h +++ b/src/gui/widgets/tab.h @@ -25,9 +25,6 @@ #include #include - -#include - #include #include "localconsts.h" diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index b1d0ca35e..d41af4542 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -40,12 +40,10 @@ TabbedArea::TabbedArea() : gcn::KeyListener(), gcn::MouseListener(), gcn::WidgetListener(), - mSelectedTab(nullptr), mTabContainer(new gcn::Container()), mWidgetContainer(new gcn::Container()), mOpaque(false), - mTabsWidth(0), mVisibleTabsWidth(0), mTabScrollIndex(0), @@ -509,7 +507,7 @@ void TabbedArea::adjustTabPositions() void TabbedArea::action(const gcn::ActionEvent& actionEvent) { - Widget *const source = actionEvent.getSource(); + gcn::Widget *const source = actionEvent.getSource(); Tab *const tab = dynamic_cast(source); if (tab) @@ -597,7 +595,7 @@ void TabbedArea::removeAll() { const int idx = getNumberOfTabs() - 1; Tab *tab = mTabs[idx].first; - Widget *widget = mTabs[idx].second; + gcn::Widget *widget = mTabs[idx].second; removeTab(tab); delete tab; delete widget; -- cgit v1.2.3-70-g09d2