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

6
src/plugins/perforce/perforceplugin.cpp
View File

@@ -775,7 +775,7 @@ void PerforcePluginPrivate::startSubmitProject()
cleanCommitMessageFile();
return;
}
m_commitMessageFileName = saver.fileName();
m_commitMessageFileName = saver.filePath().toString();
args.clear();
args << QLatin1String("files");
@@ -1385,7 +1385,7 @@ PerforceResponse PerforcePluginPrivate::runP4Cmd(const QString &workingDir,
QString errorMessage;
QSharedPointer<TempFileSaver> tempFile = createTemporaryArgumentFile(extraArgs, &errorMessage);
if (!tempFile.isNull()) {
actualArgs << QLatin1String("-x") << tempFile->fileName();
actualArgs << QLatin1String("-x") << tempFile->filePath().toString();
} else if (!errorMessage.isEmpty()) {
PerforceResponse tempFailResponse;
tempFailResponse.error = true;
@@ -1598,7 +1598,7 @@ bool PerforcePluginPrivate::submitEditorAboutToClose()
}
// Pipe file into p4 submit -i
FileReader reader;
if (!reader.fetch(m_commitMessageFileName, QIODevice::Text)) {
if (!reader.fetch(Utils::FilePath::fromString(m_commitMessageFileName), QIODevice::Text)) {
VcsOutputWindow::appendError(reader.errorString());
return false;
}