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/foreignwindows/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/manual/foreignwindows') 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); } } -- cgit v1.2.3