Merge branch 'master' of newgeom:newgeom.git

[modules/shaper.git] / src / Config / Config_ModuleReader.h

diff --git a/src/Config/Config_ModuleReader.h b/src/Config/Config_ModuleReader.h
index 4bd958f5150cdd2b8439a85fcefb3bfbfe20812a..5a19c24c04667d9d738a51b814a9392e467aee65 100644 (file)
--- a/src/Config/Config_ModuleReader.h
+++ b/src/Config/Config_ModuleReader.h
@@ -8,9 +8,12 @@
 #ifndef CONFIG_MODULEREADER_H_
 #define CONFIG_MODULEREADER_H_
 
+#include <Config.h>
 #include <Config_XMLReader.h>
 
-#include <list>
+#include <map>
+#include <string>
+
 
 class CONFIG_EXPORT Config_ModuleReader: public Config_XMLReader
 {
@@ -20,7 +23,7 @@ public:
   virtual ~Config_ModuleReader();
 
   void setAutoImport(bool enabled);
-  const std::list<std::string>& pluginsList() const;
+  const std::map<std::string, std::string>& plugins() const;
 
   std::string getModuleName();
 
@@ -28,11 +31,13 @@ protected:
   void processNode(xmlNodePtr aNode);
   bool processChildren(xmlNodePtr aNode);
 
-  void importPlugin(const std::string& thePluginName);
+  void importPlugin(const std::string& thePluginName,
+                    const std::string& thePluginLibrary = "");
 
 private:
-  bool m_isAutoImport;
-  std::list<std::string> m_pluginsList;
+  bool myIsAutoImport;
+  std::map<std::string, std::string> myPluginsMap;
+
 
 };