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

Formatting, style

Browse Source
This commit is contained in:
Klaus Basan
2018-05-18 20:35:08 +02:00
parent 7965f67455
commit fc35e8b654
14 changed files with 66 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/blackcore/application.cpp
View File

@@ -111,6 +111,7 @@ namespace BlackCore
Q_ASSERT_X(!sApp, Q_FUNC_INFO, "already initialized");
Q_ASSERT_X(QCoreApplication::instance(), Q_FUNC_INFO, "no application object");
m_applicationInfo.setApplicationDataDirectory(CDirectoryUtils::normalizedApplicationDataDirectory());
QCoreApplication::setApplicationName(m_applicationName);
QCoreApplication::setApplicationVersion(CBuildConfig::getVersionString());
this->setObjectName(m_applicationName);
@@ -138,7 +139,7 @@ namespace BlackCore
const QString tempPath(this->getTemporaryDirectory());
BlackMisc::setMockCacheRootDirectory(tempPath);
}
m_alreadyRunning = CApplication::getRunningApplications().containsApplication(CApplication::getSwiftApplication());
m_alreadyRunning = CApplication::getRunningApplications().containsApplication(CApplication::getApplicationInfo().getApplication());
this->initParser();
this->initLogging();
this->tagApplicationDataDirectory();
@@ -229,12 +230,6 @@ namespace BlackCore
this->gracefulShutdown();
}
const CApplicationInfo &CApplication::getApplicationInfo() const
{
static const CApplicationInfo a(CApplication::getSwiftApplication());
return a;
}
CApplicationInfoList CApplication::getRunningApplications()
{
CApplicationInfoList apps;
@@ -251,7 +246,7 @@ namespace BlackCore
bool CApplication::isAlreadyRunning() const
{
return getRunningApplications().containsBy([this](const CApplicationInfo & info) { return info.getApplication() == getSwiftApplication(); });
return getRunningApplications().containsBy([this](const CApplicationInfo & info) { return info.getApplication() == getApplicationInfo().getApplication(); });
}
bool CApplication::isShuttingDown() const

9
src/blackcore/application.h
View File

@@ -111,9 +111,6 @@ namespace BlackCore
//! Destructor
virtual ~CApplication();
//! Application information
const BlackMisc::CApplicationInfo &getApplicationInfo() const;
//! Information about all running apps (including this one only if exec() has already been called)
static BlackMisc::CApplicationInfoList getRunningApplications();
@@ -130,6 +127,9 @@ namespace BlackCore
//! \threadsafe
bool isShuttingDown() const;
//! swift application running
const BlackMisc::CApplicationInfo &getApplicationInfo() const { return m_applicationInfo; }
//! Application name and version
const QString &getApplicationName() const { return m_applicationName; }
@@ -142,9 +142,6 @@ namespace BlackCore
//! Force single application (only one instance)
void setSingleApplication(bool singleApplication);
//! swift application running
BlackMisc::CApplicationInfo::Application getSwiftApplication() const { return m_applicationInfo.getApplication(); }
//! Executable names for the given applications
QString getExecutableForApplication(BlackMisc::CApplicationInfo::Application application) const;