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

[Aurimas Černius <aurimasc src gnome org>]

commit a1d64779555359a1ff1aef003ebe10778b763899
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Feb 12 15:53:33 2017 +0200

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

 .../webdavsyncservice/webdavsyncserviceaddin.cpp   |    8 ++++----
 .../webdavsyncservice/webdavsyncserviceaddin.hpp   |    8 ++++----
 src/synchronization/fusesyncserviceaddin.cpp       |   20 ++++++++++----------
 src/synchronization/fusesyncserviceaddin.hpp       |   18 +++++++++---------
 4 files changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp 
b/src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp
index 3c04674..f8a031a 100644
--- a/src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp
+++ b/src/addins/webdavsyncservice/webdavsyncserviceaddin.cpp
@@ -111,13 +111,13 @@ Glib::ustring WebDavSyncServiceAddin::id()
   return "wdfs";
 }
 
-std::string WebDavSyncServiceAddin::fuse_mount_directory_error()
+Glib::ustring WebDavSyncServiceAddin::fuse_mount_directory_error()
 {
   const char *res = _("There was an error connecting to the server.  This may be caused by using an 
incorrect user name and/or password.");
   return res;
 }
 
-std::vector<Glib::ustring> WebDavSyncServiceAddin::get_fuse_mount_exe_args(const std::string & mountPath, 
bool fromStoredValues)
+std::vector<Glib::ustring> WebDavSyncServiceAddin::get_fuse_mount_exe_args(const Glib::ustring & mountPath, 
bool fromStoredValues)
 {
   std::string url, username, password;
   if(fromStoredValues) {
@@ -130,7 +130,7 @@ std::vector<Glib::ustring> WebDavSyncServiceAddin::get_fuse_mount_exe_args(const
   return get_fuse_mount_exe_args(mountPath, url, username, password, accept_ssl_cert());
 }
 
-std::string WebDavSyncServiceAddin::get_fuse_mount_exe_args_for_display(const std::string & mountPath, bool 
fromStoredValues)
+Glib::ustring WebDavSyncServiceAddin::get_fuse_mount_exe_args_for_display(const Glib::ustring & mountPath, 
bool fromStoredValues)
 {
   /*std::string url, username, password;
   if(fromStoredValues) {
@@ -157,7 +157,7 @@ std::string WebDavSyncServiceAddin::get_fuse_mount_exe_args_for_display(const st
   return result;
 }
 
-std::string WebDavSyncServiceAddin::fuse_mount_exe_name()
+Glib::ustring WebDavSyncServiceAddin::fuse_mount_exe_name()
 {
   return "wdfs";
 }
diff --git a/src/addins/webdavsyncservice/webdavsyncserviceaddin.hpp 
b/src/addins/webdavsyncservice/webdavsyncserviceaddin.hpp
index 35dbefc..ac99291 100644
--- a/src/addins/webdavsyncservice/webdavsyncserviceaddin.hpp
+++ b/src/addins/webdavsyncservice/webdavsyncserviceaddin.hpp
@@ -78,11 +78,11 @@ public:
   /// </summary>
   virtual Glib::ustring id() override;
 
-  virtual std::string fuse_mount_directory_error() override;
+  virtual Glib::ustring fuse_mount_directory_error() override;
 protected:
-  virtual std::vector<Glib::ustring> get_fuse_mount_exe_args(const std::string & mountPath, bool 
fromStoredValues) override;
-  virtual std::string get_fuse_mount_exe_args_for_display(const std::string & mountPath, bool 
fromStoredValues) override;
-  virtual std::string fuse_mount_exe_name() override;
+  virtual std::vector<Glib::ustring> get_fuse_mount_exe_args(const Glib::ustring & mountPath, bool 
fromStoredValues) override;
+  virtual Glib::ustring get_fuse_mount_exe_args_for_display(const Glib::ustring & mountPath, bool 
fromStoredValues) override;
+  virtual Glib::ustring fuse_mount_exe_name() override;
   virtual bool verify_configuration() override;
   virtual void save_configuration_values() override;
 
diff --git a/src/synchronization/fusesyncserviceaddin.cpp b/src/synchronization/fusesyncserviceaddin.cpp
index 3df946e..2b225d5 100644
--- a/src/synchronization/fusesyncserviceaddin.cpp
+++ b/src/synchronization/fusesyncserviceaddin.cpp
@@ -126,8 +126,8 @@ bool FuseSyncServiceAddin::save_configuration()
   if(mounted) {
     try {
       // Test creating/writing/deleting a file
-      std::string testPathBase = Glib::build_filename(m_mount_path, "test");
-      std::string testPath = testPathBase;
+      Glib::ustring testPathBase = Glib::build_filename(m_mount_path, "test");
+      Glib::ustring testPath = testPathBase;
       int count = 0;
 
       // Get unique new file name
@@ -190,13 +190,13 @@ void FuseSyncServiceAddin::reset_configuration()
   reset_configuration_values();
 }
 
-std::string FuseSyncServiceAddin::fuse_mount_timeout_error()
+Glib::ustring FuseSyncServiceAddin::fuse_mount_timeout_error()
 {
   char *error = _("Timeout connecting to server.");
   return error;
 }
 
-std::string FuseSyncServiceAddin::fuse_mount_directory_error()
+Glib::ustring FuseSyncServiceAddin::fuse_mount_directory_error()
 {
   char *error = _("Error connecting to server.");
   return error;
@@ -280,7 +280,7 @@ int FuseSyncServiceAddin::get_timeout_ms()
 
 void FuseSyncServiceAddin::set_up_mount_path()
 {
-  std::string notesPath = Glib::get_tmp_dir();
+  Glib::ustring notesPath = Glib::get_tmp_dir();
   m_mount_path = Glib::build_filename(notesPath, Glib::get_user_name(), "gnote", "sync-" + id()); // TODO: 
Best mount path name?
 }
 
@@ -336,9 +336,9 @@ bool FuseSyncServiceAddin::is_mounted()
   p.redirect_standard_output(true);
   p.file_name(m_mount_exe_path);
   p.start();
-  std::list<std::string> outputLines;
+  std::list<Glib::ustring> outputLines;
   while(!p.standard_output_eof()) {
-    std::string line = p.standard_output_read_line();
+    Glib::ustring line = p.standard_output_read_line();
     outputLines.push_back(line);
   }
   p.wait_for_exit();
@@ -349,9 +349,9 @@ bool FuseSyncServiceAddin::is_mounted()
   }
 
   // TODO: Review this methodology...is it really the exe name, for example?
-  for(std::list<std::string>::iterator iter = outputLines.begin(); iter != outputLines.end(); ++iter) {
-    if((iter->find(fuse_mount_exe_name()) == 0 || iter->find(" type fuse." + fuse_mount_exe_name()) != 
std::string::npos)
-       && iter->find(Glib::ustring::compose("on %1 ", m_mount_path)) != std::string::npos) {
+  for(auto line : outputLines) {
+    if((line.find(fuse_mount_exe_name()) == 0 || line.find(" type fuse." + fuse_mount_exe_name()) != 
Glib::ustring::npos)
+       && line.find(Glib::ustring::compose("on %1 ", m_mount_path)) != Glib::ustring::npos) {
       return true;
     }
   }
diff --git a/src/synchronization/fusesyncserviceaddin.hpp b/src/synchronization/fusesyncserviceaddin.hpp
index 4f73cb6..4d2df5a 100644
--- a/src/synchronization/fusesyncserviceaddin.hpp
+++ b/src/synchronization/fusesyncserviceaddin.hpp
@@ -47,15 +47,15 @@ public:
   virtual bool save_configuration() override;
   virtual void reset_configuration() override;
 
-  virtual std::string fuse_mount_timeout_error();
-  virtual std::string fuse_mount_directory_error();
+  virtual Glib::ustring fuse_mount_timeout_error();
+  virtual Glib::ustring fuse_mount_directory_error();
 protected:
   virtual bool verify_configuration() = 0;
   virtual void save_configuration_values() = 0;
   virtual void reset_configuration_values() = 0;
-  virtual std::string fuse_mount_exe_name() = 0;
-  virtual std::vector<Glib::ustring> get_fuse_mount_exe_args(const std::string & mountPath, bool 
fromStoredValues) = 0;
-  virtual std::string get_fuse_mount_exe_args_for_display(const std::string & mountPath, bool 
fromStoredValues) = 0;
+  virtual Glib::ustring fuse_mount_exe_name() = 0;
+  virtual std::vector<Glib::ustring> get_fuse_mount_exe_args(const Glib::ustring & mountPath, bool 
fromStoredValues) = 0;
+  virtual Glib::ustring get_fuse_mount_exe_args_for_display(const Glib::ustring & mountPath, bool 
fromStoredValues) = 0;
 private:
   static void redirect_standard_error();
   static bool wait_for_exit(Glib::Pid, int timeout, int *exit_code);
@@ -67,12 +67,12 @@ private:
   void unmount_timeout();
   bool is_mounted();
 
-  std::string m_mount_path;
+  Glib::ustring m_mount_path;
   utils::InterruptableTimeout m_unmount_timeout;
 
-  std::string m_fuse_mount_exe_path;
-  std::string m_fuse_unmount_exe_path;
-  std::string m_mount_exe_path;
+  Glib::ustring m_fuse_mount_exe_path;
+  Glib::ustring m_fuse_unmount_exe_path;
+  Glib::ustring m_mount_exe_path;
   bool m_initialized;
   bool m_enabled;
 };