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

refs #428, refs #432 some changes to COriginator / containers

Browse Source 
* originator, machine name, timestamp based, connect with QObject's &QObject::objectNameChanged
* list
This commit is contained in:
Klaus Basan
2015-05-27 03:42:56 +02:00
parent c02ee1dbed
commit 73164b2ffc
7 changed files with 118 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/originator.cpp
View File

@@ -10,22 +10,18 @@
#include "originator.h"
#include <QCoreApplication>
#include <QDBusConnection>
#include <QHostInfo>
namespace BlackMisc
{
COriginator::COriginator(const QString &name)
: m_name(name),
: m_name(name.trimmed()),
m_machineIdBase64(QDBusConnection::localMachineId().toBase64()),
m_machineName(QHostInfo::localHostName()),
m_processName(QCoreApplication::applicationName()),
m_processId(QCoreApplication::applicationPid()),
m_timestampMsEpoch(QDateTime::currentMSecsSinceEpoch())
m_processId(QCoreApplication::applicationPid())
{ }
COriginator::COriginator(const QObject *object) : COriginator(object->objectName())
{
Q_ASSERT_X(!object->objectName().isEmpty(), Q_FUNC_INFO, "Missing name");
}
QByteArray COriginator::getMachineId() const
{
return QByteArray::fromBase64(m_machineIdBase64.toLocal8Bit());
@@ -49,9 +45,9 @@ namespace BlackMisc
QString COriginator::convertToQString(bool i18n) const
{
Q_UNUSED(i18n);
QString s;
s.append(m_name);
QString s(m_name);
s.append(" ").append(m_machineIdBase64);
s.append(" ").append(m_machineName);
s.append(" ").append(QString::number(m_processId));
s.append(" ").append(m_processName);
return s;
@@ -62,12 +58,16 @@ namespace BlackMisc
if (index.isMyself()) { return this->toCVariant(); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
if (ITimestampBased::canHandleIndex(index)) { return ITimestampBased::propertyByIndex(index); }
switch (i)
{
case IndexName:
return CVariant::fromValue(m_name);
case IndexMachineIdBase64:
return CVariant::fromValue(m_machineIdBase64);
case IndexMachineName:
return CVariant::fromValue(getMachineName());
case IndexMachineId:
return CVariant::fromValue(getMachineId());
case IndexProcessId:
@@ -80,8 +80,6 @@ namespace BlackMisc
return CVariant::fromValue(isFromSameProcess());
case IndexIsFromSameProcessName:
return CVariant::fromValue(isFromSameProcessName());
case IndexUtcTimestamp:
return CVariant::fromValue(getTimestamp());
default:
return CValueObject::propertyByIndex(index);
}