Build TerminalPanel also on Windows

[dolphin.git] / src / kitemviews / kstandarditem.cpp

diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp
index 22c3a03e99959e98d3f0160a87d6f0e9e94f43f2..d4d1fa2f91efd3da9cbd9eb9ac4f543356c21bfc 100644 (file)
--- a/src/kitemviews/kstandarditem.cpp
+++ b/src/kitemviews/kstandarditem.cpp
@@ -18,14 +18,14 @@
  ***************************************************************************/
 
 #include "kstandarditem.h"
  ***************************************************************************/
 
 #include "kstandarditem.h"

-
-#include <KDebug>
+#include <QSet>
+#include <QByteArray>

 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :
     m_parent(parent),
     m_children(),
 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :
     m_parent(parent),
     m_children(),

-    m_model(0),
+    m_model(nullptr),

     m_data()
 {
 }
     m_data()
 {
 }


@@ -33,7 +33,7 @@ KStandardItem::KStandardItem(KStandardItem* parent) :
 KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
     m_parent(parent),
     m_children(),
 KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
     m_parent(parent),
     m_children(),

-    m_model(0),
+    m_model(nullptr),

     m_data()
 {
     setText(text);
     m_data()
 {
     setText(text);


@@ -42,7 +42,7 @@ KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
 KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandardItem* parent) :
     m_parent(parent),
     m_children(),
 KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandardItem* parent) :
     m_parent(parent),
     m_children(),

-    m_model(0),
+    m_model(nullptr),

     m_data()
 {
     setIcon(icon);
     m_data()
 {
     setIcon(icon);


@@ -103,11 +103,19 @@ QString KStandardItem::group() const
 
 void KStandardItem::setDataValue(const QByteArray& role, const QVariant& value)
 {
 
 void KStandardItem::setDataValue(const QByteArray& role, const QVariant& value)
 {

+    const QVariant previous = m_data.value(role);
+    if (previous == value) {
+        return;
+    }
+

     m_data.insert(role, value);
     m_data.insert(role, value);

+    onDataValueChanged(role, value, previous);
+

     if (m_model) {
         const int index = m_model->index(this);
         QSet<QByteArray> changedRoles;
         changedRoles.insert(role);
     if (m_model) {
         const int index = m_model->index(this);
         QSet<QByteArray> changedRoles;
         changedRoles.insert(role);

+        m_model->onItemChanged(index, changedRoles);

         emit m_model->itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles);
     }
 }
         emit m_model->itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles);
     }
 }


@@ -130,7 +138,9 @@ KStandardItem* KStandardItem::parent() const
 
 void KStandardItem::setData(const QHash<QByteArray, QVariant>& values)
 {
 
 void KStandardItem::setData(const QHash<QByteArray, QVariant>& values)
 {

+    const QHash<QByteArray, QVariant> previous = m_data;

     m_data = values;
     m_data = values;

+    onDataChanged(values, previous);

 }
 
 QHash<QByteArray, QVariant> KStandardItem::data() const
 }
 
 QHash<QByteArray, QVariant> KStandardItem::data() const