From ad72332d2cbd0d22e5d49d9fd60c985e563b17d0 Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget.fedora@gmail.com>
Date: Fri, 9 Sep 2011 03:49:53 +0000
Subject: namespace work (part deux)

---
 muse2/muse/midiedit/dcanvas.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'muse2/muse/midiedit/dcanvas.h')

diff --git a/muse2/muse/midiedit/dcanvas.h b/muse2/muse/midiedit/dcanvas.h
index 5d308426..0256de01 100644
--- a/muse2/muse/midiedit/dcanvas.h
+++ b/muse2/muse/midiedit/dcanvas.h
@@ -43,7 +43,7 @@ class MidiEditor;
 //    ''visual'' Drum Event
 //---------------------------------------------------------
 
-class DEvent : public CItem {
+class DEvent : public MusEWidget::CItem {
    public:
       DEvent(Event e, Part* p);
       };
@@ -66,21 +66,21 @@ class DrumCanvas : public EventCanvas {
 
       
       virtual void drawCanvas(QPainter&, const QRect&);
-      virtual void drawItem(QPainter&, const CItem*, const QRect&);
+      virtual void drawItem(QPainter&, const MusEWidget::CItem*, const QRect&);
       void drawTopItem(QPainter& p, const QRect& rect);
-      virtual void drawMoving(QPainter&, const CItem*, const QRect&);
-      virtual Undo moveCanvasItems(CItemList&, int, int, DragType);
-      virtual UndoOp moveItem(CItem*, const QPoint&, DragType);
-      virtual CItem* newItem(const QPoint&, int);
-      virtual void resizeItem(CItem*, bool, bool);
-      virtual void newItem(CItem*, bool);
-      virtual void newItem(CItem*, bool, bool replace );
-      virtual bool deleteItem(CItem*);
-      CItem* newItem(int tick, int instrument, int velocity);
+      virtual void drawMoving(QPainter&, const MusEWidget::CItem*, const QRect&);
+      virtual Undo moveCanvasItems(MusEWidget::CItemList&, int, int, DragType);
+      virtual UndoOp moveItem(MusEWidget::CItem*, const QPoint&, DragType);
+      virtual MusEWidget::CItem* newItem(const QPoint&, int);
+      virtual void resizeItem(MusEWidget::CItem*, bool, bool);
+      virtual void newItem(MusEWidget::CItem*, bool);
+      virtual void newItem(MusEWidget::CItem*, bool, bool replace );
+      virtual bool deleteItem(MusEWidget::CItem*);
+      MusEWidget::CItem* newItem(int tick, int instrument, int velocity);
 
       int y2pitch(int y) const;
       int pitch2y(int pitch) const;
-      void startDrag(CItem*, bool copymode);
+      void startDrag(MusEWidget::CItem*, bool copymode);
       void dragEnterEvent(QDragEnterEvent* event);
       void dragMoveEvent(QDragMoveEvent*);
       void dragLeaveEvent(QDragLeaveEvent*);
@@ -115,7 +115,7 @@ class DrumCanvas : public EventCanvas {
       DrumCanvas(MidiEditor*, QWidget*, int, int,
          const char* name = 0);
       void cmd(int);
-      virtual void modifySelected(NoteInfo::ValType type, int delta);
+      virtual void modifySelected(MusEWidget::NoteInfo::ValType type, int delta);
       virtual void keyPress(QKeyEvent* event);
       Event *getEventAtCursorPos();
       void selectCursorEvent(Event *ev);
-- 
cgit v1.2.3