don't use shared ptrs for project items

This commit is contained in:
itsmattkc
2020-12-16 10:28:43 +11:00
parent 1cd07bc1f7
commit e12013e2fb
31 changed files with 209 additions and 255 deletions
-6
View File
@@ -171,12 +171,6 @@ void Sequence::Load(QXmlStreamReader *reader, XMLNodeData& xml_node_data, uint v
// Link blocks
XMLLinkBlocks(xml_node_data);
// Ensure this and all children are in the main thread
// NOTE: It might be good to move the Item system to QObjects so they inherit their thread
if (QThread::currentThread() != qApp->thread()) {
moveToThread(qApp->thread());
}
}
void Sequence::Save(QXmlStreamWriter *writer) const
+2 -4
View File
@@ -31,14 +31,12 @@
namespace olive {
class Sequence;
using SequencePtr = std::shared_ptr<Sequence>;
/**
* @brief The main timeline object, an graph of edited clips that forms a complete edit
*/
class Sequence : public Item, public NodeGraph, public TimelinePoints
class Sequence : public NodeGraph, public TimelinePoints
{
Q_OBJECT
public:
Sequence();