From 085d4a900d26724c237721da98a382d8bb92d6b4 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Mon, 13 Apr 2015 16:45:54 +0200 Subject: [PATCH] Vcs: Move method around in vcsbaseclient.cpp, no code change Change-Id: Ia815179f3bb8c13b05c271f2ce82c3736e6a7b79 Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsbaseclient.cpp | 28 +++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 3bfc60ce98b..a717fa5f081 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -204,6 +204,20 @@ void VcsBaseClientImpl::annotateRevisionRequested(const QString &workingDirector annotate(workingDirectory, file, changeCopy, line); } +bool VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const QStringList &args, + QByteArray *outputData, QByteArray *errorData, + unsigned flags) const +{ + QByteArray internalErrorData; + QScopedPointer command(createCommand(workingDir)); + command->addFlags(flags); + bool result = command->runFullySynchronous(args, vcsTimeoutS(), outputData, + errorData ? errorData : &internalErrorData); + if (!internalErrorData.isEmpty()) + VcsOutputWindow::appendError(commandOutputFromLocal8Bit(internalErrorData)); + return result; +} + int VcsBaseClientImpl::vcsTimeoutS() const { return settings().intValue(VcsBaseClientSettings::timeoutKey); @@ -386,20 +400,6 @@ bool VcsBaseClient::synchronousPush(const QString &workingDir, return resp.result == Utils::SynchronousProcessResponse::Finished; } -bool VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const QStringList &args, - QByteArray *outputData, QByteArray *errorData, - unsigned flags) const -{ - QByteArray internalErrorData; - QScopedPointer command(createCommand(workingDir)); - command->addFlags(flags); - bool result = command->runFullySynchronous(args, vcsTimeoutS(), outputData, - errorData ? errorData : &internalErrorData); - if (!internalErrorData.isEmpty()) - VcsOutputWindow::appendError(commandOutputFromLocal8Bit(internalErrorData)); - return result; -} - Utils::SynchronousProcessResponse VcsBaseClient::vcsSynchronousExec(const QString &workingDirectory, const QStringList &args, unsigned flags,