BaseAnnotationHighlighter: Get rid of QTextDocument arg from c'tor

It's always nullptr.

Change-Id: Ia392b826f0afe8562b90b916722c374c5244d9aa
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
Jarek Kobus
2023-11-16 11:58:48 +01:00
parent 10c37c1439
commit 221d4ad563
17 changed files with 26 additions and 43 deletions

View File

@@ -6,9 +6,8 @@
namespace Bazaar::Internal { namespace Bazaar::Internal {
BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation, BazaarAnnotationHighlighter::BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation)
QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
, m_changeset(QLatin1String(Constants::ANNOTATE_CHANGESET_ID)) , m_changeset(QLatin1String(Constants::ANNOTATE_CHANGESET_ID))
{} {}

View File

@@ -10,8 +10,7 @@ namespace Bazaar::Internal {
class BazaarAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter class BazaarAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
public: public:
explicit BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit BazaarAnnotationHighlighter(const VcsBase::Annotation &annotation);
QTextDocument *document = nullptr);
private: private:
QString changeNumber(const QString &block) const override; QString changeNumber(const QString &block) const override;

View File

@@ -5,9 +5,8 @@
namespace ClearCase::Internal { namespace ClearCase::Internal {
ClearCaseAnnotationHighlighter::ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation, ClearCaseAnnotationHighlighter::ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation)
QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
{} {}
QString ClearCaseAnnotationHighlighter::changeNumber(const QString &block) const QString ClearCaseAnnotationHighlighter::changeNumber(const QString &block) const

View File

@@ -12,8 +12,7 @@ class ClearCaseAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit ClearCaseAnnotationHighlighter(const VcsBase::Annotation &annotation);
QTextDocument *document = nullptr);
private: private:
QString changeNumber(const QString &block) const override; QString changeNumber(const QString &block) const override;

View File

@@ -25,9 +25,8 @@ namespace Cvs::Internal {
class CvsAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter class CvsAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
public: public:
explicit CvsAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit CvsAnnotationHighlighter(const VcsBase::Annotation &annotation)
QTextDocument *document = nullptr) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
{} {}
private: private:

View File

@@ -9,9 +9,8 @@
namespace Fossil { namespace Fossil {
namespace Internal { namespace Internal {
FossilAnnotationHighlighter::FossilAnnotationHighlighter(const VcsBase::Annotation &annotation, FossilAnnotationHighlighter::FossilAnnotationHighlighter(const VcsBase::Annotation &annotation)
QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
, m_changesetIdPattern(Constants::CHANGESET_ID) , m_changesetIdPattern(Constants::CHANGESET_ID)
{ {
QTC_CHECK(m_changesetIdPattern.isValid()); QTC_CHECK(m_changesetIdPattern.isValid());

View File

@@ -11,8 +11,7 @@ namespace Internal {
class FossilAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter class FossilAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
public: public:
explicit FossilAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit FossilAnnotationHighlighter(const VcsBase::Annotation &annotation);
QTextDocument *document = nullptr);
private: private:
QString changeNumber(const QString &block) const final; QString changeNumber(const QString &block) const final;

View File

@@ -6,9 +6,8 @@
namespace Git { namespace Git {
namespace Internal { namespace Internal {
GitAnnotationHighlighter::GitAnnotationHighlighter(const VcsBase::Annotation &annotation, GitAnnotationHighlighter::GitAnnotationHighlighter(const VcsBase::Annotation &annotation)
QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
{} {}
QString GitAnnotationHighlighter::changeNumber(const QString &block) const QString GitAnnotationHighlighter::changeNumber(const QString &block) const

View File

@@ -13,8 +13,7 @@ class GitAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit GitAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit GitAnnotationHighlighter(const VcsBase::Annotation &annotation);
QTextDocument *document = nullptr);
private: private:
QString changeNumber(const QString &block) const override; QString changeNumber(const QString &block) const override;

View File

@@ -6,9 +6,8 @@
namespace Mercurial::Internal { namespace Mercurial::Internal {
MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation, MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation)
QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
, changeset(QLatin1String(Constants::CHANGESETID12)) , changeset(QLatin1String(Constants::CHANGESETID12))
{ {
} }

View File

@@ -10,8 +10,7 @@ namespace Mercurial::Internal {
class MercurialAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter class MercurialAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
public: public:
explicit MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit MercurialAnnotationHighlighter(const VcsBase::Annotation &annotation);
QTextDocument *document = nullptr);
private: private:
QString changeNumber(const QString &block) const override; QString changeNumber(const QString &block) const override;

View File

@@ -5,9 +5,8 @@
namespace Perforce::Internal { namespace Perforce::Internal {
PerforceAnnotationHighlighter::PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation, PerforceAnnotationHighlighter::PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation)
QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
{ } { }
QString PerforceAnnotationHighlighter::changeNumber(const QString &block) const QString PerforceAnnotationHighlighter::changeNumber(const QString &block) const

View File

@@ -12,8 +12,7 @@ class PerforceAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit PerforceAnnotationHighlighter(const VcsBase::Annotation &annotation);
QTextDocument *document = nullptr);
private: private:
QString changeNumber(const QString &block) const override; QString changeNumber(const QString &block) const override;

View File

@@ -6,9 +6,8 @@
using namespace Subversion; using namespace Subversion;
using namespace Subversion::Internal; using namespace Subversion::Internal;
SubversionAnnotationHighlighter::SubversionAnnotationHighlighter( SubversionAnnotationHighlighter::SubversionAnnotationHighlighter(const VcsBase::Annotation &annotation)
const VcsBase::Annotation &annotation, QTextDocument *document) : VcsBase::BaseAnnotationHighlighter(annotation)
: VcsBase::BaseAnnotationHighlighter(annotation, document)
, m_blank(QLatin1Char(' ')) , m_blank(QLatin1Char(' '))
{} {}

View File

@@ -13,8 +13,7 @@ class SubversionAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighte
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit SubversionAnnotationHighlighter(const VcsBase::Annotation &annotation, explicit SubversionAnnotationHighlighter(const VcsBase::Annotation &annotation);
QTextDocument *document = nullptr);
private: private:
QString changeNumber(const QString &block) const override; QString changeNumber(const QString &block) const override;

View File

@@ -78,9 +78,8 @@ QSet<QString> BaseAnnotationHighlighterPrivate::annotationChanges() const
return changes; return changes;
} }
BaseAnnotationHighlighter::BaseAnnotationHighlighter(const Annotation &annotation)
BaseAnnotationHighlighter::BaseAnnotationHighlighter(const Annotation &annotation, QTextDocument *document) : TextEditor::SyntaxHighlighter()
: TextEditor::SyntaxHighlighter(document)
, d(new BaseAnnotationHighlighterPrivate(this)) , d(new BaseAnnotationHighlighterPrivate(this))
{ {
setDefaultTextFormatCategories(); setDefaultTextFormatCategories();

View File

@@ -26,8 +26,7 @@ class VCSBASE_EXPORT BaseAnnotationHighlighter : public TextEditor::SyntaxHighli
public: public:
typedef QSet<QString> ChangeNumbers; typedef QSet<QString> ChangeNumbers;
explicit BaseAnnotationHighlighter(const Annotation &annotation, explicit BaseAnnotationHighlighter(const Annotation &annotation);
QTextDocument *document = nullptr);
~BaseAnnotationHighlighter() override; ~BaseAnnotationHighlighter() override;