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/master | |
parent | 9187899632c14d64b3fae6477b7f941240f912a6 (diff) |
applied WillyFoobar's patch: moved all Q_OBJECT statements to
their appropriate place
Diffstat (limited to 'muse2/muse/master')
-rw-r--r-- | muse2/muse/master/lmaster.h | 4 | ||||
-rw-r--r-- | muse2/muse/master/master.h | 3 | ||||
-rw-r--r-- | muse2/muse/master/masteredit.h | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/muse2/muse/master/lmaster.h b/muse2/muse/master/lmaster.h index 150e8236..b2919b23 100644 --- a/muse2/muse/master/lmaster.h +++ b/muse2/muse/master/lmaster.h @@ -114,13 +114,15 @@ class LMasterSigEventItem : public LMasterLViewItem { //--------------------------------------------------------- class LMaster : public MidiEditor { + Q_OBJECT + QTreeWidget* view; QToolBar* tools; QMenu* menuEdit; enum { CMD_DELETE, CMD_INSERT_SIG, CMD_INSERT_TEMPO, CMD_EDIT_BEAT, CMD_EDIT_VALUE, CMD_INSERT_KEY }; - Q_OBJECT + virtual void closeEvent(QCloseEvent*); void updateList(); void insertTempo(const TEvent*); diff --git a/muse2/muse/master/master.h b/muse2/muse/master/master.h index 52040aeb..2415b15e 100644 --- a/muse2/muse/master/master.h +++ b/muse2/muse/master/master.h @@ -26,6 +26,7 @@ class ScrollScale; //--------------------------------------------------------- class Master : public View { + Q_OBJECT enum DragMode { DRAG_OFF, DRAG_NEW, DRAG_MOVE_START, DRAG_MOVE, DRAG_DELETE, DRAG_COPY_START, DRAG_COPY, DRAG_RESIZE, DRAG_LASSO_START, DRAG_LASSO @@ -37,7 +38,7 @@ class Master : public View { DragMode drag; MidiEditor* editor; - Q_OBJECT + virtual void pdraw(QPainter&, const QRect&); virtual void viewMouseMoveEvent(QMouseEvent* event); virtual void leaveEvent(QEvent*e); diff --git a/muse2/muse/master/masteredit.h b/muse2/muse/master/masteredit.h index 59a5ab05..b2b06291 100644 --- a/muse2/muse/master/masteredit.h +++ b/muse2/muse/master/masteredit.h @@ -40,6 +40,8 @@ class TempoLabel; //--------------------------------------------------------- class MasterEdit : public MidiEditor { + Q_OBJECT + Master* canvas; ScrollScale* hscroll; ScrollScale* vscroll; @@ -62,7 +64,7 @@ class MasterEdit : public MidiEditor { static int _widthInit, _heightInit; static QByteArray _toolbarInit; - Q_OBJECT + virtual void closeEvent(QCloseEvent*); virtual void resizeEvent(QResizeEvent*); virtual void focusOutEvent(QFocusEvent*); |