See ChangeLog

4 files changed, 45 insertions, 33 deletions

diff --git a/muse2/muse/liste/editevent.cpp b/muse2/muse/liste/editevent.cpp
index ef084440..5681231b 100644
--- a/muse2/muse/liste/editevent.cpp
+++ b/muse2/muse/liste/editevent.cpp
@@ -19,10 +19,10 @@
 #include <q3widgetstack.h>
 #include <q3popupmenu.h>
 //Added by qt3to4:
-#include <Q3HBoxLayout>
-#include <Q3GridLayout>
-#include <Q3VBoxLayout>
-#include <Q3BoxLayout>
+#include <QHBoxLayout>
+#include <QGridLayout>
+#include <QVBoxLayout>
+#include <QBoxLayout>
 
 #include "song.h"
 #include "event.h"
@@ -159,15 +159,15 @@ Event EditPAfterDialog::getEvent(int tick, const Event& event, QWidget* parent)
 EditEventDialog::EditEventDialog(QWidget* parent, const char* name)
    : QDialog(parent, name, true)
       {
-      Q3VBoxLayout* xlayout = new Q3VBoxLayout(this);
-      layout1 = new Q3GridLayout(this); // ddskrjo this
+      QVBoxLayout* xlayout = new QVBoxLayout(this);
+      layout1 = new QGridLayout(this); // ddskrjo this
       xlayout->addLayout(layout1);
 
       //---------------------------------------------------
       //  Ok, Cancel
       //---------------------------------------------------
 
-      Q3BoxLayout* w5 = new Q3HBoxLayout(this); // ddskrjo this
+      QBoxLayout* w5 = new QHBoxLayout(this); // ddskrjo this
       xlayout->addLayout(w5);
       QPushButton* okB = new QPushButton(tr("Ok"), this);
       okB->setDefault(true);
@@ -296,7 +296,7 @@ EditMetaDialog::EditMetaDialog(int tick, const Event& ev,
       il2->setDark();
       typeLabel = new QLabel(this);
       typeLabel->setAlignment(Qt::AlignLeft | Qt::AlignVCenter);
-      Q3HBoxLayout* typeLayout = new Q3HBoxLayout(this);
+      QHBoxLayout* typeLayout = new QHBoxLayout(this);
       typeLayout->addWidget(il2);
       typeLayout->addWidget(typeLabel);
       typeLayout->addStretch();
diff --git a/muse2/muse/liste/editevent.h b/muse2/muse/liste/editevent.h
index 769ba256..7c0b431c 100644
--- a/muse2/muse/liste/editevent.h
+++ b/muse2/muse/liste/editevent.h
@@ -11,7 +11,7 @@
 #include <qdialog.h>
 //Added by qt3to4:
 #include <Q3PopupMenu>
-#include <Q3GridLayout>
+#include <QGridLayout>
 #include <QLabel>
 
 #include "editnotedialogbase.h"
@@ -22,7 +22,7 @@
 class PosEdit;
 class IntLabel;
 class PitchEdit;
-class Q3GridLayout;
+class QGridLayout;
 class Q3MultiLineEdit;
 class QRadioButton;
 class PosEdit;
@@ -37,7 +37,7 @@ class EditEventDialog : public QDialog {
       Q_OBJECT
 
    protected:
-      Q3GridLayout* layout1;
+      QGridLayout* layout1;
 
    public:
       EditEventDialog(QWidget* parent=0, const char* name=0);
@@ -70,7 +70,7 @@ class EditSysexDialog : public EditSysexDialogBase {
       int len;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    private slots:
       virtual void accept();
@@ -106,7 +106,7 @@ class EditCtrlDialog : public EditCtrlBase  {
       void instrPopup();
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
 
    public:
@@ -133,7 +133,7 @@ class EditMetaDialog : public EditEventDialog {
       QLabel* typeLabel;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    private slots:
       virtual void accept();
@@ -160,7 +160,7 @@ class EditCAfterDialog : public EditEventDialog {
       IntLabel* il2;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    public:
       EditCAfterDialog(int tick, const Event&,
@@ -182,7 +182,7 @@ class EditPAfterDialog : public EditEventDialog {
       IntLabel* il2;
 
    protected:
-      Q3GridLayout* layout;
+      QGridLayout* layout;
 
    public:
       EditPAfterDialog(int tick, const Event&,
diff --git a/muse2/muse/liste/listedit.cpp b/muse2/muse/liste/listedit.cpp
index 31573571..c081b68d 100644
--- a/muse2/muse/liste/listedit.cpp
+++ b/muse2/muse/liste/listedit.cpp
@@ -5,7 +5,8 @@
 //  (C) Copyright 1999 Werner Schweer (ws@seh.de)
 //=========================================================
 
-#include <q3toolbar.h>
+//#include <q3toolbar.h>
+#include <QToolBar>
 #include <qtooltip.h>
 #include <qtoolbutton.h>
 #include <qlayout.h>
@@ -14,7 +15,7 @@
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qradiobutton.h>
-#include <q3buttongroup.h>
+#include <QButtonGroup>
 #include <q3listbox.h>
 #include <q3listview.h>
 #include <q3header.h>
@@ -25,7 +26,7 @@
 #include <Qt3Support>
 //Added by qt3to4:
 #include <QKeyEvent>
-#include <Q3ActionGroup>
+#include <QActionGroup>
 #include <QCloseEvent>
 
 #include "listedit.h"
@@ -419,19 +420,30 @@ QString EventListItem::text(int col) const
 ListEdit::ListEdit(PartList* pl)
    : MidiEditor(0, 0, pl)
       {
-      insertItems = new Q3ActionGroup(this, "InsertItems", false);
-      insertNote = new Q3Action(tr("Insert Note"), QIcon(*note1Icon), tr("insert Note"),
+      // ORCAN - CHECK:
+      /*
+      insertItems = new QActionGroup(this, "InsertItems", false);
+      insertNote = new QAction(tr("Insert Note"), QIcon(*note1Icon), tr("insert Note"),
         0, insertItems);
-      insertSysEx = new Q3Action(tr("Insert SysEx"), QIcon(*sysexIcon), tr("insert SysEx"),
+      insertSysEx = new QAction(tr("Insert SysEx"), QIcon(*sysexIcon), tr("insert SysEx"),
         0, insertItems);
-      insertCtrl = new Q3Action(tr("Insert Ctrl"), QIcon(*ctrlIcon), tr("insert Ctrl"),
+      insertCtrl = new QAction(tr("Insert Ctrl"), QIcon(*ctrlIcon), tr("insert Ctrl"),
         0, insertItems);
-      insertMeta = new Q3Action(tr("Insert Meta"), QIcon(*metaIcon), tr("insert Meta"),
+      insertMeta = new QAction(tr("Insert Meta"), QIcon(*metaIcon), tr("insert Meta"),
         0, insertItems);
-      insertCAfter = new Q3Action(tr("Insert Channel Aftertouch"), QIcon(*cafterIcon), tr("insert Channel Aftertouch"),
+      insertCAfter = new QAction(tr("Insert Channel Aftertouch"), QIcon(*cafterIcon), tr("insert Channel Aftertouch"),
         0, insertItems);
-      insertPAfter = new Q3Action(tr("Insert Key Aftertouch"), QIcon(*pafterIcon), tr("insert Poly Aftertouch"),
+      insertPAfter = new QAction(tr("Insert Key Aftertouch"), QIcon(*pafterIcon), tr("insert Poly Aftertouch"),
         0, insertItems);
+      */
+      insertItems = new QActionGroup(this);
+      insertItems->setExclusive(false);
+      insertNote = new QAction(QIcon(*note1Icon), tr("insert Note"), insertItems);
+      insertSysEx = new QAction(QIcon(*sysexIcon), tr("insert SysEx"), insertItems);
+      insertCtrl = new QAction(QIcon(*ctrlIcon), tr("insert Ctrl"), insertItems);
+      insertMeta = new QAction(QIcon(*metaIcon), tr("insert Meta"), insertItems);
+      insertCAfter = new QAction(QIcon(*cafterIcon), tr("insert Channel Aftertouch"), insertItems);
+      insertPAfter = new QAction(QIcon(*pafterIcon), tr("insert Poly Aftertouch"), insertItems);
 
       connect(insertNote,    SIGNAL(activated()), SLOT(editInsertNote()));
       connect(insertSysEx,   SIGNAL(activated()), SLOT(editInsertSysEx()));
@@ -468,10 +480,10 @@ ListEdit::ListEdit(PartList* pl)
       connect(menuEdit, SIGNAL(activated(int)), SLOT(cmd(int)));
 
       //---------ToolBar----------------------------------
-      listTools = new Q3ToolBar(this, "list-tools");
+      listTools = new QToolBar(this, "list-tools");
       listTools->setLabel(tr("List Tools"));
       undoRedo->addTo(listTools);
-      Q3ToolBar* insertTools = new Q3ToolBar(this, "insert");
+      QToolBar* insertTools = new QToolBar(this, "insert");
       insertTools->setLabel(tr("Insert Tools"));
       insertItems->addTo(insertTools);
 
diff --git a/muse2/muse/liste/listedit.h b/muse2/muse/liste/listedit.h
index efa0a591..bb06c952 100644
--- a/muse2/muse/liste/listedit.h
+++ b/muse2/muse/liste/listedit.h
@@ -15,7 +15,7 @@
 #include <Q3PopupMenu>
 #include <QKeyEvent>
 #include <QCloseEvent>
-#include <Q3ActionGroup>
+#include <QActionGroup>
 #include <Qt3Support>
 
 class Event;
@@ -24,7 +24,7 @@ class PartList;
 class MidiPart;
 class MidiPart;
 class Xml;
-class Q3ActionGroup;
+class QActionGroup;
 class QAction;
 class Q3ListView;
 class Q3ListViewItem;
@@ -36,8 +36,8 @@ class Q3ListViewItem;
 class ListEdit : public MidiEditor {
       Q3ListView* liste;
       Q3PopupMenu* menuEdit;
-      Q3ActionGroup* insertItems;
-      Q3ToolBar* listTools;
+      QActionGroup* insertItems;
+      QToolBar* listTools;
       MidiTrack* curTrack;
       MidiPart* curPart;
       int selectedTick;
@@ -49,7 +49,7 @@ class ListEdit : public MidiEditor {
       virtual void closeEvent(QCloseEvent*);
       virtual void keyPressEvent(QKeyEvent*);
       void initShortcuts();
-      Q3Action *insertNote, *insertSysEx, *insertCtrl, *insertMeta, *insertCAfter, *insertPAfter;
+      QAction *insertNote, *insertSysEx, *insertCtrl, *insertMeta, *insertCAfter, *insertPAfter;
 
    private slots:
       void editInsertNote();