diff options
| author | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
|---|---|---|
| committer | Florian Jung <flo@windfisch.org> | 2012-05-28 14:15:52 +0000 |
| commit | d2a88cfaad5ac385fc3c6212c09ad7fbc38e9454 (patch) | |
| tree | 387da0b38255003e1a971629ea0de32273ac3d3c /muse2/muse/midiedit/scoreedit.h | |
| parent | 716f5a5b56a3b7ff59004ef0a1af5f98cb2a691c (diff) | |
merged with release_2_0
Diffstat (limited to 'muse2/muse/midiedit/scoreedit.h')
| -rw-r--r-- | muse2/muse/midiedit/scoreedit.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/muse2/muse/midiedit/scoreedit.h b/muse2/muse/midiedit/scoreedit.h index 584c5f78..09720505 100644 --- a/muse2/muse/midiedit/scoreedit.h +++ b/muse2/muse/midiedit/scoreedit.h @@ -39,7 +39,7 @@ #include <QByteArray> #include <QToolButton> -#include <values.h> +#include <limits.h> #include "noteinfo.h" #include "cobject.h" #include "event.h" @@ -184,7 +184,6 @@ class ScoreEdit : public TopWin void init_shortcuts(); void selection_changed(); void clipboard_changed(); - void focusCanvas(); signals: void isDeleting(MusEGui::TopWin*); @@ -198,9 +197,10 @@ class ScoreEdit : public TopWin void canvas_height_changed(int); void viewport_height_changed(int); void song_changed(int); + void focusCanvas(); public: - ScoreEdit(QWidget* parent = 0, const char* name = 0, unsigned initPos = MAXINT); + ScoreEdit(QWidget* parent = 0, const char* name = 0, unsigned initPos = INT_MAX); ~ScoreEdit(); void writeStatus(int level, MusECore::Xml& xml) const; |