Style, in CGuiApplication sGui can be used as guard (no QPointer needed)

This commit is contained in:
Klaus Basan
2018-08-13 23:43:06 +02:00
parent 0327776edd
commit 755455e8a4
5 changed files with 39 additions and 53 deletions

View File

@@ -974,13 +974,8 @@ namespace BlackCore
// info that we will shutdown
emit this->aboutToShutdown();
// before marked as shutdown, otherwise URL
if (m_networkWatchDog)
{
m_networkWatchDog->gracefulShutdown();
}
// mark as shutdown
if (m_networkWatchDog) { m_networkWatchDog->gracefulShutdown(); }
m_shutdown = true;
// save settings (but only when application was really alive)
@@ -1035,11 +1030,7 @@ namespace BlackCore
}
emit this->setupHandlingCompleted(available);
if (m_signalStartup)
{
emit this->startUpCompleted(m_started);
}
if (m_signalStartup) { emit this->startUpCompleted(m_started); }
}
void CApplication::onStartUpCompleted()

View File

@@ -334,16 +334,16 @@ namespace BlackCore
//! \name Direct access to contexts if a CCoreFacade has been initialized
//! @{
const Context::IContextNetwork *getIContextNetwork() const;
const Context::IContextAudio *getIContextAudio() const;
const Context::IContextNetwork *getIContextNetwork() const;
const Context::IContextAudio *getIContextAudio() const;
const Context::IContextApplication *getIContextApplication() const;
const Context::IContextOwnAircraft *getIContextOwnAircraft() const;
const Context::IContextSimulator *getIContextSimulator() const;
Context::IContextNetwork *getIContextNetwork();
Context::IContextAudio *getIContextAudio();
Context::IContextApplication *getIContextApplication();
Context::IContextOwnAircraft *getIContextOwnAircraft();
Context::IContextSimulator *getIContextSimulator();
const Context::IContextSimulator *getIContextSimulator() const;
Context::IContextNetwork *getIContextNetwork();
Context::IContextAudio *getIContextAudio();
Context::IContextApplication *getIContextApplication();
Context::IContextOwnAircraft *getIContextOwnAircraft();
Context::IContextSimulator *getIContextSimulator();
//! @}
// ----------------------- setup data ---------------------------------