oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions 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/node/audio/pan/pan.cpp
+1 -1
View File
@@ -49,7 +49,7 @@ QString PanNode::id() const
return QStringLiteral("org.olivevideoeditor.Olive.pan");
}
QList<Node::CategoryID> PanNode::Category() const
QVector<Node::CategoryID> PanNode::Category() const
{
return {kCategoryChannels};
}
app/node/audio/pan/pan.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> VolumeNode::Category() const
QVector<Node::CategoryID> VolumeNode::Category() const
{
return {kCategoryFilter};
}
app/node/audio/volume/volume.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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);
}
QList<Node::CategoryID> Block::Category() const
QVector<Node::CategoryID> Block::Category() const
{
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
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 QList<CategoryID> Category() const override;
virtual QVector<CategoryID> 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<NodeInput*> GetInputsToHash() const override;
virtual QVector<NodeInput*> GetInputsToHash() const override;
virtual void LengthChangedEvent(const rational& old_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");
}
QList<Node::CategoryID> CrossDissolveTransition::Category() const
QVector<Node::CategoryID> CrossDissolveTransition::Category() const
{
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 id() const override;
virtual QList<CategoryID> Category() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const 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");
}
QList<Node::CategoryID> DipToColorTransition::Category() const
QVector<Node::CategoryID> DipToColorTransition::Category() const
{
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 id() const override;
virtual QList<CategoryID> Category() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() 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");
}
QList<Node::CategoryID> BlurFilterNode::Category() const
QVector<Node::CategoryID> BlurFilterNode::Category() const
{
return {kCategoryFilter};
}
app/node/filter/blur/blur.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> StrokeFilterNode::Category() const
QVector<Node::CategoryID> StrokeFilterNode::Category() const
{
return {kCategoryFilter};
}
app/node/filter/stroke/stroke.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> MatrixGenerator::Category() const
QVector<Node::CategoryID> MatrixGenerator::Category() const
{
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 ShortName() 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 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");
}
QList<Node::CategoryID> PolygonGenerator::Category() const
QVector<Node::CategoryID> PolygonGenerator::Category() const
{
return {kCategoryGenerator};
}
app/node/generator/polygon/polygon.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> SolidGenerator::Category() const
QVector<Node::CategoryID> SolidGenerator::Category() const
{
return {kCategoryGenerator};
}
app/node/generator/solid/solid.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> TextGenerator::Category() const
QVector<Node::CategoryID> TextGenerator::Category() const
{
return {kCategoryGenerator};
}
app/node/generator/text/text.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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()
&& (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);
if (traverse) {
QList<NodeInput*> connected_inputs = connected->GetInputsIncludingArrays();
QVector<NodeInput*> 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<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);
return list;
}
QList<Node *> NodeInput::GetExclusiveDependencies() const
QVector<Node *> NodeInput::GetExclusiveDependencies() const
{
return GetDependencies(true, true);
}
QList<Node *> NodeInput::GetImmediateDependencies() const
QVector<Node *> NodeInput::GetImmediateDependencies() const
{
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);
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 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:
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_);
}
QList<Node::CategoryID> MediaInput::Category() const
QVector<Node::CategoryID> MediaInput::Category() const
{
return {kCategoryInput};
}
app/node/input/media/media.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
virtual Stream::Type type() const = 0;
virtual QList<CategoryID> Category() const override;
virtual QVector<CategoryID> Category() const override;
StreamPtr stream();
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");
}
QList<Node::CategoryID> TimeInput::Category() const
QVector<Node::CategoryID> TimeInput::Category() const
{
return {kCategoryInput};
}
app/node/input/time/timeinput.h
+1 -1
View File
@@ -35,7 +35,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> MathNode::Category() const
QVector<Node::CategoryID> MathNode::Category() const
{
return {kCategoryMath};
}
app/node/math/math/math.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> MergeNode::Category() const
QVector<Node::CategoryID> MergeNode::Category() const
{
return {kCategoryMath};
}
app/node/math/merge/merge.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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");
}
QList<Node::CategoryID> TrigonometryNode::Category() const
QVector<Node::CategoryID> TrigonometryNode::Category() const
{
return {kCategoryMath};
}
app/node/math/trigonometry/trigonometry.h
+1 -1
View File
@@ -34,7 +34,7 @@ public:
virtual QString Name() 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 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();
}
void GetInputsIncludingArraysInternal(NodeInputArray* array, QList<NodeInput *>& list)
void GetInputsIncludingArraysInternal(NodeInputArray* array, QVector<NodeInput *>& list)
{
foreach (NodeInput* input, array->sub_params()) {
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_) {
if (param->type() == NodeParam::kInput) {
@@ -300,7 +300,7 @@ QList<NodeInput *> Node::GetInputsIncludingArrays() const
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.
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<NodeInput*> inputs = GetInputsToHash();
QVector<NodeInput*> 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<NodeParam*>& src_param = source->params_;
const QList<NodeParam*>& dst_param = destination->params_;
const QVector<NodeParam*>& src_param = source->params_;
const QVector<NodeParam*>& dst_param = destination->params_;
for (int i=0;i<src_param.size();i++) {
NodeParam* p = src_param.at(i);
@@ -460,7 +460,7 @@ bool Node::IsMedia() const
return false;
}
const QList<NodeParam *>& Node::parameters() const
const QVector<NodeParam *>& 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*> Node::GetDependenciesInternal(bool traverse, bool exclusive_only) const {
QList<NodeInput*> inputs = GetInputsIncludingArrays();
QList<Node*> list;
QVector<Node *> Node::GetDependenciesInternal(bool traverse, bool exclusive_only) const {
QVector<NodeInput*> inputs = GetInputsIncludingArrays();
QVector<Node*> list;
foreach (NodeInput* i, inputs) {
i->GetDependencies(list, traverse, exclusive_only);
@@ -489,17 +489,17 @@ QList<Node*> Node::GetDependenciesInternal(bool traverse, bool exclusive_only) c
return list;
}
QList<Node *> Node::GetDependencies() const
QVector<Node *> Node::GetDependencies() const
{
return GetDependenciesInternal(true, false);
}
QList<Node *> Node::GetExclusiveDependencies() const
QVector<Node *> Node::GetExclusiveDependencies() const
{
return GetDependenciesInternal(true, true);
}
QList<Node *> Node::GetImmediateDependencies() const
QVector<Node *> 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<NodeInput*> inputs = GetInputsIncludingArrays();
QVector<NodeInput*> 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<NodeOutput*> outputs = GetOutputs();
QVector<NodeOutput*> 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<NodeOutput*> outputs = GetOutputs();
QVector<NodeOutput*> 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<NodeOutput*> outputs = GetOutputs();
QVector<NodeOutput*> 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<NodeInput*> inputs = GetInputsIncludingArrays();
QVector<NodeInput*> 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<NodeInput*> inputs = GetInputsIncludingArrays();
QVector<NodeInput*> 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<NodeOutput*> outputs = GetOutputs();
QVector<NodeOutput*> 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<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) {
// 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`
foreach (NodeInput* input, inputs) {
@@ -755,7 +755,7 @@ QList<TimeRange> Node::TransformTimeTo(const TimeRange &time, Node *target, Node
}
} else {
// 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`
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
* 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)
@@ -150,7 +150,7 @@ public:
/**
* @brief Return a list of NodeParams
*/
const QList<NodeParam*>& parameters() const;
const QVector<NodeParam*>& 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<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
@@ -169,12 +169,12 @@ public:
*
* 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)
*/
QList<Node*> GetImmediateDependencies() const;
QVector<Node *> 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<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
*/
template<class T>
QList<T*> FindInputNodes() const;
QVector<T*> FindInputNodes() const;
template<class T>
/**
* @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
@@ -407,9 +407,9 @@ public:
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;
@@ -435,7 +435,7 @@ protected:
virtual void SaveInternal(QXmlStreamWriter* writer) const;
virtual QList<NodeInput*> GetInputsToHash() const;
virtual QVector<NodeInput*> GetInputsToHash() const;
protected slots:
void InputChanged(const OLIVE_NAMESPACE::TimeRange &range);
@@ -488,14 +488,14 @@ private:
void DisconnectInput(NodeInput* input);
template<class T>
static void FindInputNodeInternal(const Node* n, QList<T *>& list);
static void FindInputNodeInternal(const Node* n, QVector<T *>& list);
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
@@ -520,9 +520,9 @@ private:
};
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) {
if (input->is_connected()) {
@@ -539,9 +539,9 @@ void Node::FindInputNodeInternal(const Node* n, QList<T *>& list)
}
template<class T>
QList<T *> Node::FindInputNodes() const
QVector<T *> Node::FindInputNodes() const
{
QList<T *> list;
QVector<T *> list;
FindInputNodeInternal<T>(this, list);
@@ -555,7 +555,7 @@ T* Node::ValueToPtr(const QVariant &ptr)
}
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()) {
Node* connected = edge->input()->parentNode();
T* cast_test = dynamic_cast<T*>(connected);
@@ -569,9 +569,9 @@ void Node::FindOutputNodeInternal(const Node* n, QList<T *>& list) {
}
template<class T>
QList<T *> Node::FindOutputNode()
QVector<T *> Node::FindOutputNode()
{
QList<T *> list;
QVector<T *> 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");
}
QList<Node::CategoryID> TrackOutput::Category() const
QVector<Node::CategoryID> TrackOutput::Category() const
{
return {kCategoryTimeline};
}
app/node/output/track/track.h
+1 -1
View File
@@ -45,7 +45,7 @@ public:
virtual QString Name() const override;
virtual QString id() const override;
virtual QList<CategoryID> Category() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
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");
}
QList<Node::CategoryID> ViewerOutput::Category() const
QVector<Node::CategoryID> ViewerOutput::Category() const
{
return {kCategoryOutput};
}
app/node/output/viewer/viewer.h
+1 -1
View File
@@ -53,7 +53,7 @@ public:
virtual QString Name() const override;
virtual QString id() const override;
virtual QList<CategoryID> Category() const override;
virtual QVector<CategoryID> Category() const override;
virtual QString Description() const override;
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;
// 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) {
if (IsCancelled()) {