on xenial help sign in
Address review nits
commitae2f1e40daa73801f76e8914f8920dc6fc166b92 authorMichael Terry <michael.terry@canonical.com> dateMon 24 Nov 2014, 12:56 (12 years ago) parentacaab88
4 files changed+9−16
plugins/Wizard/plugin.h−2 qml/Wizard/Pages.qml+6−9 qml/Wizard/Wizard.qml+2−4 tests/mocks/AccountsService/AccountsService.cpp+1−1
plugins/Wizard/plugin.h−2
@@ -12,8 +12,6 @@
1212 *
1313 * You should have received a copy of the GNU General Public License
1414 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>
1715 */
1816
1917#ifndef WIZARD_PLUGIN_H
qml/Wizard/Pages.qml+6−9
@@ -21,17 +21,14 @@ import Wizard 0.1
2121import "../Components"
2222
2323Item {
24+ id: root
25+ focus: true
26+
2427 // The background wallpaper to use
2528 property string background
2629
2730 signal quit()
2831
29− ////
30−
31− id: root
32− focus: true
33− anchors.fill: parent
34−
3532 // These should be set by a security page and we apply the settings when
3633 // the user exits the wizard.
3734 property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode
@@ -106,10 +103,10 @@ Item {
106103
107104 // Check for immediate skip or not. We may have to wait for
108105 // skipValid to be assigned (see Connections object below)
109− _checkSkip()
106+ checkSkip()
110107 }
111108
112− function _checkSkip() {
109+ function checkSkip() {
113110 if (!currentPage) { // may have had a parse error
114111 next()
115112 } else if (currentPage.skipValid) {
@@ -124,7 +121,7 @@ Item {
124121
125122 Connections {
126123 target: pageStack.currentPage
127− onSkipValidChanged: pageStack._checkSkip()
124+ onSkipValidChanged: pageStack.checkSkip()
128125 }
129126
130127 Component.onCompleted: next()
qml/Wizard/Wizard.qml+2−4
@@ -20,15 +20,13 @@ import Wizard 0.1
2020import "../Components"
2121
2222Showable {
23+ id: root
24+
2325 // The background wallpaper to use
2426 property string background
2527
2628 readonly property alias active: loader.active
2729
28− ////
29−
30− id: root
31−
3230 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }
3331
3432 onRequiredChanged: {
tests/mocks/AccountsService/AccountsService.cpp+1−1
@@ -29,7 +29,7 @@ AccountsService::AccountsService(QObject* parent)
2929 m_failedLogins(0),
3030 m_demoEdges(false),
3131 m_hereEnabled(false),
32− m_hereLicensePath()
32+ m_hereLicensePath("")
3333{
3434}
3535