Skip to content

Commit

Permalink
Mark none-implemented copy/assign operators as deleted in RGL
Browse files Browse the repository at this point in the history
  • Loading branch information
linev committed Nov 3, 2023
1 parent 88f9c03 commit 2d17eab
Show file tree
Hide file tree
Showing 37 changed files with 95 additions and 95 deletions.
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TF2GL.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLAnnotation.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down
6 changes: 3 additions & 3 deletions graf3d/gl/inc/TGLAutoRotator.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLAxis.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLAxisPainter.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ class TGLAxisPainter
typedef std::vector<TM_t> 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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLCamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLCameraGuide.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLCameraOverlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLClip.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 4 additions & 4 deletions graf3d/gl/inc/TGLClipSetEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLEmbeddedViewer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLFBO.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions graf3d/gl/inc/TGLFontManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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);
Expand Down Expand Up @@ -122,8 +122,8 @@ class TGLFontManager
typedef std::vector<Int_t> 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<TGLFont, Int_t> FontMap_t;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLLightSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions graf3d/gl/inc/TGLLightSetEditor.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions graf3d/gl/inc/TGLLockable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;

Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLLogicalShape.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLManipSet.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions graf3d/gl/inc/TGLOverlay.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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<TGLOverlayElement*> fElements;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLOverlayButton.h
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLPShapeObj.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
};
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLPShapeRef.h
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLParametricEquationGL.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLPhysicalShape.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLPlot3D.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLPlotCamera.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLRnrCtx.h
Original file line number Diff line number Diff line change
Expand Up @@ -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<TGLColorSet*> lpTGLColorSet_t;

Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLScene.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions graf3d/gl/inc/TGLSceneBase.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading

0 comments on commit 2d17eab

Please sign in to comment.