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/perforce | |
| 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/perforce')
| -rw-r--r-- | src/plugins/perforce/annotationhighlighter.cpp | 3 | ||||
| -rw-r--r-- | src/plugins/perforce/annotationhighlighter.h | 1 | ||||
| -rw-r--r-- | src/plugins/perforce/perforceeditor.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/perforce/perforceeditor.h | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/perforce/annotationhighlighter.cpp b/src/plugins/perforce/annotationhighlighter.cpp index d3d8760958..93ee74918c 100644 --- a/src/plugins/perforce/annotationhighlighter.cpp +++ b/src/plugins/perforce/annotationhighlighter.cpp @@ -33,9 +33,8 @@ namespace Perforce { namespace Internal { PerforceAnnotationHighlighter::PerforceAnnotationHighlighter(const ChangeNumbers &changeNumbers, - const QColor &bg, QTextDocument *document) : - VcsBase::BaseAnnotationHighlighter(changeNumbers, bg, document), + VcsBase::BaseAnnotationHighlighter(changeNumbers, document), m_colon(QLatin1Char(':')) { } diff --git a/src/plugins/perforce/annotationhighlighter.h b/src/plugins/perforce/annotationhighlighter.h index 4c47fd48b3..2d35c04c6e 100644 --- a/src/plugins/perforce/annotationhighlighter.h +++ b/src/plugins/perforce/annotationhighlighter.h @@ -41,7 +41,6 @@ class PerforceAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter Q_OBJECT public: explicit PerforceAnnotationHighlighter(const ChangeNumbers &changeNumbers, - const QColor &bg, QTextDocument *document = 0); private: diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp index 0c3a66d6da..a859a77fe6 100644 --- a/src/plugins/perforce/perforceeditor.cpp +++ b/src/plugins/perforce/perforceeditor.cpp @@ -109,10 +109,9 @@ QString PerforceEditor::changeUnderCursor(const QTextCursor &c) const return m_changeNumberPattern.exactMatch(change) ? change : QString(); } -VcsBase::BaseAnnotationHighlighter *PerforceEditor::createAnnotationHighlighter(const QSet<QString> &changes, - const QColor &bg) const +VcsBase::BaseAnnotationHighlighter *PerforceEditor::createAnnotationHighlighter(const QSet<QString> &changes) const { - return new PerforceAnnotationHighlighter(changes, bg); + return new PerforceAnnotationHighlighter(changes); } QString PerforceEditor::findDiffFile(const QString &f) const diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h index 09c1ef2b1b..6f8163d23c 100644 --- a/src/plugins/perforce/perforceeditor.h +++ b/src/plugins/perforce/perforceeditor.h @@ -50,7 +50,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; QString findDiffFile(const QString &f) const; QStringList annotationPreviousVersions(const QString &v) const; |