Switch lists of pointers to vectors of pointers

aegisub/src/ass_export_filter.cpp

@@ -69,10 +69,11 @@ void AssExportFilterChain::Register(AssExportFilter *filter) {
 }
 
 void AssExportFilterChain::Unregister(AssExportFilter *filter) {
-	if (find(filters()->begin(), filters()->end(), filter) == filters()->end())
+	auto it = remove(begin(*filters()), end(*filters()), filter);
+	if (it == end(*filters()))
 		throw wxString::Format("Unregister export filter: name \"%s\" is not registered.", filter->name);
 
-	filters()->remove(filter);
+	filters()->pop_back();
 }
 
 FilterList *AssExportFilterChain::filters() {

aegisub/src/ass_export_filter.h

@@ -35,8 +35,8 @@
 #pragma once
 
 #ifndef AGI_PRE
-#include <list>
 #include <memory>
+#include <vector>
 
 #include <wx/string.h>
 #include <wx/window.h>
@@ -47,8 +47,7 @@ class AssExportFilter;
 
 namespace agi { struct Context; }
 
-/// DOCME
-typedef std::list<AssExportFilter*> FilterList;
+typedef std::vector<AssExportFilter*> FilterList;
 
 /// DOCME
 /// @class AssExportFilterChain

aegisub/src/ass_exporter.cpp

@@ -45,11 +45,11 @@
 #include <algorithm>
 #endif
 
-static inline std::list<AssExportFilter*>::const_iterator filter_list_begin() {
+static inline FilterList::const_iterator filter_list_begin() {
 	return AssExportFilterChain::GetFilterList()->begin();
 }
 
-static inline std::list<AssExportFilter*>::const_iterator filter_list_end() {
+static inline FilterList::const_iterator filter_list_end() {
 	return AssExportFilterChain::GetFilterList()->end();
 }
 

aegisub/src/ass_exporter.h

@@ -37,15 +37,15 @@
 #include <wx/sizer.h>
 #include <wx/string.h>
 
-#include <list>
 #include <map>
+#include <vector>
 #endif
 
 class AssExportFilter;
 class AssFile;
 namespace agi { struct Context; }
 
-typedef std::list<AssExportFilter*> FilterList;
+typedef std::vector<AssExportFilter*> FilterList;
 
 /// DOCME
 /// @class AssExporter

aegisub/src/dialog_style_manager.cpp

@@ -401,9 +401,10 @@ void DialogStyleManager::OnCatalogDelete() {
 }
 
 void DialogStyleManager::OnCopyToStorage() {
-	std::list<wxString> copied;
 	wxArrayInt selections;
 	int n = CurrentList->GetSelections(selections);
+	wxArrayString copied;
+	copied.reserve(n);
 	for (int i = 0; i < n; i++) {
 		wxString styleName = CurrentList->GetString(selections[i]);
 
@@ -427,9 +428,10 @@ void DialogStyleManager::OnCopyToStorage() {
 }
 
 void DialogStyleManager::OnCopyToCurrent() {
-	std::list<wxString> copied;
 	wxArrayInt selections;
 	int n = StorageList->GetSelections(selections);
+	wxArrayString copied;
+	copied.reserve(n);
 	for (int i = 0; i < n; i++) {
 		wxString styleName = StorageList->GetString(selections[i]);
 		bool addStyle = true;

aegisub/src/subtitle_format.cpp

@@ -68,7 +68,7 @@ SubtitleFormat::SubtitleFormat(wxString const& name)
 }
 
 SubtitleFormat::~SubtitleFormat() {
-	formats.remove(this);
+	formats.erase(remove(begin(formats), end(formats), this));
 }
 
 bool SubtitleFormat::CanReadFile(wxString const& filename) const {
@@ -301,7 +301,7 @@ void SubtitleFormat::MergeIdentical(AssFile &file) {
 	}
 }
 
-std::list<SubtitleFormat*> SubtitleFormat::formats;
+std::vector<SubtitleFormat*> SubtitleFormat::formats;
 
 void SubtitleFormat::LoadFormats() {
 	if (formats.empty()) {

aegisub/src/subtitle_format.h

@@ -35,7 +35,7 @@
 #pragma once
 
 #ifndef AGI_PRE
-#include <list>
+#include <vector>
 
 #include <wx/arrstr.h>
 #include <wx/string.h>
@@ -61,7 +61,7 @@ class SubtitleFormat {
 	virtual wxArrayString GetWriteWildcards() const { return wxArrayString(); }
 
 	/// List of loaded subtitle formats
-	static std::list<SubtitleFormat*> formats;
+	static std::vector<SubtitleFormat*> formats;
 
 public:
 	/// Strip override tags