Changeset 10765 for code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc

Timestamp:

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

Author:

landauf

Message:

replace 'NULL' by 'nullptr'

File:

• code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc (modified) (11 diffs)

code/branches/cpp11_v2/src/libraries/core/input/InputManager.cc

@@ -210 +210 @@
         catch (const std::exception& ex)
         {
-            oisInputManager_ = NULL;
+            oisInputManager_ = nullptr;
             internalState_ |= Bad;
             ThrowException(InitialisationFailed, "Could not initialise the input system: " << ex.what());
@@ -312 +312 @@
         BOOST_FOREACH(InputDevice*& device, devices_)
         {
-            if (device == NULL)
+            if (device == nullptr)
                 continue;
             const std::string& className = device->getClassName();
@@ -321 +321 @@
         devices_.resize(InputDeviceEnumerator::FirstJoyStick);
 
-        assert(oisInputManager_ != NULL);
+        assert(oisInputManager_ != nullptr);
         try
         {
@@ -331 +331 @@
                                                    << "Potential resource leak!" << endl;
         }
-        oisInputManager_ = NULL;
+        oisInputManager_ = nullptr;
 
         internalState_ |= Bad;
@@ -388 +388 @@
         // No event gets triggered here yet!
         BOOST_FOREACH(InputDevice* device, devices_)
-            if (device != NULL)
+            if (device != nullptr)
                 device->update(time);
 
@@ -419 +419 @@
         for (unsigned int i = 0; i < devices_.size(); ++i)
         {
-            if (devices_[i] == NULL)
+            if (devices_[i] == nullptr)
                 continue;
             std::vector<InputState*>& states = devices_[i]->getStateListRef();
@@ -439 +439 @@
         std::set<InputState*> tempSet;
         for (unsigned int i = 0; i < devices_.size(); ++i)
-            if (devices_[i] != NULL)
+            if (devices_[i] != nullptr)
                 for (unsigned int iState = 0; iState < devices_[i]->getStateListRef().size(); ++iState)
                     tempSet.insert(devices_[i]->getStateListRef()[iState]);
@@ -467 +467 @@
     {
         BOOST_FOREACH(InputDevice* device, devices_)
-            if (device != NULL)
+            if (device != nullptr)
                 device->clearBuffers();
     }
@@ -477 +477 @@
 
         BOOST_FOREACH(InputDevice* device, devices_)
-            if (device != NULL)
+            if (device != nullptr)
                 device->startCalibration();
 
@@ -488 +488 @@
     {
         BOOST_FOREACH(InputDevice* device, devices_)
-            if (device != NULL)
+            if (device != nullptr)
                 device->stopCalibration();
 
@@ -509 +509 @@
     {
         Mouse* mouse = static_cast<Mouse*>(devices_[InputDeviceEnumerator::Mouse]);
-        if (mouse != NULL)
+        if (mouse != nullptr)
         {
             const OIS::MouseState state = mouse->getOISDevice()->getMouseState();