forked from qt-creator/qt-creator
VCS: Invert Command -> runVcs dependency
* Unclutter runVcs * Enable more dynamic signal/slot usage in Command Change-Id: Ie97b17078778b0c86b74d5725a78e766828ac6d8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
80194f4ef4
commit
f2e4b2b9c8
@@ -32,6 +32,8 @@
|
||||
|
||||
#include "vcsbase_global.h"
|
||||
|
||||
#include <utils/synchronousprocess.h>
|
||||
|
||||
#include <QObject>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
@@ -69,10 +71,6 @@ public:
|
||||
int defaultTimeout() const;
|
||||
void setDefaultTimeout(int timeout);
|
||||
|
||||
// Disable Terminal on UNIX (see VCS SSH handling)
|
||||
bool unixTerminalDisabled() const;
|
||||
void setUnixTerminalDisabled(bool);
|
||||
|
||||
unsigned flags() const;
|
||||
void addFlags(unsigned f);
|
||||
|
||||
@@ -82,8 +80,15 @@ public:
|
||||
QTextCodec *codec() const;
|
||||
void setCodec(QTextCodec *codec);
|
||||
|
||||
|
||||
Utils::SynchronousProcessResponse runVcs(const QStringList &arguments, int timeoutMS);
|
||||
// Make sure to not pass through the event loop at all:
|
||||
bool runFullySynchronous(const QStringList &arguments, int timeoutMS,
|
||||
QByteArray *outputData, QByteArray *errorData);
|
||||
|
||||
private:
|
||||
void run(QFutureInterface<void> &future);
|
||||
Utils::SynchronousProcessResponse runSynchronous(const QStringList &arguments, int timeoutMS);
|
||||
|
||||
signals:
|
||||
void output(const QString &);
|
||||
|
||||
Reference in New Issue
Block a user