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

Issue #77 Factor out parts of CDirectoryUtils into CSwiftDirectories

Browse Source 
CDirectoryUtils is utilities for manipulating directories.
CSwiftDirectories is getters that return directories used by swift.
This commit is contained in:
Mat Sutcliffe
2020-08-24 22:04:10 +01:00
parent 802576eda9
commit 8e065a8fef
61 changed files with 880 additions and 803 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/swiftlauncher/swiftlauncher.cpp
View File

@@ -20,6 +20,7 @@
#include "blackcore/context/contextnetwork.h"
#include "blackmisc/network/networkutils.h"
#include "blackmisc/dbusserver.h"
#include "blackmisc/swiftdirectories.h"
#include "blackmisc/directoryutils.h"
#include "blackmisc/icons.h"
#include "blackmisc/logmessage.h"
@@ -133,7 +134,7 @@ void CSwiftLauncher::installerMode()
bool runDialog = false;
do
{
const QDir dir = CDirectoryUtils::logDirectory();
const QDir dir = CSwiftDirectories::logDirectory();
if (!dir.exists()) { break; }
if (sGui && sGui->getSetupReader())
@@ -344,13 +345,13 @@ bool CSwiftLauncher::setSwiftCoreExecutable()
if (ui->cb_DisableCoreAudio->isChecked()) { args.append("--noaudio"); }
m_executableArgs = sGui->argumentsJoined(args);
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftCoreExecutableName());
m_executable = CSwiftDirectories::executableFilePath(CBuildConfig::swiftCoreExecutableName());
return true;
}
bool CSwiftLauncher::setSwiftDataExecutable()
{
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftDataExecutableName());
m_executable = CSwiftDirectories::executableFilePath(CBuildConfig::swiftDataExecutableName());
QStringList fsdArgs;
int id = 0;
@@ -369,7 +370,7 @@ bool CSwiftLauncher::setSwiftDataExecutable()
bool CSwiftLauncher::setSwiftGuiExecutable()
{
if (!sGui || sGui->isShuttingDown()) { return false; }
m_executable = CDirectoryUtils::executableFilePath(CBuildConfig::swiftGuiExecutableName());
m_executable = CSwiftDirectories::executableFilePath(CBuildConfig::swiftGuiExecutableName());
QStringList args
{
"--core", CoreModes::coreModeToString(getCoreMode()),