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/mercurial | |
| parent | 760aa0f8bce34e094abecdd99c77c359fb96bb67 (diff) | |
| download | qt-creator-e8801167aa7a0047c9c9be0942ed0b368e5b5aa4.tar.gz | |
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/mercurial')
| -rw-r--r-- | src/plugins/mercurial/annotationhighlighter.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/mercurial/annotationhighlighter.h | 2 | ||||
| -rw-r--r-- | src/plugins/mercurial/mercurialeditor.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/mercurial/mercurialeditor.h | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/src/plugins/mercurial/annotationhighlighter.cpp b/src/plugins/mercurial/annotationhighlighter.cpp index 22656bed55..6a0a0be01e 100644 --- a/src/plugins/mercurial/annotationhighlighter.cpp +++ b/src/plugins/mercurial/annotationhighlighter.cpp @@ -34,9 +34,8 @@ using namespace Mercurial::Internal; using namespace Mercurial; MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const ChangeNumbers &changeNumbers, - const QColor &bg, QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(changeNumbers, bg, document), + : VcsBase::BaseAnnotationHighlighter(changeNumbers, document), changeset(QLatin1String(Constants::CHANGESETID12)) { } diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h index 310596554d..931a745c6e 100644 --- a/src/plugins/mercurial/annotationhighlighter.h +++ b/src/plugins/mercurial/annotationhighlighter.h @@ -39,7 +39,7 @@ namespace Internal { class MercurialAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { public: - explicit MercurialAnnotationHighlighter(const ChangeNumbers &changeNumbers, const QColor &bg, + explicit MercurialAnnotationHighlighter(const ChangeNumbers &changeNumbers, QTextDocument *document = 0); private: diff --git a/src/plugins/mercurial/mercurialeditor.cpp b/src/plugins/mercurial/mercurialeditor.cpp index 79bbcded45..ca6a62b9fb 100644 --- a/src/plugins/mercurial/mercurialeditor.cpp +++ b/src/plugins/mercurial/mercurialeditor.cpp @@ -89,10 +89,9 @@ QString MercurialEditor::changeUnderCursor(const QTextCursor &cursorIn) const return QString(); } -VcsBase::BaseAnnotationHighlighter *MercurialEditor::createAnnotationHighlighter(const QSet<QString> &changes, - const QColor &bg) const +VcsBase::BaseAnnotationHighlighter *MercurialEditor::createAnnotationHighlighter(const QSet<QString> &changes) const { - return new MercurialAnnotationHighlighter(changes, bg); + return new MercurialAnnotationHighlighter(changes); } QString MercurialEditor::decorateVersion(const QString &revision) const diff --git a/src/plugins/mercurial/mercurialeditor.h b/src/plugins/mercurial/mercurialeditor.h index a2ca6dce8b..ddbefdcce8 100644 --- a/src/plugins/mercurial/mercurialeditor.h +++ b/src/plugins/mercurial/mercurialeditor.h @@ -46,7 +46,7 @@ public: private: QSet<QString> annotationChanges() const; QString changeUnderCursor(const QTextCursor &cursor) const; - VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes, const QColor &bg) const; + VcsBase::BaseAnnotationHighlighter *createAnnotationHighlighter(const QSet<QString> &changes) const; QString decorateVersion(const QString &revision) const; QStringList annotationPreviousVersions(const QString &revision) const; |