[vlmc-devel] MediaContainer: Make clip( const QUuid& uuid ) behave the same as clip( const QString &uuid )

Yikai Lu git at videolan.org
Wed Jun 1 18:15:13 CEST 2016


vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Tue May 10 19:05:30 2016 +0900| [60b8c48ce6179a316d9ee84b80a3fa109742a085] | committer: Hugo Beauzée-Luyssen

MediaContainer: Make clip( const QUuid& uuid ) behave the same as clip( const QString &uuid )

It doesn't make sense to behave differently even though they have the same name.

Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> https://code.videolan.org/videolan/vlmc/commit/60b8c48ce6179a316d9ee84b80a3fa109742a085
---

 src/Library/MediaContainer.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Library/MediaContainer.cpp b/src/Library/MediaContainer.cpp
index a0b3364..bf65c3a 100644
--- a/src/Library/MediaContainer.cpp
+++ b/src/Library/MediaContainer.cpp
@@ -46,10 +46,7 @@ MediaContainer::~MediaContainer()
 Clip*
 MediaContainer::clip( const QUuid& uuid )
 {
-    QHash<QUuid, Clip*>::iterator   it = m_clips.find( uuid );
-    if ( it != m_clips.end() )
-        return it.value();
-    return nullptr;
+    return clip( uuid.toString() );
 }
 
 Clip*



More information about the Vlmc-devel mailing list