diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2011-10-07 02:20:29 +0000 |
commit | f16b2037025918e32c5fd90527f76e1102e5ecb9 (patch) | |
tree | 0da3b7a29d13b5b826b291ccb2f2676d2e227b40 /muse2/muse/master/master.h | |
parent | 42039e7f7f215f6008829d8c6be591c998f1228c (diff) |
(hopefully) final huge namespace update.
Diffstat (limited to 'muse2/muse/master/master.h')
-rw-r--r-- | muse2/muse/master/master.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/muse2/muse/master/master.h b/muse2/muse/master/master.h index 4f181755..098df9f0 100644 --- a/muse2/muse/master/master.h +++ b/muse2/muse/master/master.h @@ -33,6 +33,8 @@ class QPoint; class QRect; class QToolBar; +namespace MusEGui { + class MidiEditor; class ScrollScale; @@ -40,7 +42,7 @@ class ScrollScale; // Master //--------------------------------------------------------- -class Master : public MusEWidget::View { +class Master : public MusEGui::View { Q_OBJECT enum DragMode { DRAG_OFF, DRAG_NEW, DRAG_MOVE_START, DRAG_MOVE, DRAG_DELETE, DRAG_COPY_START, DRAG_COPY, @@ -49,7 +51,7 @@ class Master : public MusEWidget::View { ScrollScale* vscroll; unsigned pos[3]; QPoint start; - MusEWidget::Tool tool; + MusEGui::Tool tool; DragMode drag; MidiEditor* editor; @@ -80,5 +82,7 @@ class Master : public MusEWidget::View { Master(MidiEditor*, QWidget* parent, int xmag, int ymag); }; +} // namespace MusEGui + #endif |