aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Funk <kfunk@kde.org>2017-09-24 23:55:06 +0200
committerKevin Funk <kevin.funk@kdab.com>2017-09-26 17:13:56 +0000
commit8b1769f9e33ffe820c39f8f2a43a575ab5ae7772 (patch)
tree579300539a7cd1b79ff98e804473027f9ac04042
parentb1ff51b6d555011e28ab8e9d28cddf88c88bfc46 (diff)
Replace Q_NULLPTR with nullptr
Change-Id: Ia07741ad7ee5174c03b12d6880e00d279a6d4eae Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r--examples/winextras/iconextractor/main.cpp2
-rw-r--r--src/winextras/qwineventfilter.cpp2
-rw-r--r--src/winextras/qwinfunctions.h2
-rw-r--r--src/winextras/qwinjumplist.h2
-rw-r--r--src/winextras/qwintaskbarbutton.h2
-rw-r--r--src/winextras/qwintaskbarprogress.h2
-rw-r--r--src/winextras/qwinthumbnailtoolbar.h2
-rw-r--r--src/winextras/qwinthumbnailtoolbutton.h2
-rw-r--r--tests/manual/jumplist/testwidget.h2
9 files changed, 9 insertions, 9 deletions
diff --git a/examples/winextras/iconextractor/main.cpp b/examples/winextras/iconextractor/main.cpp
index eb39f9f..6efd27b 100644
--- a/examples/winextras/iconextractor/main.cpp
+++ b/examples/winextras/iconextractor/main.cpp
@@ -141,7 +141,7 @@ static QPixmap pixmapFromShellImageList(int iImageList, const SHFILEINFO &info)
// For MinGW:
static const IID iID_IImageList = {0x46eb5926, 0x582e, 0x4017, {0x9f, 0xdf, 0xe8, 0x99, 0x8d, 0xaa, 0x9, 0x50}};
- IImageList *imageList = Q_NULLPTR;
+ IImageList *imageList = nullptr;
if (FAILED(SHGetImageList(iImageList, iID_IImageList, reinterpret_cast<void **>(&imageList))))
return result;
diff --git a/src/winextras/qwineventfilter.cpp b/src/winextras/qwineventfilter.cpp
index 6b31e71..4ec3bdc 100644
--- a/src/winextras/qwineventfilter.cpp
+++ b/src/winextras/qwineventfilter.cpp
@@ -118,5 +118,5 @@ QWindow *QWinEventFilter::findWindow(HWND handle)
if (topLevel->handle() && topLevel->winId() == wid)
return topLevel;
}
- return Q_NULLPTR;
+ return nullptr;
}
diff --git a/src/winextras/qwinfunctions.h b/src/winextras/qwinfunctions.h
index 7190258..bc07401 100644
--- a/src/winextras/qwinfunctions.h
+++ b/src/winextras/qwinfunctions.h
@@ -89,7 +89,7 @@ namespace QtWin
Q_WINEXTRAS_EXPORT QString stringFromHresult(HRESULT hresult);
Q_WINEXTRAS_EXPORT QString errorStringFromHresult(HRESULT hresult);
- Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = Q_NULLPTR);
+ Q_WINEXTRAS_EXPORT QColor colorizationColor(bool *opaqueBlend = nullptr);
Q_WINEXTRAS_EXPORT QColor realColorizationColor();
Q_WINEXTRAS_EXPORT void setWindowExcludedFromPeek(QWindow *window, bool exclude);
diff --git a/src/winextras/qwinjumplist.h b/src/winextras/qwinjumplist.h
index 3900998..b4807dd 100644
--- a/src/winextras/qwinjumplist.h
+++ b/src/winextras/qwinjumplist.h
@@ -58,7 +58,7 @@ class Q_WINEXTRAS_EXPORT QWinJumpList : public QObject
Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier)
public:
- explicit QWinJumpList(QObject *parent = Q_NULLPTR);
+ explicit QWinJumpList(QObject *parent = nullptr);
~QWinJumpList();
QString identifier() const;
diff --git a/src/winextras/qwintaskbarbutton.h b/src/winextras/qwintaskbarbutton.h
index 4685744..dc4d469 100644
--- a/src/winextras/qwintaskbarbutton.h
+++ b/src/winextras/qwintaskbarbutton.h
@@ -59,7 +59,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarButton : public QObject
Q_PROPERTY(QWindow *window READ window WRITE setWindow)
public:
- explicit QWinTaskbarButton(QObject *parent = Q_NULLPTR);
+ explicit QWinTaskbarButton(QObject *parent = nullptr);
~QWinTaskbarButton();
void setWindow(QWindow *window);
diff --git a/src/winextras/qwintaskbarprogress.h b/src/winextras/qwintaskbarprogress.h
index 6b31eef..ca64046 100644
--- a/src/winextras/qwintaskbarprogress.h
+++ b/src/winextras/qwintaskbarprogress.h
@@ -59,7 +59,7 @@ class Q_WINEXTRAS_EXPORT QWinTaskbarProgress : public QObject
Q_PROPERTY(bool stopped READ isStopped NOTIFY stoppedChanged)
public:
- explicit QWinTaskbarProgress(QObject *parent = Q_NULLPTR);
+ explicit QWinTaskbarProgress(QObject *parent = nullptr);
~QWinTaskbarProgress();
int value() const;
diff --git a/src/winextras/qwinthumbnailtoolbar.h b/src/winextras/qwinthumbnailtoolbar.h
index 4c98c70..83e2f2b 100644
--- a/src/winextras/qwinthumbnailtoolbar.h
+++ b/src/winextras/qwinthumbnailtoolbar.h
@@ -61,7 +61,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolBar : public QObject
Q_PROPERTY(QPixmap iconicLivePreviewPixmap READ iconicLivePreviewPixmap WRITE setIconicLivePreviewPixmap)
public:
- explicit QWinThumbnailToolBar(QObject *parent = Q_NULLPTR);
+ explicit QWinThumbnailToolBar(QObject *parent = nullptr);
~QWinThumbnailToolBar();
void setWindow(QWindow *window);
diff --git a/src/winextras/qwinthumbnailtoolbutton.h b/src/winextras/qwinthumbnailtoolbutton.h
index 6a14894..0ab970f 100644
--- a/src/winextras/qwinthumbnailtoolbutton.h
+++ b/src/winextras/qwinthumbnailtoolbutton.h
@@ -61,7 +61,7 @@ class Q_WINEXTRAS_EXPORT QWinThumbnailToolButton : public QObject
Q_PROPERTY(bool flat READ isFlat WRITE setFlat)
public:
- explicit QWinThumbnailToolButton(QObject *parent = Q_NULLPTR);
+ explicit QWinThumbnailToolButton(QObject *parent = nullptr);
~QWinThumbnailToolButton();
void setToolTip(const QString &toolTip);
diff --git a/tests/manual/jumplist/testwidget.h b/tests/manual/jumplist/testwidget.h
index 61ca4c6..0cae1ea 100644
--- a/tests/manual/jumplist/testwidget.h
+++ b/tests/manual/jumplist/testwidget.h
@@ -46,7 +46,7 @@ class TestWidget : public QMainWindow
Q_OBJECT
public:
- explicit TestWidget(QWidget *parent = Q_NULLPTR);
+ explicit TestWidget(QWidget *parent = nullptr);
~TestWidget();
void showFile(const QString &path);