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

vcs: s/VCS/Vcs/

Browse Source 
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
This commit is contained in:
hjk
2012-01-07 12:31:48 +01:00
parent 641716bee3
commit 6681d3edee
167 changed files with 1588 additions and 1588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/git/gitclient.h
View File

@@ -55,8 +55,8 @@ namespace Core {
class ICore;
}
namespace VCSBase {
class VCSBaseEditorWidget;
namespace VcsBase {
class VcsBaseEditorWidget;
class SubmitFileModel;
}
@@ -205,7 +205,7 @@ public:
const GitSubmitEditorPanelData &data,
const QString &amendSHA1,
const QString &messageFile,
VCSBase::SubmitFileModel *model);
VcsBase::SubmitFileModel *model);
enum StatusResult { StatusChanged, StatusUnchanged, StatusFailed };
StatusResult gitStatus(const QString &workingDirectory,
@@ -233,10 +233,10 @@ private slots:
void slotBlameRevisionRequested(const QString &source, QString change, int lineNumber);
private:
VCSBase::VCSBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VCSBase::VCSBaseEditorWidget *createVCSEditor(const Core::Id &kind,
VcsBase::VcsBaseEditorWidget *createVcsEditor(const Core::Id &kind,
QString title,
const QString &source,
CodecType codecType,
@@ -244,16 +244,16 @@ private:
const QString &dynamicPropertyValue,
QWidget *configWidget) const;
VCSBase::Command *createCommand(const QString &workingDirectory,
VCSBase::VCSBaseEditorWidget* editor = 0,
VcsBase::Command *createCommand(const QString &workingDirectory,
VcsBase::VcsBaseEditorWidget* editor = 0,
bool useOutputToWindow = false,
int editorLineNumber = -1);
VCSBase::Command *executeGit(const QString &workingDirectory,
VcsBase::Command *executeGit(const QString &workingDirectory,
const QStringList &arguments,
VCSBase::VCSBaseEditorWidget* editor = 0,
VcsBase::VcsBaseEditorWidget* editor = 0,
bool useOutputToWindow = false,
VCSBase::Command::TerminationReportMode tm = VCSBase::Command::NoReport,
VcsBase::Command::TerminationReportMode tm = VcsBase::Command::NoReport,
int editorLineNumber = -1,
bool unixTerminalDisabled = false);
@@ -265,7 +265,7 @@ private:
bool logCommandToWindow = true) const;
// Synchronous git execution using Utils::SynchronousProcess, with
// log windows updating (using VCSBasePlugin::runVCS with flags).
// log windows updating (using VcsBasePlugin::runVcs with flags).
inline Utils::SynchronousProcessResponse
synchronousGit(const QString &workingDirectory, const QStringList &arguments,
unsigned flags = 0, QTextCodec *outputCodec = 0);
@@ -278,7 +278,7 @@ private:
bool *isDirectory,
QString *errorMessage,
bool revertStaging);
void connectRepositoryChanged(const QString & repository, VCSBase::Command *cmd);
void connectRepositoryChanged(const QString & repository, VcsBase::Command *cmd);
bool synchronousPull(const QString &workingDirectory, bool rebase);
void syncAbortPullRebase(const QString &workingDir);
bool tryLauchingGitK(const QProcessEnvironment &env,