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 /src/plugins/platforms/haiku/qhaikuclipboard.cpp | |
parent | 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 (diff) |
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 'src/plugins/platforms/haiku/qhaikuclipboard.cpp')
-rw-r--r-- | src/plugins/platforms/haiku/qhaikuclipboard.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.cpp b/src/plugins/platforms/haiku/qhaikuclipboard.cpp index 774da4432a..20519e21d0 100644 --- a/src/plugins/platforms/haiku/qhaikuclipboard.cpp +++ b/src/plugins/platforms/haiku/qhaikuclipboard.cpp @@ -47,8 +47,8 @@ #include <Clipboard.h> QHaikuClipboard::QHaikuClipboard() - : m_systemMimeData(Q_NULLPTR) - , m_userMimeData(Q_NULLPTR) + : m_systemMimeData(nullptr) + , m_userMimeData(nullptr) { if (be_clipboard) be_clipboard->StartWatching(BMessenger(this)); @@ -81,12 +81,12 @@ QMimeData *QHaikuClipboard::mimeData(QClipboard::Mode mode) const BMessage *clipboard = be_clipboard->Data(); if (clipboard) { - char *name = Q_NULLPTR; + char *name = nullptr; uint32 type = 0; int32 count = 0; for (int i = 0; clipboard->GetInfo(B_MIME_TYPE, i, &name, &type, &count) == B_OK; i++) { - const void *data = Q_NULLPTR; + const void *data = nullptr; int32 dataLen = 0; const status_t status = clipboard->FindData(name, B_MIME_TYPE, &data, &dataLen); @@ -162,7 +162,7 @@ void QHaikuClipboard::MessageReceived(BMessage* message) { if (message->what == B_CLIPBOARD_CHANGED) { delete m_userMimeData; - m_userMimeData = Q_NULLPTR; + m_userMimeData = nullptr; emitChanged(QClipboard::Clipboard); } |