Ported .ui widgets to Qt4

3 files changed, 16 insertions, 5 deletions

diff --git a/muse2/muse/arranger/arranger.cpp b/muse2/muse/arranger/arranger.cpp
index df1d5ded..c0f7c1cd 100644
--- a/muse2/muse/arranger/arranger.cpp
+++ b/muse2/muse/arranger/arranger.cpp
@@ -54,7 +54,6 @@
 #include "globals.h"
 #include "tlist.h"
 #include "icons.h"
-#include "mtrackinfobase.h"
 #include "header.h"
 #include "utils.h"
 #include "alayout.h"
diff --git a/muse2/muse/arranger/arranger.h b/muse2/muse/arranger/arranger.h
index 34aa5c68..c223b0d6 100644
--- a/muse2/muse/arranger/arranger.h
+++ b/muse2/muse/arranger/arranger.h
@@ -19,7 +19,7 @@
 
 #include "midieditor.h"
 #include "pcanvas.h"
-#include "mtrackinfobase.h"
+#include "ui_mtrackinfobase.h"
 #include "trackautomationview.h"
 
 class QMainWindow;
@@ -77,14 +77,27 @@ class WidgetStack : public QWidget {
       QSize minimumSizeHint() const;
       };
 
+
+//---------------------------------------------------------
+//   MidiTrackInfoBaseWidget
+//   Wrapper around Ui::MidiTrackInfoBase
+//---------------------------------------------------------
+class MidiTrackInfoBaseWidget : public QWidget, public Ui::MidiTrackInfoBase
+{
+     Q_OBJECT
+
+  public:
+     MidiTrackInfoBaseWidget(QWidget *parent = 0) : QWidget(parent) { setupUi(this); }
+};
+
 //---------------------------------------------------------
 //   MidiTrackInfo
 //---------------------------------------------------------
 
-class MidiTrackInfo : public MidiTrackInfoBase {
+class MidiTrackInfo : public MidiTrackInfoBaseWidget {
    public:
       bool _midiDetect;
-      MidiTrackInfo(QWidget* parent) : MidiTrackInfoBase(parent) { _midiDetect = false; }
+      MidiTrackInfo(QWidget* parent) : MidiTrackInfoBaseWidget(parent) { _midiDetect = false; }
       };
 
 //---------------------------------------------------------
diff --git a/muse2/muse/arranger/trackinfo.cpp b/muse2/muse/arranger/trackinfo.cpp
index ff74ff93..20053d45 100644
--- a/muse2/muse/arranger/trackinfo.cpp
+++ b/muse2/muse/arranger/trackinfo.cpp
@@ -35,7 +35,6 @@
 #include "mididev.h"
 #include "utils.h"
 #include "tlist.h"
-//#include "mtrackinfobase.h"
 #include "alayout.h"
 #include "audio.h"
 #include "mixer/amixer.h"