Move function to proper place

Instead of writing TODO comment blocks, just do the work, and move the
function to the proper class. Further, after review from Berthold, cleanup
the function. There is no reason that getGasList() is member of
any class. It is just a non-class helper, and as it is only used
here, a static helper.

Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>

3 files changed, 20 insertions, 29 deletions

diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 31c98bac7..49e977c63 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -177,26 +177,6 @@ bool DivePlannerPointsModel::updateMaxDepth()
 	return (displayed_dive.maxdepth.mm != prevMaxDepth);
 }
 
-QStringList &DivePlannerPointsModel::getGasList()
-{
-	static QStringList list;
-	list.clear();
-	for (int i = 0; i < MAX_CYLINDERS; i++) {
-		cylinder_t *cyl = &displayed_dive.cylinder[i];
-		if (cylinder_nodata(cyl))
-			break;
-		/* Check if we have the same gasmix two or more times
-		 * If yes return more verbose string */
-		int same_gas = same_gasmix_cylinder(cyl, i, &displayed_dive, true);
-		if (same_gas == -1)
-			list.push_back(get_gas_string(cyl->gasmix));
-		else
-			list.push_back(get_gas_string(cyl->gasmix) + QString(" (%1 %2 ").arg(tr("cyl.")).arg(i + 1) +
-				cyl->type.description + ")");
-	}
-	return list;
-}
-
 void DivePlannerPointsModel::removeDeco()
 {
 	bool oldrec = setRecalc(false);
diff --git a/qt-models/diveplannermodel.h b/qt-models/diveplannermodel.h
index 7a1cdca83..dfafe2b27 100644
--- a/qt-models/diveplannermodel.h
+++ b/qt-models/diveplannermodel.h
@@ -52,7 +52,6 @@ public:
 	divedatapoint at(int row);
 	int size();
 	struct diveplan &getDiveplan();
-	QStringList &getGasList();
 	int lastEnteredPoint();
 	void removeDeco();
 	static bool addingDeco;
diff --git a/qt-models/models.cpp b/qt-models/models.cpp
index 4f4df6425..a799b605d 100644
--- a/qt-models/models.cpp
+++ b/qt-models/models.cpp
@@ -36,16 +36,28 @@ GasSelectionModel *GasSelectionModel::instance()
 	return &self;
 }
 
-//TODO: Remove this #include here when the issue below is fixed.
-#include "diveplannermodel.h"
+static QStringList getGasList()
+{
+	QStringList list;
+	for (int i = 0; i < MAX_CYLINDERS; i++) {
+		cylinder_t *cyl = &displayed_dive.cylinder[i];
+		if (cylinder_nodata(cyl))
+			break;
+		/* Check if we have the same gasmix two or more times
+		 * If yes return more verbose string */
+		int same_gas = same_gasmix_cylinder(cyl, i, &displayed_dive, true);
+		if (same_gas == -1)
+			list.push_back(get_gas_string(cyl->gasmix));
+		else
+			list.push_back(get_gas_string(cyl->gasmix) + QString(" (%1 %2 ").arg(GasSelectionModel::tr("cyl.")).arg(i + 1) +
+				cyl->type.description + ")");
+	}
+	return list;
+}
+
 void GasSelectionModel::repopulate()
 {
-	/* TODO:
-	 * getGasList shouldn't be a member of DivePlannerPointsModel,
-	 * it has nothing to do with the current plain being calculated:
-	 * it's internal to the current_dive.
-	 */
-	setStringList(DivePlannerPointsModel::instance()->getGasList());
+	setStringList(getGasList());
 }
 
 QVariant GasSelectionModel::data(const QModelIndex &index, int role) const