From f1e4528216ba836bd827e74cdf9a3b328be91c83 Mon Sep 17 00:00:00 2001 From: Florian Jung Date: Thu, 2 Jun 2011 20:00:56 +0000 Subject: applied WillyFoobar's patch: moved all Q_OBJECT statements to their appropriate place --- muse2/muse/waveedit/waveedit.h | 4 +++- muse2/muse/waveedit/waveview.h | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'muse2/muse/waveedit') 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::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*); -- cgit v1.2.3