summaryrefslogtreecommitdiff
path: root/muse2/muse/waveedit
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/waveedit
parent1b5734729f893636653693776da29c6f391d3439 (diff)
See ChangeLog
Diffstat (limited to 'muse2/muse/waveedit')
-rw-r--r--muse2/muse/waveedit/waveedit.cpp9
-rw-r--r--muse2/muse/waveedit/waveedit.h4
2 files changed, 7 insertions, 6 deletions
diff --git a/muse2/muse/waveedit/waveedit.cpp b/muse2/muse/waveedit/waveedit.cpp
index cb9d9a17..f6c5484f 100644
--- a/muse2/muse/waveedit/waveedit.cpp
+++ b/muse2/muse/waveedit/waveedit.cpp
@@ -21,7 +21,8 @@
#include "icons.h"
#include "shortcuts.h"
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
#include <qtoolbutton.h>
#include <q3accel.h>
#include <qlayout.h>
@@ -105,7 +106,7 @@ WaveEdit::WaveEdit(PartList* pl)
connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int)));
//---------ToolBar----------------------------------
- tools = new Q3ToolBar(this, "waveedit-tools");
+ tools = new QToolBar(this, "waveedit-tools");
undoRedo->addTo(tools);
Q3Accel* qa = new Q3Accel(this);
@@ -116,13 +117,13 @@ WaveEdit::WaveEdit(PartList* pl)
//--------------------------------------------------
// Transport Bar
- Q3ToolBar* transport = new Q3ToolBar(this);
+ QToolBar* transport = new QToolBar(this);
transportAction->addTo(transport);
//--------------------------------------------------
// ToolBar: Solo Cursor1 Cursor2
- tb1 = new Q3ToolBar(this, "pianoroll-tools");
+ tb1 = new QToolBar(this, "pianoroll-tools");
tb1->setLabel(tr("weTools"));
solo = new QToolButton(tb1);
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h
index eac0e5bf..454fa1a1 100644
--- a/muse2/muse/waveedit/waveedit.h
+++ b/muse2/muse/waveedit/waveedit.h
@@ -32,8 +32,8 @@ class SNode;
class WaveEdit : public MidiEditor {
WaveView* view;
QSlider* ymag;
- Q3ToolBar* tools;
- Q3ToolBar* tb1;
+ QToolBar* tools;
+ QToolBar* tb1;
QToolButton* solo;
PosLabel* pos1;
PosLabel* pos2;