1c41bbd · unity8 · git.iko.soy

plugins/LightDM/Greeter.cpp−6

compare with xenial

unifiedsplit

@@ -77,12 +77,6 @@ QString Greeter::defaultSessionHint() const

77 return d->m_greeter->defaultSessionHint();

78}

79

80−bool Greeter::lockHint() const

81−{

82− Q_D(const Greeter);

83− return d->m_greeter->lockHint();

84−}

85−

86bool Greeter::promptless() const

80bool Greeter::promptless() const

87{

81{

88 Q_D(const Greeter);

82 Q_D(const Greeter);

plugins/LightDM/Greeter.h−2

@@ -37,7 +37,6 @@ class Greeter : public QObject

37 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)

38 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)

39 Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)

40− Q_PROPERTY(bool lockscreen READ lockHint CONSTANT)

41 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

40 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)

42 Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

41 Q_PROPERTY(QString selectUser READ selectUser CONSTANT)

43

42

@@ -48,7 +47,6 @@ public:

48 bool isAuthenticated() const;

47 bool isAuthenticated() const;

49 QString authenticationUser() const;

48 QString authenticationUser() const;

50 QString defaultSessionHint() const;

49 QString defaultSessionHint() const;

51− bool lockHint() const;

52 bool promptless() const;

50 bool promptless() const;

53 QString selectUser() const;

51 QString selectUser() const;

54

52

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5

@@ -78,11 +78,6 @@ bool Greeter::showRemoteLoginHint() const

78 return true;

79}

80

81−bool Greeter::lockHint () const

82−{

83− return true;

84−}

85−

86QString Greeter::selectUserHint() const

81QString Greeter::selectUserHint() const

87{

82{

88 return QLatin1String("");

83 return QLatin1String("");

plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2

@@ -45,7 +45,6 @@ class Q_DECL_EXPORT Greeter : public QObject

45

46 Q_PROPERTY(QString hostname READ hostname CONSTANT)

47 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

48− Q_PROPERTY(bool locked READ lockHint CONSTANT)

49

48

50 Q_ENUMS(PromptType MessageType)

49 Q_ENUMS(PromptType MessageType)

51

50

@@ -68,7 +67,6 @@ public:

68 bool hideUsersHint() const;

67 bool hideUsersHint() const;

69 bool showManualLoginHint() const;

68 bool showManualLoginHint() const;

70 bool showRemoteLoginHint() const;

69 bool showRemoteLoginHint() const;

71− bool lockHint () const;

72 bool hasGuestAccountHint() const;

70 bool hasGuestAccountHint() const;

73 QString selectUserHint() const;

71 QString selectUserHint() const;

74 bool selectGuestHint() const;

72 bool selectGuestHint() const;

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5

@@ -69,11 +69,6 @@ bool Greeter::showRemoteLoginHint() const

69 return true;

70}

71

72−bool Greeter::lockHint () const

73−{

74− return false;

75−}

76−

77QString Greeter::selectUserHint() const

72QString Greeter::selectUserHint() const

78{

73{

79 Q_D(const Greeter);

74 Q_D(const Greeter);

tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2

@@ -41,7 +41,6 @@ class Q_DECL_EXPORT Greeter : public QObject

41

42 Q_PROPERTY(QString hostname READ hostname CONSTANT)

43 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)

44− Q_PROPERTY(bool locked READ lockHint CONSTANT)

45

44

46 Q_ENUMS(PromptType MessageType)

45 Q_ENUMS(PromptType MessageType)

47

46

@@ -67,7 +66,6 @@ public:

67 bool hideUsersHint() const;

66 bool hideUsersHint() const;

68 bool showManualLoginHint() const;

67 bool showManualLoginHint() const;

69 bool showRemoteLoginHint() const;

68 bool showRemoteLoginHint() const;

70− bool lockHint () const;

71 bool hasGuestAccountHint() const;

69 bool hasGuestAccountHint() const;

72 QString selectUserHint() const;

70 QString selectUserHint() const;

73 void setSelectUserHint(const QString &selectUserHint); // only in mock

71 void setSelectUserHint(const QString &selectUserHint); // only in mock