diff --git a/src/libs/vlayout/vabstractpiece.cpp b/src/libs/vlayout/vabstractpiece.cpp index 0bbe77949..0f8bc5108 100644 --- a/src/libs/vlayout/vabstractpiece.cpp +++ b/src/libs/vlayout/vabstractpiece.cpp @@ -382,7 +382,6 @@ QVector VAbstractPiece::EkvPoint(const VSAPoint &p1Line1, const VSAPoin // The easiest, real intersection points.append(CrosPoint); return points; - break; case (QLineF::UnboundedIntersection): { // Most common case const qreal localWidth = MaxLocalSA(p2Line1, width); @@ -480,7 +479,6 @@ QT_WARNING_POP /*If we have correct lines this means lines lie on a line.*/ points.append(bigLine1.p2()); return points; - break; default: break; } diff --git a/src/libs/vmisc/vtapesettings.cpp b/src/libs/vmisc/vtapesettings.cpp index ee0f5f22d..ec74ab40a 100644 --- a/src/libs/vmisc/vtapesettings.cpp +++ b/src/libs/vmisc/vtapesettings.cpp @@ -151,17 +151,13 @@ QChar VTapeSettings::GetCSVSeparator() const { case 0: return QChar('\t'); - break; case 1: return QChar(';'); - break; case 2: return QChar(' '); - break; case 3: default: return QChar(','); - break; } } diff --git a/src/libs/vtools/dialogs/tools/dialogtool.h b/src/libs/vtools/dialogs/tools/dialogtool.h index c61f50c56..0cf0a8b90 100644 --- a/src/libs/vtools/dialogs/tools/dialogtool.h +++ b/src/libs/vtools/dialogs/tools/dialogtool.h @@ -403,10 +403,8 @@ inline T DialogTool::getCurrentCrossPoint(QComboBox *box) const case 1: case 2: return static_cast(value); - break; default: return static_cast(1); - break; } } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 4509cbbed..7f213b1bf 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -181,7 +181,6 @@ QPointF VToolPointFromArcAndTangent::FindPoint(const QPointF &p, const VArc *arc { return p2; } - break; case 1: if (flagP1) { @@ -191,11 +190,9 @@ QPointF VToolPointFromArcAndTangent::FindPoint(const QPointF &p, const VArc *arc { return p2; } - break; case 0: default: - return QPointF(0, 0); - break; + return QPointF(); } break; @@ -207,14 +204,12 @@ QPointF VToolPointFromArcAndTangent::FindPoint(const QPointF &p, const VArc *arc } else { - return QPointF(0, 0); + return QPointF(); } - break; case 3: case 0: default: - return QPointF(0, 0); - break; + return QPointF(); } } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp index 4ea5cb5d4..03d39374c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromcircleandtangent.cpp @@ -166,15 +166,12 @@ QPointF VToolPointFromCircleAndTangent::FindPoint(const QPointF &p, const QPoint { return p2; } - break; case 1: return p1; - break; case 3: case 0: default: - return QPointF(0, 0); - break; + return QPointF(); } } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp index eb487fc10..82681814c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -118,10 +118,8 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF ¢e { case 0: return QPointF(); - break; case 1: return p1; - break; case 2: { const bool flagP1 = VGObject::IsPointOnLineSegment (p1, firstPoint, secondPoint); @@ -150,12 +148,10 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF ¢e return p2; } } - break; } default: qDebug() << "Unxpected value" << res; return QPointF(); - break; } } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index 5a4ed2d80..88b1585f0 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -188,7 +188,6 @@ QPointF VToolPointOfIntersectionArcs::FindPoint(const VArc *arc1, const VArc *ar { return p2; } - break; case 1: if (flagP1) { @@ -198,11 +197,9 @@ QPointF VToolPointOfIntersectionArcs::FindPoint(const VArc *arc1, const VArc *ar { return p2; } - break; case 0: default: - return QPointF(0, 0); - break; + return QPointF(); } break; @@ -214,14 +211,12 @@ QPointF VToolPointOfIntersectionArcs::FindPoint(const VArc *arc1, const VArc *ar } else { - return QPointF(0, 0); + return QPointF(); } - break; case 3: case 0: default: - return QPointF(0, 0); - break; + return QPointF(); } } diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp index f4b5dfea4..71eda82cf 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectioncircles.cpp @@ -178,15 +178,12 @@ QPointF VToolPointOfIntersectionCircles::FindPoint(const QPointF &c1Point, const { return p2; } - break; case 1: return p1; - break; case 3: case 0: default: - return QPointF(0, 0); - break; + return QPointF(); } }