Cleanup: return directly from data() methods

There is this anti-pattern in QModel data() functions to assign
to a "ret" variable and return at the end of the function. This
is inefficient, as the object is not directly constructed at
the space reserved by the caller.

Change the functions in WeightModel and CylinderModel to return
the objects directly.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>

1 files changed, 4 insertions, 7 deletions

diff --git a/qt-models/cleanertablemodel.cpp b/qt-models/cleanertablemodel.cpp
index 36b0f4e76..fc4e93b16 100644
--- a/qt-models/cleanertablemodel.cpp
+++ b/qt-models/cleanertablemodel.cpp
@@ -31,19 +31,16 @@ int CleanerTableModel::columnCount(const QModelIndex&) const
 
 QVariant CleanerTableModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
-	QVariant ret;
-
 	if (orientation == Qt::Vertical)
-		return ret;
+		return QVariant();
 
 	switch (role) {
 	case Qt::FontRole:
-		ret = defaultModelFont();
-		break;
+		return defaultModelFont();
 	case Qt::DisplayRole:
-		ret = headers.at(section);
+		return headers.at(section);
 	}
-	return ret;
+	return QVariant();
 }
 
 void CleanerTableModel::setHeaderDataStrings(const QStringList &newHeaders)