Merge branch 'master' into next

[kdenlive] / src / effectstackview.cpp

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index d188762525d2bacf0343b390606e1a6d5f73cc8c..11f09cca007e0fcf5e4b20efcc7a4e1f3f6d65dd 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -91,7 +91,7 @@ EffectStackView::EffectStackView(Monitor *monitor, QWidget *parent) :
     connect(m_ui.buttonReset, SIGNAL(clicked()), this, SLOT(slotResetEffect()));
     connect(m_ui.checkAll, SIGNAL(stateChanged(int)), this, SLOT(slotCheckAll(int)));
     connect(m_ui.buttonShowComments, SIGNAL(clicked()), this, SLOT(slotShowComments()));
-    connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement, const QDomElement)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement)));
+    connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement &, const QDomElement &)), this , SLOT(slotUpdateEffectParams(const QDomElement &, const QDomElement &)));
     connect(m_effectedit, SIGNAL(seekTimeline(int)), this , SLOT(slotSeekTimeline(int)));
     connect(m_effectedit, SIGNAL(displayMessage(const QString&, int)), this, SIGNAL(displayMessage(const QString&, int)));
     connect(m_effectedit, SIGNAL(checkMonitorPosition(int)), this, SLOT(slotCheckMonitorPosition(int)));
@@ -159,7 +159,7 @@ void EffectStackView::slotSaveEffect()
     emit reloadEffects();
 }
 
-void EffectStackView::slotUpdateEffectParams(const QDomElement old, const QDomElement e)
+void EffectStackView::slotUpdateEffectParams(const QDomElement &old, const QDomElement &e)
 {
     if (m_trackMode)
         emit updateEffect(NULL, m_trackindex, old, e, m_ui.effectlist->currentRow());
@@ -431,6 +431,7 @@ void EffectStackView::clear()
     ItemInfo info;
     m_effectedit->transferParamDesc(QDomElement(), info);
     //m_ui.region_url->clear();
+    m_clipref = NULL;
     m_ui.buttonShowComments->setEnabled(false);
     m_ui.labelComment->setText(QString());
     m_ui.effectlist->blockSignals(false);