[gnote] Replace std::string by Glib::ustring in ModuleManager

[Aurimas Černius <aurimasc src gnome org>]

commit 65722cad453b094ddd0ed4f920e1450513b36937
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Fri Jan 27 22:13:42 2017 +0200

    Replace std::string by Glib::ustring in ModuleManager

 src/addinmanager.cpp        |    4 ++--
 src/addinmanager.hpp        |    4 ++--
 src/sharp/modulemanager.cpp |   13 ++++++-------
 src/sharp/modulemanager.hpp |   13 +++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/addinmanager.cpp b/src/addinmanager.cpp
index 8514aab..124e729 100644
--- a/src/addinmanager.cpp
+++ b/src/addinmanager.cpp
@@ -228,7 +228,7 @@ namespace {
     }
   }
 
-  void AddinManager::get_enabled_addins(std::list<std::string> & addins) const
+  void AddinManager::get_enabled_addins(std::list<Glib::ustring> & addins) const
   {
     bool global_addins_prefs_loaded = true;
     Glib::KeyFile global_addins_prefs;
@@ -282,7 +282,7 @@ namespace {
     std::string local_path = m_gnote_conf_dir + "/addins";
 
     load_addin_infos(global_path, local_path);
-    std::list<std::string> enabled_addins;
+    std::list<Glib::ustring> enabled_addins;
     get_enabled_addins(enabled_addins);
     m_module_manager.load_modules(enabled_addins);
 
diff --git a/src/addinmanager.hpp b/src/addinmanager.hpp
index f419bf4..a167a63 100644
--- a/src/addinmanager.hpp
+++ b/src/addinmanager.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2010,2012-2015 Aurimas Cernius
+ * Copyright (C) 2010,2012-2015,2017 Aurimas Cernius
  * Copyright (C) 2009 Debarshi Ray
  * Copyright (C) 2009 Hubert Figuiere
  *
@@ -90,7 +90,7 @@ private:
   void load_addin_infos(const std::string & global_path, const std::string & local_path);
   void load_addin_infos(const std::string & path);
   void load_note_addin(const std::string & id, sharp::IfaceFactoryBase *const f);
-  void get_enabled_addins(std::list<std::string> & addins) const;
+  void get_enabled_addins(std::list<Glib::ustring> & addins) const;
   void initialize_sharp_addins();
   void add_module_addins(const std::string & mod_id, sharp::DynamicModule * dmod);
   AddinInfo get_info_for_module(const std::string & module) const;
diff --git a/src/sharp/modulemanager.cpp b/src/sharp/modulemanager.cpp
index 8acd9a0..b3ed4c5 100644
--- a/src/sharp/modulemanager.cpp
+++ b/src/sharp/modulemanager.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2013 Aurimas Cernius
+ * Copyright (C) 2013,2017 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -49,7 +49,7 @@ namespace sharp {
     }
   }
 
-  DynamicModule *ModuleManager::load_module(const std::string & mod)
+  DynamicModule *ModuleManager::load_module(const Glib::ustring & mod)
   {
     DynamicModule *dmod = get_module(mod);
     if(dmod) {
@@ -81,15 +81,14 @@ namespace sharp {
     return dmod;
   }
 
-  void ModuleManager::load_modules(const std::list<std::string> & modules)
+  void ModuleManager::load_modules(const std::list<Glib::ustring> & modules)
   {
-    for(std::list<std::string>::const_iterator mod_iter = modules.begin();
-        mod_iter != modules.end(); ++mod_iter) {
-      load_module(*mod_iter);
+    for(auto module : modules) {
+      load_module(module);
     }
   }
 
-  DynamicModule * ModuleManager::get_module(const std::string & module) const
+  DynamicModule * ModuleManager::get_module(const Glib::ustring & module) const
   {
     ModuleMap::const_iterator iter = m_modules.find(module);
     if(iter != m_modules.end()) {
diff --git a/src/sharp/modulemanager.hpp b/src/sharp/modulemanager.hpp
index ade87f0..1ecdfa0 100644
--- a/src/sharp/modulemanager.hpp
+++ b/src/sharp/modulemanager.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2013 Aurimas Cernius
+ * Copyright (C) 2013,2017 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a
@@ -29,25 +29,26 @@
 #define __SHARP_MODULEMANAGER_HPP_
 
 #include <map>
-#include <string>
+
+#include <glibmm/ustring.h>
 
 namespace sharp {
 
 class DynamicModule;
 
-typedef std::map<std::string, DynamicModule*> ModuleMap;
+typedef std::map<Glib::ustring, DynamicModule*> ModuleMap;
 
 class ModuleManager 
 {
 public:
   ~ModuleManager();
 
-  DynamicModule *load_module(const std::string & module);
-  void load_modules(const std::list<std::string> & modules);
+  DynamicModule *load_module(const Glib::ustring & module);
+  void load_modules(const std::list<Glib::ustring> & modules);
   
   const ModuleMap & get_modules() const
     { return m_modules; }
-  DynamicModule *get_module(const std::string & module) const;
+  DynamicModule *get_module(const Glib::ustring & module) const;
 private:
   ModuleMap m_modules;
 };