[gnote] Replace std::string -> Glib::ustring in action manager

[Aurimas Černius <aurimasc src gnome org>]

commit 9920ee262e2cb761daa79b656df1099c05ff53f9
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Jan 14 22:06:54 2017 +0200

    Replace std::string -> Glib::ustring in action manager

 src/actionmanager.cpp  |   14 +++++++-------
 src/actionmanager.hpp  |   22 +++++++++++-----------
 src/iactionmanager.hpp |   14 +++++++-------
 3 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/src/actionmanager.cpp b/src/actionmanager.cpp
index 0b9becf..cb43b3a 100644
--- a/src/actionmanager.cpp
+++ b/src/actionmanager.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011-2016 Aurimas Cernius
+ * Copyright (C) 2011-2017 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -102,7 +102,7 @@ namespace gnote {
     add_app_action("quit");
   }
 
-  Glib::RefPtr<Gio::SimpleAction> ActionManager::get_app_action(const std::string & name) const
+  Glib::RefPtr<Gio::SimpleAction> ActionManager::get_app_action(const Glib::ustring & name) const
   {
     for(std::vector<Glib::RefPtr<Gio::SimpleAction> >::const_iterator iter = m_app_actions.begin();
         iter != m_app_actions.end(); ++iter) {
@@ -114,15 +114,15 @@ namespace gnote {
     return Glib::RefPtr<Gio::SimpleAction>();
   }
 
-  Glib::RefPtr<Gio::SimpleAction> ActionManager::add_app_action(const std::string & name)
+  Glib::RefPtr<Gio::SimpleAction> ActionManager::add_app_action(const Glib::ustring & name)
   {
     Glib::RefPtr<Gio::SimpleAction> action = Gio::SimpleAction::create(name);
     m_app_actions.push_back(action);
     return action;
   }
 
-  void ActionManager::add_app_menu_item(int section, int order, const std::string & label,
-                                        const std::string & action_def)
+  void ActionManager::add_app_menu_item(int section, int order, const Glib::ustring & label,
+                                        const Glib::ustring & action_def)
   {
     m_app_menu_items.insert(std::make_pair(section, AppMenuItem(order, label, action_def)));
   }
@@ -208,7 +208,7 @@ namespace gnote {
     return std::find(m_non_modifying_actions.begin(), m_non_modifying_actions.end(), action) == 
m_non_modifying_actions.end();
   }
 
-  void ActionManager::register_main_window_search_callback(const std::string & id, const Glib::ustring & 
action,
+  void ActionManager::register_main_window_search_callback(const Glib::ustring & id, const Glib::ustring & 
action,
                                                     sigc::slot<void, const Glib::VariantBase&> callback)
   {
     DBG_ASSERT(m_main_window_search_actions.find(id) == m_main_window_search_actions.end(), "Duplicate 
callback for main window search");
@@ -217,7 +217,7 @@ namespace gnote {
     signal_main_window_search_actions_changed();
   }
 
-  void ActionManager::unregister_main_window_search_callback(const std::string & id)
+  void ActionManager::unregister_main_window_search_callback(const Glib::ustring & id)
   {
     m_main_window_search_actions.erase(id);
     signal_main_window_search_actions_changed();
diff --git a/src/actionmanager.hpp b/src/actionmanager.hpp
index b101972..69f918d 100644
--- a/src/actionmanager.hpp
+++ b/src/actionmanager.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2012-2013,2015-2016 Aurimas Cernius
+ * Copyright (C) 2012-2013,2015-2017 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -41,23 +41,23 @@ class ActionManager
 public:
   ActionManager();
 
-  virtual Glib::RefPtr<Gio::SimpleAction> get_app_action(const std::string & name) const override;
+  virtual Glib::RefPtr<Gio::SimpleAction> get_app_action(const Glib::ustring & name) const override;
   const std::vector<Glib::RefPtr<Gio::SimpleAction> > & get_app_actions() const
     {
       return m_app_actions;
     }
-  virtual Glib::RefPtr<Gio::SimpleAction> add_app_action(const std::string & name) override;
-  virtual void add_app_menu_item(int section, int order, const std::string & label,
-                                 const std::string & action_def) override;
+  virtual Glib::RefPtr<Gio::SimpleAction> add_app_action(const Glib::ustring & name) override;
+  virtual void add_app_menu_item(int section, int order, const Glib::ustring & label,
+                                 const Glib::ustring & action_def) override;
   Glib::RefPtr<Gio::Menu> get_app_menu() const;
   virtual void register_main_window_action(const Glib::ustring & action, const Glib::VariantType *state_type,
     bool modifying = true) override;
   virtual std::map<Glib::ustring, const Glib::VariantType*> get_main_window_actions() const override;
   virtual bool is_modifying_main_window_action(const Glib::ustring & action) const override;
 
-  virtual void register_main_window_search_callback(const std::string & id, const Glib::ustring & action,
+  virtual void register_main_window_search_callback(const Glib::ustring & id, const Glib::ustring & action,
                                                     sigc::slot<void, const Glib::VariantBase&> callback) 
override;
-  virtual void unregister_main_window_search_callback(const std::string & id) override;
+  virtual void unregister_main_window_search_callback(const Glib::ustring & id) override;
   virtual std::map<Glib::ustring, sigc::slot<void, const Glib::VariantBase&>> 
get_main_window_search_callbacks() override;
 private:
   void make_app_actions();
@@ -69,10 +69,10 @@ private:
   struct AppMenuItem
   {
     int order;
-    std::string label;
-    std::string action_def;
+    Glib::ustring label;
+    Glib::ustring action_def;
 
-    AppMenuItem(int ord, const std::string & lbl, const std::string & act_def)
+    AppMenuItem(int ord, const Glib::ustring & lbl, const Glib::ustring & act_def)
       : order(ord)
       , label(lbl)
       , action_def(act_def)
@@ -90,7 +90,7 @@ private:
   AppMenuItemMultiMap m_app_menu_items;
   std::map<Glib::ustring, const Glib::VariantType*> m_main_window_actions;
   std::vector<Glib::ustring> m_non_modifying_actions;
-  std::map<std::string, std::pair<Glib::ustring, sigc::slot<void, const Glib::VariantBase&>>> 
m_main_window_search_actions;
+  std::map<Glib::ustring, std::pair<Glib::ustring, sigc::slot<void, const Glib::VariantBase&>>> 
m_main_window_search_actions;
 };
 
 
diff --git a/src/iactionmanager.hpp b/src/iactionmanager.hpp
index 0bbb141..608a2f7 100644
--- a/src/iactionmanager.hpp
+++ b/src/iactionmanager.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2013,2015-2016 Aurimas Cernius
+ * Copyright (C) 2013,2015-2017 Aurimas Cernius
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -52,18 +52,18 @@ public:
 
   virtual ~IActionManager();
 
-  virtual Glib::RefPtr<Gio::SimpleAction> get_app_action(const std::string & name) const = 0;
-  virtual Glib::RefPtr<Gio::SimpleAction> add_app_action(const std::string & name) = 0;
-  virtual void add_app_menu_item(int section, int order, const std::string & label,
-                                 const std::string & action_def) = 0;
+  virtual Glib::RefPtr<Gio::SimpleAction> get_app_action(const Glib::ustring & name) const = 0;
+  virtual Glib::RefPtr<Gio::SimpleAction> add_app_action(const Glib::ustring & name) = 0;
+  virtual void add_app_menu_item(int section, int order, const Glib::ustring & label,
+                                 const Glib::ustring & action_def) = 0;
   virtual void register_main_window_action(const Glib::ustring & action, const Glib::VariantType *state_type,
     bool modifying = true) = 0;
   virtual std::map<Glib::ustring, const Glib::VariantType*> get_main_window_actions() const = 0;
   virtual bool is_modifying_main_window_action(const Glib::ustring & action) const = 0;
 
-  virtual void register_main_window_search_callback(const std::string & id, const Glib::ustring & action,
+  virtual void register_main_window_search_callback(const Glib::ustring & id, const Glib::ustring & action,
                                                     sigc::slot<void, const Glib::VariantBase&> callback) = 0;
-  virtual void unregister_main_window_search_callback(const std::string & id) = 0;
+  virtual void unregister_main_window_search_callback(const Glib::ustring & id) = 0;
   virtual std::map<Glib::ustring, sigc::slot<void, const Glib::VariantBase&>> 
get_main_window_search_callbacks() = 0;
   sigc::signal<void> signal_main_window_search_actions_changed;
   sigc::signal<void, std::map<int, Gtk::Widget*>&> signal_build_main_window_search_popover;