From 4e2656a6d2de3be6cb98cbb98bbadf17815dae48 Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Fri, 4 Sep 2020 17:09:47 +0200 Subject: QStyleOptionGraphicsItem: remove deprecated member matrix/levelOfDetail QStyleOptionGraphicsItem::matrix and levelOfDetail are deprecated and not used anywhere anymore. Change-Id: Id4b0fa8ac3ac53d771e858ecda5524a5e690342d Reviewed-by: Volker Hilsheimer --- src/widgets/styles/qstyleoption.cpp | 36 ++---------------------------------- src/widgets/styles/qstyleoption.h | 2 -- 2 files changed, 2 insertions(+), 36 deletions(-) (limited to 'src/widgets/styles') diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp index b7b5b99e3a..485b1858c2 100644 --- a/src/widgets/styles/qstyleoption.cpp +++ b/src/widgets/styles/qstyleoption.cpp @@ -3630,7 +3630,7 @@ QStyleOptionSizeGrip::QStyleOptionSizeGrip(int version) Constructs a QStyleOptionGraphicsItem. */ QStyleOptionGraphicsItem::QStyleOptionGraphicsItem() - : QStyleOption(Version, Type), levelOfDetail(1) + : QStyleOption(Version, Type) { } @@ -3638,7 +3638,7 @@ QStyleOptionGraphicsItem::QStyleOptionGraphicsItem() \internal */ QStyleOptionGraphicsItem::QStyleOptionGraphicsItem(int version) - : QStyleOption(version, Type), levelOfDetail(1) + : QStyleOption(version, Type) { } @@ -3685,38 +3685,6 @@ qreal QStyleOptionGraphicsItem::levelOfDetailFromTransform(const QTransform &wor QGraphicsItem::ItemUsesExtendedStyleOption flag set. */ -/*! - \variable QStyleOptionGraphicsItem::matrix - \brief the complete transformation matrix for the item - \obsolete - - The QTransform provided through this member does include information about - any perspective transformations applied to the view or item. To get the - correct transformation matrix, use QPainter::transform() on the painter - passed into the QGraphicsItem::paint() implementation. - - This matrix is the combination of the item's scene matrix and the matrix - of the painter used for drawing the item. It is provided for convenience, - allowing anvanced level-of-detail metrics that can be used to speed up - item drawing. - - To find the dimensions of an item in screen coordinates (i.e., pixels), - you can use the mapping functions of QTransform, such as QTransform::map(). - - This member is only initialized for items that have the - QGraphicsItem::ItemUsesExtendedStyleOption flag set. - - \sa QStyleOptionGraphicsItem::levelOfDetailFromTransform() -*/ - -/*! - \variable QStyleOptionGraphicsItem::levelOfDetail - \obsolete - - Use QStyleOptionGraphicsItem::levelOfDetailFromTransform() - together with QPainter::worldTransform() instead. -*/ - /*! \class QStyleHintReturn \brief The QStyleHintReturn class provides style hints that return more diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index 22ac309cc6..38e70e2078 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -669,8 +669,6 @@ public: enum StyleOptionVersion { Version = 1 }; QRectF exposedRect; - QTransform matrix; - qreal levelOfDetail; QStyleOptionGraphicsItem(); QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; } -- cgit v1.2.3