mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-05 09:15:34 +08:00
Ref T192, formatting
This commit is contained in:
Klaus Basan
@@ -27,7 +27,7 @@ namespace BlackCore
|
||||
{
|
||||
CContextApplicationProxy::CContextApplicationProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextApplication(mode, runtime)
|
||||
{
|
||||
this->m_dBusInterface = new CGenericDBusInterface(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), connection, this);
|
||||
m_dBusInterface = new CGenericDBusInterface(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(), connection, this);
|
||||
this->relaySignals(serviceName, connection);
|
||||
|
||||
connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const CIdentifier & origin)
|
||||
@@ -73,50 +73,50 @@ namespace BlackCore
|
||||
{
|
||||
if (subscribersOf(message).containsAnyNotIn(CIdentifierList({ origin, {} })))
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("logMessage"), message, origin);
|
||||
m_dBusInterface->callDBus(QLatin1String("logMessage"), message, origin);
|
||||
}
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::addLogSubscription(const CIdentifier &subscriber, const CLogPattern &pattern)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("addLogSubscription"), subscriber, pattern);
|
||||
m_dBusInterface->callDBus(QLatin1String("addLogSubscription"), subscriber, pattern);
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::removeLogSubscription(const CIdentifier &subscriber, const CLogPattern &pattern)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("removeLogSubscription"), subscriber, pattern);
|
||||
m_dBusInterface->callDBus(QLatin1String("removeLogSubscription"), subscriber, pattern);
|
||||
}
|
||||
|
||||
CLogSubscriptionHash CContextApplicationProxy::getAllLogSubscriptions() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<CLogSubscriptionHash>(QLatin1String("getAllLogSubscriptions"));
|
||||
return m_dBusInterface->callDBusRet<CLogSubscriptionHash>(QLatin1String("getAllLogSubscriptions"));
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::synchronizeLogSubscriptions()
|
||||
{
|
||||
// note this proxy method does not call synchronizeLogSubscriptions in core
|
||||
m_logSubscriptions = getAllLogSubscriptions();
|
||||
m_logSubscriptions = this->getAllLogSubscriptions();
|
||||
for (const auto &pattern : CLogHandler::instance()->getAllSubscriptions()) { this->addLogSubscription({}, pattern); }
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::changeSettings(const CValueCachePacket &settings, const CIdentifier &origin)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("changeSettings"), settings, origin);
|
||||
m_dBusInterface->callDBus(QLatin1String("changeSettings"), settings, origin);
|
||||
}
|
||||
|
||||
BlackMisc::CValueCachePacket CContextApplicationProxy::getAllSettings() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CValueCachePacket>(QLatin1String("getAllSettings"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CValueCachePacket>(QLatin1String("getAllSettings"));
|
||||
}
|
||||
|
||||
QStringList CContextApplicationProxy::getUnsavedSettingsKeys() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<QStringList>(QLatin1String("getUnsavedSettingsKeys"));
|
||||
return m_dBusInterface->callDBusRet<QStringList>(QLatin1String("getUnsavedSettingsKeys"));
|
||||
}
|
||||
|
||||
CSettingsDictionary CContextApplicationProxy::getUnsavedSettingsKeysDescribed() const
|
||||
{
|
||||
CSettingsDictionary result = this->m_dBusInterface->callDBusRet<CSettingsDictionary>(QLatin1String("getUnsavedSettingsKeysDescribed"));
|
||||
CSettingsDictionary result = m_dBusInterface->callDBusRet<CSettingsDictionary>(QLatin1String("getUnsavedSettingsKeysDescribed"));
|
||||
for (auto it = result.begin(); it != result.end(); ++it)
|
||||
{
|
||||
// consolidate with local names to fill any gaps in remote names
|
||||
@@ -133,71 +133,71 @@ namespace BlackCore
|
||||
|
||||
BlackMisc::CStatusMessage CContextApplicationProxy::saveSettings(const QString &keyPrefix)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("saveSettings"), keyPrefix);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("saveSettings"), keyPrefix);
|
||||
}
|
||||
|
||||
BlackMisc::CStatusMessage CContextApplicationProxy::saveSettingsByKey(const QStringList &keys)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("saveSettingsByKey"), keys);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("saveSettingsByKey"), keys);
|
||||
}
|
||||
|
||||
BlackMisc::CStatusMessage CContextApplicationProxy::loadSettings()
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("loadSettings"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("loadSettings"));
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::registerHotkeyActions(const QStringList &actions, const CIdentifier &origin)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("registerHotkeyActions"), actions, origin);
|
||||
m_dBusInterface->callDBus(QLatin1String("registerHotkeyActions"), actions, origin);
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::callHotkeyAction(const QString &action, bool argument, const CIdentifier &origin)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("callHotkeyAction"), action, argument, origin);
|
||||
m_dBusInterface->callDBus(QLatin1String("callHotkeyAction"), action, argument, origin);
|
||||
}
|
||||
|
||||
BlackMisc::CIdentifier CContextApplicationProxy::registerApplication(const CIdentifier &application)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CIdentifier>(QLatin1String("registerApplication"), application);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CIdentifier>(QLatin1String("registerApplication"), application);
|
||||
}
|
||||
|
||||
void CContextApplicationProxy::unregisterApplication(const CIdentifier &application)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("unregisterApplication"), application);
|
||||
m_dBusInterface->callDBus(QLatin1String("unregisterApplication"), application);
|
||||
}
|
||||
|
||||
BlackMisc::CIdentifierList CContextApplicationProxy::getRegisteredApplications() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CIdentifierList>(QLatin1String("getRegisteredApplications"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CIdentifierList>(QLatin1String("getRegisteredApplications"));
|
||||
}
|
||||
|
||||
bool CContextApplicationProxy::writeToFile(const QString &fileName, const QString &content)
|
||||
{
|
||||
if (fileName.isEmpty()) { return false; }
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("writeToFile"), fileName, content);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("writeToFile"), fileName, content);
|
||||
}
|
||||
|
||||
QString CContextApplicationProxy::readFromFile(const QString &fileName) const
|
||||
{
|
||||
if (fileName.isEmpty()) { return ""; }
|
||||
return this->m_dBusInterface->callDBusRet<QString>(QLatin1String("readFromFile"), fileName);
|
||||
return m_dBusInterface->callDBusRet<QString>(QLatin1String("readFromFile"), fileName);
|
||||
}
|
||||
|
||||
bool CContextApplicationProxy::removeFile(const QString &fileName)
|
||||
{
|
||||
if (fileName.isEmpty()) { return false; }
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("removeFile"), fileName);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("removeFile"), fileName);
|
||||
}
|
||||
|
||||
bool CContextApplicationProxy::existsFile(const QString &fileName) const
|
||||
{
|
||||
if (fileName.isEmpty()) { return false; }
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("existsFile"), fileName);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("existsFile"), fileName);
|
||||
}
|
||||
|
||||
QString CContextApplicationProxy::dotCommandsHtmlHelp() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<QString>(QLatin1String("dotCommandsHtmlHelp"));
|
||||
return m_dBusInterface->callDBusRet<QString>(QLatin1String("dotCommandsHtmlHelp"));
|
||||
}
|
||||
|
||||
bool CContextApplicationProxy::isContextResponsive(const QString &dBusAddress, QString &msg, int timeoutMs)
|
||||
|
||||
@@ -32,7 +32,7 @@ namespace BlackCore
|
||||
{
|
||||
CContextNetworkProxy::CContextNetworkProxy(const QString &serviceName, QDBusConnection &connection, CCoreFacadeConfig::ContextMode mode, CCoreFacade *runtime) : IContextNetwork(mode, runtime), m_dBusInterface(nullptr)
|
||||
{
|
||||
this->m_dBusInterface = new BlackMisc::CGenericDBusInterface(
|
||||
m_dBusInterface = new BlackMisc::CGenericDBusInterface(
|
||||
serviceName , IContextNetwork::ObjectPath(), IContextNetwork::InterfaceName(),
|
||||
connection, this);
|
||||
this->relaySignals(serviceName, connection);
|
||||
@@ -106,232 +106,232 @@ namespace BlackCore
|
||||
|
||||
void CContextNetworkProxy::requestAtcBookingsUpdate() const
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("requestAtcBookingsUpdate"));
|
||||
m_dBusInterface->callDBus(QLatin1String("requestAtcBookingsUpdate"));
|
||||
}
|
||||
|
||||
BlackMisc::Aviation::CAtcStationList CContextNetworkProxy::getAtcStationsOnline() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsOnline"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsOnline"));
|
||||
}
|
||||
|
||||
CAtcStationList CContextNetworkProxy::getAtcStationsBooked() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsBooked"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getAtcStationsBooked"));
|
||||
}
|
||||
|
||||
CSimulatedAircraftList CContextNetworkProxy::getAircraftInRange() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraftList>(QLatin1String("getAircraftInRange"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraftList>(QLatin1String("getAircraftInRange"));
|
||||
}
|
||||
|
||||
CCallsignSet CContextNetworkProxy::getAircraftInRangeCallsigns() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CCallsignSet>(QLatin1String("getAircraftInRangeCallsigns"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CCallsignSet>(QLatin1String("getAircraftInRangeCallsigns"));
|
||||
}
|
||||
|
||||
int CContextNetworkProxy::getAircraftInRangeCount() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<int>(QLatin1String("getAircraftInRangeCount"));
|
||||
return m_dBusInterface->callDBusRet<int>(QLatin1String("getAircraftInRangeCount"));
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::isAircraftInRange(const CCallsign &callsign) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("isAircraftInRange"), callsign);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isAircraftInRange"), callsign);
|
||||
}
|
||||
|
||||
CSimulatedAircraft CContextNetworkProxy::getAircraftInRangeForCallsign(const CCallsign &callsign) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1String("getAircraftInRangeForCallsign"), callsign);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Simulation::CSimulatedAircraft>(QLatin1String("getAircraftInRangeForCallsign"), callsign);
|
||||
}
|
||||
|
||||
CAtcStation CContextNetworkProxy::getOnlineStationForCallsign(const CCallsign &callsign) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStation>(QLatin1String("getOnlineStationForCallsign"), callsign);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStation>(QLatin1String("getOnlineStationForCallsign"), callsign);
|
||||
}
|
||||
|
||||
CUserList CContextNetworkProxy::getUsers() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1String("getUsers"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1String("getUsers"));
|
||||
}
|
||||
|
||||
CUserList CContextNetworkProxy::getUsersForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1String("getUsersForCallsigns"), callsigns);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CUserList>(QLatin1String("getUsersForCallsigns"), callsigns);
|
||||
}
|
||||
|
||||
CUser CContextNetworkProxy::getUserForCallsign(const BlackMisc::Aviation::CCallsign &callsign) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CUser>(QLatin1String("getUserForCallsign"), callsign);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CUser>(QLatin1String("getUserForCallsign"), callsign);
|
||||
}
|
||||
|
||||
CClientList CContextNetworkProxy::getOtherClients() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1String("getOtherClients"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1String("getOtherClients"));
|
||||
}
|
||||
|
||||
CServerList CContextNetworkProxy::getVatsimFsdServers() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1String("getVatsimFsdServers"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1String("getVatsimFsdServers"));
|
||||
}
|
||||
|
||||
CServerList CContextNetworkProxy::getVatsimVoiceServers() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1String("getVatsimVoiceServers"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CServerList>(QLatin1String("getVatsimVoiceServers"));
|
||||
}
|
||||
|
||||
CClientList CContextNetworkProxy::getOtherClientsForCallsigns(const BlackMisc::Aviation::CCallsignSet &callsigns) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1String("getOtherClientsForCallsigns"), callsigns);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CClientList>(QLatin1String("getOtherClientsForCallsigns"), callsigns);
|
||||
}
|
||||
|
||||
CVoiceRoomList CContextNetworkProxy::getSelectedVoiceRooms() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Audio::CVoiceRoomList>(QLatin1String("getSelectedVoiceRooms"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Audio::CVoiceRoomList>(QLatin1String("getSelectedVoiceRooms"));
|
||||
}
|
||||
|
||||
CAtcStationList CContextNetworkProxy::getSelectedAtcStations() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getSelectedAtcStations"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CAtcStationList>(QLatin1String("getSelectedAtcStations"));
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::requestDataUpdates()
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("requestDataUpdates"));
|
||||
m_dBusInterface->callDBus(QLatin1String("requestDataUpdates"));
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::requestAtisUpdates()
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("requestAtisUpdates"));
|
||||
m_dBusInterface->callDBus(QLatin1String("requestAtisUpdates"));
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::updateAircraftEnabled(const CCallsign &callsign, bool enabledForRedering)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("updateAircraftEnabled"), callsign, enabledForRedering);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("updateAircraftEnabled"), callsign, enabledForRedering);
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::updateAircraftModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("updateAircraftModel"), callsign, model, originator);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("updateAircraftModel"), callsign, model, originator);
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::updateAircraftNetworkModel(const CCallsign &callsign, const CAircraftModel &model, const CIdentifier &originator)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("updateAircraftNetworkModel"), callsign, model, originator);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("updateAircraftNetworkModel"), callsign, model, originator);
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::updateFastPositionEnabled(const CCallsign &callsign, bool enableFastPositionSending)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("updateFastPositionEnabled"), callsign, enableFastPositionSending);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("updateFastPositionEnabled"), callsign, enableFastPositionSending);
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::setFastPositionEnabledCallsigns(CCallsignSet &callsigns)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("setFastPositionEnabledCallsigns"), callsigns);
|
||||
m_dBusInterface->callDBus(QLatin1String("setFastPositionEnabledCallsigns"), callsigns);
|
||||
}
|
||||
|
||||
CCallsignSet CContextNetworkProxy::getFastPositionEnabledCallsigns() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<CCallsignSet>(QLatin1String("getFastPositionEnabledCallsigns"));
|
||||
return m_dBusInterface->callDBusRet<CCallsignSet>(QLatin1String("getFastPositionEnabledCallsigns"));
|
||||
}
|
||||
|
||||
CStatusMessageList CContextNetworkProxy::getReverseLookupMessages(const CCallsign &callsign) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<CStatusMessageList>(QLatin1String("getReverseLookupMessages"), callsign);
|
||||
return m_dBusInterface->callDBusRet<CStatusMessageList>(QLatin1String("getReverseLookupMessages"), callsign);
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::isReverseLookupMessagesEnabled() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("isReverseLookupLoggingEnabled"));
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isReverseLookupLoggingEnabled"));
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::enableReverseLookupMessages(bool enabled)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("enableReverseLookupLogging"), enabled);
|
||||
m_dBusInterface->callDBus(QLatin1String("enableReverseLookupLogging"), enabled);
|
||||
}
|
||||
|
||||
CStatusMessageList CContextNetworkProxy::getAircraftPartsHistory(const CCallsign &callsign) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<CStatusMessageList>(QLatin1String("getAircraftPartsHistory"), callsign);
|
||||
return m_dBusInterface->callDBusRet<CStatusMessageList>(QLatin1String("getAircraftPartsHistory"), callsign);
|
||||
}
|
||||
|
||||
CAircraftPartsList CContextNetworkProxy::getRemoteAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, qint64 cutoffTimeValuesBefore) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<CAircraftPartsList>(QLatin1String("getRemoteAircraftParts"), callsign, cutoffTimeValuesBefore);
|
||||
return m_dBusInterface->callDBusRet<CAircraftPartsList>(QLatin1String("getRemoteAircraftParts"), callsign, cutoffTimeValuesBefore);
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::isAircraftPartsHistoryEnabled() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("isAircraftPartsHistoryEnabled"));
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isAircraftPartsHistoryEnabled"));
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::enableAircraftPartsHistory(bool enabled)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("enableAircraftPartsHistory"), enabled);
|
||||
m_dBusInterface->callDBus(QLatin1String("enableAircraftPartsHistory"), enabled);
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::testCreateDummyOnlineAtcStations(int number)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("testCreateDummyOnlineAtcStations"), number);
|
||||
m_dBusInterface->callDBus(QLatin1String("testCreateDummyOnlineAtcStations"), number);
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::testAddAircraftParts(const BlackMisc::Aviation::CCallsign &callsign, const CAircraftParts &parts, bool incremental)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("testAddAircraftParts"), callsign, parts, incremental);
|
||||
m_dBusInterface->callDBus(QLatin1String("testAddAircraftParts"), callsign, parts, incremental);
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::testReceivedTextMessages(const CTextMessageList &textMessages)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("testReceivedTextMessages"), textMessages);
|
||||
m_dBusInterface->callDBus(QLatin1String("testReceivedTextMessages"), textMessages);
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::testRequestAircraftConfig(const CCallsign &callsign)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("testRequestAircraftConfig"), callsign);
|
||||
m_dBusInterface->callDBus(QLatin1String("testRequestAircraftConfig"), callsign);
|
||||
}
|
||||
|
||||
CStatusMessage CContextNetworkProxy::connectToNetwork(const CServer &server, INetwork::LoginMode loginMode)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("connectToNetwork"), server, loginMode);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("connectToNetwork"), server, loginMode);
|
||||
}
|
||||
|
||||
CStatusMessage CContextNetworkProxy::disconnectFromNetwork()
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("disconnectFromNetwork"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::CStatusMessage>(QLatin1String("disconnectFromNetwork"));
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::isConnected() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("isConnected"));
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("isConnected"));
|
||||
}
|
||||
|
||||
CServer CContextNetworkProxy::getConnectedServer() const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Network::CServer>(QLatin1String("getConnectedServer"));
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Network::CServer>(QLatin1String("getConnectedServer"));
|
||||
}
|
||||
|
||||
bool CContextNetworkProxy::parseCommandLine(const QString &commandLine, const CIdentifier &originator)
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<bool>(QLatin1String("parseCommandLine"), commandLine, originator);
|
||||
return m_dBusInterface->callDBusRet<bool>(QLatin1String("parseCommandLine"), commandLine, originator);
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::sendTextMessages(const CTextMessageList &textMessages)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("sendTextMessages"), textMessages);
|
||||
m_dBusInterface->callDBus(QLatin1String("sendTextMessages"), textMessages);
|
||||
}
|
||||
|
||||
void CContextNetworkProxy::sendFlightPlan(const BlackMisc::Aviation::CFlightPlan &flightPlan)
|
||||
{
|
||||
this->m_dBusInterface->callDBus(QLatin1String("sendFlightPlan"), flightPlan);
|
||||
m_dBusInterface->callDBus(QLatin1String("sendFlightPlan"), flightPlan);
|
||||
}
|
||||
|
||||
CFlightPlan CContextNetworkProxy::loadFlightPlanFromNetwork(const CCallsign &callsign) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Aviation::CFlightPlan>(QLatin1String("loadFlightPlanFromNetwork"), callsign);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Aviation::CFlightPlan>(QLatin1String("loadFlightPlanFromNetwork"), callsign);
|
||||
}
|
||||
|
||||
CMetar CContextNetworkProxy::getMetarForAirport(const CAirportIcaoCode &airportIcaoCode) const
|
||||
{
|
||||
return this->m_dBusInterface->callDBusRet<BlackMisc::Weather::CMetar>(QLatin1String("getMetarForAirport"), airportIcaoCode);
|
||||
return m_dBusInterface->callDBusRet<BlackMisc::Weather::CMetar>(QLatin1String("getMetarForAirport"), airportIcaoCode);
|
||||
}
|
||||
} // ns
|
||||
} // ns
|
||||
|
||||
@@ -170,7 +170,7 @@ namespace BlackCore
|
||||
Q_ASSERT(!dBusAddress.isEmpty());
|
||||
if (m_dbusServer) { m_dbusServer->deleteLater(); } // delete if there was an existing one
|
||||
m_dbusServer = new CDBusServer(dBusAddress, this);
|
||||
CLogMessage(this).info("DBus server on address: %1") << dBusAddress;
|
||||
CLogMessage(this).info("DBus server on address: '%1'") << dBusAddress;
|
||||
}
|
||||
|
||||
void CCoreFacade::initPostSetup(QMap<QString, int> ×)
|
||||
|
||||
@@ -250,7 +250,7 @@ void SwiftGuiStd::onKickedFromNetwork(const QString &kickMessage)
|
||||
kickMessage.isEmpty() ? "You have been kicked from the network" : kickMessage));
|
||||
}
|
||||
|
||||
void SwiftGuiStd::onConnectionStatusChanged(BlackCore::INetwork::ConnectionStatus from, BlackCore::INetwork::ConnectionStatus to)
|
||||
void SwiftGuiStd::onConnectionStatusChanged(INetwork::ConnectionStatus from, INetwork::ConnectionStatus to)
|
||||
{
|
||||
Q_UNUSED(from);
|
||||
this->updateGuiStatusInformation();
|
||||
|
||||
Reference in New Issue
Block a user