Use const'ref.

[kdenlive] / src / utils / freesound.cpp

diff --git a/src/utils/freesound.cpp b/src/utils/freesound.cpp
index 5cbdf8784688ab287837f99f5a1ed419e70ca40f..57a1c99dd86a6f914aa5098c6227880cd284ba83 100644 (file)
--- a/src/utils/freesound.cpp
+++ b/src/utils/freesound.cpp
@@ -59,7 +59,7 @@ void FreeSound::slotStartSearch(const QString searchText, int page)
     uri.append("&api_key=a1772c8236e945a4bee30a64058dabf8");
 
     KJob* resolveJob = KIO::storedGet( KUrl(uri), KIO::NoReload, KIO::HideProgressInfo );
-    connect( resolveJob, SIGNAL( result( KJob* ) ), this, SLOT( slotShowResults( KJob* ) ) );
+    connect( resolveJob, SIGNAL(result(KJob*)), this, SLOT(slotShowResults(KJob*)) );
 }
 
 
@@ -117,6 +117,7 @@ void FreeSound::slotShowResults(KJob* job)
 #endif  
     m_listWidget->blockSignals(false);
     m_listWidget->setCurrentRow(0);
+    emit searchDone();
 }
     
 
@@ -141,7 +142,7 @@ OnlineItemInfo FreeSound::displayItemDetails(QListWidgetItem *item)
     QString extraInfoUrl = item->data(infoData).toString();
     if (!extraInfoUrl.isEmpty()) {
         KJob* resolveJob = KIO::storedGet( KUrl(extraInfoUrl), KIO::NoReload, KIO::HideProgressInfo );
-        connect( resolveJob, SIGNAL( result( KJob* ) ), this, SLOT( slotParseResults( KJob* ) ) );
+        connect( resolveJob, SIGNAL(result(KJob*)), this, SLOT(slotParseResults(KJob*)) );
     }
     emit gotThumb(item->data(imageRole).toString());
     return info;
@@ -154,7 +155,6 @@ void FreeSound::slotParseResults(KJob* job)
     KIO::StoredTransferJob* storedQueryJob = static_cast<KIO::StoredTransferJob*>( job );
     QJson::Parser parser;
     bool ok;
-    int ct = 0;
     QString html = QString("<style type=\"text/css\">tr.cellone {background-color: %1;}</style>").arg(qApp->palette().alternateBase().color().name());
     
     QVariant data = parser.parse(storedQueryJob->data(), &ok);
@@ -165,37 +165,21 @@ void FreeSound::slotParseResults(KJob* job)
         html += "<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\">";
     
         if (m_metaInfo.contains(i18n("Duration"))) {
-            ct++;
-            if (ct %2 == 0) {
-                html += "<tr class=\"cellone\">";
-            }
-            else html += "<tr>";
+           html += "<tr>";
             html += "<td>" + i18n("Duration") + "</td><td>" + m_metaInfo.value(i18n("Duration")) + "</td></tr>";
             m_metaInfo.remove(i18n("Duration"));
         }
         
         if (infos.contains("samplerate")) {
-            ct++;
-            if (ct %2 == 0) {
-                html += "<tr class=\"cellone\">";
-            }
-            else html += "<tr>";
+            html += "<tr class=\"cellone\">";
             html += "<td>" + i18n("Samplerate") + "</td><td>" + QString::number(infos.value("samplerate").toDouble()) + "</td></tr>";
         }
         if (infos.contains("channels")) {
-            ct++;
-            if (ct %2 == 0) {
-                html += "<tr class=\"cellone\">";
-            }
-            else html += "<tr>";
+            html += "<tr>";
             html += "<td>" + i18n("Channels") + "</td><td>" + QString::number(infos.value("channels").toInt()) + "</td></tr>";
         }
         if (infos.contains("filesize")) {
-            ct++;
-            if (ct %2 == 0) {
-                html += "<tr class=\"cellone\">";
-            }
-            else html += "<tr>";
+            html += "<tr class=\"cellone\">";
             KIO::filesize_t fSize = infos.value("filesize").toDouble();
             html += "<td>" + i18n("File size") + "</td><td>" + KIO::convertSize(fSize) + "</td></tr>";
         }
@@ -204,7 +188,7 @@ void FreeSound::slotParseResults(KJob* job)
         }
         html +="</table>";
         if (infos.contains("description")) {
-            html += "<em>" + infos.value("description").toString() + "</em>";
+            m_metaInfo.insert("description", infos.value("description").toString());
         }
     }
     emit gotMetaInfo(html);
@@ -221,12 +205,12 @@ bool FreeSound::startItemPreview(QListWidgetItem *item)
     if (m_previewProcess && m_previewProcess->state() != QProcess::NotRunning) {
         m_previewProcess->close();
     }
-    m_previewProcess->start("ffplay", QStringList() << url << "-nodisp");
+    m_previewProcess->start(KdenliveSettings::ffplaypath(), QStringList() << url << "-nodisp");
     return true;
 }
 
 
-void FreeSound::stopItemPreview(QListWidgetItem *item)
+void FreeSound::stopItemPreview(QListWidgetItem */*item*/)
 {    
     if (m_previewProcess && m_previewProcess->state() != QProcess::NotRunning) {
         m_previewProcess->close();