summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-02-16 23:08:07 +0300
committerAndrei Karas <akaras@inbox.ru>2015-02-16 23:08:07 +0300
commit0561612345f979a3c59ed4feeeddf6491974905a (patch)
treecc8697f8628f34671bb388a86fbfb11ae0015151 /src/gui/windows
parentf6b355a4237ddcfa49ab07a1083777a9d171675d (diff)
downloadplus-0561612345f979a3c59ed4feeeddf6491974905a.tar.gz
plus-0561612345f979a3c59ed4feeeddf6491974905a.tar.bz2
plus-0561612345f979a3c59ed4feeeddf6491974905a.tar.xz
plus-0561612345f979a3c59ed4feeeddf6491974905a.zip
Build vendingslotslistener only if eathena support enabled.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/shopwindow.cpp18
-rw-r--r--src/gui/windows/shopwindow.h10
2 files changed, 16 insertions, 12 deletions
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 512cb6d54..e10197537 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -84,9 +84,9 @@ ShopWindow::DialogList ShopWindow::instances;
ShopWindow::ShopWindow() :
// TRANSLATORS: shop window name
Window(_("Personal Shop"), false, nullptr, "shop.xml"),
- VendingSlotsListener(),
#ifdef EATHENA_SUPPORT
VendingModeListener(),
+ VendingSlotsListener(),
BuyingStoreModeListener(),
BuyingStoreSlotsListener(),
#endif
@@ -200,7 +200,9 @@ ShopWindow::ShopWindow() :
center();
loadWindowState();
+#ifdef EATHENA_SUPPORT
updateShopName();
+#endif
instances.push_back(this);
}
@@ -1038,12 +1040,7 @@ void ShopWindow::updateSelection()
updateButtonsAndLabels();
}
-void ShopWindow::vendingSlotsChanged(const int slots)
-{
- mSellShopSize = slots;
- updateButtonsAndLabels();
-}
-
+#ifdef EATHENA_SUPPORT
void ShopWindow::updateShopName()
{
if (mSellShopName.empty())
@@ -1065,7 +1062,12 @@ void ShopWindow::setShopName(const std::string &name)
updateShopName();
}
-#ifdef EATHENA_SUPPORT
+void ShopWindow::vendingSlotsChanged(const int slots)
+{
+ mSellShopSize = slots;
+ updateButtonsAndLabels();
+}
+
void ShopWindow::vendingEnabled(const bool b)
{
mEnableVending = b;
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 3b418a6da..cff596f5c 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -47,9 +47,9 @@ class TabStrip;
* \ingroup Interface
*/
class ShopWindow final : public Window,
- public VendingSlotsListener,
#ifdef EATHENA_SUPPORT
public VendingModeListener,
+ public VendingSlotsListener,
public BuyingStoreModeListener,
public BuyingStoreSlotsListener,
#endif
@@ -147,24 +147,26 @@ class ShopWindow final : public Window,
bool isShopEmpty() const A_WARN_UNUSED;
- void vendingSlotsChanged(const int slots) override final;
-
#ifdef EATHENA_SUPPORT
void vendingEnabled(const bool b) override final;
+ void vendingSlotsChanged(const int slots) override final;
+
void buyingStoreEnabled(const bool b) override final;
void buyingStoreSlotsChanged(const int slots) override final;
-#endif
void setShopName(const std::string &name);
+#endif
private:
void startTrade();
void updateSelection();
+#ifdef EATHENA_SUPPORT
void updateShopName();
+#endif
typedef std::list<ShopWindow*> DialogList;
static DialogList instances;