From 9bca06b1c7c121f410766ad99b91075902ce24c7 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 16 Feb 2014 00:36:17 +0300 Subject: move selectionlistener from base into listeners. --- src/gui/windows/buydialog.cpp | 6 +++--- src/gui/windows/buydialog.h | 4 ++-- src/gui/windows/inventorywindow.cpp | 2 +- src/gui/windows/inventorywindow.h | 4 ++-- src/gui/windows/selldialog.cpp | 4 ++-- src/gui/windows/selldialog.h | 4 ++-- src/gui/windows/serverdialog.cpp | 2 +- src/gui/windows/serverdialog.h | 4 ++-- src/gui/windows/shopwindow.cpp | 2 +- src/gui/windows/shopwindow.h | 4 ++-- src/gui/windows/tradewindow.cpp | 2 +- src/gui/windows/tradewindow.h | 4 ++-- 12 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp index 2d6d7d9db..def60b942 100644 --- a/src/gui/windows/buydialog.cpp +++ b/src/gui/windows/buydialog.cpp @@ -194,7 +194,7 @@ BuyDialog::BuyDialog() : // TRANSLATORS: buy dialog name Window(_("Create items"), false, nullptr, "buy.xml"), ActionListener(), - gcn::SelectionListener(), + SelectionListener(), mNpcId(-2), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(), mSortModel(nullptr), mSortDropDown(nullptr) @@ -206,7 +206,7 @@ BuyDialog::BuyDialog(const int npcId) : // TRANSLATORS: buy dialog name Window(_("Buy"), false, nullptr, "buy.xml"), ActionListener(), - gcn::SelectionListener(), + SelectionListener(), mNpcId(npcId), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(), mSortModel(nullptr), mSortDropDown(nullptr) @@ -218,7 +218,7 @@ BuyDialog::BuyDialog(std::string nick) : // TRANSLATORS: buy dialog name Window(_("Buy"), false, nullptr, "buy.xml"), ActionListener(), - gcn::SelectionListener(), + SelectionListener(), mNpcId(-1), mMoney(0), mAmountItems(0), mMaxItems(0), mNick(nick), mSortModel(new SortListModelBuy), mSortDropDown(new DropDown(this, mSortModel, false, false, this, "sort")) diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index ef51c04b2..9e493b91e 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -26,7 +26,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/selectionlistener.hpp" +#include "listeners/selectionlistener.h" class Button; class DropDown; @@ -46,7 +46,7 @@ class Slider; */ class BuyDialog final : public Window, public ActionListener, - public gcn::SelectionListener + public SelectionListener { public: /** diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 9e2c1a6ff..7066a9c8e 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -103,7 +103,7 @@ InventoryWindow::InventoryWindow(Inventory *const inventory): Window("Inventory", false, nullptr, "inventory.xml"), ActionListener(), KeyListener(), - gcn::SelectionListener(), + SelectionListener(), InventoryListener(), mInventory(inventory), mItems(new ItemContainer(this, mInventory)), diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index 066d0d6d5..2d5ec6191 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -31,7 +31,7 @@ #include "listeners/actionlistener.h" #include "listeners/keylistener.h" -#include "gui/base/selectionlistener.hpp" +#include "listeners/selectionlistener.h" class Button; class DropDown; @@ -53,7 +53,7 @@ class TextPopup; class InventoryWindow final : public Window, public ActionListener, public KeyListener, - public gcn::SelectionListener, + public SelectionListener, public InventoryListener, public DepricatedListener { diff --git a/src/gui/windows/selldialog.cpp b/src/gui/windows/selldialog.cpp index 888a2432d..9db7bda27 100644 --- a/src/gui/windows/selldialog.cpp +++ b/src/gui/windows/selldialog.cpp @@ -54,7 +54,7 @@ SellDialog::SellDialog(const int npcId) : // TRANSLATORS: sell dialog name Window(_("Sell"), false, nullptr, "sell.xml"), ActionListener(), - gcn::SelectionListener(), + SelectionListener(), mNpcId(npcId), mMaxItems(0), mAmountItems(0), mNick("") { init(); @@ -64,7 +64,7 @@ SellDialog::SellDialog(const std::string &nick): // TRANSLATORS: sell dialog name Window(_("Sell"), false, nullptr, "sell.xml"), ActionListener(), - gcn::SelectionListener(), + SelectionListener(), mNpcId(-1), mMaxItems(0), mAmountItems(0), mNick(nick) { init(); diff --git a/src/gui/windows/selldialog.h b/src/gui/windows/selldialog.h index c23112f8a..f1747ca7e 100644 --- a/src/gui/windows/selldialog.h +++ b/src/gui/windows/selldialog.h @@ -26,7 +26,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/selectionlistener.hpp" +#include "listeners/selectionlistener.h" class Button; class Item; @@ -43,7 +43,7 @@ class Slider; */ class SellDialog final : public Window, private ActionListener, - private gcn::SelectionListener + private SelectionListener { public: /** diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index a307b043e..32e838ac3 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -246,7 +246,7 @@ ServerDialog::ServerDialog(ServerInfo *const serverInfo, Window(_("Choose Your Server"), false, nullptr, "server.xml"), ActionListener(), KeyListener(), - gcn::SelectionListener(), + SelectionListener(), mMutex(), mDescription(new Label(this, std::string())), // TRANSLATORS: servers dialog button diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index afcdf1643..c01f8dd08 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -33,7 +33,7 @@ #include "listeners/actionlistener.h" #include "listeners/keylistener.h" -#include "gui/base/selectionlistener.hpp" +#include "listeners/selectionlistener.h" #include "gui/base/listmodel.hpp" @@ -94,7 +94,7 @@ class ServersListModel final : public gcn::ListModel class ServerDialog final : public Window, public ActionListener, public KeyListener, - public gcn::SelectionListener + public SelectionListener { public: /** diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 1485f18c9..7e50e4c37 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -72,7 +72,7 @@ ShopWindow::ShopWindow(): // TRANSLATORS: shop window name Window(_("Personal Shop"), false, nullptr, "shop.xml"), ActionListener(), - gcn::SelectionListener(), + SelectionListener(), // TRANSLATORS: shop window button mCloseButton(new Button(this, _("Close"), "close", this)), mBuyShopItems(new ShopItems), diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index 606080986..9149b79cb 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -26,7 +26,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/selectionlistener.hpp" +#include "listeners/selectionlistener.h" class Button; class CheckBox; @@ -44,7 +44,7 @@ class ShopListBox; */ class ShopWindow final : public Window, public ActionListener, - public gcn::SelectionListener + public SelectionListener { public: enum ShopMode diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 6a9f9a8af..a5b7f1a47 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -68,7 +68,7 @@ TradeWindow::TradeWindow(): // TRANSLATORS: trade window caption Window(_("Trade: You"), false, nullptr, "trade.xml"), ActionListener(), - gcn::SelectionListener(), + SelectionListener(), mMyInventory(new Inventory(Inventory::TRADE)), mPartnerInventory(new Inventory(Inventory::TRADE)), mMyItemContainer(new ItemContainer(this, mMyInventory.get())), diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index 69ba64ed7..c5e1d7e8f 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -26,7 +26,7 @@ #include "gui/widgets/window.h" #include "listeners/actionlistener.h" -#include "gui/base/selectionlistener.hpp" +#include "listeners/selectionlistener.h" #include @@ -44,7 +44,7 @@ class TextField; */ class TradeWindow final : public Window, private ActionListener, - private gcn::SelectionListener + private SelectionListener { public: /** -- cgit v1.2.3-60-g2f50