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>

6 files changed, 16 insertions, 80 deletions

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);