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

[kdenlive] / src / utils / resourcewidget.cpp

diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
index 39c8ec5263eec0f17f8c59c06725ea870ad98233..16d54a3fb9dc0959f28a78cee9375e20c4cfa1bb 100644 (file)
--- a/src/utils/resourcewidget.cpp
+++ b/src/utils/resourcewidget.cpp
@@ -40,9 +40,11 @@
 #include <KIO/NetAccess>
 #include <Solid/Networking>
 #include <KRun>
+#if KDE_IS_VERSION(4,4,0)
 #include <KPixmapSequence>
 #include <KPixmapSequenceOverlayPainter>
-
+#endif
+#include <KFileItem>
 
 #ifdef USE_NEPOMUK
 #if KDE_IS_VERSION(4,6,0)
@@ -52,7 +54,6 @@
 #include <Nepomuk/Vocabulary/NIE>
 #include <Nepomuk/Vocabulary/NCO>
 #include <Nepomuk/Vocabulary/NDO>
-#include <kfileitem.h>
 #endif
 #endif
 
@@ -94,9 +95,11 @@ ResourceWidget::ResourceWidget(const QString & folder, QWidget * parent) :
     config_button->setMenu(resourceMenu);
     config_button->setIcon(KIcon("configure"));
 
+#if KDE_IS_VERSION(4,4,0)
     m_busyWidget = new KPixmapSequenceOverlayPainter(this);
     m_busyWidget->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
     m_busyWidget->setWidget(search_results->viewport());
+#endif
     
     sound_box->setEnabled(false);
     search_text->setFocus();
@@ -119,7 +122,9 @@ void ResourceWidget::slotStartSearch(int page)
     page_number->blockSignals(true);
     page_number->setValue(page);
     page_number->blockSignals(false);
+#if KDE_IS_VERSION(4,4,0)
     m_busyWidget->start();
+#endif
     m_currentService->slotStartSearch(search_text->text(), page);
 }
 
@@ -206,25 +211,6 @@ void ResourceWidget::slotPlaySound()
 }
 
 
-void ResourceWidget::slotForcePlaySound(bool play)
-{
-    /*
-    if (m_service != FREESOUND) return;
-    m_previewProcess->close();
-    if (m_currentPreview.isEmpty()) return;
-    if (play)
-        m_previewProcess->start("ffplay", QStringList() << m_currentPreview << "-nodisp");
-    */
-}
-
-void ResourceWidget::slotPreviewStatusChanged(QProcess::ProcessState state)
-{
-    /*if (state == QProcess::NotRunning)
-        button_preview->setText(i18n("Preview"));
-    else 
-        button_preview->setText(i18n("Stop"));*/
-}
-
 void ResourceWidget::slotSaveItem(const QString originalUrl)
 {
     //if (m_currentUrl.isEmpty()) return;
@@ -235,7 +221,7 @@ void ResourceWidget::slotSaveItem(const QString originalUrl)
     if (!path.endsWith('/')) path.append('/');
     if (!originalUrl.isEmpty()) {
         path.append(KUrl(originalUrl).fileName());
-        ext = "*." + KUrl(originalUrl).fileName().section(".", -1);
+        ext = "*." + KUrl(originalUrl).fileName().section('.', -1);
         m_currentInfo.itemDownload = originalUrl;
     }
     else {
@@ -276,7 +262,7 @@ void ResourceWidget::slotGotFile(KJob *job)
         //res.setProperty( Soprano::Vocabulary::NAO::description(), 
 #endif
 #endif
-        emit addClip(filePath, QString());
+        emit addClip(filePath, QMap <QString, QString>());
 }
 
 void ResourceWidget::slotOpenUrl(const QString &url)
@@ -306,7 +292,9 @@ void ResourceWidget::slotChangeService()
     connect(m_currentService, SIGNAL(maxPages(int)), page_number, SLOT(setMaximum(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)
     connect(m_currentService, SIGNAL(searchDone()), m_busyWidget, SLOT(stop()));
+#endif
     
     button_preview->setVisible(m_currentService->hasPreview);
     button_import->setVisible(!m_currentService->inlineDownload);
@@ -409,4 +397,5 @@ void ResourceWidget::updateLayout()
     if (!m_desc.isEmpty()) content.append(m_desc);
     if (!m_meta.isEmpty()) content.append(m_meta);
     info_browser->setHtml(content);
-}
\ No newline at end of file
+}
+