[gnote] Make directory_get_files return

[Aurimas Černius <aurimasc src gnome org>]

commit bd3ce7dccecc721a9e1045962960d0e8e81fc3e2
Author: Aurimas Černius <aurisc4 gmail com>
Date:   Sat Apr 13 14:41:00 2019 +0300

    Make directory_get_files return

 src/sharp/directory.cpp                      | 9 +++------
 src/sharp/directory.hpp                      | 3 +--
 src/synchronization/filesystemsyncserver.cpp | 3 +--
 3 files changed, 5 insertions(+), 10 deletions(-)
---
diff --git a/src/sharp/directory.cpp b/src/sharp/directory.cpp
index 9b2d971e..32007a00 100644
--- a/src/sharp/directory.cpp
+++ b/src/sharp/directory.cpp
@@ -141,11 +141,9 @@ namespace sharp {
     directory_get_files_with_ext(dir, "", files);
   }
 
-  void directory_get_files(const Glib::RefPtr<Gio::File> & dir,
-                           std::vector<Glib::RefPtr<Gio::File>> & files)
+  std::vector<Glib::RefPtr<Gio::File>> directory_get_files(const Glib::RefPtr<Gio::File> & dir)
   {
-    auto ret = directory_get_files_with_ext(dir, "");
-    std::swap(files, ret);
+    return directory_get_files_with_ext(dir, "");
   }
 
   bool directory_exists(const Glib::ustring & dir)
@@ -229,8 +227,7 @@ namespace sharp {
   bool directory_delete(const Glib::RefPtr<Gio::File> & dir, bool recursive)
   {
     if(recursive) {
-      std::vector<Glib::RefPtr<Gio::File>> files;
-      directory_get_files(dir, files);
+      std::vector<Glib::RefPtr<Gio::File>> files = directory_get_files(dir);
       for(auto file : files) {
         if(!file->remove()) {
           ERR_OUT("Failed to remove file %s", file->get_uri().c_str());
diff --git a/src/sharp/directory.hpp b/src/sharp/directory.hpp
index 00551801..e4989d47 100644
--- a/src/sharp/directory.hpp
+++ b/src/sharp/directory.hpp
@@ -53,8 +53,7 @@ namespace sharp {
 
   void directory_get_files(const Glib::ustring & dir,
                            std::list<Glib::ustring> & files);
-  void directory_get_files(const Glib::RefPtr<Gio::File> & dir,
-                           std::vector<Glib::RefPtr<Gio::File>> & files);
+  std::vector<Glib::RefPtr<Gio::File>> directory_get_files(const Glib::RefPtr<Gio::File> & dir);
 
   bool directory_exists(const Glib::ustring & dir);
   bool directory_exists(const Glib::RefPtr<Gio::File> & dir);
diff --git a/src/synchronization/filesystemsyncserver.cpp b/src/synchronization/filesystemsyncserver.cpp
index 2e02664b..dfe89152 100644
--- a/src/synchronization/filesystemsyncserver.cpp
+++ b/src/synchronization/filesystemsyncserver.cpp
@@ -358,8 +358,7 @@ bool FileSystemSyncServer::commit_sync_transaction()
       if(old_manifest_file->query_exists()) {
         // TODO: Do step #8 as described in http://bugzilla.gnome.org/show_bug.cgi?id=321037#c17
         // Like this?
-        std::vector<Glib::RefPtr<Gio::File>> files;
-        sharp::directory_get_files(old_manifest_file->get_parent(), files);
+        std::vector<Glib::RefPtr<Gio::File>> files = 
sharp::directory_get_files(old_manifest_file->get_parent());
         for(auto file : files) {
           Glib::ustring fileGuid = file->get_basename();
           if(std::find(m_deleted_notes.begin(), m_deleted_notes.end(), fileGuid) != m_deleted_notes.end()