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

refs #345 First wave of value classes using the CValueObjectStdTuple CRTP class template.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-10-30 22:08:22 +00:00
parent ecf8e6aafb
commit 4c8148acf1
68 changed files with 34 additions and 4499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/blackmisc/hwkeyboardkey.cpp
View File

@@ -24,22 +24,6 @@ namespace BlackMisc
m_qtKey(keyCode), m_modifier1(modifier1), m_modifier2(modifier2)
{}
void CKeyboardKey::registerMetadata()
{
qRegisterMetaType<CKeyboardKey>();
qDBusRegisterMetaType<CKeyboardKey>();
}
QJsonObject CKeyboardKey::toJson() const
{
return BlackMisc::serializeJson(TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
void CKeyboardKey::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
QString CKeyboardKey::convertToQString(bool /* i18n */) const
{
QString s = this->getModifier1AsString();
@@ -48,16 +32,6 @@ namespace BlackMisc
return s.trimmed();
}
int CKeyboardKey::getMetaTypeId() const
{
return qMetaTypeId<CKeyboardKey>();
}
bool CKeyboardKey::isA(int metaTypeId) const
{
return (metaTypeId == qMetaTypeId<CKeyboardKey>());
}
QString CKeyboardKey::modifierToString(CKeyboardKey::Modifier modifier)
{
switch (modifier)
@@ -132,46 +106,6 @@ namespace BlackMisc
return modifiers;
}
int CKeyboardKey::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CKeyboardKey &>(otherBase);
return compare(TupleConverter<CKeyboardKey>::toMetaTuple(*this), TupleConverter<CKeyboardKey>::toMetaTuple(other));
}
void CKeyboardKey::marshallToDbus(QDBusArgument &argument) const
{
argument << TupleConverter<CKeyboardKey>::toMetaTuple(*this);
}
void CKeyboardKey::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> TupleConverter<CKeyboardKey>::toMetaTuple(*this);
}
uint CKeyboardKey::getValueHash() const
{
return qHash(TupleConverter<CKeyboardKey>::toMetaTuple(*this));
}
bool CKeyboardKey::operator ==(const CKeyboardKey &other) const
{
if (this == &other) return true;
return TupleConverter<CKeyboardKey>::toMetaTuple(*this) == TupleConverter<CKeyboardKey>::toMetaTuple(other);
}
bool CKeyboardKey::operator !=(const CKeyboardKey &other) const
{
return !((*this) == other);
}
bool CKeyboardKey::operator< (CKeyboardKey const &other) const
{
if (this->getKey() < other.getKey())
return true;
else
return false;
}
void CKeyboardKey::cleanup()
{
if (!this->hasModifier()) return;