[gnote: 6/21] Fix test sync manager after merge

[Aurimas Černius <aurimasc src gnome org>]

commit f02876479f5ac025c0a748016cb4e7b6435e198f
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Apr 1 22:00:59 2017 +0300

    Fix test sync manager after merge

 src/test/testsyncmanager.cpp |    8 ++++----
 src/test/testsyncmanager.hpp |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/test/testsyncmanager.cpp b/src/test/testsyncmanager.cpp
index c240dfa..eaedb5e 100644
--- a/src/test/testsyncmanager.cpp
+++ b/src/test/testsyncmanager.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2014 Aurimas Cernius
+ * Copyright (C) 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
@@ -29,7 +29,7 @@ SyncManager::SyncManager(gnote::NoteManagerBase & manager)
   m_client = gnote::sync::SyncClient::Ptr(new test::SyncClient(manager));
 }
 
-test::SyncClient::Ptr SyncManager::get_client(const std::string & manifest)
+test::SyncClient::Ptr SyncManager::get_client(const Glib::ustring & manifest)
 {
   SyncClient::Ptr client = dynamic_pointer_cast<SyncClient>(m_client);
   client->set_manifest_path(manifest);
@@ -51,12 +51,12 @@ void SyncManager::resolve_conflict(gnote::sync::SyncTitleConflictResolution reso
 {
 }
 
-bool SyncManager::synchronized_note_xml_matches(const std::string & noteXml1, const std::string & noteXml2)
+bool SyncManager::synchronized_note_xml_matches(const Glib::ustring & noteXml1, const Glib::ustring & 
noteXml2)
 {
   return false;
 }
 
-gnote::sync::SyncServiceAddin *SyncManager::get_sync_service_addin(const std::string & sync_service_id)
+gnote::sync::SyncServiceAddin *SyncManager::get_sync_service_addin(const Glib::ustring & sync_service_id)
 {
   return new SyncAddin();
 }
diff --git a/src/test/testsyncmanager.hpp b/src/test/testsyncmanager.hpp
index 8c7e8bb..ec5a1f3 100644
--- a/src/test/testsyncmanager.hpp
+++ b/src/test/testsyncmanager.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2014 Aurimas Cernius
+ * Copyright (C) 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
@@ -36,10 +36,10 @@ public:
   virtual void reset_client() override;
   virtual void perform_synchronization(const gnote::sync::SyncUI::Ptr & sync_ui) override;
   virtual void resolve_conflict(gnote::sync::SyncTitleConflictResolution resolution) override;
-  virtual bool synchronized_note_xml_matches(const std::string & noteXml1, const std::string & noteXml2) 
override;
-  virtual gnote::sync::SyncServiceAddin *get_sync_service_addin(const std::string & sync_service_id) 
override;
+  virtual bool synchronized_note_xml_matches(const Glib::ustring & noteXml1, const Glib::ustring & noteXml2) 
override;
+  virtual gnote::sync::SyncServiceAddin *get_sync_service_addin(const Glib::ustring & sync_service_id) 
override;
   virtual gnote::sync::SyncServiceAddin *get_configured_sync_service() override;
-  test::SyncClient::Ptr get_client(const std::string & manifest);
+  test::SyncClient::Ptr get_client(const Glib::ustring & manifest);
 };
 
 }