diff --git a/src/plugins/bazaar/annotationhighlighter.cpp b/src/plugins/bazaar/annotationhighlighter.cpp index 86220f52662..e059ce23b14 100644 --- a/src/plugins/bazaar/annotationhighlighter.cpp +++ b/src/plugins/bazaar/annotationhighlighter.cpp @@ -6,9 +6,8 @@ namespace Bazaar::Internal { -BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(annotation, document) +BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) , m_changeset(QLatin1String(Constants::ANNOTATE_CHANGESET_ID)) {} diff --git a/src/plugins/bazaar/annotationhighlighter.h b/src/plugins/bazaar/annotationhighlighter.h index c0a789d6c94..2e72096ff67 100644 --- a/src/plugins/bazaar/annotationhighlighter.h +++ b/src/plugins/bazaar/annotationhighlighter.h @@ -10,8 +10,7 @@ namespace Bazaar::Internal { class BazaarAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { public: - explicit BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr); + explicit BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation); private: QString changeNumber(const QString &block) const override; diff --git a/src/plugins/clearcase/annotationhighlighter.cpp b/src/plugins/clearcase/annotationhighlighter.cpp index 25d076b13d0..76d1ce61ed6 100644 --- a/src/plugins/clearcase/annotationhighlighter.cpp +++ b/src/plugins/clearcase/annotationhighlighter.cpp @@ -5,9 +5,8 @@ namespace ClearCase::Internal { -ClearCaseAnnotationHighlighter::ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(annotation, document) +ClearCaseAnnotationHighlighter::ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) {} QString ClearCaseAnnotationHighlighter::changeNumber(const QString &block) const diff --git a/src/plugins/clearcase/annotationhighlighter.h b/src/plugins/clearcase/annotationhighlighter.h index 46830ee033f..afa9a9ecb82 100644 --- a/src/plugins/clearcase/annotationhighlighter.h +++ b/src/plugins/clearcase/annotationhighlighter.h @@ -12,8 +12,7 @@ class ClearCaseAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { Q_OBJECT public: - explicit ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr); + explicit ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation); private: QString changeNumber(const QString &block) const override; diff --git a/src/plugins/cvs/cvseditor.cpp b/src/plugins/cvs/cvseditor.cpp index 85b9e8b7d88..0643b6ec20a 100644 --- a/src/plugins/cvs/cvseditor.cpp +++ b/src/plugins/cvs/cvseditor.cpp @@ -25,9 +25,8 @@ namespace Cvs::Internal { class CvsAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { public: - explicit CvsAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr) - : VcsBase::BaseAnnotationHighlighter(annotation, document) + explicit CvsAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) {} private: diff --git a/src/plugins/fossil/annotationhighlighter.cpp b/src/plugins/fossil/annotationhighlighter.cpp index bd42e5bfc59..53f9e7a849b 100644 --- a/src/plugins/fossil/annotationhighlighter.cpp +++ b/src/plugins/fossil/annotationhighlighter.cpp @@ -9,9 +9,8 @@ namespace Fossil { namespace Internal { -FossilAnnotationHighlighter::FossilAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(annotation, document) +FossilAnnotationHighlighter::FossilAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) , m_changesetIdPattern(Constants::CHANGESET_ID) { QTC_CHECK(m_changesetIdPattern.isValid()); diff --git a/src/plugins/fossil/annotationhighlighter.h b/src/plugins/fossil/annotationhighlighter.h index fba44146d93..f8751881eb3 100644 --- a/src/plugins/fossil/annotationhighlighter.h +++ b/src/plugins/fossil/annotationhighlighter.h @@ -11,8 +11,7 @@ namespace Internal { class FossilAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { public: - explicit FossilAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr); + explicit FossilAnnotationHighlighter(const VcsBase::Annotation &annotation); private: QString changeNumber(const QString &block) const final; diff --git a/src/plugins/git/annotationhighlighter.cpp b/src/plugins/git/annotationhighlighter.cpp index c37e349ef39..cfc6a54c96f 100644 --- a/src/plugins/git/annotationhighlighter.cpp +++ b/src/plugins/git/annotationhighlighter.cpp @@ -6,9 +6,8 @@ namespace Git { namespace Internal { -GitAnnotationHighlighter::GitAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(annotation, document) +GitAnnotationHighlighter::GitAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) {} QString GitAnnotationHighlighter::changeNumber(const QString &block) const diff --git a/src/plugins/git/annotationhighlighter.h b/src/plugins/git/annotationhighlighter.h index 33f899f94ca..03da6f8fcc4 100644 --- a/src/plugins/git/annotationhighlighter.h +++ b/src/plugins/git/annotationhighlighter.h @@ -13,8 +13,7 @@ class GitAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { Q_OBJECT public: - explicit GitAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr); + explicit GitAnnotationHighlighter(const VcsBase::Annotation &annotation); private: QString changeNumber(const QString &block) const override; diff --git a/src/plugins/mercurial/annotationhighlighter.cpp b/src/plugins/mercurial/annotationhighlighter.cpp index 51daa0fc4b7..415876abca4 100644 --- a/src/plugins/mercurial/annotationhighlighter.cpp +++ b/src/plugins/mercurial/annotationhighlighter.cpp @@ -6,9 +6,8 @@ namespace Mercurial::Internal { -MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(annotation, document) +MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) , changeset(QLatin1String(Constants::CHANGESETID12)) { } diff --git a/src/plugins/mercurial/annotationhighlighter.h b/src/plugins/mercurial/annotationhighlighter.h index f6559d2b229..0d70c87603f 100644 --- a/src/plugins/mercurial/annotationhighlighter.h +++ b/src/plugins/mercurial/annotationhighlighter.h @@ -10,8 +10,7 @@ namespace Mercurial::Internal { class MercurialAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { public: - explicit MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr); + explicit MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation); private: QString changeNumber(const QString &block) const override; diff --git a/src/plugins/perforce/annotationhighlighter.cpp b/src/plugins/perforce/annotationhighlighter.cpp index 0079747c4ff..f701a286b67 100644 --- a/src/plugins/perforce/annotationhighlighter.cpp +++ b/src/plugins/perforce/annotationhighlighter.cpp @@ -5,9 +5,8 @@ namespace Perforce::Internal { -PerforceAnnotationHighlighter::PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(annotation, document) +PerforceAnnotationHighlighter::PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) { } QString PerforceAnnotationHighlighter::changeNumber(const QString &block) const diff --git a/src/plugins/perforce/annotationhighlighter.h b/src/plugins/perforce/annotationhighlighter.h index 511969ffaf6..fa4483355b4 100644 --- a/src/plugins/perforce/annotationhighlighter.h +++ b/src/plugins/perforce/annotationhighlighter.h @@ -12,8 +12,7 @@ class PerforceAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter { Q_OBJECT public: - explicit PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr); + explicit PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation); private: QString changeNumber(const QString &block) const override; diff --git a/src/plugins/subversion/annotationhighlighter.cpp b/src/plugins/subversion/annotationhighlighter.cpp index fc42b989e76..b94cbe9c60c 100644 --- a/src/plugins/subversion/annotationhighlighter.cpp +++ b/src/plugins/subversion/annotationhighlighter.cpp @@ -6,9 +6,8 @@ using namespace Subversion; using namespace Subversion::Internal; -SubversionAnnotationHighlighter::SubversionAnnotationHighlighter( - const VcsBase::Annotation &annotation, QTextDocument *document) - : VcsBase::BaseAnnotationHighlighter(annotation, document) +SubversionAnnotationHighlighter::SubversionAnnotationHighlighter(const VcsBase::Annotation &annotation) + : VcsBase::BaseAnnotationHighlighter(annotation) , m_blank(QLatin1Char(' ')) {} diff --git a/src/plugins/subversion/annotationhighlighter.h b/src/plugins/subversion/annotationhighlighter.h index 014fc6add86..8da44f42978 100644 --- a/src/plugins/subversion/annotationhighlighter.h +++ b/src/plugins/subversion/annotationhighlighter.h @@ -13,8 +13,7 @@ class SubversionAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighte { Q_OBJECT public: - explicit SubversionAnnotationHighlighter(const VcsBase::Annotation &annotation, - QTextDocument *document = nullptr); + explicit SubversionAnnotationHighlighter(const VcsBase::Annotation &annotation); private: QString changeNumber(const QString &block) const override; diff --git a/src/plugins/vcsbase/baseannotationhighlighter.cpp b/src/plugins/vcsbase/baseannotationhighlighter.cpp index 26e44ebd91c..a4fa4bc7f2a 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.cpp +++ b/src/plugins/vcsbase/baseannotationhighlighter.cpp @@ -78,9 +78,8 @@ QSet BaseAnnotationHighlighterPrivate::annotationChanges() const return changes; } - -BaseAnnotationHighlighter::BaseAnnotationHighlighter(const Annotation &annotation, QTextDocument *document) - : TextEditor::SyntaxHighlighter(document) +BaseAnnotationHighlighter::BaseAnnotationHighlighter(const Annotation &annotation) + : TextEditor::SyntaxHighlighter() , d(new BaseAnnotationHighlighterPrivate(this)) { setDefaultTextFormatCategories(); diff --git a/src/plugins/vcsbase/baseannotationhighlighter.h b/src/plugins/vcsbase/baseannotationhighlighter.h index 7c6f58c9feb..4b29697fe61 100644 --- a/src/plugins/vcsbase/baseannotationhighlighter.h +++ b/src/plugins/vcsbase/baseannotationhighlighter.h @@ -26,8 +26,7 @@ class VCSBASE_EXPORT BaseAnnotationHighlighter : public TextEditor::SyntaxHighli public: typedef QSet ChangeNumbers; - explicit BaseAnnotationHighlighter(const Annotation &annotation, - QTextDocument *document = nullptr); + explicit BaseAnnotationHighlighter(const Annotation &annotation); ~BaseAnnotationHighlighter() override;