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>
This commit is contained in:
Berthold Stoeger 2019-07-15 23:44:39 +02:00 committed by Dirk Hohndel
parent 0136d76cf4
commit 8f119dcf72
14 changed files with 17 additions and 3 deletions

View file

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

View file

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

View file

@ -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"

View file

@ -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"

View file

@ -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>

View file

@ -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;

View file

@ -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();