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



commit b6ef79b831ad22bcd7379d0a7216f5a73677e53f
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sun Feb 5 21:44:04 2017 +0200

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

 src/noterenamedialog.cpp |   10 +++++-----
 src/noterenamedialog.hpp |   13 ++++++-------
 2 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/src/noterenamedialog.cpp b/src/noterenamedialog.cpp
index dc38001..7b1a317 100644
--- a/src/noterenamedialog.cpp
+++ b/src/noterenamedialog.cpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011-2014 Aurimas Cernius
+ * Copyright (C) 2011-2014,2017 Aurimas Cernius
  * Copyright (C) 2010 Debarshi Ray
  *
  * This program is free software: you can redistribute it and/or modify
@@ -61,7 +61,7 @@ gint ModelColumnRecord::get_column_selected_num() const
     return COLUMN_BOOL;
 }
 
-const Gtk::TreeModelColumn<std::string> & ModelColumnRecord::get_column_title()
+const Gtk::TreeModelColumn<Glib::ustring> & ModelColumnRecord::get_column_title()
                                             const
 {
     return m_column_title;
@@ -118,7 +118,7 @@ void ModelFiller::operator()(const NoteBase::Ptr & note)
 }
 
 NoteRenameDialog::NoteRenameDialog(const NoteBase::List & notes,
-                                   const std::string & old_title,
+                                   const Glib::ustring & old_title,
                                    const NoteBase::Ptr & renamed_note)
   : Gtk::Dialog(_("Rename Note Links?"),
                 *dynamic_cast<Gtk::Window*>(static_pointer_cast<Note>(renamed_note)->get_window()->host()),
@@ -349,7 +349,7 @@ bool NoteRenameDialog::on_notes_model_foreach_iter_select(
 void NoteRenameDialog::on_notes_view_row_activated(
                          const Gtk::TreePath & p,
                          Gtk::TreeView::Column *,
-                         const std::string & old_title)
+                         const Glib::ustring & old_title)
 {
   const Gtk::TreeModel::iterator iter = m_notes_model->get_iter(p);
   if (!iter)
@@ -378,7 +378,7 @@ void NoteRenameDialog::on_select_all_button_clicked(bool select)
       select));
 }
 
-void NoteRenameDialog::on_toggle_cell_toggled(const std::string & p)
+void NoteRenameDialog::on_toggle_cell_toggled(const Glib::ustring & p)
 {
   const Gtk::TreeModel::iterator iter = m_notes_model->get_iter(p);
   if (!iter)
diff --git a/src/noterenamedialog.hpp b/src/noterenamedialog.hpp
index 7888c72..880896b 100644
--- a/src/noterenamedialog.hpp
+++ b/src/noterenamedialog.hpp
@@ -1,7 +1,7 @@
 /*
  * gnote
  *
- * Copyright (C) 2011,2013-2014 Aurimas Cernius
+ * Copyright (C) 2011,2013-2014,2017 Aurimas Cernius
  * Copyright (C) 2010 Debarshi Ray
  *
  * This program is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@
 #define __NOTE_RENAME_DIALOG_HPP_
 
 #include <map>
-#include <string>
 
 #include <glibmm.h>
 #include <gtkmm/grid.h>
@@ -53,7 +52,7 @@ public:
   const Gtk::TreeModelColumn<bool> & get_column_selected() const;
   gint get_column_selected_num() const;
 
-  const Gtk::TreeModelColumn<std::string> & get_column_title() const;
+  const Gtk::TreeModelColumn<Glib::ustring> & get_column_title() const;
   gint get_column_title_num() const;
 
   const Gtk::TreeModelColumn<NoteBase::Ptr> & get_column_note() const;
@@ -69,7 +68,7 @@ private:
   };
 
   Gtk::TreeModelColumn<bool> m_column_selected;
-  Gtk::TreeModelColumn<std::string> m_column_title;
+  Gtk::TreeModelColumn<Glib::ustring> m_column_title;
   Gtk::TreeModelColumn<NoteBase::Ptr> m_column_note;
 };
 
@@ -81,7 +80,7 @@ public:
   typedef shared_ptr<std::map<NoteBase::Ptr, bool> > MapPtr;
 
   NoteRenameDialog(const NoteBase::List & notes,
-                   const std::string & old_title,
+                   const Glib::ustring & old_title,
                    const NoteBase::Ptr & renamed_note);
   MapPtr get_notes() const;
   NoteRenameBehavior get_selected_behavior() const;
@@ -99,9 +98,9 @@ private:
                                           bool select);
   void on_notes_view_row_activated(const Gtk::TreeModel::Path & p,
                                    Gtk::TreeView::Column *,
-                                   const std::string & old_title);
+                                   const Glib::ustring & old_title);
   void on_select_all_button_clicked(bool select);
-  void on_toggle_cell_toggled(const std::string & p);
+  void on_toggle_cell_toggled(const Glib::ustring & p);
 
   ModelColumnRecord m_model_column_record;
   Glib::RefPtr<Gtk::ListStore> m_notes_model;


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