[Scummvm-cvs-logs] CVS: scummvm/gui newgui.h,1.48,1.49

Max Horn fingolfin at users.sourceforge.net
Sat Jan 1 11:20:09 CET 2005


Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4920/gui

Modified Files:
	newgui.h 
Log Message:
Changed the singleton code to allow for custom object factories; this allowed me to change OSystem to use the singleton base class, too

Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- newgui.h	1 Jan 2005 16:09:07 -0000	1.48
+++ newgui.h	1 Jan 2005 19:19:05 -0000	1.49
@@ -56,7 +56,7 @@
 class NewGui : public Common::Singleton<NewGui> {
 	typedef Common::String String;
 	friend class Dialog;
-	friend class Common::Singleton<NewGui>;
+	friend SingletonBaseType *makeInstance<>();
 	NewGui();
 public:
 





More information about the Scummvm-git-logs mailing list