Replace roles into projectlistview. Turn const int into enum.

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index d8dab1960181259dd764d816c8466e0b7a146297..0cf3b482d1a03c5d0aa4b2519f90bf491738bdec 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -69,7 +69,7 @@
 #include "lib/audio/audioCorrelation.h"
 
 #include <KDebug>
-#include <KLocale>
+#include <KLocalizedString>
 #include <KUrl>
 #include <KIcon>
 #include <KCursor>
@@ -1224,8 +1224,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             info.startPos = transitionClip->startPos();
         } else {
             GenTime transitionDuration(65, m_document->fps());
-            if (m_dragItem->cropDuration() < transitionDuration) info.startPos = m_dragItem->startPos();
-            else info.startPos = info.endPos - transitionDuration;
+            if (m_dragItem->cropDuration() < transitionDuration)
+                info.startPos = m_dragItem->startPos();
+            else
+                info.startPos = info.endPos - transitionDuration;
         }
         if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps());
         QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement();
@@ -1835,13 +1837,14 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event)
     } else QGraphicsView::dragEnterEvent(event);
 }
 
-bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos)
+bool CustomTrackView::itemCollision(AbstractClipItem *item, const ItemInfo &newPos)
 {
     QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
     QList<QGraphicsItem*> collindingItems = scene()->items(shape, Qt::IntersectsItemShape);
     collindingItems.removeAll(item);
-    if (collindingItems.isEmpty()) return false;
-    else {
+    if (collindingItems.isEmpty()) {
+        return false;
+    } else {
         for (int i = 0; i < collindingItems.count(); ++i) {
             QGraphicsItem *collision = collindingItems.at(i);
             if (collision->type() == item->type()) {
@@ -1913,7 +1916,7 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
     } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage);
 }
 
-void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
+void CustomTrackView::deleteEffect(int track, const GenTime &pos, const QDomElement &effect)
 {
     QString index = effect.attribute("kdenlive_ix");
     if (pos < GenTime()) {
@@ -1999,7 +2002,7 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *
     }
 }
 
-void CustomTrackView::slotAddEffect(ClipItem *clip, QDomElement effect)
+void CustomTrackView::slotAddEffect(ClipItem *clip, const QDomElement &effect)
 {
     if (clip) slotAddEffect(effect, clip->startPos(), clip->track());
 }
@@ -2315,7 +2318,7 @@ void CustomTrackView::updateEffectState(int track, GenTime pos, QList <int> effe
     else emit displayMessage(i18n("Cannot find clip to update effect"), ErrorMessage);
 }
 
-void CustomTrackView::moveEffect(int track, GenTime pos, QList <int> oldPos, QList <int> newPos)
+void CustomTrackView::moveEffect(int track, const GenTime &pos, const QList <int> &oldPos, const QList <int> &newPos)
 {
     if (pos < GenTime()) {
         // Moving track effect
@@ -2713,7 +2716,7 @@ void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old)
     setDocumentModified();
 }
 
-void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget)
+void CustomTrackView::updateTransition(int track, const GenTime &pos, const QDomElement &oldTransition, const QDomElement &transition, bool updateTransitionWidget)
 {
     Transition *item = getTransitionItemAt(pos, track);
     if (!item) {
@@ -4377,7 +4380,7 @@ void CustomTrackView::deleteSelectedClips()
 }
 
 
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id)
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, const ItemInfo &speedIndependantInfo, const double speed, const double oldspeed, int strobe, const QString &id)
 {
     Q_UNUSED(id)
     //DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
@@ -5249,7 +5252,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI
     }
 }
 
-void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool standalone)
+void CustomTrackView::updatePositionEffects(ClipItem* item, const ItemInfo &info, bool standalone)
 {
     int end = item->fadeIn();
     if (end != 0) {