Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 9588 for code/branches/core6


Ignore:
Timestamp:
Mar 26, 2013, 11:40:05 PM (11 years ago)
Author:
landauf
Message:

JoyStick and WANDiscoverable use only config values → inherit from Configurable

Location:
code/branches/core6/src/libraries
Files:
2 edited

Legend:

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

    r8729 r9588  
    3636#include <ois/OISJoyStick.h>
    3737#include "InputDevice.h"
     38#include "core/config/Configurable.h"
    3839
    3940namespace orxonox
     
    5859    */
    5960    class _CoreExport JoyStick
    60         : public OrxonoxClass
     61        : public Configurable
    6162        , public InputDeviceTemplated<JoyStickTraits>
    6263        , public OIS::JoyStickListener
  • code/branches/core6/src/libraries/network/WANDiscoverable.h

    r9579 r9588  
    3030
    3131#include "NetworkPrereqs.h"
    32 #include "core/class/OrxonoxClass.h"
     32#include "core/config/Configurable.h"
    3333#include "MasterServerComm.h"
    3434
     
    3636{
    3737
    38   class _NetworkExport WANDiscoverable: public OrxonoxClass
     38  class _NetworkExport WANDiscoverable: public Configurable
    3939  {
    4040    public:
Note: See TracChangeset for help on using the changeset viewer.