diff options
author | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-09 18:30:17 +0000 |
---|---|---|
committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2010-12-09 18:30:17 +0000 |
commit | 9f1903d96cccc7cb2f456d68d31446fa739905f7 (patch) | |
tree | 1c30a654f041dbb7614a2f8d64243b2e40336e0a /muse2/muse/arranger | |
parent | 703f47458a859c9559c13038246dd37529eba6ff (diff) |
Fix compiler warnings, and a typo in the transport max slider value.
Diffstat (limited to 'muse2/muse/arranger')
-rw-r--r-- | muse2/muse/arranger/pcanvas.cpp | 8 | ||||
-rw-r--r-- | muse2/muse/arranger/pcanvas.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/muse2/muse/arranger/pcanvas.cpp b/muse2/muse/arranger/pcanvas.cpp index b1eb22ca..d67eaf99 100644 --- a/muse2/muse/arranger/pcanvas.cpp +++ b/muse2/muse/arranger/pcanvas.cpp @@ -1862,7 +1862,7 @@ void PartCanvas::copy(PartList* pl) // pasteAt //--------------------------------------------------------- -int PartCanvas::pasteAt(const QString& pt, Track* track, int pos, bool clone, bool toTrack) +int PartCanvas::pasteAt(const QString& pt, Track* track, unsigned int pos, bool clone, bool toTrack) { //printf("int PartCanvas::pasteAt(const QString& pt, Track* track, int pos)\n"); QByteArray ba = pt.toLatin1(); @@ -1871,7 +1871,7 @@ int PartCanvas::pasteAt(const QString& pt, Track* track, int pos, bool clone, bo bool firstPart=true; int posOffset=0; //int finalPos=0; - int finalPos = pos; + unsigned int finalPos = pos; int notDone = 0; int done = 0; bool end = false; @@ -2438,7 +2438,7 @@ void PartCanvas::paste(bool clone, bool toTrack, bool doInsert) } int endPos=0; - int startPos=song->vcpos(); + unsigned int startPos=song->vcpos(); if (!txt.isEmpty()) { song->startUndo(); @@ -2459,7 +2459,7 @@ void PartCanvas::paste(bool clone, bool toTrack, bool doInsert) //--------------------------------------------------------- // movePartsToTheRight //--------------------------------------------------------- -void PartCanvas::movePartsTotheRight(int startTicks, int length) +void PartCanvas::movePartsTotheRight(unsigned int startTicks, int length) { // all parts that start after the pasted parts will be moved the entire length of the pasted parts for (iCItem i = items.begin(); i != items.end(); ++i) { diff --git a/muse2/muse/arranger/pcanvas.h b/muse2/muse/arranger/pcanvas.h index 8ce464a5..8b589d5c 100644 --- a/muse2/muse/arranger/pcanvas.h +++ b/muse2/muse/arranger/pcanvas.h @@ -95,8 +95,8 @@ class PartCanvas : public Canvas { void copy(PartList*); void paste(bool clone = false, bool toTrack = true, bool doInsert=false); - int pasteAt(const QString&, Track*, int, bool clone = false, bool toTrack = true); - void movePartsTotheRight(int startTick, int length); + int pasteAt(const QString&, Track*, unsigned int, bool clone = false, bool toTrack = true); + void movePartsTotheRight(unsigned int startTick, int length); //Part* readClone(Xml&, Track*, bool toTrack = true); void drawWavePart(QPainter&, const QRect&, WavePart*, const QRect&); Track* y2Track(int) const; |