summaryrefslogtreecommitdiffstats
path: root/src/corelib/statemachine
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-10-22 10:59:32 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-28 08:49:38 +0100
commit2e05a1578428fd8268512e12d88d90e93dcf5dff (patch)
tree327e12635d172b12d8d126197eec54d50dff5b72 /src/corelib/statemachine
parent5a9de4c6768e413a56f0e7b6c67ea11db761cd58 (diff)
QtCore: Make more signals private.
Change-Id: Ida190e8b9c1ff47a6f54a5bf68673ab50a2f1bfe Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/corelib/statemachine')
-rw-r--r--src/corelib/statemachine/qstate.cpp4
-rw-r--r--src/corelib/statemachine/qstate.h12
-rw-r--r--src/corelib/statemachine/qstatemachine.cpp8
-rw-r--r--src/corelib/statemachine/qstatemachine.h12
4 files changed, 26 insertions, 10 deletions
diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp
index 5eb9686f1d..1b897a12e5 100644
--- a/src/corelib/statemachine/qstate.cpp
+++ b/src/corelib/statemachine/qstate.cpp
@@ -164,13 +164,13 @@ QStatePrivate::~QStatePrivate()
void QStatePrivate::emitFinished()
{
Q_Q(QState);
- emit q->finished();
+ emit q->finished(QState::QPrivateSignal());
}
void QStatePrivate::emitPropertiesAssigned()
{
Q_Q(QState);
- emit q->propertiesAssigned();
+ emit q->propertiesAssigned(QState::QPrivateSignal());
}
/*!
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h
index 8d20a67350..cad2691733 100644
--- a/src/corelib/statemachine/qstate.h
+++ b/src/corelib/statemachine/qstate.h
@@ -100,8 +100,16 @@ public:
#endif
Q_SIGNALS:
- void finished();
- void propertiesAssigned();
+ void finished(
+#if !defined(qdoc)
+ QPrivateSignal
+#endif
+ );
+ void propertiesAssigned(
+#if !defined(qdoc)
+ QPrivateSignal
+#endif
+ );
protected:
void onEntry(QEvent *event);
diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp
index c8d2f39525..bf33500676 100644
--- a/src/corelib/statemachine/qstatemachine.cpp
+++ b/src/corelib/statemachine/qstatemachine.cpp
@@ -1408,14 +1408,14 @@ void QStateMachinePrivate::_q_start()
qDebug() << q << ": initial configuration:" << configuration;
#endif
- emit q->started();
+ emit q->started(QStateMachine::QPrivateSignal());
if (stopProcessingReason == Finished) {
// The state machine immediately reached a final state.
processingScheduled = false;
state = NotRunning;
unregisterAllTransitions();
- emit q->finished();
+ emitFinished();
} else {
_q_process();
}
@@ -1497,13 +1497,13 @@ void QStateMachinePrivate::_q_process()
state = NotRunning;
cancelAllDelayedEvents();
unregisterAllTransitions();
- emit q->finished();
+ emitFinished();
break;
case Stopped:
state = NotRunning;
cancelAllDelayedEvents();
unregisterAllTransitions();
- emit q->stopped();
+ emit q->stopped(QStateMachine::QPrivateSignal());
break;
}
}
diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h
index d1789e9fcd..256471e517 100644
--- a/src/corelib/statemachine/qstatemachine.h
+++ b/src/corelib/statemachine/qstatemachine.h
@@ -153,8 +153,16 @@ public Q_SLOTS:
void stop();
Q_SIGNALS:
- void started();
- void stopped();
+ void started(
+#if !defined(qdoc)
+ QPrivateSignal
+#endif
+ );
+ void stopped(
+#if !defined(qdoc)
+ QPrivateSignal
+#endif
+ );
protected:
void onEntry(QEvent *event);