diff options
Diffstat (limited to 'src')
35 files changed, 269 insertions, 268 deletions
diff --git a/src/gui/windows/buydialog.h b/src/gui/windows/buydialog.h index 104b5c4ee..dbb84b0ef 100644 --- a/src/gui/windows/buydialog.h +++ b/src/gui/windows/buydialog.h @@ -158,22 +158,22 @@ class BuyDialog final : public Window, typedef std::list<BuyDialog*> DialogList; static DialogList instances; - Button *mBuyButton; - Button *mQuitButton; - Button *mAddMaxButton; - Button *mIncreaseButton; - Button *mDecreaseButton; - ShopListBox *mShopItemList; - ScrollArea *mScrollArea; - Label *mMoneyLabel; - Label *mQuantityLabel; - Slider *mSlider; - Label *mAmountLabel; - IntTextField *mAmountField; - ShopItems *mShopItems; + Button *mBuyButton A_NONNULLPOINTER; + Button *mQuitButton A_NONNULLPOINTER; + Button *mAddMaxButton A_NONNULLPOINTER; + Button *mIncreaseButton A_NONNULLPOINTER; + Button *mDecreaseButton A_NONNULLPOINTER; + ShopListBox *mShopItemList A_NONNULLPOINTER; + ScrollArea *mScrollArea A_NONNULLPOINTER; + Label *mMoneyLabel A_NONNULLPOINTER; + Label *mQuantityLabel A_NONNULLPOINTER; + Slider *mSlider A_NONNULLPOINTER; + Label *mAmountLabel A_NONNULLPOINTER; + IntTextField *mAmountField A_NONNULLPOINTER; + ShopItems *mShopItems A_NONNULLPOINTER; SortListModelBuy *mSortModel; DropDown *mSortDropDown; - TextField *mFilterTextField; + TextField *mFilterTextField A_NONNULLPOINTER; Label *mFilterLabel; BeingId mNpcId; diff --git a/src/gui/windows/changeemaildialog.h b/src/gui/windows/changeemaildialog.h index 1ea059972..6f0aef236 100644 --- a/src/gui/windows/changeemaildialog.h +++ b/src/gui/windows/changeemaildialog.h @@ -67,15 +67,15 @@ class ChangeEmailDialog final : public Window, static void setEmail(std::string *email); private: - TextField *mFirstEmailField; - TextField *mSecondEmailField; + TextField *mFirstEmailField A_NONNULLPOINTER; + TextField *mSecondEmailField A_NONNULLPOINTER; - Button *mChangeEmailButton; - Button *mCancelButton; + Button *mChangeEmailButton A_NONNULLPOINTER; + Button *mCancelButton A_NONNULLPOINTER; - WrongDataNoticeListener *mWrongDataNoticeListener; + WrongDataNoticeListener *mWrongDataNoticeListener A_NONNULLPOINTER; - LoginData *mLoginData; + LoginData *mLoginData A_NONNULLPOINTER; }; #endif // GUI_WINDOWS_CHANGEEMAILDIALOG_H diff --git a/src/gui/windows/changepassworddialog.h b/src/gui/windows/changepassworddialog.h index 9acdee5c1..68e84c7b1 100644 --- a/src/gui/windows/changepassworddialog.h +++ b/src/gui/windows/changepassworddialog.h @@ -61,16 +61,16 @@ class ChangePasswordDialog final : public Window, void action(const ActionEvent &event) override final; private: - TextField *mOldPassField; - TextField *mFirstPassField; - TextField *mSecondPassField; + TextField *mOldPassField A_NONNULLPOINTER; + TextField *mFirstPassField A_NONNULLPOINTER; + TextField *mSecondPassField A_NONNULLPOINTER; - Button *mChangePassButton; - Button *mCancelButton; + Button *mChangePassButton A_NONNULLPOINTER; + Button *mCancelButton A_NONNULLPOINTER; - WrongDataNoticeListener *mWrongDataNoticeListener; + WrongDataNoticeListener *mWrongDataNoticeListener A_NONNULLPOINTER; - LoginData *mLoginData; + LoginData *mLoginData A_NONNULLPOINTER; }; #endif // GUI_WINDOWS_CHANGEPASSWORDDIALOG_H diff --git a/src/gui/windows/charcreatedialog.h b/src/gui/windows/charcreatedialog.h index 7ac1980c7..7ecc8a928 100644 --- a/src/gui/windows/charcreatedialog.h +++ b/src/gui/windows/charcreatedialog.h @@ -105,16 +105,16 @@ class CharCreateDialog final : public Window, CharSelectDialog *mCharSelectDialog; - TextField *mNameField; - Label *mNameLabel; - Button *mNextHairColorButton; - Button *mPrevHairColorButton; - Label *mHairColorLabel; - Label *mHairColorNameLabel; - Button *mNextHairStyleButton; - Button *mPrevHairStyleButton; - Label *mHairStyleLabel; - Label *mHairStyleNameLabel; + TextField *mNameField A_NONNULLPOINTER; + Label *mNameLabel A_NONNULLPOINTER; + Button *mNextHairColorButton A_NONNULLPOINTER; + Button *mPrevHairColorButton A_NONNULLPOINTER; + Label *mHairColorLabel A_NONNULLPOINTER; + Label *mHairColorNameLabel A_NONNULLPOINTER; + Button *mNextHairStyleButton A_NONNULLPOINTER; + Button *mPrevHairStyleButton A_NONNULLPOINTER; + Label *mHairStyleLabel A_NONNULLPOINTER; + Label *mHairStyleNameLabel A_NONNULLPOINTER; Button *mNextRaceButton; Button *mPrevRaceButton; Label *mRaceLabel; diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h index 35e02eb35..6827a78ea 100644 --- a/src/gui/windows/charselectdialog.h +++ b/src/gui/windows/charselectdialog.h @@ -107,15 +107,15 @@ class CharSelectDialog final : public Window, void unlock(); void setLocked(const bool locked); - LoginData *mLoginData; + LoginData *mLoginData A_NONNULLPOINTER; - Button *mSwitchLoginButton; - Button *mChangePasswordButton; + Button *mSwitchLoginButton A_NONNULLPOINTER; + Button *mChangePasswordButton A_NONNULLPOINTER; Button *mUnregisterButton; Button *mChangeEmailButton; - Button *mPlayButton; - Button *mInfoButton; - Button *mDeleteButton; + Button *mPlayButton A_NONNULLPOINTER; + Button *mInfoButton A_NONNULLPOINTER; + Button *mDeleteButton A_NONNULLPOINTER; Button *mRenameButton; CharacterViewBase *mCharacterView; diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp index 0ddc6e30f..e5e80e02e 100644 --- a/src/gui/windows/chatwindow.cpp +++ b/src/gui/windows/chatwindow.cpp @@ -1558,7 +1558,7 @@ bool ChatWindow::resortChatLog(std::string line, tmpNick.find(":") != std::string::npos || tmpNick.find("%") != std::string::npos || tmpNick.find("@") != std::string::npos || - tmpNick.size() < 4 || + tmpNick.size() < 5 || tmpNick[0] == '@' || tmpNick[0] == '/' || tmpNick[0] == '!' diff --git a/src/gui/windows/chatwindow.h b/src/gui/windows/chatwindow.h index ea71e4716..57ff1230d 100644 --- a/src/gui/windows/chatwindow.h +++ b/src/gui/windows/chatwindow.h @@ -360,13 +360,13 @@ class ChatWindow final : public Window, std::string partName); /** Used for showing item popup on clicking links **/ - ItemLinkHandler *mItemLinkHandler; + ItemLinkHandler *mItemLinkHandler A_NONNULLPOINTER; /** Tabbed area for holding each channel. */ - TabbedArea *mChatTabs; + TabbedArea *mChatTabs A_NONNULLPOINTER; /** Input box for typing chat messages. */ - ChatInput *mChatInput; + ChatInput *mChatInput A_NONNULLPOINTER; void initTradeFilter(); @@ -401,9 +401,9 @@ class ChatWindow final : public Window, StringVect mTradeFilter; - ColorListModel *mColorListModel; - DropDown *mColorPicker; - Button *mChatButton; + ColorListModel *mColorListModel A_NONNULLPOINTER; + DropDown *mColorPicker A_NONNULLPOINTER; + Button *mChatButton A_NONNULLPOINTER; std::list<std::string> mAwayLog; StringVect mHighlights; StringVect mGlobalsFilter; diff --git a/src/gui/windows/debugwindow.h b/src/gui/windows/debugwindow.h index 0ccbae3a1..9e9df3912 100644 --- a/src/gui/windows/debugwindow.h +++ b/src/gui/windows/debugwindow.h @@ -67,10 +67,10 @@ class DebugWindow final : public Window #endif private: - TabbedArea *mTabs; - MapDebugTab *mMapWidget; - TargetDebugTab *mTargetWidget; - NetDebugTab *mNetWidget; + TabbedArea *mTabs A_NONNULLPOINTER; + MapDebugTab *mMapWidget A_NONNULLPOINTER; + TargetDebugTab *mTargetWidget A_NONNULLPOINTER; + NetDebugTab *mNetWidget A_NONNULLPOINTER; }; extern DebugWindow *debugWindow; diff --git a/src/gui/windows/didyouknowwindow.h b/src/gui/windows/didyouknowwindow.h index d02d627f4..b69ca882e 100644 --- a/src/gui/windows/didyouknowwindow.h +++ b/src/gui/windows/didyouknowwindow.h @@ -68,11 +68,11 @@ class DidYouKnowWindow final : public Window, private: void loadFile(const int num); - BrowserBox *mBrowserBox; - ScrollArea *mScrollArea; - Button *mButtonPrev; - Button *mButtonNext; - CheckBox *mOpenAgainCheckBox; + BrowserBox *mBrowserBox A_NONNULLPOINTER; + ScrollArea *mScrollArea A_NONNULLPOINTER; + Button *mButtonPrev A_NONNULLPOINTER; + Button *mButtonNext A_NONNULLPOINTER; + CheckBox *mOpenAgainCheckBox A_NONNULLPOINTER; }; extern DidYouKnowWindow *didYouKnowWindow; diff --git a/src/gui/windows/editserverdialog.h b/src/gui/windows/editserverdialog.h index ced1242c1..f0cb6167e 100644 --- a/src/gui/windows/editserverdialog.h +++ b/src/gui/windows/editserverdialog.h @@ -63,17 +63,17 @@ class EditServerDialog final : public Window, void keyPressed(KeyEvent &event) override final; private: - TextField *mServerAddressField; - TextField *mPortField; - TextField *mNameField; - TextField *mDescriptionField; - TextField *mOnlineListUrlField; - Button *mConnectButton; - Button *mOkButton; - Button *mCancelButton; - CheckBox *mPersistentIp; - TypeListModel *mTypeListModel; - DropDown *mTypeField; + TextField *mServerAddressField A_NONNULLPOINTER; + TextField *mPortField A_NONNULLPOINTER; + TextField *mNameField A_NONNULLPOINTER; + TextField *mDescriptionField A_NONNULLPOINTER; + TextField *mOnlineListUrlField A_NONNULLPOINTER; + Button *mConnectButton A_NONNULLPOINTER; + Button *mOkButton A_NONNULLPOINTER; + Button *mCancelButton A_NONNULLPOINTER; + CheckBox *mPersistentIp A_NONNULLPOINTER; + TypeListModel *mTypeListModel A_NONNULLPOINTER; + DropDown *mTypeField A_NONNULLPOINTER; ServerDialog *mServerDialog; ServerInfo mServer; diff --git a/src/gui/windows/emotewindow.h b/src/gui/windows/emotewindow.h index f2b771a35..9a326f66b 100644 --- a/src/gui/windows/emotewindow.h +++ b/src/gui/windows/emotewindow.h @@ -66,14 +66,14 @@ class EmoteWindow final : public Window void widgetMoved(const Event &event) override final; private: - TabbedArea *mTabs; - EmotePage *mEmotePage; - ColorModel *mColorModel; - ColorPage *mColorPage; - ScrollArea *mScrollColorPage; - NamesModel *mFontModel; - ListBox *mFontPage; - ScrollArea *mScrollFontPage; + TabbedArea *mTabs A_NONNULLPOINTER; + EmotePage *mEmotePage A_NONNULLPOINTER; + ColorModel *mColorModel A_NONNULLPOINTER; + ColorPage *mColorPage A_NONNULLPOINTER; + ScrollArea *mScrollColorPage A_NONNULLPOINTER; + NamesModel *mFontModel A_NONNULLPOINTER; + ListBox *mFontPage A_NONNULLPOINTER; + ScrollArea *mScrollFontPage A_NONNULLPOINTER; ImageSet *mImageSet; }; diff --git a/src/gui/windows/equipmentwindow.h b/src/gui/windows/equipmentwindow.h index 640aa2564..2e901fd0e 100644 --- a/src/gui/windows/equipmentwindow.h +++ b/src/gui/windows/equipmentwindow.h @@ -130,14 +130,14 @@ class EquipmentWindow final : public Window, Equipment *mEquipment; - PlayerBox *mPlayerBox; - Button *mUnequip; + PlayerBox *mPlayerBox A_NONNULLPOINTER; + Button *mUnequip A_NONNULLPOINTER; ImageSet *mImageSet; Being *mBeing; Image *mSlotBackground; Image *mSlotHighlightedBackground; - ImageCollection *mVertexes; + ImageCollection *mVertexes A_NONNULLPOINTER; std::vector<EquipmentPage*> mPages; TabStrip *mTabs; Color mHighlightColor; diff --git a/src/gui/windows/helpwindow.h b/src/gui/windows/helpwindow.h index b1f09b60f..099ae549b 100644 --- a/src/gui/windows/helpwindow.h +++ b/src/gui/windows/helpwindow.h @@ -79,10 +79,9 @@ class HelpWindow final : public Window, void loadFile(std::string file); - Button *mDYKButton; - - BrowserBox *mBrowserBox; - ScrollArea *mScrollArea; + Button *mDYKButton A_NONNULLPOINTER; + BrowserBox *mBrowserBox A_NONNULLPOINTER; + ScrollArea *mScrollArea A_NONNULLPOINTER; HelpTagsMap mTagFileMap; }; diff --git a/src/gui/windows/inventorywindow.h b/src/gui/windows/inventorywindow.h index eca01ab05..790593b6f 100644 --- a/src/gui/windows/inventorywindow.h +++ b/src/gui/windows/inventorywindow.h @@ -187,11 +187,11 @@ class InventoryWindow final : public Window, Button *mInvCloseButton; ProgressBar *mWeightBar; - ProgressBar *mSlotsBar; + ProgressBar *mSlotsBar A_NONNULLPOINTER; TabStrip *mFilter; - SortListModelInv *mSortModel; - DropDown *mSortDropDown; - TextField *mNameFilter; + SortListModelInv *mSortModel A_NONNULLPOINTER; + DropDown *mSortDropDown A_NONNULLPOINTER; + TextField *mNameFilter A_NONNULLPOINTER; LayoutCell *mSortDropDownCell; LayoutCell *mNameFilterCell; LayoutCell *mFilterCell; diff --git a/src/gui/windows/itemamountwindow.h b/src/gui/windows/itemamountwindow.h index c371ffbaa..04516812e 100644 --- a/src/gui/windows/itemamountwindow.h +++ b/src/gui/windows/itemamountwindow.h @@ -107,16 +107,18 @@ class ItemAmountWindow final : public Window, Item *const item, const int maxRange = 0); - IntTextField *mItemAmountTextField; /**< Item amount caption. */ - IntTextField *mItemPriceTextField; /**< Item price caption. */ + /**< Item amount caption. */ + IntTextField *mItemAmountTextField A_NONNULLPOINTER; + /**< Item price caption. */ + IntTextField *mItemPriceTextField; Label *mGPLabel; Item *mItem; - Icon *mItemIcon; + Icon *mItemIcon A_NONNULLPOINTER; /** * Item Amount buttons. */ - Slider *mItemAmountSlide; + Slider *mItemAmountSlide A_NONNULLPOINTER; Slider *mItemPriceSlide; DropDown *mItemDropDown; ItemsModal *mItemsModal; diff --git a/src/gui/windows/killstats.h b/src/gui/windows/killstats.h index ef784acf5..5b6b9bece 100644 --- a/src/gui/windows/killstats.h +++ b/src/gui/windows/killstats.h @@ -74,24 +74,24 @@ class KillStats final : public Window, private: int mKillTimer; /**< Timer for kill stats. */ - Button *mResetButton; - Button *mTimerButton; + Button *mResetButton A_NONNULLPOINTER; + Button *mTimerButton A_NONNULLPOINTER; Label *mLine1; Label *mLine2; Label *mLine3; - Label *mLine4; - Label *mLine5; - Label *mLine6; - Label *mLine7; - - Label *mExpSpeed1Label; - Label *mExpTime1Label; - Label *mExpSpeed5Label; - Label *mExpTime5Label; - Label *mExpSpeed15Label; - Label *mExpTime15Label; - - Label *mLastKillExpLabel; + Label *mLine4 A_NONNULLPOINTER; + Label *mLine5 A_NONNULLPOINTER; + Label *mLine6 A_NONNULLPOINTER; + Label *mLine7 A_NONNULLPOINTER; + + Label *mExpSpeed1Label A_NONNULLPOINTER; + Label *mExpTime1Label A_NONNULLPOINTER; + Label *mExpSpeed5Label A_NONNULLPOINTER; + Label *mExpTime5Label A_NONNULLPOINTER; + Label *mExpSpeed15Label A_NONNULLPOINTER; + Label *mExpTime15Label A_NONNULLPOINTER; + + Label *mLastKillExpLabel A_NONNULLPOINTER; int mKillCounter; /**< Session Kill counter. */ int mExpCounter; /**< Session Exp counter. */ diff --git a/src/gui/windows/logindialog.h b/src/gui/windows/logindialog.h index 0870ab79e..ed2058285 100644 --- a/src/gui/windows/logindialog.h +++ b/src/gui/windows/logindialog.h @@ -86,20 +86,20 @@ class LoginDialog final : public Window, void prepareUpdate(); - LoginData *mLoginData; + LoginData *mLoginData A_NONNULLPOINTER; - TextField *mUserField; - TextField *mPassField; - CheckBox *mKeepCheck; - Label *mUpdateTypeLabel; + TextField *mUserField A_NONNULLPOINTER; + TextField *mPassField A_NONNULLPOINTER; + CheckBox *mKeepCheck A_NONNULLPOINTER; + Label *mUpdateTypeLabel A_NONNULLPOINTER; Label *mUpdateHostLabel; - UpdateTypeModel *mUpdateTypeModel; - DropDown *mUpdateTypeDropDown; - Button *mServerButton; - Button *mLoginButton; - Button *mRegisterButton; - CheckBox *mCustomUpdateHost; - TextField *mUpdateHostText; + UpdateTypeModel *mUpdateTypeModel A_NONNULLPOINTER; + DropDown *mUpdateTypeDropDown A_NONNULLPOINTER; + Button *mServerButton A_NONNULLPOINTER; + Button *mLoginButton A_NONNULLPOINTER; + Button *mRegisterButton A_NONNULLPOINTER; + CheckBox *mCustomUpdateHost A_NONNULLPOINTER; + TextField *mUpdateHostText A_NONNULLPOINTER; UpdateListModel *mUpdateListModel; DropDown *mUpdateHostDropDown; diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index cdb5bff2a..3bc2aabcb 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -241,36 +241,36 @@ class NpcDialog final : public Window, std::string mDefaultString; // Used for the main input area - BrowserBox *mTextBox; - ScrollArea *mScrollArea; + BrowserBox *mTextBox A_NONNULLPOINTER; + ScrollArea *mScrollArea A_NONNULLPOINTER; std::string mText; std::string mNewText; // Used for choice input - ExtendedListBox *mItemList; - ScrollArea *mListScrollArea; + ExtendedListBox *mItemList A_NONNULLPOINTER; + ScrollArea *mListScrollArea A_NONNULLPOINTER; StringVect mItems; std::vector<Image *> mImages; - ItemLinkHandler *mItemLinkHandler; + ItemLinkHandler *mItemLinkHandler A_NONNULLPOINTER; // Used for string and integer input - TextField *mTextField; - IntTextField *mIntField; - Button *mPlusButton; - Button *mMinusButton; - Button *mClearButton; + TextField *mTextField A_NONNULLPOINTER; + IntTextField *mIntField A_NONNULLPOINTER; + Button *mPlusButton A_NONNULLPOINTER; + Button *mMinusButton A_NONNULLPOINTER; + Button *mClearButton A_NONNULLPOINTER; // Used for the button - Button *mButton; - Button *mButton2; - Button *mButton3; + Button *mButton A_NONNULLPOINTER; + Button *mButton2 A_NONNULLPOINTER; + Button *mButton3 A_NONNULLPOINTER; // Will reset the text and integer input to the provided default - Button *mResetButton; + Button *mResetButton A_NONNULLPOINTER; - Inventory *mInventory; - ItemContainer *mItemContainer; - ScrollArea *mItemScrollArea; + Inventory *mInventory A_NONNULLPOINTER; + ItemContainer *mItemContainer A_NONNULLPOINTER; + ScrollArea *mItemScrollArea A_NONNULLPOINTER; enum NpcInputState { @@ -291,7 +291,7 @@ class NpcDialog final : public Window, NpcInputState mInputState; NpcActionState mActionState; - PlayerBox *mPlayerBox; + PlayerBox *mPlayerBox A_NONNULLPOINTER; Being *mAvatarBeing; int mLastNextTime; int mCameraMode; diff --git a/src/gui/windows/outfitwindow.h b/src/gui/windows/outfitwindow.h index 27a3d73aa..9a3c28baf 100644 --- a/src/gui/windows/outfitwindow.h +++ b/src/gui/windows/outfitwindow.h @@ -102,13 +102,13 @@ class OutfitWindow final : public Window, const int pointY) const A_WARN_UNUSED; void save() const; - Button *mPreviousButton; - Button *mNextButton; - Button *mEquipButtom; - Label *mCurrentLabel; - CheckBox *mUnequipCheck; - CheckBox *mAwayOutfitCheck; - Label *mKeyLabel; + Button *mPreviousButton A_NONNULLPOINTER; + Button *mNextButton A_NONNULLPOINTER; + Button *mEquipButtom A_NONNULLPOINTER; + Label *mCurrentLabel A_NONNULLPOINTER; + CheckBox *mUnequipCheck A_NONNULLPOINTER; + CheckBox *mAwayOutfitCheck A_NONNULLPOINTER; + Label *mKeyLabel A_NONNULLPOINTER; Color mBorderColor; diff --git a/src/gui/windows/questswindow.h b/src/gui/windows/questswindow.h index 0430569a3..031f239cd 100644 --- a/src/gui/windows/questswindow.h +++ b/src/gui/windows/questswindow.h @@ -77,13 +77,13 @@ class QuestsWindow final : public Window, void loadEffect(const int var, const XmlNodePtr node); - QuestsModel *mQuestsModel; - ExtendedListBox *mQuestsListBox; - ScrollArea *mQuestScrollArea; - ItemLinkHandler *mItemLinkHandler; - BrowserBox *mText; - ScrollArea *mTextScrollArea; - Button *mCloseButton; + QuestsModel *mQuestsModel A_NONNULLPOINTER; + ExtendedListBox *mQuestsListBox A_NONNULLPOINTER; + ScrollArea *mQuestScrollArea A_NONNULLPOINTER; + ItemLinkHandler *mItemLinkHandler A_NONNULLPOINTER; + BrowserBox *mText A_NONNULLPOINTER; + ScrollArea *mTextScrollArea A_NONNULLPOINTER; + Button *mCloseButton A_NONNULLPOINTER; Image *mCompleteIcon; Image *mIncompleteIcon; // quest variables: var, value diff --git a/src/gui/windows/quitdialog.h b/src/gui/windows/quitdialog.h index 96614401f..d4dcbfe4f 100644 --- a/src/gui/windows/quitdialog.h +++ b/src/gui/windows/quitdialog.h @@ -46,7 +46,7 @@ class QuitDialog final : public Window, * * @pointerToMe will be set to NULL when the QuitDialog is destroyed */ - explicit QuitDialog(QuitDialog **const pointerToMe); + explicit QuitDialog(QuitDialog **const pointerToMe) A_NONNULL(2); A_DELETE_COPY(QuitDialog) @@ -69,15 +69,15 @@ class QuitDialog final : public Window, RadioButton *const option); std::vector<RadioButton*> mOptions; - RadioButton *mLogoutQuit; - RadioButton *mForceQuit; - RadioButton *mSwitchAccountServer; - RadioButton *mSwitchCharacter; - RadioButton *mRate; - Button *mOkButton; - Button *mCancelButton; + RadioButton *mLogoutQuit A_NONNULLPOINTER; + RadioButton *mForceQuit A_NONNULLPOINTER; + RadioButton *mSwitchAccountServer A_NONNULLPOINTER; + RadioButton *mSwitchCharacter A_NONNULLPOINTER; + RadioButton *mRate A_NONNULLPOINTER; + Button *mOkButton A_NONNULLPOINTER; + Button *mCancelButton A_NONNULLPOINTER; - QuitDialog **mMyPointer; + QuitDialog **mMyPointer A_NONNULLPOINTER; bool mNeedForceQuit; }; diff --git a/src/gui/windows/registerdialog.h b/src/gui/windows/registerdialog.h index f01d1ca45..2c7229b38 100644 --- a/src/gui/windows/registerdialog.h +++ b/src/gui/windows/registerdialog.h @@ -80,17 +80,17 @@ class RegisterDialog final : public Window, */ bool canSubmit() const; - LoginData *mLoginData; - TextField *mUserField; - TextField *mPasswordField; - TextField *mConfirmField; + LoginData *mLoginData A_NONNULLPOINTER; + TextField *mUserField A_NONNULLPOINTER; + TextField *mPasswordField A_NONNULLPOINTER; + TextField *mConfirmField A_NONNULLPOINTER; TextField *mEmailField; - Button *mRegisterButton; - Button *mCancelButton; + Button *mRegisterButton A_NONNULLPOINTER; + Button *mCancelButton A_NONNULLPOINTER; RadioButton *mMaleButton; RadioButton *mFemaleButton; RadioButton *mOtherButton; - WrongDataNoticeListener *mWrongDataNoticeListener; + WrongDataNoticeListener *mWrongDataNoticeListener A_NONNULLPOINTER; }; #endif // GUI_WINDOWS_REGISTERDIALOG_H diff --git a/src/gui/windows/serverdialog.h b/src/gui/windows/serverdialog.h index 59105dd47..5f39fc0f7 100644 --- a/src/gui/windows/serverdialog.h +++ b/src/gui/windows/serverdialog.h @@ -126,15 +126,15 @@ class ServerDialog final : public Window, Mutex mMutex; ServerInfos mServers; const std::string &mDir; - Label *mDescription; - Button *mQuitButton; - Button *mConnectButton; - Button *mAddEntryButton; - Button *mEditEntryButton; - Button *mDeleteButton; - Button *mLoadButton; - ServersListModel *mServersListModel; - ListBox *mServersList; + Label *mDescription A_NONNULLPOINTER; + Button *mQuitButton A_NONNULLPOINTER; + Button *mConnectButton A_NONNULLPOINTER; + Button *mAddEntryButton A_NONNULLPOINTER; + Button *mEditEntryButton A_NONNULLPOINTER; + Button *mDeleteButton A_NONNULLPOINTER; + Button *mLoadButton A_NONNULLPOINTER; + ServersListModel *mServersListModel A_NONNULLPOINTER; + ListBox *mServersList A_NONNULLPOINTER; enum ServerDialogDownloadStatus { diff --git a/src/gui/windows/setupwindow.h b/src/gui/windows/setupwindow.h index 263877c0e..198339e4c 100644 --- a/src/gui/windows/setupwindow.h +++ b/src/gui/windows/setupwindow.h @@ -86,8 +86,8 @@ class SetupWindow final : public Window, SetupTab *mModsTab; SetupTab *mQuickTab; Button *mResetWindows; - TabbedArea *mPanel; - Label *mVersion; + TabbedArea *mPanel A_NONNULLPOINTER; + Label *mVersion A_NONNULLPOINTER; int mButtonPadding; }; diff --git a/src/gui/windows/shopwindow.h b/src/gui/windows/shopwindow.h index ea70bf3c2..73520eadd 100644 --- a/src/gui/windows/shopwindow.h +++ b/src/gui/windows/shopwindow.h @@ -174,18 +174,18 @@ class ShopWindow final : public Window, typedef std::list<ShopWindow*> DialogList; static DialogList instances; - Button *mCloseButton; + Button *mCloseButton A_NONNULLPOINTER; - ShopItems *mBuyShopItems; - ShopItems *mSellShopItems; + ShopItems *mBuyShopItems A_NONNULLPOINTER; + ShopItems *mSellShopItems A_NONNULLPOINTER; ShopItem *mTradeItem; - ShopListBox *mBuyShopItemList; - ShopListBox *mSellShopItemList; + ShopListBox *mBuyShopItemList A_NONNULLPOINTER; + ShopListBox *mSellShopItemList A_NONNULLPOINTER; ShopListBox *mCurrentShopItemList; - ScrollArea *mScrollArea; - Button *mAddButton; - Button *mDeleteButton; + ScrollArea *mScrollArea A_NONNULLPOINTER; + Button *mAddButton A_NONNULLPOINTER; + Button *mDeleteButton A_NONNULLPOINTER; Button *mAnnounceButton; Button *mPublishButton; Button *mRenameButton; diff --git a/src/gui/windows/shortcutwindow.h b/src/gui/windows/shortcutwindow.h index 77159e9f2..67009724c 100644 --- a/src/gui/windows/shortcutwindow.h +++ b/src/gui/windows/shortcutwindow.h @@ -84,7 +84,7 @@ class ShortcutWindow final : public Window ShortcutWindow(); ShortcutContainer *mItems; - ScrollArea *mScrollArea; + ScrollArea *mScrollArea A_NONNULLPOINTER; TabbedArea *mTabs; std::vector<ShortcutContainer*> mPages; int mButtonIndex; diff --git a/src/gui/windows/socialwindow.h b/src/gui/windows/socialwindow.h index a3a10101e..a5e3c3c50 100644 --- a/src/gui/windows/socialwindow.h +++ b/src/gui/windows/socialwindow.h @@ -153,17 +153,17 @@ class SocialWindow final : public Window, SocialTab *mAttackFilter; SocialTab *mPickupFilter; - SocialTab *mPlayers; - SocialTab *mNavigation; - SocialTab *mFriends; + SocialTab *mPlayers A_NONNULLPOINTER; + SocialTab *mNavigation A_NONNULLPOINTER; + SocialTab *mFriends A_NONNULLPOINTER; - CreatePartyPopup *mCreatePopup; + CreatePartyPopup *mCreatePopup A_NONNULLPOINTER; - Button *mCreateButton; - Button *mInviteButton; - Button *mLeaveButton; - Label *mCountLabel; - TabbedArea *mTabs; + Button *mCreateButton A_NONNULLPOINTER; + Button *mInviteButton A_NONNULLPOINTER; + Button *mLeaveButton A_NONNULLPOINTER; + Label *mCountLabel A_NONNULLPOINTER; + TabbedArea *mTabs A_NONNULLPOINTER; Map *mMap; int mLastUpdateTime; diff --git a/src/gui/windows/statuswindow.h b/src/gui/windows/statuswindow.h index 246c42a70..048a8a0b2 100644 --- a/src/gui/windows/statuswindow.h +++ b/src/gui/windows/statuswindow.h @@ -106,25 +106,25 @@ class StatusWindow final : public Window, /** * Status Part */ - Label *mLvlLabel; - Label *mMoneyLabel; - Label *mHpLabel; - Label *mMpLabel; - Label *mXpLabel; - ProgressBar *mHpBar; - ProgressBar *mMpBar; - ProgressBar *mXpBar; + Label *mLvlLabel A_NONNULLPOINTER; + Label *mMoneyLabel A_NONNULLPOINTER; + Label *mHpLabel A_NONNULLPOINTER; + Label *mMpLabel A_NONNULLPOINTER; + Label *mXpLabel A_NONNULLPOINTER; + ProgressBar *mHpBar A_NONNULLPOINTER; + ProgressBar *mMpBar A_NONNULLPOINTER; + ProgressBar *mXpBar A_NONNULLPOINTER; Label *mJobLvlLabel; Label *mJobLabel; ProgressBar *mJobBar; - VertContainer *mAttrCont; - ScrollArea *mAttrScroll; - VertContainer *mDAttrCont; - ScrollArea *mDAttrScroll; + VertContainer *mAttrCont A_NONNULLPOINTER; + ScrollArea *mAttrScroll A_NONNULLPOINTER; + VertContainer *mDAttrCont A_NONNULLPOINTER; + ScrollArea *mDAttrScroll A_NONNULLPOINTER; - Label *mCharacterPointsLabel; + Label *mCharacterPointsLabel A_NONNULLPOINTER; Label *mCorrectionPointsLabel; Button *mCopyButton; diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 604971419..2e04e4fbf 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -69,34 +69,33 @@ class TextCommandEditor final : public Window, bool mIsMagicCommand; - TextCommand *mCommand; - RadioButton *mIsMagic; - RadioButton *mIsOther; - Label *mSymbolLabel; - TextField *mSymbolTextField; - Label *mCommandLabel; - TextField *mCommandTextField; - Label *mCommentLabel; - TextField *mCommentTextField; - TargetTypeModel *mTargetTypeModel; - Label *mTypeLabel; - DropDown *mTypeDropDown; - IconsModel *mIconsModel; - Label *mIconLabel; - DropDown *mIconDropDown; - Label *mManaLabel; - IntTextField *mManaField; - Label *mMagicLvlLabel; - IntTextField *mMagicLvlField; - MagicSchoolModel *mMagicSchoolModel; - Label *mSchoolLabel; - DropDown *mSchoolDropDown; - Label *mSchoolLvlLabel; - IntTextField *mSchoolLvlField; - - Button *mCancelButton; - Button *mSaveButton; - Button *mDeleteButton; + TextCommand* mCommand; + RadioButton* mIsMagic A_NONNULLPOINTER; + RadioButton* mIsOther A_NONNULLPOINTER; + Label* mSymbolLabel A_NONNULLPOINTER; + TextField* mSymbolTextField A_NONNULLPOINTER; + Label* mCommandLabel A_NONNULLPOINTER; + TextField* mCommandTextField A_NONNULLPOINTER; + Label* mCommentLabel A_NONNULLPOINTER; + TextField* mCommentTextField A_NONNULLPOINTER; + TargetTypeModel* mTargetTypeModel A_NONNULLPOINTER; + Label* mTypeLabel A_NONNULLPOINTER; + DropDown* mTypeDropDown A_NONNULLPOINTER; + IconsModel* mIconsModel A_NONNULLPOINTER; + Label* mIconLabel A_NONNULLPOINTER; + DropDown* mIconDropDown A_NONNULLPOINTER; + Label* mManaLabel A_NONNULLPOINTER; + IntTextField* mManaField A_NONNULLPOINTER; + Label* mMagicLvlLabel A_NONNULLPOINTER; + IntTextField* mMagicLvlField A_NONNULLPOINTER; + MagicSchoolModel* mMagicSchoolModel A_NONNULLPOINTER; + Label* mSchoolLabel A_NONNULLPOINTER; + DropDown* mSchoolDropDown A_NONNULLPOINTER; + Label* mSchoolLvlLabel A_NONNULLPOINTER; + IntTextField* mSchoolLvlField A_NONNULLPOINTER; + Button* mCancelButton A_NONNULLPOINTER; + Button* mSaveButton A_NONNULLPOINTER; + Button* mDeleteButton A_NONNULLPOINTER; bool mEnabledKeyboard; }; diff --git a/src/gui/windows/tradewindow.h b/src/gui/windows/tradewindow.h index b1ac84045..d82714816 100644 --- a/src/gui/windows/tradewindow.h +++ b/src/gui/windows/tradewindow.h @@ -178,17 +178,17 @@ class TradeWindow final : public Window, */ void setStatus(const Status s); - Inventory *mMyInventory; - Inventory *mPartnerInventory; + Inventory *mMyInventory A_NONNULLPOINTER; + Inventory *mPartnerInventory A_NONNULLPOINTER; - ItemContainer *mMyItemContainer; - ItemContainer *mPartnerItemContainer; + ItemContainer *mMyItemContainer A_NONNULLPOINTER; + ItemContainer *mPartnerItemContainer A_NONNULLPOINTER; - Label *mMoneyLabel; - Button *mAddButton; - Button *mOkButton; - Button *mMoneyChangeButton; - TextField *mMoneyField; + Label *mMoneyLabel A_NONNULLPOINTER; + Button *mAddButton A_NONNULLPOINTER; + Button *mOkButton A_NONNULLPOINTER; + Button *mMoneyChangeButton A_NONNULLPOINTER; + TextField *mMoneyField A_NONNULLPOINTER; Item* mAutoAddItem; std::string mAutoAddToNick; diff --git a/src/gui/windows/unregisterdialog.h b/src/gui/windows/unregisterdialog.h index db1937e1a..00a9779e3 100644 --- a/src/gui/windows/unregisterdialog.h +++ b/src/gui/windows/unregisterdialog.h @@ -60,11 +60,11 @@ class UnRegisterDialog final : public Window, void action(const ActionEvent &event) override final; private: - LoginData *mLoginData; - TextField *mPasswordField; - Button *mUnRegisterButton; - Button *mCancelButton; - WrongDataNoticeListener *mWrongDataNoticeListener; + LoginData *mLoginData A_NONNULLPOINTER; + TextField *mPasswordField A_NONNULLPOINTER; + Button *mUnRegisterButton A_NONNULLPOINTER; + Button *mCancelButton A_NONNULLPOINTER; + WrongDataNoticeListener *mWrongDataNoticeListener A_NONNULLPOINTER; }; #endif // GUI_WINDOWS_UNREGISTERDIALOG_H diff --git a/src/gui/windows/updaterwindow.h b/src/gui/windows/updaterwindow.h index 6484fe09d..7c70817b0 100644 --- a/src/gui/windows/updaterwindow.h +++ b/src/gui/windows/updaterwindow.h @@ -225,12 +225,12 @@ class UpdaterWindow final : public Window, std::string mUpdateServerPath; - Label *mLabel; /**< Progress bar caption. */ - Button *mCancelButton; /**< Button to stop the update process. */ - Button *mPlayButton; /**< Button to start playing. */ - ProgressBar *mProgressBar; /**< Update progress bar. */ - BrowserBox *mBrowserBox; /**< Box to display news. */ - ScrollArea *mScrollArea; /**< Used to scroll news box. */ + Label *mLabel A_NONNULLPOINTER; + Button *mCancelButton A_NONNULLPOINTER; + Button *mPlayButton A_NONNULLPOINTER; + ProgressBar *mProgressBar A_NONNULLPOINTER; + BrowserBox *mBrowserBox A_NONNULLPOINTER; + ScrollArea *mScrollArea A_NONNULLPOINTER; /** Status of the current download. */ UpdateDownloadStatus mDownloadStatus; diff --git a/src/gui/windows/whoisonline.cpp b/src/gui/windows/whoisonline.cpp index 65096f3e0..1651f4ea0 100644 --- a/src/gui/windows/whoisonline.cpp +++ b/src/gui/windows/whoisonline.cpp @@ -99,10 +99,10 @@ WhoIsOnline::WhoIsOnline() : mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, true, "onlinebrowserbox.xml")), mScrollArea(new ScrollArea(this, mBrowserBox, false)), - mOnlinePlayers(), - mOnlineNicks(), // TRANSLATORS: who is online. button. mUpdateButton(new Button(this, _("Update"), "update", this)), + mOnlinePlayers(), + mOnlineNicks(), mFriends(), mNeutral(), mDisregard(), diff --git a/src/gui/windows/whoisonline.h b/src/gui/windows/whoisonline.h index 8ec7d3c2d..f5183ad92 100644 --- a/src/gui/windows/whoisonline.h +++ b/src/gui/windows/whoisonline.h @@ -144,14 +144,15 @@ class WhoIsOnline final : public Window, char *mMemoryBuffer; /** Buffer to handler human readable error provided by curl. */ - char *mCurlError; + char *mCurlError A_NONNULLPOINTER; + + BrowserBox *mBrowserBox A_NONNULLPOINTER; + ScrollArea *mScrollArea A_NONNULLPOINTER; + Button *mUpdateButton A_NONNULLPOINTER; - BrowserBox *mBrowserBox; - ScrollArea *mScrollArea; std::set<OnlinePlayer*> mOnlinePlayers; std::set<std::string> mOnlineNicks; - Button *mUpdateButton; std::vector<OnlinePlayer*> mFriends; std::vector<OnlinePlayer*> mNeutral; std::vector<OnlinePlayer*> mDisregard; diff --git a/src/gui/windows/worldselectdialog.h b/src/gui/windows/worldselectdialog.h index f9c5554a2..7100226db 100644 --- a/src/gui/windows/worldselectdialog.h +++ b/src/gui/windows/worldselectdialog.h @@ -68,10 +68,10 @@ class WorldSelectDialog final : public Window, void keyPressed(KeyEvent &event) override final; private: - WorldListModel *mWorldListModel; - ListBox *mWorldList; - Button *mChangeLoginButton; - Button *mChooseWorld; + WorldListModel *mWorldListModel A_NONNULLPOINTER; + ListBox *mWorldList A_NONNULLPOINTER; + Button *mChangeLoginButton A_NONNULLPOINTER; + Button *mChooseWorld A_NONNULLPOINTER; }; #endif // GUI_WINDOWS_WORLDSELECTDIALOG_H |