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

VCS: Use more FilePath in ShellCommand and surroundings

Browse Source 
Change-Id: Ie8c5fac09b45a54bcbe9a876044b653e7fccede5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2021-08-11 10:02:58 +02:00
parent 2aaa0a2180
commit bbde6ac9bf
21 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/utils/shellcommand.h
View File

@@ -82,24 +82,24 @@ public:
};
ShellCommand(const QString &workingDirectory, const Environment &environment);
ShellCommand(const FilePath &workingDirectory, const Environment &environment);
~ShellCommand() override;
QString displayName() const;
void setDisplayName(const QString &name);
void addJob(const CommandLine &command,
const QString &workingDirectory = QString(),
const FilePath &workingDirectory = {},
const ExitCodeInterpreter &interpreter = {});
void addJob(const CommandLine &command, int timeoutS,
const QString &workingDirectory = QString(),
const FilePath &workingDirectory = {},
const ExitCodeInterpreter &interpreter = {});
void execute(); // Execute tasks asynchronously!
void abort();
bool lastExecutionSuccess() const;
int lastExecutionExitCode() const;
const QString &defaultWorkingDirectory() const;
const FilePath &defaultWorkingDirectory() const;
virtual const Environment processEnvironment() const;
int defaultTimeoutS() const;
@@ -123,9 +123,9 @@ public:
// This is called once per job in a thread.
// When called from the UI thread it will execute fully synchronously, so no signals will
// be triggered!
virtual void runCommand(Utils::QtcProcess &process,
virtual void runCommand(QtcProcess &process,
const CommandLine &command,
const QString &workingDirectory = QString());
const FilePath &workingDirectory = {});
void cancel();
@@ -141,23 +141,21 @@ signals:
void append(const QString &text);
void appendSilently(const QString &text);
void appendError(const QString &text);
void appendCommand(const QString &workingDirectory, const Utils::CommandLine &command);
void appendCommand(const Utils::FilePath &workingDirectory, const Utils::CommandLine &command);
void appendMessage(const QString &text);
protected:
virtual void addTask(QFuture<void> &future);
int timeoutS() const;
QString workDirectory(const QString &wd) const;
FilePath workDirectory(const FilePath &wd) const;
private:
void run(QFutureInterface<void> &future);
// Run without a event loop in fully blocking mode. No signals will be delivered.
void runFullySynchronous(QtcProcess &proc,
const QString &workingDirectory);
void runFullySynchronous(QtcProcess &proc, const FilePath &workingDirectory);
// Run with an event loop. Signals will be delivered.
void runSynchronous(QtcProcess &proc,
const QString &workingDirectory);
void runSynchronous(QtcProcess &proc, const FilePath &workingDirectory);
class Internal::ShellCommandPrivate *const d;
};