From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001
From: Kevin Funk <kevin.funk@kdab.com>
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 <ville.voutilainen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
---
 examples/widgets/mainwindows/mainwindow/colorswatch.cpp | 2 +-
 examples/widgets/mainwindows/mainwindow/colorswatch.h   | 4 ++--
 examples/widgets/mainwindows/mainwindow/mainwindow.cpp  | 2 +-
 examples/widgets/mainwindows/mainwindow/mainwindow.h    | 2 +-
 examples/widgets/mainwindows/mainwindow/toolbar.cpp     | 4 ++--
 examples/widgets/mainwindows/sdi/main.cpp               | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'examples/widgets/mainwindows')

diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
index c47b80275f..720f9a2085 100644
--- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
+++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
@@ -468,7 +468,7 @@ static ColorSwatch *findByName(const QMainWindow *mainWindow, const QString &nam
         if (name == dock->objectName())
             return dock;
     }
-    return Q_NULLPTR;
+    return nullptr;
 }
 
 void ColorSwatch::splitInto(QAction *action)
diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.h b/examples/widgets/mainwindows/mainwindow/colorswatch.h
index ec9d9e7372..7f73e46f31 100644
--- a/examples/widgets/mainwindows/mainwindow/colorswatch.h
+++ b/examples/widgets/mainwindows/mainwindow/colorswatch.h
@@ -62,7 +62,7 @@ class ColorSwatch : public QDockWidget
     Q_OBJECT
 
 public:
-    explicit ColorSwatch(const QString &colorName, QMainWindow *parent = Q_NULLPTR, Qt::WindowFlags flags = 0);
+    explicit ColorSwatch(const QString &colorName, QMainWindow *parent = nullptr, Qt::WindowFlags flags = 0);
 
     void setCustomSizeHint(const QSize &size);
     QMenu *colorSwatchMenu() const { return menu; }
@@ -128,7 +128,7 @@ class BlueTitleBar : public QWidget
 {
     Q_OBJECT
 public:
-    explicit BlueTitleBar(QWidget *parent = Q_NULLPTR);
+    explicit BlueTitleBar(QWidget *parent = nullptr);
 
     QSize sizeHint() const override { return minimumSizeHint(); }
     QSize minimumSizeHint() const override;
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
index afceddfca1..b2c5ccc473 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.cpp
@@ -382,7 +382,7 @@ void MainWindow::switchLayoutDirection()
 class CreateDockWidgetDialog : public QDialog
 {
 public:
-    explicit CreateDockWidgetDialog(QWidget *parent = Q_NULLPTR);
+    explicit CreateDockWidgetDialog(QWidget *parent = nullptr);
 
     QString enteredObjectName() const { return m_objectName->text(); }
     Qt::DockWidgetArea location() const;
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.h b/examples/widgets/mainwindows/mainwindow/mainwindow.h
index af4f1f5745..9b1af6df80 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.h
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.h
@@ -64,7 +64,7 @@ public:
     typedef QMap<QString, QSize> CustomSizeHintMap;
 
     explicit MainWindow(const CustomSizeHintMap &customSizeHints,
-                        QWidget *parent = Q_NULLPTR,
+                        QWidget *parent = nullptr,
                         Qt::WindowFlags flags = 0);
 
 public slots:
diff --git a/examples/widgets/mainwindows/mainwindow/toolbar.cpp b/examples/widgets/mainwindows/mainwindow/toolbar.cpp
index 97152a64a3..bb30b63b02 100644
--- a/examples/widgets/mainwindows/mainwindow/toolbar.cpp
+++ b/examples/widgets/mainwindows/mainwindow/toolbar.cpp
@@ -81,8 +81,8 @@ static QPixmap genIcon(const QSize &iconSize, int number, const QColor &color)
 
 ToolBar::ToolBar(const QString &title, QWidget *parent)
     : QToolBar(parent)
-    , spinbox(Q_NULLPTR)
-    , spinboxAction(Q_NULLPTR)
+    , spinbox(nullptr)
+    , spinboxAction(nullptr)
 {
     setWindowTitle(title);
     setObjectName(title);
diff --git a/examples/widgets/mainwindows/sdi/main.cpp b/examples/widgets/mainwindows/sdi/main.cpp
index bed990d34d..6e29fafd6f 100644
--- a/examples/widgets/mainwindows/sdi/main.cpp
+++ b/examples/widgets/mainwindows/sdi/main.cpp
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
     parser.addPositionalArgument("file", "The file(s) to open.");
     parser.process(app);
 
-    MainWindow *mainWin = Q_NULLPTR;
+    MainWindow *mainWin = nullptr;
     foreach (const QString &file, parser.positionalArguments()) {
         MainWindow *newWin = new MainWindow(file);
         newWin->tile(mainWin);
-- 
cgit v1.2.3