diff options
| author | jkobus <jaroslaw.kobus@digia.com> | 2013-08-13 12:57:31 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@digia.com> | 2013-08-26 13:39:40 +0200 |
| commit | e8801167aa7a0047c9c9be0942ed0b368e5b5aa4 (patch) | |
| tree | eb1dcf7998b0457518681126ddf9b49f198dd2d4 /src/plugins/clearcase | |
| parent | 760aa0f8bce34e094abecdd99c77c359fb96bb67 (diff) | |
Add common interface for text formats inside syntax highlighter
Change-Id: I87f64446161a57aea0896f68e4eafacef791969b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Diffstat (limited to 'src/plugins/clearcase')
| -rw-r--r-- | src/plugins/clearcase/annotationhighlighter.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/clearcase/annotationhighlighter.h | 2 | ||||
| -rw-r--r-- | src/plugins/clearcase/clearcaseeditor.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/clearcase/clearcaseeditor.h | 2 |
4 files changed, 5 insertions, 8 deletions
diff --git a/src/plugins/clearcase/annotationhighlighter.cpp b/src/plugins/clearcase/annotationhighlighter.cpp index 89ba5489936..81de1b90796 100644 --- a/src/plugins/clearcase/annotationhighlighter.cpp +++ b/src/plugins/clearcase/annotationhighlighter.cpp @@ -34,9 +34,8 @@ using namespace ClearCase; using namespace ClearCase::Internal; ClearCaseAnnotationHighlighter::ClearCaseAnnotationHighlighter(const ChangeNumbers &changeNumbers, - const QColor &bg, QTextDocument *document) : - VcsBase::BaseAnnotationHighlighter(changeNumbers, bg, document), + VcsBase::BaseAnnotationHighlighter(changeNumbers, document), m_separator(QLatin1Char('|')) { } diff --git a/src/plugins/clearcase/annotationhighlighter.h b/src/plugins/clearcase/annotationhighlighter.h index 9792e2492ec..f7e2740d3d0 100644 --- a/src/plugins/clearcase/annotationhighlighter.h +++ b/src/plugins/clearcase/annotationhighlighter.h @@ -41,7 +41,7 @@ class ClearCaseAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { Q_OBJECT public: - explicit ClearCaseAnnotationHighlighter(const ChangeNumbers &changeNumbers, const QColor &bg, + explicit ClearCaseAnnotationHighlighter(const ChangeNumbers &changeNumbers, QTextDocument *document = 0); private: diff --git a/src/plugins/clearcase/clearcaseeditor.cpp b/src/plugins/clearcase/clearcaseeditor.cpp index 99324d7ab50..04e60dfe272 100644 --- a/src/plugins/clearcase/clearcaseeditor.cpp +++ b/src/plugins/clearcase/clearcaseeditor.cpp @@ -36,7 +36,6 @@ #include <utils/qtcassert.h> #include <vcsbase/diffhighlighter.h> -#include <QDebug> #include <QDir> #include <QFileInfo> #include <QTextBlock> @@ -94,8 +93,7 @@ QString ClearCaseEditor::changeUnderCursor(const QTextCursor &c) const return QString(); } -VcsBase::BaseAnnotationHighlighter *ClearCaseEditor::createAnnotationHighlighter(const QSet<QString> &changes, - const QColor &bg) const +VcsBase::BaseAnnotationHighlighter *ClearCaseEditor::createAnnotationHighlighter(const QSet<QString> &changes) const { - return new ClearCaseAnnotationHighlighter(changes, bg); + return new ClearCaseAnnotationHighlighter(changes); } diff --git a/src/plugins/clearcase/clearcaseeditor.h b/src/plugins/clearcase/clearcaseeditor.h index c9dd8c88e36..14d7031b866 100644 --- a/src/plugins/clearcase/clearcaseeditor.h +++ b/src/plugins/clearcase/clearcaseeditor.h @@ -49,7 +49,7 @@ public: private: QSet<QString> annotationChanges() const; QString changeUnderCursor(const QTextCursor &) const; - VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const; + VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const; QRegExp m_versionNumberPattern; }; |