7 files changed, 42 insertions, 53 deletions
diff --git a/src/encoderFactory.cpp b/src/encoderFactory.cpp
index 2cf1bd66..76f05f48 100644
--- a/src/encoderFactory.cpp
+++ b/src/encoderFactory.cpp
@@ -54,6 +54,13 @@ encoderFactory::~encoderFactory()
 }
 
 
+encoderFactory* encoderFactory::getInstance()
+{
+	static encoderFactory instance;
+	return (&instance);
+}
+
+
 encoder* encoderFactory::create(const string& name)
 {
 	return (getEncoderByName(name)->create());
diff --git a/src/headerFieldFactory.cpp b/src/headerFieldFactory.cpp
index 306e2c8e..807ffe4d 100644
--- a/src/headerFieldFactory.cpp
+++ b/src/headerFieldFactory.cpp
@@ -63,6 +63,13 @@ headerFieldFactory::~headerFieldFactory()
 }
 
 
+headerFieldFactory* headerFieldFactory::getInstance()
+{
+	static headerFieldFactory instance;
+	return (&instance);
+}
+
+
 headerField* headerFieldFactory::create
 	(const string& name, const string& body)
 {
diff --git a/src/messaging/serviceFactory.cpp b/src/messaging/serviceFactory.cpp
index 3007488d..a4ce70a4 100644
--- a/src/messaging/serviceFactory.cpp
+++ b/src/messaging/serviceFactory.cpp
@@ -45,6 +45,13 @@ serviceFactory::~serviceFactory()
 }
 
 
+serviceFactory* serviceFactory::getInstance()
+{
+	static serviceFactory instance;
+	return (&instance);
+}
+
+
 service* serviceFactory::create
 	(session* sess, const string& protocol, authenticator* auth)
 {
diff --git a/src/options.cpp b/src/options.cpp
index 609dbeb1..d99b248b 100644
--- a/src/options.cpp
+++ b/src/options.cpp
@@ -24,6 +24,13 @@ namespace vmime
 {
 
 
+options* options::getInstance()
+{
+	static options instance;
+	return (&instance);
+}
+
+
 options::multipartOptions::multipartOptions()
 	: m_prologText("This is a multi-part message in MIME format. Your mail reader " \
 	               "does not understand MIME message format."),
diff --git a/src/parameterFactory.cpp b/src/parameterFactory.cpp
index 57504276..cd67ce81 100644
--- a/src/parameterFactory.cpp
+++ b/src/parameterFactory.cpp
@@ -42,6 +42,13 @@ parameterFactory::~parameterFactory()
 }
 
 
+parameterFactory* parameterFactory::getInstance()
+{
+	static parameterFactory instance;
+	return (&instance);
+}
+
+
 parameter* parameterFactory::create
 	(const string& name, const string& value)
 {
diff --git a/src/textPartFactory.cpp b/src/textPartFactory.cpp
index 0d588d9c..bfc2fa64 100644
--- a/src/textPartFactory.cpp
+++ b/src/textPartFactory.cpp
@@ -42,6 +42,13 @@ textPartFactory::~textPartFactory()
 }
 
 
+textPartFactory* textPartFactory::getInstance()
+{
+	static textPartFactory instance;
+	return (&instance);
+}
+
+
 textPart* textPartFactory::create(const mediaType& type)
 {
 	NameMap::const_iterator pos = m_nameMap.find(type.generate());
diff --git a/src/utility/singleton.cpp b/src/utility/singleton.cpp
deleted file mode 100644
index 58b751e6..00000000
--- a/src/utility/singleton.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-//
-// VMime library (http://vmime.sourceforge.net)
-// Copyright (C) 2002-2005 Vincent Richard <[email protected]>
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License as
-// published by the Free Software Foundation; either version 2 of
-// the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-//
-
-#include "vmime/utility/singleton.hpp"
-
-
-namespace vmime {
-namespace utility {
-
-
-singletonManager::singletonManager()
-{
-}
-
-
-singletonManager::~singletonManager()
-{
-	for (std::list <abstractSingleton*>::iterator it = m_list.begin() ; it != m_list.end() ; ++it)
-		delete (*it);
-}
-
-
-singletonManager* singletonManager::getInstance()
-{
-	static singletonManager inst;
-	return (&inst);
-}
-
-
-void singletonManager::manage(abstractSingleton* s)
-{
-	m_list.push_back(s);
-}
-
-
-} // utility
-} // vmime