diff options
Diffstat (limited to 'src/corelib/kernel')
-rw-r--r-- | src/corelib/kernel/qcoreapplication.h | 6 | ||||
-rw-r--r-- | src/corelib/kernel/qobject.h | 6 | ||||
-rw-r--r-- | src/corelib/kernel/qsocketnotifier.h | 6 | ||||
-rw-r--r-- | src/corelib/kernel/qtimer.h | 6 | ||||
-rw-r--r-- | src/corelib/kernel/qwineventnotifier.h | 6 |
5 files changed, 5 insertions, 25 deletions
diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index e1fc364cd1..1cd835daae 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -171,11 +171,7 @@ public Q_SLOTS: static void quit(); Q_SIGNALS: - void aboutToQuit( -#if !defined(Q_QDOC) - QPrivateSignal -#endif - ); + void aboutToQuit(QPrivateSignal); void organizationNameChanged(); void organizationDomainChanged(); diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index ecea13fc4a..5f61dd984f 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -413,11 +413,7 @@ public: Q_SIGNALS: void destroyed(QObject * = 0); - void objectNameChanged(const QString &objectName -#if !defined(Q_QDOC) - , QPrivateSignal -#endif - ); + void objectNameChanged(const QString &objectName, QPrivateSignal); public: inline QObject *parent() const { return d_ptr->parent; } diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index c6e9d1e13f..4bafbfa69f 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -59,11 +59,7 @@ public Q_SLOTS: void setEnabled(bool); Q_SIGNALS: - void activated(int socket -#if !defined(Q_QDOC) - , QPrivateSignal -#endif - ); + void activated(int socket, QPrivateSignal); protected: bool event(QEvent *) Q_DECL_OVERRIDE; diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index dc948228b4..163ef75291 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -141,11 +141,7 @@ public Q_SLOTS: void stop(); Q_SIGNALS: - void timeout( -#if !defined(Q_QDOC) - QPrivateSignal -#endif - ); + void timeout(QPrivateSignal); protected: void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index 07a0b29d97..95fdff07ce 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -61,11 +61,7 @@ public Q_SLOTS: void setEnabled(bool enable); Q_SIGNALS: - void activated(HANDLE hEvent -#if !defined(Q_QDOC) - , QPrivateSignal -#endif - ); + void activated(HANDLE hEvent, QPrivateSignal); protected: bool event(QEvent * e); |