diff options
| author | Albert Astals Cid <aacid@kde.org> | 2020-09-20 23:43:20 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2020-09-27 22:07:33 +0200 |
| commit | 11ab3c0484965038173385c6d5ed6d7df1de7429 (patch) | |
| tree | 202d1cc6c9e30fed94dae713c01f77993d65615e | |
| parent | 08ab62aa2e6e390630963303bcf0543c112c2425 (diff) | |
qlist: Replace QT_DEPRECATED_X with proper QT_DEPRECATED_VERSION_X_
Change-Id: Iba3ade5828af13e49afd3e48dfec8ae52207c05c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| -rw-r--r-- | src/corelib/tools/qlist.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index 8a11663c01..e395c3b3ac 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -221,7 +221,7 @@ public: void move(int from, int to); void swapItemsAt(int i, int j); #if QT_DEPRECATED_SINCE(5, 13) && QT_VERSION < QT_VERSION_CHECK(6,0,0) - QT_DEPRECATED_X("Use QList<T>::swapItemsAt()") + QT_DEPRECATED_VERSION_X_5_13("Use QList<T>::swapItemsAt()") void swap(int i, int j) { swapItemsAt(i, j); } #endif int indexOf(const T &t, int from = 0) const; @@ -407,15 +407,15 @@ public: QVector<T> toVector() const; #if QT_DEPRECATED_SINCE(5, 14) && QT_VERSION < QT_VERSION_CHECK(6,0,0) - QT_DEPRECATED_X("Use QList<T>(set.begin(), set.end()) instead.") + QT_DEPRECATED_VERSION_X_5_14("Use QList<T>(set.begin(), set.end()) instead.") static QList<T> fromSet(const QSet<T> &set); - QT_DEPRECATED_X("Use QSet<T>(list.begin(), list.end()) instead.") + QT_DEPRECATED_VERSION_X_5_14("Use QSet<T>(list.begin(), list.end()) instead.") QSet<T> toSet() const; - QT_DEPRECATED_X("Use QList<T>(list.begin(), list.end()) instead.") + QT_DEPRECATED_VERSION_X_5_14("Use QList<T>(list.begin(), list.end()) instead.") static inline QList<T> fromStdList(const std::list<T> &list) { return QList<T>(list.begin(), list.end()); } - QT_DEPRECATED_X("Use std::list<T>(list.begin(), list.end()) instead.") + QT_DEPRECATED_VERSION_X_5_14("Use std::list<T>(list.begin(), list.end()) instead.") inline std::list<T> toStdList() const { return std::list<T>(begin(), end()); } #endif |