Get rid of most instance of 'foo == NULL'

core/include/fxcrt/fx_basic.h

Index: core/include/fxcrt/fx_basic.h
diff --git a/core/include/fxcrt/fx_basic.h b/core/include/fxcrt/fx_basic.h
index d4afcc64eb9d9837bed6ca6373be71324b3ee086..d8cede8960aa7af05d74f845e7910a7b07fab070 100644
--- a/core/include/fxcrt/fx_basic.h
+++ b/core/include/fxcrt/fx_basic.h
@@ -878,7 +878,7 @@ class CFX_CountRef {
 
   void operator=(void* p) {
     FXSYS_assert(p == 0);
-    if (m_pObject == NULL) {
+    if (!m_pObject) {
       return;
     }
     m_pObject->m_RefCount--;
@@ -892,12 +892,12 @@ class CFX_CountRef {
 
   operator const ObjClass*() const { return m_pObject; }
 
-  FX_BOOL IsNull() const { return m_pObject == NULL; }
+  FX_BOOL IsNull() const { return !m_pObject; }
 
-  FX_BOOL NotNull() const { return m_pObject != NULL; }
+  FX_BOOL NotNull() const { return !IsNull(); }

[Lei Zhang, 2015/12/12 02:31:44]

or leave it as is?

 
   ObjClass* GetModify() {
-    if (m_pObject == NULL) {
+    if (!m_pObject) {
       m_pObject = new CountedObj;
       m_pObject->m_RefCount = 1;
     } else if (m_pObject->m_RefCount > 1) {
@@ -910,7 +910,7 @@ class CFX_CountRef {
   }
 
   void SetNull() {
-    if (m_pObject == NULL) {
+    if (!m_pObject) {
       return;
     }
     m_pObject->m_RefCount--;