diff layer/NoteLayer.h @ 1424:2ee77c9974d7 single-point

Toward getting NoteLayer to work with single-point APIs
author Chris Cannam
date Wed, 13 Mar 2019 16:00:55 +0000
parents 6f51297a0250
children f792a5001d80
line wrap: on
line diff
--- a/layer/NoteLayer.h	Fri Mar 08 13:37:30 2019 +0000
+++ b/layer/NoteLayer.h	Wed Mar 13 16:00:55 2019 +0000
@@ -142,9 +142,9 @@
 
     int getDefaultColourHint(bool dark, bool &impose) override;
 
-    NoteModel::PointList getLocalPoints(LayerGeometryProvider *v, int) const;
+    EventVector getLocalPoints(LayerGeometryProvider *v, int) const;
 
-    bool getPointToDrag(LayerGeometryProvider *v, int x, int y, NoteModel::Point &) const;
+    bool getPointToDrag(LayerGeometryProvider *v, int x, int y, Event &) const;
 
     NoteModel *m_model;
     bool m_editing;
@@ -152,13 +152,13 @@
     int m_dragPointY;
     int m_dragStartX;
     int m_dragStartY;
-    NoteModel::Point m_originalPoint;
-    NoteModel::Point m_editingPoint;
+    Event m_originalPoint;
+    Event m_editingPoint;
     NoteModel::EditCommand *m_editingCommand;
     bool m_editIsOpen;
     VerticalScale m_verticalScale;
 
-    typedef std::set<NoteModel::Point, NoteModel::Point::Comparator> NoteSet;
+    typedef std::set<Event> NoteSet;
     NoteSet m_pendingNoteOns;
 
     mutable double m_scaleMinimum;