diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp index fce826cd97..893eb178e1 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp @@ -342,7 +342,7 @@ TaskFemConstraintFluidBoundary::TaskFemConstraintFluidBoundary( updateUI(); } -const Fem::FemSolverObject* TaskFemConstraintFluidBoundary::getFemSolver(void) const +const Fem::FemSolverObject* TaskFemConstraintFluidBoundary::getFemSolver() const { return pcSolver; } @@ -535,7 +535,7 @@ void TaskFemConstraintFluidBoundary::updateThermalBoundaryUI() } } -void TaskFemConstraintFluidBoundary::onBoundaryTypeChanged(void) +void TaskFemConstraintFluidBoundary::onBoundaryTypeChanged() { Fem::ConstraintFluidBoundary* pcConstraint = static_cast(ConstraintView->getObject()); @@ -556,7 +556,7 @@ void TaskFemConstraintFluidBoundary::onBoundaryTypeChanged(void) } } -void TaskFemConstraintFluidBoundary::onSubtypeChanged(void) +void TaskFemConstraintFluidBoundary::onSubtypeChanged() { updateSubtypeUI();// todo: change color for different kind of subtype, // Fem::ConstraintFluidBoundary::onChanged() and viewProvider @@ -566,7 +566,7 @@ void TaskFemConstraintFluidBoundary::onBoundaryValueChanged(double) { //left empty for future extension } -void TaskFemConstraintFluidBoundary::onTurbulenceSpecificationChanged(void) +void TaskFemConstraintFluidBoundary::onTurbulenceSpecificationChanged() { Fem::ConstraintFluidBoundary* pcConstraint = static_cast(ConstraintView->getObject()); @@ -575,7 +575,7 @@ void TaskFemConstraintFluidBoundary::onTurbulenceSpecificationChanged(void) updateTurbulenceUI(); } -void TaskFemConstraintFluidBoundary::onThermalBoundaryTypeChanged(void) +void TaskFemConstraintFluidBoundary::onThermalBoundaryTypeChanged() { Fem::ConstraintFluidBoundary* pcConstraint = static_cast(ConstraintView->getObject()); @@ -668,23 +668,23 @@ void TaskFemConstraintFluidBoundary::onCheckReverse(const bool pressed) pcConstraint->Reversed.setValue(pressed); } -std::string TaskFemConstraintFluidBoundary::getBoundaryType(void) const +std::string TaskFemConstraintFluidBoundary::getBoundaryType() const { return Base::Tools::toStdString(ui->comboBoundaryType->currentText()); } -std::string TaskFemConstraintFluidBoundary::getSubtype(void) const +std::string TaskFemConstraintFluidBoundary::getSubtype() const { return Base::Tools::toStdString(ui->comboSubtype->currentText()); } -double TaskFemConstraintFluidBoundary::getBoundaryValue(void) const +double TaskFemConstraintFluidBoundary::getBoundaryValue() const { return ui->spinBoundaryValue->value(); } -std::string TaskFemConstraintFluidBoundary::getTurbulenceModel(void) const +std::string TaskFemConstraintFluidBoundary::getTurbulenceModel() const { if (pTurbulenceModel) { return pTurbulenceModel->getValueAsString(); @@ -694,22 +694,22 @@ std::string TaskFemConstraintFluidBoundary::getTurbulenceModel(void) const } } -std::string TaskFemConstraintFluidBoundary::getTurbulenceSpecification(void) const +std::string TaskFemConstraintFluidBoundary::getTurbulenceSpecification() const { return Base::Tools::toStdString(ui->comboTurbulenceSpecification->currentText()); } -double TaskFemConstraintFluidBoundary::getTurbulentIntensityValue(void) const +double TaskFemConstraintFluidBoundary::getTurbulentIntensityValue() const { return ui->spinTurbulentIntensityValue->value(); } -double TaskFemConstraintFluidBoundary::getTurbulentLengthValue(void) const +double TaskFemConstraintFluidBoundary::getTurbulentLengthValue() const { return ui->spinTurbulentLengthValue->value(); } -bool TaskFemConstraintFluidBoundary::getHeatTransferring(void) const +bool TaskFemConstraintFluidBoundary::getHeatTransferring() const { if (pHeatTransferring) { return pHeatTransferring->getValue(); @@ -719,22 +719,22 @@ bool TaskFemConstraintFluidBoundary::getHeatTransferring(void) const } } -std::string TaskFemConstraintFluidBoundary::getThermalBoundaryType(void) const +std::string TaskFemConstraintFluidBoundary::getThermalBoundaryType() const { return Base::Tools::toStdString(ui->comboThermalBoundaryType->currentText()); } -double TaskFemConstraintFluidBoundary::getTemperatureValue(void) const +double TaskFemConstraintFluidBoundary::getTemperatureValue() const { return ui->spinTemperatureValue->value(); } -double TaskFemConstraintFluidBoundary::getHeatFluxValue(void) const +double TaskFemConstraintFluidBoundary::getHeatFluxValue() const { return ui->spinHeatFluxValue->value(); } -double TaskFemConstraintFluidBoundary::getHTCoeffValue(void) const +double TaskFemConstraintFluidBoundary::getHTCoeffValue() const { return ui->spinHTCoeffValue->value(); } @@ -749,7 +749,7 @@ const std::string TaskFemConstraintFluidBoundary::getReferences() const return TaskFemConstraint::getReferences(items); } -const std::string TaskFemConstraintFluidBoundary::getDirectionName(void) const +const std::string TaskFemConstraintFluidBoundary::getDirectionName() const { std::string dir = ui->lineDirection->text().toStdString(); if (dir.empty()) @@ -759,7 +759,7 @@ const std::string TaskFemConstraintFluidBoundary::getDirectionName(void) const return dir.substr(0, pos).c_str(); } -const std::string TaskFemConstraintFluidBoundary::getDirectionObject(void) const +const std::string TaskFemConstraintFluidBoundary::getDirectionObject() const { std::string dir = ui->lineDirection->text().toStdString(); if (dir.empty()) diff --git a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp index 7e734774db..5da3b8b6cd 100644 --- a/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp +++ b/src/Mod/Fem/Gui/ViewProviderAnalysis.cpp @@ -117,7 +117,7 @@ void ViewProviderFemAnalysis::highlightView(Gui::ViewProviderDocumentObject *vie extension.highlightView(view); } -bool ViewProviderFemAnalysis::doubleClicked(void) +bool ViewProviderFemAnalysis::doubleClicked() { Gui::Command::assureWorkbench("FemWorkbench"); Gui::Command::addModule(Gui::Command::Gui, "FemGui"); @@ -137,22 +137,22 @@ bool ViewProviderFemAnalysis::doubleClicked(void) return true; } -std::vector ViewProviderFemAnalysis::claimChildren(void) const +std::vector ViewProviderFemAnalysis::claimChildren() const { return Gui::ViewProviderDocumentObjectGroup::claimChildren(); } -std::vector ViewProviderFemAnalysis::getDisplayModes(void) const +std::vector ViewProviderFemAnalysis::getDisplayModes() const { return {"Analysis"}; } -void ViewProviderFemAnalysis::hide(void) +void ViewProviderFemAnalysis::hide() { Gui::ViewProviderDocumentObjectGroup::hide(); } -void ViewProviderFemAnalysis::show(void) +void ViewProviderFemAnalysis::show() { Gui::ViewProviderDocumentObjectGroup::show(); } diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp index 770f7a4fd4..340e5fd638 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipeline.cpp @@ -206,7 +206,7 @@ void ViewProviderFemPostPipeline::scaleField(vtkDataSet* dset, vtkDataArray* pda } } -PyObject *ViewProviderFemPostPipeline::getPyObject(void) +PyObject *ViewProviderFemPostPipeline::getPyObject() { if (PythonObject.is(Py::_None())) { // ref counter is set to 1 diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp b/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp index 55fa595100..070c671442 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp +++ b/src/Mod/Fem/Gui/ViewProviderFemPostPipelinePyImp.cpp @@ -31,7 +31,7 @@ using namespace FemGui; // returns a string which represents the object e.g. when printed in python -std::string ViewProviderFemPostPipelinePy::representation(void) const +std::string ViewProviderFemPostPipelinePy::representation() const { return std::string(""); } diff --git a/src/Mod/Import/App/StepShapePyImp.cpp b/src/Mod/Import/App/StepShapePyImp.cpp index 94b93de982..a2a2686313 100644 --- a/src/Mod/Import/App/StepShapePyImp.cpp +++ b/src/Mod/Import/App/StepShapePyImp.cpp @@ -29,7 +29,7 @@ using namespace Import; // returns a string which represents the object e.g. when printed in python -std::string StepShapePy::representation(void) const +std::string StepShapePy::representation() const { return std::string(""); } diff --git a/src/Mod/Import/App/dxf/dxf.cpp b/src/Mod/Import/App/dxf/dxf.cpp index 710318760f..fb436a0e3d 100644 --- a/src/Mod/Import/App/dxf/dxf.cpp +++ b/src/Mod/Import/App/dxf/dxf.cpp @@ -74,7 +74,7 @@ CDxfWrite::~CDxfWrite() delete m_ssLayer; } -void CDxfWrite::init(void) +void CDxfWrite::init() { writeHeaderSection(); makeBlockRecordTableHead(); @@ -82,7 +82,7 @@ void CDxfWrite::init(void) } //! assemble pieces into output file -void CDxfWrite::endRun(void) +void CDxfWrite::endRun() { makeLayerTable(); makeBlockRecordTableBody(); @@ -100,7 +100,7 @@ void CDxfWrite::endRun(void) //*************************** //writeHeaderSection //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeHeaderSection(void) +void CDxfWrite::writeHeaderSection() { std::stringstream ss; ss << "FreeCAD v" @@ -125,7 +125,7 @@ void CDxfWrite::writeHeaderSection(void) //*************************** //writeClassesSection //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeClassesSection(void) +void CDxfWrite::writeClassesSection() { if (m_version < 14) { return; @@ -141,7 +141,7 @@ void CDxfWrite::writeClassesSection(void) //*************************** //writeTablesSection //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeTablesSection(void) +void CDxfWrite::writeTablesSection() { //static tables section head end content std::stringstream ss; @@ -170,7 +170,7 @@ void CDxfWrite::writeTablesSection(void) //*************************** //makeLayerTable //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::makeLayerTable(void) +void CDxfWrite::makeLayerTable() { std::string tablehash = getLayerHandle(); (*m_ssLayer) << " 0" << endl; @@ -238,7 +238,7 @@ void CDxfWrite::makeLayerTable(void) //*************************** //makeBlockRecordTableHead //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::makeBlockRecordTableHead(void) +void CDxfWrite::makeBlockRecordTableHead() { if (m_version < 14) { return; @@ -294,7 +294,7 @@ void CDxfWrite::makeBlockRecordTableHead(void) //*************************** //makeBlockRecordTableBody //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::makeBlockRecordTableBody(void) +void CDxfWrite::makeBlockRecordTableBody() { if (m_version < 14) { return; @@ -323,7 +323,7 @@ void CDxfWrite::makeBlockRecordTableBody(void) //*************************** //makeBlockSectionHead //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::makeBlockSectionHead(void) +void CDxfWrite::makeBlockSectionHead() { (*m_ssBlock) << " 0" << endl; (*m_ssBlock) << "SECTION" << endl; @@ -451,7 +451,7 @@ std::string CDxfWrite::getPlateFile(std::string fileSpec) return outString.str(); } -std::string CDxfWrite::getHandle(void) +std::string CDxfWrite::getHandle() { m_handle++; std::stringstream ss; @@ -460,7 +460,7 @@ std::string CDxfWrite::getHandle(void) return ss.str(); } -std::string CDxfWrite::getEntityHandle(void) +std::string CDxfWrite::getEntityHandle() { return getHandle(); // m_entityHandle++; @@ -470,7 +470,7 @@ std::string CDxfWrite::getEntityHandle(void) // return ss.str(); } -std::string CDxfWrite::getLayerHandle(void) +std::string CDxfWrite::getLayerHandle() { return getHandle(); // m_layerHandle++; @@ -480,7 +480,7 @@ std::string CDxfWrite::getLayerHandle(void) // return ss.str(); } -std::string CDxfWrite::getBlockHandle(void) +std::string CDxfWrite::getBlockHandle() { return getHandle(); // m_blockHandle++; @@ -490,7 +490,7 @@ std::string CDxfWrite::getBlockHandle(void) // return ss.str(); } -std::string CDxfWrite::getBlkRecordHandle(void) +std::string CDxfWrite::getBlkRecordHandle() { return getHandle(); // m_blkRecordHandle++; @@ -1378,7 +1378,7 @@ void CDxfWrite::writeDiametricDim(const double* textMidPoint, //*************************** //writeDimBlockPreamble //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeDimBlockPreamble(void) +void CDxfWrite::writeDimBlockPreamble() { if (m_version > 12) { std::string blockName("*"); @@ -1423,7 +1423,7 @@ void CDxfWrite::writeDimBlockPreamble(void) //*************************** //writeBlockTrailer //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeBlockTrailer(void) +void CDxfWrite::writeBlockTrailer() { (*m_ssBlock) << " 0" << endl; (*m_ssBlock) << "ENDBLK" << endl; @@ -1696,7 +1696,7 @@ void CDxfWrite::writeDiametricDimBlock(const double* textMidPoint, //*************************** //writeBlocksSection //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeBlocksSection(void) +void CDxfWrite::writeBlocksSection() { if (m_version < 14) { std::stringstream ss; @@ -1715,7 +1715,7 @@ void CDxfWrite::writeBlocksSection(void) //*************************** //writeEntitiesSection //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeEntitiesSection(void) +void CDxfWrite::writeEntitiesSection() { std::stringstream ss; ss << "entities" << m_version << ".rub"; @@ -1733,7 +1733,7 @@ void CDxfWrite::writeEntitiesSection(void) //*************************** //writeObjectsSection //added by Wandererfan 2018 (wandererfan@gmail.com) for FreeCAD project -void CDxfWrite::writeObjectsSection(void) +void CDxfWrite::writeObjectsSection() { if (m_version < 14) { return; diff --git a/src/Mod/Import/App/dxf/dxf.h b/src/Mod/Import/App/dxf/dxf.h index 43bd41aa38..b7bf67c69d 100644 --- a/src/Mod/Import/App/dxf/dxf.h +++ b/src/Mod/Import/App/dxf/dxf.h @@ -156,11 +156,11 @@ protected: //! copy boiler plate file std::string getPlateFile(std::string fileSpec); void setDataDir(std::string s) { m_dataDir = s; } - std::string getHandle(void); - std::string getEntityHandle(void); - std::string getLayerHandle(void); - std::string getBlockHandle(void); - std::string getBlkRecordHandle(void); + std::string getHandle(); + std::string getEntityHandle(); + std::string getLayerHandle(); + std::string getBlockHandle(); + std::string getBlkRecordHandle(); std::string m_optionSource; int m_version; @@ -186,8 +186,8 @@ public: ImportExport CDxfWrite(const char* filepath); ImportExport ~CDxfWrite(); - ImportExport void init(void); - ImportExport void endRun(void); + ImportExport void init(); + ImportExport void endRun(); ImportExport bool Failed(){return m_fail;} // void setOptions(void); @@ -237,19 +237,19 @@ public: const char* dimText); ImportExport void writeDimBlockPreamble(); - ImportExport void writeBlockTrailer(void); + ImportExport void writeBlockTrailer(); - ImportExport void writeHeaderSection(void); - ImportExport void writeTablesSection(void); - ImportExport void writeBlocksSection(void); - ImportExport void writeEntitiesSection(void); - ImportExport void writeObjectsSection(void); - ImportExport void writeClassesSection(void); + ImportExport void writeHeaderSection(); + ImportExport void writeTablesSection(); + ImportExport void writeBlocksSection(); + ImportExport void writeEntitiesSection(); + ImportExport void writeObjectsSection(); + ImportExport void writeClassesSection(); - ImportExport void makeLayerTable(void); - ImportExport void makeBlockRecordTableHead(void); - ImportExport void makeBlockRecordTableBody(void); - ImportExport void makeBlockSectionHead(void); + ImportExport void makeLayerTable(); + ImportExport void makeBlockRecordTableHead(); + ImportExport void makeBlockRecordTableBody(); + ImportExport void makeBlockSectionHead(); }; // derive a class from this and implement it's virtual functions diff --git a/src/Mod/Inspection/App/InspectionFeature.cpp b/src/Mod/Inspection/App/InspectionFeature.cpp index 44384a8575..8a45be6a75 100644 --- a/src/Mod/Inspection/App/InspectionFeature.cpp +++ b/src/Mod/Inspection/App/InspectionFeature.cpp @@ -160,7 +160,7 @@ namespace Inspection { // do nothing } - void Validate (void) + void Validate () { // do nothing } @@ -182,7 +182,7 @@ namespace Inspection { // do nothing } - unsigned long HasElements (void) const override + unsigned long HasElements () const override { return _pclMesh->CountFacets(); } @@ -224,7 +224,7 @@ namespace Inspection { _aulGrid[ulX1][ulY1][ulZ1].insert(ulFacetIndex); } - void InitGrid (void) override + void InitGrid () override { unsigned long i, j; @@ -252,7 +252,7 @@ namespace Inspection { } } - void RebuildGrid (void) override + void RebuildGrid () override { _ulCtElements = _pclMesh->CountFacets(); InitGrid(); @@ -552,7 +552,7 @@ void PropertyDistanceList::setSize(int newSize) _lValueList.resize(newSize); } -int PropertyDistanceList::getSize(void) const +int PropertyDistanceList::getSize() const { return static_cast(_lValueList.size()); } @@ -572,7 +572,7 @@ void PropertyDistanceList::setValues(const std::vector& values) hasSetValue(); } -PyObject *PropertyDistanceList::getPyObject(void) +PyObject *PropertyDistanceList::getPyObject() { PyObject* list = PyList_New(getSize()); for (int i = 0;i_lValueList = _lValueList; @@ -673,7 +673,7 @@ void PropertyDistanceList::Paste(const App::Property &from) hasSetValue(); } -unsigned int PropertyDistanceList::getMemSize (void) const +unsigned int PropertyDistanceList::getMemSize () const { return static_cast(_lValueList.size() * sizeof(float)); } @@ -763,7 +763,7 @@ short Feature::mustExecute() const return 0; } -App::DocumentObjectExecReturn* Feature::execute(void) +App::DocumentObjectExecReturn* Feature::execute() { bool useMultithreading = true; diff --git a/src/Mod/Inspection/Gui/AppInspectionGui.cpp b/src/Mod/Inspection/Gui/AppInspectionGui.cpp index 405d4c788a..2038d46923 100644 --- a/src/Mod/Inspection/Gui/AppInspectionGui.cpp +++ b/src/Mod/Inspection/Gui/AppInspectionGui.cpp @@ -32,7 +32,7 @@ // use a different name to CreateCommand() -void CreateInspectionCommands(void); +void CreateInspectionCommands(); namespace InspectionGui { diff --git a/src/Mod/Inspection/Gui/Command.cpp b/src/Mod/Inspection/Gui/Command.cpp index 4767190cf5..659d8a63cf 100644 --- a/src/Mod/Inspection/Gui/Command.cpp +++ b/src/Mod/Inspection/Gui/Command.cpp @@ -58,7 +58,7 @@ void CmdVisualInspection::activated(int) dlg.exec(); } -bool CmdVisualInspection::isActive(void) +bool CmdVisualInspection::isActive() { return App::GetApplication().getActiveDocument(); } @@ -95,7 +95,7 @@ void CmdInspectElement::activated(int) } } -bool CmdInspectElement::isActive(void) +bool CmdInspectElement::isActive() { App::Document* doc = App::GetApplication().getActiveDocument(); if (!doc || doc->countObjectsOfType(Inspection::Feature::getClassTypeId()) == 0) @@ -110,7 +110,7 @@ bool CmdInspectElement::isActive(void) return false; } -void CreateInspectionCommands(void) +void CreateInspectionCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommand(new CmdVisualInspection()); diff --git a/src/Mod/Mesh/Gui/Command.cpp b/src/Mod/Mesh/Gui/Command.cpp index 726750bfdf..bb7d759935 100644 --- a/src/Mod/Mesh/Gui/Command.cpp +++ b/src/Mod/Mesh/Gui/Command.cpp @@ -833,7 +833,7 @@ void CmdMeshTrimByPlane::activated(int) doCommand(Doc,"import MeshPartGui, FreeCADGui\nFreeCADGui.runCommand('MeshPart_TrimByPlane')\n"); } -bool CmdMeshTrimByPlane::isActive(void) +bool CmdMeshTrimByPlane::isActive() { // Check for the selected mesh feature (all Mesh types) if (getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) != 1) @@ -891,7 +891,7 @@ void CmdMeshCrossSections::activated(int) doCommand(Doc,"import MeshPartGui, FreeCADGui\nFreeCADGui.runCommand('MeshPart_CrossSections')\n"); } -bool CmdMeshCrossSections::isActive(void) +bool CmdMeshCrossSections::isActive() { return (Gui::Selection().countObjectsOfType(Mesh::Feature::getClassTypeId()) > 0 && !Gui::Control().activeDialog()); diff --git a/src/Mod/Mesh/Gui/Workbench.cpp b/src/Mod/Mesh/Gui/Workbench.cpp index 694fe048de..b0fe076f45 100644 --- a/src/Mod/Mesh/Gui/Workbench.cpp +++ b/src/Mod/Mesh/Gui/Workbench.cpp @@ -105,7 +105,7 @@ public: taskbox->groupLayout()->addWidget(box); Content.push_back(taskbox); } - bool shouldShow(void) override + bool shouldShow() override { return true; } diff --git a/src/Mod/MeshPart/Gui/CrossSections.cpp b/src/Mod/MeshPart/Gui/CrossSections.cpp index 4fdc946351..473f9514a7 100644 --- a/src/Mod/MeshPart/Gui/CrossSections.cpp +++ b/src/Mod/MeshPart/Gui/CrossSections.cpp @@ -94,7 +94,7 @@ public: { return ""; } - std::vector getDisplayModes(void) const override + std::vector getDisplayModes() const override { return std::vector(); } diff --git a/src/Mod/Path/Gui/ViewProviderArea.h b/src/Mod/Path/Gui/ViewProviderArea.h index c96077acb6..22d458e554 100644 --- a/src/Mod/Path/Gui/ViewProviderArea.h +++ b/src/Mod/Path/Gui/ViewProviderArea.h @@ -62,7 +62,7 @@ class PathGuiExport ViewProviderAreaView : public PartGui::ViewProviderPlanePara public: ViewProviderAreaView(); ~ViewProviderAreaView() override; - std::vector claimChildren(void) const override; + std::vector claimChildren() const override; void updateData(const App::Property*) override; bool onDelete(const std::vector &) override; diff --git a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp index 28e475f8d6..17c8f427b9 100644 --- a/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp +++ b/src/Mod/ReverseEngineering/Gui/AppReverseEngineeringGui.cpp @@ -32,7 +32,7 @@ // use a different name to CreateCommand() -void CreateReverseEngineeringCommands(void); +void CreateReverseEngineeringCommands(); void loadReverseEngineeringResource() { diff --git a/src/Mod/ReverseEngineering/Gui/Command.cpp b/src/Mod/ReverseEngineering/Gui/Command.cpp index 176fc3f606..a97766da92 100644 --- a/src/Mod/ReverseEngineering/Gui/Command.cpp +++ b/src/Mod/ReverseEngineering/Gui/Command.cpp @@ -90,7 +90,7 @@ void CmdApproxSurface::activated(int) Gui::Control().showDialog(new ReenGui::TaskFitBSplineSurface(objT)); } -bool CmdApproxSurface::isActive(void) +bool CmdApproxSurface::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -189,7 +189,7 @@ void CmdApproxPlane::activated(int) } } -bool CmdApproxPlane::isActive(void) +bool CmdApproxPlane::isActive() { if (getSelection().countObjectsOfType(App::GeoFeature::getClassTypeId()) == 1) return true; @@ -255,7 +255,7 @@ void CmdApproxCylinder::activated(int) updateActive(); } -bool CmdApproxCylinder::isActive(void) +bool CmdApproxCylinder::isActive() { if (getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) > 0) return true; @@ -302,7 +302,7 @@ void CmdApproxSphere::activated(int) updateActive(); } -bool CmdApproxSphere::isActive(void) +bool CmdApproxSphere::isActive() { if (getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) > 0) return true; @@ -357,7 +357,7 @@ void CmdApproxPolynomial::activated(int) updateActive(); } -bool CmdApproxPolynomial::isActive(void) +bool CmdApproxPolynomial::isActive() { if (getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) > 0) return true; @@ -388,7 +388,7 @@ void CmdSegmentation::activated(int) Gui::Control().showDialog(dlg); } -bool CmdSegmentation::isActive(void) +bool CmdSegmentation::isActive() { if (Gui::Control().activeDialog()) return false; @@ -418,7 +418,7 @@ void CmdSegmentationManual::activated(int) Gui::Control().showDialog(dlg); } -bool CmdSegmentationManual::isActive(void) +bool CmdSegmentationManual::isActive() { if (Gui::Control().activeDialog()) return false; @@ -468,7 +468,7 @@ void CmdSegmentationFromComponents::activated(int) doc->recompute(); } -bool CmdSegmentationFromComponents::isActive(void) +bool CmdSegmentationFromComponents::isActive() { if (getSelection().countObjectsOfType(Mesh::Feature::getClassTypeId()) > 0) return true; @@ -535,7 +535,7 @@ void CmdMeshBoundary::activated(int) document->commitTransaction(); } -bool CmdMeshBoundary::isActive(void) +bool CmdMeshBoundary::isActive() { return Gui::Selection().countObjectsOfType (Mesh::Feature::getClassTypeId()) > 0; @@ -570,7 +570,7 @@ void CmdPoissonReconstruction::activated(int) Gui::Control().showDialog(new ReenGui::TaskPoisson(objT)); } -bool CmdPoissonReconstruction::isActive(void) +bool CmdPoissonReconstruction::isActive() { return (hasActiveDocument() && !Gui::Control().activeDialog()); } @@ -620,12 +620,12 @@ void CmdViewTriangulation::activated(int) } } -bool CmdViewTriangulation::isActive(void) +bool CmdViewTriangulation::isActive() { return (Gui::Selection().countObjectsOfType(Points::Structured::getClassTypeId()) > 0); } -void CreateReverseEngineeringCommands(void) +void CreateReverseEngineeringCommands() { Gui::CommandManager &rcCmdMgr = Gui::Application::Instance->commandManager(); rcCmdMgr.addCommand(new CmdApproxSurface()); diff --git a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h index 150498146b..dc090b83b5 100644 --- a/src/Mod/ReverseEngineering/Gui/SegmentationManual.h +++ b/src/Mod/ReverseEngineering/Gui/SegmentationManual.h @@ -92,7 +92,7 @@ public: QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Ok | QDialogButtonBox::Close; } - bool isAllowedAlterDocument(void) const override + bool isAllowedAlterDocument() const override { return true; } void modifyStandardButtons(QDialogButtonBox*) override; diff --git a/src/Mod/Robot/App/Edge2TracObject.cpp b/src/Mod/Robot/App/Edge2TracObject.cpp index 0ee5577f8d..045c316894 100644 --- a/src/Mod/Robot/App/Edge2TracObject.cpp +++ b/src/Mod/Robot/App/Edge2TracObject.cpp @@ -57,7 +57,7 @@ Edge2TracObject::~Edge2TracObject() { } -App::DocumentObjectExecReturn *Edge2TracObject::execute(void) +App::DocumentObjectExecReturn *Edge2TracObject::execute() { App::DocumentObject* link = Source.getValue(); if (!link) diff --git a/src/Mod/Robot/App/RobotAlgos.h b/src/Mod/Robot/App/RobotAlgos.h index ff8330579e..1f24cdd0a0 100644 --- a/src/Mod/Robot/App/RobotAlgos.h +++ b/src/Mod/Robot/App/RobotAlgos.h @@ -37,10 +37,10 @@ class RobotExport RobotAlgos public: /// Constructor - RobotAlgos(void); + RobotAlgos(); virtual ~RobotAlgos(); - void Test(void); + void Test(); }; inline KDL::Frame toFrame(const Base::Placement &To){ diff --git a/src/Mod/Robot/App/TrajectoryCompound.cpp b/src/Mod/Robot/App/TrajectoryCompound.cpp index 8da304bc6d..de68523e98 100644 --- a/src/Mod/Robot/App/TrajectoryCompound.cpp +++ b/src/Mod/Robot/App/TrajectoryCompound.cpp @@ -43,7 +43,7 @@ TrajectoryCompound::~TrajectoryCompound() { } -App::DocumentObjectExecReturn *TrajectoryCompound::execute(void) +App::DocumentObjectExecReturn *TrajectoryCompound::execute() { const std::vector &Tracs = Source.getValues(); Robot::Trajectory result; diff --git a/src/Mod/Robot/App/TrajectoryObject.cpp b/src/Mod/Robot/App/TrajectoryObject.cpp index 8d0c6a31d4..71266c17b1 100644 --- a/src/Mod/Robot/App/TrajectoryObject.cpp +++ b/src/Mod/Robot/App/TrajectoryObject.cpp @@ -46,7 +46,7 @@ TrajectoryObject::~TrajectoryObject() { } -short TrajectoryObject::mustExecute(void) const +short TrajectoryObject::mustExecute() const { return 0; } diff --git a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp index 57a3a61caf..643a3b72ff 100644 --- a/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp +++ b/src/Mod/Sketcher/Gui/CommandSketcherBSpline.cpp @@ -1376,7 +1376,7 @@ void CmdSketcherJoinCurves::activated(int iMsg) getSelection().clearSelection(); } -bool CmdSketcherJoinCurves::isActive(void) +bool CmdSketcherJoinCurves::isActive() { return isSketcherBSplineActive(getActiveGuiDocument(), true); } diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp index a33eaa525e..bcd2fd8c62 100644 --- a/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp +++ b/src/Mod/Sketcher/Gui/DrawSketchHandler.cpp @@ -294,7 +294,7 @@ void DrawSketchHandler::preActivated() ViewProviderSketchDrawSketchHandlerAttorney::setConstraintSelectability(*sketchgui, false); } -void DrawSketchHandler::quit(void) +void DrawSketchHandler::quit() { assert(sketchgui); @@ -307,12 +307,12 @@ void DrawSketchHandler::quit(void) //************************************************************************** // Helpers -int DrawSketchHandler::getHighestVertexIndex(void) +int DrawSketchHandler::getHighestVertexIndex() { return sketchgui->getSketchObject()->getHighestVertexIndex(); } -int DrawSketchHandler::getHighestCurveIndex(void) +int DrawSketchHandler::getHighestCurveIndex() { return sketchgui->getSketchObject()->getHighestCurveIndex(); } @@ -475,7 +475,7 @@ void DrawSketchHandler::updateCursor() setCrosshairCursor(cursorstring); } -void DrawSketchHandler::applyCursor(void) +void DrawSketchHandler::applyCursor() { applyCursor(actCursor); } @@ -489,7 +489,7 @@ void DrawSketchHandler::applyCursor(QCursor& newCursor) } } -void DrawSketchHandler::unsetCursor(void) +void DrawSketchHandler::unsetCursor() { Gui::MDIView* view = Gui::getMainWindow()->activeWindow(); if (view && view->isDerivedFrom(Gui::View3DInventor::getClassTypeId())) { @@ -995,7 +995,7 @@ void DrawSketchHandler::setPositionText(const Base::Vector2d& Pos) ViewProviderSketchDrawSketchHandlerAttorney::setPositionText(*sketchgui, Pos); } -void DrawSketchHandler::resetPositionText(void) +void DrawSketchHandler::resetPositionText() { ViewProviderSketchDrawSketchHandlerAttorney::resetPositionText(*sketchgui); } @@ -1061,17 +1061,17 @@ void DrawSketchHandler::preselectAtPoint(Base::Vector2d point) ViewProviderSketchDrawSketchHandlerAttorney::preselectAtPoint(*sketchgui, point); } -int DrawSketchHandler::getPreselectPoint(void) const +int DrawSketchHandler::getPreselectPoint() const { return ViewProviderSketchDrawSketchHandlerAttorney::getPreselectPoint(*sketchgui); } -int DrawSketchHandler::getPreselectCurve(void) const +int DrawSketchHandler::getPreselectCurve() const { return ViewProviderSketchDrawSketchHandlerAttorney::getPreselectCurve(*sketchgui); } -int DrawSketchHandler::getPreselectCross(void) const +int DrawSketchHandler::getPreselectCross() const { return ViewProviderSketchDrawSketchHandlerAttorney::getPreselectCross(*sketchgui); } diff --git a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp index 22c994f5c0..3ce3667bd1 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp +++ b/src/Mod/Sketcher/Gui/TaskSketcherElements.cpp @@ -1539,7 +1539,7 @@ void TaskSketcherElements::leaveEvent(QEvent* event) ui->listWidgetElements->clearFocus(); } -void TaskSketcherElements::slotElementsChanged(void) +void TaskSketcherElements::slotElementsChanged() { assert(sketchView); // Build up ListView with the elements diff --git a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h index 8141357901..310e1f046c 100644 --- a/src/Mod/Sketcher/Gui/TaskSketcherValidation.h +++ b/src/Mod/Sketcher/Gui/TaskSketcherValidation.h @@ -86,7 +86,7 @@ class TaskSketcherValidation: public Gui::TaskView::TaskDialog public: explicit TaskSketcherValidation(Sketcher::SketchObject* Obj); ~TaskSketcherValidation() override; - QDialogButtonBox::StandardButtons getStandardButtons(void) const override + QDialogButtonBox::StandardButtons getStandardButtons() const override { return QDialogButtonBox::Close; } diff --git a/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp b/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp index 0a6f4a18a9..0964bcdc2c 100644 --- a/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp +++ b/src/Mod/Surface/App/Blending/FeatureBlendCurve.cpp @@ -127,7 +127,7 @@ BlendPoint FeatureBlendCurve::GetBlendPoint(App::PropertyLinkSub &link, App::Pro return bp; } -App::DocumentObjectExecReturn *FeatureBlendCurve::execute(void) +App::DocumentObjectExecReturn *FeatureBlendCurve::execute() { BlendPoint bp1 = GetBlendPoint(StartEdge, StartParameter, StartContinuity); BlendPoint bp2 = GetBlendPoint(EndEdge, EndParameter, EndContinuity); diff --git a/src/Mod/Surface/Gui/ViewProviderExtend.cpp b/src/Mod/Surface/Gui/ViewProviderExtend.cpp index faaaf28891..60b4bc6fec 100644 --- a/src/Mod/Surface/Gui/ViewProviderExtend.cpp +++ b/src/Mod/Surface/Gui/ViewProviderExtend.cpp @@ -33,7 +33,7 @@ PROPERTY_SOURCE(SurfaceGui::ViewProviderExtend, PartGui::ViewProviderSpline) namespace SurfaceGui { -QIcon ViewProviderExtend::getIcon(void) const +QIcon ViewProviderExtend::getIcon() const { return Gui::BitmapFactory().pixmap("Surface_ExtendFace"); }