Menu
▾
▴
[Lmuse-cvs-traffic] muse/muse/widgets drange.h, 1.1.1.1, 1.1.1.1.2.1 hitscale.cpp, 1.3, 1.3.2.1 knob.cpp, 1.3.2.1, 1.3.2.2 mtscale.cpp, 1.8.2.3, 1.8.2.4 musewidgetsplug.cpp, 1.9.2.1, 1.9.2.2 shortcutconfig.cpp, 1.7, 1.7.2.1 sliderbase.cpp, 1.4.2.3, 1.4.2.4
|
From: Robert J. <spa...@us...> - 2007-01-27 14:52:54
|
Update of /cvsroot/lmuse/muse/muse/widgets In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5576/widgets Modified Files: Tag: REL07 drange.h hitscale.cpp knob.cpp mtscale.cpp musewidgetsplug.cpp shortcutconfig.cpp sliderbase.cpp Log Message: Fixes to remove warnings and potential errors, from WillyFoobar Index: knob.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/knob.cpp,v retrieving revision 1.3.2.1 retrieving revision 1.3.2.2 diff -C2 -d -r1.3.2.1 -r1.3.2.2 *** knob.cpp 29 Oct 2006 07:54:52 -0000 1.3.2.1 --- knob.cpp 27 Jan 2007 14:52:43 -0000 1.3.2.2 *************** *** 210,218 **** // Called by QwtSliderBase //------------------------------------------------------------ ! void Knob::getScrollMode( QPoint &p, const Qt::ButtonState &button, int &scrollMode, int &direction) { int dx, dy, r; double arc; r = kRect.width() / 2; --- 210,219 ---- // Called by QwtSliderBase //------------------------------------------------------------ ! void Knob::getScrollMode( QPoint &p, const Qt::ButtonState &/*button*/, int &scrollMode, int &direction)// prevent compiler warning : unsused parameter { int dx, dy, r; double arc; + /*Qt::ButtonState but= button ;*/ // prevent compiler warning : unsused variable r = kRect.width() / 2; Index: sliderbase.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/sliderbase.cpp,v retrieving revision 1.4.2.3 retrieving revision 1.4.2.4 diff -C2 -d -r1.4.2.3 -r1.4.2.4 *** sliderbase.cpp 14 Nov 2006 06:28:37 -0000 1.4.2.3 --- sliderbase.cpp 27 Jan 2007 14:52:43 -0000 1.4.2.4 *************** *** 229,233 **** { int ms = 0; ! double inc = step(); _ignoreMouseMove = false; const Qt::ButtonState button = e->button(); --- 229,233 ---- { int ms = 0; ! /*double inc = step(); */ // prevent compiler warning: unused variable _ignoreMouseMove = false; const Qt::ButtonState button = e->button(); Index: drange.h =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/drange.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.2.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1 *** drange.h 27 Oct 2003 18:54:42 -0000 1.1.1.1 --- drange.h 27 Jan 2007 14:52:43 -0000 1.1.1.1.2.1 *************** *** 49,52 **** --- 49,53 ---- public: DoubleRange(); + virtual ~DoubleRange(){}; double value() const { return d_value; } Index: shortcutconfig.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/shortcutconfig.cpp,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -C2 -d -r1.7 -r1.7.2.1 *** shortcutconfig.cpp 16 Mar 2004 20:54:25 -0000 1.7 --- shortcutconfig.cpp 27 Jan 2007 14:52:43 -0000 1.7.2.1 *************** *** 101,105 **** } ! void ShortcutConfig::closeEvent(QCloseEvent* e) { done(_config_changed); --- 101,105 ---- } ! void ShortcutConfig::closeEvent(QCloseEvent* /*e*/) // prevent compiler warning : unused variable { done(_config_changed); Index: mtscale.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/mtscale.cpp,v retrieving revision 1.8.2.3 retrieving revision 1.8.2.4 diff -C2 -d -r1.8.2.3 -r1.8.2.4 *** mtscale.cpp 29 Dec 2004 00:15:55 -0000 1.8.2.3 --- mtscale.cpp 27 Jan 2007 14:52:43 -0000 1.8.2.4 *************** *** 99,103 **** return; } ! if (opos > tval) { w += opos - tval; x += tval; --- 99,103 ---- return; } ! if (opos > (unsigned int) tval) { //prevent compiler warning: comparison signed/unsigned w += opos - tval; x += tval; Index: hitscale.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/hitscale.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** hitscale.cpp 11 Jan 2004 18:55:37 -0000 1.3 --- hitscale.cpp 27 Jan 2007 14:52:43 -0000 1.3.2.1 *************** *** 37,41 **** if (val == pos[idx]) return; ! int opos = mapx(pos[idx]); pos[idx] = val; if (!isVisible()) --- 37,41 ---- if (val == pos[idx]) return; ! unsigned int opos = mapx(pos[idx]); // in order preventing comparison of sigend & unsigned int ??is this OK? pos[idx] = val; if (!isVisible()) *************** *** 44,48 **** int x = -9; int w = 18; ! if (opos > val) { w += opos - val; x += val; --- 44,48 ---- int x = -9; int w = 18; ! if (opos > val) { //here would be the comparison signed/unsigned w += opos - val; x += val; Index: musewidgetsplug.cpp =================================================================== RCS file: /cvsroot/lmuse/muse/muse/widgets/Attic/musewidgetsplug.cpp,v retrieving revision 1.9.2.1 retrieving revision 1.9.2.2 diff -C2 -d -r1.9.2.1 -r1.9.2.2 *** musewidgetsplug.cpp 12 Dec 2004 19:54:29 -0000 1.9.2.1 --- musewidgetsplug.cpp 27 Jan 2007 14:52:43 -0000 1.9.2.2 *************** *** 122,125 **** --- 122,126 ---- false, // BigTimeVisible; false, // mixerVisible; + false, // markerVisible; // This line was missing 2007-01-08 (willyfoobar) true, // showSplashScreen 1, // canvasShowPartType 1 - names, 2 events *************** *** 128,131 **** --- 129,133 ---- QString(""), // canvasBgPixmap; QString(""), // style + QString("") // externalWavEditor //this line was missing 2007-01-08 (willyfoobar) }; |