Use boolean to indicate QTableWidgetItem is header item

QTableWidgetItem uses additional enum flag ItemIsHeaderItem which has
the same numerical value as ItemFlag ItemNeverHasChildren.
This causes conflict since the user can set the latter flag using
the setFlags, while the ItemIsHeaderItem is only used internally
to mark header items.

Remove the additional flag and use boolean instead to fix the conflict.

Pick-to: 6.2 6.5 6.5.1
Fixes: QTBUG-113209
Change-Id: Icff549c7e452d9f84575a524361719204817274e
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

1 files changed, 2 insertions, 5 deletions

diff --git a/src/widgets/itemviews/qtablewidget_p.h b/src/widgets/itemviews/qtablewidget_p.h
index 1d893224c0..6bfa355edb 100644
--- a/src/widgets/itemviews/qtablewidget_p.h
+++ b/src/widgets/itemviews/qtablewidget_p.h
@@ -53,10 +53,6 @@ class QTableModel : public QAbstractTableModel
     friend class QTableWidget;
 
 public:
-    enum ItemFlagsExtension {
-        ItemIsHeaderItem = 128
-    }; // we need this to separate header items from other items
-
     QTableModel(int rows, int columns, QTableWidget *parent);
     ~QTableModel();
 
@@ -173,9 +169,10 @@ public:
 class QTableWidgetItemPrivate
 {
 public:
-    QTableWidgetItemPrivate(QTableWidgetItem *item) : q(item), id(-1) {}
+    QTableWidgetItemPrivate(QTableWidgetItem *item) : q(item), id(-1), headerItem(false) {}
     QTableWidgetItem *q;
     int id;
+    bool headerItem; // Qt 7 TODO: inline this stuff in the public class.
 };
 
 QT_END_NAMESPACE