diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-19 12:11:37 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-19 12:17:12 +0300 |
commit | 46fc225f65f7d11348fc9e94feb0cb6484b27cab (patch) | |
tree | f3158ad5b416b0e182bf8168e49b5ba3c2027d7c | |
parent | 389f3a580e6641d8486a44f25d3443829f42408f (diff) | |
download | manaverse-46fc225f65f7d11348fc9e94feb0cb6484b27cab.tar.gz manaverse-46fc225f65f7d11348fc9e94feb0cb6484b27cab.tar.bz2 manaverse-46fc225f65f7d11348fc9e94feb0cb6484b27cab.tar.xz manaverse-46fc225f65f7d11348fc9e94feb0cb6484b27cab.zip |
Fix overload virtual function BasicContainer2::add.
-rw-r--r-- | src/gui/widgets/basiccontainer2.cpp | 2 | ||||
-rw-r--r-- | src/gui/widgets/basiccontainer2.h | 2 | ||||
-rw-r--r-- | src/gui/widgets/desktop.cpp | 5 | ||||
-rw-r--r-- | src/gui/widgets/widgetgroup.cpp | 5 | ||||
-rw-r--r-- | src/gui/widgets/widgetgroup.h | 4 |
5 files changed, 10 insertions, 8 deletions
diff --git a/src/gui/widgets/basiccontainer2.cpp b/src/gui/widgets/basiccontainer2.cpp index ed839d30b..e78584585 100644 --- a/src/gui/widgets/basiccontainer2.cpp +++ b/src/gui/widgets/basiccontainer2.cpp @@ -107,7 +107,7 @@ void BasicContainer2::add(Widget* widget) BasicContainer::add(widget); } -void BasicContainer2::add(Widget* widget, int x, int y) +void BasicContainer2::addXY(Widget* widget, int x, int y) { widget->setPosition(x, y); BasicContainer::add(widget); diff --git a/src/gui/widgets/basiccontainer2.h b/src/gui/widgets/basiccontainer2.h index 60f4e69bb..49371cfa7 100644 --- a/src/gui/widgets/basiccontainer2.h +++ b/src/gui/widgets/basiccontainer2.h @@ -130,7 +130,7 @@ class BasicContainer2: public BasicContainer * @param y The y coordinate for the widget. * @see remove, clear */ - virtual void add(Widget* widget, int x, int y); + virtual void addXY(Widget* widget, int x, int y); /** * Removes a widget from the Container. diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp index ef7459b0c..3f79d1531 100644 --- a/src/gui/widgets/desktop.cpp +++ b/src/gui/widgets/desktop.cpp @@ -93,12 +93,13 @@ void Desktop::postInit() { if (mSkin) { - add(mVersionLabel, mSkin->getOption("versionX", 25), + addXY(mVersionLabel, + mSkin->getOption("versionX", 25), mSkin->getOption("versionY", 2)); } else { - add(mVersionLabel, 25, 2); + addXY(mVersionLabel, 25, 2); } } diff --git a/src/gui/widgets/widgetgroup.cpp b/src/gui/widgets/widgetgroup.cpp index d54e3074a..d8bfd4d32 100644 --- a/src/gui/widgets/widgetgroup.cpp +++ b/src/gui/widgets/widgetgroup.cpp @@ -50,7 +50,7 @@ void WidgetGroup::addButton(const std::string &restrict text, { widget->setActionEventId(mActionEventId + tag); widget->addActionListener(this); - add(widget, mSpacing); + addWidget(widget, mSpacing); } } @@ -63,7 +63,8 @@ void WidgetGroup::action(const ActionEvent &event) } } -void WidgetGroup::add(Widget *const widget, const int spacing) +void WidgetGroup::addWidget(Widget *const widget, + const int spacing) { if (!widget) return; diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h index dc85461f4..5425ffbe8 100644 --- a/src/gui/widgets/widgetgroup.h +++ b/src/gui/widgets/widgetgroup.h @@ -41,8 +41,8 @@ class WidgetGroup notfinal : public Container, void action(const ActionEvent &event) override; - virtual void add(Widget *const widget, - const int spacing); + virtual void addWidget(Widget *const widget, + const int spacing); void clear() override final; |