Summary: Fixes crash when hiding devices

Summary:
Fixes crash when hiding devices. The crash is caused by
KStandardItem::setDataValue which calls the
KStandardItemModel::onItemChanged function, and that function will
delete the KStandardItem if the data value being set is the hidden
attribute being set to true. To fix this KStandardItem now derives
QObject so that we can use deleteLater.

Test Plan:
Right click a device in the places panel and select hide
Right click the places panel and select show hidden
Right click the hidden device and select show
Right click the same device and select hide

BUG: 403064

Reviewers: #dolphin, elvisangelaccio

Reviewed By: #dolphin, elvisangelaccio

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D21050

diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp
index 4fb3f8f9834143e61fdf4806199a5f8f11e24b93..b3bbcaa41123cb7b1fcaa0996b5876d9296148d1 100644 (file)
--- a/src/kitemviews/kstandarditem.cpp
+++ b/src/kitemviews/kstandarditem.cpp
@@ -21,16 +21,14 @@
 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :
 #include "kstandarditemmodel.h"
 
 KStandardItem::KStandardItem(KStandardItem* parent) :

-    m_parent(parent),
-    m_children(),
+    QObject(parent),

     m_model(nullptr),
     m_data()
 {
 }
 
 KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
     m_model(nullptr),
     m_data()
 {
 }
 
 KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :

-    m_parent(parent),
-    m_children(),
+    QObject(parent),

     m_model(nullptr),
     m_data()
 {
     m_model(nullptr),
     m_data()
 {


@@ -38,8 +36,7 @@ KStandardItem::KStandardItem(const QString& text, KStandardItem* parent) :
 }
 
 KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandardItem* parent) :
 }
 
 KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandardItem* parent) :

-    m_parent(parent),
-    m_children(),
+    QObject(parent),

     m_model(nullptr),
     m_data()
 {
     m_model(nullptr),
     m_data()
 {


@@ -47,14 +44,6 @@ KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandard
     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()
 {
 }
 KStandardItem::~KStandardItem()
 {
 }


@@ -123,17 +112,6 @@ QVariant KStandardItem::dataValue(const QByteArray& role) const
     return m_data[role];
 }
 
     return m_data[role];
 }
 

-void KStandardItem::setParent(KStandardItem* parent)
-{
-    // TODO: not implemented yet
-    m_parent = parent;
-}
-
-KStandardItem* KStandardItem::parent() const
-{
-    return m_parent;
-}
-

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


@@ -146,11 +124,6 @@ QHash<QByteArray, QVariant> KStandardItem::data() const
     return m_data;
 }
 
     return m_data;
 }
 

-QList<KStandardItem*> KStandardItem::children() const
-{
-    return m_children;
-}
-

 void KStandardItem::onDataValueChanged(const QByteArray& role,
                                        const QVariant& current,
                                        const QVariant& previous)
 void KStandardItem::onDataValueChanged(const QByteArray& role,
                                        const QVariant& current,
                                        const QVariant& previous)

diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h
index fec197c06ff34dbadbbf5a8b9d6f7da9ae33ed38..ad3452d774ba36ac3f565324f740d0084916a09e 100644 (file)
--- a/src/kitemviews/kstandarditem.h
+++ b/src/kitemviews/kstandarditem.h
@@ -24,7 +24,7 @@
 
 #include <QByteArray>
 #include <QHash>
 
 #include <QByteArray>
 #include <QHash>

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

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


@@ -36,14 +36,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:
     explicit KStandardItem(KStandardItem* parent = nullptr);
     explicit KStandardItem(const QString& text, KStandardItem* parent = nullptr);
     KStandardItem(const QString& icon, const QString& text, KStandardItem* parent = nullptr);
 public:
     explicit KStandardItem(KStandardItem* parent = nullptr);
     explicit KStandardItem(const QString& text, KStandardItem* parent = nullptr);
     KStandardItem(const QString& icon, const QString& text, KStandardItem* parent = nullptr);

-    KStandardItem(const KStandardItem& item);

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


@@ -70,14 +69,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 +81,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;

diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp
index a4d42b5715a73162b25a090ae35125ca73644c55..d7307c0bdd40d56030fa0adc1ba047739818b7dd 100644 (file)
--- a/src/kitemviews/kstandarditemmodel.cpp
+++ b/src/kitemviews/kstandarditemmodel.cpp
@@ -112,7 +112,7 @@ void KStandardItemModel::removeItem(int index)
 
         onItemRemoved(index, item);
 
 
         onItemRemoved(index, item);
 

-        delete item;
+        item->deleteLater();

         item = nullptr;
 
         emit itemsRemoved(KItemRangeList() << KItemRange(index, 1));
         item = nullptr;
 
         emit itemsRemoved(KItemRangeList() << KItemRange(index, 1));