[gnote] Replace most std::string by Glib::ustring in TagManager

[Aurimas Černius <aurimasc src gnome org>]

commit f97b029ef6bd8c19d61d5104759a8afe424f84de
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Feb 4 14:18:46 2017 +0200

    Replace most std::string by Glib::ustring in TagManager

 src/tagmanager.cpp |   18 +++++++-----------
 src/tagmanager.hpp |    4 ++--
 2 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/src/tagmanager.cpp b/src/tagmanager.cpp
index a41b9ea..90550fe 100644
--- a/src/tagmanager.cpp
+++ b/src/tagmanager.cpp
@@ -20,9 +20,7 @@
  */
 
 
-#include <string.h>
-
-#include <glibmm.h>
+#include <glibmm/stringutils.h>
 
 #include "tagmanager.hpp"
 #include "debug.hpp"
@@ -69,7 +67,7 @@ namespace gnote {
     if (tag_name.empty())
       throw sharp::Exception("TagManager.GetTag () called with a null tag name.");
 
-    std::string normalized_tag_name = Glib::ustring(sharp::string_trim(tag_name)).lowercase();
+    Glib::ustring normalized_tag_name = sharp::string_trim(tag_name).lowercase();
     if (normalized_tag_name.empty())
       throw sharp::Exception ("TagManager.GetTag () called with an empty tag name.");
 
@@ -77,13 +75,13 @@ namespace gnote {
     sharp::string_split(splits, normalized_tag_name, ":");
     if ((splits.size() > 2) || Glib::str_has_prefix(normalized_tag_name, Tag::SYSTEM_TAG_PREFIX)) {
       Glib::Mutex::Lock lock(m_locker);
-      std::map<std::string, Tag::Ptr>::const_iterator iter = m_internal_tags.find(normalized_tag_name);
+      auto iter = m_internal_tags.find(normalized_tag_name);
       if(iter != m_internal_tags.end()) {
         return iter->second;
       }
       return Tag::Ptr();
     }
-    std::map<std::string, Gtk::TreeIter>::const_iterator iter = m_tag_map.find(normalized_tag_name);
+    auto iter = m_tag_map.find(normalized_tag_name);
     if (iter != m_tag_map.end()) {
       Gtk::TreeIter tree_iter = iter->second;
       return (*tree_iter)[m_columns.m_tag];
@@ -100,7 +98,7 @@ namespace gnote {
     if (tag_name.empty())
       throw sharp::Exception ("TagManager.GetOrCreateTag () called with a null tag name.");
 
-    std::string normalized_tag_name = Glib::ustring(sharp::string_trim(tag_name)).lowercase();
+    Glib::ustring normalized_tag_name = sharp::string_trim(tag_name).lowercase();
     if (normalized_tag_name.empty())
       throw sharp::Exception ("TagManager.GetOrCreateTag () called with an empty tag name.");
 
@@ -108,8 +106,7 @@ namespace gnote {
     sharp::string_split(splits, normalized_tag_name, ":");
     if ((splits.size() > 2) || Glib::str_has_prefix(normalized_tag_name, Tag::SYSTEM_TAG_PREFIX)){
       Glib::Mutex::Lock lock(m_locker);
-      std::map<std::string, Tag::Ptr>::iterator iter;
-      iter = m_internal_tags.find(normalized_tag_name);
+      auto iter = m_internal_tags.find(normalized_tag_name);
       if(iter != m_internal_tags.end()) {
         return iter->second;
       }
@@ -191,8 +188,7 @@ namespace gnote {
       m_internal_tags.erase(tag->normalized_name());
     }
     bool tag_removed = false;
-    std::map<std::string, Gtk::TreeIter>::iterator map_iter;
-    map_iter = m_tag_map.find(tag->normalized_name());
+    auto map_iter = m_tag_map.find(tag->normalized_name());
     if (map_iter != m_tag_map.end()) {
 
       Glib::Mutex::Lock lock(m_locker);
diff --git a/src/tagmanager.hpp b/src/tagmanager.hpp
index db03d36..a579ff7 100644
--- a/src/tagmanager.hpp
+++ b/src/tagmanager.hpp
@@ -69,9 +69,9 @@ private:
   Glib::RefPtr<Gtk::ListStore>     m_tags;
   Glib::RefPtr<Gtk::TreeModelSort> m_sorted_tags;
   // The key for this dictionary is Tag.Name.ToLower ().
-  typedef std::map<std::string, Gtk::TreeIter> TagMap;
+  typedef std::map<Glib::ustring, Gtk::TreeIter> TagMap;
   TagMap                           m_tag_map;
-  typedef std::map<std::string, Tag::Ptr> InternalMap;
+  typedef std::map<Glib::ustring, Tag::Ptr> InternalMap;
   InternalMap                      m_internal_tags;
   mutable Glib::Mutex              m_locker;