improved movePartsToTheRight and merged with globalInsert

4 files changed, 8 insertions, 37 deletions

diff --git a/muse2/muse/arranger/arrangerview.cpp b/muse2/muse/arranger/arrangerview.cpp
index fd8165cf..d776198e 100644
--- a/muse2/muse/arranger/arrangerview.cpp
+++ b/muse2/muse/arranger/arrangerview.cpp
@@ -37,6 +37,7 @@
 
 #include "arrangerview.h"
 #include "visibletracks.h"
+#include "structure.h"
 
 
 #include <iostream>
@@ -961,3 +962,9 @@ void ArrangerView::updateVisibleTracksButtons()
 {
   visTracks->updateVisibleTracksButtons();
 }
+
+void ArrangerView::globalCut() { globalCut(); }
+void ArrangerView::globalInsert() { globalInsert(); }
+void ArrangerView::globalSplit() { globalSplit(); }
+void ArrangerView::copyRange() { copyRange(); }
+void ArrangerView::cutEvents() { cutEvents(); }
diff --git a/muse2/muse/arranger/arrangerview.h b/muse2/muse/arranger/arrangerview.h
index 752c2728..52e3273d 100644
--- a/muse2/muse/arranger/arrangerview.h
+++ b/muse2/muse/arranger/arrangerview.h
@@ -58,8 +58,6 @@ class ArrangerView : public TopWin
 
 		virtual void closeEvent(QCloseEvent*);
 
-		void adjustGlobalLists(Undo& operations, int startPos, int diff);
-
 		QGridLayout* mainGrid;
 		QWidget* mainw;
 
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 572492d6..19e53f2e 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -27,6 +27,7 @@
 #include "widgets/tools.h"
 #include "arranger.h"
 #include "arrangerview.h"
+#include "structure.h"
 #include "pcanvas.h"
 #include "midieditor.h"
 #include "globals.h"
@@ -2879,40 +2880,6 @@ void PartCanvas::paste(bool clone, bool toTrack, bool doInsert)
     }
 
 //---------------------------------------------------------
-//   movePartsToTheRight
-//---------------------------------------------------------
-Undo PartCanvas::movePartsTotheRight(unsigned int startTicks, int length)
-{
-        Undo operations;
-        
-        // all parts that start after the pasted parts will be moved the entire length of the pasted parts
-        for (iCItem i = items.begin(); i != items.end(); ++i) {
-          if (!i->second->isSelected()) {
-              Part* part = i->second->part();
-              if (part->tick() >= startTicks) {
-                Part *newPart = part->clone();
-                newPart->setTick(newPart->tick()+length);
-                
-                operations.push_back(UndoOp(UndoOp::ModifyPart,part,newPart,false,false));
-              }
-          }
-        }
-        // perhaps ask if markers should be moved?
-        MarkerList *markerlist = song->marker();
-        for(iMarker i = markerlist->begin(); i != markerlist->end(); ++i)
-        {
-            Marker* m = &i->second;
-            if (m->tick() >= startTicks) {
-              Marker *oldMarker = new Marker();
-              *oldMarker = *m;
-              m->setTick(m->tick()+length);
-              operations.push_back(UndoOp(UndoOp::ModifyMarker,oldMarker, m));
-            }
-        }
-        
-        return operations;
-}
-//---------------------------------------------------------
 //   startDrag
 //---------------------------------------------------------
 
diff --git a/muse2/muse/arranger/pcanvas.h b/muse2/muse/arranger/pcanvas.h
index 71a0129c..eaa51190 100644
--- a/muse2/muse/arranger/pcanvas.h
+++ b/muse2/muse/arranger/pcanvas.h
@@ -109,7 +109,6 @@ class PartCanvas : public Canvas {
       void copy(PartList*);
       void paste(bool clone = false, bool toTrack = true, bool doInsert=false);
       Undo pasteAt(const QString&, Track*, unsigned int, bool clone = false, bool toTrack = true, int* finalPosPtr = NULL);
-      Undo movePartsTotheRight(unsigned int startTick, int length);
       //Part* readClone(Xml&, Track*, bool toTrack = true);
       void drawWavePart(QPainter&, const QRect&, WavePart*, const QRect&);
       //void drawMidiPart(QPainter&, const QRect& rect, EventList* events, MidiTrack*mt, const QRect& r, int pTick, int from, int to);