merged with trunk, removed more memory leaks

5 files changed, 17 insertions, 7 deletions

diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp
index 0de8d278..5b5f3a6f 100644
--- a/muse2/muse/arranger/pcanvas.cpp
+++ b/muse2/muse/arranger/pcanvas.cpp
@@ -112,6 +112,11 @@ PartCanvas::PartCanvas(int* r, QWidget* parent, int sx, int sy)
       partsChanged();
       }
 
+PartCanvas::~PartCanvas()
+{
+  //items.clearDelete();
+}
+
 //---------------------------------------------------------
 //   y2pitch
 //---------------------------------------------------------
@@ -427,7 +432,8 @@ QPoint PartCanvas::raster(const QPoint& p) const
 
 void PartCanvas::partsChanged()
       {
-      items.clear();
+      //items.clear();
+      items.clearDelete();
       for (iTrack t = tracks->begin(); t != tracks->end(); ++t) {
             PartList* pl = (*t)->parts();
             for (iPart i = pl->begin(); i != pl->end(); ++i) {
diff --git a/muse2/muse/arranger/pcanvas.h b/muse2/muse/arranger/pcanvas.h
index 3e320e56..e0c601fe 100644
--- a/muse2/muse/arranger/pcanvas.h
+++ b/muse2/muse/arranger/pcanvas.h
@@ -171,6 +171,7 @@ class PartCanvas : public MusEWidget::Canvas {
              CMD_PASTE_DIALOG, CMD_PASTE_CLONE_DIALOG, CMD_INSERT_EMPTYMEAS };
 
       PartCanvas(int* raster, QWidget* parent, int, int);
+      virtual ~PartCanvas();
       void partsChanged();
       void cmd(int);
    public slots:
diff --git a/muse2/muse/arranger/tlist.cpp b/muse2/muse/arranger/tlist.cpp
index c28a40b2..68f6dceb 100644
--- a/muse2/muse/arranger/tlist.cpp
+++ b/muse2/muse/arranger/tlist.cpp
@@ -265,8 +265,11 @@ void TList::paint(const QRect& r)
                   switch (section) {
                         case COL_RECORD:
                               if (track->canRecord() && !header->isSectionHidden(COL_RECORD)) {
+                                    //bool aa = p.testRenderHint(QPainter::SmoothPixmapTransform); // Antialiasing);  // The rec icon currently looks very jagged. AA should help.
+                                    //p.setRenderHint(QPainter::SmoothPixmapTransform); //Antialiasing);  
                                     drawCenteredPixmap(p,
                                        track->recordFlag() ? record_on_Icon : record_off_Icon, r);
+                                    //p.setRenderHint(QPainter::SmoothPixmapTransform, aa); //Antialiasing, aa);  
                                     }
                               break;
                         case COL_CLASS:
@@ -1689,10 +1692,10 @@ void TList::setYPos(int y)
 //   resizeEvent
 //---------------------------------------------------------
 
-void TList::resizeEvent(QResizeEvent* /*ev*/)
-      {
-      
-      }
+//void TList::resizeEvent(QResizeEvent* /*ev*/)
+//      {
+//      
+//      }
 
 //---------------------------------------------------------
 //   classesPopupMenu
diff --git a/muse2/muse/arranger/tlist.h b/muse2/muse/arranger/tlist.h
index 01b13eb3..db19ef6b 100644
--- a/muse2/muse/arranger/tlist.h
+++ b/muse2/muse/arranger/tlist.h
@@ -103,7 +103,7 @@ class TList : public QWidget {
       void moveSelection(int n);
       void adjustScrollbar();
       void paint(const QRect& r);
-      virtual void resizeEvent(QResizeEvent*);
+      //virtual void resizeEvent(QResizeEvent*);
       void redraw(const QRect& r);
       Track* y2Track(int) const;
       void classesPopupMenu(Track*, int x, int y);
diff --git a/muse2/muse/arranger/trackautomationview.h b/muse2/muse/arranger/trackautomationview.h
index f169e968..8c7aed84 100644
--- a/muse2/muse/arranger/trackautomationview.h
+++ b/muse2/muse/arranger/trackautomationview.h
@@ -33,7 +33,7 @@ namespace MusEArranger {
 class TrackAutomationView : public QWidget
 {
     Track *_t;
-    void paintEvent(QPaintEvent *e);
+    virtual void paintEvent(QPaintEvent *e);
     std::map<int,int> automationList;
 public:
     TrackAutomationView(QWidget *parent, Track *t);