From 22e6e2cd40aaf7407fc58291c2e9c6af2f8bc60a Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 5 Aug 2023 14:26:29 +0200 Subject: [PATCH] Part/PD: modernize C++: redundant void arg --- src/Mod/Part/App/BSplineSurfacePyImp.cpp | 28 +++++++++---------- src/Mod/Part/App/DatumFeature.h | 2 +- src/Mod/Part/App/FeatureChamfer.cpp | 2 +- src/Mod/Part/App/FeatureExtrusion.h | 4 +-- src/Mod/Part/App/FeatureGeometrySet.h | 4 +-- src/Mod/Part/App/FeatureOffset.cpp | 4 +-- src/Mod/Part/App/FeaturePartCircle.cpp | 2 +- src/Mod/Part/App/FeaturePartImportIges.h | 4 +-- src/Mod/Part/App/FeaturePartSection.cpp | 2 +- .../Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp | 8 +++--- src/Mod/Part/App/LineSegmentPyImp.cpp | 6 ++-- src/Mod/Part/App/Part2DObject.cpp | 8 +++--- src/Mod/Part/App/PropertyTopoShape.cpp | 16 +++++------ src/Mod/Part/Gui/CommandParametric.cpp | 12 ++++---- src/Mod/Part/Gui/CrossSections.cpp | 2 +- src/Mod/Part/Gui/TaskAttacher.h | 8 +++--- src/Mod/Part/Gui/ViewProvider.h | 2 +- .../Part/Gui/ViewProviderCircleParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderCompound.cpp | 2 +- src/Mod/Part/Gui/ViewProviderExt.h | 4 +-- src/Mod/Part/Gui/ViewProviderExtrusion.h | 2 +- .../Part/Gui/ViewProviderHelixParametric.cpp | 4 +-- .../Part/Gui/ViewProviderHelixParametric.h | 4 +-- src/Mod/Part/Gui/ViewProviderLineParametric.h | 2 +- src/Mod/Part/Gui/ViewProviderRuledSurface.h | 2 +- .../Part/Gui/ViewProviderSphereParametric.h | 4 +-- src/Mod/Part/Gui/ViewProviderSpline.cpp | 2 +- .../Part/Gui/ViewProviderTorusParametric.cpp | 2 +- .../Part/Gui/ViewProviderTorusParametric.h | 2 +- src/Mod/PartDesign/App/FeatureAddSub.cpp | 4 +-- src/Mod/PartDesign/App/FeatureFillet.h | 4 +-- src/Mod/PartDesign/App/FeaturePyImp.cpp | 2 +- src/Mod/PartDesign/Gui/AppPartDesignGui.cpp | 6 ++-- src/Mod/PartDesign/Gui/CommandPrimitive.cpp | 10 +++---- .../PartDesign/Gui/TaskBooleanParameters.cpp | 6 ++-- .../PartDesign/Gui/TaskChamferParameters.h | 14 +++++----- .../PartDesign/Gui/TaskDraftParameters.cpp | 6 ++-- .../PartDesign/Gui/TaskDressUpParameters.cpp | 2 +- .../PartDesign/Gui/TaskDressUpParameters.h | 6 ++-- .../PartDesign/Gui/TaskExtrudeParameters.h | 28 +++++++++---------- src/Mod/PartDesign/Gui/TaskFeaturePick.h | 4 +-- .../Gui/TaskLinearPatternParameters.cpp | 8 +++--- .../Gui/TaskPolarPatternParameters.cpp | 8 +++--- .../Gui/TaskPrimitiveParameters.cpp | 2 +- .../PartDesign/Gui/TaskScaledParameters.cpp | 6 ++-- .../Gui/TaskThicknessParameters.cpp | 12 ++++---- .../PartDesign/Gui/TaskThicknessParameters.h | 12 ++++---- .../Gui/TaskTransformedParameters.h | 6 ++-- src/Mod/PartDesign/Gui/Utils.cpp | 2 +- src/Mod/PartDesign/Gui/ViewProvider.h | 4 +-- src/Mod/PartDesign/Gui/ViewProviderBody.h | 4 +-- src/Mod/PartDesign/Gui/ViewProviderDatum.h | 8 +++--- src/Mod/PartDesign/Gui/ViewProviderHelix.cpp | 4 +-- src/Mod/PartDesign/Gui/ViewProviderHelix.h | 4 +-- src/Mod/PartDesign/Gui/ViewProviderLoft.h | 4 +-- .../PartDesign/Gui/ViewProviderPrimitive.h | 2 +- .../Gui/ViewProviderShapeBinder.cpp | 2 +- 57 files changed, 163 insertions(+), 163 deletions(-) diff --git a/src/Mod/Part/App/BSplineSurfacePyImp.cpp b/src/Mod/Part/App/BSplineSurfacePyImp.cpp index ef02c34028..4be55ad7c6 100644 --- a/src/Mod/Part/App/BSplineSurfacePyImp.cpp +++ b/src/Mod/Part/App/BSplineSurfacePyImp.cpp @@ -46,7 +46,7 @@ using namespace Part; // returns a string which represents the object e.g. when printed in python -std::string BSplineSurfacePy::representation(void) const +std::string BSplineSurfacePy::representation() const { return ""; } @@ -1553,7 +1553,7 @@ PyObject* BSplineSurfacePy::buildFromNSections(PyObject *args) } } -Py::Long BSplineSurfacePy::getUDegree(void) const +Py::Long BSplineSurfacePy::getUDegree() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); @@ -1561,7 +1561,7 @@ Py::Long BSplineSurfacePy::getUDegree(void) const return Py::Long(deg); } -Py::Long BSplineSurfacePy::getVDegree(void) const +Py::Long BSplineSurfacePy::getVDegree() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); @@ -1569,42 +1569,42 @@ Py::Long BSplineSurfacePy::getVDegree(void) const return Py::Long(deg); } -Py::Long BSplineSurfacePy::getMaxDegree(void) const +Py::Long BSplineSurfacePy::getMaxDegree() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->MaxDegree()); } -Py::Long BSplineSurfacePy::getNbUPoles(void) const +Py::Long BSplineSurfacePy::getNbUPoles() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbUPoles()); } -Py::Long BSplineSurfacePy::getNbVPoles(void) const +Py::Long BSplineSurfacePy::getNbVPoles() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbVPoles()); } -Py::Long BSplineSurfacePy::getNbUKnots(void) const +Py::Long BSplineSurfacePy::getNbUKnots() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbUKnots()); } -Py::Long BSplineSurfacePy::getNbVKnots(void) const +Py::Long BSplineSurfacePy::getNbVKnots() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); return Py::Long(surf->NbVKnots()); } -Py::Object BSplineSurfacePy::getFirstUKnotIndex(void) const +Py::Object BSplineSurfacePy::getFirstUKnotIndex() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); @@ -1612,7 +1612,7 @@ Py::Object BSplineSurfacePy::getFirstUKnotIndex(void) const return Py::Long(index); } -Py::Object BSplineSurfacePy::getLastUKnotIndex(void) const +Py::Object BSplineSurfacePy::getLastUKnotIndex() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); @@ -1620,7 +1620,7 @@ Py::Object BSplineSurfacePy::getLastUKnotIndex(void) const return Py::Long(index); } -Py::Object BSplineSurfacePy::getFirstVKnotIndex(void) const +Py::Object BSplineSurfacePy::getFirstVKnotIndex() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); @@ -1628,7 +1628,7 @@ Py::Object BSplineSurfacePy::getFirstVKnotIndex(void) const return Py::Long(index); } -Py::Object BSplineSurfacePy::getLastVKnotIndex(void) const +Py::Object BSplineSurfacePy::getLastVKnotIndex() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); @@ -1636,7 +1636,7 @@ Py::Object BSplineSurfacePy::getLastVKnotIndex(void) const return Py::Long(index); } -Py::List BSplineSurfacePy::getUKnotSequence(void) const +Py::List BSplineSurfacePy::getUKnotSequence() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); @@ -1658,7 +1658,7 @@ Py::List BSplineSurfacePy::getUKnotSequence(void) const return list; } -Py::List BSplineSurfacePy::getVKnotSequence(void) const +Py::List BSplineSurfacePy::getVKnotSequence() const { Handle(Geom_BSplineSurface) surf = Handle(Geom_BSplineSurface)::DownCast (getGeometryPtr()->handle()); diff --git a/src/Mod/Part/App/DatumFeature.h b/src/Mod/Part/App/DatumFeature.h index ef9b1f7fa4..c7fd739948 100644 --- a/src/Mod/Part/App/DatumFeature.h +++ b/src/Mod/Part/App/DatumFeature.h @@ -43,7 +43,7 @@ public: //short mustExecute(); /// returns the type name of the view provider - const char* getViewProviderName(void) const override = 0; + const char* getViewProviderName() const override = 0; /// Return a shape including Placement representing the datum feature virtual TopoDS_Shape getShape() const; diff --git a/src/Mod/Part/App/FeatureChamfer.cpp b/src/Mod/Part/App/FeatureChamfer.cpp index 39cc04aeee..e6bb6f52e4 100644 --- a/src/Mod/Part/App/FeatureChamfer.cpp +++ b/src/Mod/Part/App/FeatureChamfer.cpp @@ -42,7 +42,7 @@ Chamfer::Chamfer() { } -App::DocumentObjectExecReturn *Chamfer::execute(void) +App::DocumentObjectExecReturn *Chamfer::execute() { App::DocumentObject* link = Base.getValue(); if (!link) diff --git a/src/Mod/Part/App/FeatureExtrusion.h b/src/Mod/Part/App/FeatureExtrusion.h index 69158aae6a..726213ff3a 100644 --- a/src/Mod/Part/App/FeatureExtrusion.h +++ b/src/Mod/Part/App/FeatureExtrusion.h @@ -73,10 +73,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartGui::ViewProviderExtrusion"; } //@} diff --git a/src/Mod/Part/App/FeatureGeometrySet.h b/src/Mod/Part/App/FeatureGeometrySet.h index 7522e023ea..27343bccb5 100644 --- a/src/Mod/Part/App/FeatureGeometrySet.h +++ b/src/Mod/Part/App/FeatureGeometrySet.h @@ -42,9 +42,9 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartGui::ViewProviderGeometrySet"; } //@} diff --git a/src/Mod/Part/App/FeatureOffset.cpp b/src/Mod/Part/App/FeatureOffset.cpp index 9c265c9a78..f8ab7fad9a 100644 --- a/src/Mod/Part/App/FeatureOffset.cpp +++ b/src/Mod/Part/App/FeatureOffset.cpp @@ -76,7 +76,7 @@ short Offset::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Offset::execute(void) +App::DocumentObjectExecReturn *Offset::execute() { App::DocumentObject* source = Source.getValue(); if (!source) @@ -130,7 +130,7 @@ short Offset2D::mustExecute() const return 0; } -App::DocumentObjectExecReturn *Offset2D::execute(void) +App::DocumentObjectExecReturn *Offset2D::execute() { App::DocumentObject* source = Source.getValue(); diff --git a/src/Mod/Part/App/FeaturePartCircle.cpp b/src/Mod/Part/App/FeaturePartCircle.cpp index c1d62f5282..4b0373c6ab 100644 --- a/src/Mod/Part/App/FeaturePartCircle.cpp +++ b/src/Mod/Part/App/FeaturePartCircle.cpp @@ -61,7 +61,7 @@ short Circle::mustExecute() const return Part::Primitive::mustExecute(); } -App::DocumentObjectExecReturn *Circle::execute(void) +App::DocumentObjectExecReturn *Circle::execute() { gp_Circ circle; circle.SetRadius(this->Radius.getValue()); diff --git a/src/Mod/Part/App/FeaturePartImportIges.h b/src/Mod/Part/App/FeaturePartImportIges.h index 695663104c..db0b3fff92 100644 --- a/src/Mod/Part/App/FeaturePartImportIges.h +++ b/src/Mod/Part/App/FeaturePartImportIges.h @@ -41,10 +41,10 @@ public: /** @name methods override Feature */ //@{ /// recalculate the Feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the ViewProvider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartGui::ViewProviderImport"; } //@} diff --git a/src/Mod/Part/App/FeaturePartSection.cpp b/src/Mod/Part/App/FeaturePartSection.cpp index 9ae4fc7ef8..04fd6c7431 100644 --- a/src/Mod/Part/App/FeaturePartSection.cpp +++ b/src/Mod/Part/App/FeaturePartSection.cpp @@ -34,7 +34,7 @@ using namespace Part; PROPERTY_SOURCE(Part::Section, Part::Boolean) -Section::Section(void) +Section::Section() { ADD_PROPERTY_TYPE(Approximation,(false),"Section",App::Prop_None,"Approximate the output edges"); } diff --git a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp index 793f27e1fe..c4807ecde9 100644 --- a/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/ArcOfHyperbola2dPyImp.cpp @@ -39,7 +39,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string ArcOfHyperbola2dPy::representation(void) const +std::string ArcOfHyperbola2dPy::representation() const { return ""; } @@ -86,7 +86,7 @@ int ArcOfHyperbola2dPy::PyInit(PyObject* args, PyObject* /*kwds*/) return -1; } -Py::Float ArcOfHyperbola2dPy::getMajorRadius(void) const +Py::Float ArcOfHyperbola2dPy::getMajorRadius() const { return Py::Float(getGeom2dArcOfHyperbolaPtr()->getMajorRadius()); } @@ -96,7 +96,7 @@ void ArcOfHyperbola2dPy::setMajorRadius(Py::Float arg) getGeom2dArcOfHyperbolaPtr()->setMajorRadius((double)arg); } -Py::Float ArcOfHyperbola2dPy::getMinorRadius(void) const +Py::Float ArcOfHyperbola2dPy::getMinorRadius() const { return Py::Float(getGeom2dArcOfHyperbolaPtr()->getMinorRadius()); } @@ -106,7 +106,7 @@ void ArcOfHyperbola2dPy::setMinorRadius(Py::Float arg) getGeom2dArcOfHyperbolaPtr()->setMinorRadius((double)arg); } -Py::Object ArcOfHyperbola2dPy::getHyperbola(void) const +Py::Object ArcOfHyperbola2dPy::getHyperbola() const { Handle(Geom2d_TrimmedCurve) trim = Handle(Geom2d_TrimmedCurve)::DownCast (getGeom2dArcOfHyperbolaPtr()->handle()); diff --git a/src/Mod/Part/App/LineSegmentPyImp.cpp b/src/Mod/Part/App/LineSegmentPyImp.cpp index 42e7d18444..073b3fb7f0 100644 --- a/src/Mod/Part/App/LineSegmentPyImp.cpp +++ b/src/Mod/Part/App/LineSegmentPyImp.cpp @@ -41,7 +41,7 @@ using namespace Part; extern const char* gce_ErrorStatusText(gce_ErrorType et); // returns a string which represents the object e.g. when printed in python -std::string LineSegmentPy::representation(void) const +std::string LineSegmentPy::representation() const { std::stringstream str; Base::Vector3d start = getGeomLineSegmentPtr()->getStartPoint(); @@ -198,7 +198,7 @@ PyObject* LineSegmentPy::setParameterRange(PyObject *args) Py_Return; } -Py::Object LineSegmentPy::getStartPoint(void) const +Py::Object LineSegmentPy::getStartPoint() const { Handle(Geom_TrimmedCurve) this_curve = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); @@ -254,7 +254,7 @@ void LineSegmentPy::setStartPoint(Py::Object arg) } } -Py::Object LineSegmentPy::getEndPoint(void) const +Py::Object LineSegmentPy::getEndPoint() const { Handle(Geom_TrimmedCurve) this_curve = Handle(Geom_TrimmedCurve)::DownCast (this->getGeomLineSegmentPtr()->handle()); diff --git a/src/Mod/Part/App/Part2DObject.cpp b/src/Mod/Part/App/Part2DObject.cpp index d3ae46145f..97a60bee80 100644 --- a/src/Mod/Part/App/Part2DObject.cpp +++ b/src/Mod/Part/App/Part2DObject.cpp @@ -68,7 +68,7 @@ Part2DObject::Part2DObject() } -App::DocumentObjectExecReturn *Part2DObject::execute(void) +App::DocumentObjectExecReturn *Part2DObject::execute() { return Feature::execute(); } @@ -83,7 +83,7 @@ void Part2DObject::transformPlacement(const Base::Placement &transform) } } -int Part2DObject::getAxisCount(void) const +int Part2DObject::getAxisCount() const { return 0; } @@ -286,10 +286,10 @@ void Part2DObject::handleChangedPropertyName(Base::XMLReader &reader, namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(Part::Part2DObjectPython, Part::Part2DObject) - template<> const char* Part::Part2DObjectPython::getViewProviderName(void) const { + template<> const char* Part::Part2DObjectPython::getViewProviderName() const { return "PartGui::ViewProvider2DObjectPython"; } - template<> PyObject* Part::Part2DObjectPython::getPyObject(void) { + template<> PyObject* Part::Part2DObjectPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new FeaturePythonPyT(this),true); diff --git a/src/Mod/Part/App/PropertyTopoShape.cpp b/src/Mod/Part/App/PropertyTopoShape.cpp index fc473a1b74..fc12ddd744 100644 --- a/src/Mod/Part/App/PropertyTopoShape.cpp +++ b/src/Mod/Part/App/PropertyTopoShape.cpp @@ -75,7 +75,7 @@ void PropertyPartShape::setValue(const TopoDS_Shape& sh) hasSetValue(); } -const TopoDS_Shape& PropertyPartShape::getValue(void)const +const TopoDS_Shape& PropertyPartShape::getValue() const { return _Shape.getShape(); } @@ -133,7 +133,7 @@ void PropertyPartShape::transformGeometry(const Base::Matrix4D &rclTrf) hasSetValue(); } -PyObject *PropertyPartShape::getPyObject(void) +PyObject *PropertyPartShape::getPyObject() { Base::PyObjectBase* prop = static_cast(_Shape.getPyObject()); if (prop) @@ -154,7 +154,7 @@ void PropertyPartShape::setPyObject(PyObject *value) } } -App::Property *PropertyPartShape::Copy(void) const +App::Property *PropertyPartShape::Copy() const { PropertyPartShape *prop = new PropertyPartShape(); prop->_Shape = this->_Shape; @@ -173,7 +173,7 @@ void PropertyPartShape::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyPartShape::getMemSize (void) const +unsigned int PropertyPartShape::getMemSize () const { return _Shape.getMemSize(); } @@ -435,7 +435,7 @@ void PropertyShapeHistory::setValues(const std::vector& values) hasSetValue(); } -PyObject *PropertyShapeHistory::getPyObject(void) +PyObject *PropertyShapeHistory::getPyObject() { return Py::new_reference_to(Py::None()); } @@ -460,7 +460,7 @@ void PropertyShapeHistory::RestoreDocFile(Base::Reader &) { } -App::Property *PropertyShapeHistory::Copy(void) const +App::Property *PropertyShapeHistory::Copy() const { PropertyShapeHistory *p= new PropertyShapeHistory(); p->_lValueList = _lValueList; @@ -503,7 +503,7 @@ void PropertyFilletEdges::setValues(const std::vector& values) hasSetValue(); } -PyObject *PropertyFilletEdges::getPyObject(void) +PyObject *PropertyFilletEdges::getPyObject() { Py::List list(getSize()); std::vector::const_iterator it; @@ -576,7 +576,7 @@ void PropertyFilletEdges::RestoreDocFile(Base::Reader &reader) setValues(values); } -App::Property *PropertyFilletEdges::Copy(void) const +App::Property *PropertyFilletEdges::Copy() const { PropertyFilletEdges *p= new PropertyFilletEdges(); p->_lValueList = _lValueList; diff --git a/src/Mod/Part/Gui/CommandParametric.cpp b/src/Mod/Part/Gui/CommandParametric.cpp index 660bec3b6e..815b69617e 100644 --- a/src/Mod/Part/Gui/CommandParametric.cpp +++ b/src/Mod/Part/Gui/CommandParametric.cpp @@ -86,7 +86,7 @@ void CmdPartCylinder::activated(int iMsg) runCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); } -bool CmdPartCylinder::isActive(void) +bool CmdPartCylinder::isActive() { if (getActiveGuiDocument()) return true; @@ -128,7 +128,7 @@ void CmdPartBox::activated(int iMsg) runCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); } -bool CmdPartBox::isActive(void) +bool CmdPartBox::isActive() { if (getActiveGuiDocument()) return true; @@ -170,7 +170,7 @@ void CmdPartSphere::activated(int iMsg) runCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); } -bool CmdPartSphere::isActive(void) +bool CmdPartSphere::isActive() { if (getActiveGuiDocument()) return true; @@ -212,7 +212,7 @@ void CmdPartCone::activated(int iMsg) runCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); } -bool CmdPartCone::isActive(void) +bool CmdPartCone::isActive() { if (getActiveGuiDocument()) return true; @@ -254,7 +254,7 @@ void CmdPartTorus::activated(int iMsg) runCommand(Gui, "Gui.SendMsgToActiveView(\"ViewFit\")"); } -bool CmdPartTorus::isActive(void) +bool CmdPartTorus::isActive() { if (getActiveGuiDocument()) return true; @@ -265,7 +265,7 @@ bool CmdPartTorus::isActive(void) //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ -void CreateParamPartCommands(void) +void CreateParamPartCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommand(new CmdPartCylinder()); diff --git a/src/Mod/Part/Gui/CrossSections.cpp b/src/Mod/Part/Gui/CrossSections.cpp index 1f42410aaf..371d2948d2 100644 --- a/src/Mod/Part/Gui/CrossSections.cpp +++ b/src/Mod/Part/Gui/CrossSections.cpp @@ -91,7 +91,7 @@ public: { return ""; } - std::vector getDisplayModes(void) const override + std::vector getDisplayModes() const override { return std::vector(); } diff --git a/src/Mod/Part/Gui/TaskAttacher.h b/src/Mod/Part/Gui/TaskAttacher.h index 4c230380dc..49a0de4ea8 100644 --- a/src/Mod/Part/Gui/TaskAttacher.h +++ b/src/Mod/Part/Gui/TaskAttacher.h @@ -61,7 +61,7 @@ public: QString text = QString::fromLatin1("Attachment"), VisibilityFunction func = 0); ~TaskAttacher() override; - bool getFlip(void) const; + bool getFlip() const; /** * @brief getActiveMapMode returns either the default mode for selected @@ -89,7 +89,7 @@ private Q_SLOTS: void onButtonRef2(const bool checked = true); void onButtonRef3(const bool checked = true); void onButtonRef4(const bool checked = true); - void onModeSelect(void); + void onModeSelect(); void visibilityAutomation(bool opening_not_closing); protected: @@ -168,11 +168,11 @@ public: /// is called by the framework if the dialog is rejected (Cancel) bool reject() override; /// is called by the framework if the user presses the help button - bool isAllowedAlterDocument(void) const override + bool isAllowedAlterDocument() const override { return false; } /// returns for Close and Help button - QDialogButtonBox::StandardButtons getStandardButtons(void) const override + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } protected: diff --git a/src/Mod/Part/Gui/ViewProvider.h b/src/Mod/Part/Gui/ViewProvider.h index 8e224b8a3c..d5f294e41d 100644 --- a/src/Mod/Part/Gui/ViewProvider.h +++ b/src/Mod/Part/Gui/ViewProvider.h @@ -51,7 +51,7 @@ public: ViewProviderPart(); /// destructor ~ViewProviderPart() override; - bool doubleClicked(void) override; + bool doubleClicked() override; protected: void applyColor(const Part::ShapeHistory& hist, diff --git a/src/Mod/Part/Gui/ViewProviderCircleParametric.h b/src/Mod/Part/Gui/ViewProviderCircleParametric.h index 3800065666..4a1c5df693 100644 --- a/src/Mod/Part/Gui/ViewProviderCircleParametric.h +++ b/src/Mod/Part/Gui/ViewProviderCircleParametric.h @@ -46,7 +46,7 @@ public: /// destructor ~ViewProviderCircleParametric() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderCompound.cpp b/src/Mod/Part/Gui/ViewProviderCompound.cpp index 7504eed898..d7969a1aae 100644 --- a/src/Mod/Part/Gui/ViewProviderCompound.cpp +++ b/src/Mod/Part/Gui/ViewProviderCompound.cpp @@ -46,7 +46,7 @@ ViewProviderCompound::~ViewProviderCompound() { } -std::vector ViewProviderCompound::claimChildren(void) const +std::vector ViewProviderCompound::claimChildren() const { return static_cast(getObject())->Links.getValues(); } diff --git a/src/Mod/Part/Gui/ViewProviderExt.h b/src/Mod/Part/Gui/ViewProviderExt.h index 01b75aaa2a..bdd044e6fb 100644 --- a/src/Mod/Part/Gui/ViewProviderExt.h +++ b/src/Mod/Part/Gui/ViewProviderExt.h @@ -92,7 +92,7 @@ public: void attach(App::DocumentObject *) override; void setDisplayMode(const char* ModeName) override; /// returns a list of all possible modes - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; /// Update the view representation void reload(); /// If no other task is pending it opens a dialog to allow to change face colors @@ -107,7 +107,7 @@ public: */ //@{ /// indicates if the ViewProvider use the new Selection model - bool useNewSelectionModel(void) const override {return true;} + bool useNewSelectionModel() const override {return true;} /// return a hit element to the selection path or 0 std::string getElement(const SoDetail*) const override; SoDetail* getDetail(const char*) const override; diff --git a/src/Mod/Part/Gui/ViewProviderExtrusion.h b/src/Mod/Part/Gui/ViewProviderExtrusion.h index d8e2816e0b..44ca9b538d 100644 --- a/src/Mod/Part/Gui/ViewProviderExtrusion.h +++ b/src/Mod/Part/Gui/ViewProviderExtrusion.h @@ -40,7 +40,7 @@ public: ~ViewProviderExtrusion() override; /// grouping handling - std::vector claimChildren(void)const override; + std::vector claimChildren() const override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp b/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp index 6f5b9553e1..4ebb9a9562 100644 --- a/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.cpp @@ -46,7 +46,7 @@ ViewProviderHelixParametric::~ViewProviderHelixParametric() } -std::vector ViewProviderHelixParametric::getDisplayModes(void) const +std::vector ViewProviderHelixParametric::getDisplayModes() const { // add your own modes std::vector StrList; @@ -77,7 +77,7 @@ ViewProviderSpiralParametric::~ViewProviderSpiralParametric() } -std::vector ViewProviderSpiralParametric::getDisplayModes(void) const +std::vector ViewProviderSpiralParametric::getDisplayModes() const { // add your own modes std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderHelixParametric.h b/src/Mod/Part/Gui/ViewProviderHelixParametric.h index 368c954be7..8a567ed0a3 100644 --- a/src/Mod/Part/Gui/ViewProviderHelixParametric.h +++ b/src/Mod/Part/Gui/ViewProviderHelixParametric.h @@ -39,7 +39,7 @@ public: ViewProviderHelixParametric(); /// destructor ~ViewProviderHelixParametric() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; void setupContextMenu(QMenu*, QObject*, const char*) override; private: @@ -55,7 +55,7 @@ public: ViewProviderSpiralParametric(); /// destructor ~ViewProviderSpiralParametric() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; void setupContextMenu(QMenu*, QObject*, const char*) override; private: diff --git a/src/Mod/Part/Gui/ViewProviderLineParametric.h b/src/Mod/Part/Gui/ViewProviderLineParametric.h index 2c1b8406fb..ca4c8117f5 100644 --- a/src/Mod/Part/Gui/ViewProviderLineParametric.h +++ b/src/Mod/Part/Gui/ViewProviderLineParametric.h @@ -46,7 +46,7 @@ public: /// destructor ~ViewProviderLineParametric() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/Part/Gui/ViewProviderRuledSurface.h b/src/Mod/Part/Gui/ViewProviderRuledSurface.h index c8ce24edf4..a0ddd06913 100644 --- a/src/Mod/Part/Gui/ViewProviderRuledSurface.h +++ b/src/Mod/Part/Gui/ViewProviderRuledSurface.h @@ -39,7 +39,7 @@ public: /// destructor ~ViewProviderRuledSurface() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; std::vector claimChildren() const override; void updateData(const App::Property*) override; bool onDelete(const std::vector &) override; diff --git a/src/Mod/Part/Gui/ViewProviderSphereParametric.h b/src/Mod/Part/Gui/ViewProviderSphereParametric.h index fd4968bec9..08cc382e63 100644 --- a/src/Mod/Part/Gui/ViewProviderSphereParametric.h +++ b/src/Mod/Part/Gui/ViewProviderSphereParametric.h @@ -38,7 +38,7 @@ public: /// destructor ~ViewProviderSphereParametric() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; protected: @@ -53,7 +53,7 @@ public: ViewProviderEllipsoid(); /// destructor ~ViewProviderEllipsoid() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; }; } // namespace PartGui diff --git a/src/Mod/Part/Gui/ViewProviderSpline.cpp b/src/Mod/Part/Gui/ViewProviderSpline.cpp index 5e747dce35..8d4d2b6b07 100644 --- a/src/Mod/Part/Gui/ViewProviderSpline.cpp +++ b/src/Mod/Part/Gui/ViewProviderSpline.cpp @@ -68,7 +68,7 @@ ViewProviderSpline::~ViewProviderSpline() { } -QIcon ViewProviderSpline::getIcon(void) const +QIcon ViewProviderSpline::getIcon() const { return Gui::BitmapFactory().pixmap(sPixmap); } diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp index 7c2ed137ba..451613a6d1 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.cpp @@ -48,7 +48,7 @@ ViewProviderTorusParametric::~ViewProviderTorusParametric() // ********************************************************************************** -std::vector ViewProviderTorusParametric::getDisplayModes(void) const +std::vector ViewProviderTorusParametric::getDisplayModes() const { // get the modes of the father std::vector StrList; diff --git a/src/Mod/Part/Gui/ViewProviderTorusParametric.h b/src/Mod/Part/Gui/ViewProviderTorusParametric.h index 836b8c0f7b..fe50673567 100644 --- a/src/Mod/Part/Gui/ViewProviderTorusParametric.h +++ b/src/Mod/Part/Gui/ViewProviderTorusParametric.h @@ -46,7 +46,7 @@ public: /// destructor ~ViewProviderTorusParametric() override; - std::vector getDisplayModes(void) const override; + std::vector getDisplayModes() const override; protected: diff --git a/src/Mod/PartDesign/App/FeatureAddSub.cpp b/src/Mod/PartDesign/App/FeatureAddSub.cpp index a5e21257ed..4c3581369e 100644 --- a/src/Mod/PartDesign/App/FeatureAddSub.cpp +++ b/src/Mod/PartDesign/App/FeatureAddSub.cpp @@ -97,10 +97,10 @@ void FeatureAddSub::getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &s namespace App { /// @cond DOXERR PROPERTY_SOURCE_TEMPLATE(PartDesign::FeatureAddSubPython, PartDesign::FeatureAddSub) -template<> const char* PartDesign::FeatureAddSubPython::getViewProviderName(void) const { +template<> const char* PartDesign::FeatureAddSubPython::getViewProviderName() const { return "PartDesignGui::ViewProviderPython"; } -template<> PyObject* PartDesign::FeatureAddSubPython::getPyObject(void) { +template<> PyObject* PartDesign::FeatureAddSubPython::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 PythonObject = Py::Object(new FeaturePythonPyT(this),true); diff --git a/src/Mod/PartDesign/App/FeatureFillet.h b/src/Mod/PartDesign/App/FeatureFillet.h index a1f37d0eea..0bc2f54157 100644 --- a/src/Mod/PartDesign/App/FeatureFillet.h +++ b/src/Mod/PartDesign/App/FeatureFillet.h @@ -44,10 +44,10 @@ public: /** @name methods override feature */ //@{ /// recalculate the feature - App::DocumentObjectExecReturn *execute(void) override; + App::DocumentObjectExecReturn *execute() override; short mustExecute() const override; /// returns the type name of the view provider - const char* getViewProviderName(void) const override { + const char* getViewProviderName() const override { return "PartDesignGui::ViewProviderFillet"; } //@} diff --git a/src/Mod/PartDesign/App/FeaturePyImp.cpp b/src/Mod/PartDesign/App/FeaturePyImp.cpp index 639154fb5b..d010a57c0b 100644 --- a/src/Mod/PartDesign/App/FeaturePyImp.cpp +++ b/src/Mod/PartDesign/App/FeaturePyImp.cpp @@ -30,7 +30,7 @@ using namespace PartDesign; // returns a string which represent the object e.g. when printed in python -std::string FeaturePy::representation(void) const +std::string FeaturePy::representation() const { App::DocumentObject* object = this->getFeaturePtr(); std::stringstream str; diff --git a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp index 4a66c9be08..573b30823d 100644 --- a/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp +++ b/src/Mod/PartDesign/Gui/AppPartDesignGui.cpp @@ -64,9 +64,9 @@ // use a different name to CreateCommand() -void CreatePartDesignCommands(void); -void CreatePartDesignBodyCommands(void); -void CreatePartDesignPrimitiveCommands(void); +void CreatePartDesignCommands(); +void CreatePartDesignBodyCommands(); +void CreatePartDesignPrimitiveCommands(); void loadPartDesignResource() { diff --git a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp index e2e91e8fd9..560ca9e2d5 100644 --- a/src/Mod/PartDesign/Gui/CommandPrimitive.cpp +++ b/src/Mod/PartDesign/Gui/CommandPrimitive.cpp @@ -137,7 +137,7 @@ void CmdPrimtiveCompAdditive::activated(int iMsg) PartDesignGui::setEdit(prm,pcActiveBody); } -Gui::Action * CmdPrimtiveCompAdditive::createAction(void) +Gui::Action * CmdPrimtiveCompAdditive::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -229,7 +229,7 @@ void CmdPrimtiveCompAdditive::languageChange() arc8->setStatusTip(arc8->toolTip()); } -bool CmdPrimtiveCompAdditive::isActive(void) +bool CmdPrimtiveCompAdditive::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -293,7 +293,7 @@ void CmdPrimtiveCompSubtractive::activated(int iMsg) PartDesignGui::setEdit(Feat,pcActiveBody); } -Gui::Action * CmdPrimtiveCompSubtractive::createAction(void) +Gui::Action * CmdPrimtiveCompSubtractive::createAction() { Gui::ActionGroup* pcAction = new Gui::ActionGroup(this, Gui::getMainWindow()); pcAction->setDropDownMenu(true); @@ -385,7 +385,7 @@ void CmdPrimtiveCompSubtractive::languageChange() arc8->setStatusTip(arc8->toolTip()); } -bool CmdPrimtiveCompSubtractive::isActive(void) +bool CmdPrimtiveCompSubtractive::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -394,7 +394,7 @@ bool CmdPrimtiveCompSubtractive::isActive(void) // Initialization //=========================================================================== -void CreatePartDesignPrimitiveCommands(void) +void CreatePartDesignPrimitiveCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); diff --git a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp index 8da1456d6e..766886d2c9 100644 --- a/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskBooleanParameters.cpp @@ -235,7 +235,7 @@ void TaskBooleanParameters::onTypeChanged(int index) pcBoolean->getDocument()->recomputeFeature(pcBoolean); } -const std::vector TaskBooleanParameters::getBodies(void) const +const std::vector TaskBooleanParameters::getBodies() const { std::vector result; for (int i = 0; i < ui->listWidgetBodies->count(); i++) @@ -243,12 +243,12 @@ const std::vector TaskBooleanParameters::getBodies(void) const return result; } -int TaskBooleanParameters::getType(void) const +int TaskBooleanParameters::getType() const { return ui->comboType->currentIndex(); } -void TaskBooleanParameters::onBodyDeleted(void) +void TaskBooleanParameters::onBodyDeleted() { PartDesign::Boolean* pcBoolean = static_cast(BooleanView->getObject()); std::vector bodies = pcBoolean->Group.getValues(); diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.h b/src/Mod/PartDesign/Gui/TaskChamferParameters.h index 41b8b10e76..0d93bf3c21 100644 --- a/src/Mod/PartDesign/Gui/TaskChamferParameters.h +++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.h @@ -50,8 +50,8 @@ private Q_SLOTS: void onSize2Changed(double); void onAngleChanged(double); void onFlipDirection(bool); - void onRefDeleted(void) override; - void onAddAllEdges(void); + void onRefDeleted() override; + void onAddAllEdges(); void onCheckBoxUseAllEdgesToggled(bool checked); protected: @@ -60,11 +60,11 @@ protected: void changeEvent(QEvent *e) override; void onSelectionChanged(const Gui::SelectionChanges& msg) override; - int getType(void) const; - double getSize(void) const; - double getSize2(void) const; - double getAngle(void) const; - bool getFlipDirection(void) const; + int getType() const; + double getSize() const; + double getSize2() const; + double getAngle() const; + bool getFlipDirection() const; private: void setUpUI(PartDesign::Chamfer* pcChamfer); diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp index 513201ebcd..4ad7a6b010 100644 --- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp @@ -196,7 +196,7 @@ void TaskDraftParameters::onButtonLine(bool checked) } } -void TaskDraftParameters::onRefDeleted(void) +void TaskDraftParameters::onRefDeleted() { TaskDressUpParameters::deleteRef(ui->listWidgetReferences); } @@ -230,7 +230,7 @@ void TaskDraftParameters::onAngleChanged(double angle) hideOnError(); } -double TaskDraftParameters::getAngle(void) const +double TaskDraftParameters::getAngle() const { return ui->draftAngle->value().getValue(); } @@ -245,7 +245,7 @@ void TaskDraftParameters::onReversedChanged(const bool on) { hideOnError(); } -bool TaskDraftParameters::getReversed(void) const +bool TaskDraftParameters::getReversed() const { return ui->checkReverse->isChecked(); } diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp index be09cb2e22..ea8f5cd362 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp @@ -362,7 +362,7 @@ void TaskDressUpParameters::showObject() } } -Part::Feature* TaskDressUpParameters::getBase(void) const +Part::Feature* TaskDressUpParameters::getBase() const { PartDesign::DressUp* pcDressUp = static_cast(DressUpView->getObject()); // Unlikely but this may throw an exception in case we are started to edit an object which base feature diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h index 0803ed7321..06ec92173f 100644 --- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h +++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h @@ -49,8 +49,8 @@ public: TaskDressUpParameters(ViewProviderDressUp *DressUpView, bool selectEdges, bool selectFaces, QWidget* parent = nullptr); ~TaskDressUpParameters() override; - const std::vector getReferences(void) const; - Part::Feature *getBase(void) const; + const std::vector getReferences() const; + Part::Feature *getBase() const; void hideObject(); void showObject(); @@ -68,7 +68,7 @@ protected Q_SLOTS: void doubleClicked(QListWidgetItem* item); void setSelection(QListWidgetItem* current); void itemClickedTimeout(); - virtual void onRefDeleted(void) = 0; + virtual void onRefDeleted() = 0; void createDeleteAction(QListWidget* parentList); void createAddAllEdgesAction(QListWidget* parentList); diff --git a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h index 80baa86212..062030cd52 100644 --- a/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h +++ b/src/Mod/PartDesign/Gui/TaskExtrudeParameters.h @@ -102,24 +102,24 @@ protected: App::PropertyLinkSub* propReferenceAxis; void getReferenceAxis(App::DocumentObject*& obj, std::vector& sub) const; - double getOffset(void) const; - bool getAlongSketchNormal(void) const; - bool getCustom(void) const; - std::string getReferenceAxis(void) const; - double getXDirection(void) const; - double getYDirection(void) const; - double getZDirection(void) const; - bool getReversed(void) const; - bool getMidplane(void) const; - int getMode(void) const; - QString getFaceName(void) const; + double getOffset() const; + bool getAlongSketchNormal() const; + bool getCustom() const; + std::string getReferenceAxis() const; + double getXDirection() const; + double getYDirection() const; + double getZDirection() const; + bool getReversed() const; + bool getMidplane() const; + int getMode() const; + QString getFaceName() const; void onSelectionChanged(const Gui::SelectionChanges& msg) override; virtual void translateModeList(int index); virtual void updateUI(int index); - void updateDirectionEdits(void); + void updateDirectionEdits(); void setDirectionMode(int index); - void handleLineFaceNameClick(void); - void handleLineFaceNameNo(void); + void handleLineFaceNameClick(); + void handleLineFaceNameNo(); private: void tryRecomputeFeature(); diff --git a/src/Mod/PartDesign/Gui/TaskFeaturePick.h b/src/Mod/PartDesign/Gui/TaskFeaturePick.h index 4f3e991c22..23734959d1 100644 --- a/src/Mod/PartDesign/Gui/TaskFeaturePick.h +++ b/src/Mod/PartDesign/Gui/TaskFeaturePick.h @@ -123,13 +123,13 @@ public: /// is called by the framework if the dialog is rejected (Cancel) bool reject() override; /// is called by the framework if the user presses the help button - bool isAllowedAlterDocument(void) const override + bool isAllowedAlterDocument() const override { return false; } void showExternal(bool val); /// returns for Close and Help button - QDialogButtonBox::StandardButtons getStandardButtons(void) const override + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok|QDialogButtonBox::Cancel; } diff --git a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp index 7ff72735e3..dade40b34f 100644 --- a/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskLinearPatternParameters.cpp @@ -359,7 +359,7 @@ void TaskLinearPatternParameters::onUpdateView(bool on) } } -void TaskLinearPatternParameters::onFeatureDeleted(void) +void TaskLinearPatternParameters::onFeatureDeleted() { PartDesign::Transformed* pcTransformed = getObject(); std::vector originals = pcTransformed->Originals.getValues(); @@ -382,17 +382,17 @@ void TaskLinearPatternParameters::getDirection(App::DocumentObject*& obj, std::v sub = lnk.getSubValues(); } -bool TaskLinearPatternParameters::getReverse(void) const +bool TaskLinearPatternParameters::getReverse() const { return ui->checkReverse->isChecked(); } -double TaskLinearPatternParameters::getLength(void) const +double TaskLinearPatternParameters::getLength() const { return ui->spinLength->value().getValue(); } -unsigned TaskLinearPatternParameters::getOccurrences(void) const +unsigned TaskLinearPatternParameters::getOccurrences() const { return ui->spinOccurrences->value(); } diff --git a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp index c565ecf839..5e4837dac6 100644 --- a/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPolarPatternParameters.cpp @@ -358,7 +358,7 @@ void TaskPolarPatternParameters::onUpdateView(bool on) } } -void TaskPolarPatternParameters::onFeatureDeleted(void) +void TaskPolarPatternParameters::onFeatureDeleted() { PartDesign::Transformed* pcTransformed = getObject(); std::vector originals = pcTransformed->Originals.getValues(); @@ -381,17 +381,17 @@ void TaskPolarPatternParameters::getAxis(App::DocumentObject*& obj, std::vector< sub = lnk.getSubValues(); } -bool TaskPolarPatternParameters::getReverse(void) const +bool TaskPolarPatternParameters::getReverse() const { return ui->checkReverse->isChecked(); } -double TaskPolarPatternParameters::getAngle(void) const +double TaskPolarPatternParameters::getAngle() const { return ui->polarAngle->value().getValue(); } -unsigned TaskPolarPatternParameters::getOccurrences(void) const +unsigned TaskPolarPatternParameters::getOccurrences() const { return ui->spinOccurrences->value(); } diff --git a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp index 1d4d915383..7c0424b205 100644 --- a/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskPrimitiveParameters.cpp @@ -961,7 +961,7 @@ bool TaskPrimitiveParameters::reject() return true; } -QDialogButtonBox::StandardButtons TaskPrimitiveParameters::getStandardButtons(void) const { +QDialogButtonBox::StandardButtons TaskPrimitiveParameters::getStandardButtons() const { return Gui::TaskView::TaskDialog::getStandardButtons(); } diff --git a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp index 6d6f5553ef..320af9d228 100644 --- a/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskScaledParameters.cpp @@ -208,7 +208,7 @@ void TaskScaledParameters::onUpdateView(bool on) } } -void TaskScaledParameters::onFeatureDeleted(void) +void TaskScaledParameters::onFeatureDeleted() { PartDesign::Transformed* pcTransformed = getObject(); std::vector originals = pcTransformed->Originals.getValues(); @@ -223,12 +223,12 @@ void TaskScaledParameters::onFeatureDeleted(void) recomputeFeature(); } -double TaskScaledParameters::getFactor(void) const +double TaskScaledParameters::getFactor() const { return ui->spinFactor->value().getValue(); } -unsigned TaskScaledParameters::getOccurrences(void) const +unsigned TaskScaledParameters::getOccurrences() const { return ui->spinOccurrences->value(); } diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp index 2841d519ac..4b608b3ce6 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp @@ -134,7 +134,7 @@ void TaskThicknessParameters::setButtons(const selectionModes mode) ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr()); } -void TaskThicknessParameters::onRefDeleted(void) +void TaskThicknessParameters::onRefDeleted() { TaskDressUpParameters::deleteRef(ui->listWidgetReferences); } @@ -172,7 +172,7 @@ void TaskThicknessParameters::onModeChanged(int mode) { hideOnError(); } -double TaskThicknessParameters::getValue(void) const +double TaskThicknessParameters::getValue() const { return ui->Value->value().getValue(); } @@ -187,7 +187,7 @@ void TaskThicknessParameters::onReversedChanged(const bool on) { hideOnError(); } -bool TaskThicknessParameters::getReversed(void) const +bool TaskThicknessParameters::getReversed() const { return ui->checkReverse->isChecked(); } @@ -201,17 +201,17 @@ void TaskThicknessParameters::onIntersectionChanged(const bool on) { hideOnError(); } -bool TaskThicknessParameters::getIntersection(void) const +bool TaskThicknessParameters::getIntersection() const { return ui->checkIntersection->isChecked(); } -int TaskThicknessParameters::getJoinType(void) const { +int TaskThicknessParameters::getJoinType() const { return ui->joinComboBox->currentIndex(); } -int TaskThicknessParameters::getMode(void) const { +int TaskThicknessParameters::getMode() const { return ui->modeComboBox->currentIndex(); } diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h index a94a09bcf5..7d16706a98 100644 --- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.h +++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.h @@ -41,11 +41,11 @@ public: void apply() override; - double getValue(void) const; - bool getReversed(void) const; - bool getIntersection(void) const; - int getMode(void) const; - int getJoinType(void) const; + double getValue() const; + bool getReversed() const; + bool getIntersection() const; + int getMode() const; + int getJoinType() const; private Q_SLOTS: void onValueChanged(double angle); @@ -53,7 +53,7 @@ private Q_SLOTS: void onJoinTypeChanged(int join); void onReversedChanged(bool reversed); void onIntersectionChanged(bool intersection); - void onRefDeleted(void) override; + void onRefDeleted() override; protected: void setButtons(const selectionModes mode) override; diff --git a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h index d474b7c0a1..0513d3fce5 100644 --- a/src/Mod/PartDesign/Gui/TaskTransformedParameters.h +++ b/src/Mod/PartDesign/Gui/TaskTransformedParameters.h @@ -98,7 +98,7 @@ public: */ int setCurrentLink(const App::PropertyLinkSub &lnk); - QComboBox& combo(void) const {assert(_combo); return *_combo;} + QComboBox& combo() const {assert(_combo); return *_combo;} ~ComboLinks() {_combo = nullptr; clear();} private: @@ -129,7 +129,7 @@ public: ~TaskTransformedParameters() override; /// Returns the originals property of associated top feeature object - const std::vector & getOriginals(void) const; + const std::vector & getOriginals() const; /// Get the TransformedFeature object associated with this task // Either through the ViewProvider or the currently active subFeature of the parentTask @@ -177,7 +177,7 @@ protected Q_SLOTS: virtual void onSubTaskButtonOK() {} void onButtonAddFeature(const bool checked); void onButtonRemoveFeature(const bool checked); - virtual void onFeatureDeleted(void)=0; + virtual void onFeatureDeleted() = 0; void indexesMoved(); protected: diff --git a/src/Mod/PartDesign/Gui/Utils.cpp b/src/Mod/PartDesign/Gui/Utils.cpp index 2e1db4dd01..f058c11ac2 100644 --- a/src/Mod/PartDesign/Gui/Utils.cpp +++ b/src/Mod/PartDesign/Gui/Utils.cpp @@ -180,7 +180,7 @@ PartDesign::Body * makeBodyActive(App::DocumentObject *body, App::Document *doc, return dynamic_cast(body); } -void needActiveBodyError(void) +void needActiveBodyError() { QMessageBox::warning( Gui::getMainWindow(), QObject::tr("Active Body Required"), diff --git a/src/Mod/PartDesign/Gui/ViewProvider.h b/src/Mod/PartDesign/Gui/ViewProvider.h index 2896b75948..02004503ff 100644 --- a/src/Mod/PartDesign/Gui/ViewProvider.h +++ b/src/Mod/PartDesign/Gui/ViewProvider.h @@ -48,7 +48,7 @@ public: /// destructor ~ViewProvider() override; - bool doubleClicked(void) override; + bool doubleClicked() override; void updateData(const App::Property*) override; void onChanged(const App::Property* prop) override; @@ -68,7 +68,7 @@ public: //Returns the ViewProvider of the body the feature belongs to, or NULL, if not in a body ViewProviderBody* getBodyViewProvider(); - PyObject* getPyObject(void) override; + PyObject* getPyObject() override; QIcon mergeColorfulOverlayIcons (const QIcon & orig) const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderBody.h b/src/Mod/PartDesign/Gui/ViewProviderBody.h index b7208836e8..dc55944c2c 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderBody.h +++ b/src/Mod/PartDesign/Gui/ViewProviderBody.h @@ -56,10 +56,10 @@ public: void attach(App::DocumentObject *) override; - bool doubleClicked(void) override; + bool doubleClicked() override; void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; - std::vector< std::string > getDisplayModes(void) const override; + std::vector< std::string > getDisplayModes() const override; void setDisplayMode(const char* ModeName) override; void setOverrideMode(const std::string& mode) override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderDatum.h b/src/Mod/PartDesign/Gui/ViewProviderDatum.h index 76af19a279..8187d00ab2 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderDatum.h +++ b/src/Mod/PartDesign/Gui/ViewProviderDatum.h @@ -54,14 +54,14 @@ public: void attach(App::DocumentObject *) override; bool onDelete(const std::vector &) override; - bool doubleClicked(void) override; - std::vector getDisplayModes(void) const override; + bool doubleClicked() override; + std::vector getDisplayModes() const override; void setDisplayMode(const char* ModeName) override; /// indicates if the ViewProvider use the new Selection model - bool useNewSelectionModel(void) const override { return true; } + bool useNewSelectionModel() const override { return true; } /// indicates if the ViewProvider can be selected - bool isSelectable(void) const override; + bool isSelectable() const override; /// return a hit element to the selection path or 0 std::string getElement(const SoDetail *) const override; SoDetail* getDetail(const char*) const override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp b/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp index 79c2fbc6ed..2a78f12a09 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderHelix.cpp @@ -61,7 +61,7 @@ TaskDlgFeatureParameters *ViewProviderHelix::getEditDialog() return new TaskDlgHelixParameters( this ); } -QIcon ViewProviderHelix::getIcon(void) const { +QIcon ViewProviderHelix::getIcon() const { QString str = QString::fromLatin1("PartDesign_"); auto* prim = static_cast(getObject()); if(prim->getAddSubType() == PartDesign::FeatureAddSub::Additive) @@ -90,7 +90,7 @@ void ViewProviderHelix::unsetEdit(int ModNum) PartDesignGui::ViewProvider::unsetEdit(ModNum); } -std::vector ViewProviderHelix::claimChildren(void) const { +std::vector ViewProviderHelix::claimChildren() const { std::vector temp; App::DocumentObject* sketch = static_cast(getObject())->Profile.getValue(); if (sketch && sketch->isDerivedFrom(Part::Part2DObject::getClassTypeId())) diff --git a/src/Mod/PartDesign/Gui/ViewProviderHelix.h b/src/Mod/PartDesign/Gui/ViewProviderHelix.h index 716fdfc6ed..675e49f603 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderHelix.h +++ b/src/Mod/PartDesign/Gui/ViewProviderHelix.h @@ -42,12 +42,12 @@ public: void setupContextMenu(QMenu*, QObject*, const char*) override; /// grouping handling - std::vector claimChildren(void)const override; + std::vector claimChildren() const override; bool onDelete(const std::vector &) override; protected: - QIcon getIcon(void) const override; + QIcon getIcon() const override; /// Returns a newly created TaskDlgHelixParameters TaskDlgFeatureParameters *getEditDialog() override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderLoft.h b/src/Mod/PartDesign/Gui/ViewProviderLoft.h index 6f89b3d134..56dc3fb9e6 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderLoft.h +++ b/src/Mod/PartDesign/Gui/ViewProviderLoft.h @@ -45,7 +45,7 @@ public: ~ViewProviderLoft() override; /// grouping handling - std::vector claimChildren(void)const override; + std::vector claimChildren() const override; void setupContextMenu(QMenu*, QObject*, const char*) override; bool onDelete(const std::vector &) override; @@ -54,7 +54,7 @@ public: void highlightReferences(Reference mode, bool on); protected: - QIcon getIcon(void) const override; + QIcon getIcon() const override; bool setEdit(int ModNum) override; void unsetEdit(int ModNum) override; TaskDlgFeatureParameters* getEditDialog() override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h index e381c1c1c1..337d7a2988 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h +++ b/src/Mod/PartDesign/Gui/ViewProviderPrimitive.h @@ -42,7 +42,7 @@ public: void updateData(const App::Property*) override; protected: - QIcon getIcon(void) const override; + QIcon getIcon() const override; void setupContextMenu(QMenu* menu, QObject* receiver, const char* member) override; bool setEdit(int ModNum) override; void unsetEdit(int ModNum) override; diff --git a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp index 3cef2ae9c4..31a77cf361 100644 --- a/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp +++ b/src/Mod/PartDesign/Gui/ViewProviderShapeBinder.cpp @@ -402,7 +402,7 @@ void ViewProviderSubShapeBinder::updatePlacement(bool transaction) { App::GetApplication().closeActiveTransaction(true); } -std::vector ViewProviderSubShapeBinder::claimChildren(void) const { +std::vector ViewProviderSubShapeBinder::claimChildren() const { std::vector ret; auto self = Base::freecad_dynamic_cast(getObject()); if (self && self->ClaimChildren.getValue() && self->Support.getValue()) {