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

Meson: Simplify Command structure

Browse Source 
Also, change from .toString() to .path() which is the right thing
to uses in this context.

Change-Id: Ic1fe001267a729e9f68a313bea476eb17b718ba3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
hjk
2024-07-22 13:17:46 +02:00
parent 3197ef3ea6
commit 0982613a73
4 changed files with 30 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/mesonprojectmanager/toolwrapper.h
View File

@@ -7,10 +7,7 @@
#include "versionhelper.h"
#include <utils/commandline.h>
#include <utils/environment.h>
#include <utils/id.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/store.h>
#include <optional>
@@ -20,20 +17,9 @@ namespace Internal {
class Command
{
Utils::CommandLine m_cmd;
Utils::FilePath m_workDir;
public:
Command() = default;
Command(const Utils::FilePath &exe, const Utils::FilePath &workDir, const QStringList &args)
: m_cmd{exe, args}
, m_workDir{workDir}
{}
const Utils::CommandLine &cmdLine() const { return m_cmd; }
const Utils::FilePath &workDir() const { return m_workDir; }
Utils::FilePath executable() const { return m_cmd.executable(); }
QStringList arguments() const { return m_cmd.splitArguments(); }
QString toUserOutput() const { return m_cmd.toUserOutput(); }
Utils::CommandLine cmdLine;
Utils::FilePath workDir;
};
class ToolWrapper