Merge branch 'master' into transition-offsets

app/widget/timelinewidget/tool/pointer.cpp

@@ -504,10 +504,10 @@ void PointerTool::ProcessDrag(const TimelineCoordinate &mouse_pos)
   rational tooltip_timebase = parent()->GetTimebaseForTrackType(drag_start_.GetTrack().type());
   QToolTip::hideText();
   QToolTip::showText(QCursor::pos(),
-                     Timecode::timestamp_to_timecode(Timecode::time_to_timestamp(time_movement, tooltip_timebase),
-                                                     tooltip_timebase,
-                                                     Core::instance()->GetTimecodeDisplay(),
-                                                     true),
+                     Timecode::time_to_timecode(time_movement,
+                                                tooltip_timebase,
+                                                Core::instance()->GetTimecodeDisplay(),
+                                                true),
                      parent());
 }
 
@@ -670,10 +670,10 @@ void PointerTool::FinishDrag(TimelineViewMouseEvent *event)
       QHash<Track::Reference, QList<Block*> >::const_iterator i;
       for (i=slide_info.constBegin(); i!=slide_info.constEnd(); i++) {
         command->add_child(new TrackSlideCommand(parent()->GetTrackFromReference(i.key()),
-                              i.value(),
-                              in_adjacents.value(i.key()),
-                              out_adjacents.value(i.key()),
-                              movement));
+                                                 i.value(),
+                                                 in_adjacents.value(i.key()),
+                                                 out_adjacents.value(i.key()),
+                                                 movement));
       }
 
       // Adjust selections