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

Vcs: Move method around in vcsbaseclient.cpp, no code change

Browse Source 
Change-Id: I72ec25e5e98b162779a101534d511cb786d99426
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-04-13 16:53:41 +02:00
parent 5954506d19
commit 3ddb751be8
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/vcsbase/vcsbaseclient.cpp
View File

@@ -218,6 +218,15 @@ bool VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const
return result; return result;
} }
Utils::SynchronousProcessResponse VcsBaseClientImpl::vcsSynchronousExec(const QString &workingDir,
const QStringList &args,
unsigned flags,
QTextCodec *outputCodec) const
{
return VcsBasePlugin::runVcs(workingDir, vcsBinary(), args, vcsTimeoutS(), flags,
outputCodec, processEnvironment());
}
int VcsBaseClientImpl::vcsTimeoutS() const int VcsBaseClientImpl::vcsTimeoutS() const
{ {
return settings().intValue(VcsBaseClientSettings::timeoutKey); return settings().intValue(VcsBaseClientSettings::timeoutKey);
@@ -400,15 +409,6 @@ bool VcsBaseClient::synchronousPush(const QString &workingDir,
return resp.result == Utils::SynchronousProcessResponse::Finished; return resp.result == Utils::SynchronousProcessResponse::Finished;
} }
Utils::SynchronousProcessResponse VcsBaseClientImpl::vcsSynchronousExec(const QString &workingDir,
const QStringList &args,
unsigned flags,
QTextCodec *outputCodec) const
{
return VcsBasePlugin::runVcs(workingDir, vcsBinary(), args, vcsTimeoutS(), flags,
outputCodec, processEnvironment());
}
void VcsBaseClient::annotate(const QString &workingDir, const QString &file, void VcsBaseClient::annotate(const QString &workingDir, const QString &file,
const QString &revision /* = QString() */, const QString &revision /* = QString() */,
int lineNumber /* = -1 */, int lineNumber /* = -1 */,