From c0f3ef9a823246ae0df044f153605d12752dd5cd Mon Sep 17 00:00:00 2001
From: Artem Sokolovskii <artem.sokolovskii@qt.io>
Date: Thu, 8 Dec 2022 16:28:51 +0100
Subject: [PATCH] ClangFormat: Refactor for remote file system support

Change-Id: If44af32e2b3534fb350de9c657b99edd6bb6923a
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
---
 .../clangformat/clangformatbaseindenter.cpp   | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/plugins/clangformat/clangformatbaseindenter.cpp b/src/plugins/clangformat/clangformatbaseindenter.cpp
index 6072082c8c7..63b84036bd3 100644
--- a/src/plugins/clangformat/clangformatbaseindenter.cpp
+++ b/src/plugins/clangformat/clangformatbaseindenter.cpp
@@ -495,11 +495,8 @@ Utils::Text::Replacements ClangFormatBaseIndenter::replacements(QByteArray buffe
     std::vector<clang::tooling::Range> ranges{{static_cast<unsigned int>(rangeStart), rangeLength}};
 
     clang::format::FormattingAttemptStatus status;
-    clang::tooling::Replacements clangReplacements = reformat(style,
-                                                              buffer.data(),
-                                                              ranges,
-                                                              m_fileName.toString().toStdString(),
-                                                              &status);
+    clang::tooling::Replacements clangReplacements = clang::format::reformat(
+        style, buffer.data(), ranges, m_fileName.toFSPathString().toStdString(), &status);
 
     clang::tooling::Replacements filtered;
     if (status.FormatComplete) {
@@ -546,7 +543,7 @@ Utils::Text::Replacements ClangFormatBaseIndenter::format(
     }
 
     clang::format::FormatStyle style = styleForFile();
-    const std::string assumedFileName = m_fileName.toString().toStdString();
+    const std::string assumedFileName = m_fileName.toFSPathString().toStdString();
     clang::tooling::Replacements clangReplacements = clang::format::sortIncludes(style,
                                                                                  buffer.data(),
                                                                                  ranges,
@@ -559,11 +556,11 @@ Utils::Text::Replacements ClangFormatBaseIndenter::format(
     ranges = clang::tooling::calculateRangesAfterReplacements(clangReplacements, ranges);
 
     clang::format::FormattingAttemptStatus status;
-    const clang::tooling::Replacements formatReplacements = reformat(style,
-                                                                     *changedCode,
-                                                                     ranges,
-                                                                     assumedFileName,
-                                                                     &status);
+    const clang::tooling::Replacements formatReplacements = clang::format::reformat(style,
+                                                                                    *changedCode,
+                                                                                    ranges,
+                                                                                    assumedFileName,
+                                                                                    &status);
     clangReplacements = clangReplacements.merge(formatReplacements);
 
     const Utils::Text::Replacements toReplace = utf16Replacements(m_doc, buffer, clangReplacements);