Skip to content

Commit e8d4733

Browse files
committed
Try to fix EnumEdit linking on MSCV
1 parent 5344339 commit e8d4733

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

common/include/enumedit.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class NOVUSCOMMON_EXPORT EnumEdit : public EditWidget
2929
}
3030
~EnumEdit() override = default;
3131

32-
void setValue(const E &value)
32+
void setEnumValue(const E &value)
3333
{
3434
QSignalBlocker blocker(comboBox);
3535
comboBox->setCurrentIndex(static_cast<int>(value));

parts/scene/objectpropertieswidget.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void ObjectPropertiesWidget::refreshActionData(const ScnSGActionControllerDescri
181181
section->setLayout(layout);
182182

183183
auto typeEdit = new EnumEdit<ScnSGActionControllerDescriptor::Tag>();
184-
typeEdit->setValue(action.tag);
184+
typeEdit->setEnumValue(action.tag);
185185
typeEdit->setEnabled(false);
186186
layout->addRow(i18n("Type"), typeEdit);
187187

@@ -205,7 +205,7 @@ void ObjectPropertiesWidget::refreshActionData(const ScnSGActionControllerDescri
205205
layout->addRow(i18n("VFX Child 1 ID"), vfxChildId2Edit);
206206

207207
auto rotationAxisEdit = new EnumEdit<RotationAxis>();
208-
rotationAxisEdit->setValue(rotation.axis);
208+
rotationAxisEdit->setEnumValue(rotation.axis);
209209
rotationAxisEdit->setEnabled(false);
210210
layout->addRow(i18n("Axis"), rotationAxisEdit);
211211

@@ -457,7 +457,7 @@ void ObjectPropertiesWidget::addTriggerBoxSection(const physis_TriggerBoxInstanc
457457
section->setLayout(layout);
458458

459459
auto shapeEdit = new EnumEdit<TriggerBoxShape>();
460-
shapeEdit->setValue(triggerBox.trigger_box_shape);
460+
shapeEdit->setEnumValue(triggerBox.trigger_box_shape);
461461
shapeEdit->setEnabled(false);
462462
layout->addRow(i18n("Shape"), shapeEdit);
463463

@@ -542,7 +542,7 @@ void ObjectPropertiesWidget::addExitRangeSection(const physis_ExitRangeInstanceO
542542
section->setLayout(layout);
543543

544544
auto exitTypeEdit = new EnumEdit<ExitType>();
545-
exitTypeEdit->setValue(exitRange.exit_type);
545+
exitTypeEdit->setEnumValue(exitRange.exit_type);
546546
exitTypeEdit->setEnabled(false);
547547
layout->addRow(i18n("Exit Type"), exitTypeEdit);
548548

@@ -615,7 +615,7 @@ void ObjectPropertiesWidget::addLightSection(const physis_LightInstanceObject &l
615615
section->setLayout(layout);
616616

617617
auto lightTypeEdit = new EnumEdit<LightType>();
618-
lightTypeEdit->setValue(light.light_type);
618+
lightTypeEdit->setEnumValue(light.light_type);
619619
lightTypeEdit->setEnabled(false);
620620
layout->addRow(i18n("Light Type"), lightTypeEdit);
621621
}
@@ -654,7 +654,7 @@ void ObjectPropertiesWidget::addEnvSetSection(const physis_EnvSetInstanceObject
654654
layout->addRow(i18n("Bound Instance ID"), boundInstanceIdEdit);
655655

656656
auto shapeEdit = new EnumEdit<EnvSetShape>();
657-
shapeEdit->setValue(envSet.shape);
657+
shapeEdit->setEnumValue(envSet.shape);
658658
shapeEdit->setEnabled(false);
659659
layout->addRow(i18n("Shape"), shapeEdit);
660660

0 commit comments

Comments
 (0)