DirectShow: Introduce nullptr

Apply Fixits by Qt Creator.

Change-Id: Idbd52ceaac6ee02f23d05f5a9b1ab6d58298b6a5
Reviewed-by: André de la Rocha <andre.rocha@qt.io>
 

1 files changed, 9 insertions, 9 deletions

diff --git a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
index 2c1fab764..0f08154f1 100644
--- a/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
+++ b/src/plugins/directshow/camera/dsvideodevicecontrol.cpp
@@ -129,10 +129,10 @@ void DSVideoDeviceControl::updateDevices()
 
     deviceList->clear();
 
-    ICreateDevEnum* pDevEnum = NULL;
-    IEnumMoniker* pEnum = NULL;
+    ICreateDevEnum* pDevEnum = nullptr;
+    IEnumMoniker* pEnum = nullptr;
     // Create the System device enumerator
-    HRESULT hr = CoCreateInstance(CLSID_SystemDeviceEnum, NULL,
+    HRESULT hr = CoCreateInstance(CLSID_SystemDeviceEnum, nullptr,
             CLSCTX_INPROC_SERVER, IID_ICreateDevEnum,
             reinterpret_cast<void**>(&pDevEnum));
     if (SUCCEEDED(hr)) {
@@ -142,12 +142,12 @@ void DSVideoDeviceControl::updateDevices()
         if (S_OK == hr) {
             pEnum->Reset();
             // go through and find all video capture devices
-            IMoniker* pMoniker = NULL;
-            IMalloc *mallocInterface = 0;
+            IMoniker* pMoniker = nullptr;
+            IMalloc *mallocInterface = nullptr;
             CoGetMalloc(1, (LPMALLOC*)&mallocInterface);
-            while (pEnum->Next(1, &pMoniker, NULL) == S_OK) {
-                BSTR strName = 0;
-                hr = pMoniker->GetDisplayName(NULL, NULL, &strName);
+            while (pEnum->Next(1, &pMoniker, nullptr) == S_OK) {
+                BSTR strName = nullptr;
+                hr = pMoniker->GetDisplayName(nullptr, nullptr, &strName);
                 if (SUCCEEDED(hr)) {
                     QString output(QString::fromWCharArray(strName));
                     mallocInterface->Free(strName);
@@ -162,7 +162,7 @@ void DSVideoDeviceControl::updateDevices()
                         // Find the description
                         VARIANT varName;
                         varName.vt = VT_BSTR;
-                        hr = pPropBag->Read(L"FriendlyName", &varName, 0);
+                        hr = pPropBag->Read(L"FriendlyName", &varName, nullptr);
                         if (SUCCEEDED(hr)) {
                             output = QString::fromWCharArray(varName.bstrVal);
                         }