diff options
| author | Michael Terry <michael.terry@canonical.com> | 2013-04-15 10:42:09 -0400 |
|---|---|---|
| committer | Michael Terry <michael.terry@canonical.com> | 2013-04-15 10:42:09 -0400 |
| commit | 37a98b510b69bf6960043bb051346532e54796a8 (patch) | |
| tree | 20be43167bae595ad0c1c3f8e8ff527a1a92b101 /liblightdm-qt/QLightDM | |
| parent | 3178c258de618160229ed42ad3a0e5a2d7821100 (diff) | |
| download | lightdm-git-37a98b510b69bf6960043bb051346532e54796a8.tar.gz | |
Use modern Q_SLOTS and Q_SIGNALS instead of slots and signals
Diffstat (limited to 'liblightdm-qt/QLightDM')
| -rw-r--r-- | liblightdm-qt/QLightDM/greeter.h | 26 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/sessionsmodel.h | 2 | ||||
| -rw-r--r-- | liblightdm-qt/QLightDM/usersmodel.h | 2 |
3 files changed, 15 insertions, 15 deletions
diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h index 602c09c4..ca5f7928 100644 --- a/liblightdm-qt/QLightDM/greeter.h +++ b/liblightdm-qt/QLightDM/greeter.h @@ -24,19 +24,19 @@ class Q_DECL_EXPORT Greeter : public QObject { Q_OBJECT - Q_PROPERTY(bool authenticated READ isAuthenticated ); //NOTFIY authenticationComplete - Q_PROPERTY(QString authenticationUser READ authenticationUser ); - Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT); - Q_PROPERTY(QString selectUser READ selectUserHint CONSTANT); - Q_PROPERTY(bool selectGuest READ selectGuestHint CONSTANT); - - Q_PROPERTY(QString hostname READ hostname CONSTANT); - Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT); - Q_PROPERTY(bool locked READ lockHint CONSTANT); + Q_PROPERTY(bool authenticated READ isAuthenticated ) //NOTFIY authenticationComplete + Q_PROPERTY(QString authenticationUser READ authenticationUser ) + Q_PROPERTY(QString defaultSession READ defaultSessionHint CONSTANT) + Q_PROPERTY(QString selectUser READ selectUserHint CONSTANT) + Q_PROPERTY(bool selectGuest READ selectGuestHint CONSTANT) + + Q_PROPERTY(QString hostname READ hostname CONSTANT) + Q_PROPERTY(bool hasGuestAccount READ hasGuestAccountHint CONSTANT) + Q_PROPERTY(bool locked READ lockHint CONSTANT) - Q_PROPERTY(QString hostname READ hostname CONSTANT); + Q_PROPERTY(QString hostname READ hostname CONSTANT) - Q_ENUMS(PromptType MessageType); + Q_ENUMS(PromptType MessageType) public: enum PromptType { @@ -70,7 +70,7 @@ public: QString authenticationUser() const; QString hostname() const; -public slots: +public Q_SLOTS: bool connectSync(); void authenticate(const QString &username=QString()); void authenticateAsGuest(); @@ -81,7 +81,7 @@ public slots: void setLanguage (const QString &language); bool startSessionSync(const QString &session=QString()); -signals: +Q_SIGNALS: void showMessage(QString text, QLightDM::Greeter::MessageType type); void showPrompt(QString text, QLightDM::Greeter::PromptType type); void authenticationComplete(); diff --git a/liblightdm-qt/QLightDM/sessionsmodel.h b/liblightdm-qt/QLightDM/sessionsmodel.h index 79564cf3..aa6edbc1 100644 --- a/liblightdm-qt/QLightDM/sessionsmodel.h +++ b/liblightdm-qt/QLightDM/sessionsmodel.h @@ -20,7 +20,7 @@ namespace QLightDM { { Q_OBJECT - Q_ENUMS(SessionModelRoles SessionType); + Q_ENUMS(SessionModelRoles SessionType) public: enum SessionModelRoles { diff --git a/liblightdm-qt/QLightDM/usersmodel.h b/liblightdm-qt/QLightDM/usersmodel.h index 72f8f601..9735a59e 100644 --- a/liblightdm-qt/QLightDM/usersmodel.h +++ b/liblightdm-qt/QLightDM/usersmodel.h @@ -24,7 +24,7 @@ class Q_DECL_EXPORT UsersModel : public QAbstractListModel { Q_OBJECT - Q_ENUMS(UserModelRoles); + Q_ENUMS(UserModelRoles) public: explicit UsersModel(QObject *parent = 0); |