Changeset 244 for code/branches/objecthierarchie/src/Test.h

Timestamp:

Nov 25, 2007, 5:21:53 PM (16 years ago)

Author:

landauf

Message:

reimplementation of the factory and parts of the class-hierarchy-generating-algorithm. interfaces with protected constructors are now allowed.

File:

• code/branches/objecthierarchie/src/Test.h (modified) (19 diffs)

code/branches/objecthierarchie/src/Test.h

@@ -9 +9 @@
     class Interface1 : virtual public OrxonoxClass
     {
-        public:
-            Interface1() { registerAbstractRootObject(Interface1); }
+        protected:
+            Interface1() { RegisterRootObject(Interface1); }
     };
 
     class Interface2 : virtual public OrxonoxClass
     {
-        public:
-            Interface2() { registerAbstractRootObject(Interface2); }
+        protected:
+            Interface2() { RegisterRootObject(Interface2); }
     };
 
@@ -22 +22 @@
     {
         public:
-            A1() { registerObject(A1); }
+            A1() { RegisterObject(A1); }
     };
 
@@ -28 +28 @@
     {
         public:
-            A2() { registerObject(A2); }
+            A2() { RegisterObject(A2); }
     };
 
@@ -34 +34 @@
     {
         public:
-            A3() { registerObject(A3); }
+            A3() { RegisterObject(A3); }
     };
 
@@ -40 +40 @@
     {
         public:
-            A1B1() { registerObject(A1B1); }
+            A1B1() { RegisterObject(A1B1); }
     };
 
@@ -46 +46 @@
     {
         public:
-            A1B2() { registerObject(A1B2); }
+            A1B2() { RegisterObject(A1B2); }
     };
 
@@ -52 +52 @@
     {
         public:
-            A2B1() { registerObject(A2B1); }
+            A2B1() { RegisterObject(A2B1); }
     };
 
@@ -58 +58 @@
     {
         public:
-            A2B2() { registerObject(A2B2); }
+            A2B2() { RegisterObject(A2B2); }
     };
 
@@ -64 +64 @@
     {
         public:
-            A3B1() { registerObject(A3B1); }
+            A3B1() { RegisterObject(A3B1); }
     };
 
@@ -70 +70 @@
     {
         public:
-            A3B2() { registerObject(A3B2); }
+            A3B2() { RegisterObject(A3B2); }
     };
 
@@ -76 +76 @@
     {
         public:
-            A1B1C1() { registerObject(A1B1C1); }
+            A1B1C1() { RegisterObject(A1B1C1); }
     };
 
@@ -82 +82 @@
     {
         public:
-            A1B1C2() { registerObject(A1B1C2); }
+            A1B1C2() { RegisterObject(A1B1C2); }
     };
 
@@ -88 +88 @@
     {
         public:
-            A1B2C1() { registerObject(A1B2C1); }
+            A1B2C1() { RegisterObject(A1B2C1); }
     };
 
@@ -94 +94 @@
     {
         public:
-            A2B1C1() { registerObject(A2B1C1); }
+            A2B1C1() { RegisterObject(A2B1C1); }
     };
 
@@ -100 +100 @@
     {
         public:
-            A2B2C1() { registerObject(A2B2C1); }
+            A2B2C1() { RegisterObject(A2B2C1); }
     };
 
@@ -106 +106 @@
     {
         public:
-            A3B1C1() { registerObject(A3B1C1); }
+            A3B1C1() { RegisterObject(A3B1C1); }
     };
 
@@ -112 +112 @@
     {
         public:
-            A3B1C2() { registerObject(A3B1C2); }
+            A3B1C2() { RegisterObject(A3B1C2); }
     };
 
@@ -118 +118 @@
     {
         public:
-            A3B2C1() { registerObject(A3B2C1); }
+            A3B2C1() { RegisterObject(A3B2C1); }
     };
 
@@ -124 +124 @@
     {
         public:
-            A3B2C2() { registerObject(A3B2C2); }
+            A3B2C2() { RegisterObject(A3B2C2); }
     };