diff layer/FlexiNoteLayer.h @ 810:b68af2be4545 tonioni

Merge from branch warnfix_no_size_t

--- a/layer/FlexiNoteLayer.h	Mon Jun 16 12:50:27 2014 +0100
+++ b/layer/FlexiNoteLayer.h	Wed Jun 18 13:42:25 2014 +0100
@@ -46,7 +46,7 @@
     virtual QString getFeatureDescription(View *v, QPoint &) const;
 
     virtual bool snapToFeatureFrame(View *v, int &frame,
-                    size_t &resolution,
+                    int &resolution,
                     SnapType snap) const;
 
     virtual void drawStart(View *v, QMouseEvent *);
@@ -70,7 +70,7 @@
 
     virtual bool editOpen(View *v, QMouseEvent *);
 
-    virtual void moveSelection(Selection s, size_t newStartFrame);
+    virtual void moveSelection(Selection s, int newStartFrame);
     virtual void resizeSelection(Selection s, Selection newSize);
     virtual void deleteSelection(Selection s);
     virtual void deleteSelectionInclusive(Selection s);
@@ -138,13 +138,13 @@
      * not be finally added to the layer until the corresponding
      * note-off.
      */
-    void addNoteOn(long frame, int pitch, int velocity);
+    void addNoteOn(int frame, int pitch, int velocity);
     
     /**
      * Add a note-off.  This will cause a note to appear, if and only
      * if there is a matching pending note-on.
      */
-    void addNoteOff(long frame, int pitch);
+    void addNoteOff(int frame, int pitch);
 
     /**
      * Abandon all pending note-on events.
@@ -187,8 +187,8 @@
     int m_dragStartY;
     FlexiNoteModel::Point m_originalPoint;
     FlexiNoteModel::Point m_editingPoint;
-    long m_greatestLeftNeighbourFrame;
-    long m_smallestRightNeighbourFrame;
+    int m_greatestLeftNeighbourFrame;
+    int m_smallestRightNeighbourFrame;
     FlexiNoteModel::EditCommand *m_editingCommand;
     VerticalScale m_verticalScale;
     EditMode m_editMode;