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>

21 files changed, 16 insertions, 22 deletions

diff --git a/desktop-widgets/configuredivecomputerdialog.cpp b/desktop-widgets/configuredivecomputerdialog.cpp
index 1b11e66de..bceaa98f9 100644
--- a/desktop-widgets/configuredivecomputerdialog.cpp
+++ b/desktop-widgets/configuredivecomputerdialog.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/configuredivecomputerdialog.h"
 
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "desktop-widgets/mainwindow.h"
 #include "core/display.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
diff --git a/desktop-widgets/divecomputermanagementdialog.cpp b/desktop-widgets/divecomputermanagementdialog.cpp
index 62d0d4e28..0835abd6c 100644
--- a/desktop-widgets/divecomputermanagementdialog.cpp
+++ b/desktop-widgets/divecomputermanagementdialog.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/divecomputermanagementdialog.h"
 #include "desktop-widgets/mainwindow.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "qt-models/divecomputermodel.h"
 #include <QMessageBox>
 #include <QShortcut>
diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp
index 468daf5d1..20d708957 100644
--- a/desktop-widgets/divelistview.cpp
+++ b/desktop-widgets/divelistview.cpp
@@ -24,7 +24,6 @@
 #include "desktop-widgets/divelistview.h"
 #include "qt-models/divepicturemodel.h"
 #include "core/metrics.h"
-#include "core/helpers.h"
 
 DiveListView::DiveListView(QWidget *parent) : QTreeView(parent), mouseClickSelection(false), sortColumn(0),
 	currentOrder(Qt::DescendingOrder), dontEmitDiveChangedSignal(false), selectionSaved(false)
diff --git a/desktop-widgets/divelogexportdialog.h b/desktop-widgets/divelogexportdialog.h
index 7e734e6e1..f872487d6 100644
--- a/desktop-widgets/divelogexportdialog.h
+++ b/desktop-widgets/divelogexportdialog.h
@@ -5,7 +5,6 @@
 #include <QDialog>
 #include <QTextStream>
 #include <QFuture>
-#include "core/helpers.h"
 #include "core/statistics.h"
 
 class QAbstractButton;
diff --git a/desktop-widgets/diveplanner.cpp b/desktop-widgets/diveplanner.cpp
index bbaf8dc7f..82ff4db79 100644
--- a/desktop-widgets/diveplanner.cpp
+++ b/desktop-widgets/diveplanner.cpp
@@ -3,7 +3,7 @@
 #include "desktop-widgets/modeldelegates.h"
 #include "desktop-widgets/mainwindow.h"
 #include "core/planner.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
 
 #include "qt-models/cylindermodel.h"
diff --git a/desktop-widgets/diveshareexportdialog.cpp b/desktop-widgets/diveshareexportdialog.cpp
index 7d4c156aa..c106cdc75 100644
--- a/desktop-widgets/diveshareexportdialog.cpp
+++ b/desktop-widgets/diveshareexportdialog.cpp
@@ -4,7 +4,7 @@
 #include "desktop-widgets/mainwindow.h"
 #include "core/save-html.h"
 #include "desktop-widgets/subsurfacewebservices.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/cloudstorage.h"
 
 #include <QDesktopServices>
diff --git a/desktop-widgets/downloadfromdivecomputer.cpp b/desktop-widgets/downloadfromdivecomputer.cpp
index b2476d77c..887aaa2a5 100644
--- a/desktop-widgets/downloadfromdivecomputer.cpp
+++ b/desktop-widgets/downloadfromdivecomputer.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/downloadfromdivecomputer.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/divelistview.h"
 #include "core/display.h"
diff --git a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
index 13dc89d70..1600556f0 100644
--- a/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
+++ b/desktop-widgets/plugins/facebook/facebookconnectwidget.cpp
@@ -26,7 +26,7 @@
 #include "profile-widget/profilewidget2.h"
 
 #include "core/pref.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
 
 #include "ui_socialnetworksdialog.h"
diff --git a/desktop-widgets/preferences/preferences_language.cpp b/desktop-widgets/preferences/preferences_language.cpp
index 0738392a5..e4a63ae9e 100644
--- a/desktop-widgets/preferences/preferences_language.cpp
+++ b/desktop-widgets/preferences/preferences_language.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "preferences_language.h"
 #include "ui_preferences_language.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/subsurface-qt/SettingsObjectWrapper.h"
 
 #include <QApplication>
diff --git a/desktop-widgets/printer.cpp b/desktop-widgets/printer.cpp
index 2d1a1d258..64acf81c0 100644
--- a/desktop-widgets/printer.cpp
+++ b/desktop-widgets/printer.cpp
@@ -2,7 +2,7 @@
 #include "printer.h"
 #include "templatelayout.h"
 #include "core/statistics.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 
 #include <algorithm>
 #include <QPainter>
diff --git a/desktop-widgets/printoptions.cpp b/desktop-widgets/printoptions.cpp
index 91099b928..38a670cf8 100644
--- a/desktop-widgets/printoptions.cpp
+++ b/desktop-widgets/printoptions.cpp
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "printoptions.h"
 #include "templateedit.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 
 #include <QDebug>
 #include <QFileDialog>
diff --git a/desktop-widgets/simplewidgets.cpp b/desktop-widgets/simplewidgets.cpp
index 86b705cfc..0f22ff377 100644
--- a/desktop-widgets/simplewidgets.cpp
+++ b/desktop-widgets/simplewidgets.cpp
@@ -13,13 +13,12 @@
 
 #include "core/file.h"
 #include "desktop-widgets/mainwindow.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "libdivecomputer/parser.h"
 #include "desktop-widgets/divelistview.h"
 #include "core/display.h"
 #include "profile-widget/profilewidget2.h"
 #include "desktop-widgets/undocommands.h"
-#include "core/qthelper.h"
 #include "core/metadata.h"
 
 class MinMaxAvgWidgetPrivate {
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 2e04ec88d..db0c80832 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/subsurfacewebservices.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/webservice.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/usersurvey.h"
diff --git a/desktop-widgets/tab-widgets/TabDiveInformation.cpp b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
index 18391e7ca..09f180cb1 100644
--- a/desktop-widgets/tab-widgets/TabDiveInformation.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveInformation.cpp
@@ -3,7 +3,7 @@
 #include "ui_TabDiveInformation.h"
 #include "../tagwidget.h"
 
-#include <core/helpers.h>
+#include <core/qthelper.h>
 #include <core/statistics.h>
 #include <core/display.h>
 
diff --git a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp
index cc7946a88..55f61eb5a 100644
--- a/desktop-widgets/tab-widgets/TabDiveStatistics.cpp
+++ b/desktop-widgets/tab-widgets/TabDiveStatistics.cpp
@@ -2,7 +2,7 @@
 #include "TabDiveStatistics.h"
 #include "ui_TabDiveStatistics.h"
 
-#include <core/helpers.h>
+#include <core/qthelper.h>
 #include <core/display.h>
 #include <core/statistics.h>
 
diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp
index c9dccc7ea..62925ee52 100644
--- a/desktop-widgets/tab-widgets/maintab.cpp
+++ b/desktop-widgets/tab-widgets/maintab.cpp
@@ -8,7 +8,7 @@
 #include "desktop-widgets/tab-widgets/maintab.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/mapwidget.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/statistics.h"
 #include "desktop-widgets/modeldelegates.h"
 #include "qt-models/diveplannermodel.h"
diff --git a/desktop-widgets/templatelayout.cpp b/desktop-widgets/templatelayout.cpp
index 9831bc934..0d6586390 100644
--- a/desktop-widgets/templatelayout.cpp
+++ b/desktop-widgets/templatelayout.cpp
@@ -3,7 +3,6 @@
 #include <string>
 
 #include "templatelayout.h"
-#include "core/helpers.h"
 #include "core/display.h"
 
 QList<QString> grantlee_templates, grantlee_statistics_templates;
diff --git a/desktop-widgets/templatelayout.h b/desktop-widgets/templatelayout.h
index 6c3c079e4..2f5b24354 100644
--- a/desktop-widgets/templatelayout.h
+++ b/desktop-widgets/templatelayout.h
@@ -8,7 +8,6 @@
 #include "printoptions.h"
 #include "core/statistics.h"
 #include "core/qthelper.h"
-#include "core/helpers.h"
 #include "core/subsurface-qt/DiveObjectHelper.h"
 
 int getTotalWork(print_options *printOptions);
diff --git a/desktop-widgets/updatemanager.cpp b/desktop-widgets/updatemanager.cpp
index f853f3853..db4cd5ecc 100644
--- a/desktop-widgets/updatemanager.cpp
+++ b/desktop-widgets/updatemanager.cpp
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "desktop-widgets/updatemanager.h"
-#include "core/helpers.h"
 #include "core/qthelper.h"
 #include <QtNetwork>
 #include <QMessageBox>
diff --git a/desktop-widgets/usermanual.cpp b/desktop-widgets/usermanual.cpp
index 83bffb521..445f3755d 100644
--- a/desktop-widgets/usermanual.cpp
+++ b/desktop-widgets/usermanual.cpp
@@ -5,7 +5,7 @@
 
 #include "desktop-widgets/usermanual.h"
 #include "desktop-widgets/mainwindow.h"
-#include "core/helpers.h"
+#include "core/qthelper.h"
 
 SearchBar::SearchBar(QWidget *parent): QWidget(parent)
 {
diff --git a/desktop-widgets/usersurvey.cpp b/desktop-widgets/usersurvey.cpp
index dd6d62231..326a51f9e 100644
--- a/desktop-widgets/usersurvey.cpp
+++ b/desktop-widgets/usersurvey.cpp
@@ -9,7 +9,7 @@
 #include "desktop-widgets/subsurfacewebservices.h"
 #include "desktop-widgets/updatemanager.h"
 
-#include "core/helpers.h"
+#include "core/qthelper.h"
 #include "core/subsurfacesysinfo.h"
 
 UserSurvey::UserSurvey(QWidget *parent) : QDialog(parent),