whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename Qt::ReturnByValue_t -> Qt::ReturnByValueConstant 

Copy the convention of QDeadlineTimer::ForeverConstant

Task-number: QTBUG-48701
Change-Id: Ic7760b7ffec630f1cd47361f5adda3f17fffb9f6
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
bb10
Sze Howe Koh 2020-01-26 16:52:47 +08:00
parent 74a2467edd
commit c3050b6d96
6 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/global/qnamespace.h
View File

@ -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.

2
src/corelib/global/qnamespace.qdoc
View File

@ -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.

4
src/gui/kernel/qcursor.cpp
View File

@ -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();

8
src/gui/kernel/qcursor.h
View File

@ -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;

4
src/widgets/widgets/qlabel.cpp
View File

@ -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)

8
src/widgets/widgets/qlabel.h
View File

@ -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)