aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2013-06-09 06:00:29 +0300
committerOrgad Shaneh <[email protected]>2013-06-10 10:37:36 +0200
commit808f4492c56cd282305668a46b3627194097ce50 (patch)
treedf3b8e89efe611dfa15b997570aa998f155e61a6 /src/plugins/git/gitclient.h
parentaae82f0e298659f20707e5c77f9c2138d71adc71 (diff)
VCS: Add a property to Command to indicate expected repo changes
Change-Id: Ia6c929ae64008dcb37695a5358c44096a893e0c4 Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 7565ac6b33d..9cfc17773a8 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -358,10 +358,10 @@ private:
// Fully synchronous git execution (QProcess-based).
bool fullySynchronousGit(const QString &workingDirectory,
- const QStringList &arguments,
- QByteArray* outputText,
- QByteArray* errorText = 0,
- bool logCommandToWindow = true) const;
+ const QStringList &arguments,
+ QByteArray* outputText,
+ QByteArray* errorText = 0,
+ unsigned flags = 0) const;
// Synchronous git execution using Utils::SynchronousProcess, with
// log windows updating (using VcsBasePlugin::runVcs with flags).
@@ -391,7 +391,6 @@ private:
mutable unsigned m_cachedGitVersion;
const QString m_msgWait;
- QSignalMapper *m_repositoryChangedSignalMapper;
GitSettings *m_settings;
QString m_gitQtcEditor;
QMap<QString, StashInfo> m_stashInfo;