Qt4 port of .ui widgets

3 files changed, 21 insertions, 14 deletions

diff --git a/muse2/muse/mplugins/mitplugin.cpp b/muse2/muse/mplugins/mitplugin.cpp
index d8066e2c..1923f1d6 100644
--- a/muse2/muse/mplugins/mitplugin.cpp
+++ b/muse2/muse/mplugins/mitplugin.cpp
@@ -6,8 +6,6 @@
 //  (C) Copyright 2001 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <q3popupmenu.h>
-
 #include "mitplugin.h"
 #include "app.h"
 #include "event.h"
diff --git a/muse2/muse/mplugins/mittranspose.cpp b/muse2/muse/mplugins/mittranspose.cpp
index b9a260c9..95b3b3de 100644
--- a/muse2/muse/mplugins/mittranspose.cpp
+++ b/muse2/muse/mplugins/mittranspose.cpp
@@ -6,12 +6,8 @@
 //  (C) Copyright 2001 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <qcheckbox.h>
-#include <qspinbox.h>
-#include <qlabel.h>
-#include <qtimer.h>
-//Added by qt3to4:
 #include <QCloseEvent>
+#include <QWidget>
 
 #include "mittranspose.h"
 #include "song.h"
@@ -26,8 +22,8 @@ MITPluginTranspose* mitPluginTranspose;
 //   MITPluginTranspose
 //---------------------------------------------------------
 
-MITPluginTranspose::MITPluginTranspose(QWidget* parent, const char* name, Qt::WFlags fl)
-   : MITTransposeBase(parent, name, fl)
+MITPluginTranspose::MITPluginTranspose(QWidget* parent, Qt::WFlags fl)
+    : MITTransposeBaseWidget(parent, fl)
       {
       on        = false;
       transpose = 0;
diff --git a/muse2/muse/mplugins/mittranspose.h b/muse2/muse/mplugins/mittranspose.h
index b942eddf..b794e274 100644
--- a/muse2/muse/mplugins/mittranspose.h
+++ b/muse2/muse/mplugins/mittranspose.h
@@ -10,10 +10,10 @@
 #define __MITTRANSPOSE_H__
 
 #include "mitplugin.h"
-#include "mittransposebase.h"
+#include "ui_mittransposebase.h"
 #include <list>
-//Added by qt3to4:
-#include <QCloseEvent>
+
+class QCloseEvent;
 
 struct KeyOn {
       unsigned char pitch;
@@ -34,10 +34,23 @@ 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 MITTransposeBase, public MITPlugin {
+class MITPluginTranspose : public MITTransposeBaseWidget, public MITPlugin {
       Q_OBJECT
 
       KeyOnList keyOnList;
@@ -58,7 +71,7 @@ class MITPluginTranspose : public MITTransposeBase, public MITPlugin {
       void noteReceived();
 
    public:
-      MITPluginTranspose(QWidget* parent = 0, const char* name = 0, Qt::WFlags fl = 0);
+      MITPluginTranspose(QWidget* parent = 0, Qt::WFlags fl = 0);
       virtual void process(MEvent&);
       virtual void readStatus(Xml&);
       virtual void writeStatus(int, Xml&) const;