diff --git a/src/blackmisc/variant_private.h b/src/blackmisc/variant_private.h index b4cb00d7d..2e07b21a3 100644 --- a/src/blackmisc/variant_private.h +++ b/src/blackmisc/variant_private.h @@ -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 struct int_t { typedef int type; }; + template struct int_t { typedef int type; }; template struct Derived : public U, public Fallback {}; # define DISABLE_IF_HAS(MEMBER) typename int_t<&Derived::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::Defined>{}); + return maybeGetMetaTypeId(std::integral_constant::Defined> {}); } virtual const void *upCastTo(const void *object, int metaTypeId) const override { const auto base = static_cast(static_cast *>(&cast(object))); - return metaTypeId == getMetaTypeId() ? object : CValueObjectMetaInfo>{}.upCastTo(base, metaTypeId); + return metaTypeId == getMetaTypeId() ? object : CValueObjectMetaInfo> {} .upCastTo(base, metaTypeId); } virtual int compareImpl(const void *lhs, const void *rhs) const override {