From d0069ff8c91e0027a0a1f3ef7767dbb13e0eacc4 Mon Sep 17 00:00:00 2001
From: Luca Beldi <v.ronin@yahoo.it>
Date: Wed, 1 Aug 2018 16:43:31 +0100
Subject: Add a method to clear the data to QStandardItemModel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After the behavior of setItemData has been changed following QTBUG-45114,
QStandardItemModel was lacking an interface to clear all the data from a single index.

Task-number: QTBUG-69616
Change-Id: Ide0b5bb6358439fc42c474df8b044fbace6def8d
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: David Faure <david.faure@kdab.com>
---
 .../itemmodels/qstandarditem/tst_qstandarditem.cpp | 12 ++++++++++++
 .../qstandarditemmodel/tst_qstandarditemmodel.cpp  | 22 ++++++++++++++++++++++
 2 files changed, 34 insertions(+)

(limited to 'tests/auto/gui/itemmodels')

diff --git a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
index a45539a041..d19aa9b54f 100644
--- a/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditem/tst_qstandarditem.cpp
@@ -69,8 +69,20 @@ private slots:
     void sortChildren();
     void subclassing();
     void lessThan();
+    void clearData();
 };
 
+void tst_QStandardItem::clearData()
+{
+    QStandardItem item;
+    item.setData(QStringLiteral("Test"), Qt::EditRole);
+    item.setData(5, Qt::UserRole);
+    item.clearData();
+    QCOMPARE(item.data(Qt::EditRole), QVariant());
+    QCOMPARE(item.data(Qt::UserRole), QVariant());
+    QCOMPARE(item.data(Qt::DisplayRole), QVariant());
+}
+
 void tst_QStandardItem::ctor()
 {
     QStandardItem item;
diff --git a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
index 9399ebce34..f6ed3e142d 100644
--- a/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
+++ b/tests/auto/gui/itemmodels/qstandarditemmodel/tst_qstandarditemmodel.cpp
@@ -98,6 +98,7 @@ private slots:
     void checkChildren();
     void data();
     void clear();
+    void clearItemData();
     void sort_data();
     void sort();
     void sortRole_data();
@@ -752,6 +753,27 @@ void tst_QStandardItemModel::data()
 
 }
 
+void tst_QStandardItemModel::clearItemData()
+{
+    currentRoles.clear();
+    QVERIFY(!m_model->clearItemData(QModelIndex()));
+    QCOMPARE(currentRoles, {});
+    const QModelIndex idx = m_model->index(0, 0);
+    const QMap<int, QVariant> oldData = m_model->itemData(idx);
+    m_model->setData(idx, QLatin1String("initialitem"), Qt::DisplayRole);
+    m_model->setData(idx, QLatin1String("tooltip"), Qt::ToolTipRole);
+    m_model->setData(idx, 5, Qt::UserRole);
+    currentRoles.clear();
+    QVERIFY(m_model->clearItemData(idx));
+    QCOMPARE(idx.data(Qt::UserRole), QVariant());
+    QCOMPARE(idx.data(Qt::ToolTipRole), QVariant());
+    QCOMPARE(idx.data(Qt::DisplayRole), QVariant());
+    QCOMPARE(idx.data(Qt::EditRole), QVariant());
+    QCOMPARE(currentRoles, {});
+    m_model->setItemData(idx, oldData);
+    currentRoles.clear();
+}
+
 void tst_QStandardItemModel::clear()
 {
     QStandardItemModel model;
-- 
cgit v1.2.3