Merge lp:~mterry/lightdm/enums into lp:lightdm

[Michael Terry]

Register enums with QObject meta type system

Register enums with the QObject meta type system. This way they can be accessed from Qml.

[David Edmundson (david.edmundson)]

+ Q_ENUMS(PromptType MessageType);

makes absolute sense.

I don't understand why you would do it for the model roles, Models are accessed through roleNames anyway.

[Michael Terry (mterry)]

I figured (A) it didn't hurt and (B) we don't know how downstream users were going to use the classes. For example, I could imagine someone taking one of these models and exposing a function that takes a role enum. In which case, we'd be doing them a favor if we exposed the enum. Doesn't seem likely, but then I thought of (A). :)

But I'm not doing something that needs it right now. If you think it doesn't make sense, I can drop those bits.

[David Edmundson (david.edmundson)]

You're right that it doesn't hurt.
I don't mind either way.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1630
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~mterry/lightdm/enums/+merge/156695/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/lightdm-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/lightdm-quantal-amd64-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/2/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1630
http://jenkins.qa.ubuntu.com/job/lightdm-ci/8/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/lightdm-raring-amd64-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/lightdm-ci/8/rebuild

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

[David Edmundson (david.edmundson)]

review: Approve

=== modified file 'liblightdm-qt/QLightDM/greeter.h'
--- liblightdm-qt/QLightDM/greeter.h	2013-01-31 20:56:09 +0000
+++ liblightdm-qt/QLightDM/greeter.h	2013-04-02 21:10:29 +0000
@@ -36,6 +36,8 @@
     
     Q_PROPERTY(QString hostname READ hostname CONSTANT);
 
+    Q_ENUMS(PromptType MessageType);
+
 public:
     enum PromptType {
         PromptTypeQuestion,

=== modified file 'liblightdm-qt/QLightDM/sessionsmodel.h'
--- liblightdm-qt/QLightDM/sessionsmodel.h	2013-01-31 20:56:09 +0000
+++ liblightdm-qt/QLightDM/sessionsmodel.h	2013-04-02 21:10:29 +0000
@@ -19,6 +19,9 @@
     class Q_DECL_EXPORT SessionsModel : public QAbstractListModel
     {
         Q_OBJECT
+
+        Q_ENUMS(SessionModelRoles SessionType);
+
     public:
         enum SessionModelRoles {
             //name is exposed as Qt::DisplayRole

=== modified file 'liblightdm-qt/QLightDM/usersmodel.h'
--- liblightdm-qt/QLightDM/usersmodel.h	2013-03-08 22:00:21 +0000
+++ liblightdm-qt/QLightDM/usersmodel.h	2013-04-02 21:10:29 +0000
@@ -23,6 +23,9 @@
 class Q_DECL_EXPORT UsersModel : public QAbstractListModel
 {
     Q_OBJECT
+
+    Q_ENUMS(UserModelRoles);
+
 public:
     explicit UsersModel(QObject *parent = 0);
     ~UsersModel();