From c3077fde553f8a0238daefb1323b9807b70a2b03 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 3 Aug 2021 09:21:15 +0200 Subject: [PATCH] Utils: Rename cmd parameter to args in prepareArgs That's what it is. Change-Id: I45fa1de000cdd25990d3e292bc129a8a12af65c6 Reviewed-by: Jarek Kobus --- src/libs/utils/commandline.cpp | 8 ++++---- src/libs/utils/commandline.h | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/libs/utils/commandline.cpp b/src/libs/utils/commandline.cpp index abe74202c93..a62badb95cc 100644 --- a/src/libs/utils/commandline.cpp +++ b/src/libs/utils/commandline.cpp @@ -588,8 +588,8 @@ static QString quoteArgWin(const QString &arg) return ret; } -ProcessArgs ProcessArgs::prepareArgs(const QString &cmd, SplitError *err, OsType osType, - const Environment *env, const FilePath *pwd, bool abortOnMeta) +ProcessArgs ProcessArgs::prepareArgs(const QString &args, SplitError *err, OsType osType, + const Environment *env, const FilePath *pwd, bool abortOnMeta) { QString wdcopy; QString *wd = nullptr; @@ -599,9 +599,9 @@ ProcessArgs ProcessArgs::prepareArgs(const QString &cmd, SplitError *err, OsType } ProcessArgs res; if (osType == OsTypeWindows) - res = prepareArgsWin(cmd, err, env, wd); + res = prepareArgsWin(args, err, env, wd); else - res = createUnixArgs(splitArgs(cmd, osType, abortOnMeta, err, env, wd)); + res = createUnixArgs(splitArgs(args, osType, abortOnMeta, err, env, wd)); return res; } diff --git a/src/libs/utils/commandline.h b/src/libs/utils/commandline.h index fc1e9566ef5..cb939d25c1b 100644 --- a/src/libs/utils/commandline.h +++ b/src/libs/utils/commandline.h @@ -63,8 +63,7 @@ public: //! Join an argument list into a shell command static QString joinArgs(const QStringList &args, OsType osType = HostOsInfo::hostOs()); //! Prepare argument of a shell command for feeding into QProcess - static ProcessArgs prepareArgs(const QString &cmd, SplitError *err, - OsType osType = HostOsInfo::hostOs(), + static ProcessArgs prepareArgs(const QString &args, SplitError *err, OsType osType, const Environment *env = nullptr, const FilePath *pwd = nullptr, bool abortOnMeta = true); //! Prepare a shell command for feeding into QProcess