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

refs #808, CSimulatorInternals

Browse Source 
* renamed from CSimulatorSetup to CSimulatorInternals
* removed the FSX class, no longer needed
* utility functions for CNameVariantPair
This commit is contained in:
Klaus Basan
2016-11-17 04:39:19 +01:00
parent e9f52bb829
commit 2163fd9b01
21 changed files with 100 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/simulator/fsx/simulatorfsx.cpp
View File

@@ -13,7 +13,7 @@
#include "blackmisc/network/textmessage.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"
#include "blackmisc/simulation/fsx/fsxsimulatorinternals.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/simulation/aircraftmodel.h"
#include "blackmisc/aviation/airportlist.h"
@@ -50,7 +50,7 @@ namespace BlackSimPlugin
Q_ASSERT_X(ownAircraftProvider, Q_FUNC_INFO, "Missing provider");
Q_ASSERT_X(remoteAircraftProvider, Q_FUNC_INFO, "Missing provider");
Q_ASSERT_X(sApp, Q_FUNC_INFO, "Missing global object");
this->m_simulatorSetup = CFsxSimulatorSetup::getInitialSetup();
this->m_simulatorSetup = CFsxSimulatorInternals::getInitializedInternals();
this->m_realityBubbleTimer.setInterval(20 * 1000);
connect(&m_realityBubbleTimer, &QTimer::timeout, this, &CSimulatorFsx::ps_addAircraftCurrentlyOutOfBubble);

2
src/plugins/simulator/fsx/simulatorfsxsimconnectproc.cpp
View File

@@ -12,7 +12,7 @@
#include "simconnectdatadefinition.h"
#include "blackmisc/simulation/fscommon/bcdconversions.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"
#include "blackmisc/simulation/fsx/fsxsimulatorinternals.h"
#include "blackmisc/simulation/simulatorplugininfo.h"
#include "blackmisc/aviation/airportlist.h"
#include "blackmisc/logmessage.h"

4
src/plugins/simulator/fsxconfig/simconnectsettingscomponent.cpp
View File

@@ -14,7 +14,7 @@
#include "blackcore/context/contextsimulator.h"
#include "blackmisc/network/networkutils.h"
#include "blackmisc/logmessage.h"
#include "blackmisc/simulation/fsx/fsxsimulatorsetup.h"
#include "blackmisc/simulation/fsx/fsxsimulatorinternals.h"
#include "blackmisc/simulation/fsx/simconnectutilities.h"
#include <QFileInfo>
#include <QDesktopServices>
@@ -145,7 +145,7 @@ namespace BlackSimPlugin
if (sGui->getIContextSimulator())
{
fileName = sGui->getIContextSimulator()->getSimulatorSetup().getStringValue(CFsxSimulatorSetup::KeyLocalSimConnectCfgFilename());
fileName = sGui->getIContextSimulator()->getSimulatorInternals().getStringValue(CFsxSimulatorInternals::KeyLocalSimConnectCfgFilename());
}
if (fileName.isEmpty())