Merge branch 'master-interface' into 'master'

Use DeclareInterfaceID and extends for (I)SeedToTrackConversionTool

See merge request atlas/athena!23396

InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISeedToTrackConversionTool.h

@@ -19,15 +19,9 @@ class MsgStream;
 
 namespace InDet 
 {
-
-
-  static const InterfaceID IID_ISeedToTrackConversionTool("InDet::ISeedToTrackConversionTool", 1, 0);
-
   class ISeedToTrackConversionTool : virtual public IAlgTool {
   public:
-    static const InterfaceID& interfaceID( ) ;
-    virtual StatusCode initialize ()=0;
-    virtual StatusCode finalize()=0;
+    DeclareInterfaceID(ISeedToTrackConversionTool, 1, 0);
     virtual void executeSiSPSeedSegments(const Trk::TrackParameters*,const int&, const std::list<const Trk::SpacePoint*>&) const =0;
     virtual void newEvent(const Trk::TrackInfo&, const std::string&) const =0;
     virtual void endEvent() const =0;
@@ -45,10 +39,6 @@ namespace InDet
   // Overload of << operator for MsgStream and  std::ostream
   MsgStream&    operator << (MsgStream&   ,const ISeedToTrackConversionTool&);
   std::ostream& operator << (std::ostream&,const ISeedToTrackConversionTool&);
-  inline const InterfaceID& ISeedToTrackConversionTool::interfaceID()
-    { 
-      return IID_ISeedToTrackConversionTool; 
-    }
 
   // Overload of << operator MsgStream
   inline MsgStream& operator    <<

InnerDetector/InDetRecTools/SeedToTrackConversionTool/SeedToTrackConversionTool/SeedToTrackConversionTool.h

@@ -39,7 +39,7 @@ namespace InDet
       @author  Weiming Yao <Weiming.Yao>
   */  
 
-  class SeedToTrackConversionTool : virtual public ISeedToTrackConversionTool, public AthAlgTool
+  class SeedToTrackConversionTool : public extends<AthAlgTool, ISeedToTrackConversionTool>
   {
   public:
     SeedToTrackConversionTool(const std::string&,const std::string&,const IInterface*);

InnerDetector/InDetRecTools/SeedToTrackConversionTool/src/SeedToTrackConversionTool.cxx

@@ -22,9 +22,8 @@
 InDet::SeedToTrackConversionTool::SeedToTrackConversionTool(const std::string& t,
                                                             const std::string& n,
                                                             const IInterface* p)
-  : AthAlgTool(t, n, p)
+  : base_class(t, n, p)
 {
-  declareInterface<ISeedToTrackConversionTool>(this);
 }
 
 //================ Initialisation =================================================