TaskTree: Get rid of registration macros

Alias task types manually.
Don't require the alias to be inside the Tasking namespace.
Addresses the 22th point of the jira ticket below.

Task-number: QTCREATORBUG-28741
Change-Id: I1bdda7fe5a01e4bcb5052ec328f4e0eace878651
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Jarek Kobus
2023-08-17 11:08:21 +02:00
parent 36e0ea27b9
commit 98026b29c6
28 changed files with 56 additions and 100 deletions

View File

@@ -44,6 +44,7 @@
using namespace Core;
using namespace ProjectExplorer;
using namespace Tasking;
using namespace Utils;
namespace CMakeProjectManager::Internal {
@@ -59,7 +60,7 @@ const char CLEAR_SYSTEM_ENVIRONMENT_KEY[] = "CMakeProjectManager.MakeStep.ClearS
const char USER_ENVIRONMENT_CHANGES_KEY[] = "CMakeProjectManager.MakeStep.UserEnvironmentChanges";
const char BUILD_PRESET_KEY[] = "CMakeProjectManager.MakeStep.BuildPreset";
class ProjectParserTaskAdapter : public Tasking::TaskAdapter<QPointer<Target>>
class ProjectParserTaskAdapter : public TaskAdapter<QPointer<Target>>
{
public:
void start() final {
@@ -72,11 +73,7 @@ public:
}
};
} // namespace CMakeProjectManager::Internal
TASKING_DECLARE_TASK(ProjectParserTask, CMakeProjectManager::Internal::ProjectParserTaskAdapter);
namespace CMakeProjectManager::Internal {
using ProjectParserTask = CustomTask<ProjectParserTaskAdapter>;
class CmakeProgressParser : public Utils::OutputLineParser
{
@@ -345,10 +342,8 @@ void CMakeBuildStep::setupOutputFormatter(Utils::OutputFormatter *formatter)
CMakeAbstractProcessStep::setupOutputFormatter(formatter);
}
Tasking::GroupItem CMakeBuildStep::runRecipe()
GroupItem CMakeBuildStep::runRecipe()
{
using namespace Tasking;
const auto onParserSetup = [this](QPointer<Target> &parseTarget) {
// Make sure CMake state was written to disk before trying to build:
auto bs = qobject_cast<CMakeBuildSystem *>(buildSystem());