From 3cd19a591f8107dfda47ee4833d110fd3a67ea0c Mon Sep 17 00:00:00 2001
From: Hugues Delorme <delorme.hugues@fougsys.fr>
Date: Mon, 19 May 2014 18:26:02 +0200
Subject: [PATCH] VcsBase: fix constness of VcsBaseClient member functions
Member functions VcsBaseClient::createCommand() and vcsSynchronousExec()
should be const (ie. read-only functions)
Change-Id: I4db75c9e23d9d1abf316ce1a4e222a5f3b339b13
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
---
src/plugins/vcsbase/vcsbaseclient.cpp | 4 ++--
src/plugins/vcsbase/vcsbaseclient.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index 460c9d20a00..dbbc54b5892 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -316,7 +316,7 @@ Utils::SynchronousProcessResponse VcsBaseClient::vcsSynchronousExec(
const QString &workingDirectory,
const QStringList &args,
unsigned flags,
- QTextCodec *outputCodec)
+ QTextCodec *outputCodec) const
{
const QString binary = settings()->binaryPath();
const int timeoutSec = settings()->intValue(VcsBaseClientSettings::timeoutKey);
@@ -603,7 +603,7 @@ QProcessEnvironment VcsBaseClient::processEnvironment() const
Command *VcsBaseClient::createCommand(const QString &workingDirectory,
VcsBase::VcsBaseEditorWidget *editor,
- JobOutputBindMode mode)
+ JobOutputBindMode mode) const
{
Command *cmd = new Command(d->m_clientSettings->binaryPath(),
workingDirectory, processEnvironment());
diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h
index 85e81938354..0dae176643a 100644
--- a/src/plugins/vcsbase/vcsbaseclient.h
+++ b/src/plugins/vcsbase/vcsbaseclient.h
@@ -172,7 +172,7 @@ protected:
Utils::SynchronousProcessResponse vcsSynchronousExec(const QString &workingDir,
const QStringList &args,
unsigned flags = 0,
- QTextCodec *outputCodec = 0);
+ QTextCodec *outputCodec = 0) const;
VcsBase::VcsBaseEditorWidget *createVcsEditor(Core::Id kind, QString title,
const QString &source, bool setSourceCodec,
const char *registerDynamicProperty,
@@ -184,7 +184,7 @@ protected:
};
Command *createCommand(const QString &workingDirectory,
VcsBase::VcsBaseEditorWidget *editor = 0,
- JobOutputBindMode mode = NoOutputBind);
+ JobOutputBindMode mode = NoOutputBind) const;
void enqueueJob(Command *cmd, const QStringList &args, Utils::ExitCodeInterpreter *interpreter = 0);
void resetCachedVcsInfo(const QString &workingDir);
--
GitLab