flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 14:55:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Smaller adjustments of unit test and application

Browse Source
This commit is contained in:
Klaus Basan
2018-05-27 00:04:00 +02:00
parent 90f84149ed
commit 4eeaf1adc4
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackcore/application.cpp
View File

@@ -359,8 +359,10 @@ namespace BlackCore
// crashpad dump
if (this->isSet(m_cmdTestCrashpad))
{
QPointer<CApplication> myself(this);
QTimer::singleShot(10 * 1000, [ = ]
{
if (!myself) { return; }
#ifdef BLACK_USE_CRASHPAD
CRASHPAD_SIMULATE_CRASH();
#else
@@ -547,7 +549,7 @@ namespace BlackCore
CSettingsCache::instance()->saveToStore(keys);
}
QString CApplication::getTemporaryDirectory() const
QString CApplication::getTemporaryDirectory()
{
static const QTemporaryDir tempDir;
if (tempDir.isValid()) { return tempDir.path(); }

6
src/blackcore/application.h
View File

@@ -184,12 +184,12 @@ namespace BlackCore
//! Comprehensive info
QString getInfoString(const QString &separator) const;
//! Directory for temporary files
QString getTemporaryDirectory() const;
//! Stop and restart application
void restartApplication(const QStringList &newArguments = {}, const QStringList &removeArguments = {});
//! Directory for temporary files
static QString getTemporaryDirectory();
//! Register as running
//! \note Normally done automatically when CApplication::exec is called
static bool registerAsRunning();

2
src/blackgui/components/dbownmodelsetcomponent.cpp
View File

@@ -334,7 +334,7 @@ namespace BlackGui
void CDbOwnModelSetComponent::showAirlineAircraftMatrix() const
{
const CAircraftModelList set(this->getModelSetFromView());
const QString file = CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrixFile(set, sGui->getTemporaryDirectory());
const QString file = CAircraftModelUtilities::createIcaoAirlineAircraftHtmlMatrixFile(set, CGuiApplication::getTemporaryDirectory());
if (file.isEmpty()) { return; }
QDesktopServices::openUrl(QUrl::fromLocalFile(file));
}

7
tests/blackcore/main.cpp
View File

@@ -32,12 +32,11 @@ int main(int argc, char *argv[])
a.addVatlibOptions();
const bool setup = a.parseAndSynchronizeSetup();
if (!setup) { qWarning() << "No setup loaded"; }
if (!a.start())
int r = EXIT_FAILURE;
if (a.start())
{
a.gracefulShutdown();
return EXIT_FAILURE;
r = CBlackCoreTestMain::unitMain(argc, argv);
}
const int r = CBlackCoreTestMain::unitMain(argc, argv);
a.gracefulShutdown();
return r;
}