┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews/kstandarditem.h
diff options
context:
space:
mode:
authorDavid Hallas <[email protected]>2019-04-22 19:40:16 +0200
committerDavid Hallas <[email protected]>2019-05-13 16:58:21 +0200
commit78540e49213ed1a03687d55063816659c9142eba (patch)
treea6866dc21d8def8ba9d809223f671afef7d56032 /src/kitemviews/kstandarditem.h
parent2fac50f5f59bbbc58a59e7ab5f1ec4e371a604c6 (diff)
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
Diffstat (limited to 'src/kitemviews/kstandarditem.h')
-rw-r--r--src/kitemviews/kstandarditem.h14
1 files changed, 3 insertions, 11 deletions
diff --git a/src/kitemviews/kstandarditem.h b/src/kitemviews/kstandarditem.h
index fec197c06..ad3452d77 100644
--- a/src/kitemviews/kstandarditem.h
+++ b/src/kitemviews/kstandarditem.h
@@ -24,7 +24,7 @@
#include <QByteArray>
#include <QHash>
-#include <QList>
+#include <QObject>
#include <QVariant>
class KStandardItemModel;
@@ -36,14 +36,13 @@ class KStandardItemModel;
* 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);
- KStandardItem(const KStandardItem& item);
virtual ~KStandardItem();
/**
@@ -70,14 +69,9 @@ public:
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;
- QList<KStandardItem*> children() const;
-
protected:
virtual void onDataValueChanged(const QByteArray& role,
const QVariant& current,
@@ -87,8 +81,6 @@ protected:
const QHash<QByteArray, QVariant>& previous);
private:
- KStandardItem* m_parent;
- QList<KStandardItem*> m_children;
KStandardItemModel* m_model;
QHash<QByteArray, QVariant> m_data;