From 2d17eab13055a34ca24122c8090ceb29ed72a63d Mon Sep 17 00:00:00 2001 From: Sergey Linev Date: Tue, 31 Oct 2023 14:24:03 +0100 Subject: [PATCH] Mark none-implemented copy/assign operators as deleted in RGL --- graf3d/gl/inc/TF2GL.h | 4 ++-- graf3d/gl/inc/TGLAnnotation.h | 4 ++-- graf3d/gl/inc/TGLAutoRotator.h | 6 +++--- graf3d/gl/inc/TGLAxis.h | 4 ++-- graf3d/gl/inc/TGLAxisPainter.h | 4 ++-- graf3d/gl/inc/TGLCamera.h | 4 ++-- graf3d/gl/inc/TGLCameraGuide.h | 4 ++-- graf3d/gl/inc/TGLCameraOverlay.h | 4 ++-- graf3d/gl/inc/TGLClip.h | 4 ++-- graf3d/gl/inc/TGLClipSetEditor.h | 8 ++++---- graf3d/gl/inc/TGLEmbeddedViewer.h | 4 ++-- graf3d/gl/inc/TGLFBO.h | 4 ++-- graf3d/gl/inc/TGLFontManager.h | 10 +++++----- graf3d/gl/inc/TGLLightSet.h | 4 ++-- graf3d/gl/inc/TGLLightSetEditor.h | 8 ++++---- graf3d/gl/inc/TGLLockable.h | 8 ++++---- graf3d/gl/inc/TGLLogicalShape.h | 4 ++-- graf3d/gl/inc/TGLManipSet.h | 4 ++-- graf3d/gl/inc/TGLOverlay.h | 8 ++++---- graf3d/gl/inc/TGLOverlayButton.h | 4 ++-- graf3d/gl/inc/TGLPShapeObj.h | 4 ++-- graf3d/gl/inc/TGLPShapeRef.h | 4 ++-- graf3d/gl/inc/TGLParametricEquationGL.h | 4 ++-- graf3d/gl/inc/TGLPhysicalShape.h | 4 ++-- graf3d/gl/inc/TGLPlot3D.h | 4 ++-- graf3d/gl/inc/TGLPlotCamera.h | 4 ++-- graf3d/gl/inc/TGLRnrCtx.h | 4 ++-- graf3d/gl/inc/TGLScene.h | 4 ++-- graf3d/gl/inc/TGLSceneBase.h | 4 ++-- graf3d/gl/inc/TGLTH3Composition.h | 14 +++++++------- graf3d/gl/inc/TGLText.h | 4 ++-- graf3d/gl/inc/TGLUtil.h | 12 ++++++------ graf3d/gl/inc/TGLViewer.h | 4 ++-- graf3d/gl/inc/TGLViewerBase.h | 4 ++-- graf3d/gl/inc/TGLWidget.h | 4 ++-- graf3d/gl/inc/TH2GL.h | 4 ++-- graf3d/gl/inc/TH3GL.h | 4 ++-- 37 files changed, 95 insertions(+), 95 deletions(-) diff --git a/graf3d/gl/inc/TF2GL.h b/graf3d/gl/inc/TF2GL.h index 54b5f5d52779c..7d90177f6ffbc 100644 --- a/graf3d/gl/inc/TF2GL.h +++ b/graf3d/gl/inc/TF2GL.h @@ -21,8 +21,8 @@ class TH2; class TF2GL : public TGLPlot3D { private: - TF2GL(const TF2GL&); // Not implemented - TF2GL& operator=(const TF2GL&); // Not implemented + TF2GL(const TF2GL&) = delete; + TF2GL& operator=(const TF2GL&) = delete; protected: TF2 *fM; // fModel dynamic-casted to TH2 diff --git a/graf3d/gl/inc/TGLAnnotation.h b/graf3d/gl/inc/TGLAnnotation.h index abacd5566e15e..636c521a4d901 100644 --- a/graf3d/gl/inc/TGLAnnotation.h +++ b/graf3d/gl/inc/TGLAnnotation.h @@ -25,8 +25,8 @@ class TGMainFrame; class TGLAnnotation : public TGLOverlayElement { private: - TGLAnnotation(const TGLAnnotation&); // Not implemented - TGLAnnotation& operator=(const TGLAnnotation&); // Not implemented + TGLAnnotation(const TGLAnnotation&) = delete; + TGLAnnotation& operator=(const TGLAnnotation&) = delete; protected: enum EDrag { kMove, kResize, kNone }; diff --git a/graf3d/gl/inc/TGLAutoRotator.h b/graf3d/gl/inc/TGLAutoRotator.h index bb5bee021fcf6..cb748dfa6ddc1 100644 --- a/graf3d/gl/inc/TGLAutoRotator.h +++ b/graf3d/gl/inc/TGLAutoRotator.h @@ -23,9 +23,9 @@ class TStopwatch; class TGLAutoRotator : public TObject { private: - TGLAutoRotator(const TGLAutoRotator&); // Not implemented - TGLAutoRotator& operator=(const TGLAutoRotator&); // Not implemented - + TGLAutoRotator(const TGLAutoRotator&) = delete; + TGLAutoRotator& operator=(const TGLAutoRotator&) = delete; + protected: TGLViewer *fViewer; TGLCamera *fCamera; diff --git a/graf3d/gl/inc/TGLAxis.h b/graf3d/gl/inc/TGLAxis.h index c00da64b8e309..4db16b41286aa 100644 --- a/graf3d/gl/inc/TGLAxis.h +++ b/graf3d/gl/inc/TGLAxis.h @@ -21,8 +21,8 @@ class TGLText; class TGLAxis : public TAttLine, public TAttText { private: - TGLAxis(const TGLAxis&); // Not implemented - TGLAxis& operator=(const TGLAxis&); // Not implemented + TGLAxis(const TGLAxis&) = delete; + TGLAxis& operator=(const TGLAxis&) = delete; Int_t fNDiv; Int_t fNDiv1; diff --git a/graf3d/gl/inc/TGLAxisPainter.h b/graf3d/gl/inc/TGLAxisPainter.h index 7622347ce1b2a..a662b5ceea266 100644 --- a/graf3d/gl/inc/TGLAxisPainter.h +++ b/graf3d/gl/inc/TGLAxisPainter.h @@ -38,8 +38,8 @@ class TGLAxisPainter typedef std::vector TMVec_t; // vector od tick lines private: - TGLAxisPainter(const TGLAxisPainter&); // Not implemented - TGLAxisPainter& operator=(const TGLAxisPainter&); // Not implemented + TGLAxisPainter(const TGLAxisPainter&) = delete; + TGLAxisPainter& operator=(const TGLAxisPainter&) = delete; // Print format derived from attributers. Int_t fExp; diff --git a/graf3d/gl/inc/TGLCamera.h b/graf3d/gl/inc/TGLCamera.h index aab64421cad29..109f03462d3b8 100644 --- a/graf3d/gl/inc/TGLCamera.h +++ b/graf3d/gl/inc/TGLCamera.h @@ -68,8 +68,8 @@ class TGLCamera : public TObject TGLBoundingBox Frustum(Bool_t asBox = kTRUE) const; // current frustum // Non-copyable class - TGLCamera(const TGLCamera &); - TGLCamera & operator=(const TGLCamera &); + TGLCamera(const TGLCamera &) = delete; + TGLCamera & operator=(const TGLCamera &) = delete; protected: // Fields diff --git a/graf3d/gl/inc/TGLCameraGuide.h b/graf3d/gl/inc/TGLCameraGuide.h index c7e9a436bcfc9..d90da1a566cb0 100644 --- a/graf3d/gl/inc/TGLCameraGuide.h +++ b/graf3d/gl/inc/TGLCameraGuide.h @@ -17,8 +17,8 @@ class TGLCameraGuide : public TGLOverlayElement { private: - TGLCameraGuide(const TGLCameraGuide&); // Not implemented - TGLCameraGuide& operator=(const TGLCameraGuide&); // Not implemented + TGLCameraGuide(const TGLCameraGuide&) = delete; + TGLCameraGuide& operator=(const TGLCameraGuide&) = delete; protected: Float_t fXPos; diff --git a/graf3d/gl/inc/TGLCameraOverlay.h b/graf3d/gl/inc/TGLCameraOverlay.h index f080b8829cdc7..756124db32afe 100644 --- a/graf3d/gl/inc/TGLCameraOverlay.h +++ b/graf3d/gl/inc/TGLCameraOverlay.h @@ -28,8 +28,8 @@ class TGLCameraOverlay : public TGLOverlayElement enum EMode { kPlaneIntersect, kBar, kAxis, kGridFront, kGridBack }; private: - TGLCameraOverlay(const TGLCameraOverlay&); // Not implemented - TGLCameraOverlay& operator=(const TGLCameraOverlay&); // Not implemented + TGLCameraOverlay(const TGLCameraOverlay&) = delete; + TGLCameraOverlay& operator=(const TGLCameraOverlay&) = delete; protected: Bool_t fShowOrthographic; diff --git a/graf3d/gl/inc/TGLClip.h b/graf3d/gl/inc/TGLClip.h index 44371284d6295..b0f02d78353ba 100644 --- a/graf3d/gl/inc/TGLClip.h +++ b/graf3d/gl/inc/TGLClip.h @@ -139,8 +139,8 @@ class TGLClipBox : public TGLClip class TGLClipSet : public TGLOverlayElement { private: - TGLClipSet(const TGLClipSet&); // Not implemented - TGLClipSet& operator=(const TGLClipSet&); // Not implemented + TGLClipSet(const TGLClipSet&) = delete; + TGLClipSet& operator=(const TGLClipSet&) = delete; protected: TGLClipPlane *fClipPlane; diff --git a/graf3d/gl/inc/TGLClipSetEditor.h b/graf3d/gl/inc/TGLClipSetEditor.h index b95bc5e775efe..d9fc77da5c86c 100644 --- a/graf3d/gl/inc/TGLClipSetEditor.h +++ b/graf3d/gl/inc/TGLClipSetEditor.h @@ -26,8 +26,8 @@ class TGButtonGroup; class TGLClipSetSubEditor : public TGVerticalFrame { private: - TGLClipSetSubEditor(const TGLClipSetSubEditor&); // Not implemented - TGLClipSetSubEditor& operator=(const TGLClipSetSubEditor&); // Not implemented + TGLClipSetSubEditor(const TGLClipSetSubEditor&) = delete; + TGLClipSetSubEditor& operator=(const TGLClipSetSubEditor&) = delete; protected: TGLClipSet *fM; @@ -68,8 +68,8 @@ class TGLClipSetSubEditor : public TGVerticalFrame class TGLClipSetEditor : public TGedFrame { private: - TGLClipSetEditor(const TGLClipSetEditor&); // Not implemented - TGLClipSetEditor& operator=(const TGLClipSetEditor&); // Not implemented + TGLClipSetEditor(const TGLClipSetEditor&) = delete; + TGLClipSetEditor& operator=(const TGLClipSetEditor&) = delete; protected: TGLClipSet *fM; // fModel dynamic-casted to TGLClipSet diff --git a/graf3d/gl/inc/TGLEmbeddedViewer.h b/graf3d/gl/inc/TGLEmbeddedViewer.h index 991a3fc7715a5..7b993b8e8915f 100644 --- a/graf3d/gl/inc/TGLEmbeddedViewer.h +++ b/graf3d/gl/inc/TGLEmbeddedViewer.h @@ -30,8 +30,8 @@ class TGLEmbeddedViewer : public TGLViewer void Init(const TGWindow *parent); void CreateFrames(); - TGLEmbeddedViewer(const TGLEmbeddedViewer&); // Not implemented - TGLEmbeddedViewer& operator=(const TGLEmbeddedViewer&); // Not implemented + TGLEmbeddedViewer(const TGLEmbeddedViewer&) = delete; + TGLEmbeddedViewer& operator=(const TGLEmbeddedViewer&) = delete; public: TGLEmbeddedViewer(const TGWindow *parent, TVirtualPad *pad = nullptr, Int_t border=2); diff --git a/graf3d/gl/inc/TGLFBO.h b/graf3d/gl/inc/TGLFBO.h index bbdd8647b2a2d..fb84673085bf9 100644 --- a/graf3d/gl/inc/TGLFBO.h +++ b/graf3d/gl/inc/TGLFBO.h @@ -17,8 +17,8 @@ class TGLFBO { private: - TGLFBO(const TGLFBO&); // Not implemented - TGLFBO& operator=(const TGLFBO&); // Not implemented + TGLFBO(const TGLFBO&) = delete; + TGLFBO& operator=(const TGLFBO&) = delete; protected: UInt_t fFrameBuffer; diff --git a/graf3d/gl/inc/TGLFontManager.h b/graf3d/gl/inc/TGLFontManager.h index 86fc1edc83414..83a56a45986ad 100644 --- a/graf3d/gl/inc/TGLFontManager.h +++ b/graf3d/gl/inc/TGLFontManager.h @@ -34,7 +34,7 @@ class TGLFont enum ETextAlignV_e { kBottom, kTop, kCenterV }; private: - TGLFont& operator=(const TGLFont& o); // Not implemented. + TGLFont& operator=(const TGLFont&) = delete; FTFont *fFont; // FTGL font. TGLFontManager *fManager; // Font manager. @@ -52,8 +52,8 @@ class TGLFont mutable Int_t fTrashCount; public: TGLFont(); - TGLFont(Int_t size, Int_t font, EMode mode, FTFont *f=nullptr, TGLFontManager *mng=nullptr); - TGLFont(const TGLFont& o); // Not implemented. + TGLFont(Int_t size, Int_t font, EMode mode, FTFont *f = nullptr, TGLFontManager *mng = nullptr); + TGLFont(const TGLFont &o); virtual ~TGLFont(); void CopyAttributes(const TGLFont &o); @@ -122,8 +122,8 @@ class TGLFontManager typedef std::vector FontSizeVec_t; private: - TGLFontManager(const TGLFontManager&); // Not implemented - TGLFontManager& operator=(const TGLFontManager&); // Not implemented + TGLFontManager(const TGLFontManager&) = delete; + TGLFontManager& operator=(const TGLFontManager&) = delete; protected: typedef std::map FontMap_t; diff --git a/graf3d/gl/inc/TGLLightSet.h b/graf3d/gl/inc/TGLLightSet.h index 43e4b5a621d24..7701e88ef0924 100644 --- a/graf3d/gl/inc/TGLLightSet.h +++ b/graf3d/gl/inc/TGLLightSet.h @@ -29,8 +29,8 @@ class TGLLightSet : public TObject kLightMask = 0x001f, kLightSpecular = 0x0100 }; private: - TGLLightSet(const TGLLightSet&); // Not implemented - TGLLightSet& operator=(const TGLLightSet&); // Not implemented + TGLLightSet(const TGLLightSet&) = delete; + TGLLightSet& operator=(const TGLLightSet&) = delete; protected: UInt_t fLightState; //! light states (on/off) mask diff --git a/graf3d/gl/inc/TGLLightSetEditor.h b/graf3d/gl/inc/TGLLightSetEditor.h index 6e8b487910da8..c20418cd91ee0 100644 --- a/graf3d/gl/inc/TGLLightSetEditor.h +++ b/graf3d/gl/inc/TGLLightSetEditor.h @@ -20,8 +20,8 @@ class TGLLightSet; class TGLLightSetSubEditor : public TGVerticalFrame { private: - TGLLightSetSubEditor(const TGLLightSetSubEditor&); // Not implemented - TGLLightSetSubEditor& operator=(const TGLLightSetSubEditor&); // Not implemented + TGLLightSetSubEditor(const TGLLightSetSubEditor&) = delete; + TGLLightSetSubEditor& operator=(const TGLLightSetSubEditor&) = delete; protected: TGLLightSet *fM; @@ -54,8 +54,8 @@ class TGLLightSetSubEditor : public TGVerticalFrame class TGLLightSetEditor : public TGedFrame { private: - TGLLightSetEditor(const TGLLightSetEditor&); // Not implemented - TGLLightSetEditor& operator=(const TGLLightSetEditor&); // Not implemented + TGLLightSetEditor(const TGLLightSetEditor&) = delete; + TGLLightSetEditor& operator=(const TGLLightSetEditor&) = delete; protected: TGLLightSet *fM; // fModel dynamic-casted to TGLLightSetEditor diff --git a/graf3d/gl/inc/TGLLockable.h b/graf3d/gl/inc/TGLLockable.h index 25d30c6812507..878997bbfaa3d 100644 --- a/graf3d/gl/inc/TGLLockable.h +++ b/graf3d/gl/inc/TGLLockable.h @@ -24,8 +24,8 @@ class TGLLockable }; private: - TGLLockable(const TGLLockable&); // Not implemented - TGLLockable& operator=(const TGLLockable&); // Not implemented + TGLLockable(const TGLLockable&) = delete; + TGLLockable& operator=(const TGLLockable&) = delete; protected: // Locking - can take/release via const handle @@ -35,8 +35,8 @@ class TGLLockable class TUnlocker { private: - TUnlocker(const TUnlocker&) = delete; // Not implemented - TUnlocker& operator=(const TUnlocker&) = delete; // Not implemented + TUnlocker(const TUnlocker&) = delete; + TUnlocker& operator=(const TUnlocker&) = delete; const TGLLockable *fLockable; diff --git a/graf3d/gl/inc/TGLLogicalShape.h b/graf3d/gl/inc/TGLLogicalShape.h index eb3d8a7e4e180..009ec2ba7ef35 100644 --- a/graf3d/gl/inc/TGLLogicalShape.h +++ b/graf3d/gl/inc/TGLLogicalShape.h @@ -31,8 +31,8 @@ class TGLLogicalShape friend class TGLScene; private: - TGLLogicalShape(const TGLLogicalShape&); // Not implemented. - TGLLogicalShape& operator=(const TGLLogicalShape&); // Not implemented. + TGLLogicalShape(const TGLLogicalShape&) = delete; + TGLLogicalShape& operator=(const TGLLogicalShape&) = delete; public: enum ELODAxes { kLODAxesNone = 0, // LOD will be set to high or pixel. diff --git a/graf3d/gl/inc/TGLManipSet.h b/graf3d/gl/inc/TGLManipSet.h index e579bb8b6b7ca..352e5c5805c53 100644 --- a/graf3d/gl/inc/TGLManipSet.h +++ b/graf3d/gl/inc/TGLManipSet.h @@ -24,8 +24,8 @@ class TGLManipSet : public TGLOverlayElement, enum EManip { kTrans, kScale, kRotate, kEndType }; private: - TGLManipSet(const TGLManipSet&); // Not implemented - TGLManipSet& operator=(const TGLManipSet&); // Not implemented + TGLManipSet(const TGLManipSet&) = delete; + TGLManipSet& operator=(const TGLManipSet&) = delete; protected: TGLManip *fManip[3]; //! manipulator store diff --git a/graf3d/gl/inc/TGLOverlay.h b/graf3d/gl/inc/TGLOverlay.h index 0a4a8483e3e25..6f676608e654e 100644 --- a/graf3d/gl/inc/TGLOverlay.h +++ b/graf3d/gl/inc/TGLOverlay.h @@ -28,8 +28,8 @@ class TGLOverlayElement kAllVisible = kDisabled | kActive }; private: - TGLOverlayElement(const TGLOverlayElement&); // Not implemented - TGLOverlayElement& operator=(const TGLOverlayElement&); // Not implemented + TGLOverlayElement(const TGLOverlayElement&) = delete; + TGLOverlayElement& operator=(const TGLOverlayElement&) = delete; protected: ERole fRole; @@ -65,8 +65,8 @@ class TGLOverlayElement class TGLOverlayList { private: - TGLOverlayList(const TGLOverlayList&); // Not implemented - TGLOverlayList& operator=(const TGLOverlayList&); // Not implemented + TGLOverlayList(const TGLOverlayList&) = delete; + TGLOverlayList& operator=(const TGLOverlayList&) = delete; protected: std::list fElements; diff --git a/graf3d/gl/inc/TGLOverlayButton.h b/graf3d/gl/inc/TGLOverlayButton.h index cbc78f16939ae..00a5f3f5e08e1 100644 --- a/graf3d/gl/inc/TGLOverlayButton.h +++ b/graf3d/gl/inc/TGLOverlayButton.h @@ -24,8 +24,8 @@ class TGLOverlayButton : public TGLOverlayElement, { private: - TGLOverlayButton(const TGLOverlayButton&); // Not implemented - TGLOverlayButton& operator=(const TGLOverlayButton&); // Not implemented + TGLOverlayButton(const TGLOverlayButton&) = delete; + TGLOverlayButton& operator=(const TGLOverlayButton&) = delete; protected: diff --git a/graf3d/gl/inc/TGLPShapeObj.h b/graf3d/gl/inc/TGLPShapeObj.h index cd8728c3de346..f1a6f7a258c72 100644 --- a/graf3d/gl/inc/TGLPShapeObj.h +++ b/graf3d/gl/inc/TGLPShapeObj.h @@ -31,8 +31,8 @@ class TGLPShapeObj : public TObject const char* GetName() const override { return "Selected"; } private: - TGLPShapeObj(const TGLPShapeObj &); // Not implemented - TGLPShapeObj& operator=(const TGLPShapeObj &); // Not implemented + TGLPShapeObj(const TGLPShapeObj &) = delete; + TGLPShapeObj& operator=(const TGLPShapeObj &) = delete; ClassDefOverride(TGLPShapeObj, 0) // This object wraps TGLPhysicalShape (not a TObject) }; diff --git a/graf3d/gl/inc/TGLPShapeRef.h b/graf3d/gl/inc/TGLPShapeRef.h index 6f06b56733661..9c240aaf9a1a3 100644 --- a/graf3d/gl/inc/TGLPShapeRef.h +++ b/graf3d/gl/inc/TGLPShapeRef.h @@ -20,8 +20,8 @@ class TGLPShapeRef { friend class TGLPhysicalShape; private: - TGLPShapeRef(const TGLPShapeRef&); // Not implemented - TGLPShapeRef& operator=(const TGLPShapeRef&); // Not implemented + TGLPShapeRef(const TGLPShapeRef&) = delete; + TGLPShapeRef& operator=(const TGLPShapeRef&) = delete; TGLPShapeRef * fNextPSRef; // Internal pointer to the next reference (used by TGLPhysicalShape directly). diff --git a/graf3d/gl/inc/TGLParametricEquationGL.h b/graf3d/gl/inc/TGLParametricEquationGL.h index 8ab8c25518d72..0d7da74b25fde 100644 --- a/graf3d/gl/inc/TGLParametricEquationGL.h +++ b/graf3d/gl/inc/TGLParametricEquationGL.h @@ -22,8 +22,8 @@ class TH2; class TGLParametricEquationGL : public TGLPlot3D { private: - TGLParametricEquationGL(const TGLParametricEquationGL&); // Not implemented - TGLParametricEquationGL& operator=(const TGLParametricEquationGL&); // Not implemented + TGLParametricEquationGL(const TGLParametricEquationGL&) = delete; + TGLParametricEquationGL& operator=(const TGLParametricEquationGL&) = delete; protected: TGLParametricEquation *fM; diff --git a/graf3d/gl/inc/TGLPhysicalShape.h b/graf3d/gl/inc/TGLPhysicalShape.h index 6712b7c78dd53..9abb980edd23f 100644 --- a/graf3d/gl/inc/TGLPhysicalShape.h +++ b/graf3d/gl/inc/TGLPhysicalShape.h @@ -33,8 +33,8 @@ class TGLPhysicalShape friend class TGLLogicalShape; // for replica-list management private: - TGLPhysicalShape(const TGLPhysicalShape&); // Not implemented - TGLPhysicalShape& operator=(const TGLPhysicalShape&); // Not implemented + TGLPhysicalShape(const TGLPhysicalShape&) = delete; + TGLPhysicalShape& operator=(const TGLPhysicalShape&) = delete; public: // Flags for permitted manipulation of object diff --git a/graf3d/gl/inc/TGLPlot3D.h b/graf3d/gl/inc/TGLPlot3D.h index fb241afce4b08..8d9b36ebe6ec6 100644 --- a/graf3d/gl/inc/TGLPlot3D.h +++ b/graf3d/gl/inc/TGLPlot3D.h @@ -22,8 +22,8 @@ class TH3; class TGLPlot3D : public TGLObject { private: - TGLPlot3D(const TGLPlot3D&); // Not implemented - TGLPlot3D& operator=(const TGLPlot3D&); // Not implemented + TGLPlot3D(const TGLPlot3D&) = delete; + TGLPlot3D& operator=(const TGLPlot3D&) = delete; protected: TGLPlotPainter *fPlotPainter; diff --git a/graf3d/gl/inc/TGLPlotCamera.h b/graf3d/gl/inc/TGLPlotCamera.h index 10afe03bb7b33..49f10e4361c9f 100644 --- a/graf3d/gl/inc/TGLPlotCamera.h +++ b/graf3d/gl/inc/TGLPlotCamera.h @@ -21,8 +21,8 @@ class TGLPaintDevice; class TGLPlotCamera { private: - TGLPlotCamera(const TGLPlotCamera&); // Not implemented - TGLPlotCamera& operator=(const TGLPlotCamera&); // Not implemented + TGLPlotCamera(const TGLPlotCamera&) = delete; + TGLPlotCamera& operator=(const TGLPlotCamera&) = delete; protected: TGLRect fViewport; diff --git a/graf3d/gl/inc/TGLRnrCtx.h b/graf3d/gl/inc/TGLRnrCtx.h index 1a311d74d90f1..7d36f8da39107 100644 --- a/graf3d/gl/inc/TGLRnrCtx.h +++ b/graf3d/gl/inc/TGLRnrCtx.h @@ -85,8 +85,8 @@ class TGLRnrCtx }; private: - TGLRnrCtx(const TGLRnrCtx&); // Not implemented - TGLRnrCtx& operator=(const TGLRnrCtx&); // Not implemented + TGLRnrCtx(const TGLRnrCtx&) = delete; + TGLRnrCtx& operator=(const TGLRnrCtx&) = delete; typedef std::list lpTGLColorSet_t; diff --git a/graf3d/gl/inc/TGLScene.h b/graf3d/gl/inc/TGLScene.h index 5c115d9c4e4af..9ac2b2ae930c0 100644 --- a/graf3d/gl/inc/TGLScene.h +++ b/graf3d/gl/inc/TGLScene.h @@ -28,8 +28,8 @@ class TGLContextIdentity; class TGLScene : public TGLSceneBase { private: - TGLScene(const TGLScene&); // Not implemented - TGLScene& operator=(const TGLScene&); // Not implemented + TGLScene(const TGLScene&) = delete; + TGLScene& operator=(const TGLScene&) = delete; // Compare physical-shape volumes/diagonals -- for draw-vec sorting static Bool_t ComparePhysicalVolumes(const TGLPhysicalShape* shape1, diff --git a/graf3d/gl/inc/TGLSceneBase.h b/graf3d/gl/inc/TGLSceneBase.h index 2ed91b89d066a..fb6d3bc5ad5f0 100644 --- a/graf3d/gl/inc/TGLSceneBase.h +++ b/graf3d/gl/inc/TGLSceneBase.h @@ -32,8 +32,8 @@ class TGLSelectRecord; class TGLSceneBase : public TGLLockable // : public TObject / TNamed { private: - TGLSceneBase(const TGLSceneBase&); // Not implemented - TGLSceneBase& operator=(const TGLSceneBase&); // Not implemented + TGLSceneBase(const TGLSceneBase&) = delete; + TGLSceneBase& operator=(const TGLSceneBase&) = delete; static UInt_t fgSceneIDSrc; diff --git a/graf3d/gl/inc/TGLTH3Composition.h b/graf3d/gl/inc/TGLTH3Composition.h index c028c852991c8..574cd0a66fd2e 100644 --- a/graf3d/gl/inc/TGLTH3Composition.h +++ b/graf3d/gl/inc/TGLTH3Composition.h @@ -51,8 +51,8 @@ class TGLTH3Composition : public TH3C { std::vector fHists; std::unique_ptr fPainter; - TGLTH3Composition(const TGLTH3Composition &rhs); - TGLTH3Composition &operator = (const TGLTH3Composition &); + TGLTH3Composition(const TGLTH3Composition &) = delete; + TGLTH3Composition &operator = (const TGLTH3Composition &) = delete; ClassDefOverride(TGLTH3Composition, 0)//Composition of TH3 objects. }; @@ -81,9 +81,9 @@ class TGLTH3CompositionPainter: public TGLPlotPainter { void DrawPlot()const override; //Empty overriders. - void DrawSectionXOZ()const override{} - void DrawSectionYOZ()const override{} - void DrawSectionXOY()const override{} + void DrawSectionXOZ()const override {} + void DrawSectionYOZ()const override {} + void DrawSectionXOY()const override {} void SetColor(Int_t color)const; @@ -92,8 +92,8 @@ class TGLTH3CompositionPainter: public TGLPlotPainter { mutable TGLQuadric fQuadric; - TGLTH3CompositionPainter(const TGLTH3CompositionPainter &rhs); - TGLTH3CompositionPainter &operator = (const TGLTH3CompositionPainter &rhs); + TGLTH3CompositionPainter(const TGLTH3CompositionPainter &) = delete; + TGLTH3CompositionPainter &operator = (const TGLTH3CompositionPainter &) = delete; ClassDefOverride(TGLTH3CompositionPainter, 0)//Painter to draw several TH3. }; diff --git a/graf3d/gl/inc/TGLText.h b/graf3d/gl/inc/TGLText.h index 7beb3a8a5d7a8..64d63236e202a 100644 --- a/graf3d/gl/inc/TGLText.h +++ b/graf3d/gl/inc/TGLText.h @@ -18,8 +18,8 @@ class FTFont; class TGLText : public TAttText { private: - TGLText(const TGLText&); // Not implemented - TGLText& operator=(const TGLText&); // Not implemented + TGLText(const TGLText&) = delete; + TGLText& operator=(const TGLText&) = delete; Double_t fX; // X position Double_t fY; // Y position diff --git a/graf3d/gl/inc/TGLUtil.h b/graf3d/gl/inc/TGLUtil.h index 1dc13825ee270..d0eccb4a0b9d7 100644 --- a/graf3d/gl/inc/TGLUtil.h +++ b/graf3d/gl/inc/TGLUtil.h @@ -931,8 +931,8 @@ class TGLUtil static Float_t fgSimpleAxisWidthScale; static Float_t fgSimpleAxisBBoxScale; - TGLUtil(const TGLUtil&); // Not implemented. - TGLUtil& operator=(const TGLUtil&); // Not implemented. + TGLUtil(const TGLUtil&) = delete; + TGLUtil& operator=(const TGLUtil&) = delete; public: virtual ~TGLUtil() {} @@ -1098,8 +1098,8 @@ class TGLCapabilityEnabler class TGLFloatHolder { - TGLFloatHolder(const TGLFloatHolder&); // Not implemented - TGLFloatHolder& operator=(const TGLFloatHolder&); // Not implemented + TGLFloatHolder(const TGLFloatHolder&) = delete; + TGLFloatHolder& operator=(const TGLFloatHolder&) = delete; Int_t fWhat; Float_t fState; @@ -1352,8 +1352,8 @@ class TGLLevelPalette { Int_t fMaxPaletteSize; Rgl::Range_t fZRange; - TGLLevelPalette(const TGLLevelPalette&); // Not implemented - TGLLevelPalette& operator=(const TGLLevelPalette&); // Not implemented + TGLLevelPalette(const TGLLevelPalette&) = delete; + TGLLevelPalette& operator=(const TGLLevelPalette&) = delete; public: TGLLevelPalette(); diff --git a/graf3d/gl/inc/TGLViewer.h b/graf3d/gl/inc/TGLViewer.h index 6da9f237852f3..13b2fbfbdb00b 100644 --- a/graf3d/gl/inc/TGLViewer.h +++ b/graf3d/gl/inc/TGLViewer.h @@ -431,8 +431,8 @@ class TGLRedrawTimer : public TTimer class TGLFaderHelper { private: - TGLFaderHelper(const TGLFaderHelper&); // Not implemented - TGLFaderHelper& operator=(const TGLFaderHelper&); // Not implemented + TGLFaderHelper(const TGLFaderHelper&) = delete; + TGLFaderHelper& operator=(const TGLFaderHelper&) = delete; public: TGLViewer *fViewer; diff --git a/graf3d/gl/inc/TGLViewerBase.h b/graf3d/gl/inc/TGLViewerBase.h index 5dcab1b96119f..719ea09201e3e 100644 --- a/graf3d/gl/inc/TGLViewerBase.h +++ b/graf3d/gl/inc/TGLViewerBase.h @@ -36,8 +36,8 @@ class TGLOverlayElement; class TGLViewerBase : public TGLLockable // : public TObject { private: - TGLViewerBase(const TGLViewerBase&); // Not implemented - TGLViewerBase& operator=(const TGLViewerBase&); // Not implemented + TGLViewerBase(const TGLViewerBase&) = delete; + TGLViewerBase& operator=(const TGLViewerBase&) = delete; protected: typedef std::list SceneInfoList_t; diff --git a/graf3d/gl/inc/TGLWidget.h b/graf3d/gl/inc/TGLWidget.h index 6c52b1e19da7c..010212c06a2a7 100644 --- a/graf3d/gl/inc/TGLWidget.h +++ b/graf3d/gl/inc/TGLWidget.h @@ -86,8 +86,8 @@ class TGLWidget : public TGFrame, public TGLPaintDevice void DoRedraw() override; private: - TGLWidget(const TGLWidget &); // Not implemented. - TGLWidget &operator = (const TGLWidget &); // Not implemented. + TGLWidget(const TGLWidget &) = delete; + TGLWidget &operator = (const TGLWidget &) = delete; protected: TGLWidget(Window_t glw, const TGWindow* parent, Bool_t selectInput); diff --git a/graf3d/gl/inc/TH2GL.h b/graf3d/gl/inc/TH2GL.h index ff925af891768..a8b9551a95cef 100644 --- a/graf3d/gl/inc/TH2GL.h +++ b/graf3d/gl/inc/TH2GL.h @@ -23,8 +23,8 @@ class TAxis; class TH2GL : public TGLPlot3D { private: - TH2GL(const TH2GL&); // Not implemented - TH2GL& operator=(const TH2GL&); // Not implemented + TH2GL(const TH2GL&) = delete; + TH2GL& operator=(const TH2GL&) = delete; protected: TH2 *fM; // Model object dynamic-casted to TH2. diff --git a/graf3d/gl/inc/TH3GL.h b/graf3d/gl/inc/TH3GL.h index 1c96a453d74aa..c56882e2e4345 100644 --- a/graf3d/gl/inc/TH3GL.h +++ b/graf3d/gl/inc/TH3GL.h @@ -26,8 +26,8 @@ class TH3; class TH3GL : public TGLPlot3D { private: - TH3GL(const TH3GL&); // Not implemented - TH3GL& operator=(const TH3GL&); // Not implemented + TH3GL(const TH3GL&) = delete; + TH3GL& operator=(const TH3GL&) = delete; protected: TH3 *fM; // Model object dynamic-casted to TH3.