From: Robert J. <spa...@us...> - 2007-01-27 14:30:30
|
Update of /cvsroot/lmuse/muse/muse/arranger In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv29227/arranger Modified Files: Tag: REL07 arranger.cpp pcanvas.cpp tlist.cpp tlist.h Log Message: Fixes to remove warnings, from WillyFoobar Index: tlist.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/Attic/tlist.h,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** tlist.h 10 Nov 2006 22:12:05 -0000 1.8.2.3 --- tlist.h 27 Jan 2007 14:30:25 -0000 1.8.2.4 *************** *** 40,43 **** --- 40,44 ---- public: THeaderTip(QWidget * parent) : QToolTip(parent) {} + virtual ~THeaderTip() {} protected: void maybeTip(const QPoint &); Index: tlist.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/Attic/tlist.cpp,v retrieving revision 1.31.2.15 retrieving revision 1.31.2.16 diff -C2 -d -r1.31.2.15 -r1.31.2.16 *** tlist.cpp 4 Jan 2007 00:35:16 -0000 1.31.2.15 --- tlist.cpp 27 Jan 2007 14:30:25 -0000 1.31.2.16 *************** *** 1153,1155 **** } - \ No newline at end of file --- 1153,1154 ---- Index: pcanvas.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/Attic/pcanvas.cpp,v retrieving revision 1.48.2.11 retrieving revision 1.48.2.12 diff -C2 -d -r1.48.2.11 -r1.48.2.12 *** pcanvas.cpp 3 Oct 2006 19:50:08 -0000 1.48.2.11 --- pcanvas.cpp 27 Jan 2007 14:30:25 -0000 1.48.2.12 *************** *** 407,411 **** snappedpos = sigmap.raster(pos, *_raster); } ! int newwidth = snappedpos - p->tick(); if (newwidth == 0) newwidth = sigmap.rasterStep(p->tick(), *_raster); --- 407,411 ---- snappedpos = sigmap.raster(pos, *_raster); } ! unsigned int newwidth = snappedpos - p->tick(); if (newwidth == 0) newwidth = sigmap.rasterStep(p->tick(), *_raster); *************** *** 1182,1186 **** if (type == Note) { int pitch = i->second.pitch(); ! int th = part->track()->height() * 0.75; // only draw on three quarters int hoffset = (part->track()->height() - th ) / 2; // offset from bottom //printf("r.y=%d th = %d pitch=%d\n", r.y(),th,pitch); --- 1182,1186 ---- if (type == Note) { int pitch = i->second.pitch(); ! int th = int(part->track()->height() * 0.75); // only draw on three quarters int hoffset = (part->track()->height() - th ) / 2; // offset from bottom //printf("r.y=%d th = %d pitch=%d\n", r.y(),th,pitch); Index: arranger.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/arranger/arranger.cpp,v retrieving revision 1.33.2.7 retrieving revision 1.33.2.8 diff -C2 -d -r1.33.2.7 -r1.33.2.8 *** arranger.cpp 10 Nov 2006 22:12:04 -0000 1.33.2.7 --- arranger.cpp 27 Jan 2007 14:30:24 -0000 1.33.2.8 *************** *** 745,753 **** //--------------------------------------------------------- ! void WidgetStack::addWidget(QWidget* w, int n) { if (w) w->hide(); ! if (stack.size() <= n) stack.push_back(w); else --- 745,753 ---- //--------------------------------------------------------- ! void WidgetStack::addWidget(QWidget* w, unsigned int n) { if (w) w->hide(); ! if (stack.size() <= n ) stack.push_back(w); else *************** *** 755,761 **** } ! QWidget* WidgetStack::getWidget(int n) { ! if (stack.size() <= n) return 0; return stack[n]; --- 755,761 ---- } ! QWidget* WidgetStack::getWidget(unsigned int n) { ! if (stack.size() <= n ) return 0; return stack[n]; |