diff options
Diffstat (limited to 'src/corelib/statemachine/qstate.h')
| -rw-r--r-- | src/corelib/statemachine/qstate.h | 54 |
1 files changed, 37 insertions, 17 deletions
diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index ba2d034..4c86e02 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -3,9 +3,39 @@ ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). ** Contact: Qt Software Information (qt-info@nokia.com) ** -** This file is part of the $MODULE$ of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** -** $TROLLTECH_DUAL_LICENSE$ +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at qt-sales@nokia.com. +** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -26,10 +56,8 @@ QT_MODULE(Core) class QAbstractTransition; class QHistoryState; -#ifndef QT_NO_ANIMATION -class QAbstractAnimation; -class QAnimationState; -#endif +class QSignalTransition; +class QStateFinishedTransition; class QStatePrivate; class Q_CORE_EXPORT QState : public QActionState @@ -54,20 +82,12 @@ public: void setErrorState(QAbstractState *state); void addTransition(QAbstractTransition *transition); - void addTransition(QObject *sender, const char *signal, QAbstractState *target); - void addTransition(QAbstractState *target); - void addFinishedTransition(QAbstractState *target); + QSignalTransition *addTransition(QObject *sender, const char *signal, QAbstractState *target); + QAbstractTransition *addTransition(QAbstractState *target); + QStateFinishedTransition *addFinishedTransition(QAbstractState *target); void removeTransition(QAbstractTransition *transition); QList<QAbstractTransition*> transitions() const; -#ifndef QT_NO_ANIMATION - QAnimationState *addAnimatedTransition(QObject *sender, const char *signal, - QAbstractState *targetState, - QAbstractAnimation *animation = 0); - QAnimationState *addAnimatedTransition(QAbstractTransition *transition, - QAbstractAnimation *animation = 0); -#endif - QHistoryState *addHistoryState(HistoryType type = ShallowHistory); QAbstractState *initialState() const; |