1 files changed, 22 insertions, 10 deletions
diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h
index 582330c7b5..862a016d5f 100644
--- a/src/widgets/itemviews/qtableview_p.h
+++ b/src/widgets/itemviews/qtableview_p.h
@@ -16,13 +16,18 @@
 //
 
 #include <QtWidgets/private/qtwidgetsglobal_p.h>
+#include "qtableview.h"
+#include "qheaderview.h"
+
 #include <QtCore/QList>
 #include <QtCore/QMap>
 #include <QtCore/QSet>
 #include <QtCore/QDebug>
 #include "private/qabstractitemview_p.h"
 
+#include <array>
 #include <list>
+#include <vector>
 
 QT_REQUIRE_CONFIG(tableview);
 
@@ -93,7 +98,9 @@ private:
 
 Q_DECLARE_TYPEINFO ( QSpanCollection::Span, Q_RELOCATABLE_TYPE);
 
-
+#if QT_CONFIG(abstractbutton)
+class QTableCornerButton;
+#endif
 class Q_AUTOTEST_EXPORT QTableViewPrivate : public QAbstractItemViewPrivate
 {
     Q_DECLARE_PUBLIC(QTableView)
@@ -111,6 +118,7 @@ public:
 #endif
  }
     void init();
+    void clearConnections();
     void trimHiddenSelections(QItemSelectionRange *range) const;
     QRect intersectedRect(const QRect rect, const QModelIndex &topLeft, const QModelIndex &bottomRight) const override;
 
@@ -156,8 +164,15 @@ public:
     QHeaderView *horizontalHeader;
     QHeaderView *verticalHeader;
 #if QT_CONFIG(abstractbutton)
-    QWidget *cornerWidget;
+    QTableCornerButton *cornerWidget;
+    QMetaObject::Connection cornerWidgetConnection;
 #endif
+    QMetaObject::Connection selectionmodelConnection;
+    std::array<QMetaObject::Connection, 4> modelConnections;
+    std::array<QMetaObject::Connection, 7> verHeaderConnections;
+    std::array<QMetaObject::Connection, 5> horHeaderConnections;
+    std::vector<QMetaObject::Connection> dynHorHeaderConnections;
+
     bool sortingEnabled;
     bool geometryRecursionBlock;
     QPoint visualCursor;  // (Row,column) cell coordinates to track through span navigation.
@@ -210,17 +225,14 @@ public:
 
     QRect visualSpanRect(const QSpanCollection::Span &span) const;
 
-    void _q_selectRow(int row);
-    void _q_selectColumn(int column);
-
     void selectRow(int row, bool anchor);
     void selectColumn(int column, bool anchor);
 
-    void _q_updateSpanInsertedRows(const QModelIndex &parent, int start, int end);
-    void _q_updateSpanInsertedColumns(const QModelIndex &parent, int start, int end);
-    void _q_updateSpanRemovedRows(const QModelIndex &parent, int start, int end);
-    void _q_updateSpanRemovedColumns(const QModelIndex &parent, int start, int end);
-    void _q_sortIndicatorChanged(int column, Qt::SortOrder order);
+    void updateSpanInsertedRows(const QModelIndex &parent, int start, int end);
+    void updateSpanInsertedColumns(const QModelIndex &parent, int start, int end);
+    void updateSpanRemovedRows(const QModelIndex &parent, int start, int end);
+    void updateSpanRemovedColumns(const QModelIndex &parent, int start, int end);
+    void sortIndicatorChanged(int column, Qt::SortOrder order);
 };
 
 QT_END_NAMESPACE