mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Signed-off-by: Jan Iversen <jani@apache.org>
This commit is contained in:
jan Iversen 2018-09-08 19:46:11 +02:00 committed by Dirk Hohndel
parent 1ee7265972
commit 2385f48c6a
26 changed files with 48 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/cloudstorage.cpp
View file

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

14
core/settings/qPref.cpp
View file

@ -1,6 +1,20 @@
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
#include "qPref.h" #include "qPref.h"
#include "qPrefPrivate.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 <QtQml>
#include <QQmlContext> #include <QQmlContext>

15
core/settings/qPref.h
View file

@ -7,21 +7,6 @@
#include <QObject> #include <QObject>
#include <QQmlEngine> #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 { class qPref : public QObject {
Q_OBJECT Q_OBJECT
Q_PROPERTY(QString canonical_version READ canonical_version); Q_PROPERTY(QString canonical_version READ canonical_version);

5
desktop-widgets/mainwindow.cpp
View file

@ -47,7 +47,10 @@
#include "core/windowtitleupdate.h" #include "core/windowtitleupdate.h"
#include "desktop-widgets/locationinformation.h" #include "desktop-widgets/locationinformation.h"
#include "preferences/preferencesdialog.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 #ifndef NO_USERMANUAL
#include "usermanual.h" #include "usermanual.h"

4
desktop-widgets/preferences/preferences_defaults.cpp
View file

@ -2,7 +2,9 @@
#include "preferences_defaults.h" #include "preferences_defaults.h"
#include "ui_preferences_defaults.h" #include "ui_preferences_defaults.h"
#include "core/dive.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> #include <QFileDialog>

3
desktop-widgets/preferences/preferences_network.cpp
View file

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

2
desktop-widgets/subsurfacewebservices.cpp
View file

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

6
mobile-widgets/qmlmanager.cpp
View file

@ -33,9 +33,11 @@
#include "core/downloadfromdcthread.h" #include "core/downloadfromdcthread.h"
#include "core/subsurface-string.h" #include "core/subsurface-string.h"
#include "core/pref.h" #include "core/pref.h"
#include "core/settings/qPref.h"
#include "core/ssrf.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; QMLManager *QMLManager::m_instance = NULL;
bool noCloudToCloud = false; bool noCloudToCloud = false;

1
mobile-widgets/qmlprefs.cpp
View file

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

3
mobile-widgets/qmlprefs.h
View file

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

1
subsurface-mobile-main.cpp
View file

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

3
tests/testparseperformance.cpp
View file

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

2
tests/testqPrefCloudStorage.cpp
View file

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

2
tests/testqPrefDisplay.cpp
View file

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

2
tests/testqPrefDiveComputer.cpp
View file

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

2
tests/testqPrefDivePlanner.cpp
View file

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

2
tests/testqPrefFacebook.cpp
View file

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

2
tests/testqPrefGeneral.cpp
View file

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

2
tests/testqPrefGeocoding.cpp
View file

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

2
tests/testqPrefLanguage.cpp
View file

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

2
tests/testqPrefLocationService.cpp
View file

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

2
tests/testqPrefPartialPressureGas.cpp
View file

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

2
tests/testqPrefProxy.cpp
View file

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

2
tests/testqPrefTechnicalDetails.cpp
View file

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

2
tests/testqPrefUnits.cpp
View file

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

2
tests/testqPrefUpdateManager.cpp
View file

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