Use new SGBucket API in tile-manager

[flightgear.git] / src / Input / FGLinuxEventInput.hxx

diff --git a/src/Input/FGLinuxEventInput.hxx b/src/Input/FGLinuxEventInput.hxx
index 3676c48cbb8ee3a37b657384d3ea09da7654a647..df151663cc40564aab021d90a5433d95a9d9f68a 100644 (file)
--- a/src/Input/FGLinuxEventInput.hxx
+++ b/src/Input/FGLinuxEventInput.hxx
@@ -25,7 +25,6 @@
 
 #include "FGEventInput.hxx"
 #include <linux/input.h>
-#include <hal/libhal.h>
 
 struct FGLinuxEventData : public FGEventData {
   FGLinuxEventData( struct input_event & event, double dt, int modifiers ) :
@@ -43,7 +42,7 @@ struct FGLinuxEventData : public FGEventData {
 class FGLinuxInputDevice : public FGInputDevice {
 public:
   FGLinuxInputDevice();
-  FGLinuxInputDevice( string name, string devname );
+  FGLinuxInputDevice( std::string name, std::string devname );
   virtual ~FGLinuxInputDevice();
 
   virtual void Open();
@@ -51,17 +50,17 @@ public:
   virtual void Send( const char * eventName, double value );
   virtual const char * TranslateEventName( FGEventData & eventData );
 
-  void SetDevname( const string name );
-  string GetDevname() const { return devname; }
+  void SetDevname( const std::string & name );
+  std::string GetDevname() const { return devname; }
 
   int GetFd() { return fd; }
 
   double Normalize( struct input_event & event );
 private:
-  string devname;
+  std::string devname;
   int fd;
 
-  map<unsigned int,input_absinfo> absinfo;
+  std::map<unsigned int,input_absinfo> absinfo;
 };
 
 class FGLinuxEventInput : public FGEventInput {
@@ -71,10 +70,7 @@ public:
   virtual void update (double dt);
   virtual void postinit();
 
-  void AddHalDevice( const char * udi );
 protected:
-  LibHalContext *halcontext;
-
 };
 
 #endif