Changeset 10768 for code/branches/cpp11_v2/src/libraries/core/BaseObject.cc

Timestamp:

Nov 6, 2015, 10:54:34 PM (8 years ago)

Author:

landauf

Message:

replace '0' by 'nullptr'

File:

• code/branches/cpp11_v2/src/libraries/core/BaseObject.cc (modified) (8 diffs)

code/branches/cpp11_v2/src/libraries/core/BaseObject.cc

@@ -65 +65 @@
         this->bRegisteredEventStates_ = false;
 
-        this->lastLoadedXMLElement_ = 0;
-
-        this->mainStateFunctor_ = 0;
+        this->lastLoadedXMLElement_ = nullptr;
+
+        this->mainStateFunctor_ = nullptr;
 
         if (context)
@@ -86 +86 @@
         else
         {
-            this->file_ = 0;
+            this->file_ = nullptr;
             this->sceneID_ = OBJECTID_UNKNOWN;
         }
@@ -132 +132 @@
         XMLPortObject(BaseObject, BaseObject, "eventlisteners", addEventListener, getEventListener, xmlelement, mode);
 
-        Element* events = 0;
+        Element* events = nullptr;
         if (mode == XMLPort::LoadObject || mode == XMLPort::ExpandObject)
             events = xmlelement.FirstChildElement("events", false);
@@ -240 +240 @@
             i++;
         }
-        return 0;
+        return nullptr;
     }
 
@@ -278 +278 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 
@@ -302 +302 @@
             ++i;
         }
-        return 0;
+        return nullptr;
     }
 
@@ -331 +331 @@
             return (it->second);
         else
-            return 0;
+            return nullptr;
     }
 
@@ -423 +423 @@
     void BaseObject::changedMainStateName()
     {
-        this->mainStateFunctor_ = 0;
+        this->mainStateFunctor_ = nullptr;
 
         if (!this->mainStateName_.empty())