git.iko.soy/unity8
on xenial help sign in
Fix compile warnings in mocks

Approved by: Daniel d'Andrada, Unity8 CI Bot

commit9515b33539d4a86858dbd32c4711900db5782e3a authorAlbert Astals Cid <albert.astals@canonical.com> dateWed 7 Dec 2016, 13:45 (10 years ago) parentae18a52d242233
2 files changed+24−24
compare with xenial
unifiedsplit
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1 tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp+23−23
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1
@@ -22,6 +22,7 @@ namespace QLightDM
2222
2323SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
2424 : testScenario("singleSession")
25+ , q_ptr(parent)
2526 , m_availableSessions(
2627 {
2728 {"ubuntu", "", "Ubuntu", ""},
@@ -36,7 +37,6 @@ SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
3637 {"xterm", "", "Recovery Console", ""},
3738 {"", "", "Unknown?", ""}
3839 })
39− , q_ptr(parent)
4040{
4141 numSessions = numAvailableSessions();
4242 resetEntries();
tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp+23−23
@@ -73,7 +73,7 @@ void UsersModelPrivate::resetEntries_single()
7373{
7474 entries =
7575 {
76− { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
76+ { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
7777 };
7878}
7979
@@ -81,7 +81,7 @@ void UsersModelPrivate::resetEntries_singlePassphrase()
8181{
8282 entries =
8383 {
84− { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
84+ { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
8585 };
8686}
8787
@@ -89,7 +89,7 @@ void UsersModelPrivate::resetEntries_singlePin()
8989{
9090 entries =
9191 {
92− { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
92+ { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0, 0 },
9393 };
9494}
9595
@@ -97,27 +97,27 @@ void UsersModelPrivate::resetEntries_full()
9797{
9898 entries =
9999 {
100− { "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0 },
101− { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
102− { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
103− { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0 },
104− { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0 },
105− { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0 },
106− { "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0 },
107− { "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0 },
108− { "long-info-prompt", "Long Info Prompt", 0, 0, false, false, "ubuntu", 0 },
109− { "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0 },
110− { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0 },
111− { "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 },
112− { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0 },
100+ { "has-password", "Has Password", 0, 0, false, false, "ubuntu", 0, 0 },
101+ { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0, 0 },
102+ { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
103+ { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0, 0 },
104+ { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0, 0 },
105+ { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0, 0 },
106+ { "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
107+ { "html-info-prompt", "HTML Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
108+ { "long-info-prompt", "Long Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
109+ { "wide-info-prompt", "Wide Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
110+ { "multi-info-prompt", "Multi Info Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
111+ { "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 },
112+ { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0, 0 },
113113 // white and black are a bit redundant, but useful for manually testing if UI is still readable
114− { "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0 },
115− { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
116− { "no-background", "No Background", "", 0, false, false, "ubuntu", 0 },
117− { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0 },
118− { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0 },
119− { "empty-name", "", 0, 0, false, false, "ubuntu", 0 },
120− { "active", "Active Account", 0, 0, true, false, "ubuntu", 0 },
114+ { "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0, 0 },
115+ { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0, 0 },
116+ { "no-background", "No Background", "", 0, false, false, "ubuntu", 0, 0 },
117+ { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0, 0 },
118+ { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0, 0 },
119+ { "empty-name", "", 0, 0, false, false, "ubuntu", 0, 0 },
120+ { "active", "Active Account", 0, 0, true, false, "ubuntu", 0, 0 },
121121 };
122122}
123123