From 42f47e483da19079a937c4801ca94bd62d8dc970 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 21 Aug 2017 22:44:29 +0300 Subject: Remove useless else. --- src/gui/models/playertablemodel.cpp | 6 ++---- src/gui/models/skillmodel.cpp | 3 +-- src/gui/models/worldlistmodel.h | 5 +---- 3 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src/gui/models') diff --git a/src/gui/models/playertablemodel.cpp b/src/gui/models/playertablemodel.cpp index 417fafcbc..271b6a5bb 100644 --- a/src/gui/models/playertablemodel.cpp +++ b/src/gui/models/playertablemodel.cpp @@ -68,8 +68,7 @@ int PlayerTableModel::getRows() const { if (mPlayers != nullptr) return CAST_S32(mPlayers->size()); - else - return 0; + return 0; } int PlayerTableModel::getColumns() const @@ -86,8 +85,7 @@ int PlayerTableModel::getColumnWidth(const int index) const { if (index == NAME_COLUMN) return NAME_COLUMN_WIDTH; - else - return RELATION_CHOICE_COLUMN_WIDTH; + return RELATION_CHOICE_COLUMN_WIDTH; } void PlayerTableModel::playerRelationsUpdated() diff --git a/src/gui/models/skillmodel.cpp b/src/gui/models/skillmodel.cpp index 0dcf9cedd..4d22280d8 100644 --- a/src/gui/models/skillmodel.cpp +++ b/src/gui/models/skillmodel.cpp @@ -47,8 +47,7 @@ std::string SkillModel::getElementAt(int i) const SkillInfo *const info = getSkillAt(i); if (info != nullptr) return info->data->name; - else - return std::string(); + return std::string(); } void SkillModel::updateVisibilities() diff --git a/src/gui/models/worldlistmodel.h b/src/gui/models/worldlistmodel.h index 9ae5a5e22..3be179c61 100644 --- a/src/gui/models/worldlistmodel.h +++ b/src/gui/models/worldlistmodel.h @@ -59,10 +59,7 @@ class WorldListModel final : public ListModel return std::string(si->name).append(" (").append( toString(si->online_users)).append(")"); } - else - { - return "???"; - } + return "???"; } private: Worlds mWorlds; -- cgit v1.2.3-60-g2f50