From 306ad2effe4d0897453e61ad787e01dc47c33076 Mon Sep 17 00:00:00 2001 From: Thorbjørn Lindeijer Date: Tue, 12 Mar 2024 13:24:16 +0100 Subject: 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 --- src/net/tmwa/gui/guildtab.cpp | 4 ---- src/net/tmwa/gui/guildtab.h | 1 - src/net/tmwa/gui/partytab.cpp | 8 +------- src/net/tmwa/gui/partytab.h | 1 - 4 files changed, 1 insertion(+), 13 deletions(-) (limited to 'src/net') diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp index 6014e507..9858028e 100644 --- a/src/net/tmwa/gui/guildtab.cpp +++ b/src/net/tmwa/gui/guildtab.cpp @@ -43,10 +43,6 @@ GuildTab::GuildTab() : setTabColor(&Theme::getThemeColor(Theme::GUILD)); } -GuildTab::~GuildTab() -{ -} - void GuildTab::handleInput(const std::string &msg) { Net::getGuildHandler()->chat(taGuild->getId(), msg); diff --git a/src/net/tmwa/gui/guildtab.h b/src/net/tmwa/gui/guildtab.h index e7d7b7cc..3f864748 100644 --- a/src/net/tmwa/gui/guildtab.h +++ b/src/net/tmwa/gui/guildtab.h @@ -33,7 +33,6 @@ class GuildTab : public ChatTab { public: GuildTab(); - ~GuildTab() override; void showHelp() override; diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp index 89f3a769..6f1e3b68 100644 --- a/src/net/tmwa/gui/partytab.cpp +++ b/src/net/tmwa/gui/partytab.cpp @@ -42,10 +42,6 @@ PartyTab::PartyTab() : setTabColor(&Theme::getThemeColor(Theme::PARTY_CHAT_TAB)); } -PartyTab::~PartyTab() -{ -} - void PartyTab::handleInput(const std::string &msg) { Net::getPartyHandler()->chat(msg); @@ -197,9 +193,7 @@ bool PartyTab::handleCommand(const std::string &type, const std::string &args) void PartyTab::getAutoCompleteList(std::vector &names) const { - Party *p = local_player->getParty(); - - if (p) + if (Party *p = local_player->getParty()) p->getNames(names); } diff --git a/src/net/tmwa/gui/partytab.h b/src/net/tmwa/gui/partytab.h index 61ccf37a..a6c52f58 100644 --- a/src/net/tmwa/gui/partytab.h +++ b/src/net/tmwa/gui/partytab.h @@ -33,7 +33,6 @@ class PartyTab : public ChatTab { public: PartyTab(); - ~PartyTab() override; void showHelp() override; -- cgit v1.2.3-70-g09d2