Fix typos (patch from yurchor)

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 8f3054a25b3689cd8fc575b7ab444d81dc8bc6c1..ab42612b0d538effb23e0d53d73bfdadd732f319 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -471,7 +471,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             // razor tool over a clip, display current frame in monitor
             if (false && !m_blockRefresh && item->type() == AVWIDGET) {
                 //TODO: solve crash when showing frame when moving razor over clip
-                emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
+                emit showClipFrame(((ClipItem *) item)->baseClip(), QPoint(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
             }
             event->accept();
             return;
@@ -1309,7 +1309,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
             kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
             return false;
         }
-        const QPointF framePos = mapToScene(pos);
+        QPointF framePos = mapToScene(pos);
         ItemInfo info;
         info.startPos = GenTime();
         info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
@@ -1322,6 +1322,8 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
         pasteInfo.startPos = GenTime((int)(framePos.x() + 0.5), m_document->fps());
         pasteInfo.endPos = pasteInfo.startPos + info.endPos;
         pasteInfo.track = (int)(framePos.y() / m_tracksHeight);
+        framePos.setX((int)(framePos.x() + 0.5));
+        framePos.setY(pasteInfo.track * m_tracksHeight);
         if (!canBePastedTo(pasteInfo, AVWIDGET)) {
             return true;
         }
@@ -1345,9 +1347,11 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
 
         QList <GenTime> offsetList;
         QList <ItemInfo> infoList;
-        const QPointF framePos = mapToScene(pos);
+        QPointF framePos = mapToScene(pos);
         GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps());
         int track = (int)(framePos.y() / m_tracksHeight);
+        framePos.setX((int)(framePos.x() + 0.5));
+        framePos.setY(track * m_tracksHeight);
 
         // Check if clips can be inserted at that position
         for (int i = 0; i < ids.size(); ++i) {
@@ -2485,7 +2489,7 @@ void CustomTrackView::slotRemoveSpace()
     int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true);
     //kDebug() << "// GOT LENGT; " << length;
     if (length <= 0) {
-        emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
+        emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
         return;
     }