on xenial help sign in
Remove lockHint as its no longer used
commit1c41bbdf7726728d3a73f0d3b5ef274c75353af5 authorJosh Arenson <joshua.arenson@canonical.com> dateThu 28 Jul 2016, 08:34 (10 years ago) parentc28c141
6 files changed−22
plugins/LightDM/Greeter.cpp−6 plugins/LightDM/Greeter.h−2 plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5 plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2 tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5 tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2
plugins/LightDM/Greeter.cpp−6
@@ -77,12 +77,6 @@ QString Greeter::defaultSessionHint() const
7777 return d->m_greeter->defaultSessionHint();
7878}
7979
80−bool Greeter::lockHint() const
81−{
82− Q_D(const Greeter);
83− return d->m_greeter->lockHint();
84−}
85−
8680bool Greeter::promptless() const
8781{
8882 Q_D(const Greeter);
plugins/LightDM/Greeter.h−2
@@ -37,7 +37,6 @@ class Greeter : public QObject
3737 Q_PROPERTY(bool authenticated READ isAuthenticated NOTIFY isAuthenticatedChanged)
3838 Q_PROPERTY(QString authenticationUser READ authenticationUser NOTIFY authenticationUserChanged)
3939 Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT)
40− Q_PROPERTY(bool lockscreen READ lockHint CONSTANT)
4140 Q_PROPERTY(bool promptless READ promptless NOTIFY promptlessChanged)
4241 Q_PROPERTY(QString selectUser READ selectUser CONSTANT)
4342
@@ -48,7 +47,6 @@ public:
4847 bool isAuthenticated() const;
4948 QString authenticationUser() const;
5049 QString defaultSessionHint() const;
51− bool lockHint() const;
5250 bool promptless() const;
5351 QString selectUser() const;
5452
plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5
@@ -78,11 +78,6 @@ bool Greeter::showRemoteLoginHint() const
7878 return true;
7979}
8080
81−bool Greeter::lockHint () const
82−{
83− return true;
84−}
85−
8681QString Greeter::selectUserHint() const
8782{
8883 return QLatin1String("");
plugins/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2
@@ -45,7 +45,6 @@ class Q_DECL_EXPORT Greeter : public QObject
4545
4646 Q_PROPERTY(QString hostname READ hostname CONSTANT)
4747 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
48− Q_PROPERTY(bool locked READ lockHint CONSTANT)
4948
5049 Q_ENUMS(PromptType MessageType)
5150
@@ -68,7 +67,6 @@ public:
6867 bool hideUsersHint() const;
6968 bool showManualLoginHint() const;
7069 bool showRemoteLoginHint() const;
71− bool lockHint () const;
7270 bool hasGuestAccountHint() const;
7371 QString selectUserHint() const;
7472 bool selectGuestHint() const;
tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.cpp−5
@@ -69,11 +69,6 @@ bool Greeter::showRemoteLoginHint() const
6969 return true;
7070}
7171
72−bool Greeter::lockHint () const
73−{
74− return false;
75−}
76−
7772QString Greeter::selectUserHint() const
7873{
7974 Q_D(const Greeter);
tests/mocks/LightDM/IntegratedLightDM/liblightdm/Greeter.h−2
@@ -41,7 +41,6 @@ class Q_DECL_EXPORT Greeter : public QObject
4141
4242 Q_PROPERTY(QString hostname READ hostname CONSTANT)
4343 Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT)
44− Q_PROPERTY(bool locked READ lockHint CONSTANT)
4544
4645 Q_ENUMS(PromptType MessageType)
4746
@@ -67,7 +66,6 @@ public:
6766 bool hideUsersHint() const;
6867 bool showManualLoginHint() const;
6968 bool showRemoteLoginHint() const;
70− bool lockHint () const;
7169 bool hasGuestAccountHint() const;
7270 QString selectUserHint() const;
7371 void setSelectUserHint(const QString &selectUserHint); // only in mock