Fix compilation with KDE < 4.4

diff --git a/src/geometrywidget.cpp b/src/geometrywidget.cpp
index 321ab76fecb8500362922d3e6e92e2aba66512d2..9cc3a27325a28806720808015b563d45e936b19d 100644 (file)
--- a/src/geometrywidget.cpp
+++ b/src/geometrywidget.cpp
@@ -70,17 +70,24 @@ GeometryWidget::GeometryWidget(Monitor* monitor, Timecode timecode, int clipPos,
     m_timeline = new KeyframeHelper(m_ui.frameTimeline);
     layout->addWidget(m_timeline);
     layout->setContentsMargins(0, 0, 0, 0);
+    
+    int size = style()->pixelMetric(QStyle::PM_SmallIconSize);
+    QSize iconSize(size, size);
 
     m_ui.buttonPrevious->setIcon(KIcon("media-skip-backward"));
     m_ui.buttonPrevious->setToolTip(i18n("Go to previous keyframe"));
+    m_ui.buttonPrevious->setIconSize(iconSize);
     m_ui.buttonNext->setIcon(KIcon("media-skip-forward"));
     m_ui.buttonNext->setToolTip(i18n("Go to next keyframe"));
+    m_ui.buttonNext->setIconSize(iconSize);
     m_ui.buttonAddDelete->setIcon(KIcon("document-new"));
     m_ui.buttonAddDelete->setToolTip(i18n("Add keyframe"));
+    m_ui.buttonAddDelete->setIconSize(iconSize);
 
     m_ui.buttonSync->setIcon(KIcon("insert-link"));
     m_ui.buttonSync->setToolTip(i18n("Synchronize with timeline cursor"));
     m_ui.buttonSync->setChecked(KdenliveSettings::transitionfollowcursor());
+    m_ui.buttonSync->setIconSize(iconSize);
 
     connect(m_timeline, SIGNAL(positionChanged(int)), this, SLOT(slotPositionChanged(int)));
     connect(m_timeline, SIGNAL(keyframeMoved(int)),   this, SLOT(slotKeyframeMoved(int)));

diff --git a/src/renderer.cpp b/src/renderer.cpp
index bde98fdc2d70bcd56809828bcccd61bf31a58779..3dd02443f01c6d1c5783c37d01bed8a249109e9d 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1261,7 +1261,6 @@ const QString Render::sceneList()
     if (split) slotSplitView(false);
     xmlConsumer.connect(prod);
     xmlConsumer.run();
-    //while (!xmlConsumer.is_stopped()) {}
     playlist = QString::fromUtf8(xmlConsumer.get("kdenlive_playlist"));
     if (split) slotSplitView(true);
     return playlist;
@@ -1272,6 +1271,7 @@ bool Render::saveSceneList(QString path, QDomElement kdenliveData)
     QFile file(path);
     QDomDocument doc;
     doc.setContent(sceneList(), false);
+    if (doc.isNull()) return false;
     QDomElement root = doc.documentElement();
     if (!kdenliveData.isNull() && !root.isNull()) {
         // add Kdenlive specific tags

diff --git a/src/utils/resourcewidget.cpp b/src/utils/resourcewidget.cpp
index 80fbc18ebef50334bae34a15b0eb5690c381cc3d..cafd50a16e96b13555c0df7744eb66b758bf38a3 100644 (file)
--- a/src/utils/resourcewidget.cpp
+++ b/src/utils/resourcewidget.cpp
@@ -40,8 +40,10 @@
 #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
@@ -93,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();
@@ -118,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);
 }
 
@@ -286,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);

diff --git a/src/utils/resourcewidget.h b/src/utils/resourcewidget.h
index b2021e0c175d19692302d17ef3b548acd7af07a4..ed2542768c07baeee3c12b9179873278bfb0ad9d 100644 (file)
--- a/src/utils/resourcewidget.h
+++ b/src/utils/resourcewidget.h
@@ -29,8 +29,12 @@
 #include <QDialog>
 #include <QProcess>
 #include <kio/jobclasses.h>
+#include <kdeversion.h>
 
+
+#if KDE_IS_VERSION(4,4,0)
 class KPixmapSequenceOverlayPainter;
+#endif
 class QAction;
 
 class ResourceWidget : public QDialog, public Ui::FreeSound_UI
@@ -68,7 +72,9 @@ private:
     AbstractService *m_currentService;
     void parseLicense(const QString &);
     OnlineItemInfo m_currentInfo;
+#if KDE_IS_VERSION(4,4,0)
     KPixmapSequenceOverlayPainter *m_busyWidget;
+#endif
     QAction *m_autoPlay;
     QString m_tmpThumbFile;
     QString m_title;