Skip to content

Commit

Permalink
Fix overloaded-virtual warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alja
alja committed May 14, 2014
1 parent fc0226d commit e99cc32
Show file tree
Hide file tree
Showing 19 changed files with 48 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Fireworks/Candidates/plugins/FWCandidateProxyBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class FWCandidateProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Candid
FWCandidateProxyBuilder(const FWCandidateProxyBuilder&); // stop default
const FWCandidateProxyBuilder& operator=(const FWCandidateProxyBuilder&); // stop default

using FWSimpleProxyBuilderTemplate<reco::Candidate> {::build;
using FWSimpleProxyBuilderTemplate<reco::Candidate>::build;
void build(const reco::Candidate& iData, unsigned int iIndex, TEveElement& oItemHolder, const FWViewContext*) override;
};

Expand Down
5 changes: 2 additions & 3 deletions Fireworks/Core/interface/FWDetailView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@ class FWDetailView : public FWDetailViewBase {
static std::string classRegisterTypeName() {
return typeid(T).name();
}
virtual void build(const FWModelId&, const T*) = 0;
virtual void setTextInfo(const FWModelId&, const T*) = 0;

private:
virtual void build(const FWModelId& iID, const void* iData) {
setItem(iID.item());
build(iID, reinterpret_cast<const T*> (iData));
}

virtual void build(const FWModelId&, const T*) = 0;
virtual void setTextInfo(const FWModelId&, const T*) = 0;
};

#endif
6 changes: 5 additions & 1 deletion Fireworks/Electrons/plugins/FWConvTrackHitsDetailView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,17 @@ class FWConvTrackHitsDetailView: public FWDetailViewGL<reco::Conversion>,
void camera2Callback();
void camera3Callback();
void switchProjection();


private:
FWConvTrackHitsDetailView(const FWConvTrackHitsDetailView&); // stop default
const FWConvTrackHitsDetailView& operator=(const FWConvTrackHitsDetailView&); // stop default

using FWDetailViewGL<reco::Conversion>::build;
void build (const FWModelId &id, const reco::Conversion*);
using FWDetailViewGL<reco::Conversion>::setTextInfo;
void setTextInfo (const FWModelId &id, const reco::Conversion*);


void
addTrackerHits3D( std::vector<TVector3> &points,
Expand Down Expand Up @@ -69,4 +73,4 @@ class FWConvTrackHitsDetailView: public FWDetailViewGL<reco::Conversion>,
CSGAction* m_camTypeAction;
};

#endif
#endif
2 changes: 1 addition & 1 deletion Fireworks/Electrons/plugins/FWConversionProxyBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class FWConversionProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Conve
FWConversionProxyBuilder( const FWConversionProxyBuilder& ); // stop default
const FWConversionProxyBuilder& operator=( const FWConversionProxyBuilder& ); // stop default

using FWSimpleProxyBuilderTemplate<reco::Conversion> {::buildViewType;
using FWSimpleProxyBuilderTemplate<reco::Conversion>::buildViewType;
virtual void buildViewType(const reco::Conversion& iData, unsigned int iIndex, TEveElement& oItemHolder, FWViewType::EType type , const FWViewContext*) override;

TEveElementList* requestCommon();
Expand Down
3 changes: 3 additions & 0 deletions Fireworks/Electrons/plugins/FWElectronDetailView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ class FWElectronDetailView : public FWDetailViewGL<reco::GsfElectron>
FWElectronDetailView(const FWElectronDetailView&); // stop default
const FWElectronDetailView& operator=(const FWElectronDetailView&); // stop default

using FWDetailViewGL<reco::GsfElectron>::build;
virtual void build (const FWModelId &id, const reco::GsfElectron*);

using FWDetailViewGL<reco::GsfElectron>::setTextInfo;
virtual void setTextInfo(const FWModelId &id, const reco::GsfElectron*);

double deltaEtaSuperClusterTrackAtVtx (const reco::GsfElectron &);
Expand Down
10 changes: 6 additions & 4 deletions Fireworks/Electrons/plugins/FWElectronProxyBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,18 +36,20 @@ class FWElectronProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::GsfElec
FWElectronProxyBuilder() ;
virtual ~FWElectronProxyBuilder();

using FWProxyBuilderBase::haveSingleProduct;
virtual bool haveSingleProduct() const override { return false; }
using FWProxyBuilderBase::cleanLocal;
virtual void cleanLocal() override;
using FWSimpleProxyBuilderTemplate<reco::GsfElectron>::buildViewType;
virtual void buildViewType(const reco::GsfElectron& iData, unsigned int iIndex, TEveElement& oItemHolder, FWViewType::EType type , const FWViewContext*) override;

REGISTER_PROXYBUILDER_METHODS();

private:
FWElectronProxyBuilder( const FWElectronProxyBuilder& ); // stop default
const FWElectronProxyBuilder& operator=( const FWElectronProxyBuilder& ); // stop default

using FWSimpleProxyBuilderTemplate<reco::GsfElectron> {::buildViewType;
virtual void buildViewType(const reco::GsfElectron& iData, unsigned int iIndex, TEveElement& oItemHolder, FWViewType::EType type , const FWViewContext*) override;


TEveElementList* requestCommon();

TEveElementList* m_common;
Expand Down Expand Up @@ -130,6 +132,7 @@ class FWElectronGlimpseProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::
public:
FWElectronGlimpseProxyBuilder() {}
virtual ~FWElectronGlimpseProxyBuilder() {}
using FWSimpleProxyBuilderTemplate<reco::GsfElectron>::build;

REGISTER_PROXYBUILDER_METHODS();

Expand All @@ -138,7 +141,6 @@ class FWElectronGlimpseProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::

const FWElectronGlimpseProxyBuilder& operator=(const FWElectronGlimpseProxyBuilder&); // stop default

using FWSimpleProxyBuilderTemplate<reco::GsfElectron> {::build;
virtual void build(const reco::GsfElectron& iData, unsigned int iIndex, TEveElement& oItemHolder, const FWViewContext*) override;
};

Expand Down
2 changes: 2 additions & 0 deletions Fireworks/Electrons/plugins/FWPhotonDetailView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ class FWPhotonDetailView : public FWDetailViewGL<reco::Photon> {
FWPhotonDetailView();
virtual ~FWPhotonDetailView();

using FWDetailViewGL<reco::Photon>::build;
virtual void build (const FWModelId &id, const reco::Photon*);
using FWDetailViewGL<reco::Photon>::setTextInfo;
virtual void setTextInfo(const FWModelId &id, const reco::Photon*);

private:
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/GenParticle/plugins/FWGenParticleLegoProxyBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class FWGenParticleLegoProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::

const FWGenParticleLegoProxyBuilder& operator=(const FWGenParticleLegoProxyBuilder&); // stop default

using FWSimpleProxyBuilderTemplate<reco::GenParticle> {::build;
using FWSimpleProxyBuilderTemplate<reco::GenParticle>::build;
void build(const reco::GenParticle& iData, unsigned int iIndex,TEveElement& oItemHolder, const FWViewContext*) override;
};

Expand Down
2 changes: 1 addition & 1 deletion Fireworks/GenParticle/plugins/FWGenParticleProxyBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class FWGenParticleProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::GenP

const FWGenParticleProxyBuilder& operator=(const FWGenParticleProxyBuilder&); // stop default

using FWSimpleProxyBuilderTemplate<reco::GenParticle> {::build;
using FWSimpleProxyBuilderTemplate<reco::GenParticle>::build;
void build(const reco::GenParticle& iData, unsigned int iIndex,TEveElement& oItemHolder, const FWViewContext*) override;

};
Expand Down
5 changes: 5 additions & 0 deletions Fireworks/ParticleFlow/plugins/FWPFClusterLegoProxyBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,11 @@ class FWPFClusterLegoProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::PF
virtual ~FWPFClusterLegoProxyBuilder(){}

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::scaleProduct;
virtual void scaleProduct( TEveElementList *parent, FWViewType::EType, const FWViewContext *vc );
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::havePerViewProduct;
virtual bool havePerViewProduct(FWViewType::EType) const { return true; }
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::localModelChanges;
virtual void localModelChanges( const FWModelId &iId, TEveElement *el,
FWViewType::EType viewType, const FWViewContext *vc );

Expand Down Expand Up @@ -70,6 +73,7 @@ class FWPFEcalClusterLegoProxyBuilder : public FWPFClusterLegoProxyBuilder
virtual ~FWPFEcalClusterLegoProxyBuilder(){}

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::build;
virtual void build( const reco::PFCluster&, unsigned int, TEveElement&, const FWViewContext* );

REGISTER_PROXYBUILDER_METHODS();
Expand All @@ -92,6 +96,7 @@ class FWPFHcalClusterLegoProxyBuilder : public FWPFClusterLegoProxyBuilder
virtual ~FWPFHcalClusterLegoProxyBuilder(){}

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::build;
virtual void build( const reco::PFCluster&, unsigned int, TEveElement&, const FWViewContext* );

REGISTER_PROXYBUILDER_METHODS();
Expand Down
6 changes: 6 additions & 0 deletions Fireworks/ParticleFlow/plugins/FWPFClusterRPZProxyBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,13 @@ class FWPFClusterRPZProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::PFC
virtual ~FWPFClusterRPZProxyBuilder();

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::build;
virtual void build( const reco::PFCluster &iData, unsigned int iIndex, TEveElement &oItemHolder, const FWViewContext *vc );
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::scaleProduct;
virtual void scaleProduct( TEveElementList *parent, FWViewType::EType, const FWViewContext *vc );
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::havePerViewProduct;
virtual bool havePerViewProduct( FWViewType::EType ) const { return true; }
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::cleanLocal;
virtual void cleanLocal() { m_clusters.clear(); }

REGISTER_PROXYBUILDER_METHODS();
Expand Down Expand Up @@ -65,6 +69,7 @@ class FWPFEcalClusterRPZProxyBuilder : public FWPFClusterRPZProxyBuilder
virtual ~FWPFEcalClusterRPZProxyBuilder(){}

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::build;
virtual void build( const reco::PFCluster &iData, unsigned int iIndex, TEveElement &oItemHolder, const FWViewContext *vc );

REGISTER_PROXYBUILDER_METHODS();
Expand All @@ -88,6 +93,7 @@ class FWPFHcalClusterRPZProxyBuilder : public FWPFClusterRPZProxyBuilder
virtual ~FWPFHcalClusterRPZProxyBuilder(){}

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<reco::PFCluster>::build;
virtual void build( const reco::PFCluster &iData, unsigned int iIndex, TEveElement &oItemHolder, const FWViewContext *vc );

REGISTER_PROXYBUILDER_METHODS();
Expand Down
1 change: 1 addition & 0 deletions Fireworks/ParticleFlow/plugins/FWPFPatJet3DProxyBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ class FWPFPatJet3DProxyBuilder : public FWSimpleProxyBuilderTemplate<T>
const FWPFPatJet3DProxyBuilder& operator=(const FWPFPatJet3DProxyBuilder&); // Stop default

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<T>::build;
void build(const T&, unsigned int, TEveElement&, const FWViewContext*);
};
#endif
Expand Down
3 changes: 3 additions & 0 deletions Fireworks/ParticleFlow/plugins/FWPFPatJetLegoProxyBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,11 @@ class FWPFPatJetLegoProxyBuilder : public FWSimpleProxyBuilderTemplate<T>
virtual ~FWPFPatJetLegoProxyBuilder();

// --------------------- Member Functions --------------------------
using FWSimpleProxyBuilderTemplate<T>::havePerViewProduct;
virtual bool havePerViewProduct(FWViewType::EType) const { return true; }
using FWSimpleProxyBuilderTemplate<T>::scaleProduct;
virtual void scaleProduct(TEveElementList* parent, FWViewType::EType, const FWViewContext* vc);
using FWSimpleProxyBuilderTemplate<T>::localModelChanges;
virtual void localModelChanges(const FWModelId& iId, TEveElement* iCompound, FWViewType::EType viewType, const FWViewContext* vc);

private:
Expand Down
3 changes: 2 additions & 1 deletion Fireworks/ParticleFlow/plugins/FWPFTrack3DProxyBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,15 @@ class FWPFTrack3DProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Track>
FWPFTrack3DProxyBuilder(){}
virtual ~FWPFTrack3DProxyBuilder(){}

using FWSimpleProxyBuilderTemplate<reco::Track>::build;
virtual void build( const reco::Track &iData, unsigned int iIndex, TEveElement &oItemHolder, const FWViewContext *vc );
REGISTER_PROXYBUILDER_METHODS();

private:
FWPFTrack3DProxyBuilder( const FWPFTrack3DProxyBuilder& );
const FWPFTrack3DProxyBuilder& operator=( const FWPFTrack3DProxyBuilder& );

// --------------------- Member Functions --------------------------
virtual void build( const reco::Track &iData, unsigned int iIndex, TEveElement &oItemHolder, const FWViewContext *vc );
};
#endif
//=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_
4 changes: 2 additions & 2 deletions Fireworks/ParticleFlow/plugins/FWPFTrackRPZProxyBuilder.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ class FWPFTrackRPZProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Track
// ---------------- Constructor(s)/Destructor ----------------------
FWPFTrackRPZProxyBuilder(){}
virtual ~FWPFTrackRPZProxyBuilder(){}

using FWSimpleProxyBuilderTemplate<reco::Track>::build;
virtual void build( const reco::Track &iData, unsigned int iIndex, TEveElement &oItemHolder, const FWViewContext *vc );
REGISTER_PROXYBUILDER_METHODS();

private:
FWPFTrackRPZProxyBuilder( const FWPFTrackRPZProxyBuilder& );
const FWPFTrackRPZProxyBuilder& operator=( const FWPFTrackRPZProxyBuilder& );

// --------------------- Member Functions --------------------------
virtual void build( const reco::Track &iData, unsigned int iIndex, TEveElement &oItemHolder, const FWViewContext *vc );
};
#endif
//=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_=_
4 changes: 3 additions & 1 deletion Fireworks/Tracks/plugins/FWTrackHitsDetailView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,10 @@ class FWTrackHitsDetailView: public FWDetailViewGL<reco::Track>,
FWTrackHitsDetailView(const FWTrackHitsDetailView&); // stop default
const FWTrackHitsDetailView& operator=(const FWTrackHitsDetailView&); // stop default

using FWDetailView<reco::Track>::build;
void build (const FWModelId &id, const reco::Track*);
void setTextInfo (const FWModelId &id, const reco::Track*);
using FWDetailView<reco::Track>::setTextInfo;
void setTextInfo (const FWModelId &id, const reco::Track*);
void makeLegend( void );

void
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Tracks/plugins/FWTrackProxyBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class FWTrackProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Track> {

const FWTrackProxyBuilder& operator=(const FWTrackProxyBuilder&); // stop default

using FWSimpleProxyBuilderTemplate<reco::Track> {::build;
using FWSimpleProxyBuilderTemplate<reco::Track>::build;
void build(const reco::Track& iData, unsigned int iIndex,TEveElement& oItemHolder, const FWViewContext*) override;
};

Expand Down
2 changes: 2 additions & 0 deletions Fireworks/Tracks/plugins/FWTrackResidualDetailView.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ class FWTrackResidualDetailView : public FWDetailViewCanvas<reco::Track>{
FWTrackResidualDetailView(const FWTrackResidualDetailView&); // stop default
const FWTrackResidualDetailView& operator=(const FWTrackResidualDetailView&); // stop default

using FWDetailViewCanvas<reco::Track>::build;
virtual void build (const FWModelId &id, const reco::Track*);
using FWDetailViewCanvas<reco::Track>::setTextInfo;
virtual void setTextInfo(const FWModelId &id, const reco::Track*);

double getSignedResidual (const FWGeometry *geom, unsigned int id, double resX);
Expand Down
2 changes: 1 addition & 1 deletion Fireworks/Vertices/plugins/FWSecVertexProxyBuilder.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class FWSecVertexProxyBuilder : public FWSimpleProxyBuilderTemplate<reco::Second
const FWSecVertexProxyBuilder& operator=(const FWSecVertexProxyBuilder&); // stop default

// ---------- member data --------------------------------
using FWSimpleProxyBuilderTemplate<reco::SecondaryVertexTagInfo> {::build;
using FWSimpleProxyBuilderTemplate<reco::SecondaryVertexTagInfo>::build;
void build(const reco::SecondaryVertexTagInfo& iData, unsigned int iIndex, TEveElement& oItemHolder, const FWViewContext*) override;
};

Expand Down

0 comments on commit e99cc32

Please sign in to comment.