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

Issue #77 Factor out parts of CFsCommonUtil into new class CFsDirectories

Browse Source 
This breaks the cyclic dependency involving
CSimulatorInfo, CFsCommonUtil, and CAircraftModelList.
This commit is contained in:
Mat Sutcliffe
2020-11-12 22:43:44 +00:00
parent d09336bd26
commit 038c57d149
10 changed files with 800 additions and 711 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -16,7 +16,7 @@
#include "blackcore/context/contextapplicationproxy.h"
#include "blackcore/setupreader.h"
#include "blacksound/audioutilities.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/fscommon/fsdirectories.h"
#include "blackcore/context/contextnetwork.h"
#include "blackmisc/network/networkutils.h"
#include "blackmisc/dbusserver.h"
@@ -648,16 +648,16 @@ void CSwiftLauncher::showSimulatorConfigDirs()
if (s == ui->pb_P3DConfigDirs)
{
simDir = CFsCommonUtil::p3dDir();
simObjDir = CFsCommonUtil::p3dSimObjectsDir();
const QString versionHint = CFsCommonUtil::guessP3DVersion(simDir);
dirs = CFsCommonUtil::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(simObjDir, versionHint);
simDir = CFsDirectories::p3dDir();
simObjDir = CFsDirectories::p3dSimObjectsDir();
const QString versionHint = CFsDirectories::guessP3DVersion(simDir);
dirs = CFsDirectories::p3dSimObjectsDirPlusAddOnXmlSimObjectsPaths(simObjDir, versionHint);
}
else if (s == ui->pb_FSXConfigDirs)
{
dirs = CFsCommonUtil::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths();
simDir = CFsCommonUtil::fsxDir();
simObjDir = CFsCommonUtil::fsxSimObjectsDir();
dirs = CFsDirectories::fsxSimObjectsDirPlusAddOnXmlSimObjectsPaths();
simDir = CFsDirectories::fsxDir();
simObjDir = CFsDirectories::fsxSimObjectsDir();
}
const QString info = u"Sim.dir: " % simDir % "\n" %