diff options
| author | Martin Smith <martin.smith@qt.io> | 2018-01-03 12:30:05 +0100 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2018-01-04 12:50:55 +0000 |
| commit | c2b468149317245b7cc6b4b00ee72660118132c7 (patch) | |
| tree | b4ded452a92f10736f382d475de254750d6a333e /src | |
| parent | 58a47ccfe5bbd10c1f055c70ca87b6bded57fd4a (diff) | |
doc: Correct remaining qdoc warnings in qtimer.cpp
clang required adding template clauses to a several \fn commands.
There was also a case where Q_QDOC was changed to Q_CLANG_QDOC
in qtimer.h
Change-Id: I1184e507a3fa719fe5049ade80e5da24f52ac851
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qtimer.cpp | 12 | ||||
| -rw-r--r-- | src/corelib/kernel/qtimer.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 85e95d7f7e..27d94e47d3 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -410,7 +410,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv } } -/*!\fn void QTimer::singleShot(int msec, const QObject *receiver, PointerToMemberFunction method) +/*! \fn template<typename PointerToMemberFunction> void QTimer::singleShot(int msec, const QObject *receiver, PointerToMemberFunction method) \since 5.4 @@ -432,7 +432,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv \sa start() */ -/*!\fn void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiver, PointerToMemberFunction method) +/*! \fn template<typename PointerToMemberFunction> void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiver, PointerToMemberFunction method) \since 5.4 @@ -455,7 +455,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv \sa start() */ -/*!\fn void QTimer::singleShot(int msec, Functor functor) +/*! \fn template<typename Functor> void QTimer::singleShot(int msec, Functor functor) \since 5.4 @@ -472,7 +472,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv \sa start() */ -/*!\fn void QTimer::singleShot(int msec, Qt::TimerType timerType, Functor functor) +/*! \fn template<typename Functor> void QTimer::singleShot(int msec, Qt::TimerType timerType, Functor functor) \since 5.4 @@ -490,7 +490,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv \sa start() */ -/*!\fn void QTimer::singleShot(int msec, const QObject *context, Functor functor) +/*! \fn template<typename Functor> void QTimer::singleShot(int msec, const QObject *context, Functor functor) \since 5.4 @@ -511,7 +511,7 @@ void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *receiv \sa start() */ -/*!\fn void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *context, Functor functor) +/*! \fn template<typename Functor> void QTimer::singleShot(int msec, Qt::TimerType timerType, const QObject *context, Functor functor) \since 5.4 diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index d41573264f..e6db586aa0 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -83,7 +83,7 @@ public: static void singleShot(int msec, const QObject *receiver, const char *member); static void singleShot(int msec, Qt::TimerType timerType, const QObject *receiver, const char *member); -#ifdef Q_QDOC +#ifdef Q_CLANG_QDOC template<typename PointerToMemberFunction> static void singleShot(int msec, const QObject *receiver, PointerToMemberFunction method); template<typename PointerToMemberFunction> |