diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-12 11:33:12 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-15 15:00:58 +0000 |
| commit | bcc1eaab705834bfb6bed9b19f1b44bae10fef76 (patch) | |
| tree | 4f21483986814a4139b2b360749f48f4855245ae /src/dbus/qdbuspendingreply.h | |
| parent | 85aa0fd041fbaa258f089d86f227311e53f6206a (diff) | |
doc: Fix remaining qdoc warnings in QtDBus
Added many template clauses to \fn commands. Also added or
modified some uses of Q_CLANG_QDOC in some dbus include files
to work around some seriousl ugly template clauses that could
not be added to \fn commands. Also modified a few parameter
names in the documentation.
The first attempt at making this change caused syncqt to fail
to create QtDBus/QDBusPendingReply. This second attempt works.
Change-Id: I96c1fb9bcb1d9debf9409f6baf8c42e18fb9e75d
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/dbus/qdbuspendingreply.h')
| -rw-r--r-- | src/dbus/qdbuspendingreply.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 4bf574e140..4d2c3a7c5a 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -108,8 +108,10 @@ namespace QDBusPendingReplyTypes { template <> struct NotVoid<void> { typedef TypeIsVoid Type; }; } // namespace QDBusPendingReplyTypes +#ifndef Q_CLANG_QDOC template<typename T1 = void, typename T2 = void, typename T3 = void, typename T4 = void, typename T5 = void, typename T6 = void, typename T7 = void, typename T8 = void> +#endif class QDBusPendingReply: #ifdef Q_CLANG_QDOC public QDBusPendingCall @@ -150,6 +152,7 @@ public: using QDBusPendingReplyData::argumentAt; #endif +#ifndef Q_CLANG_QDOC template<int Index> inline const typename Select<Index>::Type argumentAt() const { @@ -157,6 +160,7 @@ public: typedef typename Select<Index>::Type ResultType; return qdbus_cast<ResultType>(argumentAt(Index), 0); } +#endif #if defined(Q_CLANG_QDOC) bool isFinished() const; @@ -167,6 +171,7 @@ public: QDBusError error() const; QDBusMessage reply() const; + typedef QVariant T1; inline T1 value() const; inline operator T1() const; #else |