no else after return

GUI/View/Instrument/InstrumentListModel.cpp

@@ -86,24 +86,25 @@ QVariant InstrumentListModel::data(const QModelIndex& index, int role) const
 {
     QVector<InstrumentItem*> instruments = m_instruments->instrumentItems();
     if (!index.isValid() || index.row() >= instruments.size() || index.row() < 0)
-        return QVariant();
+        return {};
 
     InstrumentItem* item = instruments[index.row()];
     if (role == Qt::DecorationRole) {
         if (item->hasModelType<GISASInstrumentItem>())
             return m_gisasIcon;
-        else if (item->hasModelType<OffSpecularInstrumentItem>())
+        if (item->hasModelType<OffSpecularInstrumentItem>())
             return m_offSpecularIcon;
-        else if (item->hasModelType<SpecularInstrumentItem>())
+        if (item->hasModelType<SpecularInstrumentItem>())
             return m_specularIcon;
-        else if (item->hasModelType<DepthProbeInstrumentItem>())
+        if (item->hasModelType<DepthProbeInstrumentItem>())
             return m_depthProbeIcon;
-        else
-            return QVariant();
-    } else if (role == Qt::DisplayRole)
+        return {};
+    }
+
+    if (role == Qt::DisplayRole)
         return item->itemName();
 
-    return QVariant();
+    return {};
 }
 
 InstrumentItem* InstrumentListModel::instrumentForIndex(const QModelIndex& index) const
@@ -111,8 +112,7 @@ InstrumentItem* InstrumentListModel::instrumentForIndex(const QModelIndex& index
     QVector<InstrumentItem*> instruments = m_instruments->instrumentItems();
     if (index.row() >= 0 && index.row() < instruments.size())
         return instruments[index.row()];
-    else
-        return nullptr;
+    return nullptr;
 }
 
 QModelIndex InstrumentListModel::addNewGISASInstrument()

GUI/View/Job/JobListModel.cpp

@@ -50,13 +50,13 @@ QVariant JobListModel::data(const QModelIndex& index, int role) const
 {
     QVector<JobItem*> jobs = m_jobs->jobItems();
     if (!index.isValid() || index.row() >= jobs.size() || index.row() < 0)
-        return QVariant();
+        return {};
 
     JobItem* item = jobs[index.row()];
     if (role == Qt::DisplayRole)
         return item->itemName();
 
-    return QVariant();
+    return {};
 }
 
 JobItem* JobListModel::jobForIndex(const QModelIndex& index) const
@@ -64,8 +64,7 @@ JobItem* JobListModel::jobForIndex(const QModelIndex& index) const
     QVector<JobItem*> jobs = m_jobs->jobItems();
     if (index.row() >= 0 && index.row() < jobs.size())
         return jobs[index.row()];
-    else
-        return nullptr;
+    return nullptr;
 }
 
 QModelIndex JobListModel::indexForJob(JobItem* job)
@@ -74,8 +73,7 @@ QModelIndex JobListModel::indexForJob(JobItem* job)
     int idx = jobs.indexOf(job);
     if (idx != -1)
         return index(idx, 0);
-    else
-        return QModelIndex();
+    return {};
 }
 
 void JobListModel::runJob(const QModelIndex& index)