Fix crash on clip cut introduced in recent coverity fix:

[kdenlive] / src / projectlistview.cpp

diff --git a/src/projectlistview.cpp b/src/projectlistview.cpp
index e08fd4b743bfba42f63893c90c6e6526bae1478d..e4a2641b2323fc5484f33530f74a21b5a8cefa52 100644 (file)
--- a/src/projectlistview.cpp
+++ b/src/projectlistview.cpp
@@ -45,15 +45,7 @@ ProjectListView::ProjectListView(QWidget *parent) :
     setFrameShape(QFrame::NoFrame);
     setRootIsDecorated(true);
 
-    QString style = "QTreeView::branch:has-siblings:!adjoins-item{border-image: none;border:0px} \
-    QTreeView::branch:has-siblings:adjoins-item {border-image: none;border:0px}      \
-    QTreeView::branch:!has-children:!has-siblings:adjoins-item {border-image: none;border:0px} \
-    QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {   \
-         border-image: none;image: url(:/images/stylesheet-branch-closed.png);}      \
-    QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings  {    \
-         border-image: none;image: url(:/images/stylesheet-branch-open.png);}";
-
-    setStyleSheet(style);
+    updateStyleSheet();
 
     setColumnCount(4);
     QStringList headers;
@@ -82,6 +74,18 @@ ProjectListView::~ProjectListView()
 {
 }
 
+void ProjectListView::updateStyleSheet()
+{
+    QString style = "QTreeView::branch:has-siblings:!adjoins-item{border-image: none;border:0px} \
+    QTreeView::branch:has-siblings:adjoins-item {border-image: none;border:0px}      \
+    QTreeView::branch:!has-children:!has-siblings:adjoins-item {border-image: none;border:0px} \
+    QTreeView::branch:has-children:!has-siblings:closed,QTreeView::branch:closed:has-children:has-siblings {   \
+         border-image: none;image: url(:/images/stylesheet-branch-closed.png);}      \
+    QTreeView::branch:open:has-children:!has-siblings,QTreeView::branch:open:has-children:has-siblings  {    \
+         border-image: none;image: url(:/images/stylesheet-branch-open.png);}";
+    setStyleSheet(style);
+}
+
 void ProjectListView::processLayout()
 {
     executeDelayedItemsLayout();
@@ -262,7 +266,7 @@ void ProjectListView::dropEvent(QDropEvent *event)
                 if (it->type() == PROJECTCLIPTYPE) {
                     if (it->parent()) clone = (ProjectItem*) it->parent()->takeChild(it->parent()->indexOfChild(it));
                     else clone = (ProjectItem*) takeTopLevelItem(indexOfTopLevelItem(it));
-                    if (clone) {
+                    if (clone && item) {
                         item->addChild(clone);
                         QMap <QString, QString> props;
                         props.insert("groupname", item->groupName());
@@ -276,6 +280,7 @@ void ProjectListView::dropEvent(QDropEvent *event)
             const QList <QTreeWidgetItem *> list = selectedItems();
             ProjectItem *clone;
             foreach(QTreeWidgetItem *it, list) {
+                if (it->type() != PROJECTCLIPTYPE) continue;
                 QTreeWidgetItem *parent = it->parent();
                 if (parent/* && ((ProjectItem *) it)->clipId() < 10000*/)  {
                     kDebug() << "++ item parent: " << parent->text(1);
@@ -293,7 +298,12 @@ void ProjectListView::dropEvent(QDropEvent *event)
         QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';');
         emit addClipCut(list.at(0), list.at(1).toInt(), list.at(2).toInt());
     }
-    event->acceptProposedAction();
+    if (event->source() == this) {
+       event->setDropAction(Qt::MoveAction);
+        event->accept();
+    } else {
+       event->acceptProposedAction();
+    }
     QTreeWidget::dropEvent(event);
 }
 
@@ -304,7 +314,15 @@ void ProjectListView::mousePressEvent(QMouseEvent *event)
         m_DragStartPosition = event->pos();
         m_dragStarted = true;
         /*QTreeWidgetItem *underMouse = itemAt(event->pos());
-        if (underMouse && underMouse->isSelected()) emit focusMonitor();*/
+        ProjectItem *item = static_cast<ProjectItem *>(underMouse);
+        if (item) {
+            QRect itemRect = visualItemRect(item);
+            if (item->underJobMenu(itemRect, event->pos())) {
+                emit display
+            }
+            
+            && underMouse->isSelected()) emit focusMonitor()
+        }*/
     }
     QTreeWidget::mousePressEvent(event);
 }
@@ -348,7 +366,7 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event)
             drag->setMimeData(mimeData);
             drag->setPixmap(clickItem->data(0, Qt::DecorationRole).value<QPixmap>());
             drag->setHotSpot(QPoint(0, 50));
-            drag->exec();
+            drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
         }
     } else {
         if (it && (it->flags() & Qt::ItemIsDragEnabled)) {
@@ -376,7 +394,7 @@ void ProjectListView::mouseMoveEvent(QMouseEvent *event)
             drag->setMimeData(mimeData);
             drag->setPixmap(it->data(0, Qt::DecorationRole).value<QPixmap>());
             drag->setHotSpot(QPoint(0, 50));
-            drag->exec();
+            drag->exec(Qt::CopyAction | Qt::MoveAction, Qt::CopyAction);
         }
         //event->accept();
     }