diff options
| author | Kevin Funk <kevin.funk@kdab.com> | 2014-10-09 16:05:33 +0200 |
|---|---|---|
| committer | Brett Stottlemyer <bstottle@ford.com> | 2014-10-21 02:13:33 +0200 |
| commit | f830c109d09d835551c1325c4904fc9a490b3754 (patch) | |
| tree | 6bb3c09cb44ed0a5446749701ac4281831a62967 /src/imports/statemachine/finalstate.cpp | |
| parent | 5871f3e829f1f48995b5d6c03f7ad31fcda386e5 (diff) | |
qmlstatemachine: Rename StateBase to State
As discussed with Brett Stottlmyer and Alan Alpert.
Add a section about the implications when importing both
QtQml.StateMachine
and QtQuick in one single QML file.
Change-Id: I8755f4b578e2a6ff4c2377c7a8a0b996ba9b7129
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/imports/statemachine/finalstate.cpp')
| -rw-r--r-- | src/imports/statemachine/finalstate.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/imports/statemachine/finalstate.cpp b/src/imports/statemachine/finalstate.cpp index 73e85a1abd..9b3c05e294 100644 --- a/src/imports/statemachine/finalstate.cpp +++ b/src/imports/statemachine/finalstate.cpp @@ -59,9 +59,9 @@ QQmlListProperty<QObject> FinalState::children() A final state is used to communicate that (part of) a StateMachine has finished its work. When a final top-level state is entered, the state - machine's \l{StateBase::finished}{finished}() signal is emitted. In + machine's \l{State::finished}{finished}() signal is emitted. In general, when a final substate (a child of a State) is entered, the parent - state's \l{StateBase::finished}{finished}() signal is emitted. FinalState + state's \l{State::finished}{finished}() signal is emitted. FinalState is part of \l{The Declarative State Machine Framework}. To use a final state, you create a FinalState object and add a transition @@ -73,5 +73,5 @@ QQmlListProperty<QObject> FinalState::children() \clearfloat - \sa StateMachine, StateBase + \sa StateMachine, State */ |