git.iko.soy/unity8
on xenial help sign in
Fix compile warnings in mocks
9515b33Albert Astals Cid
tests/mocks/LightDM/IntegratedLightDM/liblightdm/SessionsModelPrivate.cpp+1−1
compare with xenial
unifiedsplit
@@ -22,6 +22,7 @@ namespace QLightDM
22
22
23SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
23SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
24 : testScenario("singleSession")
24 : testScenario("singleSession")
25+ , q_ptr(parent)
25 , m_availableSessions(
26 , m_availableSessions(
26 {
27 {
27 {"ubuntu", "", "Ubuntu", ""},
28 {"ubuntu", "", "Ubuntu", ""},
@@ -36,7 +37,6 @@ SessionsModelPrivate::SessionsModelPrivate(SessionsModel* parent)
36 {"xterm", "", "Recovery Console", ""},
37 {"xterm", "", "Recovery Console", ""},
37 {"", "", "Unknown?", ""}
38 {"", "", "Unknown?", ""}
38 })
39 })
39− , q_ptr(parent)
40{
40{
41 numSessions = numAvailableSessions();
41 numSessions = numAvailableSessions();
42 resetEntries();
42 resetEntries();
tests/mocks/LightDM/IntegratedLightDM/liblightdm/UsersModelPrivate.cpp+23−23
@@ -73,7 +73,7 @@ void UsersModelPrivate::resetEntries_single()
73{
73{
74 entries =
74 entries =
75 {
75 {
76− { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
76+ { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
77 };
77 };
78}
78}
79
79
@@ -81,7 +81,7 @@ void UsersModelPrivate::resetEntries_singlePassphrase()
81{
81{
82 entries =
82 entries =
83 {
83 {
84− { "single", "Single User", 0, 0, false, false, "ubuntu", 0 },
84+ { "single", "Single User", 0, 0, false, false, "ubuntu", 0, 0 },
85 };
85 };
86}
86}
87
87
@@ -89,7 +89,7 @@ void UsersModelPrivate::resetEntries_singlePin()
89{
89{
90 entries =
90 entries =
91 {
91 {
92− { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0 },
92+ { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0, 0 },
93 };
93 };
94}
94}
95
95
@@ -97,27 +97,27 @@ void UsersModelPrivate::resetEntries_full()
97{
97{
98 entries =
98 entries =
99 {
99 {
100− { "has-password", "Has Password", 0, 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 },
101+ { "has-pin", "Has PIN", 0, 0, false, false, "ubuntu", 0, 0 },
102− { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0 },
102+ { "different-prompt", "Different Prompt", 0, 0, false, false, "ubuntu", 0, 0 },
103− { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0 },
103+ { "no-password", "No Password", 0, 0, false, false, "ubuntu", 0, 0 },
104− { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0 },
104+ { "auth-error", "Auth Error", 0, 0, false, false, "ubuntu", 0, 0 },
105− { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0 },
105+ { "two-factor", "Two Factor", 0, 0, false, false, "ubuntu", 0, 0 },
106− { "info-prompt", "Info Prompt", 0, 0, false, false, "ubuntu", 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 },
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 },
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 },
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 },
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 },
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 },
112+ { "color-background", "Color Background", "#E95420", 0, false, false, "ubuntu", 0, 0 },
113 // white and black are a bit redundant, but useful for manually testing if UI is still readable
113 // 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 },
114+ { "white-background", "White Background", "#ffffff", 0, false, false, "ubuntu", 0, 0 },
115− { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0 },
115+ { "black-background", "Black Background", "#000000", 0, false, false, "ubuntu", 0, 0 },
116− { "no-background", "No Background", "", 0, false, false, "ubuntu", 0 },
116+ { "no-background", "No Background", "", 0, false, false, "ubuntu", 0, 0 },
117− { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0 },
117+ { "unicode", "가나다라마", 0, 0, false, false, "ubuntu", 0, 0 },
118− { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0 },
118+ { "no-response", "No Response", 0, 0, false, false, "ubuntu", 0, 0 },
119− { "empty-name", "", 0, 0, false, false, "ubuntu", 0 },
119+ { "empty-name", "", 0, 0, false, false, "ubuntu", 0, 0 },
120− { "active", "Active Account", 0, 0, true, false, "ubuntu", 0 },
120+ { "active", "Active Account", 0, 0, true, false, "ubuntu", 0, 0 },
121 };
121 };
122}
122}
123
123