Fixes crashes if parent is destroyed. Found by krazy. Details at:
http://blogs.kde.org/node/3919
---
src/projectlist.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index ff9d174..6c77cd7 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -1642,7 +1642,7 @@ void ProjectList::slotAddClip(const QList <QUrl>
givenList, const QString &group
l->addWidget(c);
l->addStretch(5);
f->setLayout(l);
- KFileDialog *d = new KFileDialog(KUrl("kfiledialog:///clipfolder"),
dialogFilter, kapp->activeWindow(), f);
+ QPointer<KFileDialog> d = new
KFileDialog(KUrl("kfiledialog:///clipfolder"), dialogFilter,
kapp->activeWindow(), f);
d->setOperationMode(KFileDialog::Opening);
d->setMode(KFile::Files);
if (d->exec() == QDialog::Accepted) {
@@ -1808,7 +1808,7 @@ void ProjectList::slotAddColorClip()
if (!m_commandStack)
kDebug() << "!!!!!!!!!!!!!!!! NO CMD STK";
- QDialog *dia = new QDialog(this);
+ QPointer<QDialog> dia = new QDialog(this);
Ui::ColorClip_UI dia_ui;
dia_ui.setupUi(dia);
dia->setWindowTitle(i18n("Color Clip"));
@@ -1879,7 +1879,7 @@ void ProjectList::slotAddTitleTemplateClip()
const QString path = m_doc->projectFolder().path(KUrl::AddTrailingSlash) +
"titles/";
QStringList templateFiles = QDir(path).entryList(filter, QDir::Files);
- QDialog *dia = new QDialog(this);
+ QPointer<QDialog> dia = new QDialog(this);
Ui::TemplateClip_UI dia_ui;
dia_ui.setupUi(dia);
for (int i = 0; i < templateFiles.size(); ++i)
@@ -2722,7 +2722,7 @@ void ProjectList::slotCutClipJob(const QString &id,
QPoint zone)
QString timeIn = Timecode::getStringTimecode(in, clipFps, true);
QString timeOut = Timecode::getStringTimecode(duration, clipFps, true);
- QDialog *d = new QDialog(this);
+ QPointer<QDialog> d = new QDialog(this);
Ui::CutJobDialog_UI ui;
ui.setupUi(d);
ui.extra_params->setVisible(false);
@@ -3384,7 +3384,7 @@ void ProjectList::startClipFilterJob(const QString
&filterName, const QString &c
else {
destination = item->clipUrl().directory();
}
- ClipStabilize *d = new ClipStabilize(destination, ids.count(), filterName);
+ QPointer<ClipStabilize> d = new ClipStabilize(destination, ids.count(),
filterName);
if (d->exec() == QDialog::Accepted) {
processClipJob(ids, d->destination(), d->autoAddClip(), d->params(),
d->desc());
}
--
1.7.10.4
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Kdenlive-devel mailing list
Kdenlive-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kdenlive-devel
