From 9b705abaef38a3e5ce69e8b5673fe90232af6c0d Mon Sep 17 00:00:00 2001 From: ferdymercury Date: Thu, 12 Feb 2026 09:14:28 +0100 Subject: [PATCH 1/4] [gui,grafs][nfc] Avoid Doxygen documentation errors without disturbing transient I/O mark --- graf2d/cocoa/inc/TGCocoa.h | 2 +- graf2d/cocoa/src/TGCocoa.mm | 2 +- graf2d/gpad/src/TInspectCanvas.cxx | 4 +- graf2d/graf/inc/TMathText.h | 2 +- graf3d/eve/inc/TEveCaloLegoOverlay.h | 2 +- graf3d/eve/inc/TEveDigitSet.h | 8 +- graf3d/eve/inc/TEveElement.h | 26 +++--- graf3d/eve/inc/TEveGeoNode.h | 4 +- graf3d/eve/inc/TEveGeoShape.h | 2 +- graf3d/eve/inc/TEveGridStepper.h | 2 +- graf3d/eve/inc/TEvePointSet.h | 2 +- graf3d/eve/inc/TEveStraightLineSet.h | 2 +- graf3d/eve/inc/TEveTrack.h | 2 +- graf3d/eve/inc/TEveTrans.h | 8 +- graf3d/eve/inc/TEveVSD.h | 42 +++++----- graf3d/eve7/inc/ROOT/REveDigitSet.hxx | 8 +- graf3d/eve7/inc/ROOT/REveElement.hxx | 12 +-- graf3d/eve7/inc/ROOT/REveGeoShape.hxx | 4 +- graf3d/eve7/inc/ROOT/REveManager.hxx | 2 +- graf3d/eve7/inc/ROOT/REvePointSet.hxx | 2 +- graf3d/eve7/inc/ROOT/REveTrack.hxx | 2 +- graf3d/eve7/inc/ROOT/REveTrans.hxx | 8 +- graf3d/eve7/inc/ROOT/REveVSD.hxx | 42 +++++----- graf3d/g3d/inc/TAxis3D.h | 2 +- graf3d/g3d/inc/TGeometry.h | 24 +++--- graf3d/g3d/inc/TPCON.h | 4 +- graf3d/g3d/inc/TSPHE.h | 8 +- graf3d/g3d/inc/TTUBE.h | 4 +- graf3d/g3d/inc/TView3D.h | 2 +- graf3d/gl/inc/TGLAnnotation.h | 8 +- graf3d/gl/inc/TGLBoundingBox.h | 10 +-- graf3d/gl/inc/TGLCamera.h | 40 ++++----- graf3d/gl/inc/TGLClip.h | 6 +- graf3d/gl/inc/TGLLightSet.h | 10 +-- graf3d/gl/inc/TGLLogicalShape.h | 28 +++---- graf3d/gl/inc/TGLManip.h | 10 +-- graf3d/gl/inc/TGLManipSet.h | 6 +- graf3d/gl/inc/TGLOrthoCamera.h | 4 +- graf3d/gl/inc/TGLPhysicalShape.h | 26 +++--- graf3d/gl/inc/TGLRnrCtx.h | 4 +- graf3d/gl/inc/TGLRotateManip.h | 8 +- graf3d/gl/inc/TGLScaleManip.h | 2 +- graf3d/gl/inc/TGLScene.h | 8 +- graf3d/gl/inc/TGLScenePad.h | 10 +-- graf3d/gl/inc/TGLStopwatch.h | 6 +- graf3d/gl/inc/TGLUtil.h | 8 +- graf3d/gl/inc/TGLViewer.h | 116 +++++++++++++------------- gui/guihtml/src/TGHtml.cxx | 4 +- gui/recorder/inc/TRecorder.h | 2 +- 49 files changed, 275 insertions(+), 275 deletions(-) diff --git a/graf2d/cocoa/inc/TGCocoa.h b/graf2d/cocoa/inc/TGCocoa.h index 5bd3c2136d12d..0ec9a188991c5 100644 --- a/graf2d/cocoa/inc/TGCocoa.h +++ b/graf2d/cocoa/inc/TGCocoa.h @@ -441,7 +441,7 @@ class TGCocoa : public TVirtualX { Drawable_t fSelectedDrawable; - std::unique_ptr fPimpl; //! + std::unique_ptr fPimpl; /// &text) Util::NSScopeGuard winGuard(fakeWindow); fakeView = fakeWindow.fContentView; - [fakeView setHidden : NO];//! + [fakeView setHidden : NO]; fPimpl->SetFakeGLWindow(fakeWindow);//Can throw. winGuard.Release(); diff --git a/graf2d/gpad/src/TInspectCanvas.cxx b/graf2d/gpad/src/TInspectCanvas.cxx index 91466bba14fb2..a71c85b9e722d 100644 --- a/graf2d/gpad/src/TInspectCanvas.cxx +++ b/graf2d/gpad/src/TInspectCanvas.cxx @@ -47,8 +47,8 @@ class TInspectorObject : public TObject TClass *IsA() const override { return fClass; } private: - void *fObj{nullptr}; //! pointer to the foreign object - TClass *fClass{nullptr}; //! pointer to class of the foreign object + void *fObj{nullptr}; /// fgTemporaryStore; //! + static Int_t fgCSGExportNSeg; /// fgTemporaryStore; /// fMainTrans; // Pointer to main transformation matrix. - void *fUserData{nullptr}; //! Externally assigned and controlled user data. + void *fUserData{nullptr}; /// fRenderData;//! Vertex / normal / triangle index information for rendering. + std::unique_ptr fRenderData;/// fBuff; //! 3d buffer + std::unique_ptr fBuff; ///Collection of rotation matrices THashList *fShapes; //->Collection of shapes TList *fNodes; //->Collection of nodes - TRotMatrix *fMatrix; //!Pointers to current rotation matrices - TNode *fCurrentNode; //!Pointer to current node - TMaterial **fMaterialPointer; //!Pointers to materials - TRotMatrix **fMatrixPointer; //!Pointers to rotation matrices - TShape **fShapePointer; //!Pointers to shapes + TRotMatrix *fMatrix; /// CSPart_t; - mutable TGLFaceSet *fComposite; //! Paritally created composite + mutable TGLFaceSet *fComposite; /// fCSTokens; RootCsg::TBaseMesh* BuildComposite(); TGLLogicalShape* AttemptDirectRenderer(TObject* id); - Bool_t fSmartRefresh; //! cache logicals during scene rebuilds + Bool_t fSmartRefresh; ///EndMenu(dummy); @@ -1450,7 +1450,7 @@ Bool_t TGHtml::HandleMotion(Event_t *event) fLastUri = uri; if (uri) uri = ResolveUri(uri); MouseOver(uri); - //!!if (uri) delete [] uri; + // if (uri) delete [] uri; } return kTRUE; diff --git a/gui/recorder/inc/TRecorder.h b/gui/recorder/inc/TRecorder.h index d99974ed909b1..fb268e11f5a73 100644 --- a/gui/recorder/inc/TRecorder.h +++ b/gui/recorder/inc/TRecorder.h @@ -265,7 +265,7 @@ class TRecWinPair : public TObject class TRecorder : public TObject { private: - TRecorderState *fRecorderState; //! Current state of recorder + TRecorderState *fRecorderState; /// Date: Thu, 12 Feb 2026 09:16:25 +0100 Subject: [PATCH 2/4] [doc][nfc] Avoid Doxygen documentation errors without disturbing transient I/O mark --- documentation/primer/macros/MySelector.h | 10 +++++----- documentation/users-guide/AddingaClass.md | 4 ++-- documentation/users-guide/InputOutput.md | 12 ++++++------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/documentation/primer/macros/MySelector.h b/documentation/primer/macros/MySelector.h index cd962b6dcfae5..1381013035f2c 100644 --- a/documentation/primer/macros/MySelector.h +++ b/documentation/primer/macros/MySelector.h @@ -17,7 +17,7 @@ class MySelector : public TSelector { public : - TTree *fChain; //!pointer to the analyzed TTree or TChain + TTree *fChain; /// Date: Tue, 3 Mar 2026 13:44:40 +0100 Subject: [PATCH 3/4] [nfc] minor improvement --- documentation/users-guide/AddingaClass.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/documentation/users-guide/AddingaClass.md b/documentation/users-guide/AddingaClass.md index 2690b13fa3969..0a4d287d3d6e9 100644 --- a/documentation/users-guide/AddingaClass.md +++ b/documentation/users-guide/AddingaClass.md @@ -600,8 +600,8 @@ in this chapter. #include "TObject.h" class SClass : public TObject { private: - Float_t fX; //x position in centimeters - Float_t fY; //y position in centimeters + Float_t fX; /// Date: Tue, 3 Mar 2026 15:55:09 +0100 Subject: [PATCH 4/4] [gui][doc] restore some original comments --- documentation/users-guide/InputOutput.md | 3 ++- graf2d/cocoa/src/TGCocoa.mm | 2 +- gui/guihtml/src/TGHtml.cxx | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/documentation/users-guide/InputOutput.md b/documentation/users-guide/InputOutput.md index a3f1a87cb5f55..0bbb0b511e810 100644 --- a/documentation/users-guide/InputOutput.md +++ b/documentation/users-guide/InputOutput.md @@ -1234,10 +1234,11 @@ and its contents into the buffer `R__b`. The `Streamer `calls method reads the information from buffer `R__b` into the `Event` object. -### Transient Data Members (/// &text) Util::NSScopeGuard winGuard(fakeWindow); fakeView = fakeWindow.fContentView; - [fakeView setHidden : NO]; + [fakeView setHidden : NO];//! fPimpl->SetFakeGLWindow(fakeWindow);//Can throw. winGuard.Release(); diff --git a/gui/guihtml/src/TGHtml.cxx b/gui/guihtml/src/TGHtml.cxx index b17916499e278..2ce76e9751f49 100644 --- a/gui/guihtml/src/TGHtml.cxx +++ b/gui/guihtml/src/TGHtml.cxx @@ -1414,7 +1414,7 @@ Bool_t TGHtml::HandleButton(Event_t *event) uri = ResolveUri(uri); if (uri) { MouseDown(uri); - // delete[] uri; + //!!delete[] uri; } } fMenu->EndMenu(dummy); @@ -1450,7 +1450,7 @@ Bool_t TGHtml::HandleMotion(Event_t *event) fLastUri = uri; if (uri) uri = ResolveUri(uri); MouseOver(uri); - // if (uri) delete [] uri; + //!!if (uri) delete [] uri; } return kTRUE;