[gnote] Replace std::string by Glib::ustring in recent changes
- From: Aurimas Černius <aurimasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnote] Replace std::string by Glib::ustring in recent changes
- Date: Sat, 4 Feb 2017 13:50:53 +0000 (UTC)
commit 94d35f6542bf12e62c6c045ca9cfbfbdb9801fa7
Author: Aurimas Černius <aurisc4 gmail com>
Date: Sat Feb 4 15:03:12 2017 +0200
Replace std::string by Glib::ustring in recent changes
src/recentchanges.cpp | 10 +++++-----
src/recentchanges.hpp | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/recentchanges.cpp b/src/recentchanges.cpp
index c511c79..512b828 100644
--- a/src/recentchanges.cpp
+++ b/src/recentchanges.cpp
@@ -659,7 +659,7 @@ namespace gnote {
.connect(sigc::mem_fun(*this, &NoteRecentChanges::entry_changed_timeout));
}
- std::string search_text = get_search_text();
+ Glib::ustring search_text = get_search_text();
if(search_text.empty()) {
SearchableItem *searchable_widget = dynamic_cast<SearchableItem*>(currently_embedded());
if(searchable_widget) {
@@ -685,7 +685,7 @@ namespace gnote {
if(!m_search_box.get_visible()) {
return;
}
- std::string search_text = get_search_text();
+ Glib::ustring search_text = get_search_text();
if(search_text.empty()) {
return;
}
@@ -696,9 +696,9 @@ namespace gnote {
}
}
- std::string NoteRecentChanges::get_search_text()
+ Glib::ustring NoteRecentChanges::get_search_text()
{
- std::string text = m_search_entry.get_text();
+ Glib::ustring text = m_search_entry.get_text();
text = sharp::string_trim(text);
return text;
}
@@ -800,7 +800,7 @@ namespace gnote {
return menu;
}
- void NoteRecentChanges::on_embedded_name_changed(const std::string & name)
+ void NoteRecentChanges::on_embedded_name_changed(const Glib::ustring & name)
{
set_title(name);
}
diff --git a/src/recentchanges.hpp b/src/recentchanges.hpp
index 4eea10b..8c7abdd 100644
--- a/src/recentchanges.hpp
+++ b/src/recentchanges.hpp
@@ -82,7 +82,7 @@ private:
void on_entry_changed();
void on_entry_activated();
void entry_changed_timeout();
- std::string get_search_text();
+ Glib::ustring get_search_text();
void update_toolbar(EmbeddableWidget & widget);
void on_all_notes_button_clicked();
void on_show_window_menu();
@@ -90,7 +90,7 @@ private:
void on_find_next_button_clicked();
void on_find_prev_button_clicked();
Gtk::PopoverMenu *make_window_menu(Gtk::Button *button, const std::vector<Gtk::Widget*> & items);
- void on_embedded_name_changed(const std::string & name);
+ void on_embedded_name_changed(const Glib::ustring & name);
void on_settings_changed(const Glib::ustring & key);
bool on_notes_widget_key_press(GdkEventKey*);
void on_close_window(const Glib::VariantBase&);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]