Remove useless else

src/collection/collectionfilter.cpp

@@ -280,19 +280,19 @@ bool CollectionFilter::FieldNumericalValueMatchesData(const T value, const QStri
   if (foperator == QLatin1Char('=') || foperator == QLatin1String("==")) {
     return data == value;
   }
-  else if (foperator == QLatin1String("!=") || foperator == QLatin1String("<>")) {
+  if (foperator == QLatin1String("!=") || foperator == QLatin1String("<>")) {
     return data != value;
   }
-  else if (foperator == QLatin1Char('<')) {
+  if (foperator == QLatin1Char('<')) {
     return data < value;
   }
-  else if (foperator == QLatin1Char('>')) {
+  if (foperator == QLatin1Char('>')) {
     return data > value;
   }
-  else if (foperator == QLatin1String(">=")) {
+  if (foperator == QLatin1String(">=")) {
     return data >= value;
   }
-  else if (foperator == QLatin1String("<=")) {
+  if (foperator == QLatin1String("<=")) {
     return data <= value;
   }
 

src/collection/collectionfilterwidget.cpp

@@ -241,9 +241,8 @@ QString CollectionFilterWidget::group_by_version() const {
   if (settings_prefix_.isEmpty()) {
     return QStringLiteral("group_by_version");
   }
-  else {
-    return QStringLiteral("%1_group_by_version").arg(settings_prefix_);
-  }
+
+  return QStringLiteral("%1_group_by_version").arg(settings_prefix_);
 
 }
 
@@ -252,9 +251,8 @@ QString CollectionFilterWidget::group_by_key() const {
   if (settings_prefix_.isEmpty()) {
     return QStringLiteral("group_by");
   }
-  else {
-    return QStringLiteral("%1_group_by").arg(settings_prefix_);
-  }
+
+  return QStringLiteral("%1_group_by").arg(settings_prefix_);
 
 }
 
@@ -265,9 +263,8 @@ QString CollectionFilterWidget::separate_albums_by_grouping_key() const {
   if (settings_prefix_.isEmpty()) {
     return QStringLiteral("separate_albums_by_grouping");
   }
-  else {
-    return QStringLiteral("%1_separate_albums_by_grouping").arg(settings_prefix_);
-  }
+
+  return QStringLiteral("%1_separate_albums_by_grouping").arg(settings_prefix_);
 
 }
 

src/collection/collectionmodel.cpp

@@ -360,19 +360,15 @@ QVariant CollectionModel::data(const CollectionItem *item, const int role) const
         if (item->children.isEmpty()) {
           return false;
         }
-        else if (std::any_of(item->children.begin(), item->children.end(), [this, role](CollectionItem *child) { return !data(child, role).toBool(); })) {
+        if (std::any_of(item->children.begin(), item->children.end(), [this, role](CollectionItem *child) { return !data(child, role).toBool(); })) {
           return false;
         }
-        else {
-          return true;
-        }
+        return true;
       }
-      else if (item->type == CollectionItem::Type::Song) {
+      if (item->type == CollectionItem::Type::Song) {
         return item->metadata.IsEditable();
       }
-      else {
-        return false;
-      }
+      return false;
     }
 
     case Role_SortText:
@@ -1042,7 +1038,7 @@ QString CollectionModel::PrettyYearAlbum(const int year, const QString &album) {
 QString CollectionModel::PrettyAlbumDisc(const QString &album, const int disc) {
 
   if (disc <= 0 || Song::AlbumContainsDisc(album)) return TextOrUnknown(album);
-  else return TextOrUnknown(album) + QStringLiteral(" - (Disc ") + QString::number(disc) + QStringLiteral(")");
+  return TextOrUnknown(album) + QStringLiteral(" - (Disc ") + QString::number(disc) + QStringLiteral(")");
 
 }
 
@@ -1070,15 +1066,13 @@ QString CollectionModel::PrettyFormat(const Song &song) {
   if (song.samplerate() <= 0) {
     return song.TextForFiletype();
   }
-  else {
-    if (song.bitdepth() <= 0) {
-      return QStringLiteral("%1 (%2)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5));
-    }
-    else {
-      return QStringLiteral("%1 (%2/%3)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5)).arg(song.bitdepth());
-    }
+
+  if (song.bitdepth() <= 0) {
+    return QStringLiteral("%1 (%2)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5));
   }
 
+  return QStringLiteral("%1 (%2/%3)").arg(song.TextForFiletype(), QString::number(song.samplerate() / 1000.0, 'G', 5)).arg(song.bitdepth());
+
 }
 
 QString CollectionModel::SortText(const GroupBy group_by, const int container_level, const Song &song, const bool sort_skips_articles) {
@@ -1129,10 +1123,7 @@ QString CollectionModel::SortText(const GroupBy group_by, const int container_le
       if (container_level == 1 && !IsAlbumGroupBy(options_active_.group_by[0])) {
         return SortText(song.title());
       }
-      else {
-        return SortTextForSong(song);
-      }
-      break;
+      return SortTextForSong(song);
     }
   }
 

src/collection/collectionwatcher.cpp

@@ -326,7 +326,8 @@ SongList CollectionWatcher::ScanTransaction::FindSongsInSubdirectory(const QStri
   if (cached_songs_.contains(path)) {
     return cached_songs_.values(path);
   }
-  else return SongList();
+
+  return SongList();
 
 }
 

src/collection/savedgroupingmanager.cpp

@@ -78,9 +78,8 @@ QString SavedGroupingManager::GetSavedGroupingsSettingsGroup(const QString &sett
   if (settings_group.isEmpty() || settings_group == QLatin1String(CollectionSettingsPage::kSettingsGroup)) {
     return QLatin1String(kSavedGroupingsSettingsGroup);
   }
-  else {
-    return QLatin1String(kSavedGroupingsSettingsGroup) + QLatin1Char('_') + settings_group;
-  }
+
+  return QLatin1String(kSavedGroupingsSettingsGroup) + QLatin1Char('_') + settings_group;
 
 }