diff options
author | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-04-19 01:16:48 (GMT) |
---|---|---|
committer | Leonardo Sobral Cunha <leo.cunha@nokia.com> | 2010-04-19 07:31:10 (GMT) |
commit | 685549ea36f84c84805eee0191b362eea6c66728 (patch) | |
tree | 93d68e97d1a856a475126a995dde0b5661e92091 /demos/declarative | |
parent | 906a4c123794efd02b64b03fc544925ce3f4a012 (diff) | |
download | Qt-685549ea36f84c84805eee0191b362eea6c66728.zip Qt-685549ea36f84c84805eee0191b362eea6c66728.tar.gz Qt-685549ea36f84c84805eee0191b362eea6c66728.tar.bz2 |
Indentation and whitespace fixes in qml's samegame tutorial
Diffstat (limited to 'demos/declarative')
-rw-r--r-- | demos/declarative/samegame/SamegameCore/BoomBlock.qml | 10 | ||||
-rw-r--r-- | demos/declarative/samegame/SamegameCore/Button.qml | 4 | ||||
-rw-r--r-- | demos/declarative/samegame/SamegameCore/Dialog.qml | 2 | ||||
-rw-r--r-- | demos/declarative/samegame/samegame.qml | 2 |
4 files changed, 10 insertions, 8 deletions
diff --git a/demos/declarative/samegame/SamegameCore/BoomBlock.qml b/demos/declarative/samegame/SamegameCore/BoomBlock.qml index bad1bf4..47f43c2 100644 --- a/demos/declarative/samegame/SamegameCore/BoomBlock.qml +++ b/demos/declarative/samegame/SamegameCore/BoomBlock.qml @@ -1,7 +1,8 @@ import Qt 4.7 import Qt.labs.particles 1.0 -Item { id:block +Item { + id: block property bool dying: false property bool spawned: false property int type: 0 @@ -11,7 +12,8 @@ Item { id:block SpringFollow on x { enabled: spawned; to: targetX; spring: 2; damping: 0.2 } SpringFollow on y { to: targetY; spring: 2; damping: 0.2 } - Image { id: img + Image { + id: img source: { if(type == 0){ "pics/redStone.png"; @@ -26,10 +28,10 @@ Item { id:block anchors.fill: parent } - Particles { + Particles { id: particles - width: 1; height: 1 + width: 1; height: 1 anchors.centerIn: parent emissionRate: 0 diff --git a/demos/declarative/samegame/SamegameCore/Button.qml b/demos/declarative/samegame/SamegameCore/Button.qml index 0faabc9..6d5d75d 100644 --- a/demos/declarative/samegame/SamegameCore/Button.qml +++ b/demos/declarative/samegame/SamegameCore/Button.qml @@ -17,9 +17,9 @@ Rectangle { GradientStop { position: 0.0 color: { - if (mouseArea.pressed) + if (mouseArea.pressed) return activePalette.dark - else + else return activePalette.light } } diff --git a/demos/declarative/samegame/SamegameCore/Dialog.qml b/demos/declarative/samegame/SamegameCore/Dialog.qml index 8784348..d4f188c 100644 --- a/demos/declarative/samegame/SamegameCore/Dialog.qml +++ b/demos/declarative/samegame/SamegameCore/Dialog.qml @@ -22,7 +22,7 @@ Rectangle { border.width: 1 opacity: 0 - Behavior on opacity { + Behavior on opacity { NumberAnimation { duration: 1000 } } diff --git a/demos/declarative/samegame/samegame.qml b/demos/declarative/samegame/samegame.qml index 92201f5..f1b41c9 100644 --- a/demos/declarative/samegame/samegame.qml +++ b/demos/declarative/samegame/samegame.qml @@ -38,7 +38,7 @@ Rectangle { Dialog { id: nameInputDialog - + property int initialWidth: 0 anchors.centerIn: parent |