From 20700feb84d16b59456031d69c460f52c3db159a Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 7 Jul 2023 14:06:00 +0200 Subject: [PATCH] VcsBase: Proliferate FilePath use a tiny bit Change-Id: I78929f6036702fe0b5384f4324f6283c2129d91b Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 14 +++++++------- src/plugins/vcsbase/vcsbasesubmiteditor.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index 03eaa49c857..7d18d1de851 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -521,7 +521,7 @@ void VcsBaseSubmitEditor::slotCheckSubmitMessage() bool VcsBaseSubmitEditor::checkSubmitMessage(QString *errorMessage) const { - const QString checkScript = commonSettings().submitMessageCheckScript.value(); + const FilePath checkScript = commonSettings().submitMessageCheckScript(); if (checkScript.isEmpty()) return true; QApplication::setOverrideCursor(Qt::WaitCursor); @@ -530,17 +530,17 @@ bool VcsBaseSubmitEditor::checkSubmitMessage(QString *errorMessage) const return rc; } -static QString msgCheckScript(const FilePath &workingDir, const QString &cmd) +static QString msgCheckScript(const FilePath &workingDir, const FilePath &cmd) { - const QString nativeCmd = QDir::toNativeSeparators(cmd); + const QString nativeCmd = cmd.toUserOutput(); return workingDir.isEmpty() ? Tr::tr("Executing %1").arg(nativeCmd) : - Tr::tr("Executing [%1] %2"). - arg(workingDir.toUserOutput(), nativeCmd); + Tr::tr("Executing [%1] %2").arg(workingDir.toUserOutput(), nativeCmd); } -bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript, QString *errorMessage) const +bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const FilePath &checkScript, QString *errorMessage) const { + QTC_ASSERT(!checkScript.needsDevice(), return false); // Not supported below. // Write out message TempFileSaver saver(TemporaryDirectory::masterDirectoryPath() + "/msgXXXXXX.txt"); saver.write(fileContents()); @@ -552,7 +552,7 @@ bool VcsBaseSubmitEditor::runSubmitMessageCheckScript(const QString &checkScript Process checkProcess; if (!d->m_checkScriptWorkingDirectory.isEmpty()) checkProcess.setWorkingDirectory(d->m_checkScriptWorkingDirectory); - checkProcess.setCommand({FilePath::fromString(checkScript), {saver.filePath().toString()}}); + checkProcess.setCommand({checkScript, {saver.filePath().path()}}); checkProcess.start(); const bool succeeded = checkProcess.waitForFinished(); diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index 38540386664..5277b3efcf6 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -116,7 +116,7 @@ private: void createUserFields(const QString &fieldConfigFile); bool checkSubmitMessage(QString *errorMessage) const; - bool runSubmitMessageCheckScript(const QString &script, QString *errorMessage) const; + bool runSubmitMessageCheckScript(const Utils::FilePath &script, QString *errorMessage) const; QString promptForNickName(); void close();