Changeset 9406 in orxonox.OLD for trunk/src/lib/util/loading

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

Location:

trunk/src/lib/util/loading

Files:

• dynamic_loader.cc (modified) (1 diff)
• factory.cc (modified) (4 diffs)
• load_param.cc (modified) (2 diffs)
• resource.cc (modified) (1 diff)
• resource_manager.cc (modified) (1 diff)

trunk/src/lib/util/loading/dynamic_loader.cc

@@ -23 +23 @@
 
 
-using namespace std;
+
 
 

trunk/src/lib/util/loading/factory.cc

@@ -19 +19 @@
 //#include "shell_command.h"
 
-using namespace std;
+
 
 //SHELL_COMMAND(create, Factory, fabricate);
@@ -117 +117 @@
   if (factory != Factory::factoryList->end())
   {
-    PRINTF(2)("Create a new Object of type %s\n", (*factory)->getName());
+    PRINTF(2)("Create a new Object of type %s\n", (*factory)->getCName());
     return (*factory)->fabricateObject(root);
   }
@@ -145 +145 @@
   if (factory != Factory::factoryList->end())
   {
-    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getName());
+    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getCName());
     return (*factory)->fabricateObject(NULL);
   }
@@ -173 +173 @@
   if (factory != Factory::factoryList->end())
   {
-    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getName());
+    PRINTF(4)("Create a new Object of type %s\n", (*factory)->getCName());
     return (*factory)->fabricateObject(NULL);
   }

trunk/src/lib/util/loading/load_param.cc

@@ -65 +65 @@
           ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
     {
-      PRINTF(4)("Loading value '%s' with Parameters '%s' onto: %s::%s\n", this->paramName.c_str(), loadString.c_str(), this->object->getClassName(), this->object->getName());
+      PRINTF(4)("Loading value '%s' with Parameters '%s' onto: %s::%s\n", this->paramName.c_str(), loadString.c_str(), this->object->getClassCName(), this->object->getCName());
       (*this->executor)(this->object, SubString(loadString, ",", SubString::WhiteSpaces, false, '\\'));
     }
@@ -164 +164 @@
 {
     // locating the class
-    this->classDesc = LoadClassDescription::addClass(object->getClassName());
+    this->classDesc = LoadClassDescription::addClass(object->getClassCName());
 
     if ((this->paramDesc = this->classDesc->addParam(paramName)) != NULL)

trunk/src/lib/util/loading/resource.cc

@@ -18 +18 @@
 #include "resource.h"
 
-using namespace std;
+
 
 

trunk/src/lib/util/loading/resource_manager.cc

@@ -50 +50 @@
 #include <unistd.h>
 
-using namespace std;
+
 
 /**