Changeset 10765 for code/branches/cpp11_v2/src/orxonox/gamestates

Timestamp:

Nov 4, 2015, 10:25:42 PM (9 years ago)

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

Location:

code/branches/cpp11_v2/src/orxonox/gamestates

Files:

• GSLevel.cc (modified) (1 diff)
• GSLevelMemento.h (modified) (1 diff)
• GSMainMenu.cc (modified) (1 diff)

code/branches/cpp11_v2/src/orxonox/gamestates/GSLevel.cc

@@ -156 +156 @@
         {
             ModifyConsoleCommand(__CC_changeGame_name).deactivate();
-            ModifyConsoleCommand(__CC_reloadLevel_name).setObject(NULL).deactivate();
+            ModifyConsoleCommand(__CC_reloadLevel_name).setObject(nullptr).deactivate();
         }
     }

code/branches/cpp11_v2/src/orxonox/gamestates/GSLevelMemento.h

@@ -48 +48 @@
         protected:
             /**
-             * Returns the state of this memento. Returns NULL if no state needed to persist.
+             * Returns the state of this memento. Returns nullptr if no state needed to persist.
              */
             virtual GSLevelMementoState* exportMementoState() = 0;

code/branches/cpp11_v2/src/orxonox/gamestates/GSMainMenu.cc

@@ -73 +73 @@
 
         // create an empty Scene
-        this->scene_ = new Scene(NULL);
+        this->scene_ = new Scene(nullptr);
         this->scene_->setSyncMode( 0x0 );
         // and a Camera