Ported vscale and ctrledit

2 files changed, 11 insertions, 17 deletions

diff --git a/muse2/muse/ctrl/ctrledit.cpp b/muse2/muse/ctrl/ctrledit.cpp
index bca9d550..fd9f108f 100644
--- a/muse2/muse/ctrl/ctrledit.cpp
+++ b/muse2/muse/ctrl/ctrledit.cpp
@@ -17,13 +17,7 @@
 #include "instruments/minstrument.h"
 #include "gconfig.h"
 
-#include <qlayout.h>
-#include <qpainter.h>
-#include <qtoolbutton.h>
-#include <q3popupmenu.h>
-#include <qlabel.h>
-//Added by qt3to4:
-#include <Q3HBoxLayout>
+#include <QHBoxLayout>
 
 //---------------------------------------------------------
 //   setTool
@@ -39,12 +33,13 @@ void CtrlEdit::setTool(int t)
 //---------------------------------------------------------
 
 CtrlEdit::CtrlEdit(QWidget* parent, MidiEditor* e, int xmag,
-   bool expand, const char* name) : QWidget(parent, name)
+   bool expand, const char* name) : QWidget(parent)
       {
-      Q3HBoxLayout* hbox = new Q3HBoxLayout(this);
-      panel             = new CtrlPanel(this, e, "panel");
-      canvas            = new CtrlCanvas(e, this, xmag, "ctrlcanvas", panel);
-      QWidget* vscale   = new VScale(this);
+      setObjectName(name);
+      QHBoxLayout* hbox = new QHBoxLayout;
+      panel             = new CtrlPanel(0, e, "panel");
+      canvas            = new CtrlCanvas(e, 0, xmag, "ctrlcanvas", panel);
+      QWidget* vscale   = new VScale;
 
       canvas->setOrigin(-(config.division/4), 0);
 
@@ -54,6 +49,7 @@ CtrlEdit::CtrlEdit(QWidget* parent, MidiEditor* e, int xmag,
       hbox->addWidget(panel,  expand ? 100 : 0, Qt::AlignRight);
       hbox->addWidget(canvas, 100);
       hbox->addWidget(vscale, 0);
+      setLayout(hbox);
 
       connect(panel, SIGNAL(destroyPanel()), SLOT(destroy()));
       connect(panel, SIGNAL(controllerChanged(int)), canvas, SLOT(setController(int)));
diff --git a/muse2/muse/ctrl/ctrledit.h b/muse2/muse/ctrl/ctrledit.h
index 2af7c528..61bf9b46 100644
--- a/muse2/muse/ctrl/ctrledit.h
+++ b/muse2/muse/ctrl/ctrledit.h
@@ -8,15 +8,12 @@
 #ifndef __CTRL_EDIT_H__
 #define __CTRL_EDIT_H__
 
-#include <qwidget.h>
-//Added by qt3to4:
-#include <QLabel>
+#include <QWidget>
+
 #include "ctrlcanvas.h"
 #include "song.h"
 
 class MidiEditor;
-class QLabel;
-class QToolButton;
 class CtrlView;
 class CtrlPanel;
 class Xml;
@@ -29,6 +26,7 @@ class Xml;
 class CtrlEdit : public QWidget {
       CtrlCanvas* canvas;
       CtrlPanel* panel;
+
       Q_OBJECT
 
    private slots: