diff options
| author | Florian Jung <flo@windfisch.org> | 2011-06-02 20:00:56 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-06-02 20:00:56 +0000 |
| commit | f1e4528216ba836bd827e74cdf9a3b328be91c83 (patch) | |
| tree | 0a5ca610cd19cdb8521f904734da96ce879ef314 /muse2/muse/waveedit | |
| parent | 9187899632c14d64b3fae6477b7f941240f912a6 (diff) | |
applied WillyFoobar's patch: moved all Q_OBJECT statements to
their appropriate place
Diffstat (limited to 'muse2/muse/waveedit')
| -rw-r--r-- | muse2/muse/waveedit/waveedit.h | 4 | ||||
| -rw-r--r-- | muse2/muse/waveedit/waveview.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/muse2/muse/waveedit/waveedit.h b/muse2/muse/waveedit/waveedit.h index e966a635..1ff8a65b 100644 --- a/muse2/muse/waveedit/waveedit.h +++ b/muse2/muse/waveedit/waveedit.h @@ -33,6 +33,8 @@ class QAction; //--------------------------------------------------------- class WaveEdit : public MidiEditor { + Q_OBJECT + WaveView* view; QSlider* ymag; QToolBar* tools; @@ -49,7 +51,7 @@ class WaveEdit : public MidiEditor { static int _widthInit, _heightInit; static QByteArray _toolbarInit; - Q_OBJECT + virtual void closeEvent(QCloseEvent*); virtual void keyPressEvent(QKeyEvent*); virtual void resizeEvent(QResizeEvent* ev); diff --git a/muse2/muse/waveedit/waveview.h b/muse2/muse/waveedit/waveview.h index c7992952..1a646af9 100644 --- a/muse2/muse/waveedit/waveview.h +++ b/muse2/muse/waveedit/waveview.h @@ -34,6 +34,8 @@ typedef std::list<WaveEventSelection>::iterator iWaveSelection; //--------------------------------------------------------- class WaveView : public View { + Q_OBJECT + MidiEditor* editor; unsigned pos[3]; int yScale; @@ -50,7 +52,6 @@ class WaveView : public View { unsigned selectionStart, selectionStop, dragstartx; - Q_OBJECT virtual void pdraw(QPainter&, const QRect&); virtual void draw(QPainter&, const QRect&); virtual void viewMousePressEvent(QMouseEvent*); |