From 32b586864e3a4398da38c045f4ac0823c3dc3c57 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 5 Jun 2020 20:29:48 +0200
Subject: QAbstractItemModel: remove deprecated setRoleNames()

Remove setRoleNames() and all its now unneeded helper functions.

Change-Id: I0a83751aace35700655d4cc7c79278325994cbdd
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
---
 src/gui/itemmodels/qstandarditemmodel.cpp | 9 +++++++++
 src/gui/itemmodels/qstandarditemmodel.h   | 1 +
 src/gui/itemmodels/qstandarditemmodel_p.h | 1 +
 3 files changed, 11 insertions(+)

(limited to 'src/gui/itemmodels')

diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp
index 8bc5abe461..d40e5d7923 100644
--- a/src/gui/itemmodels/qstandarditemmodel.cpp
+++ b/src/gui/itemmodels/qstandarditemmodel.cpp
@@ -2232,6 +2232,15 @@ void QStandardItemModel::setItemRoleNames(const QHash<int,QByteArray> &roleNames
     d->roleNames = roleNames;
 }
 
+/*!
+  reimp
+*/
+QHash<int, QByteArray> QStandardItemModel::roleNames() const
+{
+    Q_D(const QStandardItemModel);
+    return d->roleNames;
+}
+
 /*!
     Removes all items (including header items) from the model and sets the
     number of rows and columns to zero.
diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h
index e0b274649a..34747fa86b 100644
--- a/src/gui/itemmodels/qstandarditemmodel.h
+++ b/src/gui/itemmodels/qstandarditemmodel.h
@@ -321,6 +321,7 @@ public:
     ~QStandardItemModel();
 
     void setItemRoleNames(const QHash<int,QByteArray> &roleNames);
+    QHash<int, QByteArray> roleNames() const override;
 
     QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
     QModelIndex parent(const QModelIndex &child) const override;
diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
index 97c2e6f01b..5a06b70c0b 100644
--- a/src/gui/itemmodels/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -245,6 +245,7 @@ public:
 
     QVector<QStandardItem*> columnHeaderItems;
     QVector<QStandardItem*> rowHeaderItems;
+    QHash<int, QByteArray> roleNames;
     QScopedPointer<QStandardItem> root;
     const QStandardItem *itemPrototype;
     int sortRole;
-- 
cgit v1.2.3