diff options
Diffstat (limited to 'src/widgets/widgets/qlabel.cpp')
-rw-r--r-- | src/widgets/widgets/qlabel.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/widgets/qlabel.cpp b/src/widgets/widgets/qlabel.cpp index e3225800cc..ee4825d3e5 100644 --- a/src/widgets/widgets/qlabel.cpp +++ b/src/widgets/widgets/qlabel.cpp @@ -66,16 +66,16 @@ QLabelPrivate::QLabelPrivate() sh(), msh(), text(), - pixmap(Q_NULLPTR), - scaledpixmap(Q_NULLPTR), - cachedimage(Q_NULLPTR), + pixmap(nullptr), + scaledpixmap(nullptr), + cachedimage(nullptr), #ifndef QT_NO_PICTURE - picture(Q_NULLPTR), + picture(nullptr), #endif #if QT_CONFIG(movie) movie(), #endif - control(Q_NULLPTR), + control(nullptr), shortcutCursor(), #ifndef QT_NO_CURSOR cursor(), @@ -583,7 +583,7 @@ QSize QLabelPrivate::sizeForWidth(int w) const int m = indent; if (m < 0 && q->frameWidth()) // no indent, but we do have a frame - m = fm.width(QLatin1Char('x')) - margin*2; + m = fm.horizontalAdvance(QLatin1Char('x')) - margin*2; if (m > 0) { if ((align & Qt::AlignLeft) || (align & Qt::AlignRight)) hextra += m; @@ -1440,7 +1440,7 @@ QRect QLabelPrivate::documentRect() const : q->layoutDirection(), QFlag(this->align)); int m = indent; if (m < 0 && q->frameWidth()) // no indent, but we do have a frame - m = q->fontMetrics().width(QLatin1Char('x')) / 2 - margin; + m = q->fontMetrics().horizontalAdvance(QLatin1Char('x')) / 2 - margin; if (m > 0) { if (align & Qt::AlignLeft) cr.setLeft(cr.left() + m); |