[Orxonox-commit 4919] r9588 - in code/branches/core6/src/libraries: core/input network

[landauf at orxonox.net]

Author: landauf
Date: 2013-03-26 23:40:05 +0100 (Tue, 26 Mar 2013)
New Revision: 9588

Modified:
   code/branches/core6/src/libraries/core/input/JoyStick.h
   code/branches/core6/src/libraries/network/WANDiscoverable.h
Log:
JoyStick and WANDiscoverable use only config values -> inherit from Configurable

Modified: code/branches/core6/src/libraries/core/input/JoyStick.h
===================================================================
--- code/branches/core6/src/libraries/core/input/JoyStick.h	2013-03-26 22:33:01 UTC (rev 9587)
+++ code/branches/core6/src/libraries/core/input/JoyStick.h	2013-03-26 22:40:05 UTC (rev 9588)
@@ -35,6 +35,7 @@
 #include <vector>
 #include <ois/OISJoyStick.h>
 #include "InputDevice.h"
+#include "core/config/Configurable.h"
 
 namespace orxonox
 {
@@ -57,7 +58,7 @@
         in an ini-file.
     */
     class _CoreExport JoyStick
-        : public OrxonoxClass
+        : public Configurable
         , public InputDeviceTemplated<JoyStickTraits>
         , public OIS::JoyStickListener
     {

Modified: code/branches/core6/src/libraries/network/WANDiscoverable.h
===================================================================
--- code/branches/core6/src/libraries/network/WANDiscoverable.h	2013-03-26 22:33:01 UTC (rev 9587)
+++ code/branches/core6/src/libraries/network/WANDiscoverable.h	2013-03-26 22:40:05 UTC (rev 9588)
@@ -29,13 +29,13 @@
 #define _WANDiscoverable_H__
 
 #include "NetworkPrereqs.h"
-#include "core/class/OrxonoxClass.h"
+#include "core/config/Configurable.h"
 #include "MasterServerComm.h"
 
 namespace orxonox
 {
 
-  class _NetworkExport WANDiscoverable: public OrxonoxClass
+  class _NetworkExport WANDiscoverable: public Configurable
   {
     public:
       /** constructor */