Changeset 1792 for code/trunk/src/core/Shell.h

Timestamp:

Sep 16, 2008, 8:45:13 PM (16 years ago)

Author:

rgrieder

Message:

Changed initialisation of TclThreadManager, TclBind and Shell to match the simple singleton concept (runtime assert in the c'tor).
That simplifies things a lot. The instances now 'belong' to GSRoot.

File:

• code/trunk/src/core/Shell.h (modified) (4 diffs)

code/trunk/src/core/Shell.h

@@ -30 +30 @@
 #define _Shell_H__
 
+#include "CorePrereqs.h"
+
 #include <list>
 #include <vector>
-
-#include "CorePrereqs.h"
 
 #include "OrxonoxClass.h"
@@ -60 +60 @@
     {
         public:
-            static Shell& getInstance();
-            static Shell& createShell();
+            Shell();
+            virtual ~Shell();
+
+            static Shell& getInstance() { assert(singletonRef_s); return *singletonRef_s; }
 
             static void clearShell();
@@ -104 +106 @@
 
         private:
-            Shell();
             Shell(const Shell& other);
-            virtual ~Shell();
 
             void configureInputBuffer();
@@ -142 +142 @@
             unsigned int historyOffset_;
             bool bAddOutputLevel_;
+
+            static Shell* singletonRef_s;
     };
 }