Changeset 10919 for code/branches/cpp11_v2/src/libraries/core/command

Timestamp:

Dec 5, 2015, 10:47:51 PM (9 years ago)

Author:

landauf

Message:

use range-based for-loop where it makes sense (e.g. ObjectList)

Location:

code/branches/cpp11_v2/src/libraries/core/command

Files:

• ArgumentCompletionFunctions.cc (modified) (1 diff)
• CommandEvaluation.cc (modified) (1 diff)
• TclThreadManager.cc (modified) (1 diff)

code/branches/cpp11_v2/src/libraries/core/command/ArgumentCompletionFunctions.cc

@@ -334 +334 @@
             ArgumentCompletionList threads;
 
-            for (std::list<unsigned int>::const_iterator it = threadnumbers.begin(); it != threadnumbers.end(); ++it)
-                threads.emplace_back(multi_cast<std::string>(*it));
+            for (unsigned int threadnumber : threadnumbers)
+                threads.emplace_back(multi_cast<std::string>(threadnumber));
 
             return threads;

code/branches/cpp11_v2/src/libraries/core/command/CommandEvaluation.cc

@@ -328 +328 @@
 
         // iterate through all groups and their commands and calculate the distance to the current command. keep the best.
-        for (const auto& mapEntry : ConsoleCommandManager::getInstance().getCommandsLC())
-        {
-            if (mapEntry.first != "")
-            {
-                for (std::map<std::string, ConsoleCommand*>::const_iterator it_name = mapEntry.second.begin(); it_name != mapEntry.second.end(); ++it_name)
-                {
-                    std::string command = mapEntry.first + " " + it_name->first;
+        for (const auto& mapEntryGroup : ConsoleCommandManager::getInstance().getCommandsLC())
+        {
+            if (mapEntryGroup.first != "")
+            {
+                for (const auto& mapEntryName : mapEntryGroup.second)
+                {
+                    std::string command = mapEntryGroup.first + " " + mapEntryName.first;
                     unsigned int distance = getLevenshteinDistance(command, token0_LC + " " + token1_LC);
                     if (distance < nearestDistance)

code/branches/cpp11_v2/src/libraries/core/command/TclThreadManager.cc

@@ -145 +145 @@
             {
                 boost::shared_lock<boost::shared_mutex> lock(*this->interpreterBundlesMutex_);
-                for (std::map<unsigned int, TclInterpreterBundle*>::const_iterator it = this->interpreterBundles_.begin(); it != this->interpreterBundles_.end(); ++it)
+                for (const auto& mapEntry : this->interpreterBundles_)
                 {
-                    if (it->first == 0)
+                    if (mapEntry.first == 0)
                         continue; // We'll handle the default interpreter later (and without threads of course)
 
-                    TclInterpreterBundle* bundle = it->second;
+                    TclInterpreterBundle* bundle = mapEntry.second;
                     if (!bundle->queue_.empty())
                     {