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



commit 87f82978ba4b3404cd250df12909e29ca08be3fe
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Feb 4 14:59:54 2017 +0200

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

 src/mainwindow.cpp    |    4 ++--
 src/mainwindow.hpp    |    6 +++---
 src/recentchanges.cpp |    2 +-
 src/recentchanges.hpp |    4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2120d6a..e5e5bba 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -121,7 +121,7 @@ bool MainWindow::use_client_side_decorations()
       const char *current_desktop = std::getenv("DESKTOP_SESSION");
       if (current_desktop) {
         Glib::ustring current_de = Glib::ustring(current_desktop).lowercase();
-        FOREACH(std::string de, desktops) {
+        FOREACH(Glib::ustring de, desktops) {
           Glib::ustring denv = Glib::ustring(de).lowercase();
           if(current_de.find(denv) != Glib::ustring::npos) {
             s_use_client_side_decorations = 1;
@@ -135,7 +135,7 @@ bool MainWindow::use_client_side_decorations()
 }
 
 
-MainWindow::MainWindow(const std::string & title)
+MainWindow::MainWindow(const Glib::ustring & title)
   : m_close_on_esc(false)
 {
   set_title(title);
diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
index 95a4fe8..bc708d2 100644
--- a/src/mainwindow.hpp
+++ b/src/mainwindow.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
@@ -40,9 +40,9 @@ public:
   static MainWindow *present_default(const Note::Ptr & note);
   static bool use_client_side_decorations();
 
-  explicit MainWindow(const std::string & title);
+  explicit MainWindow(const Glib::ustring & title);
 
-  virtual void set_search_text(const std::string & value) = 0;
+  virtual void set_search_text(const Glib::ustring & value) = 0;
   virtual void show_search_bar(bool grab_focus = true) = 0;
   virtual void present_search() = 0;
   virtual void new_note() = 0;
diff --git a/src/recentchanges.cpp b/src/recentchanges.cpp
index 6a9c5a4..c511c79 100644
--- a/src/recentchanges.cpp
+++ b/src/recentchanges.cpp
@@ -457,7 +457,7 @@ namespace gnote {
     }
   }
 
-  void NoteRecentChanges::set_search_text(const std::string & value)
+  void NoteRecentChanges::set_search_text(const Glib::ustring & value)
   {
     m_search_entry.set_text(value);
   }
diff --git a/src/recentchanges.hpp b/src/recentchanges.hpp
index 18db48f..4eea10b 100644
--- a/src/recentchanges.hpp
+++ b/src/recentchanges.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2010-2016 Aurimas Cernius
+ * Copyright (C) 2010-2017 Aurimas Cernius
  * Copyright (C) 2010 Debarshi Ray
  * Copyright (C) 2009 Hubert Figuiere
  *
@@ -47,7 +47,7 @@ public:
   NoteRecentChanges(NoteManager& m);
   virtual ~NoteRecentChanges();
   virtual void show_search_bar(bool grab_focus = true) override;
-  virtual void set_search_text(const std::string & value) override;
+  virtual void set_search_text(const Glib::ustring & value) override;
   virtual void new_note() override;
   virtual void present_search() override;
   virtual void close_window() override;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]