Changeset 5690 in orxonox.OLD for trunk

Timestamp:

Nov 22, 2005, 12:15:36 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: parameters of Executor are const void* instead of const char*

Location:

trunk/src/lib

Files:

• gui/gl_gui/glgui_widget.cc (modified) (2 diffs)
• gui/gl_gui/glgui_widget.h (modified) (3 diffs)
• shell/shell_command.h (modified) (1 diff)
• util/executor/executor.h (modified) (4 diffs)
• util/executor/executor_specials.h (modified) (1 diff)

trunk/src/lib/gui/gl_gui/glgui_widget.cc

@@ -76 +76 @@
  * @param signal the name of the Signal
  */
-void GLGuiWidget::connectSignal(GLGuiSignalType signalType, Signal* signal)
+void GLGuiWidget::connectSignal(GLGuiSignalType signalType, const Executor& signal)
 {
-  if (signal == NULL || signalType >= GLGuiSignalCount)
+  if (signalType >= GLGuiSignalCount)
     return;
 
@@ -84 +84 @@
     PRINTF(2)("Already connected a Signal to %s (%s) type %s... overwriting\n");
 
-  this->widgetSignals[signalType] = signal;
+  this->widgetSignals[signalType] = signal.clone();
 }
 

trunk/src/lib/gui/gl_gui/glgui_widget.h

@@ -8 +8 @@
 
 #include "element_2d.h"
+#include "event.h"
+
 #include "glincl.h"
-#include "event.h"
+#include "executor/executor.h"
 
 // FORWARD DECLARATION
 class Material;
-class Signal; //!< @todo create this!!
 
 typedef enum
@@ -49 +50 @@
     void hide() {};
 
-    void connectSignal(GLGuiSignalType signalType, Signal* signal);
+    void connectSignal(GLGuiSignalType signalType, const Executor& signal);
     void disconnectSignal(GLGuiSignalType signalType);
     bool focusOverWidget(float x, float y);
@@ -71 +72 @@
 
   private:
-    Signal*               widgetSignals[GLGuiSignalCount];
+    Executor*             widgetSignals[GLGuiSignalCount];
 
     bool                  focusable;        //!< If this widget can receive focus.

trunk/src/lib/shell/shell_command.h

@@ -9 +9 @@
 #include "base_object.h"
 
-#include "helper_functions.h"
-#include "multi_type.h"
-#include "substring.h"
-#include "functor_list.h"
 #include "executor/executor.h"
 #include <stdarg.h>

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

@@ -42 +42 @@
 
     /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */
-    virtual void execute (BaseObject* object, const char* parameters) = 0;
+    virtual void execute (BaseObject* object, const void* parameters) = 0;
 
     /** @returns the Type of this Function (either static or objective) */
@@ -185 +185 @@
 #define ExecutorExecute1(t1) \
    else if (this->paramCount == 1 && this->defaultValue[0].getType() == t1##_PARAM) \
-    EXECUTOREXECUTER(_1_##t1)(t1##_FUNC(parameters, t1##_DEFGRAB(0)))
+    EXECUTOREXECUTER(_1_##t1)(t1##_FUNC((const char*)parameters, t1##_DEFGRAB(0)))
 
 //! execute-macro for functions with two parameters
@@ -261 +261 @@
     } fp;
 
-    virtual void execute (BaseObject* object, const char* parameters)
+    virtual void execute (BaseObject* object, const void* parameters)
     {
-      SubString sub(parameters, " \n\t,", '\\');
+      SubString sub((const char*) parameters, " \n\t,", '\\');
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x
@@ -323 +323 @@
 
 
-    virtual void execute (BaseObject* object, const char* parameters)
+    virtual void execute (BaseObject* object, const void* parameters)
     {
-  SubString sub(parameters, " \n\t,");
+  SubString sub((const char*)parameters, " \n\t,");
 //! FUNCTOR_LIST is the List of Executive Functions
 #define FUNCTOR_LIST(x) ExecutorExecute ## x

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

@@ -59 +59 @@
      * @param loadString ignored in this case
      */
-    virtual void execute(BaseObject* object, const char* loadString)
+    virtual void execute(BaseObject* object, const void* loadString)
     {
       if (object != NULL && this->element != NULL)