Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Mar 25, 2013, 11:05:13 PM (12 years ago)
Author:
landauf
Message:

made some classes (mostly singletons) inherit from Configurable instead of OrxonoxClass when they only need the config value facilities

Location:
code/branches/core6/src/libraries/core/input
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • code/branches/core6/src/libraries/core/input/InputBuffer.h

    r9563 r9578  
    3434#include <list>
    3535#include <string>
    36 #include "core/class/OrxonoxClass.h"
     36#include "core/config/Configurable.h"
    3737#include "InputHandler.h"
    3838
     
    7474    };
    7575
    76     class _CoreExport InputBuffer : public InputHandler, public OrxonoxClass
     76    class _CoreExport InputBuffer : public InputHandler, public Configurable
    7777    {
    7878        public:
  • code/branches/core6/src/libraries/core/input/InputManager.cc

    r9560 r9578  
    280280        this->destroyState("calibrator");
    281281        // Destroy KeyDetector and state
    282         calibratorCallbackHandler_->destroy();
     282        delete calibratorCallbackHandler_;
    283283        // Destroy the empty InputState
    284284        this->destroyStateInternal(this->emptyState_);
  • code/branches/core6/src/libraries/core/input/KeyBinderManager.h

    r9563 r9578  
    3636
    3737#include "util/Singleton.h"
    38 #include "core/class/OrxonoxClass.h"
     38#include "core/config/Configurable.h"
    3939
    4040namespace orxonox //tolua_export
     
    5353    */
    5454    class _CoreExport KeyBinderManager //tolua_export
    55         : public Singleton<KeyBinderManager>, public OrxonoxClass
     55        : public Singleton<KeyBinderManager>, public Configurable
    5656    { //tolua_export
    5757        friend class Singleton<KeyBinderManager>;
Note: See TracChangeset for help on using the changeset viewer.