STYLE: Update cpp classes to prefer = default to explicitly trivial i…

…mplementations This check replaces default bodies of special member functions with = default;. The explicitly defaulted function declarations enable more opportunities in optimization, because the compiler might treat explicitly defaulted functions as trivial. Additionally, the C++11 use of = default more clearly expreses the intent for the special member functions. See https://www.slicer.org/w/index.php?title=Documentation/Nightly/Developers/Tutorials/MigrationGuide#C.2B.2B11:_Update_source_code_to_use_.3D_default
Slicer · Apr 15, 2020 · 4476737 · 4476737
1 parent b8b4c03
commit 4476737
Show file tree

Hide file tree

Showing 46 changed files with 65 additions and 143 deletions.
diff --git a/Base/QTCore/qSlicerCoreApplication.cxx b/Base/QTCore/qSlicerCoreApplication.cxx
@@ -680,9 +680,7 @@ qSlicerCoreApplication::qSlicerCoreApplication(
 }
 
 //-----------------------------------------------------------------------------
-qSlicerCoreApplication::~qSlicerCoreApplication()
-{
-}
+qSlicerCoreApplication::~qSlicerCoreApplication() = default;
 
 //-----------------------------------------------------------------------------
 qSlicerCoreApplication* qSlicerCoreApplication::application()

diff --git a/Base/QTGUI/qSlicerAbstractModulePanel.cxx b/Base/QTGUI/qSlicerAbstractModulePanel.cxx
@@ -26,7 +26,7 @@
 class qSlicerAbstractModulePanelPrivate
 {
 public:
-  qSlicerAbstractModulePanelPrivate() {}
+  qSlicerAbstractModulePanelPrivate() = default;
   qSlicerModuleManager* ModuleManager{nullptr};
 };
 
@@ -38,8 +38,7 @@ qSlicerAbstractModulePanel::qSlicerAbstractModulePanel(QWidget* _parent, Qt::Win
 }
 
 //---------------------------------------------------------------------------
-qSlicerAbstractModulePanel::~qSlicerAbstractModulePanel()
-= default;
+qSlicerAbstractModulePanel::~qSlicerAbstractModulePanel() = default;
 
 //---------------------------------------------------------------------------
 void qSlicerAbstractModulePanel::setModuleManager(qSlicerModuleManager* moduleManager)

diff --git a/Base/QTGUI/qSlicerExtensionsInstallWidget_p.h b/Base/QTGUI/qSlicerExtensionsInstallWidget_p.h
@@ -36,7 +36,7 @@ class ExtensionInstallWidgetWebChannelProxy : public QObject
 {
   Q_OBJECT
 public:
-  ExtensionInstallWidgetWebChannelProxy(){}
+  ExtensionInstallWidgetWebChannelProxy() = default;
   qSlicerExtensionsInstallWidget* InstallWidget{nullptr};
 public slots:
   void refresh();

diff --git a/Libs/MRML/Core/Testing/vtkMRMLSceneTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLSceneTest1.cxx
@@ -38,7 +38,7 @@ class vtkMRMLCustomNode
   int ResetCount{0};
 
 protected:
-  vtkMRMLCustomNode(){}
+  vtkMRMLCustomNode() = default;
   ~vtkMRMLCustomNode() override = default;
   vtkMRMLCustomNode(const vtkMRMLCustomNode&);
   void operator=(const vtkMRMLCustomNode&);

diff --git a/Libs/MRML/Core/Testing/vtkMRMLStorageNodeTest1.cxx b/Libs/MRML/Core/Testing/vtkMRMLStorageNodeTest1.cxx
@@ -54,7 +54,7 @@ class vtkMRMLStorageNodeTestHelper1 : public vtkMRMLStorageNode
   const char* SupportedClass{nullptr};
   int ReadDataReturnValue{0};
 protected:
-  vtkMRMLStorageNodeTestHelper1() {}
+  vtkMRMLStorageNodeTestHelper1() = default;
 };
 vtkStandardNewMacro(vtkMRMLStorageNodeTestHelper1);
 

diff --git a/Libs/MRML/Core/vtkCodedEntry.cxx b/Libs/MRML/Core/vtkCodedEntry.cxx
@@ -18,7 +18,7 @@ or http://www.slicer.org/copyright/copyright.txt for details.
 vtkStandardNewMacro(vtkCodedEntry);
 
 //----------------------------------------------------------------------------
-vtkCodedEntry::vtkCodedEntry() { }
+vtkCodedEntry::vtkCodedEntry() = default;
 
 //----------------------------------------------------------------------------
 vtkCodedEntry::~vtkCodedEntry()

diff --git a/Libs/MRML/Core/vtkMRMLFolderDisplayNode.cxx b/Libs/MRML/Core/vtkMRMLFolderDisplayNode.cxx
@@ -33,7 +33,7 @@
 vtkMRMLNodeNewMacro(vtkMRMLFolderDisplayNode);
 
 //-----------------------------------------------------------------------------
-vtkMRMLFolderDisplayNode::vtkMRMLFolderDisplayNode() { }
+vtkMRMLFolderDisplayNode::vtkMRMLFolderDisplayNode() = default;
 
 //-----------------------------------------------------------------------------
 vtkMRMLFolderDisplayNode::~vtkMRMLFolderDisplayNode() = default;

diff --git a/Libs/MRML/Core/vtkMRMLParser.h b/Libs/MRML/Core/vtkMRMLParser.h
@@ -35,7 +35,7 @@ class VTK_MRML_EXPORT vtkMRMLParser : public vtkXMLParser
   void SetNodeCollection(vtkCollection* scene) {this->NodeCollection = scene;};
 
 protected:
-  vtkMRMLParser() {};
+  vtkMRMLParser() = default;;
   ~vtkMRMLParser() override  = default;
   vtkMRMLParser(const vtkMRMLParser&);
   void operator=(const vtkMRMLParser&);

diff --git a/Libs/MRML/Core/vtkMRMLScalarVolumeNode.cxx b/Libs/MRML/Core/vtkMRMLScalarVolumeNode.cxx
@@ -31,7 +31,7 @@ vtkCxxSetObjectMacro(vtkMRMLScalarVolumeNode, VoxelValueQuantity, vtkCodedEntry)
 vtkCxxSetObjectMacro(vtkMRMLScalarVolumeNode, VoxelValueUnits, vtkCodedEntry);
 
 //----------------------------------------------------------------------------
-vtkMRMLScalarVolumeNode::vtkMRMLScalarVolumeNode() { }
+vtkMRMLScalarVolumeNode::vtkMRMLScalarVolumeNode() = default;
 
 //----------------------------------------------------------------------------
 vtkMRMLScalarVolumeNode::~vtkMRMLScalarVolumeNode()

diff --git a/Libs/MRML/Core/vtkMRMLSegmentationStorageNode.cxx b/Libs/MRML/Core/vtkMRMLSegmentationStorageNode.cxx
@@ -93,11 +93,10 @@ static const int SINGLE_SEGMENT_INDEX = -1; // used as segment index when there
 vtkMRMLNodeNewMacro(vtkMRMLSegmentationStorageNode);
 
 //----------------------------------------------------------------------------
-vtkMRMLSegmentationStorageNode::vtkMRMLSegmentationStorageNode() { }
+vtkMRMLSegmentationStorageNode::vtkMRMLSegmentationStorageNode() = default;
 
 //----------------------------------------------------------------------------
-vtkMRMLSegmentationStorageNode::~vtkMRMLSegmentationStorageNode()
-= default;
+vtkMRMLSegmentationStorageNode::~vtkMRMLSegmentationStorageNode() = default;
 
 //----------------------------------------------------------------------------
 void vtkMRMLSegmentationStorageNode::PrintSelf(ostream& os, vtkIndent indent)

diff --git a/Libs/MRML/Core/vtkMRMLSelectionNode.cxx b/Libs/MRML/Core/vtkMRMLSelectionNode.cxx
@@ -62,9 +62,7 @@ vtkMRMLSelectionNode::vtkMRMLSelectionNode()
 }
 
 //----------------------------------------------------------------------------
-vtkMRMLSelectionNode::~vtkMRMLSelectionNode()
-{
-}
+vtkMRMLSelectionNode::~vtkMRMLSelectionNode() = default;
 
 //----------------------------------------------------------------------------
 void vtkMRMLSelectionNode::WriteXML(ostream& of, int nIndent)

diff --git a/Libs/MRML/Core/vtkMRMLTextStorageNode.cxx b/Libs/MRML/Core/vtkMRMLTextStorageNode.cxx
@@ -38,14 +38,10 @@
 vtkMRMLNodeNewMacro(vtkMRMLTextStorageNode);
 
 //----------------------------------------------------------------------------
-vtkMRMLTextStorageNode::vtkMRMLTextStorageNode()
-{
-}
+vtkMRMLTextStorageNode::vtkMRMLTextStorageNode() = default;
 
 //----------------------------------------------------------------------------
-vtkMRMLTextStorageNode::~vtkMRMLTextStorageNode()
-{
-}
+vtkMRMLTextStorageNode::~vtkMRMLTextStorageNode() = default;
 
 //----------------------------------------------------------------------------
 bool vtkMRMLTextStorageNode::CanReadInReferenceNode(vtkMRMLNode* refNode)

diff --git a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLCameraDisplayableManagerTest1.cxx b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLCameraDisplayableManagerTest1.cxx
@@ -484,7 +484,7 @@ class vtkRenderRequestCallback : public vtkCommand
     //std::cout << "RenderRequestCount [" << this->RenderRequestCount << "]" << std::endl;
     }
 protected:
-  vtkRenderRequestCallback() {}
+  vtkRenderRequestCallback() = default;
   vtkRenderer * Renderer{nullptr};
   int           RenderRequestCount{0};
 };

diff --git a/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLThreeDReformatDisplayableManagerTest1.cxx b/Libs/MRML/DisplayableManager/Testing/Cxx/vtkMRMLThreeDReformatDisplayableManagerTest1.cxx
@@ -895,7 +895,7 @@ class vtkRenderCallback : public vtkCommand
     {
     this->RenderWindow->Render();
     }
-  vtkRenderCallback()  {}
+  vtkRenderCallback()  = default;
   vtkRenderWindow *RenderWindow{nullptr};
 };
 

diff --git a/Libs/MRML/DisplayableManager/vtkMRMLViewInteractorStyle.cxx b/Libs/MRML/DisplayableManager/vtkMRMLViewInteractorStyle.cxx
@@ -45,9 +45,7 @@ vtkMRMLViewInteractorStyle::vtkMRMLViewInteractorStyle()
 }
 
 //----------------------------------------------------------------------------
-vtkMRMLViewInteractorStyle::~vtkMRMLViewInteractorStyle()
-{
-}
+vtkMRMLViewInteractorStyle::~vtkMRMLViewInteractorStyle() = default;
 
 //----------------------------------------------------------------------------
 void vtkMRMLViewInteractorStyle::PrintSelf(ostream& os, vtkIndent indent)

diff --git a/Libs/MRML/Logic/vtkMRMLApplicationLogic.cxx b/Libs/MRML/Logic/vtkMRMLApplicationLogic.cxx
@@ -102,8 +102,7 @@ vtkMRMLApplicationLogic::vtkInternal::vtkInternal(vtkMRMLApplicationLogic* exter
 }
 
 //----------------------------------------------------------------------------
-vtkMRMLApplicationLogic::vtkInternal::~vtkInternal()
-= default;
+vtkMRMLApplicationLogic::vtkInternal::~vtkInternal() = default;
 
 //----------------------------------------------------------------------------
 void vtkMRMLApplicationLogic::vtkInternal::PropagateVolumeSelection(int layer, int fit)
@@ -1162,7 +1161,7 @@ int vtkMRMLApplicationLogic::LoadDefaultParameterSets(vtkMRMLScene* scene,
 
 //----------------------------------------------------------------------------
 vtkMRMLApplicationLogic
-::InvokeRequest::InvokeRequest() { }
+::InvokeRequest::InvokeRequest() = default;
 
 //----------------------------------------------------------------------------
 void vtkMRMLApplicationLogic

diff --git a/Libs/vtkITK/itkMorphologicalContourInterpolator.h b/Libs/vtkITK/itkMorphologicalContourInterpolator.h
@@ -219,7 +219,7 @@ class MorphologicalContourInterpolator:
 
 protected:
   MorphologicalContourInterpolator();
-  ~MorphologicalContourInterpolator() override {}
+  ~MorphologicalContourInterpolator() override = default;
   typename TImage::PixelType m_Label;
   int                        m_Axis{ -1 };
   bool                       m_HeuristicAlignment{ true };

diff --git a/Libs/vtkITK/itkMorphologicalContourInterpolator.hxx b/Libs/vtkITK/itkMorphologicalContourInterpolator.hxx
@@ -796,7 +796,7 @@ class MatchesID
   typename TImage::PixelType m_ID;
 
 public:
-  MatchesID() {}
+  MatchesID() = default;
   MatchesID( typename TImage::PixelType id )
     : m_ID( id )
   {}

diff --git a/Libs/vtkITK/vtkITKMorphologicalContourInterpolator.cxx b/Libs/vtkITK/vtkITKMorphologicalContourInterpolator.cxx
@@ -18,8 +18,7 @@
 
 vtkStandardNewMacro(vtkITKMorphologicalContourInterpolator);
 
-vtkITKMorphologicalContourInterpolator::vtkITKMorphologicalContourInterpolator() { }
-
+vtkITKMorphologicalContourInterpolator::vtkITKMorphologicalContourInterpolator() = default;
 vtkITKMorphologicalContourInterpolator::~vtkITKMorphologicalContourInterpolator() = default;
 
 

diff --git a/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.cxx b/Libs/vtkSegmentationCore/vtkPolyDataToFractionalLabelmapFilter.cxx
@@ -116,7 +116,7 @@ namespace {
 class EdgeLocatorNode
 {
 public:
-  EdgeLocatorNode()  {}
+  EdgeLocatorNode()  = default;
 
   // Free the list that this node is the head of
   void FreeList() {

diff --git a/Libs/vtkSegmentationCore/vtkSegmentationConverterRule.cxx b/Libs/vtkSegmentationCore/vtkSegmentationConverterRule.cxx
@@ -29,7 +29,7 @@
 #include <vtkSegment.h>
 
 //----------------------------------------------------------------------------
-vtkSegmentationConverterRule::vtkSegmentationConverterRule() { }
+vtkSegmentationConverterRule::vtkSegmentationConverterRule() = default;
 
 //----------------------------------------------------------------------------
 vtkSegmentationConverterRule::~vtkSegmentationConverterRule()

diff --git a/...rtAutomatedRegistration/ITKRegistrationHelper/itkAffineImageToImageRegistrationMethod.txx b/...rtAutomatedRegistration/ITKRegistrationHelper/itkAffineImageToImageRegistrationMethod.txx
@@ -71,9 +71,7 @@ AffineImageToImageRegistrationMethod<TImage>::AffineImageToImageRegistrationMeth
 }
 
 template <class TImage>
-AffineImageToImageRegistrationMethod<TImage>::~AffineImageToImageRegistrationMethod()
-{
-}
+AffineImageToImageRegistrationMethod<TImage>::~AffineImageToImageRegistrationMethod() = default;
 
 template <class TImage>
 void AffineImageToImageRegistrationMethod<TImage>::GenerateData()

diff --git a/...I/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h b/...I/ExpertAutomatedRegistration/ITKRegistrationHelper/itkAnisotropicSimilarity3DTransform.h
@@ -134,9 +134,7 @@ class AnisotropicSimilarity3DTransform :
   AnisotropicSimilarity3DTransform(const MatrixType & matrix, const OutputVectorType & offset);
   AnisotropicSimilarity3DTransform(unsigned int paramDim);
   AnisotropicSimilarity3DTransform();
-  ~AnisotropicSimilarity3DTransform() override
-  {
-  };
+  ~AnisotropicSimilarity3DTransform() override = default;;
 
   void PrintSelf(std::ostream & os, Indent indent) const override;
 

diff --git a/...tration/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.h b/...tration/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.h
@@ -150,9 +150,7 @@ class AnisotropicSimilarityLandmarkBasedTransformInitializer :
 
 protected:
   AnisotropicSimilarityLandmarkBasedTransformInitializer();
-  ~AnisotropicSimilarityLandmarkBasedTransformInitializer() override
-  {
-  }
+  ~AnisotropicSimilarityLandmarkBasedTransformInitializer() override = default;
 
   void PrintSelf(std::ostream & os, Indent indent) const override;
 

diff --git a/...ation/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.txx b/...ation/ITKRegistrationHelper/itkAnisotropicSimilarityLandmarkBasedTransformInitializer.txx
@@ -29,9 +29,7 @@ namespace itk
 
 template <class TTransform, class TFixedImage, class TMovingImage>
 AnisotropicSimilarityLandmarkBasedTransformInitializer<TTransform, TFixedImage, TMovingImage>
-::AnisotropicSimilarityLandmarkBasedTransformInitializer()
-{
-}
+::AnisotropicSimilarityLandmarkBasedTransformInitializer() = default;
 
 template <class TTransform, class TFixedImage, class TMovingImage>
 void

diff --git a/...tAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.txx b/...tAutomatedRegistration/ITKRegistrationHelper/itkBSplineImageToImageRegistrationMethod.txx
@@ -111,9 +111,7 @@ protected:
     m_UpdateInterval = 1;
     m_DontShowParameters = false;
   }
-  ~BSplineImageRegistrationViewer() override
-  {
-  }
+  ~BSplineImageRegistrationViewer() override = default;
 
 };
 
@@ -133,9 +131,7 @@ BSplineImageToImageRegistrationMethod<TImage>::BSplineImageToImageRegistrationMe
 }
 
 template <class TImage>
-BSplineImageToImageRegistrationMethod<TImage>::~BSplineImageToImageRegistrationMethod()
-{
-}
+BSplineImageToImageRegistrationMethod<TImage>::~BSplineImageToImageRegistrationMethod() = default;
 
 template <class TImage>
 void

diff --git a/...CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageRegionMomentsCalculator.txx b/...CLI/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageRegionMomentsCalculator.txx
@@ -71,9 +71,7 @@ ImageRegionMomentsCalculator<TImage>::ImageRegionMomentsCalculator()
 // Destructor
 template <class TImage>
 ImageRegionMomentsCalculator<TImage>::
-~ImageRegionMomentsCalculator()
-{
-}
+~ImageRegionMomentsCalculator() = default;
 
 template <class TInputImage>
 void

diff --git a/...I/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.txx b/...I/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationHelper.txx
@@ -145,9 +145,7 @@ ImageToImageRegistrationHelper<TImage>
 
 template <class TImage>
 ImageToImageRegistrationHelper<TImage>
-::~ImageToImageRegistrationHelper()
-{
-}
+::~ImageToImageRegistrationHelper() = default;
 
 template <class TImage>
 void

diff --git a/...I/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationMethod.txx b/...I/ExpertAutomatedRegistration/ITKRegistrationHelper/itkImageToImageRegistrationMethod.txx
@@ -53,9 +53,7 @@ ImageToImageRegistrationMethod<TImage>::ImageToImageRegistrationMethod()
 }
 
 template <class TImage>
-ImageToImageRegistrationMethod<TImage>::~ImageToImageRegistrationMethod()
-{
-}
+ImageToImageRegistrationMethod<TImage>::~ImageToImageRegistrationMethod() = default;
 
 template <class TImage>
 void

diff --git a/...tAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.txx b/...tAutomatedRegistration/ITKRegistrationHelper/itkInitialImageToImageRegistrationMethod.txx
@@ -39,9 +39,7 @@ InitialImageToImageRegistrationMethod<TImage>::InitialImageToImageRegistrationMe
 }
 
 template <class TImage>
-InitialImageToImageRegistrationMethod<TImage>::~InitialImageToImageRegistrationMethod()
-{
-}
+InitialImageToImageRegistrationMethod<TImage>::~InitialImageToImageRegistrationMethod() = default;
 
 /** Only the GenerateData() method should be overloaded. The Update() method
  * must not be overloaded */

diff --git a/...utomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.txx b/...utomatedRegistration/ITKRegistrationHelper/itkOptimizedImageToImageRegistrationMethod.txx
@@ -126,9 +126,7 @@ protected:
     m_UpdateInterval = 1;
     m_DontShowParameters = false;
   }
-  ~ImageRegistrationViewer() override
-  {
-  }
+  ~ImageRegistrationViewer() override = default;
 
 };
 
@@ -176,9 +174,7 @@ OptimizedImageToImageRegistrationMethod<TImage>::OptimizedImageToImageRegistrati
 }
 
 template <class TImage>
-OptimizedImageToImageRegistrationMethod<TImage>::~OptimizedImageToImageRegistrationMethod()
-{
-}
+OptimizedImageToImageRegistrationMethod<TImage>::~OptimizedImageToImageRegistrationMethod() = default;
 
 template <class TImage>
 void

diff --git a/Modules/CLI/PETStandardUptakeValueComputation/itkDCMTKFileReader.h b/Modules/CLI/PETStandardUptakeValueComputation/itkDCMTKFileReader.h
@@ -60,7 +60,7 @@ namespace itk
 class DCMTKSequence
 {
 public:
-  DCMTKSequence()  {}
+  DCMTKSequence()  = default;
   void SetDcmSequenceOfItems(DcmSequenceOfItems *seq);
   int card();
   int GetSequence(unsigned long index,
@@ -144,7 +144,7 @@ class DCMTKFileReader
 public:
   typedef DCMTKFileReader Self;
 
-  DCMTKFileReader() {}
+  DCMTKFileReader() = default;
   ~DCMTKFileReader();
 
   void SetFileName(const std::string &fileName);