diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2014-03-09 21:14:26 +0100 |
| commit | d802d392811be44d34ae9cd23f616db93e54c50f (patch) | |
| tree | f9aa8831a0731ea246bd921d979f4bffa7f07bd0 /Source/Core/DolphinWX/GLInterface/X11_Util.cpp | |
| parent | f28116b7da6aac6069084596dc4dbf866bdebfd8 (diff) | |
clang-modernize -use-nullptr
and s/\bNULL\b/nullptr/g for *.cpp/h/mm files not compiled on my machine
Diffstat (limited to 'Source/Core/DolphinWX/GLInterface/X11_Util.cpp')
| -rw-r--r-- | Source/Core/DolphinWX/GLInterface/X11_Util.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp index d3f4c5b9f2..93e510af65 100644 --- a/Source/Core/DolphinWX/GLInterface/X11_Util.cpp +++ b/Source/Core/DolphinWX/GLInterface/X11_Util.cpp @@ -9,7 +9,7 @@ #if USE_EGL bool cXInterface::ServerConnect(void) { - GLWin.dpy = XOpenDisplay(NULL); + GLWin.dpy = XOpenDisplay(nullptr); if (!GLWin.dpy) return false; @@ -49,7 +49,7 @@ bool cXInterface::Initialize(void *config, void *window_handle) GLWin.width = _twidth; GLWin.height = _theight; - GLWin.evdpy = XOpenDisplay(NULL); + GLWin.evdpy = XOpenDisplay(nullptr); GLWin.parent = (Window) window_handle; GLWin.screen = DefaultScreen(GLWin.dpy); @@ -86,7 +86,7 @@ void *cXInterface::CreateWindow(void) CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); - XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); + XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, nullptr, 0, nullptr); XMapRaised(GLWin.evdpy, GLWin.win); XSync(GLWin.evdpy, True); @@ -136,7 +136,7 @@ void cX11Window::CreateXWindow(void) CWBorderPixel | CWBackPixel | CWColormap | CWEventMask, &GLWin.attr); wmProtocols[0] = XInternAtom(GLWin.evdpy, "WM_DELETE_WINDOW", True); XSetWMProtocols(GLWin.evdpy, GLWin.win, wmProtocols, 1); - XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, NULL, 0, NULL); + XSetStandardProperties(GLWin.evdpy, GLWin.win, "GPU", "GPU", None, nullptr, 0, nullptr); XMapRaised(GLWin.evdpy, GLWin.win); XSync(GLWin.evdpy, True); |