[gnote] Return addins as return value

[Aurimas Černius <aurimasc src gnome org>]

commit 01d2623c81f54d539b691de664c98c7c98694eef
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Apr 13 20:36:07 2019 +0300

    Return addins as return value

 src/addinmanager.cpp                | 12 ++++++------
 src/addinmanager.hpp                |  6 +++---
 src/notemanager.cpp                 |  3 +--
 src/preferencesdialog.cpp           |  9 +++------
 src/synchronization/syncmanager.cpp |  3 +--
 5 files changed, 14 insertions(+), 19 deletions(-)
---
diff --git a/src/addinmanager.cpp b/src/addinmanager.cpp
index 290ce29e..da669524 100644
--- a/src/addinmanager.cpp
+++ b/src/addinmanager.cpp
@@ -413,21 +413,21 @@ namespace {
     return NULL;
   }
 
-  void AddinManager::get_preference_tab_addins(std::vector<PreferenceTabAddin *> &l) const
+  std::vector<PreferenceTabAddin*> AddinManager::get_preference_tab_addins() const
   {
-    l = sharp::map_get_values(m_pref_tab_addins);
+    return sharp::map_get_values(m_pref_tab_addins);
   }
 
 
-  void AddinManager::get_sync_service_addins(std::vector<sync::SyncServiceAddin *> &l) const
+  std::vector<sync::SyncServiceAddin*> AddinManager::get_sync_service_addins() const
   {
-    l = sharp::map_get_values(m_sync_service_addins);
+    return sharp::map_get_values(m_sync_service_addins);
   }
 
 
-  void AddinManager::get_import_addins(std::vector<ImportAddin*> & l) const
+  std::vector<ImportAddin*> AddinManager::get_import_addins() const
   {
-    l = sharp::map_get_values(m_import_addins);
+    return sharp::map_get_values(m_import_addins);
   }
 
   void AddinManager::initialize_application_addins() const
diff --git a/src/addinmanager.hpp b/src/addinmanager.hpp
index 77ad68ba..de4c4f8c 100644
--- a/src/addinmanager.hpp
+++ b/src/addinmanager.hpp
@@ -66,9 +66,9 @@ public:
   std::vector<NoteAddin*> get_note_addins(const Note::Ptr &) const;
   ApplicationAddin *get_application_addin(const Glib::ustring & id) const;
   sync::SyncServiceAddin *get_sync_service_addin(const Glib::ustring & id) const;
-  void get_preference_tab_addins(std::vector<PreferenceTabAddin *> &) const;
-  void get_sync_service_addins(std::vector<sync::SyncServiceAddin *> &) const;
-  void get_import_addins(std::vector<ImportAddin*> &) const;
+  std::vector<PreferenceTabAddin*> get_preference_tab_addins() const;
+  std::vector<sync::SyncServiceAddin*> get_sync_service_addins() const;
+  std::vector<ImportAddin*> get_import_addins() const;
   void initialize_application_addins() const;
   void initialize_sync_service_addins() const;
   void shutdown_application_addins() const;
diff --git a/src/notemanager.cpp b/src/notemanager.cpp
index 5257e43f..7f345ad6 100644
--- a/src/notemanager.cpp
+++ b/src/notemanager.cpp
@@ -65,8 +65,7 @@ namespace gnote {
     m_addin_mgr = create_addin_manager ();
 
     if (is_first_run) {
-      std::vector<ImportAddin*> l;
-      m_addin_mgr->get_import_addins(l);
+      std::vector<ImportAddin*> l = m_addin_mgr->get_import_addins();
       bool has_imported = false;
 
       if(l.empty()) {
diff --git a/src/preferencesdialog.cpp b/src/preferencesdialog.cpp
index e084e210..4dd88a2b 100644
--- a/src/preferencesdialog.cpp
+++ b/src/preferencesdialog.cpp
@@ -125,8 +125,7 @@ namespace gnote {
                            _("Plugins"));
 
       // TODO: Figure out a way to have these be placed in a specific order
-    std::vector<PreferenceTabAddin *> tabAddins;
-    m_addin_manager.get_preference_tab_addins(tabAddins);
+    std::vector<PreferenceTabAddin*> tabAddins = m_addin_manager.get_preference_tab_addins();
     for(auto tabAddin : tabAddins) {
       DBG_OUT("Adding preference tab addin: %s", 
               typeid(*tabAddin).name());
@@ -431,8 +430,7 @@ namespace gnote {
 
     // Populate the store with all the available SyncServiceAddins
     m_sync_addin_store = Gtk::ListStore::create(m_sync_addin_store_record);
-    std::vector<sync::SyncServiceAddin*> addins;
-    m_addin_manager.get_sync_service_addins(addins);
+    std::vector<sync::SyncServiceAddin*> addins = m_addin_manager.get_sync_service_addins();
     std::sort(addins.begin(), addins.end(), CompareSyncAddinsByName());
     for(auto addin : addins) {
       if(addin->initialized()) {
@@ -1343,8 +1341,7 @@ namespace gnote {
 
   void PreferencesDialog::update_sync_services()
   {
-    std::vector<sync::SyncServiceAddin*> new_addins;
-    m_addin_manager.get_sync_service_addins(new_addins);
+    std::vector<sync::SyncServiceAddin*> new_addins = m_addin_manager.get_sync_service_addins();
     auto remove_iter = new_addins.begin();
     while(remove_iter != new_addins.end()) {
       if(!(*remove_iter)->initialized()) {
diff --git a/src/synchronization/syncmanager.cpp b/src/synchronization/syncmanager.cpp
index 655fb523..6d733d36 100644
--- a/src/synchronization/syncmanager.cpp
+++ b/src/synchronization/syncmanager.cpp
@@ -556,8 +556,7 @@ namespace sync {
 
     try {
       NoteManager & manager(dynamic_cast<NoteManager&>(m_note_manager));
-      std::vector<SyncServiceAddin*> addins;
-      manager.get_addin_manager().get_sync_service_addins(addins);
+      std::vector<SyncServiceAddin*> addins = manager.get_addin_manager().get_sync_service_addins();
       for(auto iter : addins) {
         if(iter->id() == sync_service_id) {
           addin = iter;