Ticket #8391: makeInstance.patch

base/plugins.h

@@ -117 +117 @@
         
         bool tryLoadPlugin(Plugin *plugin);
         
-        friend SingletonBaseType *makeInstance<>();
+        friend class Common::Singleton<SingletonBaseType>;
         PluginManager();
 
 public:

common/config-manager.h

@@ -114 +114 @@
 */
 
 private:
-        friend SingletonBaseType *makeInstance<>();
+        friend class Singleton<SingletonBaseType>;
         ConfigManager();
 
         void                    loadFile(const String &filename);

common/singleton.h

@@ -23 +23 @@
 #ifndef COMMON_SINGLETON_H
 #define COMMON_SINGLETON_H
 
-/**
- * The default object factory used by the template class Singleton.
- * By specialising this template function, one can make a singleton use a
- * custom object factory. For example, to support encapsulation, your
- * singleton class might be pure virtual (or "abstract" in Java terminology),
- * and you specialise makeInstance to return an instance of a subclass.
- */
-template <class T>
-T* makeInstance() {
-        return new T();
-}
-
 namespace Common {
 
 /**
@@ -49 +37 @@
         
         static T* _singleton;
 
+        /**
+         * The default object factory used by the template class Singleton.
+         * By specialising this template function, one can make a singleton use a
+         * custom object factory. For example, to support encapsulation, your
+         * singleton class might be pure virtual (or "abstract" in Java terminology),
+         * and you specialise makeInstance to return an instance of a subclass.
+         */
+        //template <class T>
+        static T* makeInstance() {
+                return new T();
+        }
+        
+
 public:
         static T& instance() {
                 // TODO: We aren't thread safe. For now we ignore it since the
@@ -59 +60 @@
                 // order might become an issue. There are various approaches
                 // to solve that problem, but for now this is sufficient
                 if (!_singleton)
-                        _singleton = makeInstance<T>();
+                        _singleton = makeInstance();
+//                      _singleton = makeInstance<T>();
                 return *_singleton;
         }
 protected:

common/system.cpp

@@ -34 +34 @@
 DECLARE_SINGLETON(OSystem);
 
 template <>
-OSystem *makeInstance<>() {
+OSystem *Common::Singleton<OSystem>::makeInstance() {
         // Attention: Do not call parseGraphicsMode() here, nor any other function
         // which needs to access the OSystem instance, else you get stuck in an
         // endless loop.

common/system.h

@@ -35 +35 @@
  * Custome object factory for OSystem.
  */
 template <>
-OSystem *makeInstance<>();
+OSystem *Common::Singleton<OSystem>::makeInstance();
 
 
 /**

gui/newgui.h

@@ -56 +56 @@
 class NewGui : public Common::Singleton<NewGui> {
         typedef Common::String String;
         friend class Dialog;
-        friend SingletonBaseType *makeInstance<>();
+        friend class Common::Singleton<SingletonBaseType>;
         NewGui();
 public:
 

scumm/smush/smush_player.cpp

@@ -172 +172 @@
         }
 };
 
-static StringResource *getStrings(const char *file, bool is_encoded) {
+static StringResource *getStrings(ScummEngine *vm, const char *file, bool is_encoded) {
         debugC(DEBUG_SMUSH, "trying to read text ressources from %s", file);
-        File theFile;
+        ScummFile theFile;
 
-        theFile.open(file);
+        vm->openFile(theFile, file);
         if (!theFile.isOpen()) {
                 return 0;
         }
@@ -195 +195 @@
 
                 if (type != TYPE_ETRS) {
                         delete [] filebuffer;
-                        return getStrings(file, false);
+                        return getStrings(vm, file, false);
                 }
 
                 char *old = filebuffer;
@@ -651 +651 @@
         char fname[260];
         memcpy(fname, file, i - file);
         strcpy(fname + (i - file), ".trs");
-        if ((_strings = getStrings(fname, false)) != 0) {
+        if ((_strings = getStrings(_vm, fname, false)) != 0) {
                 return true;
         }
 
-        if ((_strings = getStrings("digtxt.trs", true)) != 0) {
+        if ((_strings = getStrings(_vm, "digtxt.trs", true)) != 0) {
                 return true;
         }
         return false;

sound/audiocd.h

@@ -54 +54 @@
         Status getStatus() const;
 
 private:
-        friend SingletonBaseType *makeInstance<>();
+        friend class Common::Singleton<SingletonBaseType>;
         AudioCDManager();
 
         int getCachedTrack(int track);