From 791857fba1dcdce2860029fde56d2fd309149249 Mon Sep 17 00:00:00 2001 From: Thomas Wilshaw Date: Tue, 29 Sep 2020 12:03:01 +0100 Subject: [PATCH] Cleanup. --- app/project/projectviewmodel.cpp | 1 - app/project/projectviewmodel.h | 3 +++ app/widget/projectexplorer/projectexplorer.cpp | 2 +- app/widget/projectexplorer/projectexplorer.h | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/project/projectviewmodel.cpp b/app/project/projectviewmodel.cpp index 3a94252d6..8c176f24f 100644 --- a/app/project/projectviewmodel.cpp +++ b/app/project/projectviewmodel.cpp @@ -26,7 +26,6 @@ #include "core.h" #include "node/input/media/media.h" -#include "widget/timelinewidget/timelinewidget.h" OLIVE_NAMESPACE_ENTER diff --git a/app/project/projectviewmodel.h b/app/project/projectviewmodel.h index bd3e068ed..8da1c2472 100644 --- a/app/project/projectviewmodel.h +++ b/app/project/projectviewmodel.h @@ -195,6 +195,9 @@ public: }; + /** + * @brief An undo command for offlining footage when it is deleted from the project explorer + */ class OfflineFootageCommand : public UndoCommand { public: OfflineFootageCommand(ProjectViewModel* model, ItemPtr item, QMap nodes, QUndoCommand* parent = nullptr); diff --git a/app/widget/projectexplorer/projectexplorer.cpp b/app/widget/projectexplorer/projectexplorer.cpp index 26fedcd2d..fecb0ac6f 100644 --- a/app/widget/projectexplorer/projectexplorer.cpp +++ b/app/widget/projectexplorer/projectexplorer.cpp @@ -588,7 +588,7 @@ QList ProjectExplorer::GetFootageBlocks(QList nodes) // For each Block see if it is linked to one of the Footage nodes add it to the delete list if (node->IsBlock()) { foreach (Node* input, nodes) { - if (node->GetExclusiveDependencies().contains(input)) { + if (node->GetDependencies().contains(input)) { blocks.append(static_cast(node)); } } diff --git a/app/widget/projectexplorer/projectexplorer.h b/app/widget/projectexplorer/projectexplorer.h index 8900fc9de..a91af4cd2 100644 --- a/app/widget/projectexplorer/projectexplorer.h +++ b/app/widget/projectexplorer/projectexplorer.h @@ -124,6 +124,8 @@ private: /** * @brief Get all the blocks associated with the given footage nodes + * + * Currently quite brute force. */ QList GetFootageBlocks(QList nodes);