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

refs #413 Decomposed dbus-related functions of CValueObject into Mixin::DBusByTuple.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-03 19:59:06 +01:00
parent 2f55caf7c6
commit 30cc7048ac
10 changed files with 130 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/pq/measurementunit.h
View File

@@ -253,21 +253,21 @@ namespace BlackMisc
return this->getSymbol(i18n);
}
public:
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override
void marshallToDbus(QDBusArgument &argument) const
{
argument << this->m_symbol;
}
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &) override
void unmarshallFromDbus(const QDBusArgument &)
{
// the concrete implementations will override this default
// this is required so I can also stream None
(*this) = CMeasurementUnit::None();
}
public:
//! Default constructor for meta system
//! \remarks Only public because the need, to use this with the metasystem
CMeasurementUnit() : m_name("none"), m_symbol(""), m_epsilon(0), m_displayDigits(0)

4
src/blackmisc/pq/physicalquantity.h
View File

@@ -193,10 +193,10 @@ namespace BlackMisc
void makeNegative();
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &argument) const override;
void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc CValueObject::qHash
uint getValueHash() const;

27
src/blackmisc/pq/units.h
View File

@@ -135,9 +135,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -226,9 +225,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -308,9 +306,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -399,9 +396,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -507,9 +503,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -590,9 +585,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -692,9 +686,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -818,9 +811,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;
@@ -884,9 +876,8 @@ namespace BlackMisc
return u;
}
protected:
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &argument) override
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
argument >> unitName;