diff options
author | Kevin Funk <kevin.funk@kdab.com> | 2017-09-18 11:49:52 +0200 |
---|---|---|
committer | Kevin Funk <kevin.funk@kdab.com> | 2017-09-19 11:53:55 +0000 |
commit | 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 (patch) | |
tree | 7f600686e4dd92681bec09ac745a9dcd4425844b /tests/manual | |
parent | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (diff) | |
download | qtbase-58c14c4a7edcecdd9d58b682a9360c83e2274ec5.tar.gz |
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 <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/cocoa/menurama/menuramaapplication.cpp | 2 | ||||
-rw-r--r-- | tests/manual/diaglib/logwidget.cpp | 2 | ||||
-rw-r--r-- | tests/manual/foreignwindows/main.cpp | 6 | ||||
-rw-r--r-- | tests/manual/qlayout/gridwidget.cpp | 4 | ||||
-rw-r--r-- | tests/manual/qlayout/hbwidget.cpp | 4 | ||||
-rw-r--r-- | tests/manual/qlayout/vbwidget.cpp | 4 | ||||
-rw-r--r-- | tests/manual/qscreen/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qscreen/propertywatcher.cpp | 2 | ||||
-rw-r--r-- | tests/manual/qscreen/propertywatcher.h | 2 | ||||
-rw-r--r-- | tests/manual/touch/main.cpp | 2 | ||||
-rw-r--r-- | tests/manual/widgets/styles/main.cpp | 6 |
11 files changed, 18 insertions, 18 deletions
diff --git a/tests/manual/cocoa/menurama/menuramaapplication.cpp b/tests/manual/cocoa/menurama/menuramaapplication.cpp index acd44565eb..5fb2041ae4 100644 --- a/tests/manual/cocoa/menurama/menuramaapplication.cpp +++ b/tests/manual/cocoa/menurama/menuramaapplication.cpp @@ -71,5 +71,5 @@ QAction *MenuramaApplication::findAction(QLatin1String title, QMenu *parentMenu) if (a->text() == title) return a; - return Q_NULLPTR; + return nullptr; } diff --git a/tests/manual/diaglib/logwidget.cpp b/tests/manual/diaglib/logwidget.cpp index 8e4844fab2..35fabd6e2e 100644 --- a/tests/manual/diaglib/logwidget.cpp +++ b/tests/manual/diaglib/logwidget.cpp @@ -133,7 +133,7 @@ void LogWidget::install() qInfo("%s", qPrintable(LogWidget::startupMessage())); } -void LogWidget::uninstall() { qInstallMessageHandler(Q_NULLPTR); } +void LogWidget::uninstall() { qInstallMessageHandler(nullptr); } #else // Qt 5 diff --git a/tests/manual/foreignwindows/main.cpp b/tests/manual/foreignwindows/main.cpp index cda7e7207e..74c6d8c376 100644 --- a/tests/manual/foreignwindows/main.cpp +++ b/tests/manual/foreignwindows/main.cpp @@ -110,7 +110,7 @@ EmbeddingWindow::EmbeddingWindow(QWindow *window) : m_window(window) + QLatin1String(" 0x") + QString::number(window->winId(), 16); setWindowTitle(title); setObjectName("MainWindow"); - QWidget *container = QWidget::createWindowContainer(window, Q_NULLPTR, Qt::Widget); + QWidget *container = QWidget::createWindowContainer(window, nullptr, Qt::Widget); container->setObjectName("Container"); setCentralWidget(container); @@ -149,8 +149,8 @@ EmbeddingWindow::EmbeddingWindow(QWindow *window) : m_window(window) void EmbeddingWindow::releaseForeignWindow() { if (m_window) { - m_window->setParent(Q_NULLPTR); - m_window = Q_NULLPTR; + m_window->setParent(nullptr); + m_window = nullptr; m_releaseAction->setEnabled(false); } } diff --git a/tests/manual/qlayout/gridwidget.cpp b/tests/manual/qlayout/gridwidget.cpp index ede13a22c3..f19b3eac6f 100644 --- a/tests/manual/qlayout/gridwidget.cpp +++ b/tests/manual/qlayout/gridwidget.cpp @@ -62,8 +62,8 @@ GridWidget::GridWidget(QWidget *parent) : qDebug("There should be four warnings, but no crash or freeze:"); hb->addWidget(this, 6, 6); ///< This command should print a warning, but should not add "this" - hb->addWidget(Q_NULLPTR, 6, 7); ///< This command should print a warning, but should not add "NULL" + hb->addWidget(nullptr, 6, 7); ///< This command should print a warning, but should not add "NULL" hb->addLayout(hb, 7, 6); ///< This command should print a warning, but should not add "hb" - hb->addLayout(Q_NULLPTR, 7, 7); ///< This command should print a warning, but should not add "NULL" + hb->addLayout(nullptr, 7, 7); ///< This command should print a warning, but should not add "NULL" qDebug("Neither crashed nor frozen"); } diff --git a/tests/manual/qlayout/hbwidget.cpp b/tests/manual/qlayout/hbwidget.cpp index d1f6c94d5b..80219d01fd 100644 --- a/tests/manual/qlayout/hbwidget.cpp +++ b/tests/manual/qlayout/hbwidget.cpp @@ -58,8 +58,8 @@ HbWidget::HbWidget(QWidget *parent) : qDebug("There should be four warnings, but no crash or freeze:"); hb->addWidget(this); ///< This command should print a warning, but should not add "this" - hb->addWidget(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addWidget(nullptr); ///< This command should print a warning, but should not add "NULL" hb->addLayout(hb); ///< This command should print a warning, but should not add "hb" - hb->addLayout(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addLayout(nullptr); ///< This command should print a warning, but should not add "NULL" qDebug("Neither crashed nor frozen"); } diff --git a/tests/manual/qlayout/vbwidget.cpp b/tests/manual/qlayout/vbwidget.cpp index d3898422fb..97f240f9a0 100644 --- a/tests/manual/qlayout/vbwidget.cpp +++ b/tests/manual/qlayout/vbwidget.cpp @@ -58,8 +58,8 @@ VbWidget::VbWidget(QWidget *parent) : qDebug("There should be four warnings, but no crash or freeze:"); hb->addWidget(this); ///< This command should print a warning, but should not add "this" - hb->addWidget(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addWidget(nullptr); ///< This command should print a warning, but should not add "NULL" hb->addLayout(hb); ///< This command should print a warning, but should not add "hb" - hb->addLayout(Q_NULLPTR); ///< This command should print a warning, but should not add "NULL" + hb->addLayout(nullptr); ///< This command should print a warning, but should not add "NULL" qDebug("Neither crashed nor frozen"); } diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp index 4b9f49e9f0..6fba872b12 100644 --- a/tests/manual/qscreen/main.cpp +++ b/tests/manual/qscreen/main.cpp @@ -100,7 +100,7 @@ class ScreenPropertyWatcher : public PropertyWatcher { Q_OBJECT public: - ScreenPropertyWatcher(QWidget *wp = Q_NULLPTR) : PropertyWatcher(Q_NULLPTR, QString(), wp) + ScreenPropertyWatcher(QWidget *wp = nullptr) : PropertyWatcher(nullptr, QString(), wp) { // workaround for the fact that virtualSiblings is not a property, // thus there is no change notification: diff --git a/tests/manual/qscreen/propertywatcher.cpp b/tests/manual/qscreen/propertywatcher.cpp index 0fb322a480..d2a552f108 100644 --- a/tests/manual/qscreen/propertywatcher.cpp +++ b/tests/manual/qscreen/propertywatcher.cpp @@ -34,7 +34,7 @@ #include "propertyfield.h" PropertyWatcher::PropertyWatcher(QObject *subject, QString annotation, QWidget *parent) - : QWidget(parent), m_subject(Q_NULLPTR), m_formLayout(new QFormLayout(this)) + : QWidget(parent), m_subject(nullptr), m_formLayout(new QFormLayout(this)) { setMinimumSize(450, 300); m_formLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); diff --git a/tests/manual/qscreen/propertywatcher.h b/tests/manual/qscreen/propertywatcher.h index f371a3b9b6..d988d96c91 100644 --- a/tests/manual/qscreen/propertywatcher.h +++ b/tests/manual/qscreen/propertywatcher.h @@ -39,7 +39,7 @@ class PropertyWatcher : public QWidget Q_OBJECT public: - explicit PropertyWatcher(QObject* subject = Q_NULLPTR, QString annotation = QString(), QWidget *parent = Q_NULLPTR); + explicit PropertyWatcher(QObject* subject = nullptr, QString annotation = QString(), QWidget *parent = nullptr); QFormLayout *formLayout() { return m_formLayout; } diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp index 9d4b8d08bd..d3c6079c7d 100644 --- a/tests/manual/touch/main.cpp +++ b/tests/manual/touch/main.cpp @@ -169,7 +169,7 @@ void SwipeGesture::draw(const QRectF &rect, QPainter &painter) const Gesture *Gesture::fromQGesture(const QWidget *w, const QGesture *source) { - Gesture *result = Q_NULLPTR; + Gesture *result = nullptr; switch (source->gestureType()) { case Qt::TapGesture: case Qt::TapAndHoldGesture: 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<QStyle::StandardPixmap>(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<QStyle::PixelMetric>(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<QStyle::StyleHint>(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; |