merged with trunk

1 files changed, 3 insertions, 9 deletions

diff --git a/muse2/muse/midiedit/ecanvas.cpp b/muse2/muse/midiedit/ecanvas.cpp
index 3eeb4f84..984ec41c 100644
--- a/muse2/muse/midiedit/ecanvas.cpp
+++ b/muse2/muse/midiedit/ecanvas.cpp
@@ -21,6 +21,7 @@
 //
 //=========================================================
 
+#include <stdio.h>
 #include <errno.h>
 #include <values.h>
 #include <sys/stat.h>
@@ -77,9 +78,7 @@ QString EventCanvas::getCaption() const
       {
       int bar1, bar2, xx;
       unsigned x;
-      ///sigmap.tickValues(curPart->tick(), &bar1, &xx, &x);
       AL::sigmap.tickValues(curPart->tick(), &bar1, &xx, &x);
-      ///sigmap.tickValues(curPart->tick() + curPart->lenTick(), &bar2, &xx, &x);
       AL::sigmap.tickValues(curPart->tick() + curPart->lenTick(), &bar2, &xx, &x);
 
       return QString("MusE: Part <") + curPart->name()
@@ -151,7 +150,7 @@ void EventCanvas::songChanged(int flags)
         return;
     
       if (flags & ~SC_SELECTION) {
-            //items.clear();
+            //items.clear(); DELETETHIS
             bool curItemNeedsRestore=false;
             MusECore::Event storedEvent;
             int partSn;
@@ -182,10 +181,8 @@ void EventCanvas::songChanged(int flags)
                   MusECore::EventList* el = part->events();
                   for (MusECore::iEvent i = el->begin(); i != el->end(); ++i) {
                         MusECore::Event e = i->second;
-                        // Added by T356. Do not add events which are either past, or extend past the end of the part.
-                        // Reverted to just events which are past. p4.0.24 
+                        // Do not add events which are past the end of the part.
                         if(e.tick() > len)      
-                        //if(e.endTick() > len)
                           break;
                         
                         if (e.isNote()) {
@@ -288,13 +285,10 @@ MusECore::MidiTrack* EventCanvas::track() const
 void EventCanvas::keyPress(QKeyEvent* event)
       {
       int key = event->key();
-      ///if (event->state() & Qt::ShiftButton)
       if (((QInputEvent*)event)->modifiers() & Qt::ShiftModifier)
             key += Qt::SHIFT;
-      ///if (event->state() & Qt::AltButton)
       if (((QInputEvent*)event)->modifiers() & Qt::AltModifier)
             key += Qt::ALT;
-      ///if (event->state() & Qt::ControlButton)
       if (((QInputEvent*)event)->modifiers() & Qt::ControlModifier)
             key+= Qt::CTRL;