GUI: Use PtrMap in the GUI classes

xoreos · Oct 29, 2016 · da68283 · da68283
1 parent 1667fdd
commit da68283
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -287,14 +287,7 @@ void MainWindow::close() {
 	_files.clear();
 	_path.clear();
 
-	for (ArchiveMap::iterator a = _archives.begin(); a != _archives.end(); ++a)
-		delete a->second;
-
 	_archives.clear();
-
-	for (KEYDataFileMap::iterator d = _keyDataFiles.begin(); d != _keyDataFiles.end(); ++d)
-		delete d->second;
-
 	_keyDataFiles.clear();
 
 	resourceSelect(0);

diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h
@@ -29,6 +29,7 @@
 
 #include <wx/frame.h>
 
+#include "src/common/ptrmap.h"
 #include "src/common/ustring.h"
 #include "src/common/filetree.h"
 
@@ -74,8 +75,8 @@ class MainWindow : public wxFrame {
 	Aurora::Archive *getArchive(const boost::filesystem::path &path);
 
 private:
-	typedef std::map<Common::UString, Aurora::Archive *> ArchiveMap;
-	typedef std::map<Common::UString, Aurora::KEYDataFile *> KEYDataFileMap;
+	typedef Common::PtrMap<Common::UString, Aurora::Archive> ArchiveMap;
+	typedef Common::PtrMap<Common::UString, Aurora::KEYDataFile> KEYDataFileMap;
 
 	Common::UString _path;
 	Common::FileTree _files;