From 4a3224ff74d939b946ed2d7aa685456463974f1c Mon Sep 17 00:00:00 2001 From: laphecet Date: Thu, 6 Mar 2008 09:44:33 +0000 Subject: [PATCH] Fixing (most of) compiler warnings --- MUON/AliMUONAttPainterSelectorFrame.h | 5 ----- MUON/AliMUONMchViewApplication.h | 9 ++------- MUON/AliMUONPainterMatrixFrame.h | 5 ----- MUON/AliMUONPainterPlotSelector.h | 5 ----- MUON/AliMUONPainterRegistry.cxx | 2 +- MUON/AliMUONPainterRegistry.h | 8 +++----- MUON/AliMUONQADataMakerSim.cxx | 14 ++++++++++++-- MUON/AliMUONRawStreamTrigger.cxx | 8 ++++++-- MUON/AliMUONTrackHitPattern.cxx | 2 ++ MUON/AliMUONTrackerData.cxx | 2 +- MUON/AliMUONVPainter.cxx | 2 ++ MUON/AliMUONVPainter.h | 12 +++++------- MUON/AliMUONVTrackerData.cxx | 2 +- MUON/AliMUONVTrackerData.h | 10 ++++------ MUON/mapping/AliMpDEVisu.cxx | 1 + 15 files changed, 40 insertions(+), 47 deletions(-) diff --git a/MUON/AliMUONAttPainterSelectorFrame.h b/MUON/AliMUONAttPainterSelectorFrame.h index 124e48adb48..d8cb56aed6b 100644 --- a/MUON/AliMUONAttPainterSelectorFrame.h +++ b/MUON/AliMUONAttPainterSelectorFrame.h @@ -15,9 +15,6 @@ #ifndef ROOT_TGFrame # include "TGFrame.h" #endif -#ifndef ROOT_RQ_OBJECT -# include -#endif #ifndef ALIMUONATTPAINTER_H # include "AliMUONAttPainter.h" #endif @@ -26,8 +23,6 @@ class TGButtonGroup; class AliMUONAttPainterSelectorFrame : public TGHorizontalFrame { - RQ_OBJECT("AliMUONAttPainterSelectorFrame") - public: AliMUONAttPainterSelectorFrame(TGWindow* p=0x0, UInt_t w=1, UInt_t h=1); virtual ~AliMUONAttPainterSelectorFrame(); diff --git a/MUON/AliMUONMchViewApplication.h b/MUON/AliMUONMchViewApplication.h index 344beb7a60c..6f3e5308fbd 100644 --- a/MUON/AliMUONMchViewApplication.h +++ b/MUON/AliMUONMchViewApplication.h @@ -15,17 +15,12 @@ #ifndef ROOT_TRint # include #endif -#ifndef ROOT_RQ_OBJECT -# include -#endif class AliMUONPainterMasterFrame; class TGMainFrame; class AliMUONMchViewApplication : public TRint { - RQ_OBJECT("AliMUONMchViewApplication") - public: AliMUONMchViewApplication(const char* name, int* argc, char** argv, Float_t wfraction, Float_t hfraction); @@ -34,10 +29,10 @@ public: void HandleMenu(Int_t i); /// Return the version number of the mchview application - static const char* Version() { return "0.92"; } + static const char* Version() { return "0.92a"; } /// Return the SVN revision and version number of the mchview application - static const char* FullVersion() { return Form("mchview Version %s ($Revision$)",Version()); } + static const char* FullVersion() { return Form("mchview Version %s ($Id$)",Version()); } void Open(const char* filename); diff --git a/MUON/AliMUONPainterMatrixFrame.h b/MUON/AliMUONPainterMatrixFrame.h index bb932ea7c02..0f8478109a0 100644 --- a/MUON/AliMUONPainterMatrixFrame.h +++ b/MUON/AliMUONPainterMatrixFrame.h @@ -15,9 +15,6 @@ #ifndef ROOT_TGFrame # include "TGFrame.h" #endif -#ifndef ROOT_RQ_OBJECT -# include -#endif #include class AliMUONPainterColorSlider; @@ -34,8 +31,6 @@ class TRootEmbeddedCanvas; class AliMUONPainterMatrixFrame : public TGCompositeFrame { - RQ_OBJECT("AliMUONPainterMatrixFrame") - public: AliMUONPainterMatrixFrame(const TGWindow* window, UInt_t w, UInt_t h); virtual ~AliMUONPainterMatrixFrame(); diff --git a/MUON/AliMUONPainterPlotSelector.h b/MUON/AliMUONPainterPlotSelector.h index b6a8827da92..aeeaf5ca032 100644 --- a/MUON/AliMUONPainterPlotSelector.h +++ b/MUON/AliMUONPainterPlotSelector.h @@ -15,9 +15,6 @@ #ifndef ROOT_TGFrame # include "TGFrame.h" #endif -#ifndef ROOT_RQ_OBJECT -# include -#endif #ifndef ROOT_TString # include "TString.h" #endif @@ -29,8 +26,6 @@ class TMap; class AliMUONPainterPlotSelector : public TGCompositeFrame { - RQ_OBJECT("AliMUONPainterPlotSelector") - public: AliMUONPainterPlotSelector(const TGWindow* window, UInt_t w=1, UInt_t h=1); virtual ~AliMUONPainterPlotSelector(); diff --git a/MUON/AliMUONPainterRegistry.cxx b/MUON/AliMUONPainterRegistry.cxx index 4b0c02c965a..70f5c796054 100644 --- a/MUON/AliMUONPainterRegistry.cxx +++ b/MUON/AliMUONPainterRegistry.cxx @@ -42,7 +42,7 @@ ClassImp(AliMUONPainterRegistry) AliMUONPainterRegistry* AliMUONPainterRegistry::fgInstance(0x0); //_____________________________________________________________________________ -AliMUONPainterRegistry::AliMUONPainterRegistry() : TObject(), +AliMUONPainterRegistry::AliMUONPainterRegistry() : TObject(), TQObject(), fDataSources(new TObjArray), fPainterMatrices(new TObjArray), fDataReaders(new TObjArray), diff --git a/MUON/AliMUONPainterRegistry.h b/MUON/AliMUONPainterRegistry.h index 1c3e50e4a46..5474230a74a 100644 --- a/MUON/AliMUONPainterRegistry.h +++ b/MUON/AliMUONPainterRegistry.h @@ -15,8 +15,8 @@ #ifndef ROOT_TObject # include "TObject.h" #endif -#ifndef ROOT_RQ_OBJECT -# include +#ifndef ROOT_TQObject +# include #endif class TGPopupMenu; @@ -26,10 +26,8 @@ class AliMUONVTrackerDataMaker; class AliMUONPainterMatrix; class TGMenuBar; -class AliMUONPainterRegistry : public TObject +class AliMUONPainterRegistry : public TObject, public TQObject { - RQ_OBJECT("AliMUONPainterRegistry") - public: virtual ~AliMUONPainterRegistry(); diff --git a/MUON/AliMUONQADataMakerSim.cxx b/MUON/AliMUONQADataMakerSim.cxx index 6387549b540..551571cd29b 100644 --- a/MUON/AliMUONQADataMakerSim.cxx +++ b/MUON/AliMUONQADataMakerSim.cxx @@ -55,9 +55,19 @@ AliMUONQADataMakerSim::AliMUONQADataMakerSim() : //____________________________________________________________________________ AliMUONQADataMakerSim::AliMUONQADataMakerSim(const AliMUONQADataMakerSim& qadm) : - AliQADataMakerSim() + AliQADataMakerSim(), + fHitStore(0x0), + fDigitStore(0x0) { - ///copy ctor + ///copy ctor + if ( qadm.fHitStore ) + { + fHitStore = static_cast(qadm.fHitStore->Clone()); + } + if ( qadm.fDigitStore ) + { + fDigitStore = static_cast(qadm.fDigitStore->Clone()); + } SetName((const char*)qadm.GetName()) ; SetTitle((const char*)qadm.GetTitle()); } diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx index 1e3259a5147..55822957c4a 100644 --- a/MUON/AliMUONRawStreamTrigger.cxx +++ b/MUON/AliMUONRawStreamTrigger.cxx @@ -63,7 +63,9 @@ AliMUONRawStreamTrigger::AliMUONRawStreamTrigger() fCurrentLocalStruct(0x0), fCurrentLocalStructIndex(0), fLocalStructRead(kFALSE), - fDDL(0) + fDDL(0), + fNextDDL(kFALSE), + fEnableErrorLogger(kFALSE) { /// /// create an object to read MUON raw digits @@ -85,7 +87,9 @@ AliMUONRawStreamTrigger::AliMUONRawStreamTrigger(AliRawReader* rawReader) fCurrentLocalStruct(0x0), fCurrentLocalStructIndex(0), fLocalStructRead(kFALSE), - fDDL(0) + fDDL(0), + fNextDDL(kFALSE), + fEnableErrorLogger(kFALSE) { /// /// ctor with AliRawReader as argument diff --git a/MUON/AliMUONTrackHitPattern.cxx b/MUON/AliMUONTrackHitPattern.cxx index 06f7873e627..ffea205add3 100644 --- a/MUON/AliMUONTrackHitPattern.cxx +++ b/MUON/AliMUONTrackHitPattern.cxx @@ -90,6 +90,8 @@ AliMUONTrackHitPattern::AliMUONTrackHitPattern(const AliMUONGeometryTransformer& : TObject(), fTransformer(transformer), fDigitMaker(digitMaker), + fDeltaZ(0.0), + fTrigCovariance(0x0), fkMaxDistance(99999.) { /// Default constructor diff --git a/MUON/AliMUONTrackerData.cxx b/MUON/AliMUONTrackerData.cxx index c6bbc293c01..f7f094b0a4a 100644 --- a/MUON/AliMUONTrackerData.cxx +++ b/MUON/AliMUONTrackerData.cxx @@ -762,7 +762,7 @@ AliMUONTrackerData::CreateManuParam(Int_t detElemId, Int_t manuId) const //_____________________________________________________________________________ Long64_t -AliMUONTrackerData::Merge(TCollection* li) +AliMUONTrackerData::Merge(TCollection*) { /// Merge all tracker data objects from li into a single one. diff --git a/MUON/AliMUONVPainter.cxx b/MUON/AliMUONVPainter.cxx index 2a1d34096bc..ee24707cdc0 100644 --- a/MUON/AliMUONVPainter.cxx +++ b/MUON/AliMUONVPainter.cxx @@ -95,6 +95,7 @@ ClassImp(AliMUONVPainter) //_____________________________________________________________________________ AliMUONVPainter::AliMUONVPainter(const char* type) : TObject(), + TQObject(), fName(""), fPathName(""), fType(type), @@ -120,6 +121,7 @@ AliMUONVPainter::AliMUONVPainter(const char* type) //_____________________________________________________________________________ AliMUONVPainter::AliMUONVPainter(const AliMUONVPainter& rhs) : TObject(rhs), +TQObject(), fName(""), fPathName(""), fType(""), diff --git a/MUON/AliMUONVPainter.h b/MUON/AliMUONVPainter.h index 86bdd197e2b..4c40fab87ff 100644 --- a/MUON/AliMUONVPainter.h +++ b/MUON/AliMUONVPainter.h @@ -16,8 +16,8 @@ #ifndef ALIMUONATTPAINTER_H # include "AliMUONAttPainter.h" #endif -#ifndef ROOT_RQ_OBJECT -# include +#ifndef ROOT_TQObject +# include #endif #ifndef ROOT_TString # include "TString.h" @@ -41,10 +41,8 @@ class TMap; class TObjArray; class TVirtualPad; -class AliMUONVPainter : public TObject +class AliMUONVPainter : public TObject, public TQObject { - RQ_OBJECT("AliMUONVPainter") - public: AliMUONVPainter(const char* type=""); @@ -258,9 +256,9 @@ private: Bool_t fIsValid; ///< whether we were properly initialized protected: - mutable TH1* fHistogram; ///< histogram + mutable TH1* fHistogram; //!< histogram - ClassDef(AliMUONVPainter,2) // Base class of a graphical object for MUON spectrometer + ClassDef(AliMUONVPainter,3) // Base class of a graphical object for MUON spectrometer }; #endif diff --git a/MUON/AliMUONVTrackerData.cxx b/MUON/AliMUONVTrackerData.cxx index ac4eb975eda..872df125936 100644 --- a/MUON/AliMUONVTrackerData.cxx +++ b/MUON/AliMUONVTrackerData.cxx @@ -38,7 +38,7 @@ ClassImp(AliMUONVTrackerData) //_____________________________________________________________________________ AliMUONVTrackerData::AliMUONVTrackerData(const char* name, const char* title, Bool_t) -: TNamed(name,title) +: TNamed(name,title), TQObject() { /// ctor } diff --git a/MUON/AliMUONVTrackerData.h b/MUON/AliMUONVTrackerData.h index f3ffbd092b8..cf91a9a7672 100644 --- a/MUON/AliMUONVTrackerData.h +++ b/MUON/AliMUONVTrackerData.h @@ -19,18 +19,16 @@ #ifndef ROOT_TString # include "TString.h" #endif -#ifndef ROOT_RQ_OBJECT -# include +#ifndef ROOT_TQObject +# include #endif class AliMUONSparseHisto; class AliMUONVStore; class TCollection; -class AliMUONVTrackerData : public TNamed +class AliMUONVTrackerData : public TNamed, public TQObject { - RQ_OBJECT("AliMUONVTrackerData") - public: AliMUONVTrackerData(const char* name="",const char* title="", Bool_t runnable=kTRUE); @@ -144,7 +142,7 @@ private: /// not implemented AliMUONVTrackerData& operator=(const AliMUONVTrackerData& rhs); - ClassDef(AliMUONVTrackerData,1) // Base class of MUON data that can be represented graphically + ClassDef(AliMUONVTrackerData,2) // Base class of MUON data that can be represented graphically }; #endif diff --git a/MUON/mapping/AliMpDEVisu.cxx b/MUON/mapping/AliMpDEVisu.cxx index b76c7252fd4..e3980d1e7f1 100644 --- a/MUON/mapping/AliMpDEVisu.cxx +++ b/MUON/mapping/AliMpDEVisu.cxx @@ -91,6 +91,7 @@ AliMpDEVisu::AliMpDEVisu(UInt_t w, UInt_t h) fCurrentDetElem(100), fCurrentDEName(), fSegmentation(), + fDDLStore(0x0), fZoomMode(false) { /// Standard constructor -- 2.39.3