Fix some GCC 7 warnings:

* dynamic exception specifications are deprecated [-Wdeprecated]
* this statement may fall through [-Wimplicit-fallthrough=]
This commit is contained in:
Mateusz Skowroński
2017-11-26 19:29:08 +01:00
committed by wmayer
parent 7812099f33
commit dee8769d0e
59 changed files with 241 additions and 236 deletions

View File

@@ -356,8 +356,9 @@ void Area::addWire(CArea &area, const TopoDS_Wire& wire,
Point(center.X(),center.Y())));
break;
}
//fall through
} default: {
}
/* FALLTHRU */
default: {
// Discretize all other type of curves
GCPnts_QuasiUniformDeflection discretizer(curve, deflection,
curve.FirstParameter(), curve.LastParameter());
@@ -3272,9 +3273,9 @@ void Area::toPath(Toolpath &path, const std::list<TopoDS_Shape> &shapes,
AREA_WARN("arc plane not aligned, force discretization");
}
AREA_TRACE("arc discretize " << AREA_XYZ(dir));
//fall through
} default: {
}
/* FALLTHRU */
default: {
// Discretize all other type of curves
GCPnts_QuasiUniformDeflection discretizer(curve, deflection,
curve.FirstParameter(), curve.LastParameter());

View File

@@ -339,14 +339,69 @@ lzfDecompress (const void *const in_data, unsigned int in_len,
}
switch (ctrl)
{
case 32: *op++ = *ip++; case 31: *op++ = *ip++; case 30: *op++ = *ip++; case 29: *op++ = *ip++;
case 28: *op++ = *ip++; case 27: *op++ = *ip++; case 26: *op++ = *ip++; case 25: *op++ = *ip++;
case 24: *op++ = *ip++; case 23: *op++ = *ip++; case 22: *op++ = *ip++; case 21: *op++ = *ip++;
case 20: *op++ = *ip++; case 19: *op++ = *ip++; case 18: *op++ = *ip++; case 17: *op++ = *ip++;
case 16: *op++ = *ip++; case 15: *op++ = *ip++; case 14: *op++ = *ip++; case 13: *op++ = *ip++;
case 12: *op++ = *ip++; case 11: *op++ = *ip++; case 10: *op++ = *ip++; case 9: *op++ = *ip++;
case 8: *op++ = *ip++; case 7: *op++ = *ip++; case 6: *op++ = *ip++; case 5: *op++ = *ip++;
case 4: *op++ = *ip++; case 3: *op++ = *ip++; case 2: *op++ = *ip++; case 1: *op++ = *ip++;
case 32: *op++ = *ip++;
/* FALLTHRU */
case 31: *op++ = *ip++;
/* FALLTHRU */
case 30: *op++ = *ip++;
/* FALLTHRU */
case 29: *op++ = *ip++;
/* FALLTHRU */
case 28: *op++ = *ip++;
/* FALLTHRU */
case 27: *op++ = *ip++;
/* FALLTHRU */
case 26: *op++ = *ip++;
/* FALLTHRU */
case 25: *op++ = *ip++;
/* FALLTHRU */
case 24: *op++ = *ip++;
/* FALLTHRU */
case 23: *op++ = *ip++;
/* FALLTHRU */
case 22: *op++ = *ip++;
/* FALLTHRU */
case 21: *op++ = *ip++;
/* FALLTHRU */
case 20: *op++ = *ip++;
/* FALLTHRU */
case 19: *op++ = *ip++;
/* FALLTHRU */
case 18: *op++ = *ip++;
/* FALLTHRU */
case 17: *op++ = *ip++;
/* FALLTHRU */
case 16: *op++ = *ip++;
/* FALLTHRU */
case 15: *op++ = *ip++;
/* FALLTHRU */
case 14: *op++ = *ip++;
/* FALLTHRU */
case 13: *op++ = *ip++;
/* FALLTHRU */
case 12: *op++ = *ip++;
/* FALLTHRU */
case 11: *op++ = *ip++;
/* FALLTHRU */
case 10: *op++ = *ip++;
/* FALLTHRU */
case 9: *op++ = *ip++;
/* FALLTHRU */
case 8: *op++ = *ip++;
/* FALLTHRU */
case 7: *op++ = *ip++;
/* FALLTHRU */
case 6: *op++ = *ip++;
/* FALLTHRU */
case 5: *op++ = *ip++;
/* FALLTHRU */
case 4: *op++ = *ip++;
/* FALLTHRU */
case 3: *op++ = *ip++;
/* FALLTHRU */
case 2: *op++ = *ip++;
/* FALLTHRU */
case 1: *op++ = *ip++;
}
}
// Back reference
@@ -409,14 +464,23 @@ lzfDecompress (const void *const in_data, unsigned int in_len,
break;
}
case 9: *op++ = *ref++;
/* FALLTHRU */
case 8: *op++ = *ref++;
/* FALLTHRU */
case 7: *op++ = *ref++;
/* FALLTHRU */
case 6: *op++ = *ref++;
/* FALLTHRU */
case 5: *op++ = *ref++;
/* FALLTHRU */
case 4: *op++ = *ref++;
/* FALLTHRU */
case 3: *op++ = *ref++;
/* FALLTHRU */
case 2: *op++ = *ref++;
/* FALLTHRU */
case 1: *op++ = *ref++;
/* FALLTHRU */
case 0: *op++ = *ref++; // two octets more
*op++ = *ref++;
}

View File

@@ -624,6 +624,7 @@ int DrawingPlane::keyboardEvent(const SoKeyboardEvent * const)
void DrawingPlane::drawLineTo(const QPoint &endPoint)
{
Q_UNUSED(endPoint);
return;
#if !defined(HAVE_QT5_OPENGL)
QPainter painter(fbo);