From 90210c8d28a90295ebbf37ef45b69924ed7f42d0 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Thu, 7 May 2020 09:30:16 +0200
Subject: Remove dead code from src/widgets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Code that's removed via QT_VERSION(6, 0, 0) check is already no
longer compiled.

Change-Id: I70865f330a6260ac2e9cf2770d599a5b6f7bb7d4
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
---
 src/widgets/itemviews/qtreewidget.cpp | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/widgets/itemviews/qtreewidget.cpp')

diff --git a/src/widgets/itemviews/qtreewidget.cpp b/src/widgets/itemviews/qtreewidget.cpp
index 25b3f3a778..244f1872c2 100644
--- a/src/widgets/itemviews/qtreewidget.cpp
+++ b/src/widgets/itemviews/qtreewidget.cpp
@@ -392,7 +392,6 @@ bool QTreeModel::setData(const QModelIndex &index, const QVariant &value, int ro
     return false;
 }
 
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
 bool QTreeModel::clearItemData(const QModelIndex &index)
 {
     if (!checkIndex(index, CheckIndexOption::IndexIsValid))
@@ -411,7 +410,6 @@ bool QTreeModel::clearItemData(const QModelIndex &index)
     emit dataChanged(index, index, QVector<int>{});
     return true;
 }
-#endif
 
 QMap<int, QVariant> QTreeModel::itemData(const QModelIndex &index) const
 {
@@ -3257,11 +3255,7 @@ QStringList QTreeWidget::mimeTypes() const
     If the list of items is empty, \nullptr is returned rather than a
     serialized empty list.
 */
-#if QT_VERSION >= QT_VERSION_CHECK(6,0,0)
 QMimeData *QTreeWidget::mimeData(const QList<QTreeWidgetItem *> &items) const
-#else
-QMimeData *QTreeWidget::mimeData(const QList<QTreeWidgetItem*> items) const
-#endif
 {
     Q_D(const QTreeWidget);
     if (d->treeModel()->cachedIndexes.isEmpty()) {
@@ -3339,17 +3333,6 @@ QModelIndex QTreeWidget::indexFromItem(const QTreeWidgetItem *item, int column)
     return d->index(item, column);
 }
 
-#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
-/*!
-    \overload
-    \internal
-*/
-QModelIndex QTreeWidget::indexFromItem(QTreeWidgetItem *item, int column) const
-{
-    return indexFromItem(const_cast<const QTreeWidgetItem *>(item), column);
-}
-#endif
-
 /*!
     Returns a pointer to the QTreeWidgetItem associated with the given \a index.
 
-- 
cgit v1.2.3