From 8d645a506de17b989259fd90ea4e382e06fbeab6 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 23 Nov 2022 12:21:23 +0100 Subject: [PATCH] ProjectExplorer: FilePathify extracompiler.cpp Change-Id: I74712eb4f7f73dd809edf3ca4cfa8a14572e0365 Reviewed-by: Christian Stenger Reviewed-by: --- src/plugins/projectexplorer/extracompiler.cpp | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/plugins/projectexplorer/extracompiler.cpp b/src/plugins/projectexplorer/extracompiler.cpp index 8c8e46f4220..e92e49f051d 100644 --- a/src/plugins/projectexplorer/extracompiler.cpp +++ b/src/plugins/projectexplorer/extracompiler.cpp @@ -86,22 +86,20 @@ ExtraCompiler::ExtraCompiler(const Project *project, const FilePath &source, // Use existing target files, where possible. Otherwise run the compiler. QDateTime sourceTime = d->source.lastModified(); for (const FilePath &target : targets) { - QFileInfo targetFileInfo(target.toFileInfo()); - if (!targetFileInfo.exists()) { + if (!target.exists()) { d->dirty = true; continue; } - QDateTime lastModified = targetFileInfo.lastModified(); + QDateTime lastModified = target.lastModified(); if (lastModified < sourceTime) d->dirty = true; if (!d->compileTime.isValid() || d->compileTime > lastModified) d->compileTime = lastModified; - QFile file(target.toString()); - if (file.open(QFile::ReadOnly | QFile::Text)) - setContent(target, file.readAll()); + if (const std::optional contents = target.fileContents()) + setContent(target, *contents); } } @@ -171,10 +169,9 @@ void ExtraCompiler::onTargetsBuilt(Project *project) if (d->compileTime >= generateTime) return; - QFile file(target.toString()); - if (file.open(QFile::ReadOnly | QFile::Text)) { + if (const std::optional contents = target.fileContents()) { d->compileTime = generateTime; - setContent(target, file.readAll()); + setContent(target, *contents); } } });