From c34b2f04fd540622a671e4848a37e509a6721d2c Mon Sep 17 00:00:00 2001 From: Nicolas Fella Date: Sat, 8 Jul 2023 23:46:29 +0200 Subject: Replace ServiceItemDelegate with standard Qt item delegate We don't need a custom delegate here Using the standard one from Qt also slightly improves margins --- src/settings/servicemodel.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'src/settings/servicemodel.cpp') diff --git a/src/settings/servicemodel.cpp b/src/settings/servicemodel.cpp index 5333e88b9..c2ebda7c1 100644 --- a/src/settings/servicemodel.cpp +++ b/src/settings/servicemodel.cpp @@ -6,6 +6,8 @@ #include "servicemodel.h" +#include + ServiceModel::ServiceModel(QObject *parent) : QAbstractListModel(parent) , m_items() @@ -30,7 +32,6 @@ bool ServiceModel::insertRows(int row, int count, const QModelIndex &parent) for (int i = 0; i < count; ++i) { ServiceItem item; item.checked = Qt::Unchecked; - item.configurable = false; m_items.insert(row, item); } endInsertRows(); @@ -49,9 +50,6 @@ bool ServiceModel::setData(const QModelIndex &index, const QVariant &value, int case Qt::CheckStateRole: m_items[row].checked = value.value(); break; - case ConfigurableRole: - m_items[row].configurable = value.toBool(); - break; case Qt::DecorationRole: m_items[row].icon = value.toString(); break; @@ -74,12 +72,10 @@ QVariant ServiceModel::data(const QModelIndex &index, int role) const const int row = index.row(); if (row < rowCount()) { switch (role) { - case ConfigurableRole: - return m_items[row].configurable; case Qt::CheckStateRole: return m_items[row].checked; case Qt::DecorationRole: - return m_items[row].icon; + return QIcon::fromTheme(m_items[row].icon); case Qt::DisplayRole: return m_items[row].text; case DesktopEntryNameRole: -- cgit v1.3