From 67d69781f30c8511ec4c87caf3a968eb5530bd48 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 22 Feb 2017 19:27:53 +0200 Subject: [PATCH 1/5] Remove the code after "return". --HG-- branch : develop --- src/libs/vlayout/vabstractpiece.cpp | 2 -- src/libs/vmisc/vtapesettings.cpp | 4 ---- src/libs/vtools/dialogs/tools/dialogtool.h | 2 -- .../toolsinglepoint/vtoolpointfromarcandtangent.cpp | 11 +++-------- .../vtoolpointfromcircleandtangent.cpp | 5 +---- .../toolpoint/toolsinglepoint/vtoolpointofcontact.cpp | 4 ---- .../toolsinglepoint/vtoolpointofintersectionarcs.cpp | 11 +++-------- .../vtoolpointofintersectioncircles.cpp | 5 +---- 8 files changed, 8 insertions(+), 36 deletions(-) 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(); } } From 703a26a5cf4f9a0a4d099cf0ae8dc86906ac27b3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 22 Feb 2017 19:29:30 +0200 Subject: [PATCH 2/5] Remove useless assignment to variable "date". --HG-- branch : develop --- src/libs/vlayout/vlayoutpiece.cpp | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp index b2e73c76d..255f5c34a 100644 --- a/src/libs/vlayout/vlayoutpiece.cpp +++ b/src/libs/vlayout/vlayoutpiece.cpp @@ -115,11 +115,6 @@ VLayoutPiece VLayoutPiece::Create(const VPiece &piece, const VContainer *pattern if (geom.IsVisible() == true) { VAbstractPattern* pDoc = qApp->getCurrentDocument(); - QDate date; - if (pDoc->IsDateVisible() == true) - { - date = QDate::currentDate(); - } det.SetPatternInfo(pDoc, geom, qApp->font(), pattern->size(), pattern->height()); } const VGrainlineGeometry& grainlineGeom = piece.GetGrainlineGeometry(); From 2c6f1d9f641d5a4f880961d76731c04027bb4db1 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 22 Feb 2017 19:34:29 +0200 Subject: [PATCH 3/5] End a switch case with an unconditional break. --HG-- branch : develop --- src/app/tape/mapplication.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/tape/mapplication.cpp b/src/app/tape/mapplication.cpp index 5c22c5fa3..4093d4a14 100644 --- a/src/app/tape/mapplication.cpp +++ b/src/app/tape/mapplication.cpp @@ -192,6 +192,7 @@ inline void noisyFailureMsgHandler(QtMsgType type, const QMessageLogContext &con #endif case QtDebugMsg: Q_UNREACHABLE(); //-V501 + break; default: break; } From 34b70cfb021bfcd042ca8a72bad3346647660dba Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 22 Feb 2017 19:40:50 +0200 Subject: [PATCH 4/5] Add an explicit "return" statement with an expression. --HG-- branch : develop --- .../toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp | 1 + .../toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp | 1 + .../drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp | 1 + .../toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp | 1 + .../tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp index cf9e51ad1..67ab701a5 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/toollinepoint/vtoolshoulderpoint.cpp @@ -137,6 +137,7 @@ QPointF VToolShoulderPoint::FindPoint(const QPointF &p1Line, const QPointF &p2Li return line.p2(); } } + return QPointF(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp index 7f213b1bf..d88f37a2c 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointfromarcandtangent.cpp @@ -211,6 +211,7 @@ QPointF VToolPointFromArcAndTangent::FindPoint(const QPointF &p, const VArc *arc default: return QPointF(); } + 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 82681814c..92b483d6b 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofcontact.cpp @@ -153,6 +153,7 @@ QPointF VToolPointOfContact::FindPoint(const qreal &radius, const QPointF ¢e qDebug() << "Unxpected value" << res; return QPointF(); } + return QPointF(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp index 88b1585f0..a93da2a1f 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtoolpointofintersectionarcs.cpp @@ -218,6 +218,7 @@ QPointF VToolPointOfIntersectionArcs::FindPoint(const VArc *arc1, const VArc *ar default: return QPointF(); } + return QPointF(); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp index cebca4ee5..062ebda38 100644 --- a/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp +++ b/src/libs/vtools/tools/drawTools/toolpoint/toolsinglepoint/vtooltriangle.cpp @@ -228,6 +228,7 @@ QPointF VToolTriangle::FindPoint(const QPointF &axisP1, const QPointF &axisP2, c return line.p2(); } } + return QPointF(); } //--------------------------------------------------------------------------------------------------------------------- From 5a2604d2bd9f7d971b0d21e5aefc1151a84273ad Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 22 Feb 2017 19:49:17 +0200 Subject: [PATCH 5/5] "catch" a specific exception type. --HG-- branch : develop --- src/libs/vlayout/vlayoutpiece.cpp | 3 ++- src/libs/vtools/tools/vtoolseamallowance.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/vlayout/vlayoutpiece.cpp b/src/libs/vlayout/vlayoutpiece.cpp index 255f5c34a..4d9eeadd0 100644 --- a/src/libs/vlayout/vlayoutpiece.cpp +++ b/src/libs/vlayout/vlayoutpiece.cpp @@ -250,8 +250,9 @@ void VLayoutPiece::SetGrainline(const VGrainlineGeometry& geom, const VContainer dLen = cal2.EvalFormula(rPattern.PlainVariables(), qsFormula); dLen = ToPixel(dLen, *rPattern.GetPatternUnit()); } - catch(...) + catch(qmu::QmuParserError &e) { + Q_UNUSED(e); return; } diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index d324fda3f..4d13e909a 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -509,8 +509,9 @@ void VToolSeamAllowance::UpdateGrainline() Calculator cal2; dLength = cal2.EvalFormula(VDataTool::data.PlainVariables(), qsFormula); } - catch(...) + catch(qmu::QmuParserError &e) { + Q_UNUSED(e); m_grainLine->hide(); return; }