Bug 777292 part 2 - Change all nsnull to nullptr

Author: ayg

accessible/build/nsAccessibilityFactory.cpp

@@ -16,7 +16,7 @@ static nsresult
 NS_ConstructAccessibilityService(nsISupports *aOuter, REFNSIID aIID, void **aResult)
 {
     nsresult rv;
-    NS_ASSERTION(aOuter == nsnull, "no aggregation");
+    NS_ASSERTION(aOuter == nullptr, "no aggregation");
     nsIAccessibilityService* accessibility;
     rv = NS_GetAccessibilityService(&accessibility);
     if (NS_FAILED(rv)) {

accessible/src/atk/AccessibleWrap.cpp

@@ -238,7 +238,7 @@ PRInt32 AccessibleWrap::mAccWrapDeleted = 0;
 
 AccessibleWrap::
   AccessibleWrap(nsIContent* aContent, DocAccessible* aDoc) :
-  Accessible(aContent, aDoc), mAtkObject(nsnull)
+  Accessible(aContent, aDoc), mAtkObject(nullptr)
 {
 #ifdef MAI_LOGGING
   ++mAccWrapCreated;
@@ -265,11 +265,11 @@ AccessibleWrap::ShutdownAtkObject()
 {
     if (mAtkObject) {
         if (IS_MAI_OBJECT(mAtkObject)) {
-            MAI_ATK_OBJECT(mAtkObject)->accWrap = nsnull;
+            MAI_ATK_OBJECT(mAtkObject)->accWrap = nullptr;
         }
-        SetMaiHyperlink(nsnull);
+        SetMaiHyperlink(nullptr);
         g_object_unref(mAtkObject);
-        mAtkObject = nsnull;
+        mAtkObject = nullptr;
     }
 }
 
@@ -288,7 +288,7 @@ AccessibleWrap::GetMaiHyperlink(bool aCreate /* = true */)
 
     NS_ASSERTION(quark_mai_hyperlink, "quark_mai_hyperlink not initialized");
     NS_ASSERTION(IS_MAI_OBJECT(mAtkObject), "Invalid AtkObject");
-    MaiHyperlink* maiHyperlink = nsnull;
+    MaiHyperlink* maiHyperlink = nullptr;
     if (quark_mai_hyperlink && IS_MAI_OBJECT(mAtkObject)) {
         maiHyperlink = (MaiHyperlink*)g_object_get_qdata(G_OBJECT(mAtkObject),
                                                          quark_mai_hyperlink);
@@ -319,7 +319,7 @@ AccessibleWrap::SetMaiHyperlink(MaiHyperlink* aMaiHyperlink)
 NS_IMETHODIMP
 AccessibleWrap::GetNativeInterface(void** aOutAccessible)
 {
-    *aOutAccessible = nsnull;
+    *aOutAccessible = nullptr;
 
     if (!mAtkObject) {
         if (IsDefunct() || !nsAccUtils::IsEmbeddedObject(this)) {
@@ -347,7 +347,7 @@ AccessibleWrap::GetNativeInterface(void** aOutAccessible)
 AtkObject *
 AccessibleWrap::GetAtkObject(void)
 {
-    void *atkObj = nsnull;
+    void *atkObj = nullptr;
     GetNativeInterface(&atkObj);
     return static_cast<AtkObject *>(atkObj);
 }
@@ -357,9 +357,9 @@ AccessibleWrap::GetAtkObject(void)
 AtkObject *
 AccessibleWrap::GetAtkObject(nsIAccessible* acc)
 {
-    void *atkObjPtr = nsnull;
+    void *atkObjPtr = nullptr;
     acc->GetNativeInterface(&atkObjPtr);
-    return atkObjPtr ? ATK_OBJECT(atkObjPtr) : nsnull;    
+    return atkObjPtr ? ATK_OBJECT(atkObjPtr) : nullptr;    
 }
 
 /* private */
@@ -620,7 +620,7 @@ finalizeCB(GObject *aObj)
 {
     if (!IS_MAI_OBJECT(aObj))
         return;
-    NS_ASSERTION(MAI_ATK_OBJECT(aObj)->accWrap == nsnull, "AccWrap NOT null");
+    NS_ASSERTION(MAI_ATK_OBJECT(aObj)->accWrap == nullptr, "AccWrap NOT null");
 
 #ifdef MAI_LOGGING
     ++sMaiAtkObjDeleted;
@@ -640,7 +640,7 @@ getNameCB(AtkObject* aAtkObj)
 {
   AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
   if (!accWrap)
-    return nsnull;
+    return nullptr;
 
   nsAutoString uniName;
   accWrap->Name(uniName);
@@ -657,7 +657,7 @@ getDescriptionCB(AtkObject *aAtkObj)
 {
     AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
     if (!accWrap || accWrap->IsDefunct())
-        return nsnull;
+        return nullptr;
 
     /* nsIAccessible is responsible for the non-NULL description */
     nsAutoString uniDesc;
@@ -708,12 +708,12 @@ AtkAttributeSet*
 ConvertToAtkAttributeSet(nsIPersistentProperties* aAttributes)
 {
     if (!aAttributes)
-        return nsnull;
+        return nullptr;
 
-    AtkAttributeSet *objAttributeSet = nsnull;
+    AtkAttributeSet *objAttributeSet = nullptr;
     nsCOMPtr<nsISimpleEnumerator> propEnum;
     nsresult rv = aAttributes->Enumerate(getter_AddRefs(propEnum));
-    NS_ENSURE_SUCCESS(rv, nsnull);
+    NS_ENSURE_SUCCESS(rv, nullptr);
 
     bool hasMore;
     while (NS_SUCCEEDED(propEnum->HasMoreElements(&hasMore)) && hasMore) {
@@ -760,14 +760,14 @@ GetAttributeSet(Accessible* aAccessible)
         return ConvertToAtkAttributeSet(attributes);
     }
 
-    return nsnull;
+    return nullptr;
 }
 
 AtkAttributeSet *
 getAttributesCB(AtkObject *aAtkObj)
 {
   AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
-  return accWrap ? GetAttributeSet(accWrap) : nsnull;
+  return accWrap ? GetAttributeSet(accWrap) : nullptr;
 }
 
 AtkObject *
@@ -776,11 +776,11 @@ getParentCB(AtkObject *aAtkObj)
   if (!aAtkObj->accessible_parent) {
     AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
     if (!accWrap)
-      return nsnull;
+      return nullptr;
 
     Accessible* accParent = accWrap->Parent();
     if (!accParent)
-      return nsnull;
+      return nullptr;
 
     AtkObject* parent = AccessibleWrap::GetAtkObject(accParent);
     if (parent)
@@ -805,23 +805,23 @@ refChildCB(AtkObject *aAtkObj, gint aChildIndex)
 {
     // aChildIndex should not be less than zero
     if (aChildIndex < 0) {
-      return nsnull;
+      return nullptr;
     }
 
     AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
     if (!accWrap || nsAccUtils::MustPrune(accWrap)) {
-        return nsnull;
+        return nullptr;
     }
 
     Accessible* accChild = accWrap->GetEmbeddedChildAt(aChildIndex);
     if (!accChild)
-        return nsnull;
+        return nullptr;
 
     AtkObject* childAtkObj = AccessibleWrap::GetAtkObject(accChild);
 
     NS_ASSERTION(childAtkObj, "Fail to get AtkObj");
     if (!childAtkObj)
-        return nsnull;
+        return nullptr;
     g_object_ref(childAtkObj);
 
   if (aAtkObj != childAtkObj->accessible_parent)
@@ -872,7 +872,7 @@ TranslateStates(PRUint64 aState, AtkStateSet* aStateSet)
 AtkStateSet *
 refStateSetCB(AtkObject *aAtkObj)
 {
-    AtkStateSet *state_set = nsnull;
+    AtkStateSet *state_set = nullptr;
     state_set = ATK_OBJECT_CLASS(parent_class)->ref_state_set(aAtkObj);
 
     AccessibleWrap* accWrap = GetAccessibleWrap(aAtkObj);
@@ -919,7 +919,7 @@ refRelationSetCB(AtkObject *aAtkObj)
 
     Relation rel(accWrap->RelationByType(relationTypes[i]));
     nsTArray<AtkObject*> targets;
-    Accessible* tempAcc = nsnull;
+    Accessible* tempAcc = nullptr;
     while ((tempAcc = rel.Next()))
       targets.AppendElement(AccessibleWrap::GetAtkObject(tempAcc));
 
@@ -938,18 +938,18 @@ refRelationSetCB(AtkObject *aAtkObj)
 AccessibleWrap*
 GetAccessibleWrap(AtkObject* aAtkObj)
 {
-  NS_ENSURE_TRUE(IS_MAI_OBJECT(aAtkObj), nsnull);
+  NS_ENSURE_TRUE(IS_MAI_OBJECT(aAtkObj), nullptr);
   AccessibleWrap* accWrap = MAI_ATK_OBJECT(aAtkObj)->accWrap;
 
   // Check if the accessible was deconstructed.
   if (!accWrap)
-    return nsnull;
+    return nullptr;
 
-  NS_ENSURE_TRUE(accWrap->GetAtkObject() == aAtkObj, nsnull);
+  NS_ENSURE_TRUE(accWrap->GetAtkObject() == aAtkObj, nullptr);
 
   AccessibleWrap* appAccWrap = nsAccessNode::GetApplicationAccessible();
   if (appAccWrap != accWrap && !accWrap->IsValidObject())
-    return nsnull;
+    return nullptr;
 
   return accWrap;
 }
@@ -1308,7 +1308,7 @@ AccessibleWrap::FireAtkTextChangedEvent(AccEvent* aEvent,
     PRUint32 length = event->GetLength();
     bool isInserted = event->IsTextInserted();
     bool isFromUserInput = aEvent->IsFromUserInput();
-    char* signal_name = nsnull;
+    char* signal_name = nullptr;
 
   if (gAvailableAtkSignals == eUnknown)
     gAvailableAtkSignals =

accessible/src/atk/ApplicationAccessibleWrap.cpp

@@ -28,7 +28,7 @@ using namespace mozilla::a11y;
 typedef GType (* AtkGetTypeType) (void);
 GType g_atk_hyperlink_impl_type = G_TYPE_INVALID;
 static bool sATKChecked = false;
-static PRLibrary *sATKLib = nsnull;
+static PRLibrary *sATKLib = nullptr;
 static const char sATKLibName[] = "libatk-1.0.so.0";
 static const char sATKHyperlinkImplGetTypeSymbol[] =
   "atk_hyperlink_impl_get_type";
@@ -441,7 +441,7 @@ mai_util_get_root(void)
     if (gail_get_root)
       return gail_get_root();
 
-    return nsnull;
+    return nullptr;
   }
 
   return nsAccessNode::GetApplicationAccessible()->GetAtkObject();
@@ -652,7 +652,7 @@ ApplicationAccessibleWrap::Unload()
     }
     // if (sATKLib) {
     //     PR_UnloadLibrary(sATKLib);
-    //     sATKLib = nsnull;
+    //     sATKLib = nullptr;
     // }
 }
 
@@ -670,7 +670,7 @@ ApplicationAccessibleWrap::Name(nsString& aName)
 NS_IMETHODIMP
 ApplicationAccessibleWrap::GetNativeInterface(void** aOutAccessible)
 {
-    *aOutAccessible = nsnull;
+    *aOutAccessible = nullptr;
 
     if (!mAtkObject) {
         mAtkObject =
@@ -841,7 +841,7 @@ namespace a11y {
 
   static const char sAccEnv [] = "GNOME_ACCESSIBILITY";
 #ifdef MOZ_ENABLE_DBUS
-static DBusPendingCall *sPendingCall = nsnull;
+static DBusPendingCall *sPendingCall = nullptr;
 #endif
 
 void
@@ -861,7 +861,7 @@ PreInit()
   if (PR_GetEnv(sAccEnv) || !PR_GetEnv("DBUS_SESSION_BUS_ADDRESS"))
     return;
 
-  DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, nsnull);
+  DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, nullptr);
   if (!bus)
     return;
 
@@ -907,14 +907,14 @@ ShouldA11yBeEnabled()
 #ifdef MOZ_ENABLE_DBUS
   PreInit();
   bool dbusSuccess = false;
-  DBusMessage *reply = nsnull;
+  DBusMessage *reply = nullptr;
   if (!sPendingCall)
     goto dbus_done;
 
   dbus_pending_call_block(sPendingCall);
   reply = dbus_pending_call_steal_reply(sPendingCall);
   dbus_pending_call_unref(sPendingCall);
-  sPendingCall = nsnull;
+  sPendingCall = nullptr;
   if (!reply ||
       dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN ||
       strcmp(dbus_message_get_signature (reply), DBUS_TYPE_VARIANT_AS_STRING))

accessible/src/atk/AtkSocketAccessible.cpp

@@ -68,7 +68,7 @@ mai_atk_socket_new(AccessibleWrap* aAccWrap)
 {
   NS_ENSURE_TRUE(aAccWrap, NULL);
 
-  MaiAtkSocket* acc = nsnull;
+  MaiAtkSocket* acc = nullptr;
   acc = static_cast<MaiAtkSocket*>(g_object_new(MAI_TYPE_ATK_SOCKET, NULL));
   NS_ENSURE_TRUE(acc, NULL);
 
@@ -81,7 +81,7 @@ static AtkObject*
 RefAccessibleAtPoint(AtkComponent* aComponent, gint aX, gint aY,
                      AtkCoordType aCoordType)
 {
-  NS_ENSURE_TRUE(MAI_IS_ATK_SOCKET(aComponent), nsnull);
+  NS_ENSURE_TRUE(MAI_IS_ATK_SOCKET(aComponent), nullptr);
 
   return refAccessibleAtPointHelper(MAI_ATK_SOCKET(aComponent)->accWrap,
                                     aX, aY, aCoordType);
@@ -145,9 +145,9 @@ AtkSocketAccessible::Shutdown()
 {
   if (mAtkObject) {
     if (MAI_IS_ATK_SOCKET(mAtkObject))
-      MAI_ATK_SOCKET(mAtkObject)->accWrap = nsnull;
+      MAI_ATK_SOCKET(mAtkObject)->accWrap = nullptr;
     g_object_unref(mAtkObject);
-    mAtkObject = nsnull;
+    mAtkObject = nullptr;
   }
   AccessibleWrap::Shutdown();
 }

accessible/src/atk/RootAccessibleWrap.cpp

@@ -11,7 +11,7 @@
 using namespace mozilla::a11y;
 
 NativeRootAccessibleWrap::NativeRootAccessibleWrap(AtkObject* aAccessible):
-  RootAccessible(nsnull, nsnull, nsnull)
+  RootAccessible(nullptr, nullptr, nullptr)
 {
   // XXX: mark the object as defunct to ensure no single internal method is
   // running on it.
@@ -24,5 +24,5 @@ NativeRootAccessibleWrap::NativeRootAccessibleWrap(AtkObject* aAccessible):
 NativeRootAccessibleWrap::~NativeRootAccessibleWrap()
 {
   g_object_unref(mAtkObject);
-  mAtkObject = nsnull;
+  mAtkObject = nullptr;
 }