[gnote] Replace std::list with std::vector in backlinks



commit b311a9d933f4e9f7fcebb1aeb56f41f01f3c1f14
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Mon Apr 22 11:12:33 2019 +0300

    Replace std::list with std::vector in backlinks

 src/addins/backlinks/backlinksnoteaddin.cpp | 10 ++++++----
 src/addins/backlinks/backlinksnoteaddin.hpp |  4 +---
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/src/addins/backlinks/backlinksnoteaddin.cpp b/src/addins/backlinks/backlinksnoteaddin.cpp
index 0cddb87c..1eebbd9e 100644
--- a/src/addins/backlinks/backlinksnoteaddin.cpp
+++ b/src/addins/backlinks/backlinksnoteaddin.cpp
@@ -85,8 +85,7 @@ std::vector<gnote::PopoverWidget> BacklinksNoteAddin::get_actions_popover_widget
 
 void BacklinksNoteAddin::update_menu(Gtk::Box *menu) const
 {
-  std::list<Gtk::Widget*> items;
-  get_backlink_menu_items(items);
+  auto items = get_backlink_menu_items();
   bool have_items = false;
   for(auto item : items) {
     dynamic_cast<Gtk::ModelButton*>(item)->property_inverted() = true;
@@ -106,8 +105,9 @@ void BacklinksNoteAddin::update_menu(Gtk::Box *menu) const
 }
 
 
-void BacklinksNoteAddin::get_backlink_menu_items(std::list<Gtk::Widget*> & items) const
+std::vector<Gtk::Widget*> BacklinksNoteAddin::get_backlink_menu_items() const
 {
+  std::vector<Gtk::Widget*> items;
   gnote::NoteBase::List notes = get_note()->manager().get_notes_linking_to(get_note()->get_title());
   for(const gnote::NoteBase::Ptr & note : notes) {
     if(note != get_note()) { // don't match ourself
@@ -118,10 +118,12 @@ void BacklinksNoteAddin::get_backlink_menu_items(std::list<Gtk::Widget*> & items
     }
   }
 
-  items.sort([](Gtk::Widget *x, Gtk::Widget *y)
+  std::sort(items.begin(), items.end(), [](Gtk::Widget *x, Gtk::Widget *y)
     {
       return dynamic_cast<Gtk::ModelButton*>(x)->get_label() < 
dynamic_cast<Gtk::ModelButton*>(y)->get_label();
     });
+
+  return items;
 }
 
 
diff --git a/src/addins/backlinks/backlinksnoteaddin.hpp b/src/addins/backlinks/backlinksnoteaddin.hpp
index 22d74f7b..a6e2145d 100644
--- a/src/addins/backlinks/backlinksnoteaddin.hpp
+++ b/src/addins/backlinks/backlinksnoteaddin.hpp
@@ -21,8 +21,6 @@
 #ifndef __BACKLINKS_NOTEADDIN_HPP_
 #define __BACKLINKS_NOTEADDIN_HPP_
 
-#include <list>
-
 #include "sharp/dynamicmodule.hpp"
 #include "noteaddin.hpp"
 
@@ -56,7 +54,7 @@ public:
 private:
   void on_open_note(const Glib::VariantBase & param);
   void update_menu(Gtk::Box *menu) const;
-  void get_backlink_menu_items(std::list<Gtk::Widget*> & items) const;
+  std::vector<Gtk::Widget*> get_backlink_menu_items() const;
   bool check_note_has_match(const gnote::Note::Ptr &, const Glib::ustring &);
 };
 


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