X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=1c464842a2a4952ba1ce08016a45260394035f3d;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=e1034e85843ffed7ce24f3cbc4654e013338e200;hpb=eb9ff9e83c9731da1706ad862095629675427022;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index e1034e85..1c464842 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1835,13 +1835,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 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 +1914,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 +2000,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()); } @@ -2020,7 +2021,7 @@ void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime } } -void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) +void CustomTrackView::slotAddEffect(QDomElement effect, const GenTime &pos, int track) { QList itemList; QUndoCommand *effectCommand = new QUndoCommand(); @@ -2432,7 +2433,7 @@ void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString regio m_commandStack->push(command); } -ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack, bool execute) +ClipItem *CustomTrackView::cutClip(const ItemInfo &info, const GenTime &cutTime, bool cut, const EffectsList &oldStack, bool execute) { if (cut) { // cut clip @@ -2666,7 +2667,7 @@ void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionI setDocumentModified(); } -void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh) +void CustomTrackView::addTransition(const ItemInfo &transitionInfo, int endTrack, const QDomElement ¶ms, bool refresh) { Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true); //kDebug() << "---- ADDING transition " << params.attribute("value"); @@ -2679,7 +2680,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE } } -void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/, bool refresh) +void CustomTrackView::deleteTransition(const ItemInfo &transitionInfo, int endTrack, QDomElement /*params*/, bool refresh) { Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track); if (!item) { @@ -3049,7 +3050,7 @@ int CustomTrackView::duration() const return m_projectDuration; } -void CustomTrackView::addTrack(TrackInfo type, int ix) +void CustomTrackView::addTrack(const TrackInfo &type, int ix) { QList transitionInfos; if (ix == -1 || ix == m_document->tracksCount()) { @@ -4830,7 +4831,7 @@ bool CustomTrackView::moveClip(const ItemInfo &start, const ItemInfo &end, bool return success; } -void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime &offset, const int trackOffset, bool reverseMove) +void CustomTrackView::moveGroup(QList startClip, QList startTransition, const GenTime &offset, const int trackOffset, bool reverseMove) { // Group Items resetSelectionGroup(); @@ -5249,7 +5250,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) {