X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fdocumentchecker.cpp;h=f2b09d62909016d3313c915fbcf9122f86b913dc;hb=d7224c861d0935141cd4f9c57eea1b1902578148;hp=41067fd5281eff569d353370a3a141d67dd274f3;hpb=0d59a0487e34d72a58cde6f58b7499d8f6ef404b;p=kdenlive

diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp
index 41067fd5..f2b09d62 100644
--- a/src/documentchecker.cpp
+++ b/src/documentchecker.cpp
@@ -64,7 +64,7 @@ const int LUMAPLACEHOLDER = 12;
 
 enum TITLECLIPTYPE { TITLE_IMAGE_ELEMENT = 20, TITLE_FONT_ELEMENT = 21 };
 
-DocumentChecker::DocumentChecker(QDomNodeList infoproducers, QDomDocument doc):
+DocumentChecker::DocumentChecker(const QDomNodeList &infoproducers, const QDomDocument &doc):
     m_info(infoproducers), m_doc(doc), m_dialog(NULL)
 {
 
@@ -86,7 +86,7 @@ bool DocumentChecker::hasErrorInClips()
     m_safeImages.clear();
     m_safeFonts.clear();
     max = m_info.count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         e = m_info.item(i).toElement();
         clipType = e.attribute("type").toInt();
         if (clipType == COLOR) continue;
@@ -170,7 +170,7 @@ bool DocumentChecker::hasErrorInClips()
     if (!root.isEmpty()) root = KUrl(root).path(KUrl::AddTrailingSlash);
     QDomNodeList trans = m_doc.elementsByTagName("transition");
     max = trans.count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         QString luma = getProperty(trans.at(i).toElement(), "luma");
         if (!luma.isEmpty() && !filesToCheck.contains(luma))
             filesToCheck.append(luma);
@@ -202,7 +202,7 @@ bool DocumentChecker::hasErrorInClips()
 
     m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     max = m_missingClips.count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         e = m_missingClips.at(i).toElement();
         QString clipType;
         int t = e.attribute("type").toInt();
@@ -286,7 +286,7 @@ bool DocumentChecker::hasErrorInClips()
     m_ui.fixDuration->setEnabled(!wrongDurationClips.isEmpty());
 
     max = wrongDurationClips.count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         e = wrongDurationClips.at(i).toElement();
         QString clipType;
         int t = e.attribute("type").toInt();
@@ -337,9 +337,8 @@ bool DocumentChecker::hasErrorInClips()
         item->setToolTip(0, i18n("Missing proxy"));
     }
 
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         e = missingProxies.at(i).toElement();
-        QString clipType;
         QString realPath = e.attribute("resource");
         QString id = e.attribute("id");
         // Tell Kdenlive to recreate proxy
@@ -390,7 +389,7 @@ bool DocumentChecker::hasErrorInClips()
         item->setData(0, hashRole, e.attribute("file_hash"));
         item->setData(0, statusRole, SOURCEMISSING);
         item->setToolTip(0, i18n("Missing source clip"));
-        for (int i = 0; i < max; i++) {
+        for (int i = 0; i < max; ++i) {
             e = missingSources.at(i).toElement();
             QString clipType;
             QString realPath = e.attribute("resource");
@@ -420,7 +419,7 @@ bool DocumentChecker::hasErrorInClips()
     connect(m_ui.usePlaceholders, SIGNAL(pressed()), this, SLOT(slotPlaceholders()));
     connect(m_ui.removeSelected, SIGNAL(pressed()), this, SLOT(slotDeleteSelected()));
     connect(m_ui.fixDuration, SIGNAL(pressed()), this, SLOT(slotFixDuration()));
-    connect(m_ui.treeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)), this, SLOT(slotEditItem(QTreeWidgetItem *, int)));
+    connect(m_ui.treeWidget, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)), this, SLOT(slotEditItem(QTreeWidgetItem*,int)));
     connect(m_ui.treeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(slotCheckButtons()));
     //adjustSize();
     if (m_ui.treeWidget->topLevelItem(0)) m_ui.treeWidget->setCurrentItem(m_ui.treeWidget->topLevelItem(0));
@@ -432,14 +431,14 @@ bool DocumentChecker::hasErrorInClips()
 
 DocumentChecker::~DocumentChecker()
 {
-    if (m_dialog) delete m_dialog;
+    delete m_dialog;
 }
 
 
 QString DocumentChecker::getProperty(QDomElement effect, const QString &name)
 {
     QDomNodeList params = effect.elementsByTagName("property");
-    for (int i = 0; i < params.count(); i++) {
+    for (int i = 0; i < params.count(); ++i) {
         QDomElement e = params.item(i).toElement();
         if (e.attribute("name") == name) {
             return e.firstChild().nodeValue();
@@ -448,10 +447,10 @@ QString DocumentChecker::getProperty(QDomElement effect, const QString &name)
     return QString();
 }
 
-void DocumentChecker::setProperty(QDomElement effect, const QString &name, const QString value)
+void DocumentChecker::setProperty(QDomElement effect, const QString &name, const QString &value)
 {
     QDomNodeList params = effect.elementsByTagName("property");
-    for (int i = 0; i < params.count(); i++) {
+    for (int i = 0; i < params.count(); ++i) {
         QDomElement e = params.item(i).toElement();
         if (e.attribute("name") == name) {
             e.firstChild().setNodeValue(value);
@@ -562,7 +561,7 @@ QString DocumentChecker::searchPathRecursively(const QDir &dir, const QString &f
     if (!filesAndDirs.isEmpty()) return searchDir.absoluteFilePath(filesAndDirs.at(0));
     searchDir.setNameFilters(QStringList());
     filesAndDirs = searchDir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot);
-    for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
+    for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) {
         foundFileName = searchPathRecursively(searchDir.absoluteFilePath(filesAndDirs.at(i)), fileName);
         if (!foundFileName.isEmpty())
             break;
@@ -576,7 +575,7 @@ QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &m
     QByteArray fileData;
     QByteArray fileHash;
     QStringList filesAndDirs = dir.entryList(QDir::Files | QDir::Readable);
-    for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) {
+    for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) {
         QFile file(dir.absoluteFilePath(filesAndDirs.at(i)));
         if (QString::number(file.size()) == matchSize) {
             if (file.open(QIODevice::ReadOnly)) {
@@ -599,7 +598,7 @@ QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &m
         //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++) {
+    for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); ++i) {
         foundFileName = searchFileRecursively(dir.absoluteFilePath(filesAndDirs.at(i)), matchSize, matchHash);
         if (!foundFileName.isEmpty())
             break;
@@ -667,7 +666,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers
         QString id = child->data(0, idRole).toString();
         if (t == TITLE_IMAGE_ELEMENT) {
             // edit images embedded in titles
-            for (int i = 0; i < infoproducers.count(); i++) {
+            for (int i = 0; i < infoproducers.count(); ++i) {
                 e = infoproducers.item(i).toElement();
                 if (e.attribute("id") == id) {
                     // Fix clip
@@ -677,7 +676,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers
                     break;
                 }
             }
-            for (int i = 0; i < producers.count(); i++) {
+            for (int i = 0; i < producers.count(); ++i) {
                 e = producers.item(i).toElement();
                 if (e.attribute("id").section('_', 0, 0) == id) {
                     // Fix clip
@@ -695,7 +694,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers
             }
         } else {
             // edit clip url
-            for (int i = 0; i < infoproducers.count(); i++) {
+            for (int i = 0; i < infoproducers.count(); ++i) {
                 e = infoproducers.item(i).toElement();
                 if (e.attribute("id") == id) {
                     // Fix clip
@@ -705,7 +704,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers
                     break;
                 }
             }
-            for (int i = 0; i < producers.count(); i++) {
+            for (int i = 0; i < producers.count(); ++i) {
                 e = producers.item(i).toElement();
                 if (e.attribute("id").section('_', 0, 0) == id || e.attribute("id").section(':', 1, 1) == id) {
                     // Fix clip
@@ -726,7 +725,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers
         }
     } else if (child->data(0, statusRole).toInt() == CLIPPLACEHOLDER && t != TITLE_FONT_ELEMENT && t != TITLE_IMAGE_ELEMENT) {
         QString id = child->data(0, idRole).toString();
-        for (int i = 0; i < infoproducers.count(); i++) {
+        for (int i = 0; i < infoproducers.count(); ++i) {
             e = infoproducers.item(i).toElement();
             if (e.attribute("id") == id) {
                 // Fix clip
@@ -735,7 +734,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers
             }
         }
     } else if (child->data(0, statusRole).toInt() == LUMAOK) {
-        for (int i = 0; i < trans.count(); i++) {
+        for (int i = 0; i < trans.count(); ++i) {
             QString luma = getProperty(trans.at(i).toElement(), "luma");
             if (!luma.isEmpty() && luma == child->data(0, idRole).toString()) {
                 setProperty(trans.at(i).toElement(), "luma", child->text(1));
@@ -743,7 +742,7 @@ void DocumentChecker::fixClipItem(QTreeWidgetItem *child, QDomNodeList producers
             }
         }
     } else if (child->data(0, statusRole).toInt() == LUMAMISSING) {
-        for (int i = 0; i < trans.count(); i++) {
+        for (int i = 0; i < trans.count(); ++i) {
             QString luma = getProperty(trans.at(i).toElement(), "luma");
             if (!luma.isEmpty() && luma == child->data(0, idRole).toString()) {
                 setProperty(trans.at(i).toElement(), "luma", QString());
@@ -780,7 +779,7 @@ void DocumentChecker::slotFixDuration()
             QString id = child->data(0, idRole).toString();
             bool resetDuration = child->data(0, resetDurationRole).toInt();
 
-            for (int i = 0; i < m_info.count(); i++) {
+            for (int i = 0; i < m_info.count(); ++i) {
                 QDomElement e = m_info.at(i).toElement();
                 if (e.attribute("id") == id) {
                     if (m_missingClips.contains(e)) {
@@ -859,7 +858,7 @@ void DocumentChecker::slotDeleteSelected()
         QDomElement e;
         QDomNodeList transitions = m_doc.elementsByTagName("transition");
         foreach (const QString &lumaPath, deletedLumas) {
-            for (int i = 0; i < transitions.count(); i++) {
+            for (int i = 0; i < transitions.count(); ++i) {
                 e = transitions.item(i).toElement();
                 QString resource = EffectsList::property(e, "luma");
                 if (resource == lumaPath) EffectsList::removeProperty(e, "luma");
@@ -875,26 +874,26 @@ void DocumentChecker::slotDeleteSelected()
         QDomNode mlt = m_doc.elementsByTagName("mlt").at(0);
         QDomNode kdenlivedoc = m_doc.elementsByTagName("kdenlivedoc").at(0);
 
-        for (int i = 0, j = 0; i < infoproducers.count() && j < deletedIds.count(); i++) {
+        for (int i = 0, j = 0; i < infoproducers.count() && j < deletedIds.count(); ++i) {
             e = infoproducers.item(i).toElement();
             if (deletedIds.contains(e.attribute("id"))) {
                 // Remove clip
                 kdenlivedoc.removeChild(e);
-                i--;
+                --i;
                 j++;
             }
         }
 
-        for (int i = 0; i < producers.count(); i++) {
+        for (int i = 0; i < producers.count(); ++i) {
             e = producers.item(i).toElement();
             if (deletedIds.contains(e.attribute("id").section('_', 0, 0)) || deletedIds.contains(e.attribute("id").section(':', 1, 1).section('_', 0, 0))) {
                 // Remove clip
                 mlt.removeChild(e);
-                i--;
+                --i;
             }
         }
 
-        for (int i = 0; i < playlists.count(); i++) {
+        for (int i = 0; i < playlists.count(); ++i) {
             QDomNodeList entries = playlists.at(i).toElement().elementsByTagName("entry");
             for (int j = 0; j < entries.count(); j++) {
                 e = entries.item(j).toElement();
@@ -916,7 +915,7 @@ void DocumentChecker::slotDeleteSelected()
     }
 }
 
-void DocumentChecker::checkMissingImagesAndFonts(QStringList images, QStringList fonts, const QString &id, const QString &baseClip)
+void DocumentChecker::checkMissingImagesAndFonts(const QStringList &images, const QStringList &fonts, const QString &id, const QString &baseClip)
 {
     QDomDocument doc;
     foreach(const QString &img, images) {