Merge pull request #4512 from TrenchBroom/4511

kduske · web-flow · commit a6800a8bd58a · 2024-03-03T22:11:52.000+01:00
4511: Return a copy of recent documents for safety
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 number	Diff line change
`@@ -334,7 +334,7 @@ void TrenchBroomApp::loadStyle()`
`334`	`334`	`}`
`335`	`335`	`}`
`336`	`336`
`337`		`-const std::vector<std::filesystem::path>& TrenchBroomApp::recentDocuments() const`
	`337`	`+std::vector<std::filesystem::path> TrenchBroomApp::recentDocuments() const`
`338`	`338`	`{`
`339`	`339`	`return m_recentDocuments->recentDocuments();`
`340`	`340`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ RecentDocuments::RecentDocuments(`
`78`	`78`	`assert(m_maxSize > 0);`
`79`	`79`	`}`
`80`	`80`
`81`		`-const std::vector<std::filesystem::path>& RecentDocuments::recentDocuments() const`
	`81`	`+std::vector<std::filesystem::path> RecentDocuments::recentDocuments() const`
`82`	`82`	`{`
`83`	`83`	`return m_filteredDocuments;`
`84`	`84`	`}`