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 #628 Use the metaclass mixins in all value classes.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-04-02 17:34:18 +01:00
parent 4f3637a046
commit 4bd4baa535
82 changed files with 629 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,13 +242,13 @@ namespace BlackMisc
return this->getSymbol(i18n);
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::marshallToDbus
void marshallToDbus(QDBusArgument &argument) const
{
argument << this->m_symbol;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &)
{
// the concrete implementations will override this default

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

@@ -180,22 +180,22 @@ namespace BlackMisc
//! Make value always negative
void makeNegative();
//! \copydoc BlackMisc::Mixin::DBusByTuple::marshallToDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::marshallToDbus
void marshallToDbus(QDBusArgument &argument) const;
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument);
//! \copydoc BlackMisc::Mixin::HashByTuple::qHash
//! \copydoc BlackMisc::Mixin::HashByMetaClass::qHash
uint getValueHash() const;
//! \copydoc CValueObject::qHash
friend uint qHash(const PQ &pq) { return pq.getValueHash(); }
//! \copydoc BlackMisc::Mixin::JsonByTuple::toJson
//! \copydoc BlackMisc::Mixin::JsonByMetaClass::toJson
QJsonObject toJson() const;
//! \copydoc BlackMisc::Mixin::JsonByTuple::convertFromJson
//! \copydoc BlackMisc::Mixin::JsonByMetaClass::convertFromJson
void convertFromJson(const QJsonObject &json);
//! Parse to string, with specified separator

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

@@ -74,14 +74,16 @@ namespace BlackMisc
static double parseNumber(const QString &number, bool &success, SeparatorMode mode = SeparatorsCLocale);
private:
BLACK_ENABLE_TUPLE_CONVERSION(CPqString)
QString m_string;
BLACK_METACLASS(CPqString,
BLACK_METAMEMBER(string)
);
};
}
}
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::PhysicalQuantities::CPqString, (o.m_string))
Q_DECLARE_METATYPE(BlackMisc::PhysicalQuantities::CPqString)
#endif // guard

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

@@ -143,7 +143,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -242,7 +242,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -332,7 +332,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -431,7 +431,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -547,7 +547,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -638,7 +638,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -747,7 +747,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -880,7 +880,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;
@@ -954,7 +954,7 @@ namespace BlackMisc
return u;
}
//! \copydoc BlackMisc::Mixin::DBusByTuple::unmarshallFromDbus
//! \copydoc BlackMisc::Mixin::DBusByMetaClass::unmarshallFromDbus
void unmarshallFromDbus(const QDBusArgument &argument)
{
QString unitName;