[vlmc-devel] Timeline: Rename oldx to oldX

[Yikai Lu]

vlmc | branch: master | Yikai Lu <luyikei.qmltu at gmail.com> | Thu Jul 21 17:26:12 2016 +0900| [06cc789ccc7fcca480bdd54ef7bbaec0514121be] | committer: Yikai Lu

Timeline: Rename oldx to oldX

> https://code.videolan.org/videolan/vlmc/commit/06cc789ccc7fcca480bdd54ef7bbaec0514121be
---

 src/Gui/timeline/Track.qml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Gui/timeline/Track.qml b/src/Gui/timeline/Track.qml
index 75b4345..da03d94 100644
--- a/src/Gui/timeline/Track.qml
+++ b/src/Gui/timeline/Track.qml
@@ -175,8 +175,8 @@ Item {
 
                     for ( i = 0; i < selectedClips.length; ++i ) {
                         var target = selectedClips[i];
-                        var oldx = target.pixelPosition();
-                        var newX = Math.max( oldx + deltaX, 0 );
+                        var oldX = target.pixelPosition();
+                        var newX = Math.max( oldX + deltaX, 0 );
 
                         if ( drag.source === target ) {
                             var oldTrackId = target.newTrackId;
@@ -235,7 +235,7 @@ Item {
                                             if ( cx - sw > 0 )
                                                 newX = cx - sw + 25;
                                             else
-                                                newX = oldx;
+                                                newX = oldX;
                                         } else {
                                             newX = cx + cw - 25;
                                         }
@@ -248,7 +248,7 @@ Item {
                                             if ( cx - sw > 0 )
                                                 newX = cx - sw;
                                             else
-                                                newX = oldx;
+                                                newX = oldX;
                                         } else {
                                             newX = cx + cw;
                                         }
@@ -271,7 +271,7 @@ Item {
                         // Recalculate deltaX in case of drag.source being moved
                         if ( drag.source === target ) {
                             if ( oldTrackId === target.newTrackId )
-                                deltaX = Math.round( newX - oldx );
+                                deltaX = Math.round( newX - oldX );
                             else
                                 // Don't move other clips if drag.source's track is changed
                                 deltaX = 0;