ae2f1e4 · unity8 · git.iko.soy

plugins/Wizard/plugin.h−2

compare with xenial

unifiedsplit

@@ -12,8 +12,6 @@

12 *

13 * You should have received a copy of the GNU General Public License

14 * along with this program. If not, see <http://www.gnu.org/licenses/>.

15− *

16− * Author: Renato Araujo Oliveira Filho <renato.filho@canonical.com>

17 */

15 */

18

16

19#ifndef WIZARD_PLUGIN_H

17#ifndef WIZARD_PLUGIN_H

qml/Wizard/Pages.qml+6−9

@@ -21,17 +21,14 @@ import Wizard 0.1

21import "../Components"

22

23Item {

24+ id: root

25+ focus: true

26+

24 // The background wallpaper to use

27 // The background wallpaper to use

25 property string background

28 property string background

26

29

27 signal quit()

30 signal quit()

28

31

29− ////

30−

31− id: root

32− focus: true

33− anchors.fill: parent

34−

35 // These should be set by a security page and we apply the settings when

32 // These should be set by a security page and we apply the settings when

36 // the user exits the wizard.

33 // the user exits the wizard.

37 property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode

34 property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode

@@ -106,10 +103,10 @@ Item {

106

103

107 // Check for immediate skip or not. We may have to wait for

104 // Check for immediate skip or not. We may have to wait for

108 // skipValid to be assigned (see Connections object below)

105 // skipValid to be assigned (see Connections object below)

109− _checkSkip()

106+ checkSkip()

110 }

107 }

111

108

112− function _checkSkip() {

109+ function checkSkip() {

113 if (!currentPage) { // may have had a parse error

110 if (!currentPage) { // may have had a parse error

114 next()

111 next()

115 } else if (currentPage.skipValid) {

112 } else if (currentPage.skipValid) {

@@ -124,7 +121,7 @@ Item {

124

121

125 Connections {

122 Connections {

126 target: pageStack.currentPage

123 target: pageStack.currentPage

127− onSkipValidChanged: pageStack._checkSkip()

124+ onSkipValidChanged: pageStack.checkSkip()

128 }

125 }

129

126

130 Component.onCompleted: next()

127 Component.onCompleted: next()

qml/Wizard/Wizard.qml+2−4

@@ -20,15 +20,13 @@ import Wizard 0.1

20import "../Components"

21

22Showable {

23+ id: root

24+

23 // The background wallpaper to use

25 // The background wallpaper to use

24 property string background

26 property string background

25

27

26 readonly property alias active: loader.active

28 readonly property alias active: loader.active

27

29

28− ////

29−

30− id: root

31−

32 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }

30 hideAnimation: StandardAnimation { property: "opacity"; to: 0 }

33

31

34 onRequiredChanged: {

32 onRequiredChanged: {

tests/mocks/AccountsService/AccountsService.cpp+1−1

@@ -29,7 +29,7 @@ AccountsService::AccountsService(QObject* parent)

29 m_failedLogins(0),

30 m_demoEdges(false),

31 m_hereEnabled(false),

32− m_hereLicensePath()

32+ m_hereLicensePath("")

33{

34}

35