From 82bc4870b37455d87e32826a55d1fe280723d07c Mon Sep 17 00:00:00 2001
From: Jarek Kobus <jaroslaw.kobus@qt.io>
Date: Wed, 3 May 2023 14:45:54 +0200
Subject: [PATCH] Tasking::WaitForBarrier: Rename it into WaitForBarrierTask

Rename BarrierAdapter into BarrierTaskAdapter.

Task-number: QTCREATORBUG-29102
Change-Id: I003b09fd71af1bde870f761d365a8cea1858862a
Reviewed-by: hjk <hjk@qt.io>
---
 src/libs/utils/barrier.h                   | 10 ++++-----
 src/libs/utils/filestreamer.cpp            |  2 +-
 tests/auto/utils/tasktree/tst_tasktree.cpp | 24 +++++++++++-----------
 3 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/libs/utils/barrier.h b/src/libs/utils/barrier.h
index 52b44fd7031..2af08dfdd11 100644
--- a/src/libs/utils/barrier.h
+++ b/src/libs/utils/barrier.h
@@ -34,16 +34,16 @@ private:
     int m_current = -1;
 };
 
-class QTCREATOR_UTILS_EXPORT BarrierAdapter : public Tasking::TaskAdapter<Barrier>
+class QTCREATOR_UTILS_EXPORT BarrierTaskAdapter : public Tasking::TaskAdapter<Barrier>
 {
 public:
-    BarrierAdapter() { connect(task(), &Barrier::done, this, &TaskInterface::done); }
+    BarrierTaskAdapter() { connect(task(), &Barrier::done, this, &TaskInterface::done); }
     void start() final { task()->start(); }
 };
 
 } // namespace Utils
 
-QTC_DECLARE_CUSTOM_TASK(BarrierTask, Utils::BarrierAdapter);
+QTC_DECLARE_CUSTOM_TASK(BarrierTask, Utils::BarrierTaskAdapter);
 
 namespace Utils::Tasking {
 
@@ -70,11 +70,11 @@ using MultiBarrier = TreeStorage<SharedBarrier<Limit>>;
 // alias template deduction only available with C++20.
 using SingleBarrier = MultiBarrier<1>;
 
-class QTCREATOR_UTILS_EXPORT WaitForBarrier : public BarrierTask
+class QTCREATOR_UTILS_EXPORT WaitForBarrierTask : public BarrierTask
 {
 public:
     template <int Limit>
-    WaitForBarrier(const MultiBarrier<Limit> &sharedBarrier)
+    WaitForBarrierTask(const MultiBarrier<Limit> &sharedBarrier)
         : BarrierTask([sharedBarrier](Barrier &barrier) {
             SharedBarrier<Limit> *activeBarrier = sharedBarrier.activeStorage();
             if (!activeBarrier) {
diff --git a/src/libs/utils/filestreamer.cpp b/src/libs/utils/filestreamer.cpp
index cdc192422a9..54e5d6e1b19 100644
--- a/src/libs/utils/filestreamer.cpp
+++ b/src/libs/utils/filestreamer.cpp
@@ -349,7 +349,7 @@ static Group interDeviceTransferTask(const FilePath &source, const FilePath &des
         Storage(storage),
         Writer(setupWriter),
         Group {
-            WaitForBarrier(writerReadyBarrier),
+            WaitForBarrierTask(writerReadyBarrier),
             Reader(setupReader, finalizeReader, finalizeReader)
         }
     };
diff --git a/tests/auto/utils/tasktree/tst_tasktree.cpp b/tests/auto/utils/tasktree/tst_tasktree.cpp
index 465c7f6bbb0..96e9f2fc535 100644
--- a/tests/auto/utils/tasktree/tst_tasktree.cpp
+++ b/tests/auto/utils/tasktree/tst_tasktree.cpp
@@ -1216,7 +1216,7 @@ void tst_TaskTree::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
             }
@@ -1239,7 +1239,7 @@ void tst_TaskTree::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
             }
@@ -1268,7 +1268,7 @@ void tst_TaskTree::testTree_data()
             parallel,
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
             },
@@ -1292,12 +1292,12 @@ void tst_TaskTree::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 1)),
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(4))
             },
             Group {
                 OnGroupSetup(groupSetup(3)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(5))
             }
         };
@@ -1325,8 +1325,8 @@ void tst_TaskTree::testTree_data()
                 Group {
                     parallel,
                     OnGroupSetup(groupSetup(1)),
-                    WaitForBarrier(barrier),
-                    WaitForBarrier(barrier2)
+                    WaitForBarrierTask(barrier),
+                    WaitForBarrierTask(barrier2)
                 },
                 Test(setupTask(2))
             },
@@ -1367,7 +1367,7 @@ void tst_TaskTree::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 2)),
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
             }
@@ -1393,7 +1393,7 @@ void tst_TaskTree::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
             }
@@ -1424,7 +1424,7 @@ void tst_TaskTree::testTree_data()
             parallel,
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(2)),
                 Test(setupTask(3))
             },
@@ -1452,12 +1452,12 @@ void tst_TaskTree::testTree_data()
             AsyncTask<bool>(setupBarrierAdvance(storage, barrier, 0)),
             Group {
                 OnGroupSetup(groupSetup(2)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(4))
             },
             Group {
                 OnGroupSetup(groupSetup(3)),
-                WaitForBarrier(barrier),
+                WaitForBarrierTask(barrier),
                 Test(setupTask(5))
             }
         };