[PATCH by Ray Lehtiniemi] Do not return references to temporaries.

[kdenlive] / src / clipmanager.cpp

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index 379eaaba5835116a24a20bd06df25bede15558ee..2960180f385b924461ab09594a0bd19547e9bb38 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -16,18 +16,20 @@
  *   Free Software Foundation, Inc.,                                       *
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
-#include <KDebug>
-#include <KFileDialog>
-#include <kio/netaccess.h>
 
+
+#include "clipmanager.h"
 #include "addclipcommand.h"
 #include "kdenlivesettings.h"
-#include "clipmanager.h"
 #include "docclipbase.h"
 #include "kdenlivedoc.h"
 
 #include <mlt++/Mlt.h>
 
+#include <KDebug>
+#include <KFileDialog>
+#include <kio/netaccess.h>
+
 ClipManager::ClipManager(KdenliveDoc *doc): m_doc(doc), m_audioThumbsEnabled(false), m_audioThumbsQueue(QList <QString> ()), m_generatingAudioId(QString()) {
     m_clipIdCounter = 1;
     m_folderIdCounter = 1;
@@ -37,6 +39,15 @@ ClipManager::~ClipManager() {
     qDeleteAll(m_clipList);
 }
 
+void ClipManager::clear() {
+    qDeleteAll(m_clipList);
+    m_clipList.clear();
+    m_clipIdCounter = 1;
+    m_folderIdCounter = 1;
+    m_folderList.clear();
+    m_audioThumbsQueue.clear();
+}
+
 void ClipManager::checkAudioThumbs() {
     if (m_audioThumbsEnabled == KdenliveSettings::audiothumbnails()) return;
     m_audioThumbsEnabled = KdenliveSettings::audiothumbnails();
@@ -48,7 +59,7 @@ void ClipManager::checkAudioThumbs() {
         if (m_generatingAudioId.isEmpty()) startAudioThumbsGeneration();
     } else {
         m_audioThumbsQueue.clear();
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
     }
 }
 
@@ -63,7 +74,7 @@ void ClipManager::askForAudioThumb(const QString &id) {
 void ClipManager::startAudioThumbsGeneration() {
     if (!KdenliveSettings::audiothumbnails()) {
         m_audioThumbsQueue.clear();
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
         return;
     }
     if (!m_audioThumbsQueue.isEmpty()) {
@@ -72,14 +83,14 @@ void ClipManager::startAudioThumbsGeneration() {
         if (!clip || !clip->slotGetAudioThumbs())
             endAudioThumbsGeneration(m_generatingAudioId);
     } else {
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
     }
 }
 
 void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
     if (!KdenliveSettings::audiothumbnails()) {
         m_audioThumbsQueue.clear();
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
         return;
     }
     if (!m_audioThumbsQueue.isEmpty()) {
@@ -87,7 +98,7 @@ void ClipManager::endAudioThumbsGeneration(const QString &requestedId) {
             startAudioThumbsGeneration();
         }
     } else {
-        m_generatingAudioId = QString();
+        m_generatingAudioId.clear();
     }
 }
 
@@ -95,10 +106,14 @@ void ClipManager::setThumbsProgress(const QString &message, int progress) {
     m_doc->setThumbsProgress(message, progress);
 }
 
-QList <DocClipBase*> ClipManager::documentClipList() {
+QList <DocClipBase*> ClipManager::documentClipList() const {
     return m_clipList;
 }
 
+QMap <QString, QString> ClipManager::documentFolderList() const {
+    return m_folderList;
+}
+
 void ClipManager::addClip(DocClipBase *clip) {
     m_clipList.append(clip);
     const QString id = clip->getId();
@@ -191,7 +206,7 @@ void ClipManager::slotAddClipList(const KUrl::List urls, const QString group, co
     QUndoCommand *addClips = new QUndoCommand();
     addClips->setText(i18n("Add clips"));
 
-    foreach(const KUrl file, urls) {
+    foreach(const KUrl &file, urls) {
         if (KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
             QDomDocument doc;
             QDomElement prod = doc.createElement("producer");
@@ -316,5 +331,11 @@ QString ClipManager::projectFolder() const {
     return m_doc->projectFolder().path();
 }
 
+void ClipManager::addFolder(const QString &id, const QString &name) {
+    m_folderList.insert(id, name);
+}
 
+void ClipManager::deleteFolder(const QString &id) {
+    m_folderList.remove(id);
+}