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/kernel/qcursor.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/kernel/qcursor.h')
| -rw-r--r-- | src/gui/kernel/qcursor.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index 3ae6b98ced..d3b4140ec7 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -43,6 +43,7 @@ #include <QtGui/qtguiglobal.h> #include <QtCore/qpoint.h> #include <QtGui/qwindowdefs.h> +#include <QtGui/qbitmap.h> QT_BEGIN_NAMESPACE @@ -97,19 +98,13 @@ public: Qt::CursorShape shape() const; void setShape(Qt::CursorShape newShape); -#if QT_DEPRECATED_SINCE(5, 15) - QT_DEPRECATED_VERSION_X(5, 15, "Use the other overload which returns QBitmap by-value") - const QBitmap *bitmap() const; // ### Qt 7: Remove function +#if QT_DEPRECATED_SINCE(6, 6) + QBitmap bitmap(Qt::ReturnByValueConstant) const { return bitmap(); } + QBitmap mask(Qt::ReturnByValueConstant) const { return mask(); } +#endif // QT_DEPRECATED_SINCE(6, 6) + QBitmap bitmap() const; + QBitmap mask() const; - QT_DEPRECATED_VERSION_X(5, 15, "Use the other overload which returns QBitmap by-value") - const QBitmap *mask() const; // ### Qt 7: Remove function - - QBitmap bitmap(Qt::ReturnByValueConstant) const; - QBitmap mask(Qt::ReturnByValueConstant) const; -#else - QBitmap bitmap(Qt::ReturnByValueConstant = Qt::ReturnByValue) const; // ### Qt 7: Remove arg - QBitmap mask(Qt::ReturnByValueConstant = Qt::ReturnByValue) const; // ### Qt 7: Remove arg -#endif // QT_DEPRECATED_SINCE(5, 15) QPixmap pixmap() const; QPoint hotSpot() const; |