Utils: filepathify TextFileFormat

Change-Id: I6a4e2d38b0bbdec661a4a492901d9182a9f2e502
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

15 files changed, 69 insertions, 50 deletions

diff --git a/src/plugins/autotest/itestparser.cpp b/src/plugins/autotest/itestparser.cpp
index 51ab6f6b3b2..873f4f2a781 100644
--- a/src/plugins/autotest/itestparser.cpp
+++ b/src/plugins/autotest/itestparser.cpp
@@ -60,8 +60,11 @@ QByteArray CppParser::getFileContent(const QString &filePath) const
     } else {
         QString error;
         const QTextCodec *codec = Core::EditorManager::defaultTextCodec();
-        if (Utils::TextFileFormat::readFileUTF8(filePath, codec, &fileContent, &error)
-                != Utils::TextFileFormat::ReadSuccess) {
+        if (Utils::TextFileFormat::readFileUTF8(Utils::FilePath::fromString(filePath),
+                                                codec,
+                                                &fileContent,
+                                                &error)
+            != Utils::TextFileFormat::ReadSuccess) {
             qDebug() << "Failed to read file" << filePath << ":" << error;
         }
     }
diff --git a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
index 98d26069b78..93b248ea1b6 100644
--- a/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
+++ b/src/plugins/clangtools/clangfixitsrefactoringchanges.cpp
@@ -122,7 +122,9 @@ bool FixitsRefactoringFile::apply()
 
     QString error;
     for (auto it = m_documents.begin(); it != m_documents.end(); ++it) {
-        if (!m_textFileFormat.writeFile(it.key(), it.value()->toPlainText(), &error)) {
+        if (!m_textFileFormat.writeFile(FilePath::fromString(it.key()),
+                                        it.value()->toPlainText(),
+                                        &error)) {
             qCDebug(fixitsLog) << "ERROR: Could not write file" << it.key() << ":" << error;
             return false; // Error writing file
         }
@@ -163,10 +165,12 @@ QTextDocument *FixitsRefactoringFile::document(const QString &filePath) const
         if (!filePath.isEmpty()) {
             QString error;
             QTextCodec *defaultCodec = Core::EditorManager::defaultTextCodec();
-            TextFileFormat::ReadResult result = TextFileFormat::readFile(
-                        filePath, defaultCodec,
-                        &fileContents, &m_textFileFormat,
-                        &error);
+            TextFileFormat::ReadResult result = TextFileFormat::readFile(FilePath::fromString(
+                                                                             filePath),
+                                                                         defaultCodec,
+                                                                         &fileContents,
+                                                                         &m_textFileFormat,
+                                                                         &error);
             if (result != TextFileFormat::ReadSuccess) {
                 qCDebug(fixitsLog) << "ERROR: Could not read " << filePath << ":" << error;
                 m_textFileFormat.codec = nullptr;
diff --git a/src/plugins/coreplugin/generatedfile.cpp b/src/plugins/coreplugin/generatedfile.cpp
index 2ddeeeb1a9c..0280eb08d8f 100644
--- a/src/plugins/coreplugin/generatedfile.cpp
+++ b/src/plugins/coreplugin/generatedfile.cpp
@@ -165,7 +165,7 @@ bool GeneratedFile::write(QString *errorMessage) const
     Utils::TextFileFormat format;
     format.codec = EditorManager::defaultTextCodec();
     format.lineTerminationMode = EditorManager::defaultLineEnding();
-    return format.writeFile(m_d->path, contents(), errorMessage);
+    return format.writeFile(Utils::FilePath::fromString(m_d->path), contents(), errorMessage);
 }
 
 GeneratedFile::Attributes GeneratedFile::attributes() const
diff --git a/src/plugins/coreplugin/textdocument.cpp b/src/plugins/coreplugin/textdocument.cpp
index 3040dd9a452..d562831ef8e 100644
--- a/src/plugins/coreplugin/textdocument.cpp
+++ b/src/plugins/coreplugin/textdocument.cpp
@@ -110,7 +110,7 @@ bool BaseTextDocument::write(const QString &fileName, const Utils::TextFileForma
 {
     if (debug)
         qDebug() << Q_FUNC_INFO << this << fileName;
-    return format.writeFile(fileName, data, errorMessage);
+    return format.writeFile(Utils::FilePath::fromString(fileName), data, errorMessage);
 }
 
 void BaseTextDocument::setSupportsUtf8Bom(bool value)
@@ -136,7 +136,7 @@ void BaseTextDocument::setLineTerminationMode(Utils::TextFileFormat::LineTermina
 BaseTextDocument::ReadResult BaseTextDocument::read(const QString &fileName, QStringList *plainTextList, QString *errorString)
 {
     d->m_readResult =
-        Utils::TextFileFormat::readFile(fileName, codec(),
+        Utils::TextFileFormat::readFile(Utils::FilePath::fromString(fileName), codec(),
                                         plainTextList, &d->m_format, errorString, &d->m_decodingErrorSample);
     return d->m_readResult;
 }
@@ -154,7 +154,7 @@ BaseTextDocument::ReadResult BaseTextDocument::read(const QString &fileName, QSt
 BaseTextDocument::ReadResult BaseTextDocument::read(const QString &fileName, QString *plainText, QString *errorString)
 {
     d->m_readResult =
-        Utils::TextFileFormat::readFile(fileName, codec(),
+        Utils::TextFileFormat::readFile(Utils::FilePath::fromString(fileName), codec(),
                                         plainText, &d->m_format, errorString, &d->m_decodingErrorSample);
     return d->m_readResult;
 }
diff --git a/src/plugins/cppeditor/cppeditorwidget.cpp b/src/plugins/cppeditor/cppeditorwidget.cpp
index 6f858dae26c..c7ca20d4217 100644
--- a/src/plugins/cppeditor/cppeditorwidget.cpp
+++ b/src/plugins/cppeditor/cppeditorwidget.cpp
@@ -361,8 +361,12 @@ static std::unique_ptr<QTextDocument> getCurrentDocument(const QString &path)
     QString contents;
     Utils::TextFileFormat format;
     QString error;
-    if (Utils::TextFileFormat::readFile(path, defaultCodec, &contents, &format, &error)
-            != Utils::TextFileFormat::ReadSuccess) {
+    if (Utils::TextFileFormat::readFile(Utils::FilePath::fromString(path),
+                                        defaultCodec,
+                                        &contents,
+                                        &format,
+                                        &error)
+        != Utils::TextFileFormat::ReadSuccess) {
         qWarning() << "Error reading file " << path << " : " << error;
         return {};
     }
diff --git a/src/plugins/cpptools/cppfindreferences.cpp b/src/plugins/cpptools/cppfindreferences.cpp
index 3ac9bcdf1da..2ffb129adb6 100644
--- a/src/plugins/cpptools/cppfindreferences.cpp
+++ b/src/plugins/cpptools/cppfindreferences.cpp
@@ -140,7 +140,7 @@ static QByteArray getSource(const Utils::FilePath &fileName,
         QString error;
         QTextCodec *defaultCodec = EditorManager::defaultTextCodec();
         Utils::TextFileFormat::ReadResult result = Utils::TextFileFormat::readFile(
-                    fileName.toString(), defaultCodec, &fileContents, &format, &error);
+                    fileName, defaultCodec, &fileContents, &format, &error);
         if (result != Utils::TextFileFormat::ReadSuccess)
             qWarning() << "Could not read " << fileName << ". Error: " << error;
 
diff --git a/src/plugins/cpptools/cppsourceprocessor.cpp b/src/plugins/cpptools/cppsourceprocessor.cpp
index 7f232c1ad7f..b9585f7acae 100644
--- a/src/plugins/cpptools/cppsourceprocessor.cpp
+++ b/src/plugins/cpptools/cppsourceprocessor.cpp
@@ -220,8 +220,11 @@ bool CppSourceProcessor::getFileContents(const QString &absoluteFilePath,
     // Get from file
     *revision = 0;
     QString error;
-    if (Utils::TextFileFormat::readFileUTF8(absoluteFilePath, m_defaultCodec, contents, &error)
-            != Utils::TextFileFormat::ReadSuccess) {
+    if (Utils::TextFileFormat::readFileUTF8(Utils::FilePath::fromString(absoluteFilePath),
+                                            m_defaultCodec,
+                                            contents,
+                                            &error)
+        != Utils::TextFileFormat::ReadSuccess) {
         qWarning("Error reading file \"%s\": \"%s\".", qPrintable(absoluteFilePath),
                  qPrintable(error));
         return false;
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp
index ca234eb6f89..7785fe9423c 100644
--- a/src/plugins/diffeditor/diffeditorplugin.cpp
+++ b/src/plugins/diffeditor/diffeditorplugin.cpp
@@ -199,7 +199,7 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
     QList<ReloadInput> result;
 
     auto textDocument = qobject_cast<TextEditor::TextDocument *>(
-        DocumentModel::documentForFilePath(Utils::FilePath::fromString(m_fileName)));
+        DocumentModel::documentForFilePath(FilePath::fromString(m_fileName)));
 
     if (textDocument && textDocument->isModified()) {
         QString errorString;
@@ -207,7 +207,7 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
 
         QString leftText;
         const Utils::TextFileFormat::ReadResult leftResult
-                = Utils::TextFileFormat::readFile(m_fileName, format.codec,
+            = Utils::TextFileFormat::readFile(FilePath::fromString(m_fileName), format.codec,
                                         &leftText, &format, &errorString);
 
         const QString rightText = textDocument->plainText();
@@ -262,9 +262,8 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
 
             QString leftText;
             const QString fileName = textDocument->filePath().toString();
-            const Utils::TextFileFormat::ReadResult leftResult
-                    = Utils::TextFileFormat::readFile(fileName, format.codec,
-                                            &leftText, &format, &errorString);
+            const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile(
+                FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString);
 
             const QString rightText = textDocument->plainText();
 
@@ -321,9 +320,8 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const
 
             QString leftText;
             const QString fileName = textDocument->filePath().toString();
-            const Utils::TextFileFormat::ReadResult leftResult
-                    = Utils::TextFileFormat::readFile(fileName, format.codec,
-                                            &leftText, &format, &errorString);
+            const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile(
+                FilePath::fromString(fileName), format.codec, &leftText, &format, &errorString);
 
             const QString rightText = textDocument->plainText();
 
@@ -378,12 +376,10 @@ QList<ReloadInput> DiffExternalFilesController::reloadInputList() const
     QString leftText;
     QString rightText;
 
-    const Utils::TextFileFormat::ReadResult leftResult
-            = Utils::TextFileFormat::readFile(m_leftFileName, format.codec,
-                                    &leftText, &format, &errorString);
-    const Utils::TextFileFormat::ReadResult rightResult
-            = Utils::TextFileFormat::readFile(m_rightFileName, format.codec,
-                                    &rightText, &format, &errorString);
+    const Utils::TextFileFormat::ReadResult leftResult = Utils::TextFileFormat::readFile(
+        FilePath::fromString(m_leftFileName), format.codec, &leftText, &format, &errorString);
+    const Utils::TextFileFormat::ReadResult rightResult = Utils::TextFileFormat::readFile(
+        FilePath::fromString(m_rightFileName), format.codec, &rightText, &format, &errorString);
 
     ReloadInput reloadInput;
     reloadInput.leftText = leftText;
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp
index 9eeea589d40..b3a447da195 100644
--- a/src/plugins/git/gitclient.cpp
+++ b/src/plugins/git/gitclient.cpp
@@ -3836,8 +3836,11 @@ IEditor *GitClient::openShowEditor(const QString &workingDirectory, const QStrin
         if (content.isEmpty())
             return nullptr;
         QByteArray fileContent;
-        if (TextFileFormat::readFileUTF8(path, nullptr, &fileContent, nullptr)
-                == TextFileFormat::ReadSuccess) {
+        if (TextFileFormat::readFileUTF8(Utils::FilePath::fromString(path),
+                                         nullptr,
+                                         &fileContent,
+                                         nullptr)
+            == TextFileFormat::ReadSuccess) {
             if (fileContent == content)
                 return nullptr; // open the file for read/write
         }
diff --git a/src/plugins/languageclient/languageclientsymbolsupport.cpp b/src/plugins/languageclient/languageclientsymbolsupport.cpp
index 434d4f80506..5d78618e20b 100644
--- a/src/plugins/languageclient/languageclientsymbolsupport.cpp
+++ b/src/plugins/languageclient/languageclientsymbolsupport.cpp
@@ -146,7 +146,7 @@ QStringList SymbolSupport::getFileContents(const Utils::FilePath &filePath)
         format.lineTerminationMode = Utils::TextFileFormat::LFLineTerminator;
         QString error;
         const QTextCodec *codec = Core::EditorManager::defaultTextCodec();
-        if (Utils::TextFileFormat::readFile(filePath.toString(), codec, &fileContent, &format, &error)
+        if (Utils::TextFileFormat::readFile(filePath, codec, &fileContent, &format, &error)
             != Utils::TextFileFormat::ReadSuccess) {
             qDebug() << "Failed to read file" << filePath << ":" << error;
         }
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
index 758e642bc7c..8d7866dd93f 100644
--- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp
@@ -770,12 +770,12 @@ QPair<ProFile *, QStringList> QmakePriFile::readProFile()
         QString contents;
         {
             QString errorMsg;
-            if (TextFileFormat::readFile(
-                        filePath().toString(),
-                        Core::EditorManager::defaultTextCodec(),
-                        &contents,
-                        &m_textFormat,
-                        &errorMsg) != TextFileFormat::ReadSuccess) {
+            if (TextFileFormat::readFile(filePath(),
+                                         Core::EditorManager::defaultTextCodec(),
+                                         &contents,
+                                         &m_textFormat,
+                                         &errorMsg)
+                != TextFileFormat::ReadSuccess) {
                 QmakeBuildSystem::proFileParseError(errorMsg, filePath());
                 return qMakePair(includeFile, lines);
             }
@@ -932,7 +932,7 @@ void QmakePriFile::save(const QStringList &lines)
         QTC_ASSERT(m_textFormat.codec, return);
         FileChangeBlocker changeGuard(filePath().toString());
         QString errorMsg;
-        if (!m_textFormat.writeFile(filePath().toString(), lines.join('\n'), &errorMsg)) {
+        if (!m_textFormat.writeFile(filePath(), lines.join('\n'), &errorMsg)) {
             QMessageBox::critical(Core::ICore::dialogParent(), QCoreApplication::translate(
                                       "QmakePriFile", "File Error"), errorMsg);
         }
diff --git a/src/plugins/qmldesigner/documentmanager.cpp b/src/plugins/qmldesigner/documentmanager.cpp
index 7cd0b2d14c2..d8a8048aaf8 100644
--- a/src/plugins/qmldesigner/documentmanager.cpp
+++ b/src/plugins/qmldesigner/documentmanager.cpp
@@ -302,7 +302,7 @@ bool DocumentManager::createFile(const QString &filePath, const QString &content
     textFileFormat.codec = Core::EditorManager::defaultTextCodec();
     QString errorMessage;
 
-    return textFileFormat.writeFile(filePath, contents, &errorMessage);
+    return textFileFormat.writeFile(Utils::FilePath::fromString(filePath), contents, &errorMessage);
 }
 
 void DocumentManager::addFileToVersionControl(const QString &directoryPath, const QString &newFilePath)
diff --git a/src/plugins/qmlprojectmanager/qmlproject.cpp b/src/plugins/qmlprojectmanager/qmlproject.cpp
index 3469a44c233..eeb09147fc8 100644
--- a/src/plugins/qmlprojectmanager/qmlproject.cpp
+++ b/src/plugins/qmlprojectmanager/qmlproject.cpp
@@ -543,7 +543,7 @@ bool QmlBuildSystem::renameFile(Node * context, const QString &filePath, const Q
             QString error;
             Utils::TextFileFormat textFileFormat;
             const QTextCodec *codec = QTextCodec::codecForName("UTF-8"); // qml files are defined to be utf-8
-            if (Utils::TextFileFormat::readFile(qmlProjectFilePath.toString(), codec, &fileContent, &textFileFormat, &error)
+            if (Utils::TextFileFormat::readFile(qmlProjectFilePath, codec, &fileContent, &textFileFormat, &error)
                     != Utils::TextFileFormat::ReadSuccess) {
                 qWarning() << "Failed to read file" << qmlProjectFilePath << ":" << error;
             }
@@ -556,7 +556,7 @@ bool QmlBuildSystem::renameFile(Node * context, const QString &filePath, const Q
 
             fileContent.replace(match.capturedStart(1), match.capturedLength(1), QFileInfo(newFilePath).fileName());
 
-            if (!textFileFormat.writeFile(qmlProjectFilePath.toString(), fileContent, &error))
+            if (!textFileFormat.writeFile(qmlProjectFilePath, fileContent, &error))
                 qWarning() << "Failed to write file" << qmlProjectFilePath << ":" << error;
 
             refresh(Everything);
diff --git a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
index 98306e45ec7..a16223eb60c 100644
--- a/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
+++ b/src/plugins/resourceeditor/qrceditor/resourcefile.cpp
@@ -242,7 +242,9 @@ bool ResourceFile::save()
         return false;
     }
 
-    return m_textFileFormat.writeFile(m_file_name, contents(), &m_error_message);
+    return m_textFileFormat.writeFile(Utils::FilePath::fromString(m_file_name),
+                                      contents(),
+                                      &m_error_message);
 }
 
 void ResourceFile::refresh()
diff --git a/src/plugins/texteditor/refactoringchanges.cpp b/src/plugins/texteditor/refactoringchanges.cpp
index 9732972b010..b936066b1a0 100644
--- a/src/plugins/texteditor/refactoringchanges.cpp
+++ b/src/plugins/texteditor/refactoringchanges.cpp
@@ -98,7 +98,7 @@ bool RefactoringChanges::createFile(const QString &fileName, const QString &cont
     TextFileFormat format;
     format.codec = EditorManager::defaultTextCodec();
     QString error;
-    bool saveOk = format.writeFile(fileName, document->toPlainText(), &error);
+    bool saveOk = format.writeFile(Utils::FilePath::fromString(fileName), document->toPlainText(), &error);
     delete document;
     if (!saveOk)
         return false;
@@ -198,10 +198,12 @@ QTextDocument *RefactoringFile::mutableDocument() const
         if (!m_fileName.isEmpty()) {
             QString error;
             QTextCodec *defaultCodec = EditorManager::defaultTextCodec();
-            TextFileFormat::ReadResult result = TextFileFormat::readFile(
-                        m_fileName, defaultCodec,
-                        &fileContents, &m_textFileFormat,
-                        &error);
+            TextFileFormat::ReadResult result = TextFileFormat::readFile(FilePath::fromString(
+                                                                             m_fileName),
+                                                                         defaultCodec,
+                                                                         &fileContents,
+                                                                         &m_textFileFormat,
+                                                                         &error);
             if (result != TextFileFormat::ReadSuccess) {
                 qWarning() << "Could not read " << m_fileName << ". Error: " << error;
                 m_textFileFormat.codec = nullptr;
@@ -372,7 +374,9 @@ bool RefactoringFile::apply()
                 QString error;
                 // suppress "file has changed" warnings if the file is open in a read-only editor
                 Core::FileChangeBlocker block(m_fileName);
-                if (!m_textFileFormat.writeFile(m_fileName, doc->toPlainText(), &error)) {
+                if (!m_textFileFormat.writeFile(FilePath::fromString(m_fileName),
+                                                doc->toPlainText(),
+                                                &error)) {
                     qWarning() << "Could not apply changes to" << m_fileName << ". Error: " << error;
                     result = false;
                 }