Changeset 11062 for code/branches/cpp11_v3/src/libraries/core

Timestamp:

Jan 13, 2016, 11:13:30 PM (8 years ago)

Author:

landauf

Message:

added c++11 features to code that was modified in presentationHS15

Location:

code/branches/cpp11_v3/src/libraries/core

Files:

• GUIManager.cc (modified) (1 diff)
• module/Plugin.cc (modified) (2 diffs)

code/branches/cpp11_v3/src/libraries/core/GUIManager.cc

@@ -267 +267 @@
             ArgumentCompletionList names;
             const std::vector<std::string> guis = GUIManager::getInstance().getLoadedGUIs();
-            for (size_t i = 0; i < guis.size(); ++i)
-                names.push_back(ArgumentCompletionListElement(guis[i], getLowercase(guis[i])));
+            for (const std::string gui : guis)
+                names.push_back(ArgumentCompletionListElement(gui, getLowercase(gui)));
             return names;
         }

code/branches/cpp11_v3/src/libraries/core/module/Plugin.cc

@@ -79 +79 @@
     {
         // only load module if it isn't already loaded. otherwise merely activate it.
-        if (this->moduleInstance_ == NULL)
+        if (this->moduleInstance_ == nullptr)
             this->loadModule();
         else
@@ -112 +112 @@
         Core::getInstance().unloadModule(this->moduleInstance_);
         delete this->moduleInstance_;
-        this->moduleInstance_ = NULL;
+        this->moduleInstance_ = nullptr;
     }
     void Plugin::deactivateModule()