From bcc1eaab705834bfb6bed9b19f1b44bae10fef76 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Fri, 12 Jan 2018 11:33:12 +0100 Subject: 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 --- src/dbus/qdbusreply.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/dbus/qdbusreply.h') diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 869687ac85..177b6c6e89 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -82,10 +82,14 @@ public: other.waitForFinished(); return *this = other.reply(); } +#if defined(Q_CLANG_QDOC) + inline QDBusReply(const QDBusPendingReply &reply) { } +#else inline QDBusReply(const QDBusPendingReply &reply) { *this = static_cast(reply); } +#endif inline QDBusReply(const QDBusError &dbusError = QDBusError()) : m_error(dbusError), m_data(Type()) -- cgit v1.2.3