bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

libcef: Convert NULL to nullptr (see issue #2861)

Browse Source
This commit is contained in:
Marshall Greenblatt
2020-01-15 14:36:24 +01:00
parent c05c3e4065
commit ea63799c3e
98 changed files with 538 additions and 527 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libcef_dll/cpptoc/base_ref_counted_cpptoc.cc
View File

@@ -13,7 +13,7 @@ CefRefPtr<CefBaseRefCounted> CefCppToCRefCounted<
cef_base_ref_counted_t>::UnwrapDerived(CefWrapperType type,
cef_base_ref_counted_t* s) {
NOTREACHED();
return NULL;
return nullptr;
}
template <>

2
libcef_dll/cpptoc/base_scoped_cpptoc.cc
View File

@@ -19,7 +19,7 @@ CefRawPtr<CefBaseScoped>
CefCppToCScoped<CefBaseScopedCppToC, CefBaseScoped, cef_base_scoped_t>::
UnwrapDerivedRaw(CefWrapperType type, cef_base_scoped_t* s) {
NOTREACHED();
return NULL;
return nullptr;
}
template <>

4
libcef_dll/cpptoc/cpptoc_ref_counted.h
View File

@@ -22,7 +22,7 @@ class CefCppToCRefCounted : public CefBaseRefCounted {
// passing an object instance the other side.
static StructName* Wrap(CefRefPtr<BaseName> c) {
if (!c.get())
return NULL;
return nullptr;
// Wrap our object with the CefCppToCRefCounted class.
ClassName* wrapper = new ClassName();
@@ -38,7 +38,7 @@ class CefCppToCRefCounted : public CefBaseRefCounted {
// back from the other side.
static CefRefPtr<BaseName> Unwrap(StructName* s) {
if (!s)
return NULL;
return nullptr;
// Cast our structure to the wrapper structure type.
WrapperStruct* wrapperStruct = GetWrapperStruct(s);

6
libcef_dll/cpptoc/cpptoc_scoped.h
View File

@@ -34,7 +34,7 @@ class CefCppToCScoped : public CefBaseScoped {
// }
static StructName* WrapOwn(CefOwnPtr<BaseName> c) {
if (!c)
return NULL;
return nullptr;
// Wrap our object with the CefCppToC class.
ClassName* wrapper = new ClassName();
@@ -97,7 +97,7 @@ class CefCppToCScoped : public CefBaseScoped {
// We're giving up ownership of the underlying object. Clear the pointer so
// it doesn't get deleted.
BaseName* object = wrapperStruct->object_;
wrapperStruct->object_ = NULL;
wrapperStruct->object_ = nullptr;
delete wrapperStruct->wrapper_;
@@ -114,7 +114,7 @@ class CefCppToCScoped : public CefBaseScoped {
// }
static CefRawPtr<BaseName> UnwrapRaw(StructName* s) {
if (!s)
return NULL;
return nullptr;
// Cast our structure to the wrapper structure type.
WrapperStruct* wrapperStruct = GetWrapperStruct(s);