mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-28 03:35:38 +08:00
Some minor fixes (typos, doxygen, etc.) found during #846
This commit is contained in:
committed by
Mathew Sutcliffe
parent
8341da2310
commit
1e85842c71
@@ -35,13 +35,13 @@ namespace BlackCore
|
|||||||
|
|
||||||
CCoreFacadeConfig CCoreFacadeConfig::forCoreAllLocalInDBus(const QString &dbusBootstrapAddress)
|
CCoreFacadeConfig CCoreFacadeConfig::forCoreAllLocalInDBus(const QString &dbusBootstrapAddress)
|
||||||
{
|
{
|
||||||
const CCoreFacadeConfig cfg = CCoreFacadeConfig(CCoreFacadeConfig(CCoreFacadeConfig::LocalInDbusServer, dbusBootstrapAddress));
|
const CCoreFacadeConfig cfg(CCoreFacadeConfig::LocalInDbusServer, dbusBootstrapAddress);
|
||||||
return cfg;
|
return cfg;
|
||||||
}
|
}
|
||||||
|
|
||||||
CCoreFacadeConfig CCoreFacadeConfig::forCoreAllLocalInDBusNoAudio(const QString &dbusBootstrapAddress)
|
CCoreFacadeConfig CCoreFacadeConfig::forCoreAllLocalInDBusNoAudio(const QString &dbusBootstrapAddress)
|
||||||
{
|
{
|
||||||
CCoreFacadeConfig cfg = CCoreFacadeConfig(CCoreFacadeConfig(CCoreFacadeConfig::LocalInDbusServer, dbusBootstrapAddress));
|
CCoreFacadeConfig cfg(CCoreFacadeConfig::LocalInDbusServer, dbusBootstrapAddress);
|
||||||
cfg.m_audio = CCoreFacadeConfig::NotUsed;
|
cfg.m_audio = CCoreFacadeConfig::NotUsed;
|
||||||
return cfg;
|
return cfg;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -112,7 +112,6 @@ namespace BlackGui
|
|||||||
const auto currentAircraftParts = sGui->getIContextNetwork()->getRemoteAircraftParts(cs, -1).frontOrDefault();
|
const auto currentAircraftParts = sGui->getIContextNetwork()->getRemoteAircraftParts(cs, -1).frontOrDefault();
|
||||||
const auto aircraftPartsHistory = sGui->getIContextNetwork()->getAircraftPartsHistory(cs);
|
const auto aircraftPartsHistory = sGui->getIContextNetwork()->getAircraftPartsHistory(cs);
|
||||||
|
|
||||||
|
|
||||||
QString html;
|
QString html;
|
||||||
if (currentAircraftParts == CAircraftParts() && aircraftPartsHistory.isEmpty())
|
if (currentAircraftParts == CAircraftParts() && aircraftPartsHistory.isEmpty())
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -40,8 +40,8 @@ namespace BlackGui
|
|||||||
|
|
||||||
void CRegisterComponent::ps_update()
|
void CRegisterComponent::ps_update()
|
||||||
{
|
{
|
||||||
if (!sGui) { return; }
|
// if not supported, do nothing
|
||||||
Q_ASSERT_X(sGui->supportsContexts(), Q_FUNC_INFO, "Application does not support contexts");
|
if (!sGui || !sGui->supportsContexts()) { return; }
|
||||||
ui->tvp_RegisteredComponents->updateContainer(sGui->getIContextApplication()->getRegisteredApplications());
|
ui->tvp_RegisteredComponents->updateContainer(sGui->getIContextApplication()->getRegisteredApplications());
|
||||||
}
|
}
|
||||||
} // ns
|
} // ns
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ namespace BlackGui
|
|||||||
explicit CRegisterComponent(QWidget *parent = nullptr);
|
explicit CRegisterComponent(QWidget *parent = nullptr);
|
||||||
|
|
||||||
//! Destructor
|
//! Destructor
|
||||||
~CRegisterComponent();
|
virtual ~CRegisterComponent();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
//! Update data
|
//! Update data
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ int main(int argc, char *argv[])
|
|||||||
//! [SwiftApplicationDemo]
|
//! [SwiftApplicationDemo]
|
||||||
CGuiApplication::highDpiScreenSupport();
|
CGuiApplication::highDpiScreenSupport();
|
||||||
QApplication qa(argc, argv);
|
QApplication qa(argc, argv);
|
||||||
|
Q_UNUSED(qa); // init of qa is required, but qa not used
|
||||||
CGuiApplication a("swift core", CApplicationInfo::PilotClientCore, CIcons::swiftCore24());
|
CGuiApplication a("swift core", CApplicationInfo::PilotClientCore, CIcons::swiftCore24());
|
||||||
a.addWindowStateOption();
|
a.addWindowStateOption();
|
||||||
a.addDBusAddressOption();
|
a.addDBusAddressOption();
|
||||||
@@ -39,7 +40,11 @@ int main(int argc, char *argv[])
|
|||||||
a.useContexts(a.isParserOptionSet("coreaudio") ?
|
a.useContexts(a.isParserOptionSet("coreaudio") ?
|
||||||
CCoreFacadeConfig::forCoreAllLocalInDBus(dBusAdress) :
|
CCoreFacadeConfig::forCoreAllLocalInDBus(dBusAdress) :
|
||||||
CCoreFacadeConfig::forCoreAllLocalInDBusNoAudio(dBusAdress));
|
CCoreFacadeConfig::forCoreAllLocalInDBusNoAudio(dBusAdress));
|
||||||
a.start();
|
if (!a.start())
|
||||||
|
{
|
||||||
|
a.gracefulShutdown();
|
||||||
|
return EXIT_FAILURE;
|
||||||
|
}
|
||||||
//! [SwiftApplicationDemo]
|
//! [SwiftApplicationDemo]
|
||||||
|
|
||||||
if (!QSystemTrayIcon::isSystemTrayAvailable())
|
if (!QSystemTrayIcon::isSystemTrayAvailable())
|
||||||
|
|||||||
@@ -41,7 +41,7 @@ public:
|
|||||||
CSwiftCore(QWidget *parent = nullptr);
|
CSwiftCore(QWidget *parent = nullptr);
|
||||||
|
|
||||||
//! Destructor
|
//! Destructor
|
||||||
~CSwiftCore();
|
virtual ~CSwiftCore();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
//! \name PushButton slots
|
//! \name PushButton slots
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ int main(int argc, char *argv[])
|
|||||||
CGuiApplication a("swift mapping tool", CApplicationInfo::MappingTool, CIcons::swiftDatabase48());
|
CGuiApplication a("swift mapping tool", CApplicationInfo::MappingTool, CIcons::swiftDatabase48());
|
||||||
a.setSignalStartupAutomatically(false); // application will signal startup on its own
|
a.setSignalStartupAutomatically(false); // application will signal startup on its own
|
||||||
a.splashScreen(CIcons::swiftDatabase256());
|
a.splashScreen(CIcons::swiftDatabase256());
|
||||||
|
a.parse();
|
||||||
a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forMappingTool());
|
a.useWebDataServices(BlackCore::CWebReaderFlags::AllSwiftDbReaders, CDatabaseReaderConfigList::forMappingTool());
|
||||||
if (!a.start()) { return EXIT_FAILURE; }
|
if (!a.start()) { return EXIT_FAILURE; }
|
||||||
CSwiftData w;
|
CSwiftData w;
|
||||||
|
|||||||
Reference in New Issue
Block a user