summaryrefslogtreecommitdiff
path: root/src/gui/socialwindow.h
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 13:24:16 +0100
committerThorbjørn Lindeijer <bjorn@lindeijer.nl>2024-03-12 21:23:10 +0100
commit306ad2effe4d0897453e61ad787e01dc47c33076 (patch)
tree75b8b291af55e80d01d9eb85afd7d465233a1a57 /src/gui/socialwindow.h
parent66599a9896e0cf69b58c0a73152aba4750d87af2 (diff)
downloadmana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.gz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.bz2
mana-306ad2effe4d0897453e61ad787e01dc47c33076.tar.xz
mana-306ad2effe4d0897453e61ad787e01dc47c33076.zip
General code cleanups
* Use default member initializers * Use range-based for loops * Avoid needless pointer references for ShopItem::mDuplicates * Removed type aliases that are only used once or twice * Removed more unused includes * Removed some unused functions * Removed superfluous .c_str() * Rely on default copy and assignment operators for Vector class * Use std::unique_ptr in some places * Removed duplicated mPlayerMoney updating in SellDialog * Removed duplicated Game::handleInput call * Removed unused SDLInput::mMouseInWindow * Removed remnant of manual widget positioning in HelpWindow * Removed superfluous initialization of static pointers
Diffstat (limited to 'src/gui/socialwindow.h')
-rw-r--r--src/gui/socialwindow.h19
1 files changed, 8 insertions, 11 deletions
diff --git a/src/gui/socialwindow.h b/src/gui/socialwindow.h
index 7ffcec78..8575f3b2 100644
--- a/src/gui/socialwindow.h
+++ b/src/gui/socialwindow.h
@@ -64,7 +64,7 @@ public:
*/
void action(const gcn::ActionEvent &event) override;
- void showGuildInvite(const std::string &guildName, const int guildId,
+ void showGuildInvite(const std::string &guildName, int guildId,
const std::string &inviterName);
void showGuildCreate();
@@ -79,19 +79,16 @@ protected:
void updateButtons();
- int mGuildInvited;
- ConfirmDialog *mGuildAcceptDialog;
- TextDialog *mGuildCreateDialog;
+ int mGuildInvited = 0;
+ ConfirmDialog *mGuildAcceptDialog = nullptr;
+ TextDialog *mGuildCreateDialog = nullptr;
std::string mPartyInviter;
- ConfirmDialog *mPartyAcceptDialog;
- TextDialog *mPartyCreateDialog;
+ ConfirmDialog *mPartyAcceptDialog = nullptr;
+ TextDialog *mPartyCreateDialog = nullptr;
- using GuildMap = std::map<Guild *, SocialTab *>;
- GuildMap mGuilds;
-
- using PartyMap = std::map<Party *, SocialTab *>;
- PartyMap mParties;
+ std::map<Guild *, SocialTab *> mGuilds;
+ std::map<Party *, SocialTab *> mParties;
CreatePopup *mCreatePopup;