Changeset 1263 for code/branches/merge/src/core

Timestamp:

May 13, 2008, 3:45:19 PM (17 years ago)

Author:

rgrieder

Message:

• merged ogre branch into merge branch

Location:

code/branches/merge/src/core

Files:

• BaseObject.cc (modified) (1 diff)
• CoreIncludes.h (modified) (1 diff)
• Debug.h (modified) (1 diff)
• Error.cc (modified) (1 diff)
• Error.h (modified) (1 diff)
• Namespace.cc (modified) (1 diff)
• OrxonoxClass.cc (modified) (1 diff)

code/branches/merge/src/core/BaseObject.cc

@@ -45 +45 @@
         @brief Constructor: Registers the object in the BaseObject-list.
     */
-    BaseObject::BaseObject()
+    BaseObject::BaseObject() :
+      bActive_(true),
+      bVisible_(true),
+      level_(0),
+      namespace_(0)
     {
         RegisterRootObject(BaseObject);
-
-        this->bActive_ = true;
-        this->bVisible_ = true;
-        this->level_ = 0;
-        this->namespace_ = 0;
     }
 

code/branches/merge/src/core/CoreIncludes.h

@@ -59 +59 @@
     if (orxonox::Identifier::isCreatingHierarchy() && this->getParents()) \
         this->getParents()->insert(this->getParents()->end(), this->getIdentifier()); \
-    orxonox::ClassManager<ClassName>::getIdentifier()->addObject(this)
+    orxonox::ClassManager<ClassName>::getIdentifier()->addObject(this); \
+    if (orxonox::Identifier::isCreatingHierarchy()) \
+      return
 
 /**

code/branches/merge/src/core/Debug.h

@@ -273 +273 @@
 #define CCOUT_EXEC(x) \
   orxonox::OutputHandler::getOutStream().setOutputLevel(x) \
-  << "*** " << this->getIdentifier()->getName() << ": "
+  << this->getIdentifier()->getName() << ": "
 
 #ifndef CCOUT

code/branches/merge/src/core/Error.cc

@@ -37 +37 @@
 namespace orxonox
 {
-        Error::Error()
-        {
-                Error(0,"");
-        }
-
         Error::Error(std::string errorMsg, int errorCode)
-        {
-                Error(errorCode, errorMsg);
-        }
-
-        Error::Error(int errorCode, std::string errorMsg)
         {
                 COUT(1) << "############################ "<< std::endl

code/branches/merge/src/core/Error.h

@@ -44 +44 @@
         {
         public:
-                Error();
-                Error(std::string errorMsg, int errorCode = 0);
-                Error(int errorCode, std::string errorMsg = "");
+                Error(std::string errorMsg = "", int errorCode = 0);
         private:
 

code/branches/merge/src/core/Namespace.cc

@@ -37 +37 @@
     CreateFactory(Namespace);
 
-    Namespace::Namespace()
+    Namespace::Namespace() :
+      bAutogeneratedFileRootNamespace_(false),
+      bRoot_(false),
+      operator_("or")
     {
         RegisterObject(Namespace);
-
-        this->bAutogeneratedFileRootNamespace_ = false;
-        this->bRoot_ = false;
-        this->operator_ = "or";
     }
 

code/branches/merge/src/core/OrxonoxClass.cc

@@ -37 +37 @@
 {
     /** @brief Constructor: Sets the default values. */
-    OrxonoxClass::OrxonoxClass()
+    OrxonoxClass::OrxonoxClass() :
+      identifier_(0),
+      parents_(0)
     {
         this->setConfigValues();
-
-        this->identifier_ = 0;
-        this->parents_ = 0;
     }