Support compiling headers with QT_NO_KEYWORDS.

6 files changed, 21 insertions, 20 deletions

diff --git a/liblightdm-qt/Makefile.am b/liblightdm-qt/Makefile.am
index d16cf966..26f15684 100644
--- a/liblightdm-qt/Makefile.am
+++ b/liblightdm-qt/Makefile.am
@@ -17,6 +17,7 @@ liblightdm_qt5_2_la_LIBADD = \
 common_cflags = \
 	-I$(top_srcdir)/liblightdm-gobject \
 	$(LIBLIGHTDM_GOBJECT_CFLAGS) \
+	-DQT_NO_KEYWORDS \
 	-DXSESSIONS_DIR=\"$(datadir)/xsessions\"
 liblightdm_qt_2_la_CXXFLAGS = \
 	$(LIBLIGHTDM_QT4_CFLAGS) \
diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h
index 602c09c4..787485f4 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();
@@ -92,6 +92,6 @@ private:
     Q_DECLARE_PRIVATE(Greeter)
 
 };
-};
+}
 
 #endif // QLIGHTDM_GREETER_H
diff --git a/liblightdm-qt/QLightDM/power.h b/liblightdm-qt/QLightDM/power.h
index 86eb2b2e..b00081ba 100644
--- a/liblightdm-qt/QLightDM/power.h
+++ b/liblightdm-qt/QLightDM/power.h
@@ -44,6 +44,6 @@ namespace QLightDM
         PowerInterfacePrivate * const d;
 
     };
-};
+}
 
 #endif // QLIGHTDM_POWER_H
diff --git a/liblightdm-qt/QLightDM/sessionsmodel.h b/liblightdm-qt/QLightDM/sessionsmodel.h
index 79564cf3..77c81fb2 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 {
@@ -48,6 +48,6 @@ namespace QLightDM {
     private:
         Q_DECLARE_PRIVATE(SessionsModel)
     };
-};
+}
 
 #endif // QLIGHTDM_SESSION_H
diff --git a/liblightdm-qt/QLightDM/usersmodel.h b/liblightdm-qt/QLightDM/usersmodel.h
index 72f8f601..d803c41c 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);
@@ -52,6 +52,6 @@ private:
 
 };
 
-};
+}
 
 #endif // QLIGHTDM_USER_H
diff --git a/tests/src/test-qt-greeter.h b/tests/src/test-qt-greeter.h
index 222e40fa..99370996 100644
--- a/tests/src/test-qt-greeter.h
+++ b/tests/src/test-qt-greeter.h
@@ -7,7 +7,7 @@ class TestGreeter : public QLightDM::Greeter
 public:
     TestGreeter ();
 
-private slots:
+private Q_SLOTS:
     void showMessage(QString text, QLightDM::Greeter::MessageType type);
     void showPrompt(QString text, QLightDM::Greeter::PromptType type);
     void authenticationComplete();