Merge branch 'master' into frameworks

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

diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h
index a108572a78110db56296215bf180ede0e939e0ab..689db42519f6f8b5f3369677fc694515408b68ea 100644 (file)
--- a/src/kitemviews/kstandarditem.h
+++ b/src/kitemviews/kstandarditem.h
@@ -43,7 +43,8 @@ class LIBDOLPHINPRIVATE_EXPORT KStandardItem
 public:
     explicit KStandardItem(KStandardItem* parent = 0);
     explicit KStandardItem(const QString& text, KStandardItem* parent = 0);
-    KStandardItem(const QIcon& icon, const QString& text, KStandardItem* parent = 0);
+    KStandardItem(const QString& icon, const QString& text, KStandardItem* parent = 0);
+    KStandardItem(const KStandardItem& item);
     virtual ~KStandardItem();
 
     /**
@@ -55,8 +56,11 @@ public:
     /**
      * Sets the icon for the "iconName"-role.
      */
-    void setIcon(const QIcon& icon);
-    QIcon icon() const;
+    void setIcon(const QString& icon);
+    QString icon() const;
+
+    void setIconOverlays(const QStringList& overlays);
+    QStringList iconOverlays() const;
 
     /**
      * Sets the group for the "group"-role.
@@ -70,9 +74,19 @@ public:
     void setParent(KStandardItem* parent);
     KStandardItem* parent() const;
 
+    void setData(const QHash<QByteArray, QVariant>& values);
     QHash<QByteArray, QVariant> data() const;
+
     QList<KStandardItem*> children() const;
 
+protected:
+    virtual void onDataValueChanged(const QByteArray& role,
+                                    const QVariant& current,
+                                    const QVariant& previous);
+
+    virtual void onDataChanged(const QHash<QByteArray, QVariant>& current,
+                               const QHash<QByteArray, QVariant>& previous);
+
 private:
     KStandardItem* m_parent;
     QList<KStandardItem*> m_children;