[PATCH by Ray Lehtiniemi] Do not return references to temporaries.

[kdenlive] / src / projectlist.h

diff --git a/src/projectlist.h b/src/projectlist.h
index d707faf399c4a40db4b2b426f2dc409f60294d3e..e0679d03e2a9b51e2eaf8a9515509025bd73c94c 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#ifndef PRJECTLIST_H
-#define PRJECTLIST_H
+#ifndef PROJECTLIST_H
+#define PROJECTLIST_H
 
 #include <QDomNodeList>
 #include <QToolBar>
@@ -32,9 +32,12 @@
 
 #include <KTreeWidgetSearchLine>
 #include <KUrl>
+#include <nepomuk/kratingpainter.h>
+#include <nepomuk/resource.h>
 
 #include "definitions.h"
 #include "timecode.h"
+#include "kdenlivesettings.h"
 
 namespace Mlt {
 class Producer;
@@ -68,14 +71,11 @@ public:
     */
     void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
         if (index.column() == 1) {
-            const bool hover = option.state & (QStyle::State_Selected);
             QRect r1 = option.rect;
             painter->save();
-            if (hover) {
+            if (option.state & (QStyle::State_Selected)) {
                 painter->setPen(option.palette.color(QPalette::HighlightedText));
-                QColor backgroundColor = option.palette.color(QPalette::Highlight);
-                painter->setBrush(QBrush(backgroundColor));
-                painter->fillRect(r1, QBrush(backgroundColor));
+                painter->fillRect(r1, option.palette.highlight());
             }
             QFont font = painter->font();
             font.setBold(true);
@@ -94,6 +94,16 @@ public:
             painter->setPen(option.palette.color(QPalette::Mid));
             painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText);
             painter->restore();
+        } else if (index.column() == 3 && KdenliveSettings::activate_nepomuk()) {
+            if (index.data().toString().isEmpty()) {
+                QItemDelegate::paint(painter, option, index);
+                return;
+            }
+            QRect r1 = option.rect;
+            if (option.state & (QStyle::State_Selected)) {
+                painter->fillRect(r1, option.palette.highlight());
+            }
+            KRatingPainter::paintRating(painter, r1, Qt::AlignCenter, index.data().toInt());
         } else {
             QItemDelegate::paint(painter, option, index);
         }
@@ -118,8 +128,8 @@ public:
 
 public slots:
     void setDocument(KdenliveDoc *doc);
-    void slotReplyGetImage(const QString &clipId, int pos, const QPixmap &pix, int w, int h);
-    void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata);
+    void slotReplyGetImage(const QString &clipId, const QPixmap &pix);
+    void slotReplyGetFileProperties(const QString &clipId, Mlt::Producer *producer, const QMap < QString, QString > &properties, const QMap < QString, QString > &metadata, bool replace);
     void slotAddClip(DocClipBase *clip, bool getProperties);
     void slotDeleteClip(const QString &clipId);
     void slotUpdateClip(const QString &id);
@@ -131,6 +141,9 @@ public slots:
     void slotAddClip(KUrl givenUrl = KUrl(), QString group = QString());
     void slotAddFolder(const QString foldername, const QString &clipId, bool remove, bool edit = false);
     void slotResetProjectList();
+    void slotOpenClip();
+    void slotEditClip();
+    void slotReloadClip();
 
 private:
     ProjectListView *listView;
@@ -146,6 +159,8 @@ private:
     ProjectItem *getFolderItemById(const QString &id);
     QAction *m_editAction;
     QAction *m_deleteAction;
+    QAction *m_openAction;
+    QAction *m_reloadAction;
     KdenliveDoc *m_doc;
     ProjectItem *m_selectedItem;
     bool m_refreshed;
@@ -158,7 +173,6 @@ private:
     void editFolder(const QString folderName, const QString oldfolderName, const QString &clipId);
 
 private slots:
-    void slotEditClip();
     void slotClipSelected();
     void slotAddColorClip();
     void slotAddSlideshowClip();
@@ -176,7 +190,7 @@ private slots:
 
 signals:
     void clipSelected(DocClipBase *);
-    void getFileProperties(const QDomElement&, const QString &);
+    void getFileProperties(const QDomElement&, const QString &, bool);
     void receivedClipDuration(const QString &, int);
     void showClipProperties(DocClipBase *);
     void projectModified();