flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-20 04:25:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup the enabled modules in all sub projects

Browse Source 
Most modules were just enabled to add include path for dependent headers
This commit is contained in:
Roland Winklmeier
2018-05-14 16:06:35 +02:00
committed by Klaus Basan
parent 8fad39fdaf
commit 4aaccb44c3
27 changed files with 30 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/blackmiscsim/sampleblackmiscsim.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus network xml QT += core dbus network
TARGET = sampleblackmiscsim TARGET = sampleblackmiscsim
TEMPLATE = app TEMPLATE = app

9
src/blackcore/application.cpp
View File

@@ -106,7 +106,7 @@ namespace BlackCore
CApplication::CApplication(const QString &applicationName, CApplicationInfo::Application application, bool init) : CApplication::CApplication(const QString &applicationName, CApplicationInfo::Application application, bool init) :
m_accessManager(new QNetworkAccessManager(this)), m_accessManager(new QNetworkAccessManager(this)),
m_applicationInfo(application), m_applicationInfo(application),
m_cookieManager({}, this), m_applicationName(applicationName), m_coreFacadeConfig(CCoreFacadeConfig::allEmpty()) m_applicationName(applicationName), m_coreFacadeConfig(CCoreFacadeConfig::allEmpty())
{ {
Q_ASSERT_X(!sApp, Q_FUNC_INFO, "already initialized"); Q_ASSERT_X(!sApp, Q_FUNC_INFO, "already initialized");
Q_ASSERT_X(QCoreApplication::instance(), Q_FUNC_INFO, "no application object"); Q_ASSERT_X(QCoreApplication::instance(), Q_FUNC_INFO, "no application object");
@@ -157,8 +157,9 @@ namespace BlackCore
sApp = this; sApp = this;
Q_ASSERT_X(m_accessManager, Q_FUNC_INFO, "Need QAM"); Q_ASSERT_X(m_accessManager, Q_FUNC_INFO, "Need QAM");
m_networkWatchDog.reset(new CNetworkWatchdog(this)); // not yet started m_networkWatchDog.reset(new CNetworkWatchdog(this)); // not yet started
m_cookieManager.setParent(m_accessManager); m_cookieManager = new CCookieManager({}, this);
m_accessManager->setCookieJar(&m_cookieManager); m_cookieManager->setParent(m_accessManager);
m_accessManager->setCookieJar(m_cookieManager);
connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, this, &CApplication::changedInternetAccessibility, Qt::QueuedConnection); connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, this, &CApplication::changedInternetAccessibility, Qt::QueuedConnection);
connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, this, &CApplication::onChangedNetworkAccessibility, Qt::QueuedConnection); connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, this, &CApplication::onChangedNetworkAccessibility, Qt::QueuedConnection);
connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, m_networkWatchDog.data(), &CNetworkWatchdog::onChangedNetworkAccessibility, Qt::QueuedConnection); connect(m_accessManager, &QNetworkAccessManager::networkAccessibleChanged, m_networkWatchDog.data(), &CNetworkWatchdog::onChangedNetworkAccessibility, Qt::QueuedConnection);
@@ -709,7 +710,7 @@ namespace BlackCore
void CApplication::deleteAllCookies() void CApplication::deleteAllCookies()
{ {
m_cookieManager.deleteAllCookies(); m_cookieManager->deleteAllCookies();
} }
CNetworkWatchdog *CApplication::getNetworkWatchdog() const CNetworkWatchdog *CApplication::getNetworkWatchdog() const

4
src/blackcore/application.h
View File

@@ -13,7 +13,6 @@
#define BLACKCORE_APPLICATION_H #define BLACKCORE_APPLICATION_H
#include "blackcore/blackcoreexport.h" #include "blackcore/blackcoreexport.h"
#include "blackcore/cookiemanager.h"
#include "blackcore/corefacadeconfig.h" #include "blackcore/corefacadeconfig.h"
#include "blackcore/db/databasereaderconfig.h" #include "blackcore/db/databasereaderconfig.h"
#include "blackcore/data/globalsetup.h" #include "blackcore/data/globalsetup.h"
@@ -62,6 +61,7 @@ namespace crashpad
namespace BlackCore namespace BlackCore
{ {
class CCoreFacade; class CCoreFacade;
class CCookieManager;
class CSetupReader; class CSetupReader;
class CWebDataServices; class CWebDataServices;
class ISimulator; class ISimulator;
@@ -616,7 +616,7 @@ namespace BlackCore
QScopedPointer<CWebDataServices> m_webDataServices; //!< web data services QScopedPointer<CWebDataServices> m_webDataServices; //!< web data services
QScopedPointer<Db::CNetworkWatchdog> m_networkWatchDog; //!< checking DB/internet access QScopedPointer<Db::CNetworkWatchdog> m_networkWatchDog; //!< checking DB/internet access
QScopedPointer<BlackMisc::CFileLogger> m_fileLogger; //!< file logger QScopedPointer<BlackMisc::CFileLogger> m_fileLogger; //!< file logger
CCookieManager m_cookieManager; //!< single cookie manager for our access manager QPointer<CCookieManager> m_cookieManager; //!< single cookie manager for our access manager
const QString m_applicationName; //!< application name const QString m_applicationName; //!< application name
QReadWriteLock m_accessManagerLock; //!< lock to make access manager access threadsafe QReadWriteLock m_accessManagerLock; //!< lock to make access manager access threadsafe
CCoreFacadeConfig m_coreFacadeConfig; //!< Core facade config if any CCoreFacadeConfig m_coreFacadeConfig; //!< Core facade config if any

1
src/blackcore/db/databasereaderconfig.h
View File

@@ -15,7 +15,6 @@
#include "blackcore/blackcoreexport.h" #include "blackcore/blackcoreexport.h"
#include "blackmisc/pq/time.h" #include "blackmisc/pq/time.h"
#include "blackmisc/network/entityflags.h" #include "blackmisc/network/entityflags.h"
#include "blackmisc/network/url.h"
#include "blackmisc/db/dbflags.h" #include "blackmisc/db/dbflags.h"
#include "blackmisc/sequence.h" #include "blackmisc/sequence.h"
#include "blackmisc/valueobject.h" #include "blackmisc/valueobject.h"

2
src/blackgui/blackgui.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += network dbus gui svg widgets QT += core dbus gui network svg widgets
TARGET = blackgui TARGET = blackgui
TEMPLATE = lib TEMPLATE = lib

3
src/blackinput/blackinput.pro
View File

@@ -1,6 +1,7 @@
load(common_pre) load(common_pre)
QT += network dbus gui widgets multimedia QT += core dbus
macx: QT += widgets
TARGET = blackinput TARGET = blackinput
TEMPLATE = lib TEMPLATE = lib

2
src/blackinput/macos/keyboardmacos.mm
View File

@@ -11,7 +11,7 @@
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include <QHash> #include <QHash>
#include <QtWidgets/QMessageBox> #include <QMessageBox>
#include <CoreFoundation/CoreFoundation.h> #include <CoreFoundation/CoreFoundation.h>
#include <AppKit/NSEvent.h> #include <AppKit/NSEvent.h>
#include <AppKit/NSAlert.h> #include <AppKit/NSAlert.h>

2
src/blackmisc/simulation/fscommon/aircraftcfgparser.cpp
View File

@@ -7,7 +7,6 @@
* contained in the LICENSE file. * contained in the LICENSE file.
*/ */
#include "blackcore/db/databaseutils.h"
#include "blackmisc/simulation/aircraftmodelutils.h" #include "blackmisc/simulation/aircraftmodelutils.h"
#include "blackmisc/simulation/fscommon/aircraftcfgentries.h" #include "blackmisc/simulation/fscommon/aircraftcfgentries.h"
#include "blackmisc/simulation/fscommon/aircraftcfgparser.h" #include "blackmisc/simulation/fscommon/aircraftcfgparser.h"
@@ -37,7 +36,6 @@ using namespace BlackMisc;
using namespace BlackMisc::Simulation; using namespace BlackMisc::Simulation;
using namespace BlackMisc::Simulation::FsCommon; using namespace BlackMisc::Simulation::FsCommon;
using namespace BlackMisc::Network; using namespace BlackMisc::Network;
using namespace BlackCore::Db;
namespace BlackMisc namespace BlackMisc
{ {

2
src/blacksound/blacksound.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += network dbus gui multimedia QT += dbus multimedia
TARGET = blacksound TARGET = blacksound
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/fs9/fs9.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus gui network xml widgets QT += core dbus network widgets
TARGET = simulatorfs9 TARGET = simulatorfs9
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/fscommon/fscommon.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus xml network QT += core dbus network
TARGET = simulatorfscommon TARGET = simulatorfscommon
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/fsuipc32/fsuipc32.pro
View File

@@ -2,7 +2,7 @@ load(common_pre)
requires(equals(WORD_SIZE,32)) requires(equals(WORD_SIZE,32))
QT += core dbus xml network QT += core
TARGET = fsuipc TARGET = fsuipc
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/fsuipc64/fsuipc64.pro
View File

@@ -2,7 +2,7 @@ load(common_pre)
requires(equals(WORD_SIZE,64)) requires(equals(WORD_SIZE,64))
QT += core dbus xml network QT += core
TARGET = fsuipc TARGET = fsuipc
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/fsx/fsx.pro
View File

@@ -2,7 +2,7 @@ load(common_pre)
REQUIRES += contains(BLACK_CONFIG,FSX) REQUIRES += contains(BLACK_CONFIG,FSX)
QT += core dbus gui network xml widgets QT += core dbus widgets
TARGET = simulatorfsx TARGET = simulatorfsx
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/fsxcommon/fsxcommon.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus xml network widgets QT += core dbus network widgets
TARGET = simulatorfsxcommon TARGET = simulatorfsxcommon
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/fsxconfig/fsxconfig.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += core widgets dbus network QT += core dbus network widgets
TARGET = simulatorfsxconfig TARGET = simulatorfsxconfig
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/p3d/p3d.pro
View File

@@ -2,7 +2,7 @@ load(common_pre)
REQUIRES += contains(BLACK_CONFIG,P3D) REQUIRES += contains(BLACK_CONFIG,P3D)
QT += core dbus gui network xml widgets QT += core dbus widgets
TARGET = simulatorp3d TARGET = simulatorp3d
TEMPLATE = lib TEMPLATE = lib

1
src/plugins/simulator/p3d/simulatorp3d.cpp
View File

@@ -8,7 +8,6 @@
*/ */
#include "simulatorp3d.h" #include "simulatorp3d.h"
#include "blackcore/application.h"
#include "blackmisc/threadutils.h" #include "blackmisc/threadutils.h"
#include "blackmisc/logmessage.h" #include "blackmisc/logmessage.h"
#include "blackconfig/buildconfig.h" #include "blackconfig/buildconfig.h"

2
src/plugins/simulator/p3dconfig/p3dconfig.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += core widgets dbus network QT += core dbus network widgets
TARGET = simulatorp3dconfig TARGET = simulatorp3dconfig
TEMPLATE = lib TEMPLATE = lib

2
src/plugins/simulator/xplane/xplane.pro
View File

@@ -1,6 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus network widgets QT += core dbus widgets
TARGET = simulatorxplane TARGET = simulatorxplane
TEMPLATE = lib TEMPLATE = lib

4
src/swiftcore/swiftcore.pro
View File

@@ -1,8 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus network xml multimedia gui svg QT += core dbus network widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = swiftcore TARGET = swiftcore
TEMPLATE = app TEMPLATE = app

4
src/swiftdata/swiftdata.pro
View File

@@ -1,8 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus network xml multimedia gui svg QT += core dbus network widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = swiftdata TARGET = swiftdata
TEMPLATE = app TEMPLATE = app

4
src/swiftguistandard/swiftguistandard.pro
View File

@@ -1,8 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus gui svg network xml multimedia QT += core dbus network widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = swiftguistd TARGET = swiftguistd
TEMPLATE = app TEMPLATE = app

4
src/swiftlauncher/swiftlauncher.pro
View File

@@ -1,8 +1,6 @@
load(common_pre) load(common_pre)
QT += core dbus gui svg network xml multimedia QT += core dbus network widgets
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = swiftlauncher TARGET = swiftlauncher
TEMPLATE = app TEMPLATE = app