[gnote] Replace std::string by Glib::ustring in main window embeds



commit 6c2ee3c5e1ed3549f716b0936a2913477cab0f64
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Feb 4 14:48:12 2017 +0200

    Replace std::string by Glib::ustring in main window embeds

 src/addins/statistics/statisticswidget.cpp |    2 +-
 src/addins/statistics/statisticswidget.hpp |    4 ++--
 src/mainwindowembeds.hpp                   |    8 ++++----
 src/notewindow.cpp                         |    4 ++--
 src/notewindow.hpp                         |    6 +++---
 src/searchnoteswidget.cpp                  |    4 ++--
 src/searchnoteswidget.hpp                  |    6 +++---
 7 files changed, 17 insertions(+), 17 deletions(-)
---
diff --git a/src/addins/statistics/statisticswidget.cpp b/src/addins/statistics/statisticswidget.cpp
index d03153b..01439f3 100644
--- a/src/addins/statistics/statisticswidget.cpp
+++ b/src/addins/statistics/statisticswidget.cpp
@@ -165,7 +165,7 @@ StatisticsWidget::StatisticsWidget(gnote::NoteManager & nm)
   append_column(*column);
 }
 
-std::string StatisticsWidget::get_name() const
+Glib::ustring StatisticsWidget::get_name() const
 {
   return _("Statistics");
 }
diff --git a/src/addins/statistics/statisticswidget.hpp b/src/addins/statistics/statisticswidget.hpp
index eae640c..6d8e242 100644
--- a/src/addins/statistics/statisticswidget.hpp
+++ b/src/addins/statistics/statisticswidget.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2013 Aurimas Cernius
+ * Copyright (C) 2013,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,7 +36,7 @@ class StatisticsWidget
 {
 public:
   StatisticsWidget(gnote::NoteManager & nm);
-  virtual std::string get_name() const override;
+  virtual Glib::ustring get_name() const override;
   virtual void foreground() override;
   virtual void background() override;
 private:
diff --git a/src/mainwindowembeds.hpp b/src/mainwindowembeds.hpp
index 7c451f8..b5d123a 100644
--- a/src/mainwindowembeds.hpp
+++ b/src/mainwindowembeds.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
@@ -48,7 +48,7 @@ class EmbeddableWidget
 {
 public:
   EmbeddableWidget() : m_host(NULL) {}
-  virtual std::string get_name() const = 0;
+  virtual Glib::ustring get_name() const = 0;
   virtual void embed(EmbeddableWidgetHost *h);
   virtual void unembed();
   virtual void foreground();
@@ -61,7 +61,7 @@ public:
       return m_host;
     }
 
-  sigc::signal<void, const std::string &> signal_name_changed;
+  sigc::signal<void, const Glib::ustring &> signal_name_changed;
   sigc::signal<void> signal_embedded;
   sigc::signal<void> signal_unembedded;
   sigc::signal<void> signal_foregrounded;
@@ -74,7 +74,7 @@ private:
 class SearchableItem
 {
 public:
-  virtual void perform_search(const std::string & search_text) = 0;
+  virtual void perform_search(const Glib::ustring & search_text) = 0;
   virtual bool supports_goto_result();
   virtual bool goto_next_result();
   virtual bool goto_previous_result();
diff --git a/src/notewindow.cpp b/src/notewindow.cpp
index d1ab137..83705ff 100644
--- a/src/notewindow.cpp
+++ b/src/notewindow.cpp
@@ -154,7 +154,7 @@ namespace gnote {
   }
 
 
-  std::string NoteWindow::get_name() const
+  Glib::ustring NoteWindow::get_name() const
   {
     return m_name;
   }
@@ -279,7 +279,7 @@ namespace gnote {
     }
   }
 
-  void NoteWindow::perform_search(const std::string & text)
+  void NoteWindow::perform_search(const Glib::ustring & text)
   {
     get_find_handler().perform_search(text);
   }
diff --git a/src/notewindow.hpp b/src/notewindow.hpp
index 9393560..78386c2 100644
--- a/src/notewindow.hpp
+++ b/src/notewindow.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011-2016 Aurimas Cernius
+ * Copyright (C) 2011-2017 Aurimas Cernius
  * Copyright (C) 2009 Hubert Figuiere
  *
  * This program is free software: you can redistribute it and/or modify
@@ -136,14 +136,14 @@ public:
   NoteWindow(Note &);
   ~NoteWindow();
 
-  virtual std::string get_name() const override;
+  virtual Glib::ustring get_name() const override;
   void set_name(const std::string & name);
   virtual void foreground() override;
   virtual void background() override;
   virtual void hint_size(int & width, int & height) override;
   virtual void size_internals() override;
 
-  virtual void perform_search(const std::string & text) override;
+  virtual void perform_search(const Glib::ustring & text) override;
   virtual bool supports_goto_result() override;
   virtual bool goto_next_result() override;
   virtual bool goto_previous_result() override;
diff --git a/src/searchnoteswidget.cpp b/src/searchnoteswidget.cpp
index 0b26ef4..171423b 100644
--- a/src/searchnoteswidget.cpp
+++ b/src/searchnoteswidget.cpp
@@ -122,7 +122,7 @@ SearchNotesWidget::~SearchNotesWidget()
   }
 }
 
-std::string SearchNotesWidget::get_name() const
+Glib::ustring SearchNotesWidget::get_name() const
 {
   notebooks::Notebook::Ptr selected_notebook = get_selected_notebook();
   if(!selected_notebook
@@ -151,7 +151,7 @@ void SearchNotesWidget::make_actions()
   m_rename_notebook_action->signal_activate().connect(sigc::mem_fun(*this, 
&SearchNotesWidget::on_rename_notebook));
 }
 
-void SearchNotesWidget::perform_search(const std::string & search_text)
+void SearchNotesWidget::perform_search(const Glib::ustring & search_text)
 {
   restore_matches_window();
   m_search_text = search_text;
diff --git a/src/searchnoteswidget.hpp b/src/searchnoteswidget.hpp
index a24a610..4996afe 100644
--- a/src/searchnoteswidget.hpp
+++ b/src/searchnoteswidget.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2010-2015 Aurimas Cernius
+ * Copyright (C) 2010-2015,2017 Aurimas Cernius
  * Copyright (C) 2010 Debarshi Ray
  * Copyright (C) 2009 Hubert Figuiere
  *
@@ -48,12 +48,12 @@ class SearchNotesWidget
 public:
   SearchNotesWidget(NoteManager & m);
   virtual ~SearchNotesWidget();
-  virtual std::string get_name() const override;
+  virtual Glib::ustring get_name() const override;
   virtual void foreground() override;
   virtual void background() override;
   virtual void hint_size(int & width, int & height) override;
   virtual void size_internals() override;
-  virtual void perform_search(const std::string & search_text) override;
+  virtual void perform_search(const Glib::ustring & search_text) override;
   virtual std::vector<Gtk::Widget*> get_popover_widgets() override;
   virtual std::vector<MainWindowAction::Ptr> get_widget_actions() override;
 


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