QtWidgets/Graphics-/ItemViews: mark obsolete functions as deprecated

Mark some long obsolete functions as deprecated so the can be removed
with Qt6:
 - QGraphicsItem::matrix()/setMatrix()/resetMatrix()/sceneMatrix()
 - QGraphicsItemAnimation::reset()
 - QGraphicsScene::isSortCacheEnabled()/setSortCacheEnabled()
 - QAbstractItemDelegate::elidedText()
 - QAbstractItemView::setHorizontalStepsPerItem()/horizontalStepsPerItem()
 - QAbstractItemView::setVerticalStepsPerItem()/verticalStepsPerItem()

Change-Id: I7244078552ebeac9dfbcf3291b3ae0c44cc2c1d9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>

6 files changed, 25 insertions, 3 deletions

diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index 4476ecded3..6e53ea94f3 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -3997,6 +3997,7 @@ void QGraphicsItem::ensureVisible(const QRectF &rect, int xmargin, int ymargin)
     ensureVisible(QRectF(\a x, \a y, \a w, \a h), \a xmargin, \a ymargin).
 */
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4012,6 +4013,7 @@ QMatrix QGraphicsItem::matrix() const
 {
     return transform().toAffine();
 }
+#endif
 
 /*!
     \since 4.3
@@ -4322,6 +4324,7 @@ void QGraphicsItem::setTransformOriginPoint(const QPointF &origin)
 */
 
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4334,7 +4337,7 @@ QMatrix QGraphicsItem::sceneMatrix() const
     d_ptr->ensureSceneTransform();
     return d_ptr->sceneTransform.toAffine();
 }
-
+#endif
 
 /*!
     \since 4.3
@@ -4546,6 +4549,7 @@ QTransform QGraphicsItem::itemTransform(const QGraphicsItem *other, bool *ok) co
     return x;
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4584,6 +4588,7 @@ void QGraphicsItem::setMatrix(const QMatrix &matrix, bool combine)
     // Send post-notification.
     itemChange(ItemTransformHasChanged, QVariant::fromValue<QTransform>(newTransform));
 }
+#endif
 
 /*!
     \since 4.3
@@ -4638,6 +4643,7 @@ void QGraphicsItem::setTransform(const QTransform &matrix, bool combine)
     d_ptr->sendScenePosChange();
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \obsolete
 
@@ -4647,6 +4653,7 @@ void QGraphicsItem::resetMatrix()
 {
     resetTransform();
 }
+#endif
 
 /*!
     \since 4.3
diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h
index 729176530d..7dd4441ae9 100644
--- a/src/widgets/graphicsview/qgraphicsitem.h
+++ b/src/widgets/graphicsview/qgraphicsitem.h
@@ -283,10 +283,16 @@ public:
     inline void ensureVisible(qreal x, qreal y, qreal w, qreal h, int xmargin = 50, int ymargin = 50);
 
     // Local transformation
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use transform() instead")
     QMatrix matrix() const;
+    QT_DEPRECATED_X("Use sceneTransform() instead")
     QMatrix sceneMatrix() const;
+    QT_DEPRECATED_X("Use setTransform() instead")
     void setMatrix(const QMatrix &matrix, bool combine = false);
+    QT_DEPRECATED_X("Use resetTransform() instead")
     void resetMatrix();
+#endif
     QTransform transform() const;
     QTransform sceneTransform() const;
     QTransform deviceTransform(const QTransform &viewportTransform) const;
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.cpp b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
index 572ec141bc..78b91d5c39 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.cpp
@@ -549,6 +549,7 @@ void QGraphicsItemAnimation::setStep(qreal step)
     afterAnimationStep(step);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     Resets the item to its starting position and transformation.
 
@@ -563,6 +564,7 @@ void QGraphicsItemAnimation::reset()
     d->startPos = d->item->pos();
     d->startMatrix = d->item->matrix();
 }
+#endif
 
 /*!
   \fn void QGraphicsItemAnimation::beforeAnimationStep(qreal step)
diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h
index 7417d7729c..f983bd8026 100644
--- a/src/widgets/graphicsview/qgraphicsitemanimation.h
+++ b/src/widgets/graphicsview/qgraphicsitemanimation.h
@@ -96,7 +96,10 @@ public:
 
 public Q_SLOTS:
     void setStep(qreal x);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED_X("Use setStep(0) instead")
     void reset();
+#endif
 
 protected:
     virtual void beforeAnimationStep(qreal step);
diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp
index db7ce5251a..a60c2872ae 100644
--- a/src/widgets/graphicsview/qgraphicsscene.cpp
+++ b/src/widgets/graphicsview/qgraphicsscene.cpp
@@ -1929,6 +1929,7 @@ void QGraphicsScene::setBspTreeDepth(int depth)
     bspTree->setBspTreeDepth(depth);
 }
 
+#if QT_DEPRECATED_SINCE(5, 13)
 /*!
     \property QGraphicsScene::sortCacheEnabled
     \brief whether sort caching is enabled
@@ -1949,6 +1950,7 @@ void QGraphicsScene::setSortCacheEnabled(bool enabled)
         return;
     d->sortCacheEnabled = enabled;
 }
+#endif
 
 /*!
     Calculates and returns the bounding rect of all items on the scene. This
diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h
index 287e551db7..71b8fc3013 100644
--- a/src/widgets/graphicsview/qgraphicsscene.h
+++ b/src/widgets/graphicsview/qgraphicsscene.h
@@ -141,8 +141,10 @@ public:
     ItemIndexMethod itemIndexMethod() const;
     void setItemIndexMethod(ItemIndexMethod method);
 
-    bool isSortCacheEnabled() const;
-    void setSortCacheEnabled(bool enabled);
+#if QT_DEPRECATED_SINCE(5, 13)
+    QT_DEPRECATED bool isSortCacheEnabled() const;
+    QT_DEPRECATED void setSortCacheEnabled(bool enabled);
+#endif
 
     int bspTreeDepth() const;
     void setBspTreeDepth(int depth);