Bunch of minor ports and cleanups. See ChangeLog.

4 files changed, 12 insertions, 12 deletions

diff --git a/muse2/muse/midiedit/dcanvas.cpp b/muse2/muse/midiedit/dcanvas.cpp
index 17a4ac88..3c2895d6 100644
--- a/muse2/muse/midiedit/dcanvas.cpp
+++ b/muse2/muse/midiedit/dcanvas.cpp
@@ -9,10 +9,8 @@
 #include <QApplication>
 #include <QClipboard>
 #include <QDrag>
-
-//Added by qt3to4:
 #include <QDragLeaveEvent>
-#include <Q3PointArray>
+#include <QPolygon>
 #include <QDragEnterEvent>
 #include <QDragMoveEvent>
 #include <QDropEvent>
@@ -484,7 +482,7 @@ void DrumCanvas::drawItem(QPainter&p, const CItem*item, const QRect& rect)
       int x = 0, y = 0;
         x = mapx(item->pos().x());
         y = mapy(item->pos().y());
-      Q3PointArray pa(4);
+      QPolygon pa(4);
       pa.setPoint(0, x - CARET2, y);
       pa.setPoint(1, x,          y - CARET2);
       pa.setPoint(2, x + CARET2, y);
@@ -542,7 +540,7 @@ void DrumCanvas::drawMoving(QPainter& p, const CItem* item, const QRect& rect)
       //  return;
       //if(!item->isMoving()) 
       //  return;
-      Q3PointArray pa(4);
+      QPolygon pa(4);
       QPoint pt = map(item->mp());
       int x = pt.x();
       int y = pt.y();
diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h
index 2b93ddae..996608bd 100644
--- a/muse2/muse/midiedit/dcanvas.h
+++ b/muse2/muse/midiedit/dcanvas.h
@@ -10,14 +10,16 @@
 
 #include "ecanvas.h"
 #include "song.h"
-#include <QResizeEvent>
-#include <QDragEnterEvent>
-#include <QDropEvent>
-#include <QDragMoveEvent>
-#include <QDragLeaveEvent>
 
 #define TH 18
 
+
+class QResizeEvent;
+class QDragEnterEvent;
+class QDropEvent;
+class QDragMoveEvent;
+class QDragLeaveEvent;
+
 class MidiEditor;
 
 //---------------------------------------------------------
diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 44a6682e..62241b10 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -357,7 +357,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       //
       //  Reihenfolge in dlist.c festgeschrieben ("Dcols")
       //
-      header = new HeaderNew(split1w1, "header");
+      header = new Header(split1w1, "header");
       header->setFixedHeight(31);
       header->setColumnLabel(tr("M"), COL_MUTE, 20);
       header->setColumnLabel(tr("Sound"), COL_NAME, 120);
diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index 39f68deb..37473aaf 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -60,7 +60,7 @@ class DrumEdit : public MidiEditor {
       Splitter* split2;
       QWidget* split1w1;
       DList* dlist;
-      HeaderNew* header;
+      Header* header;
       QToolBar* tools;
 
       static int _quantInit, _rasterInit;