- Timestamp:
- Dec 20, 2004, 12:41:55 AM (20 years ago)
- Location:
- orxonox/trunk/src
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
orxonox/trunk/src/keynames.cc
r2995 r3230 20 20 using namespace std; 21 21 22 int buttonname _to_SDLB( char* name)22 int buttonnameToSDLB( char* name) 23 23 { 24 24 if( !strcmp (name, "BUTTON_LEFT")) return SDL_BUTTON_LEFT; … … 30 30 } 31 31 32 char* SDLB _to_buttonname( int button)32 char* SDLBToButtonname( int button) 33 33 { 34 34 if( button == SDL_BUTTON_LEFT) return "BUTTON_LEFT"; … … 40 40 } 41 41 42 int keyname _to_SDLK( char* name)42 int keynameToSDLK( char* name) 43 43 { 44 44 if( !strcmp (name, "BACKSPACE")) return SDLK_BACKSPACE; … … 178 178 } 179 179 180 char* SDLK _to_keyname( int key)180 char* SDLKToKeyname( int key) 181 181 { 182 182 if( key == SDLK_BACKSPACE) return "BACKSPACE"; -
orxonox/trunk/src/keynames.h
r3224 r3230 24 24 \return an int containing the SDL identifier of the mouse button or -1 if the button name is not valid 25 25 */ 26 int buttonname _to_SDLB( char* name);26 int buttonnameToSDLB( char* name); 27 27 28 28 /** … … 31 31 \return a pointer to a string containing the name of the mouse button 32 32 */ 33 char* SDLB _to_buttonname( int button);33 char* SDLBToButtonname( int button); 34 34 35 35 /** … … 38 38 \return the SDLK sym of the named key or -1 if the key name is not valid 39 39 */ 40 int keyname _to_SDLK( char* name);40 int keynameToSDLK( char* name); 41 41 42 42 /** … … 45 45 \return a pointer to a string containig the name of the key 46 46 */ 47 char* SDLK _to_keyname( int key);47 char* SDLKToKeyname( int key); 48 48 49 49 -
orxonox/trunk/src/list_template.h
r3224 r3230 47 47 48 48 int add(T* obj, ADDMODE mode, bool bRef); 49 T* get _object();50 ListTemplate<T>* get _next();51 ListTemplate<T>* get _previous();52 ListTemplate<T>* get _last();53 ListTemplate<T>* get _first();54 void set _next(ListTemplate<T>* ptr);55 void set _prev(ListTemplate<T>* ptr);49 T* getObject(); 50 ListTemplate<T>* getNext(); 51 ListTemplate<T>* getPrevious(); 52 ListTemplate<T>* getLast(); 53 ListTemplate<T>* getFirst(); 54 void setNext(ListTemplate<T>* ptr); 55 void setPrev(ListTemplate<T>* ptr); 56 56 int remove (T* obj, FINDMODE mode); 57 57 int getSize(); … … 101 101 else 102 102 { 103 if (prev != NULL) prev->set _next (next);104 if (next != NULL) next->set _prev (prev);103 if (prev != NULL) prev->setNext (next); 104 if (next != NULL) next->setPrev (prev); 105 105 if (!bReference) delete object; 106 106 } … … 131 131 case LIST_ADD_NEXT: 132 132 p = new ListTemplate<T>( obj, next, this, bRef); 133 if( next != NULL) next->set _prev (p);133 if( next != NULL) next->setPrev (p); 134 134 next = p; 135 135 break; 136 136 case LIST_ADD_PREV: 137 137 p = new ListTemplate<T>( obj, this, prev, bRef); 138 if( prev != NULL) prev->set _next (p);138 if( prev != NULL) prev->setNext (p); 139 139 prev = p; 140 140 break; … … 160 160 */ 161 161 template<class T> 162 ListTemplate<T>* ListTemplate<T>::get _next ()162 ListTemplate<T>* ListTemplate<T>::getNext () 163 163 { 164 164 return next; … … 170 170 */ 171 171 template<class T> 172 ListTemplate<T>* ListTemplate<T>::get _previous ()172 ListTemplate<T>* ListTemplate<T>::getPrevious () 173 173 { 174 174 return prev; … … 180 180 */ 181 181 template<class T> 182 ListTemplate<T>* ListTemplate<T>::get _last ()182 ListTemplate<T>* ListTemplate<T>::getLast () 183 183 { 184 184 if (next == NULL) return this; 185 else return next->get _last();185 else return next->getLast(); 186 186 } 187 187 … … 191 191 */ 192 192 template<class T> 193 ListTemplate<T>* ListTemplate<T>::get _first ()193 ListTemplate<T>* ListTemplate<T>::getFirst () 194 194 { 195 195 if (prev == NULL) return this; 196 else return prev->get _first();196 else return prev->getFirst(); 197 197 } 198 198 … … 221 221 else 222 222 { 223 if( prev->get _object() == obj)223 if( prev->getObject() == obj) 224 224 { 225 225 delete prev; … … 235 235 else 236 236 { 237 if( next->get _object() == obj)237 if( next->getObject() == obj) 238 238 { 239 239 delete next; … … 260 260 */ 261 261 template<class T> 262 void ListTemplate<T>::set _next (ListTemplate<T>* ptr)262 void ListTemplate<T>::setNext (ListTemplate<T>* ptr) 263 263 { 264 264 next = ptr; … … 272 272 */ 273 273 template<class T> 274 void ListTemplate<T>::set _prev (ListTemplate<T>* ptr)274 void ListTemplate<T>::setPrev (ListTemplate<T>* ptr) 275 275 { 276 276 prev = ptr; … … 282 282 */ 283 283 template<class T> 284 T* ListTemplate<T>::get _object()284 T* ListTemplate<T>::getObject() 285 285 { 286 286 return object;
Note: See TracChangeset
for help on using the changeset viewer.