Skip to content

Commit a56ac8d

Browse files
committed
Address some minor TODOs after CINT to Cling migration
I also understand now that the `TGQuartz.h` header is actually needed by the ROOT plugin system.
1 parent c7b3720 commit a56ac8d

File tree

4 files changed

+7
-12
lines changed

4 files changed

+7
-12
lines changed

graf2d/cocoa/inc/TGCocoa.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -468,10 +468,10 @@ class TGCocoa : public TVirtualX {
468468
public:
469469
static Atom_t fgDeleteWindowAtom;
470470

471-
private:
472-
//TODO: use instead = delete syntax from C++0x11
473-
TGCocoa(const TGCocoa &rhs);
474-
TGCocoa &operator = (const TGCocoa &rhs);
471+
TGCocoa(const TGCocoa &rhs) = delete;
472+
TGCocoa &operator = (const TGCocoa &rhs) = delete;
473+
TGCocoa(TGCocoa &&rhs) = delete;
474+
TGCocoa &operator = (TGCocoa &&rhs) = delete;
475475

476476
ClassDefOverride(TGCocoa, 0); //TVirtualX for MacOS X.
477477
};

graf2d/cocoa/inc/TGQuartz.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ class TGQuartz : public TGCocoa {
9696
void AlignTTFString();
9797
Bool_t IsTTFStringVisible(Int_t x, Int_t y, UInt_t w, UInt_t h);
9898
void RenderTTFString(Int_t x, Int_t y, ETextMode mode);
99-
//TODO: move internal headers like TGQuartz.h out of the public ROOT user interface. Then we can also use XQuartz types like QuartzPixmap* instead of void * in functions like these
10099
void DrawFTGlyphIntoPixmap(void *pixmap, FT_Bitmap *source, ULong_t fore, ULong_t back, Int_t bx, Int_t by);
101100

102101
void SetAA();

io/io/inc/TMapFile.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,16 @@ friend class TMapRec;
7373

7474
static void *MapToAddress();
7575

76-
public:
77-
enum { kDefaultMapSize = 0x80000 }; // default size of mapped heap is 500 KB
78-
79-
// TODO: Should both be protected
8076
~TMapFile() override;
8177
void *operator new(size_t sz) { return TObject::operator new(sz); }
8278
void *operator new[](size_t sz) { return TObject::operator new[](sz); }
8379
void *operator new(size_t sz, void *vp) { return TObject::operator new(sz, vp); }
8480
void *operator new[](size_t sz, void *vp) { return TObject::operator new[](sz, vp); }
8581
void operator delete(void *vp);
8682

83+
public:
84+
enum { kDefaultMapSize = 0x80000 }; // default size of mapped heap is 500 KB
85+
8786
void Browse(TBrowser *b) override;
8887
void Close(Option_t *option = "") override;
8988
void *GetBaseAddr() const { return (void *)fBaseAddr; }

tmva/tmva/inc/TMVA/MethodCuts.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,6 @@ namespace TMVA {
7070
MethodCuts( DataSetInfo& theData,
7171
const TString& theWeightFile);
7272

73-
// TODO: remove this is a workaround which was necessary when CINT was not capable of handling dynamic casts
74-
static MethodCuts* DynamicCast( IMethod* method ) { return dynamic_cast<MethodCuts*>(method); }
75-
7673
virtual ~MethodCuts( void );
7774

7875
Bool_t HasAnalysisType( Types::EAnalysisType type, UInt_t numberClasses, UInt_t numberTargets ) override;

0 commit comments

Comments
 (0)