feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BaseAnnotationHighlighter: Get rid of QTextDocument arg from c'tor

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/bazaar/annotationhighlighter.cpp
View File

@@ -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))
{}

3
src/plugins/bazaar/annotationhighlighter.h
View File

@@ -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;

5
src/plugins/clearcase/annotationhighlighter.cpp
View File

@@ -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

3
src/plugins/clearcase/annotationhighlighter.h
View File

@@ -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;

5
src/plugins/cvs/cvseditor.cpp
View File

@@ -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:

5
src/plugins/fossil/annotationhighlighter.cpp
View File

@@ -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());

3
src/plugins/fossil/annotationhighlighter.h
View File

@@ -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;

5
src/plugins/git/annotationhighlighter.cpp
View File

@@ -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

3
src/plugins/git/annotationhighlighter.h
View File

@@ -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;

5
src/plugins/mercurial/annotationhighlighter.cpp
View File

@@ -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))
{
}

3
src/plugins/mercurial/annotationhighlighter.h
View File

@@ -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;

5
src/plugins/perforce/annotationhighlighter.cpp
View File

@@ -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

3
src/plugins/perforce/annotationhighlighter.h
View File

@@ -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;

5
src/plugins/subversion/annotationhighlighter.cpp
View File

@@ -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(' '))
{}

3
src/plugins/subversion/annotationhighlighter.h
View File

@@ -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;

5
src/plugins/vcsbase/baseannotationhighlighter.cpp
View File

@@ -78,9 +78,8 @@ QSet<QString> 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();

3
src/plugins/vcsbase/baseannotationhighlighter.h
View File

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