Fix code style.

6 files changed, 29 insertions, 20 deletions

diff --git a/src/gui/dialogsmanager.cpp b/src/gui/dialogsmanager.cpp
index 83fc286ca..dd5cfee6e 100644
--- a/src/gui/dialogsmanager.cpp
+++ b/src/gui/dialogsmanager.cpp
@@ -42,6 +42,10 @@
 
 #include "debug.h"
 
+#ifdef WIN32
+#undef ERROR
+#endif
+
 extern OkDialog *deathNotice;
 
 void DialogsManager::closeDialogs()
diff --git a/src/gui/models/keylistmodel.h b/src/gui/models/keylistmodel.h
index 007722087..399dd7482 100644
--- a/src/gui/models/keylistmodel.h
+++ b/src/gui/models/keylistmodel.h
@@ -30,6 +30,8 @@
 
 #include "localconsts.h"
 
+extern SetupActionData *const setupActionData[];
+
 /**
  * The list model for key function list.
  *
diff --git a/src/gui/popupmanager.cpp b/src/gui/popupmanager.cpp
index 9b254746e..f27b94c86 100644
--- a/src/gui/popupmanager.cpp
+++ b/src/gui/popupmanager.cpp
@@ -64,7 +64,7 @@ void PopupManager::hidePopupMenu()
         popupMenu->setVisible(false);
 }
 
-bool PopupManager::isPopupMenuVisible() const
+bool PopupManager::isPopupMenuVisible()
 {
     return popupMenu ? popupMenu->isPopupVisible() : false;
 }
@@ -75,12 +75,12 @@ void PopupManager::clearPopup()
         popupMenu->clear();
 }
 
-bool PopupManager::isTextPopupVisible() const
+bool PopupManager::isTextPopupVisible()
 {
     return textPopup ? textPopup->isPopupVisible() : false;
 }
 
-bool PopupManager::isBeingPopupVisible() const
+bool PopupManager::isBeingPopupVisible()
 {
     return beingPopup ? beingPopup->isPopupVisible() : false;
 }
diff --git a/src/gui/popupmanager.h b/src/gui/popupmanager.h
index c34934798..49b0c7fd6 100644
--- a/src/gui/popupmanager.h
+++ b/src/gui/popupmanager.h
@@ -40,28 +40,28 @@ class PopupManager final
          */
         ~PopupManager();
 
-        bool isBeingPopupVisible() const;
+        static bool isBeingPopupVisible() A_WARN_UNUSED;
 
-        bool isTextPopupVisible() const;
+        static bool isTextPopupVisible() A_WARN_UNUSED;
 
         /**
          * Closes the popup menu. Needed for when the player dies or switching
          * maps.
          */
-        void closePopupMenu();
+        static void closePopupMenu();
 
         /**
          * Hides the BeingPopup.
          */
-        void hideBeingPopup();
+        static void hideBeingPopup();
 
-        void hideTextPopup();
+        static void hideTextPopup();
 
-        bool isPopupMenuVisible() const A_WARN_UNUSED;
+        static bool isPopupMenuVisible() A_WARN_UNUSED;
 
-        void clearPopup();
+        static void clearPopup();
 
-        void hidePopupMenu();
+        static void hidePopupMenu();
 };
 
 extern PopupManager *popupManager;
diff --git a/src/gui/widgets/tabs/setup_input.cpp b/src/gui/widgets/tabs/setup_input.cpp
index 3c467f046..b9d9949d5 100644
--- a/src/gui/widgets/tabs/setup_input.cpp
+++ b/src/gui/widgets/tabs/setup_input.cpp
@@ -370,16 +370,21 @@ void Setup_Input::fixTranslations()
 {
     fixTranslation(setupActionDataShortcuts,
         static_cast<int>(InputAction::SHORTCUT_1),
-        static_cast<int>(InputAction::SHORTCUT_20), "Item Shortcut %d");
+        static_cast<int>(InputAction::SHORTCUT_20),
+        "Item Shortcut %d");
 
-    fixTranslation(setupActionDataEmotes, static_cast<int>(InputAction::EMOTE_1),
-        static_cast<int>(InputAction::EMOTE_48), "Emote Shortcut %d");
+    fixTranslation(setupActionDataEmotes,
+        static_cast<int>(InputAction::EMOTE_1),
+        static_cast<int>(InputAction::EMOTE_48),
+        "Emote Shortcut %d");
 
-    fixTranslation(setupActionDataOutfits, static_cast<int>(InputAction::OUTFIT_1),
-        static_cast<int>(InputAction::OUTFIT_48), "Outfit Shortcut %d");
+    fixTranslation(setupActionDataOutfits,
+        static_cast<int>(InputAction::OUTFIT_1),
+        static_cast<int>(InputAction::OUTFIT_48),
+        "Outfit Shortcut %d");
 
-    fixTranslation(setupActionDataMove, static_cast<int>(
-        InputAction::MOVE_TO_POINT_1),
+    fixTranslation(setupActionDataMove,
+        static_cast<int>(InputAction::MOVE_TO_POINT_1),
         static_cast<int>(InputAction::MOVE_TO_POINT_48),
         "Move to point Shortcut %d");
 }
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index e5be2fc65..0efa9c08d 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -35,8 +35,6 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
-#include "events/keyevent.h"
-
 #include "input/inputmanager.h"
 
 #include "gui/chatconsts.h"