use QObject since we don't need more

svn path=/trunk/kdenlive/; revision=3803

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 980c364fa24bd2687effd3428f18a2f79825d202..7aa6a4a48cae6b12ec73e10e5e3886e63e2774f1 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -65,12 +65,11 @@ class Wipeval: public EffectStackEdit::UiItem, public Ui::Wipeval_UI
 QMap<QString, QImage> EffectStackEdit::iconCache;
 
 EffectStackEdit::EffectStackEdit(QWidget *parent) :
-        QWidget(parent),
+        QObject(parent),
         m_in(0),
         m_out(0),
         m_frameSize(QPoint())
 {
-    setSizePolicy(QSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding));
     QVBoxLayout *vbox1 = new QVBoxLayout(parent);
     vbox1->setContentsMargins(0, 0, 0, 0);
     vbox1->setSpacing(0);
@@ -80,7 +79,7 @@ EffectStackEdit::EffectStackEdit(QWidget *parent) :
     area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     area->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
     area->setFrameStyle(QFrame::NoFrame);
-    wid->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
+    parent->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
     area->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::MinimumExpanding));
 
     vbox1->addWidget(area);
@@ -89,8 +88,7 @@ EffectStackEdit::EffectStackEdit(QWidget *parent) :
     m_vbox = new QVBoxLayout(wid);
     m_vbox->setContentsMargins(0, 0, 0, 0);
     m_vbox->setSpacing(0);
-    wid->show();
-
+    //wid->show();
 }
 
 EffectStackEdit::~EffectStackEdit()
@@ -421,12 +419,12 @@ QString EffectStackEdit::getWipeString(wipeInfo info)
 
 void EffectStackEdit::collectAllParameters()
 {
-    if (m_valueItems.isEmpty()) return;
+    if (m_valueItems.isEmpty() || m_params.isNull()) return;
 
     const QDomElement oldparam = m_params.cloneNode().toElement();
     QDomElement newparam = oldparam.cloneNode().toElement();
     QDomNodeList namenode = newparam.elementsByTagName("parameter");
-
+    
     for (int i = 0; i < namenode.count() ; i++) {
         QDomNode pa = namenode.item(i);
         QDomNode na = pa.firstChildElement("name");

diff --git a/src/effectstackedit.h b/src/effectstackedit.h
index 846fb2837493369b379d80fb5ceb6a7964f33629..334e4af89d29a9dade12337c94a1b19137197cd2 100644 (file)
--- a/src/effectstackedit.h
+++ b/src/effectstackedit.h
@@ -39,7 +39,7 @@ struct wipeInfo {
 
 class QFrame;
 
-class EffectStackEdit : public QWidget
+class EffectStackEdit : public QObject
 {
     Q_OBJECT
 public: