diff options
Diffstat (limited to 'examples')
193 files changed, 729 insertions, 729 deletions
diff --git a/examples/declarative/animation/basics/color-animation/color-animation.pro b/examples/declarative/animation/basics/color-animation/color-animation.pro index f0e805e5..bfe6ac4e 100644 --- a/examples/declarative/animation/basics/color-animation/color-animation.pro +++ b/examples/declarative/animation/basics/color-animation/color-animation.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/animation/basics/property-animation/property-animation.pro b/examples/declarative/animation/basics/property-animation/property-animation.pro index 0c2dcdb1..77db98d9 100644 --- a/examples/declarative/animation/basics/property-animation/property-animation.pro +++ b/examples/declarative/animation/basics/property-animation/property-animation.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro index 7430b0fc..c5605fe4 100644 --- a/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro +++ b/examples/declarative/animation/behaviors/behavior-example/behavior-example.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/animation/behaviors/behavior-example/qml/behaviours/SideRect.qml b/examples/declarative/animation/behaviors/behavior-example/qml/behaviours/SideRect.qml index c3462c40..32d4f3f4 100644 --- a/examples/declarative/animation/behaviors/behavior-example/qml/behaviours/SideRect.qml +++ b/examples/declarative/animation/behaviors/behavior-example/qml/behaviours/SideRect.qml @@ -54,8 +54,8 @@ Rectangle { anchors.fill: parent hoverEnabled: true onEntered: { - focusRect.x = myRect.x; - focusRect.y = myRect.y; + focusRect.x = myRect.x; + focusRect.y = myRect.y; focusRect.text = myRect.text; } } diff --git a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro index f8c2b129..c387ebe1 100644 --- a/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro +++ b/examples/declarative/animation/behaviors/wigglytext/wigglytext.pro @@ -17,8 +17,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/animation/easing/easing.pro b/examples/declarative/animation/easing/easing.pro index 63769634..c190caba 100644 --- a/examples/declarative/animation/easing/easing.pro +++ b/examples/declarative/animation/easing/easing.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/animation/states/qml/states/states.qml b/examples/declarative/animation/states/qml/states/states.qml index e3941ab3..701b945e 100644 --- a/examples/declarative/animation/states/qml/states/states.qml +++ b/examples/declarative/animation/states/qml/states/states.qml @@ -45,7 +45,7 @@ Rectangle { width: 640; height: 480 color: "#343434" - Image { + Image { id: userIcon x: topLeftRect.x; y: topLeftRect.y source: "qt-logo.png" diff --git a/examples/declarative/animation/states/qml/states/transitions.qml b/examples/declarative/animation/states/qml/states/transitions.qml index f4af7392..ba900b93 100644 --- a/examples/declarative/animation/states/qml/states/transitions.qml +++ b/examples/declarative/animation/states/qml/states/transitions.qml @@ -42,7 +42,7 @@ import QtQuick 1.0 /* This is exactly the same as states.qml, except that we have appended - a set of transitions to apply animations when the item changes + a set of transitions to apply animations when the item changes between each state. */ @@ -51,7 +51,7 @@ Rectangle { width: 640; height: 480 color: "#343434" - Image { + Image { id: userIcon x: topLeftRect.x; y: topLeftRect.y source: "qt-logo.png" diff --git a/examples/declarative/animation/states/states.pro b/examples/declarative/animation/states/states.pro index 7e9f48d3..45384f67 100644 --- a/examples/declarative/animation/states/states.pro +++ b/examples/declarative/animation/states/states.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp index 3f5ed62f..3b01c65b 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.cpp +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.cpp @@ -66,7 +66,7 @@ public: if (size) *size = QSize(width, height); QPixmap pixmap(requestedSize.width() > 0 ? requestedSize.width() : width, - requestedSize.height() > 0 ? requestedSize.height() : height); + requestedSize.height() > 0 ? requestedSize.height() : height); pixmap.fill(QColor(id).rgba()); //![0] diff --git a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml index 205a19b1..6f8d15b4 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml +++ b/examples/declarative/cppextensions/qgraphicslayouts/layoutitem/layoutitem.qml @@ -49,7 +49,7 @@ LayoutItem { //Sized by the layout Rectangle { color: "yellow"; anchors.fill: parent } - Rectangle { + Rectangle { width: 100; height: 100 anchors.top: parent.top; anchors.right: parent.right color: "green" diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp index 1061bb35..85187a94 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/gridlayout.cpp @@ -156,7 +156,7 @@ qreal GraphicsGridLayoutObject::spacing() const { if (verticalSpacing() == horizontalSpacing()) return verticalSpacing(); - return -1; + return -1; } qreal GraphicsGridLayoutObject::contentsMargin() const diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml index 2319f637..0ac4af8b 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicsgridlayout/qml/qgraphicsgridlayout/qgraphicsgridlayout.qml @@ -50,11 +50,11 @@ Item { size.height: parent.height /* - Below we create a grid layout using the GraphicsGridLayout item - (defined by the GraphicsGridLayoutObject class in gridlayout.h). + Below we create a grid layout using the GraphicsGridLayout item + (defined by the GraphicsGridLayoutObject class in gridlayout.h). The row, column etc. are set through attached properties on - GraphicsGridLayout, using the properties defined in the + GraphicsGridLayout, using the properties defined in the GridLayoutAttached class (also defined in gridlayout.h). */ diff --git a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml index 6e97152d..329d682c 100644 --- a/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml +++ b/examples/declarative/cppextensions/qgraphicslayouts/qgraphicslinearlayout/qml/qgraphicslinearlayout/qgraphicslinearlayout.qml @@ -50,11 +50,11 @@ Item { size.height: parent.height /* - Below we create a linear layout using the GraphicsLinearLayout item - (defined by the GraphicsLinearLayoutObject class in linearlayout.h). + Below we create a linear layout using the GraphicsLinearLayout item + (defined by the GraphicsLinearLayoutObject class in linearlayout.h). The first LayoutItem uses 'GraphicsLinearLayout.spacing' to set the - item's spacing: this is an attached property, set using the + item's spacing: this is an attached property, set using the properties defined in the LinearLayoutAttached class (also defined in linearlayout.h). */ diff --git a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro index bc17d41c..0f9f004a 100644 --- a/examples/declarative/cppextensions/referenceexamples/adding/adding.pro +++ b/examples/declarative/cppextensions/referenceexamples/adding/adding.pro @@ -1,7 +1,7 @@ QT += declarative SOURCES += main.cpp \ - person.cpp + person.cpp HEADERS += person.h RESOURCES += adding.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro index 32f01468..a5f595bc 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/attached.pro +++ b/examples/declarative/cppextensions/referenceexamples/attached/attached.pro @@ -2,7 +2,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += attached.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp index 333bce84..b226a4fb 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/attached/birthdayparty.cpp @@ -69,7 +69,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/attached/example.qml b/examples/declarative/cppextensions/referenceexamples/attached/example.qml index 5376d223..12825a77 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/example.qml +++ b/examples/declarative/cppextensions/referenceexamples/attached/example.qml @@ -47,23 +47,23 @@ BirthdayParty { } // ![1] - Boy { - name: "Leo Hodges" + Boy { + name: "Leo Hodges" shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 } BirthdayParty.rsvp: "2009-07-06" } // ![1] - 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" shoe.size: 7 shoe.color: "red" shoe.brand: "Marc Jacobs" - shoe.price: 699.99 + shoe.price: 699.99 BirthdayParty.rsvp: "2009-07-01" } diff --git a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp index 084b506a..df6ea5c0 100644 --- a/examples/declarative/cppextensions/referenceexamples/attached/main.cpp +++ b/examples/declarative/cppextensions/referenceexamples/attached/main.cpp @@ -71,7 +71,7 @@ int main(int argc, char ** argv) Person *guest = party->guest(ii); QDate rsvpDate; - QObject *attached = + QObject *attached = qmlAttachedPropertiesObject<BirthdayParty>(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro index 64bcd0ef..21421069 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/binding.pro +++ b/examples/declarative/cppextensions/referenceexamples/binding/binding.pro @@ -3,7 +3,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ birthdayparty.cpp \ - happybirthdaysong.cpp + happybirthdaysong.cpp HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h diff --git a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp index b2d6ffa0..49ad0e08 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/binding/birthdayparty.cpp @@ -75,7 +75,7 @@ void BirthdayParty::setHost(Person *c) emit hostChanged(); } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp b/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp index 1ec5c636..b699750a 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/happybirthdaysong.cpp +++ b/examples/declarative/cppextensions/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/declarative/cppextensions/referenceexamples/binding/main.cpp b/examples/declarative/cppextensions/referenceexamples/binding/main.cpp index 3d244105..e7c8a1c4 100644 --- a/examples/declarative/cppextensions/referenceexamples/binding/main.cpp +++ b/examples/declarative/cppextensions/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<BirthdayParty>(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp index 678395eb..7d67dab3 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/coercion/birthdayparty.cpp @@ -54,7 +54,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro index 17f67be4..d6eb6a36 100644 --- a/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro +++ b/examples/declarative/cppextensions/referenceexamples/coercion/coercion.pro @@ -2,7 +2,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += coercion.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp index 678395eb..7d67dab3 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/default/birthdayparty.cpp @@ -54,7 +54,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/default/default.pro b/examples/declarative/cppextensions/referenceexamples/default/default.pro index b045061d..4d5d3cbf 100644 --- a/examples/declarative/cppextensions/referenceexamples/default/default.pro +++ b/examples/declarative/cppextensions/referenceexamples/default/default.pro @@ -2,7 +2,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += default.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro index 3956f7ab..e8052f44 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/extended.pro +++ b/examples/declarative/cppextensions/referenceexamples/extended/extended.pro @@ -1,7 +1,7 @@ QT += widgets declarative SOURCES += main.cpp \ - lineedit.cpp + lineedit.cpp HEADERS += lineedit.h RESOURCES += extended.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp b/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp index 5f5b91b9..d14279f6 100644 --- a/examples/declarative/cppextensions/referenceexamples/extended/lineedit.cpp +++ b/examples/declarative/cppextensions/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/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp index 678395eb..7d67dab3 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/grouped/birthdayparty.cpp @@ -54,7 +54,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml index b4890323..01425e25 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/example.qml +++ b/examples/declarative/cppextensions/referenceexamples/grouped/example.qml @@ -47,27 +47,27 @@ BirthdayParty { shoe { size: 12; color: "white"; brand: "Nike"; price: 90.0 } } - Boy { - name: "Leo Hodges" + Boy { + name: "Leo Hodges" shoe { size: 10; color: "black"; brand: "Reebok"; price: 59.95 } } // ![1] - Boy { - name: "Jack Smith" - shoe { + Boy { + name: "Jack Smith" + shoe { size: 8 color: "blue" - brand: "Puma" - price: 19.95 + brand: "Puma" + price: 19.95 } } // ![1] - Girl { - name: "Anne Brown" + Girl { + name: "Anne Brown" shoe.size: 7 shoe.color: "red" shoe.brand: "Marc Jacobs" - shoe.price: 699.99 + shoe.price: 699.99 } } // ![0] diff --git a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro index 3a3830fb..427e0642 100644 --- a/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro +++ b/examples/declarative/cppextensions/referenceexamples/grouped/grouped.pro @@ -2,7 +2,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += grouped.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp index 850e7bd1..b3a5443d 100644 --- a/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.cpp @@ -55,7 +55,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro index 1d42fcac..25e47bfb 100644 --- a/examples/declarative/cppextensions/referenceexamples/methods/methods.pro +++ b/examples/declarative/cppextensions/referenceexamples/methods/methods.pro @@ -2,7 +2,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += methods.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp index 231909a7..9a7ea3ee 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/properties/birthdayparty.cpp @@ -55,7 +55,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro index 509bf3b6..1ebc0cdd 100644 --- a/examples/declarative/cppextensions/referenceexamples/properties/properties.pro +++ b/examples/declarative/cppextensions/referenceexamples/properties/properties.pro @@ -2,7 +2,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += properties.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp index cdc93585..379dd220 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/signal/birthdayparty.cpp @@ -70,7 +70,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/signal/example.qml b/examples/declarative/cppextensions/referenceexamples/signal/example.qml index 1b8e881e..bd805da0 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/example.qml +++ b/examples/declarative/cppextensions/referenceexamples/signal/example.qml @@ -50,22 +50,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/declarative/cppextensions/referenceexamples/signal/main.cpp b/examples/declarative/cppextensions/referenceexamples/signal/main.cpp index 214d9289..7698c2ef 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/main.cpp +++ b/examples/declarative/cppextensions/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<BirthdayParty>(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro index 11465c38..3caa1ee6 100644 --- a/examples/declarative/cppextensions/referenceexamples/signal/signal.pro +++ b/examples/declarative/cppextensions/referenceexamples/signal/signal.pro @@ -2,7 +2,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ - birthdayparty.cpp + birthdayparty.cpp HEADERS += person.h \ birthdayparty.h RESOURCES += signal.qrc diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp index 1f5e15f0..2b14c2ff 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/birthdayparty.cpp @@ -70,7 +70,7 @@ void BirthdayParty::setHost(Person *c) m_host = c; } -QDeclarativeListProperty<Person> BirthdayParty::guests() +QDeclarativeListProperty<Person> BirthdayParty::guests() { return QDeclarativeListProperty<Person>(this, m_guests); } diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml b/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml index a5212811..dac02077 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/example.qml @@ -53,22 +53,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/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp index 728d51f4..70b17685 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/happybirthdaysong.cpp +++ b/examples/declarative/cppextensions/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/declarative/cppextensions/referenceexamples/valuesource/main.cpp b/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp index 09e28a4a..90cb4450 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/main.cpp +++ b/examples/declarative/cppextensions/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<BirthdayParty>(guest, false); if (attached) rsvpDate = attached->property("rsvp").toDate(); diff --git a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro index ada2ad76..7f02509c 100644 --- a/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro +++ b/examples/declarative/cppextensions/referenceexamples/valuesource/valuesource.pro @@ -3,7 +3,7 @@ QT += declarative SOURCES += main.cpp \ person.cpp \ birthdayparty.cpp \ - happybirthdaysong.cpp + happybirthdaysong.cpp HEADERS += person.h \ birthdayparty.h \ happybirthdaysong.h diff --git a/examples/declarative/demos/calculator/qml/calculator/calculator.qml b/examples/declarative/demos/calculator/qml/calculator/calculator.qml index d7355082..e51040c3 100644 --- a/examples/declarative/demos/calculator/qml/calculator/calculator.qml +++ b/examples/declarative/demos/calculator/qml/calculator/calculator.qml @@ -63,7 +63,7 @@ Rectangle { id: main state: "orientation " + runtime.orientation - property bool landscapeWindow: window.width > window.height + property bool landscapeWindow: window.width > window.height property real baseWidth: landscapeWindow ? window.height : window.width property real baseHeight: landscapeWindow ? window.width : window.height property real rotationDelta: landscapeWindow ? -90 : 0 diff --git a/examples/declarative/demos/samegame/qml/samegame/SamegameCore/samegame.js b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/samegame.js index d7b827a1..058062d2 100644 --- a/examples/declarative/demos/samegame/qml/samegame/SamegameCore/samegame.js +++ b/examples/declarative/demos/samegame/qml/samegame/SamegameCore/samegame.js @@ -226,7 +226,7 @@ function initHighScoreBar() + maxColumn + "x" + maxRow + '" ORDER BY score desc LIMIT 10'); if(rs.rows.length < 10) highScoreBar = 0; - else + else highScoreBar = rs.rows.item(rs.rows.length - 1).score; } ); diff --git a/examples/declarative/demos/samegame/qml/samegame/highscores/scores.php b/examples/declarative/demos/samegame/qml/samegame/highscores/scores.php index 3cceb2d7..ffb0dd5d 100644 --- a/examples/declarative/demos/samegame/qml/samegame/highscores/scores.php +++ b/examples/declarative/demos/samegame/qml/samegame/highscores/scores.php @@ -11,8 +11,8 @@ //if($grid != "10x10"){ //Need a standard, so as to reject others? //} - $file = fopen("score_data.xml", "a"); #It's XML. Happy? - $ret = fwrite($file, "<record><score>". $score . "</score><name>" + $file = fopen("score_data.xml", "a"); #It's XML. Happy? + $ret = fwrite($file, "<record><score>". $score . "</score><name>" . $name . "</name><gridSize>" . $grid . "</gridSize><seconds>" . $time . "</seconds></record>\n"); echo "Your score has been recorded. Thanks for playing!"; @@ -21,7 +21,7 @@ }else{#Read high score list #Now uses XSLT to display. So just print the file. With XML cruft added. #Note that firefox at least won't apply the XSLT on a php file. So redirecting - $file = fopen("scores.xml", "w"); + $file = fopen("scores.xml", "w"); $ret = fwrite($file, '<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<?xml-stylesheet type="text/xsl" href="score_style.xsl"?>' . "\n" . "<records>\n" . file_get_contents("score_data.xml") . "</records>\n"); diff --git a/examples/declarative/demos/samegame/qml/samegame/samegame.qml b/examples/declarative/demos/samegame/qml/samegame/samegame.qml index db8016fc..2d67bcb2 100644 --- a/examples/declarative/demos/samegame/qml/samegame/samegame.qml +++ b/examples/declarative/demos/samegame/qml/samegame/samegame.qml @@ -88,7 +88,7 @@ Rectangle { z: 22; Behavior on width { - NumberAnimation {} + NumberAnimation {} enabled: nameInputDialog.initialWidth != 0 } @@ -119,7 +119,7 @@ Rectangle { maximumLength: 24 onTextChanged: { var newWidth = nameInputText.width + dialogText.width + 40; - if ( (newWidth > nameInputDialog.width && newWidth < screen.width) + if ( (newWidth > nameInputDialog.width && newWidth < screen.width) || (nameInputDialog.width > nameInputDialog.initialWidth) ) nameInputDialog.width = newWidth; } @@ -138,7 +138,7 @@ Rectangle { Button { id: newGameButton anchors { left: parent.left; leftMargin: 3; verticalCenter: parent.verticalCenter } - text: "New Game" + text: "New Game" onClicked: Logic.startNewGame() } diff --git a/examples/declarative/demos/snake/qml/snake/content/snake.js b/examples/declarative/demos/snake/qml/snake/content/snake.js index 837b82ad..5d4b6098 100644 --- a/examples/declarative/demos/snake/qml/snake/content/snake.js +++ b/examples/declarative/demos/snake/qml/snake/content/snake.js @@ -63,7 +63,7 @@ function startNewGame() link.dying = false; } else { if(linkComponent.status != Component.Ready) { - if(linkComponent.status == Component.Error) + if (linkComponent.status == Component.Error) console.log(linkComponent.errorString()); else console.log("Still loading linkComponent"); diff --git a/examples/declarative/i18n/i18n.pro b/examples/declarative/i18n/i18n.pro index bfb628a8..81eae8c7 100644 --- a/examples/declarative/i18n/i18n.pro +++ b/examples/declarative/i18n/i18n.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/i18n/qml/i18n/i18n.qml b/examples/declarative/i18n/qml/i18n/i18n.qml index d948c70d..e40c18dd 100644 --- a/examples/declarative/i18n/qml/i18n/i18n.qml +++ b/examples/declarative/i18n/qml/i18n/i18n.qml @@ -66,7 +66,7 @@ Rectangle { Text { text: "If a translation is available for the system language (eg. French) then the - string below will translated (eg. 'Bonjour'). Otherwise it will show 'Hello'." + string below will translated (eg. 'Bonjour'). Otherwise it will show 'Hello'." width: parent.width; wrapMode: Text.WordWrap } diff --git a/examples/declarative/imageelements/borderimage/borderimage.pro b/examples/declarative/imageelements/borderimage/borderimage.pro index 72ca4bb5..8f2c3cb4 100644 --- a/examples/declarative/imageelements/borderimage/borderimage.pro +++ b/examples/declarative/imageelements/borderimage/borderimage.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/imageelements/image/image.pro b/examples/declarative/imageelements/image/image.pro index 0eba8390..f37533dd 100644 --- a/examples/declarative/imageelements/image/image.pro +++ b/examples/declarative/imageelements/image/image.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/imageelements/image/qml/image/ImageCell.qml b/examples/declarative/imageelements/image/qml/image/ImageCell.qml index 07283fc3..a4d5ef51 100644 --- a/examples/declarative/imageelements/image/qml/image/ImageCell.qml +++ b/examples/declarative/imageelements/image/qml/image/ImageCell.qml @@ -53,7 +53,7 @@ Item { smooth: true } - Text { + Text { id: captionItem anchors.horizontalCenter: parent.horizontalCenter; anchors.bottom: parent.bottom } diff --git a/examples/declarative/imageelements/shadows/shadows.pro b/examples/declarative/imageelements/shadows/shadows.pro index 4f5d91fa..03808e91 100644 --- a/examples/declarative/imageelements/shadows/shadows.pro +++ b/examples/declarative/imageelements/shadows/shadows.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/keyinteraction/focus/focus.pro b/examples/declarative/keyinteraction/focus/focus.pro index e18ffa8e..21b1e459 100644 --- a/examples/declarative/keyinteraction/focus/focus.pro +++ b/examples/declarative/keyinteraction/focus/focus.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ContextMenu.qml b/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ContextMenu.qml index 44759c54..0a300a45 100644 --- a/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ContextMenu.qml +++ b/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ContextMenu.qml @@ -54,7 +54,7 @@ FocusScope { focus: true Keys.onRightPressed: mainView.focus = true - Text { + Text { anchors { top: parent.top; horizontalCenter: parent.horizontalCenter; margins: 30 } color: "black" font.pixelSize: 14 diff --git a/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/GridMenu.qml b/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/GridMenu.qml index d102f56e..b4c88547 100644 --- a/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/GridMenu.qml +++ b/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/GridMenu.qml @@ -44,7 +44,7 @@ FocusScope { property alias interactive: gridView.interactive onActiveFocusChanged: { - if (activeFocus) + if (activeFocus) mainView.state = "" } diff --git a/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ListMenu.qml b/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ListMenu.qml index 903c8411..46da75bb 100644 --- a/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ListMenu.qml +++ b/examples/declarative/keyinteraction/focus/qml/focus/FocusCore/ListMenu.qml @@ -44,7 +44,7 @@ FocusScope { clip: true onActiveFocusChanged: { - if (activeFocus) + if (activeFocus) mainView.state = "showListViews" } diff --git a/examples/declarative/keyinteraction/focus/qml/focus/focus.qml b/examples/declarative/keyinteraction/focus/qml/focus/focus.qml index 7654097d..48cba466 100644 --- a/examples/declarative/keyinteraction/focus/qml/focus/focus.qml +++ b/examples/declarative/keyinteraction/focus/qml/focus/focus.qml @@ -43,7 +43,7 @@ import "FocusCore" Rectangle { id: window - + width: 800; height: 480 color: "#3E606F" @@ -66,11 +66,11 @@ Rectangle { y: 320; width: parent.width; height: 320 } - Rectangle { + Rectangle { id: shade anchors.fill: parent color: "black" - opacity: 0 + opacity: 0 } states: State { diff --git a/examples/declarative/modelviews/abstractitemmodel/model.h b/examples/declarative/modelviews/abstractitemmodel/model.h index cf086476..0012393b 100644 --- a/examples/declarative/modelviews/abstractitemmodel/model.h +++ b/examples/declarative/modelviews/abstractitemmodel/model.h @@ -41,7 +41,7 @@ #include <QStringList> //![0] -class Animal +class Animal { public: Animal(const QString &type, const QString &size); diff --git a/examples/declarative/modelviews/gridview/gridview.pro b/examples/declarative/modelviews/gridview/gridview.pro index f83458da..23cb485d 100644 --- a/examples/declarative/modelviews/gridview/gridview.pro +++ b/examples/declarative/modelviews/gridview/gridview.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro index 243d9ace..ab2655b2 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro +++ b/examples/declarative/modelviews/listview/dynamiclist/dynamiclist.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/RecipesModel.qml b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/RecipesModel.qml index 8cdfb986..7440e359 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/RecipesModel.qml +++ b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/content/RecipesModel.qml @@ -44,20 +44,20 @@ ListModel { ListElement { title: "Pancakes" picture: "content/pics/pancakes.jpg" - ingredients: "<html> - <ul> - <li> 1 cup (150g) self-raising flour - <li> 1 tbs caster sugar - <li> 3/4 cup (185ml) milk - <li> 1 egg - </ul> + ingredients: "<html> + <ul> + <li> 1 cup (150g) self-raising flour + <li> 1 tbs caster sugar + <li> 3/4 cup (185ml) milk + <li> 1 egg + </ul> </html>" - method: "<html> - <ol> - <li> Sift flour and sugar together into a bowl. Add a pinch of salt. - <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. - <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. - <li> Turn over and cook other side until golden. + method: "<html> + <ol> + <li> Sift flour and sugar together into a bowl. Add a pinch of salt. + <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. + <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. + <li> Turn over and cook other side until golden. </ol> </html>" } @@ -70,60 +70,60 @@ ListModel { ListElement { title: "Vegetable Soup" picture: "content/pics/vegetable-soup.jpg" - ingredients: "<html> - <ul> - <li> 1 onion - <li> 1 turnip - <li> 1 potato - <li> 1 carrot - <li> 1 head of celery - <li> 1 1/2 litres of water - </ul> + ingredients: "<html> + <ul> + <li> 1 onion + <li> 1 turnip + <li> 1 potato + <li> 1 carrot + <li> 1 head of celery + <li> 1 1/2 litres of water + </ul> </html>" - method: "<html> - <ol> - <li> Chop vegetables. - <li> Boil in water until vegetables soften. - <li> Season with salt and pepper to taste. - </ol> + method: "<html> + <ol> + <li> Chop vegetables. + <li> Boil in water until vegetables soften. + <li> Season with salt and pepper to taste. + </ol> </html>" } ListElement { title: "Hamburger" picture: "content/pics/hamburger.jpg" - ingredients: "<html> - <ul> - <li> 500g minced beef - <li> Seasoning - <li> lettuce, tomato, onion, cheese - <li> 1 hamburger bun for each burger - </ul> + ingredients: "<html> + <ul> + <li> 500g minced beef + <li> Seasoning + <li> lettuce, tomato, onion, cheese + <li> 1 hamburger bun for each burger + </ul> </html>" - method: "<html> - <ol> - <li> Mix the beef, together with seasoning, in a food processor. - <li> Shape the beef into burgers. - <li> Grill the burgers for about 5 mins on each side (until cooked through) - <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. - </ol> + method: "<html> + <ol> + <li> Mix the beef, together with seasoning, in a food processor. + <li> Shape the beef into burgers. + <li> Grill the burgers for about 5 mins on each side (until cooked through) + <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. + </ol> </html>" } ListElement { title: "Lemonade" picture: "content/pics/lemonade.jpg" - ingredients: "<html> - <ul> - <li> 1 cup Lemon Juice - <li> 1 cup Sugar - <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) - </ul> + ingredients: "<html> + <ul> + <li> 1 cup Lemon Juice + <li> 1 cup Sugar + <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) + </ul> </html>" - method: "<html> - <ol> - <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. - <li> Pour in lemon juice, stir again, and add 4 cups of cold water. - <li> Chill or serve over ice cubes. - </ol> + method: "<html> + <ol> + <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. + <li> Pour in lemon juice, stir again, and add 4 cups of cold water. + <li> Chill or serve over ice cubes. + </ol> </html>" } } diff --git a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/dynamiclist.qml b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/dynamiclist.qml index 3712d69c..8ec75118 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/dynamiclist.qml +++ b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/dynamiclist.qml @@ -84,7 +84,7 @@ Rectangle { // The delegate for each fruit in the model: Component { id: listDelegate - + Item { id: delegateItem width: listView.width; height: 55 @@ -107,7 +107,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - Text { + Text { text: name font.pixelSize: 15 color: "white" @@ -133,7 +133,7 @@ Rectangle { onClicked: fruitModel.setProperty(index, "cost", cost + 0.25) } - Text { + Text { id: costText anchors.verticalCenter: parent.verticalCenter text: '$' + Number(cost).toFixed(2) @@ -183,7 +183,7 @@ Rectangle { anchors { left: parent.left; bottom: parent.bottom; margins: 20 } spacing: 10 - TextButton { + TextButton { text: "Add an item" onClicked: { fruitModel.append({ @@ -194,8 +194,8 @@ Rectangle { } } - TextButton { - text: "Remove all items" + TextButton { + text: "Remove all items" onClicked: fruitModel.clear() } } diff --git a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/expandingdelegates.qml b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/expandingdelegates.qml index 5a90bdf8..8c0ab9db 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/expandingdelegates.qml +++ b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/expandingdelegates.qml @@ -101,7 +101,7 @@ Rectangle { width: background.width - recipeImage.width - 20; height: recipeImage.height spacing: 5 - Text { + Text { text: title font.bold: true; font.pointSize: 16 } diff --git a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlight.qml b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlight.qml index b86e156c..f8d3df79 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlight.qml +++ b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlight.qml @@ -67,7 +67,7 @@ Rectangle { PropertyChanges { target: wrapper; x: 20 } } transitions: Transition { - NumberAnimation { properties: "x"; duration: 200 } + NumberAnimation { properties: "x"; duration: 200 } } } } diff --git a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlightranges.qml b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlightranges.qml index f2f767f4..1935a6ff 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlightranges.qml +++ b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/highlightranges.qml @@ -46,8 +46,8 @@ Rectangle { property int current: 0 width: 600; height: 300 - // This example shows the same model in three different ListView items, - // with different highlight ranges. The highlight ranges are set by the + // This example shows the same model in three different ListView items, + // with different highlight ranges. The highlight ranges are set by the // preferredHighlightBegin and preferredHighlightEnd properties in ListView. // // The first ListView does not set a highlight range, so its currentItem diff --git a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/sections.qml b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/sections.qml index 52240794..bb0f0b2c 100644 --- a/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/sections.qml +++ b/examples/declarative/modelviews/listview/dynamiclist/qml/dynamic/sections.qml @@ -59,7 +59,7 @@ Rectangle { } // The delegate for each section header - Component { + Component { id: sectionHeading Rectangle { width: container.width diff --git a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro index e3d3cd01..1d4aed90 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro +++ b/examples/declarative/modelviews/listview/expandingdelegates/expandingdelegates.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/RecipesModel.qml b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/RecipesModel.qml index 8cdfb986..7440e359 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/RecipesModel.qml +++ b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/content/RecipesModel.qml @@ -44,20 +44,20 @@ ListModel { ListElement { title: "Pancakes" picture: "content/pics/pancakes.jpg" - ingredients: "<html> - <ul> - <li> 1 cup (150g) self-raising flour - <li> 1 tbs caster sugar - <li> 3/4 cup (185ml) milk - <li> 1 egg - </ul> + ingredients: "<html> + <ul> + <li> 1 cup (150g) self-raising flour + <li> 1 tbs caster sugar + <li> 3/4 cup (185ml) milk + <li> 1 egg + </ul> </html>" - method: "<html> - <ol> - <li> Sift flour and sugar together into a bowl. Add a pinch of salt. - <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. - <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. - <li> Turn over and cook other side until golden. + method: "<html> + <ol> + <li> Sift flour and sugar together into a bowl. Add a pinch of salt. + <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. + <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. + <li> Turn over and cook other side until golden. </ol> </html>" } @@ -70,60 +70,60 @@ ListModel { ListElement { title: "Vegetable Soup" picture: "content/pics/vegetable-soup.jpg" - ingredients: "<html> - <ul> - <li> 1 onion - <li> 1 turnip - <li> 1 potato - <li> 1 carrot - <li> 1 head of celery - <li> 1 1/2 litres of water - </ul> + ingredients: "<html> + <ul> + <li> 1 onion + <li> 1 turnip + <li> 1 potato + <li> 1 carrot + <li> 1 head of celery + <li> 1 1/2 litres of water + </ul> </html>" - method: "<html> - <ol> - <li> Chop vegetables. - <li> Boil in water until vegetables soften. - <li> Season with salt and pepper to taste. - </ol> + method: "<html> + <ol> + <li> Chop vegetables. + <li> Boil in water until vegetables soften. + <li> Season with salt and pepper to taste. + </ol> </html>" } ListElement { title: "Hamburger" picture: "content/pics/hamburger.jpg" - ingredients: "<html> - <ul> - <li> 500g minced beef - <li> Seasoning - <li> lettuce, tomato, onion, cheese - <li> 1 hamburger bun for each burger - </ul> + ingredients: "<html> + <ul> + <li> 500g minced beef + <li> Seasoning + <li> lettuce, tomato, onion, cheese + <li> 1 hamburger bun for each burger + </ul> </html>" - method: "<html> - <ol> - <li> Mix the beef, together with seasoning, in a food processor. - <li> Shape the beef into burgers. - <li> Grill the burgers for about 5 mins on each side (until cooked through) - <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. - </ol> + method: "<html> + <ol> + <li> Mix the beef, together with seasoning, in a food processor. + <li> Shape the beef into burgers. + <li> Grill the burgers for about 5 mins on each side (until cooked through) + <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. + </ol> </html>" } ListElement { title: "Lemonade" picture: "content/pics/lemonade.jpg" - ingredients: "<html> - <ul> - <li> 1 cup Lemon Juice - <li> 1 cup Sugar - <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) - </ul> + ingredients: "<html> + <ul> + <li> 1 cup Lemon Juice + <li> 1 cup Sugar + <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) + </ul> </html>" - method: "<html> - <ol> - <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. - <li> Pour in lemon juice, stir again, and add 4 cups of cold water. - <li> Chill or serve over ice cubes. - </ol> + method: "<html> + <ol> + <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. + <li> Pour in lemon juice, stir again, and add 4 cups of cold water. + <li> Chill or serve over ice cubes. + </ol> </html>" } } diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/dynamiclist.qml b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/dynamiclist.qml index 3712d69c..8ec75118 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/dynamiclist.qml +++ b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/dynamiclist.qml @@ -84,7 +84,7 @@ Rectangle { // The delegate for each fruit in the model: Component { id: listDelegate - + Item { id: delegateItem width: listView.width; height: 55 @@ -107,7 +107,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - Text { + Text { text: name font.pixelSize: 15 color: "white" @@ -133,7 +133,7 @@ Rectangle { onClicked: fruitModel.setProperty(index, "cost", cost + 0.25) } - Text { + Text { id: costText anchors.verticalCenter: parent.verticalCenter text: '$' + Number(cost).toFixed(2) @@ -183,7 +183,7 @@ Rectangle { anchors { left: parent.left; bottom: parent.bottom; margins: 20 } spacing: 10 - TextButton { + TextButton { text: "Add an item" onClicked: { fruitModel.append({ @@ -194,8 +194,8 @@ Rectangle { } } - TextButton { - text: "Remove all items" + TextButton { + text: "Remove all items" onClicked: fruitModel.clear() } } diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/expandingdelegates.qml b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/expandingdelegates.qml index 5a90bdf8..8c0ab9db 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/expandingdelegates.qml +++ b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/expandingdelegates.qml @@ -101,7 +101,7 @@ Rectangle { width: background.width - recipeImage.width - 20; height: recipeImage.height spacing: 5 - Text { + Text { text: title font.bold: true; font.pointSize: 16 } diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlight.qml b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlight.qml index b86e156c..f8d3df79 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlight.qml +++ b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlight.qml @@ -67,7 +67,7 @@ Rectangle { PropertyChanges { target: wrapper; x: 20 } } transitions: Transition { - NumberAnimation { properties: "x"; duration: 200 } + NumberAnimation { properties: "x"; duration: 200 } } } } diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlightranges.qml b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlightranges.qml index f2f767f4..1935a6ff 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlightranges.qml +++ b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/highlightranges.qml @@ -46,8 +46,8 @@ Rectangle { property int current: 0 width: 600; height: 300 - // This example shows the same model in three different ListView items, - // with different highlight ranges. The highlight ranges are set by the + // This example shows the same model in three different ListView items, + // with different highlight ranges. The highlight ranges are set by the // preferredHighlightBegin and preferredHighlightEnd properties in ListView. // // The first ListView does not set a highlight range, so its currentItem diff --git a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/sections.qml b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/sections.qml index 52240794..bb0f0b2c 100644 --- a/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/sections.qml +++ b/examples/declarative/modelviews/listview/expandingdelegates/qml/expandingdelegates/sections.qml @@ -59,7 +59,7 @@ Rectangle { } // The delegate for each section header - Component { + Component { id: sectionHeading Rectangle { width: container.width diff --git a/examples/declarative/modelviews/listview/highlight/highlight.pro b/examples/declarative/modelviews/listview/highlight/highlight.pro index 2ef2c0fb..780b1526 100644 --- a/examples/declarative/modelviews/listview/highlight/highlight.pro +++ b/examples/declarative/modelviews/listview/highlight/highlight.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/modelviews/listview/highlight/qml/highlight/content/RecipesModel.qml b/examples/declarative/modelviews/listview/highlight/qml/highlight/content/RecipesModel.qml index 8cdfb986..7440e359 100644 --- a/examples/declarative/modelviews/listview/highlight/qml/highlight/content/RecipesModel.qml +++ b/examples/declarative/modelviews/listview/highlight/qml/highlight/content/RecipesModel.qml @@ -44,20 +44,20 @@ ListModel { ListElement { title: "Pancakes" picture: "content/pics/pancakes.jpg" - ingredients: "<html> - <ul> - <li> 1 cup (150g) self-raising flour - <li> 1 tbs caster sugar - <li> 3/4 cup (185ml) milk - <li> 1 egg - </ul> + ingredients: "<html> + <ul> + <li> 1 cup (150g) self-raising flour + <li> 1 tbs caster sugar + <li> 3/4 cup (185ml) milk + <li> 1 egg + </ul> </html>" - method: "<html> - <ol> - <li> Sift flour and sugar together into a bowl. Add a pinch of salt. - <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. - <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. - <li> Turn over and cook other side until golden. + method: "<html> + <ol> + <li> Sift flour and sugar together into a bowl. Add a pinch of salt. + <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. + <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. + <li> Turn over and cook other side until golden. </ol> </html>" } @@ -70,60 +70,60 @@ ListModel { ListElement { title: "Vegetable Soup" picture: "content/pics/vegetable-soup.jpg" - ingredients: "<html> - <ul> - <li> 1 onion - <li> 1 turnip - <li> 1 potato - <li> 1 carrot - <li> 1 head of celery - <li> 1 1/2 litres of water - </ul> + ingredients: "<html> + <ul> + <li> 1 onion + <li> 1 turnip + <li> 1 potato + <li> 1 carrot + <li> 1 head of celery + <li> 1 1/2 litres of water + </ul> </html>" - method: "<html> - <ol> - <li> Chop vegetables. - <li> Boil in water until vegetables soften. - <li> Season with salt and pepper to taste. - </ol> + method: "<html> + <ol> + <li> Chop vegetables. + <li> Boil in water until vegetables soften. + <li> Season with salt and pepper to taste. + </ol> </html>" } ListElement { title: "Hamburger" picture: "content/pics/hamburger.jpg" - ingredients: "<html> - <ul> - <li> 500g minced beef - <li> Seasoning - <li> lettuce, tomato, onion, cheese - <li> 1 hamburger bun for each burger - </ul> + ingredients: "<html> + <ul> + <li> 500g minced beef + <li> Seasoning + <li> lettuce, tomato, onion, cheese + <li> 1 hamburger bun for each burger + </ul> </html>" - method: "<html> - <ol> - <li> Mix the beef, together with seasoning, in a food processor. - <li> Shape the beef into burgers. - <li> Grill the burgers for about 5 mins on each side (until cooked through) - <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. - </ol> + method: "<html> + <ol> + <li> Mix the beef, together with seasoning, in a food processor. + <li> Shape the beef into burgers. + <li> Grill the burgers for about 5 mins on each side (until cooked through) + <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. + </ol> </html>" } ListElement { title: "Lemonade" picture: "content/pics/lemonade.jpg" - ingredients: "<html> - <ul> - <li> 1 cup Lemon Juice - <li> 1 cup Sugar - <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) - </ul> + ingredients: "<html> + <ul> + <li> 1 cup Lemon Juice + <li> 1 cup Sugar + <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) + </ul> </html>" - method: "<html> - <ol> - <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. - <li> Pour in lemon juice, stir again, and add 4 cups of cold water. - <li> Chill or serve over ice cubes. - </ol> + method: "<html> + <ol> + <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. + <li> Pour in lemon juice, stir again, and add 4 cups of cold water. + <li> Chill or serve over ice cubes. + </ol> </html>" } } diff --git a/examples/declarative/modelviews/listview/highlight/qml/highlight/dynamiclist.qml b/examples/declarative/modelviews/listview/highlight/qml/highlight/dynamiclist.qml index 3712d69c..8ec75118 100644 --- a/examples/declarative/modelviews/listview/highlight/qml/highlight/dynamiclist.qml +++ b/examples/declarative/modelviews/listview/highlight/qml/highlight/dynamiclist.qml @@ -84,7 +84,7 @@ Rectangle { // The delegate for each fruit in the model: Component { id: listDelegate - + Item { id: delegateItem width: listView.width; height: 55 @@ -107,7 +107,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - Text { + Text { text: name font.pixelSize: 15 color: "white" @@ -133,7 +133,7 @@ Rectangle { onClicked: fruitModel.setProperty(index, "cost", cost + 0.25) } - Text { + Text { id: costText anchors.verticalCenter: parent.verticalCenter text: '$' + Number(cost).toFixed(2) @@ -183,7 +183,7 @@ Rectangle { anchors { left: parent.left; bottom: parent.bottom; margins: 20 } spacing: 10 - TextButton { + TextButton { text: "Add an item" onClicked: { fruitModel.append({ @@ -194,8 +194,8 @@ Rectangle { } } - TextButton { - text: "Remove all items" + TextButton { + text: "Remove all items" onClicked: fruitModel.clear() } } diff --git a/examples/declarative/modelviews/listview/highlight/qml/highlight/expandingdelegates.qml b/examples/declarative/modelviews/listview/highlight/qml/highlight/expandingdelegates.qml index 5a90bdf8..8c0ab9db 100644 --- a/examples/declarative/modelviews/listview/highlight/qml/highlight/expandingdelegates.qml +++ b/examples/declarative/modelviews/listview/highlight/qml/highlight/expandingdelegates.qml @@ -101,7 +101,7 @@ Rectangle { width: background.width - recipeImage.width - 20; height: recipeImage.height spacing: 5 - Text { + Text { text: title font.bold: true; font.pointSize: 16 } diff --git a/examples/declarative/modelviews/listview/highlight/qml/highlight/highlight.qml b/examples/declarative/modelviews/listview/highlight/qml/highlight/highlight.qml index df693613..6f447dca 100644 --- a/examples/declarative/modelviews/listview/highlight/qml/highlight/highlight.qml +++ b/examples/declarative/modelviews/listview/highlight/qml/highlight/highlight.qml @@ -68,7 +68,7 @@ Rectangle { PropertyChanges { target: wrapper; x: 20 } } transitions: Transition { - NumberAnimation { properties: "x"; duration: 200 } + NumberAnimation { properties: "x"; duration: 200 } } } } diff --git a/examples/declarative/modelviews/listview/highlight/qml/highlight/highlightranges.qml b/examples/declarative/modelviews/listview/highlight/qml/highlight/highlightranges.qml index f2f767f4..1935a6ff 100644 --- a/examples/declarative/modelviews/listview/highlight/qml/highlight/highlightranges.qml +++ b/examples/declarative/modelviews/listview/highlight/qml/highlight/highlightranges.qml @@ -46,8 +46,8 @@ Rectangle { property int current: 0 width: 600; height: 300 - // This example shows the same model in three different ListView items, - // with different highlight ranges. The highlight ranges are set by the + // This example shows the same model in three different ListView items, + // with different highlight ranges. The highlight ranges are set by the // preferredHighlightBegin and preferredHighlightEnd properties in ListView. // // The first ListView does not set a highlight range, so its currentItem diff --git a/examples/declarative/modelviews/listview/highlight/qml/highlight/sections.qml b/examples/declarative/modelviews/listview/highlight/qml/highlight/sections.qml index 52240794..bb0f0b2c 100644 --- a/examples/declarative/modelviews/listview/highlight/qml/highlight/sections.qml +++ b/examples/declarative/modelviews/listview/highlight/qml/highlight/sections.qml @@ -59,7 +59,7 @@ Rectangle { } // The delegate for each section header - Component { + Component { id: sectionHeading Rectangle { width: container.width diff --git a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro index 1cb417d1..695ebcd0 100644 --- a/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro +++ b/examples/declarative/modelviews/listview/highlightranges/highlightranges.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/RecipesModel.qml b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/RecipesModel.qml index 8cdfb986..7440e359 100644 --- a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/RecipesModel.qml +++ b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/content/RecipesModel.qml @@ -44,20 +44,20 @@ ListModel { ListElement { title: "Pancakes" picture: "content/pics/pancakes.jpg" - ingredients: "<html> - <ul> - <li> 1 cup (150g) self-raising flour - <li> 1 tbs caster sugar - <li> 3/4 cup (185ml) milk - <li> 1 egg - </ul> + ingredients: "<html> + <ul> + <li> 1 cup (150g) self-raising flour + <li> 1 tbs caster sugar + <li> 3/4 cup (185ml) milk + <li> 1 egg + </ul> </html>" - method: "<html> - <ol> - <li> Sift flour and sugar together into a bowl. Add a pinch of salt. - <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. - <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. - <li> Turn over and cook other side until golden. + method: "<html> + <ol> + <li> Sift flour and sugar together into a bowl. Add a pinch of salt. + <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. + <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. + <li> Turn over and cook other side until golden. </ol> </html>" } @@ -70,60 +70,60 @@ ListModel { ListElement { title: "Vegetable Soup" picture: "content/pics/vegetable-soup.jpg" - ingredients: "<html> - <ul> - <li> 1 onion - <li> 1 turnip - <li> 1 potato - <li> 1 carrot - <li> 1 head of celery - <li> 1 1/2 litres of water - </ul> + ingredients: "<html> + <ul> + <li> 1 onion + <li> 1 turnip + <li> 1 potato + <li> 1 carrot + <li> 1 head of celery + <li> 1 1/2 litres of water + </ul> </html>" - method: "<html> - <ol> - <li> Chop vegetables. - <li> Boil in water until vegetables soften. - <li> Season with salt and pepper to taste. - </ol> + method: "<html> + <ol> + <li> Chop vegetables. + <li> Boil in water until vegetables soften. + <li> Season with salt and pepper to taste. + </ol> </html>" } ListElement { title: "Hamburger" picture: "content/pics/hamburger.jpg" - ingredients: "<html> - <ul> - <li> 500g minced beef - <li> Seasoning - <li> lettuce, tomato, onion, cheese - <li> 1 hamburger bun for each burger - </ul> + ingredients: "<html> + <ul> + <li> 500g minced beef + <li> Seasoning + <li> lettuce, tomato, onion, cheese + <li> 1 hamburger bun for each burger + </ul> </html>" - method: "<html> - <ol> - <li> Mix the beef, together with seasoning, in a food processor. - <li> Shape the beef into burgers. - <li> Grill the burgers for about 5 mins on each side (until cooked through) - <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. - </ol> + method: "<html> + <ol> + <li> Mix the beef, together with seasoning, in a food processor. + <li> Shape the beef into burgers. + <li> Grill the burgers for about 5 mins on each side (until cooked through) + <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. + </ol> </html>" } ListElement { title: "Lemonade" picture: "content/pics/lemonade.jpg" - ingredients: "<html> - <ul> - <li> 1 cup Lemon Juice - <li> 1 cup Sugar - <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) - </ul> + ingredients: "<html> + <ul> + <li> 1 cup Lemon Juice + <li> 1 cup Sugar + <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) + </ul> </html>" - method: "<html> - <ol> - <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. - <li> Pour in lemon juice, stir again, and add 4 cups of cold water. - <li> Chill or serve over ice cubes. - </ol> + method: "<html> + <ol> + <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. + <li> Pour in lemon juice, stir again, and add 4 cups of cold water. + <li> Chill or serve over ice cubes. + </ol> </html>" } } diff --git a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/dynamiclist.qml b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/dynamiclist.qml index 3712d69c..8ec75118 100644 --- a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/dynamiclist.qml +++ b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/dynamiclist.qml @@ -84,7 +84,7 @@ Rectangle { // The delegate for each fruit in the model: Component { id: listDelegate - + Item { id: delegateItem width: listView.width; height: 55 @@ -107,7 +107,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - Text { + Text { text: name font.pixelSize: 15 color: "white" @@ -133,7 +133,7 @@ Rectangle { onClicked: fruitModel.setProperty(index, "cost", cost + 0.25) } - Text { + Text { id: costText anchors.verticalCenter: parent.verticalCenter text: '$' + Number(cost).toFixed(2) @@ -183,7 +183,7 @@ Rectangle { anchors { left: parent.left; bottom: parent.bottom; margins: 20 } spacing: 10 - TextButton { + TextButton { text: "Add an item" onClicked: { fruitModel.append({ @@ -194,8 +194,8 @@ Rectangle { } } - TextButton { - text: "Remove all items" + TextButton { + text: "Remove all items" onClicked: fruitModel.clear() } } diff --git a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/expandingdelegates.qml b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/expandingdelegates.qml index 5a90bdf8..8c0ab9db 100644 --- a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/expandingdelegates.qml +++ b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/expandingdelegates.qml @@ -101,7 +101,7 @@ Rectangle { width: background.width - recipeImage.width - 20; height: recipeImage.height spacing: 5 - Text { + Text { text: title font.bold: true; font.pointSize: 16 } diff --git a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlight.qml b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlight.qml index b86e156c..f8d3df79 100644 --- a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlight.qml +++ b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlight.qml @@ -67,7 +67,7 @@ Rectangle { PropertyChanges { target: wrapper; x: 20 } } transitions: Transition { - NumberAnimation { properties: "x"; duration: 200 } + NumberAnimation { properties: "x"; duration: 200 } } } } diff --git a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlightranges.qml b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlightranges.qml index f2f767f4..1935a6ff 100644 --- a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlightranges.qml +++ b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/highlightranges.qml @@ -46,8 +46,8 @@ Rectangle { property int current: 0 width: 600; height: 300 - // This example shows the same model in three different ListView items, - // with different highlight ranges. The highlight ranges are set by the + // This example shows the same model in three different ListView items, + // with different highlight ranges. The highlight ranges are set by the // preferredHighlightBegin and preferredHighlightEnd properties in ListView. // // The first ListView does not set a highlight range, so its currentItem diff --git a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/sections.qml b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/sections.qml index 52240794..bb0f0b2c 100644 --- a/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/sections.qml +++ b/examples/declarative/modelviews/listview/highlightranges/qml/highlightranges/sections.qml @@ -59,7 +59,7 @@ Rectangle { } // The delegate for each section header - Component { + Component { id: sectionHeading Rectangle { width: container.width diff --git a/examples/declarative/modelviews/listview/sections/qml/sections/content/RecipesModel.qml b/examples/declarative/modelviews/listview/sections/qml/sections/content/RecipesModel.qml index 8cdfb986..7440e359 100644 --- a/examples/declarative/modelviews/listview/sections/qml/sections/content/RecipesModel.qml +++ b/examples/declarative/modelviews/listview/sections/qml/sections/content/RecipesModel.qml @@ -44,20 +44,20 @@ ListModel { ListElement { title: "Pancakes" picture: "content/pics/pancakes.jpg" - ingredients: "<html> - <ul> - <li> 1 cup (150g) self-raising flour - <li> 1 tbs caster sugar - <li> 3/4 cup (185ml) milk - <li> 1 egg - </ul> + ingredients: "<html> + <ul> + <li> 1 cup (150g) self-raising flour + <li> 1 tbs caster sugar + <li> 3/4 cup (185ml) milk + <li> 1 egg + </ul> </html>" - method: "<html> - <ol> - <li> Sift flour and sugar together into a bowl. Add a pinch of salt. - <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. - <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. - <li> Turn over and cook other side until golden. + method: "<html> + <ol> + <li> Sift flour and sugar together into a bowl. Add a pinch of salt. + <li> Beat milk and egg together, then add to dry ingredients. Beat until smooth. + <li> Pour mixture into a pan on medium heat and cook until bubbles appear on the surface. + <li> Turn over and cook other side until golden. </ol> </html>" } @@ -70,60 +70,60 @@ ListModel { ListElement { title: "Vegetable Soup" picture: "content/pics/vegetable-soup.jpg" - ingredients: "<html> - <ul> - <li> 1 onion - <li> 1 turnip - <li> 1 potato - <li> 1 carrot - <li> 1 head of celery - <li> 1 1/2 litres of water - </ul> + ingredients: "<html> + <ul> + <li> 1 onion + <li> 1 turnip + <li> 1 potato + <li> 1 carrot + <li> 1 head of celery + <li> 1 1/2 litres of water + </ul> </html>" - method: "<html> - <ol> - <li> Chop vegetables. - <li> Boil in water until vegetables soften. - <li> Season with salt and pepper to taste. - </ol> + method: "<html> + <ol> + <li> Chop vegetables. + <li> Boil in water until vegetables soften. + <li> Season with salt and pepper to taste. + </ol> </html>" } ListElement { title: "Hamburger" picture: "content/pics/hamburger.jpg" - ingredients: "<html> - <ul> - <li> 500g minced beef - <li> Seasoning - <li> lettuce, tomato, onion, cheese - <li> 1 hamburger bun for each burger - </ul> + ingredients: "<html> + <ul> + <li> 500g minced beef + <li> Seasoning + <li> lettuce, tomato, onion, cheese + <li> 1 hamburger bun for each burger + </ul> </html>" - method: "<html> - <ol> - <li> Mix the beef, together with seasoning, in a food processor. - <li> Shape the beef into burgers. - <li> Grill the burgers for about 5 mins on each side (until cooked through) - <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. - </ol> + method: "<html> + <ol> + <li> Mix the beef, together with seasoning, in a food processor. + <li> Shape the beef into burgers. + <li> Grill the burgers for about 5 mins on each side (until cooked through) + <li> Serve each burger on a bun with ketchup, cheese, lettuce, tomato and onion. + </ol> </html>" } ListElement { title: "Lemonade" picture: "content/pics/lemonade.jpg" - ingredients: "<html> - <ul> - <li> 1 cup Lemon Juice - <li> 1 cup Sugar - <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) - </ul> + ingredients: "<html> + <ul> + <li> 1 cup Lemon Juice + <li> 1 cup Sugar + <li> 6 Cups of Water (2 cups warm water, 4 cups cold water) + </ul> </html>" - method: "<html> - <ol> - <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. - <li> Pour in lemon juice, stir again, and add 4 cups of cold water. - <li> Chill or serve over ice cubes. - </ol> + method: "<html> + <ol> + <li> Pour 2 cups of warm water into a pitcher and stir in sugar until it dissolves. + <li> Pour in lemon juice, stir again, and add 4 cups of cold water. + <li> Chill or serve over ice cubes. + </ol> </html>" } } diff --git a/examples/declarative/modelviews/listview/sections/qml/sections/dynamiclist.qml b/examples/declarative/modelviews/listview/sections/qml/sections/dynamiclist.qml index 3712d69c..8ec75118 100644 --- a/examples/declarative/modelviews/listview/sections/qml/sections/dynamiclist.qml +++ b/examples/declarative/modelviews/listview/sections/qml/sections/dynamiclist.qml @@ -84,7 +84,7 @@ Rectangle { // The delegate for each fruit in the model: Component { id: listDelegate - + Item { id: delegateItem width: listView.width; height: 55 @@ -107,7 +107,7 @@ Rectangle { Column { anchors.verticalCenter: parent.verticalCenter - Text { + Text { text: name font.pixelSize: 15 color: "white" @@ -133,7 +133,7 @@ Rectangle { onClicked: fruitModel.setProperty(index, "cost", cost + 0.25) } - Text { + Text { id: costText anchors.verticalCenter: parent.verticalCenter text: '$' + Number(cost).toFixed(2) @@ -183,7 +183,7 @@ Rectangle { anchors { left: parent.left; bottom: parent.bottom; margins: 20 } spacing: 10 - TextButton { + TextButton { text: "Add an item" onClicked: { fruitModel.append({ @@ -194,8 +194,8 @@ Rectangle { } } - TextButton { - text: "Remove all items" + TextButton { + text: "Remove all items" onClicked: fruitModel.clear() } } diff --git a/examples/declarative/modelviews/listview/sections/qml/sections/expandingdelegates.qml b/examples/declarative/modelviews/listview/sections/qml/sections/expandingdelegates.qml index 5a90bdf8..8c0ab9db 100644 --- a/examples/declarative/modelviews/listview/sections/qml/sections/expandingdelegates.qml +++ b/examples/declarative/modelviews/listview/sections/qml/sections/expandingdelegates.qml @@ -101,7 +101,7 @@ Rectangle { width: background.width - recipeImage.width - 20; height: recipeImage.height spacing: 5 - Text { + Text { text: title font.bold: true; font.pointSize: 16 } diff --git a/examples/declarative/modelviews/listview/sections/qml/sections/highlight.qml b/examples/declarative/modelviews/listview/sections/qml/sections/highlight.qml index b86e156c..f8d3df79 100644 --- a/examples/declarative/modelviews/listview/sections/qml/sections/highlight.qml +++ b/examples/declarative/modelviews/listview/sections/qml/sections/highlight.qml @@ -67,7 +67,7 @@ Rectangle { PropertyChanges { target: wrapper; x: 20 } } transitions: Transition { - NumberAnimation { properties: "x"; duration: 200 } + NumberAnimation { properties: "x"; duration: 200 } } } } diff --git a/examples/declarative/modelviews/listview/sections/qml/sections/highlightranges.qml b/examples/declarative/modelviews/listview/sections/qml/sections/highlightranges.qml index f2f767f4..1935a6ff 100644 --- a/examples/declarative/modelviews/listview/sections/qml/sections/highlightranges.qml +++ b/examples/declarative/modelviews/listview/sections/qml/sections/highlightranges.qml @@ -46,8 +46,8 @@ Rectangle { property int current: 0 width: 600; height: 300 - // This example shows the same model in three different ListView items, - // with different highlight ranges. The highlight ranges are set by the + // This example shows the same model in three different ListView items, + // with different highlight ranges. The highlight ranges are set by the // preferredHighlightBegin and preferredHighlightEnd properties in ListView. // // The first ListView does not set a highlight range, so its currentItem diff --git a/examples/declarative/modelviews/listview/sections/qml/sections/sections.qml b/examples/declarative/modelviews/listview/sections/qml/sections/sections.qml index 52240794..bb0f0b2c 100644 --- a/examples/declarative/modelviews/listview/sections/qml/sections/sections.qml +++ b/examples/declarative/modelviews/listview/sections/qml/sections/sections.qml @@ -59,7 +59,7 @@ Rectangle { } // The delegate for each section header - Component { + Component { id: sectionHeading Rectangle { width: container.width diff --git a/examples/declarative/modelviews/listview/sections/sections.pro b/examples/declarative/modelviews/listview/sections/sections.pro index 5f08fb97..695136a9 100644 --- a/examples/declarative/modelviews/listview/sections/sections.pro +++ b/examples/declarative/modelviews/listview/sections/sections.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/modelviews/pathview/pathview.pro b/examples/declarative/modelviews/pathview/pathview.pro index 2e4138e4..6750dd6a 100644 --- a/examples/declarative/modelviews/pathview/pathview.pro +++ b/examples/declarative/modelviews/pathview/pathview.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro index 07a33b3d..9adbf2bb 100644 --- a/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro +++ b/examples/declarative/modelviews/visualitemmodel/visualitemmodel.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/positioners/positioners.pro b/examples/declarative/positioners/positioners.pro index 39732285..10700db0 100644 --- a/examples/declarative/positioners/positioners.pro +++ b/examples/declarative/positioners/positioners.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/positioners/qml/positioners/positioners.qml b/examples/declarative/positioners/qml/positioners/positioners.qml index f0d1867c..69891a67 100644 --- a/examples/declarative/positioners/qml/positioners/positioners.qml +++ b/examples/declarative/positioners/qml/positioners/positioners.qml @@ -61,7 +61,7 @@ Rectangle { width: 100; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } @@ -72,7 +72,7 @@ Rectangle { width: 100; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } @@ -81,7 +81,7 @@ Rectangle { Row { id: layout2 - y: 300 + y: 300 move: Transition { NumberAnimation { properties: "x"; easing.type: Easing.OutBounce } } @@ -107,7 +107,7 @@ Rectangle { width: 50; height: 100 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } @@ -171,7 +171,7 @@ Rectangle { width: 50; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } @@ -182,7 +182,7 @@ Rectangle { width: 50; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } @@ -193,7 +193,7 @@ Rectangle { width: 50; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } @@ -221,7 +221,7 @@ Rectangle { width: 60; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } @@ -232,18 +232,18 @@ Rectangle { width: 60; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } Rectangle { color: "orange"; width: 50; height: 50; border.color: "black"; radius: 15 } - Rectangle { + Rectangle { id: blueF3 width: 40; height: 50 color: "lightsteelblue" border.color: "black" - radius: 15 + radius: 15 Behavior on opacity { NumberAnimation {} } } diff --git a/examples/declarative/screenorientation/Core/Bubble.qml b/examples/declarative/screenorientation/Core/Bubble.qml index a959eced..d46384e8 100644 --- a/examples/declarative/screenorientation/Core/Bubble.qml +++ b/examples/declarative/screenorientation/Core/Bubble.qml @@ -56,18 +56,18 @@ Rectangle { x: (rising && !verticalRise) ? xAttractor : Math.random()*(main.inPortrait ? main.baseWidth : main.baseHeight) Behavior on x { id: xBehavior - SmoothedAnimation { - velocity: 100+Math.random()*100 - } + SmoothedAnimation { + velocity: 100+Math.random()*100 + } } - Behavior on y { + Behavior on y { id: yBehavior - SmoothedAnimation { - velocity: 100+Math.random()*100 - } + SmoothedAnimation { + velocity: 100+Math.random()*100 + } } Timer { - interval: 80+Math.random()*40 + interval: 80+Math.random()*40 repeat: true running: true onTriggered: { @@ -83,7 +83,7 @@ Rectangle { rising = false; yBehavior.enabled = true; rising = true; - } + } } } } diff --git a/examples/declarative/screenorientation/Core/screenorientation.js b/examples/declarative/screenorientation/Core/screenorientation.js index ca97478c..3171c43c 100644 --- a/examples/declarative/screenorientation/Core/screenorientation.js +++ b/examples/declarative/screenorientation/Core/screenorientation.js @@ -53,7 +53,7 @@ function printOrientation(orientation) { } return orientationString; } - + function getAngle(orientation) { var angle; if (orientation == Orientation.Portrait) { diff --git a/examples/declarative/screenorientation/screenorientation.qml b/examples/declarative/screenorientation/screenorientation.qml index 1d749eea..458d8a29 100644 --- a/examples/declarative/screenorientation/screenorientation.qml +++ b/examples/declarative/screenorientation/screenorientation.qml @@ -44,7 +44,7 @@ import "Core/screenorientation.js" as ScreenOrientation Rectangle { id: window - width: 360 + width: 360 height: 640 color: "white" @@ -57,7 +57,7 @@ Rectangle { property bool inPortrait: (activeOrientation == Orientation.Portrait || activeOrientation == Orientation.PortraitInverted); // rotation correction for landscape devices like N900 - property bool landscapeWindow: window.width > window.height + property bool landscapeWindow: window.width > window.height property variant rotationDelta: landscapeWindow ? -90 : 0 rotation: rotationDelta @@ -95,7 +95,7 @@ Rectangle { Column { width: centeredText.width anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter + anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenterOffset: 30 Text { text: "Orientation" @@ -157,7 +157,7 @@ Rectangle { states: [ State { name: "orientation " + Orientation.Landscape - PropertyChanges { + PropertyChanges { target: main rotation: ScreenOrientation.getAngle(Orientation.Landscape)+rotationDelta width: baseHeight @@ -166,7 +166,7 @@ Rectangle { }, State { name: "orientation " + Orientation.PortraitInverted - PropertyChanges { + PropertyChanges { target: main rotation: ScreenOrientation.getAngle(Orientation.PortraitInverted)+rotationDelta width: baseWidth @@ -175,7 +175,7 @@ Rectangle { }, State { name: "orientation " + Orientation.LandscapeInverted - PropertyChanges { + PropertyChanges { target: main rotation: ScreenOrientation.getAngle(Orientation.LandscapeInverted)+rotationDelta width: baseHeight @@ -185,15 +185,15 @@ Rectangle { ] transitions: Transition { ParallelAnimation { - RotationAnimation { + RotationAnimation { direction: RotationAnimation.Shortest duration: 300 - easing.type: Easing.InOutQuint + easing.type: Easing.InOutQuint } - NumberAnimation { + NumberAnimation { properties: "x,y,width,height" duration: 300 - easing.type: Easing.InOutQuint + easing.type: Easing.InOutQuint } } } diff --git a/examples/declarative/sqllocalstorage/qml/sqllocalstorage/hello.qml b/examples/declarative/sqllocalstorage/qml/sqllocalstorage/hello.qml index 8645eb3a..d3982dae 100644 --- a/examples/declarative/sqllocalstorage/qml/sqllocalstorage/hello.qml +++ b/examples/declarative/sqllocalstorage/qml/sqllocalstorage/hello.qml @@ -44,7 +44,7 @@ Rectangle { color: "white" width: 200 height: 100 - + Text { text: "?" anchors.horizontalCenter: parent.horizontalCenter diff --git a/examples/declarative/text/fonts/availableFonts/availableFonts.pro b/examples/declarative/text/fonts/availableFonts/availableFonts.pro index 3cd3f973..32934548 100644 --- a/examples/declarative/text/fonts/availableFonts/availableFonts.pro +++ b/examples/declarative/text/fonts/availableFonts/availableFonts.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/text/fonts/banner/banner.pro b/examples/declarative/text/fonts/banner/banner.pro index e21ee2e3..dd86a77e 100644 --- a/examples/declarative/text/fonts/banner/banner.pro +++ b/examples/declarative/text/fonts/banner/banner.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/text/fonts/fonts/fonts.pro b/examples/declarative/text/fonts/fonts/fonts.pro index 4fd22c68..c875c539 100644 --- a/examples/declarative/text/fonts/fonts/fonts.pro +++ b/examples/declarative/text/fonts/fonts/fonts.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/text/fonts/hello/hello.pro b/examples/declarative/text/fonts/hello/hello.pro index db92f145..7dc9c592 100644 --- a/examples/declarative/text/fonts/hello/hello.pro +++ b/examples/declarative/text/fonts/hello/hello.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/text/textselection/qml/textselection/textselection.qml b/examples/declarative/text/textselection/qml/textselection/textselection.qml index bd623baa..54053c48 100644 --- a/examples/declarative/text/textselection/qml/textselection/textselection.qml +++ b/examples/declarative/text/textselection/qml/textselection/textselection.qml @@ -131,8 +131,8 @@ Rectangle { } } - function hitHandle(h,x,y) { - return x>=h.x+flick.contentX && x<h.x+flick.contentX+h.width && y>=h.y+flick.contentY && y<h.y+flick.contentY+h.height + function hitHandle(h,x,y) { + return x>=h.x+flick.contentX && x<h.x+flick.contentX+h.width && y>=h.y+flick.contentY && y<h.y+flick.contentY+h.height } onPressed: { @@ -215,9 +215,9 @@ Rectangle { Text { anchors.centerIn: parent; text: "Cut" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { edit.cut(); editor.state = "" } + onClicked: { edit.cut(); editor.state = "" } } } @@ -230,9 +230,9 @@ Rectangle { Text { anchors.centerIn: parent; text: "Copy" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { edit.copy(); editor.state = "selection" } + onClicked: { edit.copy(); editor.state = "selection" } } } @@ -245,9 +245,9 @@ Rectangle { Text { anchors.centerIn: parent; text: "Paste" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { edit.paste(); edit.cursorPosition = edit.selectionEnd; editor.state = "" } + onClicked: { edit.paste(); edit.cursorPosition = edit.selectionEnd; editor.state = "" } } } @@ -260,13 +260,13 @@ Rectangle { Text { anchors.centerIn: parent; text: "Deselect" } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { + onClicked: { edit.cursorPosition = edit.selectionEnd; edit.select(edit.cursorPosition, edit.cursorPosition); - editor.state = "" - } + editor.state = "" + } } } } diff --git a/examples/declarative/text/textselection/textselection.pro b/examples/declarative/text/textselection/textselection.pro index bd697106..e5a323d2 100644 --- a/examples/declarative/text/textselection/textselection.pro +++ b/examples/declarative/text/textselection/textselection.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/threading/workerscript/qml/workerscript/workerscript.qml b/examples/declarative/threading/workerscript/qml/workerscript/workerscript.qml index bc042c53..2f3cb77e 100644 --- a/examples/declarative/threading/workerscript/qml/workerscript/workerscript.qml +++ b/examples/declarative/threading/workerscript/qml/workerscript/workerscript.qml @@ -59,7 +59,7 @@ Rectangle { anchors.left: parent.left; anchors.leftMargin: 20 color: "red" - MouseArea { + MouseArea { anchors.fill: parent onClicked: myWorker.sendMessage( { rectangle: "red", x: mouse.x, y: mouse.y } ); } @@ -70,7 +70,7 @@ Rectangle { anchors.right: parent.right; anchors.rightMargin: 20 color: "blue" - MouseArea { + MouseArea { anchors.fill: parent onClicked: myWorker.sendMessage( { rectangle: "blue", x: mouse.x, y: mouse.y } ); } diff --git a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimental-gestures.pro b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimental-gestures.pro index 396a59d8..8e75a060 100644 --- a/examples/declarative/touchinteraction/gestures/experimental-gestures/experimental-gestures.pro +++ b/examples/declarative/touchinteraction/gestures/experimental-gestures/experimental-gestures.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro b/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro index 9d984146..3d73ba49 100644 --- a/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro +++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/mousearea-example.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml b/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml index f2a7b59e..5d5fe4ec 100644 --- a/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml +++ b/examples/declarative/touchinteraction/mousearea/mousearea-example/qml/mousearea-example/mousearea-example.qml @@ -53,7 +53,7 @@ Rectangle { Text { text: "Click"; font.pixelSize: 16; anchors.centerIn: parent } MouseArea { - anchors.fill: parent + anchors.fill: parent hoverEnabled: true acceptedButtons: Qt.LeftButton | Qt.RightButton @@ -61,7 +61,7 @@ Rectangle { onExited: info.text = 'Exited (pressed=' + pressed + ')' onPressed: { - info.text = 'Pressed (button=' + (mouse.button == Qt.RightButton ? 'right' : 'left') + info.text = 'Pressed (button=' + (mouse.button == Qt.RightButton ? 'right' : 'left') + ' shift=' + (mouse.modifiers & Qt.ShiftModifier ? 'true' : 'false') + ')' var posInBox = redSquare.mapToItem(box, mouse.x, mouse.y) posInfo.text = + mouse.x + ',' + mouse.y + ' in square' diff --git a/examples/declarative/toys/clocks/clocks.pro b/examples/declarative/toys/clocks/clocks.pro index 3fc085ca..9988765d 100644 --- a/examples/declarative/toys/clocks/clocks.pro +++ b/examples/declarative/toys/clocks/clocks.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/toys/clocks/qml/clocks/content/Clock.qml b/examples/declarative/toys/clocks/qml/clocks/content/Clock.qml index d0d3ac53..e26ab728 100644 --- a/examples/declarative/toys/clocks/qml/clocks/content/Clock.qml +++ b/examples/declarative/toys/clocks/qml/clocks/content/Clock.qml @@ -47,7 +47,7 @@ Item { property alias city: cityLabel.text property int hours property int minutes - property int seconds + property int seconds property real shift property bool night: false diff --git a/examples/declarative/toys/corkboards/corkboards.pro b/examples/declarative/toys/corkboards/corkboards.pro index dbcfc859..b32e640e 100644 --- a/examples/declarative/toys/corkboards/corkboards.pro +++ b/examples/declarative/toys/corkboards/corkboards.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/toys/corkboards/qml/corkboards/Day.qml b/examples/declarative/toys/corkboards/qml/corkboards/Day.qml index c698a02c..ef54a788 100644 --- a/examples/declarative/toys/corkboards/qml/corkboards/Day.qml +++ b/examples/declarative/toys/corkboards/qml/corkboards/Day.qml @@ -48,7 +48,7 @@ Component { width: ListView.view.width+40; height: ListView.view.height - Image { + Image { source: "cork.jpg" width: page.ListView.view.width height: page.ListView.view.height diff --git a/examples/declarative/toys/corkboards/qml/corkboards/corkboards.qml b/examples/declarative/toys/corkboards/qml/corkboards/corkboards.qml index 54ce43be..ad908161 100644 --- a/examples/declarative/toys/corkboards/qml/corkboards/corkboards.qml +++ b/examples/declarative/toys/corkboards/qml/corkboards/corkboards.qml @@ -49,12 +49,12 @@ Rectangle { ListElement { name: "Sunday" - notes: [ + notes: [ ListElement { noteText: "Lunch" }, ListElement { noteText: "Birthday Party" } ] } - + ListElement { name: "Monday" notes: [ diff --git a/examples/declarative/toys/dynamicscene/dynamicscene.pro b/examples/declarative/toys/dynamicscene/dynamicscene.pro index c77e7374..d9c1678d 100644 --- a/examples/declarative/toys/dynamicscene/dynamicscene.pro +++ b/examples/declarative/toys/dynamicscene/dynamicscene.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/toys/dynamicscene/qml/dynamicscene/PaletteItem.qml b/examples/declarative/toys/dynamicscene/qml/dynamicscene/PaletteItem.qml index 68d3119b..baff5b12 100644 --- a/examples/declarative/toys/dynamicscene/qml/dynamicscene/PaletteItem.qml +++ b/examples/declarative/toys/dynamicscene/qml/dynamicscene/PaletteItem.qml @@ -49,7 +49,7 @@ Image { source: image - MouseArea { + MouseArea { anchors.fill: parent onPressed: Code.startDrag(mouse); diff --git a/examples/declarative/toys/dynamicscene/qml/dynamicscene/PerspectiveItem.qml b/examples/declarative/toys/dynamicscene/qml/dynamicscene/PerspectiveItem.qml index 8ac639d8..f9487feb 100644 --- a/examples/declarative/toys/dynamicscene/qml/dynamicscene/PerspectiveItem.qml +++ b/examples/declarative/toys/dynamicscene/qml/dynamicscene/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 source: image diff --git a/examples/declarative/toys/dynamicscene/qml/dynamicscene/Sun.qml b/examples/declarative/toys/dynamicscene/qml/dynamicscene/Sun.qml index 84c34dc3..d6921387 100644 --- a/examples/declarative/toys/dynamicscene/qml/dynamicscene/Sun.qml +++ b/examples/declarative/toys/dynamicscene/qml/dynamicscene/Sun.qml @@ -69,7 +69,7 @@ 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++; } else { window.activeSuns--; diff --git a/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml b/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml index 775661b2..bb8347b0 100644 --- a/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml +++ b/examples/declarative/toys/dynamicscene/qml/dynamicscene/dynamicscene.qml @@ -194,7 +194,7 @@ Item { Button { text: "Create" onClicked: { - try { + try { Qt.createQmlObject(qmlText.text, window, 'CustomObject'); } catch(err) { dialog.show('Error on line ' + err.qmlErrors[0].lineNumber + '\n' + err.qmlErrors[0].message); diff --git a/examples/declarative/toys/dynamicscene/qml/dynamicscene/itemCreation.js b/examples/declarative/toys/dynamicscene/qml/dynamicscene/itemCreation.js index 4ee74c28..b96f3a5e 100644 --- a/examples/declarative/toys/dynamicscene/qml/dynamicscene/itemCreation.js +++ b/examples/declarative/toys/dynamicscene/qml/dynamicscene/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/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/Button.qml b/examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/Button.qml index ebf52e4d..5f4a34a6 100644 --- a/examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/Button.qml +++ b/examples/declarative/toys/tic-tac-toe/qml/tic-tac-toe/content/Button.qml @@ -49,7 +49,7 @@ Rectangle { signal clicked width: buttonLabel.width + 20; height: buttonLabel.height + 6 - border { width: 1; color: Qt.darker(container.color) } + border { width: 1; color: Qt.darker(container.color) } radius: 8 color: "lightgray" smooth: true @@ -59,13 +59,13 @@ Rectangle { position: 0.0 color: container.pressed ? "darkgray" : "white" } - GradientStop { + GradientStop { position: 1.0 color: container.color } } - MouseArea { + MouseArea { anchors.fill: parent onClicked: container.clicked() } diff --git a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro index 84045aa9..7d1bec3d 100644 --- a/examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro +++ b/examples/declarative/toys/tic-tac-toe/tic-tac-toe.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/toys/tvtennis/qml/tvtennis/tvtennis.qml b/examples/declarative/toys/tvtennis/qml/tvtennis/tvtennis.qml index c7f534cd..f05b3362 100644 --- a/examples/declarative/toys/tvtennis/qml/tvtennis/tvtennis.qml +++ b/examples/declarative/toys/tvtennis/qml/tvtennis/tvtennis.qml @@ -64,7 +64,7 @@ Rectangle { PropertyAction { target: ball; property: "direction"; value: "right" } } - // Make y move with a velocity of 200 + // Make y move with a velocity of 200 Behavior on y { SpringAnimation{ velocity: 200; } } diff --git a/examples/declarative/toys/tvtennis/tvtennis.pro b/examples/declarative/toys/tvtennis/tvtennis.pro index 1b934494..5f1703b6 100644 --- a/examples/declarative/toys/tvtennis/tvtennis.pro +++ b/examples/declarative/toys/tvtennis/tvtennis.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml index 94883646..1328ea2c 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/app.qml +++ b/examples/declarative/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/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro index 8152fcaf..e25eec23 100644 --- a/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro +++ b/examples/declarative/tutorials/extending/chapter4-customPropertyTypes/chapter4-customPropertyTypes.pro @@ -1,7 +1,7 @@ QT += widgets declarative HEADERS += piechart.h \ - pieslice.h + pieslice.h SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml b/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml index fc56a19b..0f971d9a 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/app.qml +++ b/examples/declarative/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/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro index ef45c8d3..4f34de7e 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/chapter5-listproperties.pro @@ -1,7 +1,7 @@ QT += widgets declarative HEADERS += piechart.h \ - pieslice.h + pieslice.h SOURCES += piechart.cpp \ pieslice.cpp \ main.cpp diff --git a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp index 68dc91ef..3dff29e7 100644 --- a/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter5-listproperties/piechart.cpp @@ -56,7 +56,7 @@ void PieChart::setName(const QString &name) } //![0] -QDeclarativeListProperty<PieSlice> PieChart::slices() +QDeclarativeListProperty<PieSlice> PieChart::slices() { return QDeclarativeListProperty<PieSlice>(this, 0, &PieChart::append_slice); } diff --git a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml b/examples/declarative/tutorials/extending/chapter6-plugins/app.qml index 684e416e..e72451e7 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/app.qml +++ b/examples/declarative/tutorials/extending/chapter6-plugins/app.qml @@ -47,17 +47,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/declarative/tutorials/extending/chapter6-plugins/piechart.cpp b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp index ed611b73..b17c9955 100644 --- a/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp +++ b/examples/declarative/tutorials/extending/chapter6-plugins/piechart.cpp @@ -55,7 +55,7 @@ void PieChart::setName(const QString &name) m_name = name; } -QDeclarativeListProperty<PieSlice> PieChart::slices() +QDeclarativeListProperty<PieSlice> PieChart::slices() { return QDeclarativeListProperty<PieSlice>(this, 0, &PieChart::append_slice); } diff --git a/examples/declarative/tutorials/extending/extending.pro b/examples/declarative/tutorials/extending/extending.pro index fe9a5cc7..7f9d8d68 100644 --- a/examples/declarative/tutorials/extending/extending.pro +++ b/examples/declarative/tutorials/extending/extending.pro @@ -6,4 +6,4 @@ SUBDIRS += \ chapter3-bindings \ chapter4-customPropertyTypes \ chapter5-listproperties \ - chapter6-plugins + chapter6-plugins diff --git a/examples/declarative/tutorials/gettingStarted/core/button.qml b/examples/declarative/tutorials/gettingStarted/core/button.qml index aaf619b5..8f1488d1 100644 --- a/examples/declarative/tutorials/gettingStarted/core/button.qml +++ b/examples/declarative/tutorials/gettingStarted/core/button.qml @@ -80,7 +80,7 @@ Rectangle { signal buttonClick() //define the clickable area to be the whole rectangle - MouseArea { + MouseArea { id: buttonMouseArea anchors.fill: parent //stretch the area to the parent's dimension onClicked: buttonClick() diff --git a/examples/declarative/tutorials/gettingStarted/core/fileDialog.qml b/examples/declarative/tutorials/gettingStarted/core/fileDialog.qml index 9f50c73f..b4bf3e24 100644 --- a/examples/declarative/tutorials/gettingStarted/core/fileDialog.qml +++ b/examples/declarative/tutorials/gettingStarted/core/fileDialog.qml @@ -71,7 +71,7 @@ Rectangle { } Text { height: header.height; anchors.centerIn: header - text: "files:" + text: "files:" color: "lightblue" font.weight: Font.Light font.italic: true diff --git a/examples/declarative/tutorials/gettingStarted/core/fileMenu.qml b/examples/declarative/tutorials/gettingStarted/core/fileMenu.qml index b2a34b9b..494f8acb 100644 --- a/examples/declarative/tutorials/gettingStarted/core/fileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/core/fileMenu.qml @@ -53,7 +53,7 @@ Rectangle { //used to divide the screen into parts. property real partition: 1/3 - color: "#6C646A" + color: "#6C646A" gradient: Gradient { GradientStop { position: 0.0; color: "#6C646A" } GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } diff --git a/examples/declarative/tutorials/gettingStarted/core/menuBar.qml b/examples/declarative/tutorials/gettingStarted/core/menuBar.qml index 49dc0e0d..78e85080 100644 --- a/examples/declarative/tutorials/gettingStarted/core/menuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/core/menuBar.qml @@ -67,7 +67,7 @@ Rectangle { Text { height: parent.height anchors { right: labelRow.left ; verticalCenter: parent.bottom } - text: "menu: " + text: "menu: " color: "lightblue" font { weight: Font.Light; italic: true } smooth: true @@ -97,13 +97,13 @@ Rectangle { id: editButton height: 20; width: 50 buttonColor : menuListView.currentIndex == 1? Qt.darker(editColor, 1.5) : Qt.darker(editColor, 1.9) - scale: menuListView.currentIndex == 1? 1.25: 1 + scale: menuListView.currentIndex == 1? 1.25: 1 label: "Edit" radius: 1 labelSize: menuListView.currentIndex == 1? 16:12 smooth:true //on a button click, change the list's currently selected item to EditMenu - onButtonClick: menuListView.currentIndex = 1 + onButtonClick: menuListView.currentIndex = 1 gradient: Gradient { GradientStop { position: 0.0; color: editColor } GradientStop { position: 1.0; color: "#136F6F6F" } @@ -123,7 +123,7 @@ Rectangle { //control the movement of the menu switching snapMode: ListView.SnapOneItem orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds + boundsBehavior: Flickable.StopAtBounds flickDeceleration: 5000 highlightFollowsCurrentItem: true highlightMoveDuration:240 diff --git a/examples/declarative/tutorials/gettingStarted/filedialog/directory.cpp b/examples/declarative/tutorials/gettingStarted/filedialog/directory.cpp index 8bde1e3a..74b60a83 100644 --- a/examples/declarative/tutorials/gettingStarted/filedialog/directory.cpp +++ b/examples/declarative/tutorials/gettingStarted/filedialog/directory.cpp @@ -90,7 +90,7 @@ File* fileAt(QDeclarativeListProperty<File> * property, int index) /* Returns the number of files in the list */ -int filesSize(QDeclarativeListProperty<File> * property) +int filesSize(QDeclarativeListProperty<File> * property) { return static_cast< QList<File *> *>(property->data)->size(); } diff --git a/examples/declarative/tutorials/gettingStarted/filedialog/directory.h b/examples/declarative/tutorials/gettingStarted/filedialog/directory.h index a39ca3b3..fe8924a0 100644 --- a/examples/declarative/tutorials/gettingStarted/filedialog/directory.h +++ b/examples/declarative/tutorials/gettingStarted/filedialog/directory.h @@ -100,7 +100,7 @@ class Directory : public QObject { //Registered to QML in a plugin. Accessible from QML as a property of Directory QList<File *> m_fileList; - //refresh content of the directory + //refresh content of the directory void refresh(); }; diff --git a/examples/declarative/tutorials/gettingStarted/gettingStarted.qml b/examples/declarative/tutorials/gettingStarted/gettingStarted.qml index fae37148..64f5fa84 100644 --- a/examples/declarative/tutorials/gettingStarted/gettingStarted.qml +++ b/examples/declarative/tutorials/gettingStarted/gettingStarted.qml @@ -107,7 +107,7 @@ Rectangle { PropertyChanges { target: menuBar; y: 0} PropertyChanges { target: textArea; y: partition + drawer.height} PropertyChanges { target: drawer; y: partition} - PropertyChanges { target: arrowIcon; rotation: 180} + PropertyChanges { target: arrowIcon; rotation: 180} }, State { name: "DRAWER_CLOSED" diff --git a/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml index b7eed442..8ab8598a 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part0/Button.qml @@ -43,13 +43,13 @@ import QtQuick 1.0 Rectangle { id: simplebutton - color: "grey" + color: "grey" width: 150; height: 75 - + Text{ id: buttonLabel anchors.centerIn: parent - text: "button label" + text: "button label" } } //! [document] diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml index 78b38aee..e39814ed 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/Button.qml @@ -50,20 +50,20 @@ Rectangle { //these properties act as constants, useable outside this QML file property int buttonHeight: 75 property int buttonWidth: 150 - + //the color highlight when the mouse hovers on the rectangle property color onHoverColor: "gold" property color borderColor: "white" //buttonColor is set to the button's main color - property color buttonColor: "lightblue" + property color buttonColor: "lightblue" //set appearance properties radius:10 smooth: true border{color: "white"; width: 3} width: buttonWidth; height: buttonHeight - + Text{ id: buttonLabel anchors.centerIn: parent @@ -77,11 +77,11 @@ Rectangle { } //define the clickable area to be the whole rectangle - MouseArea{ + MouseArea{ id: buttonMouseArea anchors.fill: parent //stretch the area to the parent's dimension onClicked: buttonClick() - + //if true, then onEntered and onExited called if mouse hovers in the mouse area //if false, a button must be clicked to detect the mouse hover hoverEnabled: true @@ -90,7 +90,7 @@ Rectangle { onEntered: parent.border.color = onHoverColor //remove the border if the mouse exits the button mouse area onExited: parent.border.color = borderColor - + } //change the color of the button when pressed diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml index 5e825755..a753edd3 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/EditMenu.qml @@ -60,7 +60,7 @@ Rectangle { buttonColor: "lightgrey" label: "Cut" } - + Button{ buttonColor: "grey" id: saveButton diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml index d53e1f3d..46537a1e 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/FileMenu.qml @@ -49,9 +49,9 @@ Rectangle { //generous amount of screen space that will allow the buttons to fit height: 480; width:1000 - color: "#6C646A" + color: "#6C646A" - //a sub-rectangle allows the flexibility of setting the row area + //a sub-rectangle allows the flexibility of setting the row area Rectangle{ id:actionContainer @@ -70,7 +70,7 @@ Rectangle { buttonColor: "lightgrey" label: "Load" } - + Button{ buttonColor: "grey" id: saveButton diff --git a/examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml index d2131eeb..e2617651 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part2/MenuBar.qml @@ -50,12 +50,12 @@ Rectangle { //container for the header and the buttons Rectangle{ - + id: labelList height:parent.height/10 width: parent.width color: "steelblue" - + //default z is 0, items with higher z values are shown on top of items with lower z values z: 1 @@ -82,16 +82,16 @@ Rectangle { width: 50 id: editButton buttonColor : menuListView.currentIndex == 1? editColor : Qt.darker(editColor, 1.5) - scale: menuListView.currentIndex == 1? 1.25: 1 + scale: menuListView.currentIndex == 1? 1.25: 1 label: "Edit" radius: 1 //on a button click, change the list's currently selected item to EditMenu onButtonClick: { - menuListView.currentIndex = 1 + menuListView.currentIndex = 1 } - + } @@ -111,7 +111,7 @@ Rectangle { color: editColor width: menuListView.width height: menuBar.height - + } } @@ -129,7 +129,7 @@ Rectangle { //control the movement of the menu switching snapMode: ListView.SnapOneItem orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds + boundsBehavior: Flickable.StopAtBounds flickDeceleration: 5000 highlightFollowsCurrentItem: true highlightMoveDuration:240 diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml index 78b38aee..e39814ed 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/Button.qml @@ -50,20 +50,20 @@ Rectangle { //these properties act as constants, useable outside this QML file property int buttonHeight: 75 property int buttonWidth: 150 - + //the color highlight when the mouse hovers on the rectangle property color onHoverColor: "gold" property color borderColor: "white" //buttonColor is set to the button's main color - property color buttonColor: "lightblue" + property color buttonColor: "lightblue" //set appearance properties radius:10 smooth: true border{color: "white"; width: 3} width: buttonWidth; height: buttonHeight - + Text{ id: buttonLabel anchors.centerIn: parent @@ -77,11 +77,11 @@ Rectangle { } //define the clickable area to be the whole rectangle - MouseArea{ + MouseArea{ id: buttonMouseArea anchors.fill: parent //stretch the area to the parent's dimension onClicked: buttonClick() - + //if true, then onEntered and onExited called if mouse hovers in the mouse area //if false, a button must be clicked to detect the mouse hover hoverEnabled: true @@ -90,7 +90,7 @@ Rectangle { onEntered: parent.border.color = onHoverColor //remove the border if the mouse exits the button mouse area onExited: parent.border.color = borderColor - + } //change the color of the button when pressed diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml index 5e825755..a753edd3 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/EditMenu.qml @@ -60,7 +60,7 @@ Rectangle { buttonColor: "lightgrey" label: "Cut" } - + Button{ buttonColor: "grey" id: saveButton diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml index d53e1f3d..46537a1e 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/FileMenu.qml @@ -49,9 +49,9 @@ Rectangle { //generous amount of screen space that will allow the buttons to fit height: 480; width:1000 - color: "#6C646A" + color: "#6C646A" - //a sub-rectangle allows the flexibility of setting the row area + //a sub-rectangle allows the flexibility of setting the row area Rectangle{ id:actionContainer @@ -70,7 +70,7 @@ Rectangle { buttonColor: "lightgrey" label: "Load" } - + Button{ buttonColor: "grey" id: saveButton diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml index d2131eeb..e2617651 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/MenuBar.qml @@ -50,12 +50,12 @@ Rectangle { //container for the header and the buttons Rectangle{ - + id: labelList height:parent.height/10 width: parent.width color: "steelblue" - + //default z is 0, items with higher z values are shown on top of items with lower z values z: 1 @@ -82,16 +82,16 @@ Rectangle { width: 50 id: editButton buttonColor : menuListView.currentIndex == 1? editColor : Qt.darker(editColor, 1.5) - scale: menuListView.currentIndex == 1? 1.25: 1 + scale: menuListView.currentIndex == 1? 1.25: 1 label: "Edit" radius: 1 //on a button click, change the list's currently selected item to EditMenu onButtonClick: { - menuListView.currentIndex = 1 + menuListView.currentIndex = 1 } - + } @@ -111,7 +111,7 @@ Rectangle { color: editColor width: menuListView.width height: menuBar.height - + } } @@ -129,7 +129,7 @@ Rectangle { //control the movement of the menu switching snapMode: ListView.SnapOneItem orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds + boundsBehavior: Flickable.StopAtBounds flickDeceleration: 5000 highlightFollowsCurrentItem: true highlightMoveDuration:240 diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml index ece97fec..4d3ddb33 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/TextArea.qml @@ -71,7 +71,7 @@ Rectangle { width:parent.width; height:parent.height color:"midnightblue" focus: true - + wrapMode: TextEdit.Wrap onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) diff --git a/examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml index a535c0fc..679e4f4f 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part3/TextEditor.qml @@ -47,7 +47,7 @@ Rectangle { border.color:"black" //the screen is partitioned into the MenuBar and TextArea. 1/3 of the screen is assigned to the MenuBar property int partition: height/3 - + MenuBar{ id:menuBar height: partition diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml index 2ca436ba..1a8b7acb 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/Button.qml @@ -48,7 +48,7 @@ Rectangle { //these properties act as constants, useable outside this QML file property int buttonHeight: 75 property int buttonWidth: 150 - + //attaches to the Text element's text content property string label property color textColor: buttonLabel.color @@ -58,7 +58,7 @@ Rectangle { property color borderColor: "white" //buttonColor is set to the button's main color - property color buttonColor: "lightblue" + property color buttonColor: "lightblue" //set appearance properties radius:10 @@ -66,7 +66,7 @@ Rectangle { border.color: "white" border.width: 3 width: buttonWidth; height: buttonHeight - + Text{ id: buttonLabel anchors.centerIn: parent @@ -80,11 +80,11 @@ Rectangle { } //define the clickable area to be the whole rectangle - MouseArea{ + MouseArea{ id: buttonMouseArea anchors.fill: parent //stretch the area to the parent's dimension onClicked: buttonClick() - + //if true, then onEntered and onExited called if mouse hovers in the mouse area //if false, a button must be clicked to detect the mouse hover hoverEnabled: true @@ -93,7 +93,7 @@ Rectangle { onEntered: parent.border.color = onHoverColor //remove the border if the mouse exits the button mouse area onExited: parent.border.color = borderColor - + } //change the color of the button when pressed diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml index 64345ebd..b7e1b7c0 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/EditMenu.qml @@ -64,7 +64,7 @@ Rectangle { buttonColor: "lightgrey" label: "Cut" } - + Button{ buttonColor: "grey" id: saveButton diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml index 20acaa8a..df23a14b 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/FileMenu.qml @@ -49,13 +49,13 @@ Rectangle { //generous amount of screen space that will allow the buttons to fit height: 480; width:1000 - color: "#6C646A" + color: "#6C646A" gradient: Gradient{ GradientStop { position: 0.0; color: "#6C646A" } GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } } - //a sub-rectangle allows the flexibility of setting the row area + //a sub-rectangle allows the flexibility of setting the row area Rectangle{ id:actionContainer @@ -74,7 +74,7 @@ Rectangle { buttonColor: "lightgrey" label: "Load" } - + Button{ buttonColor: "grey" id: saveButton diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml index 9c027fc9..8a674ca2 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/MenuBar.qml @@ -50,7 +50,7 @@ Rectangle { //container for the header and the buttons Rectangle{ - + id: labelList height:parent.height/10 width: parent.width @@ -88,16 +88,16 @@ Rectangle { width: 50 id: editButton buttonColor : menuListView.currentIndex == 1? editColor : Qt.darker(editColor, 1.5) - scale: menuListView.currentIndex == 1? 1.25: 1 + scale: menuListView.currentIndex == 1? 1.25: 1 label: "Edit" radius: 1 //on a button click, change the list's currently selected item to EditMenu onButtonClick: { - menuListView.currentIndex = 1 + menuListView.currentIndex = 1 } - + } @@ -117,7 +117,7 @@ Rectangle { color: editColor width: menuListView.width height: menuBar.height - + } } @@ -135,7 +135,7 @@ Rectangle { //control the movement of the menu switching snapMode: ListView.SnapOneItem orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds + boundsBehavior: Flickable.StopAtBounds flickDeceleration: 5000 highlightFollowsCurrentItem: true highlightMoveDuration:240 diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml index 384a6c52..7978ed42 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/SimpleButton.qml @@ -42,16 +42,16 @@ import QtQuick 1.0 Rectangle { id: simplebutton - color: "grey" + color: "grey" width: 150; height: 75 - + Text{ id: buttonLabel anchors.centerIn: parent - text: "button label" + text: "button label" } - MouseArea{ + MouseArea{ id: buttonMouseArea anchors.fill: parent onClicked: console.log(buttonLabel.text + " clicked" ) diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml index 1e33bec9..0c2277e9 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/TextArea.qml @@ -46,7 +46,7 @@ Rectangle { width :400 height:400 property color fontColor: "white" - + Flickable{ id: flickArea @@ -71,7 +71,7 @@ Rectangle { width:parent.width; height:parent.height color:fontColor focus: true - + wrapMode: TextEdit.Wrap onCursorRectangleChanged: flickArea.ensureVisible(cursorRectangle) diff --git a/examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml index 0fdce356..a5b6e618 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part4/TextEditor.qml @@ -45,8 +45,8 @@ Rectangle { width: 1000; height: 1000 property int partition: height/3 state: "DRAWER_CLOSED" - - + + //Item 1: MenuBar on the top portion of the screen MenuBar{ id:menuBar @@ -66,7 +66,7 @@ Rectangle { color: "#3F3F3F" fontColor: "#DCDCCC" height: partition*2 - width:parent.width + width:parent.width } //Item 3: The drawer handle @@ -88,17 +88,17 @@ Rectangle { id: arrowIcon source: "images/arrow.png" anchors.horizontalCenter: parent.horizontalCenter - + Behavior{NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }} } - + MouseArea{ id: drawerMouseArea anchors.fill:parent onClicked:{ if (screen.state == "DRAWER_CLOSED"){ screen.state = "DRAWER_OPEN" - console.log("drawer OPEN") + console.log("drawer OPEN") } else if (screen.state == "DRAWER_OPEN"){ screen.state = "DRAWER_CLOSED" @@ -109,13 +109,13 @@ Rectangle { //if true, then onEntered and onExited called if mouse hovers in the mouse area //if false, a button must be clicked to detect the mouse hover hoverEnabled: true - + //display a border if the mouse hovers on the button mouse area onEntered: parent.border.color = Qt.lighter("#6A6D6A") //remove the border if the mouse exits the button mouse area onExited: parent.border.color = "#6A6D6A" } - + } states:[ State{ @@ -123,14 +123,14 @@ Rectangle { PropertyChanges { target: menuBar; y:0} PropertyChanges { target: textArea; y: partition + drawer.height} PropertyChanges { target: drawer; y: partition} - PropertyChanges { target: arrowIcon; rotation: 180} + PropertyChanges { target: arrowIcon; rotation: 180} }, State{ name: "DRAWER_CLOSED" PropertyChanges { target: menuBar; y:-partition} PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height} PropertyChanges { target: drawer; y: 0} - PropertyChanges { target: arrowIcon; rotation: 0} + PropertyChanges { target: arrowIcon; rotation: 0} } ] @@ -141,6 +141,6 @@ Rectangle { NumberAnimation { target: menuBar; properties: "y"; duration: 100;easing.type: Easing.OutExpo } NumberAnimation { target: drawer; properties: "y"; duration: 100;easing.type: Easing.OutExpo } } - + ] } diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml b/examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml index 7c63d752..da54a552 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/TextEditor.qml @@ -46,7 +46,7 @@ Rectangle { width: 1000; height: 1000 property int partition: height/3 state: "DRAWER_CLOSED" - + //Item 1: MenuBar on the top portion of the screen MenuBar{ id:menuBar @@ -59,7 +59,7 @@ Rectangle { y:drawer.height color: "#3F3F3F" fontColor: "#DCDCCC" - height: partition*2; width:parent.width + height: partition*2; width:parent.width } //Item 3: The drawer handle Rectangle{ @@ -78,10 +78,10 @@ Rectangle { id: arrowIcon source: "images/arrow.png" anchors.horizontalCenter: parent.horizontalCenter - + Behavior{NumberAnimation{property: "rotation";easing.type: Easing.OutExpo }} } - + MouseArea{ id: drawerMouseArea anchors.fill:parent @@ -105,14 +105,14 @@ Rectangle { PropertyChanges { target: menuBar; y: 0} PropertyChanges { target: textArea; y: partition + drawer.height} PropertyChanges { target: drawer; y: partition} - PropertyChanges { target: arrowIcon; rotation: 180} + PropertyChanges { target: arrowIcon; rotation: 180} }, State{ name: "DRAWER_CLOSED" PropertyChanges { target: menuBar; y:-height; } PropertyChanges { target: textArea; y: drawer.height; height: screen.height - drawer.height} PropertyChanges { target: drawer; y: 0} - PropertyChanges { target: arrowIcon; rotation: 0} + PropertyChanges { target: arrowIcon; rotation: 0} } ] diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/core/button.qml b/examples/declarative/tutorials/gettingStarted/parts/part5/core/button.qml index aaf619b5..8f1488d1 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/core/button.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/core/button.qml @@ -80,7 +80,7 @@ Rectangle { signal buttonClick() //define the clickable area to be the whole rectangle - MouseArea { + MouseArea { id: buttonMouseArea anchors.fill: parent //stretch the area to the parent's dimension onClicked: buttonClick() diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileDialog.qml b/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileDialog.qml index 9f50c73f..b4bf3e24 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileDialog.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileDialog.qml @@ -71,7 +71,7 @@ Rectangle { } Text { height: header.height; anchors.centerIn: header - text: "files:" + text: "files:" color: "lightblue" font.weight: Font.Light font.italic: true diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileMenu.qml b/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileMenu.qml index b2a34b9b..494f8acb 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileMenu.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/core/fileMenu.qml @@ -53,7 +53,7 @@ Rectangle { //used to divide the screen into parts. property real partition: 1/3 - color: "#6C646A" + color: "#6C646A" gradient: Gradient { GradientStop { position: 0.0; color: "#6C646A" } GradientStop { position: 1.0; color: Qt.darker("#6A6D6A") } diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/core/menuBar.qml b/examples/declarative/tutorials/gettingStarted/parts/part5/core/menuBar.qml index 49dc0e0d..78e85080 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/core/menuBar.qml +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/core/menuBar.qml @@ -67,7 +67,7 @@ Rectangle { Text { height: parent.height anchors { right: labelRow.left ; verticalCenter: parent.bottom } - text: "menu: " + text: "menu: " color: "lightblue" font { weight: Font.Light; italic: true } smooth: true @@ -97,13 +97,13 @@ Rectangle { id: editButton height: 20; width: 50 buttonColor : menuListView.currentIndex == 1? Qt.darker(editColor, 1.5) : Qt.darker(editColor, 1.9) - scale: menuListView.currentIndex == 1? 1.25: 1 + scale: menuListView.currentIndex == 1? 1.25: 1 label: "Edit" radius: 1 labelSize: menuListView.currentIndex == 1? 16:12 smooth:true //on a button click, change the list's currently selected item to EditMenu - onButtonClick: menuListView.currentIndex = 1 + onButtonClick: menuListView.currentIndex = 1 gradient: Gradient { GradientStop { position: 0.0; color: editColor } GradientStop { position: 1.0; color: "#136F6F6F" } @@ -123,7 +123,7 @@ Rectangle { //control the movement of the menu switching snapMode: ListView.SnapOneItem orientation: ListView.Horizontal - boundsBehavior: Flickable.StopAtBounds + boundsBehavior: Flickable.StopAtBounds flickDeceleration: 5000 highlightFollowsCurrentItem: true highlightMoveDuration:240 diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp index 452124f5..84ebdced 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.cpp @@ -44,11 +44,11 @@ #include <QtDeclarative/qdeclarative.h> void DialogPlugin::registerTypes(const char *uri){ - + //register the class Directory into QML as a "Directory" element version 1.0 qmlRegisterType<Directory>(uri, 1, 0, "Directory"); qmlRegisterType<File>(uri,1,0,"File"); - + //qRegisterMetaType<QDeclarativeListProperty<QString> > ("QDeclarativeListProperty<QString>"); - + } diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h index 68c6076e..0a5bc9ef 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/dialogPlugin.h @@ -51,7 +51,7 @@ class DialogPlugin : public QDeclarativeExtensionPlugin public: //registerTypes is inherited from QDeclarativeExtensionPlugin void registerTypes(const char *uri); - + }; #endif diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp index bdf450eb..dd4a5546 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.cpp @@ -48,10 +48,10 @@ Initialize the saves directory and creates the file list */ Directory::Directory(QObject *parent) : QObject(parent) { - + m_dir.cd( QDir::currentPath()); - + //go to the saved directory. if not found, create save directory m_saveDir = "saves"; if (m_dir.cd(m_saveDir) == 0){ @@ -144,7 +144,7 @@ void Directory::setFileContent(const QString &str){ if(str != m_fileContent){ m_fileContent = str; emit fileContentChanged(); - } + } } /* @@ -152,17 +152,17 @@ Called from QML to save the file using the filename and file content. Saving makes sure that the file has a .txt extension. */ void Directory::saveFile(){ - + if(currentFile.name().size() == 0){ qWarning()<< "Empty filename. no save"; return; } - + QString extendedName = currentFile.name(); if(!currentFile.name().endsWith(".txt")){ extendedName.append(".txt"); } - + QFile file( m_dir.filePath(extendedName) ); if (file.open(QFile::WriteOnly | QFile::Truncate)){ QTextStream outStream(&file); @@ -184,11 +184,11 @@ void Directory::loadFile(){ if(!currentFile.name().endsWith(".txt")){ extendedName.append(".txt"); } - + QFile file( m_dir.filePath(extendedName) ); if (file.open(QFile::ReadOnly )){ QTextStream inStream(&file); - + QString line; do{ line = inStream.read(75); @@ -205,12 +205,12 @@ created files are added onto the list. void Directory::refresh(){ m_dirFiles = m_dir.entryList(m_filterList,QDir::Files,QDir::Name); m_fileList.clear(); - + File * file; for(int i = 0; i < m_dirFiles.size() ; i ++){ - + file = new File(); - + if(m_dirFiles.at(i).endsWith(".txt")){ QString name = m_dirFiles.at(i); file->setName( name.remove(".txt",Qt::CaseSensitive)); diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h index b5a7bbe1..a8997ee2 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/directory.h @@ -52,22 +52,22 @@ class Directory : public QObject{ Q_OBJECT - + //number of files in the directory Q_PROPERTY(int filesCount READ filesCount) - + //list property containing file names as QString Q_PROPERTY(QDeclarativeListProperty<File> files READ files CONSTANT ) - + //file name of the text file to read/write Q_PROPERTY(QString filename READ filename WRITE setFilename NOTIFY filenameChanged) - + //text content of the file Q_PROPERTY(QString fileContent READ fileContent WRITE setFileContent NOTIFY fileContentChanged) - + public: Directory(QObject *parent = 0); - + //properties' read functions int filesCount() const; QString filename() const; @@ -77,30 +77,30 @@ class Directory : public QObject{ //properties' write functions void setFilename(const QString &str); void setFileContent(const QString &str); - + //accessible from QML Q_INVOKABLE void saveFile(); Q_INVOKABLE void loadFile(); - + signals: void directoryChanged(); void filenameChanged(); void fileContentChanged(); - + private: QDir m_dir; - QStringList m_dirFiles; - File currentFile; + QStringList m_dirFiles; + File currentFile; QString m_saveDir; - QStringList m_filterList; - + QStringList m_filterList; + //contains the file data in QString format QString m_fileContent; - + //Registered to QML in a plugin. Accessible from QML as a property of Directory QList<File *> m_fileList; - //refresh content of the directory + //refresh content of the directory void refresh(); }; diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h index ef1551a3..f3afb6ff 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/file.h @@ -46,20 +46,20 @@ #include <QObject> class File : public QObject{ - + Q_OBJECT - + Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged) - + public: File(QObject *parent = 0); - + QString name() const; void setName(const QString &str); - + signals: void nameChanged(); - + private: QString m_name; }; diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro index f9229a3b..856221bc 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/filedialog/filedialog.pro @@ -8,10 +8,10 @@ MOC_DIR = tmp TARGET = FileDialog -HEADERS += directory.h \ - file.h \ - dialogPlugin.h +HEADERS += directory.h \ + file.h \ + dialogPlugin.h -SOURCES += directory.cpp \ - file.cpp \ - dialogPlugin.cpp +SOURCES += directory.cpp \ + file.cpp \ + dialogPlugin.cpp diff --git a/examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject b/examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject index ed034dff..30e9e1fe 100644 --- a/examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject +++ b/examples/declarative/tutorials/gettingStarted/parts/part5/qml-texteditor5.qmlproject @@ -4,8 +4,8 @@ Project { /* Include .qml, .js, and image files from current directory and subdirectories */ QmlFiles { directory: "." - directory: "core" - directory: "filedialog" + directory: "core" + directory: "filedialog" } JavaScriptFiles { directory: "." diff --git a/examples/declarative/tutorials/samegame/samegame1/samegame.qml b/examples/declarative/tutorials/samegame/samegame1/samegame.qml index 999e629a..0a68cd47 100644 --- a/examples/declarative/tutorials/samegame/samegame1/samegame.qml +++ b/examples/declarative/tutorials/samegame/samegame1/samegame.qml @@ -68,7 +68,7 @@ Rectangle { Button { anchors { left: parent.left; verticalCenter: parent.verticalCenter } - text: "New Game" + text: "New Game" onClicked: console.log("This doesn't do anything yet...") } diff --git a/examples/declarative/tutorials/samegame/samegame3/Block.qml b/examples/declarative/tutorials/samegame/samegame3/Block.qml index 20a2e163..c451fcfe 100644 --- a/examples/declarative/tutorials/samegame/samegame3/Block.qml +++ b/examples/declarative/tutorials/samegame/samegame3/Block.qml @@ -53,7 +53,7 @@ Item { source: { if (type == 0) return "../shared/pics/redStone.png"; - else if (type == 1) + else if (type == 1) return "../shared/pics/blueStone.png"; else return "../shared/pics/greenStone.png"; diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js index df5bdfb0..01edc5bd 100644 --- a/examples/declarative/tutorials/samegame/samegame3/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js @@ -160,7 +160,7 @@ function victoryCheck() { } //![2] -//only floods up and right, to see if it can find adjacent same-typed blocks +//only floods up and right, to see if it can find adjacent same-typed blocks function floodMoveCheck(column, row, type) { if (column >= maxColumn || column < 0 || row >= maxRow || row < 0) return false; diff --git a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml index aeb544c7..c44fbd61 100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml +++ b/examples/declarative/tutorials/samegame/samegame4/content/BoomBlock.qml @@ -94,7 +94,7 @@ Item { source: { if (type == 0) return "../../shared/pics/redStar.png"; - else if (type == 1) + else if (type == 1) return "../../shared/pics/blueStar.png"; else return "../../shared/pics/greenStar.png"; diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js index ccc3f9da..59ac4464 100644 --- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js @@ -174,7 +174,7 @@ function victoryCheck() { } //![4] -//only floods up and right, to see if it can find adjacent same-typed blocks +//only floods up and right, to see if it can find adjacent same-typed blocks function floodMoveCheck(column, row, type) { if (column >= maxColumn || column < 0 || row >= maxRow || row < 0) return false; diff --git a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php b/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php index daf480e2..86e4187a 100644 --- a/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php +++ b/examples/declarative/tutorials/samegame/samegame4/highscores/scores.php @@ -8,8 +8,8 @@ $time = $_POST["time"]; if($name == "") $name = "Anonymous"; - $file = fopen("score_data.xml", "a"); - $ret = fwrite($file, "<record><score>". $score . "</score><name>" + $file = fopen("score_data.xml", "a"); + $ret = fwrite($file, "<record><score>". $score . "</score><name>" . $name . "</name><gridSize>" . $grid . "</gridSize><seconds>" . $time . "</seconds></record>\n"); echo "Your score has been recorded. Thanks for playing!"; @@ -18,7 +18,7 @@ }else{#Read high score list #Now uses XSLT to display. So just print the file. With XML cruft added. #Note that firefox at least won't apply the XSLT on a php file. So redirecting - $file = fopen("scores.xml", "w"); + $file = fopen("scores.xml", "w"); $ret = fwrite($file, '<?xml version="1.0" encoding="ISO-8859-1"?>' . "\n" . '<?xml-stylesheet type="text/xsl" href="score_style.xsl"?>' . "\n" . "<records>\n" . file_get_contents("score_data.xml") . "</records>\n"); diff --git a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro index a2159f30..622a2ac9 100644 --- a/examples/declarative/ui-components/dialcontrol/dialcontrol.pro +++ b/examples/declarative/ui-components/dialcontrol/dialcontrol.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/ui-components/flipable/flipable.pro b/examples/declarative/ui-components/flipable/flipable.pro index af1892f7..6ddf19c1 100644 --- a/examples/declarative/ui-components/flipable/flipable.pro +++ b/examples/declarative/ui-components/flipable/flipable.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/ui-components/flipable/qml/flipable/content/Card.qml b/examples/declarative/ui-components/flipable/qml/flipable/content/Card.qml index f90e5549..49781aac 100644 --- a/examples/declarative/ui-components/flipable/qml/flipable/content/Card.qml +++ b/examples/declarative/ui-components/flipable/qml/flipable/content/Card.qml @@ -49,7 +49,7 @@ Flipable { property int yAxis: 0 property int angle: 0 - width: front.width; height: front.height + width: front.width; height: front.height front: Image { id: frontImage; smooth: true } back: Image { source: "back.png"; smooth: true } diff --git a/examples/declarative/ui-components/flipable/qml/flipable/flipable.qml b/examples/declarative/ui-components/flipable/qml/flipable/flipable.qml index ee333f1b..ec1c1e83 100644 --- a/examples/declarative/ui-components/flipable/qml/flipable/flipable.qml +++ b/examples/declarative/ui-components/flipable/qml/flipable/flipable.qml @@ -43,7 +43,7 @@ import "content" Rectangle { id: window - + width: 480; height: 320 color: "darkgreen" diff --git a/examples/declarative/ui-components/main/main.pro b/examples/declarative/ui-components/main/main.pro index d44b7adc..25a2d7c2 100644 --- a/examples/declarative/ui-components/main/main.pro +++ b/examples/declarative/ui-components/main/main.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/ui-components/main/qml/main/SearchBox.qml b/examples/declarative/ui-components/main/qml/main/SearchBox.qml index 3085d8ed..fddd0bad 100644 --- a/examples/declarative/ui-components/main/qml/main/SearchBox.qml +++ b/examples/declarative/ui-components/main/qml/main/SearchBox.qml @@ -66,9 +66,9 @@ FocusScope { font.italic: true } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { focusScope.focus = true; textInput.openSoftwareInputPanel(); } + onClicked: { focusScope.focus = true; textInput.openSoftwareInputPanel(); } } TextInput { @@ -84,7 +84,7 @@ FocusScope { source: "images/clear.png" opacity: 0 - MouseArea { + MouseArea { anchors.fill: parent onClicked: { textInput.text = ''; focusScope.focus = true; textInput.openSoftwareInputPanel(); } } diff --git a/examples/declarative/ui-components/progressbar/progressbar.pro b/examples/declarative/ui-components/progressbar/progressbar.pro index 66365c2e..cc9f886e 100644 --- a/examples/declarative/ui-components/progressbar/progressbar.pro +++ b/examples/declarative/ui-components/progressbar/progressbar.pro @@ -14,8 +14,8 @@ QML_IMPORT_PATH = # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/ui-components/searchbox/qml/searchbox/SearchBox.qml b/examples/declarative/ui-components/searchbox/qml/searchbox/SearchBox.qml index 3085d8ed..fddd0bad 100644 --- a/examples/declarative/ui-components/searchbox/qml/searchbox/SearchBox.qml +++ b/examples/declarative/ui-components/searchbox/qml/searchbox/SearchBox.qml @@ -66,9 +66,9 @@ FocusScope { font.italic: true } - MouseArea { + MouseArea { anchors.fill: parent - onClicked: { focusScope.focus = true; textInput.openSoftwareInputPanel(); } + onClicked: { focusScope.focus = true; textInput.openSoftwareInputPanel(); } } TextInput { @@ -84,7 +84,7 @@ FocusScope { source: "images/clear.png" opacity: 0 - MouseArea { + MouseArea { anchors.fill: parent onClicked: { textInput.text = ''; focusScope.focus = true; textInput.openSoftwareInputPanel(); } } diff --git a/examples/declarative/ui-components/slideswitch/qml/slideswitch/content/Switch.qml b/examples/declarative/ui-components/slideswitch/qml/slideswitch/content/Switch.qml index 792d848e..115cec3a 100644 --- a/examples/declarative/ui-components/slideswitch/qml/slideswitch/content/Switch.qml +++ b/examples/declarative/ui-components/slideswitch/qml/slideswitch/content/Switch.qml @@ -53,7 +53,7 @@ Item { function toggle() { if (toggleswitch.state == "on") toggleswitch.state = "off"; - else + else toggleswitch.state = "on"; } //![2] diff --git a/examples/declarative/ui-components/slideswitch/slideswitch.pro b/examples/declarative/ui-components/slideswitch/slideswitch.pro index 7f7c981c..b09167f1 100644 --- a/examples/declarative/ui-components/slideswitch/slideswitch.pro +++ b/examples/declarative/ui-components/slideswitch/slideswitch.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += diff --git a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro index 3755d5fc..467e24b3 100644 --- a/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro +++ b/examples/declarative/xml/xmlhttprequest-example/xmlhttprequestexample.pro @@ -14,8 +14,8 @@ DEFINES += ORIENTATIONLOCK # DEFINES += QMLJSDEBUGGER # If your application uses the Qt Mobility libraries, uncomment -# the following lines and add the respective components to the -# MOBILITY variable. +# the following lines and add the respective components to the +# MOBILITY variable. # CONFIG += mobility # MOBILITY += |