X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistwidget.cpp;h=6b1a4212c394d17ff7a87a156a514d5c03c16727;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=328d95813c03384289fdce8e4df54b58f70273be;hpb=012c94867ad207d4b5674640c03d7dd133c1a614;p=kdenlive

diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp
index 328d9581..6b1a4212 100644
--- a/src/effectslistwidget.cpp
+++ b/src/effectslistwidget.cpp
@@ -41,8 +41,8 @@ const int IdRole = TypeRole + 1;
 
 
 EffectsListWidget::EffectsListWidget(QMenu *contextMenu, QWidget *parent) :
-        QTreeWidget(parent),
-        m_menu(contextMenu)
+    QTreeWidget(parent),
+    m_menu(contextMenu)
 {
     setColumnCount(1);
     setDragEnabled(true);
@@ -188,34 +188,34 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi
             sub->addMenu(sub4);
         }
         for (int j = 0; j < effectsInCategory; j++) {
-                QTreeWidgetItem *item = topLevelItem(i)->child(j);
-                KAction *a = new KAction(KIcon(item->icon(0)), item->text(0), sub);
-                QStringList data = item->data(0, IdRole).toStringList();
-                QString id = data.at(1);
-                if (id.isEmpty()) id = data.at(0);
-                a->setData(data);
-                a->setIconVisibleInMenu(false);
-                if (hasSubCategories) {
-                    // put action in sub category
-                    QRegExp rx("^[s-z].+");
+            QTreeWidgetItem *item = topLevelItem(i)->child(j);
+            KAction *a = new KAction(KIcon(item->icon(0)), item->text(0), sub);
+            QStringList data = item->data(0, IdRole).toStringList();
+            QString id = data.at(1);
+            if (id.isEmpty()) id = data.at(0);
+            a->setData(data);
+            a->setIconVisibleInMenu(false);
+            if (hasSubCategories) {
+                // put action in sub category
+                QRegExp rx("^[s-z].+");
+                if (rx.exactMatch(item->text(0).toLower())) {
+                    sub4->addAction(a);
+                } else {
+                    rx.setPattern("^[m-r].+");
                     if (rx.exactMatch(item->text(0).toLower())) {
-                        sub4->addAction(a);
-                    } else {
-                        rx.setPattern("^[m-r].+");
+                        sub3->addAction(a);
+                    }
+                    else {
+                        rx.setPattern("^[g-l].+");
                         if (rx.exactMatch(item->text(0).toLower())) {
-                            sub3->addAction(a);
-                        }
-                        else {
-                            rx.setPattern("^[g-l].+");
-                            if (rx.exactMatch(item->text(0).toLower())) {
-                                sub2->addAction(a);
-                            }
-                            else sub1->addAction(a);
+                            sub2->addAction(a);
                         }
+                        else sub1->addAction(a);
                     }
                 }
-                else sub->addAction(a);
-                effectActions->addAction("video_effect_" + id, a);
+            }
+            else sub->addAction(a);
+            effectActions->addAction("video_effect_" + id, a);
         }
     }
 }
@@ -228,14 +228,14 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
     int ct = effectlist->count();
 
     
-    for (int ix = 0; ix < ct; ix ++) {
+    for (int ix = 0; ix < ct; ++ix) {
         effectInfo = effectlist->effectIdInfo(ix);
         effectInfo.append(QString::number(type));
         parentItem = NULL;
 
         if (folders) {
             for (int i = 0; i < folders->count(); ++i) {
-                l = folders->at(i)->data(0, IdRole).toString().split(',', QString::SkipEmptyParts);
+                l = folders->at(i)->data(0, IdRole).toString().split(QLatin1Char(','), QString::SkipEmptyParts);
                 if (l.contains(effectInfo.at(2))) {
                     parentItem = folders->at(i);
                     break;
@@ -247,7 +247,7 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q
 
         if (!effectInfo.isEmpty()) {
             item = new QTreeWidgetItem(parentItem, QStringList(effectInfo.takeFirst()));
-	    if (effectInfo.count() == 4) item->setIcon(0, KIcon("folder"));
+            if (effectInfo.count() == 4) item->setIcon(0, KIcon("folder"));
             else item->setIcon(0, icon);
             item->setData(0, TypeRole, type);
             item->setData(0, IdRole, effectInfo);
@@ -265,7 +265,7 @@ QTreeWidgetItem *EffectsListWidget::findFolder(const QString &name)
     QTreeWidgetItem *item = NULL;
     QList<QTreeWidgetItem *> result = findItems(name, Qt::MatchExactly);
     if (!result.isEmpty()) {
-        for (int j = 0; j < result.count(); j++) {
+        for (int j = 0; j < result.count(); ++j) {
             if (result.at(j)->data(0, TypeRole) ==  EFFECT_FOLDER) {
                 item = result.at(j);
                 break;
@@ -324,9 +324,9 @@ QString EffectsListWidget::currentInfo() const
 void EffectsListWidget::keyPressEvent(QKeyEvent *e)
 {
     if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
-	emit applyEffect(currentEffect());
-	e->accept();
-	return;
+        emit applyEffect(currentEffect());
+        e->accept();
+        return;
     }
     QTreeWidget::keyPressEvent(e);
 }
@@ -338,7 +338,8 @@ QMimeData * EffectsListWidget::mimeData(const QList<QTreeWidgetItem *> list) con
     foreach(QTreeWidgetItem *item, list) {
         if (item->flags() & Qt::ItemIsDragEnabled) {
             const QDomElement e = itemEffect(item);
-            if (!e.isNull()) doc.appendChild(doc.importNode(e, true));
+            if (!e.isNull())
+                doc.appendChild(doc.importNode(e, true));
         }
     }
     QMimeData *mime = new QMimeData;
@@ -363,7 +364,8 @@ void EffectsListWidget::dragMoveEvent(QDragMoveEvent *event)
 void EffectsListWidget::contextMenuEvent(QContextMenuEvent * event)
 {
     QTreeWidgetItem *item = itemAt(event->pos());
-    if (item && item->data(0, TypeRole).toInt() == EFFECT_CUSTOM) m_menu->popup(event->globalPos());
+    if (item && item->data(0, TypeRole).toInt() == EFFECT_CUSTOM)
+        m_menu->popup(event->globalPos());
 }
 
 #include "effectslistwidget.moc"