SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / settings / servicemodel.cpp

diff --git a/src/settings/servicemodel.cpp b/src/settings/servicemodel.cpp
index 81810b0a03ffe83c58b7422fba2d8b47a116577b..c2ebda7c16338e74bb2b6c8932cca8abe30c9e1d 100644 (file)
--- a/src/settings/servicemodel.cpp
+++ b/src/settings/servicemodel.cpp
@@ -6,9 +6,11 @@
 
 #include "servicemodel.h"
 
 
 #include "servicemodel.h"
 

-ServiceModel::ServiceModel(QObject* parent) :
-    QAbstractListModel(parent),
-    m_items()
+#include <QIcon>
+
+ServiceModel::ServiceModel(QObject *parent)
+    : QAbstractListModel(parent)
+    , m_items()

 {
 }
 
 {
 }
 


@@ -16,7 +18,7 @@ ServiceModel::~ServiceModel()
 {
 }
 
 {
 }
 

-bool ServiceModel::insertRows(int row, int count, const QModelIndex& parent)
+bool ServiceModel::insertRows(int row, int count, const QModelIndex &parent)

 {
     if (row > rowCount()) {
         return false;
 {
     if (row > rowCount()) {
         return false;


@@ -29,8 +31,7 @@ bool ServiceModel::insertRows(int row, int count, const QModelIndex& parent)
     beginInsertRows(parent, row, row + count - 1);
     for (int i = 0; i < count; ++i) {
         ServiceItem item;
     beginInsertRows(parent, row, row + count - 1);
     for (int i = 0; i < count; ++i) {
         ServiceItem item;

-        item.checked = false;
-        item.configurable = false;
+        item.checked = Qt::Unchecked;

         m_items.insert(row, item);
     }
     endInsertRows();
         m_items.insert(row, item);
     }
     endInsertRows();


@@ -38,7 +39,7 @@ bool ServiceModel::insertRows(int row, int count, const QModelIndex& parent)
     return true;
 }
 
     return true;
 }
 

-bool ServiceModel::setData(const QModelIndex& index, const QVariant& value, int role)
+bool ServiceModel::setData(const QModelIndex &index, const QVariant &value, int role)

 {
     const int row = index.row();
     if (row >= rowCount()) {
 {
     const int row = index.row();
     if (row >= rowCount()) {


@@ -47,10 +48,7 @@ bool ServiceModel::setData(const QModelIndex& index, const QVariant& value, int
 
     switch (role) {
     case Qt::CheckStateRole:
 
     switch (role) {
     case Qt::CheckStateRole:

-        m_items[row].checked = value.toBool();
-        break;
-    case ConfigurableRole:
-        m_items[row].configurable = value.toBool();
+        m_items[row].checked = value.value<Qt::CheckState>();

         break;
     case Qt::DecorationRole:
         m_items[row].icon = value.toString();
         break;
     case Qt::DecorationRole:
         m_items[row].icon = value.toString();


@@ -65,30 +63,47 @@ bool ServiceModel::setData(const QModelIndex& index, const QVariant& value, int
         return false;
     }
 
         return false;
     }
 

-    emit dataChanged(index, index);
+    Q_EMIT dataChanged(index, index);

     return true;
 }
 
     return true;
 }
 

-QVariant ServiceModel::data(const QModelIndex& index, int role) const
+QVariant ServiceModel::data(const QModelIndex &index, int role) const

 {
     const int row = index.row();
     if (row < rowCount()) {
         switch (role) {
 {
     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;
-        case Qt::DisplayRole:      return m_items[row].text;
-        case DesktopEntryNameRole: return m_items[row].desktopEntryName;
-        default: break;
+        case Qt::CheckStateRole:
+            return m_items[row].checked;
+        case Qt::DecorationRole:
+            return QIcon::fromTheme(m_items[row].icon);
+        case Qt::DisplayRole:
+            return m_items[row].text;
+        case DesktopEntryNameRole:
+            return m_items[row].desktopEntryName;
+        default:
+            break;

         }
     }
 
     return QVariant();
 }
 
         }
     }
 
     return QVariant();
 }
 

-int ServiceModel::rowCount(const QModelIndex& parent) const
+int ServiceModel::rowCount(const QModelIndex &parent) const

 {
     Q_UNUSED(parent)
     return m_items.count();
 }
 
 {
     Q_UNUSED(parent)
     return m_items.count();
 }
 

+void ServiceModel::clear()
+{
+    beginRemoveRows(QModelIndex(), 0, m_items.count());
+    m_items.clear();
+    endRemoveRows();
+}
+
+Qt::ItemFlags ServiceModel::flags(const QModelIndex &index) const
+{
+    return QAbstractListModel::flags(index) | Qt::ItemIsUserCheckable;
+}
+
+#include "moc_servicemodel.cpp"