AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Christian Ehrlicher 2019-01-26 20:06:14 +01:00
parent 1b90684948
commit 93cebb3837
10 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/widgets/graphicsview/qgraphicsitem.cpp
View File

@ -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

6
src/widgets/graphicsview/qgraphicsitem.h
View File

@ -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;

2
src/widgets/graphicsview/qgraphicsitemanimation.cpp
View File

@ -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)

3
src/widgets/graphicsview/qgraphicsitemanimation.h
View File

@ -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);

2
src/widgets/graphicsview/qgraphicsscene.cpp
View File

@ -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

6
src/widgets/graphicsview/qgraphicsscene.h
View File

@ -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);

2
src/widgets/itemviews/qabstractitemdelegate.cpp
View File

@ -345,6 +345,7 @@ bool QAbstractItemDelegate::editorEvent(QEvent *,
return false;
}
#if QT_DEPRECATED_SINCE(5, 13)
/*!
\obsolete
@ -364,6 +365,7 @@ QString QAbstractItemDelegate::elidedText(const QFontMetrics &fontMetrics, int w
{
return fontMetrics.elidedText(text, mode, width);
}
#endif
/*!
\since 4.3

3
src/widgets/itemviews/qabstractitemdelegate.h
View File

@ -103,8 +103,11 @@ public:
const QStyleOptionViewItem &option,
const QModelIndex &index);
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use QFontMetrics::elidedText() instead")
static QString elidedText(const QFontMetrics &fontMetrics, int width,
Qt::TextElideMode mode, const QString &text);
#endif
virtual bool helpEvent(QHelpEvent *event,
QAbstractItemView *view,

2
src/widgets/itemviews/qabstractitemview.cpp
View File

@ -2921,6 +2921,7 @@ void QAbstractItemView::editorDestroyed(QObject *editor)
setState(NoState);
}
#if QT_DEPRECATED_SINCE(5, 13)
/*!
\obsolete
Sets the horizontal scroll bar's steps per item to \a steps.
@ -2978,6 +2979,7 @@ int QAbstractItemView::verticalStepsPerItem() const
{
return 1;
}
#endif
/*!
Moves to and selects the item best matching the string \a search.

10
src/widgets/itemviews/qabstractitemview.h
View File

@ -272,10 +272,12 @@ Q_SIGNALS:
protected:
QAbstractItemView(QAbstractItemViewPrivate &, QWidget *parent = nullptr);
void setHorizontalStepsPerItem(int steps);
int horizontalStepsPerItem() const;
void setVerticalStepsPerItem(int steps);
int verticalStepsPerItem() const;
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED void setHorizontalStepsPerItem(int steps);
QT_DEPRECATED int horizontalStepsPerItem() const;
QT_DEPRECATED void setVerticalStepsPerItem(int steps);
QT_DEPRECATED int verticalStepsPerItem() const;
#endif
enum CursorAction { MoveUp, MoveDown, MoveLeft, MoveRight,
MoveHome, MoveEnd, MovePageUp, MovePageDown,