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

Vcs: Move vcsFullySynchronousExec into VcsBaseClientImpl

Browse Source 
Use that in the gitplugin in favor of fullySynchronousGit.

Change-Id: Ifd981f3fc5e87e16ad52caf32c204f81acffe586
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-04-10 16:04:42 +02:00
parent e4db1211ff
commit dcdcf54048
4 changed files with 84 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/vcsbase/vcsbaseclient.h
View File

@@ -110,6 +110,11 @@ protected:
virtual void annotateRevisionRequested(const QString &workingDirectory, const QString &file,
const QString &change, int line);
// Fully synchronous VCS execution (QProcess-based)
bool vcsFullySynchronousExec(const QString &workingDir, const QStringList &args,
QByteArray *outputData, QByteArray *errorData = 0,
unsigned flags = 0) const;
private:
void saveSettings();
void commandFinishedGotoLine(QWidget*);
@@ -220,10 +225,7 @@ protected:
virtual StatusItem parseStatusLine(const QString &line) const = 0;
QString vcsEditorTitle(const QString &vcsCmd, const QString &sourceId) const;
// Fully synchronous VCS execution (QProcess-based)
bool vcsFullySynchronousExec(const QString &workingDir, const QStringList &args,
QByteArray *outputData, QByteArray *errorData = 0,
unsigned flags = 0) const;
// Synchronous VCS execution using Utils::SynchronousProcess, with
// log windows updating (using VcsBasePlugin::runVcs with flags)
Utils::SynchronousProcessResponse vcsSynchronousExec(const QString &workingDir,