[pclasses-cvs] pclasses2/include/pclasses/System Mime.h,1.1,1.2

[stephan b. <sg...@us...>]

Update of /cvsroot/pclasses/pclasses2/include/pclasses/System
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17410/include/pclasses/System

Modified Files:
	Mime.h 
Log Message:
corrected staticness of MimeTypeDb::instance()

Index: Mime.h
===================================================================
RCS file: /cvsroot/pclasses/pclasses2/include/pclasses/System/Mime.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Mime.h	24 Dec 2004 02:51:50 -0000	1.1
+++ Mime.h	24 Dec 2004 03:01:08 -0000	1.2
@@ -21,7 +21,6 @@
 #ifndef _pmime_h_
 #define _pmime_h_
 
-#include <pclasses/Phoenix.h>
 #include <list>
 #include <string>
 #include <map>
@@ -129,11 +128,7 @@
 	const MimeTypeMap & typeMap() const
 	{ return this->m_types; }
 
-	MimeTypeDb & instance()
-	{
-		typedef ::P::Phoenix< MimeTypeDb, MimeTypeDb, MimeTypeDb::init_functor > PHX;
-		return PHX::instance();
-	}
+	static MimeTypeDb & instance();
 
   private:
 	/** For use with P::Phoenix. */
@@ -141,8 +136,8 @@
 	{
 		/**
 		   Gets called when instance() creates a new instance.
-		   If db is empty thent this function tries to populate
-		   it using the system-wise mime db.
+		   If db is empty then this function tries to populate
+		   it using the system-wide mime db.
 		*/
 		void operator()( MimeTypeDb & db ) const;
 	};