Cleanup

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e1ab4dc9f4e961297dda7bf46973e1cceeea4252..43c1fc024c83da354b01ed15d1b7019bf8eb9b1d 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -3102,7 +3102,7 @@ void MainWindow::slotEditItemDuration()
         m_activeTimeline->projectView()->editItemDuration();
 }
 
-void MainWindow::slotAddProjectClip(KUrl url, QMap <QString, QString> data)
+void MainWindow::slotAddProjectClip(KUrl url, stringMap data)
 {
     if (m_activeDocument) {
         m_activeDocument->slotAddClipFile(url, data);
@@ -4497,7 +4497,7 @@ void MainWindow::slotDownloadResources()
     if (m_activeDocument) currentFolder = m_activeDocument->projectFolder().path();
     else currentFolder = KdenliveSettings::defaultprojectfolder();
     ResourceWidget *d = new ResourceWidget(currentFolder);
-    connect(d, SIGNAL(addClip(KUrl, QMap <QString, QString>)), this, SLOT(slotAddProjectClip(KUrl, QMap <QString, QString>)));
+    connect(d, SIGNAL(addClip(KUrl,stringMap)), this, SLOT(slotAddProjectClip(KUrl,stringMap)));
     d->show();
 }
 

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 3f64677acb1ee10da4a9a63d76d363758521f580..a7f1c2c76dbf311b4a38aec2254231276aad377e 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);
+    void slotAddProjectClip(KUrl url, stringMap data = stringMap());
     void slotAddProjectClipList(KUrl::List urls);
     void slotShowClipProperties(DocClipBase *clip);
     void slotShowClipProperties(QList <DocClipBase *>cliplist, QMap<QString, QString> commonproperties);

diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
index 45bcb227f5a4c8b7f7c35e82ac4148b2bafb657c..c0ea22991ff08b6f83d50137d02b6944aa166bc8 100644 (file)
--- a/src/utils/resourcewidget.cpp
+++ b/src/utils/resourcewidget.cpp
@@ -261,7 +261,7 @@ void ResourceWidget::slotGotFile(KJob *job)
         //res.setProperty( Soprano::Vocabulary::NAO::description(), 
 #endif
 #endif
-        emit addClip(filePath, QMap <QString, QString>());
+        emit addClip(filePath, stringMap());
 }
 
 void ResourceWidget::slotOpenUrl(const QString &url)
@@ -288,7 +288,7 @@ void ResourceWidget::slotChangeService()
 
     connect(m_currentService, SIGNAL(gotMetaInfo(const QString)), this, SLOT(slotSetMetadata(const QString)));
     connect(m_currentService, SIGNAL(gotMetaInfo(QMap <QString, QString>)), this, SLOT(slotDisplayMetaInfo(QMap <QString, QString>)));
-    connect(m_currentService, SIGNAL(maxPages(int)), page_number, SLOT(setMaximum(int)));
+    connect(m_currentService, SIGNAL(maxPages(int)), this, SLOT(slotSetMaximum(int)));
     connect(m_currentService, SIGNAL(searchInfo(QString)), search_info, SLOT(setText(QString)));
     connect(m_currentService, SIGNAL(gotThumb(const QString)), this, SLOT(slotLoadThumb(const QString)));
 #if KDE_IS_VERSION(4,4,0)
@@ -301,6 +301,11 @@ void ResourceWidget::slotChangeService()
     if (!search_text->text().isEmpty()) slotStartSearch();
 }
 
+void ResourceWidget::slotSetMaximum(int max)
+{
+    page_number->setMaximum(max);
+}
+
 void ResourceWidget::slotOnline()
 {
     button_search->setEnabled(true);

diff --git a/src/utils/resourcewidget.h b/src/utils/resourcewidget.h
index ecbbdc2993682df2b52155ac3d9933a943ba8246..21f06af8f041b9287573e88fd393469a9760b6b3 100644 (file)
--- a/src/utils/resourcewidget.h
+++ b/src/utils/resourcewidget.h
@@ -25,6 +25,7 @@
 
 #include "ui_freesound_ui.h"
 #include "abstractservice.h"
+#include "../definitions.h"
 
 #include <QDialog>
 #include <QProcess>
@@ -66,6 +67,7 @@ private slots:
     void slotSetDescription(const QString desc);
     void slotSetImage(const QString desc);
     void slotSetTitle(const QString desc);
+    void slotSetMaximum(int max);
 
 private:
     QString m_folder;
@@ -84,7 +86,7 @@ private:
     void updateLayout();
    
 signals:
-    void addClip(KUrl, QMap <QString, QString> data);
+    void addClip(KUrl, stringMap data);
 };