]> git.sesse.net Git - kdenlive/commitdiff
- Avoid compiler warnings.
authorAlberto Villa <avilla@FreeBSD.org>
Tue, 28 Dec 2010 00:44:23 +0000 (00:44 +0000)
committerAlberto Villa <avilla@FreeBSD.org>
Tue, 28 Dec 2010 00:44:23 +0000 (00:44 +0000)
svn path=/trunk/kdenlive/; revision=5213

src/blackmagic/devices.h
src/effectslistwidget.cpp

index ce77c568233a0d4f8ba32286beafa021dddac1cc..603ac1cd07109e381c9eca6bd058c451dca15386 100644 (file)
@@ -18,4 +18,4 @@ public:
     static QStringList supportedModes(int card);
 };
 
-#endif
\ No newline at end of file
+#endif
index 377280c1975ae3b809adf57c552116a1f15f5cf2..10c0d315194287cb2761a9bdfc9a8a75111f212e 100644 (file)
@@ -151,7 +151,7 @@ void EffectsListWidget::initList()
 
     loadEffects(&MainWindow::videoEffects, KIcon("kdenlive-show-video"), misc, &folders, QString::number((int) EFFECT_VIDEO), current, &found);
     loadEffects(&MainWindow::audioEffects, KIcon("kdenlive-show-audio"), audio, &folders, QString::number((int) EFFECT_AUDIO), current, &found);
-    loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, &QList<QTreeWidgetItem *>(), QString::number((int) EFFECT_CUSTOM), current, &found);
+    loadEffects(&MainWindow::customEffects, KIcon("kdenlive-custom-effect"), custom, static_cast<QList<QTreeWidgetItem *> *>(0), QString::number((int) EFFECT_CUSTOM), current, &found);
 
     if (!found && !currentFolder.isEmpty()) {
         // previously selected effect was removed, focus on its parent folder
@@ -178,11 +178,13 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
         effectInfo = effectlist->effectIdInfo(ix);
         parentItem = NULL;
 
-        for (int i = 0; i < folders->count(); i++) {
-            l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts);
-            if (l.contains(effectInfo.at(2))) {
-                parentItem = folders->at(i);
-                break;
+        if (folders) {
+            for (int i = 0; i < folders->count(); i++) {
+                l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts);
+                if (l.contains(effectInfo.at(2))) {
+                    parentItem = folders->at(i);
+                    break;
+                }
             }
         }
         if (parentItem == NULL)