Merge lp:~michihenning/unity/phablet-unity-api-whitespace-test into lp:unity/phablet

[Michi Henning]

Added test to scan for trailing whitespace in source files.

This MP adds a test to scan source files for trailing whitespace. File types examined are:

.cpp .h .py .sh .qml .js and CMakeLists.txt

Please suggest anything else that should be added.

I removed trailing whitespace from a bunch of source files so the test passes.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:545
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/284/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/285/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/284/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/160/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/160/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/284/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:545
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/303/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/304/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/303/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/179/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/179/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/303/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

The failure comes from the prerequisite - once the other is fixed this should be fine again.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:546
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/309/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/310
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/310/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/309
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/185
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/185/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/693

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/309/rebuild

review: Approve (continuous-integration)

[Albert Astals Cid (aacid)]

I'm not sure i agree with this intolerance against whitespaces but the "Renamed Version.h.cmake to Version.h.in" seems like it doesn't belong in here, no?

[Jussi Pakkanen (jpakkane)]

The checker script is starting to push the limits of what should be implemented in shell. This one is fine but in the future I would like to see these kinds of things done in Python.

Other than that, approve with the same comment as aacid.

review: Approve

[Pete Woods (pete-woods)]

> The checker script is starting to push the limits of what should be
> implemented in shell. This one is fine but in the future I would like to see
> these kinds of things done in Python.

Indeed, for example it looks like this script wouldn't like files with spaces in the name.

>
> Other than that, approve with the same comment as aacid.

[Pete Woods (pete-woods)]

> > The checker script is starting to push the limits of what should be
> > implemented in shell. This one is fine but in the future I would like to see
> > these kinds of things done in Python.
>
> Indeed, for example it looks like this script wouldn't like files with spaces
> in the name.
>

I realise it's a bad idea to have source files with spaces in the name, it should just be a choice that these files would be disallowed, rather than it being because the whitespace script would break.

[Michał Sawicz (saviq)]

I'm all for having that test - better fix whitespaces sooner rather than later.

I agree that the script seems fragile... Also, it doesn't seem to check for \t? Why the two spaces in the regex?

Isn't there a ready-made solution for this? I'd also like to check for leading \t, or maybe just mixed \t\s?

review: Needs Fixing

[Michi Henning (michihenning)]

I did the rename of Version.h.cmake to Version.h.in because cmake generates lots of .cmake files. Those files contain lots of trailing space. Version.h.cmake is not a generated file so it should have a different extension.

Right, the script doesn't work with file names containing spaces. Not sure how serious this is.

@Sawicz: What looks like a double space is actually a blank and a tab :-)

I can rewrite this in Python, if you like. Not totally sure whether it's worth it though for something as simple as this?

I don't know of a ready-made tool to do this. If there is one, I'd be happy to look at it.

[Michał Sawicz (saviq)]

Please merge trunk, there's a conflict.

Please use '[[:space:]]$' for the regex, then, and there's three more files with whitespace issues when you merge trunk:

./Components/UbuntuShapeForItem.qml: trailing whitespace
./runtests.sh: trailing whitespace
./plugins/Unity/categories.cpp: trailing whitespace

Components/UbuntuShapeForItem.qml actually has \r\n - should be converted to unix newlines.

review: Needs Fixing

[Michi Henning (michihenning)]

As to trailing whitespace, it seems to be universally frowned upon, hence the test. Personally, I don't feel that strongly about it, but not having trailing whitespace makes it less likely for noise to be introduced into diffs, and it's tidier.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:548
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/335/
Executed test runs:
    None: http://s-jenkins:8080/job/unity-phablet-qmluitests/67/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/336
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/336/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/335
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/211
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/211/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/211
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/746

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/335/rebuild

review: Needs Fixing (continuous-integration)

[Jussi Pakkanen (jpakkane)]

I'm willing to accept this if a comment is added to the top saying:

- all future scripts of this type must be in Python
- if any changes to this script is needed, it must be rewritten in Python

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:548
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/341
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/341/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/340
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/216
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/216/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/218
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/747

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/340/rebuild

review: Needs Fixing (continuous-integration)

[Jussi Pakkanen (jpakkane)]

Yes indeed.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:551
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/408/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/151/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/409/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/408/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/284/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/288

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/408/rebuild

review: Needs Fixing (continuous-integration)

[Michi Henning (michihenning)]

Bloody hell, why is it that jenkins compiles stuff that doesn't even exist in my tree? (Rhetorical question...)

And why do those source files get dropped into the source tree? The tests run the whitespace checker on ${CMAKE_SOURCE_DIR}, so how dome there is suddenly a new file there?

I'm looking for suggestions for how to fix the whitespace checking to avoid the problem...

[Michał Sawicz (saviq)]

/tmp/buildd/qml-phone-shell-1.69/ is ${CMAKE_SOURCE_DIR}, I think we might need to explicitly list the dirs / files we're interested in.

[Michi Henning (michihenning)]

> /tmp/buildd/qml-phone-shell-1.69/ is ${CMAKE_SOURCE_DIR}, I think we might
> need to explicitly list the dirs / files we're interested in.

What I don't get is where the extra source file comes from, and why it has trailing whitespace.

I mean, if I run a test in my local tree and it passes, why wouldn't the same test pass when run by Jenkins?

[Michał Sawicz (saviq)]

The file is generated by cmake when it tries to figure out the compilers and stuff. Why does it end up with a trailing whitespace I couldn't say :)

[Pete Woods (pete-woods)]

> I mean, if I run a test in my local tree and it passes, why wouldn't the same
> test pass when run by Jenkins?

Is Jenkins using a subdirectory for the binary directory and you a directory to the side, perhaps? That would be an explanation for why Jenkins would descend into the binary dir by recursive search from the source dir and you not..
</complete guess not having looked in any detail>

[Michi Henning (michihenning)]

Pete is right, the file is generated into the build dir. I'm not getting the failure locally because the version for raring i386 doesn't have trailing whitespace.

OK, seems like I'll have to add an option to the script to ignore the build dir.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:553
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/428/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/189/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/429/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/428/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/304
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/304/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/308

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/428/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:554
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/429/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-phablet-qmluitests/190/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/430/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/429/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/305
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/305/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/309

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/429/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:555
http://jenkins.qa.ubuntu.com/job/unity-phablet-ci/430/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/unity-phablet-qmluitests/191
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/431
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-armhf-ci/431/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-quantal-i386-ci/430
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/306
        deb: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-armhf-ci/306/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-raring-i386-ci/310
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/893

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-phablet-ci/430/rebuild

review: Approve (continuous-integration)

=== modified file 'Bottombar/Bottombar.qml'
--- Bottombar/Bottombar.qml	2013-04-09 12:30:58 +0000
+++ Bottombar/Bottombar.qml	2013-04-11 01:54:24 +0000
@@ -116,7 +116,7 @@
         onOpenReleased: {
             if (hudButton.opacity != 0 && hudButton.mouseOver) {
                 hudButtonShowable.hide()
-                if (shell.applicationManager.sideStageFocusedApplication && 
+                if (shell.applicationManager.sideStageFocusedApplication &&
                   ((hudButtonRevealer.pressedX > bottombar.width - bottombar.sideStageWidth) || !shell.applicationManager.mainStageFocusedApplication))
                 {
                     theHud.showSideStage()

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-10 02:41:39 +0000
+++ CMakeLists.txt	2013-04-11 01:54:24 +0000
@@ -7,6 +7,10 @@
 
 project(qml-phone-shell C CXX)
 
+if(${PROJECT_BINARY_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+   message(FATAL_ERROR "In-tree build attempt detected, aborting. Set your build dir outside your source dir, delete CMakeCache.txt from source root and try again.")
+endif()
+
 set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
 # Instruct CMake to run moc automatically when needed.

=== modified file 'Components/ListItems/Header.qml'
--- Components/ListItems/Header.qml	2013-01-15 11:37:07 +0000
+++ Components/ListItems/Header.qml	2013-04-11 01:54:24 +0000
@@ -27,7 +27,7 @@
 
     /* When this header is used in a ListViewWithPageHeader with CurrentLabelAtStart mode, to stop
        the list's delegates contents being visible through this header, they clip themselves
-       depending on their position. However to allow delegates underlap the bottom X pixels of this 
+       depending on their position. However to allow delegates underlap the bottom X pixels of this
        header (so delegate appears through ThinDivider say) we set an offset property here. */
     readonly property int bottomBorderAllowedOverlap: bottomBorder.allowedBottomOverlap
 

=== modified file 'Components/Revealer.qml'
--- Components/Revealer.qml	2013-03-19 12:07:14 +0000
+++ Components/Revealer.qml	2013-04-11 01:54:24 +0000
@@ -70,7 +70,7 @@
                 value -= hintDisplacement
             }
         }
-        
+
         return value
     }
     property var draggingArea: leftDraggingArea.enabled ? leftDraggingArea : rightDraggingArea
@@ -160,7 +160,7 @@
         id: leftDraggingArea
 
         property bool isOpeningArea: revealer.direction == Qt.LeftToRight
-        
+
         height: orientation == Qt.Vertical ? handleSize : parent.height
         width: orientation == Qt.Horizontal ? handleSize : parent.width
         orientation: revealer.orientation
@@ -201,7 +201,7 @@
         id: rightDraggingArea
 
         property bool isOpeningArea: revealer.direction == Qt.RightToLeft
-        
+
         x: orientation == Qt.Vertical ? 0 : parent.width - width
         y: orientation == Qt.Vertical ? parent.height - height : 0
         height: orientation == Qt.Vertical ? handleSize : parent.height

=== modified file 'Components/UbuntuShapeForItem.qml'
--- Components/UbuntuShapeForItem.qml	2013-02-07 12:18:24 +0000
+++ Components/UbuntuShapeForItem.qml	2013-04-11 01:54:24 +0000
@@ -1,89 +1,89 @@
-/*
- * Copyright (C) 2012 Canonical, Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-import QtQuick 2.0
-import Ubuntu.Components 0.1 as Theming
-
-/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
- * general (Item-based) components. This ability should be incorporated into the SDK's
- * UbuntuShape so this file can be removed.
- * Bug: https://bugs.launchpad.net/tavastia/+bug/1089595
- */
-
-Item {
-    id: shape
-
-    Theming.ItemStyle.class: "UbuntuShape-radius-" + radius
-
-    property string radius: "small"
-    property url maskSource: Theming.ComponentUtils.style(shape, "maskSource", "")
-    property url borderSource: Theming.ComponentUtils.style(shape, "borderIdle", "")
-    property Item image
-
-    implicitWidth: units.gu(8)
-    implicitHeight: units.gu(8)
-
-    onWidthChanged: __updateImageDimensions()
-    onHeightChanged: __updateImageDimensions()
-    onImageChanged: __updateImageDimensions()
-
-    function __updateImageDimensions() {
-        if (!image) return;
-        image.width = shape.width;
-        image.height = shape.height;
-        image.visible = false;
-    }
-
-    ShaderEffect {
-        anchors.fill: parent
-        visible: shape.image
-
-        property ShaderEffectSource mask: ShaderEffectSource {
-            sourceItem: BorderImage {
-                width: shape.width
-                height: shape.height
-                source: shape.maskSource
-                visible: false
-            }
-        }
-
-        property ShaderEffectSource image: ShaderEffectSource {
-            sourceItem: shape.image
-        }
-
-        fragmentShader:
-            "
-            varying highp vec2 qt_TexCoord0;
-            uniform lowp float qt_Opacity;
-            uniform sampler2D mask;
-            uniform sampler2D image;
-
-            void main(void)
-            {
-                lowp vec4 maskColor = texture2D(mask, qt_TexCoord0.st);
-                lowp vec4 imageColor = texture2D(image, qt_TexCoord0.st);
-                gl_FragColor = imageColor * maskColor.a * qt_Opacity;
-            }
-            "
-    }
-
-    BorderImage {
-        id: border
-
-        anchors.fill: parent
-        source: shape.borderSource
-    }
-}
+/*
+ * Copyright (C) 2012 Canonical, Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1 as Theming
+
+/* FIXME: This component is duplicating the UbuntuShape from the SDK, but shapes more
+ * general (Item-based) components. This ability should be incorporated into the SDK's
+ * UbuntuShape so this file can be removed.
+ * Bug: https://bugs.launchpad.net/tavastia/+bug/1089595
+ */
+
+Item {
+    id: shape
+
+    Theming.ItemStyle.class: "UbuntuShape-radius-" + radius
+
+    property string radius: "small"
+    property url maskSource: Theming.ComponentUtils.style(shape, "maskSource", "")
+    property url borderSource: Theming.ComponentUtils.style(shape, "borderIdle", "")
+    property Item image
+
+    implicitWidth: units.gu(8)
+    implicitHeight: units.gu(8)
+
+    onWidthChanged: __updateImageDimensions()
+    onHeightChanged: __updateImageDimensions()
+    onImageChanged: __updateImageDimensions()
+
+    function __updateImageDimensions() {
+        if (!image) return;
+        image.width = shape.width;
+        image.height = shape.height;
+        image.visible = false;
+    }
+
+    ShaderEffect {
+        anchors.fill: parent
+        visible: shape.image
+
+        property ShaderEffectSource mask: ShaderEffectSource {
+            sourceItem: BorderImage {
+                width: shape.width
+                height: shape.height
+                source: shape.maskSource
+                visible: false
+            }
+        }
+
+        property ShaderEffectSource image: ShaderEffectSource {
+            sourceItem: shape.image
+        }
+
+        fragmentShader:
+            "
+            varying highp vec2 qt_TexCoord0;
+            uniform lowp float qt_Opacity;
+            uniform sampler2D mask;
+            uniform sampler2D image;
+
+            void main(void)
+            {
+                lowp vec4 maskColor = texture2D(mask, qt_TexCoord0.st);
+                lowp vec4 imageColor = texture2D(image, qt_TexCoord0.st);
+                gl_FragColor = imageColor * maskColor.a * qt_Opacity;
+            }
+            "
+    }
+
+    BorderImage {
+        id: border
+
+        anchors.fill: parent
+        source: shape.borderSource
+    }
+}

=== modified file 'Greeter/Greeter.qml'
--- Greeter/Greeter.qml	2013-03-26 18:39:27 +0000
+++ Greeter/Greeter.qml	2013-04-11 01:54:24 +0000
@@ -29,10 +29,10 @@
 
     readonly property bool narrowMode: width <= units.gu(60)
     readonly property bool multiUser: !narrowMode // TODO: populate with real value
-    
+
     signal selected(int uid)
     signal unlocked(int uid)
-    
+
     ListModel {
         id: userList
         objectName: "userList"
@@ -79,7 +79,7 @@
         property bool guestAccount: item ? item.guestAccount : false
 
         source: required ? "GreeterContent.qml" : ""
-        
+
 
         Connections {
             target: greeterContentLoader.item

=== modified file 'Greeter/GreeterContent.qml'
--- Greeter/GreeterContent.qml	2013-03-19 11:59:54 +0000
+++ Greeter/GreeterContent.qml	2013-04-11 01:54:24 +0000
@@ -24,7 +24,7 @@
 
     property bool guestAccount: loginLoader.status == Loader.Ready && loginLoader.item.guestAccount
     property bool ready: wallpaper.status == Image.Ready
-    
+
     signal selected(int uid)
     signal unlocked(int uid)
 

=== modified file 'Greeter/LoginList.qml'
--- Greeter/LoginList.qml	2013-03-19 17:18:48 +0000
+++ Greeter/LoginList.qml	2013-04-11 01:54:24 +0000
@@ -180,7 +180,7 @@
             }
         }
 
-        // This is needed because PathView.moving is not true if the PathView 
+        // This is needed because PathView.moving is not true if the PathView
         // moves because of an internal event (e.g. currentIndex has changed)
         Timer {
             id: moveTimer

=== modified file 'Hud/AppStack.qml'
--- Hud/AppStack.qml	2013-03-19 12:52:03 +0000
+++ Hud/AppStack.qml	2013-04-11 01:54:24 +0000
@@ -45,7 +45,7 @@
     Connections {
         target: model
         // Accumulate count changes since hud clears
-        // and then readds items to the models which means 
+        // and then readds items to the models which means
         // even if the result is the same we get lots of count changes
         onCountChanged: mergeModelsTimer.restart()
     }

=== modified file 'Hud/ResultList.qml'
--- Hud/ResultList.qml	2013-03-19 12:52:03 +0000
+++ Hud/ResultList.qml	2013-04-11 01:54:24 +0000
@@ -32,7 +32,7 @@
     Connections {
         target: model
         // Accumulate count changes since hud clears
-        // and then readds items to the models which means 
+        // and then readds items to the models which means
         // even if the result is the same we get lots of count changes
         onCountChanged: updateModelTimer.restart()
     }

=== modified file 'Panel/Indicators.qml'
--- Panel/Indicators.qml	2013-04-10 09:45:49 +0000
+++ Panel/Indicators.qml	2013-04-11 01:54:24 +0000
@@ -248,7 +248,7 @@
             if (showAnimation.running) {
                 if (indicators.state == "initial") {
                     openOverview()
-                } 
+                }
                 indicators.state = "commit"
             }
         }

=== modified file 'Shell.qml'
--- Shell.qml	2013-03-26 13:45:29 +0000
+++ Shell.qml	2013-04-11 01:54:24 +0000
@@ -389,7 +389,7 @@
         height: parent.height - panel.panelHeight
 
         onShownChanged: if (shown) greeter.forceActiveFocus()
-        
+
         onUnlocked: greeter.hide()
         onSelected: shell.background = greeter.model.get(uid).background;
 

=== modified file 'include/unity/api/CMakeLists.txt'
--- include/unity/api/CMakeLists.txt	2013-04-05 03:18:14 +0000
+++ include/unity/api/CMakeLists.txt	2013-04-11 01:54:24 +0000
@@ -21,7 +21,7 @@
 #
 # Generated headers
 #
-configure_file(Version.h.cmake Version.h)
+configure_file(Version.h.in Version.h)
 set(headers ${headers} ${CMAKE_CURRENT_BINARY_DIR}/Version.h)
 
 install(FILES ${headers} DESTINATION ${HDR_INSTALL_DIR}/unity/api)

=== renamed file 'include/unity/api/Version.h.cmake' => 'include/unity/api/Version.h.in'
--- include/unity/api/Version.h.cmake	2013-04-10 02:41:39 +0000
+++ include/unity/api/Version.h.in	2013-04-11 01:54:24 +0000
@@ -20,11 +20,11 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
+#include <unity/config.h>
+
 #ifndef UNITY_API_VERSION_H
 #define UNITY_API_VERSION_H
 
-#include <unity/config.h>
-
 #define UNITY_API_VERSION_MAJOR @UNITY_API_MAJOR@
 #define UNITY_API_VERSION_MINOR @UNITY_API_MINOR@
 #define UNITY_API_VERSION_MICRO @UNITY_API_MICRO@

=== modified file 'plugins/Unity/bottombarvisibilitycommunicatorshell.h'
--- plugins/Unity/bottombarvisibilitycommunicatorshell.h	2013-02-11 18:11:16 +0000
+++ plugins/Unity/bottombarvisibilitycommunicatorshell.h	2013-04-11 01:54:24 +0000
@@ -22,7 +22,7 @@
 class QDBusInterface;
 
 /** This is an internal class used to talk with the bottom bar used by either
-  * applications or the SDK. 
+  * applications or the SDK.
   * There is a method to force the bottom bar to be hidden or otherwise behave as usual
   */
 

=== modified file 'plugins/Unity/categories.cpp'
--- plugins/Unity/categories.cpp	2013-04-10 08:11:52 +0000
+++ plugins/Unity/categories.cpp	2013-04-11 01:54:24 +0000
@@ -125,7 +125,7 @@
     QVector<int> roles;
     roles.append(Categories::RoleCount);
     Q_FOREACH(CategoryFilter* filter, m_timerFilters) {
-        QModelIndex changedIndex = index(filter->index());		
+        QModelIndex changedIndex = index(filter->index());
         Q_EMIT dataChanged(changedIndex, changedIndex, roles);
     }
     m_timerFilters.clear();

=== modified file 'plugins/Unity/lens.cpp'
--- plugins/Unity/lens.cpp	2013-04-10 08:11:52 +0000
+++ plugins/Unity/lens.cpp	2013-04-11 01:54:24 +0000
@@ -123,7 +123,7 @@
 {
     return m_globalSearchQuery;
 }
-    
+
 QString Lens::noResultsHint() const
 {
     return m_noResultsHint;
@@ -161,7 +161,7 @@
         Q_EMIT globalSearchQueryChanged();
     }
 }
-    
+
 void Lens::setNoResultsHint(const QString& hint) {
     if (hint != m_noResultsHint) {
         m_noResultsHint = hint;
@@ -320,7 +320,7 @@
 {
     Q_EMIT viewTypeChanged( (Lens::ViewType) viewType);
 }
-    
+
 void Lens::onSearchFinished(unity::dash::Lens::Hints const &hints)
 {
     QString hint;

=== modified file 'plugins/Utils/tests/CMakeLists.txt'
--- plugins/Utils/tests/CMakeLists.txt	2013-04-05 14:00:32 +0000
+++ plugins/Utils/tests/CMakeLists.txt	2013-04-11 01:54:24 +0000
@@ -7,7 +7,7 @@
 macro(run_tests)
     set(_test_list "")
     foreach(_test ${ARGN})
-        add_test(NAME ${_test} 
+        add_test(NAME ${_test}
             COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${_test}
               -o ${CMAKE_BINARY_DIR}/${_test}.xml,xunitxml
               -o -,txt

=== modified file 'runtests.sh'
--- runtests.sh	2013-04-08 10:06:50 +0000
+++ runtests.sh	2013-04-11 01:54:24 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 
 # This is a very quick and dirty attempt to figure some metrics for our tests
 # It monitors all qml files with inotifywatch and generates a cobertura
@@ -131,4 +131,3 @@
 echo "    </package>"  >> $coveragefile
 echo "  </packages>" >> $coveragefile
 echo "</coverage>" >> $coveragefile
-

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-04-10 00:02:36 +0000
+++ tests/CMakeLists.txt	2013-04-11 01:54:24 +0000
@@ -71,3 +71,4 @@
 add_subdirectory(gtest)
 add_subdirectory(unittests)
 add_subdirectory(qmluitests)
+add_subdirectory(whitespace)

=== modified file 'tests/autopilot/qml_phone_shell/tests/helpers.py'
--- tests/autopilot/qml_phone_shell/tests/helpers.py	2013-03-22 11:47:00 +0000
+++ tests/autopilot/qml_phone_shell/tests/helpers.py	2013-04-11 01:54:24 +0000
@@ -75,7 +75,7 @@
         bottombar = self.main_window.get_bottombar()
 
         # if we have huge amounts of pixels (e.g. Nexus10), but slow video (e.g. VM) it might take a little
-        # until the dash is fully rendered after sliding away the greeter/lockscreen and the click might 
+        # until the dash is fully rendered after sliding away the greeter/lockscreen and the click might
         # go to the void for the first time because there's no real way to know what the display has
         # painted already. Give it another (max retries) chance.
         try:
@@ -86,7 +86,7 @@
                 self.open_first_dash_home_app(retries-1)
             else:
                 logger.warning("Failed to launch app. Giving up. Tests may fail...")
-                
+
 
     def show_hud(self, retries=2):
         self.open_first_dash_home_app()

=== modified file 'tests/autopilot/qml_phone_shell/tests/testcases.py'
--- tests/autopilot/qml_phone_shell/tests/testcases.py	2013-03-13 18:29:47 +0000
+++ tests/autopilot/qml_phone_shell/tests/testcases.py	2013-04-11 01:54:24 +0000
@@ -9,10 +9,10 @@
 # This file contains general purpose test cases for Unity.
 # Each test written in this file will be executed for a variety of
 # configurations, such as Phone, Tablet or Desktop form factors.
-# 
+#
 # Sometimes there is the need to disable a certain test for a particular
 # configuration. To do so, add this in a new line directly below your test:
-# 
+#
 #    test_testname.blacklist = (FormFactors.Tablet, FormFactors.Desktop,)
 #
 # Available form factors are:

=== modified file 'tests/qmluitests/UnityTestCase.qml'
--- tests/qmluitests/UnityTestCase.qml	2013-03-28 11:03:01 +0000
+++ tests/qmluitests/UnityTestCase.qml	2013-04-11 01:54:24 +0000
@@ -27,7 +27,7 @@
     }
 
     // Flickable won't recognise a single mouse move as dragging the flickable.
-    // Use 5 steps because it's what 
+    // Use 5 steps because it's what
     // Qt uses in QQuickViewTestUtil::flick
     // speed is in pixels/second
     function mouseFlick(item, x, y, toX, toY, pressMouse, releaseMouse,

=== modified file 'tests/unittests/SideStage/tst_SideStage.qml'
--- tests/unittests/SideStage/tst_SideStage.qml	2013-04-10 07:44:42 +0000
+++ tests/unittests/SideStage/tst_SideStage.qml	2013-04-11 01:54:24 +0000
@@ -31,17 +31,17 @@
         handleSizeCollapsed: units.gu(2)
         handleSizeExpanded: units.gu(5)
     }
-    
+
     function test_handle_data() {
         return [
             {tag: "expanded", expanded: true},
             {tag: "collapsed", expanded: false}
         ]
     }
-    
+
     function test_handle(data) {
         sideStage.handleExpanded = data.expanded
-        
+
         if (data.expanded) {
             tryCompare(findChild(sideStage, "sideStageHandle"), "width", sideStage.handleSizeExpanded);
         } else {

=== added directory 'tests/whitespace'
=== added file 'tests/whitespace/CMakeLists.txt'
--- tests/whitespace/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/whitespace/CMakeLists.txt	2013-04-11 01:54:24 +0000
@@ -0,0 +1,23 @@
+#
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+#
+
+#
+# Test that all source files, cmakefiles, etc. do not contain trailing whitespace.
+#
+
+add_test(whitespace ${CMAKE_CURRENT_SOURCE_DIR}/check_whitespace.py ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})

=== added file 'tests/whitespace/check_whitespace.py'
--- tests/whitespace/check_whitespace.py	1970-01-01 00:00:00 +0000
+++ tests/whitespace/check_whitespace.py	2013-04-11 01:54:24 +0000
@@ -0,0 +1,104 @@
+#! /usr/bin/env python
+
+#
+# Copyright (C) 2013 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Authored by: Michi Henning <[e-mail]>
+#
+
+#
+# Little helper program to test that source files do not contain trailing whitespace.
+#
+# Usage: check_whitespace.py directory [ignore_prefix]
+#
+# The directory specifies the (recursive) location of the source files. Any files with a path that starts
+# with ignore_prefix are not checked. This is useful to exclude files that are generated into the build directory.
+#
+# See the file_pat definition below for a list of files that are checked.
+#
+
+import argparse
+import os
+import re
+import sys
+
+progname = sys.argv[0]
+
+# Print msg on stderr, preceded by program name and followed by newline
+
+def error(msg):
+    print >> sys.stderr, progname + ": " + msg + "\n"
+
+# Function to raise errors encountered by os.walk
+
+def raise_error(e):
+    raise e
+
+# Scan lines in file_path for trailing whitespace. For each file, print the line number of the first occurrence,
+# and the total number of occurrences if more than one.
+
+whitespace_pat = re.compile(r'.*[ \t]$')
+
+def scan_for_trailing_whitespace(file_path):
+    with open(file_path, 'rt') as file:
+        line_num = 0
+        num_errors = 0
+        for line in file:
+            line_num += 1
+            if whitespace_pat.match(line):
+                if num_errors == 0:
+                    print file_path + ":" + str(line_num) + ": trailing whitespace",
+                num_errors += 1
+        if num_errors > 1:
+            print "(" + str(num_errors) + " lines with trailing whitespace in total)",
+        if num_errors != 0:
+            print
+    return num_errors != 0
+
+# Parse args
+
+parser = argparse.ArgumentParser(description = 'Test that source files do not contain trailing whitespace.')
+parser.add_argument('dir', nargs = 1, help = 'The directory to (recursively) search for source files')
+parser.add_argument('ignore_prefix', nargs = '?', default="",
+                    help = 'Ignore source files with a path that starts with the given prefix.')
+args = parser.parse_args()
+progname = parser.prog
+
+# Files we want to check for trailing whitespace.
+
+file_pat = r'(.*\.(c|cpp|h|in|install|js|py|qml|sh)$)|(.*CMakeLists\.txt$)'
+pat = re.compile(file_pat)
+
+# Find all the files with matching file extension in the specified directory and check them for trailing whitespace.
+
+dir = args.dir[0]
+ignore = args.ignore_prefix
+
+found_whitespace = False
+try:
+    for root, dirs, files in os.walk(dir, onerror = raise_error):
+        for file in files:
+            path = os.path.join(root, file)
+            if not path.startswith(ignore) and pat.match(file):
+                if scan_for_trailing_whitespace(path):
+                    found_whitespace = True
+except OSError as e:
+    error("cannot create file list for \"" + dir + "\": " + e.strerror)
+    sys.exit(1)
+
+if found_whitespace:
+    sys.exit(1)
+
+sys.exit(0)