From 9b4aee571a825a0d79f843a709aa4a4d3f45db58 Mon Sep 17 00:00:00 2001 From: hristov Date: Tue, 23 Jun 2009 15:58:19 +0000 Subject: [PATCH] Remove implicit calls to TString::TString(int) - this constructor was made protected in ROOT trunk (Matevz) --- ANALYSIS/AliAnalysisTaskTagCreator.cxx | 2 +- ANALYSIS/AliTagAnalysis.cxx | 40 ++++++++++++------------- EVE/EveHLT/AliEveHOMERSrcTranslator.cxx | 2 +- EVE/EveHLT/AliEveHOMERXMLHandler.cxx | 10 +++---- ITS/AliITSDetTypeRec.cxx | 2 +- ITS/AliITSDetTypeSim.cxx | 2 +- ITS/AliITSQASSDDataMakerRec.cxx | 4 +-- MUON/AliMUONGlobalCrateConfig.cxx | 2 +- MUON/AliMUONRawStreamTracker.cxx | 2 +- MUON/AliMUONRawStreamTrigger.cxx | 2 +- PWG2/SPECTRA/AliProtonAnalysis.cxx | 2 +- STEER/AliAODTagCreator.cxx | 2 +- STEER/AliESDTagCreator.cxx | 4 +-- STEER/AliQAManager.cxx | 8 ++--- STEER/AliStack.cxx | 6 ++-- STEER/AliTagCreator.cxx | 4 +-- TPC/AliTPCGenDBTemp.h | 4 +-- 17 files changed, 49 insertions(+), 49 deletions(-) diff --git a/ANALYSIS/AliAnalysisTaskTagCreator.cxx b/ANALYSIS/AliAnalysisTaskTagCreator.cxx index 82bc7ff408f..1c5d2c98f49 100644 --- a/ANALYSIS/AliAnalysisTaskTagCreator.cxx +++ b/ANALYSIS/AliAnalysisTaskTagCreator.cxx @@ -99,7 +99,7 @@ void AliAnalysisTaskTagCreator::UserExec(Option_t */*option*/) } evtTag->SetGUID(fguid); if(opt.Contains("grid")) { - evtTag->SetMD5(0); + evtTag->SetMD5(""); evtTag->SetTURL(fturl); evtTag->SetSize(0); } diff --git a/ANALYSIS/AliTagAnalysis.cxx b/ANALYSIS/AliTagAnalysis.cxx index be12fb05d13..199544aeadb 100644 --- a/ANALYSIS/AliTagAnalysis.cxx +++ b/ANALYSIS/AliTagAnalysis.cxx @@ -170,9 +170,9 @@ TChain *AliTagAnalysis::QueryTags(AliRunTagCuts *runTagCuts, AliEventTag *evTag = new AliEventTag; fChain->SetBranchAddress("AliTAG",&tag); - TString guid = 0; - TString turl = 0; - TString path = 0; + TString guid; + TString turl; + TString path; Int_t iAccepted = 0; for(Int_t iTagFiles = 0; iTagFiles < fChain->GetEntries(); iTagFiles++) { @@ -233,9 +233,9 @@ TChain *AliTagAnalysis::QueryTags(const char *fRunCut, AliEventTag *evTag = new AliEventTag; fChain->SetBranchAddress("AliTAG",&tag); - TString guid = 0; - TString turl = 0; - TString path = 0; + TString guid; + TString turl; + TString path; TTreeFormula *fRunFormula = new TTreeFormula("fRun",fRunCut,fChain); TTreeFormula *fLHCFormula = new TTreeFormula("fLHC",fLHCCut,fChain); @@ -299,9 +299,9 @@ Bool_t AliTagAnalysis::CreateXMLCollection(const char* name, collection->SetCollectionName(name); collection->WriteHeader(); - TString guid = 0x0; - TString turl = 0x0; - TString lfn = 0x0; + TString guid; + TString turl; + TString lfn; //Defining tag objects AliRunTag *tag = new AliRunTag; @@ -350,9 +350,9 @@ Bool_t AliTagAnalysis::CreateXMLCollection(const char* name, collection->SetCollectionName(name); collection->WriteHeader(); - TString guid = 0x0; - TString turl = 0x0; - TString lfn = 0x0; + TString guid; + TString turl; + TString lfn; //Defining tag objects AliRunTag *tag = new AliRunTag; @@ -412,11 +412,11 @@ Bool_t AliTagAnalysis::CreateAsciiCollection(const char* name, ofstream fout; fout.open(name); - TString guid = 0x0; - TString turl = 0x0; - TString lfn = 0x0; + TString guid; + TString turl; + TString lfn; - TString line0 = 0; + TString line0; //Defining tag objects AliRunTag *tag = new AliRunTag; @@ -470,11 +470,11 @@ Bool_t AliTagAnalysis::CreateAsciiCollection(const char* name, ofstream fout; fout.open(name); - TString guid = 0x0; - TString turl = 0x0; - TString lfn = 0x0; + TString guid; + TString turl; + TString lfn; - TString line0 = 0; + TString line0; //Defining tag objects AliRunTag *tag = new AliRunTag; diff --git a/EVE/EveHLT/AliEveHOMERSrcTranslator.cxx b/EVE/EveHLT/AliEveHOMERSrcTranslator.cxx index b3f6ac9049d..aac971bff17 100644 --- a/EVE/EveHLT/AliEveHOMERSrcTranslator.cxx +++ b/EVE/EveHLT/AliEveHOMERSrcTranslator.cxx @@ -192,7 +192,7 @@ Int_t AliEveHOMERSrcTranslator::FillSourceDesc( AliHLTHOMERSourceDesc* source, T TString AliEveHOMERSrcTranslator::ResolveHostname( TString nodename ){ // resolves the hostname, out of the XML nodename, and the realm set - TString hostname = 0; + TString hostname; // -- Set hostname according to realm if ( ! fRealm.CompareTo( "ACR" ) ) diff --git a/EVE/EveHLT/AliEveHOMERXMLHandler.cxx b/EVE/EveHLT/AliEveHOMERXMLHandler.cxx index 6ba7d55c779..10b5fb589e0 100644 --- a/EVE/EveHLT/AliEveHOMERXMLHandler.cxx +++ b/EVE/EveHLT/AliEveHOMERXMLHandler.cxx @@ -181,10 +181,10 @@ Int_t AliEveHOMERXMLHandler::AddSourceTDS( TXMLNode * xmlNode ) { TXMLNode * attrNode = NULL; TXMLNode * prevNode = xmlNode; - TString xmlHostname = 0; - TString xmlPort = 0; + TString xmlHostname; + TString xmlPort; - TString hostname = 0; + TString hostname; Int_t port = 0; // -- Get hostname and port from TDS node out of XML @@ -307,7 +307,7 @@ Int_t AliEveHOMERXMLHandler::FillSourceInformation( TString xmlParent, AliHLTHOM TString AliEveHOMERXMLHandler::GetNodename( TString xmlHostname ) { // Get xml nodename out of xml hostname - TString nodename = 0; + TString nodename; TXMLNode * node = NULL; TXMLNode * prevNode = fRootNode->GetChildren(); @@ -325,7 +325,7 @@ TString AliEveHOMERXMLHandler::GetNodename( TString xmlHostname ) { TXMLAttr *attr = 0; TIter next(attrList); - TString nodeId = 0; + TString nodeId; // Get "nodeID" and "nodeName" of this "Node" node while ( ( attr = (TXMLAttr*)next() ) ) { diff --git a/ITS/AliITSDetTypeRec.cxx b/ITS/AliITSDetTypeRec.cxx index 7f36b4c4468..7aea9bf3800 100644 --- a/ITS/AliITSDetTypeRec.cxx +++ b/ITS/AliITSDetTypeRec.cxx @@ -623,7 +623,7 @@ Bool_t AliITSDetTypeRec::GetCalibrationSSD(Bool_t cacheStatus) { return kFALSE; } - TObject *emptyssd = 0; TString ssdobjectname = 0; + TObject *emptyssd = 0; TString ssdobjectname; AliITSNoiseSSDv2 *noiseSSD = new AliITSNoiseSSDv2(); emptyssd = (TObject *)entryNoiseSSD->GetObject(); ssdobjectname = emptyssd->GetName(); diff --git a/ITS/AliITSDetTypeSim.cxx b/ITS/AliITSDetTypeSim.cxx index b5a0e0c47a2..85949f1dc77 100644 --- a/ITS/AliITSDetTypeSim.cxx +++ b/ITS/AliITSDetTypeSim.cxx @@ -526,7 +526,7 @@ if(!deadSPD || !noisySPD || !foEffSPD || !foNoiSPD entrySSD->SetOwner(kTRUE); */ - TObject *emptyssd = 0; TString ssdobjectname = 0; + TObject *emptyssd = 0; TString ssdobjectname; AliITSNoiseSSDv2 *noiseSSD = new AliITSNoiseSSDv2(); emptyssd = (TObject *)entryNoiseSSD->GetObject(); ssdobjectname = emptyssd->GetName(); diff --git a/ITS/AliITSQASSDDataMakerRec.cxx b/ITS/AliITSQASSDDataMakerRec.cxx index e07ffacbab8..147b0b1d59d 100644 --- a/ITS/AliITSQASSDDataMakerRec.cxx +++ b/ITS/AliITSQASSDDataMakerRec.cxx @@ -305,8 +305,8 @@ Int_t AliITSQASSDDataMakerRec::InitRaws() { AliDebug(AliQAv1::GetQADebugLevel(), "Book Offline Histograms for SSD\n "); } AliDebug(AliQAv1::GetQADebugLevel(), Form("Number of histograms (SPD+SDD): %d\n",fGenRawsOffset)); - TString gTitle = 0; - TString gName = 0; + TString gTitle; + TString gName; //book online-offline QA histos TH1D *fHistSSDEventType = new TH1D("fHistSSDEventType", "SSD Event Type;Event type;Events", diff --git a/MUON/AliMUONGlobalCrateConfig.cxx b/MUON/AliMUONGlobalCrateConfig.cxx index b0d884b0444..a473fa278d3 100644 --- a/MUON/AliMUONGlobalCrateConfig.cxx +++ b/MUON/AliMUONGlobalCrateConfig.cxx @@ -351,7 +351,7 @@ TString AliMUONGlobalCrateConfig::GetJtagCrateName(Int_t jtagLine, Int_t index) { /// Get the crate name for a given line and a given index if (jtagLine > AliMpConstants::LocalBoardNofChannels() || index > AliMpConstants::LocalBoardNofChannels()) - return 0x0; + return ""; else return fJtagCrateName[jtagLine*fgkJtagNofLines + index]; } diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx index 958bc1f8adf..4f493c3c619 100644 --- a/MUON/AliMUONRawStreamTracker.cxx +++ b/MUON/AliMUONRawStreamTracker.cxx @@ -418,7 +418,7 @@ void AliMUONRawStreamTracker::AddErrorMessage() /// add message into logger of AliRawReader per event assert( GetReader() != 0 ); - TString msg = 0; + TString msg; Int_t occurance = 0; AliMUONLogger* log = fPayload->GetErrorLogger(); diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx index ff2f7813672..7378c4e9654 100644 --- a/MUON/AliMUONRawStreamTrigger.cxx +++ b/MUON/AliMUONRawStreamTrigger.cxx @@ -400,7 +400,7 @@ void AliMUONRawStreamTrigger::AddErrorMessage() { /// add message into logger of AliRawReader per event - TString msg = 0; + TString msg; Int_t occurance = 0; AliMUONLogger* log = fPayload->GetErrorLogger(); diff --git a/PWG2/SPECTRA/AliProtonAnalysis.cxx b/PWG2/SPECTRA/AliProtonAnalysis.cxx index 8776c6e5699..568aa1f5ff0 100644 --- a/PWG2/SPECTRA/AliProtonAnalysis.cxx +++ b/PWG2/SPECTRA/AliProtonAnalysis.cxx @@ -880,7 +880,7 @@ Bool_t AliProtonAnalysis::ReadCorrectionContainer(const char* filename) { TH1D *gEfficiency[2][3]; //efficiency as a function of pT and of y (raws-[2]) TH1D *gCorrection[2][3]; //efficiency as a function of pT and of y (raws-[2]) - TString gTitle = 0; + TString gTitle; //Get the projection of the efficiency maps for(Int_t iParameter = 0; iParameter < 2; iParameter++) { gEfficiency[iParameter][0] = effProtonsStep0Step1->Project(iParameter); diff --git a/STEER/AliAODTagCreator.cxx b/STEER/AliAODTagCreator.cxx index 06bcd7e73ee..30b007f4f05 100644 --- a/STEER/AliAODTagCreator.cxx +++ b/STEER/AliAODTagCreator.cxx @@ -333,7 +333,7 @@ void AliAODTagCreator::CreateTags(const char* type) //evTag->SetEventId(iEventNumber+1); evTag->SetGUID(fguid); if(!strcmp(type,"grid")) { - evTag->SetMD5(0); + evTag->SetMD5(""); evTag->SetTURL(fturl); evTag->SetSize(0); } diff --git a/STEER/AliESDTagCreator.cxx b/STEER/AliESDTagCreator.cxx index 2cbc010a628..cf088e1c276 100644 --- a/STEER/AliESDTagCreator.cxx +++ b/STEER/AliESDTagCreator.cxx @@ -196,7 +196,7 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) { //private method that creates tag files TString fSession = type; TString fguid, fmd5, fturl; - TString fTempGuid = 0; + TString fTempGuid; ///////////// //muon code// @@ -452,7 +452,7 @@ void AliESDTagCreator::CreateTag(TChain* chain, const char *type) { evTag->SetBunchCrossNumber(esd->GetBunchCrossNumber()); evTag->SetGUID(fguid); if(fSession == "grid") { - evTag->SetMD5(0); + evTag->SetMD5(""); evTag->SetTURL(fturl); evTag->SetSize(0); } diff --git a/STEER/AliQAManager.cxx b/STEER/AliQAManager.cxx index 6d0babcf3f1..b68be818ab2 100644 --- a/STEER/AliQAManager.cxx +++ b/STEER/AliQAManager.cxx @@ -1116,7 +1116,7 @@ TString AliQAManager::Run(const Char_t * detectors, AliRawReader * rawReader, co if (!fCycleSame) if ( !InitQA(AliQAv1::kRAWS) ) - return kFALSE ; + return "" ; fRawReaderDelete = kFALSE ; DoIt(AliQAv1::kRAWS) ; @@ -1151,7 +1151,7 @@ TString AliQAManager::Run(const Char_t * detectors, const Char_t * fileName, con if (!fCycleSame) if ( !InitQA(AliQAv1::kRAWS, fileName) ) - return kFALSE ; + return "" ; DoIt(AliQAv1::kRAWS) ; return fDetectorsW ; @@ -1187,14 +1187,14 @@ TString AliQAManager::Run(const Char_t * detectors, const AliQAv1::TASKINDEX_t t if ( fTasks.Contains(Form("%d", task)) ) { if (!fCycleSame) if ( !InitQA(AliQAv1::GetTaskIndex(AliQAv1::GetTaskName(task)), fileName) ) - return kFALSE ; + return "" ; DoIt(AliQAv1::GetTaskIndex(AliQAv1::GetTaskName(task))) ; } } } else { if (! fCycleSame ) if ( !InitQA(taskIndex, fileName) ) - return kFALSE ; + return "" ; DoIt(taskIndex) ; } return fDetectorsW ; diff --git a/STEER/AliStack.cxx b/STEER/AliStack.cxx index df46b5bb849..6bff8223966 100644 --- a/STEER/AliStack.cxx +++ b/STEER/AliStack.cxx @@ -774,9 +774,9 @@ void AliStack::DumpPStack () printf("\n=======================================================================\n\n"); // print particle file map - printf("\nParticle file map: \n"); - for (i=0; iGetRunId(); localFileName += ".Merged."; localFileName += tagPattern.Data(); - TString filename = 0x0; + TString filename; if(fStorage == 0) { filename = localFileName.Data(); @@ -158,7 +158,7 @@ Bool_t AliTagCreator::MergeTags(const char *type, TGridResult *result) { TString localFileName = "Run"; localFileName += tag->GetRunId(); localFileName += ".Merged"; localFileName += tagPattern.Data(); - TString filename = 0x0; + TString filename; if(fStorage == 0) { filename = localFileName.Data(); diff --git a/TPC/AliTPCGenDBTemp.h b/TPC/AliTPCGenDBTemp.h index 103a1103383..28eb567be43 100644 --- a/TPC/AliTPCGenDBTemp.h +++ b/TPC/AliTPCGenDBTemp.h @@ -30,14 +30,14 @@ public: void MakeCalib(const char *file, const char *fMap, const TTimeStamp& startTime, const TTimeStamp& endTime, Int_t run, - const TString& amandaString=0); + const TString& amandaString=""); void MakeConfig(const char *file, Int_t firstRun, Int_t lastRun, const char *confDir); // functionality static TClonesArray* ReadList(const char* fname, const char *title="tempConf", - const TString& amandaString=0); + const TString& amandaString=""); static TTree* ReadListTree(const char* fname, const char *title="tempConf"); // getters/setters -- 2.39.3