From 5f6984bd7fb42898dc330447f341c1346488bf1f Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Thu, 15 Jan 2009 14:05:12 +0000
Subject: [PATCH] From Axel: Replace all references to Text_t by char, still
keeping the definition in Rtypes.h
git-svn-id: http://root.cern.ch/svn/root/trunk@27157 27541ba8-7e3a-0410-8455-c3a389f83636
---
core/meta/src/TDataMember.cxx | 2 +-
graf2d/qt/inc/TGQt.h | 2 +-
graf3d/eve/inc/TEveBoxSet.h | 2 +-
graf3d/eve/inc/TEveCalo.h | 8 +++---
graf3d/eve/inc/TEveCompound.h | 2 +-
graf3d/eve/inc/TEveDigitSet.h | 2 +-
graf3d/eve/inc/TEveElement.h | 26 +++++++++----------
graf3d/eve/inc/TEveEventManager.h | 2 +-
graf3d/eve/inc/TEveGValuators.h | 2 +-
graf3d/eve/inc/TEveGeoNode.h | 10 +++----
graf3d/eve/inc/TEveGeoShapeExtract.h | 2 +-
graf3d/eve/inc/TEveLine.h | 2 +-
graf3d/eve/inc/TEveManager.h | 6 ++---
graf3d/eve/inc/TEveParamList.h | 2 +-
graf3d/eve/inc/TEvePointSet.h | 20 +++++++-------
graf3d/eve/inc/TEvePolygonSetProjected.h | 2 +-
graf3d/eve/inc/TEveQuadSet.h | 4 +--
graf3d/eve/inc/TEveScalableStraightLineSet.h | 2 +-
graf3d/eve/inc/TEveScene.h | 6 ++---
graf3d/eve/inc/TEveSelection.h | 2 +-
graf3d/eve/inc/TEveStraightLineSet.h | 2 +-
graf3d/eve/inc/TEveText.h | 6 ++---
graf3d/eve/inc/TEveTextEditor.h | 2 +-
graf3d/eve/inc/TEveTrack.h | 2 +-
graf3d/eve/inc/TEveTrackPropagator.h | 2 +-
graf3d/eve/inc/TEveTrans.h | 2 +-
graf3d/eve/inc/TEveTreeTools.h | 20 +++++++-------
graf3d/eve/inc/TEveUtil.h | 10 +++----
graf3d/eve/inc/TEveVSD.h | 6 ++---
graf3d/eve/inc/TEveViewer.h | 4 +--
graf3d/eve/inc/TEveWindow.h | 12 ++++-----
graf3d/eve/inc/TEveWindowManager.h | 2 +-
graf3d/eve/src/TEveBoxSet.cxx | 2 +-
graf3d/eve/src/TEveCalo.cxx | 8 +++---
graf3d/eve/src/TEveCompound.cxx | 2 +-
graf3d/eve/src/TEveDigitSet.cxx | 2 +-
graf3d/eve/src/TEveElement.cxx | 16 ++++++------
graf3d/eve/src/TEveEventManager.cxx | 2 +-
graf3d/eve/src/TEveGValuators.cxx | 2 +-
graf3d/eve/src/TEveGeoNode.cxx | 10 +++----
graf3d/eve/src/TEveGeoShapeExtract.cxx | 2 +-
graf3d/eve/src/TEveLine.cxx | 2 +-
graf3d/eve/src/TEveManager.cxx | 6 ++---
graf3d/eve/src/TEveParamList.cxx | 2 +-
graf3d/eve/src/TEvePointSet.cxx | 8 +++---
graf3d/eve/src/TEvePolygonSetProjected.cxx | 2 +-
graf3d/eve/src/TEveQuadSet.cxx | 4 +--
.../eve/src/TEveScalableStraightLineSet.cxx | 2 +-
graf3d/eve/src/TEveScene.cxx | 6 ++---
graf3d/eve/src/TEveSelection.cxx | 2 +-
graf3d/eve/src/TEveStraightLineSet.cxx | 2 +-
graf3d/eve/src/TEveText.cxx | 2 +-
graf3d/eve/src/TEveTextEditor.cxx | 2 +-
graf3d/eve/src/TEveTrack.cxx | 2 +-
graf3d/eve/src/TEveTrackPropagator.cxx | 2 +-
graf3d/eve/src/TEveTrans.cxx | 2 +-
graf3d/eve/src/TEveTreeTools.cxx | 8 +++---
graf3d/eve/src/TEveUtil.cxx | 10 +++----
graf3d/eve/src/TEveVSD.cxx | 4 +--
graf3d/eve/src/TEveViewer.cxx | 4 +--
graf3d/eve/src/TEveWindow.cxx | 12 ++++-----
graf3d/eve/src/TEveWindowManager.cxx | 2 +-
graf3d/g3d/inc/TXTRU.h | 2 +-
graf3d/g3d/src/TXTRU.cxx | 2 +-
graf3d/gl/inc/TGLFontManager.h | 8 +++---
graf3d/gl/inc/TGLLightSetEditor.h | 2 +-
graf3d/gl/inc/TGLRnrCtx.h | 2 +-
graf3d/gl/src/TGLFontManager.cxx | 2 +-
graf3d/gl/src/TGLLightSetEditor.cxx | 2 +-
graf3d/gl/src/TGLRnrCtx.cxx | 2 +-
gui/ged/inc/TGedEditor.h | 4 +--
gui/ged/inc/TGedFrame.h | 2 +-
gui/ged/src/TGedEditor.cxx | 4 +--
gui/ged/src/TGedFrame.cxx | 2 +-
gui/gui/src/TRootContextMenu.cxx | 18 ++++++-------
gui/qtgsi/src/TQCanvasMenu.cxx | 14 +++++-----
io/io/src/TBufferFile.cxx | 6 ++---
misc/table/inc/TChair.h | 4 +--
misc/table/inc/TDataSet.h | 4 +--
misc/table/inc/TGenericTable.h | 8 +++---
misc/table/inc/TIndexTable.h | 4 +--
misc/table/inc/TTable.h | 16 ++++++------
misc/table/inc/TTableDescriptor.h | 4 +--
misc/table/inc/TTableSorter.h | 8 +++---
misc/table/inc/TVolume.h | 8 +++---
misc/table/inc/TVolumePosition.h | 4 +--
misc/table/inc/TVolumeView.h | 2 +-
misc/table/inc/Ttypes.h | 4 +--
misc/table/src/TDataSet.cxx | 4 +--
misc/table/src/TGenericTable.cxx | 8 +++---
misc/table/src/TTable.cxx | 26 +++++++++----------
misc/table/src/TTableSorter.cxx | 6 ++---
misc/table/src/TVolume.cxx | 8 +++---
misc/table/src/TVolumePosition.cxx | 6 ++---
misc/table/src/TVolumeView.cxx | 4 +--
montecarlo/vmc/inc/TGeoMCGeometry.h | 4 +--
montecarlo/vmc/inc/TVirtualMC.h | 6 ++---
montecarlo/vmc/inc/TVirtualMCGeometry.h | 4 +--
montecarlo/vmc/src/TGeoMCGeometry.cxx | 4 +--
roofit/roofitcore/inc/RooAbsArg.h | 12 ++++-----
roofit/roofitcore/inc/RooAbsCollection.h | 2 +-
roofit/roofitcore/inc/RooAbsReal.h | 2 +-
roofit/roofitcore/inc/RooCatType.h | 4 +--
roofit/roofitcore/src/RooAbsArg.cxx | 12 ++++-----
roofit/roofitcore/src/RooAbsCategory.cxx | 4 +--
roofit/roofitcore/src/RooAbsCollection.cxx | 2 +-
roofit/roofitcore/src/RooAbsReal.cxx | 2 +-
roofit/roofitcore/src/RooAbsString.cxx | 2 +-
roofit/roofitcore/src/RooCatType.cxx | 2 +-
roofit/roofitcore/src/RooRealVar.cxx | 6 ++---
test/RootShower/GTitleFrame.cxx | 4 +--
test/RootShower/GTitleFrame.h | 2 +-
test/RootShower/RootShower.cxx | 2 +-
test/RootShower/RootShower.h | 2 +-
test/Tetris.cxx | 2 +-
test/Tetris.h | 4 +--
test/tcollbm.cxx | 4 +--
tree/tree/src/TBufferSQL.cxx | 4 +--
118 files changed, 300 insertions(+), 300 deletions(-)
diff --git a/core/meta/src/TDataMember.cxx b/core/meta/src/TDataMember.cxx
index b735585d736..692af957bfe 100644
--- a/core/meta/src/TDataMember.cxx
+++ b/core/meta/src/TDataMember.cxx
@@ -153,7 +153,7 @@
//End_Html
//
// One can sepcify values as Integers or Enums - when data field is an
-// Integer, Float or Enum type; as texts - for Text_t (more precisely:
+// Integer, Float or Enum type; as texts - for char (more precisely:
// Option_t).
//
// As mentioned above - this information are mainly used by contextmenu,
diff --git a/graf2d/qt/inc/TGQt.h b/graf2d/qt/inc/TGQt.h
index df628bcfc01..eba3c7b8ec7 100644
--- a/graf2d/qt/inc/TGQt.h
+++ b/graf2d/qt/inc/TGQt.h
@@ -194,7 +194,7 @@ public:
TGQt();
TGQt(const TGQt &vx): TVirtualX(vx) { MayNotUse("TGQt(const TGQt &)"); } // without dict does not compile? (rdm)
- TGQt(const Text_t *name, const Text_t *title);
+ TGQt(const char *name, const char *title);
virtual ~TGQt();
// Include the base TVirtualX class interface
#include "TVirtualX.interface.h"
diff --git a/graf3d/eve/inc/TEveBoxSet.h b/graf3d/eve/inc/TEveBoxSet.h
index 3674b2fd39a..5b6f269e3f9 100644
--- a/graf3d/eve/inc/TEveBoxSet.h
+++ b/graf3d/eve/inc/TEveBoxSet.h
@@ -62,7 +62,7 @@ protected:
static Int_t SizeofAtom(EBoxType_e bt);
public:
- TEveBoxSet(const Text_t* n="TEveBoxSet", const Text_t* t="");
+ TEveBoxSet(const char* n="TEveBoxSet", const char* t="");
virtual ~TEveBoxSet() {}
void Reset(EBoxType_e boxType, Bool_t valIsCol, Int_t chunkSize);
diff --git a/graf3d/eve/inc/TEveCalo.h b/graf3d/eve/inc/TEveCalo.h
index 84d8f7bf8f1..e2ff67bd49a 100644
--- a/graf3d/eve/inc/TEveCalo.h
+++ b/graf3d/eve/inc/TEveCalo.h
@@ -67,7 +67,7 @@ protected:
virtual void BuildCellIdCache() = 0;
public:
- TEveCaloViz(TEveCaloData* data=0, const Text_t* n="TEveCaloViz", const Text_t* t="");
+ TEveCaloViz(TEveCaloData* data=0, const char* n="TEveCaloViz", const char* t="");
virtual ~TEveCaloViz();
@@ -157,7 +157,7 @@ protected:
virtual void BuildCellIdCache();
public:
- TEveCalo3D(TEveCaloData* d=0, const Text_t* n="TEveCalo3D", const Text_t* t="xx");
+ TEveCalo3D(TEveCaloData* d=0, const char* n="TEveCalo3D", const char* t="xx");
virtual ~TEveCalo3D() {}
virtual void ComputeBBox();
@@ -190,7 +190,7 @@ protected:
virtual void BuildCellIdCache();
public:
- TEveCalo2D(const Text_t* n="TEveCalo2D", const Text_t* t="");
+ TEveCalo2D(const char* n="TEveCalo2D", const char* t="");
virtual ~TEveCalo2D(){}
virtual void SetProjection(TEveProjectionManager* proj, TEveProjectable* model);
@@ -246,7 +246,7 @@ protected:
virtual void BuildCellIdCache();
public:
- TEveCaloLego(TEveCaloData* data=0, const Text_t* n="TEveCaloLego", const Text_t* t="");
+ TEveCaloLego(TEveCaloData* data=0, const char* n="TEveCaloLego", const char* t="");
virtual ~TEveCaloLego(){}
diff --git a/graf3d/eve/inc/TEveCompound.h b/graf3d/eve/inc/TEveCompound.h
index c104cc52204..a51510e6c20 100644
--- a/graf3d/eve/inc/TEveCompound.h
+++ b/graf3d/eve/inc/TEveCompound.h
@@ -31,7 +31,7 @@ protected:
Short_t fCompoundOpen; // If more than zero, tag new children as compound members.
public:
- TEveCompound(const Text_t* n="TEveCompound", const Text_t* t="",
+ TEveCompound(const char* n="TEveCompound", const char* t="",
Bool_t doColor=kTRUE);
virtual ~TEveCompound() {}
diff --git a/graf3d/eve/inc/TEveDigitSet.h b/graf3d/eve/inc/TEveDigitSet.h
index 06f313afb8b..ad31cdbef40 100644
--- a/graf3d/eve/inc/TEveDigitSet.h
+++ b/graf3d/eve/inc/TEveDigitSet.h
@@ -71,7 +71,7 @@ protected:
void ReleaseIds();
public:
- TEveDigitSet(const Text_t* n="TEveDigitSet", const Text_t* t="");
+ TEveDigitSet(const char* n="TEveDigitSet", const char* t="");
virtual ~TEveDigitSet();
virtual Bool_t CanEditMainColor() const { return kTRUE; }
diff --git a/graf3d/eve/inc/TEveElement.h b/graf3d/eve/inc/TEveElement.h
index 131a58b01ac..8fb834e5657 100644
--- a/graf3d/eve/inc/TEveElement.h
+++ b/graf3d/eve/inc/TEveElement.h
@@ -111,11 +111,11 @@ public:
virtual TEveElement* CloneElementRecurse(Int_t level=0) const;
virtual void CloneChildrenRecurse(TEveElement* dest, Int_t level=0) const;
- virtual const Text_t* GetElementName() const;
- virtual const Text_t* GetElementTitle() const;
- virtual void SetElementName (const Text_t* name);
- virtual void SetElementTitle(const Text_t* title);
- virtual void SetElementNameTitle(const Text_t* name, const Text_t* title);
+ virtual const char* GetElementName() const;
+ virtual const char* GetElementTitle() const;
+ virtual void SetElementName (const char* name);
+ virtual void SetElementTitle(const char* title);
+ virtual void SetElementNameTitle(const char* name, const char* title);
virtual void NameTitleChanged();
const TString& GetVizTag() const { return fVizTag; }
@@ -212,7 +212,7 @@ public:
virtual Int_t GetNItems() const { return fItems.size(); }
void SpawnEditor(); // *MENU*
- virtual void ExportToCINT(Text_t* var_name); // *MENU*
+ virtual void ExportToCINT(char* var_name); // *MENU*
virtual Bool_t AcceptElement(TEveElement* el);
@@ -377,7 +377,7 @@ public:
virtual TEveElementObjectPtr* CloneElement() const { return new TEveElementObjectPtr(*this); }
virtual TObject* GetObject(const TEveException& eh="TEveElementObjectPtr::GetObject ") const;
- virtual void ExportToCINT(Text_t* var_name);
+ virtual void ExportToCINT(char* var_name);
Bool_t GetOwnObject() const { return fOwnObject; }
void SetOwnObject(Bool_t o) { fOwnObject = o; }
@@ -402,23 +402,23 @@ protected:
TClass *fChildClass; // Class of acceptable children, others are rejected.
public:
- TEveElementList(const Text_t* n="TEveElementList", const Text_t* t="",
+ TEveElementList(const char* n="TEveElementList", const char* t="",
Bool_t doColor=kFALSE);
TEveElementList(const TEveElementList& e);
virtual ~TEveElementList() {}
virtual TEveElementList* CloneElement() const { return new TEveElementList(*this); }
- virtual const Text_t* GetElementName() const { return GetName(); }
- virtual const Text_t* GetElementTitle() const { return GetTitle(); }
+ virtual const char* GetElementName() const { return GetName(); }
+ virtual const char* GetElementTitle() const { return GetTitle(); }
- virtual void SetElementName (const Text_t* name)
+ virtual void SetElementName (const char* name)
{ TNamed::SetName(name); NameTitleChanged(); }
- virtual void SetElementTitle(const Text_t* title)
+ virtual void SetElementTitle(const char* title)
{ TNamed::SetTitle(title); NameTitleChanged(); }
- virtual void SetElementNameTitle(const Text_t* name, const Text_t* title)
+ virtual void SetElementNameTitle(const char* name, const char* title)
{ TNamed::SetNameTitle(name, title); NameTitleChanged(); }
virtual Bool_t CanEditMainColor() const { return fDoColor; }
diff --git a/graf3d/eve/inc/TEveEventManager.h b/graf3d/eve/inc/TEveEventManager.h
index 9587cf13f0d..e2aeee296ce 100644
--- a/graf3d/eve/inc/TEveEventManager.h
+++ b/graf3d/eve/inc/TEveEventManager.h
@@ -22,7 +22,7 @@ protected:
std::vector<TString> fNewEventCommands;
public:
- TEveEventManager(const Text_t* n="TEveEventManager", const Text_t* t="");
+ TEveEventManager(const char* n="TEveEventManager", const char* t="");
virtual ~TEveEventManager() {}
std::vector<TString>& GetNewEventCommands() { return fNewEventCommands; }
diff --git a/graf3d/eve/inc/TEveGValuators.h b/graf3d/eve/inc/TEveGValuators.h
index 55a18b308a3..8510d41a8b1 100644
--- a/graf3d/eve/inc/TEveGValuators.h
+++ b/graf3d/eve/inc/TEveGValuators.h
@@ -96,7 +96,7 @@ public:
void SetLimits(Float_t min, Float_t max, Int_t npos,
TGNumberFormat::EStyle nef=TGNumberFormat::kNESRealTwo);
- void SetToolTip(const Text_t* tip);
+ void SetToolTip(const char* tip);
void SetEnabled(Bool_t state);
ClassDef(TEveGValuator, 0); // Composite GUI element for single value selection (supports label, number-entry and slider).
diff --git a/graf3d/eve/inc/TEveGeoNode.h b/graf3d/eve/inc/TEveGeoNode.h
index 75dff1bdd80..0dddf67b15a 100644
--- a/graf3d/eve/inc/TEveGeoNode.h
+++ b/graf3d/eve/inc/TEveGeoNode.h
@@ -41,10 +41,10 @@ protected:
public:
TEveGeoNode(TGeoNode* node);
- virtual const Text_t* GetName() const;
- virtual const Text_t* GetTitle() const;
- virtual const Text_t* GetElementName() const;
- virtual const Text_t* GetElementTitle() const;
+ virtual const char* GetName() const;
+ virtual const char* GetTitle() const;
+ virtual const char* GetElementName() const;
+ virtual const char* GetElementTitle() const;
TGeoNode* GetNode() const { return fNode; }
@@ -138,7 +138,7 @@ protected:
TEveGeoShapeExtract* DumpShapeTree(TEveGeoShape* geon, TEveGeoShapeExtract* parent = 0);
public:
- TEveGeoShape(const Text_t* name="TEveGeoShape", const Text_t* title=0);
+ TEveGeoShape(const char* name="TEveGeoShape", const char* title=0);
virtual ~TEveGeoShape();
virtual Bool_t CanEditMainColor() const { return kTRUE; }
diff --git a/graf3d/eve/inc/TEveGeoShapeExtract.h b/graf3d/eve/inc/TEveGeoShapeExtract.h
index 3ba85fe9534..12385760a4d 100644
--- a/graf3d/eve/inc/TEveGeoShapeExtract.h
+++ b/graf3d/eve/inc/TEveGeoShapeExtract.h
@@ -31,7 +31,7 @@ protected:
TList* fElements; // Children elements.
public:
- TEveGeoShapeExtract(const Text_t* n="TEveGeoShapeExtract", const Text_t* t=0);
+ TEveGeoShapeExtract(const char* n="TEveGeoShapeExtract", const char* t=0);
~TEveGeoShapeExtract();
Bool_t HasElements();
diff --git a/graf3d/eve/inc/TEveLine.h b/graf3d/eve/inc/TEveLine.h
index f7b63d7ee85..1fb1a5e98ab 100644
--- a/graf3d/eve/inc/TEveLine.h
+++ b/graf3d/eve/inc/TEveLine.h
@@ -40,7 +40,7 @@ protected:
public:
TEveLine(Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
- TEveLine(const Text_t* name, Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
+ TEveLine(const char* name, Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
virtual ~TEveLine() {}
virtual void SetLineColor(Color_t col) { SetMainColor(col); }
diff --git a/graf3d/eve/inc/TEveManager.h b/graf3d/eve/inc/TEveManager.h
index 5d9a4b2e0b9..0d4b6045aad 100644
--- a/graf3d/eve/inc/TEveManager.h
+++ b/graf3d/eve/inc/TEveManager.h
@@ -154,11 +154,11 @@ public:
TGWindow* GetMainWindow() const;
TEveViewer* GetDefaultViewer() const;
TGLViewer* GetDefaultGLViewer() const;
- TEveViewer* SpawnNewViewer(const Text_t* name, const Text_t* title="", Bool_t embed=kTRUE);
- TEveScene* SpawnNewScene(const Text_t* name, const Text_t* title="");
+ TEveViewer* SpawnNewViewer(const char* name, const char* title="", Bool_t embed=kTRUE);
+ TEveScene* SpawnNewScene(const char* name, const char* title="");
TFolder* GetMacroFolder() const { return fMacroFolder; }
- TMacro* GetMacro(const Text_t* name) const;
+ TMacro* GetMacro(const char* name) const;
void EditElement(TEveElement* element);
diff --git a/graf3d/eve/inc/TEveParamList.h b/graf3d/eve/inc/TEveParamList.h
index 9ceb7aaba7f..18643b9dbdc 100644
--- a/graf3d/eve/inc/TEveParamList.h
+++ b/graf3d/eve/inc/TEveParamList.h
@@ -79,7 +79,7 @@ protected:
BoolConfigVec_t fBoolParameters;
public:
- TEveParamList(const Text_t* n="TEveParamList", const Text_t* t="", Bool_t doColor=kFALSE);
+ TEveParamList(const char* n="TEveParamList", const char* t="", Bool_t doColor=kFALSE);
virtual ~TEveParamList() {}
void AddParameter(const FloatConfig_t& parameter) { fFloatParameters.push_back(parameter); }
diff --git a/graf3d/eve/inc/TEvePointSet.h b/graf3d/eve/inc/TEvePointSet.h
index 47d4f180b81..81322e559db 100644
--- a/graf3d/eve/inc/TEvePointSet.h
+++ b/graf3d/eve/inc/TEvePointSet.h
@@ -49,7 +49,7 @@ protected:
public:
TEvePointSet(Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
- TEvePointSet(const Text_t* name, Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
+ TEvePointSet(const char* name, Int_t n_points=0, ETreeVarType_e tv_type=kTVT_XYZ);
TEvePointSet(const TEvePointSet& e);
virtual ~TEvePointSet();
@@ -60,13 +60,13 @@ public:
void Reset(Int_t n_points=0, Int_t n_int_ids=0);
Int_t GrowFor(Int_t n_points);
- virtual const Text_t* GetTitle() const { return fTitle; }
- virtual const Text_t* GetElementName() const { return TPointSet3D::GetName(); }
- virtual const Text_t* GetElementTitle() const { return fTitle; }
- virtual void SetElementName (const Text_t* n) { fName = n; NameTitleChanged(); }
- virtual void SetTitle(const Text_t* t) { fTitle = t; NameTitleChanged(); }
- virtual void SetElementTitle(const Text_t* t) { fTitle = t; NameTitleChanged(); }
- virtual void SetElementNameTitle(const Text_t* n, const Text_t* t)
+ virtual const char* GetTitle() const { return fTitle; }
+ virtual const char* GetElementName() const { return TPointSet3D::GetName(); }
+ virtual const char* GetElementTitle() const { return fTitle; }
+ virtual void SetElementName (const char* n) { fName = n; NameTitleChanged(); }
+ virtual void SetTitle(const char* t) { fTitle = t; NameTitleChanged(); }
+ virtual void SetElementTitle(const char* t) { fTitle = t; NameTitleChanged(); }
+ virtual void SetElementNameTitle(const char* n, const char* t)
{ fName = n; fTitle = t; NameTitleChanged(); }
Int_t GetIntIdsPerPoint() const { return fIntIdsPerPoint; }
@@ -121,7 +121,7 @@ protected:
TString fQuantName; // Name of the separating quantity.
public:
- TEvePointSetArray(const Text_t* name="TEvePointSetArray", const Text_t* title="");
+ TEvePointSetArray(const char* name="TEvePointSetArray", const char* title="");
virtual ~TEvePointSetArray();
virtual void RemoveElementLocal(TEveElement* el);
@@ -135,7 +135,7 @@ public:
virtual Int_t Size(Bool_t under=kFALSE, Bool_t over=kFALSE) const;
- void InitBins(const Text_t* quant_name, Int_t nbins, Double_t min, Double_t max);
+ void InitBins(const char* quant_name, Int_t nbins, Double_t min, Double_t max);
Bool_t Fill(Double_t x, Double_t y, Double_t z, Double_t quant);
void SetPointId(TObject* id);
void CloseBins();
diff --git a/graf3d/eve/inc/TEvePolygonSetProjected.h b/graf3d/eve/inc/TEvePolygonSetProjected.h
index 538ab2fa4ad..af005efc1a2 100644
--- a/graf3d/eve/inc/TEvePolygonSetProjected.h
+++ b/graf3d/eve/inc/TEvePolygonSetProjected.h
@@ -85,7 +85,7 @@ protected:
Float_t fLineWidth; // outline width of polygons
public:
- TEvePolygonSetProjected(const Text_t* n="TEvePolygonSetProjected", const Text_t* t="");
+ TEvePolygonSetProjected(const char* n="TEvePolygonSetProjected", const char* t="");
virtual ~TEvePolygonSetProjected();
virtual void SetProjection(TEveProjectionManager* mng, TEveProjectable* model);
diff --git a/graf3d/eve/inc/TEveQuadSet.h b/graf3d/eve/inc/TEveQuadSet.h
index 57cd5b4b092..527cc852882 100644
--- a/graf3d/eve/inc/TEveQuadSet.h
+++ b/graf3d/eve/inc/TEveQuadSet.h
@@ -86,9 +86,9 @@ protected:
static Int_t SizeofAtom(EQuadType_e qt);
public:
- TEveQuadSet(const Text_t* n="TEveQuadSet", const Text_t* t="");
+ TEveQuadSet(const char* n="TEveQuadSet", const char* t="");
TEveQuadSet(EQuadType_e quadType, Bool_t valIsCol, Int_t chunkSize,
- const Text_t* n="TEveQuadSet", const Text_t* t="");
+ const char* n="TEveQuadSet", const char* t="");
virtual ~TEveQuadSet() {}
void Reset(EQuadType_e quadType, Bool_t valIsCol, Int_t chunkSize);
diff --git a/graf3d/eve/inc/TEveScalableStraightLineSet.h b/graf3d/eve/inc/TEveScalableStraightLineSet.h
index 15c2aeb0bb3..0ac1097f83d 100644
--- a/graf3d/eve/inc/TEveScalableStraightLineSet.h
+++ b/graf3d/eve/inc/TEveScalableStraightLineSet.h
@@ -25,7 +25,7 @@ protected:
Float_t fScaleCenter[3];
public:
- TEveScalableStraightLineSet(const Text_t* n="ScalableStraightLineSet", const Text_t* t="");
+ TEveScalableStraightLineSet(const char* n="ScalableStraightLineSet", const char* t="");
virtual ~TEveScalableStraightLineSet() {}
void SetScaleCenter(Float_t x, Float_t y, Float_t z);
diff --git a/graf3d/eve/inc/TEveScene.h b/graf3d/eve/inc/TEveScene.h
index 7e14d74e9f3..6ad6d5b1b14 100644
--- a/graf3d/eve/inc/TEveScene.h
+++ b/graf3d/eve/inc/TEveScene.h
@@ -36,7 +36,7 @@ protected:
Bool_t fSmartRefresh;
public:
- TEveScene(const Text_t* n="TEveScene", const Text_t* t="");
+ TEveScene(const char* n="TEveScene", const char* t="");
virtual ~TEveScene();
virtual void CollectSceneParents(List_t& scenes);
@@ -48,7 +48,7 @@ public:
TGLScenePad* GetGLScene() const { return fGLScene; }
void SetGLScene(TGLScenePad* s) { fGLScene = s; }
- virtual void SetName(const Text_t* n);
+ virtual void SetName(const char* n);
virtual void Paint(Option_t* option = "");
void DestroyElementRenderers(TEveElement* element);
@@ -73,7 +73,7 @@ private:
protected:
public:
- TEveSceneList(const Text_t* n="TEveSceneList", const Text_t* t="");
+ TEveSceneList(const char* n="TEveSceneList", const char* t="");
virtual ~TEveSceneList() {}
void DestroyScenes();
diff --git a/graf3d/eve/inc/TEveSelection.h b/graf3d/eve/inc/TEveSelection.h
index 5a13375715f..1032833a1f3 100644
--- a/graf3d/eve/inc/TEveSelection.h
+++ b/graf3d/eve/inc/TEveSelection.h
@@ -54,7 +54,7 @@ protected:
void DoElementUnselect(SelMap_i entry);
public:
- TEveSelection(const Text_t* n="TEveSelection", const Text_t* t="");
+ TEveSelection(const char* n="TEveSelection", const char* t="");
virtual ~TEveSelection() {}
void SetHighlightMode();
diff --git a/graf3d/eve/inc/TEveStraightLineSet.h b/graf3d/eve/inc/TEveStraightLineSet.h
index cbd18b6694f..1c5953732cc 100644
--- a/graf3d/eve/inc/TEveStraightLineSet.h
+++ b/graf3d/eve/inc/TEveStraightLineSet.h
@@ -80,7 +80,7 @@ protected:
Line_t* fLastLine; //!
public:
- TEveStraightLineSet(const Text_t* n="StraightLineSet", const Text_t* t="");
+ TEveStraightLineSet(const char* n="StraightLineSet", const char* t="");
virtual ~TEveStraightLineSet() {}
virtual void SetLineColor(Color_t col) { SetMainColor(col); }
diff --git a/graf3d/eve/inc/TEveText.h b/graf3d/eve/inc/TEveText.h
index 87d768baff3..7b7b7ba38d2 100644
--- a/graf3d/eve/inc/TEveText.h
+++ b/graf3d/eve/inc/TEveText.h
@@ -42,7 +42,7 @@ protected:
public:
- TEveText(const Text_t* txt="");
+ TEveText(const char* txt="");
virtual ~TEveText() {}
Int_t GetFontSize() const { return fFontSize; }
@@ -53,8 +53,8 @@ public:
void SetFontFile(const char* name);
void SetFontMode(Int_t mode);
- const Text_t* GetText() const { return fText.Data(); }
- void SetText(const Text_t* t) { fText = t; }
+ const char* GetText() const { return fText.Data(); }
+ void SetText(const char* t) { fText = t; }
Bool_t GetLighting() const { return fLighting; }
void SetLighting(Bool_t isOn) { fLighting = isOn; }
diff --git a/graf3d/eve/inc/TEveTextEditor.h b/graf3d/eve/inc/TEveTextEditor.h
index 087e58c7994..a482d8e688b 100644
--- a/graf3d/eve/inc/TEveTextEditor.h
+++ b/graf3d/eve/inc/TEveTextEditor.h
@@ -48,7 +48,7 @@ public:
virtual void SetModel(TObject* obj);
- void DoText(const Text_t*);
+ void DoText(const char*);
void DoFontSize();
void DoFontFile();
diff --git a/graf3d/eve/inc/TEveTrack.h b/graf3d/eve/inc/TEveTrack.h
index acde6d034a5..e8b6f8f0d9c 100644
--- a/graf3d/eve/inc/TEveTrack.h
+++ b/graf3d/eve/inc/TEveTrack.h
@@ -164,7 +164,7 @@ protected:
public:
TEveTrackList(TEveTrackPropagator* rs=0);
- TEveTrackList(const Text_t* name, TEveTrackPropagator* rs=0);
+ TEveTrackList(const char* name, TEveTrackPropagator* rs=0);
virtual ~TEveTrackList();
void MakeTracks(Bool_t recurse=kTRUE);
diff --git a/graf3d/eve/inc/TEveTrackPropagator.h b/graf3d/eve/inc/TEveTrackPropagator.h
index e2ffcab7fb4..10d5131c91e 100644
--- a/graf3d/eve/inc/TEveTrackPropagator.h
+++ b/graf3d/eve/inc/TEveTrackPropagator.h
@@ -204,7 +204,7 @@ protected:
Bool_t PointOverVertex(const TEveVector4& v0, const TEveVector4& v);
public:
- TEveTrackPropagator(const Text_t* n="TEveTrackPropagator", const Text_t* t="",
+ TEveTrackPropagator(const char* n="TEveTrackPropagator", const char* t="",
TEveMagField* field=0);
virtual ~TEveTrackPropagator();
diff --git a/graf3d/eve/inc/TEveTrans.h b/graf3d/eve/inc/TEveTrans.h
index 86c3b50e096..66f1ff50d32 100644
--- a/graf3d/eve/inc/TEveTrans.h
+++ b/graf3d/eve/inc/TEveTrans.h
@@ -127,7 +127,7 @@ public:
// Cardan angle interface
void SetRotByAngles(Float_t a1, Float_t a2, Float_t a3);
- void SetRotByAnyAngles(Float_t a1, Float_t a2, Float_t a3, const Text_t* pat);
+ void SetRotByAnyAngles(Float_t a1, Float_t a2, Float_t a3, const char* pat);
void GetRotAngles(Float_t* x) const;
// Scaling
diff --git a/graf3d/eve/inc/TEveTreeTools.h b/graf3d/eve/inc/TEveTreeTools.h
index f6eca5bc211..c6e330cb1c1 100644
--- a/graf3d/eve/inc/TEveTreeTools.h
+++ b/graf3d/eve/inc/TEveTreeTools.h
@@ -28,7 +28,7 @@ protected:
TEventList* fEvList;
TList fInput;
public:
- TEveSelectorToEventList(TEventList* evl, const Text_t* sel);
+ TEveSelectorToEventList(TEventList* evl, const char* sel);
virtual Int_t Version() const { return 1; }
virtual Bool_t Process(Long64_t entry);
@@ -82,11 +82,11 @@ protected:
public:
TEvePointSelector(TTree* t=0, TEvePointSelectorConsumer* c=0,
- const Text_t* vexp="", const Text_t* sel="");
+ const char* vexp="", const char* sel="");
virtual ~TEvePointSelector() {}
- virtual Long64_t Select(const Text_t* selection=0);
- virtual Long64_t Select(TTree* t, const Text_t* selection=0);
+ virtual Long64_t Select(const char* selection=0);
+ virtual Long64_t Select(TTree* t, const char* selection=0);
virtual void TakeAction();
@@ -96,14 +96,14 @@ public:
TEvePointSelectorConsumer* GetConsumer() const { return fConsumer; }
void SetConsumer(TEvePointSelectorConsumer* c) { fConsumer = c; }
- const Text_t* GetVarexp() const { return fVarexp; }
- void SetVarexp(const Text_t* v) { fVarexp = v; }
+ const char* GetVarexp() const { return fVarexp; }
+ void SetVarexp(const char* v) { fVarexp = v; }
- const Text_t* GetSelection() const { return fSelection; }
- void SetSelection(const Text_t* s) { fSelection = s; }
+ const char* GetSelection() const { return fSelection; }
+ void SetSelection(const char* s) { fSelection = s; }
- const Text_t* GetSubIdExp() const { return fSubIdExp; }
- void SetSubIdExp(const Text_t* s) { fSubIdExp = s; }
+ const char* GetSubIdExp() const { return fSubIdExp; }
+ void SetSubIdExp(const char* s) { fSubIdExp = s; }
Int_t GetSubIdNum() const { return fSubIdNum; }
diff --git a/graf3d/eve/inc/TEveUtil.h b/graf3d/eve/inc/TEveUtil.h
index b7e646b3c64..1a75b0d00b2 100644
--- a/graf3d/eve/inc/TEveUtil.h
+++ b/graf3d/eve/inc/TEveUtil.h
@@ -44,10 +44,10 @@ public:
static void SetupEnvironment();
static void SetupGUI();
- static Bool_t CheckMacro(const Text_t* mac);
- static void AssertMacro(const Text_t* mac);
- static void Macro(const Text_t* mac);
- static void LoadMacro(const Text_t* mac);
+ static Bool_t CheckMacro(const char* mac);
+ static void AssertMacro(const char* mac);
+ static void Macro(const char* mac);
+ static void LoadMacro(const char* mac);
// Color management
@@ -55,7 +55,7 @@ public:
static void ColorFromIdx(Color_t ci, UChar_t col[4], UChar_t transparency);
static void ColorFromIdx(Float_t f1, Color_t c1, Float_t f2, Color_t c2,
UChar_t col[4], Bool_t alpha=kTRUE);
- static Color_t* FindColorVar(TObject* obj, const Text_t* varname);
+ static Color_t* FindColorVar(TObject* obj, const char* varname);
static void SetColorBrightness(Float_t value, Bool_t full_redraw=kFALSE);
diff --git a/graf3d/eve/inc/TEveVSD.h b/graf3d/eve/inc/TEveVSD.h
index 34d2a048cbe..a0d44f714d0 100644
--- a/graf3d/eve/inc/TEveVSD.h
+++ b/graf3d/eve/inc/TEveVSD.h
@@ -47,7 +47,7 @@ public:
TEveMCRecCrossRef fGI, *fpGI; //!
public:
- TEveVSD(const Text_t* name="TEveVSD", const Text_t* title="");
+ TEveVSD(const char* name="TEveVSD", const char* title="");
virtual void SetDirectory(TDirectory* dir);
@@ -60,8 +60,8 @@ public:
virtual void WriteTrees();
virtual void LoadTrees();
- virtual void LoadVSD(const Text_t* vsd_file_name,
- const Text_t* dir_name="Event0");
+ virtual void LoadVSD(const char* vsd_file_name,
+ const char* dir_name="Event0");
static void DisableTObjectStreamersForVSDStruct();
diff --git a/graf3d/eve/inc/TEveViewer.h b/graf3d/eve/inc/TEveViewer.h
index ff01b74b769..c1dd1fc3653 100644
--- a/graf3d/eve/inc/TEveViewer.h
+++ b/graf3d/eve/inc/TEveViewer.h
@@ -37,7 +37,7 @@ protected:
TGFrame *fGLViewerFrame;
public:
- TEveViewer(const Text_t* n="TEveViewer", const Text_t* t="");
+ TEveViewer(const char* n="TEveViewer", const char* t="");
virtual ~TEveViewer();
virtual void PreUndock();
@@ -78,7 +78,7 @@ protected:
Bool_t fShowTooltip;
public:
- TEveViewerList(const Text_t* n="TEveViewerList", const Text_t* t="");
+ TEveViewerList(const char* n="TEveViewerList", const char* t="");
virtual ~TEveViewerList() {}
virtual void AddElement(TEveElement* el);
diff --git a/graf3d/eve/inc/TEveWindow.h b/graf3d/eve/inc/TEveWindow.h
index 02650c27351..3ba46dc4e53 100644
--- a/graf3d/eve/inc/TEveWindow.h
+++ b/graf3d/eve/inc/TEveWindow.h
@@ -215,7 +215,7 @@ protected:
virtual void PreDeleteElement();
public:
- TEveWindow(const Text_t* n="TEveWindow", const Text_t* t="");
+ TEveWindow(const char* n="TEveWindow", const char* t="");
virtual ~TEveWindow();
virtual void NameTitleChanged();
@@ -297,7 +297,7 @@ protected:
virtual void SetCurrent(Bool_t curr);
public:
- TEveWindowSlot(const Text_t* n="TEveWindowSlot", const Text_t* t="");
+ TEveWindowSlot(const char* n="TEveWindowSlot", const char* t="");
virtual ~TEveWindowSlot();
virtual TGFrame* GetGUIFrame();
@@ -308,7 +308,7 @@ public:
TEveWindowFrame* MakeFrame(TGFrame* frame=0);
TGCompositeFrame* StartEmbedding();
- TEveWindowFrame* StopEmbedding(const Text_t* name=0);
+ TEveWindowFrame* StopEmbedding(const char* name=0);
ClassDef(TEveWindowSlot, 0); // An unoccupied eve-window slot.
};
@@ -328,7 +328,7 @@ protected:
TGFrame *fGUIFrame;
public:
- TEveWindowFrame(TGFrame* frame, const Text_t* n="TEveWindowFrame", const Text_t* t="");
+ TEveWindowFrame(TGFrame* frame, const char* n="TEveWindowFrame", const char* t="");
virtual ~TEveWindowFrame();
virtual TGFrame* GetGUIFrame() { return fGUIFrame; }
@@ -353,7 +353,7 @@ protected:
TGPack *fPack;
public:
- TEveWindowPack(TGPack* p, const Text_t* n="TEveWindowPack", const Text_t* t="");
+ TEveWindowPack(TGPack* p, const char* n="TEveWindowPack", const char* t="");
virtual ~TEveWindowPack();
virtual TGFrame* GetGUIFrame();
@@ -387,7 +387,7 @@ protected:
TGTab *fTab;
public:
- TEveWindowTab(TGTab* tab, const Text_t* n="TEveWindowTab", const Text_t* t="");
+ TEveWindowTab(TGTab* tab, const char* n="TEveWindowTab", const char* t="");
virtual ~TEveWindowTab();
virtual TGFrame* GetGUIFrame();
diff --git a/graf3d/eve/inc/TEveWindowManager.h b/graf3d/eve/inc/TEveWindowManager.h
index f2f03fa83e0..5d69e38c4e3 100644
--- a/graf3d/eve/inc/TEveWindowManager.h
+++ b/graf3d/eve/inc/TEveWindowManager.h
@@ -32,7 +32,7 @@ protected:
void DestroyWindowRecursively(TEveWindow* window);
public:
- TEveWindowManager(const Text_t* n="TEveWindowManager", const Text_t* t="");
+ TEveWindowManager(const char* n="TEveWindowManager", const char* t="");
virtual ~TEveWindowManager();
void SelectWindow(TEveWindow* w);
diff --git a/graf3d/eve/src/TEveBoxSet.cxx b/graf3d/eve/src/TEveBoxSet.cxx
index 17511607051..2137752b237 100644
--- a/graf3d/eve/src/TEveBoxSet.cxx
+++ b/graf3d/eve/src/TEveBoxSet.cxx
@@ -47,7 +47,7 @@
ClassImp(TEveBoxSet);
//______________________________________________________________________________
-TEveBoxSet::TEveBoxSet(const Text_t* n, const Text_t* t) :
+TEveBoxSet::TEveBoxSet(const char* n, const char* t) :
TEveDigitSet (n, t),
fBoxType (kBT_Undef),
diff --git a/graf3d/eve/src/TEveCalo.cxx b/graf3d/eve/src/TEveCalo.cxx
index eb3cab186c8..bd69b794352 100644
--- a/graf3d/eve/src/TEveCalo.cxx
+++ b/graf3d/eve/src/TEveCalo.cxx
@@ -42,7 +42,7 @@
ClassImp(TEveCaloViz);
//______________________________________________________________________________
-TEveCaloViz::TEveCaloViz(TEveCaloData* data, const Text_t* n, const Text_t* t) :
+TEveCaloViz::TEveCaloViz(TEveCaloData* data, const char* n, const char* t) :
TEveElement(),
TNamed(n, t),
TEveProjectable(),
@@ -374,7 +374,7 @@ void TEveCaloViz::SetupColorHeight(Float_t value, Int_t slice, Float_t& outH) co
ClassImp(TEveCalo3D);
-TEveCalo3D::TEveCalo3D(TEveCaloData* d, const Text_t* n, const Text_t* t):
+TEveCalo3D::TEveCalo3D(TEveCaloData* d, const char* n, const char* t):
TEveCaloViz(d, n, t),
fRnrEndCapFrame(kTRUE),
fRnrBarrelFrame(kTRUE)
@@ -429,7 +429,7 @@ void TEveCalo3D::ComputeBBox()
ClassImp(TEveCalo2D);
//______________________________________________________________________________
-TEveCalo2D::TEveCalo2D(const Text_t* n, const Text_t* t):
+TEveCalo2D::TEveCalo2D(const char* n, const char* t):
TEveCaloViz(0, n, t),
TEveProjected(),
fOldProjectionType(TEveProjection::kPT_Unknown)
@@ -574,7 +574,7 @@ void TEveCalo2D::ComputeBBox()
ClassImp(TEveCaloLego);
//______________________________________________________________________________
-TEveCaloLego::TEveCaloLego(TEveCaloData* d, const Text_t* n, const Text_t* t):
+TEveCaloLego::TEveCaloLego(TEveCaloData* d, const char* n, const char* t):
TEveCaloViz(d, n, t),
fTopViewUseMaxColor(kTRUE),
diff --git a/graf3d/eve/src/TEveCompound.cxx b/graf3d/eve/src/TEveCompound.cxx
index 485e766242a..0b28ba529ed 100644
--- a/graf3d/eve/src/TEveCompound.cxx
+++ b/graf3d/eve/src/TEveCompound.cxx
@@ -24,7 +24,7 @@
ClassImp(TEveCompound);
//______________________________________________________________________________
-TEveCompound::TEveCompound(const Text_t* n, const Text_t* t, Bool_t doColor) :
+TEveCompound::TEveCompound(const char* n, const char* t, Bool_t doColor) :
TEveElementList (n, t, doColor),
TEveProjectable (),
fCompoundOpen (0)
diff --git a/graf3d/eve/src/TEveDigitSet.cxx b/graf3d/eve/src/TEveDigitSet.cxx
index e56b0674339..1afe6f00d71 100644
--- a/graf3d/eve/src/TEveDigitSet.cxx
+++ b/graf3d/eve/src/TEveDigitSet.cxx
@@ -47,7 +47,7 @@
ClassImp(TEveDigitSet);
//______________________________________________________________________________
-TEveDigitSet::TEveDigitSet(const Text_t* n, const Text_t* t) :
+TEveDigitSet::TEveDigitSet(const char* n, const char* t) :
TEveElement (),
TNamed (n, t),
diff --git a/graf3d/eve/src/TEveElement.cxx b/graf3d/eve/src/TEveElement.cxx
index d0830ebadd3..b446e31d51e 100644
--- a/graf3d/eve/src/TEveElement.cxx
+++ b/graf3d/eve/src/TEveElement.cxx
@@ -232,7 +232,7 @@ void TEveElement::CloneChildrenRecurse(TEveElement* dest, Int_t level) const
/******************************************************************************/
//______________________________________________________________________________
-const Text_t* TEveElement::GetElementName() const
+const char* TEveElement::GetElementName() const
{
// Virtual function for retrieveing name of the element.
// Here we attempt to cast the assigned object into TNamed and call
@@ -245,7 +245,7 @@ const Text_t* TEveElement::GetElementName() const
}
//______________________________________________________________________________
-const Text_t* TEveElement::GetElementTitle() const
+const char* TEveElement::GetElementTitle() const
{
// Virtual function for retrieveing title of the render-element.
// Here we attempt to cast the assigned object into TNamed and call
@@ -258,7 +258,7 @@ const Text_t* TEveElement::GetElementTitle() const
}
//______________________________________________________________________________
-void TEveElement::SetElementName(const Text_t* name)
+void TEveElement::SetElementName(const char* name)
{
// Virtual function for setting of name of an element.
// Here we attempt to cast the assigned object into TNamed and call
@@ -275,7 +275,7 @@ void TEveElement::SetElementName(const Text_t* name)
}
//______________________________________________________________________________
-void TEveElement::SetElementTitle(const Text_t* title)
+void TEveElement::SetElementTitle(const char* title)
{
// Virtual function for setting of title of an element.
// Here we attempt to cast the assigned object into TNamed and call
@@ -292,7 +292,7 @@ void TEveElement::SetElementTitle(const Text_t* title)
}
//______________________________________________________________________________
-void TEveElement::SetElementNameTitle(const Text_t* name, const Text_t* title)
+void TEveElement::SetElementNameTitle(const char* name, const char* title)
{
// Virtual function for setting of name and title of render element.
// Here we attempt to cast the assigned object into TNamed and call
@@ -899,7 +899,7 @@ void TEveElement::SpawnEditor()
}
//______________________________________________________________________________
-void TEveElement::ExportToCINT(Text_t* var_name)
+void TEveElement::ExportToCINT(char* var_name)
{
// Export render-element to CINT with variable name var_name.
@@ -1691,7 +1691,7 @@ TObject* TEveElementObjectPtr::GetObject(const TEveException& eh) const
}
//______________________________________________________________________________
-void TEveElementObjectPtr::ExportToCINT(Text_t* var_name)
+void TEveElementObjectPtr::ExportToCINT(char* var_name)
{
// Export external object to CINT with variable name var_name.
// Virtual from TEveElement.
@@ -1732,7 +1732,7 @@ TEveElementObjectPtr::~TEveElementObjectPtr()
ClassImp(TEveElementList);
//______________________________________________________________________________
-TEveElementList::TEveElementList(const Text_t* n, const Text_t* t, Bool_t doColor) :
+TEveElementList::TEveElementList(const char* n, const char* t, Bool_t doColor) :
TEveElement(),
TNamed(n, t),
fColor(0),
diff --git a/graf3d/eve/src/TEveEventManager.cxx b/graf3d/eve/src/TEveEventManager.cxx
index ac85a300a5a..28c18989894 100644
--- a/graf3d/eve/src/TEveEventManager.cxx
+++ b/graf3d/eve/src/TEveEventManager.cxx
@@ -22,7 +22,7 @@
ClassImp(TEveEventManager)
//______________________________________________________________________________
-TEveEventManager::TEveEventManager(const Text_t* n, const Text_t* t) :
+TEveEventManager::TEveEventManager(const char* n, const char* t) :
TEveElementList(n, t),
fNewEventCommands()
{
diff --git a/graf3d/eve/src/TEveGValuators.cxx b/graf3d/eve/src/TEveGValuators.cxx
index e58b0f3da51..5031d4fcede 100644
--- a/graf3d/eve/src/TEveGValuators.cxx
+++ b/graf3d/eve/src/TEveGValuators.cxx
@@ -224,7 +224,7 @@ void TEveGValuator::SetValue(Float_t val, Bool_t emit)
}
//______________________________________________________________________________
-void TEveGValuator::SetToolTip(const Text_t* tip)
+void TEveGValuator::SetToolTip(const char* tip)
{
// Set the tooltip of the number-entry.
diff --git a/graf3d/eve/src/TEveGeoNode.cxx b/graf3d/eve/src/TEveGeoNode.cxx
index 04951e4e6a1..3a577768412 100644
--- a/graf3d/eve/src/TEveGeoNode.cxx
+++ b/graf3d/eve/src/TEveGeoNode.cxx
@@ -58,7 +58,7 @@ TEveGeoNode::TEveGeoNode(TGeoNode* node) :
}
//______________________________________________________________________________
-const Text_t* TEveGeoNode::GetName() const
+const char* TEveGeoNode::GetName() const
{
// Return name, taken from geo-node. Used via TObject.
@@ -66,7 +66,7 @@ const Text_t* TEveGeoNode::GetName() const
}
//______________________________________________________________________________
-const Text_t* TEveGeoNode::GetTitle() const
+const char* TEveGeoNode::GetTitle() const
{
// Return title, taken from geo-node. Used via TObject.
@@ -74,7 +74,7 @@ const Text_t* TEveGeoNode::GetTitle() const
}
//______________________________________________________________________________
-const Text_t* TEveGeoNode::GetElementName() const
+const char* TEveGeoNode::GetElementName() const
{
// Return name, taken from geo-node. Used via TEveElement.
@@ -82,7 +82,7 @@ const Text_t* TEveGeoNode::GetElementName() const
}
//______________________________________________________________________________
-const Text_t* TEveGeoNode::GetElementTitle() const
+const char* TEveGeoNode::GetElementTitle() const
{
// Return title, taken from geo-node. Used via TEveElement.
@@ -505,7 +505,7 @@ TGeoManager* TEveGeoShape::GetGeoMangeur()
}
//______________________________________________________________________________
-TEveGeoShape::TEveGeoShape(const Text_t* name, const Text_t* title) :
+TEveGeoShape::TEveGeoShape(const char* name, const char* title) :
TEveElement (fColor),
TNamed (name, title),
fColor (0),
diff --git a/graf3d/eve/src/TEveGeoShapeExtract.cxx b/graf3d/eve/src/TEveGeoShapeExtract.cxx
index 78b22bd4aba..d6d0a207939 100644
--- a/graf3d/eve/src/TEveGeoShapeExtract.cxx
+++ b/graf3d/eve/src/TEveGeoShapeExtract.cxx
@@ -31,7 +31,7 @@
ClassImp(TEveGeoShapeExtract);
//______________________________________________________________________________
-TEveGeoShapeExtract::TEveGeoShapeExtract(const Text_t* n, const Text_t* t) :
+TEveGeoShapeExtract::TEveGeoShapeExtract(const char* n, const char* t) :
TNamed (n,t),
fRnrSelf (kTRUE),
diff --git a/graf3d/eve/src/TEveLine.cxx b/graf3d/eve/src/TEveLine.cxx
index 13f9de1e777..dd3b1e13472 100644
--- a/graf3d/eve/src/TEveLine.cxx
+++ b/graf3d/eve/src/TEveLine.cxx
@@ -39,7 +39,7 @@ TEveLine::TEveLine(Int_t n_points, ETreeVarType_e tv_type) :
}
//______________________________________________________________________________
-TEveLine::TEveLine(const Text_t* name, Int_t n_points, ETreeVarType_e tv_type) :
+TEveLine::TEveLine(const char* name, Int_t n_points, ETreeVarType_e tv_type) :
TEvePointSet(name, n_points, tv_type),
fRnrLine (kTRUE),
fRnrPoints (kFALSE),
diff --git a/graf3d/eve/src/TEveManager.cxx b/graf3d/eve/src/TEveManager.cxx
index 1e64d39bfcd..857437f00c7 100644
--- a/graf3d/eve/src/TEveManager.cxx
+++ b/graf3d/eve/src/TEveManager.cxx
@@ -285,7 +285,7 @@ TGLViewer* TEveManager::GetDefaultGLViewer() const
}
//______________________________________________________________________________
-TEveViewer* TEveManager::SpawnNewViewer(const Text_t* name, const Text_t* title,
+TEveViewer* TEveManager::SpawnNewViewer(const char* name, const char* title,
Bool_t embed)
{
// Create a new GL viewer.
@@ -318,7 +318,7 @@ TEveViewer* TEveManager::SpawnNewViewer(const Text_t* name, const Text_t* title,
}
//______________________________________________________________________________
-TEveScene* TEveManager::SpawnNewScene(const Text_t* name, const Text_t* title)
+TEveScene* TEveManager::SpawnNewScene(const char* name, const char* title)
{
// Create a new scene.
@@ -332,7 +332,7 @@ TEveScene* TEveManager::SpawnNewScene(const Text_t* name, const Text_t* title)
/******************************************************************************/
//______________________________________________________________________________
-TMacro* TEveManager::GetMacro(const Text_t* name) const
+TMacro* TEveManager::GetMacro(const char* name) const
{
// Find macro in fMacroFolder by name.
diff --git a/graf3d/eve/src/TEveParamList.cxx b/graf3d/eve/src/TEveParamList.cxx
index 293cba74cd5..df3e6b4bad0 100644
--- a/graf3d/eve/src/TEveParamList.cxx
+++ b/graf3d/eve/src/TEveParamList.cxx
@@ -34,7 +34,7 @@
ClassImp(TEveParamList);
//______________________________________________________________________________
-TEveParamList::TEveParamList(const Text_t* n, const Text_t* t, Bool_t doColor) :
+TEveParamList::TEveParamList(const char* n, const char* t, Bool_t doColor) :
TNamed(n, t),
fColor(0)
{
diff --git a/graf3d/eve/src/TEvePointSet.cxx b/graf3d/eve/src/TEvePointSet.cxx
index 894426248df..2006862e356 100644
--- a/graf3d/eve/src/TEvePointSet.cxx
+++ b/graf3d/eve/src/TEvePointSet.cxx
@@ -69,7 +69,7 @@ TEvePointSet::TEvePointSet(Int_t n_points, ETreeVarType_e tv_type) :
}
//______________________________________________________________________________
-TEvePointSet::TEvePointSet(const Text_t* name, Int_t n_points, ETreeVarType_e tv_type) :
+TEvePointSet::TEvePointSet(const char* name, Int_t n_points, ETreeVarType_e tv_type) :
TEveElement(fMarkerColor),
TPointSet3D(n_points),
TEvePointSelectorConsumer(tv_type),
@@ -408,8 +408,8 @@ void TEvePointSet::PointSelected(Int_t id)
ClassImp(TEvePointSetArray);
//______________________________________________________________________________
-TEvePointSetArray::TEvePointSetArray(const Text_t* name,
- const Text_t* title) :
+TEvePointSetArray::TEvePointSetArray(const char* name,
+ const char* title) :
TEveElement(fMarkerColor),
TNamed(name, title),
@@ -562,7 +562,7 @@ Int_t TEvePointSetArray::Size(Bool_t under, Bool_t over) const
}
//______________________________________________________________________________
-void TEvePointSetArray::InitBins(const Text_t* quant_name,
+void TEvePointSetArray::InitBins(const char* quant_name,
Int_t nbins, Double_t min, Double_t max)
{
// Initialize internal point-sets with given binning parameters.
diff --git a/graf3d/eve/src/TEvePolygonSetProjected.cxx b/graf3d/eve/src/TEvePolygonSetProjected.cxx
index 60660669f09..97ae87ae900 100644
--- a/graf3d/eve/src/TEvePolygonSetProjected.cxx
+++ b/graf3d/eve/src/TEvePolygonSetProjected.cxx
@@ -49,7 +49,7 @@ typedef std::list<Seg_t>::iterator LSegIt_t;
ClassImp(TEvePolygonSetProjected);
//______________________________________________________________________________
-TEvePolygonSetProjected::TEvePolygonSetProjected(const Text_t* n, const Text_t* t) :
+TEvePolygonSetProjected::TEvePolygonSetProjected(const char* n, const char* t) :
TEveElementList(n, t),
fBuff(0),
diff --git a/graf3d/eve/src/TEveQuadSet.cxx b/graf3d/eve/src/TEveQuadSet.cxx
index 7de4e9e3efc..386eaa0416e 100644
--- a/graf3d/eve/src/TEveQuadSet.cxx
+++ b/graf3d/eve/src/TEveQuadSet.cxx
@@ -41,7 +41,7 @@
ClassImp(TEveQuadSet);
//______________________________________________________________________________
-TEveQuadSet::TEveQuadSet(const Text_t* n, const Text_t* t) :
+TEveQuadSet::TEveQuadSet(const char* n, const char* t) :
TEveDigitSet (n, t),
fQuadType (kQT_Undef),
@@ -55,7 +55,7 @@ TEveQuadSet::TEveQuadSet(const Text_t* n, const Text_t* t) :
//______________________________________________________________________________
TEveQuadSet::TEveQuadSet(EQuadType_e quadType, Bool_t valIsCol, Int_t chunkSize,
- const Text_t* n, const Text_t* t) :
+ const char* n, const char* t) :
TEveDigitSet (n, t),
fQuadType (kQT_Undef),
diff --git a/graf3d/eve/src/TEveScalableStraightLineSet.cxx b/graf3d/eve/src/TEveScalableStraightLineSet.cxx
index c55af3ea4b6..560920e3c43 100644
--- a/graf3d/eve/src/TEveScalableStraightLineSet.cxx
+++ b/graf3d/eve/src/TEveScalableStraightLineSet.cxx
@@ -26,7 +26,7 @@
ClassImp(TEveScalableStraightLineSet);
//______________________________________________________________________________
-TEveScalableStraightLineSet::TEveScalableStraightLineSet(const Text_t* n, const Text_t* t):
+TEveScalableStraightLineSet::TEveScalableStraightLineSet(const char* n, const char* t):
TEveStraightLineSet (n, t),
fCurrentScale(1.0)
{
diff --git a/graf3d/eve/src/TEveScene.cxx b/graf3d/eve/src/TEveScene.cxx
index 70924cb841c..50c6ee0951c 100644
--- a/graf3d/eve/src/TEveScene.cxx
+++ b/graf3d/eve/src/TEveScene.cxx
@@ -33,7 +33,7 @@
ClassImp(TEveScene);
//______________________________________________________________________________
-TEveScene::TEveScene(const Text_t* n, const Text_t* t) :
+TEveScene::TEveScene(const char* n, const char* t) :
TEveElementList(n, t),
fPad (0),
fGLScene(0),
@@ -110,7 +110,7 @@ void TEveScene::Repaint(Bool_t dropLogicals)
/******************************************************************************/
//______________________________________________________________________________
-void TEveScene::SetName(const Text_t* n)
+void TEveScene::SetName(const char* n)
{
// Set scene's name.
@@ -177,7 +177,7 @@ const TGPicture* TEveScene::GetListTreeIcon(Bool_t)
ClassImp(TEveSceneList);
//______________________________________________________________________________
-TEveSceneList::TEveSceneList(const Text_t* n, const Text_t* t) :
+TEveSceneList::TEveSceneList(const char* n, const char* t) :
TEveElementList(n, t)
{
// Constructor.
diff --git a/graf3d/eve/src/TEveSelection.cxx b/graf3d/eve/src/TEveSelection.cxx
index dd7e8c08cf4..81f2557d7d9 100644
--- a/graf3d/eve/src/TEveSelection.cxx
+++ b/graf3d/eve/src/TEveSelection.cxx
@@ -24,7 +24,7 @@
ClassImp(TEveSelection);
//______________________________________________________________________________
-TEveSelection::TEveSelection(const Text_t* n, const Text_t* t) :
+TEveSelection::TEveSelection(const char* n, const char* t) :
TEveElementList(n, t),
fPickToSelect (kPS_Projectable),
fActive (kTRUE),
diff --git a/graf3d/eve/src/TEveStraightLineSet.cxx b/graf3d/eve/src/TEveStraightLineSet.cxx
index 4ab37149fa9..22c31dd0a58 100644
--- a/graf3d/eve/src/TEveStraightLineSet.cxx
+++ b/graf3d/eve/src/TEveStraightLineSet.cxx
@@ -32,7 +32,7 @@
ClassImp(TEveStraightLineSet);
//______________________________________________________________________________
-TEveStraightLineSet::TEveStraightLineSet(const Text_t* n, const Text_t* t):
+TEveStraightLineSet::TEveStraightLineSet(const char* n, const char* t):
TEveElement (),
TNamed (n, t),
diff --git a/graf3d/eve/src/TEveText.cxx b/graf3d/eve/src/TEveText.cxx
index 93a11a98d3f..74b10b52dd8 100644
--- a/graf3d/eve/src/TEveText.cxx
+++ b/graf3d/eve/src/TEveText.cxx
@@ -36,7 +36,7 @@
ClassImp(TEveText);
//______________________________________________________________________________
-TEveText::TEveText(const Text_t* txt) :
+TEveText::TEveText(const char* txt) :
TEveElement(fTextColor),
TNamed("TEveText", ""),
TAtt3D(),
diff --git a/graf3d/eve/src/TEveTextEditor.cxx b/graf3d/eve/src/TEveTextEditor.cxx
index 5a18554589e..8cfde654be7 100644
--- a/graf3d/eve/src/TEveTextEditor.cxx
+++ b/graf3d/eve/src/TEveTextEditor.cxx
@@ -175,7 +175,7 @@ void TEveTextEditor::SetModel(TObject* obj)
}
//______________________________________________________________________________
-void TEveTextEditor::DoText(const Text_t* /*txt*/)
+void TEveTextEditor::DoText(const char* /*txt*/)
{
// Slot for setting text.
diff --git a/graf3d/eve/src/TEveTrack.cxx b/graf3d/eve/src/TEveTrack.cxx
index a6a59493704..9774c13778f 100644
--- a/graf3d/eve/src/TEveTrack.cxx
+++ b/graf3d/eve/src/TEveTrack.cxx
@@ -664,7 +664,7 @@ TEveTrackList::TEveTrackList(TEveTrackPropagator* rs) :
}
//______________________________________________________________________________
-TEveTrackList::TEveTrackList(const Text_t* name, TEveTrackPropagator* rs) :
+TEveTrackList::TEveTrackList(const char* name, TEveTrackPropagator* rs) :
TEveElementList(name),
TAttMarker(1, 20, 1),
TAttLine(1,1,1),
diff --git a/graf3d/eve/src/TEveTrackPropagator.cxx b/graf3d/eve/src/TEveTrackPropagator.cxx
index d2d11dc3dd5..79ea304be2f 100644
--- a/graf3d/eve/src/TEveTrackPropagator.cxx
+++ b/graf3d/eve/src/TEveTrackPropagator.cxx
@@ -160,7 +160,7 @@ const Float_t TEveTrackPropagator::fgkB2C = 0.299792458e-2;
TEveTrackPropagator TEveTrackPropagator::fgDefStyle;
//______________________________________________________________________________
-TEveTrackPropagator::TEveTrackPropagator(const Text_t* n, const Text_t* t,
+TEveTrackPropagator::TEveTrackPropagator(const char* n, const char* t,
TEveMagField *field) :
TEveElementList(n, t),
TEveRefBackPtr(),
diff --git a/graf3d/eve/src/TEveTrans.cxx b/graf3d/eve/src/TEveTrans.cxx
index 958210b0805..11f6973df84 100644
--- a/graf3d/eve/src/TEveTrans.cxx
+++ b/graf3d/eve/src/TEveTrans.cxx
@@ -510,7 +510,7 @@ void TEveTrans::SetRotByAngles(Float_t a1, Float_t a2, Float_t a3)
//______________________________________________________________________________
void TEveTrans::SetRotByAnyAngles(Float_t a1, Float_t a2, Float_t a3,
- const Text_t* pat)
+ const char* pat)
{
// Sets Rotation part as given by angles a1, a1, a3 and pattern pat.
// Pattern consists of "XxYyZz" characters.
diff --git a/graf3d/eve/src/TEveTreeTools.cxx b/graf3d/eve/src/TEveTreeTools.cxx
index 8846c7119ee..afa4139a5c5 100644
--- a/graf3d/eve/src/TEveTreeTools.cxx
+++ b/graf3d/eve/src/TEveTreeTools.cxx
@@ -31,7 +31,7 @@
ClassImp(TEveSelectorToEventList)
//______________________________________________________________________________
-TEveSelectorToEventList::TEveSelectorToEventList(TEventList* evl, const Text_t* sel) :
+TEveSelectorToEventList::TEveSelectorToEventList(TEventList* evl, const char* sel) :
TSelectorDraw(), fEvList(evl)
{
// Constructor.
@@ -67,7 +67,7 @@ ClassImp(TEvePointSelectorConsumer)
//______________________________________________________________________________
TEvePointSelector::TEvePointSelector(TTree* t,
TEvePointSelectorConsumer* c,
- const Text_t* vexp, const Text_t* sel) :
+ const char* vexp, const char* sel) :
TSelectorDraw(),
fTree (t),
@@ -83,7 +83,7 @@ TEvePointSelector::TEvePointSelector(TTree* t,
}
//______________________________________________________________________________
-Long64_t TEvePointSelector::Select(const Text_t* selection)
+Long64_t TEvePointSelector::Select(const char* selection)
{
// Process the tree, select points matching 'selection'.
@@ -116,7 +116,7 @@ Long64_t TEvePointSelector::Select(const Text_t* selection)
}
//______________________________________________________________________________
-Long64_t TEvePointSelector::Select(TTree* t, const Text_t* selection)
+Long64_t TEvePointSelector::Select(TTree* t, const char* selection)
{
// Process tree 't', select points matching 'selection'.
diff --git a/graf3d/eve/src/TEveUtil.cxx b/graf3d/eve/src/TEveUtil.cxx
index d033b9cdfb1..b76d66e83a5 100644
--- a/graf3d/eve/src/TEveUtil.cxx
+++ b/graf3d/eve/src/TEveUtil.cxx
@@ -133,7 +133,7 @@ void ChompTail(TString& s, char c='.')
}
//______________________________________________________________________________
-Bool_t TEveUtil::CheckMacro(const Text_t* mac)
+Bool_t TEveUtil::CheckMacro(const char* mac)
{
// Checks if macro 'mac' is loaded.
@@ -158,7 +158,7 @@ Bool_t TEveUtil::CheckMacro(const Text_t* mac)
}
//______________________________________________________________________________
-void TEveUtil::AssertMacro(const Text_t* mac)
+void TEveUtil::AssertMacro(const char* mac)
{
// Load and execute macro 'mac' if it has not been loaded yet.
@@ -168,7 +168,7 @@ void TEveUtil::AssertMacro(const Text_t* mac)
}
//______________________________________________________________________________
-void TEveUtil::Macro(const Text_t* mac)
+void TEveUtil::Macro(const char* mac)
{
// Execute macro 'mac'. Do not reload the macro.
@@ -180,7 +180,7 @@ void TEveUtil::Macro(const Text_t* mac)
}
//______________________________________________________________________________
-void TEveUtil::LoadMacro(const Text_t* mac)
+void TEveUtil::LoadMacro(const char* mac)
{
// Makes sure that macro 'mac' is loaded, but do not reload it.
@@ -255,7 +255,7 @@ void TEveUtil::ColorFromIdx(Float_t f1, Color_t c1, Float_t f2, Color_t c2,
}
//______________________________________________________________________________
-Color_t* TEveUtil::FindColorVar(TObject* obj, const Text_t* varname)
+Color_t* TEveUtil::FindColorVar(TObject* obj, const char* varname)
{
// Find address of Color_t data-member with name varname in object
// obj.
diff --git a/graf3d/eve/src/TEveVSD.cxx b/graf3d/eve/src/TEveVSD.cxx
index 633296e2dd8..84fd3462e8c 100644
--- a/graf3d/eve/src/TEveVSD.cxx
+++ b/graf3d/eve/src/TEveVSD.cxx
@@ -24,7 +24,7 @@
ClassImp(TEveVSD);
//______________________________________________________________________________
-TEveVSD::TEveVSD(const Text_t* , const Text_t* ) :
+TEveVSD::TEveVSD(const char* , const char* ) :
TObject(),
fBuffSize (128*1024),
@@ -214,7 +214,7 @@ void TEveVSD::LoadTrees()
}
//______________________________________________________________________________
-void TEveVSD::LoadVSD(const Text_t* vsd_file_name, const Text_t* dir_name)
+void TEveVSD::LoadVSD(const char* vsd_file_name, const char* dir_name)
{
// Load VSD data from given file and directory.
diff --git a/graf3d/eve/src/TEveViewer.cxx b/graf3d/eve/src/TEveViewer.cxx
index 3d8aaae279e..b01e73a7a5d 100644
--- a/graf3d/eve/src/TEveViewer.cxx
+++ b/graf3d/eve/src/TEveViewer.cxx
@@ -43,7 +43,7 @@
ClassImp(TEveViewer);
//______________________________________________________________________________
-TEveViewer::TEveViewer(const Text_t* n, const Text_t* t) :
+TEveViewer::TEveViewer(const char* n, const char* t) :
TEveWindowFrame(0, n, t),
fGLViewer (0),
fGLViewerFrame (0)
@@ -247,7 +247,7 @@ Bool_t TEveViewer::HandleElementPaste(TEveElement* el)
ClassImp(TEveViewerList);
//______________________________________________________________________________
-TEveViewerList::TEveViewerList(const Text_t* n, const Text_t* t) :
+TEveViewerList::TEveViewerList(const char* n, const char* t) :
TEveElementList(n, t),
fShowTooltip (kTRUE)
{
diff --git a/graf3d/eve/src/TEveWindow.cxx b/graf3d/eve/src/TEveWindow.cxx
index 64f83aa1e5b..3d8434c0155 100644
--- a/graf3d/eve/src/TEveWindow.cxx
+++ b/graf3d/eve/src/TEveWindow.cxx
@@ -662,7 +662,7 @@ Pixel_t TEveWindow::fgCurrentBackgroundColor = 0x80A0C0;
Pixel_t TEveWindow::fgMiniBarBackgroundColor = 0x80C0A0;
//______________________________________________________________________________
-TEveWindow::TEveWindow(const Text_t* n, const Text_t* t) :
+TEveWindow::TEveWindow(const char* n, const char* t) :
TEveElementList(n, t),
fEveFrame (0),
@@ -1081,7 +1081,7 @@ void TEveWindow::SwapWindows(TEveWindow* w1, TEveWindow* w2)
ClassImp(TEveWindowSlot);
//______________________________________________________________________________
-TEveWindowSlot::TEveWindowSlot(const Text_t* n, const Text_t* t) :
+TEveWindowSlot::TEveWindowSlot(const char* n, const char* t) :
TEveWindow (n, t),
fEmptyButt (0),
fEmbedBuffer (0)
@@ -1189,7 +1189,7 @@ TGCompositeFrame* TEveWindowSlot::StartEmbedding()
}
//______________________________________________________________________________
-TEveWindowFrame* TEveWindowSlot::StopEmbedding(const Text_t* name)
+TEveWindowFrame* TEveWindowSlot::StopEmbedding(const char* name)
{
// An embedded window is created in place of this window-slot.
// This window-slot will auto-destruct.
@@ -1251,7 +1251,7 @@ TEveWindowFrame* TEveWindowSlot::StopEmbedding(const Text_t* name)
ClassImp(TEveWindowFrame);
//______________________________________________________________________________
-TEveWindowFrame::TEveWindowFrame(TGFrame* frame, const Text_t* n, const Text_t* t) :
+TEveWindowFrame::TEveWindowFrame(TGFrame* frame, const char* n, const char* t) :
TEveWindow (n, t),
fGUIFrame (frame)
{
@@ -1302,7 +1302,7 @@ TGCompositeFrame* TEveWindowFrame::GetGUICompositeFrame()
ClassImp(TEveWindowPack);
//______________________________________________________________________________
-TEveWindowPack::TEveWindowPack(TGPack* p, const Text_t* n, const Text_t* t) :
+TEveWindowPack::TEveWindowPack(TGPack* p, const char* n, const char* t) :
TEveWindow (n, t),
fPack (p ? p : new TGPack())
{
@@ -1381,7 +1381,7 @@ void TEveWindowPack::EqualizeFrames()
ClassImp(TEveWindowTab);
//______________________________________________________________________________
-TEveWindowTab::TEveWindowTab(TGTab* tab, const Text_t* n, const Text_t* t) :
+TEveWindowTab::TEveWindowTab(TGTab* tab, const char* n, const char* t) :
TEveWindow(n, t),
fTab (tab ? tab : new TGTab())
{
diff --git a/graf3d/eve/src/TEveWindowManager.cxx b/graf3d/eve/src/TEveWindowManager.cxx
index efb66d11531..9946990ef5a 100644
--- a/graf3d/eve/src/TEveWindowManager.cxx
+++ b/graf3d/eve/src/TEveWindowManager.cxx
@@ -28,7 +28,7 @@
ClassImp(TEveWindowManager);
//______________________________________________________________________________
-TEveWindowManager::TEveWindowManager(const Text_t* n, const Text_t* t) :
+TEveWindowManager::TEveWindowManager(const char* n, const char* t) :
TEveElementList(n, t),
TQObject (),
fCurrentWindow (0),
diff --git a/graf3d/g3d/inc/TXTRU.h b/graf3d/g3d/inc/TXTRU.h
index 3cf001f48e0..98be42aae34 100644
--- a/graf3d/g3d/inc/TXTRU.h
+++ b/graf3d/g3d/inc/TXTRU.h
@@ -24,7 +24,7 @@
class TXTRU : public TShape {
public:
TXTRU();
- TXTRU(const Text_t *name, const Text_t *title, const Text_t *material,
+ TXTRU(const char *name, const char *title, const char *material,
Int_t nyx, Int_t nz);
TXTRU(const TXTRU &xtru);
virtual ~TXTRU();
diff --git a/graf3d/g3d/src/TXTRU.cxx b/graf3d/g3d/src/TXTRU.cxx
index f417d3589a4..3ede3dd1e88 100644
--- a/graf3d/g3d/src/TXTRU.cxx
+++ b/graf3d/g3d/src/TXTRU.cxx
@@ -78,7 +78,7 @@ TXTRU::TXTRU()
//______________________________________________________________________________
-TXTRU::TXTRU(const Text_t *name, const Text_t *title, const Text_t *material,
+TXTRU::TXTRU(const char *name, const char *title, const char *material,
Int_t nxy, Int_t nz)
: TShape (name,title,material)
{
diff --git a/graf3d/gl/inc/TGLFontManager.h b/graf3d/gl/inc/TGLFontManager.h
index b6dda5efdd9..0691d1a017c 100644
--- a/graf3d/gl/inc/TGLFontManager.h
+++ b/graf3d/gl/inc/TGLFontManager.h
@@ -71,12 +71,12 @@ public:
void SetDepth(Float_t d) { fDepth = d; }
// FTGL wrapper functions
- void BBox(const Text_t* txt,
+ void BBox(const char* txt,
Float_t& llx, Float_t& lly, Float_t& llz,
Float_t& urx, Float_t& ury, Float_t& urz) const;
- void Render(const Text_t* txt) const;
- void RenderBitmap(const Text_t* txt, Float_t x, Float_t y, Float_t zs, ETextAlign_e align) const;
+ void Render(const char* txt) const;
+ void RenderBitmap(const char* txt, Float_t x, Float_t y, Float_t zs, ETextAlign_e align) const;
// helper gl draw functions
virtual void PreRender(Bool_t autoLight=kTRUE, Bool_t lightOn=kFALSE) const;
@@ -131,7 +131,7 @@ public:
virtual ~TGLFontManager();
void RegisterFont(Int_t size, Int_t file, TGLFont::EMode mode, TGLFont& out);
- void RegisterFont(Int_t size, const Text_t* name, TGLFont::EMode mode, TGLFont& out);
+ void RegisterFont(Int_t size, const char* name, TGLFont::EMode mode, TGLFont& out);
void ReleaseFont(TGLFont& font);
static TObjArray* GetFontFileArray();
diff --git a/graf3d/gl/inc/TGLLightSetEditor.h b/graf3d/gl/inc/TGLLightSetEditor.h
index 6c774a133d8..6b96f2208b9 100644
--- a/graf3d/gl/inc/TGLLightSetEditor.h
+++ b/graf3d/gl/inc/TGLLightSetEditor.h
@@ -35,7 +35,7 @@ protected:
TGButton *fSpecularLight;
- TGButton* MakeLampButton(const Text_t* name, Int_t wid, TGCompositeFrame* parent);
+ TGButton* MakeLampButton(const char* name, Int_t wid, TGCompositeFrame* parent);
public:
TGLLightSetSubEditor(const TGWindow* p);
diff --git a/graf3d/gl/inc/TGLRnrCtx.h b/graf3d/gl/inc/TGLRnrCtx.h
index 750d3799808..05d68175614 100644
--- a/graf3d/gl/inc/TGLRnrCtx.h
+++ b/graf3d/gl/inc/TGLRnrCtx.h
@@ -217,7 +217,7 @@ public:
void SetGLCtxIdentity(TGLContextIdentity* cid) { fGLCtxIdentity = cid; }
void RegisterFont(Int_t size, Int_t file, Int_t mode, TGLFont& out);
- void RegisterFont(Int_t size, const Text_t* name, Int_t mode, TGLFont& out);
+ void RegisterFont(Int_t size, const char* name, Int_t mode, TGLFont& out);
void ReleaseFont(TGLFont& font);
GLUquadric* GetGluQuadric() { return fQuadric; }
diff --git a/graf3d/gl/src/TGLFontManager.cxx b/graf3d/gl/src/TGLFontManager.cxx
index 8620b1b576e..0e93ddc8e60 100644
--- a/graf3d/gl/src/TGLFontManager.cxx
+++ b/graf3d/gl/src/TGLFontManager.cxx
@@ -309,7 +309,7 @@ void TGLFontManager::RegisterFont(Int_t size, Int_t fileID, TGLFont::EMode mode,
}
//______________________________________________________________________________
-void TGLFontManager::RegisterFont(Int_t size, const Text_t* name, TGLFont::EMode mode, TGLFont &out)
+void TGLFontManager::RegisterFont(Int_t size, const char* name, TGLFont::EMode mode, TGLFont &out)
{
// Get mapping from ttf id to font names. Table taken from TTF.cxx.
diff --git a/graf3d/gl/src/TGLLightSetEditor.cxx b/graf3d/gl/src/TGLLightSetEditor.cxx
index 1dd7a7e1a3d..02e25215295 100644
--- a/graf3d/gl/src/TGLLightSetEditor.cxx
+++ b/graf3d/gl/src/TGLLightSetEditor.cxx
@@ -66,7 +66,7 @@ TGLLightSetSubEditor::TGLLightSetSubEditor(const TGWindow *p) :
}
//______________________________________________________________________________
-TGButton* TGLLightSetSubEditor::MakeLampButton(const Text_t* name, Int_t wid,
+TGButton* TGLLightSetSubEditor::MakeLampButton(const char* name, Int_t wid,
TGCompositeFrame* parent)
{
// Create a button for given lamp and set it up.
diff --git a/graf3d/gl/src/TGLRnrCtx.cxx b/graf3d/gl/src/TGLRnrCtx.cxx
index 22942a6b6c8..3466bbf737c 100644
--- a/graf3d/gl/src/TGLRnrCtx.cxx
+++ b/graf3d/gl/src/TGLRnrCtx.cxx
@@ -312,7 +312,7 @@ void TGLRnrCtx::RegisterFont(Int_t size, Int_t file, Int_t mode, TGLFont& out)
}
//______________________________________________________________________
-void TGLRnrCtx::RegisterFont(Int_t size, const Text_t* name, Int_t mode, TGLFont& out)
+void TGLRnrCtx::RegisterFont(Int_t size, const char* name, Int_t mode, TGLFont& out)
{
// Get font in the GL rendering context.
diff --git a/gui/ged/inc/TGedEditor.h b/gui/ged/inc/TGedEditor.h
index b83c0ac3979..5d51df2b477 100644
--- a/gui/ged/inc/TGedEditor.h
+++ b/gui/ged/inc/TGedEditor.h
@@ -88,8 +88,8 @@ public:
TGCanvas* GetTGCanvas() const { return fCan; }
TGTab* GetTab() const { return fTab; }
- virtual TGCompositeFrame* GetEditorTab(const Text_t* name);
- virtual TGedTabInfo* GetEditorTabInfo(const Text_t* name);
+ virtual TGCompositeFrame* GetEditorTab(const char* name);
+ virtual TGedTabInfo* GetEditorTabInfo(const char* name);
virtual TCanvas* GetCanvas() const { return fCanvas; }
virtual TVirtualPad* GetPad() const { return fPad; }
diff --git a/gui/ged/inc/TGedFrame.h b/gui/ged/inc/TGedFrame.h
index 480e75649b5..07fd277e44c 100644
--- a/gui/ged/inc/TGedFrame.h
+++ b/gui/ged/inc/TGedFrame.h
@@ -81,7 +81,7 @@ public:
TList* GetExtraTabs() { return fExtraTabs; }
TGedEditor* GetGedEditor() { return fGedEditor; }
virtual void AddExtraTab(TGedSubFrame* sf);
- virtual TGVerticalFrame* CreateEditorTabSubFrame(const Text_t* name);
+ virtual TGVerticalFrame* CreateEditorTabSubFrame(const char* name);
virtual void Refresh(TObject *model);
virtual void SetDrawOption(Option_t *option="");
diff --git a/gui/ged/src/TGedEditor.cxx b/gui/ged/src/TGedEditor.cxx
index 409b67abf26..65fb5c66200 100644
--- a/gui/ged/src/TGedEditor.cxx
+++ b/gui/ged/src/TGedEditor.cxx
@@ -183,7 +183,7 @@ void TGedEditor::Update(TGedFrame* /*frame*/)
}
//______________________________________________________________________________
-TGCompositeFrame* TGedEditor::GetEditorTab(const Text_t* name)
+TGCompositeFrame* TGedEditor::GetEditorTab(const char* name)
{
// Find or create tab with name.
@@ -191,7 +191,7 @@ TGCompositeFrame* TGedEditor::GetEditorTab(const Text_t* name)
}
//______________________________________________________________________________
-TGedTabInfo* TGedEditor::GetEditorTabInfo(const Text_t* name)
+TGedTabInfo* TGedEditor::GetEditorTabInfo(const char* name)
{
// Find or create tab with name.
diff --git a/gui/ged/src/TGedFrame.cxx b/gui/ged/src/TGedFrame.cxx
index 6201147e7e4..fbc13fd1232 100644
--- a/gui/ged/src/TGedFrame.cxx
+++ b/gui/ged/src/TGedFrame.cxx
@@ -132,7 +132,7 @@ void TGedFrame::AddExtraTab(TGedSubFrame* sf)
}
//______________________________________________________________________________
-TGVerticalFrame* TGedFrame::CreateEditorTabSubFrame(const Text_t* name)
+TGVerticalFrame* TGedFrame::CreateEditorTabSubFrame(const char* name)
{
// Create a vertical frame to be used by 'owner' in extra tab 'name'.
// The new frame is registered into the sub-frame list.
diff --git a/gui/gui/src/TRootContextMenu.cxx b/gui/gui/src/TRootContextMenu.cxx
index e886ec5dc02..2b242fc7873 100644
--- a/gui/gui/src/TRootContextMenu.cxx
+++ b/gui/gui/src/TRootContextMenu.cxx
@@ -422,11 +422,11 @@ void TRootContextMenu::Dialog(TObject *object, TFunction *function)
while ((argument = (TMethodArg *) next())) {
// Do not input argument for self object
if (selfobjpos != argpos) {
- Text_t *argname = fContextMenu->CreateArgumentTitle(argument);
- const Text_t *type = argument->GetTypeName();
+ char *argname = fContextMenu->CreateArgumentTitle(argument);
+ const char *type = argument->GetTypeName();
TDataType *datatype = gROOT->GetType(type);
- const Text_t *charstar = "char*";
- Text_t basictype[32];
+ const char *charstar = "char*";
+ char basictype[32];
if (datatype) {
strcpy(basictype, datatype->GetTypeName());
@@ -448,10 +448,10 @@ void TRootContextMenu::Dialog(TObject *object, TFunction *function)
// Get the current value and form it as a text:
- Text_t val[256];
+ char val[256];
if (!strncmp(basictype, "char*", 5)) {
- Text_t *tdefval;
+ char *tdefval;
m->GetterMethod()->Execute(object, "", &tdefval);
strncpy(val, tdefval, 255);
} else if (!strncmp(basictype, "float", 5) ||
@@ -479,11 +479,11 @@ void TRootContextMenu::Dialog(TObject *object, TFunction *function)
TIter nextopt(opt);
TOptionListItem *it = 0;
while ((it = (TOptionListItem*) nextopt())) {
- Text_t *name = it->fOptName;
- Text_t *label = it->fOptLabel;
+ char *name = it->fOptName;
+ char *label = it->fOptLabel;
Long_t value = it->fValue;
if (value != -9999) {
- Text_t val[256];
+ char val[256];
sprintf(val, "%li", value);
o->AddItem(name, val);
}else
diff --git a/gui/qtgsi/src/TQCanvasMenu.cxx b/gui/qtgsi/src/TQCanvasMenu.cxx
index cddcfe50a4f..a4a18c36b4c 100644
--- a/gui/qtgsi/src/TQCanvasMenu.cxx
+++ b/gui/qtgsi/src/TQCanvasMenu.cxx
@@ -185,11 +185,11 @@ void TQCanvasMenu::Dialog(TObject* object, TMethod* method)
TMethodArg *argument = 0;
TIter next(method->GetListOfMethodArgs());
while ((argument = (TMethodArg *) next())) {
- Text_t *argname = CreateArgumentTitle(argument);
- const Text_t *type = argument->GetTypeName();
+ char *argname = CreateArgumentTitle(argument);
+ const char *type = argument->GetTypeName();
TDataType *datatype = gROOT->GetType(type);
- const Text_t *charstar = "char*";
- Text_t basictype [32];
+ const char *charstar = "char*";
+ char basictype [32];
if (datatype) {
strncpy(basictype, datatype->GetTypeName(),31);
@@ -207,13 +207,13 @@ void TQCanvasMenu::Dialog(TObject* object, TMethod* method)
TDataMember *m = argument->GetDataMember();
if (m && m->GetterMethod()) {
- Text_t gettername[256] = "";
+ char gettername[256] = "";
strncpy(gettername, m->GetterMethod()->GetMethodName(),255);
m->GetterMethod()->Init(object->IsA(), gettername, "");
// Get the current value and form it as a text:
- Text_t val[256];
+ char val[256];
if (!strncmp(basictype, "char*", 5)) {
- Text_t *tdefval;
+ char *tdefval;
m->GetterMethod()->Execute(object, "", &tdefval);
strncpy(val, tdefval, 255);
}
diff --git a/io/io/src/TBufferFile.cxx b/io/io/src/TBufferFile.cxx
index cbd0ce2a7ca..3507d74ff92 100644
--- a/io/io/src/TBufferFile.cxx
+++ b/io/io/src/TBufferFile.cxx
@@ -3115,7 +3115,7 @@ void TBufferFile::WriteBuf(const void *buf, Int_t max)
}
//______________________________________________________________________________
-Text_t *TBufferFile::ReadString(Text_t *s, Int_t max)
+char *TBufferFile::ReadString(char *s, Int_t max)
{
// Read string from I/O buffer. String is read till 0 character is
// found or till max-1 characters are read (i.e. string s has max
@@ -3144,12 +3144,12 @@ Text_t *TBufferFile::ReadString(Text_t *s, Int_t max)
}
//______________________________________________________________________________
-void TBufferFile::WriteString(const Text_t *s)
+void TBufferFile::WriteString(const char *s)
{
// Write string to I/O buffer. Writes string upto and including the
// terminating 0.
- WriteBuf(s, (strlen(s)+1)*sizeof(Text_t));
+ WriteBuf(s, (strlen(s)+1)*sizeof(char));
}
//______________________________________________________________________________
diff --git a/misc/table/inc/TChair.h b/misc/table/inc/TChair.h
index 7fd87301233..8c482dc54fb 100644
--- a/misc/table/inc/TChair.h
+++ b/misc/table/inc/TChair.h
@@ -55,7 +55,7 @@ public:
virtual TH1 *Draw(TCut varexp, TCut selection, Option_t *option="",
Int_t nentries=1000000000, Int_t firstentry=0)
{return GetThisTable()->Draw(varexp,selection,option,nentries,firstentry);}
- virtual TH1 *Draw(const Text_t *varexp, const Text_t *selection, Option_t *option="",
+ virtual TH1 *Draw(const char *varexp, const char *selection, Option_t *option="",
Int_t nentries=1000000000, Int_t firstentry=0) {
return GetThisTable()->Draw(varexp,selection,option,nentries,firstentry);}
virtual Char_t *GetArray() const {return (Char_t *)GetThisTable()->GetArray();}
@@ -66,7 +66,7 @@ public:
const TTable *Table() const {return fTable; }
virtual TTableDescriptor *GetRowDescriptors() const {return GetThisTable()->GetRowDescriptors();}
virtual const Char_t *GetType() const {return GetThisTable()->GetType();}
- virtual void Fit(const Text_t *formula ,const Text_t *varexp, const Text_t *selection="",Option_t *option="",Option_t *goption="",
+ virtual void Fit(const char *formula ,const char *varexp, const char *selection="",Option_t *option="",Option_t *goption="",
Int_t nentries=1000000000, Int_t firstentry=0) {
GetThisTable()->Fit(formula,varexp,selection,option,goption,nentries,firstentry);}
virtual Long_t HasData() const { return GetThisTable()->HasData();}
diff --git a/misc/table/inc/TDataSet.h b/misc/table/inc/TDataSet.h
index b62a2ff97a2..bc0fb1db569 100644
--- a/misc/table/inc/TDataSet.h
+++ b/misc/table/inc/TDataSet.h
@@ -142,8 +142,8 @@ public:
virtual TDataSet *Prev() const;
virtual void Update(); // Update dataset
virtual void Update(TDataSet *set,UInt_t opt=0);// Update this dataset with the new one
- virtual Int_t Write(const Text_t *name=0, Int_t option=0, Int_t bufsize=0);
- virtual Int_t Write(const Text_t *name=0, Int_t option=0, Int_t bufsize=0) const;
+ virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0);
+ virtual Int_t Write(const char *name=0, Int_t option=0, Int_t bufsize=0) const;
ClassDef(TDataSet,1) // The base class to create the hierarchical data structures
};
diff --git a/misc/table/inc/TGenericTable.h b/misc/table/inc/TGenericTable.h
index 78982f28a4a..acd00020d95 100644
--- a/misc/table/inc/TGenericTable.h
+++ b/misc/table/inc/TGenericTable.h
@@ -47,14 +47,14 @@ public:
TGenericTable() : TTable("TGenericTable",-1), fColDescriptors(0) {SetType("generic");}
// Create TGenericTable by C structure name provided
- TGenericTable(const char *structName, const Text_t *name);
+ TGenericTable(const char *structName, const char *name);
TGenericTable(const char *structName, Int_t n);
- TGenericTable(const char *structName, const Text_t *name,Int_t n);
+ TGenericTable(const char *structName, const char *name,Int_t n);
// Create TGenericTable by TTableDescriptor pointer
- TGenericTable(const TTableDescriptor &dsc, const Text_t *name);
+ TGenericTable(const TTableDescriptor &dsc, const char *name);
TGenericTable(const TTableDescriptor &dsc, Int_t n);
- TGenericTable(const TTableDescriptor &dsc,const Text_t *name,Int_t n);
+ TGenericTable(const TTableDescriptor &dsc,const char *name,Int_t n);
virtual ~TGenericTable();
diff --git a/misc/table/inc/TIndexTable.h b/misc/table/inc/TIndexTable.h
index ae18c73af4c..a59a1fff4f9 100644
--- a/misc/table/inc/TIndexTable.h
+++ b/misc/table/inc/TIndexTable.h
@@ -73,9 +73,9 @@ protected:
virtual void SetDescriptorPointer(TTableDescriptor *list);
public:
TIndexTable() : TTable("TIndexTable",sizeof(int)) {SetType("int");}
- TIndexTable(const Text_t *name) : TTable(name,sizeof(int)) {SetType("int");}
+ TIndexTable(const char *name) : TTable(name,sizeof(int)) {SetType("int");}
TIndexTable(Int_t n) : TTable("TIndexTable",n,sizeof(int)) {SetType("int");}
- TIndexTable(const Text_t *name,Int_t n) : TTable(name,n,sizeof(int)) {SetType("int");}
+ TIndexTable(const char *name,Int_t n) : TTable(name,n,sizeof(int)) {SetType("int");}
virtual ~TIndexTable() {}
const int *GetTable(Int_t i=0) const;
int &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); }
diff --git a/misc/table/inc/TTable.h b/misc/table/inc/TTable.h
index dca115f17fb..43efa11a6da 100644
--- a/misc/table/inc/TTable.h
+++ b/misc/table/inc/TTable.h
@@ -72,7 +72,7 @@ protected:
Int_t SetfN(Long_t len);
void SetTablePointer(void *table);
void SetUsedRows(Int_t n);
- virtual void SetType(const Text_t *const type);
+ virtual void SetType(const char *const type);
void StreamerHeader(TBuffer &b,Version_t version=3);
void StreamerTable(TBuffer &b,Version_t version=3);
virtual TTableDescriptor *GetDescriptorPointer() const;
@@ -91,10 +91,10 @@ public:
// As result of the Update() method for example
};
static const char *fgTypeName[kEndColumnType];
- TTable(const Text_t *name=0, Int_t size=0);
- TTable(const Text_t *name, Int_t n,Int_t size);
- TTable(const Text_t *name, Int_t n, Char_t *array,Int_t size);
- TTable(const Text_t *name, const Text_t *type, Int_t n, Char_t *array, Int_t size);
+ TTable(const char *name=0, Int_t size=0);
+ TTable(const char *name, Int_t n,Int_t size);
+ TTable(const char *name, Int_t n, Char_t *array,Int_t size);
+ TTable(const char *name, const char *type, Int_t n, Char_t *array, Int_t size);
TTable(const TTable &table);
TTable &operator=(const TTable &rhs);
virtual ~TTable();
@@ -113,7 +113,7 @@ public:
virtual void Draw(Option_t *opt);
virtual TH1 *Draw(TCut varexp, TCut selection, Option_t *option=""
,Int_t nentries=1000000000, Int_t firstentry=0);
- virtual TH1 *Draw(const Text_t *varexp, const Text_t *selection, Option_t *option=""
+ virtual TH1 *Draw(const char *varexp, const char *selection, Option_t *option=""
,Int_t nentries=1000000000, Int_t firstentry=0); // *MENU*
void *GetArray() const ;
virtual TClass *GetRowClass() const ;
@@ -124,7 +124,7 @@ public:
virtual TTableDescriptor *GetTableDescriptors() const;
virtual TTableDescriptor *GetRowDescriptors() const;
virtual const Char_t *GetType() const;
- virtual void Fit(const Text_t *formula ,const Text_t *varexp, const Text_t *selection="",Option_t *option="" ,Option_t *goption=""
+ virtual void Fit(const char *formula ,const char *varexp, const char *selection="",Option_t *option="" ,Option_t *goption=""
,Int_t nentries=1000000000, Int_t firstentry=0); // *MENU*
virtual Long_t HasData() const { return 1; }
@@ -139,7 +139,7 @@ public:
const Char_t *colfirst="", const Char_t *collast="") const; // *MENU*
virtual void PrintContents(Option_t *opt="") const;
virtual const Char_t *PrintHeader() const; // *MENU*
- virtual void Project(const Text_t *hname, const Text_t *varexp, const Text_t *selection="", Option_t *option=""
+ virtual void Project(const char *hname, const char *varexp, const char *selection="", Option_t *option=""
,Int_t nentries=1000000000, Int_t firstentry=0);
virtual Int_t Purge(Option_t *opt="");
diff --git a/misc/table/inc/TTableDescriptor.h b/misc/table/inc/TTableDescriptor.h
index e00f374827d..aed7b660cde 100644
--- a/misc/table/inc/TTableDescriptor.h
+++ b/misc/table/inc/TTableDescriptor.h
@@ -80,9 +80,9 @@ protected:
public:
typedef tableDescriptor_st* iterator;
TTableDescriptor() : TTable("TTableDescriptor",sizeof(tableDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
- TTableDescriptor(const Text_t *name) : TTable(name,sizeof(tableDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
+ TTableDescriptor(const char *name) : TTable(name,sizeof(tableDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
TTableDescriptor(Int_t n) : TTable("TTableDescriptor",n,sizeof(tableDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
- TTableDescriptor(const Text_t *name,Int_t n) : TTable(name,n,sizeof(tableDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
+ TTableDescriptor(const char *name,Int_t n) : TTable(name,n,sizeof(tableDescriptor_st)), fRowClass(0), fSecondDescriptor(0) {SetType("tableDescriptor_st");}
tableDescriptor_st *GetTable(Int_t i=0) const { return ((tableDescriptor_st *)GetArray())+i;}
tableDescriptor_st &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); }
const tableDescriptor_st &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); return *((const tableDescriptor_st *)(GetTable(i))); }
diff --git a/misc/table/inc/TTableSorter.h b/misc/table/inc/TTableSorter.h
index 72b233a0a6c..e551d007e4f 100644
--- a/misc/table/inc/TTableSorter.h
+++ b/misc/table/inc/TTableSorter.h
@@ -164,13 +164,13 @@ public:
Int_t BinarySearch(Char_t value ) const;
Int_t BinarySearch(Bool_t value ) const;
- virtual const Text_t *GetColumnName() const { return fColName.Data();}
+ virtual const char *GetColumnName() const { return fColName.Data();}
Int_t GetIndex(UInt_t sortedIndex) const;
virtual const void *GetKeyAddress(Int_t indx) { return (fSortIndex && indx >= 0) ?fSortIndex[indx]:(void *)(-1);}
virtual Int_t GetLastFound() const { return fLastFound; }
- virtual const Text_t *GetTableName() const;
- virtual const Text_t *GetTableTitle() const;
- virtual const Text_t *GetTableType() const;
+ virtual const char *GetTableName() const;
+ virtual const char *GetTableTitle() const;
+ virtual const char *GetTableType() const;
virtual TTable *GetTable() const;
virtual Int_t GetNRows() const { return fNumberOfRows;}
virtual Int_t GetFirstRow() const { return fFirstRow;}
diff --git a/misc/table/inc/TVolume.h b/misc/table/inc/TVolume.h
index af39fa04be9..f684d8e5951 100644
--- a/misc/table/inc/TVolume.h
+++ b/misc/table/inc/TVolume.h
@@ -63,12 +63,12 @@ protected:
friend class TPolyLineShape;
public:
TVolume();
- TVolume(const Text_t *name, const Text_t *title, const Text_t *shapename, Option_t *option="");
- TVolume(const Text_t *name, const Text_t *title, TShape *shape, Option_t *option="");
+ TVolume(const char *name, const char *title, const char *shapename, Option_t *option="");
+ TVolume(const char *name, const char *title, TShape *shape, Option_t *option="");
TVolume(TNode &node);
virtual ~TVolume();
virtual TVolumePosition *Add(TVolume *node, Double_t x=0, Double_t y=0, Double_t z=0, TRotMatrix *matrix=0, UInt_t id=0, Option_t *option="");
- virtual TVolumePosition *Add(TVolume *node, Double_t x, Double_t y, Double_t z, const Text_t *matrixname, UInt_t id=0, Option_t *option="");
+ virtual TVolumePosition *Add(TVolume *node, Double_t x, Double_t y, Double_t z, const char *matrixname, UInt_t id=0, Option_t *option="");
static Int_t MapStNode2GEANTVis(ENodeSEEN vis);
static Int_t MapGEANT2StNodeVis(Int_t vis);
virtual void Add(TShape *shape, Bool_t IsMaster=kFALSE);
@@ -80,7 +80,7 @@ public:
virtual void DrawOnly(Option_t *option="");
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
static TRotMatrix *GetIdentity();
- virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
const Option_t *GetOption() const { return fOption.Data();}
TShape *GetShape() const {return fShape;}
TList *GetListOfShapes() const {return fListOfShapes;}
diff --git a/misc/table/inc/TVolumePosition.h b/misc/table/inc/TVolumePosition.h
index bd4d6562982..19e8ef129c8 100644
--- a/misc/table/inc/TVolumePosition.h
+++ b/misc/table/inc/TVolumePosition.h
@@ -40,7 +40,7 @@ public:
kIsOwn = BIT(23) // if the TVolumePoistion doesn't own the TRotMatrix object
};
TVolumePosition(TVolume *node=0,Double_t x=0, Double_t y=0, Double_t z=0, TRotMatrix *matrix=0);
- TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const Text_t *matrixname);
+ TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const char *matrixname);
TVolumePosition(const TVolumePosition* oldPosition, const TVolumePosition* curPosition);
TVolumePosition(const TVolumePosition&pos);
virtual ~TVolumePosition();
@@ -61,7 +61,7 @@ public:
virtual void Draw(Option_t *depth="3"); // *MENU*
virtual void ExecuteEvent(Int_t event, Int_t px, Int_t py);
virtual TVolume *GetNode() const {return fNode;}
- virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
const Option_t *GetOption() const { return GetNode()?GetNode()->GetOption():0;}
virtual const Char_t *GetName() const;
const TRotMatrix *GetMatrix() const;
diff --git a/misc/table/inc/TVolumeView.h b/misc/table/inc/TVolumeView.h
index 25c24a01094..23b93c307be 100644
--- a/misc/table/inc/TVolumeView.h
+++ b/misc/table/inc/TVolumeView.h
@@ -54,7 +54,7 @@ public:
virtual Int_t GetGlobalRange(const TVolumeView *rootNode,Float_t *min, Float_t *max);
virtual TList *GetListOfShapes() const;
virtual void GetLocalRange(Float_t *min, Float_t *max);
- virtual Text_t *GetObjectInfo(Int_t px, Int_t py) const;
+ virtual char *GetObjectInfo(Int_t px, Int_t py) const;
virtual TShape *GetShape() const;
virtual Int_t GetVisibility() const;
virtual Bool_t IsMarked() const;
diff --git a/misc/table/inc/Ttypes.h b/misc/table/inc/Ttypes.h
index cb962fbfdc8..60cfa2eac87 100644
--- a/misc/table/inc/Ttypes.h
+++ b/misc/table/inc/Ttypes.h
@@ -71,9 +71,9 @@ virtual void SetDescriptorPointer(TTableDescriptor *list) { fgColDescriptors =
public: \
typedef structName* iterator; \
className() : TTable(_QUOTE_(className),sizeof(structName)) {SetType(_QUOTE_(structName));} \
- className(const Text_t *name) : TTable(name,sizeof(structName)) {SetType(_QUOTE_(structName));} \
+ className(const char *name) : TTable(name,sizeof(structName)) {SetType(_QUOTE_(structName));} \
className(Int_t n) : TTable(_QUOTE_(className),n,sizeof(structName)) {SetType(_QUOTE_(structName));}\
- className(const Text_t *name,Int_t n) : TTable(name,n,sizeof(structName)) {SetType(_QUOTE_(structName));}\
+ className(const char *name,Int_t n) : TTable(name,n,sizeof(structName)) {SetType(_QUOTE_(structName));}\
structName *GetTable(Int_t i=0) const { return ((structName *)GetArray())+i;} \
structName &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); } \
const structName &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); return *((const structName *)(GetTable(i))); } \
diff --git a/misc/table/src/TDataSet.cxx b/misc/table/src/TDataSet.cxx
index c2f9fb23c3b..ee454a2f4da 100644
--- a/misc/table/src/TDataSet.cxx
+++ b/misc/table/src/TDataSet.cxx
@@ -848,7 +848,7 @@ void TDataSet::Sort()
}
//______________________________________________________________________________
-Int_t TDataSet::Write(const Text_t *name, Int_t option, Int_t bufsize)
+Int_t TDataSet::Write(const char *name, Int_t option, Int_t bufsize)
{
//
// To Write object first we should temporary break the
@@ -863,7 +863,7 @@ Int_t TDataSet::Write(const Text_t *name, Int_t option, Int_t bufsize)
}
//______________________________________________________________________________
-Int_t TDataSet::Write(const Text_t *name, Int_t option, Int_t bufsize) const
+Int_t TDataSet::Write(const char *name, Int_t option, Int_t bufsize) const
{
//
// To Write object first we should temporary break the
diff --git a/misc/table/src/TGenericTable.cxx b/misc/table/src/TGenericTable.cxx
index 1421fe975ba..cee14830f39 100644
--- a/misc/table/src/TGenericTable.cxx
+++ b/misc/table/src/TGenericTable.cxx
@@ -105,7 +105,7 @@
// Create TGenericTable by TTableDescriptor pointer
//______________________________________________________________________________
-TGenericTable::TGenericTable(const TTableDescriptor &dsc, const Text_t *name) : TTable(name,dsc.Sizeof()),fColDescriptors(0)
+TGenericTable::TGenericTable(const TTableDescriptor &dsc, const char *name) : TTable(name,dsc.Sizeof()),fColDescriptors(0)
{
///////////////////////////////////////////////////////////
//
@@ -139,7 +139,7 @@ TGenericTable::TGenericTable(const TTableDescriptor &dsc, Int_t n) : TTable("TGe
}
//______________________________________________________________________________
-TGenericTable::TGenericTable(const TTableDescriptor &dsc,const Text_t *name,Int_t n) : TTable(name,n,dsc.Sizeof()),fColDescriptors(0)
+TGenericTable::TGenericTable(const TTableDescriptor &dsc,const char *name,Int_t n) : TTable(name,n,dsc.Sizeof()),fColDescriptors(0)
{
///////////////////////////////////////////////////////////
//
@@ -158,7 +158,7 @@ TGenericTable::TGenericTable(const TTableDescriptor &dsc,const Text_t *name,Int_
// Create TGenericTable by C structure name provided
//______________________________________________________________________________
-TGenericTable::TGenericTable(const char *structName, const Text_t *name) : TTable(name,-1),fColDescriptors(0)
+TGenericTable::TGenericTable(const char *structName, const char *name) : TTable(name,-1),fColDescriptors(0)
{
///////////////////////////////////////////////////////////
//
@@ -200,7 +200,7 @@ TGenericTable::TGenericTable(const char *structName, Int_t n) : TTable("TGeneric
SetGenericType();
}
//______________________________________________________________________________
-TGenericTable::TGenericTable(const char *structName, const Text_t *name,Int_t n) : TTable(name,-1),fColDescriptors(0)
+TGenericTable::TGenericTable(const char *structName, const char *name,Int_t n) : TTable(name,-1),fColDescriptors(0)
{
///////////////////////////////////////////////////////////
//
diff --git a/misc/table/src/TTable.cxx b/misc/table/src/TTable.cxx
index 2e8913020c0..5762a20ee48 100644
--- a/misc/table/src/TTable.cxx
+++ b/misc/table/src/TTable.cxx
@@ -86,9 +86,9 @@
// public:
// typedef structName* iterator;
// className() : TTable(_QUOTE_(className),sizeof(structName)) {SetType(_QUOTE_(structName));}
-// className(const Text_t *name) : TTable(name,sizeof(structName)) {SetType(_QUOTE_(structName));}
+// className(const char *name) : TTable(name,sizeof(structName)) {SetType(_QUOTE_(structName));}
// className(Int_t n) : TTable(_QUOTE_(className),n,sizeof(structName)) {SetType(_QUOTE_(structName));}
-// className(const Text_t *name,Int_t n) : TTable(name,n,sizeof(structName)) {SetType(_QUOTE_(structName));}
+// className(const char *name,Int_t n) : TTable(name,n,sizeof(structName)) {SetType(_QUOTE_(structName));}
// structName *GetTable(Int_t i=0) const { return ((structName *)GetArray())+i;}
// structName &operator[](Int_t i){ assert(i>=0 && i < GetNRows()); return *GetTable(i); }
// const structName &operator[](Int_t i) const { assert(i>=0 && i < GetNRows()); return *((const structName *)(GetTable(i))); }
@@ -371,7 +371,7 @@ TH1 *TTable::Draw(TCut varexp, TCut selection, Option_t *option, Int_t nentries
}
//______________________________________________________________________________
-TH1 *TTable::Draw(const Text_t *varexp00, const Text_t *selection, Option_t *option,Int_t nentries, Int_t firstentry)
+TH1 *TTable::Draw(const char *varexp00, const char *selection, Option_t *option,Int_t nentries, Int_t firstentry)
{
//*-*-*-*-*-*-*-*-*-*-*Draw expression varexp for specified entries-*-*-*-*-*
//*-* ===========================================
@@ -470,14 +470,14 @@ TH1 *TTable::Draw(const Text_t *varexp00, const Text_t *selection, Option_t *opt
if (GetNRows() == 0 || varexp00 == 0 || varexp00[0]==0) return 0;
TString opt;
-// Text_t *hdefault = (char *)"htemp";
+// char *hdefault = (char *)"htemp";
const char *hdefault = "htemp";
Int_t i,j,action;
Int_t hkeep = 0;
opt = option;
opt.ToLower();
- Text_t *varexp0 = StrDup(varexp00);
- Text_t *hname = strstr(varexp0,">>");
+ char *varexp0 = StrDup(varexp00);
+ char *hname = strstr(varexp0,">>");
TH1 *oldh1 = 0;
TEventList *elist = 0;
Bool_t profile = kFALSE;
@@ -1022,7 +1022,7 @@ Bool_t TTable::EntryLoop(const Char_t *exprFileName,Int_t &action, TObject *obj
}
//______________________________________________________________________________
-TTable::TTable(const Text_t *name, Int_t size) : TDataSet(name),
+TTable::TTable(const char *name, Int_t size) : TDataSet(name),
fSize(size),fN(0), fTable(0),fMaxIndex(0)
{
// Default TTable ctor.
@@ -1030,7 +1030,7 @@ TTable::TTable(const Text_t *name, Int_t size) : TDataSet(name),
}
//______________________________________________________________________________
-TTable::TTable(const Text_t *name, Int_t n,Int_t size) : TDataSet(name),
+TTable::TTable(const char *name, Int_t n,Int_t size) : TDataSet(name),
fSize(size),fN(0),fTable(0),fMaxIndex(0)
{
// Create TTable object and set array size to n longs.
@@ -1038,7 +1038,7 @@ TTable::TTable(const Text_t *name, Int_t n,Int_t size) : TDataSet(name),
}
//______________________________________________________________________________
-TTable::TTable(const Text_t *name, Int_t n, Char_t *table,Int_t size) : TDataSet(name),
+TTable::TTable(const char *name, Int_t n, Char_t *table,Int_t size) : TDataSet(name),
fSize(size),fN(0),fTable(0),fMaxIndex(0)
{
// Create TTable object and initialize it with values of array.
@@ -1047,7 +1047,7 @@ TTable::TTable(const Text_t *name, Int_t n, Char_t *table,Int_t size) : TDataSet
}
//______________________________________________________________________________
-TTable::TTable(const Text_t *name, const Text_t *type, Int_t n, Char_t *array, Int_t size)
+TTable::TTable(const char *name, const char *type, Int_t n, Char_t *array, Int_t size)
: TDataSet(name),fSize(size),fTable(0),fMaxIndex(0)
{
// Create TTable object and initialize it with values of array.
@@ -1386,7 +1386,7 @@ Long_t TTable::GetTableSize() const {
}
//______________________________________________________________________________
-void TTable::Fit(const Text_t *formula ,const Text_t *varexp, const Text_t *selection,Option_t *option ,Option_t *goption,Int_t nentries, Int_t firstentry)
+void TTable::Fit(const char *formula ,const char *varexp, const char *selection,Option_t *option ,Option_t *goption,Int_t nentries, Int_t firstentry)
{
//*-*-*-*-*-*-*-*-*Fit a projected item(s) from a TTable*-*-*-*-*-*-*-*-*-*
//*-* =======================================
@@ -1766,7 +1766,7 @@ void TTable::PrintContents(Option_t *) const
}
//______________________________________________________________________________
-void TTable::Project(const Text_t *hname, const Text_t *varexp, const Text_t *selection, Option_t *option,Int_t nentries, Int_t firstentry)
+void TTable::Project(const char *hname, const char *varexp, const char *selection, Option_t *option,Int_t nentries, Int_t firstentry)
{
//*-*-*-*-*-*-*-*-*Make a projection of a TTable using selections*-*-*-*-*-*-*
//*-* =============================================
@@ -1959,7 +1959,7 @@ void TTable::SetTablePointer(void *table)
}
//______________________________________________________________________________
-void TTable::SetType(const Text_t *const type)
+void TTable::SetType(const char *const type)
{
//to be documented
SetTitle(type);
diff --git a/misc/table/src/TTableSorter.cxx b/misc/table/src/TTableSorter.cxx
index 4e3a60a1e6f..8c56c2f9c99 100644
--- a/misc/table/src/TTableSorter.cxx
+++ b/misc/table/src/TTableSorter.cxx
@@ -769,21 +769,21 @@ Int_t TTableSorter::FindFirstKey(const void *key) const
}
//_____________________________________________________________________________
-const Text_t * TTableSorter::GetTableName() const
+const char * TTableSorter::GetTableName() const
{
//to be documented
return fParentTable ? fParentTable->GetName():"";
}
//_____________________________________________________________________________
-const Text_t * TTableSorter::GetTableTitle() const
+const char * TTableSorter::GetTableTitle() const
{
//to be documented
return fParentTable ? fParentTable->GetTitle():"";
}
//_____________________________________________________________________________
-const Text_t * TTableSorter::GetTableType() const
+const char * TTableSorter::GetTableType() const
{
//to be documented
return fParentTable ? fParentTable->GetType():"";
diff --git a/misc/table/src/TVolume.cxx b/misc/table/src/TVolume.cxx
index 01ce0519eab..e3ee22170c0 100644
--- a/misc/table/src/TVolume.cxx
+++ b/misc/table/src/TVolume.cxx
@@ -81,7 +81,7 @@ TVolume::TVolume()
}
//______________________________________________________________________________
-TVolume::TVolume(const Text_t *name, const Text_t *title, const Text_t *shapename, Option_t *option)
+TVolume::TVolume(const char *name, const char *title, const char *shapename, Option_t *option)
:TObjectSet(name),TAttLine(), TAttFill(),fShape(0),fListOfShapes(0)
{
//*-*-*-*-*-*-*-*-*-*-*Volume normal constructor*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -113,7 +113,7 @@ TVolume::TVolume(const Text_t *name, const Text_t *title, const Text_t *shapenam
//______________________________________________________________________________
-TVolume::TVolume(const Text_t *name, const Text_t *title, TShape *shape, Option_t *option)
+TVolume::TVolume(const char *name, const char *title, TShape *shape, Option_t *option)
:TObjectSet(name),TAttLine(),TAttFill(),fShape(0),fListOfShapes(0)
{
//*-*-*-*-*-*-*-*-*-*-*Volume normal constructor*-*-*-*-*-*-*-*-*-*-*
@@ -300,7 +300,7 @@ TVolumePosition *TVolume::Add(TVolume *volume, Double_t x, Double_t y, Double_t
//______________________________________________________________________________
TVolumePosition *TVolume::Add(TVolume *volume, Double_t x, Double_t y, Double_t z,
- const Text_t *matrixname, UInt_t id, Option_t *)
+ const char *matrixname, UInt_t id, Option_t *)
{
//*-*
//*-* volume the pointer to the volume to be placed
@@ -527,7 +527,7 @@ TRotMatrix *TVolume::GetIdentity()
}
//______________________________________________________________________________
-Text_t *TVolume::GetObjectInfo(Int_t px, Int_t py) const
+char *TVolume::GetObjectInfo(Int_t px, Int_t py) const
{
//to be documented
if (!gPad) return 0;
diff --git a/misc/table/src/TVolumePosition.cxx b/misc/table/src/TVolumePosition.cxx
index aa528a75f64..8bc7c2ccd09 100644
--- a/misc/table/src/TVolumePosition.cxx
+++ b/misc/table/src/TVolumePosition.cxx
@@ -49,7 +49,7 @@ ClassImp(TVolumePosition)
//______________________________________________________________________________
-TVolumePosition::TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const Text_t *matrixname)
+TVolumePosition::TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const char *matrixname)
: fMatrix(0),fNode(node),fId(0)
{
//*-*-*-*-*-*-*-*-*-*-*Node normal constructor*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
@@ -221,7 +221,7 @@ const Char_t *TVolumePosition::GetName() const
}
//______________________________________________________________________________
-Text_t *TVolumePosition::GetObjectInfo(Int_t, Int_t) const
+char *TVolumePosition::GetObjectInfo(Int_t, Int_t) const
{
//to be documented
if (!gPad) return 0;
@@ -486,7 +486,7 @@ void TVolumePosition::SavePrimitive(ostream &, Option_t * /*= ""*/)
Double_t y = GetY();
Double_t z = GetZ();
TRotMatrix *matrix =
- myPosition = new TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const Text_t *matrixname)
+ myPosition = new TVolumePosition(TVolume *node,Double_t x, Double_t y, Double_t z, const char *matrixname)
: fNode(node),fX(x),fY(y),fZ(z),fMatrix(0)
{
/
diff --git a/misc/table/src/TVolumeView.cxx b/misc/table/src/TVolumeView.cxx
index ba48b62cf57..eb84603da9c 100644
--- a/misc/table/src/TVolumeView.cxx
+++ b/misc/table/src/TVolumeView.cxx
@@ -353,7 +353,7 @@ TVolumeView::TVolumeView(Double_t *translate, Double_t *rotate, UInt_t positionI
thisPosition = new TVolumePosition(thisNode,thisX, thisY, thisZ);
else if (rotate) {
const Char_t *title = "rotation";
- thisRotMatrix = new TRotMatrix((Text_t *)matrixName,(Text_t *)title,rotate);
+ thisRotMatrix = new TRotMatrix((char *)matrixName,(char *)title,rotate);
thisPosition = new TVolumePosition(thisNode,thisX, thisY, thisZ, thisRotMatrix);
} else
Error("TVolumeView"," No rotation matrix is defined");
@@ -618,7 +618,7 @@ void TVolumeView::GetLocalRange(Float_t *min, Float_t *max)
}
//______________________________________________________________________________
-Text_t *TVolumeView::GetObjectInfo(Int_t px, Int_t py) const
+char *TVolumeView::GetObjectInfo(Int_t px, Int_t py) const
{
//to be documented
if (!gPad) return 0;
diff --git a/montecarlo/vmc/inc/TGeoMCGeometry.h b/montecarlo/vmc/inc/TGeoMCGeometry.h
index 11dccffff00..932d182b03e 100644
--- a/montecarlo/vmc/inc/TGeoMCGeometry.h
+++ b/montecarlo/vmc/inc/TGeoMCGeometry.h
@@ -121,9 +121,9 @@ public:
//virtual void WriteEuclid(const char*, const char*, Int_t, Int_t);
// get methods
- virtual Int_t VolId(const Text_t* volName) const;
+ virtual Int_t VolId(const char* volName) const;
virtual const char* VolName(Int_t id) const;
- virtual Int_t MediumId(const Text_t* mediumName) const;
+ virtual Int_t MediumId(const char* mediumName) const;
virtual Int_t NofVolumes() const;
virtual Int_t NofVolDaughters(const char* volName) const;
virtual const char* VolDaughterName(const char* volName, Int_t i) const;
diff --git a/montecarlo/vmc/inc/TVirtualMC.h b/montecarlo/vmc/inc/TVirtualMC.h
index be76aa1668a..d2665a0d7bb 100644
--- a/montecarlo/vmc/inc/TVirtualMC.h
+++ b/montecarlo/vmc/inc/TVirtualMC.h
@@ -428,13 +428,13 @@ public:
//
// Return the unique numeric identifier for volume name volName
- virtual Int_t VolId(const Text_t* volName) const = 0;
+ virtual Int_t VolId(const char* volName) const = 0;
// Return the volume name for a given volume identifier id
virtual const char* VolName(Int_t id) const = 0;
// Return the unique numeric identifier for medium name mediumName
- virtual Int_t MediumId(const Text_t* mediumName) const;
+ virtual Int_t MediumId(const char* mediumName) const;
// Return total number of volumes in the geometry
virtual Int_t NofVolumes() const = 0;
@@ -903,7 +903,7 @@ private:
// new functions
-inline Int_t TVirtualMC::MediumId(const Text_t* /*mediumName*/) const {
+inline Int_t TVirtualMC::MediumId(const char* /*mediumName*/) const {
Warning("MediumId", "New function - not yet implemented.");
return 0;
}
diff --git a/montecarlo/vmc/inc/TVirtualMCGeometry.h b/montecarlo/vmc/inc/TVirtualMCGeometry.h
index 72572e8138e..00905aae7a8 100644
--- a/montecarlo/vmc/inc/TVirtualMCGeometry.h
+++ b/montecarlo/vmc/inc/TVirtualMCGeometry.h
@@ -266,13 +266,13 @@ public:
// Return the unique numeric identifier for volume name volName
- virtual Int_t VolId(const Text_t* volName) const = 0;
+ virtual Int_t VolId(const char* volName) const = 0;
// Return the volume name for a given volume identifier id
virtual const char* VolName(Int_t id) const = 0;
// Return the unique numeric identifier for medium name mediumName
- virtual Int_t MediumId(const Text_t* mediumName) const = 0;
+ virtual Int_t MediumId(const char* mediumName) const = 0;
// Return total number of volumes in the geometry
virtual Int_t NofVolumes() const = 0;
diff --git a/montecarlo/vmc/src/TGeoMCGeometry.cxx b/montecarlo/vmc/src/TGeoMCGeometry.cxx
index 67b6bd55b3f..2712571ac3c 100644
--- a/montecarlo/vmc/src/TGeoMCGeometry.cxx
+++ b/montecarlo/vmc/src/TGeoMCGeometry.cxx
@@ -534,7 +534,7 @@ void TGeoMCGeometry::Gsposp(const char *name, Int_t nr, const char *mother,
}
//_____________________________________________________________________________
-Int_t TGeoMCGeometry::VolId(const Text_t *name) const
+Int_t TGeoMCGeometry::VolId(const char *name) const
{
//
// Return the unique numeric identifier for volume name
@@ -549,7 +549,7 @@ Int_t TGeoMCGeometry::VolId(const Text_t *name) const
}
//_____________________________________________________________________________
-Int_t TGeoMCGeometry::MediumId(const Text_t *name) const
+Int_t TGeoMCGeometry::MediumId(const char *name) const
{
//
// Return the unique numeric identifier for medium name
diff --git a/roofit/roofitcore/inc/RooAbsArg.h b/roofit/roofitcore/inc/RooAbsArg.h
index 0ff981f50a7..12051633a61 100644
--- a/roofit/roofitcore/inc/RooAbsArg.h
+++ b/roofit/roofitcore/inc/RooAbsArg.h
@@ -203,23 +203,23 @@ public:
virtual Int_t defaultPrintContents(Option_t* opt) const ;
// Accessors to attributes
- void setAttribute(const Text_t* name, Bool_t value=kTRUE) ;
- Bool_t getAttribute(const Text_t* name) const ;
+ void setAttribute(const char* name, Bool_t value=kTRUE) ;
+ Bool_t getAttribute(const char* name) const ;
inline const std::set<std::string>& attributes() const {
// Returns set of names of boolean attributes defined
return _boolAttrib ;
}
- void setStringAttribute(const Text_t* key, const Text_t* value) ;
- const Text_t* getStringAttribute(const Text_t* key) const ;
+ void setStringAttribute(const char* key, const char* value) ;
+ const char* getStringAttribute(const char* key) const ;
inline const std::map<std::string,std::string>& stringAttributes() const {
// Returns map<string,string> with all string attributes defined
return _stringAttrib ;
}
// Accessors to transient attributes
- void setTransientAttribute(const Text_t* name, Bool_t value=kTRUE) ;
- Bool_t getTransientAttribute(const Text_t* name) const ;
+ void setTransientAttribute(const char* name, Bool_t value=kTRUE) ;
+ Bool_t getTransientAttribute(const char* name) const ;
inline const std::set<std::string>& transientAttributes() const {
// Return set of transient boolean attributes
return _boolAttribTransient ;
diff --git a/roofit/roofitcore/inc/RooAbsCollection.h b/roofit/roofitcore/inc/RooAbsCollection.h
index c7fa4ef8e5f..c7a4c39aca1 100644
--- a/roofit/roofitcore/inc/RooAbsCollection.h
+++ b/roofit/roofitcore/inc/RooAbsCollection.h
@@ -71,7 +71,7 @@ public:
Bool_t remove(const RooAbsCollection& list, Bool_t silent=kFALSE, Bool_t matchByNameOnly=kFALSE) ;
// Group operations on AbsArgs
- void setAttribAll(const Text_t* name, Bool_t value=kTRUE) ;
+ void setAttribAll(const char* name, Bool_t value=kTRUE) ;
// List search methods
RooAbsArg *find(const char *name) const ;
diff --git a/roofit/roofitcore/inc/RooAbsReal.h b/roofit/roofitcore/inc/RooAbsReal.h
index 6f4d70f25b3..2e8be627c92 100644
--- a/roofit/roofitcore/inc/RooAbsReal.h
+++ b/roofit/roofitcore/inc/RooAbsReal.h
@@ -60,7 +60,7 @@ public:
}
Bool_t operator==(Double_t value) const ;
virtual Bool_t operator==(const RooAbsArg& other) ;
- inline const Text_t *getUnit() const {
+ inline const char *getUnit() const {
// Return string with unit description
return _unit.Data();
}
diff --git a/roofit/roofitcore/inc/RooCatType.h b/roofit/roofitcore/inc/RooCatType.h
index 4966be3a865..d35078fc95b 100644
--- a/roofit/roofitcore/inc/RooCatType.h
+++ b/roofit/roofitcore/inc/RooCatType.h
@@ -42,11 +42,11 @@ public:
} ;
virtual TObject* Clone(const char*) const { return new RooCatType(*this); }
- virtual const Text_t* GetName() const {
+ virtual const char* GetName() const {
// Return state name
return _label ;
}
- virtual void SetName(const Text_t* name) ;
+ virtual void SetName(const char* name) ;
inline RooCatType& operator=(const RooCatType& other) {
// Assignment operator from other RooCatType
diff --git a/roofit/roofitcore/src/RooAbsArg.cxx b/roofit/roofitcore/src/RooAbsArg.cxx
index 37e1379eed9..c2ba230ce89 100644
--- a/roofit/roofitcore/src/RooAbsArg.cxx
+++ b/roofit/roofitcore/src/RooAbsArg.cxx
@@ -234,7 +234,7 @@ Bool_t RooAbsArg::isCloneOf(const RooAbsArg& other) const
//_____________________________________________________________________________
-void RooAbsArg::setAttribute(const Text_t* name, Bool_t value)
+void RooAbsArg::setAttribute(const char* name, Bool_t value)
{
// Set (default) or clear a named boolean attribute of this object.
@@ -255,7 +255,7 @@ void RooAbsArg::setAttribute(const Text_t* name, Bool_t value)
//_____________________________________________________________________________
-Bool_t RooAbsArg::getAttribute(const Text_t* name) const
+Bool_t RooAbsArg::getAttribute(const char* name) const
{
// Check if a named attribute is set. By default, all attributes are unset.
@@ -264,7 +264,7 @@ Bool_t RooAbsArg::getAttribute(const Text_t* name) const
//_____________________________________________________________________________
-void RooAbsArg::setStringAttribute(const Text_t* key, const Text_t* value)
+void RooAbsArg::setStringAttribute(const char* key, const char* value)
{
// Associate string 'value' to this object under key 'key'
@@ -278,7 +278,7 @@ void RooAbsArg::setStringAttribute(const Text_t* key, const Text_t* value)
}
//_____________________________________________________________________________
-const Text_t* RooAbsArg::getStringAttribute(const Text_t* key) const
+const char* RooAbsArg::getStringAttribute(const char* key) const
{
// Get string attribute mapped under key 'key'. Returns null pointer
// if no attribute exists under that key
@@ -293,7 +293,7 @@ const Text_t* RooAbsArg::getStringAttribute(const Text_t* key) const
//_____________________________________________________________________________
-void RooAbsArg::setTransientAttribute(const Text_t* name, Bool_t value)
+void RooAbsArg::setTransientAttribute(const char* name, Bool_t value)
{
// Set (default) or clear a named boolean attribute of this object.
@@ -314,7 +314,7 @@ void RooAbsArg::setTransientAttribute(const Text_t* name, Bool_t value)
//_____________________________________________________________________________
-Bool_t RooAbsArg::getTransientAttribute(const Text_t* name) const
+Bool_t RooAbsArg::getTransientAttribute(const char* name) const
{
// Check if a named attribute is set. By default, all attributes
// are unset.
diff --git a/roofit/roofitcore/src/RooAbsCategory.cxx b/roofit/roofitcore/src/RooAbsCategory.cxx
index c1aa2d03a86..c1e948360d0 100644
--- a/roofit/roofitcore/src/RooAbsCategory.cxx
+++ b/roofit/roofitcore/src/RooAbsCategory.cxx
@@ -493,7 +493,7 @@ void RooAbsCategory::attachToTree(TTree& t, Int_t bufSize)
TString format(idxName);
format.Append("/I");
void* ptr = &(_value._value) ;
- branch = t.Branch(idxName, ptr, (const Text_t*)format, bufSize);
+ branch = t.Branch(idxName, ptr, (const char*)format, bufSize);
branch->SetCompressionLevel(1) ;
}
@@ -510,7 +510,7 @@ void RooAbsCategory::attachToTree(TTree& t, Int_t bufSize)
TString format(lblName);
format.Append("/C");
void* ptr = _value._label ;
- branch = t.Branch(lblName, ptr, (const Text_t*)format, bufSize);
+ branch = t.Branch(lblName, ptr, (const char*)format, bufSize);
branch->SetCompressionLevel(1) ;
}
diff --git a/roofit/roofitcore/src/RooAbsCollection.cxx b/roofit/roofitcore/src/RooAbsCollection.cxx
index 9304c8fb404..5ec2532cffc 100644
--- a/roofit/roofitcore/src/RooAbsCollection.cxx
+++ b/roofit/roofitcore/src/RooAbsCollection.cxx
@@ -584,7 +584,7 @@ void RooAbsCollection::removeAll()
//_____________________________________________________________________________
-void RooAbsCollection::setAttribAll(const Text_t* name, Bool_t value)
+void RooAbsCollection::setAttribAll(const char* name, Bool_t value)
{
// Set given attribute in each element of the collection by
// calling each elements setAttribute() function.
diff --git a/roofit/roofitcore/src/RooAbsReal.cxx b/roofit/roofitcore/src/RooAbsReal.cxx
index a026e63883e..39c405341c3 100644
--- a/roofit/roofitcore/src/RooAbsReal.cxx
+++ b/roofit/roofitcore/src/RooAbsReal.cxx
@@ -2471,7 +2471,7 @@ void RooAbsReal::attachToTree(TTree& t, Int_t bufSize)
TString format(cleanName);
format.Append("/D");
- branch = t.Branch(cleanName, &_value, (const Text_t*)format, bufSize);
+ branch = t.Branch(cleanName, &_value, (const char*)format, bufSize);
branch->SetCompressionLevel(1) ;
// cout << "RooAbsReal::attachToTree(" << cleanName << "): creating new branch in tree " << (void*)&t << endl ;
}
diff --git a/roofit/roofitcore/src/RooAbsString.cxx b/roofit/roofitcore/src/RooAbsString.cxx
index e1611114bfe..dd53447a0cd 100644
--- a/roofit/roofitcore/src/RooAbsString.cxx
+++ b/roofit/roofitcore/src/RooAbsString.cxx
@@ -237,7 +237,7 @@ void RooAbsString::attachToTree(TTree& t, Int_t bufSize)
} else {
TString format(GetName());
format.Append("/C");
- branch = t.Branch(GetName(), _value, (const Text_t*)format, bufSize);
+ branch = t.Branch(GetName(), _value, (const char*)format, bufSize);
branch->SetCompressionLevel(1) ;
}
}
diff --git a/roofit/roofitcore/src/RooCatType.cxx b/roofit/roofitcore/src/RooCatType.cxx
index f2457e7c0de..facc7592408 100644
--- a/roofit/roofitcore/src/RooCatType.cxx
+++ b/roofit/roofitcore/src/RooCatType.cxx
@@ -39,7 +39,7 @@ ClassImp(RooCatType)
//_____________________________________________________________________________
-void RooCatType::SetName(const Text_t* name)
+void RooCatType::SetName(const char* name)
{
// Constructor with name argument
if (strlen(name)>255) {
diff --git a/roofit/roofitcore/src/RooRealVar.cxx b/roofit/roofitcore/src/RooRealVar.cxx
index 4d7a7db45f8..88592880481 100644
--- a/roofit/roofitcore/src/RooRealVar.cxx
+++ b/roofit/roofitcore/src/RooRealVar.cxx
@@ -936,7 +936,7 @@ void RooRealVar::attachToTree(TTree& t, Int_t bufSize)
} else {
TString format2(errName);
format2.Append("/D");
- t.Branch(errName, &_error, (const Text_t*)format2, bufSize);
+ t.Branch(errName, &_error, (const char*)format2, bufSize);
}
}
@@ -950,7 +950,7 @@ void RooRealVar::attachToTree(TTree& t, Int_t bufSize)
} else {
TString format2(loName);
format2.Append("/D");
- t.Branch(loName, &_asymErrLo, (const Text_t*)format2, bufSize);
+ t.Branch(loName, &_asymErrLo, (const char*)format2, bufSize);
}
TString hiName(GetName()) ;
@@ -961,7 +961,7 @@ void RooRealVar::attachToTree(TTree& t, Int_t bufSize)
} else {
TString format2(hiName);
format2.Append("/D");
- t.Branch(hiName, &_asymErrHi, (const Text_t*)format2, bufSize);
+ t.Branch(hiName, &_asymErrHi, (const char*)format2, bufSize);
}
}
}
diff --git a/test/RootShower/GTitleFrame.cxx b/test/RootShower/GTitleFrame.cxx
index f729070dc5f..70837b9fe3a 100644
--- a/test/RootShower/GTitleFrame.cxx
+++ b/test/RootShower/GTitleFrame.cxx
@@ -22,8 +22,8 @@
//______________________________________________________________________________
//______________________________________________________________________________
-GTitleFrame::GTitleFrame(const TGWindow *p, const Text_t *mainText,
- const Text_t *subText, UInt_t w, UInt_t h,
+GTitleFrame::GTitleFrame(const TGWindow *p, const char *mainText,
+ const char *subText, UInt_t w, UInt_t h,
UInt_t options) : TGCompositeFrame(p, w, h, options)
{
// Create GTitleFrame object, with TGWindow parent 'p', text 'mainText'
diff --git a/test/RootShower/GTitleFrame.h b/test/RootShower/GTitleFrame.h
index a4763038ec3..1f2cad8c863 100644
--- a/test/RootShower/GTitleFrame.h
+++ b/test/RootShower/GTitleFrame.h
@@ -47,7 +47,7 @@ private:
public:
// Constructor & destructor
- GTitleFrame(const TGWindow *p, const Text_t *mainText, const Text_t *subText,
+ GTitleFrame(const TGWindow *p, const char *mainText, const char *subText,
UInt_t w, UInt_t h, UInt_t options = kHorizontalFrame | kRaisedFrame);
void ChangeRightLogo(Int_t frame);
virtual ~GTitleFrame();
diff --git a/test/RootShower/RootShower.cxx b/test/RootShower/RootShower.cxx
index 424dbc58c8e..68c06e075fb 100644
--- a/test/RootShower/RootShower.cxx
+++ b/test/RootShower/RootShower.cxx
@@ -1011,7 +1011,7 @@ Bool_t RootShower::ProcessMessage(Long_t msg, Long_t parm1, Long_t parm2)
//______________________________________________________________________________
-TGListTreeItem* RootShower::AddToTree(const Text_t *name)
+TGListTreeItem* RootShower::AddToTree(const char *name)
{
// Add item to the TGListTree of the event display. It will be connected
// to the current TGListTreeItem (i.e. fCurEventListItem)
diff --git a/test/RootShower/RootShower.h b/test/RootShower/RootShower.h
index 040237f0f3b..eba7ae2e59f 100644
--- a/test/RootShower/RootShower.h
+++ b/test/RootShower/RootShower.h
@@ -119,7 +119,7 @@ private:
// Selection frame
TGCompositeFrame *fSelectionFrame; // Frame containing list tree and button frame
GButtonFrame *fButtonFrame; // Frame containing control buttons
- TGListTreeItem *AddToTree(const Text_t *name = 0);
+ TGListTreeItem *AddToTree(const char *name = 0);
void BuildEventTree();
TGCanvas *fTreeView; // Canvas containing event selection list tree
TGListTree *fEventListTree; // Event selection TGListTree
diff --git a/test/Tetris.cxx b/test/Tetris.cxx
index 0396bcbb9dc..6b62d5bacf0 100644
--- a/test/Tetris.cxx
+++ b/test/Tetris.cxx
@@ -663,7 +663,7 @@ void TetrisBoard::PieceDropped(TetrisPiece* piece, int height)
fIsDropped = kFALSE;
}
-void TetrisBoard::Print(const Text_t *) const
+void TetrisBoard::Print(const char *) const
{
// Used for testing
diff --git a/test/Tetris.h b/test/Tetris.h
index b68e8e9ac39..e8d8bcebb06 100644
--- a/test/Tetris.h
+++ b/test/Tetris.h
@@ -157,8 +157,8 @@ private:
void Clear(Option_t *option = "");
void Hide();
void Show();
- void Print(const Text_t *option = "") const;
- void Print(const Text_t *, Option_t *) { } // removes "hiding" warning
+ void Print(const char *option = "") const;
+ void Print(const char *, Option_t *) { } // removes "hiding" warning
Bool_t IsEmptyLine(int line);
Bool_t IsFullLine(Int_t line);
diff --git a/test/tcollbm.cxx b/test/tcollbm.cxx
index ca6326db7fd..394c69f3ea2 100644
--- a/test/tcollbm.cxx
+++ b/test/tcollbm.cxx
@@ -53,7 +53,7 @@ public:
HitNames() : fSize(0), fNames(0) {};
HitNames(Int_t s) : fSize(s), fNames(0) { InitNames(); };
virtual ~HitNames() { DeleteNames(); };
- const Text_t *operator[](Int_t i) { return fNames[i]; };
+ const char *operator[](Int_t i) { return fNames[i]; };
};
void HitNames::InitNames() { // Create and fill names
@@ -100,7 +100,7 @@ public:
void CleanUp() { fColl->Delete(); }
void Dump() const { fColl->Dump(); }
- virtual const Text_t* GetName() const
+ virtual const char* GetName() const
{ return fColl->ClassName(); }
Tester() :
diff --git a/tree/tree/src/TBufferSQL.cxx b/tree/tree/src/TBufferSQL.cxx
index 06bdec3f26d..23aea4e219e 100644
--- a/tree/tree/src/TBufferSQL.cxx
+++ b/tree/tree/src/TBufferSQL.cxx
@@ -746,8 +746,8 @@ void TBufferSQL::ResetOffset()
#if 0
//________________________________________________________________________
-void TBufferSQL::insert_test(const Text_t* dsn, const Text_t* usr,
- const Text_t* pwd, const TString& tblname)
+void TBufferSQL::insert_test(const char* dsn, const char* usr,
+ const char* pwd, const TString& tblname)
{
TString str;
TString select = "select * from ";
--
GitLab