Removed superfluous wrappers. Made stuff neat.

8 files changed, 12 insertions, 63 deletions

diff --git a/muse2/muse/mplugins/midifilterimpl.cpp b/muse2/muse/mplugins/midifilterimpl.cpp
index d02296ba..2c678968 100644
--- a/muse2/muse/mplugins/midifilterimpl.cpp
+++ b/muse2/muse/mplugins/midifilterimpl.cpp
@@ -39,8 +39,9 @@ void MidiFilterConfig::setCtrl4(int n)
 //---------------------------------------------------------
 
 MidiFilterConfig::MidiFilterConfig(QDialog* parent)
-  : MidiFilterConfigBaseWidget(parent)
+  : QDialog(parent)
       {
+      setupUi(this);
       cb1->setCurrentItem(midiFilterCtrl1);
       cb2->setCurrentItem(midiFilterCtrl2);
       cb3->setCurrentItem(midiFilterCtrl3);
diff --git a/muse2/muse/mplugins/midifilterimpl.h b/muse2/muse/mplugins/midifilterimpl.h
index aec17ada..bbda7757 100644
--- a/muse2/muse/mplugins/midifilterimpl.h
+++ b/muse2/muse/mplugins/midifilterimpl.h
@@ -15,23 +15,10 @@
 class QCloseEvent;
 
 //---------------------------------------------------------
-//   MidiFilterConfigBaseWidget
-//   Wrapper around Ui::MidiFilterConfigBase
-//---------------------------------------------------------
-
-class MidiFilterConfigBaseWidget : public QDialog, public Ui::MidiFilterConfigBase
-{
-      Q_OBJECT
-
-   public:
-      MidiFilterConfigBaseWidget(QDialog *parent = 0) : QDialog(parent) { setupUi(this); }
-};
-
-//---------------------------------------------------------
 //   MidiFilterConfig
 //---------------------------------------------------------
 
-class MidiFilterConfig : public MidiFilterConfigBaseWidget {
+class MidiFilterConfig : public QDialog, public Ui::MidiFilterConfigBase {
       Q_OBJECT
 
       void rChanged(bool f, int val) {
diff --git a/muse2/muse/mplugins/midiitransform.cpp b/muse2/muse/mplugins/midiitransform.cpp
index e7d8763b..32fcbea0 100644
--- a/muse2/muse/mplugins/midiitransform.cpp
+++ b/muse2/muse/mplugins/midiitransform.cpp
@@ -592,8 +592,9 @@ bool MidiInputTransformation::typesMatch(MidiRecordEvent& e, int selType) const
 //---------------------------------------------------------
 
 MidiInputTransformDialog::MidiInputTransformDialog(QDialog* parent, Qt::WFlags fl)
-   : MidiInputTransformDialogBaseWidget(parent, fl)
+   : QDialog(parent, fl)
       {
+      setupUi(this);
       cindex = 0;
       cmodul = 0;
       cmt    = 0;
diff --git a/muse2/muse/mplugins/midiitransform.h b/muse2/muse/mplugins/midiitransform.h
index 3180bf23..b9288319 100644
--- a/muse2/muse/mplugins/midiitransform.h
+++ b/muse2/muse/mplugins/midiitransform.h
@@ -25,23 +25,10 @@ class Xml;
 enum InputTransformProcEventOp { KeepType, FixType };
 
 //---------------------------------------------------------
-//   MidiInputTransformDialogBaseWidget
-//   Wrapper around Ui::MidiInputTransformDialogBase
-//---------------------------------------------------------
-
-class MidiInputTransformDialogBaseWidget : public QDialog, public Ui::MidiInputTransformDialogBase
-{
-      Q_OBJECT
-
-   public:
-      MidiInputTransformDialogBaseWidget(QDialog *parent = 0, Qt::WFlags f = 0) : QDialog(parent, f) { setupUi(this); }
-};
-
-//---------------------------------------------------------
 //   MidiInputTransform
 //---------------------------------------------------------
 
-class MidiInputTransformDialog : public MidiInputTransformDialogBaseWidget {
+class MidiInputTransformDialog : public QDialog, public Ui::MidiInputTransformDialogBase {
       Q_OBJECT
       MidiInputTransformation* cmt;
       int cindex;                   // current index in preset list
diff --git a/muse2/muse/mplugins/mittranspose.cpp b/muse2/muse/mplugins/mittranspose.cpp
index 95b3b3de..d64022be 100644
--- a/muse2/muse/mplugins/mittranspose.cpp
+++ b/muse2/muse/mplugins/mittranspose.cpp
@@ -23,8 +23,9 @@ MITPluginTranspose* mitPluginTranspose;
 //---------------------------------------------------------
 
 MITPluginTranspose::MITPluginTranspose(QWidget* parent, Qt::WFlags fl)
-    : MITTransposeBaseWidget(parent, fl)
+    : QWidget(parent, fl)
       {
+      setupUi(this);
       on        = false;
       transpose = 0;
       trigger   = 24;
diff --git a/muse2/muse/mplugins/mittranspose.h b/muse2/muse/mplugins/mittranspose.h
index b794e274..fcbc96e3 100644
--- a/muse2/muse/mplugins/mittranspose.h
+++ b/muse2/muse/mplugins/mittranspose.h
@@ -34,23 +34,10 @@ typedef KeyOnList::iterator iKeyOn;
 class Xml;
 
 //---------------------------------------------------------
-//   MITTransposeBaseWidget
-//   Wrapper around Ui::MITTransposeBase
-//---------------------------------------------------------
-
-class MITTransposeBaseWidget : public QWidget, public Ui::MITTransposeBase
-{
-      Q_OBJECT
-
-   public:
-      MITTransposeBaseWidget(QWidget *parent = 0, Qt::WFlags f = 0) : QWidget(parent, f) { setupUi(this); }
-};
-
-//---------------------------------------------------------
 //   MITPluginTranspose
 //---------------------------------------------------------
 
-class MITPluginTranspose : public MITTransposeBaseWidget, public MITPlugin {
+class MITPluginTranspose : public QWidget, public Ui::MITTransposeBase, public MITPlugin {
       Q_OBJECT
 
       KeyOnList keyOnList;
diff --git a/muse2/muse/mplugins/mrconfig.cpp b/muse2/muse/mplugins/mrconfig.cpp
index 290aba67..f64384af 100644
--- a/muse2/muse/mplugins/mrconfig.cpp
+++ b/muse2/muse/mplugins/mrconfig.cpp
@@ -18,8 +18,9 @@
 //---------------------------------------------------------
 
 MRConfig::MRConfig(QWidget* parent, Qt::WFlags fl)
-   : MRConfigBaseWidget(parent, fl)
+   : QWidget(parent, fl)
       {
+      setupUi(this);
       b1->setChecked(rcEnable);
       sb1->setValue(rcStopNote);
       sb2->setValue(rcRecordNote);
diff --git a/muse2/muse/mplugins/mrconfig.h b/muse2/muse/mplugins/mrconfig.h
index c58ddc19..e829c15c 100644
--- a/muse2/muse/mplugins/mrconfig.h
+++ b/muse2/muse/mplugins/mrconfig.h
@@ -15,26 +15,10 @@ class QCloseEvent;
 class QWidget;
 
 //---------------------------------------------------------
-//   MRConfigBaseWidget
-//   Wrapper around Ui::MRConfigBase
-//---------------------------------------------------------
-
-class MRConfigBaseWidget : public QWidget, public Ui::MRConfigBase
-{
-      Q_OBJECT
-
-   public:
-      MRConfigBaseWidget(QWidget *parent = 0, Qt::WFlags f = 0) : QWidget(parent, f) { setupUi(this); }
-};
-
-
-
-
-//---------------------------------------------------------
 //   MRConfig
 //---------------------------------------------------------
 
-class MRConfig : public MRConfigBaseWidget {
+class MRConfig : public QWidget, public Ui::MRConfigBase {
       Q_OBJECT
 
       virtual void closeEvent(QCloseEvent*);