From 218631efce838f2051b752941f1ca661b08ee2d6 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 16 Jan 2017 09:44:16 +0100 Subject: [PATCH] Use nullptr everywhere Differential Revision: https://phabricator.kde.org/D3987 --- src/wayland/tests/renderingservertest.cpp | 2 +- src/wayland/tests/waylandservertest.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wayland/tests/renderingservertest.cpp b/src/wayland/tests/renderingservertest.cpp index 82aaa2ff18..5ae0edb592 100644 --- a/src/wayland/tests/renderingservertest.cpp +++ b/src/wayland/tests/renderingservertest.cpp @@ -57,7 +57,7 @@ static int startXServer() close(pipeFds[0]); char fdbuf[16]; sprintf(fdbuf, "%d", pipeFds[1]); - execlp(process.constData(), process.constData(), "-displayfd", fdbuf, "-rootless", (char *)0); + execlp(process.constData(), process.constData(), "-displayfd", fdbuf, "-rootless", (char *)nullptr); close(pipeFds[1]); exit(20); } diff --git a/src/wayland/tests/waylandservertest.cpp b/src/wayland/tests/waylandservertest.cpp index 29ae90e653..b56736cf3a 100644 --- a/src/wayland/tests/waylandservertest.cpp +++ b/src/wayland/tests/waylandservertest.cpp @@ -48,7 +48,7 @@ static int startXServer() close(pipeFds[0]); char fdbuf[16]; sprintf(fdbuf, "%d", pipeFds[1]); - execlp(process.constData(), process.constData(), "-displayfd", fdbuf, (char *)0); + execlp(process.constData(), process.constData(), "-displayfd", fdbuf, (char *)nullptr); close(pipeFds[1]); exit(20); } @@ -112,7 +112,7 @@ int main(int argc, char **argv) eventDispatcher->processEvents(QEventLoop::WaitForMoreEvents); FD_ZERO(&rfds); FD_SET(pipe, &rfds); - } while (select(pipe + 1, &rfds, NULL, NULL, &tv) == 0); + } while (select(pipe + 1, &rfds, nullptr, nullptr, &tv) == 0); // now Xwayland is ready and we can read the pipe to get the display readDisplayFromPipe(pipe);