From 2596b887ee262c12fc6dd22c569e41c63e5ef222 Mon Sep 17 00:00:00 2001
From: Frank Winklmeier <frank.winklmeier@cern.ch>
Date: Thu, 22 Mar 2018 14:16:42 +0100
Subject: [PATCH] Migrate to DECLARE_COMPONENT macro
Use DECLARE_COMPONENT instead of the obsolete FACTORY_ENTRIES macros to
declare Gaudi components. In addition:
- Move DECLARE call to _entries.cxx if available
- Delete obsolete _load.cxx file
Former-commit-id: 8684fcdd1a32cf993269dc304f9a779e5ff02346
---
.../AthExHive/src/HiveExSvc.cxx | 3 +--
.../test/SlotSpecificObj_test.cxx | 2 +-
.../AthenaServices/src/LoggedMessageSvc.cxx | 6 +----
.../src/ToyNextPassFilterAlg.cxx | 4 +---
.../AthenaServices/src/ToyNextPassFilterAlg.h | 8 +++----
.../src/ToyNextPassFilterTool.cxx | 4 +---
.../src/components/AthenaServices_entries.cxx | 4 ++++
.../test/AthenaEventLoopMgr_test.cxx | 8 +++----
Control/AthenaServices/test/RCUSvc_test.cxx | 2 +-
.../SGComps/test/AddressRemappingSvc_test.cxx | 2 +-
.../src/IOVRegistrationSvc.cxx | 4 +---
.../RegistrationServices_entries.cxx | 3 ++-
.../src/Other/LArGeoH62004Tools_entries.cc | 15 +++----------
.../src/Other/LArGeoH62004Tools_load.cc | 8 -------
.../test/RpcPadContainerCnv_p1_test.cxx | 2 +-
.../test/RpcPadContainerCnv_p2_test.cxx | 2 +-
.../DerivationFrameworkMuons_entries.cxx | 22 +++++--------------
.../DerivationFrameworkMuons_load.cxx | 3 ---
.../ISF_Algorithms/test/SimKernelMT_test.cxx | 6 ++---
.../ISF_Services/test/InputConverter_test.cxx | 2 +-
.../test/TileCondToolDspThreshold_test.cxx | 2 +-
.../test/TileCondToolOfcCool_test.cxx | 2 +-
.../test/TileCondToolTMDB_test.cxx | 2 +-
.../test/TileDigitsThresholdFilter_test.cxx | 2 +-
.../src/components/TrkDigTools_entries.cxx | 8 +------
25 files changed, 42 insertions(+), 84 deletions(-)
mode change 100755 => 100644 Database/RegistrationServices/src/IOVRegistrationSvc.cxx
mode change 100755 => 100644 LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_entries.cc
delete mode 100755 LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_load.cc
delete mode 100644 PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_load.cxx
diff --git a/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx b/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
index 8e58617ce6c..e94a2cd91b6 100644
--- a/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
+++ b/Control/AthenaExamples/AthExHive/src/HiveExSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "HiveExSvc.h"
@@ -12,7 +12,6 @@
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-DECLARE_SERVICE_FACTORY(HiveExSvc)
thread_local int s_i(0);
diff --git a/Control/AthenaKernel/test/SlotSpecificObj_test.cxx b/Control/AthenaKernel/test/SlotSpecificObj_test.cxx
index 4c182de6904..5089dc959c6 100644
--- a/Control/AthenaKernel/test/SlotSpecificObj_test.cxx
+++ b/Control/AthenaKernel/test/SlotSpecificObj_test.cxx
@@ -47,7 +47,7 @@ public:
};
-DECLARE_SERVICE_FACTORY( TestWhiteBoard )
+DECLARE_COMPONENT( TestWhiteBoard )
struct Payload
diff --git a/Control/AthenaServices/src/LoggedMessageSvc.cxx b/Control/AthenaServices/src/LoggedMessageSvc.cxx
index 2ea42de3f46..7647b55df1a 100644
--- a/Control/AthenaServices/src/LoggedMessageSvc.cxx
+++ b/Control/AthenaServices/src/LoggedMessageSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// $Id: AthMessageSvc.cpp,v 1.27 2008/10/21 16:25:55 marcocle Exp $
@@ -18,10 +18,6 @@
using namespace std;
-// Instantiation of a static factory class used by clients to create
-// instances of this service
-DECLARE_SERVICE_FACTORY(LoggedMessageSvc)
-
static std::string levelNames[MSG::NUM_LEVELS];
// Constructor
diff --git a/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx b/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx
index 77a421aa339..f26619d5d2d 100644
--- a/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx
+++ b/Control/AthenaServices/src/ToyNextPassFilterAlg.cxx
@@ -1,13 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// $Id: ToyNextPassFilterAlg.cxx,v 1.4 2008-09-23 22:00:47 binet Exp $
#include "GaudiKernel/AlgFactory.h"
#include "ToyNextPassFilterAlg.h"
-DECLARE_ALGORITHM_FACTORY( ToyNextPassFilterAlg )
-
ToyNextPassFilterAlg::ToyNextPassFilterAlg( const std::string& name,
ISvcLocator* pLoc ):
AthAlgorithm ( name, pLoc ), m_passesDone(0)
diff --git a/Control/AthenaServices/src/ToyNextPassFilterAlg.h b/Control/AthenaServices/src/ToyNextPassFilterAlg.h
index ccceb916e1f..709b9ffe112 100644
--- a/Control/AthenaServices/src/ToyNextPassFilterAlg.h
+++ b/Control/AthenaServices/src/ToyNextPassFilterAlg.h
@@ -1,9 +1,9 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
-#ifndef TOYNEXTPASSFILTERTOOL_H
-#define TOYNEXTPASSFILTERTOOL_H 1
+#ifndef TOYNEXTPASSFILTERALG_H
+#define TOYNEXTPASSFILTERALG_H 1
/** @file ToyNextPassFilterAlg.h
* @brief an Algorithm providing a toy implementation of INextPassFilter
*
@@ -49,4 +49,4 @@ private:
unsigned int m_passesDone; ///< no of passes already done
unsigned int m_nPasses; ///< property: no of pass to allow
};
-#endif // TOYNEXTPASSFILTERTOOL_H
+#endif // TOYNEXTPASSFILTERALG_H
diff --git a/Control/AthenaServices/src/ToyNextPassFilterTool.cxx b/Control/AthenaServices/src/ToyNextPassFilterTool.cxx
index 890273d1e38..a4cb9caacb6 100644
--- a/Control/AthenaServices/src/ToyNextPassFilterTool.cxx
+++ b/Control/AthenaServices/src/ToyNextPassFilterTool.cxx
@@ -1,13 +1,11 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
// $Id: ToyNextPassFilterTool.cxx,v 1.4 2008-09-23 22:00:47 binet Exp $
#include "GaudiKernel/ToolFactory.h"
#include "ToyNextPassFilterTool.h"
-DECLARE_TOOL_FACTORY(ToyNextPassFilterTool)
-
ToyNextPassFilterTool::ToyNextPassFilterTool( const std::string& type,
const std::string& name,
const IInterface* parent )
diff --git a/Control/AthenaServices/src/components/AthenaServices_entries.cxx b/Control/AthenaServices/src/components/AthenaServices_entries.cxx
index 2badf0c8121..97329c05c29 100644
--- a/Control/AthenaServices/src/components/AthenaServices_entries.cxx
+++ b/Control/AthenaServices/src/components/AthenaServices_entries.cxx
@@ -30,6 +30,8 @@
#include "../AthenaStopperAlg.h"
#include "../AthenaHiveEventLoopMgr.h"
#include "../AthIncFirerAlg.h"
+#include "../ToyNextPassFilterAlg.h"
+#include "../ToyNextPassFilterTool.h"
DECLARE_COMPONENT( AthenaOutputStream )
DECLARE_COMPONENT( AthenaConditionStream )
@@ -63,3 +65,5 @@ DECLARE_COMPONENT( AthenaOutputStreamTool )
DECLARE_COMPONENT( ThinningOutputTool )
DECLARE_COMPONENT( AthenaStopperAlg )
DECLARE_COMPONENT( AthIncFirerAlg )
+DECLARE_COMPONENT( ToyNextPassFilterAlg )
+DECLARE_COMPONENT( ToyNextPassFilterTool )
diff --git a/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx b/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx
index 5e0a344d580..cc7fe401ecc 100644
--- a/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx
+++ b/Control/AthenaServices/test/AthenaEventLoopMgr_test.cxx
@@ -301,10 +301,10 @@ StatusCode TestAlgorithm::execute()
//********************************************************************
-DECLARE_SERVICE_FACTORY( TestEvtSelector )
-DECLARE_SERVICE_FACTORY( TestEvtSelector2 )
-DECLARE_SERVICE_FACTORY( TestConversionSvc )
-DECLARE_ALGORITHM_FACTORY( TestAlgorithm )
+DECLARE_COMPONENT( TestEvtSelector )
+DECLARE_COMPONENT( TestEvtSelector2 )
+DECLARE_COMPONENT( TestConversionSvc )
+DECLARE_COMPONENT( TestAlgorithm )
DECLARE_CONVERTER_FACTORY( TestConverter )
class swallowsemicolon;
diff --git a/Control/AthenaServices/test/RCUSvc_test.cxx b/Control/AthenaServices/test/RCUSvc_test.cxx
index 0c07a94b9f9..94bfbada71a 100644
--- a/Control/AthenaServices/test/RCUSvc_test.cxx
+++ b/Control/AthenaServices/test/RCUSvc_test.cxx
@@ -58,7 +58,7 @@ public:
};
-DECLARE_SERVICE_FACTORY( TestWhiteBoard )
+DECLARE_COMPONENT( TestWhiteBoard )
struct Payload
diff --git a/Control/SGComps/test/AddressRemappingSvc_test.cxx b/Control/SGComps/test/AddressRemappingSvc_test.cxx
index 8aff61c37c2..d58b317836f 100644
--- a/Control/SGComps/test/AddressRemappingSvc_test.cxx
+++ b/Control/SGComps/test/AddressRemappingSvc_test.cxx
@@ -110,7 +110,7 @@ StatusCode TestAlgResourcePool::initialize()
}
-DECLARE_SERVICE_FACTORY (TestAlgResourcePool)
+DECLARE_COMPONENT( TestAlgResourcePool )
class TestAddress
diff --git a/Database/RegistrationServices/src/IOVRegistrationSvc.cxx b/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
old mode 100755
new mode 100644
index 5216b2bdefa..7382c2bec5f
--- a/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
+++ b/Database/RegistrationServices/src/IOVRegistrationSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
/**
@@ -48,8 +48,6 @@
//<<<<<< METHOD DEFINITIONS
-DECLARE_SERVICE_FACTORY(IOVRegistrationSvc)
-
//--------------------------------------------------------------------------
IOVRegistrationSvc::IOVRegistrationSvc( const std::string& name, ISvcLocator* svc )
diff --git a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
index 81232ae76fc..809d6f6a2ec 100644
--- a/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
+++ b/Database/RegistrationServices/src/components/RegistrationServices_entries.cxx
@@ -3,9 +3,10 @@
#include "../RegistrationStream.h"
#include "../RegistrationStreamLCGTool.h"
#include "../RegistrationStreamTagTool.h"
+#include "../IOVRegistrationSvc.h"
DECLARE_COMPONENT( RegistrationStream )
DECLARE_COMPONENT( OutputConditionsAlg )
DECLARE_COMPONENT( RegistrationStreamLCGTool )
DECLARE_COMPONENT( RegistrationStreamTagTool )
-
+DECLARE_COMPONENT( IOVRegistrationSvc )
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_entries.cc b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_entries.cc
old mode 100755
new mode 100644
index f5411ccf188..84264ced585
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_entries.cc
+++ b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_entries.cc
@@ -2,20 +2,11 @@
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
*/
-#include "GaudiKernel/DeclareFactoryEntries.h"
-
#include "LArGeoH62004Algs/LArTBH6TriggerTimeTool.h"
//#include "LArGeoH62004Algs/LArTBH6CellCorrTool.h"
//#include "LArGeoH62004Algs/TBClusterMaker.h"
-DECLARE_TOOL_FACTORY( LArTBH6TriggerTimeTool );
-//DECLARE_TOOL_FACTORY( LArTBH6CellCorrTool );
-//DECLARE_TOOL_FACTORY( TBClusterMaker );
+DECLARE_COMPONENT( LArTBH6TriggerTimeTool );
+//DECLARE_COMPONENT( LArTBH6CellCorrTool );
+//DECLARE_COMPONENT( TBClusterMaker );
-DECLARE_FACTORY_ENTRIES(LArG4TBH6Tools) {
- DECLARE_ALGORITHM(LArTBH6BeamInfo);
-// DECLARE_ALGORITHM(CBNT_TBTrackInfo);
- DECLARE_TOOL( LArTBH6TriggerTimeTool );
-// DECLARE_TOOL( LArTBH6CellCorrTool );
-// DECLARE_TOOL( TBClusterMaker );
-}
diff --git a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_load.cc b/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_load.cc
deleted file mode 100755
index 97129deec4e..00000000000
--- a/LArCalorimeter/LArGeoModel/LArGeoH62004Algs/src/Other/LArGeoH62004Tools_load.cc
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
-*/
-
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES(LArGeoH62004Tools)
-
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
index 716cc26009a..481e8ddab8d 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p1_test.cxx
@@ -289,7 +289,7 @@ const CablingRPCBase::RDOmap& TestRPC_CablingSvc::give_RDOs() const
}
-DECLARE_SERVICE_FACTORY( TestRPC_CablingSvc )
+DECLARE_COMPONENT( TestRPC_CablingSvc )
//****************************************************************************
diff --git a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
index c2c3e8261bb..781876b027b 100644
--- a/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
+++ b/MuonSpectrometer/MuonCnv/MuonEventAthenaPool/test/RpcPadContainerCnv_p2_test.cxx
@@ -289,7 +289,7 @@ const CablingRPCBase::RDOmap& TestRPC_CablingSvc::give_RDOs() const
}
-DECLARE_SERVICE_FACTORY( TestRPC_CablingSvc )
+DECLARE_COMPONENT( TestRPC_CablingSvc )
//****************************************************************************
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
index 8bc3ed98372..6beafa35da6 100644
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
+++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_entries.cxx
@@ -1,4 +1,3 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "DerivationFrameworkMuons/dimuonTaggingTool.h"
#include "DerivationFrameworkMuons/isolationDecorator.h"
#include "DerivationFrameworkMuons/mcpDecorator.h"
@@ -7,19 +6,10 @@
#include "DerivationFrameworkMuons/MuonIDCovMatrixDecorator.h"
using namespace DerivationFramework;
-DECLARE_TOOL_FACTORY( dimuonTaggingTool )
-DECLARE_TOOL_FACTORY( isolationDecorator )
-DECLARE_TOOL_FACTORY( mcpDecorator )
-DECLARE_TOOL_FACTORY (MuonTPExtrapolationTool)
-DECLARE_TOOL_FACTORY (IDTrackCaloDepositsDecoratorTool)
-DECLARE_TOOL_FACTORY (MuonIDCovMatrixDecorator)
-
-DECLARE_FACTORY_ENTRIES( DerivationFrameworkMuons ) {
- DECLARE_TOOL( dimuonTaggingTool )
- DECLARE_TOOL( isolationDecorator )
- DECLARE_TOOL( mcpDecorator )
- DECLARE_TOOL(MuonTPExtrapolationTool)
- DECLARE_TOOL(IDTrackCaloDepositsDecoratorTool)
- DECLARE_TOOL(MuonIDCovMatrixDecorator)
-}
+DECLARE_COMPONENT( dimuonTaggingTool )
+DECLARE_COMPONENT( isolationDecorator )
+DECLARE_COMPONENT( mcpDecorator )
+DECLARE_COMPONENT( MuonTPExtrapolationTool )
+DECLARE_COMPONENT( IDTrackCaloDepositsDecoratorTool )
+DECLARE_COMPONENT( MuonIDCovMatrixDecorator )
diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_load.cxx b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_load.cxx
deleted file mode 100644
index 53b825b3359..00000000000
--- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkMuons/src/components/DerivationFrameworkMuons_load.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "GaudiKernel/LoadFactoryEntries.h"
-
-LOAD_FACTORY_ENTRIES( DerivationFrameworkMuons )
diff --git a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
index 1ffaf73c1b4..f048fd3ec21 100644
--- a/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Algorithms/test/SimKernelMT_test.cxx
@@ -65,7 +65,7 @@ public:
}; // MockInputConverter class
-DECLARE_SERVICE_FACTORY( MockInputConverter )
+DECLARE_COMPONENT( MockInputConverter )
// Athena Service to mock an SimulationService
@@ -86,7 +86,7 @@ public:
MOCK_METHOD0(releaseEvent, StatusCode());
}; // MockSimulationSvc class
-DECLARE_SERVICE_FACTORY( MockSimulationSvc )
+DECLARE_COMPONENT( MockSimulationSvc )
// Athena Tool to mock a SimulationSelector
@@ -126,7 +126,7 @@ private:
}; // MockSimulationSelector class
-DECLARE_TOOL_FACTORY( MockSimulationSelector )
+DECLARE_COMPONENT( MockSimulationSelector )
// Gaudi Test fixture that provides a clean Gaudi environment for
diff --git a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
index 048d2271741..eee4410313a 100644
--- a/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
+++ b/Simulation/ISF/ISF_Core/ISF_Services/test/InputConverter_test.cxx
@@ -64,7 +64,7 @@ class MockFilterTool : public AthAlgTool,
MOCK_CONST_METHOD1(pass, bool(const HepMC::GenParticle&));
};
-DECLARE_TOOL_FACTORY( MockFilterTool )
+DECLARE_COMPONENT( MockFilterTool )
class InputConverter_test: public ::testing::Test {
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx b/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx
index e1e3f3c8440..befb1f53cd7 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileCondToolDspThreshold_test.cxx
@@ -114,7 +114,7 @@ class TileCondProxyMock: public AthAlgTool, virtual public ITileCondProxy<T> {
typedef TileCondProxyMock< TileCalibDrawerFlt > TileCondProxyMockFlt;
-DECLARE_TOOL_FACTORY( TileCondProxyMockFlt )
+DECLARE_COMPONENT( TileCondProxyMockFlt )
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx b/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx
index bda0064bc9b..07df9d94568 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileCondToolOfcCool_test.cxx
@@ -115,7 +115,7 @@ class TileCondProxyMock: public AthAlgTool, virtual public ITileCondProxy<T> {
typedef TileCondProxyMock< TileCalibDrawerOfc > TileCondProxyMockOfc;
-DECLARE_TOOL_FACTORY( TileCondProxyMockOfc )
+DECLARE_COMPONENT( TileCondProxyMockOfc )
diff --git a/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx b/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx
index 0a37660b5e4..bb502a0844f 100644
--- a/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx
+++ b/TileCalorimeter/TileConditions/test/TileCondToolTMDB_test.cxx
@@ -115,7 +115,7 @@ class TileCondProxyMock: public AthAlgTool, virtual public ITileCondProxy<T> {
typedef TileCondProxyMock< TileCalibDrawerFlt > TileCondProxyMockFlt;
-DECLARE_TOOL_FACTORY( TileCondProxyMockFlt )
+DECLARE_COMPONENT( TileCondProxyMockFlt )
diff --git a/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx b/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx
index 091d9315215..b55350afa73 100644
--- a/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx
+++ b/TileCalorimeter/TileRecAlgs/test/TileDigitsThresholdFilter_test.cxx
@@ -100,7 +100,7 @@ class TileCondToolDspThresholdMock: public AthAlgTool, virtual public ITileCondT
};
-DECLARE_TOOL_FACTORY( TileCondToolDspThresholdMock )
+DECLARE_COMPONENT( TileCondToolDspThresholdMock )
void test1() {
diff --git a/Tracking/TrkDigitization/TrkDigTools/src/components/TrkDigTools_entries.cxx b/Tracking/TrkDigitization/TrkDigTools/src/components/TrkDigTools_entries.cxx
index 5d70f209e1d..701daa1f527 100644
--- a/Tracking/TrkDigitization/TrkDigTools/src/components/TrkDigTools_entries.cxx
+++ b/Tracking/TrkDigitization/TrkDigTools/src/components/TrkDigTools_entries.cxx
@@ -1,12 +1,6 @@
-#include "GaudiKernel/DeclareFactoryEntries.h"
#include "TrkDigTools/PlanarModuleStepper.h"
using namespace Trk;
-DECLARE_TOOL_FACTORY( PlanarModuleStepper )
+DECLARE_COMPONENT( PlanarModuleStepper )
-/** factory entries need to have the name of the package */
-DECLARE_FACTORY_ENTRIES( TrkDigTools )
-{
- DECLARE_TOOL( PlanarModuleStepper )
-}
--
GitLab