Update generated QScriptValue test files

A couple of bugs were introduced in the generator when it was
refactored; fixed now.
The generated tests are now in a separate directory/class, so
the test function qualifier had to be updated.

Reviewed-by: Jedrzej Nowacki

7 files changed, 947 insertions, 930 deletions

diff --git a/tests/auto/qscriptvaluegenerated/testgen/data.txt b/tests/auto/qscriptvaluegenerated/testgen/data.txt
index 73677ec..cebe1d2 100644
--- a/tests/auto/qscriptvaluegenerated/testgen/data.txt
+++ b/tests/auto/qscriptvaluegenerated/testgen/data.txt
@@ -158,4 +158,4 @@ engine->newVariant(QVariant())
 engine->newVariant(QVariant(123))
 engine->newVariant(QVariant(false))
 engine->newQObject(0)
-engine->newQObject(engine)
\ No newline at end of file
+engine->newQObject(engine)
diff --git a/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp b/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp
index 9d7d33d..183b62c 100644
--- a/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp
+++ b/tests/auto/qscriptvaluegenerated/testgen/testgenerator.cpp
@@ -156,14 +156,14 @@ static QString generateLicence()
 
 static QString generateIsXXXDef(const QString& name, const QList<QString>& list)
 {
-    static const QString templ("void tst_QScriptValue::%1_initData()\n"\
+    static const QString templ("void tst_QScriptValueGenerated::%1_initData()\n"\
                                "{\n"\
                                "    QTest::addColumn<bool>(\"expected\");\n"\
                                "    initScriptValues();\n"\
                                "}\n"\
                                "\n"\
                                "static QString %1_array[] = {%2};\n\n"\
-                               "void tst_QScriptValue::%1_makeData(const char* expr)\n"\
+                               "void tst_QScriptValueGenerated::%1_makeData(const char* expr)\n"\
                                "{\n"\
                                "    static QSet<QString> %1;\n"\
                                "    if (%1.isEmpty()) {\n"\
@@ -174,7 +174,7 @@ static QString generateIsXXXDef(const QString& name, const QList<QString>& list)
                                "    newRow(expr) << %1.contains(expr);\n"\
                                "}\n"\
                                "\n"\
-                               "void tst_QScriptValue::%1_test(const char*, const QScriptValue& value)\n"\
+                               "void tst_QScriptValueGenerated::%1_test(const char*, const QScriptValue& value)\n"\
                                "{\n"\
                                "    QFETCH(bool, expected);\n"\
                                "    QCOMPARE(value.%1(), expected);\n"\
@@ -197,8 +197,9 @@ static QString generateIsXXXDef(const QString& name, const QList<QString>& list)
             set.append("\",");
         set.append("\n    \"");
         set.append(escape(t));
-        set.append("\"");
     }
+    if (!list.isEmpty())
+        set.append("\"\n");
 
     return result.arg(name, set.join(QString()), QString::number(list.count()));
 }
@@ -207,7 +208,7 @@ template<typename T>
 static QString generateToXXXDef(const QString& name, const QList<QPair<QString, T> >& list)
 {
     static const QString templ = "\n"\
-                                 "void tst_QScriptValue::%1_initData()\n"\
+                                 "void tst_QScriptValueGenerated::%1_initData()\n"\
                                  "{\n"\
                                  "    QTest::addColumn<%2>(\"expected\");\n"\
                                  "    initScriptValues();\n"\
@@ -215,7 +216,7 @@ static QString generateToXXXDef(const QString& name, const QList<QPair<QString,
                                  "\n"\
                                  "static QString %1_tagArray[] = {%4};\n\n"\
                                  "static %2 %1_valueArray[] = {%5};\n\n"\
-                                 "void tst_QScriptValue::%1_makeData(const char* expr)\n"\
+                                 "void tst_QScriptValueGenerated::%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %2> %1;\n"\
                                  "    if (%1.isEmpty()) {\n"\
@@ -226,7 +227,7 @@ static QString generateToXXXDef(const QString& name, const QList<QPair<QString,
                                  "    newRow(expr) << %1.value(expr);\n"\
                                  "}\n"\
                                  "\n"\
-                                 "void tst_QScriptValue::%1_test(const char*, const QScriptValue& value)\n"\
+                                 "void tst_QScriptValueGenerated::%1_test(const char*, const QScriptValue& value)\n"\
                                  "{\n"\
                                  "    QFETCH(%2, expected);\n"\
                                  "    QCOMPARE(value.%1(), expected);\n"\
@@ -268,7 +269,7 @@ template<>
 QString generateToXXXDef<qsreal>(const QString& name, const QList<QPair<QString, qsreal> >& list)
 {
     static const QString templ = "\n"\
-                                 "void tst_QScriptValue::%1_initData()\n"\
+                                 "void tst_QScriptValueGenerated::%1_initData()\n"\
                                  "{\n"\
                                  "    QTest::addColumn<%2>(\"expected\");\n"\
                                  "    initScriptValues();\n"\
@@ -276,7 +277,7 @@ QString generateToXXXDef<qsreal>(const QString& name, const QList<QPair<QString,
                                  "\n"\
                                  "static QString %1_tagArray[] = {%3};\n"\
                                  "static %2 %1_valueArray[] = {%4};\n"\
-                                 "void tst_QScriptValue::%1_makeData(const char* expr)\n"\
+                                 "void tst_QScriptValueGenerated::%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %2> %1;\n"\
                                  "    if (%1.isEmpty()) {\n"\
@@ -287,7 +288,7 @@ QString generateToXXXDef<qsreal>(const QString& name, const QList<QPair<QString,
                                  "    newRow(expr) << %1.value(expr);\n"\
                                  "}\n"\
                                  "\n"\
-                                 "void tst_QScriptValue::%1_test(const char*, const QScriptValue& value)\n"\
+                                 "void tst_QScriptValueGenerated::%1_test(const char*, const QScriptValue& value)\n"\
                                  "{\n"\
                                  "    QFETCH(%2, expected);\n"\
                                  "%666"
@@ -345,7 +346,7 @@ template<typename T>
 static QString generateCastDef(const QList<QPair<QString, T> >& list)
 {
     static const QString templ = "\n"\
-                                 "void tst_QScriptValue::qscriptvalue_cast%1_initData()\n"\
+                                 "void tst_QScriptValueGenerated::qscriptvalue_cast%1_initData()\n"\
                                  "{\n"\
                                  "    QTest::addColumn<%1>(\"expected\");\n"\
                                  "    initScriptValues();\n"\
@@ -353,7 +354,7 @@ static QString generateCastDef(const QList<QPair<QString, T> >& list)
                                  "\n"\
                                  "static QString qscriptvalue_cast%1_tagArray[] = {%2};\n"\
                                  "static %1 qscriptvalue_cast%1_valueArray[] = {%3};\n"\
-                                 "void tst_QScriptValue::qscriptvalue_cast%1_makeData(const char* expr)\n"\
+                                 "void tst_QScriptValueGenerated::qscriptvalue_cast%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %1> value;\n"\
                                  "    if (value.isEmpty()) {\n"\
@@ -364,7 +365,7 @@ static QString generateCastDef(const QList<QPair<QString, T> >& list)
                                  "    newRow(expr) << value.value(expr);\n"\
                                  "}\n"\
                                  "\n"\
-                                 "void tst_QScriptValue::qscriptvalue_cast%1_test(const char*, const QScriptValue& value)\n"\
+                                 "void tst_QScriptValueGenerated::qscriptvalue_cast%1_test(const char*, const QScriptValue& value)\n"\
                                  "{\n"\
                                  "    QFETCH(%1, expected);\n"\
                                  "    QCOMPARE(qscriptvalue_cast<%1>(value), expected);\n"\
@@ -401,7 +402,7 @@ template<>
 QString generateCastDef<qsreal>(const QList<QPair<QString, qsreal> >& list)
 {
     static const QString templ = "\n"\
-                                 "void tst_QScriptValue::qscriptvalue_cast%1_initData()\n"\
+                                 "void tst_QScriptValueGenerated::qscriptvalue_cast%1_initData()\n"\
                                  "{\n"\
                                  "    QTest::addColumn<%1>(\"expected\");\n"\
                                  "    initScriptValues();\n"\
@@ -409,7 +410,7 @@ QString generateCastDef<qsreal>(const QList<QPair<QString, qsreal> >& list)
                                  "\n"\
                                  "static QString qscriptvalue_cast%1_tagArray[] = {%2};\n"\
                                  "static %1 qscriptvalue_cast%1_valueArray[] = {%3};\n"\
-                                 "void tst_QScriptValue::qscriptvalue_cast%1_makeData(const char* expr)\n"\
+                                 "void tst_QScriptValueGenerated::qscriptvalue_cast%1_makeData(const char* expr)\n"\
                                  "{\n"\
                                  "    static QHash<QString, %1> value;\n"\
                                  "    if (value.isEmpty()) {\n"\
@@ -420,7 +421,7 @@ QString generateCastDef<qsreal>(const QList<QPair<QString, qsreal> >& list)
                                  "    newRow(expr) << value.value(expr);\n"\
                                  "}\n"\
                                  "\n"\
-                                 "void tst_QScriptValue::qscriptvalue_cast%1_test(const char*, const QScriptValue& value)\n"\
+                                 "void tst_QScriptValueGenerated::qscriptvalue_cast%1_test(const char*, const QScriptValue& value)\n"\
                                  "{\n"\
                                  "    QFETCH(%1, expected);\n"\
                                  "    if (qIsNaN(expected)) {\n"
@@ -469,7 +470,7 @@ QString generateCastDef<qsreal>(const QList<QPair<QString, qsreal> >& list)
 static QString generateCompareDef(const QString& comparisionType, const QList<QString> tags)
 {
     static const QString templ = "\n"\
-                                 "void tst_QScriptValue::%1_initData()\n"\
+                                 "void tst_QScriptValueGenerated::%1_initData()\n"\
                                  "{\n"\
                                  "    QTest::addColumn<QScriptValue>(\"other\");\n"\
                                  "    QTest::addColumn<bool>(\"expected\");\n"\
@@ -477,7 +478,7 @@ static QString generateCompareDef(const QString& comparisionType, const QList<QS
                                  "}\n"\
                                  "\n"\
                                  "static QString %1_array[] = {%2};\n\n"\
-                                 "void tst_QScriptValue::%1_makeData(const char *expr)\n"\
+                                 "void tst_QScriptValueGenerated::%1_makeData(const char *expr)\n"\
                                  "{\n"\
                                  "    static QSet<QString> equals;\n"\
                                  "    if (equals.isEmpty()) {\n"\
@@ -492,7 +493,7 @@ static QString generateCompareDef(const QString& comparisionType, const QList<QS
                                  "    }\n"\
                                  "}\n"\
                                  "\n"\
-                                 "void tst_QScriptValue::%1_test(const char *, const QScriptValue& value)\n"\
+                                 "void tst_QScriptValueGenerated::%1_test(const char *, const QScriptValue& value)\n"\
                                  "{\n"\
                                  "    QFETCH(QScriptValue, other);\n"\
                                  "    QFETCH(bool, expected);\n"\
@@ -520,7 +521,7 @@ static QString generateCompareDef(const QString& comparisionType, const QList<QS
 
 static QString generateInitDef(const QVector<QString>& allDataTags)
 {
-    static const QString templ = "void tst_QScriptValue::initScriptValues()\n"\
+    static const QString templ = "void tst_QScriptValueGenerated::initScriptValues()\n"\
                                  "{\n"\
                                  "    m_values.clear();\n"\
                                  "    if (engine)\n"\
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
index 90bc104..b12dd29 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_cast.cpp
@@ -53,7 +53,7 @@ void tst_QScriptValueGenerated::qscriptvalue_castQString_initData()
     initScriptValues();
 }
 
-static QString qscriptvalue_castQString_tagArray [] = {
+static QString qscriptvalue_castQString_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -195,79 +195,79 @@ static QString qscriptvalue_castQString_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static QString qscriptvalue_castQString_valueArray [] = {
-    "", "", 
-    "", "true", 
-    "false", "122", 
-    "124", "0", 
-    "0", "123", 
-    "6.37e-8", "-6.37e-8", 
-    "1126240820", "65536", 
-    "65537", "NaN", 
-    "NaN", "Infinity", 
-    "-Infinity", "NaN", 
-    "Infinity", "-Infinity", 
-    "ciao", "ciao", 
-    "", "", 
-    "0", "123", 
-    "12.4", "", 
-    "", "true", 
-    "false", "122", 
-    "124", "0", 
-    "0", "123", 
-    "6.37e-8", "-6.37e-8", 
-    "1126240820", "65536", 
-    "65537", "NaN", 
-    "NaN", "Infinity", 
-    "-Infinity", "NaN", 
-    "Infinity", "-Infinity", 
-    "ciao", "ciao", 
-    "", "", 
-    "0", "123", 
-    "12.3", "", 
-    "", "true", 
-    "false", "122", 
-    "124", "0", 
-    "0", "123", 
-    "6.37e-8", "-6.37e-8", 
-    "1126240820", "65536", 
-    "65537", "NaN", 
-    "NaN", "Infinity", 
-    "-Infinity", "NaN", 
-    "Infinity", "-Infinity", 
-    "ciao", "ciao", 
-    "", "", 
-    "0", "123", 
-    "1.23", "", 
-    "", "[object Object]", 
-    "Invalid Date", "", 
-    "function () {\n    [native code]\n}", "Error: Unknown error", 
-    "function Object() {\n    [native code]\n}", "function Array() {\n    [native code]\n}", 
-    "function Number() {\n    [native code]\n}", "function Function() {\n    [native code]\n}", 
-    "function () { return 1; }", "function () { return 'ciao'; }", 
-    "function () { throw new Error('foo'); }", "/foo/", 
-    "[object Object]", "", 
-    "Error: Unknown error", "22", 
-    "ReferenceError: Can't find variable: Undefined", "ReferenceError: Can't find variable: Null", 
-    "ReferenceError: Can't find variable: True", "ReferenceError: Can't find variable: False", 
-    "", "", 
-    "true", "false", 
-    "122", "124", 
-    "0", "0", 
-    "123", "6.37e-8", 
-    "-6.37e-8", "1126240820", 
-    "65536", "65537", 
-    "NaN", "Infinity", 
-    "-Infinity", "ciao", 
-    "", "0", 
-    "123", "12.4", 
-    "", "", 
-    "[object Object]", "", 
-    ",,,,,,,,,", "Invalid Date", 
-    "[object QMetaObject]", "undefined", 
-    "123", "false", 
-    "", "QScriptEngine(name = \"\")", };
+    "engine->newQObject(engine)"};
+static QString qscriptvalue_castQString_valueArray[] = {
+    "", "",
+    "", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "NaN", "Infinity",
+    "-Infinity", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "ciao",
+    "", "",
+    "0", "123",
+    "12.4", "",
+    "", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "NaN", "Infinity",
+    "-Infinity", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "ciao",
+    "", "",
+    "0", "123",
+    "12.3", "",
+    "", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "NaN", "Infinity",
+    "-Infinity", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "ciao",
+    "", "",
+    "0", "123",
+    "1.23", "",
+    "", "[object Object]",
+    "Invalid Date", "",
+    "function () {\n    [native code]\n}", "Error: Unknown error",
+    "function Object() {\n    [native code]\n}", "function Array() {\n    [native code]\n}",
+    "function Number() {\n    [native code]\n}", "function Function() {\n    [native code]\n}",
+    "function () { return 1; }", "function () { return 'ciao'; }",
+    "function () { throw new Error('foo'); }", "/foo/",
+    "[object Object]", "",
+    "Error: Unknown error", "22",
+    "ReferenceError: Can't find variable: Undefined", "ReferenceError: Can't find variable: Null",
+    "ReferenceError: Can't find variable: True", "ReferenceError: Can't find variable: False",
+    "", "",
+    "true", "false",
+    "122", "124",
+    "0", "0",
+    "123", "6.37e-8",
+    "-6.37e-8", "1126240820",
+    "65536", "65537",
+    "NaN", "Infinity",
+    "-Infinity", "ciao",
+    "", "0",
+    "123", "12.4",
+    "", "",
+    "[object Object]", "",
+    ",,,,,,,,,", "Invalid Date",
+    "[object QMetaObject]", "undefined",
+    "123", "false",
+    "", "QScriptEngine(name = \"\")"};
 void tst_QScriptValueGenerated::qscriptvalue_castQString_makeData(const char* expr)
 {
     static QHash<QString, QString> value;
@@ -295,7 +295,7 @@ void tst_QScriptValueGenerated::qscriptvalue_castqsreal_initData()
     initScriptValues();
 }
 
-static QString qscriptvalue_castqsreal_tagArray [] = {
+static QString qscriptvalue_castqsreal_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -437,23 +437,23 @@ static QString qscriptvalue_castqsreal_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static qsreal qscriptvalue_castqsreal_valueArray [] = {
-    0, qQNaN(), 0, 1, 0, 122, 124, 0, 0, 123, 
-    6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), 
-    qInf(), qInf(), qQNaN(), qQNaN(), 0, 0, 0, 123, 12.4, qQNaN(), 
-    0, 1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 
-    1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), 
-    qQNaN(), qQNaN(), 0, 0, 0, 123, 12.3, qQNaN(), 0, 1, 
-    0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 
-    65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), qQNaN(), qQNaN(), 
-    0, 0, 0, 123, 1.23, 0, qQNaN(), qQNaN(), qQNaN(), 0, 
-    qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 
-    qQNaN(), 0, qQNaN(), 22, qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0, 
-    1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 
-    65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4, 
-    0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0, 
-    0, qQNaN(), };
+    "engine->newQObject(engine)"};
+static qsreal qscriptvalue_castqsreal_valueArray[] = {
+    0, qQNaN(), 0, 1, 0, 122, 124, 0, 0, 123,
+    6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(),
+    qInf(), qInf(), qQNaN(), qQNaN(), 0, 0, 0, 123, 12.4, qQNaN(),
+    0, 1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08,
+    1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(),
+    qQNaN(), qQNaN(), 0, 0, 0, 123, 12.3, qQNaN(), 0, 1,
+    0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536,
+    65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), qQNaN(), qQNaN(),
+    0, 0, 0, 123, 1.23, 0, qQNaN(), qQNaN(), qQNaN(), 0,
+    qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(),
+    qQNaN(), 0, qQNaN(), 22, qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0,
+    1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820,
+    65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4,
+    0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0,
+    0, qQNaN()};
 void tst_QScriptValueGenerated::qscriptvalue_castqsreal_makeData(const char* expr)
 {
     static QHash<QString, qsreal> value;
@@ -491,7 +491,7 @@ void tst_QScriptValueGenerated::qscriptvalue_castbool_initData()
     initScriptValues();
 }
 
-static QString qscriptvalue_castbool_tagArray [] = {
+static QString qscriptvalue_castbool_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -633,79 +633,79 @@ static QString qscriptvalue_castbool_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static bool qscriptvalue_castbool_valueArray [] = {
-    false, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, false, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, true, };
+    "engine->newQObject(engine)"};
+static bool qscriptvalue_castbool_valueArray[] = {
+    false, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, false,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    true, true,
+    false, true,
+    true, true,
+    false, true,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    false, true};
 void tst_QScriptValueGenerated::qscriptvalue_castbool_makeData(const char* expr)
 {
     static QHash<QString, bool> value;
@@ -733,7 +733,7 @@ void tst_QScriptValueGenerated::qscriptvalue_castqint32_initData()
     initScriptValues();
 }
 
-static QString qscriptvalue_castqint32_tagArray [] = {
+static QString qscriptvalue_castqint32_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -875,79 +875,79 @@ static QString qscriptvalue_castqint32_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static qint32 qscriptvalue_castqint32_valueArray [] = {
-    0, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 22, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    1, 0, 
-    122, 124, 
-    0, 0, 
-    123, 0, 
-    0, 1126240820, 
-    65536, 65537, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 12, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 0, 
-    0, 0, };
+    "engine->newQObject(engine)"};
+static qint32 qscriptvalue_castqint32_valueArray[] = {
+    0, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 22,
+    0, 0,
+    0, 0,
+    0, 0,
+    1, 0,
+    122, 124,
+    0, 0,
+    123, 0,
+    0, 1126240820,
+    65536, 65537,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 12,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 0,
+    0, 0};
 void tst_QScriptValueGenerated::qscriptvalue_castqint32_makeData(const char* expr)
 {
     static QHash<QString, qint32> value;
@@ -975,7 +975,7 @@ void tst_QScriptValueGenerated::qscriptvalue_castquint32_initData()
     initScriptValues();
 }
 
-static QString qscriptvalue_castquint32_tagArray [] = {
+static QString qscriptvalue_castquint32_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -1117,79 +1117,79 @@ static QString qscriptvalue_castquint32_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static quint32 qscriptvalue_castquint32_valueArray [] = {
-    0, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 22, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    1, 0, 
-    122, 124, 
-    0, 0, 
-    123, 0, 
-    0, 1126240820, 
-    65536, 65537, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 12, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 0, 
-    0, 0, };
+    "engine->newQObject(engine)"};
+static quint32 qscriptvalue_castquint32_valueArray[] = {
+    0, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 22,
+    0, 0,
+    0, 0,
+    0, 0,
+    1, 0,
+    122, 124,
+    0, 0,
+    123, 0,
+    0, 1126240820,
+    65536, 65537,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 12,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 0,
+    0, 0};
 void tst_QScriptValueGenerated::qscriptvalue_castquint32_makeData(const char* expr)
 {
     static QHash<QString, quint32> value;
@@ -1217,7 +1217,7 @@ void tst_QScriptValueGenerated::qscriptvalue_castquint16_initData()
     initScriptValues();
 }
 
-static QString qscriptvalue_castquint16_tagArray [] = {
+static QString qscriptvalue_castquint16_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -1359,79 +1359,79 @@ static QString qscriptvalue_castquint16_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static quint16 qscriptvalue_castquint16_valueArray [] = {
-    0, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    4660, 0, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    4660, 0, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    4660, 0, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 22, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    1, 0, 
-    122, 124, 
-    0, 0, 
-    123, 0, 
-    0, 4660, 
-    0, 1, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 12, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 0, 
-    0, 0, };
+    "engine->newQObject(engine)"};
+static quint16 qscriptvalue_castquint16_valueArray[] = {
+    0, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    4660, 0,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    4660, 0,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    4660, 0,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 22,
+    0, 0,
+    0, 0,
+    0, 0,
+    1, 0,
+    122, 124,
+    0, 0,
+    123, 0,
+    0, 4660,
+    0, 1,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 12,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 0,
+    0, 0};
 void tst_QScriptValueGenerated::qscriptvalue_castquint16_makeData(const char* expr)
 {
     static QHash<QString, quint16> value;
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
index 02243de..16d5770 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_comparison.cpp
@@ -54,7 +54,7 @@ void tst_QScriptValueGenerated::equals_initData()
     initScriptValues();
 }
 
-static QString equals_array [] = {
+static QString equals_array[] = {
     "QScriptValue() <=> QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue) <=> QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::UndefinedValue) <=> QScriptValue(QScriptValue::NullValue)",
@@ -1271,7 +1271,7 @@ static QString equals_array [] = {
     "engine->newQObject(0) <=> engine->nullValue()",
     "engine->newQObject(0) <=> engine->undefinedValue()",
     "engine->newQObject(0) <=> engine->newQObject(0)",
-    "engine->newQObject(engine) <=> engine->newQObject(engine)",};
+    "engine->newQObject(engine) <=> engine->newQObject(engine)"};
 
 void tst_QScriptValueGenerated::equals_makeData(const char *expr)
 {
@@ -1305,7 +1305,7 @@ void tst_QScriptValueGenerated::strictlyEquals_initData()
     initScriptValues();
 }
 
-static QString strictlyEquals_array [] = {
+static QString strictlyEquals_array[] = {
     "QScriptValue() <=> QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue) <=> QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::UndefinedValue) <=> QScriptValue(0, QScriptValue::UndefinedValue)",
@@ -1828,7 +1828,7 @@ static QString strictlyEquals_array [] = {
     "engine->newQObject(0) <=> engine->evaluate(\"null\")",
     "engine->newQObject(0) <=> engine->nullValue()",
     "engine->newQObject(0) <=> engine->newQObject(0)",
-    "engine->newQObject(engine) <=> engine->newQObject(engine)",};
+    "engine->newQObject(engine) <=> engine->newQObject(engine)"};
 
 void tst_QScriptValueGenerated::strictlyEquals_makeData(const char *expr)
 {
@@ -1862,7 +1862,7 @@ void tst_QScriptValueGenerated::lessThan_initData()
     initScriptValues();
 }
 
-static QString lessThan_array [] = {
+static QString lessThan_array[] = {
     "QScriptValue(QScriptValue::NullValue) <=> QScriptValue(true)",
     "QScriptValue(QScriptValue::NullValue) <=> QScriptValue(int(122))",
     "QScriptValue(QScriptValue::NullValue) <=> QScriptValue(uint(124))",
@@ -6925,7 +6925,7 @@ static QString lessThan_array [] = {
     "engine->newQObject(engine) <=> engine->evaluate(\"False\")",
     "engine->newQObject(engine) <=> engine->evaluate(\"'ciao'\")",
     "engine->newQObject(engine) <=> engine->newObject()",
-    "engine->newQObject(engine) <=> engine->newQMetaObject(&QObject::staticMetaObject)",};
+    "engine->newQObject(engine) <=> engine->newQMetaObject(&QObject::staticMetaObject)"};
 
 void tst_QScriptValueGenerated::lessThan_makeData(const char *expr)
 {
@@ -6959,7 +6959,7 @@ void tst_QScriptValueGenerated::instanceOf_initData()
     initScriptValues();
 }
 
-static QString instanceOf_array [] = {
+static QString instanceOf_array[] = {
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"Object\")",
     "engine->evaluate(\"[]\") <=> engine->evaluate(\"Array\")",
     "engine->evaluate(\"Date.prototype\") <=> engine->evaluate(\"Object\")",
@@ -6999,7 +6999,7 @@ static QString instanceOf_array [] = {
     "engine->newVariant(QVariant()) <=> engine->evaluate(\"Object\")",
     "engine->newVariant(QVariant(123)) <=> engine->evaluate(\"Object\")",
     "engine->newVariant(QVariant(false)) <=> engine->evaluate(\"Object\")",
-    "engine->newQObject(engine) <=> engine->evaluate(\"Object\")",};
+    "engine->newQObject(engine) <=> engine->evaluate(\"Object\")"};
 
 void tst_QScriptValueGenerated::instanceOf_makeData(const char *expr)
 {
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
index 8c8a7d1..77b58ef 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_init.cpp
@@ -49,7 +49,7 @@
 void tst_QScriptValueGenerated::initScriptValues()
 {
     m_values.clear();
-    if (engine) 
+    if (engine)
         delete engine;
     engine = new QScriptEngine;
     DEFINE_TEST_VALUE(QScriptValue());
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
index 71a5c1d..70ccb17 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_isXXX.cpp
@@ -52,7 +52,7 @@ void tst_QScriptValueGenerated::isValid_initData()
     initScriptValues();
 }
 
-static QString isValid_array [] = {
+static QString isValid_array[] = {
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
     "QScriptValue(true)",
@@ -193,7 +193,8 @@ static QString isValid_array [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"
+};
 
 void tst_QScriptValueGenerated::isValid_makeData(const char* expr)
 {
@@ -222,7 +223,7 @@ void tst_QScriptValueGenerated::isBool_initData()
     initScriptValues();
 }
 
-static QString isBool_array [] = {
+static QString isBool_array[] = {
     "QScriptValue(true)",
     "QScriptValue(false)",
     "QScriptValue(0, true)",
@@ -230,7 +231,8 @@ static QString isBool_array [] = {
     "QScriptValue(engine, true)",
     "QScriptValue(engine, false)",
     "engine->evaluate(\"true\")",
-    "engine->evaluate(\"false\")",};
+    "engine->evaluate(\"false\")"
+};
 
 void tst_QScriptValueGenerated::isBool_makeData(const char* expr)
 {
@@ -259,7 +261,7 @@ void tst_QScriptValueGenerated::isBoolean_initData()
     initScriptValues();
 }
 
-static QString isBoolean_array [] = {
+static QString isBoolean_array[] = {
     "QScriptValue(true)",
     "QScriptValue(false)",
     "QScriptValue(0, true)",
@@ -267,7 +269,8 @@ static QString isBoolean_array [] = {
     "QScriptValue(engine, true)",
     "QScriptValue(engine, false)",
     "engine->evaluate(\"true\")",
-    "engine->evaluate(\"false\")",};
+    "engine->evaluate(\"false\")"
+};
 
 void tst_QScriptValueGenerated::isBoolean_makeData(const char* expr)
 {
@@ -296,7 +299,7 @@ void tst_QScriptValueGenerated::isNumber_initData()
     initScriptValues();
 }
 
-static QString isNumber_array [] = {
+static QString isNumber_array[] = {
     "QScriptValue(int(122))",
     "QScriptValue(uint(124))",
     "QScriptValue(0)",
@@ -352,7 +355,8 @@ static QString isNumber_array [] = {
     "engine->evaluate(\"0x10001\")",
     "engine->evaluate(\"NaN\")",
     "engine->evaluate(\"Infinity\")",
-    "engine->evaluate(\"-Infinity\")",};
+    "engine->evaluate(\"-Infinity\")"
+};
 
 void tst_QScriptValueGenerated::isNumber_makeData(const char* expr)
 {
@@ -381,7 +385,7 @@ void tst_QScriptValueGenerated::isFunction_initData()
     initScriptValues();
 }
 
-static QString isFunction_array [] = {
+static QString isFunction_array[] = {
     "engine->evaluate(\"Function.prototype\")",
     "engine->evaluate(\"Object\")",
     "engine->evaluate(\"Array\")",
@@ -391,7 +395,8 @@ static QString isFunction_array [] = {
     "engine->evaluate(\"(function() { return 'ciao'; })\")",
     "engine->evaluate(\"(function() { throw new Error('foo'); })\")",
     "engine->evaluate(\"/foo/\")",
-    "engine->newQMetaObject(&QObject::staticMetaObject)",};
+    "engine->newQMetaObject(&QObject::staticMetaObject)"
+};
 
 void tst_QScriptValueGenerated::isFunction_makeData(const char* expr)
 {
@@ -420,13 +425,14 @@ void tst_QScriptValueGenerated::isNull_initData()
     initScriptValues();
 }
 
-static QString isNull_array [] = {
+static QString isNull_array[] = {
     "QScriptValue(QScriptValue::NullValue)",
     "QScriptValue(0, QScriptValue::NullValue)",
     "QScriptValue(engine, QScriptValue::NullValue)",
     "engine->evaluate(\"null\")",
     "engine->nullValue()",
-    "engine->newQObject(0)",};
+    "engine->newQObject(0)"
+};
 
 void tst_QScriptValueGenerated::isNull_makeData(const char* expr)
 {
@@ -455,7 +461,7 @@ void tst_QScriptValueGenerated::isString_initData()
     initScriptValues();
 }
 
-static QString isString_array [] = {
+static QString isString_array[] = {
     "QScriptValue(\"NaN\")",
     "QScriptValue(\"Infinity\")",
     "QScriptValue(\"-Infinity\")",
@@ -490,7 +496,8 @@ static QString isString_array [] = {
     "engine->evaluate(\"''\")",
     "engine->evaluate(\"'0'\")",
     "engine->evaluate(\"'123'\")",
-    "engine->evaluate(\"'12.4'\")",};
+    "engine->evaluate(\"'12.4'\")"
+};
 
 void tst_QScriptValueGenerated::isString_makeData(const char* expr)
 {
@@ -519,13 +526,14 @@ void tst_QScriptValueGenerated::isUndefined_initData()
     initScriptValues();
 }
 
-static QString isUndefined_array [] = {
+static QString isUndefined_array[] = {
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(0, QScriptValue::UndefinedValue)",
     "QScriptValue(engine, QScriptValue::UndefinedValue)",
     "engine->evaluate(\"{}\")",
     "engine->evaluate(\"undefined\")",
-    "engine->undefinedValue()",};
+    "engine->undefinedValue()"
+};
 
 void tst_QScriptValueGenerated::isUndefined_makeData(const char* expr)
 {
@@ -554,10 +562,11 @@ void tst_QScriptValueGenerated::isVariant_initData()
     initScriptValues();
 }
 
-static QString isVariant_array [] = {
+static QString isVariant_array[] = {
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
-    "engine->newVariant(QVariant(false))",};
+    "engine->newVariant(QVariant(false))"
+};
 
 void tst_QScriptValueGenerated::isVariant_makeData(const char* expr)
 {
@@ -586,8 +595,9 @@ void tst_QScriptValueGenerated::isQObject_initData()
     initScriptValues();
 }
 
-static QString isQObject_array [] = {
-    "engine->newQObject(engine)",};
+static QString isQObject_array[] = {
+    "engine->newQObject(engine)"
+};
 
 void tst_QScriptValueGenerated::isQObject_makeData(const char* expr)
 {
@@ -616,8 +626,9 @@ void tst_QScriptValueGenerated::isQMetaObject_initData()
     initScriptValues();
 }
 
-static QString isQMetaObject_array [] = {
-    "engine->newQMetaObject(&QObject::staticMetaObject)",};
+static QString isQMetaObject_array[] = {
+    "engine->newQMetaObject(&QObject::staticMetaObject)"
+};
 
 void tst_QScriptValueGenerated::isQMetaObject_makeData(const char* expr)
 {
@@ -646,7 +657,7 @@ void tst_QScriptValueGenerated::isObject_initData()
     initScriptValues();
 }
 
-static QString isObject_array [] = {
+static QString isObject_array[] = {
     "engine->evaluate(\"[]\")",
     "engine->evaluate(\"Object.prototype\")",
     "engine->evaluate(\"Date.prototype\")",
@@ -676,7 +687,8 @@ static QString isObject_array [] = {
     "engine->newVariant(QVariant())",
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"
+};
 
 void tst_QScriptValueGenerated::isObject_makeData(const char* expr)
 {
@@ -705,9 +717,10 @@ void tst_QScriptValueGenerated::isDate_initData()
     initScriptValues();
 }
 
-static QString isDate_array [] = {
+static QString isDate_array[] = {
     "engine->evaluate(\"Date.prototype\")",
-    "engine->newDate(QDateTime())",};
+    "engine->newDate(QDateTime())"
+};
 
 void tst_QScriptValueGenerated::isDate_makeData(const char* expr)
 {
@@ -736,8 +749,9 @@ void tst_QScriptValueGenerated::isRegExp_initData()
     initScriptValues();
 }
 
-static QString isRegExp_array [] = {
-    "engine->evaluate(\"/foo/\")",};
+static QString isRegExp_array[] = {
+    "engine->evaluate(\"/foo/\")"
+};
 
 void tst_QScriptValueGenerated::isRegExp_makeData(const char* expr)
 {
@@ -766,12 +780,13 @@ void tst_QScriptValueGenerated::isArray_initData()
     initScriptValues();
 }
 
-static QString isArray_array [] = {
+static QString isArray_array[] = {
     "engine->evaluate(\"[]\")",
     "engine->evaluate(\"Array.prototype\")",
     "engine->evaluate(\"new Array()\")",
     "engine->newArray()",
-    "engine->newArray(10)",};
+    "engine->newArray(10)"
+};
 
 void tst_QScriptValueGenerated::isArray_makeData(const char* expr)
 {
@@ -800,13 +815,14 @@ void tst_QScriptValueGenerated::isError_initData()
     initScriptValues();
 }
 
-static QString isError_array [] = {
+static QString isError_array[] = {
     "engine->evaluate(\"Error.prototype\")",
     "engine->evaluate(\"new Error()\")",
     "engine->evaluate(\"Undefined\")",
     "engine->evaluate(\"Null\")",
     "engine->evaluate(\"True\")",
-    "engine->evaluate(\"False\")",};
+    "engine->evaluate(\"False\")"
+};
 
 void tst_QScriptValueGenerated::isError_makeData(const char* expr)
 {
diff --git a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
index cb75ded..4abfe22 100644
--- a/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
+++ b/tests/auto/qscriptvaluegenerated/tst_qscriptvalue_generated_toXXX.cpp
@@ -53,7 +53,7 @@ void tst_QScriptValueGenerated::toString_initData()
     initScriptValues();
 }
 
-static QString toString_tagArray [] = {
+static QString toString_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -195,80 +195,80 @@ static QString toString_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"};
 
-static QString toString_valueArray [] = {
-    "", "undefined", 
-    "null", "true", 
-    "false", "122", 
-    "124", "0", 
-    "0", "123", 
-    "6.37e-8", "-6.37e-8", 
-    "1126240820", "65536", 
-    "65537", "NaN", 
-    "NaN", "Infinity", 
-    "-Infinity", "NaN", 
-    "Infinity", "-Infinity", 
-    "ciao", "ciao", 
-    "", "", 
-    "0", "123", 
-    "12.4", "undefined", 
-    "null", "true", 
-    "false", "122", 
-    "124", "0", 
-    "0", "123", 
-    "6.37e-8", "-6.37e-8", 
-    "1126240820", "65536", 
-    "65537", "NaN", 
-    "NaN", "Infinity", 
-    "-Infinity", "NaN", 
-    "Infinity", "-Infinity", 
-    "ciao", "ciao", 
-    "", "", 
-    "0", "123", 
-    "12.3", "undefined", 
-    "null", "true", 
-    "false", "122", 
-    "124", "0", 
-    "0", "123", 
-    "6.37e-8", "-6.37e-8", 
-    "1126240820", "65536", 
-    "65537", "NaN", 
-    "NaN", "Infinity", 
-    "-Infinity", "NaN", 
-    "Infinity", "-Infinity", 
-    "ciao", "ciao", 
-    "", "", 
-    "0", "123", 
-    "1.23", "", 
-    "undefined", "[object Object]", 
-    "Invalid Date", "", 
-    "function () {\n    [native code]\n}", "Error: Unknown error", 
-    "function Object() {\n    [native code]\n}", "function Array() {\n    [native code]\n}", 
-    "function Number() {\n    [native code]\n}", "function Function() {\n    [native code]\n}", 
-    "function () { return 1; }", "function () { return 'ciao'; }", 
-    "function () { throw new Error('foo'); }", "/foo/", 
-    "[object Object]", "", 
-    "Error: Unknown error", "22", 
-    "ReferenceError: Can't find variable: Undefined", "ReferenceError: Can't find variable: Null", 
-    "ReferenceError: Can't find variable: True", "ReferenceError: Can't find variable: False", 
-    "undefined", "null", 
-    "true", "false", 
-    "122", "124", 
-    "0", "0", 
-    "123", "6.37e-8", 
-    "-6.37e-8", "1126240820", 
-    "65536", "65537", 
-    "NaN", "Infinity", 
-    "-Infinity", "ciao", 
-    "", "0", 
-    "123", "12.4", 
-    "null", "undefined", 
-    "[object Object]", "", 
-    ",,,,,,,,,", "Invalid Date", 
-    "[object QMetaObject]", "undefined", 
-    "123", "false", 
-    "null", "QScriptEngine(name = \"\")", };
+static QString toString_valueArray[] = {
+    "", "undefined",
+    "null", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "NaN", "Infinity",
+    "-Infinity", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "ciao",
+    "", "",
+    "0", "123",
+    "12.4", "undefined",
+    "null", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "NaN", "Infinity",
+    "-Infinity", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "ciao",
+    "", "",
+    "0", "123",
+    "12.3", "undefined",
+    "null", "true",
+    "false", "122",
+    "124", "0",
+    "0", "123",
+    "6.37e-8", "-6.37e-8",
+    "1126240820", "65536",
+    "65537", "NaN",
+    "NaN", "Infinity",
+    "-Infinity", "NaN",
+    "Infinity", "-Infinity",
+    "ciao", "ciao",
+    "", "",
+    "0", "123",
+    "1.23", "",
+    "undefined", "[object Object]",
+    "Invalid Date", "",
+    "function () {\n    [native code]\n}", "Error: Unknown error",
+    "function Object() {\n    [native code]\n}", "function Array() {\n    [native code]\n}",
+    "function Number() {\n    [native code]\n}", "function Function() {\n    [native code]\n}",
+    "function () { return 1; }", "function () { return 'ciao'; }",
+    "function () { throw new Error('foo'); }", "/foo/",
+    "[object Object]", "",
+    "Error: Unknown error", "22",
+    "ReferenceError: Can't find variable: Undefined", "ReferenceError: Can't find variable: Null",
+    "ReferenceError: Can't find variable: True", "ReferenceError: Can't find variable: False",
+    "undefined", "null",
+    "true", "false",
+    "122", "124",
+    "0", "0",
+    "123", "6.37e-8",
+    "-6.37e-8", "1126240820",
+    "65536", "65537",
+    "NaN", "Infinity",
+    "-Infinity", "ciao",
+    "", "0",
+    "123", "12.4",
+    "null", "undefined",
+    "[object Object]", "",
+    ",,,,,,,,,", "Invalid Date",
+    "[object QMetaObject]", "undefined",
+    "123", "false",
+    "null", "QScriptEngine(name = \"\")"};
 
 void tst_QScriptValueGenerated::toString_makeData(const char* expr)
 {
@@ -297,7 +297,7 @@ void tst_QScriptValueGenerated::toNumber_initData()
     initScriptValues();
 }
 
-static QString toNumber_tagArray [] = {
+static QString toNumber_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -439,23 +439,23 @@ static QString toNumber_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static qsreal toNumber_valueArray [] = {
-    0, qQNaN(), 0, 1, 0, 122, 124, 0, 0, 123, 
-    6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), 
-    qInf(), qInf(), qQNaN(), qQNaN(), 0, 0, 0, 123, 12.4, qQNaN(), 
-    0, 1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 
-    1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), 
-    qQNaN(), qQNaN(), 0, 0, 0, 123, 12.3, qQNaN(), 0, 1, 
-    0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 
-    65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), qQNaN(), qQNaN(), 
-    0, 0, 0, 123, 1.23, 0, qQNaN(), qQNaN(), qQNaN(), 0, 
-    qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 
-    qQNaN(), 0, qQNaN(), 22, qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0, 
-    1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 
-    65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4, 
-    0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0, 
-    0, qQNaN(), };
+    "engine->newQObject(engine)"};
+static qsreal toNumber_valueArray[] = {
+    0, qQNaN(), 0, 1, 0, 122, 124, 0, 0, 123,
+    6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(),
+    qInf(), qInf(), qQNaN(), qQNaN(), 0, 0, 0, 123, 12.4, qQNaN(),
+    0, 1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08,
+    1126240820, 65536, 65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(),
+    qQNaN(), qQNaN(), 0, 0, 0, 123, 12.3, qQNaN(), 0, 1,
+    0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820, 65536,
+    65537, qQNaN(), qQNaN(), qInf(), qInf(), qQNaN(), qInf(), qInf(), qQNaN(), qQNaN(),
+    0, 0, 0, 123, 1.23, 0, qQNaN(), qQNaN(), qQNaN(), 0,
+    qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(),
+    qQNaN(), 0, qQNaN(), 22, qQNaN(), qQNaN(), qQNaN(), qQNaN(), qQNaN(), 0,
+    1, 0, 122, 124, 0, 0, 123, 6.369999999999999e-08, -6.369999999999999e-08, 1126240820,
+    65536, 65537, qQNaN(), qInf(), qInf(), qQNaN(), 0, 0, 123, 12.4,
+    0, qQNaN(), qQNaN(), 0, qQNaN(), qQNaN(), qQNaN(), qQNaN(), 123, 0,
+    0, qQNaN()};
 void tst_QScriptValueGenerated::toNumber_makeData(const char* expr)
 {
     static QHash<QString, qsreal> toNumber;
@@ -492,7 +492,7 @@ void tst_QScriptValueGenerated::toBool_initData()
     initScriptValues();
 }
 
-static QString toBool_tagArray [] = {
+static QString toBool_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -634,80 +634,80 @@ static QString toBool_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"};
 
-static bool toBool_valueArray [] = {
-    false, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, false, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, true, };
+static bool toBool_valueArray[] = {
+    false, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, false,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    true, true,
+    false, true,
+    true, true,
+    false, true,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    false, true};
 
 void tst_QScriptValueGenerated::toBool_makeData(const char* expr)
 {
@@ -736,7 +736,7 @@ void tst_QScriptValueGenerated::toBoolean_initData()
     initScriptValues();
 }
 
-static QString toBoolean_tagArray [] = {
+static QString toBoolean_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -878,80 +878,80 @@ static QString toBoolean_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"};
 
-static bool toBoolean_valueArray [] = {
-    false, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, false, 
-    false, true, 
-    false, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, false, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, false, 
-    true, false, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    false, true, 
-    true, true, 
-    false, false, 
-    true, true, 
-    true, true, 
-    true, true, 
-    true, true, 
-    false, true, };
+static bool toBoolean_valueArray[] = {
+    false, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, false,
+    false, true,
+    false, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, false,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    false, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    false, false,
+    true, false,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    true, true,
+    false, true,
+    true, true,
+    false, true,
+    true, true,
+    false, false,
+    true, true,
+    true, true,
+    true, true,
+    true, true,
+    false, true};
 
 void tst_QScriptValueGenerated::toBoolean_makeData(const char* expr)
 {
@@ -980,7 +980,7 @@ void tst_QScriptValueGenerated::toInteger_initData()
     initScriptValues();
 }
 
-static QString toInteger_tagArray [] = {
+static QString toInteger_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -1122,23 +1122,23 @@ static QString toInteger_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
-static qsreal toInteger_valueArray [] = {
-    0, 0, 0, 1, 0, 122, 124, 0, 0, 123, 
-    0, 0, 1126240820, 65536, 65537, 0, 0, qInf(), qInf(), 0, 
-    qInf(), qInf(), 0, 0, 0, 0, 0, 123, 12, 0, 
-    0, 1, 0, 122, 124, 0, 0, 123, 0, 0, 
-    1126240820, 65536, 65537, 0, 0, qInf(), qInf(), 0, qInf(), qInf(), 
-    0, 0, 0, 0, 0, 123, 12, 0, 0, 1, 
-    0, 122, 124, 0, 0, 123, 0, 0, 1126240820, 65536, 
-    65537, 0, 0, qInf(), qInf(), 0, qInf(), qInf(), 0, 0, 
-    0, 0, 0, 123, 1, 0, 0, 0, 0, 0, 
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 
-    0, 0, 0, 22, 0, 0, 0, 0, 0, 0, 
-    1, 0, 122, 124, 0, 0, 123, 0, 0, 1126240820, 
-    65536, 65537, 0, qInf(), qInf(), 0, 0, 0, 123, 12, 
-    0, 0, 0, 0, 0, 0, 0, 0, 123, 0, 
-    0, 0, };
+    "engine->newQObject(engine)"};
+static qsreal toInteger_valueArray[] = {
+    0, 0, 0, 1, 0, 122, 124, 0, 0, 123,
+    0, 0, 1126240820, 65536, 65537, 0, 0, qInf(), qInf(), 0,
+    qInf(), qInf(), 0, 0, 0, 0, 0, 123, 12, 0,
+    0, 1, 0, 122, 124, 0, 0, 123, 0, 0,
+    1126240820, 65536, 65537, 0, 0, qInf(), qInf(), 0, qInf(), qInf(),
+    0, 0, 0, 0, 0, 123, 12, 0, 0, 1,
+    0, 122, 124, 0, 0, 123, 0, 0, 1126240820, 65536,
+    65537, 0, 0, qInf(), qInf(), 0, qInf(), qInf(), 0, 0,
+    0, 0, 0, 123, 1, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 22, 0, 0, 0, 0, 0, 0,
+    1, 0, 122, 124, 0, 0, 123, 0, 0, 1126240820,
+    65536, 65537, 0, qInf(), qInf(), 0, 0, 0, 123, 12,
+    0, 0, 0, 0, 0, 0, 0, 0, 123, 0,
+    0, 0};
 void tst_QScriptValueGenerated::toInteger_makeData(const char* expr)
 {
     static QHash<QString, qsreal> toInteger;
@@ -1171,7 +1171,7 @@ void tst_QScriptValueGenerated::toInt32_initData()
     initScriptValues();
 }
 
-static QString toInt32_tagArray [] = {
+static QString toInt32_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -1313,80 +1313,80 @@ static QString toInt32_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"};
 
-static qint32 toInt32_valueArray [] = {
-    0, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 22, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    1, 0, 
-    122, 124, 
-    0, 0, 
-    123, 0, 
-    0, 1126240820, 
-    65536, 65537, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 12, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 0, 
-    0, 0, };
+static qint32 toInt32_valueArray[] = {
+    0, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 22,
+    0, 0,
+    0, 0,
+    0, 0,
+    1, 0,
+    122, 124,
+    0, 0,
+    123, 0,
+    0, 1126240820,
+    65536, 65537,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 12,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 0,
+    0, 0};
 
 void tst_QScriptValueGenerated::toInt32_makeData(const char* expr)
 {
@@ -1415,7 +1415,7 @@ void tst_QScriptValueGenerated::toUInt32_initData()
     initScriptValues();
 }
 
-static QString toUInt32_tagArray [] = {
+static QString toUInt32_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -1557,80 +1557,80 @@ static QString toUInt32_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"};
 
-static quint32 toUInt32_valueArray [] = {
-    0, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    1126240820, 65536, 
-    65537, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 22, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    1, 0, 
-    122, 124, 
-    0, 0, 
-    123, 0, 
-    0, 1126240820, 
-    65536, 65537, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 12, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 0, 
-    0, 0, };
+static quint32 toUInt32_valueArray[] = {
+    0, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    1126240820, 65536,
+    65537, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 22,
+    0, 0,
+    0, 0,
+    0, 0,
+    1, 0,
+    122, 124,
+    0, 0,
+    123, 0,
+    0, 1126240820,
+    65536, 65537,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 12,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 0,
+    0, 0};
 
 void tst_QScriptValueGenerated::toUInt32_makeData(const char* expr)
 {
@@ -1659,7 +1659,7 @@ void tst_QScriptValueGenerated::toUInt16_initData()
     initScriptValues();
 }
 
-static QString toUInt16_tagArray [] = {
+static QString toUInt16_tagArray[] = {
     "QScriptValue()",
     "QScriptValue(QScriptValue::UndefinedValue)",
     "QScriptValue(QScriptValue::NullValue)",
@@ -1801,80 +1801,80 @@ static QString toUInt16_tagArray [] = {
     "engine->newVariant(QVariant(123))",
     "engine->newVariant(QVariant(false))",
     "engine->newQObject(0)",
-    "engine->newQObject(engine)",};
+    "engine->newQObject(engine)"};
 
-static quint16 toUInt16_valueArray [] = {
-    0, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    4660, 0, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    4660, 0, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    12, 0, 
-    0, 1, 
-    0, 122, 
-    124, 0, 
-    0, 123, 
-    0, 0, 
-    4660, 0, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 123, 
-    1, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 22, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    1, 0, 
-    122, 124, 
-    0, 0, 
-    123, 0, 
-    0, 4660, 
-    0, 1, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 12, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    0, 0, 
-    123, 0, 
-    0, 0, };
+static quint16 toUInt16_valueArray[] = {
+    0, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    4660, 0,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    4660, 0,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    12, 0,
+    0, 1,
+    0, 122,
+    124, 0,
+    0, 123,
+    0, 0,
+    4660, 0,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 123,
+    1, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 22,
+    0, 0,
+    0, 0,
+    0, 0,
+    1, 0,
+    122, 124,
+    0, 0,
+    123, 0,
+    0, 4660,
+    0, 1,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 12,
+    0, 0,
+    0, 0,
+    0, 0,
+    0, 0,
+    123, 0,
+    0, 0};
 
 void tst_QScriptValueGenerated::toUInt16_makeData(const char* expr)
 {