diff options
author | hjk <hjk@qt.io> | 2023-08-08 15:00:18 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2023-08-08 13:20:06 +0000 |
commit | f3e1aece8305976a48ab2fa898bc5e7f41cc3d2a (patch) | |
tree | 417b79ce0b4ee8419843876407bafedf268b3359 /src/plugins/qtsupport/uicgenerator.cpp | |
parent | b92ac9a941281b22c6da551e1407314291aabcc8 (diff) |
QtSupport: De-Q_OBJECT-ify UicGenerator
Change-Id: I6934fc1553b2f32e042aef0c8a0141fee93a52cd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/uicgenerator.cpp')
-rw-r--r-- | src/plugins/qtsupport/uicgenerator.cpp | 39 |
1 files changed, 21 insertions, 18 deletions
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp index 4c68d5efa5..e49b2eb66d 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); -} - -Utils::FilePath UicGenerator::command() const +public: + UicGenerator(const Project *project, const FilePath &source, + const FilePaths &targets, QObject *parent) + : ProcessExtraCompiler(project, source, targets, parent) + { + QTC_ASSERT(targets.count() == 1, return); + } + +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); } |