1 files changed, 49 insertions, 21 deletions

diff --git a/tools/qmlviewer/qfxtester.h b/tools/qmlviewer/qfxtester.h
index 52987db..303ac3a 100644
--- a/tools/qmlviewer/qfxtester.h
+++ b/tools/qmlviewer/qfxtester.h
@@ -1,13 +1,41 @@
 /****************************************************************************
 **
-** Copyright (C) 1992-$THISYEAR$ $TROLLTECH$. All rights reserved.
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the $MODULE$ of the Qt Toolkit.
+** This file is part of the tools applications 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 Technology Preview License Agreement accompanying
+** this package.
 **
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
@@ -21,13 +49,13 @@
 
 QT_BEGIN_NAMESPACE
 
-class QFxVisualTest : public QObject
+class QmlGraphicsVisualTest : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(QList<QObject *>* events READ events CONSTANT)
     Q_CLASSINFO("DefaultProperty", "events")
 public:
-    QFxVisualTest() {}
+    QmlGraphicsVisualTest() {}
 
     QList<QObject *> *events() { return &m_events; }
 
@@ -37,16 +65,16 @@ public:
 private:
     QList<QObject *> m_events;
 };
-QML_DECLARE_TYPE(QFxVisualTest)
+QML_DECLARE_TYPE(QmlGraphicsVisualTest)
 
-class QFxVisualTestFrame : public QObject
+class QmlGraphicsVisualTestFrame : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int msec READ msec WRITE setMsec)
     Q_PROPERTY(QString hash READ hash WRITE setHash)
     Q_PROPERTY(QUrl image READ image WRITE setImage)
 public:
-    QFxVisualTestFrame() : m_msec(-1) {}
+    QmlGraphicsVisualTestFrame() : m_msec(-1) {}
 
     int msec() const { return m_msec; }
     void setMsec(int m) { m_msec = m; }
@@ -62,9 +90,9 @@ private:
     QString m_hash;
     QUrl m_image;
 };
-QML_DECLARE_TYPE(QFxVisualTestFrame)
+QML_DECLARE_TYPE(QmlGraphicsVisualTestFrame)
 
-class QFxVisualTestMouse : public QObject
+class QmlGraphicsVisualTestMouse : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int type READ type WRITE setType)
@@ -75,7 +103,7 @@ class QFxVisualTestMouse : public QObject
     Q_PROPERTY(int modifiers READ modifiers WRITE setModifiers)
     Q_PROPERTY(bool sendToViewport READ sendToViewport WRITE setSendToViewport)
 public:
-    QFxVisualTestMouse() : m_type(0), m_button(0), m_buttons(0), m_x(0), m_y(0), m_modifiers(0), m_viewport(false) {}
+    QmlGraphicsVisualTestMouse() : m_type(0), m_button(0), m_buttons(0), m_x(0), m_y(0), m_modifiers(0), m_viewport(false) {}
 
     int type() const { return m_type; }
     void setType(int t) { m_type = t; }
@@ -106,9 +134,9 @@ private:
     int m_modifiers;
     bool m_viewport;
 };
-QML_DECLARE_TYPE(QFxVisualTestMouse)
+QML_DECLARE_TYPE(QmlGraphicsVisualTestMouse)
 
-class QFxVisualTestKey : public QObject
+class QmlGraphicsVisualTestKey : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(int type READ type WRITE setType)
@@ -119,7 +147,7 @@ class QFxVisualTestKey : public QObject
     Q_PROPERTY(int count READ count WRITE setCount)
     Q_PROPERTY(bool sendToViewport READ sendToViewport WRITE setSendToViewport)
 public:
-    QFxVisualTestKey() : m_type(0), m_key(0), m_modifiers(0), m_autorep(false), m_count(0), m_viewport(false) {}
+    QmlGraphicsVisualTestKey() : m_type(0), m_key(0), m_modifiers(0), m_autorep(false), m_count(0), m_viewport(false) {}
 
     int type() const { return m_type; }
     void setType(int t) { m_type = t; }
@@ -150,13 +178,13 @@ private:
     int m_count;
     bool m_viewport;
 };
-QML_DECLARE_TYPE(QFxVisualTestKey)
+QML_DECLARE_TYPE(QmlGraphicsVisualTestKey)
 
-class QFxTester : public QAbstractAnimation
+class QmlGraphicsTester : public QAbstractAnimation
 {
 public:
-    QFxTester(const QString &script, QmlViewer::ScriptOptions options, QmlView *parent);
-    ~QFxTester();
+    QmlGraphicsTester(const QString &script, QmlViewer::ScriptOptions options, QmlView *parent);
+    ~QmlGraphicsTester();
 
     virtual int duration() const;
 
@@ -222,7 +250,7 @@ private:
 
     QmlViewer::ScriptOptions options;
     int testscriptidx;
-    QFxVisualTest *testscript;
+    QmlGraphicsVisualTest *testscript;
 
     bool hasCompleted;
     bool hasFailed;