Add some missing checks to gui found by paranucker.

7 files changed, 86 insertions, 87 deletions

diff --git a/src/gui/widgets/tabs/chat/chattab.h b/src/gui/widgets/tabs/chat/chattab.h
index 56d51b097..a03b51a86 100644
--- a/src/gui/widgets/tabs/chat/chattab.h
+++ b/src/gui/widgets/tabs/chat/chattab.h
@@ -201,7 +201,7 @@ class ChatTab notfinal : public Tab
 
         void addRow(std::string &line);
 
-        BrowserBox *mTextOutput;
+        BrowserBox *mTextOutput A_NONNULLPOINTER;
         ScrollArea *mScrollArea;
         std::string mChannelName;
         std::string mLogName;
diff --git a/src/gui/widgets/tabs/debugwindowtabs.h b/src/gui/widgets/tabs/debugwindowtabs.h
index da464dfaa..05eea784b 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.h
+++ b/src/gui/widgets/tabs/debugwindowtabs.h
@@ -59,23 +59,23 @@ class MapDebugTab final : public DebugTab
         void logic() override final;
 
     private:
-        Label *mMusicFileLabel;
-        Label *mMapLabel;
-        Label *mMinimapLabel;
-        Label *mTileMouseLabel;
-        Label *mParticleCountLabel;
-        Label *mMapActorCountLabel;
-        Label *mXYLabel;
-        Label *mTexturesLabel;
+        Label *mMusicFileLabel A_NONNULLPOINTER;
+        Label *mMapLabel A_NONNULLPOINTER;
+        Label *mMinimapLabel A_NONNULLPOINTER;
+        Label *mTileMouseLabel A_NONNULLPOINTER;
+        Label *mParticleCountLabel A_NONNULLPOINTER;
+        Label *mMapActorCountLabel A_NONNULLPOINTER;
+        Label *mXYLabel A_NONNULLPOINTER;
+        Label *mTexturesLabel A_NONNULLPOINTER;
         int mUpdateTime;
 #ifdef DEBUG_DRAW_CALLS
-        Label *mDrawCallsLabel;
+        Label *mDrawCallsLabel A_NONNULLPOINTER;
 #endif
 #ifdef DEBUG_BIND_TEXTURE
-        Label *mBindsLabel;
+        Label *mBindsLabel A_NONNULLPOINTER;
 #endif
-        Label *mFPSLabel;
-        Label *mLPSLabel;
+        Label *mFPSLabel A_NONNULLPOINTER;
+        Label *mLPSLabel A_NONNULLPOINTER;
         std::string mFPSText;
 };
 
@@ -91,19 +91,19 @@ class TargetDebugTab final : public DebugTab
         void logic() override final;
 
     private:
-        Label *mTargetLabel;
-        Label *mTargetIdLabel;
-        Label *mTargetTypeLabel;
-        Label *mTargetLevelLabel;
-        Label *mTargetRaceLabel;
-        Label *mTargetPartyLabel;
-        Label *mTargetGuildLabel;
-        Label *mAttackDelayLabel;
-        Label *mMinHitLabel;
-        Label *mMaxHitLabel;
-        Label *mCriticalHitLabel;
-        Label *mKarmaLabel;
-        Label *mMannerLabel;
+        Label *mTargetLabel A_NONNULLPOINTER;
+        Label *mTargetIdLabel A_NONNULLPOINTER;
+        Label *mTargetTypeLabel A_NONNULLPOINTER;
+        Label *mTargetLevelLabel A_NONNULLPOINTER;
+        Label *mTargetRaceLabel A_NONNULLPOINTER;
+        Label *mTargetPartyLabel A_NONNULLPOINTER;
+        Label *mTargetGuildLabel A_NONNULLPOINTER;
+        Label *mAttackDelayLabel A_NONNULLPOINTER;
+        Label *mMinHitLabel A_NONNULLPOINTER;
+        Label *mMaxHitLabel A_NONNULLPOINTER;
+        Label *mCriticalHitLabel A_NONNULLPOINTER;
+        Label *mKarmaLabel A_NONNULLPOINTER;
+        Label *mMannerLabel A_NONNULLPOINTER;
 };
 
 class NetDebugTab final : public DebugTab
@@ -118,9 +118,9 @@ class NetDebugTab final : public DebugTab
         void logic() override final;
 
     private:
-        Label *mPingLabel;
-        Label *mInPackets1Label;
-        Label *mOutPackets1Label;
+        Label *mPingLabel A_NONNULLPOINTER;
+        Label *mInPackets1Label A_NONNULLPOINTER;
+        Label *mOutPackets1Label A_NONNULLPOINTER;
 };
 
 #endif  // GUI_WIDGETS_TABS_DEBUGWINDOWTABS_H
diff --git a/src/gui/widgets/tabs/setup_colors.h b/src/gui/widgets/tabs/setup_colors.h
index e6620eb83..7f75394e8 100644
--- a/src/gui/widgets/tabs/setup_colors.h
+++ b/src/gui/widgets/tabs/setup_colors.h
@@ -55,32 +55,32 @@ class Setup_Colors final : public SetupTab,
     private:
         static const char *const rawmsg;
 
-        ListBox *mColorBox;
-        ScrollArea *mScroll;
-        BrowserBox *mPreview;
-        TextPreview *mTextPreview;
-        ScrollArea *mPreviewBox;
+        ListBox *mColorBox A_NONNULLPOINTER;
+        ScrollArea *mScroll A_NONNULLPOINTER;
+        BrowserBox *mPreview A_NONNULLPOINTER;
+        TextPreview *mTextPreview A_NONNULLPOINTER;
+        ScrollArea *mPreviewBox A_NONNULLPOINTER;
         int mSelected;
 
-        Label *mGradTypeLabel;
-        Slider *mGradTypeSlider;
-        Label *mGradTypeText;
+        Label *mGradTypeLabel A_NONNULLPOINTER;
+        Slider *mGradTypeSlider A_NONNULLPOINTER;
+        Label *mGradTypeText A_NONNULLPOINTER;
 
-        Label *mGradDelayLabel;
-        Slider *mGradDelaySlider;
-        TextField *mGradDelayText;
+        Label *mGradDelayLabel A_NONNULLPOINTER;
+        Slider *mGradDelaySlider A_NONNULLPOINTER;
+        TextField *mGradDelayText A_NONNULLPOINTER;
 
-        Label *mRedLabel;
-        Slider *mRedSlider;
-        TextField *mRedText;
+        Label *mRedLabel A_NONNULLPOINTER;
+        Slider *mRedSlider A_NONNULLPOINTER;
+        TextField *mRedText A_NONNULLPOINTER;
 
-        Label *mGreenLabel;
-        Slider *mGreenSlider;
-        TextField *mGreenText;
+        Label *mGreenLabel A_NONNULLPOINTER;
+        Slider *mGreenSlider A_NONNULLPOINTER;
+        TextField *mGreenText A_NONNULLPOINTER;
 
-        Label *mBlueLabel;
-        Slider *mBlueSlider;
-        TextField *mBlueText;
+        Label *mBlueLabel A_NONNULLPOINTER;
+        Slider *mBlueSlider A_NONNULLPOINTER;
+        TextField *mBlueText A_NONNULLPOINTER;
 
         static void setEntry(Slider *const s, TextField *const t,
                              const int value);
diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp
index cc33a2971..44fcb3fab 100644
--- a/src/gui/widgets/tabs/setup_joystick.cpp
+++ b/src/gui/widgets/tabs/setup_joystick.cpp
@@ -51,14 +51,14 @@ Setup_Joystick::Setup_Joystick(const Widget2 *const widget) :
     mCalibrateButton(new Button(this, _("Calibrate"), "calibrate", this)),
     // TRANSLATORS: joystick settings tab button
     mDetectButton(new Button(this, _("Detect joysticks"), "detect", this)),
-    mOriginalJoystickEnabled(config.getBoolValue("joystickEnabled")),
     // TRANSLATORS: joystick settings tab checkbox
     mJoystickEnabled(new CheckBox(this, _("Enable joystick"))),
     mNamesModel(new NamesModel),
     mNamesDropDown(new DropDown(this, mNamesModel)),
     // TRANSLATORS: joystick settings tab checkbox
     mUseInactiveCheckBox(new CheckBox(this, _("Use joystick if client "
-        "window inactive"), config.getBoolValue("useInactiveJoystick")))
+        "window inactive"), config.getBoolValue("useInactiveJoystick"))),
+    mOriginalJoystickEnabled(config.getBoolValue("joystickEnabled"))
 {
     // TRANSLATORS: joystick settings tab name
     setName(_("Joystick"));
diff --git a/src/gui/widgets/tabs/setup_joystick.h b/src/gui/widgets/tabs/setup_joystick.h
index cef0fc132..bc2aaa2a0 100644
--- a/src/gui/widgets/tabs/setup_joystick.h
+++ b/src/gui/widgets/tabs/setup_joystick.h
@@ -49,14 +49,14 @@ class Setup_Joystick final : public SetupTab
         void setTempEnabled(const bool sel);
 
     private:
-        Label *mCalibrateLabel;
-        Button *mCalibrateButton;
-        Button *mDetectButton;
-        bool mOriginalJoystickEnabled;
-        CheckBox *mJoystickEnabled;
-        NamesModel *mNamesModel;
-        DropDown *mNamesDropDown;
-        CheckBox *mUseInactiveCheckBox;
+        Label *mCalibrateLabel A_NONNULLPOINTER;
+        Button *mCalibrateButton A_NONNULLPOINTER;
+        Button *mDetectButton A_NONNULLPOINTER;
+        CheckBox *mJoystickEnabled A_NONNULLPOINTER;
+        NamesModel *mNamesModel A_NONNULLPOINTER;
+        DropDown *mNamesDropDown A_NONNULLPOINTER;
+        CheckBox *mUseInactiveCheckBox A_NONNULLPOINTER;
+        bool mOriginalJoystickEnabled A_NONNULLPOINTER;
 };
 
 #endif  // GUI_WIDGETS_TABS_SETUP_JOYSTICK_H
diff --git a/src/gui/widgets/tabs/setup_theme.h b/src/gui/widgets/tabs/setup_theme.h
index 45f3bc90d..312e0e82c 100644
--- a/src/gui/widgets/tabs/setup_theme.h
+++ b/src/gui/widgets/tabs/setup_theme.h
@@ -52,61 +52,61 @@ class Setup_Theme final : public SetupTab
 
     private:
         Label *mThemeLabel;
-        ThemesModel *mThemesModel;
+        ThemesModel *mThemesModel A_NONNULLPOINTER;
         DropDown *mThemeDropDown;
         std::string mTheme;
         ThemeInfo *mInfo;
 
-        FontsModel *mFontsModel;
-        Label *mFontLabel;
-        DropDown *mFontDropDown;
+        FontsModel *mFontsModel A_NONNULLPOINTER;
+        Label *mFontLabel A_NONNULLPOINTER;
+        DropDown *mFontDropDown A_NONNULLPOINTER;
         std::string mFont;
 
-        LangListModel *mLangListModel;
+        LangListModel *mLangListModel A_NONNULLPOINTER;
 
-        Label *mLangLabel;
-        DropDown *mLangDropDown;
+        Label *mLangLabel A_NONNULLPOINTER;
+        DropDown *mLangDropDown A_NONNULLPOINTER;
         std::string mLang;
 
-        Label *mBoldFontLabel;
-        DropDown *mBoldFontDropDown;
+        Label *mBoldFontLabel A_NONNULLPOINTER;
+        DropDown *mBoldFontDropDown A_NONNULLPOINTER;
         std::string mBoldFont;
 
-        Label *mParticleFontLabel;
-        DropDown *mParticleFontDropDown;
+        Label *mParticleFontLabel A_NONNULLPOINTER;
+        DropDown *mParticleFontDropDown A_NONNULLPOINTER;
         std::string mParticleFont;
 
-        Label *mHelpFontLabel;
-        DropDown *mHelpFontDropDown;
+        Label *mHelpFontLabel A_NONNULLPOINTER;
+        DropDown *mHelpFontDropDown A_NONNULLPOINTER;
         std::string mHelpFont;
 
-        Label *mSecureFontLabel;
-        DropDown *mSecureFontDropDown;
+        Label *mSecureFontLabel A_NONNULLPOINTER;
+        DropDown *mSecureFontDropDown A_NONNULLPOINTER;
         std::string mSecureFont;
 
-        Label *mNpcFontLabel;
-        DropDown *mNpcFontDropDown;
+        Label *mNpcFontLabel A_NONNULLPOINTER;
+        DropDown *mNpcFontDropDown A_NONNULLPOINTER;
         std::string mNpcFont;
 
-        Label *mJapanFontLabel;
-        DropDown *mJapanFontDropDown;
+        Label *mJapanFontLabel A_NONNULLPOINTER;
+        DropDown *mJapanFontDropDown A_NONNULLPOINTER;
         std::string mJapanFont;
 
-        Label *mChinaFontLabel;
-        DropDown *mChinaFontDropDown;
+        Label *mChinaFontLabel A_NONNULLPOINTER;
+        DropDown *mChinaFontDropDown A_NONNULLPOINTER;
         std::string mChinaFont;
 
-        FontSizeChoiceListModel *mFontSizeListModel;
+        FontSizeChoiceListModel *mFontSizeListModel A_NONNULLPOINTER;
         Label *mFontSizeLabel;
         int mFontSize;
         DropDown *mFontSizeDropDown;
 
-        FontSizeChoiceListModel *mNpcFontSizeListModel;
+        FontSizeChoiceListModel *mNpcFontSizeListModel A_NONNULLPOINTER;
         Label *mNpcFontSizeLabel;
         int mNpcFontSize;
-        DropDown *mNpcFontSizeDropDown;
+        DropDown *mNpcFontSizeDropDown A_NONNULLPOINTER;
 
-        Button *mInfoButton;
+        Button *mInfoButton A_NONNULLPOINTER;
         std::string mThemeInfo;
 };
 
diff --git a/src/gui/widgets/tabs/tab.h b/src/gui/widgets/tabs/tab.h
index ded1e6709..d999c8fe5 100644
--- a/src/gui/widgets/tabs/tab.h
+++ b/src/gui/widgets/tabs/tab.h
@@ -208,8 +208,7 @@ class Tab notfinal : public BasicContainer,
         virtual void setCurrent()
         { }
 
-        Label* mLabel;
-
+        Label* mLabel A_NONNULLPOINTER;
 
         TabbedArea* mTabbedArea;
 
@@ -232,7 +231,7 @@ class Tab notfinal : public BasicContainer,
         const Color *mPlayerFlashColor;
         const Color *mPlayerFlashOutlineColor;
         int mFlash;
-        ImageCollection *mVertexes;
+        ImageCollection *mVertexes A_NONNULLPOINTER;
         Image *mImage;
         int mMode;
         int mLabelMode;