diff options
| author | hjk <hjk@qt.io> | 2019-05-28 13:49:26 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-05-28 12:23:26 +0000 |
| commit | 473a741c9fcf09febba312464fab8385e2351181 (patch) | |
| tree | 2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/qtsupport/uicgenerator.cpp | |
| parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff) | |
Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.
Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/qtsupport/uicgenerator.cpp')
| -rw-r--r-- | src/plugins/qtsupport/uicgenerator.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/plugins/qtsupport/uicgenerator.cpp b/src/plugins/qtsupport/uicgenerator.cpp index e0cddab37d..9d86893278 100644 --- a/src/plugins/qtsupport/uicgenerator.cpp +++ b/src/plugins/qtsupport/uicgenerator.cpp @@ -43,14 +43,14 @@ using namespace ProjectExplorer; namespace QtSupport { -UicGenerator::UicGenerator(const Project *project, const Utils::FileName &source, - const Utils::FileNameList &targets, QObject *parent) : +UicGenerator::UicGenerator(const Project *project, const Utils::FilePath &source, + const Utils::FilePathList &targets, QObject *parent) : ProcessExtraCompiler(project, source, targets, parent) { QTC_ASSERT(targets.count() == 1, return); } -Utils::FileName UicGenerator::command() const +Utils::FilePath UicGenerator::command() const { QtSupport::BaseQtVersion *version = nullptr; Target *target; @@ -60,9 +60,9 @@ Utils::FileName UicGenerator::command() const version = QtSupport::QtKitAspect::qtVersion(KitManager::defaultKit()); if (!version) - return Utils::FileName(); + return Utils::FilePath(); - return Utils::FileName::fromString(version->uicCommand()); + return Utils::FilePath::fromString(version->uicCommand()); } QStringList UicGenerator::arguments() const @@ -76,7 +76,7 @@ FileNameToContentsHash UicGenerator::handleProcessFinished(QProcess *process) if (process->exitStatus() != QProcess::NormalExit && process->exitCode() != 0) return result; - const Utils::FileNameList targetList = targets(); + const Utils::FilePathList 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 @@ -96,8 +96,8 @@ QString UicGeneratorFactory::sourceTag() const } ExtraCompiler *UicGeneratorFactory::create(const Project *project, - const Utils::FileName &source, - const Utils::FileNameList &targets) + const Utils::FilePath &source, + const Utils::FilePathList &targets) { annouceCreation(project, source, targets); |