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

Shifted DBus operators to CBaseStreamStringifier, much easier to provide streaming - especially for derived classes.

Browse Source 
Still required but unwanted overloaded DBus operator in aviomodulator.h - no compilation without them. Need to be removed.
Enabled more classes for DBus.
This commit is contained in:
Klaus Basan
2013-07-24 02:20:32 +02:00
parent 8b512ba818
commit 9b2cb3b517
19 changed files with 335 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
src/blackmisc/pqbase.h
View File

@@ -50,6 +50,24 @@ protected:
return this->m_name;
}
/*!
* \brief Stream to DBus
* \param argument
*/
virtual void marshallToDbus(QDBusArgument &argument) const {
argument << this->m_name;
}
/*!
* \brief Stream from DBus
* \param argument
*/
virtual void unmarshallFromDbus(const QDBusArgument &argument) {
QString name;
argument >> name;
(*this) = CMeasurementPrefix::fromPrefixName(name);
}
public:
/*!
* \brief Copy constructor
@@ -224,6 +242,40 @@ public:
return milli;
}
/*!
* \brief All prefixes
* \return
*/
static const QList<CMeasurementPrefix> &prefixes()
{
static QList<CMeasurementPrefix> prefixes;
prefixes.append(CMeasurementPrefix::c());
prefixes.append(CMeasurementPrefix::G());
prefixes.append(CMeasurementPrefix::h());
prefixes.append(CMeasurementPrefix::k());
prefixes.append(CMeasurementPrefix::M());
prefixes.append(CMeasurementPrefix::m());
prefixes.append(CMeasurementPrefix::None());
prefixes.append(CMeasurementPrefix::One());
return prefixes;
}
/*!
* \brief Prefix from name
* \param prefixName must be valid!
* \return
*/
static const CMeasurementPrefix &fromPrefixName(const QString &prefixName) {
QList<CMeasurementPrefix> prefixes = CMeasurementPrefix::prefixes();
// read only, avoid deep copy
for (int i = 0; i < prefixes.size(); ++i) {
if (prefixes.at(i).getName() == prefixName) return (prefixes.at(i));
}
qFatal("Illegal unit name");
return CMeasurementPrefix::None(); // just suppress "not all control paths return a value"
}
};
// ---------------------------------------------------------------------------------
@@ -243,16 +295,11 @@ protected:
typedef double(*UnitConverter)(const CMeasurementUnit &, double);
/*!
* \brief Get unit from DBus argument
* \brief Stream to DBus
* \param argument
* \return
*/
static QString unitNameUnmarshalling(const QDBusArgument &argument) {
QString type;
argument.beginStructure();
argument >> type;
argument.endStructure();
return type;
virtual void marshallToDbus(QDBusArgument &argument) const {
argument << this->m_unitName;
}
private:
@@ -520,21 +567,6 @@ public:
return abs(checkValue) <= this->m_epsilon;
}
/*!
* Marshalling (to DBus) operator, unmarshalling to be found in specialized classes and
* mapping back to static object
* \brief Marshalling (to DBus) operator <<
* \param argument
* \param unit
* \return
*/
friend QDBusArgument &operator<<(QDBusArgument &argument, const CMeasurementUnit& unit) {
argument.beginStructure();
argument << unit.m_unitName;
argument.endStructure();
return argument;
}
// --------------------------------------------------------------------
// -- static
// --------------------------------------------------------------------