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

refs #140, changed CValueObject classes to tupel concept

Browse Source 
Remarks: Changes looking like an added file result from the shift of namespace voice -> audio
This commit is contained in:
Klaus Basan
2014-03-10 14:48:56 +01:00
parent 8f6a22e833
commit 34320ad3e1
43 changed files with 1293 additions and 768 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/blackmisc/avinformationmessage.cpp
View File

@@ -38,9 +38,7 @@ namespace BlackMisc
{
const auto &other = static_cast<const CInformationMessage &>(otherBase);
if (this->m_type < other.m_type) { return -1; }
if (this->m_type > other.m_type) { return 1; }
return this->m_message.compare(other.m_message);
return compare(TupleConverter<CInformationMessage>::toTuple(*this), TupleConverter<CInformationMessage>::toTuple(other));
}
/*
@@ -48,9 +46,7 @@ namespace BlackMisc
*/
void CInformationMessage::marshallToDbus(QDBusArgument &argument) const
{
argument << this->m_message;
argument << static_cast<int>(this->m_type);
argument << this->m_receivedTimestamp;
argument << TupleConverter<CInformationMessage>::toTuple(*this);
}
/*
@@ -58,11 +54,7 @@ namespace BlackMisc
*/
void CInformationMessage::unmarshallFromDbus(const QDBusArgument &argument)
{
uint type;
argument >> this->m_message;
argument >> type;
argument >> this->m_receivedTimestamp;
this->m_type = static_cast<InformationType>(type);
argument >> TupleConverter<CInformationMessage>::toTuple(*this);
}
/*
@@ -71,9 +63,7 @@ namespace BlackMisc
bool CInformationMessage::operator ==(const CInformationMessage &other) const
{
if (this == &other) return true;
return this->m_message == other.m_message &&
this->m_receivedTimestamp == other.m_receivedTimestamp &&
this->m_type == other.m_type;
return TupleConverter<CInformationMessage>::toTuple(*this) == TupleConverter<CInformationMessage>::toTuple(other);
}
/*
@@ -84,6 +74,14 @@ namespace BlackMisc
return !((*this) == other);
}
/*
* Hash
*/
uint CInformationMessage::getValueHash() const
{
return qHash(TupleConverter<CInformationMessage>::toTuple(*this));
}
/*
* Register metadata
*/
@@ -93,16 +91,6 @@ namespace BlackMisc
qDBusRegisterMetaType<CInformationMessage>();
}
/*
* Hash
*/
uint CInformationMessage::getValueHash() const
{
QList<uint> hashs;
hashs << qHash(this->m_message);
return BlackMisc::calculateHash(hashs, "CAtis");
}
/*
* Type as string
*/