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

refs #314, fromQVariant / location of toQVariant

Browse Source 
* renamed fromQVariant to convertFromQVariant, the "from" methods imply the object is changed (fromJson, fromString ..)
* implemented fromQVariant - changing the object by QVariant
* moved toQVariant into PQ template
* free function setFromQVariant
This commit is contained in:
Klaus Basan
2014-08-19 01:55:15 +02:00
parent c21a0bb0e4
commit 290abe3693
84 changed files with 478 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackmisc/setkeyboardhotkey.h
View File

@@ -15,6 +15,7 @@
#include "propertyindex.h"
#include "hwkeyboardkey.h"
#include "hotkeyfunction.h"
#include "blackmiscfreefunctions.h"
#include <QStringList>
#include <QKeySequence>
@@ -55,14 +56,7 @@ namespace BlackMisc
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::fromQVariant
virtual void fromQVariant(const QVariant &variant) override
{
Q_ASSERT(variant.canConvert<CSettingKeyboardHotkey>());
if (variant.canConvert<CSettingKeyboardHotkey>())
{
(*this) = variant.value<CSettingKeyboardHotkey>();
}
}
virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::getValueHash
virtual uint getValueHash() const override;