summaryrefslogtreecommitdiffstats
path: root/desktop-widgets
diff options
context:
space:
mode:
authorGravatar Berthold Stoeger <bstoeger@mail.tuwien.ac.at>2019-08-05 20:07:10 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2019-08-08 16:26:31 -0700
commit594d1d3514f91221884bdc31f29a09e8f325f1e8 (patch)
tree13b7d02568a0b332857935cb69bfb545fa13f966 /desktop-widgets
parent5da09a21bba0b3d8979d6b8e70baf52b0316242f (diff)
downloadsubsurface-594d1d3514f91221884bdc31f29a09e8f325f1e8.tar.gz
Cleanup: move file-related function declarations to file.h
A number of architecture-dependent functions were declared in dive.h. Move them to file.h so that not all file-manipulating translation units have to include dive.h. This is a small step in avoiding mass-recompilation on every change to dive.h Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'desktop-widgets')
-rw-r--r--desktop-widgets/divelogexportdialog.cpp13
-rw-r--r--desktop-widgets/subsurfacewebservices.cpp1
2 files changed, 8 insertions, 6 deletions
diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp
index 229909137..9bf8c16a8 100644
--- a/desktop-widgets/divelogexportdialog.cpp
+++ b/desktop-widgets/divelogexportdialog.cpp
@@ -5,20 +5,21 @@
#include <QtConcurrent>
#include <string.h> // Allows string comparisons and substitutions in TeX export
-#include "desktop-widgets/divelogexportdialog.h"
-#include "core/divelogexportlogic.h"
-#include "desktop-widgets/diveshareexportdialog.h"
#include "ui_divelogexportdialog.h"
-#include "desktop-widgets/subsurfacewebservices.h"
+#include "core/divelogexportlogic.h"
#include "core/worldmap-save.h"
#include "core/save-html.h"
#include "core/settings/qPrefDisplay.h"
-#include "desktop-widgets/mainwindow.h"
-#include "profile-widget/profilewidget2.h"
#include "core/save-profiledata.h"
#include "core/divesite.h"
#include "core/errorhelper.h"
+#include "core/file.h"
#include "core/tag.h"
+#include "desktop-widgets/mainwindow.h"
+#include "desktop-widgets/divelogexportdialog.h"
+#include "desktop-widgets/diveshareexportdialog.h"
+#include "desktop-widgets/subsurfacewebservices.h"
+#include "profile-widget/profilewidget2.h"
// Retrieves the current unit settings defined in the Subsurface preferences.
#define GET_UNIT(name, field, f, t) \
diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp
index 6bb6d44aa..57f3c2876 100644
--- a/desktop-widgets/subsurfacewebservices.cpp
+++ b/desktop-widgets/subsurfacewebservices.cpp
@@ -25,6 +25,7 @@
#include <QShortcut>
#include <QDebug>
#include <errno.h>
+#include <zip.h>
#ifdef Q_OS_UNIX
#include <unistd.h> // for dup(2)