From 4b366303e65f15511200d6996d02315973e68f75 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 6 Mar 2012 14:32:32 +0100 Subject: VCS: Make dark color schemes work with annotation highlighter Task-number: QTCREATORBUG-6257 Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889 Reviewed-by: Tobias Hunger --- src/plugins/cvs/annotationhighlighter.cpp | 3 ++- src/plugins/cvs/annotationhighlighter.h | 2 +- src/plugins/cvs/cvseditor.cpp | 5 +++-- src/plugins/cvs/cvseditor.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src/plugins/cvs') diff --git a/src/plugins/cvs/annotationhighlighter.cpp b/src/plugins/cvs/annotationhighlighter.cpp index bbf279df24..9f4b756da4 100644 --- a/src/plugins/cvs/annotationhighlighter.cpp +++ b/src/plugins/cvs/annotationhighlighter.cpp @@ -36,8 +36,9 @@ using namespace Cvs; using namespace Cvs::Internal; CvsAnnotationHighlighter::CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers, + const QColor &bg, QTextDocument *document) : - VcsBase::BaseAnnotationHighlighter(changeNumbers, document), + VcsBase::BaseAnnotationHighlighter(changeNumbers, bg, document), m_blank(QLatin1Char(' ')) { } diff --git a/src/plugins/cvs/annotationhighlighter.h b/src/plugins/cvs/annotationhighlighter.h index 8a99b898f1..ee6b874107 100644 --- a/src/plugins/cvs/annotationhighlighter.h +++ b/src/plugins/cvs/annotationhighlighter.h @@ -44,7 +44,7 @@ class CvsAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter Q_OBJECT public: - explicit CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers, + explicit CvsAnnotationHighlighter(const ChangeNumbers &changeNumbers, const QColor &bg, QTextDocument *document = 0); private: diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp index b88f40e78d..769df31f50 100644 --- a/src/plugins/cvs/cvseditor.cpp +++ b/src/plugins/cvs/cvseditor.cpp @@ -131,9 +131,10 @@ VcsBase::DiffHighlighter *CvsEditor::createDiffHighlighter() const return new VcsBase::DiffHighlighter(filePattern); } -VcsBase::BaseAnnotationHighlighter *CvsEditor::createAnnotationHighlighter(const QSet &changes) const +VcsBase::BaseAnnotationHighlighter *CvsEditor::createAnnotationHighlighter(const QSet &changes, + const QColor &bg) const { - return new CvsAnnotationHighlighter(changes); + return new CvsAnnotationHighlighter(changes, bg); } QString CvsEditor::fileNameFromDiffSpecification(const QTextBlock &inBlock) const diff --git a/src/plugins/cvs/cvseditor.h b/src/plugins/cvs/cvseditor.h index 7c376d66ec..856871d792 100644 --- a/src/plugins/cvs/cvseditor.h +++ b/src/plugins/cvs/cvseditor.h @@ -52,7 +52,7 @@ private: QSet annotationChanges() const; QString changeUnderCursor(const QTextCursor &) const; VcsBase::DiffHighlighter *createDiffHighlighter() const; - VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet &changes) const; + VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet &changes, const QColor &bg) const; QString fileNameFromDiffSpecification(const QTextBlock &diffFileName) const; QStringList annotationPreviousVersions(const QString &revision) const; -- cgit v1.2.1