From 0d2791c5f64fcb7f0ce4c2027d78fc39de514ab4 Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Mon, 6 Feb 2017 10:14:29 +0100 Subject: QCollatorSortKey: add some std::move All implementations of QCollator::sortKey() can benefit from moving their CollatorKeyType into the QCollatorSortKeyPrivate on construction. So make the QCollatorSortKeyPrivate ctor a perfect forwarder for its m_key member, and add std::move() calls where they were missing (in all but one case, lvalues were passed). Make the ctor explicit, as it should have been from the beginning. Change-Id: I2a1cdda5fd23990ace019b963df895c621a1fa85 Reviewed-by: Lars Knoll --- src/corelib/tools/qcollator_p.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools/qcollator_p.h') diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index 6ac79e820d..c03a3431db 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -131,9 +131,10 @@ class QCollatorSortKeyPrivate : public QSharedData { friend class QCollator; public: - QCollatorSortKeyPrivate(const CollatorKeyType &key) + template + explicit QCollatorSortKeyPrivate(T &&...args) : QSharedData() - , m_key(key) + , m_key(std::forward(args)...) { } -- cgit v1.2.3