1 files changed, 25 insertions, 25 deletions

diff --git a/tests/auto/declarative/shared/debugutil_p.h b/tests/auto/declarative/shared/debugutil_p.h
index 6815b3c..3aaa9db 100644
--- a/tests/auto/declarative/shared/debugutil_p.h
+++ b/tests/auto/declarative/shared/debugutil_p.h
@@ -45,37 +45,37 @@
 #include <QThread>
 #include <QTest>
 
-#include <QtDeclarative/qmlengine.h>
+#include <QtDeclarative/qdeclarativeengine.h>
 
-#include <private/qmldebugclient_p.h>
-#include <private/qmldebugservice_p.h>
-#include <private/qmlgraphicsitem_p.h>
+#include <private/qdeclarativedebugclient_p.h>
+#include <private/qdeclarativedebugservice_p.h>
+#include <private/qdeclarativeitem_p.h>
 
-class QmlTestFactory;
+class QDeclarativeTestFactory;
 
-class QmlDebugTest
+class QDeclarativeDebugTest
 {
 public:
     static bool waitForSignal(QObject *receiver, const char *member, int timeout = 5000);
 
-    static int runTests(QmlTestFactory *factory, const QList<QByteArray> &qml = QList<QByteArray>());
+    static int runTests(QDeclarativeTestFactory *factory, const QList<QByteArray> &qml = QList<QByteArray>());
 };
 
-class QmlDebugTestData : public QObject
+class QDeclarativeDebugTestData : public QObject
 {
     Q_OBJECT
 public:
-    QmlDebugTestData(QEventLoop *el);
+    QDeclarativeDebugTestData(QEventLoop *el);
 
-    ~QmlDebugTestData();
+    ~QDeclarativeDebugTestData();
 
-    QmlDebugConnection *conn;
-    QmlEngine *engine;
+    QDeclarativeDebugConnection *conn;
+    QDeclarativeEngine *engine;
 
     int exitCode;
     QEventLoop *loop;
 
-    QList<QmlGraphicsItem *> items;
+    QList<QDeclarativeItem *> items;
 
 signals:
     void engineCreated();
@@ -84,24 +84,24 @@ public slots:
     void testsFinished(int code);
 
 private:
-    friend class QmlDebugTest;
+    friend class QDeclarativeDebugTest;
 };
 
 
-class QmlTestFactory
+class QDeclarativeTestFactory
 {
 public:
-    QmlTestFactory() {}
-    virtual ~QmlTestFactory() {}
+    QDeclarativeTestFactory() {}
+    virtual ~QDeclarativeTestFactory() {}
 
-    virtual QObject *createTest(QmlDebugTestData *data) = 0;
+    virtual QObject *createTest(QDeclarativeDebugTestData *data) = 0;
 };
 
-class QmlDebugTestService : public QmlDebugService
+class QDeclarativeDebugTestService : public QDeclarativeDebugService
 {
     Q_OBJECT
 public:
-    QmlDebugTestService(const QString &s, QObject *parent = 0);
+    QDeclarativeDebugTestService(const QString &s, QObject *parent = 0);
     bool enabled;
 
 signals:
@@ -113,11 +113,11 @@ protected:
     virtual void enabledChanged(bool e);
 };
 
-class QmlDebugTestClient : public QmlDebugClient
+class QDeclarativeDebugTestClient : public QDeclarativeDebugClient
 {
     Q_OBJECT
 public:
-    QmlDebugTestClient(const QString &s, QmlDebugConnection *c);
+    QDeclarativeDebugTestClient(const QString &s, QDeclarativeDebugConnection *c);
 
     QByteArray waitForResponse();
 
@@ -135,7 +135,7 @@ class tst_QmlDebug_Thread : public QThread
 {
     Q_OBJECT
 public:
-    tst_QmlDebug_Thread(QmlDebugTestData *data, QmlTestFactory *factory);
+    tst_QmlDebug_Thread(QDeclarativeDebugTestData *data, QDeclarativeTestFactory *factory);
 
     void run();
 
@@ -143,8 +143,8 @@ signals:
     void testsFinished(int);
 
 private:
-    QmlDebugTestData *m_data;
-    QmlTestFactory *m_factory;
+    QDeclarativeDebugTestData *m_data;
+    QDeclarativeTestFactory *m_factory;
 };