diff options
Diffstat (limited to 'muse2/muse/widgets')
59 files changed, 107 insertions, 241 deletions
diff --git a/muse2/muse/widgets/bigtime.cpp b/muse2/muse/widgets/bigtime.cpp index 78da4248..f3aa75a8 100644 --- a/muse2/muse/widgets/bigtime.cpp +++ b/muse2/muse/widgets/bigtime.cpp @@ -1,14 +1,10 @@ #include <stdio.h> -#include <qpalette.h> -#include <qlabel.h> -#include <qcolor.h> -#include <qlayout.h> -//Added by qt3to4: -#include <QCloseEvent> -#include <QResizeEvent> #include <values.h> -#include <qtooltip.h> +#include <QCheckBox> +#include <QLabel> +#include <QResizeEvent> + #include "globals.h" #include "bigtime.h" #include "song.h" diff --git a/muse2/muse/widgets/bigtime.h b/muse2/muse/widgets/bigtime.h index 5e173cb0..bb32cedc 100644 --- a/muse2/muse/widgets/bigtime.h +++ b/muse2/muse/widgets/bigtime.h @@ -1,13 +1,11 @@ #ifndef __BIGTIME_H__ #define __BIGTIME_H__ -#include <qwidget.h> -#include <qlabel.h> +#include <QWidget> + +class QCheckBox; +class QLabel; -#include <qcheckbox.h> -//Added by qt3to4: -#include <QResizeEvent> -#include <QCloseEvent> class MusE; //--------------------------------------------------------- diff --git a/muse2/muse/widgets/canvas.cpp b/muse2/muse/widgets/canvas.cpp index 35a80aad..20b92e8d 100644 --- a/muse2/muse/widgets/canvas.cpp +++ b/muse2/muse/widgets/canvas.cpp @@ -8,7 +8,9 @@ #include <stdio.h> #include "canvas.h" + #include <QApplication> +#include <QMenu> #include <QPainter> #include <QCursor> #include <QTimer> diff --git a/muse2/muse/widgets/checkbox.cpp b/muse2/muse/widgets/checkbox.cpp index c680314e..8f706361 100644 --- a/muse2/muse/widgets/checkbox.cpp +++ b/muse2/muse/widgets/checkbox.cpp @@ -6,7 +6,7 @@ //========================================================= #include "checkbox.h" -//Added by qt3to4: + #include <QMouseEvent> //--------------------------------------------------------- diff --git a/muse2/muse/widgets/checkbox.h b/muse2/muse/widgets/checkbox.h index 26209987..f9b58ad1 100644 --- a/muse2/muse/widgets/checkbox.h +++ b/muse2/muse/widgets/checkbox.h @@ -8,9 +8,8 @@ #ifndef __CHECKBOX_H__ #define __CHECKBOX_H__ -#include <qcheckbox.h> -//Added by qt3to4: -#include <QMouseEvent> +#include <QCheckBox> + //--------------------------------------------------------- // CheckBox diff --git a/muse2/muse/widgets/combobox.cpp b/muse2/muse/widgets/combobox.cpp index cf7442ec..9e278376 100644 --- a/muse2/muse/widgets/combobox.cpp +++ b/muse2/muse/widgets/combobox.cpp @@ -5,11 +5,7 @@ // (C) Copyright 2004 Werner Schweer (ws@seh.de) //========================================================= -#include <QCursor> #include <QMenu> -#include <QMouseEvent> -#include <QFrame> -#include <QLabel> #include "combobox.h" diff --git a/muse2/muse/widgets/combobox.h b/muse2/muse/widgets/combobox.h index eea9bb94..305ad0b3 100644 --- a/muse2/muse/widgets/combobox.h +++ b/muse2/muse/widgets/combobox.h @@ -8,9 +8,7 @@ #ifndef __COMBOBOX_H__ #define __COMBOBOX_H__ -#include <qlabel.h> - -#include <QMouseEvent> +#include <QLabel> class QMenu; diff --git a/muse2/muse/widgets/dentry.cpp b/muse2/muse/widgets/dentry.cpp index 4c16a50d..c7aa3c1b 100644 --- a/muse2/muse/widgets/dentry.cpp +++ b/muse2/muse/widgets/dentry.cpp @@ -5,14 +5,12 @@ // (C) Copyright 1999 Werner Schweer (ws@seh.de) //========================================================= -#include "dentry.h" #include <stdio.h> -#include <qtimer.h> -#include <qcursor.h> -//Added by qt3to4: -#include <QWheelEvent> -#include <QMouseEvent> + #include <QContextMenuEvent> +#include <QTimer> + +#include "dentry.h" #include "globals.h" #define TIMER1 400 diff --git a/muse2/muse/widgets/dentry.h b/muse2/muse/widgets/dentry.h index 58f1ef6f..21c9ff38 100644 --- a/muse2/muse/widgets/dentry.h +++ b/muse2/muse/widgets/dentry.h @@ -8,16 +8,10 @@ #ifndef __DENTRY_H__ #define __DENTRY_H__ -#include <qlineedit.h> -//Added by qt3to4: -#include <QMouseEvent> -#include <QContextMenuEvent> -#include <QWheelEvent> +#include <QLineEdit> #include "sliderbase.h" -class QTimer; - //--------------------------------------------------------- // Dentry //--------------------------------------------------------- diff --git a/muse2/muse/widgets/dimap.h b/muse2/muse/widgets/dimap.h index 5e9ac3ee..cf51dee2 100644 --- a/muse2/muse/widgets/dimap.h +++ b/muse2/muse/widgets/dimap.h @@ -14,7 +14,7 @@ #ifndef __DIMAP_H__ #define __DIMAP_H__ -#include <qglobal.h> +#include <QtGlobal> class DiMap { diff --git a/muse2/muse/widgets/doublelabel.cpp b/muse2/muse/widgets/doublelabel.cpp index af492738..fe2bfc6a 100644 --- a/muse2/muse/widgets/doublelabel.cpp +++ b/muse2/muse/widgets/doublelabel.cpp @@ -5,16 +5,9 @@ // (C) Copyright 1999 Werner Schweer (ws@seh.de) //========================================================= -#include <stdio.h> +#include <cmath> #include "doublelabel.h" -#include <qvalidator.h> -#include <qpalette.h> -#include <stdio.h> -#include <values.h> -#include <math.h> - -#include "utils.h" //--------------------------------------------------------- // DoubleLabel diff --git a/muse2/muse/widgets/drange.cpp b/muse2/muse/widgets/drange.cpp index 5c986403..e144dfea 100644 --- a/muse2/muse/widgets/drange.cpp +++ b/muse2/muse/widgets/drange.cpp @@ -12,6 +12,9 @@ //========================================================= #include <cmath> + +#include <QtGlobal> + #include "mmath.h" #include "drange.h" diff --git a/muse2/muse/widgets/drange.h b/muse2/muse/widgets/drange.h index 1ee3dd21..d0931e86 100644 --- a/muse2/muse/widgets/drange.h +++ b/muse2/muse/widgets/drange.h @@ -14,8 +14,6 @@ #ifndef __DOUBLE_RANGE_H__ #define __DOUBLE_RANGE_H__ -#include <qglobal.h> - //--------------------------------------------------------- // DoubleRange //--------------------------------------------------------- diff --git a/muse2/muse/widgets/filedialog.h b/muse2/muse/widgets/filedialog.h index c2feba37..a7c8a1f7 100644 --- a/muse2/muse/widgets/filedialog.h +++ b/muse2/muse/widgets/filedialog.h @@ -6,7 +6,6 @@ //========================================================= #include <QFileDialog> -#include <QPixmap> #include "ui_fdialogbuttons.h" diff --git a/muse2/muse/widgets/hitscale.cpp b/muse2/muse/widgets/hitscale.cpp index aa3838fe..feba5920 100644 --- a/muse2/muse/widgets/hitscale.cpp +++ b/muse2/muse/widgets/hitscale.cpp @@ -7,10 +7,9 @@ #include "hitscale.h" #include "midieditor.h" -#include <qpainter.h> -//Added by qt3to4: -#include <QEvent> + #include <QMouseEvent> +#include <QPainter> #include "song.h" diff --git a/muse2/muse/widgets/hitscale.h b/muse2/muse/widgets/hitscale.h index 85711e71..0eaae399 100644 --- a/muse2/muse/widgets/hitscale.h +++ b/muse2/muse/widgets/hitscale.h @@ -9,11 +9,7 @@ #define __HITSCALE_H__ #include "view.h" -//Added by qt3to4: -#include <QEvent> -#include <QMouseEvent> -class QPainter; class MidiEditor; //--------------------------------------------------------- diff --git a/muse2/muse/widgets/intlabel.cpp b/muse2/muse/widgets/intlabel.cpp index 8835e79d..355f4510 100644 --- a/muse2/muse/widgets/intlabel.cpp +++ b/muse2/muse/widgets/intlabel.cpp @@ -8,10 +8,6 @@ #include <stdio.h> #include "intlabel.h" -#include <qvalidator.h> -#include <qpalette.h> -#include <stdio.h> - #include "utils.h" //--------------------------------------------------------- diff --git a/muse2/muse/widgets/lcombo.cpp b/muse2/muse/widgets/lcombo.cpp index 16fe150a..15cf6266 100644 --- a/muse2/muse/widgets/lcombo.cpp +++ b/muse2/muse/widgets/lcombo.cpp @@ -7,11 +7,9 @@ #include "lcombo.h" -#include <QLayout> -#include <QFrame> -#include <qlabel.h> -//Added by qt3to4: #include <QHBoxLayout> +#include <QLabel> + //--------------------------------------------------------- // LabelCombo diff --git a/muse2/muse/widgets/lcombo.h b/muse2/muse/widgets/lcombo.h index 885d21e7..b125fce5 100644 --- a/muse2/muse/widgets/lcombo.h +++ b/muse2/muse/widgets/lcombo.h @@ -8,15 +8,11 @@ #ifndef __LCOMBO_H__ #define __LCOMBO_H__ -//#include <qwidget.h> -//#include <qcombobox.h> - -class QString; -class QWidget; - -//class Q3ListBox; #include <QAbstractItemView> #include <QComboBox> +#include <QVariant> + +class QString; //--------------------------------------------------------- diff --git a/muse2/muse/widgets/midisyncimpl.cpp b/muse2/muse/widgets/midisyncimpl.cpp index 25508c27..75d21ac0 100644 --- a/muse2/muse/widgets/midisyncimpl.cpp +++ b/muse2/muse/widgets/midisyncimpl.cpp @@ -6,10 +6,12 @@ // (C) Copyright 1999/2000 Werner Schweer (ws@seh.de) //========================================================= +#include <QCloseEvent> +#include <QInputDialog> +#include <QMessageBox> #include <QStringList> +#include <QTimer> #include <QTreeWidgetItem> -#include <QInputDialog> -#include <QCloseEvent> #include "app.h" #include "song.h" diff --git a/muse2/muse/widgets/mlabel.cpp b/muse2/muse/widgets/mlabel.cpp index a6c1b183..2b9526d4 100644 --- a/muse2/muse/widgets/mlabel.cpp +++ b/muse2/muse/widgets/mlabel.cpp @@ -6,8 +6,6 @@ //========================================================= #include "mlabel.h" -//Added by qt3to4: -#include <QMouseEvent> void MLabel::mousePressEvent(QMouseEvent*) diff --git a/muse2/muse/widgets/mlabel.h b/muse2/muse/widgets/mlabel.h index 04604041..01bfa788 100644 --- a/muse2/muse/widgets/mlabel.h +++ b/muse2/muse/widgets/mlabel.h @@ -8,9 +8,7 @@ #ifndef __MLABEL_H__ #define __MLABEL_H__ -#include <qlabel.h> -//Added by qt3to4: -#include <QMouseEvent> +#include <QLabel> //--------------------------------------------------------- // MLabel diff --git a/muse2/muse/widgets/mtscale.cpp b/muse2/muse/widgets/mtscale.cpp index 3ed9690a..624c83d4 100644 --- a/muse2/muse/widgets/mtscale.cpp +++ b/muse2/muse/widgets/mtscale.cpp @@ -7,19 +7,11 @@ #include <values.h> -#include <qpainter.h> -#include <qtooltip.h> -#include <qcursor.h> -//Added by qt3to4: -#include <QPixmap> #include <QMouseEvent> -#include <QEvent> +#include <QPainter> + #include "mtscale.h" -#include "midieditor.h" -#include "globals.h" #include "song.h" -#include "../marker/marker.h" -#include "../marker/markerview.h" #include "icons.h" #include "gconfig.h" diff --git a/muse2/muse/widgets/mtscale.h b/muse2/muse/widgets/mtscale.h index c632a24b..7c53d4ff 100644 --- a/muse2/muse/widgets/mtscale.h +++ b/muse2/muse/widgets/mtscale.h @@ -9,11 +9,7 @@ #define __MTSCALE_H__ #include "view.h" -//Added by qt3to4: -#include <QMouseEvent> -#include <QEvent> -class QPainter; //--------------------------------------------------------- // MTScale diff --git a/muse2/muse/widgets/musewidgetsplug.cpp b/muse2/muse/widgets/musewidgetsplug.cpp index 5aea4c81..4ec8b3a2 100644 --- a/muse2/muse/widgets/musewidgetsplug.cpp +++ b/muse2/muse/widgets/musewidgetsplug.cpp @@ -11,10 +11,8 @@ // #include <qwidgetplugin.h> #include <QtCore/QtPlugin> // p4.0.2 #include <QtDesigner/QDesignerCustomWidgetInterface> // - -//Added by qt3to4: #include <QPixmap> -#include "posedit.h" + #include "poslabel.h" #include "pitchedit.h" #include "pitchlabel.h" diff --git a/muse2/muse/widgets/nentry.cpp b/muse2/muse/widgets/nentry.cpp index 7df7b964..77710e5a 100644 --- a/muse2/muse/widgets/nentry.cpp +++ b/muse2/muse/widgets/nentry.cpp @@ -5,22 +5,14 @@ // (C) Copyright 1999 Werner Schweer (ws@seh.de) //========================================================= -#include <QLayout> -#include <qlabel.h> -//Added by qt3to4: +#include <QApplication> #include <QHBoxLayout> -#include <QContextMenuEvent> -#include <QWheelEvent> -#include <QFrame> +#include <QLabel> +#include <QLineEdit> #include <QMouseEvent> -#include <QKeyEvent> +#include <QTimer> + #include "nentry.h" -#include <stdio.h> -#include <qtimer.h> -#include <qevent.h> -#include "globals.h" -#include <qapplication.h> -#include <qcursor.h> #define TIMER1 400 #define TIMER2 200 diff --git a/muse2/muse/widgets/nentry.h b/muse2/muse/widgets/nentry.h index 10eefeee..48343b4a 100644 --- a/muse2/muse/widgets/nentry.h +++ b/muse2/muse/widgets/nentry.h @@ -9,20 +9,11 @@ #define __NENTRY_H__ #include <QFrame> -#include <qlineedit.h> -#include <qstring.h> -//Added by qt3to4: -#include <QWheelEvent> -#include <QEvent> -#include <QHBoxLayout> -#include <QMouseEvent> -#include <QLabel> -#include <QContextMenuEvent> -#include <QKeyEvent> -class QTimer; class QHBoxLayout; class QLabel; +class QLineEdit; +class QTimer; class NentryFilter : public QObject { Q_OBJECT diff --git a/muse2/muse/widgets/noteinfo.cpp b/muse2/muse/widgets/noteinfo.cpp index 2bc17783..4f0e0c8c 100644 --- a/muse2/muse/widgets/noteinfo.cpp +++ b/muse2/muse/widgets/noteinfo.cpp @@ -5,15 +5,12 @@ // (C) Copyright 1999 Werner Schweer (ws@seh.de) //========================================================= -#include "config.h" - -#include "noteinfo.h" -#include <QLayout> #include <QLabel> +#include "config.h" +#include "noteinfo.h" #include "awl/posedit.h" //#include "awl/pitchedit.h" - #include "song.h" #include "globals.h" ///#include "posedit.h" diff --git a/muse2/muse/widgets/noteinfo.h b/muse2/muse/widgets/noteinfo.h index ae32bf8d..cc8fe16d 100644 --- a/muse2/muse/widgets/noteinfo.h +++ b/muse2/muse/widgets/noteinfo.h @@ -7,7 +7,6 @@ #ifndef __NOTE_INFO_H__ #define __NOTE_INFO_H__ -//#include <q3toolbar.h> #include <QToolBar> namespace Awl { @@ -15,11 +14,10 @@ namespace Awl { //class PitchEdit; }; -///class PosEdit; class QSpinBox; + +///class PosEdit; class PitchEdit; -//class QMainWindow; -class QWidget; class Pos; //--------------------------------------------------------- diff --git a/muse2/muse/widgets/pitchlabel.cpp b/muse2/muse/widgets/pitchlabel.cpp index dc5c35ee..91daf09f 100644 --- a/muse2/muse/widgets/pitchlabel.cpp +++ b/muse2/muse/widgets/pitchlabel.cpp @@ -7,8 +7,7 @@ #include <QApplication> #include <QStyle> -//Added by qt3to4: -#include <QLabel> + #include "pitchedit.h" #include "pitchlabel.h" #include "helper.h" diff --git a/muse2/muse/widgets/posedit.cpp b/muse2/muse/widgets/posedit.cpp index d491c235..3accf557 100644 --- a/muse2/muse/widgets/posedit.cpp +++ b/muse2/muse/widgets/posedit.cpp @@ -5,23 +5,17 @@ // (C) Copyright 2001 Werner Schweer (ws@seh.de) //========================================================= -#include <q3rangecontrol.h> -#include <qapplication.h> -#include <qpixmap.h> -#include <qapplication.h> -#include <q3valuelist.h> -#include <qstring.h> -#include <qstyle.h> -//Added by qt3to4: -#include <QTimerEvent> +#include <values.h> + +#include <QApplication> #include <QKeyEvent> -#include <QResizeEvent> #include <QMouseEvent> -#include <QEvent> #include <QPaintEvent> -#include <values.h> -#include <qpainter.h> -#include <qtimer.h> +#include <QPainter> +#include <QResizeEvent> +#include <QString> +#include <QStyle> +#include <QTimerEvent> #include "posedit.h" #include "sig.h" diff --git a/muse2/muse/widgets/poslabel.cpp b/muse2/muse/widgets/poslabel.cpp index 98b790ad..78903a1f 100644 --- a/muse2/muse/widgets/poslabel.cpp +++ b/muse2/muse/widgets/poslabel.cpp @@ -7,10 +7,10 @@ #include <stdlib.h> #include <cmath> + #include <QApplication> #include <QStyle> -//Added by qt3to4: -#include <QLabel> + #include "poslabel.h" ///#include "sig.h" diff --git a/muse2/muse/widgets/poslabel.h b/muse2/muse/widgets/poslabel.h index f16aa64f..29c5297d 100644 --- a/muse2/muse/widgets/poslabel.h +++ b/muse2/muse/widgets/poslabel.h @@ -8,7 +8,6 @@ #ifndef __POSLABEL_H__ #define __POSLABEL_H__ -//#include <qlabel.h> #include <QLabel> //--------------------------------------------------------- diff --git a/muse2/muse/widgets/scldraw.cpp b/muse2/muse/widgets/scldraw.cpp index b72d1000..709e104a 100644 --- a/muse2/muse/widgets/scldraw.cpp +++ b/muse2/muse/widgets/scldraw.cpp @@ -12,11 +12,11 @@ //========================================================= #include <cmath> -#include "scldraw.h" -#include <qpainter.h> -#include <qfontmetrics.h> -#include <qrect.h> + +#include <QPainter> + #include "mmath.h" +#include "scldraw.h" int const ScaleDraw::minLen = 10; diff --git a/muse2/muse/widgets/scldraw.h b/muse2/muse/widgets/scldraw.h index 8ba85600..08a198ca 100644 --- a/muse2/muse/widgets/scldraw.h +++ b/muse2/muse/widgets/scldraw.h @@ -14,15 +14,12 @@ #ifndef __SCLDRAW_H__ #define __SCLDRAW_H__ -#include <qglobal.h> -#include <qstring.h> #include "dimap.h" #include "scldiv.h" -#include <qfont.h> -#include <qrect.h> -#include <qcolor.h> class QPainter; +class QRect; + class AutoScale; class ScaleDraw : public DiMap { diff --git a/muse2/muse/widgets/sclif.h b/muse2/muse/widgets/sclif.h index 86c0ecb6..ec8eafc9 100644 --- a/muse2/muse/widgets/sclif.h +++ b/muse2/muse/widgets/sclif.h @@ -14,7 +14,6 @@ #ifndef __SCALE_IF_H__ #define __SCALE_IF_H__ -#include <qglobal.h> #include "scldraw.h" //--------------------------------------------------------- diff --git a/muse2/muse/widgets/scrollscale.h b/muse2/muse/widgets/scrollscale.h index 5373adcf..32043070 100644 --- a/muse2/muse/widgets/scrollscale.h +++ b/muse2/muse/widgets/scrollscale.h @@ -8,7 +8,7 @@ #ifndef __SCROLLSCALE_H__ #define __SCROLLSCALE_H__ -#include <QWidget> +#include <QSlider> class QBoxLayout; class QLabel; diff --git a/muse2/muse/widgets/siglabel.h b/muse2/muse/widgets/siglabel.h index 2131d593..bf9e53b4 100644 --- a/muse2/muse/widgets/siglabel.h +++ b/muse2/muse/widgets/siglabel.h @@ -11,8 +11,9 @@ #include <al/sig.h> #include <QLabel> -#include <QWheelEvent> -#include <QMouseEvent> + +class QWheelEvent; +class QMouseEvent; //--------------------------------------------------------- // SigLabel diff --git a/muse2/muse/widgets/sigscale.cpp b/muse2/muse/widgets/sigscale.cpp index 2594fecb..74ed0bcb 100644 --- a/muse2/muse/widgets/sigscale.cpp +++ b/muse2/muse/widgets/sigscale.cpp @@ -7,14 +7,10 @@ #include <values.h> -#include <qpainter.h> -#include <qtooltip.h> -//Added by qt3to4: -#include <QEvent> #include <QMouseEvent> +#include <QPainter> #include "al/sig.h" // Tim. - #include "globals.h" #include "midieditor.h" #include "sigscale.h" diff --git a/muse2/muse/widgets/sigscale.h b/muse2/muse/widgets/sigscale.h index d66d9a73..8c9ffea9 100644 --- a/muse2/muse/widgets/sigscale.h +++ b/muse2/muse/widgets/sigscale.h @@ -9,11 +9,7 @@ #define __SIGSCALE_H__ #include "view.h" -//Added by qt3to4: -#include <QEvent> -#include <QMouseEvent> -class QPainter; class MidiEditor; //--------------------------------------------------------- diff --git a/muse2/muse/widgets/slider.cpp b/muse2/muse/widgets/slider.cpp index f422c275..4f68388d 100644 --- a/muse2/muse/widgets/slider.cpp +++ b/muse2/muse/widgets/slider.cpp @@ -1,9 +1,7 @@ #include <cmath> #include "mmath.h" -#include <qdrawutil.h> + #include <QPainter> -#include <QCursor> -#include <QPaintEvent> #include <QResizeEvent> #include "slider.h" diff --git a/muse2/muse/widgets/slider.h b/muse2/muse/widgets/slider.h index 51c819f5..72fcc6ba 100644 --- a/muse2/muse/widgets/slider.h +++ b/muse2/muse/widgets/slider.h @@ -17,8 +17,6 @@ #include "sclif.h" #include "sliderbase.h" #include "scldraw.h" -#include <QResizeEvent> -#include <QPaintEvent> //--------------------------------------------------------- // Slider diff --git a/muse2/muse/widgets/sliderbase.h b/muse2/muse/widgets/sliderbase.h index b7c758a8..8bfac9c3 100644 --- a/muse2/muse/widgets/sliderbase.h +++ b/muse2/muse/widgets/sliderbase.h @@ -15,14 +15,9 @@ #define __SLIDERBASE_H__ #include "drange.h" -#include <QFrame> -#include <QPixmap> -#include <QDateTime> -//#include <qbutton.h> -#include <QtGui> -#include <QWheelEvent> -#include <QMouseEvent> -#include <QTimerEvent> + +#include <QTime> +#include <QWidget> //--------------------------------------------------------- // SliderBase diff --git a/muse2/muse/widgets/swidget.cpp b/muse2/muse/widgets/swidget.cpp index 29cece1e..79f5b845 100644 --- a/muse2/muse/widgets/swidget.cpp +++ b/muse2/muse/widgets/swidget.cpp @@ -6,7 +6,7 @@ //========================================================= #include "swidget.h" -//Added by qt3to4: + #include <QResizeEvent> //--------------------------------------------------------- diff --git a/muse2/muse/widgets/swidget.h b/muse2/muse/widgets/swidget.h index 806fe538..c5f4fd6a 100644 --- a/muse2/muse/widgets/swidget.h +++ b/muse2/muse/widgets/swidget.h @@ -8,9 +8,7 @@ #ifndef __SWIDGET_H__ #define __SWIDGET_H__ -#include <qwidget.h> -//Added by qt3to4: -#include <QResizeEvent> +#include <QWidget> //--------------------------------------------------------- // SWidget diff --git a/muse2/muse/widgets/tb1.cpp b/muse2/muse/widgets/tb1.cpp index 49b4d027..0380b795 100644 --- a/muse2/muse/widgets/tb1.cpp +++ b/muse2/muse/widgets/tb1.cpp @@ -9,12 +9,9 @@ #include <stdio.h> #include <values.h> -#include <QLabel> -#include <QLayout> -#include <QToolButton> +#include <QHeaderView> #include <QTableWidget> -#include <QTableWidgetItem> -#include <QComboBox> +#include <QToolButton> #include "config.h" #include "lcombo.h" diff --git a/muse2/muse/widgets/tb1.h b/muse2/muse/widgets/tb1.h index bbd52469..fbed13b1 100644 --- a/muse2/muse/widgets/tb1.h +++ b/muse2/muse/widgets/tb1.h @@ -8,15 +8,15 @@ #ifndef __TB1_H__ #define __TB1_H__ -#include <QWidget> #include <QToolBar> +class QToolButton; +class QTableWidget; + class PosLabel; class PitchLabel; class Track; class LabelCombo; -class QToolButton; -class QTableWidget; //--------------------------------------------------------- // Toolbar1 diff --git a/muse2/muse/widgets/tempolabel.cpp b/muse2/muse/widgets/tempolabel.cpp index df6e83c3..a26b0b69 100644 --- a/muse2/muse/widgets/tempolabel.cpp +++ b/muse2/muse/widgets/tempolabel.cpp @@ -7,8 +7,7 @@ #include <QApplication> #include <QStyle> -//Added by qt3to4: -#include <QLabel> + #include "tempolabel.h" //--------------------------------------------------------- diff --git a/muse2/muse/widgets/tools.cpp b/muse2/muse/widgets/tools.cpp index 6359270e..32f42ad9 100644 --- a/muse2/muse/widgets/tools.cpp +++ b/muse2/muse/widgets/tools.cpp @@ -7,17 +7,7 @@ #include <stdio.h> #include "tools.h" -//#include <qpixmap.h> -//#include <q3buttongroup.h> -//#include <qtoolbutton.h> -//#include <qtooltip.h> -//#include <q3whatsthis.h> -//#include <q3mainwindow.h> -#include <QPixmap> -#include <QToolButton> - -//Added by qt3to4: #include <QActionGroup> #include "icons.h" diff --git a/muse2/muse/widgets/tools.h b/muse2/muse/widgets/tools.h index 63304a4d..7cc5e62c 100644 --- a/muse2/muse/widgets/tools.h +++ b/muse2/muse/widgets/tools.h @@ -8,14 +8,12 @@ #ifndef __TOOLS_H__ #define __TOOLS_H__ -//#include <q3toolbar.h> #include <QToolBar> -//Added by qt3to4: -#include <QPixmap> -class QAction; class Action; -//class QMainWindow; + +class QAction; +class QPixmap; class QWidget; enum Tool { PointerTool=1, PencilTool=2, RubberTool=4, CutTool=8, diff --git a/muse2/muse/widgets/ttoolbar.cpp b/muse2/muse/widgets/ttoolbar.cpp index fe15f885..774cb34d 100644 --- a/muse2/muse/widgets/ttoolbar.cpp +++ b/muse2/muse/widgets/ttoolbar.cpp @@ -5,7 +5,7 @@ // (C) Copyright 1999 Werner Schweer (ws@seh.de) //========================================================= -#include <qaction.h> +#include <QAction> #include "globals.h" //--------------------------------------------------------- diff --git a/muse2/muse/widgets/ttoolbutton.cpp b/muse2/muse/widgets/ttoolbutton.cpp index 907dfe75..324b5fca 100644 --- a/muse2/muse/widgets/ttoolbutton.cpp +++ b/muse2/muse/widgets/ttoolbutton.cpp @@ -6,7 +6,6 @@ //========================================================= #include <QPainter> -#include <QPixmap> #include <QStyle> #include "ttoolbutton.h" diff --git a/muse2/muse/widgets/ttoolbutton.h b/muse2/muse/widgets/ttoolbutton.h index 0f1f8af2..b4c54401 100644 --- a/muse2/muse/widgets/ttoolbutton.h +++ b/muse2/muse/widgets/ttoolbutton.h @@ -8,7 +8,7 @@ #ifndef __TTOOLBUTTON_H__ #define __TTOOLBUTTON_H__ -#include <qtoolbutton.h> +#include <QToolButton> //--------------------------------------------------------- // TransparentToolButton diff --git a/muse2/muse/widgets/utils.cpp b/muse2/muse/widgets/utils.cpp index ddcc63c5..1bf4ca64 100644 --- a/muse2/muse/widgets/utils.cpp +++ b/muse2/muse/widgets/utils.cpp @@ -7,11 +7,13 @@ #include <stdio.h> #include <stdlib.h> -#include "utils.h" #include <math.h> -#include <QFrame> #include <sys/time.h> +#include <QFrame> + +#include "utils.h" + //--------------------------------------------------------- // curTime //--------------------------------------------------------- diff --git a/muse2/muse/widgets/utils.h b/muse2/muse/widgets/utils.h index 026ba360..654a7834 100644 --- a/muse2/muse/widgets/utils.h +++ b/muse2/muse/widgets/utils.h @@ -1,5 +1,3 @@ -//Added by qt3to4: -#include <QFrame> //========================================================= // MusE // Linux Music Editor @@ -11,9 +9,9 @@ #define __UTILS_H__ class QFrame; +class QString; class QWidget; -#include <qstring.h> extern QString bitmap2String(int bm); extern int string2bitmap(const QString& str); diff --git a/muse2/muse/widgets/view.h b/muse2/muse/widgets/view.h index 5fb5507b..782a3c81 100644 --- a/muse2/muse/widgets/view.h +++ b/muse2/muse/widgets/view.h @@ -9,15 +9,14 @@ #define __VIEW_H__ #include <QWidget> -#include <QPixmap> -#include <QMatrix> -#include <QPainter> -#include <QBrush> -#include <QResizeEvent> -#include <QDropEvent> -#include <QMouseEvent> -#include <QKeyEvent> -#include <QPaintEvent> + +class QDropEvent; +class QKeyEvent; +class QMouseEvent; +class QPaintEvent; +class QPainter; +class QPixmap; +class QResizeEvent; //--------------------------------------------------------- // View diff --git a/muse2/muse/widgets/vscale.h b/muse2/muse/widgets/vscale.h index 79a527ac..100c5fb2 100644 --- a/muse2/muse/widgets/vscale.h +++ b/muse2/muse/widgets/vscale.h @@ -8,8 +8,9 @@ #ifndef __VSCALE_H__ #define __VSCALE_H__ +#include <QWidget> + class QPaintEvent; -class QWidget; //--------------------------------------------------------- // VScale diff --git a/muse2/muse/widgets/wtscale.cpp b/muse2/muse/widgets/wtscale.cpp index 5976670e..2c02b631 100644 --- a/muse2/muse/widgets/wtscale.cpp +++ b/muse2/muse/widgets/wtscale.cpp @@ -7,12 +7,9 @@ #include <values.h> -#include <qpainter.h> -#include <qtooltip.h> -//Added by qt3to4: -#include <QPixmap> -#include <QMouseEvent> -#include <QEvent> +#include <QPainter> +#include <QRect> +#include <QToolTip> #include "wtscale.h" #include "midieditor.h" diff --git a/muse2/muse/widgets/wtscale.h b/muse2/muse/widgets/wtscale.h index ab378296..f12bbc6f 100644 --- a/muse2/muse/widgets/wtscale.h +++ b/muse2/muse/widgets/wtscale.h @@ -9,11 +9,6 @@ #define __MTSCALE_H__ #include "view.h" -//Added by qt3to4: -#include <QMouseEvent> -#include <QEvent> - -class QPainter; //--------------------------------------------------------- // WTScale |