summaryrefslogtreecommitdiff
path: root/muse2/muse/master/masteredit.cpp
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-10-26 22:30:37 +0000
committerTim E. Real <termtech@rogers.com>2010-10-26 22:30:37 +0000
commitb5a9f51073ba4e3c166f9229cd596f22878acafc (patch)
tree2f2bd80dd09f6391166ef35c2521eb2651ade4c1 /muse2/muse/master/masteredit.cpp
parent1b5734729f893636653693776da29c6f391d3439 (diff)
See ChangeLog
Diffstat (limited to 'muse2/muse/master/masteredit.cpp')
-rw-r--r--muse2/muse/master/masteredit.cpp12
1 files changed, 6 insertions, 6 deletions
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);