From 9d463583094fcc67f73b0121c223a8835e72f6ee Mon Sep 17 00:00:00 2001
From: Vasily <vautkin@teknik.io>
Date: Tue, 19 Feb 2019 20:28:38 +0100
Subject: [PATCH] Add -Wzero-as-null-pointer-constant and fix occurences

---
 build_scripts/qt/compilers/clang.pri                 |  2 +-
 build_scripts/qt/compilers/gcc.pri                   |  2 +-
 src/overlaycontroller.cpp                            |  8 ++++----
 src/overlaycontroller.h                              |  2 +-
 .../audiomanager/AudioManagerWindows.cpp             | 12 ++++++------
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/build_scripts/qt/compilers/clang.pri b/build_scripts/qt/compilers/clang.pri
index f897c2c..3c433c0 100644
--- a/build_scripts/qt/compilers/clang.pri
+++ b/build_scripts/qt/compilers/clang.pri
@@ -11,4 +11,4 @@ QMAKE_CXXFLAGS += --system-header-prefix=third-party
 # Sign conversion warns on auto generated Qt MOC files.
 QMAKE_CXXFLAGS += -Weffc++ -Wconversion -Wno-sign-conversion
 
-QMAKE_CXXFLAGS += -Wextra-semi
+QMAKE_CXXFLAGS += -Wextra-semi -Wzero-as-null-pointer-constant
diff --git a/build_scripts/qt/compilers/gcc.pri b/build_scripts/qt/compilers/gcc.pri
index 593351a..634354a 100644
--- a/build_scripts/qt/compilers/gcc.pri
+++ b/build_scripts/qt/compilers/gcc.pri
@@ -13,4 +13,4 @@ QMAKE_CXXFLAGS += -Wduplicated-branches -Wduplicated-cond -Wlogical-op -Wrestric
 # Sign conversion warns on auto generated Qt MOC files.
 QMAKE_CXXFLAGS += -Wconversion -Wno-sign-conversion
 
-QMAKE_CXXFLAGS += -Wextra-semi
+QMAKE_CXXFLAGS += -Wextra-semi -Wzero-as-null-pointer-constant
diff --git a/src/overlaycontroller.cpp b/src/overlaycontroller.cpp
index fa2e92b..e694a3d 100644
--- a/src/overlaycontroller.cpp
+++ b/src/overlaycontroller.cpp
@@ -594,7 +594,7 @@ void OverlayController::mainEventLoop()
                                         m_pWindow->mapToGlobal( ptNewMouse ),
                                         Qt::NoButton,
                                         m_lastMouseButtons,
-                                        0 );
+                                        nullptr );
                 m_ptLastMouse = ptNewMouse;
                 QCoreApplication::sendEvent( m_pWindow.get(), &mouseEvent );
                 OnRenderRequest();
@@ -615,7 +615,7 @@ void OverlayController::mainEventLoop()
                                     m_pWindow->mapToGlobal( ptNewMouse ),
                                     button,
                                     m_lastMouseButtons,
-                                    0 );
+                                    nullptr );
             QCoreApplication::sendEvent( m_pWindow.get(), &mouseEvent );
         }
         break;
@@ -633,7 +633,7 @@ void OverlayController::mainEventLoop()
                                     m_pWindow->mapToGlobal( ptNewMouse ),
                                     button,
                                     m_lastMouseButtons,
-                                    0 );
+                                    nullptr );
             QCoreApplication::sendEvent( m_pWindow.get(), &mouseEvent );
         }
         break;
@@ -652,7 +652,7 @@ void OverlayController::mainEventLoop()
                 0,
                 Qt::Vertical,
                 m_lastMouseButtons,
-                0 );
+                nullptr );
             QCoreApplication::sendEvent( m_pWindow.get(), &wheelEvent );
         }
         break;
diff --git a/src/overlaycontroller.h b/src/overlaycontroller.h
index 2a9f94f..f4b48ae 100644
--- a/src/overlaycontroller.h
+++ b/src/overlaycontroller.h
@@ -85,7 +85,7 @@ private:
     bool m_dashboardVisible = false;
 
     QPoint m_ptLastMouse;
-    Qt::MouseButtons m_lastMouseButtons = 0;
+    Qt::MouseButtons m_lastMouseButtons = nullptr;
 
     bool m_desktopMode;
     bool m_noSound;
diff --git a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
index bc0a5ce..5e1fa93 100644
--- a/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
+++ b/src/tabcontrollers/audiomanager/AudioManagerWindows.cpp
@@ -370,7 +370,7 @@ IMMDeviceEnumerator* AudioManagerWindows::getAudioDeviceEnumerator()
 {
     IMMDeviceEnumerator* pEnumerator;
     if ( CoCreateInstance( __uuidof( MMDeviceEnumerator ),
-                           NULL,
+                           nullptr,
                            CLSCTX_ALL,
                            __uuidof( IMMDeviceEnumerator ),
                            reinterpret_cast<void**>( &pEnumerator ) )
@@ -387,14 +387,14 @@ IPolicyConfig* AudioManagerWindows::getPolicyConfig()
     // for Win 10
     auto hr
         = CoCreateInstance( __uuidof( CPolicyConfigClient ),
-                            NULL,
+                            nullptr,
                             CLSCTX_INPROC,
                             IID_IPolicyConfig2,
                             reinterpret_cast<LPVOID*>( &var_policyConfig ) );
     if ( hr != S_OK )
     {
         hr = CoCreateInstance( __uuidof( CPolicyConfigClient ),
-                               NULL,
+                               nullptr,
                                CLSCTX_INPROC,
                                IID_IPolicyConfig1,
                                reinterpret_cast<LPVOID*>( &var_policyConfig ) );
@@ -403,7 +403,7 @@ IPolicyConfig* AudioManagerWindows::getPolicyConfig()
     if ( hr != S_OK )
     {
         hr = CoCreateInstance( __uuidof( CPolicyConfigClient ),
-                               NULL,
+                               nullptr,
                                CLSCTX_INPROC,
                                IID_IPolicyConfig0,
                                reinterpret_cast<LPVOID*>( &var_policyConfig ) );
@@ -471,7 +471,7 @@ IAudioEndpointVolume*
     IAudioEndpointVolume* pEndpointVolume;
     if ( device->Activate( __uuidof( IAudioEndpointVolume ),
                            CLSCTX_INPROC_SERVER,
-                           NULL,
+                           nullptr,
                            reinterpret_cast<void**>( &pEndpointVolume ) )
          < 0 )
     {
@@ -546,7 +546,7 @@ HRESULT AudioManagerWindows::QueryInterface( REFIID riid, void** ppvObject )
     }
     else
     {
-        *ppvObject = NULL;
+        *ppvObject = nullptr;
         return E_NOINTERFACE;
     }
     return S_OK;