Merge lp:~aacid/unity8/fixLightdmMockWarnings into lp:unity8

[Albert Astals Cid]

Fix compile warnings in mocks

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A

 * If you changed the UI, has there been a design review?
N/A

[Daniel d'Andrada (dandrader)]

Warnings are gone.

* Did you perform an exploratory manual test run of the code change and any related functionality?
N/A

* Did CI run pass? If not, please explain why.
Not relevant to this MP

review: Approve

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:2705
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2580/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/3395
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=vivid+overlay,testname=qmluitests.sh/1953
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=qmluitests.sh/1953
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/test-0-autopkgtest/label=amd64,release=zesty,testname=qmluitests.sh/1953
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/3423
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3274/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3274
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3274/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/2580/rebuild

review: Approve (continuous-integration)

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-07-13 20:24:24 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp	2016-11-28 10:21:11 +0000
@@ -22,6 +22,7 @@
 
 SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
     : testScenario("singleSession")
+    , q_ptr(parent)
     , m_availableSessions(
         {
             {"ubuntu", "", "Ubuntu", ""},
@@ -36,7 +37,6 @@
             {"xterm", "", "Recovery Console", ""},
             {"", "", "Unknown?", ""}
         })
-    , q_ptr(parent)
 {
     numSessions = numAvailableSessions();
     resetEntries();

=== modified file 'tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp'
--- tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-08-30 13:46:17 +0000
+++ tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp	2016-11-28 10:21:11 +0000
@@ -73,7 +73,7 @@
 {
     entries =
     {
-        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
+        { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
     };
 }
 
@@ -81,7 +81,7 @@
 {
     entries =
     {
-        { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
+        { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
     };
 }
 
@@ -89,7 +89,7 @@
 {
     entries =
     {
-        { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
+        { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0, 0 },
     };
 }
 
@@ -97,27 +97,27 @@
 {
     entries =
     {
-        { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0 },
-        { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0 },
-        { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0 },
-        { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0 },
-        { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0 },
-        { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
-        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0 },
-        { "color-background",  "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
+        { "has-password",      "Has Password", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "has-pin",           "Has PIN",      0, 0, false, false, "ubuntu", 0, 0 },
+        { "different-prompt",  "Different Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "no-password",       "No Password", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "auth-error",        "Auth Error", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "two-factor",        "Two Factor", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "info-prompt",       "Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "html-info-prompt",  "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "long-info-prompt",  "Long Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "wide-info-prompt",  "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "long-name",         "Long name (far far too long to fit, seriously this would never fit on the screen, you will never see this part of the name)", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "color-background",  "Color Background", "#E95420", 0, false, false, "ubuntu", 0, 0 },
         // white and black are a bit redundant, but useful for manually testing if UI is still readable
-        { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
-        { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
-        { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0 },
-        { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0 },
-        { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0 },
-        { "empty-name",        "", 0, 0, false, false, "ubuntu", 0 },
-        { "active",            "Active Account", 0, 0, true, false, "ubuntu", 0 },
+        { "white-background",  "White Background", "#ffffff", 0, false, false, "ubuntu", 0, 0 },
+        { "black-background",  "Black Background", "#000000", 0, false, false, "ubuntu", 0, 0 },
+        { "no-background",     "No Background", "", 0, false, false, "ubuntu", 0, 0 },
+        { "unicode",           "가나다라마", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "no-response",       "No Response", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "empty-name",        "", 0, 0, false, false, "ubuntu", 0, 0 },
+        { "active",            "Active Account", 0, 0, true, false, "ubuntu", 0, 0 },
     };
 }