ClangTools: Use FilePath in AnalyzeUnit

Change-Id: Ic8e19053a60e7c4d801f32f9048b7c48d00b2a3d
Reviewed-by: Christian Kandeler <[email protected]>
Reviewed-by: Jarek Kobus <[email protected]>

1 files changed, 6 insertions, 6 deletions

diff --git a/src/plugins/clangtools/clangtoolrunner.cpp b/src/plugins/clangtools/clangtoolrunner.cpp
index 4c2a908a789..a02ae6912e0 100644
--- a/src/plugins/clangtools/clangtoolrunner.cpp
+++ b/src/plugins/clangtools/clangtoolrunner.cpp
@@ -41,7 +41,7 @@ AnalyzeUnit::AnalyzeUnit(const FileInfo &fileInfo,
                                           UseLanguageDefines::No,
                                           UseBuildSystemWarnings::No,
                                           actualClangIncludeDir);
-    file = fileInfo.file.toString();
+    file = fileInfo.file;
     arguments = extraClangToolsPrependOptions();
     arguments.append(optionsBuilder.build(fileInfo.kind, CppEditor::getPchUsage()));
     arguments.append(extraClangToolsAppendOptions());
@@ -85,9 +85,9 @@ static QStringList clangArguments(const ClangDiagnosticConfig &diagnosticConfig,
     return arguments;
 }
 
-static QString createOutputFilePath(const FilePath &dirPath, const QString &fileToAnalyze)
+static QString createOutputFilePath(const FilePath &dirPath, const FilePath &fileToAnalyze)
 {
-    const QString fileName = QFileInfo(fileToAnalyze).fileName();
+    const QString fileName = fileToAnalyze.fileName();
     const FilePath fileTemplate = dirPath.pathAppended("report-" + fileName + "-XXXXXX");
 
     TemporaryFile temporaryFile("clangtools");
@@ -117,7 +117,7 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
         result << "-export-fixes=" + data->outputFilePath;
         if (!input.overlayFilePath.isEmpty() && isVFSOverlaySupported(data->executable))
             result << "--vfsoverlay=" + input.overlayFilePath;
-        result << QDir::toNativeSeparators(input.unit.file);
+        result << input.unit.file.nativePath();
         return result;
     };
 
@@ -134,8 +134,8 @@ TaskItem clangToolTask(const AnalyzeInputData &input,
         }
 
         QTC_CHECK(!input.unit.arguments.contains(QLatin1String("-o")));
-        QTC_CHECK(!input.unit.arguments.contains(input.unit.file));
-        QTC_ASSERT(FilePath::fromString(input.unit.file).exists(), return TaskAction::StopWithError);
+        QTC_CHECK(!input.unit.arguments.contains(input.unit.file.nativePath()));
+        QTC_ASSERT(input.unit.file.exists(), return TaskAction::StopWithError);
         data->outputFilePath = createOutputFilePath(input.outputDirPath, input.unit.file);
         QTC_ASSERT(!data->outputFilePath.isEmpty(), return TaskAction::StopWithError);