8219b02 · 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+7−10

@@ -21,18 +21,15 @@ import Wizard 0.1

21import "../Components"

22

23Item {

24+ id: root

25+ objectName: "wizardPages"

26+ focus: true

27+

24 // The background wallpaper to use

28 // The background wallpaper to use

25 property string background

29 property string background

26

30

27 signal quit()

31 signal quit()

28

32

29− ////

30−

31− id: root

32− objectName: "wizardPages"

33− focus: true

34− anchors.fill: parent

35−

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

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

37 // the user exits the wizard.

34 // the user exits the wizard.

38 property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode

35 property int passwordMethod: UbuntuSecurityPrivacyPanel.Passcode

@@ -113,10 +110,10 @@ Item {

113

110

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

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

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

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

116− _checkSkip()

113+ checkSkip()

117 }

114 }

118

115

119− function _checkSkip() {

116+ function checkSkip() {

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

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

121 next()

118 next()

122 } else if (currentPage.skipValid) {

119 } else if (currentPage.skipValid) {

@@ -131,7 +128,7 @@ Item {

131

128

132 Connections {

129 Connections {

133 target: pageStack.currentPage

130 target: pageStack.currentPage

134− onSkipValidChanged: pageStack._checkSkip()

131+ onSkipValidChanged: pageStack.checkSkip()

135 }

132 }

136

133

137 Component.onCompleted: next()

134 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