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

refs #313 Replaced old tuple system with meta tuples

Browse Source
This commit is contained in:
Roland Winklmeier
2014-08-04 20:18:35 +02:00
parent 50b5e80057
commit e06cb7d683
2 changed files with 7 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/blackmisc/hwkeyboardkey.cpp
View File

@@ -25,20 +25,12 @@ namespace BlackMisc
qDBusRegisterMetaType<CKeyboardKey>();
}
/*
* Members
*/
const QStringList &CKeyboardKey::jsonMembers()
{
return TupleConverter<CKeyboardKey>::jsonMembers();
}
/*
* To JSON
*/
QJsonObject CKeyboardKey::toJson() const
{
return BlackMisc::serializeJson(CKeyboardKey::jsonMembers(), TupleConverter<CKeyboardKey>::toTuple(*this));
return BlackMisc::serializeJson(TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
/*
@@ -46,7 +38,7 @@ namespace BlackMisc
*/
void CKeyboardKey::fromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CKeyboardKey::jsonMembers(), TupleConverter<CKeyboardKey>::toTuple(*this));
BlackMisc::deserializeJson(json, TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
@@ -148,7 +140,7 @@ namespace BlackMisc
int CKeyboardKey::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CKeyboardKey &>(otherBase);
return compare(TupleConverter<CKeyboardKey>::toTuple(*this), TupleConverter<CKeyboardKey>::toTuple(other));
return compare(TupleConverter<CKeyboardKey>::toMetaTuple(*this), TupleConverter<CKeyboardKey>::toMetaTuple(other));
}
/*
@@ -156,7 +148,7 @@ namespace BlackMisc
*/
void CKeyboardKey::marshallToDbus(QDBusArgument &argument) const
{
argument << TupleConverter<CKeyboardKey>::toTuple(*this);
argument << TupleConverter<CKeyboardKey>::toMetaTuple(*this);
}
/*
@@ -164,7 +156,7 @@ namespace BlackMisc
*/
void CKeyboardKey::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> TupleConverter<CKeyboardKey>::toTuple(*this);
argument >> TupleConverter<CKeyboardKey>::toMetaTuple(*this);
}
/*
@@ -172,7 +164,7 @@ namespace BlackMisc
*/
uint CKeyboardKey::getValueHash() const
{
return qHash(TupleConverter<CKeyboardKey>::toTuple(*this));
return qHash(TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
/*
@@ -181,7 +173,7 @@ namespace BlackMisc
bool CKeyboardKey::operator ==(const CKeyboardKey &other) const
{
if (this == &other) return true;
return TupleConverter<CKeyboardKey>::toTuple(*this) == TupleConverter<CKeyboardKey>::toTuple(other);
return TupleConverter<CKeyboardKey>::toMetaTuple(*this) == TupleConverter<CKeyboardKey>::toMetaTuple(other);
}
/*

3
src/blackmisc/hwkeyboardkey.h
View File

@@ -80,9 +80,6 @@ namespace BlackMisc
//! Register metadata
static void registerMetadata();
//! \copydoc TupleConverter<>::jsonMembers()
static const QStringList &jsonMembers();
//! Equal?
bool operator ==(const CKeyboardKey &other) const;