flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-30 22:29:13 +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;

3
src/blackmisc/blackmiscfreefunctions.cpp
View File

@@ -20,6 +20,7 @@
#include "statusmessagelist.h"
#include "pixmap.h"
#include "iconlist.h"
#include "originator.h"
#include "eventallclasses.h"
#include <QtNetwork/QHostInfo>
#include <QProcessEnvironment>
@@ -80,7 +81,6 @@ void BlackMisc::Hardware::registerMetadata()
*/
void BlackMisc::Event::registerMetadata()
{
COriginator::registerMetadata();
CEventHotkeyFunction::registerMetadata();
}
@@ -105,6 +105,7 @@ void BlackMisc::registerMetadata()
CLogCategory::registerMetadata();
CLogCategoryList::registerMetadata();
CPixmap::registerMetadata();
COriginator::registerMetadata();
// sub namespaces
PhysicalQuantities::registerMetadata();

1
src/blackmisc/eventallclasses.h
View File

@@ -10,7 +10,6 @@
#ifndef BLACKMISC_EVENT_ALLCLASSES_H
#define BLACKMISC_EVENT_ALLCLASSES_H
#include "blackmisc/evoriginator.h"
#include "blackmisc/eveventhotkeyfunction.h"
#endif // guard

2
src/blackmisc/eveventhotkeyfunction.h
View File

@@ -14,7 +14,7 @@
#include "blackmiscexport.h"
#include "valueobject.h"
#include "evoriginator.h"
#include "originator.h"
#include "hotkeyfunction.h"
#include "blackmiscfreefunctions.h"

57
src/blackmisc/evoriginator.cpp
View File

@@ -1,57 +0,0 @@
/* Copyright (C) 2014
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "evoriginator.h"
#include <QCoreApplication>
#include <QDBusConnection>
namespace BlackMisc
{
namespace Event
{
// Default constructor
COriginator::COriginator()
: m_machineId(QDBusConnection::localMachineId()),
m_processId(QCoreApplication::applicationPid()),
m_processName(QCoreApplication::applicationName())
{
}
bool COriginator::isFromLocalMachine() const
{
return QDBusConnection::localMachineId() == getMachineId();
}
bool COriginator::isFromSameProcess() const
{
return QCoreApplication::applicationPid() == getProcessId() && isFromLocalMachine();
}
bool COriginator::isFromSameProcessName() const
{
return QCoreApplication::applicationName() == getProcessName();
}
/*
* Convert to string
*/
QString COriginator::convertToQString(bool /* i18n */) const
{
QString s;
s.append(m_originatorName);
s.append(" ").append(m_machineId);
s.append(" ").append(m_primaryIpAddress);
s.append(" ").append(m_objectId);
s.append(" ").append(m_processId);
s.append(" ").append(m_processName);
return s;
}
}
}

78
src/blackmisc/evoriginator.h
View File

@@ -1,78 +0,0 @@
/* Copyright (C) 2014
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#ifndef BLACKMISC_EVENT_ORIGINATOR_H
#define BLACKMISC_EVENT_ORIGINATOR_H
//! \file
#include "blackmiscexport.h"
#include "valueobject.h"
#include "blackmiscfreefunctions.h"
#include <QByteArray>
#include <QString>
namespace BlackMisc
{
namespace Event
{
//! Value object encapsulating information about the originiator
class BLACKMISC_EXPORT COriginator :
public Mixin::MetaType<COriginator>,
public Mixin::HashByTuple<COriginator>,
public Mixin::DBusByTuple<COriginator>,
public Mixin::EqualsByTuple<COriginator>,
public Mixin::LessThanByTuple<COriginator>,
public Mixin::CompareByTuple<COriginator>,
public Mixin::Index<COriginator>,
public Mixin::String<COriginator>,
public Mixin::Icon<COriginator>
{
public:
//! Default constructor.
COriginator();
//! Get machine id
QByteArray getMachineId() const {return m_machineId;}
//! Get process id
qint32 getProcessId() const {return m_processId;}
//! Get process name
QString getProcessName() const {return m_processName;}
//! Check if originating from the same local machine
bool isFromLocalMachine() const;
//! Check if originating from the same process id
bool isFromSameProcess() const;
//! Check if originating from the same process name
bool isFromSameProcessName() const;
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(COriginator)
QString m_originatorName;
QByteArray m_machineId;
QByteArray m_primaryIpAddress;
QByteArray m_objectId;
qint32 m_processId;
QString m_processName;
};
}
}
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Event::COriginator, (o.m_originatorName, o.m_machineId, o.m_primaryIpAddress, o.m_objectId, o.m_processId, o.m_processName))
Q_DECLARE_METATYPE(BlackMisc::Event::COriginator)
#endif // BLACKMISC_EVENT_ORIGINATOR_H

52
src/blackmisc/originator.cpp Normal file
View File

@@ -0,0 +1,52 @@
/* Copyright (C) 2014
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "originator.h"
#include <QCoreApplication>
#include <QDBusConnection>
namespace BlackMisc
{
// Default constructor
COriginator::COriginator()
: m_machineId(QDBusConnection::localMachineId()),
m_processId(QCoreApplication::applicationPid()),
m_processName(QCoreApplication::applicationName())
{
}
bool COriginator::isFromLocalMachine() const
{
return QDBusConnection::localMachineId() == getMachineId();
}
bool COriginator::isFromSameProcess() const
{
return QCoreApplication::applicationPid() == getProcessId() && isFromLocalMachine();
}
bool COriginator::isFromSameProcessName() const
{
return QCoreApplication::applicationName() == getProcessName();
}
QString COriginator::convertToQString(bool /* i18n */) const
{
QString s;
s.append(m_originatorName);
s.append(" ").append(m_machineId);
s.append(" ").append(m_primaryIpAddress);
s.append(" ").append(m_objectId);
s.append(" ").append(m_processId);
s.append(" ").append(m_processName);
return s;
}
}

82
src/blackmisc/originator.h Normal file
View File

@@ -0,0 +1,82 @@
/* Copyright (C) 2014
* swift Project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#ifndef BLACKMISC_EVENT_ORIGINATOR_H
#define BLACKMISC_EVENT_ORIGINATOR_H
//! \file
#include "blackmiscexport.h"
#include "valueobject.h"
#include "blackmiscfreefunctions.h"
#include <QByteArray>
#include <QString>
namespace BlackMisc
{
//! Value object encapsulating information about the originiator
class BLACKMISC_EXPORT COriginator :
public Mixin::MetaType<COriginator>,
public Mixin::HashByTuple<COriginator>,
public Mixin::DBusByTuple<COriginator>,
public Mixin::EqualsByTuple<COriginator>,
public Mixin::LessThanByTuple<COriginator>,
public Mixin::CompareByTuple<COriginator>,
public Mixin::Index<COriginator>,
public Mixin::String<COriginator>,
public Mixin::Icon<COriginator>
{
public:
//! Default constructor.
COriginator();
//! Get machine id
QByteArray getMachineId() const {return m_machineId;}
//! Get process id
qint32 getProcessId() const {return m_processId;}
//! Get process name
QString getProcessName() const {return m_processName;}
//! Check if originating from the same local machine
bool isFromLocalMachine() const;
//! Check if originating from the same process id
bool isFromSameProcess() const;
//! Check if originating from the same process name
bool isFromSameProcessName() const;
//! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(COriginator)
QString m_originatorName;
QByteArray m_machineId;
QByteArray m_primaryIpAddress;
QByteArray m_objectId;
qint32 m_processId;
QString m_processName;
};
}
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::COriginator, (
o.m_originatorName,
o.m_machineId,
o.m_primaryIpAddress,
o.m_objectId,
o.m_processId,
o.m_processName
))
Q_DECLARE_METATYPE(BlackMisc::COriginator)
#endif // BLACKMISC_EVENT_ORIGINATOR_H