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

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

14
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -7,7 +7,7 @@
*/
#include "blackconfig/buildconfig.h"
#include "blackmisc/simulation/fscommon/fscommonutil.h"
#include "blackmisc/simulation/fscommon/fsdirectories.h"
#include "blackmisc/simulation/simulatorinfo.h"
#include "blackmisc/simulation/xplane/xplaneutil.h"
#include "blackmisc/db/datastoreutility.h"
@@ -299,14 +299,14 @@ namespace BlackMisc
if (CBuildConfig::isRunningOnWindowsNtPlatform())
{
fs9 =
!CFsCommonUtil::fs9AircraftDir().isEmpty() &&
!CFsCommonUtil::fs9Dir().isEmpty();
!CFsDirectories::fs9AircraftDir().isEmpty() &&
!CFsDirectories::fs9Dir().isEmpty();
fsx =
!CFsCommonUtil::fsxSimObjectsDir().isEmpty() &&
!CFsCommonUtil::fsxDir().isEmpty();
!CFsDirectories::fsxSimObjectsDir().isEmpty() &&
!CFsDirectories::fsxDir().isEmpty();
p3d =
!CFsCommonUtil::p3dDir().isEmpty() &&
!CFsCommonUtil::p3dSimObjectsDir().isEmpty();
!CFsDirectories::p3dDir().isEmpty() &&
!CFsDirectories::p3dSimObjectsDir().isEmpty();
}
const bool xp = !CXPlaneUtil::xplaneRootDir().isEmpty();