[gnote] Fix TestTagManager

[Aurimas Černius <aurimasc src gnome org>]

commit ebd391e66a47247b6dde197609d37b8601c59002
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Feb 12 17:09:19 2017 +0200

    Fix TestTagManager

 src/test/testtagmanager.cpp |   20 +++++++++-----------
 src/test/testtagmanager.hpp |   12 ++++++------
 2 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/src/test/testtagmanager.cpp b/src/test/testtagmanager.cpp
index 80d5518..76b44b3 100644
--- a/src/test/testtagmanager.cpp
+++ b/src/test/testtagmanager.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2014 Aurimas Cernius
+ * Copyright (C) 2014,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
@@ -22,18 +22,18 @@
 
 namespace test {
 
-gnote::Tag::Ptr TagManager::get_tag(const std::string & tag_name) const
+gnote::Tag::Ptr TagManager::get_tag(const Glib::ustring & tag_name) const
 {
-  std::map<std::string, gnote::Tag::Ptr>::const_iterator iter = m_tags.find(tag_name);
+  auto iter = m_tags.find(tag_name);
   if(iter != m_tags.end()) {
     return iter->second;
   }
   return gnote::Tag::Ptr();
 }
 
-gnote::Tag::Ptr TagManager::get_or_create_tag(const std::string & tag_name)
+gnote::Tag::Ptr TagManager::get_or_create_tag(const Glib::ustring & tag_name)
 {
-  std::map<std::string, gnote::Tag::Ptr>::iterator iter = m_tags.find(tag_name);
+  auto iter = m_tags.find(tag_name);
   if(iter != m_tags.end()) {
     return iter->second;
   }
@@ -42,20 +42,19 @@ gnote::Tag::Ptr TagManager::get_or_create_tag(const std::string & tag_name)
   return tag;
 }
 
-gnote::Tag::Ptr TagManager::get_system_tag(const std::string & name) const
+gnote::Tag::Ptr TagManager::get_system_tag(const Glib::ustring & name) const
 {
   return get_tag("SYSTEM:" + name);
 }
 
-gnote::Tag::Ptr TagManager::get_or_create_system_tag(const std::string & name)
+gnote::Tag::Ptr TagManager::get_or_create_system_tag(const Glib::ustring & name)
 {
   return get_or_create_tag("SYSTEM:" + name);
 }
 
 void TagManager::remove_tag(const gnote::Tag::Ptr & tag)
 {
-  for(std::map<std::string, gnote::Tag::Ptr>::iterator iter = m_tags.begin();
-      iter != m_tags.end(); ++iter) {
+  for(auto iter = m_tags.begin(); iter != m_tags.end(); ++iter) {
     if(iter->second == tag) {
       m_tags.erase(iter);
       break;
@@ -66,8 +65,7 @@ void TagManager::remove_tag(const gnote::Tag::Ptr & tag)
 void TagManager::all_tags(std::list<gnote::Tag::Ptr> & list) const
 {
   list.clear();
-  for(std::map<std::string, gnote::Tag::Ptr>::const_iterator iter = m_tags.begin();
-      iter != m_tags.end(); ++iter) {
+  for(auto iter = m_tags.begin(); iter != m_tags.end(); ++iter) {
     list.push_back(iter->second);
   }
 }
diff --git a/src/test/testtagmanager.hpp b/src/test/testtagmanager.hpp
index 29885f4..acc2aa9 100644
--- a/src/test/testtagmanager.hpp
+++ b/src/test/testtagmanager.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2014 Aurimas Cernius
+ * Copyright (C) 2014,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
@@ -27,14 +27,14 @@ class TagManager
   : public gnote::ITagManager
 {
 public:
-  virtual gnote::Tag::Ptr get_tag(const std::string & tag_name) const override;
-  virtual gnote::Tag::Ptr get_or_create_tag(const std::string &) override;
-  virtual gnote::Tag::Ptr get_system_tag(const std::string & tag_name) const override;
-  virtual gnote::Tag::Ptr get_or_create_system_tag(const std::string & name) override;
+  virtual gnote::Tag::Ptr get_tag(const Glib::ustring & tag_name) const override;
+  virtual gnote::Tag::Ptr get_or_create_tag(const Glib::ustring &) override;
+  virtual gnote::Tag::Ptr get_system_tag(const Glib::ustring & tag_name) const override;
+  virtual gnote::Tag::Ptr get_or_create_system_tag(const Glib::ustring & name) override;
   virtual void remove_tag(const gnote::Tag::Ptr & tag) override;
   virtual void all_tags(std::list<gnote::Tag::Ptr> &) const override;
 private:
-  std::map<std::string, gnote::Tag::Ptr> m_tags;
+  std::map<Glib::ustring, gnote::Tag::Ptr> m_tags;
 };
 
 }