From c54deee146518a435960dbc4b28aada33da88a41 Mon Sep 17 00:00:00 2001 From: wmayer Date: Mon, 30 Nov 2020 19:05:37 +0100 Subject: [PATCH] Py2/Qt4: fix build failures and warnings --- src/App/PropertyLinks.cpp | 2 +- src/Gui/DlgParameterImp.cpp | 4 ++-- src/Gui/NavigationStyle.h | 4 ++++ src/Mod/MeshPart/App/AppMeshPartPy.cpp | 2 +- src/Mod/Part/App/Geometry.cpp | 16 ++++++++-------- src/Mod/Part/App/Geometry2d.cpp | 16 ++++++++-------- 6 files changed, 24 insertions(+), 20 deletions(-) diff --git a/src/App/PropertyLinks.cpp b/src/App/PropertyLinks.cpp index e5435eb422..c151d2b4eb 100644 --- a/src/App/PropertyLinks.cpp +++ b/src/App/PropertyLinks.cpp @@ -3951,7 +3951,7 @@ void PropertyXLinkSubList::setPyObject(PyObject *value) Py::Sequence seq(value); std::map > values; try { - for(size_t i=0;isetSortingEnabled(on); paramGroup->sortByColumn(0, Qt::AscendingOrder); paramGroup->header()->setProperty("showSortIndicator", QVariant(on)); -#endif -#if QT_VERSION >= 0x050000 paramValue->setSortingEnabled(on); paramValue->sortByColumn(0, Qt::AscendingOrder); paramValue->header()->setProperty("showSortIndicator", QVariant(on)); +#else + Q_UNUSED(on) #endif } diff --git a/src/Gui/NavigationStyle.h b/src/Gui/NavigationStyle.h index 2c163c708d..34c1bf52c3 100644 --- a/src/Gui/NavigationStyle.h +++ b/src/Gui/NavigationStyle.h @@ -99,7 +99,11 @@ public: Trackball }; +#if QT_VERSION < 0x050000 + enum RotationCenterMode { +#else enum class RotationCenterMode { +#endif WindowCenter = 0, /**< The center of the window */ ScenePointAtCursor = 1, /**< Find the point in the scene at the cursor position. If there is no point then the focal plane is used */ FocalPointAtCursor = 2, /**< Find the point on the focal plane at the cursor position. */ diff --git a/src/Mod/MeshPart/App/AppMeshPartPy.cpp b/src/Mod/MeshPart/App/AppMeshPartPy.cpp index 07463bca91..c33f16daa8 100644 --- a/src/Mod/MeshPart/App/AppMeshPartPy.cpp +++ b/src/Mod/MeshPart/App/AppMeshPartPy.cpp @@ -421,7 +421,7 @@ private: Mesh::MeshObject* mesh = static_cast(m)->getMeshObjectPtr(); std::vector segm; segm.reserve(list.size()); - for (unsigned int i=0; i makeFromTrimmedCurve(const Handle(Geom_Curve)& c, dou { if (c->IsKind(STANDARD_TYPE(Geom_Circle))) { Handle(Geom_Circle) circ = Handle(Geom_Circle)::DownCast(c); - std::unique_ptr arc(new GeomArcOfCircle()); + std::unique_ptr arc(new GeomArcOfCircle()); Handle(Geom_TrimmedCurve) this_arc = Handle(Geom_TrimmedCurve)::DownCast (arc->handle()); Handle(Geom_Circle) this_circ = Handle(Geom_Circle)::DownCast @@ -5064,7 +5064,7 @@ std::unique_ptr makeFromTrimmedCurve(const Handle(Geom_Curve)& c, dou } else if (c->IsKind(STANDARD_TYPE(Geom_Ellipse))) { Handle(Geom_Ellipse) ellp = Handle(Geom_Ellipse)::DownCast(c); - std::unique_ptr arc(new GeomArcOfEllipse()); + std::unique_ptr arc(new GeomArcOfEllipse()); Handle(Geom_TrimmedCurve) this_arc = Handle(Geom_TrimmedCurve)::DownCast (arc->handle()); Handle(Geom_Ellipse) this_ellp = Handle(Geom_Ellipse)::DownCast @@ -5075,7 +5075,7 @@ std::unique_ptr makeFromTrimmedCurve(const Handle(Geom_Curve)& c, dou } else if (c->IsKind(STANDARD_TYPE(Geom_Hyperbola))) { Handle(Geom_Hyperbola) hypr = Handle(Geom_Hyperbola)::DownCast(c); - std::unique_ptr arc(new GeomArcOfHyperbola()); + std::unique_ptr arc(new GeomArcOfHyperbola()); Handle(Geom_TrimmedCurve) this_arc = Handle(Geom_TrimmedCurve)::DownCast (arc->handle()); Handle(Geom_Hyperbola) this_hypr = Handle(Geom_Hyperbola)::DownCast @@ -5086,7 +5086,7 @@ std::unique_ptr makeFromTrimmedCurve(const Handle(Geom_Curve)& c, dou } else if (c->IsKind(STANDARD_TYPE(Geom_Line))) { Handle(Geom_Line) line = Handle(Geom_Line)::DownCast(c); - std::unique_ptr segm(new GeomLineSegment()); + std::unique_ptr segm(new GeomLineSegment()); Handle(Geom_TrimmedCurve) this_segm = Handle(Geom_TrimmedCurve)::DownCast (segm->handle()); Handle(Geom_Line) this_line = Handle(Geom_Line)::DownCast @@ -5097,7 +5097,7 @@ std::unique_ptr makeFromTrimmedCurve(const Handle(Geom_Curve)& c, dou } else if (c->IsKind(STANDARD_TYPE(Geom_Parabola))) { Handle(Geom_Parabola) para = Handle(Geom_Parabola)::DownCast(c); - std::unique_ptr arc(new GeomArcOfParabola()); + std::unique_ptr arc(new GeomArcOfParabola()); Handle(Geom_TrimmedCurve) this_arc = Handle(Geom_TrimmedCurve)::DownCast (arc->handle()); Handle(Geom_Parabola) this_para = Handle(Geom_Parabola)::DownCast @@ -5109,19 +5109,19 @@ std::unique_ptr makeFromTrimmedCurve(const Handle(Geom_Curve)& c, dou else if (c->IsKind(STANDARD_TYPE(Geom_BezierCurve))) { Handle(Geom_BezierCurve) bezier = Handle(Geom_BezierCurve)::DownCast(c->Copy()); bezier->Segment(f, l); - return std::unique_ptr(new GeomBezierCurve(bezier)); + return std::unique_ptr(new GeomBezierCurve(bezier)); } else if (c->IsKind(STANDARD_TYPE(Geom_BSplineCurve))) { Handle(Geom_BSplineCurve) bspline = Handle(Geom_BSplineCurve)::DownCast(c->Copy()); bspline->Segment(f, l); - return std::unique_ptr(new GeomBSplineCurve(bspline)); + return std::unique_ptr(new GeomBSplineCurve(bspline)); } else if (c->IsKind(STANDARD_TYPE(Geom_OffsetCurve))) { Handle(Geom_OffsetCurve) oc = Handle(Geom_OffsetCurve)::DownCast(c); double v = oc->Offset(); gp_Dir dir = oc->Direction(); std::unique_ptr bc(makeFromTrimmedCurve(oc->BasisCurve(), f, l)); - return std::unique_ptr(new GeomOffsetCurve(Handle(Geom_Curve)::DownCast(bc->handle()), v, dir)); + return std::unique_ptr(new GeomOffsetCurve(Handle(Geom_Curve)::DownCast(bc->handle()), v, dir)); } else if (c->IsKind(STANDARD_TYPE(Geom_TrimmedCurve))) { Handle(Geom_TrimmedCurve) trc = Handle(Geom_TrimmedCurve)::DownCast(c); diff --git a/src/Mod/Part/App/Geometry2d.cpp b/src/Mod/Part/App/Geometry2d.cpp index cdd822b8b8..4d2da2c7d7 100644 --- a/src/Mod/Part/App/Geometry2d.cpp +++ b/src/Mod/Part/App/Geometry2d.cpp @@ -2293,7 +2293,7 @@ std::unique_ptr makeFromTrimmedCurve2d(const Handle(Geom2d_Curve)& { if (c->IsKind(STANDARD_TYPE(Geom2d_Circle))) { Handle(Geom2d_Circle) circ = Handle(Geom2d_Circle)::DownCast(c); - std::unique_ptr arc(new Geom2dArcOfCircle()); + std::unique_ptr arc(new Geom2dArcOfCircle()); Handle(Geom2d_TrimmedCurve) this_arc = Handle(Geom2d_TrimmedCurve)::DownCast (arc->handle()); @@ -2305,7 +2305,7 @@ std::unique_ptr makeFromTrimmedCurve2d(const Handle(Geom2d_Curve)& } else if (c->IsKind(STANDARD_TYPE(Geom2d_Ellipse))) { Handle(Geom2d_Ellipse) ellp = Handle(Geom2d_Ellipse)::DownCast(c); - std::unique_ptr arc(new Geom2dArcOfEllipse()); + std::unique_ptr arc(new Geom2dArcOfEllipse()); Handle(Geom2d_TrimmedCurve) this_arc = Handle(Geom2d_TrimmedCurve)::DownCast (arc->handle()); @@ -2317,7 +2317,7 @@ std::unique_ptr makeFromTrimmedCurve2d(const Handle(Geom2d_Curve)& } else if (c->IsKind(STANDARD_TYPE(Geom2d_Hyperbola))) { Handle(Geom2d_Hyperbola) hypr = Handle(Geom2d_Hyperbola)::DownCast(c); - std::unique_ptr arc(new Geom2dArcOfHyperbola()); + std::unique_ptr arc(new Geom2dArcOfHyperbola()); Handle(Geom2d_TrimmedCurve) this_arc = Handle(Geom2d_TrimmedCurve)::DownCast (arc->handle()); @@ -2329,7 +2329,7 @@ std::unique_ptr makeFromTrimmedCurve2d(const Handle(Geom2d_Curve)& } else if (c->IsKind(STANDARD_TYPE(Geom2d_Line))) { Handle(Geom2d_Line) line = Handle(Geom2d_Line)::DownCast(c); - std::unique_ptr segm(new Geom2dLineSegment()); + std::unique_ptr segm(new Geom2dLineSegment()); Handle(Geom2d_TrimmedCurve) this_segm = Handle(Geom2d_TrimmedCurve)::DownCast (segm->handle()); @@ -2341,7 +2341,7 @@ std::unique_ptr makeFromTrimmedCurve2d(const Handle(Geom2d_Curve)& } else if (c->IsKind(STANDARD_TYPE(Geom2d_Parabola))) { Handle(Geom2d_Parabola) para = Handle(Geom2d_Parabola)::DownCast(c); - std::unique_ptr arc(new Geom2dArcOfParabola()); + std::unique_ptr arc(new Geom2dArcOfParabola()); Handle(Geom2d_TrimmedCurve) this_arc = Handle(Geom2d_TrimmedCurve)::DownCast (arc->handle()); @@ -2354,18 +2354,18 @@ std::unique_ptr makeFromTrimmedCurve2d(const Handle(Geom2d_Curve)& else if (c->IsKind(STANDARD_TYPE(Geom2d_BezierCurve))) { Handle(Geom2d_BezierCurve) bezier = Handle(Geom2d_BezierCurve)::DownCast(c->Copy()); bezier->Segment(f, l); - return std::unique_ptr(new Geom2dBezierCurve(bezier)); + return std::unique_ptr(new Geom2dBezierCurve(bezier)); } else if (c->IsKind(STANDARD_TYPE(Geom2d_BSplineCurve))) { Handle(Geom2d_BSplineCurve) bspline = Handle(Geom2d_BSplineCurve)::DownCast(c->Copy()); bspline->Segment(f, l); - return std::unique_ptr(new Geom2dBSplineCurve(bspline)); + return std::unique_ptr(new Geom2dBSplineCurve(bspline)); } else if (c->IsKind(STANDARD_TYPE(Geom2d_OffsetCurve))) { Handle(Geom2d_OffsetCurve) oc = Handle(Geom2d_OffsetCurve)::DownCast(c); double v = oc->Offset(); std::unique_ptr bc(makeFromTrimmedCurve2d(oc->BasisCurve(), f, l)); - return std::unique_ptr(new Geom2dOffsetCurve(Handle(Geom2d_Curve)::DownCast(bc->handle()), v)); + return std::unique_ptr(new Geom2dOffsetCurve(Handle(Geom2d_Curve)::DownCast(bc->handle()), v)); } else if (c->IsKind(STANDARD_TYPE(Geom2d_TrimmedCurve))) { Handle(Geom2d_TrimmedCurve) trc = Handle(Geom2d_TrimmedCurve)::DownCast(c);