From ffad1e0c34c8f9f6e4f865076ec9b97fedc66b57 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 29 May 2024 13:59:41 +0200 Subject: [PATCH] Mod: Fix several compiler warnings --- src/Mod/Material/Gui/DlgInspectAppearance.cpp | 2 -- src/Mod/Part/App/AppPartPy.cpp | 12 +++++++----- src/Mod/Part/App/TopoShapeExpansion.cpp | 5 +++-- src/Mod/PartDesign/App/FeatureRevolution.cpp | 2 +- src/Mod/TechDraw/Gui/QGIViewDimension.cpp | 10 +++++----- src/Mod/TechDraw/Gui/ViewProviderLeader.cpp | 1 + 6 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/Mod/Material/Gui/DlgInspectAppearance.cpp b/src/Mod/Material/Gui/DlgInspectAppearance.cpp index 86b586d5e0..0e8728f9e3 100644 --- a/src/Mod/Material/Gui/DlgInspectAppearance.cpp +++ b/src/Mod/Material/Gui/DlgInspectAppearance.cpp @@ -183,8 +183,6 @@ void DlgInspectAppearance::update(std::vector& views) auto& material = (prop->getValues())[index]; auto* tab = makeAppearanceTab(material); ui->tabAppearance->addTab(tab, QString::number(index)); - - index++; } } } diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index defed8a154..9d94209236 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -901,19 +901,21 @@ private: pcDoc->recompute(); return Py::asObject(pcFeature->getPyObject()); #else - App::Document *pcSrcDoc = nullptr; TopoShape shape; - if (PyObject_TypeCheck(pcObj, &TopoShapePy::Type)) + if (PyObject_TypeCheck(pcObj, &TopoShapePy::Type)) { shape = *static_cast(pcObj)->getTopoShapePtr(); - else if (PyObject_TypeCheck(pcObj, &GeometryPy::Type)) + } + else if (PyObject_TypeCheck(pcObj, &GeometryPy::Type)) { shape = static_cast(pcObj)->getGeometryPtr()->toShape(); + } else if (PyObject_TypeCheck(pcObj, &App::DocumentObjectPy::Type)) { auto obj = static_cast(pcObj)->getDocumentObjectPtr(); - pcSrcDoc = obj->getDocument(); shape = Feature::getTopoShape(obj); } - else + else { throw Py::TypeError("Expects argument of type DocumentObject, Shape, or Geometry"); + } + Part::Feature *pcFeature = static_cast(pcDoc->addObject("Part::Feature", name)); // copy the data pcFeature->Shape.setValue(shape); diff --git a/src/Mod/Part/App/TopoShapeExpansion.cpp b/src/Mod/Part/App/TopoShapeExpansion.cpp index ebf192321b..f5c8d4bd7b 100644 --- a/src/Mod/Part/App/TopoShapeExpansion.cpp +++ b/src/Mod/Part/App/TopoShapeExpansion.cpp @@ -689,6 +689,7 @@ void TopoShape::copyElementMap(const TopoShape& topoShape, const char* op) setMappedChildElements(children); } +#ifndef FC_USE_TNP_FIX namespace { void warnIfLogging() @@ -722,7 +723,7 @@ void checkAndMatchHasher(TopoShape& topoShape1, const TopoShape& topoShape2) } } } // namespace - +#endif // TODO: Refactor mapSubElementTypeForShape to reduce complexity void TopoShape::mapSubElementTypeForShape(const TopoShape& other, @@ -4454,7 +4455,7 @@ TopoShape& TopoShape::makeElementRevolve(const TopoShape& _base, TopoShape& TopoShape::makeElementRevolution(const TopoShape& _base, const gp_Ax1& axis, - double d, + [[maybe_unused]]double d, const TopoDS_Face& supportface, const TopoDS_Face& uptoface, const char* face_maker, diff --git a/src/Mod/PartDesign/App/FeatureRevolution.cpp b/src/Mod/PartDesign/App/FeatureRevolution.cpp index 306a04fe93..e392150fe2 100644 --- a/src/Mod/PartDesign/App/FeatureRevolution.cpp +++ b/src/Mod/PartDesign/App/FeatureRevolution.cpp @@ -194,7 +194,6 @@ App::DocumentObjectExecReturn* Revolution::execute() if (!Ex.More()) { supportface = TopoDS_Face(); } - RevolMode mode = RevolMode::None; #ifdef FC_USE_TNP_FIX // revolve the face to a solid // TopoShape result(0); @@ -205,6 +204,7 @@ App::DocumentObjectExecReturn* Revolution::execute() return new App::DocumentObjectExecReturn("Could not revolve the sketch!"); } #else + RevolMode mode = RevolMode::None; generateRevolution(result, base.getShape(), sketchshape.getShape(), diff --git a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp index 00b2fa8520..92badcf17c 100644 --- a/src/Mod/TechDraw/Gui/QGIViewDimension.cpp +++ b/src/Mod/TechDraw/Gui/QGIViewDimension.cpp @@ -218,9 +218,8 @@ void QGIDatumLabel::snapPosition(QPointF& pos) else if (type == "DistanceY") { ip2 = Base::Vector2d(ip1.x, ip2.y); } - Base::Vector2d imid = (ip1 + ip2) * 0.5; + Base::Vector2d idir = ip2 - ip1; - Base::Vector2d inormal = Base::Vector2d(-idir.y, idir.x); if (type == "Distance" && fabs(dir.x * idir.y - dir.y * idir.x) > Precision::Confusion()) { //dimensions not parallel @@ -2222,6 +2221,10 @@ void QGIViewDimension::drawAreaExecutive(const Base::Vector2d& centerPoint, doub double centerOverhang, int standardStyle, int renderExtent, bool flipArrow) const { + Q_UNUSED(area) + Q_UNUSED(centerOverhang) + Q_UNUSED(renderExtent) + QPainterPath areaPath; Base::Vector2d labelCenter(labelRectangle.GetCenter()); @@ -2718,9 +2721,6 @@ void QGIViewDimension::drawArea(TechDraw::DrawViewDimension* dimension, fromQtGui(mapRectFromItem(datumLabel, datumLabel->boundingRect()))); areaPoint areaPoint = dimension->getAreaPoint(); - double endAngle; - double startRotation; - drawAreaExecutive( fromQtApp(areaPoint.center), areaPoint.area, labelRectangle, 0.0, viewProvider->StandardAndStyle.getValue(), viewProvider->RenderingExtent.getValue(), viewProvider->FlipArrowheads.getValue()); diff --git a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp index 66c3b132eb..28de10104c 100644 --- a/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp +++ b/src/Mod/TechDraw/Gui/ViewProviderLeader.cpp @@ -196,6 +196,7 @@ void ViewProviderLeader::handleChangedPropertyType(Base::XMLReader &reader, cons bool ViewProviderLeader::onDelete(const std::vector & parameters) { + Q_UNUSED(parameters) // a leader line cannot be deleted if it has a child weld symbol // get childs