Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Plasma
KWin
Commits
218631ef
Commit
218631ef
authored
Jan 16, 2017
by
Kevin Funk
☕
Browse files
Use nullptr everywhere
Differential Revision:
https://phabricator.kde.org/D3987
parent
1c6b81f9
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/wayland/tests/renderingservertest.cpp
View file @
218631ef
...
...
@@ -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
);
}
...
...
src/wayland/tests/waylandservertest.cpp
View file @
218631ef
...
...
@@ -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
);
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment