diff options
| author | Michael Terry <michael.terry@canonical.com> | 2013-03-08 16:49:47 -0500 |
|---|---|---|
| committer | Michael Terry <michael.terry@canonical.com> | 2013-03-08 16:49:47 -0500 |
| commit | ff8d80017c859c7a6255f9ec24da40fd0ffed1e2 (patch) | |
| tree | 6c74bfff21be80109d4c6883f483ad667e23ec49 /liblightdm-qt | |
| parent | 28a0b4ae0611f80aaf4e80b92bd449430f7f37e6 (diff) | |
| download | lightdm-git-ff8d80017c859c7a6255f9ec24da40fd0ffed1e2.tar.gz | |
Instead, add a new role
Diffstat (limited to 'liblightdm-qt')
| -rw-r--r-- | liblightdm-qt/QLightDM/usersmodel.h | 1 | ||||
| -rw-r--r-- | liblightdm-qt/usersmodel.cpp | 7 |
2 files changed, 4 insertions, 4 deletions
diff --git a/liblightdm-qt/QLightDM/usersmodel.h b/liblightdm-qt/QLightDM/usersmodel.h index e359eb80..03e8b306 100644 --- a/liblightdm-qt/QLightDM/usersmodel.h +++ b/liblightdm-qt/QLightDM/usersmodel.h @@ -31,6 +31,7 @@ public: RealNameRole, LoggedInRole, BackgroundRole, + BackgroundPathRole, SessionRole, HasMessagesRole, ImagePathRole diff --git a/liblightdm-qt/usersmodel.cpp b/liblightdm-qt/usersmodel.cpp index c009ef34..f45a79e2 100644 --- a/liblightdm-qt/usersmodel.cpp +++ b/liblightdm-qt/usersmodel.cpp @@ -185,6 +185,7 @@ UsersModel::UsersModel(QObject *parent) : roles[RealNameRole] = "realName"; roles[LoggedInRole] = "loggedIn"; roles[BackgroundRole] = "background"; + roles[BackgroundPathRole] = "backgroundPath"; roles[SessionRole] = "session"; roles[HasMessagesRole] = "hasMessages"; roles[ImagePathRole] = "imagePath"; @@ -232,11 +233,9 @@ QVariant UsersModel::data(const QModelIndex &index, int role) const case UsersModel::LoggedInRole: return d->users[row].isLoggedIn; case UsersModel::BackgroundRole: -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) - return d->users[row].background; -#else return QPixmap(d->users[row].background); -#endif + case UsersModel::BackgroundPathRole: + return d->users[row].background; case UsersModel::HasMessagesRole: return d->users[row].hasMessages; case UsersModel::ImagePathRole: |