diff options
author | Simon Rettberg | 2018-07-24 13:08:25 +0200 |
---|---|---|
committer | Simon Rettberg | 2018-07-24 13:08:25 +0200 |
commit | 9ba63d1460db41c219b638212b42476164fcfdff (patch) | |
tree | 55e3249c18c50ec8e90278e639732988845c990c /src/server/util | |
parent | [server] Fix logic error (diff) | |
download | pvs2-9ba63d1460db41c219b638212b42476164fcfdff.tar.gz pvs2-9ba63d1460db41c219b638212b42476164fcfdff.tar.xz pvs2-9ba63d1460db41c219b638212b42476164fcfdff.zip |
Update code style, fix compiler warnings
- Use nullptr instead of NULL for better warnings in case of mistakes
- Get rid of VLAs which are not in C++11 actually
- Fix implicit signed <-> unsigned mismatches by adding checks and casts
Diffstat (limited to 'src/server/util')
-rw-r--r-- | src/server/util/platform/screensaver.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/util/platform/screensaver.cpp b/src/server/util/platform/screensaver.cpp index efffba9..cdd6ee1 100644 --- a/src/server/util/platform/screensaver.cpp +++ b/src/server/util/platform/screensaver.cpp @@ -14,17 +14,17 @@ namespace { - Display *display = NULL; + Display *display = nullptr; bool extensionSupported = false; bool dpmsSupported = false; bool init() { - if (display != NULL) { + if (display != nullptr) { return true; } display = QX11Info::display(); - if (display == NULL) { + if (display == nullptr) { return false; } #ifdef X11_Xscreensaver_FOUND |