Projects
home:Aloysius:branches:Multimedia
OpenOctaveMidi-unstable
oom-2012-04-03_gcc6.patch
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File oom-2012-04-03_gcc6.patch of Package OpenOctaveMidi-unstable
Index: oom/oom/midiedit/EventCanvas.cpp =================================================================== --- oom.orig/oom/midiedit/EventCanvas.cpp +++ oom/oom/midiedit/EventCanvas.cpp @@ -267,8 +267,8 @@ void EventCanvas::selectAtTick(unsigned while (i != list.end()) { CItem* cur = i->second; - unsigned int curtk = abs(cur->x() + cur->part()->tick() - tick); - unsigned int neartk = abs(nearest->x() + nearest->part()->tick() - tick); + unsigned int curtk = abs(int(cur->x() + cur->part()->tick() - tick)); + unsigned int neartk = abs(int(nearest->x() + nearest->part()->tick() - tick)); if (curtk < neartk) { Index: oom/oom/widgets/pcscale.cpp =================================================================== --- oom.orig/oom/widgets/pcscale.cpp +++ oom/oom/widgets/pcscale.cpp @@ -508,7 +508,7 @@ bool PCScale::selectProgramChange(int x) int minDiff = INT_MAX; foreach(Event event, events) { - int diff = abs((event.tick() + part->tick()) - x); + int diff = abs(int((event.tick() + part->tick()) - x)); if (diff < minDiff) { minDiff = diff; nearest = event; @@ -567,7 +567,7 @@ bool PCScale::selectProgramChange(int x) int minDiff = INT_MAX; foreach(Event event, events) { - int diff = abs((event.tick() + part->tick()) - x); + int diff = abs(int((event.tick() + part->tick()) - x)); if (diff < minDiff) { minDiff = diff; nearest = event; Index: oom/patchcanvas/patchscene.cpp =================================================================== --- oom.orig/patchcanvas/patchscene.cpp +++ oom/patchcanvas/patchscene.cpp @@ -87,7 +87,7 @@ void PatchScene::zoom_fit() } } - views().at(0)->fitInView(min_x, min_y, abs(max_x-min_x), abs(max_y-min_y), Qt::KeepAspectRatio); + views().at(0)->fitInView(min_x, min_y, abs(int(max_x-min_x)), abs(int(max_y-min_y)), Qt::KeepAspectRatio); fixScaleFactor(); } } @@ -203,7 +203,7 @@ void PatchScene::mouseMoveEvent(QGraphic if (pos.y() > orig_point.y()) y = orig_point.y(); else y = pos.y(); - fake_rubberband->setRect(x, y, abs(pos.x()-orig_point.x()), abs(pos.y()-orig_point.y())); + fake_rubberband->setRect(x, y, abs(int(pos.x()-orig_point.x())), abs(int(pos.y()-orig_point.y()))); event->accept(); } else Index: oom/patchcanvas/canvasbezierlinemov.cpp =================================================================== --- oom.orig/patchcanvas/canvasbezierlinemov.cpp +++ oom/patchcanvas/canvasbezierlinemov.cpp @@ -42,14 +42,14 @@ void CanvasBezierLineMov::updateLinePos( { old_x = 0; old_y = 7.5; - mid_x = abs(scenePos.x()-item_x)/2; + mid_x = abs(int(scenePos.x()-item_x))/2; new_x = old_x-mid_x; } else if (port_mode == PORT_MODE_OUTPUT) { old_x = item_width+12; old_y = 7.5; - mid_x = abs(scenePos.x()-(item_x+old_x))/2; + mid_x = abs(int(scenePos.x()-(item_x+old_x)))/2; new_x = old_x+mid_x; } else
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.