Changeset 7725 in orxonox.OLD for trunk/src

Timestamp:

May 19, 2006, 11:58:19 AM (19 years ago)

Author:

bensch

Message:

trunk: const Executor introduced

Location:

trunk/src/lib

Files:

• coord/p_node.cc (modified) (7 diffs)
• coord/p_node.h (modified) (1 diff)
• shell/some_shell_commands.cc (modified) (2 diffs)
• util/executor/executor.h (modified) (1 diff)
• util/executor/executor_functional.h (modified) (3 diffs)

trunk/src/lib/coord/p_node.cc

@@ -29 +29 @@
 
 #include "synchronizeable.h"
-
-using namespace std;
-
 
 /**
@@ -595 +592 @@
 void PNode::removeNode()
 {
-  list<PNode*>::iterator child = this->children.begin();
-  list<PNode*>::iterator reparenter;
+  std::list<PNode*>::iterator child = this->children.begin();
+  std::list<PNode*>::iterator reparenter;
   while (child != this->children.end())
   {
@@ -857 +854 @@
   if(!this->children.empty() && (this->bActive || this->parentMode & PNODE_UPDATE_CHILDREN_IF_INACTIVE ))
   {
-    list<PNode*>::iterator child;
+    std::list<PNode*>::iterator child;
     for (child = this->children.begin(); child != this->children.end(); child ++)
     {
@@ -888 +885 @@
 {
   nodes++;
-  list<PNode*>::const_iterator child;
+  std::list<PNode*>::const_iterator child;
   for (child = this->children.begin(); child != this->children.end(); child ++)
     (*child)->countChildNodes(nodes);
@@ -928 +925 @@
   if (depth >= 2 || depth == 0)
   {
-    list<PNode*>::const_iterator child;
+    std::list<PNode*>::const_iterator child;
     for (child = this->children.begin(); child != this->children.end(); child ++)
     {
@@ -1006 +1003 @@
     /* rotate the current color in HSV space around 20 degree */
     Vector childColor =  Color::HSVtoRGB(Color::RGBtoHSV(color)+Vector(20,0,.0));
-    list<PNode*>::const_iterator child;
+    std::list<PNode*>::const_iterator child;
     for (child = this->children.begin(); child != this->children.end(); child ++)
     {
@@ -1176 +1173 @@
   //   int n = children.size();
   //   //check if camera is in children
-  //   for (std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
+  //   for (std::std::list<PNode*>::const_iterator it = children.begin(); it!=children.end(); it++)
   //   {
   //     if ( (*it)->isA(CL_CAMERA) )

trunk/src/lib/coord/p_node.h

@@ -178 +178 @@
   // DEBUG //
   void countChildNodes(int& nodes) const;
-  void debugNodeSC (unsigned int depth = 1, unsigned int level = 0) { this->debugNode(depth, level); };
   void debugNode (unsigned int depth = 1, unsigned int level = 0) const;
   void debugDraw(unsigned int depth = 1, float size = 1.0, const Vector& color = Vector(1, 0, 0), unsigned int level = 0) const;

trunk/src/lib/shell/some_shell_commands.cc

@@ -17 +17 @@
  * @file some_shell_commands.cc
  * @brief All the ShellCommands, that should not pollute the SourceCode.
+ *
+ * This File is here, so that we do not have to pollute the Library-files
+ * with unneccessary other modules.
+ * Like this
  */
 
@@ -27 +31 @@
 
 #include "class_list.h"
-  SHELL_COMMAND_STATIC(debug, ClassList, ClassList::debugS)
+  SHELL_COMMAND(debug, ClassList, ClassList::debugS)
       ->describe("Shows all registered classes, if param1: is a valid ClassName only values of this class are shown. param2: how much output")
       ->defaultValues(MT_NULL, 1);
 
 #include "p_node.h"
-  SHELL_COMMAND(debugNode, PNode, debugNodeSC);
+  SHELL_COMMAND(debugNode, PNode, debugNode);
   SHELL_COMMAND(setPosition, PNode, setAbsCoor);
 

trunk/src/lib/util/executor/executor.h

@@ -78 +78 @@
 
 #include "executor/executor_functional.h"
+#define EXECUTOR_FUNCTIONAL_USE_CONST
+#include "executor/executor_functional.h"
 #define EXECUTOR_FUNCTIONAL_USE_STATIC
 #include "executor/executor_functional.h"

trunk/src/lib/util/executor/executor_functional.h

@@ -65 +65 @@
  #undef __EXECUTOR_FUNCTIONAL_NAME
  #define __EXECUTOR_FUNCTIONAL_NAME(ParamCount) Executor##ParamCount##Params_const
- #undef EXECUTOR_FUNCTIONAL_USE_CONST
 #endif
 
@@ -80 +79 @@
  #define __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER    *functionPointer
 
-#undef EXECUTOR_FUNCTIONAL_USE_STATIC
 #endif /* EXECUTOR_FUNCTIONAL_USE_STATIC */
 
@@ -426 +424 @@
 #undef __EXECUTOR_FUNCTIONAL_FUNCTION_EXEC
 #undef __EXECUTOR_FUNCTIONAL_FUNCTION_POINTER
+
+#ifdef EXECUTOR_FUNCTIONAL_USE_CONST
+ #undef EXECUTOR_FUNCTIONAL_USE_CONST
+#endif
+#ifdef EXECUTOR_FUNCTIONAL_USE_STATIC
+ #undef EXECUTOR_FUNCTIONAL_USE_STATIC
+#endif