QHeaderView - renaming functions in Qt5

This patch renames the functions in Qt5 according to the
notes. It also renames resizeMode to be consistent.

The old functions are both marked with both QT_DEPRECATED
and '### Qt 6 - remove'

All usage of the function within the qtbase are also
changed to use the new functions.

Change-Id: I9e05fa41d232e9ca43b945fcc949987017f3aedd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

1 files changed, 21 insertions, 6 deletions

diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h
index d72b8cd735..bf686e2925 100644
--- a/src/widgets/itemviews/qheaderview.h
+++ b/src/widgets/itemviews/qheaderview.h
@@ -114,18 +114,33 @@ public:
     int visualIndex(int logicalIndex) const;
     int logicalIndex(int visualIndex) const;
 
-    void setMovable(bool movable);
-    bool isMovable() const;
+    void setSectionsMovable(bool movable);
+    bool sectionsMovable() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    inline QT_DEPRECATED void setMovable(bool movable) { setSectionsMovable(movable); }
+    inline QT_DEPRECATED bool isMovable() const { return sectionsMovable(); }
+#endif
 
-    void setClickable(bool clickable);
-    bool isClickable() const;
+    void setSectionsClickable(bool clickable);
+    bool sectionsClickable() const;
+#if QT_DEPRECATED_SINCE(5, 0)
+    inline QT_DEPRECATED void setClickable(bool clickable) { setSectionsClickable(clickable); }
+    inline QT_DEPRECATED bool isClickable() const { return sectionsClickable(); }
+#endif
 
     void setHighlightSections(bool highlight);
     bool highlightSections() const;
 
     void setResizeMode(ResizeMode mode);
-    void setResizeMode(int logicalIndex, ResizeMode mode);
-    ResizeMode resizeMode(int logicalIndex) const;
+    ResizeMode sectionResizeMode(int logicalIndex) const;
+    void setSectionResizeMode(int logicalIndex, ResizeMode mode);
+#if QT_DEPRECATED_SINCE(5, 0)
+    inline QT_DEPRECATED void setResizeMode(int logicalindex, ResizeMode mode)
+        { setSectionResizeMode(logicalindex, mode); }
+    inline QT_DEPRECATED ResizeMode resizeMode(int logicalindex) const
+        { return sectionResizeMode(logicalindex); }
+#endif
+
     int stretchSectionCount() const;
 
     void setSortIndicatorShown(bool show);