From a694a86ed585394459ee1ab43bb8b25eb2ee8e62 Mon Sep 17 00:00:00 2001 From: Sean McBride <sean@rogue-research.com> Date: Tue, 19 Sep 2023 23:04:09 -0400 Subject: [PATCH] Fixed clearly extraneous semi-colons These were auto-found and auto-fixed by clang `-Xclang -fixit` --- Charts/Core/vtkPlot.h | 4 ++-- Charts/Core/vtkPlotArea.h | 2 +- Charts/Core/vtkPlotBar.h | 4 ++-- Charts/Core/vtkPlotStacked.h | 4 ++-- Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h | 2 +- .../SMP/STDThread/vtkSMPThreadLocalImpl.h | 2 +- .../SMP/Sequential/vtkSMPThreadLocalImpl.h | 4 ++-- Common/Core/Testing/Cxx/TestAffineArray.cxx | 2 +- .../Core/Testing/Cxx/TestCompositeArray.cxx | 2 +- Common/Core/Testing/Cxx/TestConstantArray.cxx | 2 +- .../Testing/Cxx/TestImplicitArraysBase.cxx | 2 +- Common/Core/Testing/Cxx/TestIndexedArray.cxx | 2 +- .../Core/Testing/Cxx/TestStdFunctionArray.cxx | 2 +- Common/Core/vtkSMPThreadLocal.h | 2 +- Common/Core/vtkSMPThreadLocalObject.h | 2 +- .../Cxx/TestHyperTreeGridGeometricLocator.cxx | 2 +- Common/DataModel/vtkBezierHexahedron.cxx | 2 +- Common/DataModel/vtkBezierWedge.cxx | 6 +++--- Common/DataModel/vtkBoundingBox.cxx | 2 +- Common/DataModel/vtkHyperTreeGridLocator.h | 2 +- ...TreeGridNonOrientedMooreSuperCursorLight.h | 1 - Common/DataModel/vtkLagrangeHexahedron.cxx | 2 +- Common/DataModel/vtkLagrangeWedge.cxx | 6 +++--- Common/DataModel/vtkLocator.h | 2 +- Common/DataModel/vtkNonLinearCell.h | 2 +- Common/DataModel/vtkPointLocator.h | 2 +- Common/DataModel/vtkSelection.cxx | 2 +- Common/DataModel/vtkUniformGridAMR.cxx | 2 +- Common/DataModel/vtkUniformHyperTreeGrid.cxx | 2 +- Common/DataModel/vtkVector.h | 4 +++- Common/ExecutionModel/vtkAlgorithm.h | 4 ++-- .../vtkRectilinearGridAlgorithm.h | 4 ++-- .../vtkStructuredGridAlgorithm.h | 4 ++-- .../vtkThreadedCompositeDataPipeline.cxx | 2 +- Common/System/vtkTimerLog.h | 2 +- Common/Transforms/vtkGeneralTransform.cxx | 2 +- Filters/AMR/Testing/Cxx/TestImageToAMR.cxx | 2 +- Filters/AMR/vtkImageToAMR.cxx | 4 ++-- .../Testing/Cxx/TestContourImplicitArrays.cxx | 2 +- .../Cxx/TestFieldDataToDataSetAttribute.cxx | 2 +- .../Core/vtkAttributeDataToTableFilter.cxx | 2 +- Filters/Core/vtkCompositeCutter.cxx | 2 +- Filters/Core/vtkContour3DLinearGrid.cxx | 2 +- Filters/Core/vtkEdgeSubdivisionCriterion.cxx | 2 +- Filters/Core/vtkGlyph3D.h | 2 +- Filters/Core/vtkPackLabels.cxx | 4 +++- .../vtkPolyDataEdgeConnectivityFilter.cxx | 2 +- Filters/Core/vtkSurfaceNets3D.h | 4 ++-- Filters/FlowPaths/vtkModifiedBSPTree.cxx | 4 ++-- Filters/FlowPaths/vtkParticleTracerBase.cxx | 2 +- Filters/FlowPaths/vtkParticleTracerBase.h | 2 +- Filters/General/vtkCurvatures.cxx | 2 +- ...vtkQuadratureSchemeDictionaryGenerator.cxx | 2 +- Filters/General/vtkRemovePolyData.cxx | 2 +- Filters/General/vtkSplitColumnComponents.cxx | 2 +- Filters/General/vtkTableFFT.h | 6 +++--- .../vtkDataSetRegionSurfaceFilter.cxx | 2 +- Filters/Hybrid/vtkDepthSortPolyData.cxx | 2 +- .../Programmable/vtkProgrammableFilter.cxx | 2 +- Filters/Reduction/vtkToImplicitStrategy.h | 2 +- .../Statistics/vtkContingencyStatistics.cxx | 2 +- IO/AMR/vtkAMRBaseReader.h | 2 +- IO/CGNS/vtkCGNSFileSeriesReader.cxx | 2 +- IO/Cesium3DTiles/vtkCesium3DTilesWriter.cxx | 2 +- IO/Exodus/vtkExodusIIWriter.h | 2 +- IO/HDF/vtkHDFReaderImplementation.cxx | 2 +- IO/Image/Testing/Cxx/TestMRCReader.cxx | 2 +- IO/Image/Testing/Cxx/TestNIFTI2.cxx | 2 +- .../Testing/Cxx/TestNIFTIReaderAnalyze.cxx | 2 +- .../Testing/Cxx/TestNIFTIReaderWriter.cxx | 2 +- IO/Image/vtkPNGReader.cxx | 2 +- IO/Import/vtkGLTFImporter.cxx | 2 +- IO/Import/vtkGLTFImporter.h | 2 +- IO/Import/vtkVRMLImporter_Yacc.h | 8 ++++---- IO/SegY/vtkSegYReaderInternal.cxx | 2 +- Infovis/Core/vtkKCoreDecomposition.cxx | 2 +- .../Layout/vtkForceDirectedLayoutStrategy.cxx | 2 +- Infovis/Layout/vtkSimple3DCirclesStrategy.cxx | 16 +++++++-------- .../vtkCameraOrientationRepresentation.h | 2 +- Interaction/Widgets/vtkSeedRepresentation.h | 2 +- Parallel/Core/vtkCommunicator.h | 2 +- Parallel/Core/vtkMultiProcessController.h | 2 +- Parallel/DIY/vtkDIYGhostUtilities.h | 2 +- Rendering/Annotation/vtkAxisActor2D.h | 2 +- Rendering/Annotation/vtkAxisFollower.h | 2 +- .../CellGrid/vtkGLSLModCoincidentTopology.h | 2 +- Rendering/Context2D/vtkPolyDataItem.cxx | 2 +- .../vtkOpenGLContextDevice2DPrivate.h | 12 +++++------ .../Testing/Cxx/TestDirectScalarsToColors.cxx | 2 +- Rendering/Core/vtkActor2DCollection.h | 2 +- Rendering/Core/vtkHardwareWindow.h | 4 ++-- Rendering/Core/vtkInteractorEventRecorder.h | 2 +- Rendering/Core/vtkPolyDataMapper.h | 4 ++-- Rendering/Core/vtkProp3D.h | 6 +++--- Rendering/Core/vtkRenderWindow.h | 2 +- Rendering/Core/vtkRenderWindowInteractor3D.h | 8 ++++---- Rendering/Core/vtkRenderer.h | 2 +- Rendering/Core/vtkVolumeProperty.h | 4 ++-- .../Cxx/TestValuePassFloatingPoint.cxx | 4 ++-- Rendering/OpenGL2/vtkCompositeMapperHelper2.h | 2 +- Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx | 8 ++++---- .../OpenGL2/vtkOpenGLVertexBufferObject.h | 4 ++-- Rendering/OpenGL2/vtkValuePass.cxx | 20 +++++++++---------- .../Parallel/vtkSynchronizedRenderWindows.cxx | 2 +- .../SceneGraph/Testing/Cxx/UnitTests.cxx | 2 -- .../Cxx/TestGPURayCastMapperShadows.cxx | 6 +++--- .../TestGPURayCastMultiVolumeOverlapping.cxx | 2 +- .../Cxx/TestGPURayCastVolumePicking.cxx | 2 +- .../TestSmartVolumeMapperImplicitArray.cxx | 2 +- Rendering/Volume/vtkGPUVolumeRayCastMapper.h | 2 +- .../vtkUnstructuredGridVolumeZSweepMapper.cxx | 2 +- .../vtkUnstructuredGridVolumeZSweepMapper.h | 2 +- .../VolumeOpenGL2/vtkVolumeShaderComposer.h | 8 ++++---- 113 files changed, 173 insertions(+), 172 deletions(-) diff --git a/Charts/Core/vtkPlot.h b/Charts/Core/vtkPlot.h index 8f19ffed890..fa080f7f7d7 100644 --- a/Charts/Core/vtkPlot.h +++ b/Charts/Core/vtkPlot.h @@ -141,7 +141,7 @@ public: // SetColor(unsigned char r, unsigned char g, unsigned char b) // here and in the inheriting classes overriding it VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.") - virtual void SetColor(double r, double g, double b) { this->SetColorF(r, g, b); }; + virtual void SetColor(double r, double g, double b) { this->SetColorF(r, g, b); } ///@} /** @@ -157,7 +157,7 @@ public: // If removed, please make GetColor(unsigned char rgb[3]) virtual VTK_DEPRECATED_IN_9_3_0("Please use unambiguous GetColorF method instead.") - virtual void GetColor(double rgb[3]) { this->GetColorF(rgb); }; + virtual void GetColor(double rgb[3]) { this->GetColorF(rgb); } ///@ /** diff --git a/Charts/Core/vtkPlotArea.h b/Charts/Core/vtkPlotArea.h index ff89806dcc2..4857d10fb82 100644 --- a/Charts/Core/vtkPlotArea.h +++ b/Charts/Core/vtkPlotArea.h @@ -46,7 +46,7 @@ public: void SetColorF(double r, double g, double b) override; VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.") - void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); }; + void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); } ///@} ///@{ diff --git a/Charts/Core/vtkPlotBar.h b/Charts/Core/vtkPlotBar.h index fa07e7119a6..c7b211ce809 100644 --- a/Charts/Core/vtkPlotBar.h +++ b/Charts/Core/vtkPlotBar.h @@ -74,7 +74,7 @@ public: void SetColorF(double r, double g, double b) override; VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.") - void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); }; + void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); } ///@} ///@{ @@ -84,7 +84,7 @@ public: void GetColorF(double rgb[3]) override; VTK_DEPRECATED_IN_9_3_0("Please use unambiguous GetColorF method instead.") - void GetColor(double rgb[3]) override { this->GetColorF(rgb); }; + void GetColor(double rgb[3]) override { this->GetColorF(rgb); } ///@} ///@{ diff --git a/Charts/Core/vtkPlotStacked.h b/Charts/Core/vtkPlotStacked.h index 36fb93a4fe7..cb6484569b4 100644 --- a/Charts/Core/vtkPlotStacked.h +++ b/Charts/Core/vtkPlotStacked.h @@ -51,7 +51,7 @@ public: void SetColorF(double r, double g, double b) override; VTK_DEPRECATED_IN_9_3_0("Please use unambiguous SetColorF method instead.") - void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); }; + void SetColor(double r, double g, double b) override { this->SetColorF(r, g, b); } ///@} ///@{ @@ -61,7 +61,7 @@ public: void GetColorF(double rgb[3]) override; VTK_DEPRECATED_IN_9_3_0("Please use unambiguous GetColorF method instead.") - void GetColor(double rgb[3]) override { this->GetColorF(rgb); }; + void GetColor(double rgb[3]) override { this->GetColorF(rgb); } ///@} /** diff --git a/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h b/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h index 984d20029f0..b4eeaaab307 100644 --- a/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h +++ b/Common/Core/SMP/Common/vtkSMPThreadLocalAPI.h @@ -176,7 +176,7 @@ public: iterator iter; iter.ImplAbstract = this->BackendsImpl[static_cast<int>(backendType)]->begin(); return iter; - }; + } //-------------------------------------------------------------------------------- iterator end() diff --git a/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h b/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h index 5649d49c011..30c267e1cc5 100644 --- a/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h +++ b/Common/Core/SMP/STDThread/vtkSMPThreadLocalImpl.h @@ -76,7 +76,7 @@ public: T* GetContentPtr() override { return reinterpret_cast<T*>(this->Impl.GetStorage()); } protected: - ItImpl* CloneImpl() const override { return new ItImpl(*this); }; + ItImpl* CloneImpl() const override { return new ItImpl(*this); } private: vtk::detail::smp::STDThread::ThreadSpecificStorageIterator Impl; diff --git a/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h b/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h index ca2c2765a27..38d72f3702f 100644 --- a/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h +++ b/Common/Core/SMP/Sequential/vtkSMPThreadLocalImpl.h @@ -90,7 +90,7 @@ public: T* GetContentPtr() override { return &*this->Iter; } protected: - ItImpl* CloneImpl() const override { return new ItImpl(*this); }; + ItImpl* CloneImpl() const override { return new ItImpl(*this); } private: friend class vtkSMPThreadLocalImpl<BackendType::Sequential, T>; @@ -123,7 +123,7 @@ public: // XXX(c++14): remove std::move and cast variable std::unique_ptr<ItImplAbstract> abstractIt(std::move(retVal)); return abstractIt; - }; + } std::unique_ptr<ItImplAbstract> end() override { diff --git a/Common/Core/Testing/Cxx/TestAffineArray.cxx b/Common/Core/Testing/Cxx/TestAffineArray.cxx index a1522ecb47f..cd452411e05 100644 --- a/Common/Core/Testing/Cxx/TestAffineArray.cxx +++ b/Common/Core/Testing/Cxx/TestAffineArray.cxx @@ -99,4 +99,4 @@ int TestAffineArray(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) } #endif // VTK_DISPATCH_AFFINE_ARRAYS return res; -}; +} diff --git a/Common/Core/Testing/Cxx/TestCompositeArray.cxx b/Common/Core/Testing/Cxx/TestCompositeArray.cxx index 07e1181c22f..e152c15b183 100644 --- a/Common/Core/Testing/Cxx/TestCompositeArray.cxx +++ b/Common/Core/Testing/Cxx/TestCompositeArray.cxx @@ -88,4 +88,4 @@ int TestCompositeArray(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) } return res; -}; +} diff --git a/Common/Core/Testing/Cxx/TestConstantArray.cxx b/Common/Core/Testing/Cxx/TestConstantArray.cxx index 6b6a556c947..575eedf57b5 100644 --- a/Common/Core/Testing/Cxx/TestConstantArray.cxx +++ b/Common/Core/Testing/Cxx/TestConstantArray.cxx @@ -95,4 +95,4 @@ int TestConstantArray(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) } #endif // VTK_DISPATCH_CONSTANT_ARRAYS return res; -}; +} diff --git a/Common/Core/Testing/Cxx/TestImplicitArraysBase.cxx b/Common/Core/Testing/Cxx/TestImplicitArraysBase.cxx index 5272294c5bc..6d750c80a43 100644 --- a/Common/Core/Testing/Cxx/TestImplicitArraysBase.cxx +++ b/Common/Core/Testing/Cxx/TestImplicitArraysBase.cxx @@ -71,7 +71,7 @@ struct ConstComponentStruct unsigned long getMemorySize() const { return 16; } }; -}; +} int TestImplicitArraysBase(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) { diff --git a/Common/Core/Testing/Cxx/TestIndexedArray.cxx b/Common/Core/Testing/Cxx/TestIndexedArray.cxx index b091e671f77..e7fb886f42a 100644 --- a/Common/Core/Testing/Cxx/TestIndexedArray.cxx +++ b/Common/Core/Testing/Cxx/TestIndexedArray.cxx @@ -57,4 +57,4 @@ int TestIndexedArray(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) } return res; -}; +} diff --git a/Common/Core/Testing/Cxx/TestStdFunctionArray.cxx b/Common/Core/Testing/Cxx/TestStdFunctionArray.cxx index c11fdebd2f8..e6f0e1b68da 100644 --- a/Common/Core/Testing/Cxx/TestStdFunctionArray.cxx +++ b/Common/Core/Testing/Cxx/TestStdFunctionArray.cxx @@ -100,4 +100,4 @@ int TestStdFunctionArray(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) } #endif // VTK_DISPATCH_STD_FUNCTION_ARRAYS return res; -}; +} diff --git a/Common/Core/vtkSMPThreadLocal.h b/Common/Core/vtkSMPThreadLocal.h index 5db75ff82f7..c5a3722c07d 100644 --- a/Common/Core/vtkSMPThreadLocal.h +++ b/Common/Core/vtkSMPThreadLocal.h @@ -121,7 +121,7 @@ public: * Returns a new iterator pointing to the beginning of * the local storage container. Thread safe. */ - iterator begin() { return this->ThreadLocalAPI.begin(); }; + iterator begin() { return this->ThreadLocalAPI.begin(); } /** * Returns a new iterator pointing to past the end of diff --git a/Common/Core/vtkSMPThreadLocalObject.h b/Common/Core/vtkSMPThreadLocalObject.h index ba47c11c79e..0224a5884b8 100644 --- a/Common/Core/vtkSMPThreadLocalObject.h +++ b/Common/Core/vtkSMPThreadLocalObject.h @@ -177,7 +177,7 @@ public: iterator iter; iter.Iter = this->Internal.begin(); return iter; - }; + } iterator end() { diff --git a/Common/DataModel/Testing/Cxx/TestHyperTreeGridGeometricLocator.cxx b/Common/DataModel/Testing/Cxx/TestHyperTreeGridGeometricLocator.cxx index f6e88a2d306..7c87fdfdfa3 100644 --- a/Common/DataModel/Testing/Cxx/TestHyperTreeGridGeometricLocator.cxx +++ b/Common/DataModel/Testing/Cxx/TestHyperTreeGridGeometricLocator.cxx @@ -483,7 +483,7 @@ bool TestLocatorTolerance() return success; } -}; +} int TestHyperTreeGridGeometricLocator(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) { diff --git a/Common/DataModel/vtkBezierHexahedron.cxx b/Common/DataModel/vtkBezierHexahedron.cxx index 67e35de1774..960b4759873 100644 --- a/Common/DataModel/vtkBezierHexahedron.cxx +++ b/Common/DataModel/vtkBezierHexahedron.cxx @@ -219,5 +219,5 @@ vtkHigherOrderQuadrilateral* vtkBezierHexahedron::GetFaceCell() vtkHigherOrderInterpolation* vtkBezierHexahedron::GetInterpolation() { return Interp; -}; +} VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBezierWedge.cxx b/Common/DataModel/vtkBezierWedge.cxx index 08f58f7cd83..c5f0a2b0c7b 100644 --- a/Common/DataModel/vtkBezierWedge.cxx +++ b/Common/DataModel/vtkBezierWedge.cxx @@ -195,11 +195,11 @@ vtkDoubleArray* vtkBezierWedge::GetRationalWeights() vtkHigherOrderQuadrilateral* vtkBezierWedge::GetBoundaryQuad() { return BdyQuad; -}; +} vtkHigherOrderTriangle* vtkBezierWedge::GetBoundaryTri() { return BdyTri; -}; +} vtkHigherOrderCurve* vtkBezierWedge::GetEdgeCell() { return EdgeCell; @@ -207,5 +207,5 @@ vtkHigherOrderCurve* vtkBezierWedge::GetEdgeCell() vtkHigherOrderInterpolation* vtkBezierWedge::GetInterpolation() { return Interp; -}; +} VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkBoundingBox.cxx b/Common/DataModel/vtkBoundingBox.cxx index bbe6e3257ae..79eb85fc67e 100644 --- a/Common/DataModel/vtkBoundingBox.cxx +++ b/Common/DataModel/vtkBoundingBox.cxx @@ -26,7 +26,7 @@ inline bool OppSign(const double& a, const double& b) { return (a <= 0 && b >= 0) || (a >= 0 && b <= 0); } -}; +} //------------------------------------------------------------------------------ void vtkBoundingBox::AddPoint(double px, double py, double pz) diff --git a/Common/DataModel/vtkHyperTreeGridLocator.h b/Common/DataModel/vtkHyperTreeGridLocator.h index ab3fe9718c3..4311cb99a9e 100644 --- a/Common/DataModel/vtkHyperTreeGridLocator.h +++ b/Common/DataModel/vtkHyperTreeGridLocator.h @@ -51,7 +51,7 @@ public: * Initialize or reinitialize the locator (setting or re-setting clean objects in memory) * (Does nothing) */ - virtual void Initialize(){}; + virtual void Initialize() {} /** * Update the locator's internal variables with respect to changes that could have happened diff --git a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h index 6d66a451706..8476f3f6fd0 100644 --- a/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h +++ b/Common/DataModel/vtkHyperTreeGridNonOrientedMooreSuperCursorLight.h @@ -63,7 +63,6 @@ protected: * Constructor */ vtkHyperTreeGridNonOrientedMooreSuperCursorLight() = default; - ; /** * Destructor diff --git a/Common/DataModel/vtkLagrangeHexahedron.cxx b/Common/DataModel/vtkLagrangeHexahedron.cxx index 635933bdd23..a4cff26a9ea 100644 --- a/Common/DataModel/vtkLagrangeHexahedron.cxx +++ b/Common/DataModel/vtkLagrangeHexahedron.cxx @@ -127,5 +127,5 @@ vtkHigherOrderQuadrilateral* vtkLagrangeHexahedron::GetFaceCell() vtkHigherOrderInterpolation* vtkLagrangeHexahedron::GetInterpolation() { return Interp; -}; +} VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLagrangeWedge.cxx b/Common/DataModel/vtkLagrangeWedge.cxx index fe639180757..e0364fbdc5d 100644 --- a/Common/DataModel/vtkLagrangeWedge.cxx +++ b/Common/DataModel/vtkLagrangeWedge.cxx @@ -100,11 +100,11 @@ void vtkLagrangeWedge::InterpolateDerivs(const double pcoords[3], double* derivs vtkHigherOrderQuadrilateral* vtkLagrangeWedge::GetBoundaryQuad() { return BdyQuad; -}; +} vtkHigherOrderTriangle* vtkLagrangeWedge::GetBoundaryTri() { return BdyTri; -}; +} vtkHigherOrderCurve* vtkLagrangeWedge::GetEdgeCell() { return EdgeCell; @@ -112,5 +112,5 @@ vtkHigherOrderCurve* vtkLagrangeWedge::GetEdgeCell() vtkHigherOrderInterpolation* vtkLagrangeWedge::GetInterpolation() { return Interp; -}; +} VTK_ABI_NAMESPACE_END diff --git a/Common/DataModel/vtkLocator.h b/Common/DataModel/vtkLocator.h index 5e8073e0923..60c10eea054 100644 --- a/Common/DataModel/vtkLocator.h +++ b/Common/DataModel/vtkLocator.h @@ -189,7 +189,7 @@ protected: /** * This function is not pure virtual to maintain backwards compatibility. */ - virtual void BuildLocatorInternal(){}; + virtual void BuildLocatorInternal() {} vtkDataSet* DataSet; vtkTypeBool UseExistingSearchStructure; diff --git a/Common/DataModel/vtkNonLinearCell.h b/Common/DataModel/vtkNonLinearCell.h index badfc7c636d..ba3f1ab99e9 100644 --- a/Common/DataModel/vtkNonLinearCell.h +++ b/Common/DataModel/vtkNonLinearCell.h @@ -65,7 +65,7 @@ public: this->Clip( value, cellScalars, locator, connectivity, inPd, outPd, inCd, cellId, outCd, insideOut); return false; - }; + } protected: vtkNonLinearCell(); diff --git a/Common/DataModel/vtkPointLocator.h b/Common/DataModel/vtkPointLocator.h index d5eff0bb7bb..45a67e0f6b6 100644 --- a/Common/DataModel/vtkPointLocator.h +++ b/Common/DataModel/vtkPointLocator.h @@ -152,7 +152,7 @@ public: xyz[1] = y; xyz[2] = z; return this->IsInsertedPoint(xyz); - }; + } vtkIdType IsInsertedPoint(const double x[3]) override; ///@} diff --git a/Common/DataModel/vtkSelection.cxx b/Common/DataModel/vtkSelection.cxx index bbe1d746e43..78804286ea4 100644 --- a/Common/DataModel/vtkSelection.cxx +++ b/Common/DataModel/vtkSelection.cxx @@ -649,7 +649,7 @@ struct vtkSelection::EvaluateFunctor this->Range = { VTK_SIGNED_CHAR_MAX, VTK_SIGNED_CHAR_MIN }; } - void Initialize(){}; + void Initialize() {} void operator()(vtkIdType begin, vtkIdType end) { diff --git a/Common/DataModel/vtkUniformGridAMR.cxx b/Common/DataModel/vtkUniformGridAMR.cxx index 138868e75d7..349136f5ead 100644 --- a/Common/DataModel/vtkUniformGridAMR.cxx +++ b/Common/DataModel/vtkUniformGridAMR.cxx @@ -196,7 +196,7 @@ void vtkUniformGridAMR::SetDataSet(vtkCompositeDataIterator* compositeIter, vtkD this->SetDataSet(amrIter->GetCurrentLevel(), amrIter->GetCurrentIndex(), vtkUniformGrid::SafeDownCast(dataObj)); } -}; +} //------------------------------------------------------------------------------ void vtkUniformGridAMR::SetGridDescription(int gridDescription) diff --git a/Common/DataModel/vtkUniformHyperTreeGrid.cxx b/Common/DataModel/vtkUniformHyperTreeGrid.cxx index 12243ed70c2..59821e5e9dd 100644 --- a/Common/DataModel/vtkUniformHyperTreeGrid.cxx +++ b/Common/DataModel/vtkUniformHyperTreeGrid.cxx @@ -262,7 +262,7 @@ void vtkUniformHyperTreeGrid::SetZCoordinates(vtkDataArray* m_ZCoordinates) this->GridScale[2] = (m_ZCoordinates->GetTuple1(m_ZCoordinates->GetNumberOfTuples() - 1) - this->Origin[2]) / (m_ZCoordinates->GetNumberOfTuples() - 1); -}; +} vtkDataArray* vtkUniformHyperTreeGrid::GetZCoordinates() { diff --git a/Common/DataModel/vtkVector.h b/Common/DataModel/vtkVector.h index 4fb69f5b7c3..93cfbd57ea8 100644 --- a/Common/DataModel/vtkVector.h +++ b/Common/DataModel/vtkVector.h @@ -504,7 +504,9 @@ public: using Superclass = vtkVector4<double>; vtkVector4d() = default; vtkVector4d(double x, double y, double z, double w) - : vtkVector4<double>(x, y, z, w){}; + : vtkVector4<double>(x, y, z, w) + { + } vtkVectorDerivedMacro(vtkVector4d, double, 4); }; diff --git a/Common/ExecutionModel/vtkAlgorithm.h b/Common/ExecutionModel/vtkAlgorithm.h index 5ae805e5ba3..0cc721ffeb0 100644 --- a/Common/ExecutionModel/vtkAlgorithm.h +++ b/Common/ExecutionModel/vtkAlgorithm.h @@ -226,8 +226,8 @@ public: void SetContainerAlgorithm(vtkAlgorithm* containerAlg) { this->ContainerAlgorithm = containerAlg; - }; - vtkAlgorithm* GetContainerAlgorithm() { return this->ContainerAlgorithm; }; + } + vtkAlgorithm* GetContainerAlgorithm() { return this->ContainerAlgorithm; } ///@} ///@{ diff --git a/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h index 7c29e879c48..0ab088d249f 100644 --- a/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h +++ b/Common/ExecutionModel/vtkRectilinearGridAlgorithm.h @@ -100,13 +100,13 @@ protected: virtual int RequestUpdateExtent(vtkInformation*, vtkInformationVector**, vtkInformationVector*) { return 1; - }; + } ///@} virtual int RequestUpdateTime(vtkInformation*, vtkInformationVector**, vtkInformationVector*) { return 1; - }; + } // see algorithm for more info int FillOutputPortInformation(int port, vtkInformation* info) override; diff --git a/Common/ExecutionModel/vtkStructuredGridAlgorithm.h b/Common/ExecutionModel/vtkStructuredGridAlgorithm.h index 8f9fc3a392a..0300a60d36c 100644 --- a/Common/ExecutionModel/vtkStructuredGridAlgorithm.h +++ b/Common/ExecutionModel/vtkStructuredGridAlgorithm.h @@ -98,13 +98,13 @@ protected: virtual int RequestUpdateExtent(vtkInformation*, vtkInformationVector**, vtkInformationVector*) { return 1; - }; + } ///@} virtual int RequestUpdateTime(vtkInformation*, vtkInformationVector**, vtkInformationVector*) { return 1; - }; + } // see algorithm for more info int FillOutputPortInformation(int port, vtkInformation* info) override; diff --git a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx index b97c37f5b4c..e0c5ab4d97a 100644 --- a/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx +++ b/Common/ExecutionModel/vtkThreadedCompositeDataPipeline.cxx @@ -56,7 +56,7 @@ void DeleteAll(vtkInformationVector** dst, int n) } delete[] dst; } -}; +} //------------------------------------------------------------------------------ class ProcessBlockData : public vtkObjectBase diff --git a/Common/System/vtkTimerLog.h b/Common/System/vtkTimerLog.h index 4991bec2d8b..0cb5168f959 100644 --- a/Common/System/vtkTimerLog.h +++ b/Common/System/vtkTimerLog.h @@ -258,7 +258,7 @@ public: vtkTimerLog::MarkStartEvent(eventString); } - ~vtkTimerLogScope() { vtkTimerLog::MarkEndEvent(this->EventString.c_str()); }; + ~vtkTimerLogScope() { vtkTimerLog::MarkEndEvent(this->EventString.c_str()); } protected: std::string EventString; diff --git a/Common/Transforms/vtkGeneralTransform.cxx b/Common/Transforms/vtkGeneralTransform.cxx index ce7b7e07a58..84346acdcee 100644 --- a/Common/Transforms/vtkGeneralTransform.cxx +++ b/Common/Transforms/vtkGeneralTransform.cxx @@ -225,7 +225,7 @@ void vtkGeneralTransform::Concatenate(vtkAbstractTransform* transform) } this->Concatenation->Concatenate(transform); this->Modified(); -}; +} //------------------------------------------------------------------------------ void vtkGeneralTransform::SetInput(vtkAbstractTransform* input) diff --git a/Filters/AMR/Testing/Cxx/TestImageToAMR.cxx b/Filters/AMR/Testing/Cxx/TestImageToAMR.cxx index 2d109c80664..a634004987c 100644 --- a/Filters/AMR/Testing/Cxx/TestImageToAMR.cxx +++ b/Filters/AMR/Testing/Cxx/TestImageToAMR.cxx @@ -49,7 +49,7 @@ vtkIdType FindCell(vtkImageData* image, double point[3]) int subid = 0; return image->vtkImageData::FindCell(point, nullptr, -1, 0.1, subid, pcoords, nullptr); } -}; +} int TestImageToAMR(int, char*[]) { diff --git a/Filters/AMR/vtkImageToAMR.cxx b/Filters/AMR/vtkImageToAMR.cxx index 360009f75f1..f86a23cb034 100644 --- a/Filters/AMR/vtkImageToAMR.cxx +++ b/Filters/AMR/vtkImageToAMR.cxx @@ -122,7 +122,7 @@ void Split(const vtkAMRBox& rootBox, int numLevels, int refinementRatio, int max SplitXYZ(parent, refinementRatio, childBoxes); } } -}; +} // create a grid by sampling from input using the indices in box vtkUniformGrid* ConstructGrid( @@ -198,7 +198,7 @@ vtkUniformGrid* ConstructGrid( return grid; } -}; +} vtkStandardNewMacro(vtkImageToAMR); //------------------------------------------------------------------------------ diff --git a/Filters/Core/Testing/Cxx/TestContourImplicitArrays.cxx b/Filters/Core/Testing/Cxx/TestContourImplicitArrays.cxx index 8a1c23d9d1b..033589a2d30 100644 --- a/Filters/Core/Testing/Cxx/TestContourImplicitArrays.cxx +++ b/Filters/Core/Testing/Cxx/TestContourImplicitArrays.cxx @@ -79,4 +79,4 @@ int TestContourImplicitArrays(int argc, char* argv[]) return (vtkRegressionTester::Test(argc, argv, renWin, 10) == vtkRegressionTester::PASSED) ? EXIT_SUCCESS : EXIT_FAILURE; -}; +} diff --git a/Filters/Core/Testing/Cxx/TestFieldDataToDataSetAttribute.cxx b/Filters/Core/Testing/Cxx/TestFieldDataToDataSetAttribute.cxx index ab644c423eb..75ae7a9db72 100644 --- a/Filters/Core/Testing/Cxx/TestFieldDataToDataSetAttribute.cxx +++ b/Filters/Core/Testing/Cxx/TestFieldDataToDataSetAttribute.cxx @@ -203,7 +203,7 @@ void TestHyperTreeGrid() TestDataObject(htg, vtkDataObject::CELL); } -}; +} int TestFieldDataToDataSetAttribute(int vtkNotUsed(argc), char* vtkNotUsed(argv)[]) { diff --git a/Filters/Core/vtkAttributeDataToTableFilter.cxx b/Filters/Core/vtkAttributeDataToTableFilter.cxx index 905ff3d0abb..996c88b6012 100644 --- a/Filters/Core/vtkAttributeDataToTableFilter.cxx +++ b/Filters/Core/vtkAttributeDataToTableFilter.cxx @@ -74,7 +74,7 @@ struct MaxCellSizeWorker { this->ReducedMaxCellSize = std::max(this->ReducedMaxCellSize, *iter); } - }; + } }; } diff --git a/Filters/Core/vtkCompositeCutter.cxx b/Filters/Core/vtkCompositeCutter.cxx index 33f7a5c10b9..c97de81ca15 100644 --- a/Filters/Core/vtkCompositeCutter.cxx +++ b/Filters/Core/vtkCompositeCutter.cxx @@ -65,7 +65,7 @@ inline bool IntersectBox(vtkImplicitFunction* func, double bounds[6], double val } return false; } -}; +} vtkCompositeCutter::vtkCompositeCutter(vtkImplicitFunction* cf) : vtkCutter(cf) diff --git a/Filters/Core/vtkContour3DLinearGrid.cxx b/Filters/Core/vtkContour3DLinearGrid.cxx index be52663665d..a496d3ed8f0 100644 --- a/Filters/Core/vtkContour3DLinearGrid.cxx +++ b/Filters/Core/vtkContour3DLinearGrid.cxx @@ -1363,7 +1363,7 @@ void GeneratePointNormals(vtkPoints* pts, vtkCellArray* tris, vtkFloatArray* cel // Clean up and get out pd->SetNormals(ptNormals); -}; +} } // anonymous namespace diff --git a/Filters/Core/vtkEdgeSubdivisionCriterion.cxx b/Filters/Core/vtkEdgeSubdivisionCriterion.cxx index 2b0aab2e3d0..62283e26357 100644 --- a/Filters/Core/vtkEdgeSubdivisionCriterion.cxx +++ b/Filters/Core/vtkEdgeSubdivisionCriterion.cxx @@ -27,7 +27,7 @@ vtkEdgeSubdivisionCriterion::~vtkEdgeSubdivisionCriterion() { delete[] this->FieldIds; delete[] this->FieldOffsets; -}; +} void vtkEdgeSubdivisionCriterion::ResetFieldList() { diff --git a/Filters/Core/vtkGlyph3D.h b/Filters/Core/vtkGlyph3D.h index c0ac2bee9f0..fd079746b6f 100644 --- a/Filters/Core/vtkGlyph3D.h +++ b/Filters/Core/vtkGlyph3D.h @@ -221,7 +221,7 @@ public: void SetVectorModeToUseVector() { this->SetVectorMode(VTK_USE_VECTOR); } void SetVectorModeToUseNormal() { this->SetVectorMode(VTK_USE_NORMAL); } void SetVectorModeToVectorRotationOff() { this->SetVectorMode(VTK_VECTOR_ROTATION_OFF); } - void SetVectorModeToFollowCameraDirection() { this->SetVectorMode(VTK_FOLLOW_CAMERA_DIRECTION); }; + void SetVectorModeToFollowCameraDirection() { this->SetVectorMode(VTK_FOLLOW_CAMERA_DIRECTION); } const char* GetVectorModeAsString(); ///@} diff --git a/Filters/Core/vtkPackLabels.cxx b/Filters/Core/vtkPackLabels.cxx index 35ae8fe9cfd..6ab8d0f0f10 100644 --- a/Filters/Core/vtkPackLabels.cxx +++ b/Filters/Core/vtkPackLabels.cxx @@ -43,7 +43,9 @@ struct LabelTuple vtkIdType Count; LabelTuple() : Label(0) - , Count(0){}; + , Count(0) + { + } // This comparison produces a stable sort because it also // considers the label value (it the label count is a tie). diff --git a/Filters/Core/vtkPolyDataEdgeConnectivityFilter.cxx b/Filters/Core/vtkPolyDataEdgeConnectivityFilter.cxx index 2e6d4e1c8b3..3f11dd21c60 100644 --- a/Filters/Core/vtkPolyDataEdgeConnectivityFilter.cxx +++ b/Filters/Core/vtkPolyDataEdgeConnectivityFilter.cxx @@ -36,7 +36,7 @@ enum RegionType LargeRegion = 1 }; -}; // anonymous namespace +} // anonymous namespace //------------------------------------------------------------------------------ // Construct with default extraction mode to extract largest regions. diff --git a/Filters/Core/vtkSurfaceNets3D.h b/Filters/Core/vtkSurfaceNets3D.h index bf8fb264c00..2b0ce30634d 100644 --- a/Filters/Core/vtkSurfaceNets3D.h +++ b/Filters/Core/vtkSurfaceNets3D.h @@ -344,8 +344,8 @@ public: void SetConstraintBox(double sx, double sy, double sz) { this->Smoother->SetConstraintBox(sx, sy, sz); - }; - void SetConstraintBox(double s[3]) { this->Smoother->SetConstraintBox(s); }; + } + void SetConstraintBox(double s[3]) { this->Smoother->SetConstraintBox(s); } double* GetConstraintBox() VTK_SIZEHINT(3) { return this->Smoother->GetConstraintBox(); } void GetConstraintBox(double s[3]) { this->Smoother->GetConstraintBox(s); } void SetConstraintStrategyToConstraintDistance() diff --git a/Filters/FlowPaths/vtkModifiedBSPTree.cxx b/Filters/FlowPaths/vtkModifiedBSPTree.cxx index 92fffa9d932..039368dcfeb 100644 --- a/Filters/FlowPaths/vtkModifiedBSPTree.cxx +++ b/Filters/FlowPaths/vtkModifiedBSPTree.cxx @@ -89,7 +89,7 @@ public: Maxs[i] = new cell_extents[nCells]; } global_list_count += 1; - }; + } ~Sorted_cell_extents_Lists() { for (int i = 0; i < 3; i++) @@ -475,7 +475,7 @@ public: { bounds[i] = b[i]; } - }; + } }; //------------------------------------------------------------------------------ diff --git a/Filters/FlowPaths/vtkParticleTracerBase.cxx b/Filters/FlowPaths/vtkParticleTracerBase.cxx index 65dbbfca3cb..9e5f2cf35a1 100644 --- a/Filters/FlowPaths/vtkParticleTracerBase.cxx +++ b/Filters/FlowPaths/vtkParticleTracerBase.cxx @@ -98,7 +98,7 @@ inline int FindInterval(double a, const std::vector<double>& A) return -1; } -}; +} VTK_ABI_NAMESPACE_BEGIN //------------------------------------------------------------------------------ diff --git a/Filters/FlowPaths/vtkParticleTracerBase.h b/Filters/FlowPaths/vtkParticleTracerBase.h index ba755f5f8af..1b30b0e6835 100644 --- a/Filters/FlowPaths/vtkParticleTracerBase.h +++ b/Filters/FlowPaths/vtkParticleTracerBase.h @@ -91,7 +91,7 @@ typedef std::list<ParticleInformation> ParticleDataList; typedef ParticleDataList::iterator ParticleListIterator; struct ParticleTracerFunctor; VTK_ABI_NAMESPACE_END -}; +} VTK_ABI_NAMESPACE_BEGIN class VTKFILTERSFLOWPATHS_EXPORT vtkParticleTracerBase : public vtkPolyDataAlgorithm diff --git a/Filters/General/vtkCurvatures.cxx b/Filters/General/vtkCurvatures.cxx index 12c27ee39f9..b738fb3d662 100644 --- a/Filters/General/vtkCurvatures.cxx +++ b/Filters/General/vtkCurvatures.cxx @@ -204,7 +204,7 @@ void vtkCurvatures::GetMeanCurvature(vtkPolyData* mesh) mesh->GetPointData()->SetActiveScalars("Mean_Curvature"); vtkDebugMacro("Set Values of Mean Curvature: Done"); -}; +} //-------------------------------------------- #define CLAMP_MACRO(v) ((v) < (-1) ? (-1) : (v) > (1) ? (1) : (v)) void vtkCurvatures::GetGaussCurvature(vtkPolyData* output) diff --git a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx index eaf7f3d17ee..4075bf86f33 100644 --- a/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx +++ b/Filters/General/vtkQuadratureSchemeDictionaryGenerator.cxx @@ -107,7 +107,7 @@ double W_QE_42_A[] = { 1.56250000000000e-01, -9.37500000000000e-02, -9.375000000 1.56250000000000e-02, 3.12500000000000e-02, 3.75000000000000e-01, 1.87500000000000e-01, 1.87500000000000e-01 }; -}; +} vtkStandardNewMacro(vtkQuadratureSchemeDictionaryGenerator); diff --git a/Filters/General/vtkRemovePolyData.cxx b/Filters/General/vtkRemovePolyData.cxx index d5072193721..ac4209666a7 100644 --- a/Filters/General/vtkRemovePolyData.cxx +++ b/Filters/General/vtkRemovePolyData.cxx @@ -714,7 +714,7 @@ struct BuildCellArrays } }; -}; // anonymous +} // anonymous //------------------------------------------------------------------------------ // Remove cells from a polygonal data set. diff --git a/Filters/General/vtkSplitColumnComponents.cxx b/Filters/General/vtkSplitColumnComponents.cxx index 5a27078c0b5..0b91067870d 100644 --- a/Filters/General/vtkSplitColumnComponents.cxx +++ b/Filters/General/vtkSplitColumnComponents.cxx @@ -214,7 +214,7 @@ std::string vtkGetComponentName(vtkAbstractArray* array, int component_no) } return vtkDefaultComponentName(component_no, array->GetNumberOfComponents()); } -}; +} //------------------------------------------------------------------------------ std::string vtkSplitColumnComponents::GetComponentLabel(vtkAbstractArray* array, int component_no) diff --git a/Filters/General/vtkTableFFT.h b/Filters/General/vtkTableFFT.h index 34e3a2b56ee..b1acdbf3a9e 100644 --- a/Filters/General/vtkTableFFT.h +++ b/Filters/General/vtkTableFFT.h @@ -237,7 +237,7 @@ public: VTK_DEPRECATED_IN_9_3_0("Function has been renamed ReturnOnesidedOn") virtual void OptimizeForRealInputOn() { this->ReturnOnesidedOn(); } VTK_DEPRECATED_IN_9_3_0("Function has been renamed ReturnOnesidedOff") - virtual void OptimizeForRealInputOff() { this->ReturnOnesidedOff(); }; + virtual void OptimizeForRealInputOff() { this->ReturnOnesidedOff(); } ///@} ///@{ @@ -250,10 +250,10 @@ public: */ VTK_DEPRECATED_IN_9_3_0( "Block behavior is not controlled using BlockSize and BlockOverlap properties.") - virtual int GetNumberOfBlock() { return 0; }; + virtual int GetNumberOfBlock() { return 0; } VTK_DEPRECATED_IN_9_3_0( "Block behavior is not controlled using BlockSize and BlockOverlap properties.") - virtual void SetNumberOfBlock(int){}; + virtual void SetNumberOfBlock(int) {} ///@} protected: diff --git a/Filters/Geometry/vtkDataSetRegionSurfaceFilter.cxx b/Filters/Geometry/vtkDataSetRegionSurfaceFilter.cxx index 31ceb48aa5d..b66de22949b 100644 --- a/Filters/Geometry/vtkDataSetRegionSurfaceFilter.cxx +++ b/Filters/Geometry/vtkDataSetRegionSurfaceFilter.cxx @@ -34,7 +34,7 @@ public: : NextRegion(0) { this->OldToNew[-1] = -1; - }; + } ~Internals() = default; // place to pass a material id back but still subclass diff --git a/Filters/Hybrid/vtkDepthSortPolyData.cxx b/Filters/Hybrid/vtkDepthSortPolyData.cxx index 1a51be32cd3..6280ca6fdcf 100644 --- a/Filters/Hybrid/vtkDepthSortPolyData.cxx +++ b/Filters/Hybrid/vtkDepthSortPolyData.cxx @@ -182,7 +182,7 @@ void getCellPoint0Depth(vtkPolyData* pds, vtkDataArray* gpts, vtkIdType nCells, delete[] cy; delete[] cz; } -}; +} vtkStandardNewMacro(vtkDepthSortPolyData); diff --git a/Filters/Programmable/vtkProgrammableFilter.cxx b/Filters/Programmable/vtkProgrammableFilter.cxx index 2a5ebb743c9..17305c02e65 100644 --- a/Filters/Programmable/vtkProgrammableFilter.cxx +++ b/Filters/Programmable/vtkProgrammableFilter.cxx @@ -35,7 +35,7 @@ void copyStructure(vtkDataObject* dataIn, vtkDataObject* dataOut) { out->CopyStructure(in); } -}; +} void initializeOutput(vtkDataObject* objInput, vtkDataObject* objOutput, bool copyArrays) { diff --git a/Filters/Reduction/vtkToImplicitStrategy.h b/Filters/Reduction/vtkToImplicitStrategy.h index 2bc58eab7e5..e37643c813a 100644 --- a/Filters/Reduction/vtkToImplicitStrategy.h +++ b/Filters/Reduction/vtkToImplicitStrategy.h @@ -74,7 +74,7 @@ public: * * The default implementation does nothing. */ - virtual void ClearCache(){}; + virtual void ClearCache() {} protected: vtkToImplicitStrategy() = default; diff --git a/Filters/Statistics/vtkContingencyStatistics.cxx b/Filters/Statistics/vtkContingencyStatistics.cxx index 4a6f8e2072a..d126c3f3718 100644 --- a/Filters/Statistics/vtkContingencyStatistics.cxx +++ b/Filters/Statistics/vtkContingencyStatistics.cxx @@ -900,7 +900,7 @@ vtkContingencyStatistics::vtkContingencyStatistics() this->AssessNames->SetValue(1, "Py|x"); this->AssessNames->SetValue(2, "Px|y"); this->AssessNames->SetValue(3, "PMI"); -}; +} //------------------------------------------------------------------------------ vtkContingencyStatistics::~vtkContingencyStatistics() = default; diff --git a/IO/AMR/vtkAMRBaseReader.h b/IO/AMR/vtkAMRBaseReader.h index f0ed5084b83..ff17a0f049a 100644 --- a/IO/AMR/vtkAMRBaseReader.h +++ b/IO/AMR/vtkAMRBaseReader.h @@ -44,7 +44,7 @@ public: vtkSetMacro(EnableCaching, vtkTypeBool); vtkGetMacro(EnableCaching, vtkTypeBool); vtkBooleanMacro(EnableCaching, vtkTypeBool); - bool IsCachingEnabled() const { return ((this->EnableCaching) ? true : false); }; + bool IsCachingEnabled() const { return ((this->EnableCaching) ? true : false); } ///@} ///@{ diff --git a/IO/CGNS/vtkCGNSFileSeriesReader.cxx b/IO/CGNS/vtkCGNSFileSeriesReader.cxx index 562e4026513..5870a7cf5db 100644 --- a/IO/CGNS/vtkCGNSFileSeriesReader.cxx +++ b/IO/CGNS/vtkCGNSFileSeriesReader.cxx @@ -217,7 +217,7 @@ static bool SetFileNameCallback(vtkAlgorithm* reader, const std::string& fname) return true; } return false; -}; +} VTK_ABI_NAMESPACE_END } diff --git a/IO/Cesium3DTiles/vtkCesium3DTilesWriter.cxx b/IO/Cesium3DTiles/vtkCesium3DTilesWriter.cxx index 007ae32706c..8aa03046cb3 100644 --- a/IO/Cesium3DTiles/vtkCesium3DTilesWriter.cxx +++ b/IO/Cesium3DTiles/vtkCesium3DTilesWriter.cxx @@ -183,7 +183,7 @@ vtkPolyData* GetMesh(vtkMultiBlockDataSet* mbMesh) auto pd = vtkPolyData::SafeDownCast(it->GetCurrentDataObject()); return pd; } -}; +} //------------------------------------------------------------------------------ vtkCesium3DTilesWriter::vtkCesium3DTilesWriter() diff --git a/IO/Exodus/vtkExodusIIWriter.h b/IO/Exodus/vtkExodusIIWriter.h index 451392fb7a4..8a3dfbbd46c 100644 --- a/IO/Exodus/vtkExodusIIWriter.h +++ b/IO/Exodus/vtkExodusIIWriter.h @@ -219,7 +219,7 @@ protected: this->OutputIndex = -1; this->NumAttributes = 0; this->BlockAttributes = nullptr; - }; + } const char* Name; int Type; int NumElements; diff --git a/IO/HDF/vtkHDFReaderImplementation.cxx b/IO/HDF/vtkHDFReaderImplementation.cxx index 7bc110addbe..23f721be2a3 100644 --- a/IO/HDF/vtkHDFReaderImplementation.cxx +++ b/IO/HDF/vtkHDFReaderImplementation.cxx @@ -55,7 +55,7 @@ herr_t AddName(hid_t group, const char* name, const H5L_info_t*, void* op_data) } return status; } -}; +} //------------------------------------------------------------------------------ vtkHDFReader::Implementation::TypeDescription vtkHDFReader::Implementation::GetTypeDescription( diff --git a/IO/Image/Testing/Cxx/TestMRCReader.cxx b/IO/Image/Testing/Cxx/TestMRCReader.cxx index d0a368a7ccd..0288311c2bb 100644 --- a/IO/Image/Testing/Cxx/TestMRCReader.cxx +++ b/IO/Image/Testing/Cxx/TestMRCReader.cxx @@ -65,7 +65,7 @@ static void TestDisplay(vtkRenderWindow* renwin, const char* infile) renwin->SetSize(size[0], size[1]); renwin->AddRenderer(ren1); -}; +} int TestMRCReader(int argc, char* argv[]) { diff --git a/IO/Image/Testing/Cxx/TestNIFTI2.cxx b/IO/Image/Testing/Cxx/TestNIFTI2.cxx index ca31ae9d35e..e8b2d53c84a 100644 --- a/IO/Image/Testing/Cxx/TestNIFTI2.cxx +++ b/IO/Image/Testing/Cxx/TestNIFTI2.cxx @@ -126,7 +126,7 @@ static void TestDisplay(vtkRenderWindow* renwin, const char* infile, const char* renwin->SetSize(size[0] + size[2], size[1]); renwin->AddRenderer(ren1); renwin->AddRenderer(ren2); -}; +} int TestNIFTI2(int argc, char* argv[]) { diff --git a/IO/Image/Testing/Cxx/TestNIFTIReaderAnalyze.cxx b/IO/Image/Testing/Cxx/TestNIFTIReaderAnalyze.cxx index 5d8bc4f054f..b6b64db4789 100644 --- a/IO/Image/Testing/Cxx/TestNIFTIReaderAnalyze.cxx +++ b/IO/Image/Testing/Cxx/TestNIFTIReaderAnalyze.cxx @@ -101,7 +101,7 @@ static void TestDisplay(vtkRenderWindow* renwin, const char* infile) renwin->SetSize(size[0] + size[2], size[1]); renwin->AddRenderer(ren1); renwin->AddRenderer(ren2); -}; +} int TestNIFTIReaderAnalyze(int argc, char* argv[]) { diff --git a/IO/Image/Testing/Cxx/TestNIFTIReaderWriter.cxx b/IO/Image/Testing/Cxx/TestNIFTIReaderWriter.cxx index f57a2e2bd1e..44bc1d9b0e1 100644 --- a/IO/Image/Testing/Cxx/TestNIFTIReaderWriter.cxx +++ b/IO/Image/Testing/Cxx/TestNIFTIReaderWriter.cxx @@ -105,7 +105,7 @@ static void TestDisplay(vtkRenderWindow* renwin, const char* infile) renwin->SetSize((size[0] + size[2]) / 2 * 2, size[1] / 2 * 2); // keep size even renwin->AddRenderer(ren1); renwin->AddRenderer(ren2); -}; +} static double TestReadWriteRead( const char* infile, const char* infile2, const char* outfile, bool planarRGB) diff --git a/IO/Image/vtkPNGReader.cxx b/IO/Image/vtkPNGReader.cxx index d6d04a7d58b..4f37efee39f 100644 --- a/IO/Image/vtkPNGReader.cxx +++ b/IO/Image/vtkPNGReader.cxx @@ -75,7 +75,7 @@ void PNGReadCallback(png_structp pngPtr, png_bytep output, png_size_t length) // Advance cursor input->position += length; } -}; +} class vtkPNGReader::vtkInternals { diff --git a/IO/Import/vtkGLTFImporter.cxx b/IO/Import/vtkGLTFImporter.cxx index a67d90ef241..8c658921a0f 100644 --- a/IO/Import/vtkGLTFImporter.cxx +++ b/IO/Import/vtkGLTFImporter.cxx @@ -314,7 +314,7 @@ void ApplyGLTFMaterialToVTKActor(std::shared_ptr<vtkGLTFDocumentLoader::Model> m b = pow(b, 1.f / 2.2f); actor->GetProperty()->SetColor(r, g, b); } -}; +} //------------------------------------------------------------------------------ void ApplyTransformToCamera(vtkSmartPointer<vtkCamera> cam, vtkSmartPointer<vtkMatrix4x4> transform) diff --git a/IO/Import/vtkGLTFImporter.h b/IO/Import/vtkGLTFImporter.h index e58db149219..ee45deeb90f 100644 --- a/IO/Import/vtkGLTFImporter.h +++ b/IO/Import/vtkGLTFImporter.h @@ -85,7 +85,7 @@ public: /** * Get a printable string describing all outputs */ - std::string GetOutputsDescription() override { return this->OutputsDescription; }; + std::string GetOutputsDescription() override { return this->OutputsDescription; } /** * update timestep diff --git a/IO/Import/vtkVRMLImporter_Yacc.h b/IO/Import/vtkVRMLImporter_Yacc.h index c472b968b9a..5d90006e2d0 100644 --- a/IO/Import/vtkVRMLImporter_Yacc.h +++ b/IO/Import/vtkVRMLImporter_Yacc.h @@ -368,17 +368,17 @@ inline void VrmlNodeType::addEventIn(const char *nodeName, int type) { add(eventIns, nodeName, type); -}; +} inline void VrmlNodeType::addEventOut(const char *nodeName, int type) { add(eventOuts, nodeName, type); -}; +} inline void VrmlNodeType::addField(const char *nodeName, int type) { add(fields, nodeName, type); -}; +} inline void VrmlNodeType::addExposedField(const char *nodeName, int type) { @@ -389,7 +389,7 @@ VrmlNodeType::addExposedField(const char *nodeName, int type) add(eventIns, tmp.data(), type); snprintf(tmp.data(), length, "%s_changed", nodeName); add(eventOuts, tmp.data(), type); -}; +} inline void VrmlNodeType::add(vtkVRMLVectorType<NameTypeRec*> &recs, const char *nodeName, int type) diff --git a/IO/SegY/vtkSegYReaderInternal.cxx b/IO/SegY/vtkSegYReaderInternal.cxx index b70d7868ef9..34287d3c6b8 100644 --- a/IO/SegY/vtkSegYReaderInternal.cxx +++ b/IO/SegY/vtkSegYReaderInternal.cxx @@ -29,7 +29,7 @@ double decodeMultiplier(short multiplier) { return (multiplier < 0) ? (-1.0 / multiplier) : (multiplier > 0 ? multiplier : 1.0); } -}; +} //------------------------------------------------------------------------------ vtkSegYReaderInternal::vtkSegYReaderInternal() diff --git a/Infovis/Core/vtkKCoreDecomposition.cxx b/Infovis/Core/vtkKCoreDecomposition.cxx index 594e6ef5958..006c1f3c7d4 100644 --- a/Infovis/Core/vtkKCoreDecomposition.cxx +++ b/Infovis/Core/vtkKCoreDecomposition.cxx @@ -199,7 +199,7 @@ public: private: vtkIntArray* _array; }; -}; +} vtkKCoreDecomposition::vtkKCoreDecomposition() { diff --git a/Infovis/Layout/vtkForceDirectedLayoutStrategy.cxx b/Infovis/Layout/vtkForceDirectedLayoutStrategy.cxx index c507dcc07ac..ef8118ec7b8 100644 --- a/Infovis/Layout/vtkForceDirectedLayoutStrategy.cxx +++ b/Infovis/Layout/vtkForceDirectedLayoutStrategy.cxx @@ -176,7 +176,7 @@ void vtkForceDirectedLayoutStrategy::Initialize() // Set some vars this->TotalIterations = 0; this->LayoutComplete = 0; -}; +} // ForceDirected graph layout method void vtkForceDirectedLayoutStrategy::Layout() diff --git a/Infovis/Layout/vtkSimple3DCirclesStrategy.cxx b/Infovis/Layout/vtkSimple3DCirclesStrategy.cxx index e3f833f4fcb..3bcfee37298 100644 --- a/Infovis/Layout/vtkSimple3DCirclesStrategy.cxx +++ b/Infovis/Layout/vtkSimple3DCirclesStrategy.cxx @@ -34,23 +34,23 @@ public: { if (&from != this) this->store = from.store; - }; + } vtkSimple3DCirclesStrategyInternal& operator=(const vtkSimple3DCirclesStrategyInternal& from) { if (&from != this) this->store = from.store; return *this; - }; + } vtkSimple3DCirclesStrategyInternal& operator=(const std::list<vtkIdType>& from) { this->store = from; return *this; - }; - vtkIdType front() { return this->store.front(); }; - void pop_front() { this->store.pop_front(); }; - std::size_t size() { return this->store.size(); }; - void push_back(const vtkIdType& value) { this->store.push_back(value); }; - ~vtkSimple3DCirclesStrategyInternal() { this->store.clear(); }; + } + vtkIdType front() { return this->store.front(); } + void pop_front() { this->store.pop_front(); } + std::size_t size() { return this->store.size(); } + void push_back(const vtkIdType& value) { this->store.push_back(value); } + ~vtkSimple3DCirclesStrategyInternal() { this->store.clear(); } private: std::list<vtkIdType> store; diff --git a/Interaction/Widgets/vtkCameraOrientationRepresentation.h b/Interaction/Widgets/vtkCameraOrientationRepresentation.h index 5b9c40a2946..dfb35adfbae 100644 --- a/Interaction/Widgets/vtkCameraOrientationRepresentation.h +++ b/Interaction/Widgets/vtkCameraOrientationRepresentation.h @@ -240,7 +240,7 @@ public: /** * These are methods that satisfy vtkWidgetRepresentation's API. */ - void PlaceWidget(double*) override{}; // this representation is an overlay. Doesn't need this. + void PlaceWidget(double*) override {} // this representation is an overlay. Doesn't need this. void BuildRepresentation() override; void StartWidgetInteraction(double eventPos[2]) override; void WidgetInteraction(double newEventPos[2]) override; diff --git a/Interaction/Widgets/vtkSeedRepresentation.h b/Interaction/Widgets/vtkSeedRepresentation.h index 2f5c5611d25..2339f9c595f 100644 --- a/Interaction/Widgets/vtkSeedRepresentation.h +++ b/Interaction/Widgets/vtkSeedRepresentation.h @@ -78,7 +78,7 @@ public: /** * Returns the model HandleRepresentation. */ - vtkHandleRepresentation* GetHandleRepresentation() { return this->HandleRepresentation; }; + vtkHandleRepresentation* GetHandleRepresentation() { return this->HandleRepresentation; } ///@} ///@{ diff --git a/Parallel/Core/vtkCommunicator.h b/Parallel/Core/vtkCommunicator.h index ada41bec157..25f79f62840 100644 --- a/Parallel/Core/vtkCommunicator.h +++ b/Parallel/Core/vtkCommunicator.h @@ -1245,7 +1245,7 @@ public: * methode a pure virtual method and having it implemented everwhere so as to no longer need the * CanProbe method. */ - virtual bool CanProbe() { return false; }; + virtual bool CanProbe() { return false; } /** * Blocking test for checking for a message tagged with tag from source process (if diff --git a/Parallel/Core/vtkMultiProcessController.h b/Parallel/Core/vtkMultiProcessController.h index a888017471b..373b6c671f0 100644 --- a/Parallel/Core/vtkMultiProcessController.h +++ b/Parallel/Core/vtkMultiProcessController.h @@ -1401,7 +1401,7 @@ public: /** * Check if this controller implements a probe operation */ - virtual bool CanProbe() { return this->Communicator->CanProbe(); }; + virtual bool CanProbe() { return this->Communicator->CanProbe(); } /** * Blocking test for checking for a message tagged with tag from source process (if diff --git a/Parallel/DIY/vtkDIYGhostUtilities.h b/Parallel/DIY/vtkDIYGhostUtilities.h index 4a0abca2cd8..3492231605e 100644 --- a/Parallel/DIY/vtkDIYGhostUtilities.h +++ b/Parallel/DIY/vtkDIYGhostUtilities.h @@ -423,7 +423,7 @@ protected: bool InputNeedsGhostsPeeledOff() const { return this->OutputToInputCellIdRedirectionMap != nullptr; - }; + } /** * Bounding box of input. diff --git a/Rendering/Annotation/vtkAxisActor2D.h b/Rendering/Annotation/vtkAxisActor2D.h index 2917bb0c57e..1e4220bf53d 100644 --- a/Rendering/Annotation/vtkAxisActor2D.h +++ b/Rendering/Annotation/vtkAxisActor2D.h @@ -167,7 +167,7 @@ public: this->UpdateAdjustedRange(); _arg1 = this->AdjustedRange[0]; _arg2 = this->AdjustedRange[1]; - }; + } virtual void GetAdjustedRange(double _arg[2]) { this->GetAdjustedRange(_arg[0], _arg[1]); } virtual int GetAdjustedNumberOfLabels() { diff --git a/Rendering/Annotation/vtkAxisFollower.h b/Rendering/Annotation/vtkAxisFollower.h index 90527f25581..b8398882159 100644 --- a/Rendering/Annotation/vtkAxisFollower.h +++ b/Rendering/Annotation/vtkAxisFollower.h @@ -128,7 +128,7 @@ public: * Overridden to disable this function, and use ComputeTransformMatrix instead, as * we need a renderer to compute the transform matrix */ - void ComputeMatrix() override{}; + void ComputeMatrix() override {} /** * Generate the matrix based on ivars. This method overloads its superclasses diff --git a/Rendering/CellGrid/vtkGLSLModCoincidentTopology.h b/Rendering/CellGrid/vtkGLSLModCoincidentTopology.h index 36e47fa9e5b..b417848ef74 100644 --- a/Rendering/CellGrid/vtkGLSLModCoincidentTopology.h +++ b/Rendering/CellGrid/vtkGLSLModCoincidentTopology.h @@ -38,7 +38,7 @@ public: { // always up to date, because once replacements were handled, there is no need to remove them return true; - }; + } protected: vtkGLSLModCoincidentTopology(); diff --git a/Rendering/Context2D/vtkPolyDataItem.cxx b/Rendering/Context2D/vtkPolyDataItem.cxx index 69c2c6b2e23..fd0e15f5b6e 100644 --- a/Rendering/Context2D/vtkPolyDataItem.cxx +++ b/Rendering/Context2D/vtkPolyDataItem.cxx @@ -66,7 +66,7 @@ public: vtkPen* pen = painter->GetPen(); pen->SetLineType(this->previousLineType); pen->SetWidth(this->previousLineWidth); - }; + } private: DrawHintsHelper(const DrawHintsHelper&) = delete; diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h index 0e9c818a304..0bd7332f9d4 100644 --- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h +++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h @@ -544,7 +544,7 @@ public: , NumPointsCell(0) { this->cache = new PolyDataCache(); - }; + } ~CellArrayHelper() { delete this->cache; } @@ -568,7 +568,7 @@ public: this->DrawPolygons(polyData, scalarMode, x, y, scale); break; } - }; + } void HandleEndFrame() { this->cache->SwapCaches(); } @@ -691,7 +691,7 @@ private: this->CellColors->SetTuple(i, mappedColorId, this->Colors); } - }; + } /** * Batch all of the line primitives in an array and draw them using @@ -763,7 +763,7 @@ private: static_cast<unsigned char*>(cacheItem->LineColors->GetVoidPointer(0)), cacheItem->LineColors->GetNumberOfComponents()); } - }; + } /** * Pre-computes the total number of polygon vertices after converted into triangles. @@ -787,7 +787,7 @@ private: cellIter->Delete(); return numTriVert; - }; + } /** * Convert all of the polygon primitives into triangles and draw them as a batch using @@ -870,7 +870,7 @@ private: this->Device->CoreDrawTriangles(cacheItem->PolyTri, static_cast<unsigned char*>(cacheItem->PolyColors->GetVoidPointer(0)), 4); } - }; + } vtkOpenGLContextDevice2D* Device; diff --git a/Rendering/Core/Testing/Cxx/TestDirectScalarsToColors.cxx b/Rendering/Core/Testing/Cxx/TestDirectScalarsToColors.cxx index 325c6fc328b..23c89bbbdc5 100644 --- a/Rendering/Core/Testing/Cxx/TestDirectScalarsToColors.cxx +++ b/Rendering/Core/Testing/Cxx/TestDirectScalarsToColors.cxx @@ -44,7 +44,7 @@ inline void UCharToColor(unsigned char src, float* dest) { *dest = (static_cast<float>(src) / 255.0); } -}; +} template <typename T, typename BaseT> void addViews(vtkRenderWindow* renWin, int typeIndex) diff --git a/Rendering/Core/vtkActor2DCollection.h b/Rendering/Core/vtkActor2DCollection.h index f7d15b4a596..cc928956670 100644 --- a/Rendering/Core/vtkActor2DCollection.h +++ b/Rendering/Core/vtkActor2DCollection.h @@ -93,7 +93,7 @@ private: void AddItem(vtkObject* o) { this->vtkCollection::AddItem(o); } void AddItem(vtkProp* o) { this->vtkPropCollection::AddItem(o); } int IsItemPresent(vtkObject* o) { return this->vtkCollection::IsItemPresent(o); } - int IndexOfFirstOccurence(vtkObject* o) { return this->vtkCollection::IndexOfFirstOccurence(o); }; + int IndexOfFirstOccurence(vtkObject* o) { return this->vtkCollection::IndexOfFirstOccurence(o); } vtkActor2DCollection(const vtkActor2DCollection&) = delete; void operator=(const vtkActor2DCollection&) = delete; diff --git a/Rendering/Core/vtkHardwareWindow.h b/Rendering/Core/vtkHardwareWindow.h index 5658701351a..17ea819292a 100644 --- a/Rendering/Core/vtkHardwareWindow.h +++ b/Rendering/Core/vtkHardwareWindow.h @@ -30,10 +30,10 @@ public: void PrintSelf(ostream& os, vtkIndent indent) override; // create the window (not the instance) - virtual void Create(){}; + virtual void Create() {} // destroy the window (not the instance) - virtual void Destroy(){}; + virtual void Destroy() {} protected: vtkHardwareWindow(); diff --git a/Rendering/Core/vtkInteractorEventRecorder.h b/Rendering/Core/vtkInteractorEventRecorder.h index a0bef5f334e..3d7595835bb 100644 --- a/Rendering/Core/vtkInteractorEventRecorder.h +++ b/Rendering/Core/vtkInteractorEventRecorder.h @@ -143,7 +143,7 @@ protected: VTK_DEPRECATED_IN_9_2_0( "This method was not used at all and has been replaced by ReadEvent(const std::string&)") - virtual void ReadEvent(){}; + virtual void ReadEvent() {} /** * A method that parse a event line and invoke the corresponding event diff --git a/Rendering/Core/vtkPolyDataMapper.h b/Rendering/Core/vtkPolyDataMapper.h index 07b1d9d4ee8..3922409dee0 100644 --- a/Rendering/Core/vtkPolyDataMapper.h +++ b/Rendering/Core/vtkPolyDataMapper.h @@ -33,7 +33,7 @@ public: /** * Implemented by sub classes. Actual rendering is done here. */ - virtual void RenderPiece(vtkRenderer*, vtkActor*){}; + virtual void RenderPiece(vtkRenderer*, vtkActor*) {} /** * This calls RenderPiece (in a for loop if streaming is necessary). @@ -49,7 +49,7 @@ public: * @note: For example, the OpenGL impl is capable of grouping polydata * that are similar in terms of the availability of scalars, normals and tcoords. */ - virtual MapperHashType GenerateHash(vtkPolyData*) { return 0; }; + virtual MapperHashType GenerateHash(vtkPolyData*) { return 0; } ///@{ /** diff --git a/Rendering/Core/vtkProp3D.h b/Rendering/Core/vtkProp3D.h index c8b5c8fb472..c5871b6619d 100644 --- a/Rendering/Core/vtkProp3D.h +++ b/Rendering/Core/vtkProp3D.h @@ -59,7 +59,7 @@ public: this->Modified(); this->IsIdentity = 0; } - }; + } ///@} virtual void SetPosition(double pos[3]) { this->SetPosition(pos[0], pos[1], pos[2]); } @@ -84,7 +84,7 @@ public: this->Modified(); this->IsIdentity = 0; } - }; + } virtual void SetOrigin(const double pos[3]) { this->SetOrigin(pos[0], pos[1], pos[2]); } vtkGetVectorMacro(Origin, double, 3); ///@} @@ -106,7 +106,7 @@ public: this->Modified(); this->IsIdentity = 0; } - }; + } virtual void SetScale(double scale[3]) { this->SetScale(scale[0], scale[1], scale[2]); } vtkGetVectorMacro(Scale, double, 3); ///@} diff --git a/Rendering/Core/vtkRenderWindow.h b/Rendering/Core/vtkRenderWindow.h index 4acbf6b1694..c69435e42ec 100644 --- a/Rendering/Core/vtkRenderWindow.h +++ b/Rendering/Core/vtkRenderWindow.h @@ -151,7 +151,7 @@ public: /** * Update the system, if needed, at end of render process */ - virtual void End(){}; + virtual void End() {} /** * Finalize the rendering process. diff --git a/Rendering/Core/vtkRenderWindowInteractor3D.h b/Rendering/Core/vtkRenderWindowInteractor3D.h index bcef433e51c..837ec38d737 100644 --- a/Rendering/Core/vtkRenderWindowInteractor3D.h +++ b/Rendering/Core/vtkRenderWindowInteractor3D.h @@ -235,16 +235,16 @@ public: /** * Set/get the direction of the physical coordinate system -Z axis in world coordinates. */ - virtual void SetPhysicalViewDirection(double, double, double){}; - virtual double* GetPhysicalViewDirection() { return nullptr; }; + virtual void SetPhysicalViewDirection(double, double, double) {} + virtual double* GetPhysicalViewDirection() { return nullptr; } ///@} ///@{ /** * Set/get the direction of the physical coordinate system +Y axis in world coordinates. */ - virtual void SetPhysicalViewUp(double, double, double){}; - virtual double* GetPhysicalViewUp() { return nullptr; }; + virtual void SetPhysicalViewUp(double, double, double) {} + virtual double* GetPhysicalViewUp() { return nullptr; } ///@} ///@{ diff --git a/Rendering/Core/vtkRenderer.h b/Rendering/Core/vtkRenderer.h index 20f9cdf85d9..99f1323808b 100644 --- a/Rendering/Core/vtkRenderer.h +++ b/Rendering/Core/vtkRenderer.h @@ -282,7 +282,7 @@ public: /** * Create an image. Subclasses of vtkRenderer must implement this method. */ - virtual void DeviceRender(){}; + virtual void DeviceRender() {} /** * Render opaque polygonal geometry. Default implementation just calls diff --git a/Rendering/Core/vtkVolumeProperty.h b/Rendering/Core/vtkVolumeProperty.h index 01423c4db3b..c0464f4b9e6 100644 --- a/Rendering/Core/vtkVolumeProperty.h +++ b/Rendering/Core/vtkVolumeProperty.h @@ -208,10 +208,10 @@ public: * for a salar value of X and a gradient magnitude of Y. */ void SetTransferFunction2D(int index, vtkImageData* function); - void SetTransferFunction2D(vtkImageData* function) { this->SetTransferFunction2D(0, function); }; + void SetTransferFunction2D(vtkImageData* function) { this->SetTransferFunction2D(0, function); } vtkImageData* GetTransferFunction2D(int index); - vtkImageData* GetTransferFunction2D() { return this->GetTransferFunction2D(0); }; + vtkImageData* GetTransferFunction2D() { return this->GetTransferFunction2D(0); } /** * Color-opacity transfer function mode. TF_1D is its default value. diff --git a/Rendering/OpenGL2/Testing/Cxx/TestValuePassFloatingPoint.cxx b/Rendering/OpenGL2/Testing/Cxx/TestValuePassFloatingPoint.cxx index fc41b362a7f..9d6adb65b2f 100644 --- a/Rendering/OpenGL2/Testing/Cxx/TestValuePassFloatingPoint.cxx +++ b/Rendering/OpenGL2/Testing/Cxx/TestValuePassFloatingPoint.cxx @@ -112,7 +112,7 @@ void GenerateElevationArray(vtkSmartPointer<vtkPolyDataAlgorithm> source) data->GetPointData()->AddArray( vtkDataSet::SafeDownCast(calc->GetOutput())->GetPointData()->GetArray("elevationVector")); data->GetCellData()->AddArray(outputP2c->GetCellData()->GetArray("elevationVector")); -}; +} //------------------------------------------------------------------------------ void RenderComponentImages(std::vector<vtkSmartPointer<vtkImageData>>& colorImOut, @@ -147,7 +147,7 @@ void RenderComponentImages(std::vector<vtkSmartPointer<vtkImageData>>& colorImOu colorImOut.push_back(colorIm); colored->Delete(); } -}; +} /////////////////////////////////////////////////////////////////////////////// int TestValuePassFloatingPoint(int argc, char* argv[]) diff --git a/Rendering/OpenGL2/vtkCompositeMapperHelper2.h b/Rendering/OpenGL2/vtkCompositeMapperHelper2.h index 32f7370a26e..95897afc478 100644 --- a/Rendering/OpenGL2/vtkCompositeMapperHelper2.h +++ b/Rendering/OpenGL2/vtkCompositeMapperHelper2.h @@ -108,7 +108,7 @@ protected: /// handle updating shift scale based on pose changes void UpdateCameraShiftScale(vtkRenderer* ren, vtkActor* actor) override; - vtkCompositeMapperHelper2() { this->Parent = nullptr; }; + vtkCompositeMapperHelper2() { this->Parent = nullptr; } ~vtkCompositeMapperHelper2() override; void DrawIBO(vtkRenderer* ren, vtkActor* actor, int primType, vtkOpenGLHelper& CellBO, diff --git a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx index f07829b7345..7fce1b12bbe 100644 --- a/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx +++ b/Rendering/OpenGL2/vtkOpenGLGlyph3DMapper.cxx @@ -97,7 +97,7 @@ public: { this->NumberOfPoints = 0; this->DataObject = nullptr; - }; + } ~vtkOpenGLGlyph3DMapperEntry() { this->ClearMappers(); @@ -105,7 +105,7 @@ public: { this->DataObject->Delete(); } - }; + } void ClearMappers() { for (MapperMap::iterator it = this->Mappers.begin(); it != this->Mappers.end(); ++it) @@ -122,7 +122,7 @@ public: std::vector<vtkOpenGLGlyph3DMapper::vtkOpenGLGlyph3DMapperEntry*> Entries; vtkTimeStamp BuildTime; vtkOpenGLGlyph3DMapperSubArray() = default; - ~vtkOpenGLGlyph3DMapperSubArray() { this->ClearEntries(); }; + ~vtkOpenGLGlyph3DMapperSubArray() { this->ClearEntries(); } void ClearEntries() { std::vector<vtkOpenGLGlyph3DMapper::vtkOpenGLGlyph3DMapperEntry*>::iterator miter = @@ -148,7 +148,7 @@ public: delete miter->second; } this->Entries.clear(); - }; + } }; vtkStandardNewMacro(vtkOpenGLGlyph3DMapper); diff --git a/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h b/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h index 677d83feefc..979a4b99072 100644 --- a/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h +++ b/Rendering/OpenGL2/vtkOpenGLVertexBufferObject.h @@ -115,8 +115,8 @@ public: // so allow applications to turn all these shifts off and manage the // float imprecision on their own. static void SetGlobalCoordShiftAndScaleEnabled(vtkTypeBool val); - static void GlobalCoordShiftAndScaleEnabledOn() { SetGlobalCoordShiftAndScaleEnabled(1); }; - static void GlobalCoordShiftAndScaleEnabledOff() { SetGlobalCoordShiftAndScaleEnabled(0); }; + static void GlobalCoordShiftAndScaleEnabledOn() { SetGlobalCoordShiftAndScaleEnabled(1); } + static void GlobalCoordShiftAndScaleEnabledOff() { SetGlobalCoordShiftAndScaleEnabled(0); } static vtkTypeBool GetGlobalCoordShiftAndScaleEnabled(); // Set/Get the DataType to use for the VBO diff --git a/Rendering/OpenGL2/vtkValuePass.cxx b/Rendering/OpenGL2/vtkValuePass.cxx index 968cb6036bd..3af34b82355 100644 --- a/Rendering/OpenGL2/vtkValuePass.cxx +++ b/Rendering/OpenGL2/vtkValuePass.cxx @@ -49,7 +49,7 @@ struct vtkValuePass::Parameters ScalarRange[0] = 1.0; ScalarRange[1] = -1.0; LookupTable = nullptr; - }; + } int ArrayMode; int ArrayAccessMode; @@ -164,7 +164,7 @@ public: , InvertibleLookupTable(nullptr) { this->CreateInvertibleLookupTable(); - }; + } ~vtkInternalsInvertible() { @@ -172,7 +172,7 @@ public: { this->InvertibleLookupTable->Delete(); } - }; + } //------------------------------------------------------------------- void ClearInvertibleColor(vtkMapper* mapper, vtkProperty* property) @@ -184,7 +184,7 @@ public: this->OriginalState.LookupTable->UnRegister(Pass); this->OriginalState = Parameters(); - }; + } /** * Makes a lookup table that can be used for deferred colormaps. @@ -209,7 +209,7 @@ public: } this->InvertibleLookupTable = table; } - }; + } /** * Floating point value to an RGB triplet. @@ -225,7 +225,7 @@ public: color[0] = (unsigned char)((valueI & 0xff0000) >> 16); color[1] = (unsigned char)((valueI & 0x00ff00) >> 8); color[2] = (unsigned char)((valueI & 0x0000ff)); - }; + } /** * RGB triplet to a floating point value. @@ -237,7 +237,7 @@ public: ((int)(*(color + 0))) << 16 | ((int)(*(color + 1))) << 8 | ((int)(*(color + 2))); double const valueS = (valueI - 0x1) / (double)0xfffffe; // 0 is reserved as "nothing" value = valueS * scale + min; - }; + } //------------------------------------------------------------------- void UseInvertibleColorFor( @@ -259,7 +259,7 @@ public: } this->SetStateInMapper((*passParams), mapper); - }; + } //------------------------------------------------------------------- void CacheMapperState(vtkMapper* mapper) @@ -273,7 +273,7 @@ public: mapper->GetScalarRange(state.ScalarRange); state.LookupTable = mapper->GetLookupTable(); state.LookupTable->Register(Pass); - }; + } //------------------------------------------------------------------- void SetStateInMapper(Parameters& state, vtkMapper* mapper) @@ -294,7 +294,7 @@ public: } mapper->SetLookupTable(state.LookupTable); - }; + } vtkValuePass* Pass; diff --git a/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx b/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx index fadfd57e146..38c8f87576b 100644 --- a/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx +++ b/Rendering/Parallel/vtkSynchronizedRenderWindows.cxx @@ -68,7 +68,7 @@ void RenderRMI( iter->second->GetRenderWindow()->Render(); } } -}; +} //------------------------------------------------------------------------------ diff --git a/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx b/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx index d3e5427c2f5..83a5fbb24aa 100644 --- a/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx +++ b/Rendering/SceneGraph/Testing/Cxx/UnitTests.cxx @@ -101,9 +101,7 @@ public: } } vtkMyMapperNode() = default; - ; ~vtkMyMapperNode() override = default; - ; }; vtkStandardNewMacro(vtkMyMapperNode); diff --git a/Rendering/Volume/Testing/Cxx/TestGPURayCastMapperShadows.cxx b/Rendering/Volume/Testing/Cxx/TestGPURayCastMapperShadows.cxx index 9ff5ac05086..99d7dddc03b 100644 --- a/Rendering/Volume/Testing/Cxx/TestGPURayCastMapperShadows.cxx +++ b/Rendering/Volume/Testing/Cxx/TestGPURayCastMapperShadows.cxx @@ -57,7 +57,7 @@ public: CoordsMin[i] = min[i]; CoordsMax[i] = max[i]; } - }; + } ImageDataAABox(double min_x, double min_y, double min_z, double max_x, double max_y, double max_z, double value = 0.0) { @@ -71,7 +71,7 @@ public: } ~ImageDataAABox() = default; - void SetValue(double value) { BoxValue = value; }; + void SetValue(double value) { BoxValue = value; } void AddBoxToArray(vtkFloatArray* data, vtkImageData* grid) { @@ -114,7 +114,7 @@ public: } } } - }; + } }; typedef std::vector<ImageDataAABox> BoxList; diff --git a/Rendering/Volume/Testing/Cxx/TestGPURayCastMultiVolumeOverlapping.cxx b/Rendering/Volume/Testing/Cxx/TestGPURayCastMultiVolumeOverlapping.cxx index bf2bd60524c..ff469be7218 100644 --- a/Rendering/Volume/Testing/Cxx/TestGPURayCastMultiVolumeOverlapping.cxx +++ b/Rendering/Volume/Testing/Cxx/TestGPURayCastMultiVolumeOverlapping.cxx @@ -121,7 +121,7 @@ public: } this->RenderWindow->Render(); - }; + } void SetVolume(vtkProp3D* vol) { this->Volume = vol; } diff --git a/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx b/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx index 39122537a8d..5278d696ea3 100644 --- a/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx +++ b/Rendering/Volume/Testing/Cxx/TestGPURayCastVolumePicking.cxx @@ -109,7 +109,7 @@ public: } result->Delete(); - }; + } ////////////////////////////////////////////////////////////////////////////// vtkSmartPointer<vtkRenderer> Renderer; diff --git a/Rendering/Volume/Testing/Cxx/TestSmartVolumeMapperImplicitArray.cxx b/Rendering/Volume/Testing/Cxx/TestSmartVolumeMapperImplicitArray.cxx index 1552ec35cbd..6cb588f513c 100644 --- a/Rendering/Volume/Testing/Cxx/TestSmartVolumeMapperImplicitArray.cxx +++ b/Rendering/Volume/Testing/Cxx/TestSmartVolumeMapperImplicitArray.cxx @@ -98,4 +98,4 @@ int TestSmartVolumeMapperImplicitArray(int argc, char* argv[]) return (vtkRegressionTester::Test(argc, argv, renWin, 10) == vtkRegressionTester::PASSED) ? EXIT_SUCCESS : EXIT_FAILURE; -}; +} diff --git a/Rendering/Volume/vtkGPUVolumeRayCastMapper.h b/Rendering/Volume/vtkGPUVolumeRayCastMapper.h index 2b7f50344ea..2317a7b543f 100644 --- a/Rendering/Volume/vtkGPUVolumeRayCastMapper.h +++ b/Rendering/Volume/vtkGPUVolumeRayCastMapper.h @@ -413,7 +413,7 @@ public: vtkGetMacro(GradientOpacityRangeType, int); ///@} - vtkDataSet* GetInput() override { return this->GetInput(0); }; + vtkDataSet* GetInput() override { return this->GetInput(0); } ///@{ /** diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx index ebe8178a539..0172ad7afee 100644 --- a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx +++ b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.cxx @@ -2273,7 +2273,7 @@ public: }; VTK_ABI_NAMESPACE_END -}; +} using namespace vtkUnstructuredGridVolumeZSweepMapperNamespace; diff --git a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h index 362af1aad4c..7364ce8a3cb 100644 --- a/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h +++ b/Rendering/Volume/vtkUnstructuredGridVolumeZSweepMapper.h @@ -56,7 +56,7 @@ class vtkDoubleScreenEdge; class vtkVertexEntry; class vtkPixelListEntryMemory; VTK_ABI_NAMESPACE_END -}; +} VTK_ABI_NAMESPACE_BEGIN class VTKRENDERINGVOLUME_EXPORT vtkUnstructuredGridVolumeZSweepMapper diff --git a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h index a4766989c3a..14426f4934b 100644 --- a/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h +++ b/Rendering/VolumeOpenGL2/vtkVolumeShaderComposer.h @@ -3020,7 +3020,7 @@ inline std::string PickingActorPassExit( \n gl_FragData[0] = vec4(0.0);\ \n }\ \n return;"); -}; +} //-------------------------------------------------------------------------- inline std::string PickingIdLow24PassExit( @@ -3046,7 +3046,7 @@ inline std::string PickingIdLow24PassExit( \n gl_FragData[0] = vec4(0.0);\ \n }\ \n return;"); -}; +} //-------------------------------------------------------------------------- inline std::string PickingIdHigh24PassExit( @@ -3073,7 +3073,7 @@ inline std::string PickingIdHigh24PassExit( \n gl_FragData[0] = vec4(0.0);\ \n }\ \n return;"); -}; +} //-------------------------------------------------------------------------- inline std::string ShadingExit(vtkRenderer* vtkNotUsed(ren), vtkVolumeMapper* mapper, @@ -3221,7 +3221,7 @@ inline std::string PickingActorPassDeclaration( { return std::string("\ \n uniform vec3 in_propId;"); -}; +} //-------------------------------------------------------------------------- inline std::string TerminationInit( -- GitLab