yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use nullptr everywhere

Browse source 
Differential Revision: https://phabricator.kde.org/D3987
This commit is contained in:
Kevin Funk 2017-01-16 09:44:16 +01:00
parent 1c6b81f9ce
commit 218631efce
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wayland/tests/renderingservertest.cpp
View file

@ -57,7 +57,7 @@ static int startXServer()
close(pipeFds[0]); close(pipeFds[0]);
char fdbuf[16]; char fdbuf[16];
sprintf(fdbuf, "%d", pipeFds[1]); 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]); close(pipeFds[1]);
exit(20); exit(20);
} }

4
src/wayland/tests/waylandservertest.cpp
View file

@ -48,7 +48,7 @@ static int startXServer()
close(pipeFds[0]); close(pipeFds[0]);
char fdbuf[16]; char fdbuf[16];
sprintf(fdbuf, "%d", pipeFds[1]); 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]); close(pipeFds[1]);
exit(20); exit(20);
} }
@ -112,7 +112,7 @@ int main(int argc, char **argv)
eventDispatcher->processEvents(QEventLoop::WaitForMoreEvents); eventDispatcher->processEvents(QEventLoop::WaitForMoreEvents);
FD_ZERO(&rfds); FD_ZERO(&rfds);
FD_SET(pipe, &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 // now Xwayland is ready and we can read the pipe to get the display
readDisplayFromPipe(pipe); readDisplayFromPipe(pipe);