Use universal references for passing callables in QtConcurrent

Task-number: QTBUG-87596
Change-Id: I219f08d73b97317820ec6e329ab1e6c89c0545f1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 26 insertions, 0 deletions

diff --git a/tests/auto/concurrent/testhelper_functions.h b/tests/auto/concurrent/testhelper_functions.h
index aeba794977..17836cba51 100644
--- a/tests/auto/concurrent/testhelper_functions.h
+++ b/tests/auto/concurrent/testhelper_functions.h
@@ -44,6 +44,19 @@ public:
     }
 };
 
+class KeepEvenIntegersMoveOnly
+{
+public:
+    KeepEvenIntegersMoveOnly() = default;
+    KeepEvenIntegersMoveOnly(KeepEvenIntegersMoveOnly &&) = default;
+    KeepEvenIntegersMoveOnly &operator=(KeepEvenIntegersMoveOnly &&other) = default;
+
+    KeepEvenIntegersMoveOnly(const KeepEvenIntegersMoveOnly &) = delete;
+    KeepEvenIntegersMoveOnly &operator=(const KeepEvenIntegersMoveOnly &) = delete;
+
+    bool operator()(int x) { return (x & 1) == 0; }
+};
+
 class Number
 {
     int n;
@@ -121,6 +134,19 @@ public:
     }
 };
 
+class IntSumReduceMoveOnly
+{
+public:
+    IntSumReduceMoveOnly() = default;
+    IntSumReduceMoveOnly(IntSumReduceMoveOnly &&) = default;
+    IntSumReduceMoveOnly &operator=(IntSumReduceMoveOnly &&other) = default;
+
+    IntSumReduceMoveOnly(const IntSumReduceMoveOnly &) = delete;
+    IntSumReduceMoveOnly &operator=(const IntSumReduceMoveOnly &) = delete;
+
+    void operator()(int &sum, int x) { sum += x; }
+};
+
 void numberSumReduce(int &sum, const Number &x)
 {
     sum += x.toInt();