summaryrefslogtreecommitdiffstats
path: root/src/qscxml.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/qscxml.h')
-rw-r--r--src/qscxml.h52
1 files changed, 17 insertions, 35 deletions
diff --git a/src/qscxml.h b/src/qscxml.h
index 255b33a..bfecc43 100644
--- a/src/qscxml.h
+++ b/src/qscxml.h
@@ -1,41 +1,23 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information (qt-info@nokia.com)
**
-** This file is part of the QtCore module of the Qt Toolkit.
+** This file is part of the SCXML project on Trolltech Labs.
**
-** $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.
+** This file may be used under the terms of the GNU General Public
+** License version 2.0 or 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 GNU
+** General Public Licensing requirements will be met:
+** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
+** 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$
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
****************************************************************************/
@@ -114,15 +96,15 @@ class QScxmlTransition : public QAbstractTransition
class QScxmlInvoker : public QObject
{
Q_OBJECT
- Q_PROPERTY (QString id READ id WRITE setID)
+ Q_PROPERTY (QString id READ id WRITE setID)
protected:
QScxmlInvoker(QScxmlEvent* ievent, QStateMachine* p) : QObject(p), initEvent(ievent),cancelled(false) {}
public:
virtual ~QScxmlInvoker();
- QString id () const;
- void setID(const QString &);
+ QString id () const;
+ void setID(const QString &);
public Q_SLOTS:
virtual void activate() = 0;
@@ -135,7 +117,7 @@ class QScxmlInvoker : public QObject
QScxml* parentStateMachine() { return (QScxml*)parent(); }
void postParentEvent (QScxmlEvent* ev);
QScxmlEvent* initEvent;
- bool cancelled;
+ bool cancelled;
friend struct QScxmlFunctions;
};
@@ -187,7 +169,7 @@ class QScxml : public QStateMachine
private Q_SLOTS:
void registerSession();
void unregisterSession();
- void handleStateFinished();
+ void handleStateFinished();
Q_SIGNALS:
void eventTriggered(const QString &);