Fix C++11 usage

- replace all the auto keyword by the proper type kept the auto line in todo for reference :) - silent a few warnings

samcake committed 12 years ago

Commit c66560c1 parent 7a95e408 files · +33 −25Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.cpp (1 of 8 files). Show all

Unified · Split

 AbstractInputController* ControllerScriptingInterface::createInputController(const QString& deviceName, const QString& tracker) {
     // This is where we retreive the Device Tracker category and then the sub tracker within it
-    auto icIt = _inputControllers.find(0);
+    //TODO C++11 auto icIt = _inputControllers.find(0);
+    InputControllerMap::iterator icIt = _inputControllers.find(0);
     if (icIt != _inputControllers.end()) {
         return (*icIt).second;
     } else {
             MotionTracker* motionTracker = dynamic_cast< MotionTracker* > (DeviceTracker::getDevice(deviceID));
             if (motionTracker) {
                 MotionTracker::Index trackerID = motionTracker->findJointIndex(tracker.toStdString());
-                if (trackerID > 0) {
+                if (trackerID >= 0) {
                     AbstractInputController* inputController = new InputController(deviceID, trackerID, this);
                     _inputControllers.insert(InputControllerMap::value_type(inputController->getKey(), inputController));
 }
 void ControllerScriptingInterface::updateInputControllers() {
-    for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
+    //TODO C++11 for (auto it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
+    for (InputControllerMap::iterator it = _inputControllers.begin(); it != _inputControllers.end(); it++) {
         (*it).second->update();
     }
 }