From b6f865431237e0bad504f18cf61c6efdc0c9a827 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Fri, 8 May 2015 21:52:29 +0100 Subject: [PATCH] refs #413 Doxygen fixes. (cherry picked from commit da107e6c5a90744c02bb61bc6be6ec026081b409) --- src/blackmisc/valueobject.h | 3 +-- src/blackmisc/variant_private.h | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/blackmisc/valueobject.h b/src/blackmisc/valueobject.h index 11f1b1167..a8b707fb2 100644 --- a/src/blackmisc/valueobject.h +++ b/src/blackmisc/valueobject.h @@ -39,16 +39,15 @@ namespace BlackMisc namespace Private { //! \private SFINAE for CValueObject constructor to avoid being selected as a viable copy constructor. - //! @{ template struct DecayFirst { typedef void type; }; + //! \private template struct DecayFirst { typedef typename std::decay::type type; }; - //! @} } /*! diff --git a/src/blackmisc/variant_private.h b/src/blackmisc/variant_private.h index 0b5db67c6..b4cb00d7d 100644 --- a/src/blackmisc/variant_private.h +++ b/src/blackmisc/variant_private.h @@ -96,11 +96,13 @@ namespace BlackMisc template struct CValueObjectMetaInfo : public IValueObjectMetaInfo { + //! \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 Derived : public U, public Fallback {}; # define DISABLE_IF_HAS(MEMBER) typename int_t<&Derived::MEMBER>::type + //! \endcond template static QJsonObject toJsonHelper(const U &object, DISABLE_IF_HAS(toJson)) { throw CVariantException(object, "toJson"); } template static QJsonObject toJsonHelper(const U &object, ...) { return object.toJson(); } @@ -203,7 +205,7 @@ namespace BlackMisc template IValueObjectMetaInfo *getValueObjectMetaInfo() { return getValueObjectMetaInfo(qMetaTypeId()); } - //! \private + //! \cond PRIVATE template struct MetaTypeHelperImpl { @@ -213,7 +215,6 @@ namespace BlackMisc static void maybeConvertFromQVariant(T &obj, const QVariant &var) { BlackMisc::setFromQVariant(&obj, var); } }; - //! \private template struct MetaTypeHelperImpl { @@ -223,9 +224,9 @@ namespace BlackMisc static void maybeConvertFromQVariant(T &, const QVariant &) {} }; - //! \private template using MetaTypeHelper = MetaTypeHelperImpl::Defined>; + //! \endcond } }