1 files changed, 6 insertions, 78 deletions

diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index 1fcd5bdef2..d7bdf6aa4c 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -189,7 +189,7 @@ static const int maxSizeSection = 1048575; // since section size is in a bitfiel
     The following values are obsolete:
     \value Custom Use Fixed instead.
 
-    \sa setResizeMode(), setSectionResizeMode(), stretchLastSection, minimumSectionSize
+    \sa setSectionResizeMode(), stretchLastSection, minimumSectionSize
 */
 
 /*!
@@ -880,7 +880,7 @@ void QHeaderView::swapSections(int first, int second)
     size equal to zero is however not recommended. In that situation hideSection
     should be used instead.
 
-    \sa sectionResized(), resizeMode(), sectionSize(), hideSection()
+    \sa sectionResized(), sectionSize(), hideSection()
 */
 
 void QHeaderView::resizeSection(int logical, int size)
@@ -960,7 +960,7 @@ void QHeaderView::resizeSection(int logical, int size)
     Resizes the sections according to the given \a mode, ignoring the current
     resize mode.
 
-    \sa resizeMode(), sectionResized()
+    \sa sectionResized()
 */
 
 void QHeaderView::resizeSections(QHeaderView::ResizeMode mode)
@@ -1139,16 +1139,6 @@ void QHeaderView::setSectionsMovable(bool movable)
     d->movableSections = movable;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn void QHeaderView::setMovable(bool movable)
-
-    Use setSectionsMovable instead.
-
-    \sa setSectionsMovable()
-*/
-
 /*!
     \since 5.0
 
@@ -1167,16 +1157,6 @@ bool QHeaderView::sectionsMovable() const
     return d->movableSections;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn bool QHeaderView::isMovable() const
-
-    Use sectionsMovable instead.
-
-    \sa sectionsMovable()
-*/
-
 /*!
     \property QHeaderView::firstSectionMovable
     \brief Whether the first column can be moved by the user
@@ -1223,16 +1203,6 @@ void QHeaderView::setSectionsClickable(bool clickable)
     d->clickableSections = clickable;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn void QHeaderView::setClickable(bool clickable)
-
-    Use setSectionsClickable instead.
-
-    \sa setSectionsClickable()
-*/
-
 /*!
     \since 5.0
 
@@ -1249,16 +1219,6 @@ bool QHeaderView::sectionsClickable() const
     return d->clickableSections;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn bool QHeaderView::isClickable() const
-
-    Use sectionsClickable instead.
-
-    \sa sectionsClickable()
-*/
-
 void QHeaderView::setHighlightSections(bool highlight)
 {
     Q_D(QHeaderView);
@@ -1277,7 +1237,7 @@ bool QHeaderView::highlightSections() const
     Sets the constraints on how the header can be resized to those described
     by the given \a mode.
 
-    \sa resizeMode(), length(), sectionResized()
+    \sa length(), sectionResized()
 */
 
 void QHeaderView::setSectionResizeMode(ResizeMode mode)
@@ -1327,26 +1287,6 @@ void QHeaderView::setSectionResizeMode(int logicalIndex, ResizeMode mode)
         d->doDelayedResizeSections(); // section sizes may change as a result of the new mode
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \overload
-    \obsolete
-    \fn void QHeaderView::setResizeMode(int logicalIndex, ResizeMode mode)
-
-    Use setSectionResizeMode instead.
-
-    \sa setSectionResizeMode()
-*/
-
-/*!
-    \obsolete
-    \fn void QHeaderView::setResizeMode(ResizeMode mode)
-
-    Use setSectionResizeMode instead.
-
-    \sa setSectionResizeMode()
-*/
-
 /*!
     \since 5.0
 
@@ -1407,16 +1347,6 @@ int QHeaderView::resizeContentsPrecision() const
     return d->resizeContentsPrecision;
 }
 
-// ### Qt 6 - remove this obsolete function
-/*!
-    \obsolete
-    \fn QHeaderView::ResizeMode QHeaderView::resizeMode(int logicalIndex) const
-
-    Use sectionResizeMode instead.
-
-    \sa sectionResizeMode()
-*/
-
 /*!
     \since 4.1
 
@@ -1424,7 +1354,7 @@ int QHeaderView::resizeContentsPrecision() const
     views, this can be used to see if the headerview needs to resize the
     sections when the view's geometry changes.
 
-    \sa stretchLastSection, resizeMode()
+    \sa stretchLastSection
 */
 
 int QHeaderView::stretchSectionCount() const
@@ -2640,7 +2570,6 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
     if (pos < 0 && d->state != QHeaderViewPrivate::SelectSections)
         return;
     if (e->buttons() == Qt::NoButton) {
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
         // Under Cocoa, when the mouse button is released, may include an extra
         // simulated mouse moved event. The state of the buttons when this event
         // is generated is already "no button" and the code below gets executed
@@ -2648,7 +2577,6 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
         // column dragging from working. So this code is disabled under Cocoa.
         d->state = QHeaderViewPrivate::NoState;
         d->pressed = -1;
-#endif
     }
     switch (d->state) {
         case QHeaderViewPrivate::ResizeSection: {
@@ -2896,7 +2824,7 @@ bool QHeaderView::viewportEvent(QEvent *e)
     case QEvent::Wheel: {
         QAbstractScrollArea *asa = qobject_cast<QAbstractScrollArea *>(parentWidget());
         if (asa)
-            return QApplication::sendEvent(asa->viewport(), e);
+            return QCoreApplication::sendEvent(asa->viewport(), e);
         break; }
     default:
         break;