See ChangeLog

4 files changed, 12 insertions, 11 deletions

diff --git a/muse2/muse/master/lmaster.cpp b/muse2/muse/master/lmaster.cpp
index 42486a8b..f50635b4 100644
--- a/muse2/muse/master/lmaster.cpp
+++ b/muse2/muse/master/lmaster.cpp
@@ -15,7 +15,8 @@
 #include "shortcuts.h"
 #include "debug.h"
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <qlayout.h>
@@ -88,10 +89,10 @@ LMaster::LMaster()
       connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(this, "list-tools");
+      tools = new QToolBar(this, "list-tools");
       undoRedo->addTo(tools);
 
-      Q3ToolBar* edit = new Q3ToolBar(this, "edit tools");
+      QToolBar* edit = new QToolBar(this, "edit tools");
       QToolButton* tempoButton = new QToolButton(edit);
       QToolButton* timeSigButton = new QToolButton(edit);
       tempoButton->setText(tr("Tempo"));
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h
index b67f64bf..9be2daf6 100644
--- a/muse2/muse/master/lmaster.h
+++ b/muse2/muse/master/lmaster.h
@@ -96,7 +96,7 @@ class LMasterSigEventItem : public LMasterLViewItem {
 
 class LMaster : public MidiEditor {
       Q3ListView* view;
-      Q3ToolBar* tools;
+      QToolBar* tools;
       Q3PopupMenu* menuEdit;
 
       enum { CMD_DELETE, CMD_INSERT_SIG, CMD_INSERT_TEMPO, CMD_EDIT_BEAT, CMD_EDIT_VALUE };
diff --git a/muse2/muse/master/masteredit.cpp b/muse2/muse/master/masteredit.cpp
index 53189573..3adcae3f 100644
--- a/muse2/muse/master/masteredit.cpp
+++ b/muse2/muse/master/masteredit.cpp
@@ -22,7 +22,8 @@
 #include "globals.h"
 
 #include <values.h>
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtoolbutton.h>
 #include <qtooltip.h>
 #include <q3accel.h>
@@ -100,13 +101,12 @@ MasterEdit::MasterEdit()
 //      menuBar()->insertItem("&File", file);
 
       //---------ToolBar----------------------------------
-      tools = new Q3ToolBar(tr("edit tools"), this);
+      tools = new QToolBar(tr("edit tools"), this);
       undoRedo->addTo(tools);
 
-      EditToolBar* tools2 = new EditToolBar(this,
-         PointerTool | PencilTool | RubberTool);
+      EditToolBar* tools2 = new EditToolBar(this, PointerTool | PencilTool | RubberTool);
 
-      Q3ToolBar* enableMaster = new Q3ToolBar(tr("EnableMaster"), this);
+      QToolBar* enableMaster = new QToolBar(tr("EnableMaster"), this);
       enableButton = new QToolButton(enableMaster);
       enableButton->setToggleButton(true);
       enableButton->setText(tr("Enable"));
@@ -114,7 +114,7 @@ MasterEdit::MasterEdit()
       enableButton->setOn(song->masterFlag());
       connect(enableButton, SIGNAL(toggled(bool)), song, SLOT(setMasterFlag(bool)));
 
-      Q3ToolBar* info = new Q3ToolBar(tr("Info"), this);
+      QToolBar* info = new QToolBar(tr("Info"), this);
       QLabel* label  = new QLabel(tr("Cursor"), info);
       label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
       label->setIndent(3);
diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h
index 88ada6eb..04ef09eb 100644
--- a/muse2/muse/master/masteredit.h
+++ b/muse2/muse/master/masteredit.h
@@ -47,7 +47,7 @@ class MasterEdit : public MidiEditor {
       TempoEdit* curTempo;
       SigEdit* curSig;
       LabelCombo* rasterLabel;
-      Q3ToolBar* tools;
+      QToolBar* tools;
       PosLabel* cursorPos;
       TempoLabel* tempo;
       QToolButton* enableButton;