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

refs #247 Using CVariant in property index system.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-12-07 16:08:32 +00:00
parent 9b060014af
commit 48f04a4750
52 changed files with 348 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/blackmisc/hwjoystickbutton.cpp
View File

@@ -9,6 +9,7 @@
#include "hwjoystickbutton.h"
#include "blackmiscfreefunctions.h"
#include "variant.h"
#include <QCoreApplication>
namespace BlackMisc
@@ -29,11 +30,11 @@ namespace BlackMisc
this->m_buttonIndex = button.m_buttonIndex;
}
void CJoystickButton::setPropertyByIndex(const QVariant &variant, const CPropertyIndex &index)
void CJoystickButton::setPropertyByIndex(const CVariant &variant, const CPropertyIndex &index)
{
if (index.isMyself())
{
this->convertFromQVariant(variant);
this->convertFromCVariant(variant);
return;
}
ColumnIndex i = index.frontCasted<ColumnIndex>();
@@ -53,23 +54,23 @@ namespace BlackMisc
}
}
QVariant CJoystickButton::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
CVariant CJoystickButton::propertyByIndex(const BlackMisc::CPropertyIndex &index) const
{
if (index.isMyself()) { return this->toQVariant(); }
if (index.isMyself()) { return this->toCVariant(); }
ColumnIndex i = index.frontCasted<ColumnIndex>();
switch (i)
{
case IndexButton:
return QVariant(this->getButtonIndex());
return CVariant::from(this->getButtonIndex());
case IndexButtonAsString:
return QVariant(this->getButtonAsString());
return CVariant::from(this->getButtonAsString());
default:
break;
}
Q_ASSERT_X(false, "CJoystickButton", "index unknown");
QString m = QString("no property, index ").append(index.toQString());
return QVariant::fromValue(m);
return CVariant::fromValue(m);
}
QString CJoystickButton::buttonIndexToString(qint32 buttonIndex)