Changeset 9588 for code/branches/core6

Timestamp:

Mar 26, 2013, 11:40:05 PM (12 years ago)

Author:

landauf

Message:

JoyStick and WANDiscoverable use only config values → inherit from Configurable

Location:

code/branches/core6/src/libraries

Files:

• core/input/JoyStick.h (modified) (2 diffs)
• network/WANDiscoverable.h (modified) (2 diffs)

code/branches/core6/src/libraries/core/input/JoyStick.h

@@ -36 +36 @@
 #include <ois/OISJoyStick.h>
 #include "InputDevice.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox
@@ -58 +59 @@
     */
     class _CoreExport JoyStick
-        : public OrxonoxClass
+        : public Configurable
         , public InputDeviceTemplated<JoyStickTraits>
         , public OIS::JoyStickListener

code/branches/core6/src/libraries/network/WANDiscoverable.h

@@ -30 +30 @@
 
 #include "NetworkPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "MasterServerComm.h"
 
@@ -36 +36 @@
 {
 
-  class _NetworkExport WANDiscoverable: public OrxonoxClass
+  class _NetworkExport WANDiscoverable: public Configurable
   {
     public: