From 694e07d193e7c5758a7d672b45668651b034003d Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 31 May 2015 00:19:18 +0300
Subject: Convert InputAction enum into strong typed enum.

---
 src/gui/popups/popupmenu.cpp   | 5 +++--
 src/gui/popups/statuspopup.cpp | 4 ++--
 src/gui/popups/statuspopup.h   | 5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'src/gui/popups')

diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 37c8e0d78..0e0e93e3f 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1526,7 +1526,7 @@ void PopupMenu::handleLink(const std::string &link,
     {
         const int id = atoi(link.substr(12).c_str());
         if (id >= 0)
-            inputManager.executeAction(id);
+            inputManager.executeAction(static_cast<InputActionT>(id));
     }
     else if (!link.compare(0, 6, "mute_+"))
     {
@@ -2179,7 +2179,8 @@ void PopupMenu::showWindowsPopup()
         if (!btn)
             continue;
 
-        mBrowserBox->addRow(strprintf("show window_%d", btn->key),
+        mBrowserBox->addRow(strprintf("show window_%d",
+            static_cast<int>(btn->key)),
             btn->text.c_str());
     }
     mBrowserBox->addRow("##3---");
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 2bc4a9170..c54a57874 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -124,11 +124,11 @@ void StatusPopup::view(const int x, const int y)
 
 void StatusPopup::setLabelText(const int num,
                                const std::string &text,
-                               const InputAction::Type key) const
+                               const InputActionT key) const
 {
     Label *const label = mLabels[num];
     label->setCaption(strprintf("%s  %s", text.c_str(),
-        inputManager.getKeyValueString(static_cast<int>(key)).c_str()));
+        inputManager.getKeyValueString(key).c_str()));
     label->adjustSize();
 }
 
diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h
index cdfbde656..43b793821 100644
--- a/src/gui/popups/statuspopup.h
+++ b/src/gui/popups/statuspopup.h
@@ -62,8 +62,9 @@ class StatusPopup final : public Popup
     private:
         void updateLabels() const;
 
-        void setLabelText(const int num, const std::string &text,
-                          const InputAction::Type key) const;
+        void setLabelText(const int num,
+                          const std::string &text,
+                          const InputActionT key) const;
 
         Label *mLabels[STATUSPOPUP_NUM_LABELS];
 };
-- 
cgit v1.2.3-60-g2f50