From f19daa7ce1724885a0cd248823e422a8b2360747 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Mon, 17 Sep 2012 10:49:13 +0200
Subject: [PATCH] Fix Qt 4.6 compilation:
 http://kdenlive.org/mantis/view.php?id=2735

---
 src/kdenlivedoc.h            | 2 +-
 src/mainwindow.h             | 2 +-
 src/projectlist.cpp          | 4 ++--
 src/utils/resourcewidget.cpp | 2 +-
 src/utils/resourcewidget.h   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 5c658590..955aee99 100644
--- a/src/kdenlivedoc.h
+++ b/src/kdenlivedoc.h
@@ -221,7 +221,7 @@ public slots:
      * @param mod (optional) true if the document has to be saved */
     void setModified(bool mod = true);
     void checkProjectClips(bool displayRatioChanged = false, bool fpsChanged = false);
-    void slotAddClipFile(const KUrl &url, stringMap data = QMap <QString, QString>());
+    void slotAddClipFile(const KUrl &url, stringMap data);
 
 private slots:
     void slotAutoSave();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index cfcdfbae..3f64677a 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -425,7 +425,7 @@ private slots:
     void slotSelectAddTimelineTransition();
     void slotAddVideoEffect(QAction *result);
     void slotAddTransition(QAction *result);
-    void slotAddProjectClip(KUrl url, QMap <QString, QString>data = QMap <QString, QString>());
+    void slotAddProjectClip(KUrl url, QMap <QString, QString>data);
     void slotAddProjectClipList(KUrl::List urls);
     void slotShowClipProperties(DocClipBase *clip);
     void slotShowClipProperties(QList <DocClipBase *>cliplist, QMap<QString, QString> commonproperties);
diff --git a/src/projectlist.cpp b/src/projectlist.cpp
index 201e2cfd..0c185866 100644
--- a/src/projectlist.cpp
+++ b/src/projectlist.cpp
@@ -2111,12 +2111,12 @@ void ProjectList::slotRefreshClipThumbnail(QTreeWidgetItem *it, bool update)
         int dwidth = (int)(height  * m_render->dar() + 0.5);
         if (clip->clipType() == AUDIO)
             pix = KIcon("audio-x-generic").pixmap(QSize(dwidth, height));
-        else if (clip->clipType() == IMAGE)
+        else if (clip->clipType() == IMAGE) {
             img = KThumb::getFrame(item->referencedClip()->getProducer(), 0, swidth, dwidth, height);
+	}
         else {
             img = item->referencedClip()->extractImage(frame, dwidth, height);
         }
-
         if (!pix.isNull() || !img.isNull()) {
             monitorItemEditing(false);
             if (!img.isNull()) {
diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
index e82b5143..16d54a3f 100644
--- a/src/utils/resourcewidget.cpp
+++ b/src/utils/resourcewidget.cpp
@@ -262,7 +262,7 @@ void ResourceWidget::slotGotFile(KJob *job)
         //res.setProperty( Soprano::Vocabulary::NAO::description(), 
 #endif
 #endif
-        emit addClip(filePath);
+        emit addClip(filePath, QMap <QString, QString>());
 }
 
 void ResourceWidget::slotOpenUrl(const QString &url)
diff --git a/src/utils/resourcewidget.h b/src/utils/resourcewidget.h
index 8d312e73..ecbbdc29 100644
--- a/src/utils/resourcewidget.h
+++ b/src/utils/resourcewidget.h
@@ -84,7 +84,7 @@ private:
     void updateLayout();
    
 signals:
-    void addClip(KUrl, QMap <QString, QString> data = QMap <QString, QString>());
+    void addClip(KUrl, QMap <QString, QString> data);
 };
 
 
-- 
2.39.2