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 std::enable_shared_from_this instead of thisP parameters.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-05-06 22:59:10 +02:00
parent b4435e5e57
commit e005d47d56
20 changed files with 114 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/render/card/viewer.cpp
+1 -1
View File
@@ -198,7 +198,7 @@ void DataViewer::setData(IndexMap<FieldP,ValueP>& values, IndexMap<FieldP,ValueP
ValueViewerP DataViewer::makeViewer(const StyleP& style) {
return style->makeViewer(*this, style);
return style->makeViewer(*this);
}
void DataViewer::onAction(const Action& action, bool undone) {
src/render/value/viewer.hpp
+2 -5
View File
@@ -113,9 +113,6 @@ class ValueViewer : public StyleListener {
Type##ValueViewer(DataViewer& parent, const Type ## StyleP& style)
#define IMPLEMENT_VALUE_VIEWER(Type) \
ValueViewerP Type##Style::makeViewer(DataViewer& parent, const StyleP& thisP) { \
assert(thisP.get() == this); \
return ValueViewerP(new Type##ValueViewer(parent, static_pointer_cast<Type##Style>(thisP))); \
ValueViewerP Type##Style::makeViewer(DataViewer& parent) { \
return ValueViewerP(new Type##ValueViewer(parent, static_pointer_cast<Type##Style>(intrusive_from_this()))); \
}