summaryrefslogtreecommitdiff
path: root/muse2/muse/midiedit/ecanvas.h
diff options
context:
space:
mode:
authorFlorian Jung <flo@windfisch.org>2012-03-19 15:13:58 +0000
committerFlorian Jung <flo@windfisch.org>2012-03-19 15:13:58 +0000
commit7200b77f549aef6e92170f110aeda8f5433a3dfc (patch)
tree4643738bbfdc59aa34ba3e1f682fac9c348d9bc2 /muse2/muse/midiedit/ecanvas.h
parent2800c0e742bdc9d141f6e8c77dbfba1831e8efb2 (diff)
merged with release_2_0
Diffstat (limited to 'muse2/muse/midiedit/ecanvas.h')
-rw-r--r--muse2/muse/midiedit/ecanvas.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/muse2/muse/midiedit/ecanvas.h b/muse2/muse/midiedit/ecanvas.h
index 349bb92b..454ae3fa 100644
--- a/muse2/muse/midiedit/ecanvas.h
+++ b/muse2/muse/midiedit/ecanvas.h
@@ -57,9 +57,9 @@ class MidiEditor;
class EventCanvas : public Canvas {
Q_OBJECT
+
virtual void leaveEvent(QEvent*e);
virtual void enterEvent(QEvent*e);
-
virtual void mouseMove(QMouseEvent* event);
protected:
@@ -86,7 +86,7 @@ class EventCanvas : public Canvas {
signals:
void pitchChanged(int); // current cursor position
void timeChanged(unsigned);
- void selectionChanged(int, MusECore::Event&, MusECore::Part*);
+ void selectionChanged(int /*tick*/ , MusECore::Event&, MusECore::Part*, bool /*update*/);
void enterCanvas();
public:
@@ -102,7 +102,7 @@ class EventCanvas : public Canvas {
void playEvents(bool flag) { _playEvents = flag; }
void selectAtTick(unsigned int tick);
void viewDropEvent(QDropEvent* event);
- virtual void modifySelected(NoteInfo::ValType, int) {}
+ virtual void modifySelected(NoteInfo::ValType, int /*val*/, bool /*delta_mode*/ = true) {}
virtual void keyPress(QKeyEvent*);
};