Cleanup: remove includes from qthelper.h

To reduce interdependencies, remove the dive.h and divelist.h
includes in qthelper.h

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

core/checkcloudconnection.cpp

@@ -8,6 +8,7 @@
 #include "pref.h"
 #include "qthelper.h"
 #include "git-access.h"
+#include "dive.h" // for "verbose"
 
 #include "checkcloudconnection.h"
 

core/cloudstorage.cpp

@@ -2,6 +2,7 @@
 #include "cloudstorage.h"
 #include "pref.h"
 #include "qthelper.h"
+#include "dive.h"
 #include "settings/qPrefCloudStorage.h"
 #include <QApplication>
 

core/downloadfromdcthread.cpp

@@ -2,6 +2,7 @@
 #include "core/libdivecomputer.h"
 #include "core/qthelper.h"
 #include "core/settings/qPrefDiveComputer.h"
+#include "core/divelist.h"
 #include <QDebug>
 #if defined(Q_OS_ANDROID)
 #include "core/subsurface-string.h"

core/git-access.c

@@ -22,6 +22,7 @@
 #include "membuffer.h"
 #include "strndup.h"
 #include "qthelper.h"
+#include "dive.h"
 #include "git-access.h"
 #include "gettext.h"
 #include "sha1.h"

core/gpslocation.cpp

@@ -4,6 +4,7 @@
 #include "qt-models/gpslistmodel.h"
 #include "core/pref.h"
 #include "core/qthelper.h"
+#include "core/divelist.h" // for mark_divelist_changed()
 #include "core/settings/qPrefLocationService.h"
 #include <time.h>
 #include <unistd.h>

core/qt-init.cpp

@@ -5,6 +5,7 @@
 #include <QLibraryInfo>
 #include <QTextCodec>
 #include "qthelper.h"
+#include "dive.h" // for "verbose"
 #include "core/settings/qPref.h"
 
 char *settings_suffix = NULL;

core/qthelper.h

@@ -5,8 +5,9 @@
 #include <stdint.h>
 #include <libxslt/transform.h>
 #include <libxslt/xsltutils.h>
-#include "dive.h"
-#include "divelist.h"
+#include "core/pref.h"
+
+struct picture;
 
 // 1) Types
 
@@ -26,7 +27,7 @@ QString distance_string(int distanceInMeters);
 bool gpsHasChanged(struct dive *dive, struct dive *master, const QString &gps_text, bool *parsed_out = 0);
 QList<int> getDivesInTrip(struct dive_trip *trip);
 QString get_gas_string(struct gasmix gas);
-QString get_divepoint_gas_string(struct dive *d, const divedatapoint& dp);
+QString get_divepoint_gas_string(struct dive *d, const struct divedatapoint &dp);
 QString get_taglist_string(struct tag_entry *tag_list);
 void read_hashes();
 void write_hashes();

desktop-widgets/downloadfromdivecomputer.cpp

@@ -3,6 +3,7 @@
 #include "desktop-widgets/command.h"
 #include "core/display.h"
 #include "core/qthelper.h"
+#include "core/divelist.h"
 #include "core/settings/qPrefDiveComputer.h"
 #include "core/subsurface-string.h"
 #include "core/uemis.h"

desktop-widgets/simplewidgets.cpp

@@ -23,6 +23,7 @@
 #include "desktop-widgets/command.h"
 #include "core/metadata.h"
 #include "core/tag.h"
+#include "core/divelist.h" // for mark_divelist_changed
 
 double MinMaxAvgWidget::average() const
 {

desktop-widgets/tab-widgets/TabDiveInformation.cpp

@@ -8,6 +8,7 @@
 #include "core/qthelper.h"
 #include "core/statistics.h"
 #include "core/display.h"
+#include "core/divelist.h"
 
 #define COMBO_CHANGED 0
 #define TEXT_EDITED 1

qt-models/cylindermodel.cpp

@@ -3,6 +3,7 @@
 #include "tankinfomodel.h"
 #include "models.h"
 #include "core/qthelper.h"
+#include "core/divelist.h" // for mark_divelist_changed()
 #include "core/color.h"
 #include "qt-models/diveplannermodel.h"
 #include "core/gettextfromc.h"

qt-models/diveimportedmodel.cpp

@@ -1,5 +1,6 @@
 #include "diveimportedmodel.h"
 #include "core/qthelper.h"
+#include "core/divelist.h"
 
 DiveImportedModel::DiveImportedModel(QObject *o) : QAbstractTableModel(o),
 	firstIndex(0),

qt-models/diveplannermodel.cpp

@@ -6,6 +6,7 @@
 #include "qt-models/models.h"
 #include "core/device.h"
 #include "core/qthelper.h"
+#include "core/divelist.h" // for mark_divelist_changed()
 #include "core/settings/qPrefDivePlanner.h"
 #include "desktop-widgets/command.h"
 #include "core/gettextfromc.h"

qt-models/models.cpp

@@ -7,6 +7,7 @@
  */
 #include "qt-models/models.h"
 #include "core/qthelper.h"
+#include "core/dive.h"
 #include "core/gettextfromc.h"
 
 #include <QLocale>