From c3050b6d96d636e53ead46c1009b83453565221c Mon Sep 17 00:00:00 2001 From: Sze Howe Koh Date: Sun, 26 Jan 2020 16:52:47 +0800 Subject: Rename Qt::ReturnByValue_t -> Qt::ReturnByValueConstant Copy the convention of QDeadlineTimer::ForeverConstant Task-number: QTBUG-48701 Change-Id: Ic7760b7ffec630f1cd47361f5adda3f17fffb9f6 Reviewed-by: Richard Moe Gustavsen Reviewed-by: Lars Knoll --- src/corelib/global/qnamespace.h | 2 +- src/corelib/global/qnamespace.qdoc | 2 +- src/gui/kernel/qcursor.cpp | 4 ++-- src/gui/kernel/qcursor.h | 8 ++++---- src/widgets/widgets/qlabel.cpp | 4 ++-- src/widgets/widgets/qlabel.h | 8 ++++---- 6 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index ea2c635303..17ae73536d 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1770,7 +1770,7 @@ public: }; // QTBUG-48701 - enum ReturnByValue_t { ReturnByValue }; // ### Qt 7: Remove me + enum ReturnByValueConstant { ReturnByValue }; // ### Qt 7: Remove me #ifndef Q_QDOC // NOTE: Generally, do not add QT_Q_ENUM if a corresponding Q_Q_FLAG exists. diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 6a84662323..708ecb11ab 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -3334,7 +3334,7 @@ */ /*! - \enum Qt::ReturnByValue_t + \enum Qt::ReturnByValueConstant \since 5.15 This is a dummy type, designed to help users transition from certain deprecated APIs to their replacement APIs. 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; diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index 2490df58f2..992e0cee97 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -227,7 +227,7 @@ const QPicture *QLabel::picture() const \endcode */ -QPicture QLabel::picture(Qt::ReturnByValue_t) const +QPicture QLabel::picture(Qt::ReturnByValueConstant) const { Q_D(const QLabel); if (d->picture) @@ -443,7 +443,7 @@ const QPixmap *QLabel::pixmap() const /*! \since 5.15 */ -QPixmap QLabel::pixmap(Qt::ReturnByValue_t) const +QPixmap QLabel::pixmap(Qt::ReturnByValueConstant) const { Q_D(const QLabel); if (d->pixmap) diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 288022a71e..c9552efd8a 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -77,9 +77,9 @@ public: QT_DEPRECATED_VERSION_X(5, 15, "Use the other overload which returns QPixmap by-value") const QPixmap *pixmap() const; // ### Qt 7: Remove function - QPixmap pixmap(Qt::ReturnByValue_t) const; + QPixmap pixmap(Qt::ReturnByValueConstant) const; #else - QPixmap pixmap(Qt::ReturnByValue_t = Qt::ReturnByValue) const; // ### Qt 7: Remove arg + QPixmap pixmap(Qt::ReturnByValueConstant = Qt::ReturnByValue) const; // ### Qt 7: Remove arg #endif // QT_DEPRECATED_SINCE(5,15) #ifndef QT_NO_PICTURE @@ -87,9 +87,9 @@ public: QT_DEPRECATED_VERSION_X(5, 15, "Use the other overload which returns QPicture by-value") const QPicture *picture() const; // ### Qt 7: Remove function - QPicture picture(Qt::ReturnByValue_t) const; + QPicture picture(Qt::ReturnByValueConstant) const; # else - QPicture picture(Qt::ReturnByValue_t = Qt::ReturnByValue) const; // ### Qt 7: Remove arg + QPicture picture(Qt::ReturnByValueConstant = Qt::ReturnByValue) const; // ### Qt 7: Remove arg # endif // QT_DEPRECATED_SINCE(5,15) #endif #if QT_CONFIG(movie) -- cgit v1.2.3