From 5da09a21bba0b3d8979d6b8e70baf52b0316242f Mon Sep 17 00:00:00 2001 From: Berthold Stoeger Date: Mon, 5 Aug 2019 19:41:15 +0200 Subject: Cleanup: move error reporting function declarations to errorhelper.h Move the declarations of the "report_error()" and "set_error_cb()" functions and the "verbose" variable to errorhelper.h. Thus, error-reporting translation units don't have to import the big dive.h header file. Signed-off-by: Berthold Stoeger --- desktop-widgets/divelistview.cpp | 1 + desktop-widgets/divelogexportdialog.cpp | 1 + desktop-widgets/mainwindow.cpp | 1 + desktop-widgets/mainwindow.h | 1 - desktop-widgets/preferences/preferences_network.cpp | 2 +- desktop-widgets/subsurfacewebservices.cpp | 1 + desktop-widgets/tab-widgets/maintab.cpp | 1 + 7 files changed, 6 insertions(+), 2 deletions(-) (limited to 'desktop-widgets') diff --git a/desktop-widgets/divelistview.cpp b/desktop-widgets/divelistview.cpp index c4f778a92..19eeccb13 100644 --- a/desktop-widgets/divelistview.cpp +++ b/desktop-widgets/divelistview.cpp @@ -19,6 +19,7 @@ #include #include #include +#include "core/errorhelper.h" #include "core/qthelper.h" #include "core/trip.h" #include "desktop-widgets/command.h" diff --git a/desktop-widgets/divelogexportdialog.cpp b/desktop-widgets/divelogexportdialog.cpp index e8047f551..229909137 100644 --- a/desktop-widgets/divelogexportdialog.cpp +++ b/desktop-widgets/divelogexportdialog.cpp @@ -17,6 +17,7 @@ #include "profile-widget/profilewidget2.h" #include "core/save-profiledata.h" #include "core/divesite.h" +#include "core/errorhelper.h" #include "core/tag.h" // Retrieves the current unit settings defined in the Subsurface preferences. diff --git a/desktop-widgets/mainwindow.cpp b/desktop-widgets/mainwindow.cpp index 2a1e879a8..d25ffe3af 100644 --- a/desktop-widgets/mainwindow.cpp +++ b/desktop-widgets/mainwindow.cpp @@ -21,6 +21,7 @@ #include "core/device.h" #include "core/divecomputer.h" #include "core/divesitehelpers.h" +#include "core/errorhelper.h" #include "core/file.h" #include "core/gettextfromc.h" #include "core/git-access.h" diff --git a/desktop-widgets/mainwindow.h b/desktop-widgets/mainwindow.h index 67a253eca..62cc1b6f1 100644 --- a/desktop-widgets/mainwindow.h +++ b/desktop-widgets/mainwindow.h @@ -21,7 +21,6 @@ #include "desktop-widgets/filterwidget2.h" #include "core/applicationstate.h" #include "core/gpslocation.h" -#include "core/dive.h" #define NUM_RECENT_FILES 4 diff --git a/desktop-widgets/preferences/preferences_network.cpp b/desktop-widgets/preferences/preferences_network.cpp index e151b2afc..a1f264b73 100644 --- a/desktop-widgets/preferences/preferences_network.cpp +++ b/desktop-widgets/preferences/preferences_network.cpp @@ -3,7 +3,7 @@ #include "ui_preferences_network.h" #include "subsurfacewebservices.h" #include "core/cloudstorage.h" -#include "core/dive.h" +#include "core/errorhelper.h" #include "core/settings/qPrefCloudStorage.h" #include "core/settings/qPrefProxy.h" #include diff --git a/desktop-widgets/subsurfacewebservices.cpp b/desktop-widgets/subsurfacewebservices.cpp index 2a42c0f2b..6bb6d44aa 100644 --- a/desktop-widgets/subsurfacewebservices.cpp +++ b/desktop-widgets/subsurfacewebservices.cpp @@ -7,6 +7,7 @@ #include "desktop-widgets/command.h" #include "desktop-widgets/usersurvey.h" #include "core/trip.h" +#include "core/errorhelper.h" #include "core/file.h" #include "desktop-widgets/mapwidget.h" #include "desktop-widgets/tab-widgets/maintab.h" diff --git a/desktop-widgets/tab-widgets/maintab.cpp b/desktop-widgets/tab-widgets/maintab.cpp index a13dd34bf..4b88f555b 100644 --- a/desktop-widgets/tab-widgets/maintab.cpp +++ b/desktop-widgets/tab-widgets/maintab.cpp @@ -20,6 +20,7 @@ #include "qt-models/divelocationmodel.h" #include "qt-models/filtermodels.h" #include "core/divesite.h" +#include "core/errorhelper.h" #include "core/subsurface-string.h" #include "core/gettextfromc.h" #include "desktop-widgets/locationinformation.h" -- cgit v1.2.3-70-g09d2