From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: Replace Q_NULLPTR with nullptr where possible Remaining uses of Q_NULLPTR are in: src/corelib/global/qcompilerdetection.h (definition and documentation of Q_NULLPTR) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a Reviewed-by: Ville Voutilainen Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- tests/manual/widgets/styles/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/manual/widgets/styles/main.cpp') diff --git a/tests/manual/widgets/styles/main.cpp b/tests/manual/widgets/styles/main.cpp index 7c840dc9ae..7df54baef5 100644 --- a/tests/manual/widgets/styles/main.cpp +++ b/tests/manual/widgets/styles/main.cpp @@ -87,7 +87,7 @@ static QWidget *createStandardPixmapPage(QWidget *parent) const int maxColumns = 6; for (int i = 0; i <= int(QStyle::SP_LineEditClearButton); ++i) { const QStyle::StandardPixmap sp = static_cast(i); - QPixmap pixmap = result->style()->standardPixmap(sp, Q_NULLPTR, result); + QPixmap pixmap = result->style()->standardPixmap(sp, nullptr, result); QLabel *descriptionLabel = new QLabel(pixmapDescription(sp, pixmap)); grid->addWidget(descriptionLabel, row, column++); QLabel *displayLabel = new QLabel; @@ -111,7 +111,7 @@ static QWidget *createMetricsPage(QWidget *parent) for (int i = 0; i <= int(QStyle::PM_HeaderDefaultSectionSizeVertical); ++i) { const QStyle::PixelMetric m = static_cast(i); str << formatEnumValue(m) << '(' << int(m) << ")=" - << result->style()->pixelMetric(m, Q_NULLPTR, result) << '\n'; + << result->style()->pixelMetric(m, nullptr, result) << '\n'; } result->setPlainText(text); return result; @@ -126,7 +126,7 @@ static QWidget *createHintsPage(QWidget *parent) for (int i = 0; i <= int(QStyle::SH_Menu_SubMenuDontStartSloppyOnLeave); ++i) { const QStyle::StyleHint h = static_cast(i); str << formatEnumValue(h) << '(' << int(h) << ")=" - << result->style()->styleHint(h, Q_NULLPTR, result) << '\n'; + << result->style()->styleHint(h, nullptr, result) << '\n'; } result->setPlainText(text); return result; -- cgit v1.2.3