From 17474b2f71e7e347522821c853ba12e3f3f3d99c Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Sun, 21 Feb 2021 09:35:14 +1100 Subject: [PATCH] fix some compilation issues on various platforms --- app/node/node.cpp | 2 +- app/node/node.h | 16 +++++++--------- app/render/colormanager.cpp | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/app/node/node.cpp b/app/node/node.cpp index df967de2e..af2d121bd 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -1809,7 +1809,7 @@ void Node::LoadImmediate(QXmlStreamReader *reader, const QString& input, int ele if (reader->name() == QStringLiteral("key")) { QString key_input; rational key_time; - NodeKeyframe::Type key_type; + NodeKeyframe::Type key_type = NodeKeyframe::kLinear; QVariant key_value; QPointF key_in_handle; QPointF key_out_handle; diff --git a/app/node/node.h b/app/node/node.h index 42fc9d2cd..96db30415 100644 --- a/app/node/node.h +++ b/app/node/node.h @@ -1183,17 +1183,15 @@ T* Node::ValueToPtr(const QVariant &ptr) template void Node::FindOutputNodeInternal(const Node* n, QVector& list) { - foreach (const std::vector& outputs, n->output_connections_) { - foreach (const NodeInput& output, outputs) { - Node* connected = output.node(); - T* cast_test = dynamic_cast(connected); + foreach (const OutputConnection& output, n->output_connections_) { + Node* connected = output.second.node(); + T* cast_test = dynamic_cast(connected); - if (cast_test) { - list.append(cast_test); - } - - FindOutputNodeInternal(connected); + if (cast_test) { + list.append(cast_test); } + + FindOutputNodeInternal(connected); } } diff --git a/app/render/colormanager.cpp b/app/render/colormanager.cpp index 10f2609bb..521975d71 100644 --- a/app/render/colormanager.cpp +++ b/app/render/colormanager.cpp @@ -281,7 +281,7 @@ void ColorManager::InputValueChangedEvent(const QString &input, int element) try { SetConfig(OCIO::Config::CreateFromFile(GetConfigFilename().toUtf8())); - } catch (OCIO::Exception& e) {} + } catch (OCIO::Exception&) {} } }