diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp index 4fb3f8f98..b3bbcaa41 100644 --- a/src/kitemviews/kstandarditem.cpp +++ b/src/kitemviews/kstandarditem.cpp @@ -1,169 +1,142 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "kstandarditem.h" #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_parent(parent), - m_children(), + QObject(parent), m_model(nullptr), m_data() { setText(text); } KStandardItem::KStandardItem(const QString& icon, const QString& text, KStandardItem* parent) : - m_parent(parent), - m_children(), + QObject(parent), m_model(nullptr), m_data() { setIcon(icon); 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) { setDataValue("text", text); } QString KStandardItem::text() const { return m_data["text"].toString(); } void KStandardItem::setIcon(const QString& icon) { setDataValue("iconName", icon); } QString KStandardItem::icon() const { 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) { setDataValue("group", group); } QString KStandardItem::group() const { return m_data["group"].toString(); } 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); onDataValueChanged(role, value, previous); if (m_model) { const int index = m_model->index(this); QSet 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 { 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& values) { const QHash previous = m_data; m_data = values; onDataChanged(values, previous); } QHash KStandardItem::data() const { return m_data; } -QList KStandardItem::children() const -{ - 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& current, const QHash& previous) { Q_UNUSED(current); Q_UNUSED(previous); } 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 @@ -1,101 +1,93 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #ifndef KSTANDARDITEM_H #define KSTANDARDITEM_H #include "dolphin_export.h" #include #include -#include +#include #include class KStandardItemModel; /** * @brief Represents and item of KStandardItemModel. * * Provides setter- and getter-methods for the most commonly * 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(); /** * Sets the text for the "text"-role. */ void setText(const QString& text); QString text() const; /** * Sets the icon for the "iconName"-role. */ void setIcon(const QString& icon); QString icon() const; void setIconOverlays(const QStringList& overlays); QStringList iconOverlays() const; /** * Sets the group for the "group"-role. */ void setGroup(const QString& group); QString group() 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& values); QHash data() const; - QList children() const; - protected: virtual void onDataValueChanged(const QByteArray& role, const QVariant& current, const QVariant& previous); virtual void onDataChanged(const QHash& current, const QHash& previous); private: - KStandardItem* m_parent; - QList m_children; KStandardItemModel* m_model; QHash m_data; friend class KStandardItemModel; }; #endif diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp index a4d42b571..d7307c0bd 100644 --- a/src/kitemviews/kstandarditemmodel.cpp +++ b/src/kitemviews/kstandarditemmodel.cpp @@ -1,238 +1,238 @@ /*************************************************************************** * Copyright (C) 2012 by Peter Penz * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ #include "kstandarditemmodel.h" #include "kstandarditem.h" KStandardItemModel::KStandardItemModel(QObject* parent) : KItemModelBase(parent), m_items(), m_indexesForItems() { } KStandardItemModel::~KStandardItemModel() { qDeleteAll(m_items); m_items.clear(); m_indexesForItems.clear(); } void KStandardItemModel::insertItem(int index, KStandardItem* item) { if (index < 0 || index > count() || !item) { delete item; return; } if (!m_indexesForItems.contains(item)) { item->m_model = this; m_items.insert(index, item); m_indexesForItems.insert(item, index); // Inserting an item requires to update the indexes // afterwards from m_indexesForItems. for (int i = index + 1; i < m_items.count(); ++i) { m_indexesForItems.insert(m_items[i], i); } // TODO: no hierarchical items are handled yet onItemInserted(index); emit itemsInserted(KItemRangeList() << KItemRange(index, 1)); } } void KStandardItemModel::changeItem(int index, KStandardItem* item) { if (index < 0 || index >= count() || !item) { delete item; return; } item->m_model = this; QSet changedRoles; KStandardItem* oldItem = m_items[index]; const QHash oldData = oldItem->data(); const QHash newData = item->data(); // Determine which roles have been changed QHashIterator it(oldData); while (it.hasNext()) { it.next(); const QByteArray role = it.key(); const QVariant oldValue = it.value(); if (newData.contains(role) && newData.value(role) != oldValue) { changedRoles.insert(role); } } m_indexesForItems.remove(oldItem); delete oldItem; oldItem = nullptr; m_items[index] = item; m_indexesForItems.insert(item, index); onItemChanged(index, changedRoles); emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles); } void KStandardItemModel::removeItem(int index) { if (index >= 0 && index < count()) { KStandardItem* item = m_items[index]; m_indexesForItems.remove(item); m_items.removeAt(index); // Removing an item requires to update the indexes // afterwards from m_indexesForItems. for (int i = index; i < m_items.count(); ++i) { m_indexesForItems.insert(m_items[i], i); } onItemRemoved(index, item); - delete item; + item->deleteLater(); item = nullptr; emit itemsRemoved(KItemRangeList() << KItemRange(index, 1)); // TODO: no hierarchical items are handled yet } } void KStandardItemModel::clear() { int size = m_items.size(); m_items.clear(); m_indexesForItems.clear(); emit itemsRemoved(KItemRangeList() << KItemRange(0, size)); } KStandardItem* KStandardItemModel::item(int index) const { if (index < 0 || index >= m_items.count()) { return nullptr; } return m_items[index]; } int KStandardItemModel::index(const KStandardItem* item) const { return m_indexesForItems.value(item, -1); } void KStandardItemModel::appendItem(KStandardItem *item) { insertItem(m_items.count(), item); } int KStandardItemModel::count() const { return m_items.count(); } QHash KStandardItemModel::data(int index) const { if (index >= 0 && index < count()) { const KStandardItem* item = m_items[index]; if (item) { return item->data(); } } return QHash(); } bool KStandardItemModel::setData(int index, const QHash& values) { Q_UNUSED(values); if (index < 0 || index >= count()) { return false; } return true; } QMimeData* KStandardItemModel::createMimeData(const KItemSet& indexes) const { Q_UNUSED(indexes); return nullptr; } int KStandardItemModel::indexForKeyboardSearch(const QString& text, int startFromIndex) const { Q_UNUSED(text); Q_UNUSED(startFromIndex); return -1; } bool KStandardItemModel::supportsDropping(int index) const { Q_UNUSED(index); return false; } QString KStandardItemModel::roleDescription(const QByteArray& role) const { Q_UNUSED(role); return QString(); } QList > KStandardItemModel::groups() const { QList > groups; const QByteArray role = sortRole().isEmpty() ? "group" : sortRole(); bool isFirstGroupValue = true; QString groupValue; const int maxIndex = count() - 1; for (int i = 0; i <= maxIndex; ++i) { const QString newGroupValue = m_items.at(i)->dataValue(role).toString(); if (newGroupValue != groupValue || isFirstGroupValue) { groupValue = newGroupValue; groups.append(QPair(i, newGroupValue)); isFirstGroupValue = false; } } return groups; } void KStandardItemModel::onItemInserted(int index) { Q_UNUSED(index); } void KStandardItemModel::onItemChanged(int index, const QSet& changedRoles) { Q_UNUSED(index); Q_UNUSED(changedRoles); } void KStandardItemModel::onItemRemoved(int index, KStandardItem* removedItem) { Q_UNUSED(index); Q_UNUSED(removedItem); }