C++/CLI - Replace NULL with nullptr

Issue #3636
cefsharp · Jul 31, 2021 · a18637f · a18637f
1 parent b24cd8e
commit a18637f
Show file tree

Hide file tree

Showing 50 changed files with 83 additions and 83 deletions.
diff --git a/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp b/CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp
@@ -38,9 +38,9 @@ namespace CefSharp
 
                 //when refreshing the browser this is sometimes null, in this case return true and log message
                 //https://github.com/cefsharp/CefSharp/pull/2446
-                if (promiseData == NULL)
+                if (promiseData == nullptr)
                 {
-                    LOG(WARNING) << "JavascriptAsyncMethodHandler::Execute promiseData returned NULL";
+                    LOG(WARNING) << "JavascriptAsyncMethodHandler::Execute promiseData returned nullptr";
 
                     return true;
                 }

diff --git a/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h b/CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h
@@ -197,9 +197,9 @@ namespace CefSharp
 
                                     //when refreshing the browser this is sometimes null, in this case return true and log message
                                     //https://github.com/cefsharp/CefSharp/pull/2446
-                                    if (promiseData == NULL)
+                                    if (promiseData == nullptr)
                                     {
-                                        LOG(WARNING) << "BindObjectAsyncHandler::Execute promiseData returned NULL";
+                                        LOG(WARNING) << "BindObjectAsyncHandler::Execute promiseData returned nullptr";
 
                                         return true;
                                     }

diff --git a/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp b/CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp
@@ -156,7 +156,7 @@ namespace CefSharp
 
                 if (createCefSharpObj)
                 {
-                    auto cefSharpObj = CefV8Value::CreateObject(NULL, NULL);
+                    auto cefSharpObj = CefV8Value::CreateObject(nullptr, nullptr);
                     cefSharpObj->SetValue(kBindObjectAsync, bindObjAsyncFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
                     cefSharpObj->SetValue(kDeleteBoundObject, unBindObjFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
                     cefSharpObj->SetValue(kRemoveObjectFromCache, removeObjectFromCacheFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
@@ -170,7 +170,7 @@ namespace CefSharp
 
                 if (createCefSharpObjCamelCase)
                 {
-                    auto cefSharpObjCamelCase = CefV8Value::CreateObject(NULL, NULL);
+                    auto cefSharpObjCamelCase = CefV8Value::CreateObject(nullptr, nullptr);
                     cefSharpObjCamelCase->SetValue(kBindObjectAsyncCamelCase, bindObjAsyncFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
                     cefSharpObjCamelCase->SetValue(kDeleteBoundObjectCamelCase, unBindObjFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
                     cefSharpObjCamelCase->SetValue(kRemoveObjectFromCacheCamelCase, removeObjectFromCacheFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
@@ -613,7 +613,7 @@ namespace CefSharp
                             if (_registerBoundObjectRegistry->TryGetAndRemoveMethodCallback(callbackId, callback))
                             {
                                 //Response object has no Accessor or Interceptor
-                                auto response = CefV8Value::CreateObject(NULL, NULL);
+                                auto response = CefV8Value::CreateObject(nullptr, nullptr);
 
                                 response->SetValue("Count", CefV8Value::CreateInt(javascriptObjects->Count), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
 

diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.cpp
@@ -50,7 +50,7 @@ namespace CefSharp
             if (type == JavascriptObject::typeid)
             {
                 JavascriptObject^ javascriptObject = (JavascriptObject^)obj;
-                CefRefPtr<CefV8Value> cefObject = CefV8Value::CreateObject(NULL, NULL);
+                CefRefPtr<CefV8Value> cefObject = CefV8Value::CreateObject(nullptr, nullptr);
 
                 for (int i = 0; i < javascriptObject->Properties->Count; i++)
                 {

diff --git a/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.cpp b/CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.cpp
@@ -23,7 +23,7 @@ namespace CefSharp
             );
 
             //V8Value that represents this javascript object - only one per complex type
-            auto javascriptObject = CefV8Value::CreateObject(_jsPropertyHandler.get(), NULL);
+            auto javascriptObject = CefV8Value::CreateObject(_jsPropertyHandler.get(), nullptr);
             auto objectName = StringUtils::ToNative(object->JavascriptName);
             v8Value->SetValue(objectName, javascriptObject, V8_PROPERTY_ATTRIBUTE_NONE);
 

diff --git a/CefSharp.BrowserSubprocess.Core/SubProcess.h b/CefSharp.BrowserSubprocess.Core/SubProcess.h
@@ -54,7 +54,7 @@ namespace CefSharp
 
                 CefMainArgs cefMainArgs((HINSTANCE)hInstance.ToPointer());
 
-                return CefExecuteProcess(cefMainArgs, (CefApp*)_cefApp.get(), NULL);
+                return CefExecuteProcess(cefMainArgs, (CefApp*)_cefApp.get(), nullptr);
             }
 
             virtual void OnBrowserCreated(CefBrowserWrapper^ cefBrowserWrapper)
@@ -82,7 +82,7 @@ namespace CefSharp
 
                 CefRefPtr<CefApp> app = new SubProcessApp(schemes);
 
-                return CefExecuteProcess(cefMainArgs, app, NULL);
+                return CefExecuteProcess(cefMainArgs, app, nullptr);
             }
         };
     }

diff --git a/CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h b/CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h
@@ -39,7 +39,7 @@ namespace CefSharp
 
             !Frame()
             {
-                _frame = NULL;
+                _frame = nullptr;
             }
 
             ~Frame()

diff --git a/CefSharp.BrowserSubprocess.Core/Wrapper/V8Context.h b/CefSharp.BrowserSubprocess.Core/Wrapper/V8Context.h
@@ -28,7 +28,7 @@ namespace CefSharp
 
             !V8Context()
             {
-                _context = NULL;
+                _context = nullptr;
             }
 
             ~V8Context()

diff --git a/CefSharp.Core.Runtime/BrowserSettings.h b/CefSharp.Core.Runtime/BrowserSettings.h
@@ -61,7 +61,7 @@ namespace CefSharp
                     delete _browserSettings;
                 }
 
-                _browserSettings = NULL;
+                _browserSettings = nullptr;
                 _isDisposed = true;
             }
 

diff --git a/CefSharp.Core.Runtime/Cef.h b/CefSharp.Core.Runtime/Cef.h
@@ -257,7 +257,7 @@ namespace CefSharp
                                                            cefApp));
                 CefMainArgs main_args;
 
-                auto success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get(), NULL);
+                auto success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get(), nullptr);
 
                 _initialized = success;
                 _multiThreadedMessageLoop = cefSettings->MultiThreadedMessageLoop;
@@ -325,7 +325,7 @@ namespace CefSharp
                 //TODO: Look at ways to expose an instance of CefApp
                 //CefRefPtr<CefSharpApp> app(new CefSharpApp(nullptr, nullptr));
 
-                return CefExecuteProcess(cefMainArgs, NULL, NULL);
+                return CefExecuteProcess(cefMainArgs, nullptr, nullptr);
             }
 
             /// <summary>Add an entry to the cross-origin whitelist.</summary>
@@ -448,7 +448,7 @@ namespace CefSharp
             /// <returns>A the global cookie manager or null if the RequestContext has not yet been initialized.</returns>
             static ICookieManager^ GetGlobalCookieManager(ICompletionCallback^ callback)
             {
-                CefRefPtr<CefCompletionCallback> c = callback == nullptr ? NULL : new CefCompletionCallbackAdapter(callback);
+                CefRefPtr<CefCompletionCallback> c = callback == nullptr ? nullptr : new CefCompletionCallbackAdapter(callback);
 
                 auto cookieManager = CefCookieManager::GetGlobalManager(c);
                 if (cookieManager.get())
@@ -806,7 +806,7 @@ namespace CefSharp
             /// will be executed asynchronously once registration is complete</param>
             static void RegisterWidevineCdm(String^ path, [Optional] IRegisterCdmCallback^ callback)
             {
-                CefRefPtr<CefRegisterCdmCallbackAdapter> adapter = NULL;
+                CefRefPtr<CefRegisterCdmCallbackAdapter> adapter = nullptr;
 
                 if (callback != nullptr)
                 {

diff --git a/CefSharp.Core.Runtime/CookieManager.cpp b/CefSharp.Core.Runtime/CookieManager.cpp
@@ -26,7 +26,7 @@ namespace CefSharp
     {
         ThrowIfDisposed();
 
-        CefRefPtr<CefDeleteCookiesCallback> wrapper = callback == nullptr ? NULL : new CefDeleteCookiesCallbackAdapter(callback);
+        CefRefPtr<CefDeleteCookiesCallback> wrapper = callback == nullptr ? nullptr : new CefDeleteCookiesCallbackAdapter(callback);
 
         return _cookieManager->DeleteCookies(StringUtils::ToNative(url), StringUtils::ToNative(name), wrapper);
     }
@@ -35,7 +35,7 @@ namespace CefSharp
     {
         ThrowIfDisposed();
 
-        CefRefPtr<CefSetCookieCallback> wrapper = callback == nullptr ? NULL : new CefSetCookieCallbackAdapter(callback);
+        CefRefPtr<CefSetCookieCallback> wrapper = callback == nullptr ? nullptr : new CefSetCookieCallbackAdapter(callback);
 
         CefCookie c;
         StringUtils::AssignNativeFromClr(c.name, cookie->Name);
@@ -81,7 +81,7 @@ namespace CefSharp
     {
         ThrowIfDisposed();
 
-        CefRefPtr<CefCompletionCallback> wrapper = callback == nullptr ? NULL : new CefCompletionCallbackAdapter(callback);
+        CefRefPtr<CefCompletionCallback> wrapper = callback == nullptr ? nullptr : new CefCompletionCallbackAdapter(callback);
 
         return _cookieManager->FlushStore(wrapper);
     }

diff --git a/CefSharp.Core.Runtime/CookieManager.h b/CefSharp.Core.Runtime/CookieManager.h
@@ -31,7 +31,7 @@ namespace CefSharp
         {
             if (this == nullptr)
             {
-                return NULL;
+                return nullptr;
             }
             return _cookieManager.get();
         }

diff --git a/CefSharp.Core.Runtime/DragData.h b/CefSharp.Core.Runtime/DragData.h
@@ -52,7 +52,7 @@ namespace CefSharp
             {
                 if (this == nullptr)
                 {
-                    return NULL;
+                    return nullptr;
                 }
                 return _wrappedDragData.get();
             }
@@ -211,7 +211,7 @@ namespace CefSharp
             {
                 if (stream == nullptr)
                 {
-                    return (Int64)_wrappedDragData->GetFileContents(NULL);
+                    return (Int64)_wrappedDragData->GetFileContents(nullptr);
                 }
 
                 auto writeHandler = new CefWriteHandlerWrapper(stream);

diff --git a/CefSharp.Core.Runtime/Internals/CefAuthCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefAuthCallbackWrapper.h
@@ -27,7 +27,7 @@ namespace CefSharp
 
             !CefAuthCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefAuthCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefBeforeDownloadCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefBeforeDownloadCallbackWrapper.h
@@ -27,7 +27,7 @@ namespace CefSharp
 
             !CefBeforeDownloadCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefBeforeDownloadCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp
@@ -225,7 +225,7 @@ int CefBrowserHostWrapper::ExecuteDevToolsMethod(int messageId, String^ method,
 
     if (paramaters == nullptr)
     {
-        return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), NULL);
+        return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), nullptr);
     }
 
     auto val = TypeConversion::ToNative(paramaters);
@@ -248,7 +248,7 @@ int CefBrowserHostWrapper::ExecuteDevToolsMethod(int messageId, String^ method,
 
     if (String::IsNullOrEmpty(paramsAsJson))
     {
-        return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), NULL);
+        return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), nullptr);
     }
 
     auto val = CefParseJSON(StringUtils::ToNative(paramsAsJson), cef_json_parser_options_t::JSON_PARSER_RFC);

diff --git a/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h b/CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h
@@ -31,7 +31,7 @@ namespace CefSharp
 
             !CefBrowserHostWrapper()
             {
-                _browserHost = NULL;
+                _browserHost = nullptr;
             }
 
             ~CefBrowserHostWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefCallbackWrapper.h
@@ -27,7 +27,7 @@ namespace CefSharp
 
             !CefCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefCertificateCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefCertificateCallbackWrapper.h
@@ -30,7 +30,7 @@ namespace CefSharp
 
             !CefCertificateCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefCertificateCallbackWrapper()
@@ -46,7 +46,7 @@ namespace CefSharp
 
                 if (cert == nullptr)
                 {
-                    _callback->Select(NULL);
+                    _callback->Select(nullptr);
                 }
                 else
                 {

diff --git a/CefSharp.Core.Runtime/Internals/CefContextMenuParamsWrapper.h b/CefSharp.Core.Runtime/Internals/CefContextMenuParamsWrapper.h
@@ -27,7 +27,7 @@ namespace CefSharp
 
             !CefContextMenuParamsWrapper()
             {
-                _wrappedInfo = NULL;
+                _wrappedInfo = nullptr;
             }
 
             ~CefContextMenuParamsWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefDownloadItemCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefDownloadItemCallbackWrapper.h
@@ -27,7 +27,7 @@ namespace CefSharp
 
             !CefDownloadItemCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefDownloadItemCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h b/CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h
@@ -156,7 +156,7 @@ namespace CefSharp
 
                 if (activeBrowser == nullptr)
                 {
-                    return NULL;
+                    return nullptr;
                 }
 
                 //TODO: CLean this up

diff --git a/CefSharp.Core.Runtime/Internals/CefFileDialogCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefFileDialogCallbackWrapper.h
@@ -26,7 +26,7 @@ namespace CefSharp
 
             !CefFileDialogCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefFileDialogCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefFrameWrapper.h b/CefSharp.Core.Runtime/Internals/CefFrameWrapper.h
@@ -40,7 +40,7 @@ namespace CefSharp
 
             !CefFrameWrapper()
             {
-                _frame = NULL;
+                _frame = nullptr;
             }
 
             ~CefFrameWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefGetExtensionResourceCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefGetExtensionResourceCallbackWrapper.h
@@ -28,7 +28,7 @@ namespace CefSharp
 
             !CefGetExtensionResourceCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefGetExtensionResourceCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefImageWrapper.h b/CefSharp.Core.Runtime/Internals/CefImageWrapper.h
@@ -28,7 +28,7 @@ namespace CefSharp
 
             !CefImageWrapper()
             {
-                _image = NULL;
+                _image = nullptr;
             }
 
             ~CefImageWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefJSDialogCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefJSDialogCallbackWrapper.h
@@ -23,7 +23,7 @@ namespace CefSharp
 
             !CefJSDialogCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefJSDialogCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefMenuModelWrapper.h b/CefSharp.Core.Runtime/Internals/CefMenuModelWrapper.h
@@ -28,7 +28,7 @@ namespace CefSharp
 
             !CefMenuModelWrapper()
             {
-                _menu = NULL;
+                _menu = nullptr;
             }
 
             ~CefMenuModelWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefRegistrationWrapper.h b/CefSharp.Core.Runtime/Internals/CefRegistrationWrapper.h
@@ -27,7 +27,7 @@ namespace CefSharp
 
             !CefRegistrationWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefRegistrationWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefRequestCallbackWrapper.h b/CefSharp.Core.Runtime/Internals/CefRequestCallbackWrapper.h
@@ -34,7 +34,7 @@ namespace CefSharp
 
             !CefRequestCallbackWrapper()
             {
-                _callback = NULL;
+                _callback = nullptr;
             }
 
             ~CefRequestCallbackWrapper()

diff --git a/CefSharp.Core.Runtime/Internals/CefRequestContextHandlerAdapter.cpp b/CefSharp.Core.Runtime/Internals/CefRequestContextHandlerAdapter.cpp
@@ -69,7 +69,7 @@ namespace CefSharp
             if (Object::ReferenceEquals(_requestContextHandler, nullptr))
             {
 
-                return NULL;
+                return nullptr;
             }
 
             CefBrowserWrapper browserWrapper(browser);
@@ -80,7 +80,7 @@ namespace CefSharp
 
             if (Object::ReferenceEquals(handler, nullptr))
             {
-                return NULL;
+                return nullptr;
             }
 
             //CefRequestContext is not associated with a specific browser