From 2347054c6d402d354eabfc3b4c9b12651db7c073 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 12 Feb 2013 00:37:49 +0100 Subject: [PATCH] Fix Coverity #980693 --- src/effectstack/collapsibleeffect.cpp | 18 +++++++++++------- src/effectstack/collapsibleeffect.h | 2 -- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/effectstack/collapsibleeffect.cpp b/src/effectstack/collapsibleeffect.cpp index 509392ba..305f2c2a 100644 --- a/src/effectstack/collapsibleeffect.cpp +++ b/src/effectstack/collapsibleeffect.cpp @@ -78,15 +78,21 @@ CollapsibleEffect::CollapsibleEffect(QDomElement effect, QDomElement original_ef m_menu->addAction(KIcon("view-refresh"), i18n("Reset Effect"), this, SLOT(slotResetEffect())); m_menu->addAction(KIcon("document-save"), i18n("Save Effect"), this, SLOT(slotSaveEffect())); - QDomElement namenode = m_effect.firstChildElement("name"); - if (namenode.isNull()) return; - QString effectname = i18n(namenode.text().toUtf8().data()); - if (m_regionEffect) effectname.append(':' + KUrl(EffectsList::parameter(m_effect, "resource")).fileName()); - QHBoxLayout *l = static_cast (frame->layout()); title = new QLabel(this); l->insertWidget(2, title); + m_groupAction = new QAction(KIcon("folder-new"), i18n("Create Group"), this); + connect(m_groupAction, SIGNAL(triggered(bool)), this, SLOT(slotCreateGroup())); + + QDomElement namenode = m_effect.firstChildElement("name"); + if (namenode.isNull()) { + // Warning, broken effect? + kDebug()<<"// Could not create effect"; + return; + } + QString effectname = i18n(namenode.text().toUtf8().data()); + if (m_regionEffect) effectname.append(':' + KUrl(EffectsList::parameter(m_effect, "resource")).fileName()); title->setText(effectname); /* * Do not show icon, makes too much visual noise @@ -97,8 +103,6 @@ CollapsibleEffect::CollapsibleEffect(QDomElement effect, QDomElement original_ef else if (type == "custom") icon = KIcon("kdenlive-custom-effect"); else icon = KIcon("kdenlive-show-video"); effecticon->setPixmap(icon.pixmap(16,16));*/ - m_groupAction = new QAction(KIcon("folder-new"), i18n("Create Group"), this); - connect(m_groupAction, SIGNAL(triggered(bool)), this, SLOT(slotCreateGroup())); if (!m_regionEffect) { if (m_info.groupIndex == -1) m_menu->addAction(m_groupAction); diff --git a/src/effectstack/collapsibleeffect.h b/src/effectstack/collapsibleeffect.h index 53e0ec0b..0b32e8b3 100644 --- a/src/effectstack/collapsibleeffect.h +++ b/src/effectstack/collapsibleeffect.h @@ -105,8 +105,6 @@ private: QDomElement m_original_effect; QList m_subEffects; bool m_lastEffect; - int m_in; - int m_out; QMenu *m_menu; QPoint m_clickPoint; EffectInfo m_info; -- 2.39.2