feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport: De-Q_OBJECT-ify UicGenerator

Browse Source 
Change-Id: I6934fc1553b2f32e042aef0c8a0141fee93a52cd
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2023-08-08 15:00:18 +02:00
parent b92ac9a941
commit f3e1aece83
2 changed files with 21 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/qtsupport/uicgenerator.cpp
View File

@@ -14,22 +14,30 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QDateTime> #include <QDateTime>
#include <QDir>
#include <QFileInfo>
#include <QLoggingCategory> #include <QLoggingCategory>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils;
namespace QtSupport { namespace QtSupport {
UicGenerator::UicGenerator(const Project *project, const Utils::FilePath &source, class UicGenerator final : public ProcessExtraCompiler
const Utils::FilePaths &targets, QObject *parent) :
ProcessExtraCompiler(project, source, targets, parent)
{ {
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; QtSupport::QtVersion *version = nullptr;
Target *target; Target *target;
@@ -44,18 +52,13 @@ Utils::FilePath UicGenerator::command() const
return version->uicFilePath(); return version->uicFilePath();
} }
QStringList UicGenerator::arguments() const FileNameToContentsHash UicGenerator::handleProcessFinished(Process *process)
{
return {"-p"};
}
FileNameToContentsHash UicGenerator::handleProcessFinished(Utils::Process *process)
{ {
FileNameToContentsHash result; FileNameToContentsHash result;
if (process->exitStatus() != QProcess::NormalExit && process->exitCode() != 0) if (process->exitStatus() != QProcess::NormalExit && process->exitCode() != 0)
return result; return result;
const Utils::FilePaths targetList = targets(); const FilePaths targetList = targets();
if (targetList.size() != 1) if (targetList.size() != 1)
return result; return result;
// As far as I can discover in the UIC sources, it writes out local 8-bit encoding. The // 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, ExtraCompiler *UicGeneratorFactory::create(const Project *project,
const Utils::FilePath &source, const FilePath &source,
const Utils::FilePaths &targets) const FilePaths &targets)
{ {
return new UicGenerator(project, source, targets, this); return new UicGenerator(project, source, targets, this);
} }

16
src/plugins/qtsupport/uicgenerator.h
View File

@@ -4,26 +4,12 @@
#pragma once #pragma once
#include <projectexplorer/extracompiler.h> #include <projectexplorer/extracompiler.h>
#include <utils/fileutils.h> #include <utils/filepath.h>
namespace QtSupport { 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 class UicGeneratorFactory : public ProjectExplorer::ExtraCompilerFactory
{ {
Q_OBJECT
public: public:
UicGeneratorFactory() = default; UicGeneratorFactory() = default;