ported many Qt3 methods to Qt4

3 files changed, 51 insertions, 43 deletions

diff --git a/muse2/muse/mplugins/midifilterimpl.cpp b/muse2/muse/mplugins/midifilterimpl.cpp
index 2c678968..196ce97c 100644
--- a/muse2/muse/mplugins/midifilterimpl.cpp
+++ b/muse2/muse/mplugins/midifilterimpl.cpp
@@ -42,10 +42,10 @@ MidiFilterConfig::MidiFilterConfig(QDialog* parent)
   : QDialog(parent)
       {
       setupUi(this);
-      cb1->setCurrentItem(midiFilterCtrl1);
-      cb2->setCurrentItem(midiFilterCtrl2);
-      cb3->setCurrentItem(midiFilterCtrl3);
-      cb4->setCurrentItem(midiFilterCtrl4);
+      cb1->setCurrentIndex(midiFilterCtrl1);
+      cb2->setCurrentIndex(midiFilterCtrl2);
+      cb3->setCurrentIndex(midiFilterCtrl3);
+      cb4->setCurrentIndex(midiFilterCtrl4);
 
       rf1->setChecked(midiRecordType & 1);
       rf2->setChecked(midiRecordType & 2);
@@ -77,22 +77,22 @@ MidiFilterConfig::MidiFilterConfig(QDialog* parent)
       connect(tf6, SIGNAL(toggled(bool)), SLOT(thruChanged6(bool)));
       connect(tf7, SIGNAL(toggled(bool)), SLOT(thruChanged7(bool)));
 
-      cf1->setOn(midiInputChannel  & 1);
-      cf2->setOn(midiInputChannel  & 2);
-      cf3->setOn(midiInputChannel  & 4);
-      cf4->setOn(midiInputChannel  & 8);
-      cf5->setOn(midiInputChannel  & 0x10);
-      cf6->setOn(midiInputChannel  & 0x20);
-      cf7->setOn(midiInputChannel  & 0x40);
-      cf8->setOn(midiInputChannel  & 0x80);
-      cf9->setOn(midiInputChannel  & 0x100);
-      cf10->setOn(midiInputChannel & 0x200);
-      cf11->setOn(midiInputChannel & 0x400);
-      cf12->setOn(midiInputChannel & 0x800);
-      cf13->setOn(midiInputChannel & 0x1000);
-      cf14->setOn(midiInputChannel & 0x2000);
-      cf15->setOn(midiInputChannel & 0x4000);
-      cf16->setOn(midiInputChannel & 0x8000);
+      cf1->setChecked(midiInputChannel  & 1);
+      cf2->setChecked(midiInputChannel  & 2);
+      cf3->setChecked(midiInputChannel  & 4);
+      cf4->setChecked(midiInputChannel  & 8);
+      cf5->setChecked(midiInputChannel  & 0x10);
+      cf6->setChecked(midiInputChannel  & 0x20);
+      cf7->setChecked(midiInputChannel  & 0x40);
+      cf8->setChecked(midiInputChannel  & 0x80);
+      cf9->setChecked(midiInputChannel  & 0x100);
+      cf10->setChecked(midiInputChannel & 0x200);
+      cf11->setChecked(midiInputChannel & 0x400);
+      cf12->setChecked(midiInputChannel & 0x800);
+      cf13->setChecked(midiInputChannel & 0x1000);
+      cf14->setChecked(midiInputChannel & 0x2000);
+      cf15->setChecked(midiInputChannel & 0x4000);
+      cf16->setChecked(midiInputChannel & 0x8000);
 
       connect(cb1, SIGNAL(activated(int)), SLOT(setCtrl1(int)));
       connect(cb2, SIGNAL(activated(int)), SLOT(setCtrl2(int)));
diff --git a/muse2/muse/mplugins/midiitransform.cpp b/muse2/muse/mplugins/midiitransform.cpp
index 386620b1..6ab584d3 100644
--- a/muse2/muse/mplugins/midiitransform.cpp
+++ b/muse2/muse/mplugins/midiitransform.cpp
@@ -611,7 +611,7 @@ MidiInputTransformDialog::MidiInputTransformDialog(QDialog* parent, Qt::WFlags f
       modulGroup->addButton(modul4select,3);
 
       for (unsigned i = 0; i < sizeof(oplist)/sizeof(*oplist); ++i)
-            funcOp->insertItem(oplist[i].text, i);
+            funcOp->insertItem(i, oplist[i].text);
 
       connect(buttonNew,    SIGNAL(clicked()),      SLOT(presetNew()));
       connect(buttonDelete, SIGNAL(clicked()),      SLOT(presetDelete()));
@@ -692,7 +692,7 @@ void MidiInputTransformDialog::updatePresetList()
       cmt = 0;
       presetList->clear();
       
-      modul1select->setOn(true);
+      modul1select->setChecked(true);
       for (iMidiInputTransformation i = mtlist.begin(); i != mtlist.end(); ++i) {
             presetList->addItem((*i)->name);
             if (cmt == 0)
@@ -967,7 +967,7 @@ void MidiInputTransformDialog::accept()
 
 void MidiInputTransformDialog::reject()
       {
-      close(false);
+      close();
       }
 
 //---------------------------------------------------------
@@ -1246,7 +1246,7 @@ void MidiInputTransformDialog::nameChanged(const QString& s)
 
 void MidiInputTransformDialog::commentChanged()
       {
-      cmt->comment = commentEntry->text();
+      cmt->comment = commentEntry->toPlainText();
       }
 
 //---------------------------------------------------------
@@ -1631,33 +1631,33 @@ void MidiInputTransformDialog::presetChanged(QListWidgetItem* item)
       nameEntry->setText(cmt->name);
       commentEntry->setText(cmt->comment);
 
-      selEventOp->setCurrentItem(cmt->selEventOp);
+      selEventOp->setCurrentIndex(cmt->selEventOp);
       selEventOpSel(cmt->selEventOp);
 
       for (unsigned i = 0; i < sizeof(selTypeTable)/sizeof(*selTypeTable); ++i) {
             if (selTypeTable[i] == cmt->selType) {
-                  selType->setCurrentItem(i);
+                  selType->setCurrentIndex(i);
                   break;
                   }
             }
 
-      selVal1Op->setCurrentItem(cmt->selVal1);
+      selVal1Op->setCurrentIndex(cmt->selVal1);
       selVal1OpSel(cmt->selVal1);
 
-      selVal2Op->setCurrentItem(cmt->selVal2);
+      selVal2Op->setCurrentIndex(cmt->selVal2);
       selVal2OpSel(cmt->selVal2);
 
-      selPortOp->setCurrentItem(cmt->selPort);
+      selPortOp->setCurrentIndex(cmt->selPort);
       selPortOpSel(cmt->selPort);
 
-      selChannelOp->setCurrentItem(cmt->selChannel);
+      selChannelOp->setCurrentIndex(cmt->selChannel);
       selChannelOpSel(cmt->selChannel);
 
       {
       unsigned i;
       for (i = 0; i < sizeof(oplist)/sizeof(*oplist); ++i) {
             if (oplist[i].id == cmt->funcOp) {
-                  funcOp->setCurrentItem(i);
+                  funcOp->setCurrentIndex(i);
                   break;
                   }
             }
@@ -1668,20 +1668,20 @@ void MidiInputTransformDialog::presetChanged(QListWidgetItem* item)
 
       for (unsigned i = 0; i < sizeof(procTypeTable)/sizeof(*procTypeTable); ++i) {
             if (procTypeTable[i] == cmt->eventType) {
-                  procType->setCurrentItem(i);
+                  procType->setCurrentIndex(i);
                   break;
                   }
             }
 
-      procEventOp->setCurrentItem(cmt->procEvent);
+      procEventOp->setCurrentIndex(cmt->procEvent);
       procEventOpSel(cmt->procEvent);
 
-      procVal1Op->setCurrentItem(cmt->procVal1);
+      procVal1Op->setCurrentIndex(cmt->procVal1);
       procVal1OpSel(cmt->procVal1);
 
       for (unsigned i = 0; i < sizeof(procVal2Map)/sizeof(*procVal2Map); ++i) {
             if (procVal2Map[i] == cmt->procVal2) {
-                  procVal2Op->setCurrentItem(i);
+                  procVal2Op->setCurrentIndex(i);
                   break;
                   }
             }
@@ -1712,10 +1712,10 @@ void MidiInputTransformDialog::presetChanged(QListWidgetItem* item)
       procChannelVala->setValue(cmt->procChannela);
       procChannelValb->setValue(cmt->procChannelb);
       
-      procPortOp->setCurrentItem(cmt->procPort);
+      procPortOp->setCurrentIndex(cmt->procPort);
       procPortOpSel(cmt->procPort);
       
-      procChannelOp->setCurrentItem(cmt->procChannel);
+      procChannelOp->setCurrentIndex(cmt->procChannel);
       procChannelOpSel(cmt->procChannel);
       
       }
diff --git a/muse2/muse/mplugins/mitplugin.cpp b/muse2/muse/mplugins/mitplugin.cpp
index d5ea7c7f..e1a4e656 100644
--- a/muse2/muse/mplugins/mitplugin.cpp
+++ b/muse2/muse/mplugins/mitplugin.cpp
@@ -30,6 +30,7 @@ void MusE::startMidiInputPlugin(int id)
       {
       bool flag = false;
       QWidget* w = 0;
+      QAction* act;
       if (id == 0) {
             if (!mitPluginTranspose) {
                   mitPluginTranspose = new MITPluginTranspose();
@@ -38,6 +39,7 @@ void MusE::startMidiInputPlugin(int id)
                      SLOT(hideMitPluginTranspose()));
                   }
             w = mitPluginTranspose;
+            act = midiTrpAction;
             }
       else if (id == 1) {
             if (!midiInputTransform) {
@@ -46,6 +48,7 @@ void MusE::startMidiInputPlugin(int id)
                      SLOT(hideMidiInputTransform()));
                   }
             w = midiInputTransform;
+            act = midiInputTrfAction;
             }
       else if (id == 2) {
             if (!midiFilterConfig) {
@@ -54,6 +57,7 @@ void MusE::startMidiInputPlugin(int id)
                      SLOT(hideMidiFilterConfig()));
                   }
             w = midiFilterConfig;
+            act = midiInputFilterAction;
             }
       else if (id == 3) {
             if (!midiRemoteConfig) {
@@ -62,6 +66,7 @@ void MusE::startMidiInputPlugin(int id)
                      SLOT(hideMidiRemoteConfig()));
                   }
             w = midiRemoteConfig;
+            act = midiRemoteAction;
             }
 #ifdef BUILD_EXPERIMENTAL
       else if (id == 4) {
@@ -71,6 +76,7 @@ void MusE::startMidiInputPlugin(int id)
                      SLOT(hideMidiRhythmGenerator()));
                   }
             w = midiRhythmGenerator;
+            act = midiRhythmAction;
             }
 #endif
       if (w) {
@@ -80,29 +86,31 @@ void MusE::startMidiInputPlugin(int id)
             else
                   w->hide();
             }
-      midiInputPlugins->setItemChecked(id, flag);
+      act->setChecked(flag);
       }
 
 void MusE::hideMitPluginTranspose()
       {
-      midiInputPlugins->setItemChecked(0, false);
+      midiTrpAction->setChecked(false);
       }
 void MusE::hideMidiInputTransform()
       {
-      midiInputPlugins->setItemChecked(1, false);
+      midiInputTrfAction->setChecked(false);
       }
 void MusE::hideMidiFilterConfig()
       {
-      midiInputPlugins->setItemChecked(2, false);
+      midiInputFilterAction->setChecked(false);
       }
 void MusE::hideMidiRemoteConfig()
       {
-      midiInputPlugins->setItemChecked(3, false);
+      midiRemoteAction->setChecked(false);
       }
+#ifdef BUILD_EXPERIMENTAL
 void MusE::hideMidiRhythmGenerator()
       {
-      midiInputPlugins->setItemChecked(4, false);
+      midiRhythmAction->setChecked(false);
       }
+#endif
 
 //---------------------------------------------------------
 //   processMidiInputTransformPlugins