Ported rack. Converted many Qt3 methods to Qt4.

4 files changed, 16 insertions, 20 deletions

diff --git a/muse2/muse/ctrl/ctrlcanvas.cpp b/muse2/muse/ctrl/ctrlcanvas.cpp
index 6a7e0720..bf943173 100644
--- a/muse2/muse/ctrl/ctrlcanvas.cpp
+++ b/muse2/muse/ctrl/ctrlcanvas.cpp
@@ -8,15 +8,9 @@
 #include <stdio.h>
 #include <values.h>
 
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qtoolbutton.h>
-#include <q3popupmenu.h>
-#include <qlabel.h>
-#include <qcursor.h>
-//Added by qt3to4:
+#include <QPainter>
+#include <QCursor>
 #include <QMouseEvent>
-#include <QEvent>
 
 #include "globals.h"
 #include "ctrledit.h"
@@ -611,7 +605,7 @@ void CtrlCanvas::viewMousePressEvent(QMouseEvent* event)
       {
       start = event->pos();
       Tool activeTool = tool;
-      bool shift = event->state() & Qt::ShiftButton;
+      bool shift = event->modifiers() & Qt::ShiftModifier;
 
       int xpos = start.x();
       int ypos = start.y();
@@ -905,7 +899,7 @@ void CtrlCanvas::viewMouseMoveEvent(QMouseEvent* event)
 
 void CtrlCanvas::viewMouseReleaseEvent(QMouseEvent* event)
       {
-      bool shift = event->state() & Qt::ShiftButton;
+      bool shift = event->modifiers() & Qt::ShiftModifier;
 
       switch (drag) {
             case DRAG_RESIZE:
@@ -920,7 +914,7 @@ void CtrlCanvas::viewMouseReleaseEvent(QMouseEvent* event)
             case DRAG_LASSO:
                   if (!shift)
                         deselectAll();
-                  lasso = lasso.normalize();
+                  lasso = lasso.normalized();
                   for (iCEvent i = items.begin(); i != items.end(); ++i) {
 #if 0
                         if ((*i)->intersects(lasso)) {
@@ -1231,7 +1225,7 @@ void CtrlCanvas::setTool(int t)
                   drawLineMode = false;
                   break;
             default:
-                  setCursor(QCursor(Qt::arrowCursor));
+                  setCursor(QCursor(Qt::ArrowCursor));
                   break;
             }
       }
@@ -1483,7 +1477,7 @@ QRect CtrlCanvas::overlayRect() const
       {
       QFontMetrics fm(config.fonts[3]);
       QRect r(fm.boundingRect(_controller ? _controller->name() : QString("")));
-      r.moveBy(2, 2);   // top/left margin
+      r.translate(2, 2);   // top/left margin
       return r;
       }
 
diff --git a/muse2/muse/ctrl/ctrlcanvas.h b/muse2/muse/ctrl/ctrlcanvas.h
index bb17fafb..e76bf71c 100644
--- a/muse2/muse/ctrl/ctrlcanvas.h
+++ b/muse2/muse/ctrl/ctrlcanvas.h
@@ -15,16 +15,16 @@
 #include "tools.h"
 #include "midictrl.h"
 #include "event.h"
-//Added by qt3to4:
-#include <QMouseEvent>
-#include <QEvent>
+
+class QMouseEvent;
+class QEvent;
+class QWidget;
 
 class Event;
 class MidiPart;
 class PartList;
 class MidiTrack;
 class MidiEditor;
-class QWidget;
 class CtrlPanel;
 
 //---------------------------------------------------------
diff --git a/muse2/muse/ctrl/ctrledit.cpp b/muse2/muse/ctrl/ctrledit.cpp
index fd9f108f..f55fe8ef 100644
--- a/muse2/muse/ctrl/ctrledit.cpp
+++ b/muse2/muse/ctrl/ctrledit.cpp
@@ -36,6 +36,7 @@ CtrlEdit::CtrlEdit(QWidget* parent, MidiEditor* e, int xmag,
    bool expand, const char* name) : QWidget(parent)
       {
       setObjectName(name);
+      setAttribute(Qt::WA_DeleteOnClose);
       QHBoxLayout* hbox = new QHBoxLayout;
       panel             = new CtrlPanel(0, e, "panel");
       canvas            = new CtrlCanvas(e, 0, xmag, "ctrlcanvas", panel);
@@ -117,7 +118,7 @@ void CtrlEdit::readStatus(Xml& xml)
 void CtrlEdit::destroy()
       {
       emit destroyedCtrl(this);
-      close(true);      // close and destroy widget
+      close();      // close and destroy widget
       }
 
 //---------------------------------------------------------
diff --git a/muse2/muse/ctrl/ctrlpanel.cpp b/muse2/muse/ctrl/ctrlpanel.cpp
index e04ecc1d..8e044510 100644
--- a/muse2/muse/ctrl/ctrlpanel.cpp
+++ b/muse2/muse/ctrl/ctrlpanel.cpp
@@ -42,8 +42,9 @@
 //---------------------------------------------------------
 
 CtrlPanel::CtrlPanel(QWidget* parent, MidiEditor* e, const char* name)
-   : QWidget(parent, name)
+   : QWidget(parent)
       {
+      setObjectName(name);
       inHeartBeat = true;
       editor = e;
       setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
@@ -604,7 +605,7 @@ void CtrlPanel::ctrlPopup()
             // add new controller
             //
             QMenu* pop1 = new QMenu(this);
-            pop1->setCheckable(false);
+            //pop1->setCheckable(false); // Qt4 doc says not needed.
             //
             // populate popup with all controllers available for
             // current instrument