Commit 65069d56 authored by luyikei's avatar luyikei Committed by Hugo Beauzée-Luyssen
Browse files

Helper: Take uuid as QUuid

parent 20c665db
...@@ -40,8 +40,7 @@ ...@@ -40,8 +40,7 @@
#include <QVariant> #include <QVariant>
Clip::Clip( QSharedPointer<Media> media, qint64 begin /*= 0*/, qint64 end /*= Backend::IInput::EndOfMedia */, const QUuid& uuid /*= QString()*/ ) : Clip::Clip( QSharedPointer<Media> media, qint64 begin /*= 0*/, qint64 end /*= Backend::IInput::EndOfMedia */, const QUuid& uuid /*= QString()*/ ) :
//FIXME: uuid -> QString conversion should be removed, since the helper stores the UUID as a QUuid Workflow::Helper( uuid ),
Workflow::Helper( uuid.toString() ),
m_media( media ), m_media( media ),
m_input( media->input()->cut( begin, end ) ), m_input( media->input()->cut( begin, end ) ),
m_isLinked( false ) m_isLinked( false )
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
using namespace Workflow; using namespace Workflow;
Helper::Helper( const QString &uuid/* = QString()*/ ) Helper::Helper( const QUuid& uuid/* = QUuid()*/ )
{ {
if ( uuid.isEmpty() == true ) if ( uuid.isNull() == true )
m_uuid = QUuid::createUuid(); m_uuid = QUuid::createUuid();
else else
m_uuid = uuid; m_uuid = uuid;
......
...@@ -34,7 +34,7 @@ namespace Workflow ...@@ -34,7 +34,7 @@ namespace Workflow
Q_OBJECT Q_OBJECT
protected: //This class is not meant to be used by itself. protected: //This class is not meant to be used by itself.
Helper( const QString &uuid = QStringLiteral() ); Helper( const QUuid &uuid = QUuid() );
~Helper(); ~Helper();
public: public:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment