8 files changed, 14 insertions, 14 deletions
diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h
index 26ef6d0bb..b44c5aae9 100644
--- a/src/gui/windows/chatwindow.h
+++ b/src/gui/windows/chatwindow.h
@@ -181,7 +181,7 @@ class ChatWindow final : public Window,
          */
         void setRecordingFile(const std::string &msg);
 
-        bool getReturnTogglesChat() const A_WARN_UNUSED
+        bool getReturnTogglesChat() const noexcept2 A_WARN_UNUSED
         { return mReturnToggles; }
 
         void setReturnTogglesChat(const bool toggles)
diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h
index 502e5c526..0a98da353 100644
--- a/src/gui/windows/shopwindow.h
+++ b/src/gui/windows/shopwindow.h
@@ -120,7 +120,7 @@ class ShopWindow final : public Window,
         void setAcceptPlayer(const std::string &name)
         { mAcceptPlayer = name; }
 
-        const std::string &getAcceptPlayer() const A_WARN_UNUSED
+        const std::string &getAcceptPlayer() const noexcept2 A_WARN_UNUSED
         { return mAcceptPlayer; }
 
         void announce(ShopItems *const list, const int mode);
diff --git a/src/gui/windows/skilldialog.h b/src/gui/windows/skilldialog.h
index 5a4a89afe..cf0bf2f62 100644
--- a/src/gui/windows/skilldialog.h
+++ b/src/gui/windows/skilldialog.h
@@ -112,7 +112,7 @@ class SkillDialog final : public Window,
                               const int id,
                               const int duration);
 
-        bool hasSkills() const A_WARN_UNUSED
+        bool hasSkills() const noexcept2 A_WARN_UNUSED
         { return !mSkills.empty(); }
 
         void widgetResized(const Event &event) override final;
diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h
index 6c23fd292..24cc32c5d 100644
--- a/src/gui/windows/socialwindow.h
+++ b/src/gui/windows/socialwindow.h
@@ -97,16 +97,16 @@ class SocialWindow final : public Window,
 
         void prevTab();
 
-        const Map* getMap() const A_WARN_UNUSED
+        const Map* getMap() const noexcept2 A_WARN_UNUSED
         { return mMap; }
 
         void setMap(Map *const map)
         { mMap = map; mProcessedPortals = false; }
 
-        bool getProcessedPortals() const A_WARN_UNUSED
+        bool getProcessedPortals() const noexcept2 A_WARN_UNUSED
         { return mProcessedPortals; }
 
-        void setProcessedPortals(const bool n)
+        void setProcessedPortals(const bool n) noexcept2
         { mProcessedPortals = n; }
 
         void selectPortal(const unsigned num);
diff --git a/src/gui/windows/textdialog.h b/src/gui/windows/textdialog.h
index edf97c547..fef9e59df 100644
--- a/src/gui/windows/textdialog.h
+++ b/src/gui/windows/textdialog.h
@@ -68,7 +68,7 @@ class TextDialog final : public Window,
 
         void setText(const std::string &text);
 
-        static bool isActive() A_WARN_UNUSED
+        static bool isActive() noexcept2 A_WARN_UNUSED
         { return instances; }
 
         void close() override final;
diff --git a/src/gui/windows/textselectdialog.h b/src/gui/windows/textselectdialog.h
index 70da4ad5e..45d5fcc43 100644
--- a/src/gui/windows/textselectdialog.h
+++ b/src/gui/windows/textselectdialog.h
@@ -75,13 +75,13 @@ class TextSelectDialog notfinal : public Window,
 
         void addText(const std::string &text);
 
-        std::string getText() const A_WARN_UNUSED
+        std::string getText() const noexcept2 A_WARN_UNUSED
         { return mText; }
 
-        void setTag(const int tag)
+        void setTag(const int tag) noexcept2
         { mTag = tag; }
 
-        int getTag() const A_WARN_UNUSED
+        int getTag() const noexcept2 A_WARN_UNUSED
         { return mTag; }
 
     protected:
diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h
index 4920fe90c..be1038d62 100644
--- a/src/gui/windows/tradewindow.h
+++ b/src/gui/windows/tradewindow.h
@@ -160,7 +160,7 @@ class TradeWindow final : public Window,
 
         void initTrade(const std::string &nick);
 
-        std::string getAutoTradeNick() const A_WARN_UNUSED
+        std::string getAutoTradeNick() const noexcept2 A_WARN_UNUSED
         { return mAutoAddToNick; }
 
         bool checkItem(const Item *const item) const A_WARN_UNUSED;
diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h
index b125bc655..b5aee4cf8 100644
--- a/src/gui/windows/whoisonline.h
+++ b/src/gui/windows/whoisonline.h
@@ -78,13 +78,13 @@ class WhoIsOnline final : public Window,
 
         void widgetResized(const Event &event) override final;
 
-        const std::set<OnlinePlayer*> &getOnlinePlayers() const A_WARN_UNUSED
+        const std::set<OnlinePlayer*> &getOnlinePlayers() const noexcept2 A_WARN_UNUSED
         { return mOnlinePlayers; }
 
-        const std::set<std::string> &getOnlineNicks() const A_WARN_UNUSED
+        const std::set<std::string> &getOnlineNicks() const noexcept2 A_WARN_UNUSED
         { return mOnlineNicks; }
 
-        void setAllowUpdate(const bool n)
+        void setAllowUpdate(const bool n) noexcept2
         { mAllowUpdate = n; }
 
         void optionChanged(const std::string &name) override final;