diff options
author | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-05 10:13:15 +0100 |
---|---|---|
committer | Thorbjørn Lindeijer <bjorn@lindeijer.nl> | 2024-03-06 21:49:14 +0000 |
commit | 3ce39d2b497ab5356290a22b324181386af51c51 (patch) | |
tree | 1b923b8be7e4d2ce8ff70768dc7fff596487935c /src/gui/charselectdialog.cpp | |
parent | a9df89bda908e3b3d443db7f3ca865b6f12c75e5 (diff) | |
download | mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.gz mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.bz2 mana-3ce39d2b497ab5356290a22b324181386af51c51.tar.xz mana-3ce39d2b497ab5356290a22b324181386af51c51.zip |
General code cleanups
* Use final for all message handlers, Client, LocalPlayer,
Being::getType, Being::setPosition and Being::setMap.
(avoids some warnings about virtual dispatch in constructors)
* Use auto in more places
* Use emplace_back instead of push_back in some places
* Use default member initializers
* Less else after return
* Removed superfluous .c_str()
* Removed type aliases that are only used once
* Removed more unused includes
Diffstat (limited to 'src/gui/charselectdialog.cpp')
-rw-r--r-- | src/gui/charselectdialog.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/gui/charselectdialog.cpp b/src/gui/charselectdialog.cpp index a0a14c65..7792813c 100644 --- a/src/gui/charselectdialog.cpp +++ b/src/gui/charselectdialog.cpp @@ -111,10 +111,6 @@ class CharacterDisplay : public Container CharSelectDialog::CharSelectDialog(LoginData *loginData): Window(_("Account and Character Management")), - mLocked(false), - mUnregisterButton(nullptr), - mChangeEmailButton(nullptr), - mCharacterEntries(0), mLoginData(loginData), mCharHandler(Net::getCharHandler()) { @@ -168,9 +164,7 @@ CharSelectDialog::CharSelectDialog(LoginData *loginData): mCharacterEntries[0]->requestFocus(); } -CharSelectDialog::~CharSelectDialog() -{ -} +CharSelectDialog::~CharSelectDialog() = default; void CharSelectDialog::action(const gcn::ActionEvent &event) { @@ -265,20 +259,14 @@ void CharSelectDialog::attemptCharacterSelect(int index) void CharSelectDialog::setCharacters(const Net::Characters &characters) { // Reset previous characters - std::vector<CharacterDisplay*>::iterator iter, iter_end; - for (iter = mCharacterEntries.begin(), iter_end = mCharacterEntries.end(); - iter != iter_end; ++iter) - (*iter)->setCharacter(nullptr); + for (auto *characterEntry : mCharacterEntries) + characterEntry->setCharacter(nullptr); - Net::Characters::const_iterator i, i_end = characters.end(); - for (i = characters.begin(); i != i_end; ++i) + for (auto character : characters) { - Net::Character *character = *i; - // Slots Number start at 1 for Manaserv, so we offset them by one. int characterSlot = character->slot; - if (Net::getNetworkType() == ServerType::MANASERV - && characterSlot > 0) + if (Net::getNetworkType() == ServerType::MANASERV && characterSlot > 0) --characterSlot; if (characterSlot >= (int)mCharacterEntries.size()) |