summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-07-09 09:56:58 +0200
committerQt by Nokia <qt-info@nokia.com>2012-07-13 01:51:47 +0200
commitf108fceb2c548687a115ec7ba6186f674db34a02 (patch)
tree4be2223be614bbdd98d5b9a9c5f81ae24ccfb32b /src/corelib/statemachine
parent536ec793b69c16611e73cff4360c6f49b644f740 (diff)
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>
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r--src/corelib/statemachine/qabstractstate.cpp4
-rw-r--r--src/corelib/statemachine/qabstractstate.h13
-rw-r--r--src/corelib/statemachine/qabstracttransition.cpp2
-rw-r--r--src/corelib/statemachine/qabstracttransition.h7
4 files changed, 16 insertions, 10 deletions
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;