4 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/shortcut/emoteshortcut.h b/src/gui/shortcut/emoteshortcut.h
index 6951ac9b3..f59ee3e18 100644
--- a/src/gui/shortcut/emoteshortcut.h
+++ b/src/gui/shortcut/emoteshortcut.h
@@ -66,7 +66,7 @@ class EmoteShortcut final
         /**
          * Returns the emote ID that is currently selected.
          */
-        unsigned char getEmoteSelected() const A_WARN_UNUSED
+        unsigned char getEmoteSelected() const noexcept2 A_WARN_UNUSED
         { return mEmoteSelected; }
 
         /**
@@ -97,7 +97,7 @@ class EmoteShortcut final
         /**
          * A flag to check if the Emote is selected.
          */
-        bool isEmoteSelected() const A_WARN_UNUSED
+        bool isEmoteSelected() const noexcept2 A_WARN_UNUSED
         { return mEmoteSelected; }
 
         /**
diff --git a/src/gui/shortcut/itemshortcut.h b/src/gui/shortcut/itemshortcut.h
index 4d7933b9f..1dd4640b2 100644
--- a/src/gui/shortcut/itemshortcut.h
+++ b/src/gui/shortcut/itemshortcut.h
@@ -89,7 +89,7 @@ class ItemShortcut final
         /**
          * Returns the item ID that is currently selected.
          */
-        int getItemSelected() const A_WARN_UNUSED
+        int getItemSelected() const noexcept2 A_WARN_UNUSED
         { return mItemSelected; }
 
         /**
@@ -127,13 +127,13 @@ class ItemShortcut final
         /**
          * Returns selected shortcut item ID.
          */
-        int getSelectedItem() const A_WARN_UNUSED
+        int getSelectedItem() const noexcept2 A_WARN_UNUSED
         { return mItemSelected; }
 
         /**
          * A flag to check if the item is selected.
          */
-        bool isItemSelected() const A_WARN_UNUSED
+        bool isItemSelected() const noexcept2 A_WARN_UNUSED
         { return mItemSelected > -1; }
 
         /**
diff --git a/src/gui/shortcut/shortcutbase.h b/src/gui/shortcut/shortcutbase.h
index 8f68d5a69..995c29121 100644
--- a/src/gui/shortcut/shortcutbase.h
+++ b/src/gui/shortcut/shortcutbase.h
@@ -75,13 +75,13 @@ class ShortcutBase notfinal
         /**
          * Returns the amount of shortcut items.
          */
-        int getItemCount() const A_WARN_UNUSED
+        int getItemCount() const noexcept2 A_WARN_UNUSED
         { return mMaxSize; }
 
         /**
          * Returns the item ID that is currently selected.
          */
-        int getItemSelected() const A_WARN_UNUSED
+        int getItemSelected() const noexcept2 A_WARN_UNUSED
         { return mItemSelected; }
 
         /**
@@ -115,7 +115,7 @@ class ShortcutBase notfinal
         /**
          * A flag to check if the item is selected.
          */
-        bool isItemSelected() const A_WARN_UNUSED
+        bool isItemSelected() const noexcept2 A_WARN_UNUSED
         { return mItemSelected > -1; }
 
         /**
diff --git a/src/gui/shortcut/spellshortcut.h b/src/gui/shortcut/spellshortcut.h
index fda7d46f1..fca419c61 100644
--- a/src/gui/shortcut/spellshortcut.h
+++ b/src/gui/shortcut/spellshortcut.h
@@ -55,19 +55,19 @@ class SpellShortcut final
          *
          * @param itemId The ID of the item that is to be assigned.
          */
-        void setItemSelected(const int itemId)
+        void setItemSelected(const int itemId) noexcept2
         { mItemSelected = itemId; }
 
         /**
          * A flag to check if the item is selected.
          */
-        bool isItemSelected() const A_WARN_UNUSED
+        bool isItemSelected() const noexcept2 A_WARN_UNUSED
         { return mItemSelected > -1; }
 
         /**
          * Returns selected shortcut item ID.
          */
-        int getSelectedItem() const A_WARN_UNUSED
+        int getSelectedItem() const noexcept2 A_WARN_UNUSED
         { return mItemSelected; }
 
         /**