summaryrefslogtreecommitdiff
path: root/muse2/muse/mixer/strip.h
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/mixer/strip.h
parent1b5734729f893636653693776da29c6f391d3439 (diff)
See ChangeLog
Diffstat (limited to 'muse2/muse/mixer/strip.h')
-rw-r--r--muse2/muse/mixer/strip.h17
1 files changed, 9 insertions, 8 deletions
diff --git a/muse2/muse/mixer/strip.h b/muse2/muse/mixer/strip.h
index a28cf5fd..4202b3e3 100644
--- a/muse2/muse/mixer/strip.h
+++ b/muse2/muse/mixer/strip.h
@@ -9,11 +9,12 @@
#ifndef __STRIP_H__
#define __STRIP_H__
-#include <q3frame.h>
+//#include <q3frame.h>
+#include <QFrame>
#include <qicon.h>
//Added by qt3to4:
-#include <Q3VBoxLayout>
-#include <Q3GridLayout>
+#include <QVBoxLayout>
+#include <QGridLayout>
#include <QLabel>
#include "globaldefs.h"
@@ -21,10 +22,10 @@
class Track;
class QLabel;
-class Q3VBoxLayout;
+class QVBoxLayout;
class Meter;
class QToolButton;
-class Q3GridLayout;
+class QGridLayout;
class ComboBox;
static const int STRIP_WIDTH = 65;
@@ -33,13 +34,13 @@ static const int STRIP_WIDTH = 65;
// Strip
//---------------------------------------------------------
-class Strip : public Q3Frame {
+class Strip : public QFrame {
Q_OBJECT
protected:
Track* track;
QLabel* label;
- Q3VBoxLayout* layout;
+ QVBoxLayout* layout;
Meter* meter[MAX_CHANNELS];
bool useSoloIconSet2;
@@ -48,7 +49,7 @@ class Strip : public Q3Frame {
QToolButton* mute;
QToolButton* iR; // Input routing button
QToolButton* oR; // Output routing button
- Q3GridLayout* sliderGrid;
+ QGridLayout* sliderGrid;
ComboBox* autoType;
void setLabelText();