From f3e1aece8305976a48ab2fa898bc5e7f41cc3d2a Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Tue, 8 Aug 2023 15:00:18 +0200
Subject: [PATCH] QtSupport: De-Q_OBJECT-ify UicGenerator

Change-Id: I6934fc1553b2f32e042aef0c8a0141fee93a52cd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
---
 src/plugins/qtsupport/uicgenerator.cpp | 37 ++++++++++++++------------
 src/plugins/qtsupport/uicgenerator.h   | 16 +----------
 2 files changed, 21 insertions(+), 32 deletions(-)

diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp
index 4c68d5efa54..e49b2eb66db 100644
--- a/src/plugins/qtsupport/uicgenerator.cpp
+++ b/src/plugins/qtsupport/uicgenerator.cpp
@@ -14,22 +14,30 @@
 #include <utils/qtcassert.h>
 
 #include <QDateTime>
-#include <QDir>
-#include <QFileInfo>
 #include <QLoggingCategory>
 
 using namespace ProjectExplorer;
+using namespace Utils;
 
 namespace QtSupport {
 
-UicGenerator::UicGenerator(const Project *project, const Utils::FilePath &source,
-                           const Utils::FilePaths &targets, QObject *parent) :
-    ProcessExtraCompiler(project, source, targets, parent)
+class UicGenerator final : public ProcessExtraCompiler
 {
-    QTC_ASSERT(targets.count() == 1, return);
-}
+public:
+    UicGenerator(const Project *project, const FilePath &source,
+                 const FilePaths &targets, QObject *parent)
+        : ProcessExtraCompiler(project, source, targets, parent)
+    {
+        QTC_ASSERT(targets.count() == 1, return);
+    }
 
-Utils::FilePath UicGenerator::command() const
+protected:
+    FilePath command() const override;
+    QStringList arguments() const override { return {"-p"}; }
+    FileNameToContentsHash handleProcessFinished(Process *process) override;
+};
+
+FilePath UicGenerator::command() const
 {
     QtSupport::QtVersion *version = nullptr;
     Target *target;
@@ -44,18 +52,13 @@ Utils::FilePath UicGenerator::command() const
     return version->uicFilePath();
 }
 
-QStringList UicGenerator::arguments() const
-{
-    return {"-p"};
-}
-
-FileNameToContentsHash UicGenerator::handleProcessFinished(Utils::Process *process)
+FileNameToContentsHash UicGenerator::handleProcessFinished(Process *process)
 {
     FileNameToContentsHash result;
     if (process->exitStatus() != QProcess::NormalExit && process->exitCode() != 0)
         return result;
 
-    const Utils::FilePaths targetList = targets();
+    const FilePaths targetList = targets();
     if (targetList.size() != 1)
         return result;
     // As far as I can discover in the UIC sources, it writes out local 8-bit encoding. The
@@ -77,8 +80,8 @@ QString UicGeneratorFactory::sourceTag() const
 }
 
 ExtraCompiler *UicGeneratorFactory::create(const Project *project,
-                                           const Utils::FilePath &source,
-                                           const Utils::FilePaths &targets)
+                                           const FilePath &source,
+                                           const FilePaths &targets)
 {
     return new UicGenerator(project, source, targets, this);
 }
diff --git a/src/plugins/qtsupport/uicgenerator.h b/src/plugins/qtsupport/uicgenerator.h
index d68b6814c22..b3b1de17e4a 100644
--- a/src/plugins/qtsupport/uicgenerator.h
+++ b/src/plugins/qtsupport/uicgenerator.h
@@ -4,26 +4,12 @@
 #pragma once
 
 #include <projectexplorer/extracompiler.h>
-#include <utils/fileutils.h>
+#include <utils/filepath.h>
 
 namespace QtSupport {
 
-class UicGenerator : public ProjectExplorer::ProcessExtraCompiler
-{
-    Q_OBJECT
-public:
-    UicGenerator(const ProjectExplorer::Project *project, const Utils::FilePath &source,
-                 const Utils::FilePaths &targets, QObject *parent = nullptr);
-
-protected:
-    Utils::FilePath command() const override;
-    QStringList arguments() const override;
-    ProjectExplorer::FileNameToContentsHash handleProcessFinished(Utils::Process *process) override;
-};
-
 class UicGeneratorFactory : public ProjectExplorer::ExtraCompilerFactory
 {
-    Q_OBJECT
 public:
     UicGeneratorFactory() = default;