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

refs #441 Rename COriginator to CIdentifier and rename COriginatorAware to CIdentifiable.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-06-05 12:57:40 +01:00
parent a4ca75c5c7
commit d4d862927e
90 changed files with 503 additions and 500 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/blackcore/context_application_proxy.cpp
View File

@@ -11,7 +11,7 @@
#include "blackcore/input_manager.h"
#include "blackmisc/blackmiscfreefunctions.h"
#include "blackmisc/loghandler.h"
#include "blackmisc/originatorlist.h"
#include "blackmisc/identifierlist.h"
#include <QObject>
#include <QMetaEnum>
#include <QDBusConnection>
@@ -32,7 +32,7 @@ namespace BlackCore
connect(inputManager, &CInputManager::hotkeyFuncEvent, this, &CContextApplicationProxy::processHotkeyFuncEvent);
inputManager->setEventForwarding(true);
connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const COriginator & origin)
connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const CIdentifier & origin)
{
if (!origin.isFromSameProcess())
{
@@ -45,7 +45,7 @@ namespace BlackCore
{
// signals originating from impl side
bool s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
"messageLogged", this, SIGNAL(messageLogged(BlackMisc::CStatusMessage, BlackMisc::COriginator)));
"messageLogged", this, SIGNAL(messageLogged(BlackMisc::CStatusMessage, BlackMisc::CIdentifier)));
Q_ASSERT(s);
s = connection.connect(serviceName, IContextApplication::ObjectPath(), IContextApplication::InterfaceName(),
"registrationChanged", this, SIGNAL(registrationChanged()));
@@ -56,24 +56,24 @@ namespace BlackCore
Q_UNUSED(s);
}
void CContextApplicationProxy::logMessage(const CStatusMessage &message, const COriginator &origin)
void CContextApplicationProxy::logMessage(const CStatusMessage &message, const CIdentifier &origin)
{
this->m_dBusInterface->callDBus(QLatin1Literal("logMessage"), message, origin);
}
BlackMisc::COriginator CContextApplicationProxy::registerApplication(const COriginator &application)
BlackMisc::CIdentifier CContextApplicationProxy::registerApplication(const CIdentifier &application)
{
return this->m_dBusInterface->callDBusRet<BlackMisc::COriginator>(QLatin1Literal("registerApplication"), application);
return this->m_dBusInterface->callDBusRet<BlackMisc::CIdentifier>(QLatin1Literal("registerApplication"), application);
}
void CContextApplicationProxy::unregisterApplication(const COriginator &application)
void CContextApplicationProxy::unregisterApplication(const CIdentifier &application)
{
this->m_dBusInterface->callDBus(QLatin1Literal("unregisterApplication"), application);
}
BlackMisc::COriginatorList CContextApplicationProxy::getRegisteredApplications() const
BlackMisc::CIdentifierList CContextApplicationProxy::getRegisteredApplications() const
{
return this->m_dBusInterface->callDBusRet<BlackMisc::COriginatorList>(QLatin1Literal("getRegisteredApplications"));
return this->m_dBusInterface->callDBusRet<BlackMisc::CIdentifierList>(QLatin1Literal("getRegisteredApplications"));
}
bool CContextApplicationProxy::writeToFile(const QString &fileName, const QString &content)