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

refs #428 Move COriginator from Event into BlackMisc namespace

Browse Source
This commit is contained in:
Roland Winklmeier
2015-05-23 18:51:14 +02:00
parent 2d20f5bf9c
commit a7d27c7234
12 changed files with 145 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackcore/context_application.h
View File

@@ -17,7 +17,7 @@
#include "blackmisc/statusmessagelist.h"
#include "blackmisc/audio/voiceroomlist.h"
#include "blackmisc/eveventhotkeyfunction.h"
#include "blackmisc/evoriginator.h"
#include "blackmisc/originator.h"
#include <QObject>
#include <QReadWriteLock>
@@ -92,7 +92,7 @@ namespace BlackCore
//! A log message was logged
//! \note Used with CLogMessage, do not use directly
void messageLogged(const BlackMisc::CStatusMessage &message, const BlackMisc::Event::COriginator &origin);
void messageLogged(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin);
//! Work around for audio context, #382
void fakedSetComVoiceRoom(const BlackMisc::Audio::CVoiceRoomList &requestedRooms);
@@ -101,7 +101,7 @@ namespace BlackCore
//! Log a log message
//! \note Not pure because it can be called from the base class constructor.
//! \note this is the function which relays CLogMessage via DBus
virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::Event::COriginator &origin) { Q_UNUSED(message); Q_UNUSED(origin); }
virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin) { Q_UNUSED(message); Q_UNUSED(origin); }
//! Ping a token, used to check if application is alive
virtual qint64 ping(qint64 token) const = 0;

2
src/blackcore/context_application_impl.cpp
View File

@@ -31,7 +31,7 @@ namespace BlackCore
return this;
}
void CContextApplication::logMessage(const CStatusMessage &message, const Event::COriginator &origin)
void CContextApplication::logMessage(const CStatusMessage &message, const COriginator &origin)
{
if (!origin.isFromSameProcess())
{

2
src/blackcore/context_application_impl.h
View File

@@ -29,7 +29,7 @@ namespace BlackCore
public slots:
//! \copydoc IContextApplication::logMessage
virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::Event::COriginator &origin) override;
virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin) override;
//! \copydoc IContextApplication::ping()
virtual qint64 ping(qint64 token) const override;

4
src/blackcore/context_application_proxy.cpp
View File

@@ -35,7 +35,7 @@ namespace BlackCore
connect(inputManager, &CInputManager::hotkeyFuncEvent, this, &CContextApplicationProxy::processHotkeyFuncEvent);
inputManager->setEventForwarding(true);
connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const Event::COriginator & origin)
connect(this, &IContextApplication::messageLogged, this, [](const CStatusMessage & message, const COriginator & origin)
{
if (!origin.isFromSameProcess())
{
@@ -65,7 +65,7 @@ namespace BlackCore
/*
* Log a message
*/
void CContextApplicationProxy::logMessage(const CStatusMessage &message, const Event::COriginator &origin)
void CContextApplicationProxy::logMessage(const CStatusMessage &message, const COriginator &origin)
{
this->m_dBusInterface->callDBus(QLatin1Literal("logMessage"), message, origin);
}

2
src/blackcore/context_application_proxy.h
View File

@@ -26,7 +26,7 @@ namespace BlackCore
public slots:
//! \copydoc IContextApplication::logMessage
virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::Event::COriginator &origin) override;
virtual void logMessage(const BlackMisc::CStatusMessage &message, const BlackMisc::COriginator &origin) override;
//! \copydoc IContextApplication::ping()
virtual qint64 ping(qint64 token) const override;