qdoc: Remove #ifdef Q_QDOC for uses of QPrivateSignal

Signals marked with QPrivateSignal had the QPrivateSignal marker
ifdefed out for qdoc. This is no longer necessary, so the #ifdefs
are removed.

Change-Id: Idb334ed311c6ed6883d7b7b5a3fcdede60c4a1f8
Task-number: QTBUG-45535
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>

17 files changed, 48 insertions, 240 deletions

diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h
index 57dac802e8..13d1782913 100644
--- a/src/corelib/io/qfilesystemwatcher.h
+++ b/src/corelib/io/qfilesystemwatcher.h
@@ -62,16 +62,8 @@ public:
     QStringList directories() const;
 
 Q_SIGNALS:
-    void fileChanged(const QString &path
-#if !defined(Q_QDOC)
-        , QPrivateSignal
-#endif
-    );
-    void directoryChanged(const QString &path
-#if !defined(Q_QDOC)
-        , QPrivateSignal
-#endif
-    );
+    void fileChanged(const QString &path, QPrivateSignal);
+    void directoryChanged(const QString &path, QPrivateSignal);
 
 private:
     Q_PRIVATE_SLOT(d_func(), void _q_fileChanged(const QString &path, bool removed))
diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h
index 54cf37b717..078217ea0b 100644
--- a/src/corelib/io/qprocess.h
+++ b/src/corelib/io/qprocess.h
@@ -223,30 +223,14 @@ public Q_SLOTS:
     void kill();
 
 Q_SIGNALS:
-    void started(
-#if !defined(Q_QDOC)
-        QPrivateSignal
-#endif
-    );
+    void started(QPrivateSignal);
     void finished(int exitCode); // ### Qt 6: merge the two signals with a default value
     void finished(int exitCode, QProcess::ExitStatus exitStatus);
     void error(QProcess::ProcessError error);
-    void stateChanged(QProcess::ProcessState state
-#if !defined(Q_QDOC)
-        , QPrivateSignal
-#endif
-    );
+    void stateChanged(QProcess::ProcessState state, QPrivateSignal);
 
-    void readyReadStandardOutput(
-#if !defined(Q_QDOC)
-        QPrivateSignal
-#endif
-    );
-    void readyReadStandardError(
-#if !defined(Q_QDOC)
-        QPrivateSignal
-#endif
-    );
+    void readyReadStandardOutput(QPrivateSignal);
+    void readyReadStandardError(QPrivateSignal);
 
 protected:
     void setProcessState(ProcessState state);
diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h
index c4f705e858..5ca7bd0123 100644
--- a/src/corelib/itemmodels/qabstractitemmodel.h
+++ b/src/corelib/itemmodels/qabstractitemmodel.h
@@ -246,82 +246,26 @@ Q_SIGNALS:
     void layoutChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
     void layoutAboutToBeChanged(const QList<QPersistentModelIndex> &parents = QList<QPersistentModelIndex>(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint);
 
-    void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void rowsInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void rowsInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void rowsRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void rowsRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void columnsInserted(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void columnsInserted(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void columnsRemoved(const QModelIndex &parent, int first, int last
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
+    void columnsRemoved(const QModelIndex &parent, int first, int last, QPrivateSignal);
 
-    void modelAboutToBeReset(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void modelReset(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void modelAboutToBeReset(QPrivateSignal);
+    void modelReset(QPrivateSignal);
 
-    void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow, QPrivateSignal);
+    void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row, QPrivateSignal);
 
-    void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
+    void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn, QPrivateSignal);
+    void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column, QPrivateSignal);
 
 public Q_SLOTS:
     virtual bool submit();
diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h
index afd5a1f616..dc8d2d4dc8 100644
--- a/src/corelib/itemmodels/qabstractproxymodel.h
+++ b/src/corelib/itemmodels/qabstractproxymodel.h
@@ -92,11 +92,7 @@ public:
     Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
-    void sourceModelChanged(
-#if !defined(qdoc)
-        QPrivateSignal
-#endif
-    );
+    void sourceModelChanged(QPrivateSignal);
 
 protected Q_SLOTS:
     void resetInternalData();
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);
diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h
index b6eb742acb..592c841c18 100644
--- a/src/corelib/statemachine/qabstractstate.h
+++ b/src/corelib/statemachine/qabstractstate.h
@@ -58,16 +58,8 @@ public:
     bool active() const;
 
 Q_SIGNALS:
-    void entered(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void exited(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void entered(QPrivateSignal);
+    void exited(QPrivateSignal);
     void activeChanged(bool active);
 
 protected:
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index 0f1bbdad71..768a364a4b 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -78,21 +78,9 @@ public:
 #endif
 
 Q_SIGNALS:
-    void triggered(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void targetStateChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void targetStatesChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void triggered(QPrivateSignal);
+    void targetStateChanged(QPrivateSignal);
+    void targetStatesChanged(QPrivateSignal);
 
 protected:
     virtual bool eventTest(QEvent *event) = 0;
diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h
index 31f0d3121b..549be15ab0 100644
--- a/src/corelib/statemachine/qhistorystate.h
+++ b/src/corelib/statemachine/qhistorystate.h
@@ -65,16 +65,8 @@ public:
     void setHistoryType(HistoryType type);
 
 Q_SIGNALS:
-    void defaultStateChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void historyTypeChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void defaultStateChanged(QPrivateSignal);
+    void historyTypeChanged(QPrivateSignal);
 
 protected:
     void onEntry(QEvent *event) Q_DECL_OVERRIDE;
diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h
index 8b9e63404a..bc56f4e9b7 100644
--- a/src/corelib/statemachine/qsignaltransition.h
+++ b/src/corelib/statemachine/qsignaltransition.h
@@ -67,16 +67,8 @@ protected:
     bool event(QEvent *e) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
-    void senderObjectChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void signalChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void senderObjectChanged(QPrivateSignal);
+    void signalChanged(QPrivateSignal);
 
 private:
     Q_DISABLE_COPY(QSignalTransition)
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index b1f2ad05bc..a74c782027 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -103,31 +103,11 @@ public:
 #endif
 
 Q_SIGNALS:
-    void finished(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void propertiesAssigned(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void childModeChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void initialStateChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void errorStateChanged(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void finished(QPrivateSignal);
+    void propertiesAssigned(QPrivateSignal);
+    void childModeChanged(QPrivateSignal);
+    void initialStateChanged(QPrivateSignal);
+    void errorStateChanged(QPrivateSignal);
 
 protected:
     void onEntry(QEvent *event) Q_DECL_OVERRIDE;
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index 7837e6ec5f..d6c3b7bfa7 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -145,16 +145,8 @@ public Q_SLOTS:
     void setRunning(bool running);
 
 Q_SIGNALS:
-    void started(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void stopped(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void started(QPrivateSignal);
+    void stopped(QPrivateSignal);
     void runningChanged(bool running);
 
 
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
index 58755b9625..bfc469583d 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -106,16 +106,8 @@ public:
     static void usleep(unsigned long);
 
 Q_SIGNALS:
-    void started(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
-    void finished(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void started(QPrivateSignal);
+    void finished(QPrivateSignal);
 
 protected:
     virtual void run();
diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h
index 388e88d641..21139b37a8 100644
--- a/src/corelib/tools/qtimeline.h
+++ b/src/corelib/tools/qtimeline.h
@@ -115,26 +115,10 @@ public Q_SLOTS:
     void toggleDirection();
 
 Q_SIGNALS:
-    void valueChanged(qreal x
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void frameChanged(int
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void stateChanged(QTimeLine::State newState
-#if !defined(Q_QDOC)
-      , QPrivateSignal
-#endif
-    );
-    void finished(
-#if !defined(Q_QDOC)
-      QPrivateSignal
-#endif
-    );
+    void valueChanged(qreal x, QPrivateSignal);
+    void frameChanged(int, QPrivateSignal);
+    void stateChanged(QTimeLine::State newState, QPrivateSignal);
+    void finished(QPrivateSignal);
 
 protected:
     void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE;