From e210b1233d93544321132aa8d202e39003395284 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Wed, 31 May 2017 09:21:58 +0200 Subject: [PATCH] doc: Correct a few minor qdoc errors MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A use of Q_QDOC is changed to Q_CLANG_QDOC. A misspelled std type name is corrected. A few extraneous ';' are removed. Change-Id: Ic49f64a3b97f645268a8ecbbca5f0eef0456bb33 Reviewed-by: Topi Reiniö --- src/corelib/io/qdatastream.cpp | 4 ++-- src/corelib/kernel/qabstracteventdispatcher.cpp | 4 ++-- src/corelib/kernel/qabstracteventdispatcher.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/corelib/io/qdatastream.cpp b/src/corelib/io/qdatastream.cpp index 5fa5b558ea..8f419a4a46 100644 --- a/src/corelib/io/qdatastream.cpp +++ b/src/corelib/io/qdatastream.cpp @@ -773,7 +773,7 @@ int QDataStream::readBlock(char *data, int len) } /*! - \fn QDataStream &QDataStream::operator>>(std::nullptr &ptr) + \fn QDataStream &QDataStream::operator>>(std::nullptr_t &ptr) \since 5.9 \overload @@ -1098,7 +1098,7 @@ int QDataStream::readRawData(char *s, int len) *****************************************************************************/ /*! - \fn QDataStream &QDataStream::operator<<(std::nullptr ptr) + \fn QDataStream &QDataStream::operator<<(std::nullptr_t ptr) \since 5.9 \overload diff --git a/src/corelib/kernel/qabstracteventdispatcher.cpp b/src/corelib/kernel/qabstracteventdispatcher.cpp index d1e436c371..67c15d2f2c 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.cpp +++ b/src/corelib/kernel/qabstracteventdispatcher.cpp @@ -479,7 +479,7 @@ bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, vo the processing of the event should continue. */ -/*! \fn bool QAbstractEventDispatcher::registerEventNotifier(QWinEventNotifier *notifier); +/*! \fn bool QAbstractEventDispatcher::registerEventNotifier(QWinEventNotifier *notifier) This pure virtual method exists on windows only and has to be reimplemented by a Windows specific event dispatcher implementation. \a notifier is the QWinEventNotifier instance to be registered. @@ -492,7 +492,7 @@ bool QAbstractEventDispatcher::filterNativeEvent(const QByteArray &eventType, vo \sa QWinEventNotifier, unregisterEventNotifier() */ -/*! \fn bool QAbstractEventDispatcher::unregisterEventNotifier(QWinEventNotifier *notifier); +/*! \fn bool QAbstractEventDispatcher::unregisterEventNotifier(QWinEventNotifier *notifier) This pure virtual method exists on windows only and has to be reimplemented by a Windows specific event dispatcher implementation. \a notifier is the QWinEventNotifier instance to be unregistered. diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index b84e047f3f..4775d3d47a 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -49,7 +49,7 @@ class QAbstractNativeEventFilter; class QAbstractEventDispatcherPrivate; class QSocketNotifier; -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) class QWinEventNotifier; #endif @@ -95,7 +95,7 @@ public: virtual int remainingTime(int timerId) = 0; -#if defined(Q_OS_WIN) || defined(Q_QDOC) +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) virtual bool registerEventNotifier(QWinEventNotifier *notifier) = 0; virtual void unregisterEventNotifier(QWinEventNotifier *notifier) = 0; #endif