Merge pull request #4512 from TrenchBroom/4511

4511: Return a copy of recent documents for safety
TrenchBroom · Mar 3, 2024 · a6800a8 · a6800a8
2 parents e112975 + c8d78e3
commit a6800a8
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/common/src/TrenchBroomApp.cpp b/common/src/TrenchBroomApp.cpp
@@ -334,7 +334,7 @@ void TrenchBroomApp::loadStyle()
   }
 }
 
-const std::vector<std::filesystem::path>& TrenchBroomApp::recentDocuments() const
+std::vector<std::filesystem::path> TrenchBroomApp::recentDocuments() const
 {
   return m_recentDocuments->recentDocuments();
 }

diff --git a/common/src/TrenchBroomApp.h b/common/src/TrenchBroomApp.h
@@ -69,7 +69,7 @@ class TrenchBroomApp : public QApplication
   void loadStyle();
 
 public:
-  const std::vector<std::filesystem::path>& recentDocuments() const;
+  std::vector<std::filesystem::path> recentDocuments() const;
   void addRecentDocumentMenu(QMenu& menu);
   void removeRecentDocumentMenu(QMenu& menu);
   void updateRecentDocument(const std::filesystem::path& path);

diff --git a/common/src/View/RecentDocuments.cpp b/common/src/View/RecentDocuments.cpp
@@ -78,7 +78,7 @@ RecentDocuments::RecentDocuments(
   assert(m_maxSize > 0);
 }
 
-const std::vector<std::filesystem::path>& RecentDocuments::recentDocuments() const
+std::vector<std::filesystem::path> RecentDocuments::recentDocuments() const
 {
   return m_filteredDocuments;
 }

diff --git a/common/src/View/RecentDocuments.h b/common/src/View/RecentDocuments.h
@@ -52,7 +52,7 @@ class RecentDocuments : public QObject
     std::function<bool(std::filesystem::path)> filterPredicate,
     QObject* parent = nullptr);
 
-  const std::vector<std::filesystem::path>& recentDocuments() const;
+  std::vector<std::filesystem::path> recentDocuments() const;
 
   void reload();
-Original file line number
+Diff line change
@@ Expand Up / @@ -334,7 +334,7 @@ void TrenchBroomApp::loadStyle() @@
       }
     }
-    const std::vector<std::filesystem::path>& TrenchBroomApp::recentDocuments() const
+    std::vector<std::filesystem::path> TrenchBroomApp::recentDocuments() const
     {
       return m_recentDocuments->recentDocuments();
     }
@@ Expand Down @@