From 681297e10b666e13cc463f6fbb16236f36c3266c Mon Sep 17 00:00:00 2001
From: Vincent Richard <vincent@vincent-richard.net>
Date: Tue, 12 Jul 2005 22:28:02 +0000
Subject: Reference counting and smart pointers.

---
 src/messaging/serviceFactory.cpp | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

(limited to 'src/messaging/serviceFactory.cpp')

diff --git a/src/messaging/serviceFactory.cpp b/src/messaging/serviceFactory.cpp
index ea1752dd..a706b0ba 100644
--- a/src/messaging/serviceFactory.cpp
+++ b/src/messaging/serviceFactory.cpp
@@ -37,11 +37,6 @@ serviceFactory::serviceFactory()
 
 serviceFactory::~serviceFactory()
 {
-	for (std::vector <registeredService*>::const_iterator it = m_services.begin() ;
-	     it != m_services.end() ; ++it)
-	{
-		delete (*it);
-	}
 }
 
 
@@ -52,17 +47,17 @@ serviceFactory* serviceFactory::getInstance()
 }
 
 
-service* serviceFactory::create
-	(session* sess, const string& protocol, authenticator* auth)
+ref <service> serviceFactory::create
+	(ref <session> sess, const string& protocol, ref <authenticator> auth)
 {
 	return (getServiceByProtocol(protocol)->create(sess, auth));
 }
 
 
-service* serviceFactory::create
-	(session* sess, const utility::url& u, authenticator* auth)
+ref <service> serviceFactory::create
+	(ref <session> sess, const utility::url& u, ref <authenticator> auth)
 {
-	service* serv = create(sess, u.getProtocol(), auth);
+	ref <service> serv = create(sess, u.getProtocol(), auth);
 
 	sess->getProperties()[serv->getInfos().getPropertyPrefix() + "server.address"] = u.getHost();
 
@@ -84,11 +79,11 @@ service* serviceFactory::create
 }
 
 
-const serviceFactory::registeredService* serviceFactory::getServiceByProtocol(const string& protocol) const
+ref <const serviceFactory::registeredService> serviceFactory::getServiceByProtocol(const string& protocol) const
 {
 	const string name(utility::stringUtils::toLower(protocol));
 
-	for (std::vector <registeredService*>::const_iterator it = m_services.begin() ;
+	for (std::vector <ref <registeredService> >::const_iterator it = m_services.begin() ;
 	     it != m_services.end() ; ++it)
 	{
 		if ((*it)->getName() == name)
@@ -105,17 +100,17 @@ const int serviceFactory::getServiceCount() const
 }
 
 
-const serviceFactory::registeredService* serviceFactory::getServiceAt(const int pos) const
+ref <const serviceFactory::registeredService> serviceFactory::getServiceAt(const int pos) const
 {
 	return (m_services[pos]);
 }
 
 
-const std::vector <const serviceFactory::registeredService*> serviceFactory::getServiceList() const
+const std::vector <ref <const serviceFactory::registeredService> > serviceFactory::getServiceList() const
 {
-	std::vector <const registeredService*> res;
+	std::vector <ref <const registeredService> > res;
 
-	for (std::vector <registeredService*>::const_iterator it = m_services.begin() ;
+	for (std::vector <ref <registeredService> >::const_iterator it = m_services.begin() ;
 	     it != m_services.end() ; ++it)
 	{
 		res.push_back(*it);
-- 
cgit v1.2.3