Changeset 9667 for code/trunk/src/modules/overlays/stats

Timestamp:

Aug 25, 2013, 9:08:42 PM (11 years ago)

Author:

landauf

Message:

merged core6 back to trunk

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/overlays/stats/Scoreboard.cc (modified) (1 diff)
• src/modules/overlays/stats/Scoreboard.h (modified) (1 diff)
• src/modules/overlays/stats/Stats.cc (modified) (1 diff)
• src/modules/overlays/stats/Stats.h (modified) (1 diff)

code/trunk/src/modules/overlays/stats/Scoreboard.cc

@@ -35 +35 @@
 namespace orxonox
 {
-    CreateFactory(Scoreboard);
+    RegisterClass(Scoreboard);
 
     /**
         @brief Constructor: Creates the scoreboard.
     */
-    Scoreboard::Scoreboard(BaseObject* creator)
-        : OrxonoxOverlay(creator)
+    Scoreboard::Scoreboard(Context* context)
+        : OrxonoxOverlay(context)
     {
         RegisterObject(Scoreboard);

code/trunk/src/modules/overlays/stats/Scoreboard.h

@@ -41 +41 @@
     {
     public: // functions
-        Scoreboard(BaseObject* creator);
+        Scoreboard(Context* context);
         virtual ~Scoreboard();
 

code/trunk/src/modules/overlays/stats/Stats.cc

@@ -35 +35 @@
 #include "util/StringUtils.h"
 #include "core/CoreIncludes.h"
-#include "core/ConfigValueIncludes.h"
+#include "core/config/ConfigValueIncludes.h"
 
 namespace orxonox
 {
-    CreateFactory(Stats);
+    RegisterClass(Stats);
 
     /**
         @brief Constructor: Creates and initializes the Stats panel.
     */
-    Stats::Stats(BaseObject* creator)
-        : OrxonoxOverlay(creator)
+    Stats::Stats(Context* context)
+        : OrxonoxOverlay(context)
         , statsOverlayNoise_(0)
         , statsOverlayBorder_(0)

code/trunk/src/modules/overlays/stats/Stats.h

@@ -41 +41 @@
     {
     public: // functions
-        Stats(BaseObject* creator);
+        Stats(Context* context);
         virtual ~Stats();