From 5e8e53f6e795a84ab5ca6cfe0d08672878044707 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Mon, 16 Nov 2015 22:17:15 +0300
Subject: Convert InventoryType enum into strong typed.

---
 src/gui/popups/popupmenu.cpp | 18 +++++++++---------
 src/gui/popups/popupmenu.h   |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/gui/popups')

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index e18906052..f55d8cb22 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1625,7 +1625,7 @@ void PopupMenu::handleLink(const std::string &link,
 void PopupMenu::showPopup(Window *const parent,
                           const int x, const int y,
                           Item *const item,
-                          const InventoryType::Type type)
+                          const InventoryTypeT type)
 {
     if (!item)
         return;
@@ -1644,7 +1644,7 @@ void PopupMenu::showPopup(Window *const parent,
 
     switch (type)
     {
-        case InventoryType::INVENTORY:
+        case InventoryType::Inventory:
             if (tradeWindow && tradeWindow->isWindowVisible() && !isProtected)
             {
                 // TRANSLATORS: popup menu item
@@ -1706,7 +1706,7 @@ void PopupMenu::showPopup(Window *const parent,
             addUseDrop(item, isProtected);
             break;
 
-        case InventoryType::STORAGE:
+        case InventoryType::Storage:
             // TRANSLATORS: popup menu item
             // TRANSLATORS: get item from storage
             mBrowserBox->addRow("/storagetoinv 'INVINDEX'", _("Retrieve"));
@@ -1734,14 +1734,14 @@ void PopupMenu::showPopup(Window *const parent,
             }
             break;
 
-        case InventoryType::TRADE:
-        case InventoryType::NPC:
+        case InventoryType::Trade:
+        case InventoryType::Npc:
 #ifdef EATHENA_SUPPORT
-        case InventoryType::CART:
-        case InventoryType::VENDING:
-        case InventoryType::MAIL:
+        case InventoryType::Cart:
+        case InventoryType::Vending:
+        case InventoryType::Mail:
 #endif
-        case InventoryType::TYPE_END:
+        case InventoryType::TypeEnd:
         default:
             break;
     }
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index e8e0ddeb4..d37a29f56 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -96,7 +96,7 @@ class PopupMenu final : public Popup, public LinkHandler
         void showPopup(Window *const parent,
                        const int x, const int y,
                        Item *const item,
-                       const InventoryType::Type type);
+                       const InventoryTypeT type);
 
         void showPopup(const int x, const int y, Button *const button);
 
-- 
cgit v1.2.3-70-g09d2