Converted Qt3 methods to Qt4. Ported song.cpp

3 files changed, 6 insertions, 6 deletions

diff --git a/muse2/muse/midiedit/dlist.cpp b/muse2/muse/midiedit/dlist.cpp
index 1b695459..ee8c8e50 100644
--- a/muse2/muse/midiedit/dlist.cpp
+++ b/muse2/muse/midiedit/dlist.cpp
@@ -326,7 +326,7 @@ void DList::viewMousePressEvent(QMouseEvent* ev)
                         val = 127;
                   
                   ///if (ev->state() & Qt::ControlButton) {
-                  if (ev->state() & Qt::ControlModifier) {
+                  if (ev->modifiers() & Qt::ControlModifier) {
                         audio->msgIdle(true);
                         // Delete all port controller events.
                         //audio->msgChangeAllPortDrumCtrlEvents(false);
@@ -690,7 +690,7 @@ void DList::viewMouseMoveEvent(QMouseEvent* ev)
                   if (delta <= 2)
                         return;
                   drag = DRAG;
-                  setCursor(QCursor(Qt::sizeVerCursor));
+                  setCursor(QCursor(Qt::SizeVerCursor));
                   redraw();
                   break;
             case NORMAL:
@@ -710,7 +710,7 @@ void DList::viewMouseReleaseEvent(QMouseEvent* ev)
       if (drag == DRAG) {
             int y = ev->y();
             unsigned dPitch = y / TH;
-            setCursor(QCursor(Qt::arrowCursor));
+            setCursor(QCursor(Qt::ArrowCursor));
             currentlySelected = &drumMap[int(dPitch)];
             emit curDrumInstrumentChanged(dPitch);
             emit mapChanged(sPitch, dPitch); //Track pitch change done in canvas
diff --git a/muse2/muse/midiedit/piano.cpp b/muse2/muse/midiedit/piano.cpp
index ed7ac9f5..625ad564 100644
--- a/muse2/muse/midiedit/piano.cpp
+++ b/muse2/muse/midiedit/piano.cpp
@@ -526,7 +526,7 @@ void Piano::viewMouseMoveEvent(QMouseEvent* event)
 void Piano::viewMousePressEvent(QMouseEvent* event)
       {
       button = event->button();
-      shift  = event->state() & Qt::ShiftButton;
+      shift  = event->modifiers() & Qt::ShiftModifier;
       if (keyDown != -1) {
             emit keyReleased(keyDown, shift);
             keyDown = -1;
@@ -548,7 +548,7 @@ void Piano::viewMousePressEvent(QMouseEvent* event)
 void Piano::viewMouseReleaseEvent(QMouseEvent* event)
       {
       button = Qt::NoButton;
-      shift = event->state() & Qt::ShiftButton;
+      shift = event->modifiers() & Qt::ShiftModifier;
       if (keyDown != -1) {
             emit keyReleased(keyDown, shift);
             keyDown = -1;
diff --git a/muse2/muse/midiedit/quantconfig.cpp b/muse2/muse/midiedit/quantconfig.cpp
index b82f66d6..59f2eaba 100644
--- a/muse2/muse/midiedit/quantconfig.cpp
+++ b/muse2/muse/midiedit/quantconfig.cpp
@@ -27,7 +27,7 @@ const char* wtQLenTxt   = QT_TR_NOOP("quantize also note len as default");
 QuantConfig::QuantConfig(int s, int l, bool lenFlag)
    : QDialog()
       {
-      setCaption(tr("MusE: Config Quantize"));
+      setWindowTitle(tr("MusE: Config Quantize"));
       QVBoxLayout *mainlayout = new QVBoxLayout;
 
       QGridLayout* layout = new QGridLayout;