diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-16 12:22:47 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-16 12:28:10 +0300 |
| commit | 0d73f54f842a9690c65faedf094112017fd07430 (patch) | |
| tree | ca009ae0b366a95ad9c0fef1fa518ad60f8dbac2 /src | |
| parent | 85e89895c4f7a53721a6bd93b47a79d5537d263a (diff) | |
| download | mv-0d73f54f842a9690c65faedf094112017fd07430.tar.gz mv-0d73f54f842a9690c65faedf094112017fd07430.tar.bz2 mv-0d73f54f842a9690c65faedf094112017fd07430.tar.xz mv-0d73f54f842a9690c65faedf094112017fd07430.zip | |
move actionevent into events directory.
Diffstat (limited to 'src')
128 files changed, 236 insertions, 323 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d5e0edfe7..99d36e1ec 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -769,7 +769,7 @@ SET(SRCS vector.h walklayer.cpp walklayer.h - gui/base/actionevent.hpp + events/actionevent.h listeners/actionlistener.h gui/base/basiccontainer.hpp gui/base/cliprectangle.hpp @@ -808,7 +808,6 @@ SET(SRCS gui/base/widgets/textbox.hpp gui/base/widgets/textfield.hpp gui/base/widgets/window.hpp - gui/base/actionevent.cpp gui/base/basiccontainer.cpp gui/base/cliprectangle.cpp gui/base/color.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 6f0dd30f4..21c2fc0e9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,15 +26,14 @@ manaplus_SOURCES = endif dyecmd_CXXFLAGS = -dyecmd_SOURCES = gui/base/actionevent.cpp \ - gui/base/cliprectangle.cpp \ +dyecmd_SOURCES = gui/base/cliprectangle.cpp \ gui/base/color.cpp \ gui/base/event.cpp \ gui/base/exception.cpp \ gui/base/font.cpp \ gui/base/rectangle.cpp \ gui/base/widget.cpp \ - gui/base/actionevent.hpp \ + events/actionevent.h \ gui/base/cliprectangle.hpp \ gui/base/color.hpp \ gui/base/event.hpp \ @@ -156,7 +155,7 @@ manaplus_CXXFLAGS += -DUSE_SDL2 endif endif -manaplus_SOURCES += gui/base/actionevent.hpp \ +manaplus_SOURCES += events/actionevent.h \ listeners/actionlistener.h \ gui/base/basiccontainer.hpp \ gui/base/cliprectangle.hpp \ @@ -196,7 +195,6 @@ manaplus_SOURCES += gui/base/actionevent.hpp \ gui/base/widgets/textbox.hpp \ gui/base/widgets/textfield.hpp \ gui/base/widgets/window.hpp \ - gui/base/actionevent.cpp \ gui/base/basiccontainer.cpp \ gui/base/cliprectangle.cpp \ gui/base/color.cpp \ diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp index 1c7dbce14..4b6d80981 100644 --- a/src/actionmanager.cpp +++ b/src/actionmanager.cpp @@ -234,12 +234,12 @@ impHandler0(ok) // Close the config window, cancelling changes if opened else if (setupWindow && setupWindow->isWindowVisible()) { - setupWindow->action(gcn::ActionEvent(nullptr, "cancel")); + setupWindow->action(ActionEvent(nullptr, "cancel")); return true; } else if (NpcDialog *const dialog = NpcDialog::getActive()) { - dialog->action(gcn::ActionEvent(nullptr, "ok")); + dialog->action(ActionEvent(nullptr, "ok")); return true; } return false; diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index 86db69d8d..ea8218ee4 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -4385,7 +4385,7 @@ void LocalPlayer::setTestParticle(const std::string &fileName, } } -void AwayListener::action(const gcn::ActionEvent &event) +void AwayListener::action(const ActionEvent &event) { if (event.getId() == "ok" && player_node && player_node->getAway()) { diff --git a/src/being/localplayer.h b/src/being/localplayer.h index f43cfe0bb..ce501bcec 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -44,7 +44,7 @@ class OkDialog; class AwayListener final : public ActionListener { public: - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; }; /** diff --git a/src/client.cpp b/src/client.cpp index 3812fc9a9..0fac5b3f2 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -174,7 +174,7 @@ UserPalette *userPalette = nullptr; SoundManager soundManager; RenderType openGLMode = RENDER_SOFTWARE; -void ErrorListener::action(const gcn::ActionEvent &event) +void ErrorListener::action(const ActionEvent &event) { if (event.getId() == "yes") openBrowser(client->getSupportUrl()); @@ -196,7 +196,7 @@ extern "C" char const *_nl_locale_name_default(void); class AccountListener final : public ActionListener { public: - void action(const gcn::ActionEvent &) + void action(const ActionEvent &) { client->setState(STATE_CHAR_SELECT); } @@ -205,7 +205,7 @@ class AccountListener final : public ActionListener class LoginListener final : public ActionListener { public: - void action(const gcn::ActionEvent &) + void action(const ActionEvent &) { client->setState(STATE_PRE_LOGIN); } @@ -1351,7 +1351,7 @@ int Client::gameExec() if (mOptions.chooseDefault) { static_cast<WorldSelectDialog*>(mCurrentDialog) - ->action(gcn::ActionEvent(nullptr, "ok")); + ->action(ActionEvent(nullptr, "ok")); } } } @@ -1853,7 +1853,7 @@ void Client::optionChanged(const std::string &name) } } -void Client::action(const gcn::ActionEvent &event) +void Client::action(const ActionEvent &event) { std::string tab; const std::string &eventId = event.getId(); diff --git a/src/client.h b/src/client.h index aedad4569..0e6528ca3 100644 --- a/src/client.h +++ b/src/client.h @@ -60,7 +60,7 @@ extern int textures_count; class ErrorListener : public ActionListener { public: - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; }; extern std::string errorMessage; @@ -302,7 +302,7 @@ public: void optionChanged(const std::string &name) override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void initTradeFilter() const; diff --git a/src/gui/base/actionevent.hpp b/src/events/actionevent.h index 621499864..77f945693 100644 --- a/src/gui/base/actionevent.hpp +++ b/src/events/actionevent.h @@ -61,8 +61,8 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef GCN_ACTIONEVENT_HPP -#define GCN_ACTIONEVENT_HPP +#ifndef EVENTS_ACTIONEVENT_HPP +#define EVENTS_ACTIONEVENT_HPP #include "gui/base/event.hpp" @@ -70,64 +70,70 @@ #include "localconsts.h" -namespace gcn +namespace GCN { class Widget; +} - /** - * Represents an action event. An action event is an event - * that can be fired by a widget whenever an action has occured. - * What exactly an action is is up to the widget that fires - * the action event. An example is a Button which fires an action - * event as soon as the Button is clicked, another example is - * TextField which fires an action event as soon as the enter - * key is pressed. - * - * Any object can listen for actions from widgets by implementing - * the ActionListener interface. - * - * If you have implement a widget of your own it's a good idea to - * let the widget fire action events whenever you feel an action - * has occured so action listeners of the widget can be informed - * of the state of the widget. - * - * @see Widget::addActionListener, Widget::removeActionListener, - * Widget::distributeActionEvent - * @author Olof Naessén - * @since 0.6.0 - */ - class ActionEvent final : public Event - { +/** + * Represents an action event. An action event is an event + * that can be fired by a widget whenever an action has occured. + * What exactly an action is is up to the widget that fires + * the action event. An example is a Button which fires an action + * event as soon as the Button is clicked, another example is + * TextField which fires an action event as soon as the enter + * key is pressed. + * + * Any object can listen for actions from widgets by implementing + * the ActionListener interface. + * + * If you have implement a widget of your own it's a good idea to + * let the widget fire action events whenever you feel an action + * has occured so action listeners of the widget can be informed + * of the state of the widget. + * + * @see Widget::addActionListener, Widget::removeActionListener, + * Widget::distributeActionEvent + * @author Olof Naessén + * @since 0.6.0 + */ +class ActionEvent final : public gcn::Event +{ public: /** - * Constructor. - * - * @param source The source widget of the event. - * @param id An identifier of the event. - */ - ActionEvent(Widget *const source, const std::string &id); + * Constructor. + * + * @param source The source widget of the event. + * @param id An identifier of the event. + */ + ActionEvent(gcn::Widget *const source, const std::string &id) : + gcn::Event(source), + mId(id) + { + } /** - * Destructor. - */ - virtual ~ActionEvent(); + * Destructor. + */ + virtual ~ActionEvent() + { } /** - * Gets the identifier of the event. An identifier can - * be used to distinguish from two actions from the same - * widget or to let many widgets fire the same widgets - * that should be treated equally. - * - * @return The identifier of the event. - */ - const std::string& getId() const A_WARN_UNUSED; + * Gets the identifier of the event. An identifier can + * be used to distinguish from two actions from the same + * widget or to let many widgets fire the same widgets + * that should be treated equally. + * + * @return The identifier of the event. + */ + const std::string &getId() const A_WARN_UNUSED + { return mId; } protected: /** - * Holds the identifier of the event. - */ + * Holds the identifier of the event. + */ std::string mId; - }; -} // namespace gcn +}; -#endif // GCN_ACTIONEVENT_HPP +#endif // EVENTS_ACTIONEVENT_HPP diff --git a/src/gui/base/actionevent.cpp b/src/gui/base/actionevent.cpp deleted file mode 100644 index 7fcc1ee84..000000000 --- a/src/gui/base/actionevent.cpp +++ /dev/null @@ -1,88 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2014 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * For comments regarding functions please see the header file. - */ - -#include "gui/base/actionevent.hpp" - -#include "debug.h" - -namespace gcn -{ - ActionEvent::ActionEvent(Widget *const source, const std::string &id) - :Event(source), - mId(id) - { - } - - ActionEvent::~ActionEvent() - { - } - - const std::string& ActionEvent::getId() const - { - return mId; - } -} // namespace gcn diff --git a/src/gui/base/widget.cpp b/src/gui/base/widget.cpp index 6acf447d1..de133ac09 100644 --- a/src/gui/base/widget.cpp +++ b/src/gui/base/widget.cpp @@ -67,8 +67,8 @@ #include "gui/base/widget.hpp" -#include "gui/base/actionevent.hpp" -#include "listeners/actionlistener.h" +#include "events/actionevent.h" + #include "gui/base/basiccontainer.hpp" #include "gui/base/event.hpp" #include "gui/base/exception.hpp" @@ -76,6 +76,7 @@ #include "gui/base/keyinput.hpp" #include "gui/base/mouseinput.hpp" +#include "listeners/actionlistener.h" #include "listeners/deathlistener.h" #include "listeners/keylistener.h" #include "listeners/mouselistener.h" diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 343baba01..197a9f716 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -2859,7 +2859,7 @@ void RenameListener::setMapItem(MapItem *const mapItem) } } -void RenameListener::action(const gcn::ActionEvent &event) +void RenameListener::action(const ActionEvent &event) { if (event.getId() == "ok" && viewport && mDialog) { @@ -2893,7 +2893,7 @@ PlayerListener::PlayerListener() : { } -void PlayerListener::action(const gcn::ActionEvent &event) +void PlayerListener::action(const ActionEvent &event) { if (event.getId() == "ok" && !mNick.empty() && mDialog) { diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h index a79dd3162..235c809ba 100644 --- a/src/gui/popups/popupmenu.h +++ b/src/gui/popups/popupmenu.h @@ -54,7 +54,7 @@ class RenameListener final : public ActionListener A_DELETE_COPY(RenameListener) - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void setMapItem(MapItem *const mapItem); @@ -74,7 +74,7 @@ class PlayerListener : public ActionListener A_DELETE_COPY(PlayerListener) - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void setNick(std::string name) { mNick = name; } diff --git a/src/gui/widgets/characterviewnormal.cpp b/src/gui/widgets/characterviewnormal.cpp index 78c538b8c..75481268b 100644 --- a/src/gui/widgets/characterviewnormal.cpp +++ b/src/gui/widgets/characterviewnormal.cpp @@ -87,6 +87,6 @@ void CharacterViewNormal::resize() (*mCharacterEntries)[f]->setPosition((f - 5) * width, y); } -void CharacterViewNormal::action(const gcn::ActionEvent &event A_UNUSED) +void CharacterViewNormal::action(const ActionEvent &event A_UNUSED) { } diff --git a/src/gui/widgets/characterviewnormal.h b/src/gui/widgets/characterviewnormal.h index 50001a61d..4ef1500b0 100644 --- a/src/gui/widgets/characterviewnormal.h +++ b/src/gui/widgets/characterviewnormal.h @@ -40,7 +40,7 @@ class CharacterViewNormal final : public CharacterViewBase void resize() override; - void action(const gcn::ActionEvent &event A_UNUSED) override final; + void action(const ActionEvent &event A_UNUSED) override final; private: std::vector<CharacterDisplay*> *mCharacterEntries; diff --git a/src/gui/widgets/characterviewsmall.cpp b/src/gui/widgets/characterviewsmall.cpp index ce218646b..eda1e4a71 100644 --- a/src/gui/widgets/characterviewsmall.cpp +++ b/src/gui/widgets/characterviewsmall.cpp @@ -98,7 +98,7 @@ void CharacterViewSmall::resize() mNumber->setPosition(10, y2); } -void CharacterViewSmall::action(const gcn::ActionEvent &event) +void CharacterViewSmall::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "next") diff --git a/src/gui/widgets/characterviewsmall.h b/src/gui/widgets/characterviewsmall.h index 3a326134b..17a549718 100644 --- a/src/gui/widgets/characterviewsmall.h +++ b/src/gui/widgets/characterviewsmall.h @@ -39,7 +39,7 @@ class CharacterViewSmall final : public CharacterViewBase void resize() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; private: CharacterDisplay *mSelectedEntry; diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp index 1aed0dfe1..bbba0cd99 100644 --- a/src/gui/widgets/dropdown.cpp +++ b/src/gui/widgets/dropdown.cpp @@ -505,7 +505,7 @@ gcn::ListModel *DropDown::getListModel() return mPopup->getListModel(); } -void DropDown::action(const gcn::ActionEvent &actionEvent A_UNUSED) +void DropDown::action(const ActionEvent &actionEvent A_UNUSED) { foldUp(); distributeActionEvent(); diff --git a/src/gui/widgets/dropdown.h b/src/gui/widgets/dropdown.h index 692b341ca..f3431459f 100644 --- a/src/gui/widgets/dropdown.h +++ b/src/gui/widgets/dropdown.h @@ -133,7 +133,7 @@ class DropDown final : public ActionListener, gcn::Rectangle getChildrenArea() override; - void action(const gcn::ActionEvent &actionEvent) override; + void action(const ActionEvent &actionEvent) override; void distributeValueChangedEvent(); diff --git a/src/gui/widgets/guitable.cpp b/src/gui/widgets/guitable.cpp index 3d987ed63..dcb5431d5 100644 --- a/src/gui/widgets/guitable.cpp +++ b/src/gui/widgets/guitable.cpp @@ -49,7 +49,7 @@ public: ~GuiTableActionListener(); - void action(const gcn::ActionEvent& actionEvent) override final; + void action(const ActionEvent& actionEvent) override final; protected: GuiTable *mTable; @@ -84,8 +84,7 @@ GuiTableActionListener::~GuiTableActionListener() } } -void GuiTableActionListener::action(const gcn::ActionEvent - &actionEvent A_UNUSED) +void GuiTableActionListener::action(const ActionEvent &actionEvent A_UNUSED) { mTable->setSelected(mRow, mColumn); mTable->distributeActionEvent(); diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp index 96494ed0b..108444bb0 100644 --- a/src/gui/widgets/itemlinkhandler.cpp +++ b/src/gui/widgets/itemlinkhandler.cpp @@ -53,7 +53,7 @@ namespace A_DELETE_COPY(OpenUrlListener) - void action(const gcn::ActionEvent &event) override final + void action(const ActionEvent &event) override final { if (event.getId() == "yes") openBrowser(url); diff --git a/src/gui/widgets/setupitem.cpp b/src/gui/widgets/setupitem.cpp index 8453a9722..8b6cca5a7 100644 --- a/src/gui/widgets/setupitem.cpp +++ b/src/gui/widgets/setupitem.cpp @@ -154,7 +154,7 @@ std::string SetupItem::getActionEventId() const return mWidget->getActionEventId(); } -void SetupItem::action(const gcn::ActionEvent &event) +void SetupItem::action(const ActionEvent &event) { if (!mWidget) return; @@ -393,7 +393,7 @@ void SetupItemTextField::toWidget() mTextField->setText(mValue); } -void SetupItemTextField::action(const gcn::ActionEvent &event) +void SetupItemTextField::action(const ActionEvent &event) { if (!mTextField) return; @@ -529,7 +529,7 @@ void SetupItemIntTextField::toWidget() mTextField->setText(mValue); } -void SetupItemIntTextField::action(const gcn::ActionEvent &event) +void SetupItemIntTextField::action(const ActionEvent &event) { if (!mTextField) return; @@ -609,7 +609,7 @@ void SetupItemLabel::toWidget() { } -void SetupItemLabel::action(const gcn::ActionEvent &event A_UNUSED) +void SetupItemLabel::action(const ActionEvent &event A_UNUSED) { } @@ -799,7 +799,7 @@ void SetupItemSlider::toWidget() mSlider->setValue2(atof(mValue.c_str())); } -void SetupItemSlider::action(const gcn::ActionEvent &event A_UNUSED) +void SetupItemSlider::action(const ActionEvent &event A_UNUSED) { fromWidget(); if (mOnTheFly) @@ -954,7 +954,7 @@ void SetupItemSlider2::toWidget() updateLabel(); } -void SetupItemSlider2::action(const gcn::ActionEvent &event A_UNUSED) +void SetupItemSlider2::action(const ActionEvent &event A_UNUSED) { fromWidget(); updateLabel(); @@ -1086,7 +1086,7 @@ void SetupItemSliderList::toWidget() mSlider->setSelectedString(mValue); } -void SetupItemSliderList::action(const gcn::ActionEvent &event A_UNUSED) +void SetupItemSliderList::action(const ActionEvent &event A_UNUSED) { fromWidget(); if (mOnTheFly) @@ -1124,7 +1124,7 @@ void SetupItemSound::addMoreControls() mHorizont->add(mButton); } -void SetupItemSound::action(const gcn::ActionEvent &event) +void SetupItemSound::action(const ActionEvent &event) { if (event.getId() == mEventName + "_PLAY") { diff --git a/src/gui/widgets/setupitem.h b/src/gui/widgets/setupitem.h index dd5eda1d9..b5261e2f4 100644 --- a/src/gui/widgets/setupitem.h +++ b/src/gui/widgets/setupitem.h @@ -79,7 +79,7 @@ class SetupItem : public ActionListener, virtual std::string getActionEventId() const A_WARN_UNUSED; - virtual void action(const gcn::ActionEvent &event) override; + virtual void action(const ActionEvent &event) override; virtual void action(); @@ -210,7 +210,7 @@ class SetupItemTextField final : public SetupItem void toWidget() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void apply(const std::string &eventName) override final; @@ -265,7 +265,7 @@ class SetupItemIntTextField final : public SetupItem void toWidget() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void apply(const std::string &eventName) override final; @@ -297,7 +297,7 @@ class SetupItemLabel final : public SetupItem void toWidget() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void apply(const std::string &eventName) override final; @@ -377,7 +377,7 @@ class SetupItemSlider final : public SetupItem void toWidget() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void apply(const std::string &eventName) override final; @@ -433,7 +433,7 @@ class SetupItemSlider2 final : public SetupItem void toWidget() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void apply(const std::string &eventName) override final; @@ -470,7 +470,7 @@ class SetupItemSliderList : public SetupItem void toWidget() override; - virtual void action(const gcn::ActionEvent &event) override; + virtual void action(const ActionEvent &event) override; void apply(const std::string &eventName) override final; @@ -520,7 +520,7 @@ class SetupItemSound final : public SetupItemSliderList A_DELETE_COPY(SetupItemSound) - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void addMoreControls() override final; diff --git a/src/gui/widgets/sliderlist.cpp b/src/gui/widgets/sliderlist.cpp index d70977ff3..eee012120 100644 --- a/src/gui/widgets/sliderlist.cpp +++ b/src/gui/widgets/sliderlist.cpp @@ -138,7 +138,7 @@ void SliderList::updateLabel() mLabel->setPosition(buttonSpace + (space - labelWidth) / 2, labelY); } -void SliderList::action(const gcn::ActionEvent &event) +void SliderList::action(const ActionEvent &event) { if (!mListModel) return; diff --git a/src/gui/widgets/sliderlist.h b/src/gui/widgets/sliderlist.h index 144fa0cf1..952b6c337 100644 --- a/src/gui/widgets/sliderlist.h +++ b/src/gui/widgets/sliderlist.h @@ -58,7 +58,7 @@ class SliderList final : public Container, void draw(Graphics *graphics) override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void setSelectedString(const std::string &str); diff --git a/src/gui/widgets/tabbedarea.cpp b/src/gui/widgets/tabbedarea.cpp index 0bf6b8d11..500e821f5 100644 --- a/src/gui/widgets/tabbedarea.cpp +++ b/src/gui/widgets/tabbedarea.cpp @@ -558,7 +558,7 @@ void TabbedArea::adjustTabPositions() } } -void TabbedArea::action(const gcn::ActionEvent& actionEvent) +void TabbedArea::action(const ActionEvent& actionEvent) { gcn::Widget *const source = actionEvent.getSource(); Tab *const tab = dynamic_cast<Tab *const>(source); diff --git a/src/gui/widgets/tabbedarea.h b/src/gui/widgets/tabbedarea.h index 27ed05b5e..ec4c02ce5 100644 --- a/src/gui/widgets/tabbedarea.h +++ b/src/gui/widgets/tabbedarea.h @@ -151,7 +151,7 @@ class TabbedArea final : public Widget2, */ void adjustTabPositions(); - void action(const gcn::ActionEvent& actionEvent) override final; + void action(const ActionEvent& actionEvent) override final; // Inherited from MouseListener diff --git a/src/gui/widgets/tabs/setup_colors.cpp b/src/gui/widgets/tabs/setup_colors.cpp index fadea948a..f7068b965 100644 --- a/src/gui/widgets/tabs/setup_colors.cpp +++ b/src/gui/widgets/tabs/setup_colors.cpp @@ -207,7 +207,7 @@ Setup_Colors::~Setup_Colors() } } -void Setup_Colors::action(const gcn::ActionEvent &event) +void Setup_Colors::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "slider_grad") diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h index 0bcc9c7f0..55d5950c5 100644 --- a/src/gui/widgets/tabs/setup_colors.h +++ b/src/gui/widgets/tabs/setup_colors.h @@ -50,7 +50,7 @@ class Setup_Colors final : public SetupTab, void cancel() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void valueChanged(const gcn::SelectionEvent &event) override final; diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp index b079974d5..ba02eb5a2 100644 --- a/src/gui/widgets/tabs/setup_input.cpp +++ b/src/gui/widgets/tabs/setup_input.cpp @@ -213,7 +213,7 @@ void Setup_Input::cancel() refreshKeys(); } -void Setup_Input::action(const gcn::ActionEvent &event) +void Setup_Input::action(const ActionEvent &event) { const std::string id = event.getId(); diff --git a/src/gui/widgets/tabs/setup_input.h b/src/gui/widgets/tabs/setup_input.h index 135cb3339..43ec53b56 100644 --- a/src/gui/widgets/tabs/setup_input.h +++ b/src/gui/widgets/tabs/setup_input.h @@ -55,7 +55,7 @@ class Setup_Input final : public SetupTab void cancel() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Get an update on the assigned key. diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp index 6f023a488..7f96ee468 100644 --- a/src/gui/widgets/tabs/setup_joystick.cpp +++ b/src/gui/widgets/tabs/setup_joystick.cpp @@ -102,7 +102,7 @@ Setup_Joystick::~Setup_Joystick() mNamesModel = nullptr; } -void Setup_Joystick::action(const gcn::ActionEvent &event) +void Setup_Joystick::action(const ActionEvent &event) { const gcn::Widget *const source = event.getSource(); if (source == mJoystickEnabled) diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h index 5c7b764ec..ac6caef24 100644 --- a/src/gui/widgets/tabs/setup_joystick.h +++ b/src/gui/widgets/tabs/setup_joystick.h @@ -44,7 +44,7 @@ class Setup_Joystick final : public SetupTab void cancel() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void setTempEnabled(const bool sel); diff --git a/src/gui/widgets/tabs/setup_relations.cpp b/src/gui/widgets/tabs/setup_relations.cpp index 89d1f5beb..d23ac565c 100644 --- a/src/gui/widgets/tabs/setup_relations.cpp +++ b/src/gui/widgets/tabs/setup_relations.cpp @@ -370,7 +370,7 @@ void Setup_Relations::cancel() { } -void Setup_Relations::action(const gcn::ActionEvent &event) +void Setup_Relations::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == ACTION_TABLE) diff --git a/src/gui/widgets/tabs/setup_relations.h b/src/gui/widgets/tabs/setup_relations.h index c9d8e50a3..55da0bedc 100644 --- a/src/gui/widgets/tabs/setup_relations.h +++ b/src/gui/widgets/tabs/setup_relations.h @@ -56,7 +56,7 @@ public: void reset(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void updatedPlayer(const std::string &name); diff --git a/src/gui/widgets/tabs/setup_theme.cpp b/src/gui/widgets/tabs/setup_theme.cpp index d7cc4b4df..fd70b9158 100644 --- a/src/gui/widgets/tabs/setup_theme.cpp +++ b/src/gui/widgets/tabs/setup_theme.cpp @@ -433,7 +433,7 @@ void Setup_Theme::updateInfo() mInfoButton->setEnabled(!mThemeInfo.empty()); } -void Setup_Theme::action(const gcn::ActionEvent &event) +void Setup_Theme::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == ACTION_THEME) diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h index a7f3ad101..5e8fe7c2a 100644 --- a/src/gui/widgets/tabs/setup_theme.h +++ b/src/gui/widgets/tabs/setup_theme.h @@ -46,7 +46,7 @@ class Setup_Theme final : public SetupTab void cancel() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void updateInfo(); diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index ffadc5d03..589b08e5e 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -445,7 +445,7 @@ void Setup_Video::cancel() config.setValue("noframe", mNoFrame); } -void Setup_Video::action(const gcn::ActionEvent &event) +void Setup_Video::action(const ActionEvent &event) { const std::string &id = event.getId(); diff --git a/src/gui/widgets/tabs/setup_video.h b/src/gui/widgets/tabs/setup_video.h index facbcbce3..b385d0358 100644 --- a/src/gui/widgets/tabs/setup_video.h +++ b/src/gui/widgets/tabs/setup_video.h @@ -50,7 +50,7 @@ class Setup_Video final : public SetupTab, public KeyListener void cancel() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; private: bool mFullScreenEnabled; diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h index fb7de574d..779826e5a 100644 --- a/src/gui/widgets/tabs/setuptabscroll.h +++ b/src/gui/widgets/tabs/setuptabscroll.h @@ -56,7 +56,7 @@ class SetupTabScroll : public SetupTab virtual void externalUnloaded() override; - virtual void action(const gcn::ActionEvent &event A_UNUSED) + virtual void action(const ActionEvent &event A_UNUSED) override final { } diff --git a/src/gui/widgets/tabstrip.cpp b/src/gui/widgets/tabstrip.cpp index 24c33c614..ca31e393d 100644 --- a/src/gui/widgets/tabstrip.cpp +++ b/src/gui/widgets/tabstrip.cpp @@ -48,7 +48,7 @@ gcn::Widget *TabStrip::createWidget(const std::string &text) const return widget; } -void TabStrip::action(const gcn::ActionEvent &event) +void TabStrip::action(const ActionEvent &event) { WidgetGroup::action(event); if (event.getSource()) diff --git a/src/gui/widgets/tabstrip.h b/src/gui/widgets/tabstrip.h index 3e954aec5..2e5ccfe34 100644 --- a/src/gui/widgets/tabstrip.h +++ b/src/gui/widgets/tabstrip.h @@ -40,7 +40,7 @@ class TabStrip final : public WidgetGroup gcn::Widget *createWidget(const std::string &name) const override final A_WARN_UNUSED; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; }; #endif // GUI_WIDGETS_TABSTRIP_H diff --git a/src/gui/widgets/widgetgroup.cpp b/src/gui/widgets/widgetgroup.cpp index 17383780f..56da2d492 100644 --- a/src/gui/widgets/widgetgroup.cpp +++ b/src/gui/widgets/widgetgroup.cpp @@ -57,7 +57,7 @@ void WidgetGroup::addButton(const std::string &restrict text, } } -void WidgetGroup::action(const gcn::ActionEvent &event) +void WidgetGroup::action(const ActionEvent &event) { for (ActionListenerIterator iter = mActionListeners.begin(); iter != mActionListeners.end(); ++iter) diff --git a/src/gui/widgets/widgetgroup.h b/src/gui/widgets/widgetgroup.h index 60ee2672f..835738a6f 100644 --- a/src/gui/widgets/widgetgroup.h +++ b/src/gui/widgets/widgetgroup.h @@ -40,7 +40,7 @@ class WidgetGroup : public Container, virtual void addButton(const std::string &restrict text, const std::string &restrict tag); - void action(const gcn::ActionEvent &event) override; + void action(const ActionEvent &event) override; virtual void add(gcn::Widget *const widget, const int spacing); diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp index 631fe3437..e04eb210f 100644 --- a/src/gui/windowmenu.cpp +++ b/src/gui/windowmenu.cpp @@ -213,7 +213,7 @@ WindowMenu::~WindowMenu() } } -void WindowMenu::action(const gcn::ActionEvent &event) +void WindowMenu::action(const ActionEvent &event) { const std::string &eventId = event.getId(); diff --git a/src/gui/windowmenu.h b/src/gui/windowmenu.h index b472be579..9375eb15d 100644 --- a/src/gui/windowmenu.h +++ b/src/gui/windowmenu.h @@ -88,7 +88,7 @@ class WindowMenu final : public Container, ~WindowMenu(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void mousePressed(gcn::MouseEvent &event) override final; diff --git a/src/gui/windows/botcheckerwindow.cpp b/src/gui/windows/botcheckerwindow.cpp index 20ade8ae4..e04174962 100644 --- a/src/gui/windows/botcheckerwindow.cpp +++ b/src/gui/windows/botcheckerwindow.cpp @@ -377,7 +377,7 @@ void BotCheckerWindow::slowLogic() BLOCK_END("BotCheckerWindow::slowLogic") } -void BotCheckerWindow::action(const gcn::ActionEvent &event) +void BotCheckerWindow::action(const ActionEvent &event) { if (event.getId() == "reset") { diff --git a/src/gui/windows/botcheckerwindow.h b/src/gui/windows/botcheckerwindow.h index 3db396321..25fd550fb 100644 --- a/src/gui/windows/botcheckerwindow.h +++ b/src/gui/windows/botcheckerwindow.h @@ -61,7 +61,7 @@ class BotCheckerWindow final : public Window, */ ~BotCheckerWindow(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void update(); diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index def60b942..0027b695e 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -388,7 +388,7 @@ void BuyDialog::sort() } } -void BuyDialog::action(const gcn::ActionEvent &event) +void BuyDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "quit") diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index 9e493b91e..f3ba80c45 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -98,7 +98,7 @@ class BuyDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Returns the number of items in the shop inventory. diff --git a/src/gui/windows/buyselldialog.cpp b/src/gui/windows/buyselldialog.cpp index 5a1914040..92f6503bb 100644 --- a/src/gui/windows/buyselldialog.cpp +++ b/src/gui/windows/buyselldialog.cpp @@ -119,7 +119,7 @@ void BuySellDialog::setVisible(bool visible) } } -void BuySellDialog::action(const gcn::ActionEvent &event) +void BuySellDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "Buy") diff --git a/src/gui/windows/buyselldialog.h b/src/gui/windows/buyselldialog.h index 84bac0cac..a89ff0bea 100644 --- a/src/gui/windows/buyselldialog.h +++ b/src/gui/windows/buyselldialog.h @@ -59,7 +59,7 @@ class BuySellDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Returns true if any instances exist. diff --git a/src/gui/windows/changeemaildialog.cpp b/src/gui/windows/changeemaildialog.cpp index 3ed9ff213..b8f9c1fd2 100644 --- a/src/gui/windows/changeemaildialog.cpp +++ b/src/gui/windows/changeemaildialog.cpp @@ -109,7 +109,7 @@ ChangeEmailDialog::~ChangeEmailDialog() mWrongDataNoticeListener = nullptr; } -void ChangeEmailDialog::action(const gcn::ActionEvent &event) +void ChangeEmailDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "cancel") diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h index cdbd371d1..d2928025d 100644 --- a/src/gui/windows/changeemaildialog.h +++ b/src/gui/windows/changeemaildialog.h @@ -58,7 +58,7 @@ class ChangeEmailDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * This is used to pass the pointer to where the new email should be diff --git a/src/gui/windows/changepassworddialog.cpp b/src/gui/windows/changepassworddialog.cpp index 24823cddc..05c7a9309 100644 --- a/src/gui/windows/changepassworddialog.cpp +++ b/src/gui/windows/changepassworddialog.cpp @@ -88,7 +88,7 @@ ChangePasswordDialog::~ChangePasswordDialog() mWrongDataNoticeListener = nullptr; } -void ChangePasswordDialog::action(const gcn::ActionEvent &event) +void ChangePasswordDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "cancel") diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h index ac7d35308..adbaf109a 100644 --- a/src/gui/windows/changepassworddialog.h +++ b/src/gui/windows/changepassworddialog.h @@ -58,7 +58,7 @@ class ChangePasswordDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; private: TextField *mOldPassField; diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index 4595709ca..23be4eacf 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -318,7 +318,7 @@ CharCreateDialog::~CharCreateDialog() Net::getCharServerHandler()->setCharCreateDialog(nullptr); } -void CharCreateDialog::action(const gcn::ActionEvent &event) +void CharCreateDialog::action(const ActionEvent &event) { const std::string id = event.getId(); if (id == "create") @@ -671,7 +671,7 @@ void CharCreateDialog::keyPressed(gcn::KeyEvent &keyEvent) { case Input::KEY_GUI_CANCEL: keyEvent.consume(); - action(gcn::ActionEvent(mCancelButton, + action(ActionEvent(mCancelButton, mCancelButton->getActionEventId())); break; diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index c0e8e2928..d98860566 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -58,7 +58,7 @@ class CharCreateDialog final : public Window, */ ~CharCreateDialog(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Unlocks the dialog, enabling the create character button again. diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index f5b522971..5d447c717 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -70,7 +70,7 @@ class CharDeleteConfirm final : public ConfirmDialog A_DELETE_COPY(CharDeleteConfirm) - void action(const gcn::ActionEvent &event) + void action(const ActionEvent &event) { if (event.getId() == "yes" && mMaster) mMaster->askPasswordForDeletion(mIndex); @@ -205,7 +205,7 @@ void CharSelectDialog::postInit() requestFocus(); } -void CharSelectDialog::action(const gcn::ActionEvent &event) +void CharSelectDialog::action(const ActionEvent &event) { // Check if a button of a character was pressed const gcn::Widget *const sourceParent = event.getSource()->getParent(); @@ -322,7 +322,7 @@ void CharSelectDialog::keyPressed(gcn::KeyEvent &keyEvent) { case Input::KEY_GUI_CANCEL: keyEvent.consume(); - action(gcn::ActionEvent(mSwitchLoginButton, + action(ActionEvent(mSwitchLoginButton, mSwitchLoginButton->getActionEventId())); break; diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 9f0e4d126..6c6759932 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -61,7 +61,7 @@ class CharSelectDialog final : public Window, ~CharSelectDialog(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void keyPressed(gcn::KeyEvent &keyEvent) override final; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index e62f797e3..28f58aaa9 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -514,7 +514,7 @@ void ChatWindow::defaultTab() mChatTabs->setSelectedTabByIndex(static_cast<unsigned>(0)); } -void ChatWindow::action(const gcn::ActionEvent &event) +void ChatWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "chatinput") diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index cb7671058..e18eef7b2 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -139,7 +139,7 @@ class ChatWindow final : public Window, /** * Performs action. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Request focus for typing chat message. diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp index 950c6eada..499538388 100644 --- a/src/gui/windows/confirmdialog.cpp +++ b/src/gui/windows/confirmdialog.cpp @@ -107,7 +107,7 @@ void ConfirmDialog::postInit() yesButton->requestFocus(); } -void ConfirmDialog::action(const gcn::ActionEvent &event) +void ConfirmDialog::action(const ActionEvent &event) { setActionEventId(event.getId()); distributeActionEvent(); diff --git a/src/gui/windows/confirmdialog.h b/src/gui/windows/confirmdialog.h index a123dae71..0d9f25d38 100644 --- a/src/gui/windows/confirmdialog.h +++ b/src/gui/windows/confirmdialog.h @@ -58,7 +58,7 @@ class ConfirmDialog : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override; + void action(const ActionEvent &event) override; void postInit() override final; diff --git a/src/gui/windows/connectiondialog.cpp b/src/gui/windows/connectiondialog.cpp index a50747958..0d0633ff8 100644 --- a/src/gui/windows/connectiondialog.cpp +++ b/src/gui/windows/connectiondialog.cpp @@ -60,7 +60,7 @@ void ConnectionDialog::postInit() setVisible(true); } -void ConnectionDialog::action(const gcn::ActionEvent &) +void ConnectionDialog::action(const ActionEvent &) { logger->log1("Cancel pressed"); client->setState(mCancelState); diff --git a/src/gui/windows/connectiondialog.h b/src/gui/windows/connectiondialog.h index b27aa892e..059d4bd6d 100644 --- a/src/gui/windows/connectiondialog.h +++ b/src/gui/windows/connectiondialog.h @@ -56,7 +56,7 @@ class ConnectionDialog final : public Window, * Called when the user presses Cancel. Restores the global state to * the previous one. */ - void action(const gcn::ActionEvent &) override; + void action(const ActionEvent &) override; void draw(Graphics *graphics) override; diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp index d393a7dd5..cb2fdec95 100644 --- a/src/gui/windows/didyouknowwindow.cpp +++ b/src/gui/windows/didyouknowwindow.cpp @@ -102,7 +102,7 @@ void DidYouKnowWindow::postInit() widgetResized(gcn::Event(nullptr)); } -void DidYouKnowWindow::action(const gcn::ActionEvent &event) +void DidYouKnowWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "close") diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index ff4599657..4f88b3f1c 100644 --- a/src/gui/windows/didyouknowwindow.h +++ b/src/gui/windows/didyouknowwindow.h @@ -53,7 +53,7 @@ class DidYouKnowWindow final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Handles link action. diff --git a/src/gui/windows/editdialog.cpp b/src/gui/windows/editdialog.cpp index 3f087b803..55102acdb 100644 --- a/src/gui/windows/editdialog.cpp +++ b/src/gui/windows/editdialog.cpp @@ -65,7 +65,7 @@ void EditDialog::postInit() okButton->requestFocus(); } -void EditDialog::action(const gcn::ActionEvent &event) +void EditDialog::action(const ActionEvent &event) { // Proxy button events to our listeners FOR_EACH (ActionListenerIterator, i, mActionListeners) diff --git a/src/gui/windows/editdialog.h b/src/gui/windows/editdialog.h index f37369a89..b3bfe1f45 100644 --- a/src/gui/windows/editdialog.h +++ b/src/gui/windows/editdialog.h @@ -59,7 +59,7 @@ class EditDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; std::string getMsg() const A_WARN_UNUSED { return mTextField->getText(); } diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index ee375a86e..d8301f5ce 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -198,7 +198,7 @@ void EditServerDialog::postInit() mNameField->requestFocus(); } -void EditServerDialog::action(const gcn::ActionEvent &event) +void EditServerDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); @@ -299,6 +299,6 @@ void EditServerDialog::keyPressed(gcn::KeyEvent &keyEvent) else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT) || actionId == static_cast<int>(Input::KEY_GUI_SELECT2)) { - action(gcn::ActionEvent(nullptr, mOkButton->getActionEventId())); + action(ActionEvent(nullptr, mOkButton->getActionEventId())); } } diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h index bf36c216f..55c200934 100644 --- a/src/gui/windows/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h @@ -92,7 +92,7 @@ class EditServerDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void keyPressed(gcn::KeyEvent &keyEvent) override final; diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index 3f7f19948..68ef56826 100644 --- a/src/gui/windows/equipmentwindow.cpp +++ b/src/gui/windows/equipmentwindow.cpp @@ -257,7 +257,7 @@ void EquipmentWindow::draw(Graphics *graphics) BLOCK_END("EquipmentWindow::draw") } -void EquipmentWindow::action(const gcn::ActionEvent &event) +void EquipmentWindow::action(const ActionEvent &event) { if (!mEquipment) return; diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 7ce8e6409..bade666ad 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -84,7 +84,7 @@ class EquipmentWindow final : public Window, */ void draw(Graphics *graphics) override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void mousePressed(gcn::MouseEvent& mouseEvent) override final; diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp index 288c38138..53e82335e 100644 --- a/src/gui/windows/helpwindow.cpp +++ b/src/gui/windows/helpwindow.cpp @@ -90,7 +90,7 @@ HelpWindow::HelpWindow() : widgetResized(gcn::Event(nullptr)); } -void HelpWindow::action(const gcn::ActionEvent &event) +void HelpWindow::action(const ActionEvent &event) { if (event.getId() == "DYK") { diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h index ae7d68c7c..d8b873408 100644 --- a/src/gui/windows/helpwindow.h +++ b/src/gui/windows/helpwindow.h @@ -59,7 +59,7 @@ class HelpWindow final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Handles link action. diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 7066a9c8e..509b085b5 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -335,7 +335,7 @@ void InventoryWindow::storeSortOrder() } } -void InventoryWindow::action(const gcn::ActionEvent &event) +void InventoryWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "outfit") diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 2d5ec6191..4babbc264 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -77,7 +77,7 @@ class InventoryWindow final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Returns the selected item. diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index 4dd220093..40ca481b0 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -339,7 +339,7 @@ void ItemAmountWindow::resetAmount() mItemAmountTextField->setValue(1); } -void ItemAmountWindow::action(const gcn::ActionEvent &event) +void ItemAmountWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "cancel") diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index ac2eae8e1..46e20353e 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -65,7 +65,7 @@ class ItemAmountWindow final : public Window, /** * Called when receiving actions from widget. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Sets default amount value. diff --git a/src/gui/windows/killstats.cpp b/src/gui/windows/killstats.cpp index dec951458..710875a3c 100644 --- a/src/gui/windows/killstats.cpp +++ b/src/gui/windows/killstats.cpp @@ -156,7 +156,7 @@ KillStats::~KillStats() { } -void KillStats::action(const gcn::ActionEvent &event) +void KillStats::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "reset") diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h index 2dcc41b97..486ec9135 100644 --- a/src/gui/windows/killstats.h +++ b/src/gui/windows/killstats.h @@ -51,7 +51,7 @@ class KillStats final : public Window, /** * Stuff. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void gainXp(int Xp); diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index 609b58b57..44a19346f 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -63,7 +63,7 @@ namespace A_DELETE_COPY(OpenUrlListener) - void action(const gcn::ActionEvent &event) override final + void action(const ActionEvent &event) override final { if (event.getId() == "yes") openBrowser(url); @@ -276,7 +276,7 @@ LoginDialog::~LoginDialog() mUpdateListModel = nullptr; } -void LoginDialog::action(const gcn::ActionEvent &event) +void LoginDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "login" && canSubmit()) @@ -330,12 +330,12 @@ void LoginDialog::keyPressed(gcn::KeyEvent &keyEvent) &keyEvent)->getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { - action(gcn::ActionEvent(nullptr, mServerButton->getActionEventId())); + action(ActionEvent(nullptr, mServerButton->getActionEventId())); } else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT) || actionId == static_cast<int>(Input::KEY_GUI_SELECT2)) { - action(gcn::ActionEvent(nullptr, mLoginButton->getActionEventId())); + action(ActionEvent(nullptr, mLoginButton->getActionEventId())); } else { diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index 70b16f537..fee21f307 100644 --- a/src/gui/windows/logindialog.h +++ b/src/gui/windows/logindialog.h @@ -66,7 +66,7 @@ class LoginDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Called when a key is pressed in one of the text fields. diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 6e33422b2..4ee8f3b29 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -295,7 +295,7 @@ void NpcDialog::showCloseButton() buildLayout(); } -void NpcDialog::action(const gcn::ActionEvent &event) +void NpcDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "ok") diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index e9ad99242..1fdd4a444 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -77,7 +77,7 @@ class NpcDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Sets the text shows in the dialog. diff --git a/src/gui/windows/npcpostdialog.cpp b/src/gui/windows/npcpostdialog.cpp index 1666d1bd6..587f94ab2 100644 --- a/src/gui/windows/npcpostdialog.cpp +++ b/src/gui/windows/npcpostdialog.cpp @@ -98,7 +98,7 @@ NpcPostDialog::~NpcPostDialog() instances.remove(this); } -void NpcPostDialog::action(const gcn::ActionEvent &event) +void NpcPostDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "send") diff --git a/src/gui/windows/npcpostdialog.h b/src/gui/windows/npcpostdialog.h index 6ce070808..5396aad6e 100644 --- a/src/gui/windows/npcpostdialog.h +++ b/src/gui/windows/npcpostdialog.h @@ -48,7 +48,7 @@ class NpcPostDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void setVisible(bool visible) override final; diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index eb22d6c87..b9f26da20 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -84,7 +84,7 @@ OkDialog::OkDialog(const std::string &restrict title, soundManager.playGuiSound(SOUND_ERROR); } -void OkDialog::action(const gcn::ActionEvent &event) +void OkDialog::action(const ActionEvent &event) { setActionEventId(event.getId()); distributeActionEvent(); diff --git a/src/gui/windows/okdialog.h b/src/gui/windows/okdialog.h index 6809bee1a..b8236dfbc 100644 --- a/src/gui/windows/okdialog.h +++ b/src/gui/windows/okdialog.h @@ -63,7 +63,7 @@ class OkDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; private: TextBox *mTextBox; diff --git a/src/gui/windows/outfitwindow.cpp b/src/gui/windows/outfitwindow.cpp index 2d59c6a43..6fbb34390 100644 --- a/src/gui/windows/outfitwindow.cpp +++ b/src/gui/windows/outfitwindow.cpp @@ -225,7 +225,7 @@ void OutfitWindow::save() const serverConfig.setValue("OutfitAwayIndex", mAwayOutfit); } -void OutfitWindow::action(const gcn::ActionEvent &event) +void OutfitWindow::action(const ActionEvent &event) { const std::string eventId = event.getId(); if (eventId == "next") diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index 4c3b5951c..f27852a8c 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -50,7 +50,7 @@ class OutfitWindow final : public Window, */ ~OutfitWindow(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void draw(Graphics *graphics) override final; diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index c37bc860c..681949145 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -318,7 +318,7 @@ void QuestsWindow::loadEffect(const int var, const XmlNodePtr node) mAllEffects.push_back(effect); } -void QuestsWindow::action(const gcn::ActionEvent &event) +void QuestsWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "select") diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index fdb2c98aa..9000fcaa9 100644 --- a/src/gui/windows/questswindow.h +++ b/src/gui/windows/questswindow.h @@ -57,7 +57,7 @@ class QuestsWindow final : public Window, ~QuestsWindow(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void updateQuest(const int var, const int val); diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 99890472b..2c264f232 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -147,7 +147,7 @@ void QuitDialog::placeOption(ContainerPlacer &placer, mOptions.push_back(option); } -void QuitDialog::action(const gcn::ActionEvent &event) +void QuitDialog::action(const ActionEvent &event) { soundManager.playGuiSound(SOUND_HIDE_WINDOW); if (event.getId() == "ok") @@ -211,11 +211,10 @@ void QuitDialog::keyPressed(gcn::KeyEvent &keyEvent) { case Input::KEY_GUI_SELECT: case Input::KEY_GUI_SELECT2: - action(gcn::ActionEvent(nullptr, mOkButton->getActionEventId())); + action(ActionEvent(nullptr, mOkButton->getActionEventId())); break; case Input::KEY_GUI_CANCEL: - action(gcn::ActionEvent(nullptr, - mCancelButton->getActionEventId())); + action(ActionEvent(nullptr, mCancelButton->getActionEventId())); break; case Input::KEY_GUI_UP: dir = -1; diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index 0b81992f1..5f0824ff4 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -62,7 +62,7 @@ class QuitDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void keyPressed(gcn::KeyEvent &keyEvent) override final; diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index fd5ab8f5a..a89b09d5b 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -54,7 +54,7 @@ void WrongDataNoticeListener::setTarget(TextField *const textField) mTarget = textField; } -void WrongDataNoticeListener::action(const gcn::ActionEvent &event) +void WrongDataNoticeListener::action(const ActionEvent &event) { if (event.getId() == "ok" && mTarget) mTarget->requestFocus(); @@ -172,7 +172,7 @@ RegisterDialog::~RegisterDialog() mWrongDataNoticeListener = nullptr; } -void RegisterDialog::action(const gcn::ActionEvent &event) +void RegisterDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "cancel") @@ -292,12 +292,12 @@ void RegisterDialog::keyPressed(gcn::KeyEvent &keyEvent) &keyEvent)->getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { - action(gcn::ActionEvent(nullptr, mCancelButton->getActionEventId())); + action(ActionEvent(nullptr, mCancelButton->getActionEventId())); } else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT) || actionId == static_cast<int>(Input::KEY_GUI_SELECT2)) { - action(gcn::ActionEvent(nullptr, mRegisterButton->getActionEventId())); + action(ActionEvent(nullptr, mRegisterButton->getActionEventId())); } else { diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index 93908c27c..766f4b6b1 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -47,7 +47,7 @@ class WrongDataNoticeListener final : public ActionListener void setTarget(TextField *const textField); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; private: TextField *mTarget; }; @@ -82,7 +82,7 @@ class RegisterDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override; + void action(const ActionEvent &event) override; /** * Called when a key is pressed in one of the text fields. diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index 9db7bda27..1917f7693 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -185,7 +185,7 @@ void SellDialog::addItem(const int id, const unsigned char color, } -void SellDialog::action(const gcn::ActionEvent &event) +void SellDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h index f1747ca7e..5d1065c16 100644 --- a/src/gui/windows/selldialog.h +++ b/src/gui/windows/selldialog.h @@ -80,7 +80,7 @@ class SellDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Updates labels according to selected item. diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 32e838ac3..8d42d83e9 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -404,7 +404,7 @@ void ServerDialog::connectToSelectedServer() client->setState(STATE_CONNECT_SERVER); } -void ServerDialog::action(const gcn::ActionEvent &event) +void ServerDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "connect") @@ -456,7 +456,7 @@ void ServerDialog::keyPressed(gcn::KeyEvent &keyEvent) case Input::KEY_GUI_SELECT: case Input::KEY_GUI_SELECT2: keyEvent.consume(); - action(gcn::ActionEvent(nullptr, + action(ActionEvent(nullptr, mConnectButton->getActionEventId())); return; @@ -510,8 +510,8 @@ void ServerDialog::mouseClicked(gcn::MouseEvent &mouseEvent) if (mouseEvent.getClickCount() == 2 && mouseEvent.getSource() == mServersList) { - action(gcn::ActionEvent(mConnectButton, - mConnectButton->getActionEventId())); + action(ActionEvent(mConnectButton, + mConnectButton->getActionEventId())); } } diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index c01f8dd08..4e711d732 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -116,7 +116,7 @@ class ServerDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void keyPressed(gcn::KeyEvent &keyEvent) override final; diff --git a/src/gui/windows/setupwindow.cpp b/src/gui/windows/setupwindow.cpp index 85e4938ef..710702f5e 100644 --- a/src/gui/windows/setupwindow.cpp +++ b/src/gui/windows/setupwindow.cpp @@ -160,7 +160,7 @@ SetupWindow::~SetupWindow() mButtons.clear(); } -void SetupWindow::action(const gcn::ActionEvent &event) +void SetupWindow::action(const ActionEvent &event) { if (Game::instance()) Game::instance()->resetAdjustLevel(); diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h index c65f1cfea..27e44b243 100644 --- a/src/gui/windows/setupwindow.h +++ b/src/gui/windows/setupwindow.h @@ -52,7 +52,7 @@ class SetupWindow final : public Window, void postInit() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void setInGame(const bool inGame); diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 7e50e4c37..04258998a 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -205,7 +205,7 @@ ShopWindow::~ShopWindow() instances.remove(this); } -void ShopWindow::action(const gcn::ActionEvent &event) +void ShopWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "close") diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 9149b79cb..a93e0d475 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -72,7 +72,7 @@ class ShopWindow final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Updates the labels according to the selected item. diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index f2af65c3c..12c6e76d8 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -321,7 +321,7 @@ SkillDialog::~SkillDialog() clearSkills(); } -void SkillDialog::action(const gcn::ActionEvent &event) +void SkillDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "inc") diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h index d58aa5cca..2bedef2b0 100644 --- a/src/gui/windows/skilldialog.h +++ b/src/gui/windows/skilldialog.h @@ -58,7 +58,7 @@ class SkillDialog final : public Window, /** * Called when receiving actions from widget. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Update the given skill's display diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp index 8b5fdf95c..72590ab60 100644 --- a/src/gui/windows/socialwindow.cpp +++ b/src/gui/windows/socialwindow.cpp @@ -208,7 +208,7 @@ public: mScroll = nullptr; } - void action(const gcn::ActionEvent &event) override final + void action(const ActionEvent &event) override final { const std::string &eventId = event.getId(); if (eventId == "do invite") @@ -343,7 +343,7 @@ public: mScroll = nullptr; } - void action(const gcn::ActionEvent &event A_UNUSED) override final + void action(const ActionEvent &event A_UNUSED) override final { } @@ -411,7 +411,7 @@ public: mScroll = nullptr; } - void action(const gcn::ActionEvent &event) override final + void action(const ActionEvent &event) override final { const std::string &eventId = event.getId(); if (eventId == "do invite") @@ -1482,7 +1482,7 @@ bool SocialWindow::removeTab(Party *const party) return true; } -void SocialWindow::action(const gcn::ActionEvent &event) +void SocialWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index 84c713787..08497c5c8 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -68,7 +68,7 @@ public: bool removeTab(Party *const party); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void showGuildInvite(const std::string &restrict guildName, const int guildId, diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp index a95eb807c..1279961e6 100644 --- a/src/gui/windows/statuswindow.cpp +++ b/src/gui/windows/statuswindow.cpp @@ -129,7 +129,7 @@ class ChangeDisplay final : public AttrDisplay, ActionListener void setPointsNeeded(const int needed); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; private: int mNeeded; @@ -746,7 +746,7 @@ void StatusWindow::updateStatusBar(ProgressBar *const bar, bar->setBackgroundColor(Theme::getThemeColor(Theme::STATUSBAR_OFF)); } -void StatusWindow::action(const gcn::ActionEvent &event) +void StatusWindow::action(const ActionEvent &event) { if (!chatWindow) return; @@ -873,7 +873,7 @@ void ChangeDisplay::setPointsNeeded(const int needed) update(); } -void ChangeDisplay::action(const gcn::ActionEvent &event) +void ChangeDisplay::action(const ActionEvent &event) { if (Net::getPlayerHandler()->canCorrectAttributes() && event.getSource() == mDec) diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index 31e1dda69..3b171a25e 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -83,7 +83,7 @@ class StatusWindow final : public Window, const int id, const bool percent = true); - void action(const gcn::ActionEvent &event) override; + void action(const ActionEvent &event) override; void clearAttributes(); diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index 72796b6b9..98b9cae60 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -314,7 +314,7 @@ TextCommandEditor::~TextCommandEditor() mMagicSchoolModel = nullptr; } -void TextCommandEditor::action(const gcn::ActionEvent &event) +void TextCommandEditor::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "magic") diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 7b3921618..3b5e239cd 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -56,7 +56,7 @@ class TextCommandEditor final : public Window, void postInit() override final; - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void scheduleDelete() override final; diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp index f6f2ce06a..c4ff71eb7 100644 --- a/src/gui/windows/textdialog.cpp +++ b/src/gui/windows/textdialog.cpp @@ -104,7 +104,7 @@ TextDialog::~TextDialog() instances--; } -void TextDialog::action(const gcn::ActionEvent &event) +void TextDialog::action(const ActionEvent &event) { if (event.getId() == "CANCEL") setActionEventId("~" + getActionEventId()); diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h index d82b15085..8e69e8a3d 100644 --- a/src/gui/windows/textdialog.h +++ b/src/gui/windows/textdialog.h @@ -59,7 +59,7 @@ public: /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Get the text in the textfield diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index a5b7f1a47..2a3b1c7b5 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -318,7 +318,7 @@ void TradeWindow::setStatus(const Status s) mOkButton->setEnabled((s != PROPOSING && s != ACCEPTED)); } -void TradeWindow::action(const gcn::ActionEvent &event) +void TradeWindow::action(const ActionEvent &event) { if (!inventoryWindow) return; diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index c5e1d7e8f..6839b2f30 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -114,7 +114,7 @@ class TradeWindow final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; /** * Closes the Trade Window, as well as telling the server that the diff --git a/src/gui/windows/unregisterdialog.cpp b/src/gui/windows/unregisterdialog.cpp index 791a25c05..3326ca2bb 100644 --- a/src/gui/windows/unregisterdialog.cpp +++ b/src/gui/windows/unregisterdialog.cpp @@ -101,7 +101,7 @@ UnRegisterDialog::~UnRegisterDialog() mWrongDataNoticeListener = nullptr; } -void UnRegisterDialog::action(const gcn::ActionEvent &event) +void UnRegisterDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "cancel") diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h index b384a7041..206c05413 100644 --- a/src/gui/windows/unregisterdialog.h +++ b/src/gui/windows/unregisterdialog.h @@ -57,7 +57,7 @@ class UnRegisterDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; private: LoginData *mLoginData; diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index b5339a202..9df4fdc57 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -270,7 +270,7 @@ void UpdaterWindow::enable() client->setState(STATE_LOAD_DATA); } -void UpdaterWindow::action(const gcn::ActionEvent &event) +void UpdaterWindow::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "cancel") @@ -295,7 +295,7 @@ void UpdaterWindow::keyPressed(gcn::KeyEvent &keyEvent) const int actionId = static_cast<KeyEvent*>(&keyEvent)->getActionId(); if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { - action(gcn::ActionEvent(nullptr, mCancelButton->getActionEventId())); + action(ActionEvent(nullptr, mCancelButton->getActionEventId())); client->setState(STATE_LOGIN); } else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT) @@ -304,12 +304,11 @@ void UpdaterWindow::keyPressed(gcn::KeyEvent &keyEvent) if (mDownloadStatus == UPDATE_COMPLETE || mDownloadStatus == UPDATE_ERROR) { - action(gcn::ActionEvent(nullptr, mPlayButton->getActionEventId())); + action(ActionEvent(nullptr, mPlayButton->getActionEventId())); } else { - action(gcn::ActionEvent(nullptr, - mCancelButton->getActionEventId())); + action(ActionEvent(nullptr, mCancelButton->getActionEventId())); } } } diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index d20f2aadc..879a9eac3 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -119,7 +119,7 @@ class UpdaterWindow final : public Window, void loadPatch(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void keyPressed(gcn::KeyEvent &keyEvent) override final; diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index fd54076ed..0d65eff35 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -683,7 +683,7 @@ void WhoIsOnline::slowLogic() BLOCK_END("WhoIsOnline::slowLogic") } -void WhoIsOnline::action(const gcn::ActionEvent &event) +void WhoIsOnline::action(const ActionEvent &event) { if (event.getId() == "update") { diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 8c6235130..af0d14f7b 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -134,7 +134,7 @@ public: void slowLogic(); - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void widgetResized(const gcn::Event &event) override final; diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index 48be8df8a..5d81e249e 100644 --- a/src/gui/windows/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -134,7 +134,7 @@ WorldSelectDialog::~WorldSelectDialog() mWorldListModel = nullptr; } -void WorldSelectDialog::action(const gcn::ActionEvent &event) +void WorldSelectDialog::action(const ActionEvent &event) { const std::string &eventId = event.getId(); if (eventId == "world") @@ -160,12 +160,12 @@ void WorldSelectDialog::keyPressed(gcn::KeyEvent &keyEvent) if (actionId == static_cast<int>(Input::KEY_GUI_CANCEL)) { - action(gcn::ActionEvent(nullptr, + action(ActionEvent(nullptr, mChangeLoginButton->getActionEventId())); } else if (actionId == static_cast<int>(Input::KEY_GUI_SELECT) || actionId == static_cast<int>(Input::KEY_GUI_SELECT2)) { - action(gcn::ActionEvent(nullptr, mChooseWorld->getActionEventId())); + action(ActionEvent(nullptr, mChooseWorld->getActionEventId())); } } diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index 5542d2360..9315317bf 100644 --- a/src/gui/windows/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h @@ -63,7 +63,7 @@ class WorldSelectDialog final : public Window, /** * Called when receiving actions from the widgets. */ - void action(const gcn::ActionEvent &event) override final; + void action(const ActionEvent &event) override final; void keyPressed(gcn::KeyEvent &keyEvent) override final; diff --git a/src/listeners/actionlistener.h b/src/listeners/actionlistener.h index ee3154f80..b22e5abc6 100644 --- a/src/listeners/actionlistener.h +++ b/src/listeners/actionlistener.h @@ -66,7 +66,7 @@ #include <string> -#include "gui/base/actionevent.hpp" +#include "events/actionevent.h" /** * Interface for listening for action events from widgets. @@ -93,7 +93,7 @@ class ActionListener * @param actionEvent The event of the action. * @since 0.6.0 */ - virtual void action(const gcn::ActionEvent &actionEvent) = 0; + virtual void action(const ActionEvent &actionEvent) = 0; protected: /** diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp index c568012fc..28f16735c 100644 --- a/src/net/ea/playerhandler.cpp +++ b/src/net/ea/playerhandler.cpp @@ -62,7 +62,7 @@ namespace */ struct WeightListener final : public ActionListener { - void action(const gcn::ActionEvent &event A_UNUSED) + void action(const ActionEvent &event A_UNUSED) { weightNotice = nullptr; } @@ -73,7 +73,7 @@ namespace */ struct DeathListener final : public ActionListener { - void action(const gcn::ActionEvent &event A_UNUSED) + void action(const ActionEvent &event A_UNUSED) { if (Net::getPlayerHandler()) Net::getPlayerHandler()->respawn(); diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp index adecd591f..4cb424fc9 100644 --- a/src/net/ea/tradehandler.cpp +++ b/src/net/ea/tradehandler.cpp @@ -50,7 +50,7 @@ namespace { struct RequestTradeListener : public ActionListener { - void action(const gcn::ActionEvent &event) + void action(const ActionEvent &event) { confirmDlg = nullptr; const std::string &eventId = event.getId(); |