From f108fceb2c548687a115ec7ba6186f674db34a02 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Mon, 9 Jul 2012 09:56:58 +0200
Subject: Make it possible to connect to QAbstract{State,Transtion} private
 signals.

Use the same trick as used for private signals in the models.

Change-Id: I4235788490cae0e3d554565621d145652dc5b0ca
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
---
 src/corelib/statemachine/qabstractstate.cpp      |  4 ++--
 src/corelib/statemachine/qabstractstate.h        | 13 +++++++++----
 src/corelib/statemachine/qabstracttransition.cpp |  2 +-
 src/corelib/statemachine/qabstracttransition.h   |  7 ++++---
 4 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/corelib/statemachine')

diff --git a/src/corelib/statemachine/qabstractstate.cpp b/src/corelib/statemachine/qabstractstate.cpp
index 3b51ded87f..323fa98a50 100644
--- a/src/corelib/statemachine/qabstractstate.cpp
+++ b/src/corelib/statemachine/qabstractstate.cpp
@@ -119,13 +119,13 @@ void QAbstractStatePrivate::callOnExit(QEvent *e)
 void QAbstractStatePrivate::emitEntered()
 {
     Q_Q(QAbstractState);
-    emit q->entered();
+    emit q->entered(QAbstractState::QPrivateSignal());
 }
 
 void QAbstractStatePrivate::emitExited()
 {
     Q_Q(QAbstractState);
-    emit q->exited();
+    emit q->exited(QAbstractState::QPrivateSignal());
 }
 
 /*!
diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h
index a726222030..cb6ccc521b 100644
--- a/src/corelib/statemachine/qabstractstate.h
+++ b/src/corelib/statemachine/qabstractstate.h
@@ -65,11 +65,16 @@ public:
     QStateMachine *machine() const;
 
 Q_SIGNALS:
-#if !defined(Q_MOC_RUN) && !defined(qdoc)
-private: // can only be emitted by QAbstractState
+    void entered(
+#if !defined(qdoc)
+      QPrivateSignal
 #endif
-    void entered();
-    void exited();
+    );
+    void exited(
+#if !defined(qdoc)
+      QPrivateSignal
+#endif
+    );
 
 protected:
     QAbstractState(QState *parent = 0);
diff --git a/src/corelib/statemachine/qabstracttransition.cpp b/src/corelib/statemachine/qabstracttransition.cpp
index 3658725484..86f0394cb7 100644
--- a/src/corelib/statemachine/qabstracttransition.cpp
+++ b/src/corelib/statemachine/qabstracttransition.cpp
@@ -145,7 +145,7 @@ QState *QAbstractTransitionPrivate::sourceState() const
 void QAbstractTransitionPrivate::emitTriggered()
 {
     Q_Q(QAbstractTransition);
-    emit q->triggered();
+    emit q->triggered(QAbstractTransition::QPrivateSignal());
 }
 
 /*!
diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h
index 1c05d39e65..93a49de907 100644
--- a/src/corelib/statemachine/qabstracttransition.h
+++ b/src/corelib/statemachine/qabstracttransition.h
@@ -88,10 +88,11 @@ public:
 #endif
 
 Q_SIGNALS:
-#if !defined(Q_MOC_RUN) && !defined(qdoc)
-private: // can only be emitted by QAbstractTransition
+    void triggered(
+#if !defined(qdoc)
+      QPrivateSignal
 #endif
-    void triggered();
+    );
 
 protected:
     virtual bool eventTest(QEvent *event) = 0;
-- 
cgit v1.2.3