diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-02 16:23:48 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-04-08 21:24:26 +0000 |
commit | 28c9e0e606d104e526bb1c8e6e8bcda3ee0aa496 (patch) | |
tree | f94de2034f1b8b8c2d315268e6bf3b11483dc0e3 /src/corelib/tools | |
parent | be56db2c49be02fd7083c5a02131462748e29bef (diff) |
Remove handling of missing Q_COMPILER_RVALUE_REFS
Change-Id: I7bc6c455fbae4cdad584c76773299a6d8cd40c82
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r-- | src/corelib/tools/qarraydatapointer.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qbitarray.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qbytearray.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qcollator.h | 4 | ||||
-rw-r--r-- | src/corelib/tools/qcommandlineoption.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qcontiguouscache.h | 2 |
6 files changed, 0 insertions, 14 deletions
diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h index bce8fc8ddc..0322615f91 100644 --- a/src/corelib/tools/qarraydatapointer.h +++ b/src/corelib/tools/qarraydatapointer.h @@ -82,7 +82,6 @@ public: return *this; } -#ifdef Q_COMPILER_RVALUE_REFS QArrayDataPointer(QArrayDataPointer &&other) noexcept : d(other.d) { @@ -95,7 +94,6 @@ public: this->swap(moved); return *this; } -#endif DataOps &operator*() const { diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h index 78beff0d42..9b0e931aca 100644 --- a/src/corelib/tools/qbitarray.h +++ b/src/corelib/tools/qbitarray.h @@ -58,11 +58,9 @@ public: explicit QBitArray(int size, bool val = false); QBitArray(const QBitArray &other) : d(other.d) {} inline QBitArray &operator=(const QBitArray &other) { d = other.d; return *this; } -#ifdef Q_COMPILER_RVALUE_REFS inline QBitArray(QBitArray &&other) noexcept : d(std::move(other.d)) {} inline QBitArray &operator=(QBitArray &&other) noexcept { qSwap(d, other.d); return *this; } -#endif inline void swap(QBitArray &other) noexcept { qSwap(d, other.d); } diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 318d773eb6..14fcddce7c 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -177,11 +177,9 @@ public: QByteArray &operator=(const QByteArray &) noexcept; QByteArray &operator=(const char *str); -#ifdef Q_COMPILER_RVALUE_REFS inline QByteArray(QByteArray && other) noexcept : d(other.d) { other.d = Data::sharedNull(); } inline QByteArray &operator=(QByteArray &&other) noexcept { qSwap(d, other.d); return *this; } -#endif inline void swap(QByteArray &other) noexcept { qSwap(d, other.d); } diff --git a/src/corelib/tools/qcollator.h b/src/corelib/tools/qcollator.h index 6c76ef038f..96a5902526 100644 --- a/src/corelib/tools/qcollator.h +++ b/src/corelib/tools/qcollator.h @@ -57,10 +57,8 @@ public: QCollatorSortKey(const QCollatorSortKey &other); ~QCollatorSortKey(); QCollatorSortKey &operator=(const QCollatorSortKey &other); -#ifdef Q_COMPILER_RVALUE_REFS inline QCollatorSortKey &operator=(QCollatorSortKey &&other) noexcept { swap(other); return *this; } -#endif void swap(QCollatorSortKey &other) noexcept { d.swap(other.d); } @@ -87,12 +85,10 @@ public: QCollator(const QCollator &); ~QCollator(); QCollator &operator=(const QCollator &); -#ifdef Q_COMPILER_RVALUE_REFS QCollator(QCollator &&other) noexcept : d(other.d) { other.d = nullptr; } QCollator &operator=(QCollator &&other) noexcept { swap(other); return *this; } -#endif void swap(QCollator &other) noexcept { qSwap(d, other.d); } diff --git a/src/corelib/tools/qcommandlineoption.h b/src/corelib/tools/qcommandlineoption.h index 643427f6fb..e2ca64acef 100644 --- a/src/corelib/tools/qcommandlineoption.h +++ b/src/corelib/tools/qcommandlineoption.h @@ -71,9 +71,7 @@ public: ~QCommandLineOption(); QCommandLineOption &operator=(const QCommandLineOption &other); -#ifdef Q_COMPILER_RVALUE_REFS QCommandLineOption &operator=(QCommandLineOption &&other) noexcept { swap(other); return *this; } -#endif void swap(QCommandLineOption &other) noexcept { qSwap(d, other.d); } diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index fdb9c6d19a..433e3f9ea4 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -107,10 +107,8 @@ public: #endif QContiguousCache<T> &operator=(const QContiguousCache<T> &other); -#ifdef Q_COMPILER_RVALUE_REFS inline QContiguousCache<T> &operator=(QContiguousCache<T> &&other) { qSwap(d, other.d); return *this; } -#endif inline void swap(QContiguousCache<T> &other) { qSwap(d, other.d); } bool operator==(const QContiguousCache<T> &other) const; inline bool operator!=(const QContiguousCache<T> &other) const { return !(*this == other); } |