diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-07-15 23:44:39 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-07-18 05:42:55 -0700 |
| commit | 8f119dcf72db445530b39e0722c3afad7c130efb (patch) | |
| tree | f0e410011a4f476b4115929dd7062646a46ccc0b /core | |
| parent | 0136d76cf4fd5c62f4224d2d721fce2b78097104 (diff) | |
| download | subsurface-8f119dcf72db445530b39e0722c3afad7c130efb.tar.gz | |
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>
Diffstat (limited to 'core')
| -rw-r--r-- | core/checkcloudconnection.cpp | 1 | ||||
| -rw-r--r-- | core/cloudstorage.cpp | 1 | ||||
| -rw-r--r-- | core/downloadfromdcthread.cpp | 1 | ||||
| -rw-r--r-- | core/git-access.c | 1 | ||||
| -rw-r--r-- | core/gpslocation.cpp | 1 | ||||
| -rw-r--r-- | core/qt-init.cpp | 1 | ||||
| -rw-r--r-- | core/qthelper.h | 7 |
7 files changed, 10 insertions, 3 deletions
diff --git a/core/checkcloudconnection.cpp b/core/checkcloudconnection.cpp index b912160c1..1d8870742 100644 --- a/core/checkcloudconnection.cpp +++ b/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" diff --git a/core/cloudstorage.cpp b/core/cloudstorage.cpp index 77d9153e9..4e7ff10f0 100644 --- a/core/cloudstorage.cpp +++ b/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> diff --git a/core/downloadfromdcthread.cpp b/core/downloadfromdcthread.cpp index 1112d6027..9763cbdd8 100644 --- a/core/downloadfromdcthread.cpp +++ b/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" diff --git a/core/git-access.c b/core/git-access.c index f4f040ab9..ff27ebcf7 100644 --- a/core/git-access.c +++ b/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" diff --git a/core/gpslocation.cpp b/core/gpslocation.cpp index 3c63d4dbd..acc5b1da5 100644 --- a/core/gpslocation.cpp +++ b/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> diff --git a/core/qt-init.cpp b/core/qt-init.cpp index ad1671655..c06aeae00 100644 --- a/core/qt-init.cpp +++ b/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; diff --git a/core/qthelper.h b/core/qthelper.h index 685525a70..74185b467 100644 --- a/core/qthelper.h +++ b/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(); |