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

16
src/plugins/git/giteditor.cpp
View File

@@ -61,9 +61,9 @@ namespace Git {
namespace Internal {
// ------------ GitEditor
GitEditor::GitEditor(const VCSBase::VCSBaseEditorParameters *type,
GitEditor::GitEditor(const VcsBase::VcsBaseEditorParameters *type,
QWidget *parent) :
VCSBase::VCSBaseEditorWidget(type, parent),
VcsBase::VcsBaseEditorWidget(type, parent),
m_changeNumberPattern8(QLatin1String(CHANGE_PATTERN_8C)),
m_changeNumberPattern40(QLatin1String(CHANGE_PATTERN_40C))
{
@@ -110,13 +110,13 @@ QString GitEditor::changeUnderCursor(const QTextCursor &c) const
return QString();
}
VCSBase::DiffHighlighter *GitEditor::createDiffHighlighter() const
VcsBase::DiffHighlighter *GitEditor::createDiffHighlighter() const
{
const QRegExp filePattern(QLatin1String("^(diff --git a/|index |[+-][+-][+-] [ab]).*$"));
return new VCSBase::DiffHighlighter(filePattern);
return new VcsBase::DiffHighlighter(filePattern);
}
VCSBase::BaseAnnotationHighlighter *GitEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
VcsBase::BaseAnnotationHighlighter *GitEditor::createAnnotationHighlighter(const QSet<QString> &changes) const
{
return new GitAnnotationHighlighter(changes);
}
@@ -196,7 +196,7 @@ void GitEditor::setPlainTextDataFiltered(const QByteArray &a)
{
QByteArray array = a;
// If desired, filter out the date from annotation
const bool omitAnnotationDate = contentType() == VCSBase::AnnotateOutput
const bool omitAnnotationDate = contentType() == VcsBase::AnnotateOutput
&& GitPlugin::instance()->settings().boolValue(GitSettings::omitAnnotationDateKey);
if (omitAnnotationDate)
array = removeAnnotationDate(a);
@@ -222,13 +222,13 @@ QStringList GitEditor::annotationPreviousVersions(const QString &revision) const
// Get the SHA1's of the file.
if (!client->synchronousParentRevisions(workingDirectory, QStringList(fi.fileName()),
revision, &revisions, &errorMessage)) {
VCSBase::VCSBaseOutputWindow::instance()->appendSilently(errorMessage);
VcsBase::VcsBaseOutputWindow::instance()->appendSilently(errorMessage);
return QStringList();
}
// Format verbose, SHA1 being first token
QStringList descriptions;
if (!client->synchronousShortDescriptions(workingDirectory, revisions, &descriptions, &errorMessage)) {
VCSBase::VCSBaseOutputWindow::instance()->appendSilently(errorMessage);
VcsBase::VcsBaseOutputWindow::instance()->appendSilently(errorMessage);
return QStringList();
}
return descriptions;