Fix selection rect after porting from QFontMetrics::width()

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

diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h
index 5bb2bb36f7bb5826c3d879e75531641ec6dac1b8..13e61a089311db50b68dfe3633f390bc7c5e0338 100644 (file)
--- a/src/kitemviews/kstandarditem.h
+++ b/src/kitemviews/kstandarditem.h
@@ -24,7 +24,8 @@
 
 #include <QByteArray>
 #include <QHash>
 
 #include <QByteArray>
 #include <QHash>

-#include <QList>
+#include <QObject>
+#include <QSet>

 #include <QVariant>
 
 class KStandardItemModel;
 #include <QVariant>
 
 class KStandardItemModel;


@@ -36,14 +37,13 @@ class KStandardItemModel;
  * used roles. It is possible to assign values for custom
  * roles by using setDataValue().
  */
  * used roles. It is possible to assign values for custom
  * roles by using setDataValue().
  */

-class DOLPHIN_EXPORT KStandardItem
+class DOLPHIN_EXPORT KStandardItem : public QObject

 {
 {

-
+    Q_OBJECT

 public:
 public:

-    explicit KStandardItem(KStandardItem* parent = 0);
-    explicit KStandardItem(const QString& text, KStandardItem* parent = 0);
-    KStandardItem(const QString& icon, const QString& text, KStandardItem* parent = 0);
-    KStandardItem(const KStandardItem& item);
+    explicit KStandardItem(KStandardItem* parent = nullptr);
+    explicit KStandardItem(const QString& text, KStandardItem* parent = nullptr);
+    KStandardItem(const QString& icon, const QString& text, KStandardItem* parent = nullptr);

     virtual ~KStandardItem();
 
     /**
     virtual ~KStandardItem();
 
     /**


@@ -70,14 +70,9 @@ public:
     void setDataValue(const QByteArray& role, const QVariant& value);
     QVariant dataValue(const QByteArray& role) const;
 
     void setDataValue(const QByteArray& role, const QVariant& value);
     QVariant dataValue(const QByteArray& role) const;
 

-    void setParent(KStandardItem* parent);
-    KStandardItem* parent() const;
-

     void setData(const QHash<QByteArray, QVariant>& values);
     QHash<QByteArray, QVariant> data() 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,
 protected:
     virtual void onDataValueChanged(const QByteArray& role,
                                     const QVariant& current,


@@ -87,8 +82,6 @@ protected:
                                const QHash<QByteArray, QVariant>& previous);
 
 private:
                                const QHash<QByteArray, QVariant>& previous);
 
 private:

-    KStandardItem* m_parent;
-    QList<KStandardItem*> m_children;

     KStandardItemModel* m_model;
 
     QHash<QByteArray, QVariant> m_data;
     KStandardItemModel* m_model;
 
     QHash<QByteArray, QVariant> m_data;