From 3f51849dc3582d34683c111e5fd3a53f414ab1c2 Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Mon, 1 Oct 2018 15:05:11 +0200
Subject: Cleanup: move CSVApps into .cpp file

No point in having this in the header file as it is not used
outside.

Remove the CSVAPPS macro, as this was never used. One thing less
to maintain.

Remove the sentinel with name = NULL, as we can simply use
range-based for.

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 desktop-widgets/divelogimportdialog.cpp | 24 ++++++++++++++++++++----
 desktop-widgets/divelogimportdialog.h   | 20 --------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/desktop-widgets/divelogimportdialog.cpp b/desktop-widgets/divelogimportdialog.cpp
index 63655b5ea..61549a7f1 100644
--- a/desktop-widgets/divelogimportdialog.cpp
+++ b/desktop-widgets/divelogimportdialog.cpp
@@ -15,7 +15,24 @@ static QString subsurface_index = "subsurface/csvindex";
 
 #define SILENCE_WARNING 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, ""
 
-const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] = {
+struct CSVAppConfig {
+	QString name;
+	int time;
+	int depth;
+	int temperature;
+	int po2;
+	int sensor1;
+	int sensor2;
+	int sensor3;
+	int cns;
+	int ndl;
+	int tts;
+	int stopdepth;
+	int pressure;
+	int setpoint;
+	QString separator;
+};
+static const CSVAppConfig CSVApps[] = {
 	// time, depth, temperature, po2, sensor1, sensor2, sensor3, cns, ndl, tts, stopdepth, pressure, setpoint
 	// indices are 0 based, -1 means the column doesn't exist
 	{ "Manual import", SILENCE_WARNING },
@@ -28,7 +45,6 @@ const DiveLogImportDialog::CSVAppConfig DiveLogImportDialog::CSVApps[CSVAPPS] =
 	{ "SubsurfaceCSV", -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "Tab" },
 	{ "AV1", 0, 1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, " " },
 	{ "Poseidon MkVI", 0, 2, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, "," },
-	{ NULL, SILENCE_WARNING }
 };
 
 enum Known {
@@ -347,8 +363,8 @@ DiveLogImportDialog::DiveLogImportDialog(QStringList fn, QWidget *parent) : QDia
 	specialCSV << AV1;
 	specialCSV << POSEIDON;
 
-	for (int i = 0; !CSVApps[i].name.isNull(); ++i)
-		ui->knownImports->addItem(CSVApps[i].name);
+	for (const CSVAppConfig &conf: CSVApps)
+		ui->knownImports->addItem(conf.name);
 
 	ui->CSVSeparator->addItems( QStringList() << tr("Tab") << "," << ";" << "|");
 
diff --git a/desktop-widgets/divelogimportdialog.h b/desktop-widgets/divelogimportdialog.h
index 318895617..e8ba4b598 100644
--- a/desktop-widgets/divelogimportdialog.h
+++ b/desktop-widgets/divelogimportdialog.h
@@ -103,26 +103,6 @@ private:
 	QString hw;
 	bool txtLog;
 
-	struct CSVAppConfig {
-		QString name;
-		int time;
-		int depth;
-		int temperature;
-		int po2;
-		int sensor1;
-		int sensor2;
-		int sensor3;
-		int cns;
-		int ndl;
-		int tts;
-		int stopdepth;
-		int pressure;
-		int setpoint;
-		QString separator;
-	};
-
-#define CSVAPPS 11
-	static const CSVAppConfig CSVApps[CSVAPPS];
 };
 
 class TagDragDelegate : public QStyledItemDelegate {
-- 
cgit v1.2.3-70-g09d2