Toolbars: Marker, list, master(s) windows. Fixes for others. Some new style headers fixes.

4 files changed, 40 insertions, 40 deletions

diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index 645dc349..b8422e03 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -5,24 +5,24 @@
 //  (C) Copyright 1999 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <qtoolbutton.h>
+#include <QToolButton>
 #include <q3accel.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <q3hbox.h>
-#include <qsizegrip.h>
-#include <qscrollbar.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qradiobutton.h>
+#include <QSizeGrip>
+#include <QScrollBar>
+#include <QLabel>
+#include <QPushButton>
+#include <QRadioButton>
 #include <q3buttongroup.h>
 #include <q3listbox.h>
 #include <q3popupmenu.h>
-#include <qmenubar.h>
-#include <qtooltip.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qmessagebox.h>
-#include <qaction.h>
+#include <QMenuBar>
+#include <QToolTip>
+#include <QApplication>
+#include <QClipboard>
+#include <QMessageBox>
+#include <QAction>
 #include <QWhatsThis>
 
 //Added by qt3to4:
@@ -223,16 +223,16 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       //    Toolbars
       //---------------------------------------------------
 
-      tools = addToolBar(tr("drum-tools"));
+      tools = addToolBar(tr("Drum tools"));
       
       QToolButton *ldm = new QToolButton();
-      QToolTip::add(ldm, tr("Load Drummap"));
+      ldm->setToolTip(tr("Load Drummap"));
       ldm->setIcon(*openIcon);
       connect(ldm, SIGNAL(clicked()), SLOT(load()));
       tools->addWidget(ldm);
       
       QToolButton *sdm = new QToolButton();
-      QToolTip::add(sdm, tr("Store Drummap"));
+      sdm->setToolTip(tr("Store Drummap"));
       sdm->setIcon(*saveIcon);
       connect(sdm, SIGNAL(clicked()), SLOT(save()));
       tools->addWidget(sdm);
@@ -244,13 +244,13 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       tools->addSeparator();
 
       srec  = new QToolButton();
-      QToolTip::add(srec, tr("Step Record"));
+      srec->setToolTip(tr("Step Record"));
       srec->setIcon(*steprecIcon);
       srec->setCheckable(true);
       tools->addWidget(srec);
 
       midiin  = new QToolButton();
-      QToolTip::add(midiin, tr("Midi Input"));
+      midiin->setToolTip(tr("Midi Input"));
       midiin->setIcon(*midiinIcon);
       midiin->setCheckable(true);
       tools->addWidget(midiin);
@@ -282,7 +282,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       ctrl->setFont(config.fonts[3]);
       hscroll           = new ScrollScale(-25, -2, xscale, 20000, Qt::Horizontal, mainw);
       ctrl->setFixedSize(40, hscroll->sizeHint().height());
-      QToolTip::add(ctrl, tr("Add Controller View"));
+      ctrl->setToolTip(tr("Add Controller View"));
 
       QSizeGrip* corner = new QSizeGrip(mainw);
       corner->setFixedHeight(hscroll->sizeHint().height());
diff --git a/muse2/muse/midiedit/drumedit.h b/muse2/muse/midiedit/drumedit.h
index a1c8583b..affb0b19 100644
--- a/muse2/muse/midiedit/drumedit.h
+++ b/muse2/muse/midiedit/drumedit.h
@@ -8,9 +8,9 @@
 #ifndef __DRUM_EDIT_H__
 #define __DRUM_EDIT_H__
 
-#include <qwidget.h>
-#include <q3mainwindow.h>
-#include <qtooltip.h>
+#include <QWidget>
+//#include <q3mainwindow.h>
+#include <QToolTip>
 #include <q3whatsthis.h>
 //Added by qt3to4:
 #include <QResizeEvent>
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 2a757f01..85057bba 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -6,20 +6,20 @@
 //=========================================================
 
 #include <q3accel.h>
-#include <qlayout.h>
+#include <QLayout>
 #include <q3hbox.h>
-#include <qsizegrip.h>
-#include <qlabel.h>
-#include <qpushbutton.h>
+#include <QSizeGrip>
+#include <QLabel>
+#include <QPushButton>
 #include <q3buttongroup.h>
-#include <qtoolbutton.h>
-#include <qtooltip.h>
+#include <QToolButton>
+#include <QToolTip>
 #include <q3popupmenu.h>
-#include <qmenubar.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qdir.h>
-#include <qaction.h>
+#include <QMenuBar>
+#include <QApplication>
+#include <QClipboard>
+#include <QDir>
+#include <QAction>
 //Added by qt3to4:
 #include <QKeyEvent>
 #include <QGridLayout>
@@ -185,26 +185,26 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       connect(menuFunctions, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      tools = addToolBar(tr("pianoroll-tools"));          
+      tools = addToolBar(tr("Pianoroll tools"));          
       tools->addActions(undoRedo->actions());
       tools->addSeparator();
 
       // Does not like this, draws on top of other buttons! Must use QToolBar::addWidget()
       //srec  = new QToolButton(tools);          
       srec  = new QToolButton();
-      QToolTip::add(srec, tr("Step Record"));
+      srec->setToolTip(tr("Step Record"));
       srec->setIcon(*steprecIcon);
       srec->setCheckable(true);
       tools->addWidget(srec);
 
       midiin  = new QToolButton();
-      QToolTip::add(midiin, tr("Midi Input"));
+      midiin->setToolTip(tr("Midi Input"));
       midiin->setIcon(*midiinIcon);
       midiin->setCheckable(true);
       tools->addWidget(midiin);
 
       speaker  = new QToolButton();
-      QToolTip::add(speaker, tr("Play Events"));
+      speaker->setToolTip(tr("Play Events"));
       speaker->setIcon(*speakerIcon);
       speaker->setCheckable(true);
       tools->addWidget(speaker);
@@ -235,7 +235,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       splitter = new Splitter(Qt::Vertical, mainw, "splitter");
       QPushButton* ctrl = new QPushButton(tr("ctrl"), mainw, "Ctrl");
       ctrl->setFont(config.fonts[3]);
-      QToolTip::add(ctrl, tr("Add Controller View"));
+      ctrl->setToolTip(tr("Add Controller View"));
       hscroll = new ScrollScale(-25, -2, xscale, 20000, Qt::Horizontal, mainw);
       ctrl->setFixedSize(pianoWidth, hscroll->sizeHint().height());
 
diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h
index b24f1c1c..2d4c7780 100644
--- a/muse2/muse/midiedit/pianoroll.h
+++ b/muse2/muse/midiedit/pianoroll.h
@@ -8,8 +8,8 @@
 #ifndef __PIANOROLL_H__
 #define __PIANOROLL_H__
 
-#include <qwidget.h>
-#include <q3mainwindow.h>
+#include <QWidget>
+//#include <q3mainwindow.h>
 //#include <QMenu>
 //Added by qt3to4:
 #include <QCloseEvent>