From 36b9e5e31eca0354f9ad277fb668c3846714b81e Mon Sep 17 00:00:00 2001
From: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Date: Sun, 3 Jun 2018 22:15:19 +0200
Subject: Cleanup: fold core/helpers.h into core/qthelper.h

helpers.h included qthelper.h and all functions declared in helpers.h
were defined in qthelper.h. Therefore fold the former into the latter,
since the split seems completely arbitrary.

While doing so, change the return-type of get_dc_nichname from
"const QString" to "QString".

Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
---
 qt-models/cylindermodel.cpp         | 2 +-
 qt-models/diveimportedmodel.cpp     | 2 +-
 qt-models/divelistmodel.cpp         | 2 +-
 qt-models/divelistmodel.h           | 1 -
 qt-models/diveplannermodel.cpp      | 1 -
 qt-models/divetripmodel.cpp         | 2 +-
 qt-models/gpslistmodel.cpp          | 2 +-
 qt-models/models.cpp                | 2 +-
 qt-models/weightmodel.cpp           | 2 +-
 qt-models/yearlystatisticsmodel.cpp | 2 +-
 10 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'qt-models')

diff --git a/qt-models/cylindermodel.cpp b/qt-models/cylindermodel.cpp
index 0892d58eb..19302421e 100644
--- a/qt-models/cylindermodel.cpp
+++ b/qt-models/cylindermodel.cpp
@@ -2,7 +2,7 @@
 #include "cylindermodel.h"
 #include "tankinfomodel.h"
 #include "models.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/color.h"
 #include "qt-models/diveplannermodel.h"
 #include "core/gettextfromc.h"
diff --git a/qt-models/diveimportedmodel.cpp b/qt-models/diveimportedmodel.cpp
index 8a0f4f7c7..d8d486a13 100644
--- a/qt-models/diveimportedmodel.cpp
+++ b/qt-models/diveimportedmodel.cpp
@@ -1,5 +1,5 @@
 #include "diveimportedmodel.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 
 DiveImportedModel::DiveImportedModel(QObject *o) : QAbstractTableModel(o),
 	firstIndex(0),
diff --git a/qt-models/divelistmodel.cpp b/qt-models/divelistmodel.cpp
index b9fb99b1b..23427002a 100644
--- a/qt-models/divelistmodel.cpp
+++ b/qt-models/divelistmodel.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qt-models/divelistmodel.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include <QDateTime>
 
 DiveListSortModel::DiveListSortModel(QObject *parent) : QSortFilterProxyModel(parent)
diff --git a/qt-models/divelistmodel.h b/qt-models/divelistmodel.h
index 87654f1ac..d7988f2d9 100644
--- a/qt-models/divelistmodel.h
+++ b/qt-models/divelistmodel.h
@@ -5,7 +5,6 @@
 #include <QAbstractListModel>
 #include <QSortFilterProxyModel>
 
-#include "core/helpers.h"
 #include "core/subsurface-qt/DiveObjectHelper.h"
 
 class DiveListSortModel : public QSortFilterProxyModel
diff --git a/qt-models/diveplannermodel.cpp b/qt-models/diveplannermodel.cpp
index 26a9ff175..2e3cb12a1 100644
--- a/qt-models/diveplannermodel.cpp
+++ b/qt-models/diveplannermodel.cpp
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "diveplannermodel.h"
 #include "core/subsurface-string.h"
-#include "core/helpers.h"
 #include "qt-models/cylindermodel.h"
 #include "core/planner.h"
 #include "qt-models/models.h"
diff --git a/qt-models/divetripmodel.cpp b/qt-models/divetripmodel.cpp
index 1e1f1530f..329858b34 100644
--- a/qt-models/divetripmodel.cpp
+++ b/qt-models/divetripmodel.cpp
@@ -3,7 +3,7 @@
 #include "core/gettextfromc.h"
 #include "core/metrics.h"
 #include "core/divelist.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/subsurface-string.h"
 #include <QIcon>
 #include <QDebug>
diff --git a/qt-models/gpslistmodel.cpp b/qt-models/gpslistmodel.cpp
index 231ec04f7..4a4a8feac 100644
--- a/qt-models/gpslistmodel.cpp
+++ b/qt-models/gpslistmodel.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qt-models/gpslistmodel.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include <QVector>
 
 GpsListModel *GpsListModel::m_instance = NULL;
diff --git a/qt-models/models.cpp b/qt-models/models.cpp
index a0f059165..74abf0533 100644
--- a/qt-models/models.cpp
+++ b/qt-models/models.cpp
@@ -6,7 +6,7 @@
  *
  */
 #include "qt-models/models.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 
 #include <QLocale>
 
diff --git a/qt-models/weightmodel.cpp b/qt-models/weightmodel.cpp
index 7a2f721dd..de2587adc 100644
--- a/qt-models/weightmodel.cpp
+++ b/qt-models/weightmodel.cpp
@@ -3,7 +3,7 @@
 #include "core/subsurface-string.h"
 #include "core/gettextfromc.h"
 #include "core/metrics.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "qt-models/weightsysteminfomodel.h"
 
 WeightModel::WeightModel(QObject *parent) : CleanerTableModel(parent),
diff --git a/qt-models/yearlystatisticsmodel.cpp b/qt-models/yearlystatisticsmodel.cpp
index a4a67aec7..9cbb19a1d 100644
--- a/qt-models/yearlystatisticsmodel.cpp
+++ b/qt-models/yearlystatisticsmodel.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qt-models/yearlystatisticsmodel.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/metrics.h"
 #include "core/statistics.h"
 
-- 
cgit v1.2.3-70-g09d2