Commit my changes to Till's slider widget for effect stack

[kdenlive] / src / effectslistwidget.cpp

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 12643ed3a6e0f33da046cb05b2221024654ddabd..10c0d315194287cb2761a9bdfc9a8a75111f212e 100644 (file)
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -73,7 +73,6 @@ void EffectsListWidget::initList()
     QString current;
     QString currentFolder;
     QTreeWidgetItem *item = NULL;
-    QTreeWidgetItem *parentItem;
     bool found = false;
 
     if (currentItem()) {
@@ -152,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
@@ -179,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)
@@ -194,6 +195,7 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
             item->setIcon(0, icon);
             item->setData(0, TypeRole, type);
             item->setData(0, IdRole, effectInfo);
+            item->setToolTip(0, effectlist->getInfo(effectInfo.at(0), effectInfo.at(1)));
             if (item->text(0) == current) {
                 setCurrentItem(item);
                 *found = true;