Fix PromptType and MessageType enum namespacing and case.

diff --git a/greeters/qt/loginprompt.cpp b/greeters/qt/loginprompt.cpp
index 258f7b3e639f3f285fb7fff11ca1028b07ed56ce..c0c95ba927602a2bdd1f886a2cb91cbcdcfbd529 100644 (file)
--- a/greeters/qt/loginprompt.cpp
+++ b/greeters/qt/loginprompt.cpp
@@ -34,7 +34,7 @@ LoginPrompt::LoginPrompt(QLightDM::Greeter *greeter, QWidget *parent) :
 
     connect(ui->loginButton, SIGNAL(released()), SLOT(onLoginButtonClicked()));
     connect(m_greeter, SIGNAL(authenticationComplete()), SLOT(onAuthenticationComplete()));
-    connect(m_greeter, SIGNAL(showPrompt(QString, QLightDM::PromptType)), SLOT(prompt(QString, QLightDM::PromptType)));
+    connect(m_greeter, SIGNAL(showPrompt(QString, QLightDM::Greeter::PromptType)), SLOT(prompt(QString, QLightDM::Greeter::PromptType)));
 }
 
 LoginPrompt::~LoginPrompt()
@@ -60,7 +60,7 @@ void LoginPrompt::onAuthenticationComplete()
     }
 }
 
-void LoginPrompt::prompt(const QString &text, QLightDM::PromptType type) {
+void LoginPrompt::prompt(const QString &text, QLightDM::Greeter::PromptType type) {
     qDebug() << text;
     m_greeter->respond(ui->password->text());
 }

diff --git a/greeters/qt/loginprompt.h b/greeters/qt/loginprompt.h
index 56bc6f8054bf8857d53eba8d8859fcf6ad198d24..872bfc13a3ed40eaddeebfca95c369ae5d6d7a1b 100644 (file)
--- a/greeters/qt/loginprompt.h
+++ b/greeters/qt/loginprompt.h
@@ -38,7 +38,7 @@ signals:
 private slots:
     void onLoginButtonClicked();
     void onAuthenticationComplete();
-    void prompt(const QString &message, QLightDM::PromptType);
+    void prompt(const QString &message, QLightDM::Greeter::PromptType);
 
 private:
     QLightDM::Greeter *m_greeter;

diff --git a/liblightdm-qt/QLightDM/greeter.h b/liblightdm-qt/QLightDM/greeter.h
index 6dfdf152b28a65d0bac8051d6a273bac6d482b53..b91d3c1dc052b49ba076534f84fb63b29a63ede0 100644 (file)
--- 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 9f8add3ffdb746966fda4ffea97498b8c6987fc1..20c0c28223d444877ce412eb15a99bd8a884a80b 100644 (file)
--- 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;
                 }
             }

diff --git a/tests/src/test-qt-greeter.cpp b/tests/src/test-qt-greeter.cpp
index 08817a9c8c99d1e1d8c2c3e93a4ef4977007c6db..b591927e4d18ed823188b6e7c6cabfd4428b745a 100644 (file)
--- a/tests/src/test-qt-greeter.cpp
+++ b/tests/src/test-qt-greeter.cpp
@@ -14,17 +14,17 @@ static QSettings *config = NULL;
 
 TestGreeter::TestGreeter ()
 {
-    connect (this, SIGNAL(showMessage(QString, QLightDM::MessageType)), SLOT(showMessage(QString, QLightDM::MessageType)));
-    connect (this, SIGNAL(showPrompt(QString, QLightDM::PromptType)), SLOT(showPrompt(QString, QLightDM::PromptType)));
+    connect (this, SIGNAL(showMessage(QString, Greeter::MessageType)), SLOT(showMessage(QString, Greeter::MessageType)));
+    connect (this, SIGNAL(showPrompt(QString, Greeter::PromptType)), SLOT(showPrompt(QString, Greeter::PromptType)));
     connect (this, SIGNAL(authenticationComplete()), SLOT(authenticationComplete()));
 }
 
-void TestGreeter::showMessage (QString text, QLightDM::MessageType type)
+void TestGreeter::showMessage (QString text, Greeter::MessageType type)
 {
     notify_status ("GREETER SHOW-MESSAGE TEXT=\"%s\"", text.toAscii ().constData ());
 }
 
-void TestGreeter::showPrompt (QString text, QLightDM::PromptType type)
+void TestGreeter::showPrompt (QString text, Greeter::PromptType type)
 {
     notify_status ("GREETER SHOW-PROMPT TEXT=\"%s\"", text.toAscii ().constData ());
 

diff --git a/tests/src/test-qt-greeter.h b/tests/src/test-qt-greeter.h
index c224759fe38ae3de8efc79fb3dcf3168fc25d222..84dc7d5c64d53d413cdcf48a019382b8f424be1e 100644 (file)
--- a/tests/src/test-qt-greeter.h
+++ b/tests/src/test-qt-greeter.h
@@ -8,7 +8,7 @@ public:
     TestGreeter ();
 
 private slots:
-    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();
 };