diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-17 17:19:24 +0200 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-04-27 12:21:29 +0200 |
| commit | dccf28b7c344822b7459635099ebe3abdf5fd107 (patch) | |
| tree | 3acab7b16c02f87ace113cc2f0cc8d9598e219e4 /src/gui/painting/qregion.h | |
| parent | 4ba25a092065a6422510a9f4afa4fbbabeda686c (diff) | |
Remove deprecated members from several QtGui classes
Those can be trivially removed as they have direct replacements, or
are completely unused.
The migration path for QCursor::bitmap and QCursor::mask is
QBitmap *pb = c.bitmap(); // up to 5.15, warns in 5.15
QBitmap vb = c.bitmap(Qt::ReturnByValue); // from 5.15, works in 6
QBitmap b = c.bitmap(); // from 6.0 on
Change-Id: I3b3acd1c7f09c4c8414e98b3ce11986f1ecd5eda
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui/painting/qregion.h')
| -rw-r--r-- | src/gui/painting/qregion.h | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index 54de916198..dac58bd2eb 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -107,35 +107,13 @@ public: Q_REQUIRED_RESULT QRegion subtracted(const QRegion &r) const; Q_REQUIRED_RESULT QRegion xored(const QRegion &r) const; -#if QT_DEPRECATED_SINCE(5, 0) - Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRegion &r) const { return united(r); } - Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion unite(const QRect &r) const { return united(r); } - Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRegion &r) const { return intersected(r); } - Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion intersect(const QRect &r) const { return intersected(r); } - Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion subtract(const QRegion &r) const { return subtracted(r); } - Q_REQUIRED_RESULT inline QT_DEPRECATED QRegion eor(const QRegion &r) const { return xored(r); } -#endif - bool intersects(const QRegion &r) const; bool intersects(const QRect &r) const; QRect boundingRect() const noexcept; -#if QT_DEPRECATED_SINCE(5, 11) - QT_DEPRECATED_X("Use begin()/end() instead") - QVector<QRect> rects() const; -#endif void setRects(const QRect *rect, int num); int rectCount() const noexcept; -#ifdef Q_COMPILER_MANGLES_RETURN_TYPE - // ### Qt 6: remove these, they're kept for MSVC compat - const QRegion operator|(const QRegion &r) const; - const QRegion operator+(const QRegion &r) const; - const QRegion operator+(const QRect &r) const; - const QRegion operator&(const QRegion &r) const; - const QRegion operator&(const QRect &r) const; - const QRegion operator-(const QRegion &r) const; - const QRegion operator^(const QRegion &r) const; -#else + QRegion operator|(const QRegion &r) const; QRegion operator+(const QRegion &r) const; QRegion operator+(const QRect &r) const; @@ -143,7 +121,7 @@ public: QRegion operator&(const QRect &r) const; QRegion operator-(const QRegion &r) const; QRegion operator^(const QRegion &r) const; -#endif // Q_COMPILER_MANGLES_RETURN_TYPE + QRegion& operator|=(const QRegion &r); QRegion& operator+=(const QRegion &r); QRegion& operator+=(const QRect &r); |