oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switched many QLists for QVectors

Browse Source 
Minor optimization
This commit is contained in:
itsmattkc
2020-11-16 16:17:43 +11:00
parent a0fb1981b4
commit 1b9bf6d92c
80 changed files with 273 additions and 281 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/core.cpp
+1 -1
View File
@@ -1034,7 +1034,7 @@ void Core::SetPreferenceForRenderMode(RenderMode::Mode mode, const QString &pref
Config::Current()[GetRenderModePreferencePrefix(mode, preference)] = value; Config::Current()[GetRenderModePreferencePrefix(mode, preference)] = value;
} }
void Core::LabelNodes(const QList<Node *> &nodes) const void Core::LabelNodes(const QVector<Node *> &nodes) const
{ {
if (nodes.isEmpty()) { if (nodes.isEmpty()) {
return; return;
app/core.h
+1 -1
View File
@@ -233,7 +233,7 @@ public:
/** /**
* @brief Show a dialog to the user to rename a set of nodes * @brief Show a dialog to the user to rename a set of nodes
*/ */
void LabelNodes(const QList<Node*>& nodes) const; void LabelNodes(const QVector<Node *> &nodes) const;
/** /**
* @brief Create a new sequence named appropriately for the active project * @brief Create a new sequence named appropriately for the active project
app/node/audio/pan/pan.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ QString PanNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.pan"); return QStringLiteral("org.olivevideoeditor.Olive.pan");
} }
QList<Node::CategoryID> PanNode::Category() const QVector<Node::CategoryID> PanNode::Category() const
{ {
return {kCategoryChannels}; return {kCategoryChannels};
} }
app/node/audio/pan/pan.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual NodeValueTable Value(NodeValueDatabase &value) const override; virtual NodeValueTable Value(NodeValueDatabase &value) const override;
app/node/audio/volume/volume.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ QString VolumeNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.volume"); return QStringLiteral("org.olivevideoeditor.Olive.volume");
} }
QList<Node::CategoryID> VolumeNode::Category() const QVector<Node::CategoryID> VolumeNode::Category() const
{ {
return {kCategoryFilter}; return {kCategoryFilter};
} }
app/node/audio/volume/volume.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual NodeValueTable Value(NodeValueDatabase &value) const override; virtual NodeValueTable Value(NodeValueDatabase &value) const override;
app/node/block/block.cpp
+3 -3
View File
@@ -58,7 +58,7 @@ Block::Block() :
set_length_and_media_out(1); set_length_and_media_out(1);
} }
QList<Node::CategoryID> Block::Category() const QVector<Node::CategoryID> Block::Category() const
{ {
return {kCategoryTimeline}; return {kCategoryTimeline};
} }
@@ -241,9 +241,9 @@ void Block::SaveInternal(QXmlStreamWriter *writer) const
} }
} }
QList<NodeInput *> Block::GetInputsToHash() const QVector<NodeInput *> Block::GetInputsToHash() const
{ {
QList<NodeInput*> inputs = Node::GetInputsToHash(); QVector<NodeInput*> inputs = Node::GetInputsToHash();
// Ignore these inputs // Ignore these inputs
inputs.removeOne(media_in_input_); inputs.removeOne(media_in_input_);
app/node/block/block.h
+2 -2
View File
@@ -43,7 +43,7 @@ public:
virtual Type type() const = 0; virtual Type type() const = 0;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
const rational& in() const; const rational& in() const;
const rational& out() const; const rational& out() const;
@@ -110,7 +110,7 @@ protected:
virtual void SaveInternal(QXmlStreamWriter* writer) const override; virtual void SaveInternal(QXmlStreamWriter* writer) const override;
virtual QList<NodeInput*> GetInputsToHash() const override; virtual QVector<NodeInput*> GetInputsToHash() const override;
virtual void LengthChangedEvent(const rational& old_length, virtual void LengthChangedEvent(const rational& old_length,
const rational& new_length, const rational& new_length,
app/node/block/transition/crossdissolve/crossdissolvetransition.cpp
+1 -1
View File
@@ -42,7 +42,7 @@ QString CrossDissolveTransition::id() const
return QStringLiteral("org.olivevideoeditor.Olive.crossdissolve"); return QStringLiteral("org.olivevideoeditor.Olive.crossdissolve");
} }
QList<Node::CategoryID> CrossDissolveTransition::Category() const QVector<Node::CategoryID> CrossDissolveTransition::Category() const
{ {
return {kCategoryTransition}; return {kCategoryTransition};
} }
app/node/block/transition/crossdissolve/crossdissolvetransition.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
//virtual void Retranslate() override; //virtual void Retranslate() override;
app/node/block/transition/diptocolor/diptocolortransition.cpp
+1 -1
View File
@@ -43,7 +43,7 @@ QString DipToColorTransition::id() const
return QStringLiteral("org.olivevideoeditor.Olive.diptocolor"); return QStringLiteral("org.olivevideoeditor.Olive.diptocolor");
} }
QList<Node::CategoryID> DipToColorTransition::Category() const QVector<Node::CategoryID> DipToColorTransition::Category() const
{ {
return {kCategoryTransition}; return {kCategoryTransition};
} }
app/node/block/transition/diptocolor/diptocolortransition.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual ShaderCode GetShaderCode(const QString& shader_id) const override; virtual ShaderCode GetShaderCode(const QString& shader_id) const override;
app/node/filter/blur/blur.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ QString BlurFilterNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.blur"); return QStringLiteral("org.olivevideoeditor.Olive.blur");
} }
QList<Node::CategoryID> BlurFilterNode::Category() const QVector<Node::CategoryID> BlurFilterNode::Category() const
{ {
return {kCategoryFilter}; return {kCategoryFilter};
} }
app/node/filter/blur/blur.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/filter/stroke/stroke.cpp
+1 -1
View File
@@ -63,7 +63,7 @@ QString StrokeFilterNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.stroke"); return QStringLiteral("org.olivevideoeditor.Olive.stroke");
} }
QList<Node::CategoryID> StrokeFilterNode::Category() const QVector<Node::CategoryID> StrokeFilterNode::Category() const
{ {
return {kCategoryFilter}; return {kCategoryFilter};
} }
app/node/filter/stroke/stroke.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/generator/matrix/matrix.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ QString MatrixGenerator::id() const
return QStringLiteral("org.olivevideoeditor.Olive.transform"); return QStringLiteral("org.olivevideoeditor.Olive.transform");
} }
QList<Node::CategoryID> MatrixGenerator::Category() const QVector<Node::CategoryID> MatrixGenerator::Category() const
{ {
return {kCategoryGenerator, kCategoryMath}; return {kCategoryGenerator, kCategoryMath};
} }
app/node/generator/matrix/matrix.h
+1 -1
View File
@@ -39,7 +39,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString ShortName() const override; virtual QString ShortName() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/generator/polygon/polygon.cpp
+1 -1
View File
@@ -69,7 +69,7 @@ QString PolygonGenerator::id() const
return QStringLiteral("org.olivevideoeditor.Olive.polygon"); return QStringLiteral("org.olivevideoeditor.Olive.polygon");
} }
QList<Node::CategoryID> PolygonGenerator::Category() const QVector<Node::CategoryID> PolygonGenerator::Category() const
{ {
return {kCategoryGenerator}; return {kCategoryGenerator};
} }
app/node/generator/polygon/polygon.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/generator/solid/solid.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ QString SolidGenerator::id() const
return QStringLiteral("org.olivevideoeditor.Olive.solidgenerator"); return QStringLiteral("org.olivevideoeditor.Olive.solidgenerator");
} }
QList<Node::CategoryID> SolidGenerator::Category() const QVector<Node::CategoryID> SolidGenerator::Category() const
{ {
return {kCategoryGenerator}; return {kCategoryGenerator};
} }
app/node/generator/solid/solid.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/generator/text/text.cpp
+1 -1
View File
@@ -72,7 +72,7 @@ QString TextGenerator::id() const
return QStringLiteral("org.olivevideoeditor.Olive.textgenerator"); return QStringLiteral("org.olivevideoeditor.Olive.textgenerator");
} }
QList<Node::CategoryID> TextGenerator::Category() const QVector<Node::CategoryID> TextGenerator::Category() const
{ {
return {kCategoryGenerator}; return {kCategoryGenerator};
} }
app/node/generator/text/text.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/input.cpp
+6 -6
View File
@@ -423,7 +423,7 @@ QVariant NodeInput::StringToValue(const DataType& data_type, const QString &stri
} }
} }
void NodeInput::GetDependencies(QList<Node *> &list, bool traverse, bool exclusive_only) const void NodeInput::GetDependencies(QVector<Node *> &list, bool traverse, bool exclusive_only) const
{ {
if (is_connected() if (is_connected()
&& (get_connected_output()->edges().size() == 1 || !exclusive_only)) { && (get_connected_output()->edges().size() == 1 || !exclusive_only)) {
@@ -433,7 +433,7 @@ void NodeInput::GetDependencies(QList<Node *> &list, bool traverse, bool exclusi
list.append(connected); list.append(connected);
if (traverse) { if (traverse) {
QList<NodeInput*> connected_inputs = connected->GetInputsIncludingArrays(); QVector<NodeInput*> connected_inputs = connected->GetInputsIncludingArrays();
foreach (NodeInput* i, connected_inputs) { foreach (NodeInput* i, connected_inputs) {
i->GetDependencies(list, traverse, exclusive_only); i->GetDependencies(list, traverse, exclusive_only);
@@ -461,21 +461,21 @@ QVariant NodeInput::GetDefaultValueForTrack(int track) const
return default_value_.at(track); return default_value_.at(track);
} }
QList<Node *> NodeInput::GetDependencies(bool traverse, bool exclusive_only) const QVector<Node *> NodeInput::GetDependencies(bool traverse, bool exclusive_only) const
{ {
QList<Node *> list; QVector<Node *> list;
GetDependencies(list, traverse, exclusive_only); GetDependencies(list, traverse, exclusive_only);
return list; return list;
} }
QList<Node *> NodeInput::GetExclusiveDependencies() const QVector<Node *> NodeInput::GetExclusiveDependencies() const
{ {
return GetDependencies(true, true); return GetDependencies(true, true);
} }
QList<Node *> NodeInput::GetImmediateDependencies() const QVector<Node *> NodeInput::GetImmediateDependencies() const
{ {
return GetDependencies(false, false); return GetDependencies(false, false);
} }
app/node/input.h
+4 -4
View File
@@ -282,17 +282,17 @@ public:
static QVariant StringToValue(const DataType &data_type, const QString &string, bool value_is_a_key_track); static QVariant StringToValue(const DataType &data_type, const QString &string, bool value_is_a_key_track);
void GetDependencies(QList<Node*>& list, bool traverse, bool exclusive_only) const; void GetDependencies(QVector<Node *> &list, bool traverse, bool exclusive_only) const;
QVariant GetDefaultValue() const; QVariant GetDefaultValue() const;
QVariant GetDefaultValueForTrack(int track) const; QVariant GetDefaultValueForTrack(int track) const;
QList<Node*> GetDependencies(bool traverse = true, bool exclusive_only = false) const; QVector<Node*> GetDependencies(bool traverse = true, bool exclusive_only = false) const;
QList<Node*> GetExclusiveDependencies() const; QVector<Node*> GetExclusiveDependencies() const;
QList<Node*> GetImmediateDependencies() const; QVector<Node*> GetImmediateDependencies() const;
signals: signals:
void ValueChanged(const OLIVE_NAMESPACE::TimeRange& range); void ValueChanged(const OLIVE_NAMESPACE::TimeRange& range);
app/node/input/media/media.cpp
+1 -1
View File
@@ -35,7 +35,7 @@ MediaInput::MediaInput() :
AddInput(footage_input_); AddInput(footage_input_);
} }
QList<Node::CategoryID> MediaInput::Category() const QVector<Node::CategoryID> MediaInput::Category() const
{ {
return {kCategoryInput}; return {kCategoryInput};
} }
app/node/input/media/media.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
virtual Stream::Type type() const = 0; virtual Stream::Type type() const = 0;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
StreamPtr stream(); StreamPtr stream();
void SetStream(StreamPtr s); void SetStream(StreamPtr s);
app/node/input/time/timeinput.cpp
+1 -1
View File
@@ -41,7 +41,7 @@ QString TimeInput::id() const
return QStringLiteral("org.olivevideoeditor.Olive.time"); return QStringLiteral("org.olivevideoeditor.Olive.time");
} }
QList<Node::CategoryID> TimeInput::Category() const QVector<Node::CategoryID> TimeInput::Category() const
{ {
return {kCategoryInput}; return {kCategoryInput};
} }
app/node/input/time/timeinput.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual NodeValueTable Value(NodeValueDatabase& value) const override; virtual NodeValueTable Value(NodeValueDatabase& value) const override;
app/node/math/math/math.cpp
+1 -1
View File
@@ -55,7 +55,7 @@ QString MathNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.math"); return QStringLiteral("org.olivevideoeditor.Olive.math");
} }
QList<Node::CategoryID> MathNode::Category() const QVector<Node::CategoryID> MathNode::Category() const
{ {
return {kCategoryMath}; return {kCategoryMath};
} }
app/node/math/math/math.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/math/merge/merge.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ QString MergeNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.merge"); return QStringLiteral("org.olivevideoeditor.Olive.merge");
} }
QList<Node::CategoryID> MergeNode::Category() const QVector<Node::CategoryID> MergeNode::Category() const
{ {
return {kCategoryMath}; return {kCategoryMath};
} }
app/node/math/merge/merge.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/math/trigonometry/trigonometry.cpp
+1 -1
View File
@@ -48,7 +48,7 @@ QString TrigonometryNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.trigonometry"); return QStringLiteral("org.olivevideoeditor.Olive.trigonometry");
} }
QList<Node::CategoryID> TrigonometryNode::Category() const QVector<Node::CategoryID> TrigonometryNode::Category() const
{ {
return {kCategoryMath}; return {kCategoryMath};
} }
app/node/math/trigonometry/trigonometry.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
virtual void Retranslate() override; virtual void Retranslate() override;
app/node/node.cpp
+26 -26
View File
@@ -265,12 +265,12 @@ void Node::SaveInternal(QXmlStreamWriter *) const
{ {
} }
QList<NodeInput *> Node::GetInputsToHash() const QVector<NodeInput *> Node::GetInputsToHash() const
{ {
return GetInputsIncludingArrays(); return GetInputsIncludingArrays();
} }
void GetInputsIncludingArraysInternal(NodeInputArray* array, QList<NodeInput *>& list) void GetInputsIncludingArraysInternal(NodeInputArray* array, QVector<NodeInput *>& list)
{ {
foreach (NodeInput* input, array->sub_params()) { foreach (NodeInput* input, array->sub_params()) {
list.append(input); list.append(input);
@@ -281,9 +281,9 @@ void GetInputsIncludingArraysInternal(NodeInputArray* array, QList<NodeInput *>&
} }
} }
QList<NodeInput *> Node::GetInputsIncludingArrays() const QVector<NodeInput *> Node::GetInputsIncludingArrays() const
{ {
QList<NodeInput *> inputs; QVector<NodeInput *> inputs;
foreach (NodeParam* param, params_) { foreach (NodeParam* param, params_) {
if (param->type() == NodeParam::kInput) { if (param->type() == NodeParam::kInput) {
@@ -300,7 +300,7 @@ QList<NodeInput *> Node::GetInputsIncludingArrays() const
return inputs; return inputs;
} }
QList<NodeOutput *> Node::GetOutputs() const QVector<NodeOutput *> Node::GetOutputs() const
{ {
// The current design only uses one output per node. This function returns a list just in case that changes. // The current design only uses one output per node. This function returns a list just in case that changes.
return {output_}; return {output_};
@@ -347,7 +347,7 @@ void Node::Hash(QCryptographicHash &hash, const rational& time) const
// Add this Node's ID // Add this Node's ID
hash.addData(id().toUtf8()); hash.addData(id().toUtf8());
QList<NodeInput*> inputs = GetInputsToHash(); QVector<NodeInput*> inputs = GetInputsToHash();
foreach (NodeInput* input, inputs) { foreach (NodeInput* input, inputs) {
// For each input, try to hash its value // 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()); Q_ASSERT(source->id() == destination->id());
const QList<NodeParam*>& src_param = source->params_; const QVector<NodeParam*>& src_param = source->params_;
const QList<NodeParam*>& dst_param = destination->params_; const QVector<NodeParam*>& dst_param = destination->params_;
for (int i=0;i<src_param.size();i++) { for (int i=0;i<src_param.size();i++) {
NodeParam* p = src_param.at(i); NodeParam* p = src_param.at(i);
@@ -460,7 +460,7 @@ bool Node::IsMedia() const
return false; return false;
} }
const QList<NodeParam *>& Node::parameters() const const QVector<NodeParam *>& Node::parameters() const
{ {
return params_; 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 * TRUE to recursively traverse each node for a complete dependency graph. FALSE to return only the immediate
* dependencies. * dependencies.
*/ */
QList<Node*> Node::GetDependenciesInternal(bool traverse, bool exclusive_only) const { QVector<Node *> Node::GetDependenciesInternal(bool traverse, bool exclusive_only) const {
QList<NodeInput*> inputs = GetInputsIncludingArrays(); QVector<NodeInput*> inputs = GetInputsIncludingArrays();
QList<Node*> list; QVector<Node*> list;
foreach (NodeInput* i, inputs) { foreach (NodeInput* i, inputs) {
i->GetDependencies(list, traverse, exclusive_only); i->GetDependencies(list, traverse, exclusive_only);
@@ -489,17 +489,17 @@ QList<Node*> Node::GetDependenciesInternal(bool traverse, bool exclusive_only) c
return list; return list;
} }
QList<Node *> Node::GetDependencies() const QVector<Node *> Node::GetDependencies() const
{ {
return GetDependenciesInternal(true, false); return GetDependenciesInternal(true, false);
} }
QList<Node *> Node::GetExclusiveDependencies() const QVector<Node *> Node::GetExclusiveDependencies() const
{ {
return GetDependenciesInternal(true, true); return GetDependenciesInternal(true, true);
} }
QList<Node *> Node::GetImmediateDependencies() const QVector<Node *> Node::GetImmediateDependencies() const
{ {
return GetDependenciesInternal(false, false); return GetDependenciesInternal(false, false);
} }
@@ -523,7 +523,7 @@ void Node::GenerateFrame(FramePtr frame, const GenerateJob &job) const
NodeInput *Node::GetInputWithID(const QString &id) const NodeInput *Node::GetInputWithID(const QString &id) const
{ {
QList<NodeInput*> inputs = GetInputsIncludingArrays(); QVector<NodeInput*> inputs = GetInputsIncludingArrays();
foreach (NodeInput* i, inputs) { foreach (NodeInput* i, inputs) {
if (i->id() == id) { if (i->id() == id) {
@@ -548,7 +548,7 @@ NodeOutput *Node::GetOutputWithID(const QString &id) const
bool Node::OutputsTo(Node *n, bool recursively) const bool Node::OutputsTo(Node *n, bool recursively) const
{ {
QList<NodeOutput*> outputs = GetOutputs(); QVector<NodeOutput*> outputs = GetOutputs();
foreach (NodeOutput* output, outputs) { foreach (NodeOutput* output, outputs) {
foreach (NodeEdgePtr edge, output->edges()) { 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 bool Node::OutputsTo(const QString &id, bool recursively) const
{ {
QList<NodeOutput*> outputs = GetOutputs(); QVector<NodeOutput*> outputs = GetOutputs();
foreach (NodeOutput* output, outputs) { foreach (NodeOutput* output, outputs) {
foreach (NodeEdgePtr edge, output->edges()) { 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 bool Node::OutputsTo(NodeInput *input, bool recursively, bool include_arrays) const
{ {
QList<NodeOutput*> outputs = GetOutputs(); QVector<NodeOutput*> outputs = GetOutputs();
foreach (NodeOutput* output, outputs) { foreach (NodeOutput* output, outputs) {
foreach (NodeEdgePtr edge, output->edges()) { 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 bool Node::InputsFrom(Node *n, bool recursively) const
{ {
QList<NodeInput*> inputs = GetInputsIncludingArrays(); QVector<NodeInput*> inputs = GetInputsIncludingArrays();
foreach (NodeInput* input, inputs) { foreach (NodeInput* input, inputs) {
foreach (NodeEdgePtr edge, input->edges()) { 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 bool Node::InputsFrom(const QString &id, bool recursively) const
{ {
QList<NodeInput*> inputs = GetInputsIncludingArrays(); QVector<NodeInput*> inputs = GetInputsIncludingArrays();
foreach (NodeInput* input, inputs) { foreach (NodeInput* input, inputs) {
foreach (NodeEdgePtr edge, input->edges()) { foreach (NodeEdgePtr edge, input->edges()) {
@@ -649,7 +649,7 @@ int Node::GetRoutesTo(Node *n) const
bool outputs_directly = false; bool outputs_directly = false;
int routes = 0; int routes = 0;
QList<NodeOutput*> outputs = GetOutputs(); QVector<NodeOutput*> outputs = GetOutputs();
foreach (NodeOutput* o, outputs) { foreach (NodeOutput* o, outputs) {
foreach (NodeEdgePtr edge, o->edges()) { foreach (NodeEdgePtr edge, o->edges()) {
@@ -728,13 +728,13 @@ QString Node::GetCategoryName(const CategoryID &c)
return tr("Uncategorized"); return tr("Uncategorized");
} }
QList<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, NodeParam::Type direction) QVector<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, NodeParam::Type direction)
{ {
QList<TimeRange> paths_found; QVector<TimeRange> paths_found;
if (direction == NodeParam::kInput) { if (direction == NodeParam::kInput) {
// Get list of all inputs // Get list of all inputs
QList<NodeInput *> inputs = GetInputsIncludingArrays(); QVector<NodeInput *> inputs = GetInputsIncludingArrays();
// If this input is connected, traverse it to see if we stumble across the specified `node` // If this input is connected, traverse it to see if we stumble across the specified `node`
foreach (NodeInput* input, inputs) { foreach (NodeInput* input, inputs) {
@@ -755,7 +755,7 @@ QList<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, Node
} }
} else { } else {
// Get list of all outputs // Get list of all outputs
QList<NodeOutput*> outputs = GetOutputs(); QVector<NodeOutput*> outputs = GetOutputs();
// If this input is connected, traverse it to see if we stumble across the specified `node` // If this input is connected, traverse it to see if we stumble across the specified `node`
foreach (NodeOutput* output, outputs) { foreach (NodeOutput* output, outputs) {
app/node/node.h
+22 -22
View File
@@ -132,7 +132,7 @@ public:
* interpreted as an empty string category. This value should be run through a translator as its largely user * interpreted as an empty string category. This value should be run through a translator as its largely user
* oriented. * oriented.
*/ */
virtual QList<CategoryID> Category() const = 0; virtual QVector<CategoryID> Category() const = 0;
/** /**
* @brief Return a description of this node's purpose (optional for subclassing, but recommended) * @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 * @brief Return a list of NodeParams
*/ */
const QList<NodeParam*>& parameters() const; const QVector<NodeParam*>& parameters() const;
/** /**
* @brief Return the index of a parameter * @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) * @brief Return a list of all Nodes that this Node's inputs are connected to (does not include this Node)
*/ */
QList<Node*> GetDependencies() const; QVector<Node *> GetDependencies() const;
/** /**
* @brief Returns a list of Nodes that this Node is dependent on, provided no other Nodes are dependent on them * @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. * Similar to GetDependencies(), but excludes any Nodes that are used outside the dependency graph of this Node.
*/ */
QList<Node*> GetExclusiveDependencies() const; QVector<Node *> GetExclusiveDependencies() const;
/** /**
* @brief Retrieve immediate dependencies (only nodes that are directly connected to the inputs of this one) * @brief Retrieve immediate dependencies (only nodes that are directly connected to the inputs of this one)
*/ */
QList<Node*> GetImmediateDependencies() const; QVector<Node *> GetImmediateDependencies() const;
/** /**
* @brief Generate hardware accelerated code for this Node * @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 * @brief Transforms time from this node through the connections it takes to get to the specified node
*/ */
QList<TimeRange> TransformTimeTo(const TimeRange& time, Node* target, NodeParam::Type direction); QVector<TimeRange> TransformTimeTo(const TimeRange& time, Node* target, NodeParam::Type direction);
/** /**
* @brief Find nodes of a certain type that this Node takes inputs from * @brief Find nodes of a certain type that this Node takes inputs from
*/ */
template<class T> template<class T>
QList<T*> FindInputNodes() const; QVector<T*> FindInputNodes() const;
template<class T> template<class T>
/** /**
* @brief Find a node of a certain type that this Node outputs to * @brief Find a node of a certain type that this Node outputs to
*/ */
QList<T *> FindOutputNode(); QVector<T *> FindOutputNode();
/** /**
* @brief Convert a pointer to a value that can be sent between NodeParams * @brief Convert a pointer to a value that can be sent between NodeParams
@@ -407,9 +407,9 @@ public:
void SetPosition(const QPointF& pos); void SetPosition(const QPointF& pos);
QList<NodeInput*> GetInputsIncludingArrays() const; QVector<NodeInput*> GetInputsIncludingArrays() const;
QList<NodeOutput*> GetOutputs() const; QVector<NodeOutput*> GetOutputs() const;
virtual bool HasGizmos() const; virtual bool HasGizmos() const;
@@ -435,7 +435,7 @@ protected:
virtual void SaveInternal(QXmlStreamWriter* writer) const; virtual void SaveInternal(QXmlStreamWriter* writer) const;
virtual QList<NodeInput*> GetInputsToHash() const; virtual QVector<NodeInput*> GetInputsToHash() const;
protected slots: protected slots:
void InputChanged(const OLIVE_NAMESPACE::TimeRange &range); void InputChanged(const OLIVE_NAMESPACE::TimeRange &range);
@@ -488,14 +488,14 @@ private:
void DisconnectInput(NodeInput* input); void DisconnectInput(NodeInput* input);
template<class T> template<class T>
static void FindInputNodeInternal(const Node* n, QList<T *>& list); static void FindInputNodeInternal(const Node* n, QVector<T *>& list);
template<class T> template<class T>
static void FindOutputNodeInternal(const Node* n, QList<T *>& list); static void FindOutputNodeInternal(const Node* n, QVector<T *>& list);
QList<Node *> GetDependenciesInternal(bool traverse, bool exclusive_only) const; QVector<Node *> GetDependenciesInternal(bool traverse, bool exclusive_only) const;
QList<NodeParam *> params_; QVector<NodeParam *> params_;
/** /**
* @brief Internal variable for whether this Node can be deleted or not * @brief Internal variable for whether this Node can be deleted or not
@@ -520,9 +520,9 @@ private:
}; };
template<class T> template<class T>
void Node::FindInputNodeInternal(const Node* n, QList<T *>& list) void Node::FindInputNodeInternal(const Node* n, QVector<T *> &list)
{ {
QList<NodeInput*> inputs = n->GetInputsIncludingArrays(); QVector<NodeInput*> inputs = n->GetInputsIncludingArrays();
foreach (NodeInput* input, inputs) { foreach (NodeInput* input, inputs) {
if (input->is_connected()) { if (input->is_connected()) {
@@ -539,9 +539,9 @@ void Node::FindInputNodeInternal(const Node* n, QList<T *>& list)
} }
template<class T> template<class T>
QList<T *> Node::FindInputNodes() const QVector<T *> Node::FindInputNodes() const
{ {
QList<T *> list; QVector<T *> list;
FindInputNodeInternal<T>(this, list); FindInputNodeInternal<T>(this, list);
@@ -555,7 +555,7 @@ T* Node::ValueToPtr(const QVariant &ptr)
} }
template<class T> template<class T>
void Node::FindOutputNodeInternal(const Node* n, QList<T *>& list) { void Node::FindOutputNodeInternal(const Node* n, QVector<T *>& list) {
foreach (NodeEdgePtr edge, n->output()->edges()) { foreach (NodeEdgePtr edge, n->output()->edges()) {
Node* connected = edge->input()->parentNode(); Node* connected = edge->input()->parentNode();
T* cast_test = dynamic_cast<T*>(connected); T* cast_test = dynamic_cast<T*>(connected);
@@ -569,9 +569,9 @@ void Node::FindOutputNodeInternal(const Node* n, QList<T *>& list) {
} }
template<class T> template<class T>
QList<T *> Node::FindOutputNode() QVector<T *> Node::FindOutputNode()
{ {
QList<T *> list; QVector<T *> list;
FindOutputNodeInternal<T>(this, list); FindOutputNodeInternal<T>(this, list);
app/node/output/track/track.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ QString TrackOutput::id() const
return QStringLiteral("org.olivevideoeditor.Olive.track"); return QStringLiteral("org.olivevideoeditor.Olive.track");
} }
QList<Node::CategoryID> TrackOutput::Category() const QVector<Node::CategoryID> TrackOutput::Category() const
{ {
return {kCategoryTimeline}; return {kCategoryTimeline};
} }
app/node/output/track/track.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
const double& GetTrackHeight() const; const double& GetTrackHeight() const;
app/node/output/viewer/viewer.cpp
+1 -1
View File
@@ -82,7 +82,7 @@ QString ViewerOutput::id() const
return QStringLiteral("org.olivevideoeditor.Olive.vieweroutput"); return QStringLiteral("org.olivevideoeditor.Olive.vieweroutput");
} }
QList<Node::CategoryID> ViewerOutput::Category() const QVector<Node::CategoryID> ViewerOutput::Category() const
{ {
return {kCategoryOutput}; return {kCategoryOutput};
} }
app/node/output/viewer/viewer.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
virtual QString Name() const override; virtual QString Name() const override;
virtual QString id() const override; virtual QString id() const override;
virtual QList<CategoryID> Category() const override; virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override; virtual QString Description() const override;
void ShiftVideoCache(const rational& from, const rational& to); void ShiftVideoCache(const rational& from, const rational& to);
app/node/traverser.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ NodeValueDatabase NodeTraverser::GenerateDatabase(const Node* node, const TimeRa
NodeValueDatabase database; NodeValueDatabase database;
// We need to insert tables into the database for each input // We need to insert tables into the database for each input
QList<NodeInput*> inputs = node->GetInputsIncludingArrays(); QVector<NodeInput*> inputs = node->GetInputsIncludingArrays();
foreach (NodeInput* input, inputs) { foreach (NodeInput* input, inputs) {
if (IsCancelled()) { if (IsCancelled()) {
app/panel/curve/curve.cpp
+1 -1
View File
@@ -37,7 +37,7 @@ void CurvePanel::DeleteSelected()
static_cast<CurveWidget*>(GetTimeBasedWidget())->DeleteSelected(); static_cast<CurveWidget*>(GetTimeBasedWidget())->DeleteSelected();
} }
void CurvePanel::SetNodes(const QList<Node *> &nodes) void CurvePanel::SetNodes(const QVector<Node *> &nodes)
{ {
static_cast<CurveWidget*>(GetTimeBasedWidget())->SetNodes(nodes); static_cast<CurveWidget*>(GetTimeBasedWidget())->SetNodes(nodes);
} }
app/panel/curve/curve.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual void DeleteSelected() override; virtual void DeleteSelected() override;
public slots: public slots:
void SetNodes(const QList<Node*>& nodes); void SetNodes(const QVector<Node *> &nodes);
virtual void IncreaseTrackHeight() override; virtual void IncreaseTrackHeight() override;
app/panel/node/node.h
+6 -6
View File
@@ -76,30 +76,30 @@ public:
} }
public slots: public slots:
void Select(const QList<Node*>& nodes) void Select(const QVector<Node*>& nodes)
{ {
node_view_->Select(nodes); node_view_->Select(nodes);
} }
void SelectWithDependencies(const QList<Node*>& nodes) void SelectWithDependencies(const QVector<Node*>& nodes)
{ {
node_view_->SelectWithDependencies(nodes); node_view_->SelectWithDependencies(nodes);
} }
void SelectBlocks(const QList<Block*>& nodes) void SelectBlocks(const QVector<Block*>& nodes)
{ {
node_view_->SelectBlocks(nodes); node_view_->SelectBlocks(nodes);
} }
void DeselectBlocks(const QList<Block*>& nodes) void DeselectBlocks(const QVector<Block*>& nodes)
{ {
node_view_->DeselectBlocks(nodes); node_view_->DeselectBlocks(nodes);
} }
signals: signals:
void NodesSelected(const QList<Node*>& nodes); void NodesSelected(const QVector<Node*>& nodes);
void NodesDeselected(const QList<Node*>& nodes); void NodesDeselected(const QVector<Node*>& nodes);
private: private:
virtual void Retranslate() override virtual void Retranslate() override
app/panel/param/param.cpp
+2 -2
View File
@@ -36,14 +36,14 @@ ParamPanel::ParamPanel(QWidget* parent) :
Retranslate(); Retranslate();
} }
void ParamPanel::SelectNodes(const QList<Node *> &nodes) void ParamPanel::SelectNodes(const QVector<Node *> &nodes)
{ {
static_cast<NodeParamView*>(GetTimeBasedWidget())->SelectNodes(nodes); static_cast<NodeParamView*>(GetTimeBasedWidget())->SelectNodes(nodes);
Retranslate(); Retranslate();
} }
void ParamPanel::DeselectNodes(const QList<Node *> &nodes) void ParamPanel::DeselectNodes(const QVector<Node *> &nodes)
{ {
static_cast<NodeParamView*>(GetTimeBasedWidget())->DeselectNodes(nodes); static_cast<NodeParamView*>(GetTimeBasedWidget())->DeselectNodes(nodes);
app/panel/param/param.h
+4 -4
View File
@@ -34,15 +34,15 @@ public:
ParamPanel(QWidget* parent); ParamPanel(QWidget* parent);
public slots: public slots:
void SelectNodes(const QList<Node*>& nodes); void SelectNodes(const QVector<Node*>& nodes);
void DeselectNodes(const QList<Node*>& nodes); void DeselectNodes(const QVector<Node*>& nodes);
virtual void DeleteSelected() override; virtual void DeleteSelected() override;
signals: signals:
void RequestSelectNode(const QList<Node*>& target); void RequestSelectNode(const QVector<Node*>& target);
void NodeOrderChanged(const QList<Node*>& nodes); void NodeOrderChanged(const QVector<Node*>& nodes);
void FocusedNodeChanged(Node* n); void FocusedNodeChanged(Node* n);
app/panel/table/table.h
+2 -2
View File
@@ -33,12 +33,12 @@ public:
NodeTablePanel(QWidget* parent); NodeTablePanel(QWidget* parent);
public slots: public slots:
void SelectNodes(const QList<Node*>& nodes) void SelectNodes(const QVector<Node*>& nodes)
{ {
static_cast<NodeTableWidget*>(GetTimeBasedWidget())->SelectNodes(nodes); static_cast<NodeTableWidget*>(GetTimeBasedWidget())->SelectNodes(nodes);
} }
void DeselectNodes(const QList<Node*>& nodes) void DeselectNodes(const QVector<Node*>& nodes)
{ {
static_cast<NodeTableWidget*>(GetTimeBasedWidget())->DeselectNodes(nodes); static_cast<NodeTableWidget*>(GetTimeBasedWidget())->DeselectNodes(nodes);
} }
app/panel/timeline/timeline.h
+2 -2
View File
@@ -91,9 +91,9 @@ protected:
virtual void Retranslate() override; virtual void Retranslate() override;
signals: signals:
void BlocksSelected(const QList<Block*>& selected_blocks); void BlocksSelected(const QVector<Block*>& selected_blocks);
void BlocksDeselected(const QList<Block*>& deselected_blocks); void BlocksDeselected(const QVector<Block*>& deselected_blocks);
}; };
app/render/previewautocacher.cpp
+3 -3
View File
@@ -453,7 +453,7 @@ void PreviewAutoCacher::CopyNodeInputValue(NodeInput *input)
// disconnecting whatever was connected to it // disconnecting whatever was connected to it
// We start by removing all old dependencies from the map // We start by removing all old dependencies from the map
QList<Node*> old_deps = our_copy->GetExclusiveDependencies(); QVector<Node*> old_deps = our_copy->GetExclusiveDependencies();
foreach (Node* i, old_deps) { foreach (Node* i, old_deps) {
copy_map_.take(copy_map_.key(i))->deleteLater(); 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); Node::CopyInputs(src_node, dst_node, false);
// Copy all connections // Copy all connections
QList<NodeInput*> src_node_inputs = src_node->GetInputsIncludingArrays(); QVector<NodeInput*> src_node_inputs = src_node->GetInputsIncludingArrays();
QList<NodeInput*> dst_node_inputs = dst_node->GetInputsIncludingArrays(); QVector<NodeInput*> dst_node_inputs = dst_node->GetInputsIncludingArrays();
for (int i=0;i<src_node_inputs.size();i++) { for (int i=0;i<src_node_inputs.size();i++) {
NodeInput* src_input = src_node_inputs.at(i); NodeInput* src_input = src_node_inputs.at(i);
app/task/project/saveotio/saveotio.cpp
+1 -1
View File
@@ -133,7 +133,7 @@ opentimelineio::v1_0::Track *SaveOTIOTask::SerializeTrack(TrackOutput *track)
otio_clip->set_source_range(opentimelineio::v1_0::TimeRange(block->in().toRationalTime(), otio_clip->set_source_range(opentimelineio::v1_0::TimeRange(block->in().toRationalTime(),
block->length().toRationalTime())); block->length().toRationalTime()));
QList<MediaInput*> media_nodes = block->FindInputNodes<MediaInput>(); QVector<MediaInput*> media_nodes = block->FindInputNodes<MediaInput>();
if (!media_nodes.isEmpty()) { if (!media_nodes.isEmpty()) {
auto media_ref = new opentimelineio::v1_0::ExternalReference(media_nodes.first()->stream()->footage()->filename().toStdString()); auto media_ref = new opentimelineio::v1_0::ExternalReference(media_nodes.first()->stream()->footage()->filename().toStdString());
otio_clip->set_media_reference(media_ref); otio_clip->set_media_reference(media_ref);
app/widget/curvewidget/curveview.cpp
+1 -1
View File
@@ -89,7 +89,7 @@ void CurveView::ConnectInput(NodeInput *input)
void CurveView::DisconnectNode(Node *node) void CurveView::DisconnectNode(Node *node)
{ {
QList<NodeInput*> inputs = node->GetInputsIncludingArrays(); QVector<NodeInput*> inputs = node->GetInputsIncludingArrays();
foreach (NodeInput* i, inputs) { foreach (NodeInput* i, inputs) {
DisconnectInput(i); DisconnectInput(i);
app/widget/curvewidget/curvewidget.cpp
+2 -2
View File
@@ -131,7 +131,7 @@ void CurveWidget::DeleteSelected()
view_->DeleteSelected(); view_->DeleteSelected();
} }
void CurveWidget::SetNodes(const QList<Node *> &nodes) void CurveWidget::SetNodes(const QVector<Node *> &nodes)
{ {
tree_view_->SetNodes(nodes); tree_view_->SetNodes(nodes);
@@ -216,7 +216,7 @@ void CurveWidget::UpdateBridgeTime(const int64_t &timestamp)
void CurveWidget::ConnectNode(Node *n) void CurveWidget::ConnectNode(Node *n)
{ {
QList<NodeInput*> inputs = n->GetInputsIncludingArrays(); QVector<NodeInput*> inputs = n->GetInputsIncludingArrays();
foreach (NodeInput* i, inputs) { foreach (NodeInput* i, inputs) {
if (tree_view_->IsInputEnabled(i)) { if (tree_view_->IsInputEnabled(i)) {
app/widget/curvewidget/curvewidget.h
+2 -4
View File
@@ -49,7 +49,7 @@ public:
void DeleteSelected(); void DeleteSelected();
public slots: public slots:
void SetNodes(const QList<Node*>& nodes); void SetNodes(const QVector<Node *> &nodes);
protected: protected:
virtual void TimeChangedEvent(const int64_t &) override; virtual void TimeChangedEvent(const int64_t &) override;
@@ -85,9 +85,7 @@ private:
NodeParamViewKeyframeControl* key_control_; NodeParamViewKeyframeControl* key_control_;
QList<QCheckBox*> checkboxes_; QVector<Node*> nodes_;
QList<Node*> nodes_;
private slots: private slots:
void SelectionChanged(); void SelectionChanged();
app/widget/keyframeview/keyframeviewbase.cpp
+1 -1
View File
@@ -76,7 +76,7 @@ void KeyframeViewBase::DeleteSelected()
void KeyframeViewBase::RemoveKeyframesOfNode(Node *n) void KeyframeViewBase::RemoveKeyframesOfNode(Node *n)
{ {
QList<NodeInput*> inputs = n->GetInputsIncludingArrays(); QVector<NodeInput*> inputs = n->GetInputsIncludingArrays();
foreach (NodeInput* i, inputs) { foreach (NodeInput* i, inputs) {
RemoveKeyframesOfInput(i); RemoveKeyframesOfInput(i);
app/widget/nodecopypaste/nodecopypaste.cpp
+6 -6
View File
@@ -29,7 +29,7 @@
OLIVE_NAMESPACE_ENTER OLIVE_NAMESPACE_ENTER
void NodeCopyPasteWidget::CopyNodesToClipboard(const QList<Node *> &nodes, void *userdata) void NodeCopyPasteWidget::CopyNodesToClipboard(const QVector<Node *> &nodes, void *userdata)
{ {
QString copy_str; QString copy_str;
@@ -56,17 +56,17 @@ void NodeCopyPasteWidget::CopyNodesToClipboard(const QList<Node *> &nodes, void
Core::CopyStringToClipboard(copy_str); Core::CopyStringToClipboard(copy_str);
} }
QList<Node *> NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUndoCommand* command, void *userdata) QVector<Node *> NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUndoCommand* command, void *userdata)
{ {
QString clipboard = Core::PasteStringFromClipboard(); QString clipboard = Core::PasteStringFromClipboard();
if (clipboard.isEmpty()) { if (clipboard.isEmpty()) {
return QList<Node*>(); return QVector<Node*>();
} }
QXmlStreamReader reader(clipboard); QXmlStreamReader reader(clipboard);
QList<Node*> pasted_nodes; QVector<Node*> pasted_nodes;
XMLNodeData xml_node_data; XMLNodeData xml_node_data;
while (XMLReadNextStartElement(&reader)) { while (XMLReadNextStartElement(&reader)) {
@@ -100,7 +100,7 @@ QList<Node *> NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUnd
if (pasted_nodes.isEmpty()) { 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 // If we passed through the whole string and there were no nodes, it must not be data for us after all
return QList<Node*>(); return QVector<Node*>();
} }
// If we have some nodes AND the XML data was malformed, the user should probably know // If we have some nodes AND the XML data was malformed, the user should probably know
@@ -116,7 +116,7 @@ QList<Node *> NodeCopyPasteWidget::PasteNodesFromClipboard(Sequence *graph, QUnd
QCoreApplication::translate("NodeCopyPasteWidget", "Failed to paste nodes: %1").arg(reader.errorString()), QCoreApplication::translate("NodeCopyPasteWidget", "Failed to paste nodes: %1").arg(reader.errorString()),
QMessageBox::Ok); QMessageBox::Ok);
return QList<Node*>(); return QVector<Node*>();
} }
// Add all nodes to graph // Add all nodes to graph
app/widget/nodecopypaste/nodecopypaste.h
+2 -2
View File
@@ -35,9 +35,9 @@ public:
NodeCopyPasteWidget() = default; NodeCopyPasteWidget() = default;
protected: protected:
void CopyNodesToClipboard(const QList<Node*>& nodes, void* userdata = nullptr); void CopyNodesToClipboard(const QVector<Node *> &nodes, void* userdata = nullptr);
QList<Node*> PasteNodesFromClipboard(Sequence *graph, QUndoCommand *command, void* userdata = nullptr); QVector<Node*> PasteNodesFromClipboard(Sequence *graph, QUndoCommand *command, void* userdata = nullptr);
virtual void CopyNodesToClipboardInternal(QXmlStreamWriter *writer, void* userdata); virtual void CopyNodesToClipboardInternal(QXmlStreamWriter *writer, void* userdata);
app/widget/nodeparamview/nodeparamview.cpp
+4 -4
View File
@@ -135,7 +135,7 @@ NodeParamView::NodeParamView(QWidget *parent) :
&NodeParamView::FocusChanged); &NodeParamView::FocusChanged);
} }
void NodeParamView::SelectNodes(const QList<Node *> &nodes) void NodeParamView::SelectNodes(const QVector<Node *> &nodes)
{ {
active_nodes_.append(nodes); active_nodes_.append(nodes);
@@ -185,7 +185,7 @@ void NodeParamView::SelectNodes(const QList<Node *> &nodes)
} }
} }
void NodeParamView::DeselectNodes(const QList<Node *> &nodes) void NodeParamView::DeselectNodes(const QVector<Node *> &nodes)
{ {
// Remove item from map and delete the widget // Remove item from map and delete the widget
bool changes_made = false; bool changes_made = false;
@@ -283,8 +283,8 @@ void NodeParamView::QueueKeyframePositionUpdate()
void NodeParamView::SignalNodeOrder() void NodeParamView::SignalNodeOrder()
{ {
// Sort by item Y (apparently there's no way in Qt to get the order of dock widgets) // Sort by item Y (apparently there's no way in Qt to get the order of dock widgets)
QList<Node*> nodes; QVector<Node*> nodes;
QList<int> item_ys; QVector<int> item_ys;
for (auto it=items_.cbegin(); it!=items_.cend(); it++) { for (auto it=items_.cbegin(); it!=items_.cend(); it++) {
int item_y = it.value()->pos().y(); int item_y = it.value()->pos().y();
app/widget/nodeparamview/nodeparamview.h
+6 -6
View File
@@ -60,8 +60,8 @@ class NodeParamView : public TimeBasedWidget
public: public:
NodeParamView(QWidget* parent = nullptr); NodeParamView(QWidget* parent = nullptr);
void SelectNodes(const QList<Node*>& nodes); void SelectNodes(const QVector<Node *> &nodes);
void DeselectNodes(const QList<Node*>& nodes); void DeselectNodes(const QVector<Node*>& nodes);
const QMap<Node*, NodeParamViewItem*>& GetItemMap() const const QMap<Node*, NodeParamViewItem*>& GetItemMap() const
{ {
@@ -75,9 +75,9 @@ public:
signals: signals:
void InputDoubleClicked(NodeInput* input); void InputDoubleClicked(NodeInput* input);
void RequestSelectNode(const QList<Node*>& target); void RequestSelectNode(const QVector<Node*>& target);
void NodeOrderChanged(const QList<Node*>& nodes); void NodeOrderChanged(const QVector<Node*>& nodes);
void FocusedNodeChanged(Node* n); void FocusedNodeChanged(Node* n);
@@ -113,9 +113,9 @@ private:
// docking windows // docking windows
QMainWindow* param_widget_area_; QMainWindow* param_widget_area_;
QList<Node*> pinned_nodes_; QVector<Node*> pinned_nodes_;
QList<Node*> active_nodes_; QVector<Node*> active_nodes_;
QMap<Node*, bool> node_expanded_state_; QMap<Node*, bool> node_expanded_state_;
app/widget/nodeparamview/nodeparamviewitem.h
+2 -2
View File
@@ -91,7 +91,7 @@ signals:
void InputDoubleClicked(NodeInput* input); void InputDoubleClicked(NodeInput* input);
void RequestSelectNode(const QList<Node*>& node); void RequestSelectNode(const QVector<Node*>& node);
private: private:
void UpdateUIForEdgeConnection(NodeInput* input); void UpdateUIForEdgeConnection(NodeInput* input);
@@ -161,7 +161,7 @@ signals:
void InputDoubleClicked(NodeInput* input); void InputDoubleClicked(NodeInput* input);
void RequestSelectNode(const QList<Node*>& node); void RequestSelectNode(const QVector<Node*>& node);
void PinToggled(bool e); void PinToggled(bool e);
app/widget/nodetableview/nodetableview.cpp
+2 -2
View File
@@ -40,7 +40,7 @@ NodeTableView::NodeTableView(QWidget* parent) :
tr("A/W")}); tr("A/W")});
} }
void NodeTableView::SelectNodes(const QList<Node *> &nodes) void NodeTableView::SelectNodes(const QVector<Node *> &nodes)
{ {
foreach (Node* n, nodes) { foreach (Node* n, nodes) {
QTreeWidgetItem* top_item = new QTreeWidgetItem(); QTreeWidgetItem* top_item = new QTreeWidgetItem();
@@ -53,7 +53,7 @@ void NodeTableView::SelectNodes(const QList<Node *> &nodes)
SetTime(last_time_); SetTime(last_time_);
} }
void NodeTableView::DeselectNodes(const QList<Node *> &nodes) void NodeTableView::DeselectNodes(const QVector<Node *> &nodes)
{ {
foreach (Node* n, nodes) { foreach (Node* n, nodes) {
delete top_level_item_map_.take(n); delete top_level_item_map_.take(n);
app/widget/nodetableview/nodetableview.h
+2 -2
View File
@@ -32,9 +32,9 @@ class NodeTableView : public QTreeWidget
public: public:
NodeTableView(QWidget* parent = nullptr); NodeTableView(QWidget* parent = nullptr);
void SelectNodes(const QList<Node*>& nodes); void SelectNodes(const QVector<Node *> &nodes);
void DeselectNodes(const QList<Node*>& nodes); void DeselectNodes(const QVector<Node*>& nodes);
void SetTime(const rational& time); void SetTime(const rational& time);
app/widget/nodetableview/nodetablewidget.h
+2 -2
View File
@@ -31,12 +31,12 @@ class NodeTableWidget : public TimeBasedWidget
public: public:
NodeTableWidget(QWidget* parent = nullptr); NodeTableWidget(QWidget* parent = nullptr);
void SelectNodes(const QList<Node*>& nodes) void SelectNodes(const QVector<Node*>& nodes)
{ {
view_->SelectNodes(nodes); view_->SelectNodes(nodes);
} }
void DeselectNodes(const QList<Node*>& nodes) void DeselectNodes(const QVector<Node*>& nodes)
{ {
view_->DeselectNodes(nodes); view_->DeselectNodes(nodes);
} }
app/widget/nodetreeview/nodetreeview.cpp
+2 -2
View File
@@ -21,7 +21,7 @@ bool NodeTreeView::IsInputEnabled(NodeInput *i) const
return !disabled_inputs_.contains(i); return !disabled_inputs_.contains(i);
} }
void NodeTreeView::SetNodes(const QList<Node *> &nodes) void NodeTreeView::SetNodes(const QVector<Node *> &nodes)
{ {
nodes_ = nodes; nodes_ = nodes;
@@ -34,7 +34,7 @@ void NodeTreeView::SetNodes(const QList<Node *> &nodes)
node_item->setData(0, kItemType, kItemTypeNode); node_item->setData(0, kItemType, kItemTypeNode);
node_item->setData(0, kItemPointer, reinterpret_cast<quintptr>(n)); node_item->setData(0, kItemPointer, reinterpret_cast<quintptr>(n));
QList<NodeInput*> inputs = n->GetInputsIncludingArrays(); QVector<NodeInput*> inputs = n->GetInputsIncludingArrays();
foreach (NodeInput* i, inputs) { foreach (NodeInput* i, inputs) {
if (only_show_keyframable_ && !i->is_keyframable()) { if (only_show_keyframable_ && !i->is_keyframable()) {
continue; continue;
app/widget/nodetreeview/nodetreeview.h
+4 -4
View File
@@ -23,7 +23,7 @@ public:
} }
public slots: public slots:
void SetNodes(const QList<Node*>& nodes); void SetNodes(const QVector<Node *> &nodes);
signals: signals:
void NodeEnableChanged(Node* n, bool e); void NodeEnableChanged(Node* n, bool e);
@@ -44,11 +44,11 @@ private:
static const int kItemType = Qt::UserRole; static const int kItemType = Qt::UserRole;
static const int kItemPointer = Qt::UserRole + 1; static const int kItemPointer = Qt::UserRole + 1;
QList<Node*> nodes_; QVector<Node*> nodes_;
QList<Node*> disabled_nodes_; QVector<Node*> disabled_nodes_;
QList<NodeInput*> disabled_inputs_; QVector<NodeInput*> disabled_inputs_;
bool only_show_keyframable_; bool only_show_keyframable_;
app/widget/nodeview/nodeview.cpp
+26 -27
View File
@@ -115,7 +115,7 @@ void NodeView::DeleteSelected()
QUndoCommand* command = new QUndoCommand(); QUndoCommand* command = new QUndoCommand();
{ {
QList<NodeEdge*> selected_edges = scene_.GetSelectedEdges(); QVector<NodeEdge*> selected_edges = scene_.GetSelectedEdges();
foreach (NodeEdge* edge, selected_edges) { foreach (NodeEdge* edge, selected_edges) {
new NodeEdgeRemoveCommand(edge->output(), edge->input(), command); new NodeEdgeRemoveCommand(edge->output(), edge->input(), command);
@@ -124,7 +124,7 @@ void NodeView::DeleteSelected()
} }
{ {
QList<Node*> selected_nodes = scene_.GetSelectedNodes(); QVector<Node*> selected_nodes = scene_.GetSelectedNodes();
// Ensure no nodes are "undeletable" // Ensure no nodes are "undeletable"
for (int i=0;i<selected_nodes.size();i++) { for (int i=0;i<selected_nodes.size();i++) {
@@ -166,7 +166,7 @@ void NodeView::DeselectAll()
SceneSelectionChangedSlot(); SceneSelectionChangedSlot();
} }
void NodeView::Select(const QList<Node *> &nodes) void NodeView::Select(const QVector<Node *> &nodes)
{ {
if (!graph_) { if (!graph_) {
return; return;
@@ -188,7 +188,7 @@ void NodeView::Select(const QList<Node *> &nodes)
SceneSelectionChangedSlot(); SceneSelectionChangedSlot();
} }
void NodeView::SelectWithDependencies(QList<Node *> nodes) void NodeView::SelectWithDependencies(QVector<Node *> nodes)
{ {
if (!graph_) { if (!graph_) {
return; return;
@@ -202,7 +202,7 @@ void NodeView::SelectWithDependencies(QList<Node *> nodes)
Select(nodes); Select(nodes);
} }
void NodeView::SelectBlocks(const QList<Block *> &blocks) void NodeView::SelectBlocks(const QVector<Block *> &blocks)
{ {
if (!graph_) { if (!graph_) {
return; return;
@@ -213,7 +213,7 @@ void NodeView::SelectBlocks(const QList<Block *> &blocks)
QueueSelectBlocksInternal(); QueueSelectBlocksInternal();
} }
void NodeView::DeselectBlocks(const QList<Block *> &blocks) void NodeView::DeselectBlocks(const QVector<Block *> &blocks)
{ {
if (!graph_) { if (!graph_) {
return; return;
@@ -240,7 +240,7 @@ void NodeView::CopySelected(bool cut)
return; return;
} }
QList<Node*> selected = scene_.GetSelectedNodes(); QVector<Node*> selected = scene_.GetSelectedNodes();
if (selected.isEmpty()) { if (selected.isEmpty()) {
return; return;
@@ -261,7 +261,7 @@ void NodeView::Paste()
QUndoCommand* command = new QUndoCommand(); QUndoCommand* command = new QUndoCommand();
QList<Node*> pasted_nodes = PasteNodesFromClipboard(static_cast<Sequence*>(graph_), command); QVector<Node*> pasted_nodes = PasteNodesFromClipboard(static_cast<Sequence*>(graph_), command);
Core::instance()->undo_stack()->pushIfHasChildren(command); Core::instance()->undo_stack()->pushIfHasChildren(command);
@@ -280,7 +280,7 @@ void NodeView::Duplicate()
return; return;
} }
QList<Node*> selected = scene_.GetSelectedNodes(); QVector<Node*> selected = scene_.GetSelectedNodes();
if (selected.isEmpty()) { if (selected.isEmpty()) {
return; return;
@@ -488,10 +488,10 @@ void NodeView::wheelEvent(QWheelEvent *event)
void NodeView::SceneSelectionChangedSlot() void NodeView::SceneSelectionChangedSlot()
{ {
QList<Node*> current_selection = scene_.GetSelectedNodes(); QVector<Node*> current_selection = scene_.GetSelectedNodes();
QList<Node*> selected; QVector<Node*> selected;
QList<Node*> deselected; QVector<Node*> deselected;
// Determine which nodes are newly selected // Determine which nodes are newly selected
if (selected_nodes_.isEmpty()) { if (selected_nodes_.isEmpty()) {
@@ -540,7 +540,7 @@ void NodeView::ShowContextMenu(const QPoint &pos)
m.addSeparator(); m.addSeparator();
QList<NodeViewItem*> selected = scene_.GetSelectedItems(); QVector<NodeViewItem*> selected = scene_.GetSelectedItems();
if (itemAt(pos) && !selected.isEmpty()) { if (itemAt(pos) && !selected.isEmpty()) {
@@ -636,7 +636,7 @@ void NodeView::ContextMenuSetDirection(QAction *action)
void NodeView::AutoPositionDescendents() void NodeView::AutoPositionDescendents()
{ {
QList<Node*> selected = scene_.GetSelectedNodes(); QVector<Node*> selected = scene_.GetSelectedNodes();
foreach (Node* n, selected) { foreach (Node* n, selected) {
scene_.ReorganizeFrom(n); scene_.ReorganizeFrom(n);
@@ -665,18 +665,18 @@ void NodeView::ContextMenuFilterChanged(QAction *action)
} }
} }
void NodeView::AttachNodesToCursor(const QList<Node *> &nodes) void NodeView::AttachNodesToCursor(const QVector<Node *> &nodes)
{ {
QList<NodeViewItem*> items; QVector<NodeViewItem*> items(nodes.size());
foreach (Node* p, nodes) { for (int i=0; i<nodes.size(); i++) {
items.append(scene_.NodeToUIObject(p)); items[i] = scene_.NodeToUIObject(nodes.at(i));
} }
AttachItemsToCursor(items); AttachItemsToCursor(items);
} }
void NodeView::AttachItemsToCursor(const QList<NodeViewItem*>& items) void NodeView::AttachItemsToCursor(const QVector<NodeViewItem*>& items)
{ {
DetachItemsFromCursor(); DetachItemsFromCursor();
@@ -731,7 +731,7 @@ void NodeView::UpdateBlockFilter()
bool first = true; bool first = true;
QPointF last_bottom_right; QPointF last_bottom_right;
QList<Node*> currently_visible; QVector<Node*> currently_visible;
foreach (Block* b, selected_blocks_) { foreach (Block* b, selected_blocks_) {
// Auto-position this node's dependencies // Auto-position this node's dependencies
@@ -741,7 +741,7 @@ void NodeView::UpdateBlockFilter()
QPointF node_pos = b->GetPosition(); QPointF node_pos = b->GetPosition();
QRectF anchor(node_pos, node_pos); QRectF anchor(node_pos, node_pos);
QList<Node*> deps = b->GetDependencies(); QVector<Node*> deps = b->GetDependencies();
foreach (Node* d, deps) { foreach (Node* d, deps) {
QPointF dep_pos = d->GetPosition(); QPointF dep_pos = d->GetPosition();
@@ -779,8 +779,7 @@ void NodeView::UpdateBlockFilter()
// ...then add its associations // ...then add its associations
deps.append(temporary_association_map_[b]); deps.append(temporary_association_map_[b]);
QHash<Node*, QList<Block*> >::const_iterator i; for (auto i=association_map_.begin(); i!=association_map_.end(); i++) {
for (i=association_map_.begin(); i!=association_map_.end(); i++) {
if (i.value().contains(b)) { if (i.value().contains(b)) {
deps.append(i.key()); deps.append(i.key());
} }
@@ -835,7 +834,7 @@ void NodeView::SelectBlocksInternal()
UpdateBlockFilter(); UpdateBlockFilter();
} }
QList<Node*> nodes; QVector<Node*> nodes;
nodes.reserve(selected_blocks_.size()); nodes.reserve(selected_blocks_.size());
foreach (Block* b, selected_blocks_) { foreach (Block* b, selected_blocks_) {
@@ -888,7 +887,7 @@ void NodeView::GraphEdgeAdded(NodeEdgePtr edge)
Node* input_node = edge->input()->parentNode(); Node* input_node = edge->input()->parentNode();
if (input_node->OutputsTo(static_cast<Sequence*>(graph_)->viewer_output(), true)) { if (input_node->OutputsTo(static_cast<Sequence*>(graph_)->viewer_output(), true)) {
QHash<Node*, QList<Block*> >::const_iterator i = association_map_.begin(); auto i = association_map_.begin();
while (i != association_map_.end()) { while (i != association_map_.end()) {
if (input_node->InputsFrom(i.key(), true)) { if (input_node->InputsFrom(i.key(), true)) {
@@ -917,14 +916,14 @@ void NodeView::GraphEdgeRemoved(NodeEdgePtr edge)
} }
} }
QList<Node*> disconnected_nodes; QVector<Node*> disconnected_nodes;
disconnected_nodes.append(output_node); disconnected_nodes.append(output_node);
disconnected_nodes.append(output_node->GetDependencies()); disconnected_nodes.append(output_node->GetDependencies());
if (output_node->OutputsTo(static_cast<Sequence*>(graph_)->viewer_output(), true)) { if (output_node->OutputsTo(static_cast<Sequence*>(graph_)->viewer_output(), true)) {
// Check if this disconnected node still has a path to the viewer somewhere else // Check if this disconnected node still has a path to the viewer somewhere else
foreach (Block* b, selected_blocks_) { foreach (Block* b, selected_blocks_) {
QList<Node*>& temp_assocs = temporary_association_map_[b]; QVector<Node*>& temp_assocs = temporary_association_map_[b];
temp_assocs.append(disconnected_nodes); temp_assocs.append(disconnected_nodes);
} }
app/widget/nodeview/nodeview.h
+12 -12
View File
@@ -58,22 +58,22 @@ public:
void SelectAll(); void SelectAll();
void DeselectAll(); void DeselectAll();
void Select(const QList<Node*>& nodes); void Select(const QVector<Node*>& nodes);
void SelectWithDependencies(QList<Node *> nodes); void SelectWithDependencies(QVector<Node *> nodes);
void CopySelected(bool cut); void CopySelected(bool cut);
void Paste(); void Paste();
void Duplicate(); void Duplicate();
void SelectBlocks(const QList<Block*>& blocks); void SelectBlocks(const QVector<Block*>& blocks);
void DeselectBlocks(const QList<Block*>& blocks); void DeselectBlocks(const QVector<Block*>& blocks);
signals: signals:
void NodesSelected(const QList<Node*>& nodes); void NodesSelected(const QVector<Node*>& nodes);
void NodesDeselected(const QList<Node*>& nodes); void NodesDeselected(const QVector<Node*>& nodes);
protected: protected:
virtual void keyPressEvent(QKeyEvent *event) override; virtual void keyPressEvent(QKeyEvent *event) override;
@@ -85,9 +85,9 @@ protected:
virtual void wheelEvent(QWheelEvent* event) override; virtual void wheelEvent(QWheelEvent* event) override;
private: private:
void AttachNodesToCursor(const QList<Node*>& nodes); void AttachNodesToCursor(const QVector<Node *> &nodes);
void AttachItemsToCursor(const QList<NodeViewItem*>& items); void AttachItemsToCursor(const QVector<NodeViewItem *> &items);
void DetachItemsFromCursor(); void DetachItemsFromCursor();
@@ -121,13 +121,13 @@ private:
NodeViewScene scene_; NodeViewScene scene_;
QList<Node*> selected_nodes_; QVector<Node*> selected_nodes_;
QList<Block*> selected_blocks_; QVector<Block*> selected_blocks_;
QHash<Node*, QList<Block*> > association_map_; QHash<Node*, QVector<Block*> > association_map_;
QHash<Block*, QList<Node*> > temporary_association_map_; QHash<Block*, QVector<Node*> > temporary_association_map_;
enum FilterMode { enum FilterMode {
kFilterShowAll, kFilterShowAll,
app/widget/nodeview/nodeviewscene.cpp
+8 -8
View File
@@ -120,10 +120,10 @@ void NodeViewScene::SetGraph(NodeGraph *graph)
graph_ = graph; graph_ = graph;
} }
QList<Node *> NodeViewScene::GetSelectedNodes() const QVector<Node *> NodeViewScene::GetSelectedNodes() const
{ {
QHash<Node*, NodeViewItem*>::const_iterator iterator; QHash<Node*, NodeViewItem*>::const_iterator iterator;
QList<Node *> selected; QVector<Node *> selected;
for (iterator=item_map_.begin();iterator!=item_map_.end();iterator++) { for (iterator=item_map_.begin();iterator!=item_map_.end();iterator++) {
if (iterator.value()->isSelected()) { if (iterator.value()->isSelected()) {
@@ -134,10 +134,10 @@ QList<Node *> NodeViewScene::GetSelectedNodes() const
return selected; return selected;
} }
QList<NodeViewItem *> NodeViewScene::GetSelectedItems() const QVector<NodeViewItem *> NodeViewScene::GetSelectedItems() const
{ {
QHash<Node*, NodeViewItem*>::const_iterator iterator; QHash<Node*, NodeViewItem*>::const_iterator iterator;
QList<NodeViewItem *> selected; QVector<NodeViewItem *> selected;
for (iterator=item_map_.begin();iterator!=item_map_.end();iterator++) { for (iterator=item_map_.begin();iterator!=item_map_.end();iterator++) {
if (iterator.value()->isSelected()) { if (iterator.value()->isSelected()) {
@@ -148,9 +148,9 @@ QList<NodeViewItem *> NodeViewScene::GetSelectedItems() const
return selected; return selected;
} }
QList<NodeEdge*> NodeViewScene::GetSelectedEdges() const QVector<NodeEdge*> NodeViewScene::GetSelectedEdges() const
{ {
QList<NodeEdge*> edges; QVector<NodeEdge*> edges;
QHash<NodeEdge*, NodeViewEdge*>::const_iterator i; QHash<NodeEdge*, NodeViewEdge*>::const_iterator i;
@@ -228,7 +228,7 @@ void NodeViewScene::RemoveEdge(NodeEdgePtr edge)
int NodeViewScene::DetermineWeight(Node *n) int NodeViewScene::DetermineWeight(Node *n)
{ {
QList<Node*> inputs = n->GetImmediateDependencies(); QVector<Node*> inputs = n->GetImmediateDependencies();
int weight = 0; int weight = 0;
@@ -253,7 +253,7 @@ NodeViewCommon::FlowDirection NodeViewScene::GetFlowDirection() const
void NodeViewScene::ReorganizeFrom(Node* n) void NodeViewScene::ReorganizeFrom(Node* n)
{ {
QList<Node*> immediates = n->GetImmediateDependencies(); QVector<Node*> immediates = n->GetImmediateDependencies();
if (immediates.isEmpty()) { if (immediates.isEmpty()) {
// Nothing to do // Nothing to do
app/widget/nodeview/nodeviewscene.h
+3 -3
View File
@@ -63,9 +63,9 @@ public:
void SetGraph(NodeGraph* graph); void SetGraph(NodeGraph* graph);
QList<Node*> GetSelectedNodes() const; QVector<Node *> GetSelectedNodes() const;
QList<NodeViewItem*> GetSelectedItems() const; QVector<NodeViewItem*> GetSelectedItems() const;
QList<NodeEdge *> GetSelectedEdges() const; QVector<NodeEdge *> GetSelectedEdges() const;
const QHash<Node*, NodeViewItem*>& item_map() const; const QHash<Node*, NodeViewItem*>& item_map() const;
const QHash<NodeEdge*, NodeViewEdge*>& edge_map() const; const QHash<NodeEdge*, NodeViewEdge*>& edge_map() const;
app/widget/nodeview/nodeviewundo.cpp
+2 -2
View File
@@ -131,7 +131,7 @@ Project *NodeAddCommand::GetRelevantProject() const
return static_cast<Sequence*>(graph_)->project(); return static_cast<Sequence*>(graph_)->project();
} }
NodeRemoveCommand::NodeRemoveCommand(NodeGraph *graph, const QList<Node *> &nodes, QUndoCommand *parent) : NodeRemoveCommand::NodeRemoveCommand(NodeGraph *graph, const QVector<Node *> &nodes, QUndoCommand *parent) :
UndoCommand(parent), UndoCommand(parent),
graph_(graph), graph_(graph),
nodes_(nodes) nodes_(nodes)
@@ -197,7 +197,7 @@ Project *NodeRemoveCommand::GetRelevantProject() const
NodeRemoveWithExclusiveDeps::NodeRemoveWithExclusiveDeps(NodeGraph *graph, Node *node, QUndoCommand *parent) : NodeRemoveWithExclusiveDeps::NodeRemoveWithExclusiveDeps(NodeGraph *graph, Node *node, QUndoCommand *parent) :
UndoCommand(parent) UndoCommand(parent)
{ {
QList<Node*> node_and_its_deps; QVector<Node*> node_and_its_deps;
node_and_its_deps.append(node); node_and_its_deps.append(node);
node_and_its_deps.append(node->GetExclusiveDependencies()); node_and_its_deps.append(node->GetExclusiveDependencies());
app/widget/nodeview/nodeviewundo.h
+4 -4
View File
@@ -98,7 +98,7 @@ private:
class NodeRemoveCommand : public UndoCommand { class NodeRemoveCommand : public UndoCommand {
public: public:
NodeRemoveCommand(NodeGraph* graph, NodeRemoveCommand(NodeGraph* graph,
const QList<Node*>& nodes, const QVector<Node*>& nodes,
QUndoCommand* parent = nullptr); QUndoCommand* parent = nullptr);
virtual Project* GetRelevantProject() const override; virtual Project* GetRelevantProject() const override;
@@ -111,9 +111,9 @@ private:
QObject memory_manager_; QObject memory_manager_;
NodeGraph* graph_; NodeGraph* graph_;
QList<Node*> nodes_; QVector<Node*> nodes_;
QList<NodeEdgePtr> edges_; QVector<NodeEdgePtr> edges_;
QList<BlockUnlinkAllCommand*> block_unlink_commands_; QVector<BlockUnlinkAllCommand*> block_unlink_commands_;
}; };
class NodeRemoveWithExclusiveDeps : public UndoCommand { class NodeRemoveWithExclusiveDeps : public UndoCommand {
app/widget/projectexplorer/projectexplorer.cpp
+2 -2
View File
@@ -637,12 +637,12 @@ void ProjectExplorer::DeleteSelected()
if (msgbox.clickedButton() == delete_clip_btn) { if (msgbox.clickedButton() == delete_clip_btn) {
// Delete any blocks that use this footage // Delete any blocks that use this footage
QList<Block*> blocks_to_remove; QVector<Block*> blocks_to_remove;
foreach (Sequence* s, used_in_sequences) { foreach (Sequence* s, used_in_sequences) {
foreach (TrackOutput* track, s->viewer_output()->GetTracks()) { foreach (TrackOutput* track, s->viewer_output()->GetTracks()) {
foreach (Block* b, track->Blocks()) { foreach (Block* b, track->Blocks()) {
QList<Node*> deps = b->GetDependencies(); QVector<Node*> deps = b->GetDependencies();
foreach (MediaInput* i, footage_nodes) { foreach (MediaInput* i, footage_nodes) {
if (deps.contains(i)) { if (deps.contains(i)) {
app/widget/timelinewidget/timelinewidget.cpp
+25 -30
View File
@@ -362,7 +362,7 @@ rational TimelineWidget::GetToolTipTimebase() const
void TimelineWidget::SelectAll() void TimelineWidget::SelectAll()
{ {
QList<Block*> newly_selected_blocks; QVector<Block*> newly_selected_blocks;
for (auto it=block_items_.cbegin(); it!=block_items_.cend(); it++) { for (auto it=block_items_.cbegin(); it!=block_items_.cend(); it++) {
if (!selected_blocks_.contains(it.key())) { if (!selected_blocks_.contains(it.key())) {
@@ -414,7 +414,7 @@ void TimelineWidget::SplitAtPlayhead()
rational playhead_time = Timecode::timestamp_to_time(GetTimestamp(), timebase()); rational playhead_time = Timecode::timestamp_to_time(GetTimestamp(), timebase());
QList<TimelineViewBlockItem *> selected_blocks = GetSelectedBlocks(); QVector<TimelineViewBlockItem *> selected_blocks = GetSelectedBlocks();
// Prioritize blocks that are selected and overlap the playhead // Prioritize blocks that are selected and overlap the playhead
QVector<Block*> blocks_to_split; QVector<Block*> blocks_to_split;
@@ -459,7 +459,7 @@ void TimelineWidget::SplitAtPlayhead()
} }
} }
void TimelineWidget::ReplaceBlocksWithGaps(const QList<Block *> &blocks, void TimelineWidget::ReplaceBlocksWithGaps(const QVector<Block *> &blocks,
bool remove_from_graph, bool remove_from_graph,
QUndoCommand *command) QUndoCommand *command)
{ {
@@ -482,8 +482,8 @@ void TimelineWidget::ReplaceBlocksWithGaps(const QList<Block *> &blocks,
void TimelineWidget::DeleteSelected(bool ripple) void TimelineWidget::DeleteSelected(bool ripple)
{ {
QList<TimelineViewBlockItem *> selected_list = GetSelectedBlocks(); QVector<TimelineViewBlockItem *> selected_list = GetSelectedBlocks();
QList<Block*> blocks_to_delete; QVector<Block*> blocks_to_delete;
foreach (TimelineViewBlockItem* item, selected_list) { foreach (TimelineViewBlockItem* item, selected_list) {
Block* b = item->block(); Block* b = item->block();
@@ -498,8 +498,8 @@ void TimelineWidget::DeleteSelected(bool ripple)
QUndoCommand* command = new QUndoCommand(); QUndoCommand* command = new QUndoCommand();
QList<Block*> clips_to_delete; QVector<Block*> clips_to_delete;
QList<TransitionBlock*> transitions_to_delete; QVector<TransitionBlock*> transitions_to_delete;
foreach (Block* b, blocks_to_delete) { foreach (Block* b, blocks_to_delete) {
if (b->type() == Block::kClip) { if (b->type() == Block::kClip) {
@@ -580,9 +580,9 @@ void TimelineWidget::OverwriteFootageAtPlayhead(const QList<Footage *> &footage)
void TimelineWidget::ToggleLinksOnSelected() void TimelineWidget::ToggleLinksOnSelected()
{ {
QList<TimelineViewBlockItem*> sel = GetSelectedBlocks(); QVector<TimelineViewBlockItem*> sel = GetSelectedBlocks();
QList<Block*> blocks; QVector<Block*> blocks;
bool link = true; bool link = true;
foreach (TimelineViewBlockItem* item, sel) { foreach (TimelineViewBlockItem* item, sel) {
@@ -612,20 +612,20 @@ void TimelineWidget::CopySelected(bool cut)
return; return;
} }
QList<TimelineViewBlockItem*> selected = GetSelectedBlocks(); QVector<TimelineViewBlockItem*> selected = GetSelectedBlocks();
if (selected.isEmpty()) { if (selected.isEmpty()) {
return; return;
} }
QList<Node*> selected_nodes; QVector<Node*> selected_nodes;
foreach (TimelineViewBlockItem* item, selected) { foreach (TimelineViewBlockItem* item, selected) {
Node* block = item->block(); Node* block = item->block();
selected_nodes.append(block); selected_nodes.append(block);
QList<Node*> deps = block->GetDependencies(); QVector<Node*> deps = block->GetDependencies();
foreach (Node* d, deps) { foreach (Node* d, deps) {
if (!selected_nodes.contains(d)) { if (!selected_nodes.contains(d)) {
@@ -649,8 +649,8 @@ void TimelineWidget::Paste(bool insert)
QUndoCommand* command = new QUndoCommand(); QUndoCommand* command = new QUndoCommand();
QList<BlockPasteData> paste_data; QVector<BlockPasteData> paste_data;
QList<Node*> pasted = PasteNodesFromClipboard(static_cast<Sequence*>(GetConnectedNode()->parent()), command, &paste_data); QVector<Node*> pasted = PasteNodesFromClipboard(static_cast<Sequence*>(GetConnectedNode()->parent()), command, &paste_data);
rational paste_start = GetTime(); rational paste_start = GetTime();
@@ -731,7 +731,7 @@ void TimelineWidget::DeleteInToOut(bool ripple)
void TimelineWidget::ToggleSelectedEnabled() void TimelineWidget::ToggleSelectedEnabled()
{ {
QList<TimelineViewBlockItem*> items = GetSelectedBlocks(); QVector<TimelineViewBlockItem*> items = GetSelectedBlocks();
if (items.isEmpty()) { if (items.isEmpty()) {
return; return;
@@ -748,12 +748,12 @@ void TimelineWidget::ToggleSelectedEnabled()
Core::instance()->undo_stack()->pushIfHasChildren(command); Core::instance()->undo_stack()->pushIfHasChildren(command);
} }
QList<TimelineViewBlockItem *> TimelineWidget::GetSelectedBlocks() QVector<TimelineViewBlockItem *> TimelineWidget::GetSelectedBlocks()
{ {
QList<TimelineViewBlockItem *> list; QVector<TimelineViewBlockItem *> list(selected_blocks_.size());
foreach (Block* b, selected_blocks_) { for (int i=0; i<selected_blocks_.size(); i++) {
list.append(block_items_.value(b)); list[i] = block_items_.value(selected_blocks_.at(i));
} }
return list; return list;
@@ -908,10 +908,7 @@ void TimelineWidget::AddBlock(Block *block, TrackReference track)
void TimelineWidget::RemoveBlock(const QList<Block *> &blocks) void TimelineWidget::RemoveBlock(const QList<Block *> &blocks)
{ {
QList<TimelineViewBlockItem*> delete_items; QVector<Block*> deselect_blocks;
delete_items.reserve(blocks.size());
QList<Block*> deselect_blocks;
foreach (Block* b, blocks) { foreach (Block* b, blocks) {
// Disconnect all signals // Disconnect all signals
@@ -940,8 +937,6 @@ void TimelineWidget::RemoveBlock(const QList<Block *> &blocks)
// through // through
emit BlocksDeselected(deselect_blocks); emit BlocksDeselected(deselect_blocks);
} }
qDeleteAll(delete_items);
} }
void TimelineWidget::AddTrack(TrackOutput *track, Timeline::TrackType type) void TimelineWidget::AddTrack(TrackOutput *track, Timeline::TrackType type)
@@ -1051,7 +1046,7 @@ void TimelineWidget::ShowContextMenu()
{ {
Menu menu(this); Menu menu(this);
QList<TimelineViewBlockItem*> selected = GetSelectedBlocks(); QVector<TimelineViewBlockItem*> selected = GetSelectedBlocks();
if (!selected.isEmpty()) { if (!selected.isEmpty()) {
MenuShared::instance()->AddItemsForEditMenu(&menu, true); MenuShared::instance()->AddItemsForEditMenu(&menu, true);
@@ -1060,8 +1055,8 @@ void TimelineWidget::ShowContextMenu()
QAction* properties_action = menu.addAction(tr("Properties")); QAction* properties_action = menu.addAction(tr("Properties"));
connect(properties_action, &QAction::triggered, this, [this](){ connect(properties_action, &QAction::triggered, this, [this](){
QList<TimelineViewBlockItem*> block_items = GetSelectedBlocks(); QVector<TimelineViewBlockItem*> block_items = GetSelectedBlocks();
QList<Node*> nodes; QVector<Node*> nodes;
foreach (TimelineViewBlockItem* i, block_items) { foreach (TimelineViewBlockItem* i, block_items) {
nodes.append(i->block()); nodes.append(i->block());
@@ -1210,7 +1205,7 @@ const QRect& TimelineWidget::GetRubberBandGeometry() const
return rubberband_.geometry(); return rubberband_.geometry();
} }
void TimelineWidget::SignalSelectedBlocks(QList<Block *> input, bool filter) void TimelineWidget::SignalSelectedBlocks(QVector<Block *> input, bool filter)
{ {
if (input.isEmpty()) { if (input.isEmpty()) {
return; return;
@@ -1233,7 +1228,7 @@ void TimelineWidget::SignalSelectedBlocks(QList<Block *> input, bool filter)
emit BlocksSelected(input); emit BlocksSelected(input);
} }
void TimelineWidget::SignalDeselectedBlocks(const QList<Block *> &deselected_blocks) void TimelineWidget::SignalDeselectedBlocks(const QVector<Block *> &deselected_blocks)
{ {
if (deselected_blocks.isEmpty()) { if (deselected_blocks.isEmpty()) {
return; return;
app/widget/timelinewidget/timelinewidget.h
+8 -8
View File
@@ -89,7 +89,7 @@ public:
void ToggleSelectedEnabled(); void ToggleSelectedEnabled();
QList<TimelineViewBlockItem*> GetSelectedBlocks(); QVector<TimelineViewBlockItem*> GetSelectedBlocks();
virtual bool SnapPoint(QList<rational> start_times, rational *movement, int snap_points = kSnapAll) override; virtual bool SnapPoint(QList<rational> start_times, rational *movement, int snap_points = kSnapAll) override;
@@ -99,7 +99,7 @@ public:
void RestoreSplitterState(const QByteArray& state); void RestoreSplitterState(const QByteArray& state);
static void ReplaceBlocksWithGaps(const QList<Block *>& blocks, bool remove_from_graph, QUndoCommand* command); static void ReplaceBlocksWithGaps(const QVector<Block *> &blocks, bool remove_from_graph, QUndoCommand* command);
/** /**
* @brief Retrieve the QGraphicsItem at a particular scene position * @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 * 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). * already selected blocks (and therefore filtering can be skipped to save time).
*/ */
void SignalSelectedBlocks(QList<Block *> selected_blocks, bool filter = true); void SignalSelectedBlocks(QVector<Block *> selected_blocks, bool filter = true);
/** /**
* @brief Track blocks that have been newly deselected * @brief Track blocks that have been newly deselected
*/ */
void SignalDeselectedBlocks(const QList<Block*>& deselected_blocks); void SignalDeselectedBlocks(const QVector<Block *> &deselected_blocks);
/** /**
* @brief Convenience function to deselect all blocks and signal them * @brief Convenience function to deselect all blocks and signal them
@@ -198,9 +198,9 @@ public:
void SignalDeselectedAllBlocks(); void SignalDeselectedAllBlocks();
signals: signals:
void BlocksSelected(const QList<Block*>& selected_blocks); void BlocksSelected(const QVector<Block*>& selected_blocks);
void BlocksDeselected(const QList<Block*>& deselected_blocks); void BlocksDeselected(const QVector<Block*>& deselected_blocks);
protected: protected:
virtual void resizeEvent(QResizeEvent *event) override; virtual void resizeEvent(QResizeEvent *event) override;
@@ -237,7 +237,7 @@ private:
QRubberBand rubberband_; QRubberBand rubberband_;
TimelineWidgetSelections rubberband_old_selections_; TimelineWidgetSelections rubberband_old_selections_;
QList<Block*> rubberband_now_selected_; QVector<Block*> rubberband_now_selected_;
TimelineWidgetSelections selections_; TimelineWidgetSelections selections_;
@@ -257,7 +257,7 @@ private:
TimeSlider* timecode_label_; TimeSlider* timecode_label_;
QList<Block*> selected_blocks_; QVector<Block*> selected_blocks_;
int deferred_scroll_value_; int deferred_scroll_value_;
app/widget/timelinewidget/tool/pointer.cpp
+18 -18
View File
@@ -79,7 +79,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event)
if (parent()->IsBlockSelected(clicked_item_->block())) { if (parent()->IsBlockSelected(clicked_item_->block())) {
// Collect item deselections // Collect item deselections
QList<Block*> deselected_blocks; QVector<Block*> deselected_blocks;
// If shift is held, deselect it // If shift is held, deselect it
if (event->GetModifiers() & Qt::ShiftModifier) { if (event->GetModifiers() & Qt::ShiftModifier) {
@@ -89,7 +89,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event)
// If not holding alt, deselect all links as well // If not holding alt, deselect all links as well
if (!(event->GetModifiers() & Qt::AltModifier)) { if (!(event->GetModifiers() & Qt::AltModifier)) {
parent()->SetBlockLinksSelected(clicked_item_->block(), false); 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) { if (selectable_item) {
// Collect item selections // Collect item selections
QList<Block*> selected_blocks; QVector<Block*> selected_blocks;
// Select this item // Select this item
parent()->AddSelection(clicked_item_); parent()->AddSelection(clicked_item_);
@@ -116,7 +116,7 @@ void PointerTool::MousePress(TimelineViewMouseEvent *event)
// If not holding alt, select all links as well // If not holding alt, select all links as well
if (!(event->GetModifiers() & Qt::AltModifier)) { if (!(event->GetModifiers() & Qt::AltModifier)) {
parent()->SetBlockLinksSelected(clicked_item_->block(), true); 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); parent()->SignalSelectedBlocks(selected_blocks);
@@ -219,13 +219,13 @@ void SetGhostToSlideMode(TimelineViewGhostItem* g)
} }
void PointerTool::InitiateDragInternal(TimelineViewBlockItem *clicked_item, void PointerTool::InitiateDragInternal(TimelineViewBlockItem *clicked_item,
Timeline::MovementMode trim_mode, Timeline::MovementMode trim_mode,
bool dont_roll_trims, bool dont_roll_trims,
bool allow_nongap_rolling, bool allow_nongap_rolling,
bool slide_instead_of_moving) bool slide_instead_of_moving)
{ {
// Get list of selected blocks // Get list of selected blocks
QList<TimelineViewBlockItem*> clips = parent()->GetSelectedBlocks(); QVector<TimelineViewBlockItem*> clips = parent()->GetSelectedBlocks();
if (trim_mode == Timeline::kMove) { 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 we're not duplicating, "remove" the clips and replace them with gaps
if (!duplicate_clips) { if (!duplicate_clips) {
QList<Block*> blocks_to_delete; QVector<Block*> blocks_to_delete(blocks_moving.size());
foreach (const GhostBlockPair& p, blocks_moving) { for (int i=0; i<blocks_moving.size(); i++) {
blocks_to_delete.append(p.block); blocks_to_delete[i] = blocks_moving.at(i).block;
} }
parent()->ReplaceBlocksWithGaps(blocks_to_delete, false, command); parent()->ReplaceBlocksWithGaps(blocks_to_delete, false, command);
@@ -724,7 +724,7 @@ Timeline::MovementMode PointerTool::IsCursorInTrimHandle(TimelineViewBlockItem *
} }
void PointerTool::InitiateDrag(TimelineViewBlockItem* clicked_item, void PointerTool::InitiateDrag(TimelineViewBlockItem* clicked_item,
Timeline::MovementMode trim_mode) Timeline::MovementMode trim_mode)
{ {
InitiateDragInternal(clicked_item, trim_mode, false, false, false); InitiateDragInternal(clicked_item, trim_mode, false, false, false);
} }
@@ -795,8 +795,8 @@ void PointerTool::AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::Movem
} }
bool PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip, bool PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip,
const QList<TimelineViewBlockItem*>& items, const QVector<TimelineViewBlockItem*>& items,
const Timeline::MovementMode& mode) const Timeline::MovementMode& mode)
{ {
foreach (TimelineViewBlockItem* compare, items) { foreach (TimelineViewBlockItem* compare, items) {
if (clip->Track() == compare->Track() if (clip->Track() == compare->Track()
@@ -811,9 +811,9 @@ bool PointerTool::IsClipTrimmable(TimelineViewBlockItem* clip,
} }
bool PointerTool::AddMovingTransitionsToClipGhost(Block* block, bool PointerTool::AddMovingTransitionsToClipGhost(Block* block,
const TrackReference& track, const TrackReference& track,
Timeline::MovementMode movement, Timeline::MovementMode movement,
const QList<TimelineViewBlockItem*>& selected_items) const QList<TimelineViewBlockItem*>& selected_items)
{ {
// Assume block is a clip and see if it has any transitions // Assume block is a clip and see if it has any transitions
TransitionBlock* transitions[2]; TransitionBlock* transitions[2];
app/widget/timelinewidget/tool/pointer.h
+1 -1
View File
@@ -100,7 +100,7 @@ private:
void AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode); void AddGhostInternal(TimelineViewGhostItem* ghost, Timeline::MovementMode mode);
bool IsClipTrimmable(TimelineViewBlockItem* clip, bool IsClipTrimmable(TimelineViewBlockItem* clip,
const QList<TimelineViewBlockItem*>& items, const QVector<TimelineViewBlockItem *> &items,
const Timeline::MovementMode& mode); const Timeline::MovementMode& mode);
void ProcessGhostsForSliding(); void ProcessGhostsForSliding();
app/widget/timelinewidget/undo/undo.cpp
+1 -1
View File
@@ -765,7 +765,7 @@ void BlockUnlinkAllCommand::undo_internal()
unlinked_.clear(); unlinked_.clear();
} }
BlockLinkManyCommand::BlockLinkManyCommand(const QList<Block *> blocks, bool link, QUndoCommand *parent) : BlockLinkManyCommand::BlockLinkManyCommand(const QVector<Block *> blocks, bool link, QUndoCommand *parent) :
UndoCommand(parent), UndoCommand(parent),
blocks_(blocks) blocks_(blocks)
{ {
app/widget/timelinewidget/undo/undo.h
+2 -2
View File
@@ -471,12 +471,12 @@ private:
class BlockLinkManyCommand : public UndoCommand { class BlockLinkManyCommand : public UndoCommand {
public: public:
BlockLinkManyCommand(const QList<Block*> blocks, bool link, QUndoCommand* parent = nullptr); BlockLinkManyCommand(const QVector<Block*> blocks, bool link, QUndoCommand* parent = nullptr);
virtual Project* GetRelevantProject() const override; virtual Project* GetRelevantProject() const override;
private: private:
QList<Block*> blocks_; QVector<Block*> blocks_;
}; };
app/widget/timetarget/timetarget.cpp
+1 -1
View File
@@ -60,7 +60,7 @@ TimeRange TimeTargetObject::GetAdjustedTime(Node* from, Node* to, const TimeRang
return r; return r;
} }
QList<TimeRange> adjusted = from->TransformTimeTo(r, to, direction); QVector<TimeRange> adjusted = from->TransformTimeTo(r, to, direction);
if (adjusted.isEmpty()) { if (adjusted.isEmpty()) {
return r; return r;