diff options
author | Robert Ancell <robert.ancell@canonical.com> | 2021-02-16 11:48:41 +1300 |
---|---|---|
committer | Robert Ancell <robert.ancell@gmail.com> | 2021-02-16 12:52:48 +1300 |
commit | a13ac8cff6e88674ac5cd289f1c1f576216686a8 (patch) | |
tree | eefe671f1994c8250eb827a7ea2e629c5ba5900e | |
parent | 6a6bd4183144427995634011ea19c7dd32e5306c (diff) | |
download | lightdm-git-a13ac8cff6e88674ac5cd289f1c1f576216686a8.tar.gz |
Replace deprecated QAbstractItemModel::setRoleNames
-rw-r--r-- | liblightdm-qt/QLightDM/sessionsmodel.h | 1 | ||||
-rw-r--r-- | liblightdm-qt/QLightDM/usersmodel.h | 1 | ||||
-rw-r--r-- | liblightdm-qt/sessionsmodel.cpp | 17 | ||||
-rw-r--r-- | liblightdm-qt/usersmodel.cpp | 25 |
4 files changed, 26 insertions, 18 deletions
diff --git a/liblightdm-qt/QLightDM/sessionsmodel.h b/liblightdm-qt/QLightDM/sessionsmodel.h index 45eae846..fa17b522 100644 --- a/liblightdm-qt/QLightDM/sessionsmodel.h +++ b/liblightdm-qt/QLightDM/sessionsmodel.h @@ -40,6 +40,7 @@ namespace QLightDM { explicit SessionsModel(SessionsModel::SessionType, QObject *parent = 0); virtual ~SessionsModel(); + QHash<int, QByteArray> roleNames() const; int rowCount(const QModelIndex &parent) const; QVariant data(const QModelIndex &index, int role=Qt::DisplayRole) const; diff --git a/liblightdm-qt/QLightDM/usersmodel.h b/liblightdm-qt/QLightDM/usersmodel.h index 71d56356..0166a47a 100644 --- a/liblightdm-qt/QLightDM/usersmodel.h +++ b/liblightdm-qt/QLightDM/usersmodel.h @@ -42,6 +42,7 @@ public: IsLockedRole }; + QHash<int, QByteArray> roleNames() const; int rowCount(const QModelIndex &parent) const; QVariant data(const QModelIndex &index, int role) const; diff --git a/liblightdm-qt/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp index 8771c799..ce29b8a1 100644 --- a/liblightdm-qt/sessionsmodel.cpp +++ b/liblightdm-qt/sessionsmodel.cpp @@ -90,10 +90,6 @@ SessionsModel::SessionsModel(QObject *parent) : { Q_D(SessionsModel); - QHash<int, QByteArray> roles = roleNames(); - roles[KeyRole] = "key"; - setRoleNames(roles); - d->loadSessions(SessionsModel::LocalSessions); } @@ -103,10 +99,6 @@ SessionsModel::SessionsModel(SessionsModel::SessionType sessionType, QObject *pa { Q_D(SessionsModel); - QHash<int, QByteArray> roles = roleNames(); - roles[KeyRole] = "key"; - setRoleNames(roles); - d->loadSessions(sessionType); } @@ -115,6 +107,15 @@ SessionsModel::~SessionsModel() delete d_ptr; } +QHash<int, QByteArray> SessionsModel::roleNames() const +{ + QHash<int, QByteArray> roles; + roles[KeyRole] = "key"; + roles[Qt::DisplayRole] = "display"; + roles[Qt::ToolTipRole] = "toolTip"; + return roles; +} + int SessionsModel::rowCount(const QModelIndex &parent) const { Q_D(const SessionsModel); diff --git a/liblightdm-qt/usersmodel.cpp b/liblightdm-qt/usersmodel.cpp index 78b4dc7c..eec420a0 100644 --- a/liblightdm-qt/usersmodel.cpp +++ b/liblightdm-qt/usersmodel.cpp @@ -185,8 +185,20 @@ UsersModel::UsersModel(QObject *parent) : d_ptr(new UsersModelPrivate(this)) { Q_D(UsersModel); - // Extend roleNames (we want to keep the "display" role) - QHash<int, QByteArray> roles = roleNames(); + d->loadUsers(); + +} + +UsersModel::~UsersModel() +{ + delete d_ptr; +} + +QHash<int, QByteArray> UsersModel::roleNames() const +{ + QHash<int, QByteArray> roles; + roles[Qt::DisplayRole] = "display"; + roles[Qt::DecorationRole] = "decoration"; roles[NameRole] = "name"; roles[RealNameRole] = "realName"; roles[LoggedInRole] = "loggedIn"; @@ -197,17 +209,10 @@ UsersModel::UsersModel(QObject *parent) : roles[ImagePathRole] = "imagePath"; roles[UidRole] = "uid"; roles[IsLockedRole] = "isLocked"; - setRoleNames(roles); - d->loadUsers(); - -} -UsersModel::~UsersModel() -{ - delete d_ptr; + return roles; } - int UsersModel::rowCount(const QModelIndex &parent) const { Q_D(const UsersModel); |