From 37a98b510b69bf6960043bb051346532e54796a8 Mon Sep 17 00:00:00 2001
From: Michael Terry <michael.terry@canonical.com>
Date: Mon, 15 Apr 2013 10:42:09 -0400
Subject: Use modern Q_SLOTS and Q_SIGNALS instead of slots and signals

---
 liblightdm-qt/QLightDM/greeter.h       | 26 +++++++++++++-------------
 liblightdm-qt/QLightDM/sessionsmodel.h |  2 +-
 liblightdm-qt/QLightDM/usersmodel.h    |  2 +-
 3 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'liblightdm-qt')

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);
-- 
cgit v1.2.1