From 768523601ff80a23bf3e821484cc116c62498a38 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 15 Feb 2014 23:58:22 +0300 Subject: move keylistener from base into listeners. --- src/gui/windows/charcreatedialog.cpp | 2 +- src/gui/windows/charcreatedialog.h | 4 ++-- src/gui/windows/charselectdialog.cpp | 2 +- src/gui/windows/charselectdialog.h | 4 ++-- src/gui/windows/chatwindow.cpp | 2 +- src/gui/windows/chatwindow.h | 4 ++-- src/gui/windows/editserverdialog.cpp | 2 +- src/gui/windows/editserverdialog.h | 4 ++-- src/gui/windows/inventorywindow.cpp | 2 +- src/gui/windows/inventorywindow.h | 4 ++-- src/gui/windows/itemamountwindow.cpp | 2 +- src/gui/windows/itemamountwindow.h | 4 ++-- src/gui/windows/logindialog.cpp | 2 +- src/gui/windows/logindialog.h | 4 ++-- src/gui/windows/quitdialog.cpp | 2 +- src/gui/windows/quitdialog.h | 4 ++-- src/gui/windows/registerdialog.cpp | 2 +- src/gui/windows/registerdialog.h | 4 ++-- src/gui/windows/serverdialog.cpp | 2 +- src/gui/windows/serverdialog.h | 7 ++++--- src/gui/windows/updaterwindow.cpp | 2 +- src/gui/windows/updaterwindow.h | 4 ++-- src/gui/windows/worldselectdialog.cpp | 2 +- src/gui/windows/worldselectdialog.h | 4 ++-- 24 files changed, 38 insertions(+), 37 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp index e581cc2c9..4595709ca 100644 --- a/src/gui/windows/charcreatedialog.cpp +++ b/src/gui/windows/charcreatedialog.cpp @@ -64,7 +64,7 @@ CharCreateDialog::CharCreateDialog(CharSelectDialog *const parent, // TRANSLATORS: char create dialog name Window(_("New Character"), true, parent, "charcreate.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mCharSelectDialog(parent), mNameField(new TextField(this, "")), // TRANSLATORS: char create dialog label diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 89e3c832a..c0e8e2928 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -28,7 +28,7 @@ #include "gui/windows/charselectdialog.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" class Label; class PlayerBox; @@ -43,7 +43,7 @@ class TextField; */ class CharCreateDialog final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: /** diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp index 37e93938c..f5b522971 100644 --- a/src/gui/windows/charselectdialog.cpp +++ b/src/gui/windows/charselectdialog.cpp @@ -89,7 +89,7 @@ CharSelectDialog::CharSelectDialog(LoginData *const data): data->username.c_str(), data->lastLogin.c_str()), false, nullptr, "char.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mLoginData(data), // TRANSLATORS: char select dialog. button. mSwitchLoginButton(new Button(this, _("Switch Login"), "switch", this)), diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 66b2f933e..9f0e4d126 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -30,7 +30,7 @@ #include "net/charserverhandler.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" class Button; class CharacterDisplay; @@ -46,7 +46,7 @@ class TextDialog; */ class CharSelectDialog final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: friend class CharDeleteConfirm; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 12ef73516..e62f797e3 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -203,7 +203,7 @@ ChatWindow::ChatWindow(): // TRANSLATORS: chat window name Window(_("Chat"), false, nullptr, "chat.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mItemLinkHandler(new ItemLinkHandler), mChatTabs(new TabbedArea(this)), mChatInput(new ChatInput(this)), diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index 6e4415728..cb7671058 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -30,7 +30,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" #include #include @@ -84,7 +84,7 @@ struct CHATLOG final */ class ChatWindow final : public Window, public ActionListener, - public gcn::KeyListener, + public KeyListener, public DepricatedListener, public ConfigListener { diff --git a/src/gui/windows/editserverdialog.cpp b/src/gui/windows/editserverdialog.cpp index 0b065bb0c..ee375a86e 100644 --- a/src/gui/windows/editserverdialog.cpp +++ b/src/gui/windows/editserverdialog.cpp @@ -64,7 +64,7 @@ EditServerDialog::EditServerDialog(ServerDialog *const parent, // TRANSLATORS: edit server dialog name Window(_("Edit Server"), true, parent), ActionListener(), - gcn::KeyListener(), + KeyListener(), mServerAddressField(new TextField(this, std::string())), mPortField(new TextField(this, std::string())), mNameField(new TextField(this, std::string())), diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h index 5ef780ef0..bf36c216f 100644 --- a/src/gui/windows/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h @@ -32,7 +32,7 @@ class ServerDialog; #include "net/serverinfo.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" #include "gui/base/listmodel.hpp" @@ -77,7 +77,7 @@ class TypeListModel : public gcn::ListModel */ class EditServerDialog final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: EditServerDialog(ServerDialog *const parent, ServerInfo server, diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 25f1a0110..9e2c1a6ff 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -102,7 +102,7 @@ InventoryWindow::WindowList InventoryWindow::invInstances; InventoryWindow::InventoryWindow(Inventory *const inventory): Window("Inventory", false, nullptr, "inventory.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), gcn::SelectionListener(), InventoryListener(), mInventory(inventory), diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 0ff314fb8..066d0d6d5 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -30,7 +30,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" #include "gui/base/selectionlistener.hpp" class Button; @@ -52,7 +52,7 @@ class TextPopup; */ class InventoryWindow final : public Window, public ActionListener, - public gcn::KeyListener, + public KeyListener, public gcn::SelectionListener, public InventoryListener, public DepricatedListener diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp index d35854375..4dd220093 100644 --- a/src/gui/windows/itemamountwindow.cpp +++ b/src/gui/windows/itemamountwindow.cpp @@ -139,7 +139,7 @@ ItemAmountWindow::ItemAmountWindow(const Usage usage, Window *const parent, Item *const item, const int maxRange) : Window("", false, parent, "amount.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mItemAmountTextField(new IntTextField(this, 1)), mItemPriceTextField(nullptr), mGPLabel(nullptr), diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index 760555c6c..ac2eae8e1 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -25,8 +25,8 @@ #include "gui/widgets/window.h" -#include "gui/base/keylistener.hpp" #include "listeners/actionlistener.h" +#include "listeners/keylistener.h" class DropDown; class Icon; @@ -44,7 +44,7 @@ class Slider; */ class ItemAmountWindow final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: enum Usage diff --git a/src/gui/windows/logindialog.cpp b/src/gui/windows/logindialog.cpp index cc8d02471..609b58b57 100644 --- a/src/gui/windows/logindialog.cpp +++ b/src/gui/windows/logindialog.cpp @@ -144,7 +144,7 @@ LoginDialog::LoginDialog(LoginData *const data, std::string serverName, // TRANSLATORS: login dialog name Window(_("Login"), false, nullptr, "login.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mLoginData(data), mUserField(new TextField(this, mLoginData->username)), mPassField(new PasswordField(this, mLoginData->password)), diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index 77fb75dd5..70b16f537 100644 --- a/src/gui/windows/logindialog.h +++ b/src/gui/windows/logindialog.h @@ -26,7 +26,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" #include @@ -46,7 +46,7 @@ class UpdateTypeModel; */ class LoginDialog final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: /** diff --git a/src/gui/windows/quitdialog.cpp b/src/gui/windows/quitdialog.cpp index 375ab415e..99890472b 100644 --- a/src/gui/windows/quitdialog.cpp +++ b/src/gui/windows/quitdialog.cpp @@ -50,7 +50,7 @@ QuitDialog::QuitDialog(QuitDialog **const pointerToMe): // TRANSLATORS: quit dialog name Window(_("Quit"), true, nullptr, "quit.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mOptions(), // TRANSLATORS: quit dialog button mLogoutQuit(new RadioButton(this, _("Quit"), "quitdialog")), diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index d99ab72d8..0b81992f1 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -26,7 +26,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" #include @@ -40,7 +40,7 @@ class RadioButton; */ class QuitDialog final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: /** diff --git a/src/gui/windows/registerdialog.cpp b/src/gui/windows/registerdialog.cpp index 66a5ad187..fd5ab8f5a 100644 --- a/src/gui/windows/registerdialog.cpp +++ b/src/gui/windows/registerdialog.cpp @@ -64,7 +64,7 @@ RegisterDialog::RegisterDialog(LoginData *const data) : // TRANSLATORS: register dialog name Window(_("Register"), false, nullptr, "register.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mLoginData(data), mUserField(new TextField(this, mLoginData->username)), mPasswordField(new PasswordField(this, mLoginData->password)), diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index fea74e776..93908c27c 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -26,7 +26,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" class Button; class LoginData; @@ -59,7 +59,7 @@ class WrongDataNoticeListener final : public ActionListener */ class RegisterDialog final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: /** diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index 1a02f95c6..a307b043e 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -245,7 +245,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo, // TRANSLATORS: servers dialog name Window(_("Choose Your Server"), false, nullptr, "server.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), gcn::SelectionListener(), mMutex(), mDescription(new Label(this, std::string())), diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index 3ea3b23a4..afcdf1643 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -32,10 +32,11 @@ #include "utils/mutex.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" -#include "gui/base/listmodel.hpp" +#include "listeners/keylistener.h" #include "gui/base/selectionlistener.hpp" +#include "gui/base/listmodel.hpp" + #include #include @@ -92,7 +93,7 @@ class ServersListModel final : public gcn::ListModel */ class ServerDialog final : public Window, public ActionListener, - public gcn::KeyListener, + public KeyListener, public gcn::SelectionListener { public: diff --git a/src/gui/windows/updaterwindow.cpp b/src/gui/windows/updaterwindow.cpp index 2e3294508..b5339a202 100644 --- a/src/gui/windows/updaterwindow.cpp +++ b/src/gui/windows/updaterwindow.cpp @@ -157,7 +157,7 @@ UpdaterWindow::UpdaterWindow(const std::string &restrict updateHost, // TRANSLATORS: updater window name Window(_("Updating..."), false, nullptr, "update.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mDownloadStatus(UPDATE_NEWS), mUpdateHost(updateHost), mUpdatesDir(updatesDir), diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index affb7edda..d20f2aadc 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -31,7 +31,7 @@ #include "utils/mutex.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" #include #include @@ -71,7 +71,7 @@ struct UpdateFile final class UpdaterWindow final : public Window, public ActionListener, public LinkHandler, - public gcn::KeyListener + public KeyListener { public: /** diff --git a/src/gui/windows/worldselectdialog.cpp b/src/gui/windows/worldselectdialog.cpp index 7372345ef..48be8df8a 100644 --- a/src/gui/windows/worldselectdialog.cpp +++ b/src/gui/windows/worldselectdialog.cpp @@ -83,7 +83,7 @@ WorldSelectDialog::WorldSelectDialog(Worlds worlds): // TRANSLATORS: world select dialog name Window(_("Select World"), false, nullptr, "world.xml"), ActionListener(), - gcn::KeyListener(), + KeyListener(), mWorldListModel(new WorldListModel(worlds)), mWorldList(new ListBox(this, mWorldListModel, "")), // TRANSLATORS: world dialog button diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index 9fe42cf13..5542d2360 100644 --- a/src/gui/windows/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h @@ -28,7 +28,7 @@ #include "net/worldinfo.h" #include "listeners/actionlistener.h" -#include "gui/base/keylistener.hpp" +#include "listeners/keylistener.h" class Button; class ListBox; @@ -41,7 +41,7 @@ class WorldListModel; */ class WorldSelectDialog final : public Window, public ActionListener, - public gcn::KeyListener + public KeyListener { public: /** -- cgit v1.2.3-60-g2f50