1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QtGui/QPainterPath: mark obsolete functions as deprecated

Browse Source 
Mark some long obsolete functions as deprecated so the can be removed
with Qt6:
 - addRoundRect()
 - subtractedInverted()

Change-Id: I4707c07e983a4ac65ec3706d25b09ec01a9de62c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
This commit is contained in:
Christian Ehrlicher 2019-01-26 13:11:41 +01:00
parent e56401818b
commit 860bfc69e4
2 changed files with 39 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gui/painting/qpainterpath.cpp
View File

@ -3242,6 +3242,7 @@ void QPainterPath::addRoundedRect(const QRectF &rect, qreal xRadius, qreal yRadi
Adds the given rectangle \a x, \a y, \a w, \a h with rounded corners to the path. Adds the given rectangle \a x, \a y, \a w, \a h with rounded corners to the path.
*/ */
#if QT_DEPRECATED_SINCE(5, 13)
/*! /*!
\obsolete \obsolete
@ -3308,6 +3309,17 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd)
\sa addRoundedRect() \sa addRoundedRect()
*/ */
void QPainterPath::addRoundRect(const QRectF &rect,
int roundness)
{
int xRnd = roundness;
int yRnd = roundness;
if (rect.width() > rect.height())
xRnd = int(roundness * rect.height()/rect.width());
else
yRnd = int(roundness * rect.width()/rect.height());
addRoundRect(rect, xRnd, yRnd);
}
/*! /*!
\obsolete \obsolete
@ -3324,6 +3336,11 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd)
\sa addRoundedRect() \sa addRoundedRect()
*/ */
void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h,
int xRnd, int yRnd)
{
addRoundRect(QRectF(x, y, w, h), xRnd, yRnd);
}
/*! /*!
\obsolete \obsolete
@ -3343,6 +3360,12 @@ void QPainterPath::addRoundRect(const QRectF &r, int xRnd, int yRnd)
\sa addRoundedRect() \sa addRoundedRect()
*/ */
void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h,
int roundness)
{
addRoundRect(QRectF(x, y, w, h), roundness);
}
#endif
/*! /*!
\since 4.3 \since 4.3
@ -3397,6 +3420,7 @@ QPainterPath QPainterPath::subtracted(const QPainterPath &p) const
return clipper.clip(QPathClipper::BoolSub); return clipper.clip(QPathClipper::BoolSub);
} }
#if QT_DEPRECATED_SINCE(5, 13)
/*! /*!
\since 4.3 \since 4.3
\obsolete \obsolete
@ -3409,6 +3433,7 @@ QPainterPath QPainterPath::subtractedInverted(const QPainterPath &p) const
{ {
return p.subtracted(*this); return p.subtracted(*this);
} }
#endif
/*! /*!
\since 4.4 \since 4.4

43
src/gui/painting/qpainterpath.h
View File

@ -143,12 +143,18 @@ public:
qreal xRadius, qreal yRadius, qreal xRadius, qreal yRadius,
Qt::SizeMode mode = Qt::AbsoluteSize); Qt::SizeMode mode = Qt::AbsoluteSize);
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead")
void addRoundRect(const QRectF &rect, int xRnd, int yRnd); void addRoundRect(const QRectF &rect, int xRnd, int yRnd);
inline void addRoundRect(qreal x, qreal y, qreal w, qreal h, QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead")
int xRnd, int yRnd); void addRoundRect(qreal x, qreal y, qreal w, qreal h,
inline void addRoundRect(const QRectF &rect, int roundness); int xRnd, int yRnd);
inline void addRoundRect(qreal x, qreal y, qreal w, qreal h, QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead")
int roundness); void addRoundRect(const QRectF &rect, int roundness);
QT_DEPRECATED_X("Use addRoundedRect(..., Qt::RelativeSize) instead")
void addRoundRect(qreal x, qreal y, qreal w, qreal h,
int roundness);
#endif
void connectPath(const QPainterPath &path); void connectPath(const QPainterPath &path);
@ -193,7 +199,10 @@ public:
Q_REQUIRED_RESULT QPainterPath united(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath united(const QPainterPath &r) const;
Q_REQUIRED_RESULT QPainterPath intersected(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath intersected(const QPainterPath &r) const;
Q_REQUIRED_RESULT QPainterPath subtracted(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath subtracted(const QPainterPath &r) const;
#if QT_DEPRECATED_SINCE(5, 13)
QT_DEPRECATED_X("Use r.subtracted() instead")
Q_REQUIRED_RESULT QPainterPath subtractedInverted(const QPainterPath &r) const; Q_REQUIRED_RESULT QPainterPath subtractedInverted(const QPainterPath &r) const;
#endif
Q_REQUIRED_RESULT QPainterPath simplified() const; Q_REQUIRED_RESULT QPainterPath simplified() const;
@ -338,30 +347,6 @@ inline void QPainterPath::addRoundedRect(qreal x, qreal y, qreal w, qreal h,
addRoundedRect(QRectF(x, y, w, h), xRadius, yRadius, mode); addRoundedRect(QRectF(x, y, w, h), xRadius, yRadius, mode);
} }
inline void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h,
int xRnd, int yRnd)
{
addRoundRect(QRectF(x, y, w, h), xRnd, yRnd);
}
inline void QPainterPath::addRoundRect(const QRectF &rect,
int roundness)
{
int xRnd = roundness;
int yRnd = roundness;
if (rect.width() > rect.height())
xRnd = int(roundness * rect.height()/rect.width());
else
yRnd = int(roundness * rect.width()/rect.height());
addRoundRect(rect, xRnd, yRnd);
}
inline void QPainterPath::addRoundRect(qreal x, qreal y, qreal w, qreal h,
int roundness)
{
addRoundRect(QRectF(x, y, w, h), roundness);
}
inline void QPainterPath::addText(qreal x, qreal y, const QFont &f, const QString &text) inline void QPainterPath::addText(qreal x, qreal y, const QFont &f, const QString &text)
{ {
addText(QPointF(x, y), f, text); addText(QPointF(x, y), f, text);