diff options
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qcursor.cpp | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qcursor.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index 7f6fdafbd0..1efa28a5af 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -621,7 +621,7 @@ const QBitmap *QCursor::mask() const QBitmap bmpVal = cursor->bitmap(); \endcode */ -QBitmap QCursor::bitmap(Qt::ReturnByValue_t) const +QBitmap QCursor::bitmap(Qt::ReturnByValueConstant) const { if (!QCursorData::initialized) QCursorData::initialize(); @@ -653,7 +653,7 @@ QBitmap QCursor::bitmap(Qt::ReturnByValue_t) const QBitmap bmpVal = cursor->mask(); \endcode */ -QBitmap QCursor::mask(Qt::ReturnByValue_t) const +QBitmap QCursor::mask(Qt::ReturnByValueConstant) const { if (!QCursorData::initialized) QCursorData::initialize(); diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index 7a11fe59ee..3ae6b98ced 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -104,11 +104,11 @@ public: 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::ReturnByValue_t) const; - QBitmap mask(Qt::ReturnByValue_t) const; + QBitmap bitmap(Qt::ReturnByValueConstant) const; + QBitmap mask(Qt::ReturnByValueConstant) const; #else - QBitmap bitmap(Qt::ReturnByValue_t = Qt::ReturnByValue) const; // ### Qt 7: Remove arg - QBitmap mask(Qt::ReturnByValue_t = Qt::ReturnByValue) const; // ### Qt 7: Remove arg + 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; |