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

refs #426 unmarshalling fix

Browse Source
This commit is contained in:
Klaus Basan
2015-05-17 13:07:58 +02:00
parent 104122023c
commit 2d506a4962
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/blackmisc/variant_private.h
View File

@@ -99,7 +99,7 @@ namespace BlackMisc
//! \cond PRIVATE
// http://en.wikibooks.org/wiki/More_C++_Idioms/Member_Detector
struct Fallback { int toJson, convertFromJson, setPropertyByIndex, propertyByIndex, propertyByIndexAsString, equalsPropertyByIndex, toIcon; };
template <int Fallback:: *> struct int_t { typedef int type; };
template <int Fallback::*> struct int_t { typedef int type; };
template <typename U> struct Derived : public U, public Fallback {};
# define DISABLE_IF_HAS(MEMBER) typename int_t<&Derived<U>::MEMBER>::type
//! \endcond
@@ -136,7 +136,7 @@ namespace BlackMisc
}
virtual void unmarshall(const QDBusArgument &arg, void *object) const override
{
cast(object).unmarshallFromDbus(arg);
arg >> cast(object);
}
virtual uint getValueHash(const void *object) const override
{
@@ -145,12 +145,12 @@ namespace BlackMisc
}
virtual int getMetaTypeId() const override
{
return maybeGetMetaTypeId(std::integral_constant<bool, QMetaTypeId<T>::Defined>{});
return maybeGetMetaTypeId(std::integral_constant<bool, QMetaTypeId<T>::Defined> {});
}
virtual const void *upCastTo(const void *object, int metaTypeId) const override
{
const auto base = static_cast<const void *>(static_cast<const MetaBaseOfT<T> *>(&cast(object)));
return metaTypeId == getMetaTypeId() ? object : CValueObjectMetaInfo<MetaBaseOfT<T>>{}.upCastTo(base, metaTypeId);
return metaTypeId == getMetaTypeId() ? object : CValueObjectMetaInfo<MetaBaseOfT<T>> {} .upCastTo(base, metaTypeId);
}
virtual int compareImpl(const void *lhs, const void *rhs) const override
{