diff options
| author | Florian Jung <flo@windfisch.org> | 2011-06-03 14:24:08 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2011-06-03 14:24:08 +0000 |
| commit | db164b62e3892bd17d1a2eabca76bde3b67072df (patch) | |
| tree | ab71ac4b4f05ab94c008d75ef7052bef5af6cc74 /muse2/muse/master/masteredit.h | |
| parent | def4fdb391f5207ebbe61881416f39f3d896cc5d (diff) | |
| parent | 9187899632c14d64b3fae6477b7f941240f912a6 (diff) | |
merged with trunk and adapted new functions
Diffstat (limited to 'muse2/muse/master/masteredit.h')
| -rw-r--r-- | muse2/muse/master/masteredit.h | 4 |
1 files changed, 3 insertions, 1 deletions
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*); |