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

Clean up pointer use:

Browse Source 
* Use unique_ptr for Actions instead of manual memory management
 * Use unique_ptr in KeywordDatabase
 * Use unique_ptr instead of shared_ptr for file formats
 * Don't pass shared_ptr to Reader/Writer, use references instead
Also
 * Switch to C++17 so we can use map::try_emplace
This commit is contained in:
Twan van Laarhoven
2020-04-25 21:30:05 +02:00
parent 708b4389a0
commit 64ea1d7322
57 changed files with 363 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/data/installer.cpp
+7 -15
View File
@@ -21,14 +21,6 @@
#include <wx/zipstrm.h>
#include <wx/stdpaths.h>
DECLARE_TYPEOF_COLLECTION(String);
DECLARE_TYPEOF_COLLECTION(PackagedP);
DECLARE_TYPEOF_COLLECTION(PackageDependencyP);
DECLARE_TYPEOF_COLLECTION(PackageDescriptionP);
DECLARE_TYPEOF_COLLECTION(InstallablePackageP);
DECLARE_POINTER_TYPE(wxFileInputStream);
DECLARE_POINTER_TYPE(wxZipInputStream);
// Don't do this check for now, because we can't bless packages
#define USE_MODIFIED_CHECK 0
@@ -50,8 +42,8 @@ void Installer::validate(Version file_app_version) {
// TODO: support absolute icon names
try{
String filename = p->name + _("/") + p->icon_url;
InputStreamP img = openIn(p->name + _("/") + p->icon_url);
image_load_file(p->icon, *img);
auto img_stream = openIn(p->name + _("/") + p->icon_url);
image_load_file(p->icon, *img_stream);
} catch (...) {
// ignore errors, it's just an image
p->icon_url.clear();
@@ -195,9 +187,9 @@ void Installer::addPackage(Packaged& package) {
const FileInfos& file_infos = package.getFileInfos();
for (FileInfos::const_iterator it = file_infos.begin() ; it != file_infos.end() ; ++it) {
String file = it->first;
InputStreamP is = package.openIn(file);
OutputStreamP os = openOut(name + _("/") + file);
os->Write(*is);
auto in_stream = package.openIn(file);
auto out_stream = openOut(name + _("/") + file);
out_stream->Write(*in_stream);
}
}
@@ -235,8 +227,8 @@ PackageDescription::PackageDescription(const Packaged& package)
}
}
// icon
InputStreamP file = const_cast<Packaged&>(package).openIconFile();
if (file) image_load_file(icon, *file);
auto file_stream = const_cast<Packaged&>(package).openIconFile();
if (file_stream) image_load_file(icon, *file_stream);
}
IMPLEMENT_REFLECTION_NO_SCRIPT(PackageDescription) {