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

[Aurimas Černius <aurimasc src gnome org>]

commit 313ec35740842f0b84e376afccf31ad1c0f56ab2
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Mon Jan 30 22:42:08 2017 +0200

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

 src/addinmanager.cpp |   50 +++++++++++++++++++++++-----------------------
 src/addinmanager.hpp |   53 ++++++++++++++++++++++++-------------------------
 2 files changed, 51 insertions(+), 52 deletions(-)
---
diff --git a/src/addinmanager.cpp b/src/addinmanager.cpp
index 124e729..6c4ad55 100644
--- a/src/addinmanager.cpp
+++ b/src/addinmanager.cpp
@@ -74,13 +74,13 @@ namespace gnote {
 
 namespace {
   template <typename AddinType>
-  std::string get_id_for_addin(const AbstractAddin & addin, const std::map<std::string, AddinType*> & addins)
+  Glib::ustring get_id_for_addin(const AbstractAddin & addin, const std::map<Glib::ustring, AddinType*> & 
addins)
   {
     const AddinType *plugin = dynamic_cast<const AddinType*>(&addin);
     if(plugin != NULL) {
-      for(typename std::map<std::string, AddinType*>::const_iterator iter = addins.begin(); iter != 
addins.end(); ++iter) {
-        if(iter->second == plugin) {
-          return iter->first;
+      for(auto iter : addins) {
+        if(iter.second == plugin) {
+          return iter.first;
         }
       }
     }
@@ -89,7 +89,7 @@ namespace {
 }
 
 
-  AddinManager::AddinManager(NoteManager & note_manager, const std::string & conf_dir)
+  AddinManager::AddinManager(NoteManager & note_manager, const Glib::ustring & conf_dir)
     : m_note_manager(note_manager)
     , m_gnote_conf_dir(conf_dir)
   {
@@ -121,7 +121,7 @@ namespace {
     }
   }
 
-  void AddinManager::add_note_addin_info(const std::string & id,
+  void AddinManager::add_note_addin_info(const Glib::ustring & id,
                                          const sharp::DynamicModule * dmod)
   {
     {
@@ -143,7 +143,7 @@ namespace {
     load_note_addin(id, f);
   }
 
-  void AddinManager::load_note_addin(const std::string & id, sharp::IfaceFactoryBase *const f)
+  void AddinManager::load_note_addin(const Glib::ustring & id, sharp::IfaceFactoryBase *const f)
   {
     m_note_addin_infos.insert(std::make_pair(id, f));
     for(NoteAddinMap::iterator iter = m_note_addins.begin();
@@ -164,7 +164,7 @@ namespace {
     }
   }
 
-  void AddinManager::erase_note_addin_info(const std::string & id)
+  void AddinManager::erase_note_addin_info(const Glib::ustring & id)
   {
     {
       const IdInfoMap::iterator iter = m_note_addin_infos.find(id);
@@ -196,14 +196,14 @@ namespace {
     }
   }
 
-  void AddinManager::load_addin_infos(const std::string & global_path,
-                                      const std::string & local_path)
+  void AddinManager::load_addin_infos(const Glib::ustring & global_path,
+                                      const Glib::ustring & local_path)
   {
     load_addin_infos(global_path);
     load_addin_infos(local_path);
   }
 
-  void AddinManager::load_addin_infos(const std::string & path)
+  void AddinManager::load_addin_infos(const Glib::ustring & path)
   {
     std::list<Glib::ustring> files;
     sharp::directory_get_files_with_ext(path, ".desktop", files);
@@ -213,7 +213,7 @@ namespace {
         if(!addin_info.validate(LIBGNOTE_RELEASE, LIBGNOTE_VERSION_INFO)) {
           continue;
         }
-        std::string module = Glib::build_filename(path, addin_info.addin_module());
+        Glib::ustring module = Glib::build_filename(path, addin_info.addin_module());
         if(sharp::file_exists(module + "." + G_MODULE_SUFFIX)) {
           addin_info.addin_module(module);
           m_addin_infos[addin_info.id()] = addin_info;
@@ -278,8 +278,8 @@ namespace {
    
     REGISTER_APP_ADDIN(notebooks::NotebookApplicationAddin);
 
-    std::string global_path = LIBDIR "/" PACKAGE_NAME "/addins/" PACKAGE_VERSION;
-    std::string local_path = m_gnote_conf_dir + "/addins";
+    Glib::ustring global_path = LIBDIR "/" PACKAGE_NAME "/addins/" PACKAGE_VERSION;
+    Glib::ustring local_path = m_gnote_conf_dir + "/addins";
 
     load_addin_infos(global_path, local_path);
     std::list<Glib::ustring> enabled_addins;
@@ -290,7 +290,7 @@ namespace {
     for(sharp::ModuleMap::const_iterator iter = modules.begin();
         iter != modules.end(); ++iter) {
 
-      std::string mod_id = get_info_for_module(iter->first).id();
+      Glib::ustring mod_id = get_info_for_module(iter->first).id();
       sharp::DynamicModule* dmod = iter->second;
       if(!dmod) {
         continue;
@@ -301,7 +301,7 @@ namespace {
     }
   }
 
-  void AddinManager::add_module_addins(const std::string & mod_id, sharp::DynamicModule * dmod)
+  void AddinManager::add_module_addins(const Glib::ustring & mod_id, sharp::DynamicModule * dmod)
   {
     sharp::IfaceFactoryBase * f = dmod->query_interface(NoteAddin::IFACE_NAME);
     if(f && dmod->is_enabled()) {
@@ -333,7 +333,7 @@ namespace {
     }
   }
 
-  AddinInfo AddinManager::get_info_for_module(const std::string & module) const
+  AddinInfo AddinManager::get_info_for_module(const Glib::ustring & module) const
   {
     for(AddinInfoMap::const_iterator iter = m_addin_infos.begin();
         iter != m_addin_infos.end(); ++iter) {
@@ -385,7 +385,7 @@ namespace {
   }
 
   ApplicationAddin * AddinManager::get_application_addin(
-                                     const std::string & id) const
+                                     const Glib::ustring & id) const
   {
     const IdImportAddinMap::const_iterator import_iter
       = m_import_addins.find(id);
@@ -402,7 +402,7 @@ namespace {
     return 0;
   }
 
-  sync::SyncServiceAddin *AddinManager::get_sync_service_addin(const std::string & id) const
+  sync::SyncServiceAddin *AddinManager::get_sync_service_addin(const Glib::ustring & id) const
   {
     const IdSyncServiceAddinMap::const_iterator iter = m_sync_service_addins.find(id);
     if(iter != m_sync_service_addins.end()) {
@@ -495,7 +495,7 @@ namespace {
     const sharp::ModuleMap & modules = m_module_manager.get_modules();
     for(AddinInfoMap::const_iterator iter = m_addin_infos.begin();
         iter != m_addin_infos.end(); ++iter) {
-      const std::string & mod_id = iter->first;
+      const Glib::ustring & mod_id = iter->first;
       sharp::ModuleMap::const_iterator mod_iter = modules.find(iter->second.addin_module());
       bool enabled = mod_iter != modules.end() && mod_iter->second->is_enabled();
       global_addins_prefs.set_boolean("Enabled", mod_id, enabled);
@@ -509,7 +509,7 @@ namespace {
     prefs_file_stream->write(global_addins_prefs.to_data());
   }
 
-  AddinInfo AddinManager::get_addin_info(const std::string & id) const
+  AddinInfo AddinManager::get_addin_info(const Glib::ustring & id) const
   {
     AddinInfoMap::const_iterator iter = m_addin_infos.find(id);
     if(iter != m_addin_infos.end()) {
@@ -520,7 +520,7 @@ namespace {
 
   AddinInfo AddinManager::get_addin_info(const AbstractAddin & addin) const
   {
-    std::string id;
+    Glib::ustring id;
     id = get_id_for_addin(addin, m_app_addins);
     if(id.empty()) {
       id = get_id_for_addin(addin, m_pref_tab_addins);
@@ -541,13 +541,13 @@ namespace {
     return get_addin_info(id);
   }
 
-  bool AddinManager::is_module_loaded(const std::string & id) const
+  bool AddinManager::is_module_loaded(const Glib::ustring & id) const
   {
     AddinInfo info = get_addin_info(id);
     return m_module_manager.get_module(info.addin_module());
   }
 
-  sharp::DynamicModule *AddinManager::get_module(const std::string & id)
+  sharp::DynamicModule *AddinManager::get_module(const Glib::ustring & id)
   {
     AddinInfo info = get_addin_info(id);
     sharp::DynamicModule *module = m_module_manager.get_module(info.addin_module());
@@ -560,7 +560,7 @@ namespace {
     return module;
   }
 
-  Gtk::Widget * AddinManager::create_addin_preference_widget(const std::string & id)
+  Gtk::Widget * AddinManager::create_addin_preference_widget(const Glib::ustring & id)
   {
     IdAddinPrefsMap::const_iterator iter = m_addin_prefs.find(id);
     if(iter != m_addin_prefs.end()) {
diff --git a/src/addinmanager.hpp b/src/addinmanager.hpp
index a167a63..830fc4a 100644
--- a/src/addinmanager.hpp
+++ b/src/addinmanager.hpp
@@ -25,7 +25,6 @@
 
 #include <list>
 #include <map>
-#include <string>
 
 #include <sigc++/signal.h>
 
@@ -46,28 +45,28 @@ namespace sync {
 class SyncServiceAddin;
 }
 
-typedef std::map<std::string, AddinInfo> AddinInfoMap;
+typedef std::map<Glib::ustring, AddinInfo> AddinInfoMap;
 
 
 class AddinManager
 {
 public:
 
-  AddinManager(NoteManager & note_manager, const std::string & conf_dir);
+  AddinManager(NoteManager & note_manager, const Glib::ustring & conf_dir);
   ~AddinManager();
 
-  void add_note_addin_info(const std::string & id, const sharp::DynamicModule * dmod);
-  void erase_note_addin_info(const std::string & id);
+  void add_note_addin_info(const Glib::ustring & id, const sharp::DynamicModule * dmod);
+  void erase_note_addin_info(const Glib::ustring & id);
 
-  std::string & get_prefs_dir()
+  Glib::ustring & get_prefs_dir()
     {
       return m_addins_prefs_dir;
     }
 
   void load_addins_for_note(const Note::Ptr &);
   std::vector<NoteAddin*> get_note_addins(const Note::Ptr &) const;
-  ApplicationAddin *get_application_addin(const std::string & id) const;
-  sync::SyncServiceAddin *get_sync_service_addin(const std::string & id) const;
+  ApplicationAddin *get_application_addin(const Glib::ustring & id) const;
+  sync::SyncServiceAddin *get_sync_service_addin(const Glib::ustring & id) const;
   void get_preference_tab_addins(std::list<PreferenceTabAddin *> &) const;
   void get_sync_service_addins(std::list<sync::SyncServiceAddin *> &) const;
   void get_import_addins(std::list<ImportAddin*> &) const;
@@ -80,48 +79,48 @@ public:
     {
       return m_addin_infos;
     }
-  AddinInfo get_addin_info(const std::string & id) const;
+  AddinInfo get_addin_info(const Glib::ustring & id) const;
   AddinInfo get_addin_info(const AbstractAddin & addin) const;
-  bool is_module_loaded(const std::string & id) const;
-  sharp::DynamicModule *get_module(const std::string & id);
+  bool is_module_loaded(const Glib::ustring & id) const;
+  sharp::DynamicModule *get_module(const Glib::ustring & id);
 
-  Gtk::Widget * create_addin_preference_widget(const std::string & id);
+  Gtk::Widget *create_addin_preference_widget(const Glib::ustring & id);
 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 load_addin_infos(const Glib::ustring & global_path, const Glib::ustring & local_path);
+  void load_addin_infos(const Glib::ustring & path);
+  void load_note_addin(const Glib::ustring & id, sharp::IfaceFactoryBase *const f);
   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;
+  void add_module_addins(const Glib::ustring & mod_id, sharp::DynamicModule * dmod);
+  AddinInfo get_info_for_module(const Glib::ustring & module) const;
   void on_setting_changed(const Glib::ustring & key);
   void register_addin_actions() const;
     
   NoteManager & m_note_manager;
-  const std::string m_gnote_conf_dir;
-  std::string m_addins_prefs_dir;
-  std::string m_addins_prefs_file;
+  const Glib::ustring m_gnote_conf_dir;
+  Glib::ustring m_addins_prefs_dir;
+  Glib::ustring m_addins_prefs_file;
   sharp::ModuleManager m_module_manager;
   std::list<sharp::IfaceFactoryBase*> m_builtin_ifaces;
   AddinInfoMap m_addin_infos;
   /// Key = TypeExtensionNode.Id
-  typedef std::map<std::string, ApplicationAddin*> AppAddinMap;
+  typedef std::map<Glib::ustring, ApplicationAddin*> AppAddinMap;
   AppAddinMap                               m_app_addins;
-  typedef std::map<std::string, NoteAddin *> IdAddinMap;
+  typedef std::map<Glib::ustring, NoteAddin *> IdAddinMap;
   typedef std::map<Note::Ptr, IdAddinMap> NoteAddinMap;
   NoteAddinMap                              m_note_addins;
   /// Key = TypeExtensionNode.Id
   /// the iface factory is not owned by the manager.
   /// TODO: make sure it is removed if the dynamic module is unloaded.
-  typedef std::map<std::string, sharp::IfaceFactoryBase*> IdInfoMap;
+  typedef std::map<Glib::ustring, sharp::IfaceFactoryBase*> IdInfoMap;
   IdInfoMap                                m_note_addin_infos;
-  typedef std::map<std::string, PreferenceTabAddin*> IdPrefTabAddinMap;
+  typedef std::map<Glib::ustring, PreferenceTabAddin*> IdPrefTabAddinMap;
   IdPrefTabAddinMap                        m_pref_tab_addins;
-  typedef std::map<std::string, sync::SyncServiceAddin*> IdSyncServiceAddinMap;
+  typedef std::map<Glib::ustring, sync::SyncServiceAddin*> IdSyncServiceAddinMap;
   IdSyncServiceAddinMap                    m_sync_service_addins;
-  typedef std::map<std::string, ImportAddin *> IdImportAddinMap;
+  typedef std::map<Glib::ustring, ImportAddin *> IdImportAddinMap;
   IdImportAddinMap                         m_import_addins;
-  typedef std::map<std::string, AddinPreferenceFactoryBase*> IdAddinPrefsMap;
+  typedef std::map<Glib::ustring, AddinPreferenceFactoryBase*> IdAddinPrefsMap;
   IdAddinPrefsMap                          m_addin_prefs;
   sigc::signal<void>         m_application_addin_list_changed;
 };