Changeset 5690 in orxonox.OLD for trunk/src/lib
- Timestamp:
- Nov 22, 2005, 12:15:36 AM (19 years ago)
- Location:
- trunk/src/lib
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/lib/gui/gl_gui/glgui_widget.cc
r5406 r5690 76 76 * @param signal the name of the Signal 77 77 */ 78 void GLGuiWidget::connectSignal(GLGuiSignalType signalType, Signal*signal)78 void GLGuiWidget::connectSignal(GLGuiSignalType signalType, const Executor& signal) 79 79 { 80 if (signal == NULL || signalType >= GLGuiSignalCount)80 if (signalType >= GLGuiSignalCount) 81 81 return; 82 82 … … 84 84 PRINTF(2)("Already connected a Signal to %s (%s) type %s... overwriting\n"); 85 85 86 this->widgetSignals[signalType] = signal ;86 this->widgetSignals[signalType] = signal.clone(); 87 87 } 88 88 -
trunk/src/lib/gui/gl_gui/glgui_widget.h
r5456 r5690 8 8 9 9 #include "element_2d.h" 10 #include "event.h" 11 10 12 #include "glincl.h" 11 #include "e vent.h"13 #include "executor/executor.h" 12 14 13 15 // FORWARD DECLARATION 14 16 class Material; 15 class Signal; //!< @todo create this!!16 17 17 18 typedef enum … … 49 50 void hide() {}; 50 51 51 void connectSignal(GLGuiSignalType signalType, Signal*signal);52 void connectSignal(GLGuiSignalType signalType, const Executor& signal); 52 53 void disconnectSignal(GLGuiSignalType signalType); 53 54 bool focusOverWidget(float x, float y); … … 71 72 72 73 private: 73 Signal*widgetSignals[GLGuiSignalCount];74 Executor* widgetSignals[GLGuiSignalCount]; 74 75 75 76 bool focusable; //!< If this widget can receive focus. -
trunk/src/lib/shell/shell_command.h
r5642 r5690 9 9 #include "base_object.h" 10 10 11 #include "helper_functions.h"12 #include "multi_type.h"13 #include "substring.h"14 #include "functor_list.h"15 11 #include "executor/executor.h" 16 12 #include <stdarg.h> -
trunk/src/lib/util/executor/executor.h
r5656 r5690 42 42 43 43 /** executes a Command @param object the object to apply this to @param parameters the parameters the command takes */ 44 virtual void execute (BaseObject* object, const char* parameters) = 0;44 virtual void execute (BaseObject* object, const void* parameters) = 0; 45 45 46 46 /** @returns the Type of this Function (either static or objective) */ … … 185 185 #define ExecutorExecute1(t1) \ 186 186 else if (this->paramCount == 1 && this->defaultValue[0].getType() == t1##_PARAM) \ 187 EXECUTOREXECUTER(_1_##t1)(t1##_FUNC( parameters, t1##_DEFGRAB(0)))187 EXECUTOREXECUTER(_1_##t1)(t1##_FUNC((const char*)parameters, t1##_DEFGRAB(0))) 188 188 189 189 //! execute-macro for functions with two parameters … … 261 261 } fp; 262 262 263 virtual void execute (BaseObject* object, const char* parameters)263 virtual void execute (BaseObject* object, const void* parameters) 264 264 { 265 SubString sub( parameters, " \n\t,", '\\');265 SubString sub((const char*) parameters, " \n\t,", '\\'); 266 266 //! FUNCTOR_LIST is the List of Executive Functions 267 267 #define FUNCTOR_LIST(x) ExecutorExecute ## x … … 323 323 324 324 325 virtual void execute (BaseObject* object, const char* parameters)325 virtual void execute (BaseObject* object, const void* parameters) 326 326 { 327 SubString sub( parameters, " \n\t,");327 SubString sub((const char*)parameters, " \n\t,"); 328 328 //! FUNCTOR_LIST is the List of Executive Functions 329 329 #define FUNCTOR_LIST(x) ExecutorExecute ## x -
trunk/src/lib/util/executor/executor_specials.h
r5659 r5690 59 59 * @param loadString ignored in this case 60 60 */ 61 virtual void execute(BaseObject* object, const char* loadString)61 virtual void execute(BaseObject* object, const void* loadString) 62 62 { 63 63 if (object != NULL && this->element != NULL)
Note: See TracChangeset
for help on using the changeset viewer.