From a261dd55f153fb18dda5e9daa63d992a823a65cf Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Fri, 22 Jan 2021 16:04:37 +1100 Subject: [PATCH] use quintptrs for footage rather than QVariant::fromValue --- app/project/project.cpp | 2 +- app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/project/project.cpp b/app/project/project.cpp index 1efa67b4b..00ce92542 100644 --- a/app/project/project.cpp +++ b/app/project/project.cpp @@ -89,7 +89,7 @@ void Project::Load(QXmlStreamReader *reader, MainWindowLayoutInfo* layout, uint foreach (const XMLNodeData::FootageConnection& con, xml_node_data.footage_connections) { if (con.footage) { - con.input->SetStandardValue(QVariant::fromValue(xml_node_data.footage_ptrs.value(con.footage)), con.element); + con.input->SetStandardValue(Node::PtrToValue(xml_node_data.footage_ptrs.value(con.footage)), con.element); } } } diff --git a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp index c0ec02478..6d828f03b 100644 --- a/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp +++ b/app/widget/nodeparamview/nodeparamviewwidgetbridge.cpp @@ -359,7 +359,7 @@ void NodeParamViewWidgetBridge::WidgetCallback() case NodeValue::kFootage: { // Widget is a FootageComboBox - SetInputValue(QVariant::fromValue(static_cast(sender())->SelectedFootage()), 0); + SetInputValue(Node::PtrToValue(static_cast(sender())->SelectedFootage()), 0); break; } case NodeValue::kCombo: