Remove unused arguments (warnings --)

[kdenlive] / src / documentchecker.cpp

diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp
index a39f1037ff61adc06b33fad13d320468cf97bb53..9bdf501e3950c6de32f5b7f6526e8902165327ab 100644 (file)
--- a/src/documentchecker.cpp
+++ b/src/documentchecker.cpp
@@ -48,34 +48,14 @@ const int CLIPMISSING = 0;
 const int CLIPOK = 1;
 const int CLIPPLACEHOLDER = 2;
 
-DocumentChecker::DocumentChecker(QDomDocument doc, QWidget * parent) :
-        QDialog(parent), m_doc(doc)
+DocumentChecker::DocumentChecker(QList <QDomElement> missingClips, QDomDocument doc, QWidget * parent) :
+        QDialog(parent),
+        m_doc(doc)
 {
     setFont(KGlobalSettings::toolBarFont());
     m_view.setupUi(this);
-
-    QDomNodeList producers = m_doc.elementsByTagName("producer");
-    QDomNodeList infoproducers = m_doc.elementsByTagName("kdenlive_producer");
-
-    int clipType;
     QDomElement e;
-    QString id;
-    QString resource;
-    QList <QDomElement> missingClips;
-    for (int i = 0; i < infoproducers.count(); i++) {
-        e = infoproducers.item(i).toElement();
-        clipType = e.attribute("type").toInt();
-        if (clipType == TEXT) continue;
-        id = e.attribute("id");
-        resource = e.attribute("resource");
-        if (clipType == SLIDESHOW) resource = KUrl(resource).directory();
-        if (!KIO::NetAccess::exists(KUrl(resource), KIO::NetAccess::SourceSide, 0)) {
-            // Missing clip found
-            missingClips.append(e);
-        }
-    }
 
-    if (missingClips.isEmpty()) QTimer::singleShot(0, this, SLOT(accept()));
     m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     for (int i = 0; i < missingClips.count(); i++) {
         e = missingClips.at(i).toElement();
@@ -123,17 +103,21 @@ void DocumentChecker::slotSearchClips()
     QString newpath = KFileDialog::getExistingDirectory(KUrl("kfiledialog:///clipfolder"), kapp->activeWindow(), i18n("Clips folder"));
     if (newpath.isEmpty()) return;
     int ix = 0;
+    m_view.recursiveSearch->setEnabled(false);
     QTreeWidgetItem *child = m_view.treeWidget->topLevelItem(ix);
-    while (child && child->data(0, statusRole).toInt() == CLIPMISSING) {
-        QString clipPath = searchFileRecursively(QDir(newpath), child->data(0, sizeRole).toString(), child->data(0, hashRole).toString());
-        if (!clipPath.isEmpty()) {
-            child->setText(1, clipPath);
-            child->setIcon(0, KIcon("dialog-ok"));
-            child->setData(0, statusRole, CLIPOK);
+    while (child) {
+        if (child->data(0, statusRole).toInt() == CLIPMISSING) {
+            QString clipPath = searchFileRecursively(QDir(newpath), child->data(0, sizeRole).toString(), child->data(0, hashRole).toString());
+            if (!clipPath.isEmpty()) {
+                child->setText(1, clipPath);
+                child->setIcon(0, KIcon("dialog-ok"));
+                child->setData(0, statusRole, CLIPOK);
+            }
         }
         ix++;
         child = m_view.treeWidget->topLevelItem(ix);
     }
+    m_view.recursiveSearch->setEnabled(true);
     checkStatus();
 }
 
@@ -145,8 +129,8 @@ QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &m
     QStringList filesAndDirs = dir.entryList(QDir::Files | QDir::Readable);
     for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
         QFile file(dir.absoluteFilePath(filesAndDirs.at(i)));
-        if (file.open(QIODevice::ReadOnly)) {
-            if (QString::number(file.size()) == matchSize) {
+        if (QString::number(file.size()) == matchSize) {
+            if (file.open(QIODevice::ReadOnly)) {
                 /*
                 * 1 MB = 1 second per 450 files (or faster)
                 * 10 MB = 9 seconds per 450 files (or faster)
@@ -163,7 +147,7 @@ QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &m
                     return file.fileName();
             }
         }
-        kDebug() << filesAndDirs.at(i) << file.size() << fileHash.toHex();
+        //kDebug() << filesAndDirs.at(i) << file.size() << fileHash.toHex();
     }
     filesAndDirs = dir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot);
     for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
@@ -189,9 +173,10 @@ void DocumentChecker::slotEditItem(QTreeWidgetItem *item, int)
 // virtual
 void DocumentChecker::accept()
 {
-    QDomElement e;
+    QDomElement e, property;
     QDomNodeList producers = m_doc.elementsByTagName("producer");
     QDomNodeList infoproducers = m_doc.elementsByTagName("kdenlive_producer");
+    QDomNodeList properties;
     int ix = 0;
     QTreeWidgetItem *child = m_view.treeWidget->topLevelItem(ix);
     while (child) {
@@ -207,9 +192,16 @@ void DocumentChecker::accept()
             }
             for (int i = 0; i < producers.count(); i++) {
                 e = producers.item(i).toElement();
-                if (e.attribute("id") == id) {
+                if (e.attribute("id").section('_', 0, 0) == id) {
                     // Fix clip
-                    e.setAttribute("resource", child->text(1));
+                    properties = e.childNodes();
+                    for (int j = 0; j < properties.count(); ++j) {
+                        property = properties.item(j).toElement();
+                        if (property.attribute("name") == "resource") {
+                            property.firstChild().setNodeValue(child->text(1));
+                            break;
+                        }
+                    }
                     break;
                 }
             }
@@ -288,8 +280,8 @@ void DocumentChecker::slotDeleteSelected()
         QDomNodeList producers = m_doc.elementsByTagName("producer");
         QDomNodeList infoproducers = m_doc.elementsByTagName("kdenlive_producer");
 
-        QDomElement westley = m_doc.firstChildElement("westley");
-        QDomElement kdenlivedoc = westley.firstChildElement("kdenlivedoc");
+        QDomElement mlt = m_doc.firstChildElement("mlt");
+        QDomElement kdenlivedoc = mlt.firstChildElement("kdenlivedoc");
 
         for (int i = 0; i < infoproducers.count(); i++) {
             e = infoproducers.item(i).toElement();
@@ -304,7 +296,7 @@ void DocumentChecker::slotDeleteSelected()
             e = producers.item(i).toElement();
             if (deletedIds.contains(e.attribute("id"))) {
                 // Remove clip
-                westley.removeChild(e);
+                mlt.removeChild(e);
                 break;
             }
         }