5 files changed, 15 insertions, 15 deletions
diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index b1a988a8e..c14f5dafb 100644
--- a/src/gui/widgets/tabs/chat/chattab.h
+++ b/src/gui/widgets/tabs/chat/chattab.h
@@ -138,7 +138,7 @@ class ChatTab notfinal : public Tab
         /**
          * Returns type of the being.
          */
-        ChatTabTypeT getType() const A_WARN_UNUSED
+        ChatTabTypeT getType() const noexcept2 A_WARN_UNUSED
         { return mType; }
 
         void saveToLogFile(const std::string &msg) const;
@@ -151,22 +151,22 @@ class ChatTab notfinal : public Tab
 
         void loadFromLogFile(const std::string &name);
 
-        bool getAllowHighlight() const A_WARN_UNUSED
+        bool getAllowHighlight() const noexcept2 A_WARN_UNUSED
         { return mAllowHightlight; }
 
-        void setAllowHighlight(const bool n)
+        void setAllowHighlight(const bool n) noexcept2
         { mAllowHightlight = n; }
 
-        bool getRemoveNames() const A_WARN_UNUSED
+        bool getRemoveNames() const noexcept2 A_WARN_UNUSED
         { return mRemoveNames; }
 
-        void setRemoveNames(const bool n)
+        void setRemoveNames(const bool n) noexcept2
         { mRemoveNames = n; }
 
-        bool getNoAway() const A_WARN_UNUSED
+        bool getNoAway() const noexcept2 A_WARN_UNUSED
         { return mNoAway; }
 
-        void setNoAway(const bool n)
+        void setNoAway(const bool n) noexcept2
         { mNoAway = n; }
 
         void addNewRow(std::string &line);
diff --git a/src/gui/widgets/tabs/chat/whispertab.h b/src/gui/widgets/tabs/chat/whispertab.h
index f298bf164..58fc1515d 100644
--- a/src/gui/widgets/tabs/chat/whispertab.h
+++ b/src/gui/widgets/tabs/chat/whispertab.h
@@ -33,7 +33,7 @@ class WhisperTab final : public ChatTab
     public:
         A_DELETE_COPY(WhisperTab)
 
-        const std::string &getNick() const A_WARN_UNUSED
+        const std::string &getNick() const noexcept2 A_WARN_UNUSED
         { return mNick; }
 
         bool handleCommand(const std::string &restrict type,
diff --git a/src/gui/widgets/tabs/setuptab.h b/src/gui/widgets/tabs/setuptab.h
index 9eadd6537..6d23bfe62 100644
--- a/src/gui/widgets/tabs/setuptab.h
+++ b/src/gui/widgets/tabs/setuptab.h
@@ -40,7 +40,7 @@ class SetupTab notfinal : public Container,
     public:
         A_DELETE_COPY(SetupTab)
 
-        const std::string &getName() const A_WARN_UNUSED
+        const std::string &getName() const noexcept2 A_WARN_UNUSED
         { return mName; }
 
         /**
@@ -64,7 +64,7 @@ class SetupTab notfinal : public Container,
          * Sets the name displayed on the tab. Should be set in the
          * constructor of a subclass.
          */
-        void setName(const std::string &name)
+        void setName(const std::string &name) noexcept2
         { mName = name; }
 
     private:
diff --git a/src/gui/widgets/tabs/setuptabscroll.h b/src/gui/widgets/tabs/setuptabscroll.h
index 30e771c05..9ac14b072 100644
--- a/src/gui/widgets/tabs/setuptabscroll.h
+++ b/src/gui/widgets/tabs/setuptabscroll.h
@@ -42,7 +42,7 @@ class SetupTabScroll notfinal : public SetupTab
 
         void addControl(SetupItem *const widget, const std::string &event);
 
-        VertContainer *getContainer() const A_WARN_UNUSED
+        VertContainer *getContainer() const noexcept2 A_WARN_UNUSED
         { return mContainer; }
 
         void apply() override;
@@ -56,7 +56,7 @@ class SetupTabScroll notfinal : public SetupTab
         void action(const ActionEvent &event A_UNUSED) override final
         { }
 
-        int getPreferredFirstItemSize() const A_WARN_UNUSED
+        int getPreferredFirstItemSize() const noexcept2 A_WARN_UNUSED
         { return mPreferredFirstItemSize; }
 
         void widgetResized(const Event &event) override final;
@@ -65,7 +65,7 @@ class SetupTabScroll notfinal : public SetupTab
 
         void clear() override final;
 
-        const std::set<SetupItem*> &getAllItems() const
+        const std::set<SetupItem*> &getAllItems() const noexcept2
         { return mAllItems; }
 
     protected:
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index 042d0e0a8..a64f6e39a 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -174,7 +174,7 @@ class Tab notfinal : public BasicContainer,
         void setFlash(const int flash)
         { mFlash = flash; mRedraw = true; }
 
-        int getFlash() const A_WARN_UNUSED
+        int getFlash() const noexcept2 A_WARN_UNUSED
         { return mFlash; }
 
         void widgetResized(const Event &event) override final;
@@ -183,7 +183,7 @@ class Tab notfinal : public BasicContainer,
 
         void setLabelFont(Font *const font);
 
-        Label *getLabel() const A_WARN_UNUSED
+        Label *getLabel() const noexcept2 A_WARN_UNUSED
         { return mLabel; }
 
         void adjustSize();