From 38520cd8a59aa28777fc1f32a490e48f896eae2b Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 26 Jun 2024 10:13:02 +0200 Subject: [PATCH] QtSupport: Simplify startEditorProcess() Skip pid arg, as it's not used. Inline error message construction. Change-Id: I429d2094c2c8117fb79e9c9309036d9573b29f3f Reviewed-by: hjk --- src/plugins/qtsupport/externaleditors.cpp | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/plugins/qtsupport/externaleditors.cpp b/src/plugins/qtsupport/externaleditors.cpp index 371623f6cf7..47200a6aeb3 100644 --- a/src/plugins/qtsupport/externaleditors.cpp +++ b/src/plugins/qtsupport/externaleditors.cpp @@ -118,12 +118,6 @@ static QString locateBinary(const QString &path, const QString &binary) return {}; } -static QString msgStartFailed(const QString &binary, QStringList arguments) -{ - arguments.push_front(binary); - return Tr::tr("Unable to start \"%1\"").arg(arguments.join(QLatin1Char(' '))); -} - static QString designerBinary(const QtSupport::QtVersion *qtVersion) { if (qtVersion) @@ -227,12 +221,11 @@ static bool startEditorProcess(const LaunchData &data, QString *errorMessage) { if (debug) qDebug() << Q_FUNC_INFO << '\n' << data.binary << data.arguments << data.workingDirectory; - qint64 pid = 0; - if (!Process::startDetached({FilePath::fromString(data.binary), data.arguments}, data.workingDirectory, &pid)) { - *errorMessage = msgStartFailed(data.binary, data.arguments); - return false; - } - return true; + const CommandLine cmd{FilePath::fromString(data.binary), data.arguments}; + if (Process::startDetached(cmd, data.workingDirectory)) + return true; + *errorMessage = Tr::tr("Unable to start \"%1\".").arg(cmd.toUserOutput()); + return false; } // ExternalDesignerEditorFactory with Designer Tcp remote control.