Fix PromptType and MessageType enum namespacing and case.

2 files changed, 23 insertions, 23 deletions

diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h
index 6dfdf152..b91d3c1d 100644
--- a/liblightdm-qt/QLightDM/greeter.h
+++ b/liblightdm-qt/QLightDM/greeter.h
@@ -22,27 +22,27 @@ class GreeterPrivate;
 
 namespace QLightDM
 {
-  typedef enum
-  {
-    PROMPT_TYPE_QUESTION,
-    PROMPT_TYPE_SECRET
-  } PromptType;
-
-  typedef enum
-  {
-    MESSAGE_TYPE_INFO,
-    MESSAGE_TYPE_ERROR
-  } MessageType;
 
   class Q_DECL_EXPORT Greeter : public QObject
   {
-    Q_OBJECT
-    public:
-        explicit Greeter(QObject* parent=0);
-        virtual ~Greeter();
+      Q_OBJECT
+  public:
+
+      enum PromptType {
+          PromptTypeQuestion,
+          PromptTypeSecret
+      };
+
+      enum MessageType {
+          MessageTypeInfo,
+          MessageTypeError
+      };
+
+      explicit Greeter(QObject* parent=0);
+      virtual ~Greeter();
 
-        QString timedLoginUser() const;
-        int timedLoginDelay() const;
+      QString timedLoginUser() const;
+      int timedLoginDelay() const;
 
         QString getHint(QString name) const;
         QString defaultSessionHint() const;
@@ -67,8 +67,8 @@ namespace QLightDM
         bool startSessionSync(const QString &session=QString());
 
     signals:
-        void showMessage(QString text, QLightDM::MessageType type);
-        void showPrompt(QString text, QLightDM::PromptType type);
+        void showMessage(QString text, Greeter::MessageType type);
+        void showPrompt(QString text, Greeter::PromptType type);
         void authenticationComplete();
         void autologinTimerExpired();
 
diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp
index 9f8add3f..20c0c282 100644
--- a/liblightdm-qt/greeter.cpp
+++ b/liblightdm-qt/greeter.cpp
@@ -414,16 +414,16 @@ void Greeter::onRead(int fd)
                 switch (style)
                 {
                 case PAM_PROMPT_ECHO_OFF:
-                    emit showPrompt(text, PROMPT_TYPE_SECRET);
+                    emit showPrompt(text, Greeter::PromptTypeSecret);
                     break;
                 case PAM_PROMPT_ECHO_ON:
-                    emit showPrompt(text, PROMPT_TYPE_QUESTION);
+                    emit showPrompt(text, Greeter::PromptTypeQuestion);
                     break;
                 case PAM_ERROR_MSG:
-                    emit showMessage(text, MESSAGE_TYPE_ERROR);
+                    emit showMessage(text, Greeter::MessageTypeError);
                     break;
                 case PAM_TEXT_INFO:
-                    emit showMessage(text, MESSAGE_TYPE_INFO);
+                    emit showMessage(text, Greeter::MessageTypeInfo);
                     break;
                 }
             }