resolve conflicts

Author: jessdtate

src/Core/Application/Application.cc

@@ -297,6 +297,23 @@ std::string Application::moduleList()
   return ostr.str();
 }
 
+bool Application::moduleNameExists(const std::string& name)
+{
+  auto map = controller()->getAllAvailableModuleDescriptions();
+  for (const auto& p1 : map)
+  {
+    for (const auto& p2 : p1.second)
+    {
+      for (const auto& p3 : p2.second)
+      {
+        if (boost::iequals(name, p3.first))
+          return true;
+      }
+    }
+  }
+  return false;
+}
+
 boost::filesystem::path Application::configDirectory() const
 {
   return applicationHelper.configDirectory();

src/Core/Application/Application.h

@@ -83,6 +83,7 @@ class SCISHARE Application : boost::noncopyable //: public EventHandler, public
   std::string applicationName() const;
   std::string version() const;
   std::string moduleList();
+  bool moduleNameExists(const std::string& name);
 
   void shutdown();