Merge pull request #19332 from mantidproject/modernize-use-equals-delete

Make changes suggested by clang-tidy check modernize-use-equals-delete

Vates/ParaviewPlugins/ParaViewFilters/ScaleWorkspace/vtkScaleWorkspace.h

@@ -9,9 +9,12 @@
 class VTK_EXPORT vtkScaleWorkspace : public vtkPointSetAlgorithm {
 public:
   static vtkScaleWorkspace *New();
-  vtkTypeMacro(vtkScaleWorkspace,
-               vtkPointSetAlgorithm) void PrintSelf(ostream &os,
-                                                    vtkIndent indent) override;
+  vtkScaleWorkspace(const vtkScaleWorkspace &) = delete;
+  void operator=(const vtkScaleWorkspace &) = delete;
+  // clang-format off
+  vtkTypeMacro(vtkScaleWorkspace, vtkPointSetAlgorithm)
+  void PrintSelf(ostream &os, vtkIndent indent) override;
+  // clang-format on
   void SetXScaling(double xScaling);
   void SetYScaling(double yScaling);
   void SetZScaling(double zScaling);
@@ -28,8 +31,6 @@ protected:
   int FillInputPortInformation(int port, vtkInformation *info) override;
 
 private:
-  vtkScaleWorkspace(const vtkScaleWorkspace &);
-  void operator=(const vtkScaleWorkspace &);
   void updateMetaData(vtkPointSet *inputDataSet);
   double m_xScaling;
   double m_yScaling;

Vates/ParaviewPlugins/ParaViewFilters/SplatterPlot/vtkSplatterPlot.h

@@ -15,8 +15,12 @@ class vtkSplatterPlotFactory;
 class VTK_EXPORT vtkSplatterPlot : public vtkUnstructuredGridAlgorithm {
 public:
   static vtkSplatterPlot *New();
-  vtkTypeMacro(vtkSplatterPlot,
-               vtkUnstructuredGridAlgorithm) double getTime() const;
+  vtkSplatterPlot(const vtkSplatterPlot &) = delete;
+  void operator=(const vtkSplatterPlot &) = delete;
+  // clang-format off
+  vtkTypeMacro(vtkSplatterPlot, vtkUnstructuredGridAlgorithm)
+  double getTime() const;
+  // clang-format on
   void PrintSelf(ostream &os, vtkIndent indent) override;
   void SetNumberOfPoints(int nPoints);
   void SetTopPercentile(double topPercentile);
@@ -43,8 +47,5 @@ private:
   std::string m_wsName;
   /// Time.
   double m_time;
-
-  vtkSplatterPlot(const vtkSplatterPlot &);
-  void operator=(const vtkSplatterPlot &);
 };
 #endif

Vates/ParaviewPlugins/ParaViewSources/MDEWSource/vtkMDEWSource.h

@@ -47,9 +47,12 @@ class MDLoadingPresenter;
 class VTK_EXPORT vtkMDEWSource : public vtkUnstructuredGridAlgorithm {
 public:
   static vtkMDEWSource *New();
-  vtkTypeMacro(vtkMDEWSource, vtkUnstructuredGridAlgorithm) void PrintSelf(
-      ostream &os, vtkIndent indent) override;
-
+  vtkMDEWSource(const vtkMDEWSource &) = delete;
+  void operator=(const vtkMDEWSource &) = delete;
+  // clang-format off
+  vtkTypeMacro(vtkMDEWSource, vtkUnstructuredGridAlgorithm)
+  void PrintSelf(ostream &os, vtkIndent indent) override;
+  // clang-format on
   void SetWsName(const std::string &wsName);
   void SetDepth(int depth);
   void SetNormalization(int option);
@@ -96,9 +99,6 @@ private:
 
   /// Normalization option
   Mantid::VATES::VisualNormalization m_normalization;
-
-  vtkMDEWSource(const vtkMDEWSource &);
-  void operator=(const vtkMDEWSource &);
   void setTimeRange(vtkInformationVector *outputVector);
 };
 #endif

Vates/ParaviewPlugins/ParaViewSources/SinglePeakMarkerSource/vtkSinglePeakMarkerSource.h

@@ -34,9 +34,12 @@
 class VTK_EXPORT vtkSinglePeakMarkerSource : public vtkPolyDataAlgorithm {
 public:
   static vtkSinglePeakMarkerSource *New();
-  vtkTypeMacro(vtkSinglePeakMarkerSource,
-               vtkPolyDataAlgorithm) void PrintSelf(ostream &os,
-                                                    vtkIndent indent) override;
+  vtkSinglePeakMarkerSource(const vtkSinglePeakMarkerSource &);
+  void operator=(const vtkSinglePeakMarkerSource &);
+  // clang-format off
+  vtkTypeMacro(vtkSinglePeakMarkerSource, vtkPolyDataAlgorithm)
+  void PrintSelf(ostream &os, vtkIndent indent) override;
+  // clang-format on
   void SetRadiusMarker(double radius);
   void SetPosition1(double position1);
   void SetPosition2(double position2);
@@ -56,8 +59,5 @@ private:
   double m_position2;
   double m_position3;
   double m_radius;
-
-  vtkSinglePeakMarkerSource(const vtkSinglePeakMarkerSource &);
-  void operator=(const vtkSinglePeakMarkerSource &);
 };
 #endif

Vates/VatesAPI/inc/MantidVatesAPI/ADSWorkspaceProvider.h

@@ -37,8 +37,9 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 template <typename Workspace_Type>
 class DLLExport ADSWorkspaceProvider : public WorkspaceProvider {
 public:
-  ADSWorkspaceProvider();
-  ~ADSWorkspaceProvider() override;
+  ADSWorkspaceProvider() = default;
+  ADSWorkspaceProvider &operator=(const ADSWorkspaceProvider &) = delete;
+  ADSWorkspaceProvider(const ADSWorkspaceProvider &) = delete;
 
   //-------WorkspaceProivder Implementations ------------
   bool canProvideWorkspace(std::string wsName) const override;
@@ -46,8 +47,6 @@ public:
   void disposeWorkspace(std::string wsName) const override;
 
 private:
-  ADSWorkspaceProvider &operator=(const ADSWorkspaceProvider &);
-  ADSWorkspaceProvider(const ADSWorkspaceProvider &);
 };
 }
 }

Vates/VatesAPI/inc/MantidVatesAPI/FilteringUpdateProgressAction.h

@@ -43,7 +43,8 @@ class DLLExport FilterUpdateProgressAction : public ProgressAction {
 public:
   FilterUpdateProgressAction(Filter *filter, const std::string &message)
       : m_filter(filter), m_message(message) {}
-
+  FilterUpdateProgressAction &operator=(FilterUpdateProgressAction &) = delete;
+  FilterUpdateProgressAction(FilterUpdateProgressAction &) = delete;
   void eventRaised(double progress) override {
     m_filter->updateAlgorithmProgress(progress, m_message);
   }
@@ -51,10 +52,6 @@ public:
   ~FilterUpdateProgressAction() {}
 
 private:
-  FilterUpdateProgressAction &operator=(FilterUpdateProgressAction &);
-
-  FilterUpdateProgressAction(FilterUpdateProgressAction &);
-
   Filter *m_filter;
 
   /// Message associated with the progress action

Vates/VatesAPI/inc/MantidVatesAPI/IMDDimensionComparitor.h

@@ -41,6 +41,8 @@ class IMDDimensionComparitor {
 public:
   /// Constructor
   IMDDimensionComparitor(Mantid::API::IMDWorkspace_sptr workspace);
+  IMDDimensionComparitor operator=(IMDDimensionComparitor &) = delete;
+  IMDDimensionComparitor(IMDDimensionComparitor &) = delete;
 
   /// Destructor
   ~IMDDimensionComparitor();
@@ -56,10 +58,6 @@ public:
 private:
   /// imd workspace shared ptr.
   Mantid::API::IMDWorkspace_sptr m_workspace;
-
-  IMDDimensionComparitor operator=(IMDDimensionComparitor &);
-
-  IMDDimensionComparitor(IMDDimensionComparitor &);
 };
 }
 }

Vates/VatesAPI/inc/MantidVatesAPI/vtkDataSetToImplicitFunction.h

@@ -42,15 +42,16 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 class DLLExport vtkDataSetToImplicitFunction {
 public:
-  static Mantid::Geometry::MDImplicitFunction *exec(vtkDataSet *dataSet);
   vtkDataSetToImplicitFunction(vtkDataSet *dataSet);
+  vtkDataSetToImplicitFunction &
+  operator=(const vtkDataSetToImplicitFunction &other) = delete;
+  vtkDataSetToImplicitFunction(const vtkDataSetToImplicitFunction &other) =
+      delete;
+  static Mantid::Geometry::MDImplicitFunction *exec(vtkDataSet *dataSet);
   Mantid::Geometry::MDImplicitFunction *execute();
   ~vtkDataSetToImplicitFunction();
 
 private:
-  vtkDataSetToImplicitFunction &
-  operator=(const vtkDataSetToImplicitFunction &other);
-  vtkDataSetToImplicitFunction(const vtkDataSetToImplicitFunction &other);
   vtkDataSet *m_dataset;
 };
 }

Vates/VatesAPI/inc/MantidVatesAPI/vtkDataSetToScaledDataSet.h

@@ -39,6 +39,9 @@ class DLLExport vtkDataSetToScaledDataSet {
 public:
   /// Constructor
   vtkDataSetToScaledDataSet();
+  vtkDataSetToScaledDataSet(const vtkDataSetToScaledDataSet &) = delete;
+  vtkDataSetToScaledDataSet &
+  operator=(const vtkDataSetToScaledDataSet &) = delete;
   /// Destructor
   virtual ~vtkDataSetToScaledDataSet();
   /// Apply the scaling and add metadata
@@ -50,7 +53,6 @@ public:
                        vtkPointSet *outputData = nullptr);
 
 private:
-  vtkDataSetToScaledDataSet &operator=(const vtkDataSetToScaledDataSet &other);
   /// Set metadata on the dataset to handle scaling
   void updateMetaData(double xScale, double yScale, double zScale,
                       vtkPointSet *inputData, vtkPointSet *outputData);

Vates/VatesAPI/inc/MantidVatesAPI/vtkDataSetToWsLocation.h

@@ -39,14 +39,15 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 class DLLExport vtkDataSetToWsLocation {
 public:
+  vtkDataSetToWsLocation &
+  operator=(const vtkDataSetToWsLocation &other) = delete;
+  vtkDataSetToWsLocation(const vtkDataSetToWsLocation &other) = delete;
   static std::string exec(vtkDataSet *dataSet);
   vtkDataSetToWsLocation(vtkDataSet *dataSet);
   std::string execute();
   ~vtkDataSetToWsLocation();
 
 private:
-  vtkDataSetToWsLocation &operator=(const vtkDataSetToWsLocation &other);
-  vtkDataSetToWsLocation(const vtkDataSetToWsLocation &other);
   vtkDataSet *m_dataset;
 };
 }

Vates/VatesAPI/inc/MantidVatesAPI/vtkDataSetToWsName.h

@@ -39,14 +39,14 @@ Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 class DLLExport vtkDataSetToWsName {
 public:
-  static std::string exec(vtkDataSet *dataSet);
   vtkDataSetToWsName(vtkDataSet *dataSet);
+  vtkDataSetToWsName &operator=(const vtkDataSetToWsName &other) = delete;
+  vtkDataSetToWsName(const vtkDataSetToWsName &other) = delete;
+  static std::string exec(vtkDataSet *dataSet);
   std::string execute();
   ~vtkDataSetToWsName();
 
 private:
-  vtkDataSetToWsName &operator=(const vtkDataSetToWsName &other);
-  vtkDataSetToWsName(const vtkDataSetToWsName &other);
   vtkDataSet *m_dataset;
 };
 }

Vates/VatesAPI/src/ADSWorkspaceProvider.cpp

@@ -9,11 +9,6 @@ using namespace Mantid::API;
 
 namespace Mantid {
 namespace VATES {
-template <typename Workspace_Type>
-ADSWorkspaceProvider<Workspace_Type>::ADSWorkspaceProvider() {}
-
-template <typename Workspace_Type>
-ADSWorkspaceProvider<Workspace_Type>::~ADSWorkspaceProvider() {}
 
 template <typename Workspace_Type>
 bool ADSWorkspaceProvider<Workspace_Type>::canProvideWorkspace(

Vates/VatesAPI/src/vtkDataSetToImplicitFunction.cpp

@@ -63,6 +63,6 @@ Mantid::Geometry::MDImplicitFunction *vtkDataSetToImplicitFunction::execute() {
 }
 
 /// Destructor.
-vtkDataSetToImplicitFunction::~vtkDataSetToImplicitFunction() {}
+vtkDataSetToImplicitFunction::~vtkDataSetToImplicitFunction() = default;
 }
 }

Vates/VatesAPI/src/vtkDataSetToScaledDataSet.cpp

@@ -23,9 +23,8 @@ namespace VATES {
 /**
  * Standard constructor for object.
  */
-vtkDataSetToScaledDataSet::vtkDataSetToScaledDataSet() {}
-
-vtkDataSetToScaledDataSet::~vtkDataSetToScaledDataSet() {}
+vtkDataSetToScaledDataSet::vtkDataSetToScaledDataSet() = default;
+vtkDataSetToScaledDataSet::~vtkDataSetToScaledDataSet() = default;
 
 /**
  * Process the input data. First, scale a copy of the points and apply

Vates/VatesAPI/src/vtkDataSetToWsName.cpp

@@ -55,6 +55,6 @@ std::string vtkDataSetToWsName::execute() {
 }
 
 /// Destructor.
-vtkDataSetToWsName::~vtkDataSetToWsName() {}
+vtkDataSetToWsName::~vtkDataSetToWsName() = default;
 }
 }