diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-08-20 16:13:21 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-08-20 16:13:45 +0300 |
commit | 32b055d5738256c4a3e653a3e7b41d86739a3b74 (patch) | |
tree | 954b6bae7bc0a19cbfd2ffd103dd0265769baf80 /src/gui | |
parent | 6073c6da086f3d1eec0fed731dc3fa5d8808fa0d (diff) | |
download | plus-32b055d5738256c4a3e653a3e7b41d86739a3b74.tar.gz plus-32b055d5738256c4a3e653a3e7b41d86739a3b74.tar.bz2 plus-32b055d5738256c4a3e653a3e7b41d86739a3b74.tar.xz plus-32b055d5738256c4a3e653a3e7b41d86739a3b74.zip |
Add missing checks or attributes to popups.
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/popups/beingpopup.h | 16 | ||||
-rw-r--r-- | src/gui/popups/itempopup.h | 12 | ||||
-rw-r--r-- | src/gui/popups/skillpopup.h | 6 | ||||
-rw-r--r-- | src/gui/popups/speechbubble.h | 4 | ||||
-rw-r--r-- | src/gui/popups/spellpopup.h | 5 | ||||
-rw-r--r-- | src/gui/popups/statuspopup.h | 2 |
6 files changed, 22 insertions, 23 deletions
diff --git a/src/gui/popups/beingpopup.h b/src/gui/popups/beingpopup.h index eba961063..c6f2a4a40 100644 --- a/src/gui/popups/beingpopup.h +++ b/src/gui/popups/beingpopup.h @@ -57,14 +57,14 @@ class BeingPopup final : public Popup #endif private: - Label *mBeingName; - Label *mBeingParty; - Label *mBeingGuild; - Label *mBeingRank; - Label *mBeingComment; - Label *mBeingBuyBoard; - Label *mBeingSellBoard; - Label *mBeingRoom; + Label *mBeingName A_NONNULLPOINTER; + Label *mBeingParty A_NONNULLPOINTER; + Label *mBeingGuild A_NONNULLPOINTER; + Label *mBeingRank A_NONNULLPOINTER; + Label *mBeingComment A_NONNULLPOINTER; + Label *mBeingBuyBoard A_NONNULLPOINTER; + Label *mBeingSellBoard A_NONNULLPOINTER; + Label *mBeingRoom A_NONNULLPOINTER; }; extern BeingPopup *beingPopup; diff --git a/src/gui/popups/itempopup.h b/src/gui/popups/itempopup.h index a66262473..fb2a935ca 100644 --- a/src/gui/popups/itempopup.h +++ b/src/gui/popups/itempopup.h @@ -75,13 +75,13 @@ class ItemPopup final : public Popup private: std::string getCardsString(const int *const cards); - Label *mItemName; - TextBox *mItemDesc; - TextBox *mItemEffect; - TextBox *mItemWeight; - TextBox *mItemCards; + Label *mItemName A_NONNULLPOINTER; + TextBox *mItemDesc A_NONNULLPOINTER; + TextBox *mItemEffect A_NONNULLPOINTER; + TextBox *mItemWeight A_NONNULLPOINTER; + TextBox *mItemCards A_NONNULLPOINTER; ItemType::Type mItemType; - Icon *mIcon; + Icon *mIcon A_NONNULLPOINTER; std::string mLastName; int mLastId; ItemColor mLastColor; diff --git a/src/gui/popups/skillpopup.h b/src/gui/popups/skillpopup.h index f0eb3e51f..25d4058f7 100644 --- a/src/gui/popups/skillpopup.h +++ b/src/gui/popups/skillpopup.h @@ -59,9 +59,9 @@ class SkillPopup final : public Popup void mouseMoved(MouseEvent &event) override final; private: - Label *mSkillName; - TextBox *mSkillDesc; - TextBox *mSkillEffect; + Label *mSkillName A_NONNULLPOINTER; + TextBox *mSkillDesc A_NONNULLPOINTER; + TextBox *mSkillEffect A_NONNULLPOINTER; unsigned int mLastId; }; diff --git a/src/gui/popups/speechbubble.h b/src/gui/popups/speechbubble.h index b44bb1d13..9c86b1698 100644 --- a/src/gui/popups/speechbubble.h +++ b/src/gui/popups/speechbubble.h @@ -60,8 +60,8 @@ class SpeechBubble final : public Popup private: std::string mText; int mSpacing; - Label *mCaption; - BrowserBox *mSpeechBox; + Label *mCaption A_NONNULLPOINTER; + BrowserBox *mSpeechBox A_NONNULLPOINTER; }; #endif // GUI_POPUPS_SPEECHBUBBLE_H diff --git a/src/gui/popups/spellpopup.h b/src/gui/popups/spellpopup.h index ed500631c..454787e6d 100644 --- a/src/gui/popups/spellpopup.h +++ b/src/gui/popups/spellpopup.h @@ -62,9 +62,8 @@ class SpellPopup final : public Popup void mouseMoved(MouseEvent &event) override final; private: - Label *mItemName; - - Label *mItemComment; + Label *mItemName A_NONNULLPOINTER; + Label *mItemComment A_NONNULLPOINTER; }; extern SpellPopup *spellPopup; diff --git a/src/gui/popups/statuspopup.h b/src/gui/popups/statuspopup.h index ed39c3ab6..4e7e0728d 100644 --- a/src/gui/popups/statuspopup.h +++ b/src/gui/popups/statuspopup.h @@ -66,7 +66,7 @@ class StatusPopup final : public Popup const std::string &text, const InputActionT key) const; - Label *mLabels[STATUSPOPUP_NUM_LABELS]; + Label *mLabels[STATUSPOPUP_NUM_LABELS] A_NONNULLPOINTER; }; #endif // GUI_POPUPS_STATUSPOPUP_H |