From fe470d60a2c9a4ccae07a4acd87d8d1a9fb696bb Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 10 May 2023 20:20:21 +0200 Subject: [PATCH] TaskTree: Prepare for de-utils-ization - part 3 Rename QTC_* macros into TASKING_*. Change-Id: I809ebf678f20df612a3211c38ebbfe6d4bf6492d Reviewed-by: hjk Reviewed-by: Qt CI Bot --- src/libs/utils/async.h | 2 +- src/libs/utils/barrier.h | 2 +- src/libs/utils/filestreamer.cpp | 4 ++-- src/libs/utils/filestreamer.h | 2 +- src/libs/utils/process.h | 2 +- src/libs/utils/tasktree.h | 6 +++--- src/plugins/coreplugin/locator/ilocatorfilter.cpp | 2 +- src/plugins/coreplugin/locator/javascriptfilter.cpp | 2 +- src/plugins/languageclient/clientrequesttask.h | 2 +- src/plugins/languageclient/currentdocumentsymbolsrequest.h | 2 +- .../projectexplorer/devicesupport/deviceusedportsgatherer.h | 2 +- src/plugins/projectexplorer/devicesupport/filetransfer.h | 4 ++-- src/plugins/projectexplorer/devicesupport/idevice.h | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/libs/utils/async.h b/src/libs/utils/async.h index 59d91ba0ad5..b08ceaf3dc2 100644 --- a/src/libs/utils/async.h +++ b/src/libs/utils/async.h @@ -211,4 +211,4 @@ public: } // namespace Utils -QTC_DECLARE_CUSTOM_TEMPLATE_TASK(AsyncTask, Utils::AsyncTaskAdapter); +TASKING_DECLARE_TEMPLATE_TASK(AsyncTask, Utils::AsyncTaskAdapter); diff --git a/src/libs/utils/barrier.h b/src/libs/utils/barrier.h index 9e5f8d50371..fe2d7bbe62c 100644 --- a/src/libs/utils/barrier.h +++ b/src/libs/utils/barrier.h @@ -43,7 +43,7 @@ public: } // namespace Tasking -QTC_DECLARE_CUSTOM_TASK(BarrierTask, Tasking::BarrierTaskAdapter); +TASKING_DECLARE_TASK(BarrierTask, Tasking::BarrierTaskAdapter); namespace Tasking { diff --git a/src/libs/utils/filestreamer.cpp b/src/libs/utils/filestreamer.cpp index 67a8a6cd92c..2d4d4909401 100644 --- a/src/libs/utils/filestreamer.cpp +++ b/src/libs/utils/filestreamer.cpp @@ -300,8 +300,8 @@ public: } // namespace Utils -QTC_DECLARE_CUSTOM_TASK(Reader, Utils::FileStreamReaderAdapter); -QTC_DECLARE_CUSTOM_TASK(Writer, Utils::FileStreamWriterAdapter); +TASKING_DECLARE_TASK(Reader, Utils::FileStreamReaderAdapter); +TASKING_DECLARE_TASK(Writer, Utils::FileStreamWriterAdapter); namespace Utils { diff --git a/src/libs/utils/filestreamer.h b/src/libs/utils/filestreamer.h index 3bbca65b8fe..8e46d7d1646 100644 --- a/src/libs/utils/filestreamer.h +++ b/src/libs/utils/filestreamer.h @@ -59,4 +59,4 @@ public: } // namespace Utils -QTC_DECLARE_CUSTOM_TASK(FileStreamerTask, Utils::FileStreamerTaskAdapter); +TASKING_DECLARE_TASK(FileStreamerTask, Utils::FileStreamerTaskAdapter); diff --git a/src/libs/utils/process.h b/src/libs/utils/process.h index 6de4f4418b1..272e25f3774 100644 --- a/src/libs/utils/process.h +++ b/src/libs/utils/process.h @@ -218,6 +218,6 @@ public: } // namespace Utils -QTC_DECLARE_CUSTOM_TASK(ProcessTask, Utils::ProcessTaskAdapter); +TASKING_DECLARE_TASK(ProcessTask, Utils::ProcessTaskAdapter); #endif // UTILS_PROCESS_H diff --git a/src/libs/utils/tasktree.h b/src/libs/utils/tasktree.h index b37749f9a42..d8545564b9c 100644 --- a/src/libs/utils/tasktree.h +++ b/src/libs/utils/tasktree.h @@ -416,13 +416,13 @@ public: } // namespace Tasking -#define QTC_DECLARE_CUSTOM_TASK(CustomTaskName, TaskAdapterClass)\ +#define TASKING_DECLARE_TASK(CustomTaskName, TaskAdapterClass)\ namespace Tasking { using CustomTaskName = CustomTask; } -#define QTC_DECLARE_CUSTOM_TEMPLATE_TASK(CustomTaskName, TaskAdapterClass)\ +#define TASKING_DECLARE_TEMPLATE_TASK(CustomTaskName, TaskAdapterClass)\ namespace Tasking {\ template \ using CustomTaskName = CustomTask>;\ } // namespace Tasking -QTC_DECLARE_CUSTOM_TASK(TaskTreeTask, TaskTreeTaskAdapter); +TASKING_DECLARE_TASK(TaskTreeTask, TaskTreeTaskAdapter); diff --git a/src/plugins/coreplugin/locator/ilocatorfilter.cpp b/src/plugins/coreplugin/locator/ilocatorfilter.cpp index b9350e5baa2..4fadef96d8e 100644 --- a/src/plugins/coreplugin/locator/ilocatorfilter.cpp +++ b/src/plugins/coreplugin/locator/ilocatorfilter.cpp @@ -328,7 +328,7 @@ public: } // namespace Core -QTC_DECLARE_CUSTOM_TASK(Collector, Core::ResultsCollectorAdapter); +TASKING_DECLARE_TASK(Collector, Core::ResultsCollectorAdapter); namespace Core { diff --git a/src/plugins/coreplugin/locator/javascriptfilter.cpp b/src/plugins/coreplugin/locator/javascriptfilter.cpp index 9fd66fa0ddb..0a155e85500 100644 --- a/src/plugins/coreplugin/locator/javascriptfilter.cpp +++ b/src/plugins/coreplugin/locator/javascriptfilter.cpp @@ -350,7 +350,7 @@ public: void start() final { task()->start(); } }; -QTC_DECLARE_CUSTOM_TASK(JavaScriptRequestTask, JavaScriptRequestAdapter); +TASKING_DECLARE_TASK(JavaScriptRequestTask, JavaScriptRequestAdapter); namespace Core::Internal { diff --git a/src/plugins/languageclient/clientrequesttask.h b/src/plugins/languageclient/clientrequesttask.h index 6700902ff11..98c4888d05b 100644 --- a/src/plugins/languageclient/clientrequesttask.h +++ b/src/plugins/languageclient/clientrequesttask.h @@ -76,4 +76,4 @@ public: } // namespace LanguageClient -QTC_DECLARE_CUSTOM_TASK(SymbolRequest, LanguageClient::WorkspaceSymbolRequestTaskAdapter); +TASKING_DECLARE_TASK(SymbolRequest, LanguageClient::WorkspaceSymbolRequestTaskAdapter); diff --git a/src/plugins/languageclient/currentdocumentsymbolsrequest.h b/src/plugins/languageclient/currentdocumentsymbolsrequest.h index 6dd8e35a9b4..399a3fe7f07 100644 --- a/src/plugins/languageclient/currentdocumentsymbolsrequest.h +++ b/src/plugins/languageclient/currentdocumentsymbolsrequest.h @@ -48,5 +48,5 @@ public: } // namespace LanguageClient -QTC_DECLARE_CUSTOM_TASK(CurrentDocumentSymbolsRequestTask, +TASKING_DECLARE_TASK(CurrentDocumentSymbolsRequestTask, LanguageClient::CurrentDocumentSymbolsRequestTaskAdapter); diff --git a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h index 56408e9aef1..194ca6f4a62 100644 --- a/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h +++ b/src/plugins/projectexplorer/devicesupport/deviceusedportsgatherer.h @@ -85,4 +85,4 @@ private: } // namespace ProjectExplorer -QTC_DECLARE_CUSTOM_TASK(PortGatherer, ProjectExplorer::DeviceUsedPortsGathererAdapter); +TASKING_DECLARE_TASK(PortGatherer, ProjectExplorer::DeviceUsedPortsGathererAdapter); diff --git a/src/plugins/projectexplorer/devicesupport/filetransfer.h b/src/plugins/projectexplorer/devicesupport/filetransfer.h index 10c1a87c030..cb8fcedf9e0 100644 --- a/src/plugins/projectexplorer/devicesupport/filetransfer.h +++ b/src/plugins/projectexplorer/devicesupport/filetransfer.h @@ -61,5 +61,5 @@ public: } // namespace ProjectExplorer -QTC_DECLARE_CUSTOM_TASK(FileTransferTask, ProjectExplorer::FileTransferTaskAdapter); -QTC_DECLARE_CUSTOM_TASK(FileTransferTestTask, ProjectExplorer::FileTransferTestTaskAdapter); +TASKING_DECLARE_TASK(FileTransferTask, ProjectExplorer::FileTransferTaskAdapter); +TASKING_DECLARE_TASK(FileTransferTestTask, ProjectExplorer::FileTransferTestTaskAdapter); diff --git a/src/plugins/projectexplorer/devicesupport/idevice.h b/src/plugins/projectexplorer/devicesupport/idevice.h index 719aa916543..55c5e2dea5b 100644 --- a/src/plugins/projectexplorer/devicesupport/idevice.h +++ b/src/plugins/projectexplorer/devicesupport/idevice.h @@ -285,4 +285,4 @@ public: } // namespace ProjectExplorer -QTC_DECLARE_CUSTOM_TASK(Killer, ProjectExplorer::KillerAdapter); +TASKING_DECLARE_TASK(Killer, ProjectExplorer::KillerAdapter);