converted Qt3 methods to Qt4. Cleaned up app.* includes a bit.

3 files changed, 5 insertions, 6 deletions

diff --git a/muse2/muse/midiedit/drumedit.cpp b/muse2/muse/midiedit/drumedit.cpp
index d8845db7..43227810 100644
--- a/muse2/muse/midiedit/drumedit.cpp
+++ b/muse2/muse/midiedit/drumedit.cpp
@@ -311,7 +311,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       corner->setFixedHeight(hscroll->sizeHint().height());
 
       mainGrid->setRowStretch(0, 100);
-      mainGrid->setColStretch(1, 100);
+      mainGrid->setColumnStretch(1, 100);
 
       mainGrid->addWidget(split1, 0, 0,  1, 3);
       mainGrid->addWidget(ctrl,    1, 0);
@@ -348,7 +348,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       //split2->setResizeMode(split1w1, QSplitter::KeepSize);
 
       gridS2->setRowStretch(1, 100);
-      gridS2->setColStretch(0, 100);
+      gridS2->setColumnStretch(0, 100);
       
       gridS2->addWidget(time,  0, 0, 1, 2);
       gridS2->addWidget(hLine(split1w2), 1, 0, 1, 2);
@@ -386,7 +386,7 @@ DrumEdit::DrumEdit(PartList* pl, QWidget* parent, const char* name, unsigned ini
       connect(dlist, SIGNAL(mapChanged(int, int)), canvas, SLOT(mapChanged(int, int)));
 
       gridS1->setRowStretch(1, 100);
-      gridS1->setColStretch(0, 100);
+      gridS1->setColumnStretch(0, 100);
       gridS1->addWidget(header, 0, 0);
       gridS1->addWidget(dlist, 1, 0);
       
diff --git a/muse2/muse/midiedit/pianoroll.cpp b/muse2/muse/midiedit/pianoroll.cpp
index 191d0db4..3d387b95 100644
--- a/muse2/muse/midiedit/pianoroll.cpp
+++ b/muse2/muse/midiedit/pianoroll.cpp
@@ -333,7 +333,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       QSizeGrip* corner = new QSizeGrip(mainw);
 
       mainGrid->setRowStretch(0, 100);
-      mainGrid->setColStretch(1, 100);
+      mainGrid->setColumnStretch(1, 100);
       mainGrid->addWidget(splitter, 0, 0, 1, 3);
       mainGrid->addWidget(ctrl,    1, 0);
       mainGrid->addWidget(hscroll, 1, 1);
@@ -359,7 +359,7 @@ PianoRoll::PianoRoll(PartList* pl, QWidget* parent, const char* name, unsigned i
       time->setOrigin(offset, 0);
 
       gridS1->setRowStretch(2, 100);
-      gridS1->setColStretch(1, 100);
+      gridS1->setColumnStretch(1, 100);
 
       gridS1->addWidget(time,                   0, 1, 1, 2);
       gridS1->addWidget(hLine(split1),          1, 0, 1, 3);
diff --git a/muse2/muse/midiedit/pianoroll.h b/muse2/muse/midiedit/pianoroll.h
index a08853bd..8f225dc1 100644
--- a/muse2/muse/midiedit/pianoroll.h
+++ b/muse2/muse/midiedit/pianoroll.h
@@ -25,7 +25,6 @@ class TimeLabel;
 class PitchLabel;
 class QLabel;
 class PianoCanvas;
-class IntLabel;
 class MTScale;
 class Track;
 class QToolButton;