Initial migration off of HAL

1 files changed, 10 insertions, 12 deletions

diff --git a/src/hardware.h b/src/hardware.h
index a3cdc2e..f902499 100644
--- a/src/hardware.h
+++ b/src/hardware.h
@@ -45,6 +45,9 @@
 #include <tqptrlist.h>
 #include <tqdict.h>
 
+// TDE hardware library
+#include <tdehardwaredevices.h>
+
 // HAL Library
 #include <hal/libhal.h>
 
@@ -125,6 +128,8 @@ class HardwareInfo : public TQObject{
   
 
 private: 
+	TDEHardwareDevices *m_hwdevices;
+
 	//! pointer to the dbusHAL connection class
 	dbusHAL *dbus_HAL;
 
@@ -315,12 +320,16 @@ private:
 	bool setSchedPowerSavings( bool enable );
 
 	//! find and update a battery information
-	void updateBatteryValues (TQString udi, TQString property);
+	void updateBatteryValues (TDEGenericDevice* device);
 
 private slots:
 
 	//! to fetch events from D-Bus and handle them
 	void processMessage (msg_type type, TQString message, TQString value);
+	//! to fetch events from the TDE hardware library and handle them
+	void processHardwareChangedEvent (TDEGenericDevice*);
+	//! to fetch keypresses from the TDE hardware library and handle them
+	void processKeyPressEvent (unsigned int, TDEEventDevice*);
 	//! to update \ref primaryBatteries
 	void updatePrimaryBatteries ();
 	//! to set \ref update_info_primBattery_changed
@@ -331,9 +340,6 @@ private slots:
 	void checkACAdapterState();
 	//! check if brightness change is possible
 	void checkBrightness();
-	
-	//! TQT_SLOT to handle the reconnect to D-Bus
-	void reconnectDBUS(); 
 
 	//! TQT_SLOT to forward signal about changed battery warning state
 	void emitBatteryWARNState (int type, int state);
@@ -423,14 +429,6 @@ public:
 	* \li false: If D-Bus not terminated
 	*/
 	bool dbus_terminated;
-	//! boolean which tell us if the HAL daemon was terminated
-	/*!
-	* This boolean contains information if the HAL daemon terminated and
-	* we recieved "hal.terminate"
-	* \li true:  If HAL terminated
-	* \li false: If HAL not terminated
-	*/
-	bool hal_terminated;
 
 	// --> functions
 	//! default constructor