core/settings ... : remove qPref* includes in qPref.h

reduce number of includes by removing qPref* includes in qPref.h

Signed-off-by: Jan Iversen <jani@apache.org>

core/cloudstorage.cpp

@@ -2,7 +2,7 @@
 #include "cloudstorage.h"
 #include "pref.h"
 #include "qthelper.h"
-#include "settings/qPref.h"
+#include "settings/qPrefCloudStorage.h"
 #include <QApplication>
 
 CloudStorageAuthenticate::CloudStorageAuthenticate(QObject *parent) :

core/settings/qPref.cpp

@@ -1,6 +1,20 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "qPref.h"
 #include "qPrefPrivate.h"
+#include "qPrefCloudStorage.h"
+#include "qPrefDisplay.h"
+#include "qPrefDiveComputer.h"
+#include "qPrefDivePlanner.h"
+#include "qPrefFacebook.h"
+#include "qPrefGeneral.h"
+#include "qPrefGeocoding.h"
+#include "qPrefLanguage.h"
+#include "qPrefLocationService.h"
+#include "qPrefPartialPressureGas.h"
+#include "qPrefProxy.h"
+#include "qPrefTechnicalDetails.h"
+#include "qPrefUnit.h"
+#include "qPrefUpdateManager.h"
 
 #include <QtQml>
 #include <QQmlContext>

core/settings/qPref.h

@@ -7,21 +7,6 @@
 #include <QObject>
 #include <QQmlEngine>
 
-#include "qPrefCloudStorage.h"
-#include "qPrefDisplay.h"
-#include "qPrefDiveComputer.h"
-#include "qPrefDivePlanner.h"
-#include "qPrefFacebook.h"
-#include "qPrefGeneral.h"
-#include "qPrefGeocoding.h"
-#include "qPrefLanguage.h"
-#include "qPrefLocationService.h"
-#include "qPrefPartialPressureGas.h"
-#include "qPrefProxy.h"
-#include "qPrefTechnicalDetails.h"
-#include "qPrefUnit.h"
-#include "qPrefUpdateManager.h"
-
 class qPref : public QObject {
 	Q_OBJECT
 	Q_PROPERTY(QString canonical_version READ canonical_version);

desktop-widgets/mainwindow.cpp

@@ -47,7 +47,10 @@
 #include "core/windowtitleupdate.h"
 #include "desktop-widgets/locationinformation.h"
 #include "preferences/preferencesdialog.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefPartialPressureGas.h"
+#include "core/settings/qPrefTechnicalDetails.h"
+#include "core/settings/qPrefCloudStorage.h"
+#include "core/settings/qPrefDisplay.h"
 
 #ifndef NO_USERMANUAL
 #include "usermanual.h"

desktop-widgets/preferences/preferences_defaults.cpp

@@ -2,7 +2,9 @@
 #include "preferences_defaults.h"
 #include "ui_preferences_defaults.h"
 #include "core/dive.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefGeneral.h"
+#include "core/settings/qPrefDisplay.h"
+#include "core/settings/qPrefCloudStorage.h"
 
 #include <QFileDialog>
 

desktop-widgets/preferences/preferences_network.cpp

@@ -4,7 +4,8 @@
 #include "subsurfacewebservices.h"
 #include "core/cloudstorage.h"
 #include "core/dive.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefCloudStorage.h"
+#include "core/settings/qPrefProxy.h"
 #include <QNetworkProxy>
 
 PreferencesNetwork::PreferencesNetwork() : AbstractPreferencesWidget(tr("Network"),QIcon(":preferences-system-network-icon"), 9), ui(new Ui::PreferencesNetwork())

desktop-widgets/subsurfacewebservices.cpp

@@ -2,7 +2,7 @@
 #include "desktop-widgets/subsurfacewebservices.h"
 #include "core/qthelper.h"
 #include "core/webservice.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefCloudStorage.h"
 #include "desktop-widgets/mainwindow.h"
 #include "desktop-widgets/usersurvey.h"
 #include "core/divelist.h"

mobile-widgets/qmlmanager.cpp

@@ -33,9 +33,11 @@
 #include "core/downloadfromdcthread.h"
 #include "core/subsurface-string.h"
 #include "core/pref.h"
-#include "core/settings/qPref.h"
-
 #include "core/ssrf.h"
+#include "core/settings/qPrefGeneral.h"
+#include "core/settings/qPrefLocationService.h"
+#include "core/settings/qPrefTechnicalDetails.h"
+#include "core/settings/qPrefPartialPressureGas.h"
 
 QMLManager *QMLManager::m_instance = NULL;
 bool noCloudToCloud = false;

mobile-widgets/qmlprefs.cpp

@@ -3,7 +3,6 @@
 #include "qmlmanager.h"
 
 #include "core/membuffer.h"
-#include "core/settings/qPref.h"
 #include "core/gpslocation.h"
 
 

mobile-widgets/qmlprefs.h

@@ -3,7 +3,8 @@
 #define QMLPREFS_H
 
 #include <QObject>
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefCloudStorage.h"
+#include "core/settings/qPrefDisplay.h"
 
 
 class QMLPrefs : public QObject {

subsurface-mobile-main.cpp

@@ -12,6 +12,7 @@
 #include "core/qthelper.h"
 #include "core/subsurfacestartup.h"
 #include "core/settings/qPref.h"
+#include "core/settings/qPrefDisplay.h"
 
 #include <QApplication>
 #include <QLocale>

tests/testparseperformance.cpp

@@ -3,7 +3,8 @@
 #include "core/dive.h"
 #include "core/divelist.h"
 #include "core/git-access.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefProxy.h"
+#include "core/settings/qPrefCloudStorage.h"
 #include <QFile>
 #include <QDebug>
 #include <QNetworkProxy>

tests/testqPrefCloudStorage.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefCloudStorage.h"
 
 #include <QTest>
 

tests/testqPrefDisplay.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefDisplay.h"
 
 #include <QDate>
 #include <QTest>

tests/testqPrefDiveComputer.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefDiveComputer.h"
 
 #include <QTest>
 

tests/testqPrefDivePlanner.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefDivePlanner.h"
 
 #include <QTest>
 

tests/testqPrefFacebook.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 #include "testqPrefFacebook.h"
 
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefFacebook.h"
 #include "core/pref.h"
 #include "core/qthelper.h"
 

tests/testqPrefGeneral.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefGeneral.h"
 
 #include <QTest>
 

tests/testqPrefGeocoding.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefGeocoding.h"
 
 #include <QTest>
 

tests/testqPrefLanguage.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefLanguage.h"
 
 #include <QTest>
 

tests/testqPrefLocationService.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefLocationService.h"
 
 #include <QTest>
 

tests/testqPrefPartialPressureGas.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefPartialPressureGas.h"
 
 #include <QTest>
 

tests/testqPrefProxy.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefProxy.h"
 
 #include <QTest>
 

tests/testqPrefTechnicalDetails.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefTechnicalDetails.h"
 
 #include <QTest>
 

tests/testqPrefUnits.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefUnit.h"
 
 #include <QTest>
 

tests/testqPrefUpdateManager.cpp

@@ -3,7 +3,7 @@
 
 #include "core/pref.h"
 #include "core/qthelper.h"
-#include "core/settings/qPref.h"
+#include "core/settings/qPrefUpdateManager.h"
 
 #include <QTest>