From e2ea0a83cc876fb54a2a8bf6f1350dbfa52f596b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 15 Jan 2014 22:01:15 +0100 Subject: fix whitespace remove trailing spaces and expand tabs Change-Id: Ieacb9d096b612c45d1a64700044c114d1f7522bc Reviewed-by: Simon Hausmann --- examples/qml/dynamicscene/content/PaletteItem.qml | 2 +- examples/qml/dynamicscene/content/PerspectiveItem.qml | 4 ++-- examples/qml/dynamicscene/content/Sun.qml | 2 +- examples/qml/dynamicscene/content/itemCreation.js | 2 +- .../networkaccessmanagerfactory.pro | 2 +- examples/qml/referenceexamples/adding/adding.pro | 2 +- examples/qml/referenceexamples/attached/attached.pro | 2 +- examples/qml/referenceexamples/binding/binding.pro | 2 +- .../qml/referenceexamples/binding/happybirthdaysong.cpp | 4 ++-- examples/qml/referenceexamples/binding/main.cpp | 2 +- examples/qml/referenceexamples/coercion/coercion.pro | 2 +- examples/qml/referenceexamples/default/default.pro | 2 +- examples/qml/referenceexamples/extended/extended.pro | 2 +- examples/qml/referenceexamples/extended/lineedit.cpp | 6 +++--- examples/qml/referenceexamples/grouped/grouped.pro | 2 +- examples/qml/referenceexamples/methods/methods.pro | 2 +- examples/qml/referenceexamples/properties/properties.pro | 2 +- examples/qml/referenceexamples/signal/main.cpp | 2 +- examples/qml/referenceexamples/signal/signal.pro | 2 +- examples/qml/referenceexamples/valuesource/example.qml | 14 +++++++------- .../referenceexamples/valuesource/happybirthdaysong.cpp | 2 +- examples/qml/referenceexamples/valuesource/main.cpp | 2 +- examples/qml/referenceexamples/valuesource/valuesource.pro | 2 +- .../extending/chapter4-customPropertyTypes/app.qml | 4 ++-- .../chapter4-customPropertyTypes.pro | 2 +- .../tutorials/extending/chapter5-listproperties/app.qml | 10 +++++----- .../chapter5-listproperties/chapter5-listproperties.pro | 2 +- examples/qml/tutorials/extending/chapter6-plugins/app.qml | 10 +++++----- examples/qml/tutorials/extending/extending.pro | 2 +- 29 files changed, 48 insertions(+), 48 deletions(-) (limited to 'examples/qml') diff --git a/examples/qml/dynamicscene/content/PaletteItem.qml b/examples/qml/dynamicscene/content/PaletteItem.qml index a74d7b6413..62d6efedc6 100644 --- a/examples/qml/dynamicscene/content/PaletteItem.qml +++ b/examples/qml/dynamicscene/content/PaletteItem.qml @@ -49,7 +49,7 @@ Image { source: image - MouseArea { + MouseArea { anchors.fill: parent onPressed: Code.startDrag(mouse); diff --git a/examples/qml/dynamicscene/content/PerspectiveItem.qml b/examples/qml/dynamicscene/content/PerspectiveItem.qml index 509d29320f..d0d1da9228 100644 --- a/examples/qml/dynamicscene/content/PerspectiveItem.qml +++ b/examples/qml/dynamicscene/content/PerspectiveItem.qml @@ -44,9 +44,9 @@ Image { id: rootItem property bool created: false - property string image + property string image - property double scaledBottom: y + (height + height*scale) / 2 + property double scaledBottom: y + (height + height*scale) / 2 property bool onLand: scaledBottom > (window.height / 2 + window.centerOffset) source: image diff --git a/examples/qml/dynamicscene/content/Sun.qml b/examples/qml/dynamicscene/content/Sun.qml index e2101a252b..5e867e45aa 100644 --- a/examples/qml/dynamicscene/content/Sun.qml +++ b/examples/qml/dynamicscene/content/Sun.qml @@ -49,7 +49,7 @@ Image { source: image onCreatedChanged: { if (created) { - sun.z = 1; // above the sky but below the ground layer + sun.z = 1; // above the sky but below the ground layer window.activeSuns++; // once item is created, start moving offscreen dropYAnim.duration = (window.height + window.centerOffset - sun.y) * 16; diff --git a/examples/qml/dynamicscene/content/itemCreation.js b/examples/qml/dynamicscene/content/itemCreation.js index 40f5415f9f..2829a83410 100644 --- a/examples/qml/dynamicscene/content/itemCreation.js +++ b/examples/qml/dynamicscene/content/itemCreation.js @@ -22,7 +22,7 @@ function loadComponent() { itemComponent = Qt.createComponent(paletteItem.componentFile); if (itemComponent.status == Component.Loading) //Depending on the content, it can be ready or error immediately component.statusChanged.connect(createItem); - else + else createItem(); } diff --git a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro index 5994ab221e..b4d6d827fd 100644 --- a/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro +++ b/examples/qml/networkaccessmanagerfactory/networkaccessmanagerfactory.pro @@ -1,7 +1,7 @@ TEMPLATE = app QT += qml quick network -SOURCES += main.cpp +SOURCES += main.cpp RESOURCES += networkaccessmanagerfactory.qrc target.path = $$[QT_INSTALL_EXAMPLES]/qml/networkaccessmanagerfactory diff --git a/examples/qml/referenceexamples/adding/adding.pro b/examples/qml/referenceexamples/adding/adding.pro index 86c830bda9..602898f1b8 100644 --- a/examples/qml/referenceexamples/adding/adding.pro +++ b/examples/qml/referenceexamples/adding/adding.pro @@ -1,7 +1,7 @@ QT += qml SOURCES += main.cpp \ - person.cpp + person.cpp HEADERS += person.h RESOURCES += adding.qrc diff --git a/examples/qml/referenceexamples/attached/attached.pro b/examples/qml/referenceexamples/attached/attached.pro index 1225a5fcfd..16b585bc45 100644 --- a/examples/qml/referenceexamples/attached/attached.pro +++ b/examples/qml/referenceexamples/attached/attached.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc diff --git a/examples/qml/referenceexamples/binding/binding.pro b/examples/qml/referenceexamples/binding/binding.pro index 3c1f9565ed..636d0a10f1 100644 --- a/examples/qml/referenceexamples/binding/binding.pro +++ b/examples/qml/referenceexamples/binding/binding.pro @@ -3,7 +3,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ birthdayparty.cpp \ - happybirthdaysong.cpp + happybirthdaysong.cpp HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h diff --git a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp index af60dd329c..6e3a9fcf6d 100644 --- a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp +++ b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp @@ -72,10 +72,10 @@ void HappyBirthdaySong::setName(const QString &name) m_lyrics << "Happy birthday dear " + m_name + ","; m_lyrics << "Happy birthday to you!"; m_lyrics << ""; - + emit nameChanged(); } - + void HappyBirthdaySong::advance() { m_line = (m_line + 1) % m_lyrics.count(); diff --git a/examples/qml/referenceexamples/binding/main.cpp b/examples/qml/referenceexamples/binding/main.cpp index 0d4b13d63f..f09b45fed2 100644 --- a/examples/qml/referenceexamples/binding/main.cpp +++ b/examples/qml/referenceexamples/binding/main.cpp @@ -72,7 +72,7 @@ int main(int argc, char ** argv) Person *guest = party->guest(ii); QDate rsvpDate; - QObject *attached = + QObject *attached = qmlAttachedPropertiesObject(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/qml/referenceexamples/coercion/coercion.pro b/examples/qml/referenceexamples/coercion/coercion.pro index c501b9cda2..7fca26c15e 100644 --- a/examples/qml/referenceexamples/coercion/coercion.pro +++ b/examples/qml/referenceexamples/coercion/coercion.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc diff --git a/examples/qml/referenceexamples/default/default.pro b/examples/qml/referenceexamples/default/default.pro index db4b88413b..c43867fc4a 100644 --- a/examples/qml/referenceexamples/default/default.pro +++ b/examples/qml/referenceexamples/default/default.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc diff --git a/examples/qml/referenceexamples/extended/extended.pro b/examples/qml/referenceexamples/extended/extended.pro index b38a1753b9..22d8ded708 100644 --- a/examples/qml/referenceexamples/extended/extended.pro +++ b/examples/qml/referenceexamples/extended/extended.pro @@ -1,7 +1,7 @@ QT += qml widgets SOURCES += main.cpp \ - lineedit.cpp + lineedit.cpp HEADERS += lineedit.h RESOURCES += extended.qrc diff --git a/examples/qml/referenceexamples/extended/lineedit.cpp b/examples/qml/referenceexamples/extended/lineedit.cpp index 522f8074ea..9c916a1bd8 100644 --- a/examples/qml/referenceexamples/extended/lineedit.cpp +++ b/examples/qml/referenceexamples/extended/lineedit.cpp @@ -66,7 +66,7 @@ int LineEditExtension::rightMargin() const return r; } -void LineEditExtension::setRightMargin(int m) +void LineEditExtension::setRightMargin(int m) { int l, r, t, b; m_lineedit->getTextMargins(&l, &t, &r, &b); @@ -80,7 +80,7 @@ int LineEditExtension::topMargin() const return t; } -void LineEditExtension::setTopMargin(int m) +void LineEditExtension::setTopMargin(int m) { int l, r, t, b; m_lineedit->getTextMargins(&l, &t, &r, &b); @@ -94,7 +94,7 @@ int LineEditExtension::bottomMargin() const return b; } -void LineEditExtension::setBottomMargin(int m) +void LineEditExtension::setBottomMargin(int m) { int l, r, t, b; m_lineedit->getTextMargins(&l, &t, &r, &b); diff --git a/examples/qml/referenceexamples/grouped/grouped.pro b/examples/qml/referenceexamples/grouped/grouped.pro index 7014d9680d..ef66ea3e1d 100644 --- a/examples/qml/referenceexamples/grouped/grouped.pro +++ b/examples/qml/referenceexamples/grouped/grouped.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc diff --git a/examples/qml/referenceexamples/methods/methods.pro b/examples/qml/referenceexamples/methods/methods.pro index c1be0713e6..911a460444 100644 --- a/examples/qml/referenceexamples/methods/methods.pro +++ b/examples/qml/referenceexamples/methods/methods.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc diff --git a/examples/qml/referenceexamples/properties/properties.pro b/examples/qml/referenceexamples/properties/properties.pro index cd1ffeddcc..0349d44091 100644 --- a/examples/qml/referenceexamples/properties/properties.pro +++ b/examples/qml/referenceexamples/properties/properties.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc diff --git a/examples/qml/referenceexamples/signal/main.cpp b/examples/qml/referenceexamples/signal/main.cpp index 8abb7d4234..dce5f71a9d 100644 --- a/examples/qml/referenceexamples/signal/main.cpp +++ b/examples/qml/referenceexamples/signal/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char ** argv) Person *guest = party->guest(ii); QDate rsvpDate; - QObject *attached = + QObject *attached = qmlAttachedPropertiesObject(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/qml/referenceexamples/signal/signal.pro b/examples/qml/referenceexamples/signal/signal.pro index 81692d3676..2dbc8e624b 100644 --- a/examples/qml/referenceexamples/signal/signal.pro +++ b/examples/qml/referenceexamples/signal/signal.pro @@ -2,7 +2,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc diff --git a/examples/qml/referenceexamples/valuesource/example.qml b/examples/qml/referenceexamples/valuesource/example.qml index e36cf7fc4f..1357536f5f 100644 --- a/examples/qml/referenceexamples/valuesource/example.qml +++ b/examples/qml/referenceexamples/valuesource/example.qml @@ -54,22 +54,22 @@ BirthdayParty { shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 } } - Boy { - name: "Leo Hodges" + Boy { + name: "Leo Hodges" BirthdayParty.rsvp: "2009-07-06" shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 } } - Boy { - name: "Jack Smith" + Boy { + name: "Jack Smith" shoe { size: 8; color: "blue"; brand: "Puma"; price: 19.95 } } - Girl { - name: "Anne Brown" + Girl { + name: "Anne Brown" BirthdayParty.rsvp: "2009-07-01" shoe.size: 7 shoe.color: "red" shoe.brand: "Marc Jacobs" - shoe.price: 699.99 + shoe.price: 699.99 } // ![1] diff --git a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp index e41e3ea074..50fbea6e3c 100644 --- a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp +++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp @@ -70,7 +70,7 @@ void HappyBirthdaySong::setName(const QString &name) m_lyrics << "Happy birthday to you!"; m_lyrics << ""; } - + void HappyBirthdaySong::advance() { m_line = (m_line + 1) % m_lyrics.count(); diff --git a/examples/qml/referenceexamples/valuesource/main.cpp b/examples/qml/referenceexamples/valuesource/main.cpp index a7fba9e95e..ec88333ede 100644 --- a/examples/qml/referenceexamples/valuesource/main.cpp +++ b/examples/qml/referenceexamples/valuesource/main.cpp @@ -73,7 +73,7 @@ int main(int argc, char ** argv) Person *guest = party->guest(ii); QDate rsvpDate; - QObject *attached = + QObject *attached = qmlAttachedPropertiesObject(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/qml/referenceexamples/valuesource/valuesource.pro b/examples/qml/referenceexamples/valuesource/valuesource.pro index 4ec77ff83b..01cfeeb6d8 100644 --- a/examples/qml/referenceexamples/valuesource/valuesource.pro +++ b/examples/qml/referenceexamples/valuesource/valuesource.pro @@ -3,7 +3,7 @@ QT += qml SOURCES += main.cpp \ person.cpp \ birthdayparty.cpp \ - happybirthdaysong.cpp + happybirthdaysong.cpp HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml index 441b7f9b82..c757fdaedd 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml +++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/app.qml @@ -49,9 +49,9 @@ Item { anchors.centerIn: parent width: 100; height: 100 - pieSlice: PieSlice { + pieSlice: PieSlice { anchors.fill: parent - color: "red" + color: "red" } } diff --git a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 6d5c7acb6c..1742334107 100644 --- a/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/qml/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -1,7 +1,7 @@ QT += qml quick HEADERS += piechart.h \ - pieslice.h + pieslice.h SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/app.qml b/examples/qml/tutorials/extending/chapter5-listproperties/app.qml index a57d1b833f..68aa6e0c1d 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/app.qml +++ b/examples/qml/tutorials/extending/chapter5-listproperties/app.qml @@ -49,17 +49,17 @@ Item { width: 100; height: 100 slices: [ - PieSlice { + PieSlice { anchors.fill: parent color: "red" - fromAngle: 0; angleSpan: 110 + fromAngle: 0; angleSpan: 110 }, - PieSlice { + PieSlice { anchors.fill: parent color: "black" - fromAngle: 110; angleSpan: 50 + fromAngle: 110; angleSpan: 50 }, - PieSlice { + PieSlice { anchors.fill: parent color: "blue" fromAngle: 160; angleSpan: 100 diff --git a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index 7cc2b40488..ba51dd9093 100644 --- a/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/qml/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -1,7 +1,7 @@ QT += qml quick HEADERS += piechart.h \ - pieslice.h + pieslice.h SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp diff --git a/examples/qml/tutorials/extending/chapter6-plugins/app.qml b/examples/qml/tutorials/extending/chapter6-plugins/app.qml index 417fc6651a..d5a474b8d3 100644 --- a/examples/qml/tutorials/extending/chapter6-plugins/app.qml +++ b/examples/qml/tutorials/extending/chapter6-plugins/app.qml @@ -48,17 +48,17 @@ Item { width: 100; height: 100 slices: [ - PieSlice { + PieSlice { anchors.fill: parent color: "red" - fromAngle: 0; angleSpan: 110 + fromAngle: 0; angleSpan: 110 }, - PieSlice { + PieSlice { anchors.fill: parent color: "black" - fromAngle: 110; angleSpan: 50 + fromAngle: 110; angleSpan: 50 }, - PieSlice { + PieSlice { anchors.fill: parent color: "blue" fromAngle: 160; angleSpan: 100 diff --git a/examples/qml/tutorials/extending/extending.pro b/examples/qml/tutorials/extending/extending.pro index 967473fda0..a665975382 100644 --- a/examples/qml/tutorials/extending/extending.pro +++ b/examples/qml/tutorials/extending/extending.pro @@ -6,5 +6,5 @@ SUBDIRS += \ chapter3-bindings \ chapter4-customPropertyTypes \ chapter5-listproperties \ - chapter6-plugins + chapter6-plugins -- cgit v1.2.3