Ported rack. Converted many Qt3 methods to Qt4.

4 files changed, 20 insertions, 18 deletions

diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index 06f816ba..cb969428 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -64,7 +64,7 @@ LMaster::LMaster()
       sig_editor = 0;
       editedItem = 0;
       editingNewItem = false;
-      setCaption(tr("MusE: Mastertrack"));
+      setWindowTitle(tr("MusE: Mastertrack"));
       setMinimumHeight(100);
       setFixedWidth(400);
 
@@ -73,12 +73,12 @@ LMaster::LMaster()
       QSignalMapper *signalMapper = new QSignalMapper(this);
       menuBar()->addMenu(menuEdit);
       menuEdit->addActions(undoRedo->actions());
-      menuEdit->insertSeparator();
-      QAction *tempoAction = menuEdit->addAction(tr("Insert Tempo"));
-      QAction *signAction = menuEdit->addAction(tr("Insert Signature"));
-      QAction *posAction = menuEdit->addAction(tr("Edit Positon"));
-      QAction *valAction = menuEdit->addAction(tr("Edit Value"));
-      QAction *delAction = menuEdit->addAction(tr("Delete Event"));
+      menuEdit->addSeparator();
+      tempoAction = menuEdit->addAction(tr("Insert Tempo"));
+      signAction = menuEdit->addAction(tr("Insert Signature"));
+      posAction = menuEdit->addAction(tr("Edit Positon"));
+      valAction = menuEdit->addAction(tr("Edit Value"));
+      delAction = menuEdit->addAction(tr("Delete Event"));
       delAction->setShortcut(Qt::Key_Delete);
 
       connect(tempoAction, SIGNAL(triggered()), signalMapper, SLOT(map()));
@@ -139,7 +139,7 @@ LMaster::LMaster()
 //      QSizeGrip* corner = new QSizeGrip(mainw);
 
       mainGrid->setRowStretch(0, 100);
-      mainGrid->setColStretch(0, 100);
+      mainGrid->setColumnStretch(0, 100);
 
       mainGrid->addWidget(view,  0, 0);
 //      mainGrid->addWidget(corner,  1, 1, AlignBottom | AlignRight);
@@ -737,8 +737,8 @@ void LMaster::configChanged()
  */
 void LMaster::initShortcuts()
       {
-      menuEdit->setAccel(shortcuts[SHRT_LM_INS_TEMPO].key, CMD_INSERT_TEMPO);
-      menuEdit->setAccel(shortcuts[SHRT_LM_INS_SIG].key, CMD_INSERT_SIG);
-      menuEdit->setAccel(shortcuts[SHRT_LM_EDIT_BEAT].key, CMD_EDIT_BEAT);
-      menuEdit->setAccel(shortcuts[SHRT_LM_EDIT_VALUE].key, CMD_EDIT_VALUE);
+      tempoAction->setShortcut(shortcuts[SHRT_LM_INS_TEMPO].key);
+      signAction->setShortcut(shortcuts[SHRT_LM_INS_SIG].key);
+      posAction->setShortcut(shortcuts[SHRT_LM_EDIT_BEAT].key);
+      valAction->setShortcut(shortcuts[SHRT_LM_EDIT_VALUE].key);
       }
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index cdad4c77..cd687e45 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -115,6 +115,8 @@ class LMaster : public MidiEditor {
       int editorColumn;
       bool editingNewItem;
 
+      QAction *tempoAction, *signAction, *posAction, *valAction, *delAction;
+
    private slots:
       void select(QTreeWidgetItem*, QTreeWidgetItem*);
       void itemDoubleClicked(QTreeWidgetItem* item);
diff --git a/muse2/muse/master/master.cpp b/muse2/muse/master/master.cpp
index 3b593fee..aaf73398 100644
--- a/muse2/muse/master/master.cpp
+++ b/muse2/muse/master/master.cpp
@@ -129,7 +129,7 @@ void Master::leaveEvent(QEvent*)
 void Master::pdraw(QPainter& p, const QRect& rect)
       {
       View::pdraw(p, rect);   // calls draw()
-      p.resetXForm();
+      p.resetTransform();
 
       int x = rect.x();
       int y = rect.y();
@@ -312,7 +312,7 @@ void Master::setTool(int t)
                   setCursor(QCursor(*pencilIcon, 4, 15));
                   break;
             default:
-                  setCursor(QCursor(Qt::arrowCursor));
+                  setCursor(QCursor(Qt::ArrowCursor));
                   break;
             }
       }
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index d4fd3e0d..4ed76c22 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -65,7 +65,7 @@ void MasterEdit::songChanged(int type)
             }
       if (type & SC_MASTER) {
             enableButton->blockSignals(true);
-            enableButton->setOn(song->masterFlag());
+            enableButton->setChecked(song->masterFlag());
             enableButton->blockSignals(false);
             }
       }
@@ -77,7 +77,7 @@ void MasterEdit::songChanged(int type)
 MasterEdit::MasterEdit()
    : MidiEditor(0, _rasterInit, 0)
       {
-      setCaption(tr("MusE: Mastertrack"));
+      setWindowTitle(tr("MusE: Mastertrack"));
       _raster = 0;      // measure
       setMinimumSize(400, 300);
       resize(500, 350);
@@ -99,7 +99,7 @@ MasterEdit::MasterEdit()
       enableButton->setCheckable(true);
       enableButton->setText(tr("Enable"));
       enableButton->setToolTip(tr("Enable usage of master track"));
-      enableButton->setOn(song->masterFlag());
+      enableButton->setChecked(song->masterFlag());
       enableMaster->addWidget(enableButton);
       connect(enableButton, SIGNAL(toggled(bool)), song, SLOT(setMasterFlag(bool)));
 
@@ -171,7 +171,7 @@ MasterEdit::MasterEdit()
 //      QSizeGrip* corner   = new QSizeGrip(mainw);
 
       mainGrid->setRowStretch(5, 100);
-      mainGrid->setColStretch(1, 100);
+      mainGrid->setColumnStretch(1, 100);
 
       mainGrid->addWidget(hLine(mainw),  0, 1);
       mainGrid->addWidget(time1,         1, 1);