summaryrefslogtreecommitdiffstats
path: root/tests/auto/declarative/qdeclarativelanguage
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2014-01-17 19:33:29 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-20 16:53:10 +0100
commita0d27513f4eff3f76fd85e6442aca443b7c05a53 (patch)
tree2239ed849796744299fbe25ab3cc50c2867160e9 /tests/auto/declarative/qdeclarativelanguage
parent9ba631edb469599d3973982f8d5d72a9ba059eab (diff)
whitespace fixes
remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativelanguage')
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml4
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml4
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml4
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/testtypes.h2
-rw-r--r--tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp26
17 files changed, 32 insertions, 32 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
index 8aaddace..0328f8d2 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/NestedAlias.qml
@@ -7,8 +7,8 @@ QtObject {
property alias a: object2.a
o1: QtObject { id: object1 }
- o2: QtObject {
- id: object2
+ o2: QtObject {
+ id: object2
property int a: 1923
}
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
index c2ac5c84..62425c63 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/OnCompletedType.qml
@@ -3,6 +3,6 @@ import QtQuick 1.0
MyQmlObject {
property int a: Math.max(10, 9)
- property int b: 11
+ property int b: 11
Component.onCompleted: console.log("Completed " + a + " " + b);
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
index c3d0e1ef..5b7d4130 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/OnDestructionType.qml
@@ -3,6 +3,6 @@ import QtQuick 1.0
MyQmlObject {
property int a: Math.max(10, 9)
- property int b: 11
+ property int b: 11
Component.onDestruction: console.log("Destruction " + a + " " + b);
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
index bd6a7693..da6c6e78 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.4.qml
@@ -1,6 +1,6 @@
import Test 1.0
Alias2 {
- enumAlias: MyTypeObject.EnumVal2
+ enumAlias: MyTypeObject.EnumVal2
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
index 0c839ee7..225c0823 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/alias.5.qml
@@ -4,7 +4,7 @@ import Test 1.0
QtObject {
property alias otherAlias: otherObject
- property variant other
+ property variant other
other: MyQmlObject {
id: otherObject
value: 10
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
index 9fe0ded4..2ce1dfe6 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/assignBasicTypes.qml
@@ -10,7 +10,7 @@ MyTypeObject {
floatProperty: 8.5
colorProperty: "red"
dateProperty: "1982-11-25"
- timeProperty: "11:11:32"
+ timeProperty: "11:11:32"
dateTimeProperty: "2009-05-12T13:22:01"
pointProperty: "99,13"
pointFProperty: "-10.1,12.3"
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
index 87dc3d3e..c1ad5483 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/defaultPropertyListOrder.qml
@@ -13,10 +13,10 @@ MyContainer {
children: [
QtObject {
property int index: 2
- },
+ },
QtObject {
property int index: 3
- }
+ }
]
QtObject {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
index c03ec492..25a821d3 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.2.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.0
import QtQuick 1.0 as Qt47
Qt.QtObject {
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
index ed25c4b8..7a0e6b69 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/dynamicObjectProperties.qml
@@ -8,6 +8,6 @@ QtObject {
objectProperty2: QtObject {}
property MyComponent myComponentProperty
- property MyComponent myComponentProperty2
+ property MyComponent myComponentProperty2
myComponentProperty2: MyComponent {}
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
index c87dfae7..2e968e4f 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/interfaceQList.qml
@@ -1,6 +1,6 @@
import Test 1.0
MyContainer {
- qlistInterfaces: [
+ qlistInterfaces: [
MyQmlObject {},
MyQmlObject {}
]
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
index 94afb16c..f26d52d4 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.1.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.0
QtObject {
property variant o;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
index d4fbf423..b3420ac1 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/invalidGroupedProperty.2.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import QtQuick 1.0
QtObject {
property int o;
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
index 5b086088..b1610f7b 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/nonexistantProperty.3.qml
@@ -1,4 +1,4 @@
import Test 1.0
-MyQmlObject {
- something: 1 + 1
+MyQmlObject {
+ something: 1 + 1
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
index e75f9044..a6b6111c 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/onCompleted.qml
@@ -10,7 +10,7 @@ MyTypeObject {
objectProperty: OnCompletedType {
qmlobjectProperty: MyQmlObject {
id: nestedObject
- property int b: 10
+ property int b: 10
Component.onCompleted: console.log("Completed " + a + " " + nestedObject.b)
}
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
index 77fe2ff3..c1ec8188 100644
--- a/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
+++ b/tests/auto/declarative/qdeclarativelanguage/data/onDestruction.qml
@@ -10,7 +10,7 @@ MyTypeObject {
objectProperty: OnDestructionType {
qmlobjectProperty: MyQmlObject {
id: nestedObject
- property int b: 10
+ property int b: 10
Component.onDestruction: console.log("Destruction " + a + " " + nestedObject.b)
}
}
diff --git a/tests/auto/declarative/qdeclarativelanguage/testtypes.h b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
index 37a91e01..c6388d86 100644
--- a/tests/auto/declarative/qdeclarativelanguage/testtypes.h
+++ b/tests/auto/declarative/qdeclarativelanguage/testtypes.h
@@ -58,7 +58,7 @@
QVariant myCustomVariantTypeConverter(const QString &data);
-class MyInterface
+class MyInterface
{
public:
MyInterface() : id(913) {}
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
index 8052f5fc..4b4bab3f 100644
--- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
+++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
@@ -412,11 +412,11 @@ void tst_qdeclarativelanguage::errors_data()
#endif
QTest::newRow("singularProperty") << "singularProperty.qml" << "singularProperty.errors.txt" << false;
QTest::newRow("singularProperty.2") << "singularProperty.2.qml" << "singularProperty.2.errors.txt" << false;
- QTest::newRow("incorrectCase") << "incorrectCase.qml"
+ QTest::newRow("incorrectCase") << "incorrectCase.qml"
#if defined(Q_OS_MAC) || defined(Q_OS_WIN32)
- << "incorrectCase.errors.insensitive.txt"
+ << "incorrectCase.errors.insensitive.txt"
#else
- << "incorrectCase.errors.sensitive.txt"
+ << "incorrectCase.errors.sensitive.txt"
#endif
<< false;
@@ -522,7 +522,7 @@ void tst_qdeclarativelanguage::assignQmlComponent()
QCOMPARE(child->property("y"), QVariant(11));
}
-// Test literal assignment to all the basic types
+// Test literal assignment to all the basic types
void tst_qdeclarativelanguage::assignBasicTypes()
{
QDeclarativeComponent component(&engine, testFileUrl("assignBasicTypes.qml"));
@@ -666,7 +666,7 @@ void tst_qdeclarativelanguage::idProperty()
MyContainer *object = qobject_cast<MyContainer *>(component.create());
QVERIFY(object != 0);
QCOMPARE(object->getChildren()->count(), 1);
- MyTypeObject *child =
+ MyTypeObject *child =
qobject_cast<MyTypeObject *>(object->getChildren()->at(0));
QVERIFY(child != 0);
QCOMPARE(child->id(), QString("myObjectId"));
@@ -826,12 +826,12 @@ void tst_qdeclarativelanguage::propertyValueSource()
QList<QObject *> valueSources;
QObjectList allChildren = object->findChildren<QObject*>();
foreach (QObject *child, allChildren) {
- if (qobject_cast<QDeclarativePropertyValueSource *>(child))
+ if (qobject_cast<QDeclarativePropertyValueSource *>(child))
valueSources.append(child);
}
QCOMPARE(valueSources.count(), 1);
- MyPropertyValueSource *valueSource =
+ MyPropertyValueSource *valueSource =
qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
QVERIFY(valueSource != 0);
QCOMPARE(valueSource->prop.object(), qobject_cast<QObject*>(object));
@@ -847,12 +847,12 @@ void tst_qdeclarativelanguage::propertyValueSource()
QList<QObject *> valueSources;
QObjectList allChildren = object->findChildren<QObject*>();
foreach (QObject *child, allChildren) {
- if (qobject_cast<QDeclarativePropertyValueSource *>(child))
+ if (qobject_cast<QDeclarativePropertyValueSource *>(child))
valueSources.append(child);
}
QCOMPARE(valueSources.count(), 1);
- MyPropertyValueSource *valueSource =
+ MyPropertyValueSource *valueSource =
qobject_cast<MyPropertyValueSource *>(valueSources.at(0));
QVERIFY(valueSource != 0);
QCOMPARE(valueSource->prop.object(), qobject_cast<QObject*>(object));
@@ -975,7 +975,7 @@ void tst_qdeclarativelanguage::aliasProperties()
QVERIFY(object != 0);
// Read through alias
- MyQmlObject *v =
+ MyQmlObject *v =
qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
QVERIFY(v != 0);
QCOMPARE(v->value(), 10);
@@ -984,7 +984,7 @@ void tst_qdeclarativelanguage::aliasProperties()
MyQmlObject *v2 = new MyQmlObject();
v2->setParent(object);
object->setProperty("aliasObject", qVariantFromValue(v2));
- MyQmlObject *v3 =
+ MyQmlObject *v3 =
qvariant_cast<MyQmlObject *>(object->property("aliasObject"));
QVERIFY(v3 != 0);
QCOMPARE(v3, v2);
@@ -1057,7 +1057,7 @@ void tst_qdeclarativelanguage::aliasProperties()
QCOMPARE(object->property("a").toInt(), 1923);
}
- // Ptr Alias Cleanup - check that aliases to ptr types return 0
+ // Ptr Alias Cleanup - check that aliases to ptr types return 0
// if the object aliased to is removed
{
QDeclarativeComponent component(&engine, testFileUrl("alias.7.qml"));
@@ -1280,7 +1280,7 @@ void tst_qdeclarativelanguage::scriptString()
}
}
-// Check that default property assignments are correctly spliced into explicit
+// Check that default property assignments are correctly spliced into explicit
// property assignments
void tst_qdeclarativelanguage::defaultPropertyListOrder()
{