Cleanup and add mimetype for TGA images, also add EXR, TIFF and TGA to the list of...

[kdenlive] / src / kdenlivedoc.cpp

diff --git a/src/kdenlivedoc.cpp b/src/kdenlivedoc.cpp
index 20255581c93602f175211b9742e4ad5cafba78d5..c6e42c1bb93f008f5e7bf24808cdb41e0131f838 100644 (file)
--- a/src/kdenlivedoc.cpp
+++ b/src/kdenlivedoc.cpp
@@ -403,7 +403,7 @@ bool KdenliveDoc::convertDocument(double version) {
     if (version == 0.5 || version == 0.7 || version > 0.81) {
         kDebug() << "Unable to open document with version " << version;
         // TODO: convert 0.7 (0.5?) files to the new document format.
-        return FALSE;
+        return false;
     }
 
     if (version == 0.8) {
@@ -427,7 +427,7 @@ bool KdenliveDoc::convertDocument(double version) {
             if (t.attribute("producer") != "black_track") tracksinfo.appendChild(trackinfo);
         }
         infoXml.appendChild(tracksinfo);
-        return TRUE;
+        return true;
     }
 
     QDomNode westley = m_document.elementsByTagName("westley").at(1);
@@ -877,7 +877,7 @@ bool KdenliveDoc::convertDocument(double version) {
                 //kDebug() << "ready to set additional <avfile />'s attributes (id =" << id << ")";
                 kproducer.setAttribute("channels", avfile.attribute("channels"));
                 kproducer.setAttribute("duration", avfile.attribute("duration"));
-                kproducer.setAttribute("frame_size", avfile.attribute("width") + "x" + avfile.attribute("height"));
+                kproducer.setAttribute("frame_size", avfile.attribute("width") + 'x' + avfile.attribute("height"));
                 kproducer.setAttribute("frequency", avfile.attribute("frequency"));
                 if (kproducer.attribute("description").isEmpty() && !avfile.attribute("description").isEmpty())
                     kproducer.setAttribute("description", avfile.attribute("description"));
@@ -899,7 +899,7 @@ bool KdenliveDoc::convertDocument(double version) {
     */
     //kDebug() << "/////////////////  END CONVERTED DOC:";
 
-    return TRUE;
+    return true;
 }
 
 QString KdenliveDoc::colorToString(const QColor& c) {
@@ -1354,7 +1354,7 @@ void KdenliveDoc::setNewClipResource(const QString &id, const QString &path) {
     for (int i = 0; i < maxprod; i++) {
         QDomNode m = prods.at(i);
         QString prodId = m.toElement().attribute("id");
-        if (prodId == id || prodId.startsWith(id + "_")) {
+        if (prodId == id || prodId.startsWith(id + '_')) {
             QDomNodeList params = m.childNodes();
             for (int j = 0; j < params.count(); j++) {
                 QDomElement e = params.item(j).toElement();
@@ -1458,7 +1458,7 @@ void KdenliveDoc::slotAddClipList(const KUrl::List urls, const QString group, co
 
 
 void KdenliveDoc::slotAddClipFile(const KUrl url, const QString group, const QString &groupId) {
-    kDebug() << "/////////  DOCUM, ADD CLP: " << url;
+    //kDebug() << "/////////  DOCUM, ADD CLP: " << url;
     m_clipManager->slotAddClipFile(url, group, groupId);
     emit selectLastAddedClip(QString::number(m_clipManager->lastClipId()));
     setModified(true);
@@ -1472,16 +1472,6 @@ DocClipBase *KdenliveDoc::getBaseClip(const QString &clipId) {
     return m_clipManager->getClipById(clipId);
 }
 
-void KdenliveDoc::slotAddColorClipFile(const QString name, const QString color, QString duration, const QString group, const QString &groupId) {
-    m_clipManager->slotAddColorClipFile(name, color, duration, group, groupId);
-    setModified(true);
-}
-
-void KdenliveDoc::slotAddSlideshowClipFile(const QString name, const QString path, int count, const QString duration, const bool loop, const bool fade, const QString &luma_duration, const QString &luma_file, const int softness, const QString group, const QString &groupId) {
-    m_clipManager->slotAddSlideshowClipFile(name, path, count, duration, loop, fade, luma_duration, luma_file, softness, group, groupId);
-    setModified(true);
-}
-
 void KdenliveDoc::slotCreateTextClip(QString group, const QString &groupId) {
     QString titlesFolder = projectFolder().path() + "/titles/";
     KStandardDirs::makeDir(titlesFolder);