Changeset 7284 for code/trunk/src/libraries/tools/Timer.cc
- Timestamp:
- Aug 31, 2010, 3:37:40 AM (14 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
-
code/trunk/src/libraries/tools/Timer.cc
r6417 r7284 33 33 #include "util/Clock.h" 34 34 #include "core/CoreIncludes.h" 35 #include "core/ ConsoleCommand.h"36 #include "core/ CommandExecutor.h"37 #include "core/ Functor.h"35 #include "core/command/ConsoleCommand.h" 36 #include "core/command/CommandExecutor.h" 37 #include "core/command/Functor.h" 38 38 39 39 namespace orxonox 40 40 { 41 SetConsoleCommand ShortcutExtern(delay);42 SetConsoleCommand ShortcutExtern(killdelays);41 SetConsoleCommand("delay", &delay).argumentCompleter(1, autocompletion::command()); 42 SetConsoleCommand("killdelays", &killdelays); 43 43 44 44 static std::set<Timer*> delaytimerset; … … 54 54 delaytimerset.insert(delaytimer); 55 55 56 ExecutorStatic*delayexecutor = createExecutor(createFunctor(&executeDelayedCommand));56 const ExecutorStaticPtr& delayexecutor = createExecutor(createFunctor(&executeDelayedCommand)); 57 57 delayexecutor->setDefaultValues(delaytimer, command); 58 58 delaytimer->setTimer(delay, false, delayexecutor); … … 97 97 @param exeuctor A executor of the function to call 98 98 */ 99 Timer::Timer(float interval, bool bLoop, Executor*executor, bool bKillAfterCall)99 Timer::Timer(float interval, bool bLoop, const ExecutorPtr& executor, bool bKillAfterCall) 100 100 { 101 101 this->init(); … … 103 103 104 104 this->setTimer(interval, bLoop, executor, bKillAfterCall); 105 }106 107 /**108 @brief Deletes the executor.109 */110 Timer::~Timer()111 {112 this->deleteExecutor();113 105 } 114 106 … … 138 130 if (temp) 139 131 this->destroy(); 140 }141 142 /**143 @brief Deletes the executor.144 */145 void Timer::deleteExecutor()146 {147 if (this->executor_)148 delete this->executor_;149 132 } 150 133
Note: See TracChangeset
for help on using the changeset viewer.