Fix Qt 4.6 compilation: http://kdenlive.org/mantis/view.php?id=2735

diff --git a/src/kdenlivedoc.h b/src/kdenlivedoc.h
index 5c658590d19cc5412ebaef5160fa9401225ba823..955aee993f5f120fa2958f475a311386cba9ef24 100644 (file)
--- 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 cfcdfbae20cd0b0099fefe974483e11d75ca70fe..3f64677acb1ee10da4a9a63d76d363758521f580 100644 (file)
--- 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 201e2cfd4221ee2949f855cc3dbefe70300bd107..0c185866cfe29d53d92de6fbf9936acfb3629889 100644 (file)
--- 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 e82b5143445cb3b464d406a427544c7f87af7349..16d54a3fb9dc0959f28a78cee9375e20c4cfa1bb 100644 (file)
--- 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 8d312e73acbe19ba247261ae816a516fff1d2921..ecbbdc2993682df2b52155ac3d9933a943ba8246 100644 (file)
--- 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);
 };