From 564b59d903683b14c75b72a3e93367717f201def Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 7 Oct 2020 13:05:48 +0200 Subject: Another round of replacing 0 with nullptr This time based on grepping to also include documentation, tests and examples previously missed by the automatic tool. Change-Id: Ied1703f4bcc470fbc275f759ed5b7c588a5c4e9f Reviewed-by: Qt CI Bot Reviewed-by: Friedemann Kleint --- src/gui/text/qstatictext.cpp | 2 +- src/gui/text/windows/qwindowsfontdatabase.cpp | 2 +- src/gui/text/windows/qwindowsfontengine.cpp | 4 ++-- src/gui/text/windows/qwindowsfontengine_p.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/gui/text') diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index 2d4fd5594d..b702764688 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -84,7 +84,7 @@ QStaticTextUserData::~QStaticTextUserData() class MyWidget: public QWidget { public: - MyWidget(QWidget *parent = 0) : QWidget(parent), m_staticText("This is static text") + MyWidget(QWidget *parent = nullptr) : QWidget(parent), m_staticText("This is static text") protected: void paintEvent(QPaintEvent *) diff --git a/src/gui/text/windows/qwindowsfontdatabase.cpp b/src/gui/text/windows/qwindowsfontdatabase.cpp index 36d8da0ce8..9ee1c5aba6 100644 --- a/src/gui/text/windows/qwindowsfontdatabase.cpp +++ b/src/gui/text/windows/qwindowsfontdatabase.cpp @@ -1139,7 +1139,7 @@ QFontEngine *QWindowsFontDatabase::createEngine(const QFontDef &request, const Q int dpi, const QSharedPointer &data) { - QFontEngine *fe = 0; + QFontEngine *fe = nullptr; LOGFONT lf = fontDefToLOGFONT(request, faceName); const bool preferClearTypeAA = lf.lfQuality == CLEARTYPE_QUALITY; diff --git a/src/gui/text/windows/qwindowsfontengine.cpp b/src/gui/text/windows/qwindowsfontengine.cpp index cbf50f65da..dd0fbbf262 100644 --- a/src/gui/text/windows/qwindowsfontengine.cpp +++ b/src/gui/text/windows/qwindowsfontengine.cpp @@ -642,7 +642,7 @@ qreal QWindowsFontEngine::minRightBearing() const HDC hdc = m_fontEngineData->hdc; SelectObject(hdc, hfont); if (ttf) { - ABC *abc = 0; + ABC *abc = nullptr; int n = tm.tmLastChar - tm.tmFirstChar; if (n <= max_font_count) { abc = new ABC[n+1]; @@ -706,7 +706,7 @@ static inline QPointF qt_to_qpointf(const POINTFX &pt, qreal scale, qreal stretc #endif static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc, - QPainterPath *path, bool ttf, glyph_metrics_t *metric = 0, + QPainterPath *path, bool ttf, glyph_metrics_t *metric = nullptr, qreal scale = 1.0, qreal stretch = 1.0) { MAT2 mat; diff --git a/src/gui/text/windows/qwindowsfontengine_p.h b/src/gui/text/windows/qwindowsfontengine_p.h index 8a676affcd..22130924ad 100644 --- a/src/gui/text/windows/qwindowsfontengine_p.h +++ b/src/gui/text/windows/qwindowsfontengine_p.h @@ -115,7 +115,7 @@ public: bool supportsTransformation(const QTransform &transform) const override; #ifndef Q_CC_MINGW - void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) override; + void getGlyphBearings(glyph_t glyph, qreal *leftBearing = nullptr, qreal *rightBearing = nullptr) override; #endif bool hasUnreliableGlyphOutline() const override; -- cgit v1.2.3