Rename QDeclarativeV4 -> QV4

Change-Id: Ic35e0ad1663cafe4aa535594dc3999a2d317ce0e
Reviewed-on: http://codereview.qt-project.org/6301
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>

16 files changed, 18 insertions, 18 deletions

diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro
index c9b54b2908..5569eb65c9 100644
--- a/tests/auto/declarative/declarative.pro
+++ b/tests/auto/declarative/declarative.pro
@@ -58,7 +58,7 @@ PRIVATETESTS += \
     qdeclarativeworkerscript \
     qdeclarativexmllistmodel \
     qpacketprotocol \
-    qdeclarativev4
+    v4
 
 SGTESTS =  \
     qsganimatedimage \
diff --git a/tests/auto/declarative/qdeclarativev4/data/conditionalExpr.qml b/tests/auto/declarative/v4/data/conditionalExpr.qml
index b74a95a94b..b74a95a94b 100644
--- a/tests/auto/declarative/qdeclarativev4/data/conditionalExpr.qml
+++ b/tests/auto/declarative/v4/data/conditionalExpr.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/doubleBoolJump.qml b/tests/auto/declarative/v4/data/doubleBoolJump.qml
index 2eea73b573..2eea73b573 100644
--- a/tests/auto/declarative/qdeclarativev4/data/doubleBoolJump.qml
+++ b/tests/auto/declarative/v4/data/doubleBoolJump.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/fetchException.qml b/tests/auto/declarative/v4/data/fetchException.qml
index 6431fcfae8..6431fcfae8 100644
--- a/tests/auto/declarative/qdeclarativev4/data/fetchException.qml
+++ b/tests/auto/declarative/v4/data/fetchException.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/logicalOr.2.qml b/tests/auto/declarative/v4/data/logicalOr.2.qml
index 54fb78b127..54fb78b127 100644
--- a/tests/auto/declarative/qdeclarativev4/data/logicalOr.2.qml
+++ b/tests/auto/declarative/v4/data/logicalOr.2.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/logicalOr.qml b/tests/auto/declarative/v4/data/logicalOr.qml
index 406a7d83eb..406a7d83eb 100644
--- a/tests/auto/declarative/qdeclarativev4/data/logicalOr.qml
+++ b/tests/auto/declarative/v4/data/logicalOr.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/nestedObjectAccess.qml b/tests/auto/declarative/v4/data/nestedObjectAccess.qml
index 56cd17e41e..56cd17e41e 100644
--- a/tests/auto/declarative/qdeclarativev4/data/nestedObjectAccess.qml
+++ b/tests/auto/declarative/v4/data/nestedObjectAccess.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/nullQObject.qml b/tests/auto/declarative/v4/data/nullQObject.qml
index 00185b3988..00185b3988 100644
--- a/tests/auto/declarative/qdeclarativev4/data/nullQObject.qml
+++ b/tests/auto/declarative/v4/data/nullQObject.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/qrealToIntRounding.qml b/tests/auto/declarative/v4/data/qrealToIntRounding.qml
index ee3d405073..ee3d405073 100644
--- a/tests/auto/declarative/qdeclarativev4/data/qrealToIntRounding.qml
+++ b/tests/auto/declarative/v4/data/qrealToIntRounding.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/subscriptionsInConditionalExpressions.qml b/tests/auto/declarative/v4/data/subscriptionsInConditionalExpressions.qml
index a8e05eeda1..a8e05eeda1 100644
--- a/tests/auto/declarative/qdeclarativev4/data/subscriptionsInConditionalExpressions.qml
+++ b/tests/auto/declarative/v4/data/subscriptionsInConditionalExpressions.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/unaryMinus.qml b/tests/auto/declarative/v4/data/unaryMinus.qml
index 01fa515d6f..01fa515d6f 100644
--- a/tests/auto/declarative/qdeclarativev4/data/unaryMinus.qml
+++ b/tests/auto/declarative/v4/data/unaryMinus.qml
diff --git a/tests/auto/declarative/qdeclarativev4/data/unnecessaryReeval.qml b/tests/auto/declarative/v4/data/unnecessaryReeval.qml
index 48662d7a2d..48662d7a2d 100644
--- a/tests/auto/declarative/qdeclarativev4/data/unnecessaryReeval.qml
+++ b/tests/auto/declarative/v4/data/unnecessaryReeval.qml
diff --git a/tests/auto/declarative/qdeclarativev4/testtypes.cpp b/tests/auto/declarative/v4/testtypes.cpp
index d1ae1253a5..d1ae1253a5 100644
--- a/tests/auto/declarative/qdeclarativev4/testtypes.cpp
+++ b/tests/auto/declarative/v4/testtypes.cpp
diff --git a/tests/auto/declarative/qdeclarativev4/testtypes.h b/tests/auto/declarative/v4/testtypes.h
index 22f3a40a4f..22f3a40a4f 100644
--- a/tests/auto/declarative/qdeclarativev4/testtypes.h
+++ b/tests/auto/declarative/v4/testtypes.h
diff --git a/tests/auto/declarative/qdeclarativev4/tst_qdeclarativev4.cpp b/tests/auto/declarative/v4/tst_v4.cpp
index 85f51c53d8..4c04e155bf 100644
--- a/tests/auto/declarative/qdeclarativev4/tst_qdeclarativev4.cpp
+++ b/tests/auto/declarative/v4/tst_v4.cpp
@@ -46,7 +46,7 @@
 #include <QtDeclarative/qdeclarativecomponent.h>
 #include <QtCore/qdebug.h>
 
-#include <private/qdeclarativev4compiler_p.h>
+#include <private/qv4compiler_p.h>
 
 #include "testtypes.h"
 
@@ -61,11 +61,11 @@ inline QUrl TEST_FILE(const char *filename)
     return TEST_FILE(QLatin1String(filename));
 }
 
-class tst_qdeclarativev4 : public QObject
+class tst_v4 : public QObject
 {
     Q_OBJECT
 public:
-    tst_qdeclarativev4() {}
+    tst_v4() {}
 
 private slots:
     void initTestCase();
@@ -82,7 +82,7 @@ private:
     QDeclarativeEngine engine;
 };
 
-void tst_qdeclarativev4::initTestCase()
+void tst_v4::initTestCase()
 {
     registerTypes();
 }
@@ -91,14 +91,14 @@ static int v4ErrorsMsgCount = 0;
 static void v4ErrorsMsgHandler(QtMsgType, const char *message)
 {
     QByteArray m(message);
-    if (m.contains("QDeclarativeV4"))
+    if (m.contains("QV4"))
         v4ErrorsMsgCount++;
 }
 
-void tst_qdeclarativev4::qtscript()
+void tst_v4::qtscript()
 {
     QFETCH(QString, file);
-    QDeclarativeV4Compiler::enableBindingsTest(true);
+    QV4Compiler::enableBindingsTest(true);
 
     QDeclarativeComponent component(&engine, TEST_FILE(file));
 
@@ -112,10 +112,10 @@ void tst_qdeclarativev4::qtscript()
 
     QCOMPARE(v4ErrorsMsgCount, 0);
 
-    QDeclarativeV4Compiler::enableBindingsTest(false);
+    QV4Compiler::enableBindingsTest(false);
 }
 
-void tst_qdeclarativev4::qtscript_data()
+void tst_v4::qtscript_data()
 {
     QTest::addColumn<QString>("file");
 
@@ -128,7 +128,7 @@ void tst_qdeclarativev4::qtscript_data()
     QTest::newRow("null qobject") << "nullQObject.qml";
 }
 
-void tst_qdeclarativev4::unnecessaryReeval()
+void tst_v4::unnecessaryReeval()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("unnecessaryReeval.qml"));
 
@@ -161,7 +161,7 @@ void tst_qdeclarativev4::unnecessaryReeval()
     delete o;
 }
 
-void tst_qdeclarativev4::logicalOr()
+void tst_v4::logicalOr()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("logicalOr.qml"));
@@ -190,7 +190,7 @@ void tst_qdeclarativev4::logicalOr()
     }
 }
 
-void tst_qdeclarativev4::conditionalExpr()
+void tst_v4::conditionalExpr()
 {
     {
         QDeclarativeComponent component(&engine, TEST_FILE("conditionalExpr.qml"));
@@ -209,7 +209,7 @@ void tst_qdeclarativev4::conditionalExpr()
 // This would previously use the metaObject of the root element to result the nested access.
 // That is, the index for accessing "result" would have been RootObject::result, instead of
 // NestedObject::result.
-void tst_qdeclarativev4::nestedObjectAccess()
+void tst_v4::nestedObjectAccess()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("nestedObjectAccess.qml"));
 
@@ -224,7 +224,7 @@ void tst_qdeclarativev4::nestedObjectAccess()
     delete o;
 }
 
-void tst_qdeclarativev4::subscriptionsInConditionalExpressions()
+void tst_v4::subscriptionsInConditionalExpressions()
 {
     QDeclarativeComponent component(&engine, TEST_FILE("subscriptionsInConditionalExpressions.qml"));
 
@@ -239,6 +239,6 @@ void tst_qdeclarativev4::subscriptionsInConditionalExpressions()
     delete o;
 }
 
-QTEST_MAIN(tst_qdeclarativev4)
+QTEST_MAIN(tst_v4)
 
-#include "tst_qdeclarativev4.moc"
+#include "tst_v4.moc"
diff --git a/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro b/tests/auto/declarative/v4/v4.pro
index 6021dc941d..6a9574d8ed 100644
--- a/tests/auto/declarative/qdeclarativev4/qdeclarativev4.pro
+++ b/tests/auto/declarative/v4/v4.pro
@@ -2,7 +2,7 @@ CONFIG += testcase
 TARGET = tst_qdeclarativev4
 macx:CONFIG -= app_bundle
 
-SOURCES += tst_qdeclarativev4.cpp \
+SOURCES += tst_v4.cpp \
            testtypes.cpp 
 HEADERS += testtypes.h