Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9869 in orxonox.OLD for trunk/src/lib/event


Ignore:
Timestamp:
Oct 3, 2006, 12:19:30 AM (18 years ago)
Author:
bensch
Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:
trunk/src/lib/event
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/lib/event/event_handler.cc

    r9656 r9869  
    2828#include <algorithm>
    2929
     30
     31ObjectListDefinition(EventHandler);
    3032/**
    3133 * @brief standard constructor
    … …  
    3335EventHandler::EventHandler ()
    3436{
    35   this->setClassID(CL_EVENT_HANDLER, "EventHandler");
     37  this->registerObject(this, EventHandler::_objectList);
    3638  this->setName("EventHandler");
    3739

  • trunk/src/lib/event/event_handler.h

    r8743 r9869  
    2121class EventHandler : public BaseObject
    2222{
    23 
     23  ObjectListDeclaration(EventHandler);
    2424public:
    2525  virtual ~EventHandler();

  • trunk/src/lib/event/event_listener.cc

    r7868 r9869  
    1919#include "event_handler.h"
    2020
     21ObjectListDefinition(EventListener);
    2122/**
    2223 * @brief standard constructor
    … …  
    2425EventListener::EventListener ()
    2526{
    26   this->setClassID(CL_EVENT_LISTENER, "EventListener");
     27  this->registerObject(this, EventListener::_objectList);
    2728}
    2829

  • trunk/src/lib/event/event_listener.h

    r7868 r9869  
    1212
    1313//! A class for event listener
    14 class EventListener : virtual public BaseObject {
    15 
    16  public:
     14class EventListener : virtual public BaseObject
     15{
     16  ObjectListDeclaration(EventListener);
     17public:
    1718  EventListener();
    1819  virtual ~EventListener();

  • trunk/src/lib/event/key_mapper.cc

    r9406 r9869  
    2525#include "globals.h"
    2626#include "parser/ini_parser/ini_parser.h"
    27 #include "util/preferences.h"
     27#include "parser/preferences/preferences.h"
    2828#include "key_names.h"
    2929#include "event_def.h"
    … …  
    3232
    3333
    34 
     34ObjectListDefinition(KeyMapper);
    3535
    3636/* initialize all variables to a reasonable value*/
    … …  
    116116KeyMapper::KeyMapper ()
    117117{
    118    this->setClassID(CL_KEY_MAPPER, "KeyMapper");
     118  this->registerObject(this, KeyMapper::_objectList);
    119119}
    120120

  • trunk/src/lib/event/key_mapper.h

    r8724 r9869  
    1616class KeyMapper : public BaseObject
    1717{
     18  ObjectListDeclaration(KeyMapper);
    1819public:
    1920  //! A mapping from key-name to key-id
Note: See TracChangeset for help on using the changeset viewer.