X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Feffectslistwidget.cpp;h=fbf8d1e59478aee5d3d48b933412ca711546da03;hb=bf036e23649237928fad4902a9cf1728e6d5c588;hp=374414ba04008a8531fd371e48485a0581d07cac;hpb=32c8c40056e65b230f058b168e8e078ba066038b;p=kdenlive diff --git a/src/effectslistwidget.cpp b/src/effectslistwidget.cpp index 374414ba..fbf8d1e5 100644 --- a/src/effectslistwidget.cpp +++ b/src/effectslistwidget.cpp @@ -93,19 +93,19 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi QList folders; QStringList folderNames; QDomNodeList groups = doc.documentElement().elementsByTagName("group"); - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { folderNames << i18n(groups.at(i).firstChild().firstChild().nodeValue().toUtf8().constData()); } - for (int i = 0; i < topLevelItemCount(); i++) { + for (int i = 0; i < topLevelItemCount(); ++i) { topLevelItem(i)->takeChildren(); QString currentName = topLevelItem(i)->text(0); if (currentName != i18n("Misc") && currentName != i18n("Audio") && currentName != i18nc("Folder Name", "Custom") && !folderNames.contains(currentName)) { takeTopLevelItem(i); - i--; + --i; } } - for (int i = 0; i < groups.count(); i++) { + for (int i = 0; i < groups.count(); ++i) { item = findFolder(folderNames.at(i)); if (item) { item->setData(0, IdRole, groups.at(i).toElement().attribute("list")); @@ -152,7 +152,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi if (!found && !currentFolder.isEmpty()) { // previously selected effect was removed, focus on its parent folder - for (int i = 0; i < topLevelItemCount(); i++) { + for (int i = 0; i < topLevelItemCount(); ++i) { if (topLevelItem(i)->text(0) == currentFolder) { setCurrentItem(topLevelItem(i)); break; @@ -168,7 +168,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi QMenu *sub2 = NULL; QMenu *sub3 = NULL; QMenu *sub4 = NULL; - for (int i = 0; i < topLevelItemCount(); i++) { + for (int i = 0; i < topLevelItemCount(); ++i) { if (!topLevelItem(i)->childCount()) continue; QMenu *sub = new QMenu(topLevelItem(i)->text(0), effectsMenu); @@ -220,7 +220,7 @@ void EffectsListWidget::initList(QMenu *effectsMenu, KActionCategory *effectActi } } -void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *folders, int type, const QString current, bool *found) +void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, QTreeWidgetItem *defaultFolder, const QList *folders, int type, const QString ¤t, bool *found) { QStringList effectInfo, l; QTreeWidgetItem *parentItem; @@ -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); + for (int i = 0; i < folders->count(); ++i) { + l = folders->at(i)->data(0, IdRole).toString().split(QLatin1Char(','), QString::SkipEmptyParts); if (l.contains(effectInfo.at(2))) { parentItem = folders->at(i); break; @@ -260,12 +260,12 @@ void EffectsListWidget::loadEffects(const EffectsList *effectlist, KIcon icon, Q } } -QTreeWidgetItem *EffectsListWidget::findFolder(const QString name) +QTreeWidgetItem *EffectsListWidget::findFolder(const QString &name) { QTreeWidgetItem *item = NULL; QList 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; @@ -300,7 +300,7 @@ const QDomElement EffectsListWidget::itemEffect(QTreeWidgetItem *item) const } -QString EffectsListWidget::currentInfo() +QString EffectsListWidget::currentInfo() const { QTreeWidgetItem *item = currentItem(); if (!item || item->data(0, TypeRole).toInt() == (int)EFFECT_FOLDER) return QString(); @@ -363,7 +363,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"