Skip to content

Commit a18637f

Browse files
amaitlandamaitland
committed
C++/CLI - Replace NULL with nullptr
Issue #3636
1 parent b24cd8e commit a18637f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+83
-83
lines changed

‎CefSharp.BrowserSubprocess.Core/Async/JavascriptAsyncMethodHandler.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ namespace CefSharp
3838

3939
//when refreshing the browser this is sometimes null, in this case return true and log message
4040
//https://github.com/cefsharp/CefSharp/pull/2446
41-
if (promiseData == NULL)
41+
if (promiseData == nullptr)
4242
{
43-
LOG(WARNING) << "JavascriptAsyncMethodHandler::Execute promiseData returned NULL";
43+
LOG(WARNING) << "JavascriptAsyncMethodHandler::Execute promiseData returned nullptr";
4444

4545
return true;
4646
}

‎CefSharp.BrowserSubprocess.Core/BindObjectAsyncHandler.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,9 @@ namespace CefSharp
197197

198198
//when refreshing the browser this is sometimes null, in this case return true and log message
199199
//https://github.com/cefsharp/CefSharp/pull/2446
200-
if (promiseData == NULL)
200+
if (promiseData == nullptr)
201201
{
202-
LOG(WARNING) << "BindObjectAsyncHandler::Execute promiseData returned NULL";
202+
LOG(WARNING) << "BindObjectAsyncHandler::Execute promiseData returned nullptr";
203203

204204
return true;
205205
}

‎CefSharp.BrowserSubprocess.Core/CefAppUnmanagedWrapper.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ namespace CefSharp
156156

157157
if (createCefSharpObj)
158158
{
159-
auto cefSharpObj = CefV8Value::CreateObject(NULL, NULL);
159+
auto cefSharpObj = CefV8Value::CreateObject(nullptr, nullptr);
160160
cefSharpObj->SetValue(kBindObjectAsync, bindObjAsyncFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
161161
cefSharpObj->SetValue(kDeleteBoundObject, unBindObjFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
162162
cefSharpObj->SetValue(kRemoveObjectFromCache, removeObjectFromCacheFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
@@ -170,7 +170,7 @@ namespace CefSharp
170170

171171
if (createCefSharpObjCamelCase)
172172
{
173-
auto cefSharpObjCamelCase = CefV8Value::CreateObject(NULL, NULL);
173+
auto cefSharpObjCamelCase = CefV8Value::CreateObject(nullptr, nullptr);
174174
cefSharpObjCamelCase->SetValue(kBindObjectAsyncCamelCase, bindObjAsyncFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
175175
cefSharpObjCamelCase->SetValue(kDeleteBoundObjectCamelCase, unBindObjFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
176176
cefSharpObjCamelCase->SetValue(kRemoveObjectFromCacheCamelCase, removeObjectFromCacheFunction, CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_NONE);
@@ -613,7 +613,7 @@ namespace CefSharp
613613
if (_registerBoundObjectRegistry->TryGetAndRemoveMethodCallback(callbackId, callback))
614614
{
615615
//Response object has no Accessor or Interceptor
616-
auto response = CefV8Value::CreateObject(NULL, NULL);
616+
auto response = CefV8Value::CreateObject(nullptr, nullptr);
617617

618618
response->SetValue("Count", CefV8Value::CreateInt(javascriptObjects->Count), CefV8Value::PropertyAttribute::V8_PROPERTY_ATTRIBUTE_READONLY);
619619

‎CefSharp.BrowserSubprocess.Core/JavascriptMethodHandler.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ namespace CefSharp
5050
if (type == JavascriptObject::typeid)
5151
{
5252
JavascriptObject^ javascriptObject = (JavascriptObject^)obj;
53-
CefRefPtr<CefV8Value> cefObject = CefV8Value::CreateObject(NULL, NULL);
53+
CefRefPtr<CefV8Value> cefObject = CefV8Value::CreateObject(nullptr, nullptr);
5454

5555
for (int i = 0; i < javascriptObject->Properties->Count; i++)
5656
{

‎CefSharp.BrowserSubprocess.Core/JavascriptObjectWrapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace CefSharp
2323
);
2424

2525
//V8Value that represents this javascript object - only one per complex type
26-
auto javascriptObject = CefV8Value::CreateObject(_jsPropertyHandler.get(), NULL);
26+
auto javascriptObject = CefV8Value::CreateObject(_jsPropertyHandler.get(), nullptr);
2727
auto objectName = StringUtils::ToNative(object->JavascriptName);
2828
v8Value->SetValue(objectName, javascriptObject, V8_PROPERTY_ATTRIBUTE_NONE);
2929

‎CefSharp.BrowserSubprocess.Core/SubProcess.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ namespace CefSharp
5454

5555
CefMainArgs cefMainArgs((HINSTANCE)hInstance.ToPointer());
5656

57-
return CefExecuteProcess(cefMainArgs, (CefApp*)_cefApp.get(), NULL);
57+
return CefExecuteProcess(cefMainArgs, (CefApp*)_cefApp.get(), nullptr);
5858
}
5959

6060
virtual void OnBrowserCreated(CefBrowserWrapper^ cefBrowserWrapper)
@@ -82,7 +82,7 @@ namespace CefSharp
8282

8383
CefRefPtr<CefApp> app = new SubProcessApp(schemes);
8484

85-
return CefExecuteProcess(cefMainArgs, app, NULL);
85+
return CefExecuteProcess(cefMainArgs, app, nullptr);
8686
}
8787
};
8888
}

‎CefSharp.BrowserSubprocess.Core/Wrapper/Frame.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ namespace CefSharp
3939

4040
!Frame()
4141
{
42-
_frame = NULL;
42+
_frame = nullptr;
4343
}
4444

4545
~Frame()

‎CefSharp.BrowserSubprocess.Core/Wrapper/V8Context.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace CefSharp
2828

2929
!V8Context()
3030
{
31-
_context = NULL;
31+
_context = nullptr;
3232
}
3333

3434
~V8Context()

‎CefSharp.Core.Runtime/BrowserSettings.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ namespace CefSharp
6161
delete _browserSettings;
6262
}
6363

64-
_browserSettings = NULL;
64+
_browserSettings = nullptr;
6565
_isDisposed = true;
6666
}
6767

‎CefSharp.Core.Runtime/Cef.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ namespace CefSharp
257257
cefApp));
258258
CefMainArgs main_args;
259259

260-
auto success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get(), NULL);
260+
auto success = CefInitialize(main_args, *(cefSettings->_cefSettings), app.get(), nullptr);
261261

262262
_initialized = success;
263263
_multiThreadedMessageLoop = cefSettings->MultiThreadedMessageLoop;
@@ -325,7 +325,7 @@ namespace CefSharp
325325
//TODO: Look at ways to expose an instance of CefApp
326326
//CefRefPtr<CefSharpApp> app(new CefSharpApp(nullptr, nullptr));
327327

328-
return CefExecuteProcess(cefMainArgs, NULL, NULL);
328+
return CefExecuteProcess(cefMainArgs, nullptr, nullptr);
329329
}
330330

331331
/// <summary>Add an entry to the cross-origin whitelist.</summary>
@@ -448,7 +448,7 @@ namespace CefSharp
448448
/// <returns>A the global cookie manager or null if the RequestContext has not yet been initialized.</returns>
449449
static ICookieManager^ GetGlobalCookieManager(ICompletionCallback^ callback)
450450
{
451-
CefRefPtr<CefCompletionCallback> c = callback == nullptr ? NULL : new CefCompletionCallbackAdapter(callback);
451+
CefRefPtr<CefCompletionCallback> c = callback == nullptr ? nullptr : new CefCompletionCallbackAdapter(callback);
452452

453453
auto cookieManager = CefCookieManager::GetGlobalManager(c);
454454
if (cookieManager.get())
@@ -806,7 +806,7 @@ namespace CefSharp
806806
/// will be executed asynchronously once registration is complete</param>
807807
static void RegisterWidevineCdm(String^ path, [Optional] IRegisterCdmCallback^ callback)
808808
{
809-
CefRefPtr<CefRegisterCdmCallbackAdapter> adapter = NULL;
809+
CefRefPtr<CefRegisterCdmCallbackAdapter> adapter = nullptr;
810810

811811
if (callback != nullptr)
812812
{

‎CefSharp.Core.Runtime/CookieManager.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace CefSharp
2626
{
2727
ThrowIfDisposed();
2828

29-
CefRefPtr<CefDeleteCookiesCallback> wrapper = callback == nullptr ? NULL : new CefDeleteCookiesCallbackAdapter(callback);
29+
CefRefPtr<CefDeleteCookiesCallback> wrapper = callback == nullptr ? nullptr : new CefDeleteCookiesCallbackAdapter(callback);
3030

3131
return _cookieManager->DeleteCookies(StringUtils::ToNative(url), StringUtils::ToNative(name), wrapper);
3232
}
@@ -35,7 +35,7 @@ namespace CefSharp
3535
{
3636
ThrowIfDisposed();
3737

38-
CefRefPtr<CefSetCookieCallback> wrapper = callback == nullptr ? NULL : new CefSetCookieCallbackAdapter(callback);
38+
CefRefPtr<CefSetCookieCallback> wrapper = callback == nullptr ? nullptr : new CefSetCookieCallbackAdapter(callback);
3939

4040
CefCookie c;
4141
StringUtils::AssignNativeFromClr(c.name, cookie->Name);
@@ -81,7 +81,7 @@ namespace CefSharp
8181
{
8282
ThrowIfDisposed();
8383

84-
CefRefPtr<CefCompletionCallback> wrapper = callback == nullptr ? NULL : new CefCompletionCallbackAdapter(callback);
84+
CefRefPtr<CefCompletionCallback> wrapper = callback == nullptr ? nullptr : new CefCompletionCallbackAdapter(callback);
8585

8686
return _cookieManager->FlushStore(wrapper);
8787
}

‎CefSharp.Core.Runtime/CookieManager.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace CefSharp
3131
{
3232
if (this == nullptr)
3333
{
34-
return NULL;
34+
return nullptr;
3535
}
3636
return _cookieManager.get();
3737
}

‎CefSharp.Core.Runtime/DragData.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ namespace CefSharp
5252
{
5353
if (this == nullptr)
5454
{
55-
return NULL;
55+
return nullptr;
5656
}
5757
return _wrappedDragData.get();
5858
}
@@ -211,7 +211,7 @@ namespace CefSharp
211211
{
212212
if (stream == nullptr)
213213
{
214-
return (Int64)_wrappedDragData->GetFileContents(NULL);
214+
return (Int64)_wrappedDragData->GetFileContents(nullptr);
215215
}
216216

217217
auto writeHandler = new CefWriteHandlerWrapper(stream);

‎CefSharp.Core.Runtime/Internals/CefAuthCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace CefSharp
2727

2828
!CefAuthCallbackWrapper()
2929
{
30-
_callback = NULL;
30+
_callback = nullptr;
3131
}
3232

3333
~CefAuthCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefBeforeDownloadCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace CefSharp
2727

2828
!CefBeforeDownloadCallbackWrapper()
2929
{
30-
_callback = NULL;
30+
_callback = nullptr;
3131
}
3232

3333
~CefBeforeDownloadCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ int CefBrowserHostWrapper::ExecuteDevToolsMethod(int messageId, String^ method,
225225

226226
if (paramaters == nullptr)
227227
{
228-
return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), NULL);
228+
return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), nullptr);
229229
}
230230

231231
auto val = TypeConversion::ToNative(paramaters);
@@ -248,7 +248,7 @@ int CefBrowserHostWrapper::ExecuteDevToolsMethod(int messageId, String^ method,
248248

249249
if (String::IsNullOrEmpty(paramsAsJson))
250250
{
251-
return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), NULL);
251+
return _browserHost->ExecuteDevToolsMethod(messageId, StringUtils::ToNative(method), nullptr);
252252
}
253253

254254
auto val = CefParseJSON(StringUtils::ToNative(paramsAsJson), cef_json_parser_options_t::JSON_PARSER_RFC);

‎CefSharp.Core.Runtime/Internals/CefBrowserHostWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ namespace CefSharp
3131

3232
!CefBrowserHostWrapper()
3333
{
34-
_browserHost = NULL;
34+
_browserHost = nullptr;
3535
}
3636

3737
~CefBrowserHostWrapper()

‎CefSharp.Core.Runtime/Internals/CefCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace CefSharp
2727

2828
!CefCallbackWrapper()
2929
{
30-
_callback = NULL;
30+
_callback = nullptr;
3131
}
3232

3333
~CefCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefCertificateCallbackWrapper.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace CefSharp
3030

3131
!CefCertificateCallbackWrapper()
3232
{
33-
_callback = NULL;
33+
_callback = nullptr;
3434
}
3535

3636
~CefCertificateCallbackWrapper()
@@ -46,7 +46,7 @@ namespace CefSharp
4646

4747
if (cert == nullptr)
4848
{
49-
_callback->Select(NULL);
49+
_callback->Select(nullptr);
5050
}
5151
else
5252
{

‎CefSharp.Core.Runtime/Internals/CefContextMenuParamsWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace CefSharp
2727

2828
!CefContextMenuParamsWrapper()
2929
{
30-
_wrappedInfo = NULL;
30+
_wrappedInfo = nullptr;
3131
}
3232

3333
~CefContextMenuParamsWrapper()

‎CefSharp.Core.Runtime/Internals/CefDownloadItemCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace CefSharp
2727

2828
!CefDownloadItemCallbackWrapper()
2929
{
30-
_callback = NULL;
30+
_callback = nullptr;
3131
}
3232

3333
~CefDownloadItemCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefExtensionHandlerAdapter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ namespace CefSharp
156156

157157
if (activeBrowser == nullptr)
158158
{
159-
return NULL;
159+
return nullptr;
160160
}
161161

162162
//TODO: CLean this up

‎CefSharp.Core.Runtime/Internals/CefFileDialogCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ namespace CefSharp
2626

2727
!CefFileDialogCallbackWrapper()
2828
{
29-
_callback = NULL;
29+
_callback = nullptr;
3030
}
3131

3232
~CefFileDialogCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefFrameWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ namespace CefSharp
4040

4141
!CefFrameWrapper()
4242
{
43-
_frame = NULL;
43+
_frame = nullptr;
4444
}
4545

4646
~CefFrameWrapper()

‎CefSharp.Core.Runtime/Internals/CefGetExtensionResourceCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace CefSharp
2828

2929
!CefGetExtensionResourceCallbackWrapper()
3030
{
31-
_callback = NULL;
31+
_callback = nullptr;
3232
}
3333

3434
~CefGetExtensionResourceCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefImageWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace CefSharp
2828

2929
!CefImageWrapper()
3030
{
31-
_image = NULL;
31+
_image = nullptr;
3232
}
3333

3434
~CefImageWrapper()

‎CefSharp.Core.Runtime/Internals/CefJSDialogCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace CefSharp
2323

2424
!CefJSDialogCallbackWrapper()
2525
{
26-
_callback = NULL;
26+
_callback = nullptr;
2727
}
2828

2929
~CefJSDialogCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefMenuModelWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace CefSharp
2828

2929
!CefMenuModelWrapper()
3030
{
31-
_menu = NULL;
31+
_menu = nullptr;
3232
}
3333

3434
~CefMenuModelWrapper()

‎CefSharp.Core.Runtime/Internals/CefRegistrationWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace CefSharp
2727

2828
!CefRegistrationWrapper()
2929
{
30-
_callback = NULL;
30+
_callback = nullptr;
3131
}
3232

3333
~CefRegistrationWrapper()

‎CefSharp.Core.Runtime/Internals/CefRequestCallbackWrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ namespace CefSharp
3434

3535
!CefRequestCallbackWrapper()
3636
{
37-
_callback = NULL;
37+
_callback = nullptr;
3838
}
3939

4040
~CefRequestCallbackWrapper()

‎CefSharp.Core.Runtime/Internals/CefRequestContextHandlerAdapter.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ namespace CefSharp
6969
if (Object::ReferenceEquals(_requestContextHandler, nullptr))
7070
{
7171

72-
return NULL;
72+
return nullptr;
7373
}
7474

7575
CefBrowserWrapper browserWrapper(browser);
@@ -80,7 +80,7 @@ namespace CefSharp
8080

8181
if (Object::ReferenceEquals(handler, nullptr))
8282
{
83-
return NULL;
83+
return nullptr;
8484
}
8585

8686
//CefRequestContext is not associated with a specific browser

0 commit comments

Comments
 (0)