summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qcollator.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-02 16:23:48 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2019-04-08 21:24:26 +0000
commit28c9e0e606d104e526bb1c8e6e8bcda3ee0aa496 (patch)
treef94de2034f1b8b8c2d315268e6bf3b11483dc0e3 /src/corelib/tools/qcollator.h
parentbe56db2c49be02fd7083c5a02131462748e29bef (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/qcollator.h')
-rw-r--r--src/corelib/tools/qcollator.h4
1 files changed, 0 insertions, 4 deletions
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); }