amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-10 04:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use make_intrusive/make_shared for smart pointer construction.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-23 23:51:34 +02:00
parent 815df01ba5
commit 708b4389a0
67 changed files with 313 additions and 329 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/packages_window.cpp
+2 -2
View File
@@ -214,7 +214,7 @@ PackagesWindow::PackagesWindow(Window* parent, const InstallerP& installer)
{
init(parent, true);
// add installer
merge(installable_packages, intrusive(new DownloadableInstaller(installer)));
merge(installable_packages, make_intrusive<DownloadableInstaller>(installer));
FOR_EACH(p, installable_packages) p->determineStatus();
// mark all packages in the installer for installation
FOR_EACH(ip, installable_packages) {
@@ -353,7 +353,7 @@ void PackagesWindow::onOk(wxCommandEvent& ev) {
os.Write(*is);
os.Close();
// open installer
ip->installer->installer = intrusive(new Installer());
ip->installer->installer = make_intrusive<Installer>();
ip->installer->installer->open(ip->installer->installer_file);
}
}