Merge branch 'Applications/16.04'

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

diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp
index 1754c531bac472b822016f7dbc3e5b5a81b6dfb9..f3fd258f93a5616578ebcfac8484fdbe5e4b06aa 100644 (file)
--- a/src/kitemviews/kstandarditem.cpp
+++ b/src/kitemviews/kstandarditem.cpp
@@ -18,8 +18,9 @@
  ***************************************************************************/
 
 #include "kstandarditem.h"
  ***************************************************************************/
 
 #include "kstandarditem.h"

-
-#include <KDebug>
+#include <QSet>
+#include <QByteArray>
+#include "kstandarditemmodel.h"

 
 KStandardItem::KStandardItem(KStandardItem* parent) :
     m_parent(parent),
 
 KStandardItem::KStandardItem(KStandardItem* parent) :
     m_parent(parent),


@@ -38,7 +39,7 @@ KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
     setText(text);
 }
 
     setText(text);
 }
 

-KStandardItem::KStandardItem(const QIcon& icon, const QString& text, KStandardItem* parent) :
+KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandardItem* parent) :

     m_parent(parent),
     m_children(),
     m_model(0),
     m_parent(parent),
     m_children(),
     m_model(0),


@@ -48,13 +49,21 @@ KStandardItem::KStandardItem(const QIcon& icon, const QString& text, KStandardIt
     setText(text);
 }
 
     setText(text);
 }
 

+KStandardItem::KStandardItem(const KStandardItem& item) :
+    m_parent(item.m_parent),
+    m_children(item.m_children),
+    m_model(item.m_model),
+    m_data(item.m_data)
+{
+}
+

 KStandardItem::~KStandardItem()
 {
 }
 
 void KStandardItem::setText(const QString& text)
 {
 KStandardItem::~KStandardItem()
 {
 }
 
 void KStandardItem::setText(const QString& text)
 {

-    m_data.insert("text", text);
+    setDataValue("text", text);

 }
 
 QString KStandardItem::text() const
 }
 
 QString KStandardItem::text() const


@@ -62,19 +71,29 @@ QString KStandardItem::text() const
     return m_data["text"].toString();
 }
 
     return m_data["text"].toString();
 }
 

-void KStandardItem::setIcon(const QIcon& icon)
+void KStandardItem::setIcon(const QString& icon)

 {
 {

-    m_data.insert("iconName", icon.name());
+    setDataValue("iconName", icon);

 }
 
 }
 

-QIcon KStandardItem::icon() const
+QString KStandardItem::icon() const

 {
 {

-    return QIcon(m_data["iconName"].toString());
+    return m_data["iconName"].toString();
+}
+
+void KStandardItem::setIconOverlays(const QStringList& overlays)
+{
+    setDataValue("iconOverlays", overlays);
+}
+
+QStringList KStandardItem::iconOverlays() const
+{
+    return m_data["iconOverlays"].toStringList();

 }
 
 void KStandardItem::setGroup(const QString& group)
 {
 }
 
 void KStandardItem::setGroup(const QString& group)
 {

-    m_data.insert("group", group);
+    setDataValue("group", group);

 }
 
 QString KStandardItem::group() const
 }
 
 QString KStandardItem::group() const


@@ -84,7 +103,21 @@ 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);
+        m_model->onItemChanged(index, changedRoles);
+        emit m_model->itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles);
+    }

 }
 
 QVariant KStandardItem::dataValue(const QByteArray& role) const
 }
 
 QVariant KStandardItem::dataValue(const QByteArray& role) const


@@ -103,6 +136,13 @@ KStandardItem* KStandardItem::parent() const
     return m_parent;
 }
 
     return m_parent;
 }
 

+void KStandardItem::setData(const QHash<QByteArray, QVariant>& values)
+{
+    const QHash<QByteArray, QVariant> previous = m_data;
+    m_data = values;
+    onDataChanged(values, previous);
+}
+

 QHash<QByteArray, QVariant> KStandardItem::data() const
 {
     return m_data;
 QHash<QByteArray, QVariant> KStandardItem::data() const
 {
     return m_data;


@@ -112,3 +152,20 @@ QList<KStandardItem*> KStandardItem::children() const
 {
     return m_children;
 }
 {
     return m_children;
 }

+
+void KStandardItem::onDataValueChanged(const QByteArray& role,
+                                       const QVariant& current,
+                                       const QVariant& previous)
+{
+    Q_UNUSED(role);
+    Q_UNUSED(current);
+    Q_UNUSED(previous);
+}
+
+void KStandardItem::onDataChanged(const QHash<QByteArray, QVariant>& current,
+                                  const QHash<QByteArray, QVariant>& previous)
+{
+    Q_UNUSED(current);
+    Q_UNUSED(previous);
+}
+