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/set/window.cpp
+3 -3
View File
@@ -309,7 +309,7 @@ void SetWindow::onChangeSet() {
updateTitle();
// make sure there is always at least one card
// some things need this
if (set->cards.empty()) set->cards.push_back(intrusive(new Card(*set->game)));
if (set->cards.empty()) set->cards.push_back(make_intrusive<Card>(*set->game));
// all panels view the same set
FOR_EACH(p, panels) {
p->setSet(set);
@@ -383,11 +383,11 @@ void SetWindow::onCardActivate(CardSelectEvent& ev) {
}
void SetWindow::selectionChoices(ExportCardSelectionChoices& out) {
out.push_back(intrusive(new ExportCardSelectionChoice(*set))); // entire set
out.push_back(make_intrusive<ExportCardSelectionChoice>(*set)); // entire set
FOR_EACH(p, panels) {
p->selectionChoices(out);
}
out.push_back(intrusive(new ExportCardSelectionChoice())); // custom
out.push_back(make_intrusive<ExportCardSelectionChoice>()); // custom
}
// ----------------------------------------------------------------------------- : Window events - close