diff options
author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-01-26 13:02:58 +0100 |
---|---|---|
committer | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2019-02-02 12:49:30 +0000 |
commit | e56401818b1aae9856a5334f530c4eda33788429 (patch) | |
tree | 2245baac25149eaeb76224a0f2f7cf60074bb603 /src/gui/painting/qpainter.h | |
parent | daee9af969a04a2919a948ba1f5d314626925a9a (diff) |
QtGui/QPainter: mark obsolete functions as deprecated
Mark some long obsolete functions as deprecated so the can be removed
with Qt6:
- initFrom()
- setMatrix()/matrix()/deviceMatrix()/resetMatrix()
- setWorldMatrix()/worldMatrix()/combinedMatrix()
- setMatrixEnabled()/matrixEnabled()
- drawRoundRect()
- setRedirected()/redirected()/restoreRedirected()
Change-Id: I0daed72c0ef06c192309f02366a7201154e75ac9
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'src/gui/painting/qpainter.h')
-rw-r--r-- | src/gui/painting/qpainter.h | 47 |
1 files changed, 31 insertions, 16 deletions
diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index 87c4899f0b..843f24e3e1 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -132,7 +132,10 @@ public: bool end(); bool isActive() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use begin(QPaintDevice*) instead") void initFrom(const QPaintDevice *device); +#endif enum CompositionMode { CompositionMode_SourceOver, @@ -232,28 +235,40 @@ public: void restore(); // XForm functions +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setTransform() instead") void setMatrix(const QMatrix &matrix, bool combine = false); + QT_DEPRECATED_X("Use transform() instead") const QMatrix &matrix() const; + QT_DEPRECATED_X("Use deviceTransform() instead") const QMatrix &deviceMatrix() const; + QT_DEPRECATED_X("Use resetTransform() instead") void resetMatrix(); +#endif void setTransform(const QTransform &transform, bool combine = false); const QTransform &transform() const; const QTransform &deviceTransform() const; void resetTransform(); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use setWorldTransform() instead") void setWorldMatrix(const QMatrix &matrix, bool combine = false); + QT_DEPRECATED_X("Use worldTransform() instead") const QMatrix &worldMatrix() const; + QT_DEPRECATED_X("Use combinedTransform() instead") + QMatrix combinedMatrix() const; + QT_DEPRECATED_X("Use setWorldMatrixEnabled() instead") + void setMatrixEnabled(bool enabled); + QT_DEPRECATED_X("Use worldMatrixEnabled() instead") + bool matrixEnabled() const; +#endif void setWorldTransform(const QTransform &matrix, bool combine = false); const QTransform &worldTransform() const; - QMatrix combinedMatrix() const; QTransform combinedTransform() const; - void setMatrixEnabled(bool enabled); - bool matrixEnabled() const; - void setWorldMatrixEnabled(bool enabled); bool worldMatrixEnabled() const; @@ -355,9 +370,14 @@ public: inline void drawRoundedRect(const QRect &rect, qreal xRadius, qreal yRadius, Qt::SizeMode mode = Qt::AbsoluteSize); +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use drawRoundedRect(..., Qt::RelativeSize) instead") void drawRoundRect(const QRectF &r, int xround = 25, int yround = 25); - inline void drawRoundRect(int x, int y, int w, int h, int = 25, int = 25); - inline void drawRoundRect(const QRect &r, int xround = 25, int yround = 25); + QT_DEPRECATED_X("Use drawRoundedRect(..., Qt::RelativeSize) instead") + void drawRoundRect(int x, int y, int w, int h, int = 25, int = 25); + QT_DEPRECATED_X("Use drawRoundedRect(..., Qt::RelativeSize) instead") + void drawRoundRect(const QRect &r, int xround = 25, int yround = 25); +#endif void drawTiledPixmap(const QRectF &rect, const QPixmap &pm, const QPointF &offset = QPointF()); inline void drawTiledPixmap(int x, int y, int w, int h, const QPixmap &, int sx=0, int sy=0); @@ -464,10 +484,15 @@ public: QPaintEngine *paintEngine() const; +#if QT_DEPRECATED_SINCE(5, 13) + QT_DEPRECATED_X("Use QWidget::render() instead") static void setRedirected(const QPaintDevice *device, QPaintDevice *replacement, const QPoint& offset = QPoint()); + QT_DEPRECATED_X("Use QWidget::render() instead") static QPaintDevice *redirected(const QPaintDevice *device, QPoint *offset = nullptr); + QT_DEPRECATED_X("Use QWidget::render() instead") static void restoreRedirected(const QPaintDevice *device); +#endif void beginNativePainting(); void endNativePainting(); @@ -629,16 +654,6 @@ inline void QPainter::drawPoints(const QPolygon &points) drawPoints(points.constData(), points.size()); } -inline void QPainter::drawRoundRect(int x, int y, int w, int h, int xRnd, int yRnd) -{ - drawRoundRect(QRectF(x, y, w, h), xRnd, yRnd); -} - -inline void QPainter::drawRoundRect(const QRect &rect, int xRnd, int yRnd) -{ - drawRoundRect(QRectF(rect), xRnd, yRnd); -} - inline void QPainter::drawRoundedRect(int x, int y, int w, int h, qreal xRadius, qreal yRadius, Qt::SizeMode mode) { |