From 1b9bf6d92cd577044f67c67144f099ccee79c916 Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Mon, 16 Nov 2020 16:17:43 +1100 Subject: [PATCH] switched many QLists for QVectors Minor optimization --- app/core.cpp | 2 +- app/core.h | 2 +- app/node/audio/pan/pan.cpp | 2 +- app/node/audio/pan/pan.h | 2 +- app/node/audio/volume/volume.cpp | 2 +- app/node/audio/volume/volume.h | 2 +- app/node/block/block.cpp | 6 +- app/node/block/block.h | 4 +- .../crossdissolve/crossdissolvetransition.cpp | 2 +- .../crossdissolve/crossdissolvetransition.h | 2 +- .../diptocolor/diptocolortransition.cpp | 2 +- .../diptocolor/diptocolortransition.h | 2 +- app/node/filter/blur/blur.cpp | 2 +- app/node/filter/blur/blur.h | 2 +- app/node/filter/stroke/stroke.cpp | 2 +- app/node/filter/stroke/stroke.h | 2 +- app/node/generator/matrix/matrix.cpp | 2 +- app/node/generator/matrix/matrix.h | 2 +- app/node/generator/polygon/polygon.cpp | 2 +- app/node/generator/polygon/polygon.h | 2 +- app/node/generator/solid/solid.cpp | 2 +- app/node/generator/solid/solid.h | 2 +- app/node/generator/text/text.cpp | 2 +- app/node/generator/text/text.h | 2 +- app/node/input.cpp | 12 ++-- app/node/input.h | 8 +-- app/node/input/media/media.cpp | 2 +- app/node/input/media/media.h | 2 +- app/node/input/time/timeinput.cpp | 2 +- app/node/input/time/timeinput.h | 2 +- app/node/math/math/math.cpp | 2 +- app/node/math/math/math.h | 2 +- app/node/math/merge/merge.cpp | 2 +- app/node/math/merge/merge.h | 2 +- app/node/math/trigonometry/trigonometry.cpp | 2 +- app/node/math/trigonometry/trigonometry.h | 2 +- app/node/node.cpp | 52 +++++++++--------- app/node/node.h | 44 +++++++-------- app/node/output/track/track.cpp | 2 +- app/node/output/track/track.h | 2 +- app/node/output/viewer/viewer.cpp | 2 +- app/node/output/viewer/viewer.h | 2 +- app/node/traverser.cpp | 2 +- app/panel/curve/curve.cpp | 2 +- app/panel/curve/curve.h | 2 +- app/panel/node/node.h | 12 ++-- app/panel/param/param.cpp | 4 +- app/panel/param/param.h | 8 +-- app/panel/table/table.h | 4 +- app/panel/timeline/timeline.h | 4 +- app/render/previewautocacher.cpp | 6 +- app/task/project/saveotio/saveotio.cpp | 2 +- app/widget/curvewidget/curveview.cpp | 2 +- app/widget/curvewidget/curvewidget.cpp | 4 +- app/widget/curvewidget/curvewidget.h | 6 +- app/widget/keyframeview/keyframeviewbase.cpp | 2 +- app/widget/nodecopypaste/nodecopypaste.cpp | 12 ++-- app/widget/nodecopypaste/nodecopypaste.h | 4 +- app/widget/nodeparamview/nodeparamview.cpp | 8 +-- app/widget/nodeparamview/nodeparamview.h | 12 ++-- app/widget/nodeparamview/nodeparamviewitem.h | 4 +- app/widget/nodetableview/nodetableview.cpp | 4 +- app/widget/nodetableview/nodetableview.h | 4 +- app/widget/nodetableview/nodetablewidget.h | 4 +- app/widget/nodetreeview/nodetreeview.cpp | 4 +- app/widget/nodetreeview/nodetreeview.h | 8 +-- app/widget/nodeview/nodeview.cpp | 53 +++++++++--------- app/widget/nodeview/nodeview.h | 24 ++++---- app/widget/nodeview/nodeviewscene.cpp | 16 +++--- app/widget/nodeview/nodeviewscene.h | 6 +- app/widget/nodeview/nodeviewundo.cpp | 4 +- app/widget/nodeview/nodeviewundo.h | 8 +-- .../projectexplorer/projectexplorer.cpp | 4 +- app/widget/timelinewidget/timelinewidget.cpp | 55 +++++++++---------- app/widget/timelinewidget/timelinewidget.h | 16 +++--- app/widget/timelinewidget/tool/pointer.cpp | 36 ++++++------ app/widget/timelinewidget/tool/pointer.h | 2 +- app/widget/timelinewidget/undo/undo.cpp | 2 +- app/widget/timelinewidget/undo/undo.h | 4 +- app/widget/timetarget/timetarget.cpp | 2 +- 80 files changed, 273 insertions(+), 281 deletions(-) diff --git a/app/core.cpp b/app/core.cpp index 86c2f829b..60be123ed 100644 --- a/app/core.cpp +++ b/app/core.cpp @@ -1034,7 +1034,7 @@ void Core::SetPreferenceForRenderMode(RenderMode::Mode mode, const QString &pref Config::Current()[GetRenderModePreferencePrefix(mode, preference)] = value; } -void Core::LabelNodes(const QList &nodes) const +void Core::LabelNodes(const QVector &nodes) const { if (nodes.isEmpty()) { return; diff --git a/app/core.h b/app/core.h index 89d609a42..62257a36a 100644 --- a/app/core.h +++ b/app/core.h @@ -233,7 +233,7 @@ public: /** * @brief Show a dialog to the user to rename a set of nodes */ - void LabelNodes(const QList& nodes) const; + void LabelNodes(const QVector &nodes) const; /** * @brief Create a new sequence named appropriately for the active project diff --git a/app/node/audio/pan/pan.cpp b/app/node/audio/pan/pan.cpp index d8b7f5183..7fbfd99ca 100644 --- a/app/node/audio/pan/pan.cpp +++ b/app/node/audio/pan/pan.cpp @@ -49,7 +49,7 @@ QString PanNode::id() const return QStringLiteral("org.olivevideoeditor.Olive.pan"); } -QList PanNode::Category() const +QVector PanNode::Category() const { return {kCategoryChannels}; } diff --git a/app/node/audio/pan/pan.h b/app/node/audio/pan/pan.h index df23f9d0f..9ec58b110 100644 --- a/app/node/audio/pan/pan.h +++ b/app/node/audio/pan/pan.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual NodeValueTable Value(NodeValueDatabase &value) const override; diff --git a/app/node/audio/volume/volume.cpp b/app/node/audio/volume/volume.cpp index 4b403118b..b6d48e764 100644 --- a/app/node/audio/volume/volume.cpp +++ b/app/node/audio/volume/volume.cpp @@ -49,7 +49,7 @@ QString VolumeNode::id() const return QStringLiteral("org.olivevideoeditor.Olive.volume"); } -QList VolumeNode::Category() const +QVector VolumeNode::Category() const { return {kCategoryFilter}; } diff --git a/app/node/audio/volume/volume.h b/app/node/audio/volume/volume.h index e408e3be7..c17656241 100644 --- a/app/node/audio/volume/volume.h +++ b/app/node/audio/volume/volume.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual NodeValueTable Value(NodeValueDatabase &value) const override; diff --git a/app/node/block/block.cpp b/app/node/block/block.cpp index 68b9779bd..0289e11b2 100644 --- a/app/node/block/block.cpp +++ b/app/node/block/block.cpp @@ -58,7 +58,7 @@ Block::Block() : set_length_and_media_out(1); } -QList Block::Category() const +QVector Block::Category() const { return {kCategoryTimeline}; } @@ -241,9 +241,9 @@ void Block::SaveInternal(QXmlStreamWriter *writer) const } } -QList Block::GetInputsToHash() const +QVector Block::GetInputsToHash() const { - QList inputs = Node::GetInputsToHash(); + QVector inputs = Node::GetInputsToHash(); // Ignore these inputs inputs.removeOne(media_in_input_); diff --git a/app/node/block/block.h b/app/node/block/block.h index ca5c700ee..52beed7cb 100644 --- a/app/node/block/block.h +++ b/app/node/block/block.h @@ -43,7 +43,7 @@ public: virtual Type type() const = 0; - virtual QList Category() const override; + virtual QVector Category() const override; const rational& in() const; const rational& out() const; @@ -110,7 +110,7 @@ protected: virtual void SaveInternal(QXmlStreamWriter* writer) const override; - virtual QList GetInputsToHash() const override; + virtual QVector GetInputsToHash() const override; virtual void LengthChangedEvent(const rational& old_length, const rational& new_length, diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp index 2073594b2..c85d48d3e 100644 --- a/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp +++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.cpp @@ -42,7 +42,7 @@ QString CrossDissolveTransition::id() const return QStringLiteral("org.olivevideoeditor.Olive.crossdissolve"); } -QList CrossDissolveTransition::Category() const +QVector CrossDissolveTransition::Category() const { return {kCategoryTransition}; } diff --git a/app/node/block/transition/crossdissolve/crossdissolvetransition.h b/app/node/block/transition/crossdissolve/crossdissolvetransition.h index e45d1de67..98daf4330 100644 --- a/app/node/block/transition/crossdissolve/crossdissolvetransition.h +++ b/app/node/block/transition/crossdissolve/crossdissolvetransition.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; //virtual void Retranslate() override; diff --git a/app/node/block/transition/diptocolor/diptocolortransition.cpp b/app/node/block/transition/diptocolor/diptocolortransition.cpp index eda0b4ef2..d75593158 100644 --- a/app/node/block/transition/diptocolor/diptocolortransition.cpp +++ b/app/node/block/transition/diptocolor/diptocolortransition.cpp @@ -43,7 +43,7 @@ QString DipToColorTransition::id() const return QStringLiteral("org.olivevideoeditor.Olive.diptocolor"); } -QList DipToColorTransition::Category() const +QVector DipToColorTransition::Category() const { return {kCategoryTransition}; } diff --git a/app/node/block/transition/diptocolor/diptocolortransition.h b/app/node/block/transition/diptocolor/diptocolortransition.h index 2c19443e1..660b5fcfc 100644 --- a/app/node/block/transition/diptocolor/diptocolortransition.h +++ b/app/node/block/transition/diptocolor/diptocolortransition.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual ShaderCode GetShaderCode(const QString& shader_id) const override; diff --git a/app/node/filter/blur/blur.cpp b/app/node/filter/blur/blur.cpp index e9e0005bf..332a31555 100644 --- a/app/node/filter/blur/blur.cpp +++ b/app/node/filter/blur/blur.cpp @@ -59,7 +59,7 @@ QString BlurFilterNode::id() const return QStringLiteral("org.olivevideoeditor.Olive.blur"); } -QList BlurFilterNode::Category() const +QVector BlurFilterNode::Category() const { return {kCategoryFilter}; } diff --git a/app/node/filter/blur/blur.h b/app/node/filter/blur/blur.h index 6f9100605..088363991 100644 --- a/app/node/filter/blur/blur.h +++ b/app/node/filter/blur/blur.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/filter/stroke/stroke.cpp b/app/node/filter/stroke/stroke.cpp index 2cea51f75..5606c19a8 100644 --- a/app/node/filter/stroke/stroke.cpp +++ b/app/node/filter/stroke/stroke.cpp @@ -63,7 +63,7 @@ QString StrokeFilterNode::id() const return QStringLiteral("org.olivevideoeditor.Olive.stroke"); } -QList StrokeFilterNode::Category() const +QVector StrokeFilterNode::Category() const { return {kCategoryFilter}; } diff --git a/app/node/filter/stroke/stroke.h b/app/node/filter/stroke/stroke.h index b9d1ac993..044f9ba95 100644 --- a/app/node/filter/stroke/stroke.h +++ b/app/node/filter/stroke/stroke.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/generator/matrix/matrix.cpp b/app/node/generator/matrix/matrix.cpp index b35247276..836510a3f 100644 --- a/app/node/generator/matrix/matrix.cpp +++ b/app/node/generator/matrix/matrix.cpp @@ -72,7 +72,7 @@ QString MatrixGenerator::id() const return QStringLiteral("org.olivevideoeditor.Olive.transform"); } -QList MatrixGenerator::Category() const +QVector MatrixGenerator::Category() const { return {kCategoryGenerator, kCategoryMath}; } diff --git a/app/node/generator/matrix/matrix.h b/app/node/generator/matrix/matrix.h index d6418eda8..ff1ddddb6 100644 --- a/app/node/generator/matrix/matrix.h +++ b/app/node/generator/matrix/matrix.h @@ -39,7 +39,7 @@ public: virtual QString Name() const override; virtual QString ShortName() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/generator/polygon/polygon.cpp b/app/node/generator/polygon/polygon.cpp index c11324bef..379eb659f 100644 --- a/app/node/generator/polygon/polygon.cpp +++ b/app/node/generator/polygon/polygon.cpp @@ -69,7 +69,7 @@ QString PolygonGenerator::id() const return QStringLiteral("org.olivevideoeditor.Olive.polygon"); } -QList PolygonGenerator::Category() const +QVector PolygonGenerator::Category() const { return {kCategoryGenerator}; } diff --git a/app/node/generator/polygon/polygon.h b/app/node/generator/polygon/polygon.h index 296177dea..d764ae7be 100644 --- a/app/node/generator/polygon/polygon.h +++ b/app/node/generator/polygon/polygon.h @@ -35,7 +35,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/generator/solid/solid.cpp b/app/node/generator/solid/solid.cpp index 0fdafc143..9309dcd69 100644 --- a/app/node/generator/solid/solid.cpp +++ b/app/node/generator/solid/solid.cpp @@ -48,7 +48,7 @@ QString SolidGenerator::id() const return QStringLiteral("org.olivevideoeditor.Olive.solidgenerator"); } -QList SolidGenerator::Category() const +QVector SolidGenerator::Category() const { return {kCategoryGenerator}; } diff --git a/app/node/generator/solid/solid.h b/app/node/generator/solid/solid.h index aa6fb5f79..101c8f15a 100644 --- a/app/node/generator/solid/solid.h +++ b/app/node/generator/solid/solid.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/generator/text/text.cpp b/app/node/generator/text/text.cpp index 1ff7c7a95..3c078cf34 100644 --- a/app/node/generator/text/text.cpp +++ b/app/node/generator/text/text.cpp @@ -72,7 +72,7 @@ QString TextGenerator::id() const return QStringLiteral("org.olivevideoeditor.Olive.textgenerator"); } -QList TextGenerator::Category() const +QVector TextGenerator::Category() const { return {kCategoryGenerator}; } diff --git a/app/node/generator/text/text.h b/app/node/generator/text/text.h index e4a14b868..cb80fd035 100644 --- a/app/node/generator/text/text.h +++ b/app/node/generator/text/text.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/input.cpp b/app/node/input.cpp index de31c0934..d34e777b6 100644 --- a/app/node/input.cpp +++ b/app/node/input.cpp @@ -423,7 +423,7 @@ QVariant NodeInput::StringToValue(const DataType& data_type, const QString &stri } } -void NodeInput::GetDependencies(QList &list, bool traverse, bool exclusive_only) const +void NodeInput::GetDependencies(QVector &list, bool traverse, bool exclusive_only) const { if (is_connected() && (get_connected_output()->edges().size() == 1 || !exclusive_only)) { @@ -433,7 +433,7 @@ void NodeInput::GetDependencies(QList &list, bool traverse, bool exclusi list.append(connected); if (traverse) { - QList connected_inputs = connected->GetInputsIncludingArrays(); + QVector connected_inputs = connected->GetInputsIncludingArrays(); foreach (NodeInput* i, connected_inputs) { i->GetDependencies(list, traverse, exclusive_only); @@ -461,21 +461,21 @@ QVariant NodeInput::GetDefaultValueForTrack(int track) const return default_value_.at(track); } -QList NodeInput::GetDependencies(bool traverse, bool exclusive_only) const +QVector NodeInput::GetDependencies(bool traverse, bool exclusive_only) const { - QList list; + QVector list; GetDependencies(list, traverse, exclusive_only); return list; } -QList NodeInput::GetExclusiveDependencies() const +QVector NodeInput::GetExclusiveDependencies() const { return GetDependencies(true, true); } -QList NodeInput::GetImmediateDependencies() const +QVector NodeInput::GetImmediateDependencies() const { return GetDependencies(false, false); } diff --git a/app/node/input.h b/app/node/input.h index 2a81c6d40..c7296ad3e 100644 --- a/app/node/input.h +++ b/app/node/input.h @@ -282,17 +282,17 @@ public: static QVariant StringToValue(const DataType &data_type, const QString &string, bool value_is_a_key_track); - void GetDependencies(QList& list, bool traverse, bool exclusive_only) const; + void GetDependencies(QVector &list, bool traverse, bool exclusive_only) const; QVariant GetDefaultValue() const; QVariant GetDefaultValueForTrack(int track) const; - QList GetDependencies(bool traverse = true, bool exclusive_only = false) const; + QVector GetDependencies(bool traverse = true, bool exclusive_only = false) const; - QList GetExclusiveDependencies() const; + QVector GetExclusiveDependencies() const; - QList GetImmediateDependencies() const; + QVector GetImmediateDependencies() const; signals: void ValueChanged(const OLIVE_NAMESPACE::TimeRange& range); diff --git a/app/node/input/media/media.cpp b/app/node/input/media/media.cpp index 8d5acd4b8..5469ef46c 100644 --- a/app/node/input/media/media.cpp +++ b/app/node/input/media/media.cpp @@ -35,7 +35,7 @@ MediaInput::MediaInput() : AddInput(footage_input_); } -QList MediaInput::Category() const +QVector MediaInput::Category() const { return {kCategoryInput}; } diff --git a/app/node/input/media/media.h b/app/node/input/media/media.h index 1ed9e0889..895a4ff66 100644 --- a/app/node/input/media/media.h +++ b/app/node/input/media/media.h @@ -38,7 +38,7 @@ public: virtual Stream::Type type() const = 0; - virtual QList Category() const override; + virtual QVector Category() const override; StreamPtr stream(); void SetStream(StreamPtr s); diff --git a/app/node/input/time/timeinput.cpp b/app/node/input/time/timeinput.cpp index d4df5b32b..485e90173 100644 --- a/app/node/input/time/timeinput.cpp +++ b/app/node/input/time/timeinput.cpp @@ -41,7 +41,7 @@ QString TimeInput::id() const return QStringLiteral("org.olivevideoeditor.Olive.time"); } -QList TimeInput::Category() const +QVector TimeInput::Category() const { return {kCategoryInput}; } diff --git a/app/node/input/time/timeinput.h b/app/node/input/time/timeinput.h index e79d1b333..d41492942 100644 --- a/app/node/input/time/timeinput.h +++ b/app/node/input/time/timeinput.h @@ -35,7 +35,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual NodeValueTable Value(NodeValueDatabase& value) const override; diff --git a/app/node/math/math/math.cpp b/app/node/math/math/math.cpp index 9330d64d3..fc43f7010 100644 --- a/app/node/math/math/math.cpp +++ b/app/node/math/math/math.cpp @@ -55,7 +55,7 @@ QString MathNode::id() const return QStringLiteral("org.olivevideoeditor.Olive.math"); } -QList MathNode::Category() const +QVector MathNode::Category() const { return {kCategoryMath}; } diff --git a/app/node/math/math/math.h b/app/node/math/math/math.h index 81e5111b1..97edcdf0b 100644 --- a/app/node/math/math/math.h +++ b/app/node/math/math/math.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/math/merge/merge.cpp b/app/node/math/merge/merge.cpp index c9a53dc54..6b7ab17a6 100644 --- a/app/node/math/merge/merge.cpp +++ b/app/node/math/merge/merge.cpp @@ -46,7 +46,7 @@ QString MergeNode::id() const return QStringLiteral("org.olivevideoeditor.Olive.merge"); } -QList MergeNode::Category() const +QVector MergeNode::Category() const { return {kCategoryMath}; } diff --git a/app/node/math/merge/merge.h b/app/node/math/merge/merge.h index 70f79369b..57182caaf 100644 --- a/app/node/math/merge/merge.h +++ b/app/node/math/merge/merge.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/math/trigonometry/trigonometry.cpp b/app/node/math/trigonometry/trigonometry.cpp index c2f0d03ff..a8649ff64 100644 --- a/app/node/math/trigonometry/trigonometry.cpp +++ b/app/node/math/trigonometry/trigonometry.cpp @@ -48,7 +48,7 @@ QString TrigonometryNode::id() const return QStringLiteral("org.olivevideoeditor.Olive.trigonometry"); } -QList TrigonometryNode::Category() const +QVector TrigonometryNode::Category() const { return {kCategoryMath}; } diff --git a/app/node/math/trigonometry/trigonometry.h b/app/node/math/trigonometry/trigonometry.h index 9af68472f..b1524616a 100644 --- a/app/node/math/trigonometry/trigonometry.h +++ b/app/node/math/trigonometry/trigonometry.h @@ -34,7 +34,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; virtual void Retranslate() override; diff --git a/app/node/node.cpp b/app/node/node.cpp index c1b90e950..c531f3c14 100644 --- a/app/node/node.cpp +++ b/app/node/node.cpp @@ -265,12 +265,12 @@ void Node::SaveInternal(QXmlStreamWriter *) const { } -QList Node::GetInputsToHash() const +QVector Node::GetInputsToHash() const { return GetInputsIncludingArrays(); } -void GetInputsIncludingArraysInternal(NodeInputArray* array, QList& list) +void GetInputsIncludingArraysInternal(NodeInputArray* array, QVector& list) { foreach (NodeInput* input, array->sub_params()) { list.append(input); @@ -281,9 +281,9 @@ void GetInputsIncludingArraysInternal(NodeInputArray* array, QList& } } -QList Node::GetInputsIncludingArrays() const +QVector Node::GetInputsIncludingArrays() const { - QList inputs; + QVector inputs; foreach (NodeParam* param, params_) { if (param->type() == NodeParam::kInput) { @@ -300,7 +300,7 @@ QList Node::GetInputsIncludingArrays() const return inputs; } -QList Node::GetOutputs() const +QVector Node::GetOutputs() const { // The current design only uses one output per node. This function returns a list just in case that changes. return {output_}; @@ -347,7 +347,7 @@ void Node::Hash(QCryptographicHash &hash, const rational& time) const // Add this Node's ID hash.addData(id().toUtf8()); - QList inputs = GetInputsToHash(); + QVector inputs = GetInputsToHash(); foreach (NodeInput* input, inputs) { // For each input, try to hash its value @@ -416,8 +416,8 @@ void Node::CopyInputs(Node *source, Node *destination, bool include_connections) { Q_ASSERT(source->id() == destination->id()); - const QList& src_param = source->params_; - const QList& dst_param = destination->params_; + const QVector& src_param = source->params_; + const QVector& dst_param = destination->params_; for (int i=0;i& Node::parameters() const +const QVector& Node::parameters() const { return params_; } @@ -478,9 +478,9 @@ int Node::IndexOfParameter(NodeParam *param) const * TRUE to recursively traverse each node for a complete dependency graph. FALSE to return only the immediate * dependencies. */ -QList Node::GetDependenciesInternal(bool traverse, bool exclusive_only) const { - QList inputs = GetInputsIncludingArrays(); - QList list; +QVector Node::GetDependenciesInternal(bool traverse, bool exclusive_only) const { + QVector inputs = GetInputsIncludingArrays(); + QVector list; foreach (NodeInput* i, inputs) { i->GetDependencies(list, traverse, exclusive_only); @@ -489,17 +489,17 @@ QList Node::GetDependenciesInternal(bool traverse, bool exclusive_only) c return list; } -QList Node::GetDependencies() const +QVector Node::GetDependencies() const { return GetDependenciesInternal(true, false); } -QList Node::GetExclusiveDependencies() const +QVector Node::GetExclusiveDependencies() const { return GetDependenciesInternal(true, true); } -QList Node::GetImmediateDependencies() const +QVector Node::GetImmediateDependencies() const { return GetDependenciesInternal(false, false); } @@ -523,7 +523,7 @@ void Node::GenerateFrame(FramePtr frame, const GenerateJob &job) const NodeInput *Node::GetInputWithID(const QString &id) const { - QList inputs = GetInputsIncludingArrays(); + QVector inputs = GetInputsIncludingArrays(); foreach (NodeInput* i, inputs) { if (i->id() == id) { @@ -548,7 +548,7 @@ NodeOutput *Node::GetOutputWithID(const QString &id) const bool Node::OutputsTo(Node *n, bool recursively) const { - QList outputs = GetOutputs(); + QVector outputs = GetOutputs(); foreach (NodeOutput* output, outputs) { foreach (NodeEdgePtr edge, output->edges()) { @@ -567,7 +567,7 @@ bool Node::OutputsTo(Node *n, bool recursively) const bool Node::OutputsTo(const QString &id, bool recursively) const { - QList outputs = GetOutputs(); + QVector outputs = GetOutputs(); foreach (NodeOutput* output, outputs) { foreach (NodeEdgePtr edge, output->edges()) { @@ -586,7 +586,7 @@ bool Node::OutputsTo(const QString &id, bool recursively) const bool Node::OutputsTo(NodeInput *input, bool recursively, bool include_arrays) const { - QList outputs = GetOutputs(); + QVector outputs = GetOutputs(); foreach (NodeOutput* output, outputs) { foreach (NodeEdgePtr edge, output->edges()) { @@ -608,7 +608,7 @@ bool Node::OutputsTo(NodeInput *input, bool recursively, bool include_arrays) co bool Node::InputsFrom(Node *n, bool recursively) const { - QList inputs = GetInputsIncludingArrays(); + QVector inputs = GetInputsIncludingArrays(); foreach (NodeInput* input, inputs) { foreach (NodeEdgePtr edge, input->edges()) { @@ -627,7 +627,7 @@ bool Node::InputsFrom(Node *n, bool recursively) const bool Node::InputsFrom(const QString &id, bool recursively) const { - QList inputs = GetInputsIncludingArrays(); + QVector inputs = GetInputsIncludingArrays(); foreach (NodeInput* input, inputs) { foreach (NodeEdgePtr edge, input->edges()) { @@ -649,7 +649,7 @@ int Node::GetRoutesTo(Node *n) const bool outputs_directly = false; int routes = 0; - QList outputs = GetOutputs(); + QVector outputs = GetOutputs(); foreach (NodeOutput* o, outputs) { foreach (NodeEdgePtr edge, o->edges()) { @@ -728,13 +728,13 @@ QString Node::GetCategoryName(const CategoryID &c) return tr("Uncategorized"); } -QList Node::TransformTimeTo(const TimeRange &time, Node *target, NodeParam::Type direction) +QVector Node::TransformTimeTo(const TimeRange &time, Node *target, NodeParam::Type direction) { - QList paths_found; + QVector paths_found; if (direction == NodeParam::kInput) { // Get list of all inputs - QList inputs = GetInputsIncludingArrays(); + QVector inputs = GetInputsIncludingArrays(); // If this input is connected, traverse it to see if we stumble across the specified `node` foreach (NodeInput* input, inputs) { @@ -755,7 +755,7 @@ QList Node::TransformTimeTo(const TimeRange &time, Node *target, Node } } else { // Get list of all outputs - QList outputs = GetOutputs(); + QVector outputs = GetOutputs(); // If this input is connected, traverse it to see if we stumble across the specified `node` foreach (NodeOutput* output, outputs) { diff --git a/app/node/node.h b/app/node/node.h index 6da128f51..003b3911d 100644 --- a/app/node/node.h +++ b/app/node/node.h @@ -132,7 +132,7 @@ public: * interpreted as an empty string category. This value should be run through a translator as its largely user * oriented. */ - virtual QList Category() const = 0; + virtual QVector Category() const = 0; /** * @brief Return a description of this node's purpose (optional for subclassing, but recommended) @@ -150,7 +150,7 @@ public: /** * @brief Return a list of NodeParams */ - const QList& parameters() const; + const QVector& parameters() const; /** * @brief Return the index of a parameter @@ -161,7 +161,7 @@ public: /** * @brief Return a list of all Nodes that this Node's inputs are connected to (does not include this Node) */ - QList GetDependencies() const; + QVector GetDependencies() const; /** * @brief Returns a list of Nodes that this Node is dependent on, provided no other Nodes are dependent on them @@ -169,12 +169,12 @@ public: * * Similar to GetDependencies(), but excludes any Nodes that are used outside the dependency graph of this Node. */ - QList GetExclusiveDependencies() const; + QVector GetExclusiveDependencies() const; /** * @brief Retrieve immediate dependencies (only nodes that are directly connected to the inputs of this one) */ - QList GetImmediateDependencies() const; + QVector GetImmediateDependencies() const; /** * @brief Generate hardware accelerated code for this Node @@ -277,19 +277,19 @@ public: /** * @brief Transforms time from this node through the connections it takes to get to the specified node */ - QList TransformTimeTo(const TimeRange& time, Node* target, NodeParam::Type direction); + QVector TransformTimeTo(const TimeRange& time, Node* target, NodeParam::Type direction); /** * @brief Find nodes of a certain type that this Node takes inputs from */ template - QList FindInputNodes() const; + QVector FindInputNodes() const; template /** * @brief Find a node of a certain type that this Node outputs to */ - QList FindOutputNode(); + QVector FindOutputNode(); /** * @brief Convert a pointer to a value that can be sent between NodeParams @@ -407,9 +407,9 @@ public: void SetPosition(const QPointF& pos); - QList GetInputsIncludingArrays() const; + QVector GetInputsIncludingArrays() const; - QList GetOutputs() const; + QVector GetOutputs() const; virtual bool HasGizmos() const; @@ -435,7 +435,7 @@ protected: virtual void SaveInternal(QXmlStreamWriter* writer) const; - virtual QList GetInputsToHash() const; + virtual QVector GetInputsToHash() const; protected slots: void InputChanged(const OLIVE_NAMESPACE::TimeRange &range); @@ -488,14 +488,14 @@ private: void DisconnectInput(NodeInput* input); template - static void FindInputNodeInternal(const Node* n, QList& list); + static void FindInputNodeInternal(const Node* n, QVector& list); template - static void FindOutputNodeInternal(const Node* n, QList& list); + static void FindOutputNodeInternal(const Node* n, QVector& list); - QList GetDependenciesInternal(bool traverse, bool exclusive_only) const; + QVector GetDependenciesInternal(bool traverse, bool exclusive_only) const; - QList params_; + QVector params_; /** * @brief Internal variable for whether this Node can be deleted or not @@ -520,9 +520,9 @@ private: }; template -void Node::FindInputNodeInternal(const Node* n, QList& list) +void Node::FindInputNodeInternal(const Node* n, QVector &list) { - QList inputs = n->GetInputsIncludingArrays(); + QVector inputs = n->GetInputsIncludingArrays(); foreach (NodeInput* input, inputs) { if (input->is_connected()) { @@ -539,9 +539,9 @@ void Node::FindInputNodeInternal(const Node* n, QList& list) } template -QList Node::FindInputNodes() const +QVector Node::FindInputNodes() const { - QList list; + QVector list; FindInputNodeInternal(this, list); @@ -555,7 +555,7 @@ T* Node::ValueToPtr(const QVariant &ptr) } template -void Node::FindOutputNodeInternal(const Node* n, QList& list) { +void Node::FindOutputNodeInternal(const Node* n, QVector& list) { foreach (NodeEdgePtr edge, n->output()->edges()) { Node* connected = edge->input()->parentNode(); T* cast_test = dynamic_cast(connected); @@ -569,9 +569,9 @@ void Node::FindOutputNodeInternal(const Node* n, QList& list) { } template -QList Node::FindOutputNode() +QVector Node::FindOutputNode() { - QList list; + QVector list; FindOutputNodeInternal(this, list); diff --git a/app/node/output/track/track.cpp b/app/node/output/track/track.cpp index 1cd8de5f9..09bb92615 100644 --- a/app/node/output/track/track.cpp +++ b/app/node/output/track/track.cpp @@ -85,7 +85,7 @@ QString TrackOutput::id() const return QStringLiteral("org.olivevideoeditor.Olive.track"); } -QList TrackOutput::Category() const +QVector TrackOutput::Category() const { return {kCategoryTimeline}; } diff --git a/app/node/output/track/track.h b/app/node/output/track/track.h index b498f4b68..06296c513 100644 --- a/app/node/output/track/track.h +++ b/app/node/output/track/track.h @@ -45,7 +45,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; const double& GetTrackHeight() const; diff --git a/app/node/output/viewer/viewer.cpp b/app/node/output/viewer/viewer.cpp index b6a4753ef..b2917546d 100644 --- a/app/node/output/viewer/viewer.cpp +++ b/app/node/output/viewer/viewer.cpp @@ -82,7 +82,7 @@ QString ViewerOutput::id() const return QStringLiteral("org.olivevideoeditor.Olive.vieweroutput"); } -QList ViewerOutput::Category() const +QVector ViewerOutput::Category() const { return {kCategoryOutput}; } diff --git a/app/node/output/viewer/viewer.h b/app/node/output/viewer/viewer.h index 94185f2ac..3113c2eae 100644 --- a/app/node/output/viewer/viewer.h +++ b/app/node/output/viewer/viewer.h @@ -53,7 +53,7 @@ public: virtual QString Name() const override; virtual QString id() const override; - virtual QList Category() const override; + virtual QVector Category() const override; virtual QString Description() const override; void ShiftVideoCache(const rational& from, const rational& to); diff --git a/app/node/traverser.cpp b/app/node/traverser.cpp index 1994d8fd5..fd6593417 100644 --- a/app/node/traverser.cpp +++ b/app/node/traverser.cpp @@ -29,7 +29,7 @@ NodeValueDatabase NodeTraverser::GenerateDatabase(const Node* node, const TimeRa NodeValueDatabase database; // We need to insert tables into the database for each input - QList inputs = node->GetInputsIncludingArrays(); + QVector inputs = node->GetInputsIncludingArrays(); foreach (NodeInput* input, inputs) { if (IsCancelled()) { diff --git a/app/panel/curve/curve.cpp b/app/panel/curve/curve.cpp index fd6e418ae..8625f111b 100644 --- a/app/panel/curve/curve.cpp +++ b/app/panel/curve/curve.cpp @@ -37,7 +37,7 @@ void CurvePanel::DeleteSelected() static_cast(GetTimeBasedWidget())->DeleteSelected(); } -void CurvePanel::SetNodes(const QList &nodes) +void CurvePanel::SetNodes(const QVector &nodes) { static_cast(GetTimeBasedWidget())->SetNodes(nodes); } diff --git a/app/panel/curve/curve.h b/app/panel/curve/curve.h index 375c42822..52903dbf0 100644 --- a/app/panel/curve/curve.h +++ b/app/panel/curve/curve.h @@ -35,7 +35,7 @@ public: virtual void DeleteSelected() override; public slots: - void SetNodes(const QList& nodes); + void SetNodes(const QVector &nodes); virtual void IncreaseTrackHeight() override; diff --git a/app/panel/node/node.h b/app/panel/node/node.h index 8580b7c1e..cba87c52c 100644 --- a/app/panel/node/node.h +++ b/app/panel/node/node.h @@ -76,30 +76,30 @@ public: } public slots: - void Select(const QList& nodes) + void Select(const QVector& nodes) { node_view_->Select(nodes); } - void SelectWithDependencies(const QList& nodes) + void SelectWithDependencies(const QVector& nodes) { node_view_->SelectWithDependencies(nodes); } - void SelectBlocks(const QList& nodes) + void SelectBlocks(const QVector& nodes) { node_view_->SelectBlocks(nodes); } - void DeselectBlocks(const QList& nodes) + void DeselectBlocks(const QVector& nodes) { node_view_->DeselectBlocks(nodes); } signals: - void NodesSelected(const QList& nodes); + void NodesSelected(const QVector& nodes); - void NodesDeselected(const QList& nodes); + void NodesDeselected(const QVector& nodes); private: virtual void Retranslate() override diff --git a/app/panel/param/param.cpp b/app/panel/param/param.cpp index 2b9df7f4c..68ae7525a 100644 --- a/app/panel/param/param.cpp +++ b/app/panel/param/param.cpp @@ -36,14 +36,14 @@ ParamPanel::ParamPanel(QWidget* parent) : Retranslate(); } -void ParamPanel::SelectNodes(const QList &nodes) +void ParamPanel::SelectNodes(const QVector &nodes) { static_cast(GetTimeBasedWidget())->SelectNodes(nodes); Retranslate(); } -void ParamPanel::DeselectNodes(const QList &nodes) +void ParamPanel::DeselectNodes(const QVector &nodes) { static_cast(GetTimeBasedWidget())->DeselectNodes(nodes); diff --git a/app/panel/param/param.h b/app/panel/param/param.h index 3c4f15354..de7a67967 100644 --- a/app/panel/param/param.h +++ b/app/panel/param/param.h @@ -34,15 +34,15 @@ public: ParamPanel(QWidget* parent); public slots: - void SelectNodes(const QList& nodes); - void DeselectNodes(const QList& nodes); + void SelectNodes(const QVector& nodes); + void DeselectNodes(const QVector& nodes); virtual void DeleteSelected() override; signals: - void RequestSelectNode(const QList& target); + void RequestSelectNode(const QVector& target); - void NodeOrderChanged(const QList& nodes); + void NodeOrderChanged(const QVector& nodes); void FocusedNodeChanged(Node* n); diff --git a/app/panel/table/table.h b/app/panel/table/table.h index 85c6ea888..10e2bc338 100644 --- a/app/panel/table/table.h +++ b/app/panel/table/table.h @@ -33,12 +33,12 @@ public: NodeTablePanel(QWidget* parent); public slots: - void SelectNodes(const QList& nodes) + void SelectNodes(const QVector& nodes) { static_cast(GetTimeBasedWidget())->SelectNodes(nodes); } - void DeselectNodes(const QList& nodes) + void DeselectNodes(const QVector& nodes) { static_cast(GetTimeBasedWidget())->DeselectNodes(nodes); } diff --git a/app/panel/timeline/timeline.h b/app/panel/timeline/timeline.h index b05f7b8bc..30bab181a 100644 --- a/app/panel/timeline/timeline.h +++ b/app/panel/timeline/timeline.h @@ -91,9 +91,9 @@ protected: virtual void Retranslate() override; signals: - void BlocksSelected(const QList& selected_blocks); + void BlocksSelected(const QVector& selected_blocks); - void BlocksDeselected(const QList& deselected_blocks); + void BlocksDeselected(const QVector& deselected_blocks); }; diff --git a/app/render/previewautocacher.cpp b/app/render/previewautocacher.cpp index 9e5902e19..9091b720b 100644 --- a/app/render/previewautocacher.cpp +++ b/app/render/previewautocacher.cpp @@ -453,7 +453,7 @@ void PreviewAutoCacher::CopyNodeInputValue(NodeInput *input) // disconnecting whatever was connected to it // We start by removing all old dependencies from the map - QList old_deps = our_copy->GetExclusiveDependencies(); + QVector old_deps = our_copy->GetExclusiveDependencies(); foreach (Node* i, old_deps) { copy_map_.take(copy_map_.key(i))->deleteLater(); } @@ -496,8 +496,8 @@ Node* PreviewAutoCacher::CopyNodeConnections(Node* src_node) Node::CopyInputs(src_node, dst_node, false); // Copy all connections - QList src_node_inputs = src_node->GetInputsIncludingArrays(); - QList dst_node_inputs = dst_node->GetInputsIncludingArrays(); + QVector src_node_inputs = src_node->GetInputsIncludingArrays(); + QVector dst_node_inputs = dst_node->GetInputsIncludingArrays(); for (int i=0;iset_source_range(opentimelineio::v1_0::TimeRange(block->in().toRationalTime(), block->length().toRationalTime())); - QList media_nodes = block->FindInputNodes(); + QVector media_nodes = block->FindInputNodes(); if (!media_nodes.isEmpty()) { auto media_ref = new opentimelineio::v1_0::ExternalReference(media_nodes.first()->stream()->footage()->filename().toStdString()); otio_clip->set_media_reference(media_ref); diff --git a/app/widget/curvewidget/curveview.cpp b/app/widget/curvewidget/curveview.cpp index a9b43d4a9..c1ece5146 100644 --- a/app/widget/curvewidget/curveview.cpp +++ b/app/widget/curvewidget/curveview.cpp @@ -89,7 +89,7 @@ void CurveView::ConnectInput(NodeInput *input) void CurveView::DisconnectNode(Node *node) { - QList inputs = node->GetInputsIncludingArrays(); + QVector inputs = node->GetInputsIncludingArrays(); foreach (NodeInput* i, inputs) { DisconnectInput(i); diff --git a/app/widget/curvewidget/curvewidget.cpp b/app/widget/curvewidget/curvewidget.cpp index 41d2a88ef..7a80a8dfc 100644 --- a/app/widget/curvewidget/curvewidget.cpp +++ b/app/widget/curvewidget/curvewidget.cpp @@ -131,7 +131,7 @@ void CurveWidget::DeleteSelected() view_->DeleteSelected(); } -void CurveWidget::SetNodes(const QList &nodes) +void CurveWidget::SetNodes(const QVector &nodes) { tree_view_->SetNodes(nodes); @@ -216,7 +216,7 @@ void CurveWidget::UpdateBridgeTime(const int64_t ×tamp) void CurveWidget::ConnectNode(Node *n) { - QList inputs = n->GetInputsIncludingArrays(); + QVector inputs = n->GetInputsIncludingArrays(); foreach (NodeInput* i, inputs) { if (tree_view_->IsInputEnabled(i)) { diff --git a/app/widget/curvewidget/curvewidget.h b/app/widget/curvewidget/curvewidget.h index 253ca6a71..530da8ac2 100644 --- a/app/widget/curvewidget/curvewidget.h +++ b/app/widget/curvewidget/curvewidget.h @@ -49,7 +49,7 @@ public: void DeleteSelected(); public slots: - void SetNodes(const QList& nodes); + void SetNodes(const QVector &nodes); protected: virtual void TimeChangedEvent(const int64_t &) override; @@ -85,9 +85,7 @@ private: NodeParamViewKeyframeControl* key_control_; - QList checkboxes_; - - QList nodes_; + QVector nodes_; private slots: void SelectionChanged(); diff --git a/app/widget/keyframeview/keyframeviewbase.cpp b/app/widget/keyframeview/keyframeviewbase.cpp index b53a0c236..80c27fd91 100644 --- a/app/widget/keyframeview/keyframeviewbase.cpp +++ b/app/widget/keyframeview/keyframeviewbase.cpp @@ -76,7 +76,7 @@ void KeyframeViewBase::DeleteSelected() void KeyframeViewBase::RemoveKeyframesOfNode(Node *n) { - QList inputs = n->GetInputsIncludingArrays(); + QVector inputs = n->GetInputsIncludingArrays(); foreach (NodeInput* i, inputs) { RemoveKeyframesOfInput(i); diff --git a/app/widget/nodecopypaste/nodecopypaste.cpp b/app/widget/nodecopypaste/nodecopypaste.cpp index 914e9f32c..a35db606f 100644 --- a/app/widget/nodecopypaste/nodecopypaste.cpp +++ b/app/widget/nodecopypaste/nodecopypaste.cpp @@ -29,7 +29,7 @@ OLIVE_NAMESPACE_ENTER -void NodeCopyPasteWidget::CopyNodesToClipboard(const QList &nodes, void *userdata) +void NodeCopyPasteWidget::CopyNodesToClipboard(const QVector &nodes, void *userdata) { QString copy_str; @@ -56,17 +56,17 @@ void NodeCopyPasteWidget::CopyNodesToClipboard(const QList &nodes, void Core::CopyStringToClipboard(copy_str); } -QList NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUndoCommand* command, void *userdata) +QVector NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUndoCommand* command, void *userdata) { QString clipboard = Core::PasteStringFromClipboard(); if (clipboard.isEmpty()) { - return QList(); + return QVector(); } QXmlStreamReader reader(clipboard); - QList pasted_nodes; + QVector pasted_nodes; XMLNodeData xml_node_data; while (XMLReadNextStartElement(&reader)) { @@ -100,7 +100,7 @@ QList NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUnd if (pasted_nodes.isEmpty()) { // If we passed through the whole string and there were no nodes, it must not be data for us after all - return QList(); + return QVector(); } // If we have some nodes AND the XML data was malformed, the user should probably know @@ -116,7 +116,7 @@ QList NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUnd QCoreApplication::translate("NodeCopyPasteWidget", "Failed to paste nodes: %1").arg(reader.errorString()), QMessageBox::Ok); - return QList(); + return QVector(); } // Add all nodes to graph diff --git a/app/widget/nodecopypaste/nodecopypaste.h b/app/widget/nodecopypaste/nodecopypaste.h index 9791ae99f..0691692ef 100644 --- a/app/widget/nodecopypaste/nodecopypaste.h +++ b/app/widget/nodecopypaste/nodecopypaste.h @@ -35,9 +35,9 @@ public: NodeCopyPasteWidget() = default; protected: - void CopyNodesToClipboard(const QList& nodes, void* userdata = nullptr); + void CopyNodesToClipboard(const QVector &nodes, void* userdata = nullptr); - QList PasteNodesFromClipboard(Sequence *graph, QUndoCommand *command, void* userdata = nullptr); + QVector PasteNodesFromClipboard(Sequence *graph, QUndoCommand *command, void* userdata = nullptr); virtual void CopyNodesToClipboardInternal(QXmlStreamWriter *writer, void* userdata); diff --git a/app/widget/nodeparamview/nodeparamview.cpp b/app/widget/nodeparamview/nodeparamview.cpp index b07031ea6..5cdc32452 100644 --- a/app/widget/nodeparamview/nodeparamview.cpp +++ b/app/widget/nodeparamview/nodeparamview.cpp @@ -135,7 +135,7 @@ NodeParamView::NodeParamView(QWidget *parent) : &NodeParamView::FocusChanged); } -void NodeParamView::SelectNodes(const QList &nodes) +void NodeParamView::SelectNodes(const QVector &nodes) { active_nodes_.append(nodes); @@ -185,7 +185,7 @@ void NodeParamView::SelectNodes(const QList &nodes) } } -void NodeParamView::DeselectNodes(const QList &nodes) +void NodeParamView::DeselectNodes(const QVector &nodes) { // Remove item from map and delete the widget bool changes_made = false; @@ -283,8 +283,8 @@ void NodeParamView::QueueKeyframePositionUpdate() void NodeParamView::SignalNodeOrder() { // Sort by item Y (apparently there's no way in Qt to get the order of dock widgets) - QList nodes; - QList item_ys; + QVector nodes; + QVector item_ys; for (auto it=items_.cbegin(); it!=items_.cend(); it++) { int item_y = it.value()->pos().y(); diff --git a/app/widget/nodeparamview/nodeparamview.h b/app/widget/nodeparamview/nodeparamview.h index f9fee45db..a8e43b0bb 100644 --- a/app/widget/nodeparamview/nodeparamview.h +++ b/app/widget/nodeparamview/nodeparamview.h @@ -60,8 +60,8 @@ class NodeParamView : public TimeBasedWidget public: NodeParamView(QWidget* parent = nullptr); - void SelectNodes(const QList& nodes); - void DeselectNodes(const QList& nodes); + void SelectNodes(const QVector &nodes); + void DeselectNodes(const QVector& nodes); const QMap& GetItemMap() const { @@ -75,9 +75,9 @@ public: signals: void InputDoubleClicked(NodeInput* input); - void RequestSelectNode(const QList& target); + void RequestSelectNode(const QVector& target); - void NodeOrderChanged(const QList& nodes); + void NodeOrderChanged(const QVector& nodes); void FocusedNodeChanged(Node* n); @@ -113,9 +113,9 @@ private: // docking windows QMainWindow* param_widget_area_; - QList pinned_nodes_; + QVector pinned_nodes_; - QList active_nodes_; + QVector active_nodes_; QMap node_expanded_state_; diff --git a/app/widget/nodeparamview/nodeparamviewitem.h b/app/widget/nodeparamview/nodeparamviewitem.h index 2bc8972fa..4731ef782 100644 --- a/app/widget/nodeparamview/nodeparamviewitem.h +++ b/app/widget/nodeparamview/nodeparamviewitem.h @@ -91,7 +91,7 @@ signals: void InputDoubleClicked(NodeInput* input); - void RequestSelectNode(const QList& node); + void RequestSelectNode(const QVector& node); private: void UpdateUIForEdgeConnection(NodeInput* input); @@ -161,7 +161,7 @@ signals: void InputDoubleClicked(NodeInput* input); - void RequestSelectNode(const QList& node); + void RequestSelectNode(const QVector& node); void PinToggled(bool e); diff --git a/app/widget/nodetableview/nodetableview.cpp b/app/widget/nodetableview/nodetableview.cpp index 4f5116b7f..80f6b8fd4 100644 --- a/app/widget/nodetableview/nodetableview.cpp +++ b/app/widget/nodetableview/nodetableview.cpp @@ -40,7 +40,7 @@ NodeTableView::NodeTableView(QWidget* parent) : tr("A/W")}); } -void NodeTableView::SelectNodes(const QList &nodes) +void NodeTableView::SelectNodes(const QVector &nodes) { foreach (Node* n, nodes) { QTreeWidgetItem* top_item = new QTreeWidgetItem(); @@ -53,7 +53,7 @@ void NodeTableView::SelectNodes(const QList &nodes) SetTime(last_time_); } -void NodeTableView::DeselectNodes(const QList &nodes) +void NodeTableView::DeselectNodes(const QVector &nodes) { foreach (Node* n, nodes) { delete top_level_item_map_.take(n); diff --git a/app/widget/nodetableview/nodetableview.h b/app/widget/nodetableview/nodetableview.h index 7aa6e3eeb..de5d920d3 100644 --- a/app/widget/nodetableview/nodetableview.h +++ b/app/widget/nodetableview/nodetableview.h @@ -32,9 +32,9 @@ class NodeTableView : public QTreeWidget public: NodeTableView(QWidget* parent = nullptr); - void SelectNodes(const QList& nodes); + void SelectNodes(const QVector &nodes); - void DeselectNodes(const QList& nodes); + void DeselectNodes(const QVector& nodes); void SetTime(const rational& time); diff --git a/app/widget/nodetableview/nodetablewidget.h b/app/widget/nodetableview/nodetablewidget.h index 1eeecbfcb..2b499b629 100644 --- a/app/widget/nodetableview/nodetablewidget.h +++ b/app/widget/nodetableview/nodetablewidget.h @@ -31,12 +31,12 @@ class NodeTableWidget : public TimeBasedWidget public: NodeTableWidget(QWidget* parent = nullptr); - void SelectNodes(const QList& nodes) + void SelectNodes(const QVector& nodes) { view_->SelectNodes(nodes); } - void DeselectNodes(const QList& nodes) + void DeselectNodes(const QVector& nodes) { view_->DeselectNodes(nodes); } diff --git a/app/widget/nodetreeview/nodetreeview.cpp b/app/widget/nodetreeview/nodetreeview.cpp index b02a707d9..324dd78c8 100644 --- a/app/widget/nodetreeview/nodetreeview.cpp +++ b/app/widget/nodetreeview/nodetreeview.cpp @@ -21,7 +21,7 @@ bool NodeTreeView::IsInputEnabled(NodeInput *i) const return !disabled_inputs_.contains(i); } -void NodeTreeView::SetNodes(const QList &nodes) +void NodeTreeView::SetNodes(const QVector &nodes) { nodes_ = nodes; @@ -34,7 +34,7 @@ void NodeTreeView::SetNodes(const QList &nodes) node_item->setData(0, kItemType, kItemTypeNode); node_item->setData(0, kItemPointer, reinterpret_cast(n)); - QList inputs = n->GetInputsIncludingArrays(); + QVector inputs = n->GetInputsIncludingArrays(); foreach (NodeInput* i, inputs) { if (only_show_keyframable_ && !i->is_keyframable()) { continue; diff --git a/app/widget/nodetreeview/nodetreeview.h b/app/widget/nodetreeview/nodetreeview.h index 2b221a68c..65d87bbda 100644 --- a/app/widget/nodetreeview/nodetreeview.h +++ b/app/widget/nodetreeview/nodetreeview.h @@ -23,7 +23,7 @@ public: } public slots: - void SetNodes(const QList& nodes); + void SetNodes(const QVector &nodes); signals: void NodeEnableChanged(Node* n, bool e); @@ -44,11 +44,11 @@ private: static const int kItemType = Qt::UserRole; static const int kItemPointer = Qt::UserRole + 1; - QList nodes_; + QVector nodes_; - QList disabled_nodes_; + QVector disabled_nodes_; - QList disabled_inputs_; + QVector disabled_inputs_; bool only_show_keyframable_; diff --git a/app/widget/nodeview/nodeview.cpp b/app/widget/nodeview/nodeview.cpp index d3cfdd3b9..2f40b1aa3 100644 --- a/app/widget/nodeview/nodeview.cpp +++ b/app/widget/nodeview/nodeview.cpp @@ -115,7 +115,7 @@ void NodeView::DeleteSelected() QUndoCommand* command = new QUndoCommand(); { - QList selected_edges = scene_.GetSelectedEdges(); + QVector selected_edges = scene_.GetSelectedEdges(); foreach (NodeEdge* edge, selected_edges) { new NodeEdgeRemoveCommand(edge->output(), edge->input(), command); @@ -124,7 +124,7 @@ void NodeView::DeleteSelected() } { - QList selected_nodes = scene_.GetSelectedNodes(); + QVector selected_nodes = scene_.GetSelectedNodes(); // Ensure no nodes are "undeletable" for (int i=0;i &nodes) +void NodeView::Select(const QVector &nodes) { if (!graph_) { return; @@ -188,7 +188,7 @@ void NodeView::Select(const QList &nodes) SceneSelectionChangedSlot(); } -void NodeView::SelectWithDependencies(QList nodes) +void NodeView::SelectWithDependencies(QVector nodes) { if (!graph_) { return; @@ -202,7 +202,7 @@ void NodeView::SelectWithDependencies(QList nodes) Select(nodes); } -void NodeView::SelectBlocks(const QList &blocks) +void NodeView::SelectBlocks(const QVector &blocks) { if (!graph_) { return; @@ -213,7 +213,7 @@ void NodeView::SelectBlocks(const QList &blocks) QueueSelectBlocksInternal(); } -void NodeView::DeselectBlocks(const QList &blocks) +void NodeView::DeselectBlocks(const QVector &blocks) { if (!graph_) { return; @@ -240,7 +240,7 @@ void NodeView::CopySelected(bool cut) return; } - QList selected = scene_.GetSelectedNodes(); + QVector selected = scene_.GetSelectedNodes(); if (selected.isEmpty()) { return; @@ -261,7 +261,7 @@ void NodeView::Paste() QUndoCommand* command = new QUndoCommand(); - QList pasted_nodes = PasteNodesFromClipboard(static_cast(graph_), command); + QVector pasted_nodes = PasteNodesFromClipboard(static_cast(graph_), command); Core::instance()->undo_stack()->pushIfHasChildren(command); @@ -280,7 +280,7 @@ void NodeView::Duplicate() return; } - QList selected = scene_.GetSelectedNodes(); + QVector selected = scene_.GetSelectedNodes(); if (selected.isEmpty()) { return; @@ -488,10 +488,10 @@ void NodeView::wheelEvent(QWheelEvent *event) void NodeView::SceneSelectionChangedSlot() { - QList current_selection = scene_.GetSelectedNodes(); + QVector current_selection = scene_.GetSelectedNodes(); - QList selected; - QList deselected; + QVector selected; + QVector deselected; // Determine which nodes are newly selected if (selected_nodes_.isEmpty()) { @@ -540,7 +540,7 @@ void NodeView::ShowContextMenu(const QPoint &pos) m.addSeparator(); - QList selected = scene_.GetSelectedItems(); + QVector selected = scene_.GetSelectedItems(); if (itemAt(pos) && !selected.isEmpty()) { @@ -636,7 +636,7 @@ void NodeView::ContextMenuSetDirection(QAction *action) void NodeView::AutoPositionDescendents() { - QList selected = scene_.GetSelectedNodes(); + QVector selected = scene_.GetSelectedNodes(); foreach (Node* n, selected) { scene_.ReorganizeFrom(n); @@ -665,18 +665,18 @@ void NodeView::ContextMenuFilterChanged(QAction *action) } } -void NodeView::AttachNodesToCursor(const QList &nodes) +void NodeView::AttachNodesToCursor(const QVector &nodes) { - QList items; + QVector items(nodes.size()); - foreach (Node* p, nodes) { - items.append(scene_.NodeToUIObject(p)); + for (int i=0; i& items) +void NodeView::AttachItemsToCursor(const QVector& items) { DetachItemsFromCursor(); @@ -731,7 +731,7 @@ void NodeView::UpdateBlockFilter() bool first = true; QPointF last_bottom_right; - QList currently_visible; + QVector currently_visible; foreach (Block* b, selected_blocks_) { // Auto-position this node's dependencies @@ -741,7 +741,7 @@ void NodeView::UpdateBlockFilter() QPointF node_pos = b->GetPosition(); QRectF anchor(node_pos, node_pos); - QList deps = b->GetDependencies(); + QVector deps = b->GetDependencies(); foreach (Node* d, deps) { QPointF dep_pos = d->GetPosition(); @@ -779,8 +779,7 @@ void NodeView::UpdateBlockFilter() // ...then add its associations deps.append(temporary_association_map_[b]); - QHash >::const_iterator i; - for (i=association_map_.begin(); i!=association_map_.end(); i++) { + for (auto i=association_map_.begin(); i!=association_map_.end(); i++) { if (i.value().contains(b)) { deps.append(i.key()); } @@ -835,7 +834,7 @@ void NodeView::SelectBlocksInternal() UpdateBlockFilter(); } - QList nodes; + QVector nodes; nodes.reserve(selected_blocks_.size()); foreach (Block* b, selected_blocks_) { @@ -888,7 +887,7 @@ void NodeView::GraphEdgeAdded(NodeEdgePtr edge) Node* input_node = edge->input()->parentNode(); if (input_node->OutputsTo(static_cast(graph_)->viewer_output(), true)) { - QHash >::const_iterator i = association_map_.begin(); + auto i = association_map_.begin(); while (i != association_map_.end()) { if (input_node->InputsFrom(i.key(), true)) { @@ -917,14 +916,14 @@ void NodeView::GraphEdgeRemoved(NodeEdgePtr edge) } } - QList disconnected_nodes; + QVector disconnected_nodes; disconnected_nodes.append(output_node); disconnected_nodes.append(output_node->GetDependencies()); if (output_node->OutputsTo(static_cast(graph_)->viewer_output(), true)) { // Check if this disconnected node still has a path to the viewer somewhere else foreach (Block* b, selected_blocks_) { - QList& temp_assocs = temporary_association_map_[b]; + QVector& temp_assocs = temporary_association_map_[b]; temp_assocs.append(disconnected_nodes); } diff --git a/app/widget/nodeview/nodeview.h b/app/widget/nodeview/nodeview.h index 5bcf7799e..d05c8f899 100644 --- a/app/widget/nodeview/nodeview.h +++ b/app/widget/nodeview/nodeview.h @@ -58,22 +58,22 @@ public: void SelectAll(); void DeselectAll(); - void Select(const QList& nodes); - void SelectWithDependencies(QList nodes); + void Select(const QVector& nodes); + void SelectWithDependencies(QVector nodes); void CopySelected(bool cut); void Paste(); void Duplicate(); - void SelectBlocks(const QList& blocks); + void SelectBlocks(const QVector& blocks); - void DeselectBlocks(const QList& blocks); + void DeselectBlocks(const QVector& blocks); signals: - void NodesSelected(const QList& nodes); + void NodesSelected(const QVector& nodes); - void NodesDeselected(const QList& nodes); + void NodesDeselected(const QVector& nodes); protected: virtual void keyPressEvent(QKeyEvent *event) override; @@ -85,9 +85,9 @@ protected: virtual void wheelEvent(QWheelEvent* event) override; private: - void AttachNodesToCursor(const QList& nodes); + void AttachNodesToCursor(const QVector &nodes); - void AttachItemsToCursor(const QList& items); + void AttachItemsToCursor(const QVector &items); void DetachItemsFromCursor(); @@ -121,13 +121,13 @@ private: NodeViewScene scene_; - QList selected_nodes_; + QVector selected_nodes_; - QList selected_blocks_; + QVector selected_blocks_; - QHash > association_map_; + QHash > association_map_; - QHash > temporary_association_map_; + QHash > temporary_association_map_; enum FilterMode { kFilterShowAll, diff --git a/app/widget/nodeview/nodeviewscene.cpp b/app/widget/nodeview/nodeviewscene.cpp index a36657b7c..1ae231b5d 100644 --- a/app/widget/nodeview/nodeviewscene.cpp +++ b/app/widget/nodeview/nodeviewscene.cpp @@ -120,10 +120,10 @@ void NodeViewScene::SetGraph(NodeGraph *graph) graph_ = graph; } -QList NodeViewScene::GetSelectedNodes() const +QVector NodeViewScene::GetSelectedNodes() const { QHash::const_iterator iterator; - QList selected; + QVector selected; for (iterator=item_map_.begin();iterator!=item_map_.end();iterator++) { if (iterator.value()->isSelected()) { @@ -134,10 +134,10 @@ QList NodeViewScene::GetSelectedNodes() const return selected; } -QList NodeViewScene::GetSelectedItems() const +QVector NodeViewScene::GetSelectedItems() const { QHash::const_iterator iterator; - QList selected; + QVector selected; for (iterator=item_map_.begin();iterator!=item_map_.end();iterator++) { if (iterator.value()->isSelected()) { @@ -148,9 +148,9 @@ QList NodeViewScene::GetSelectedItems() const return selected; } -QList NodeViewScene::GetSelectedEdges() const +QVector NodeViewScene::GetSelectedEdges() const { - QList edges; + QVector edges; QHash::const_iterator i; @@ -228,7 +228,7 @@ void NodeViewScene::RemoveEdge(NodeEdgePtr edge) int NodeViewScene::DetermineWeight(Node *n) { - QList inputs = n->GetImmediateDependencies(); + QVector inputs = n->GetImmediateDependencies(); int weight = 0; @@ -253,7 +253,7 @@ NodeViewCommon::FlowDirection NodeViewScene::GetFlowDirection() const void NodeViewScene::ReorganizeFrom(Node* n) { - QList immediates = n->GetImmediateDependencies(); + QVector immediates = n->GetImmediateDependencies(); if (immediates.isEmpty()) { // Nothing to do diff --git a/app/widget/nodeview/nodeviewscene.h b/app/widget/nodeview/nodeviewscene.h index 1cb3d1a6c..87128bb3b 100644 --- a/app/widget/nodeview/nodeviewscene.h +++ b/app/widget/nodeview/nodeviewscene.h @@ -63,9 +63,9 @@ public: void SetGraph(NodeGraph* graph); - QList GetSelectedNodes() const; - QList GetSelectedItems() const; - QList GetSelectedEdges() const; + QVector GetSelectedNodes() const; + QVector GetSelectedItems() const; + QVector GetSelectedEdges() const; const QHash& item_map() const; const QHash& edge_map() const; diff --git a/app/widget/nodeview/nodeviewundo.cpp b/app/widget/nodeview/nodeviewundo.cpp index 032cd0bcd..7e5d35170 100644 --- a/app/widget/nodeview/nodeviewundo.cpp +++ b/app/widget/nodeview/nodeviewundo.cpp @@ -131,7 +131,7 @@ Project *NodeAddCommand::GetRelevantProject() const return static_cast(graph_)->project(); } -NodeRemoveCommand::NodeRemoveCommand(NodeGraph *graph, const QList &nodes, QUndoCommand *parent) : +NodeRemoveCommand::NodeRemoveCommand(NodeGraph *graph, const QVector &nodes, QUndoCommand *parent) : UndoCommand(parent), graph_(graph), nodes_(nodes) @@ -197,7 +197,7 @@ Project *NodeRemoveCommand::GetRelevantProject() const NodeRemoveWithExclusiveDeps::NodeRemoveWithExclusiveDeps(NodeGraph *graph, Node *node, QUndoCommand *parent) : UndoCommand(parent) { - QList node_and_its_deps; + QVector node_and_its_deps; node_and_its_deps.append(node); node_and_its_deps.append(node->GetExclusiveDependencies()); diff --git a/app/widget/nodeview/nodeviewundo.h b/app/widget/nodeview/nodeviewundo.h index 6b2854e38..9fc95d717 100644 --- a/app/widget/nodeview/nodeviewundo.h +++ b/app/widget/nodeview/nodeviewundo.h @@ -98,7 +98,7 @@ private: class NodeRemoveCommand : public UndoCommand { public: NodeRemoveCommand(NodeGraph* graph, - const QList& nodes, + const QVector& nodes, QUndoCommand* parent = nullptr); virtual Project* GetRelevantProject() const override; @@ -111,9 +111,9 @@ private: QObject memory_manager_; NodeGraph* graph_; - QList nodes_; - QList edges_; - QList block_unlink_commands_; + QVector nodes_; + QVector edges_; + QVector block_unlink_commands_; }; class NodeRemoveWithExclusiveDeps : public UndoCommand { diff --git a/app/widget/projectexplorer/projectexplorer.cpp b/app/widget/projectexplorer/projectexplorer.cpp index 8a57628c9..e0bdf6ab7 100644 --- a/app/widget/projectexplorer/projectexplorer.cpp +++ b/app/widget/projectexplorer/projectexplorer.cpp @@ -637,12 +637,12 @@ void ProjectExplorer::DeleteSelected() if (msgbox.clickedButton() == delete_clip_btn) { // Delete any blocks that use this footage - QList blocks_to_remove; + QVector blocks_to_remove; foreach (Sequence* s, used_in_sequences) { foreach (TrackOutput* track, s->viewer_output()->GetTracks()) { foreach (Block* b, track->Blocks()) { - QList deps = b->GetDependencies(); + QVector deps = b->GetDependencies(); foreach (MediaInput* i, footage_nodes) { if (deps.contains(i)) { diff --git a/app/widget/timelinewidget/timelinewidget.cpp b/app/widget/timelinewidget/timelinewidget.cpp index 68e39e7cb..bc48f0172 100644 --- a/app/widget/timelinewidget/timelinewidget.cpp +++ b/app/widget/timelinewidget/timelinewidget.cpp @@ -362,7 +362,7 @@ rational TimelineWidget::GetToolTipTimebase() const void TimelineWidget::SelectAll() { - QList newly_selected_blocks; + QVector newly_selected_blocks; for (auto it=block_items_.cbegin(); it!=block_items_.cend(); it++) { if (!selected_blocks_.contains(it.key())) { @@ -414,7 +414,7 @@ void TimelineWidget::SplitAtPlayhead() rational playhead_time = Timecode::timestamp_to_time(GetTimestamp(), timebase()); - QList selected_blocks = GetSelectedBlocks(); + QVector selected_blocks = GetSelectedBlocks(); // Prioritize blocks that are selected and overlap the playhead QVector blocks_to_split; @@ -459,7 +459,7 @@ void TimelineWidget::SplitAtPlayhead() } } -void TimelineWidget::ReplaceBlocksWithGaps(const QList &blocks, +void TimelineWidget::ReplaceBlocksWithGaps(const QVector &blocks, bool remove_from_graph, QUndoCommand *command) { @@ -482,8 +482,8 @@ void TimelineWidget::ReplaceBlocksWithGaps(const QList &blocks, void TimelineWidget::DeleteSelected(bool ripple) { - QList selected_list = GetSelectedBlocks(); - QList blocks_to_delete; + QVector selected_list = GetSelectedBlocks(); + QVector blocks_to_delete; foreach (TimelineViewBlockItem* item, selected_list) { Block* b = item->block(); @@ -498,8 +498,8 @@ void TimelineWidget::DeleteSelected(bool ripple) QUndoCommand* command = new QUndoCommand(); - QList clips_to_delete; - QList transitions_to_delete; + QVector clips_to_delete; + QVector transitions_to_delete; foreach (Block* b, blocks_to_delete) { if (b->type() == Block::kClip) { @@ -580,9 +580,9 @@ void TimelineWidget::OverwriteFootageAtPlayhead(const QList &footage) void TimelineWidget::ToggleLinksOnSelected() { - QList sel = GetSelectedBlocks(); + QVector sel = GetSelectedBlocks(); - QList blocks; + QVector blocks; bool link = true; foreach (TimelineViewBlockItem* item, sel) { @@ -612,20 +612,20 @@ void TimelineWidget::CopySelected(bool cut) return; } - QList selected = GetSelectedBlocks(); + QVector selected = GetSelectedBlocks(); if (selected.isEmpty()) { return; } - QList selected_nodes; + QVector selected_nodes; foreach (TimelineViewBlockItem* item, selected) { Node* block = item->block(); selected_nodes.append(block); - QList deps = block->GetDependencies(); + QVector deps = block->GetDependencies(); foreach (Node* d, deps) { if (!selected_nodes.contains(d)) { @@ -649,8 +649,8 @@ void TimelineWidget::Paste(bool insert) QUndoCommand* command = new QUndoCommand(); - QList paste_data; - QList pasted = PasteNodesFromClipboard(static_cast(GetConnectedNode()->parent()), command, &paste_data); + QVector paste_data; + QVector pasted = PasteNodesFromClipboard(static_cast(GetConnectedNode()->parent()), command, &paste_data); rational paste_start = GetTime(); @@ -731,7 +731,7 @@ void TimelineWidget::DeleteInToOut(bool ripple) void TimelineWidget::ToggleSelectedEnabled() { - QList items = GetSelectedBlocks(); + QVector items = GetSelectedBlocks(); if (items.isEmpty()) { return; @@ -748,12 +748,12 @@ void TimelineWidget::ToggleSelectedEnabled() Core::instance()->undo_stack()->pushIfHasChildren(command); } -QList TimelineWidget::GetSelectedBlocks() +QVector TimelineWidget::GetSelectedBlocks() { - QList list; + QVector list(selected_blocks_.size()); - foreach (Block* b, selected_blocks_) { - list.append(block_items_.value(b)); + for (int i=0; i &blocks) { - QList delete_items; - delete_items.reserve(blocks.size()); - - QList deselect_blocks; + QVector deselect_blocks; foreach (Block* b, blocks) { // Disconnect all signals @@ -940,8 +937,6 @@ void TimelineWidget::RemoveBlock(const QList &blocks) // through emit BlocksDeselected(deselect_blocks); } - - qDeleteAll(delete_items); } void TimelineWidget::AddTrack(TrackOutput *track, Timeline::TrackType type) @@ -1051,7 +1046,7 @@ void TimelineWidget::ShowContextMenu() { Menu menu(this); - QList selected = GetSelectedBlocks(); + QVector selected = GetSelectedBlocks(); if (!selected.isEmpty()) { MenuShared::instance()->AddItemsForEditMenu(&menu, true); @@ -1060,8 +1055,8 @@ void TimelineWidget::ShowContextMenu() QAction* properties_action = menu.addAction(tr("Properties")); connect(properties_action, &QAction::triggered, this, [this](){ - QList block_items = GetSelectedBlocks(); - QList nodes; + QVector block_items = GetSelectedBlocks(); + QVector nodes; foreach (TimelineViewBlockItem* i, block_items) { nodes.append(i->block()); @@ -1210,7 +1205,7 @@ const QRect& TimelineWidget::GetRubberBandGeometry() const return rubberband_.geometry(); } -void TimelineWidget::SignalSelectedBlocks(QList input, bool filter) +void TimelineWidget::SignalSelectedBlocks(QVector input, bool filter) { if (input.isEmpty()) { return; @@ -1233,7 +1228,7 @@ void TimelineWidget::SignalSelectedBlocks(QList input, bool filter) emit BlocksSelected(input); } -void TimelineWidget::SignalDeselectedBlocks(const QList &deselected_blocks) +void TimelineWidget::SignalDeselectedBlocks(const QVector &deselected_blocks) { if (deselected_blocks.isEmpty()) { return; diff --git a/app/widget/timelinewidget/timelinewidget.h b/app/widget/timelinewidget/timelinewidget.h index c1be47a75..568f42949 100644 --- a/app/widget/timelinewidget/timelinewidget.h +++ b/app/widget/timelinewidget/timelinewidget.h @@ -89,7 +89,7 @@ public: void ToggleSelectedEnabled(); - QList GetSelectedBlocks(); + QVector GetSelectedBlocks(); virtual bool SnapPoint(QList start_times, rational *movement, int snap_points = kSnapAll) override; @@ -99,7 +99,7 @@ public: void RestoreSplitterState(const QByteArray& state); - static void ReplaceBlocksWithGaps(const QList& blocks, bool remove_from_graph, QUndoCommand* command); + static void ReplaceBlocksWithGaps(const QVector &blocks, bool remove_from_graph, QUndoCommand* command); /** * @brief Retrieve the QGraphicsItem at a particular scene position @@ -185,12 +185,12 @@ public: * this is preferable and should only be set to FALSE if the list is guaranteed not to contain * already selected blocks (and therefore filtering can be skipped to save time). */ - void SignalSelectedBlocks(QList selected_blocks, bool filter = true); + void SignalSelectedBlocks(QVector selected_blocks, bool filter = true); /** * @brief Track blocks that have been newly deselected */ - void SignalDeselectedBlocks(const QList& deselected_blocks); + void SignalDeselectedBlocks(const QVector &deselected_blocks); /** * @brief Convenience function to deselect all blocks and signal them @@ -198,9 +198,9 @@ public: void SignalDeselectedAllBlocks(); signals: - void BlocksSelected(const QList& selected_blocks); + void BlocksSelected(const QVector& selected_blocks); - void BlocksDeselected(const QList& deselected_blocks); + void BlocksDeselected(const QVector& deselected_blocks); protected: virtual void resizeEvent(QResizeEvent *event) override; @@ -237,7 +237,7 @@ private: QRubberBand rubberband_; TimelineWidgetSelections rubberband_old_selections_; - QList rubberband_now_selected_; + QVector rubberband_now_selected_; TimelineWidgetSelections selections_; @@ -257,7 +257,7 @@ private: TimeSlider* timecode_label_; - QList selected_blocks_; + QVector selected_blocks_; int deferred_scroll_value_; diff --git a/app/widget/timelinewidget/tool/pointer.cpp b/app/widget/timelinewidget/tool/pointer.cpp index 7f4f8e772..86c501d9b 100644 --- a/app/widget/timelinewidget/tool/pointer.cpp +++ b/app/widget/timelinewidget/tool/pointer.cpp @@ -79,7 +79,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event) if (parent()->IsBlockSelected(clicked_item_->block())) { // Collect item deselections - QList deselected_blocks; + QVector deselected_blocks; // If shift is held, deselect it if (event->GetModifiers() & Qt::ShiftModifier) { @@ -89,7 +89,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event) // If not holding alt, deselect all links as well if (!(event->GetModifiers() & Qt::AltModifier)) { parent()->SetBlockLinksSelected(clicked_item_->block(), false); - deselected_blocks.append(clicked_item_->block()->linked_clips().toList()); + deselected_blocks.append(clicked_item_->block()->linked_clips()); } } @@ -107,7 +107,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event) if (selectable_item) { // Collect item selections - QList selected_blocks; + QVector selected_blocks; // Select this item parent()->AddSelection(clicked_item_); @@ -116,7 +116,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event) // If not holding alt, select all links as well if (!(event->GetModifiers() & Qt::AltModifier)) { parent()->SetBlockLinksSelected(clicked_item_->block(), true); - selected_blocks.append(clicked_item_->block()->linked_clips().toList()); + selected_blocks.append(clicked_item_->block()->linked_clips()); } parent()->SignalSelectedBlocks(selected_blocks); @@ -219,13 +219,13 @@ void SetGhostToSlideMode(TimelineViewGhostItem* g) } void PointerTool::InitiateDragInternal(TimelineViewBlockItem *clicked_item, - Timeline::MovementMode trim_mode, - bool dont_roll_trims, - bool allow_nongap_rolling, - bool slide_instead_of_moving) + Timeline::MovementMode trim_mode, + bool dont_roll_trims, + bool allow_nongap_rolling, + bool slide_instead_of_moving) { // Get list of selected blocks - QList clips = parent()->GetSelectedBlocks(); + QVector clips = parent()->GetSelectedBlocks(); if (trim_mode == Timeline::kMove) { @@ -590,10 +590,10 @@ void PointerTool::FinishDrag(TimelineViewMouseEvent *event) // If we're not duplicating, "remove" the clips and replace them with gaps if (!duplicate_clips) { - QList blocks_to_delete; + QVector blocks_to_delete(blocks_moving.size()); - foreach (const GhostBlockPair& p, blocks_moving) { - blocks_to_delete.append(p.block); + for (int i=0; iReplaceBlocksWithGaps(blocks_to_delete, false, command); @@ -724,7 +724,7 @@ Timeline::MovementMode PointerTool::IsCursorInTrimHandle(TimelineViewBlockItem * } void PointerTool::InitiateDrag(TimelineViewBlockItem* clicked_item, - Timeline::MovementMode trim_mode) + Timeline::MovementMode trim_mode) { InitiateDragInternal(clicked_item, trim_mode, false, false, false); } @@ -795,8 +795,8 @@ void PointerTool::AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::Movem } bool PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip, - const QList& items, - const Timeline::MovementMode& mode) + const QVector& items, + const Timeline::MovementMode& mode) { foreach (TimelineViewBlockItem* compare, items) { if (clip->Track() == compare->Track() @@ -811,9 +811,9 @@ bool PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip, } bool PointerTool::AddMovingTransitionsToClipGhost(Block* block, - const TrackReference& track, - Timeline::MovementMode movement, - const QList& selected_items) + const TrackReference& track, + Timeline::MovementMode movement, + const QList& selected_items) { // Assume block is a clip and see if it has any transitions TransitionBlock* transitions[2]; diff --git a/app/widget/timelinewidget/tool/pointer.h b/app/widget/timelinewidget/tool/pointer.h index 31ec8b455..3d42fbb54 100644 --- a/app/widget/timelinewidget/tool/pointer.h +++ b/app/widget/timelinewidget/tool/pointer.h @@ -100,7 +100,7 @@ private: void AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode); bool IsClipTrimmable(TimelineViewBlockItem* clip, - const QList& items, + const QVector &items, const Timeline::MovementMode& mode); void ProcessGhostsForSliding(); diff --git a/app/widget/timelinewidget/undo/undo.cpp b/app/widget/timelinewidget/undo/undo.cpp index 7f968e29e..e1e59abfa 100644 --- a/app/widget/timelinewidget/undo/undo.cpp +++ b/app/widget/timelinewidget/undo/undo.cpp @@ -765,7 +765,7 @@ void BlockUnlinkAllCommand::undo_internal() unlinked_.clear(); } -BlockLinkManyCommand::BlockLinkManyCommand(const QList blocks, bool link, QUndoCommand *parent) : +BlockLinkManyCommand::BlockLinkManyCommand(const QVector blocks, bool link, QUndoCommand *parent) : UndoCommand(parent), blocks_(blocks) { diff --git a/app/widget/timelinewidget/undo/undo.h b/app/widget/timelinewidget/undo/undo.h index 220f4133d..e59255f3e 100644 --- a/app/widget/timelinewidget/undo/undo.h +++ b/app/widget/timelinewidget/undo/undo.h @@ -471,12 +471,12 @@ private: class BlockLinkManyCommand : public UndoCommand { public: - BlockLinkManyCommand(const QList blocks, bool link, QUndoCommand* parent = nullptr); + BlockLinkManyCommand(const QVector blocks, bool link, QUndoCommand* parent = nullptr); virtual Project* GetRelevantProject() const override; private: - QList blocks_; + QVector blocks_; }; diff --git a/app/widget/timetarget/timetarget.cpp b/app/widget/timetarget/timetarget.cpp index 51ec506d3..73f29746a 100644 --- a/app/widget/timetarget/timetarget.cpp +++ b/app/widget/timetarget/timetarget.cpp @@ -60,7 +60,7 @@ TimeRange TimeTargetObject::GetAdjustedTime(Node* from, Node* to, const TimeRang return r; } - QList adjusted = from->TransformTimeTo(r, to, direction); + QVector adjusted = from->TransformTimeTo(r, to, direction); if (adjusted.isEmpty()) { return r;