feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: filepathify fileutils

Browse Source 
Change-Id: Ic9048369f64d793f5f567cdb0c715488fb5a4ff6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
David Schulz
2021-05-18 09:47:07 +02:00
parent 013bf6a743
commit a13aef759e
66 changed files with 147 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/vcsbase/nicknamedialog.cpp
View File

@@ -244,7 +244,7 @@ bool NickNameDialog::populateModelFromMailCapFile(const QString &fileName,
if (fileName.isEmpty())
return true;
FileReader reader;
if (!reader.fetch(fileName, QIODevice::Text, errorMessage))
if (!reader.fetch(Utils::FilePath::fromString(fileName), QIODevice::Text, errorMessage))
return false;
// Split into lines and read
NickNameEntry entry;

5
src/plugins/vcsbase/submiteditorfile.cpp
View File

@@ -58,7 +58,7 @@ Core::IDocument::OpenResult SubmitEditorFile::open(QString *errorString, const Q
return OpenResult::ReadError;
FileReader reader;
if (!reader.fetch(realFileName, QIODevice::Text, errorString))
if (!reader.fetch(Utils::FilePath::fromString(realFileName), QIODevice::Text, errorString))
return OpenResult::ReadError;
const QString text = QString::fromLocal8Bit(reader.data());
@@ -91,8 +91,7 @@ void SubmitEditorFile::setModified(bool modified)
bool SubmitEditorFile::save(QString *errorString, const QString &fileName, bool autoSave)
{
const FilePath fName = fileName.isEmpty() ? filePath() : FilePath::fromString(fileName);
FileSaver saver(fName.toString(),
QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
FileSaver saver(fName, QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text);
saver.write(m_editor->fileContents());
if (!saver.finalize(errorString))
return false;

7
src/plugins/vcsbase/vcsbasesubmiteditor.cpp
View File

@@ -274,8 +274,11 @@ static inline QStringList fieldTexts(const QString &fileContents)
void VcsBaseSubmitEditor::createUserFields(const QString &fieldConfigFile)
{
FileReader reader;
if (!reader.fetch(fieldConfigFile, QIODevice::Text, Core::ICore::dialogParent()))
if (!reader.fetch(FilePath::fromString(fieldConfigFile),
QIODevice::Text,
Core::ICore::dialogParent())) {
return;
}
// Parse into fields
const QStringList fields = fieldTexts(QString::fromUtf8(reader.data()));
if (fields.empty())
@@ -657,7 +660,7 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript
QtcProcess checkProcess;
if (!d->m_checkScriptWorkingDirectory.isEmpty())
checkProcess.setWorkingDirectory(d->m_checkScriptWorkingDirectory);
checkProcess.setCommand({checkScript, {saver.fileName()}});
checkProcess.setCommand({checkScript, {saver.filePath().toString()}});
checkProcess.start();
checkProcess.closeWriteChannel();
if (!checkProcess.waitForStarted()) {