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

refs #411, MS diff to reduce DBus signature length

Browse Source
This commit is contained in:
Klaus Basan
2015-04-28 01:04:27 +02:00
committed by Mathew Sutcliffe
parent 210fb5a530
commit afdf8eccad
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/tuple_private.h
View File

@@ -332,17 +332,25 @@ namespace BlackMisc
template <class T, class... Ts> template <class T, class... Ts>
static void marshallImpl(QDBusArgument &arg, const T &head, const Ts &... tail) static void marshallImpl(QDBusArgument &arg, const T &head, const Ts &... tail)
{ {
arg << head; marshallHelper(arg, head, 0);
marshallImpl(arg, tail...); marshallImpl(arg, tail...);
} }
template <class T, typename std::enable_if<std::is_base_of<CEmpty, T>::value, int>::type = 0>
static void marshallHelper(QDBusArgument &arg, const T &val, int) { static_cast<const typename T::CValueObject &>(val).marshallToDbus(arg); }
template <class T>
static void marshallHelper(QDBusArgument &arg, const T &val, ...) { arg << val; }
static void unmarshallImpl(const QDBusArgument &) {} static void unmarshallImpl(const QDBusArgument &) {}
template <class T, class... Ts> template <class T, class... Ts>
static void unmarshallImpl(const QDBusArgument &arg, T &head, Ts &... tail) static void unmarshallImpl(const QDBusArgument &arg, T &head, Ts &... tail)
{ {
arg >> head; unmarshallHelper(arg, head, 0);
unmarshallImpl(arg, tail...); unmarshallImpl(arg, tail...);
} }
template <class T, typename std::enable_if<std::is_base_of<CEmpty, T>::value, int>::type = 0>
static void unmarshallHelper(const QDBusArgument &arg, T &val, int) { static_cast<typename T::CValueObject &>(val).unmarshallFromDbus(arg); }
template <class T>
static void unmarshallHelper(const QDBusArgument &arg, T &val, ...) { arg >> val; }
static void debugImpl(QDebug) {} static void debugImpl(QDebug) {}
template <class T, class... Ts> template <class T, class... Ts>

1
src/blackmisc/valueobject.h
View File

@@ -427,6 +427,7 @@ namespace BlackMisc
return BaseOrDummy::isA(metaTypeId); return BaseOrDummy::isA(metaTypeId);
} }
public:
//! Marshall to DBus //! Marshall to DBus
virtual void marshallToDbus(QDBusArgument &argument) const virtual void marshallToDbus(QDBusArgument &argument) const
{ {