Use DeclareInterfaceID and extends for (I)SiDetElementsRoadMaker(_xk)

InnerDetector/InDetRecTools/InDetRecToolInterfaces/InDetRecToolInterfaces/ISiDetElementsRoadMaker.h

 /*
-  Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
 */
 
 /////////////////////////////////////////////////////////////////////////////////
@@ -16,12 +16,14 @@
 #ifndef ISiDetElementsRoadMaker_H
 #define ISiDetElementsRoadMaker_H
 
-#include <list>
-#include "GaudiKernel/AlgTool.h"
+#include "GeoPrimitives/GeoPrimitives.h"
 #include "TrkEventPrimitives/PropDirection.h"
 #include "TrkParameters/TrackParameters.h"
 #include "TrkSpacePoint/SpacePoint.h"
-#include "GeoPrimitives/GeoPrimitives.h"
+
+#include "GaudiKernel/AlgTool.h"
+
+#include <list>
 
 class MsgStream;
 
@@ -31,10 +33,6 @@ namespace InDetDD {
 
 namespace InDet {
 
- 
-  static const InterfaceID IID_ISiDetElementsRoadMaker
-    ("InDet::ISiDetElementsRoadMaker",1,0);
-
   class ISiDetElementsRoadMaker : virtual public IAlgTool 
     {
       ///////////////////////////////////////////////////////////////////
@@ -43,13 +41,8 @@ namespace InDet {
       
     public:
 
-      ///////////////////////////////////////////////////////////////////
-      // Standard tool methods
-      ///////////////////////////////////////////////////////////////////
-
-      static const InterfaceID& interfaceID();
-      virtual StatusCode initialize ()=0;
-      virtual StatusCode finalize   ()=0;
+      // InterfaceID
+      DeclareInterfaceID(ISiDetElementsRoadMaker, 1, 0);
 
       ///////////////////////////////////////////////////////////////////
       // Main methods for road builder
@@ -87,11 +80,6 @@ namespace InDet {
   // Inline methods
   ///////////////////////////////////////////////////////////////////
 
-  inline const InterfaceID& ISiDetElementsRoadMaker::interfaceID()
-    {
-      return IID_ISiDetElementsRoadMaker;
-    }
-
   ///////////////////////////////////////////////////////////////////
   // Overload of << operator MsgStream
   ///////////////////////////////////////////////////////////////////

InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/SiDetElementsRoadTool_xk/SiDetElementsRoadMaker_xk.h

@@ -51,8 +51,7 @@ namespace InDet{
 
 
   class SiDetElementsRoadMaker_xk : 
-
-    virtual public ISiDetElementsRoadMaker, public AthAlgTool
+    public extends<AthAlgTool, ISiDetElementsRoadMaker>
   {
     ///////////////////////////////////////////////////////////////////
     // Public methods:

InnerDetector/InDetRecTools/SiDetElementsRoadTool_xk/src/SiDetElementsRoadMaker_xk.cxx

@@ -31,9 +31,8 @@
 
 InDet::SiDetElementsRoadMaker_xk::SiDetElementsRoadMaker_xk
 (const std::string& t, const std::string& n, const IInterface* p)
-  : AthAlgTool(t, n, p)
+  : base_class(t, n, p)
 {
-  declareInterface<ISiDetElementsRoadMaker>(this);
 }
 
 ///////////////////////////////////////////////////////////////////