Add support for freeze suspend state

1 files changed, 122 insertions, 95 deletions

diff --git a/src/hardware.cpp b/src/hardware.cpp
index cf1cdd9..bb4f21f 100644
--- a/src/hardware.cpp
+++ b/src/hardware.cpp
@@ -17,9 +17,9 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.             *
  ***************************************************************************/
 
-/*! 
+/*!
  * \file 	hardware.cpp
- * \brief 	In this file can be found the hardware information related code. 
+ * \brief 	In this file can be found the hardware information related code.
  * \author 	Danny Kukawka, <dkukawka@suse.de>, <danny.kukawka@web.de>
  * \date    	2006-2007
  */
@@ -66,7 +66,7 @@ HardwareInfo::HardwareInfo() {
 	update_info_ac_changed = true;
 	update_info_cpufreq_policy_changed = true;
 	update_info_primBattery_changed = true;
-	
+
 	currentCPUFreqPolicy = UNKNOWN_CPUFREQ;
 	primaryBatteriesWarnLevel = 12;
 	primaryBatteriesLowLevel = 7;
@@ -75,7 +75,7 @@ HardwareInfo::HardwareInfo() {
 	allUDIs = TQStringList();
 	consoleKitSession = TQString();
 	BatteryList.setAutoDelete( true ); // the list owns the objects
-	
+
 	primaryBatteries = new BatteryCollection(BAT_PRIMARY);
 	setPrimaryBatteriesWarningLevel(); // force default settings
 
@@ -92,7 +92,7 @@ HardwareInfo::HardwareInfo() {
 	checkIsLaptop();
 	checkBrightness();
 	checkCPUFreq();
-	// getSchedPowerSavings(); 
+	// getSchedPowerSavings();
 	checkSuspend();
 	intialiseHWInfo();
 
@@ -116,7 +116,7 @@ HardwareInfo::~HardwareInfo() {
  */
 bool HardwareInfo::reinitHardwareInfos () {
 	kdDebugFuncIn(trace);
-	
+
 	/* first cleanup */
 	acadapter = true;
 	lidclose = false;
@@ -128,7 +128,7 @@ bool HardwareInfo::reinitHardwareInfos () {
 	update_info_ac_changed = true;
 	update_info_cpufreq_policy_changed = true;
 	update_info_primBattery_changed = true;
-	
+
 	allUDIs = TQStringList();
 
 	BatteryList.clear();
@@ -144,7 +144,7 @@ bool HardwareInfo::reinitHardwareInfos () {
 	// getSchedPowerSavings();
 	updatePrimaryBatteries();
 
-	kdDebugFuncOut(trace);	
+	kdDebugFuncOut(trace);
 	return true;
 }
 
@@ -189,7 +189,7 @@ void HardwareInfo::processKeyPressEvent(unsigned int keycode, TDEEventDevice* ed
 
 	// FIXME
 	// How can I get specific button press/release information (instead of just "something happened to the button") from the TDE hardware library?
-	// TODO: Check if we really need to monitor this events. We get maybe also 
+	// TODO: Check if we really need to monitor this events. We get maybe also
 	//	 HAL_PROPERTY_CHANGED event for the key
 // 	if (message.startsWith("ButtonPressed")) {
 		kdDebug() << "ButtonPressed event from TDE HW library " << endl;
@@ -216,7 +216,7 @@ void HardwareInfo::processKeyPressEvent(unsigned int keycode, TDEEventDevice* ed
 }
 
 /*!
- * This funtion is used to parse a message from D-Bus for the different 
+ * This funtion is used to parse a message from D-Bus for the different
  * messagetypes and events.
  * \param type 		a \ref msg_type which should be parse/processed
  * \param message 	the message
@@ -241,7 +241,7 @@ void HardwareInfo::processMessage (msg_type type, TQString message, TQString val
 						case BUTTON_SLEEP:
 						case BUTTON_POWER:
 						case LID:
-							// TODO: handle code if needed actually not 
+							// TODO: handle code if needed actually not
 							break;
 						case LAPTOP_PANEL:
 							checkBrightness();
@@ -317,7 +317,7 @@ void HardwareInfo::handleResumeSignal (int result) {
 	if (trace) kdDebug() << funcinfo <<  "IN: " << "(int result: " << result << ")"<< endl;
 
 	if (result == -1) {
-		// check if time since suspend is higher than 6 hours, 
+		// check if time since suspend is higher than 6 hours,
 		// the magic D-Bus timeout for pending calls
 		if (calledSuspend.elapsed() > 21600000) {
 			emit resumed(INT_MAX);
@@ -325,12 +325,12 @@ void HardwareInfo::handleResumeSignal (int result) {
 	} else {
 		emit resumed(result);
 	}
-	
+
 	calledSuspend = TQTime();
 	kdDebugFuncOut(trace);
 }
 
-/*! 
+/*!
  * This function checks the session for the running TDEPowersave instance
  * \return 		Boolean with result of operation
  * \retval true		if the query/check could get finished
@@ -349,30 +349,30 @@ bool HardwareInfo::checkConsoleKitSession () {
 			kdDebug() << "Could not get XDG_SESSION_COOKIE from environment" << endl;
 			sessionIsActive = true;
 		} else {
-			if (dbus_HAL->dbusSystemMethodCall( CK_SERVICE, CK_MANAGER_OBJECT, 
-							CK_MANAGER_IFACE, "GetSessionForCookie", 
+			if (dbus_HAL->dbusSystemMethodCall( CK_SERVICE, CK_MANAGER_OBJECT,
+							CK_MANAGER_IFACE, "GetSessionForCookie",
 							&reply, DBUS_TYPE_OBJECT_PATH,
 							DBUS_TYPE_STRING, &cookie,
 							DBUS_TYPE_INVALID)) {
-				if (trace) 
+				if (trace)
 					kdDebug() << "GetSessionForCookie returned: " << reply << endl;
-				
+
 				if (reply != NULL) {
 					dbus_bool_t i_reply;
 					consoleKitSession = reply;
-	
-					if (dbus_HAL->dbusSystemMethodCall( CK_SERVICE, consoleKitSession, 
-									    CK_SESSION_IFACE, "IsActive", 
+
+					if (dbus_HAL->dbusSystemMethodCall( CK_SERVICE, consoleKitSession,
+									    CK_SESSION_IFACE, "IsActive",
 									    &i_reply, DBUS_TYPE_BOOLEAN,
 									    DBUS_TYPE_INVALID)) {
 						sessionIsActive = ((i_reply != 0) ? true: false);
-						if (trace) 
+						if (trace)
 							kdDebug() << "IsActive returned: " << sessionIsActive << endl;
-	
+
 						retval = true;
 					} else {
 						kdError() << "Could get session cookie and session name, but not "
-							<< "but not the status of the session. Assume for now " 
+							<< "but not the status of the session. Assume for now "
 							<< "the Session is inactive!" << endl;
 						sessionIsActive = false;
 					}
@@ -385,7 +385,7 @@ bool HardwareInfo::checkConsoleKitSession () {
 	return retval;
 }
 
-/*! 
+/*!
  * This function check for a given UDI, if we should handle a device
  * \param _udi		TQString with the UDI of the device
  * \param *type		pointer to a integer to return the type of the device, see \ref device_type
@@ -395,12 +395,12 @@ bool HardwareInfo::checkConsoleKitSession () {
  */
 bool HardwareInfo::checkIfHandleDevice ( TQString _udi, int *type) {
 	kdDebugFuncIn(trace);
-	
+
 	TQStringList _cap;
 	bool ret = true;
 
 	TDEGenericDevice* hwdevice = m_hwdevices->findByUniqueID(_udi);
-	
+
 	if (hwdevice) {
 		TDEGenericDeviceType::TDEGenericDeviceType devtype = hwdevice->type();
 		if (devtype == TDEGenericDeviceType::PowerSupply) {
@@ -431,9 +431,9 @@ bool HardwareInfo::checkIfHandleDevice ( TQString _udi, int *type) {
 	} else {
 		ret = false;
 	}
-	
+
 	if (!ret) *type = UNKNOWN_DEVICE;
-	
+
 	kdDebugFuncOut(trace);
 	return ret;
 }
@@ -441,7 +441,7 @@ bool HardwareInfo::checkIfHandleDevice ( TQString _udi, int *type) {
 // --> set some values for devices
 /*!
  * This function set the warning level for the primary battery collection
- * If all give param are -1 or not set this function force the current 
+ * If all give param are -1 or not set this function force the current
  * settings to the primary battery collection.
  * \param _warn		value for the state BAT_WARN or -1
  * \param _low		value for the state BAT_LOW or -1
@@ -479,7 +479,7 @@ void HardwareInfo::checkIsLaptop () {
 	TQString ret;
 
 	TDERootSystemDevice* rdevice = m_hwdevices->rootSystemDevice();
-	
+
 	if (rdevice->formFactor() == TDESystemFormFactor::Laptop) {
 		laptop = true;
 	}
@@ -495,7 +495,7 @@ void HardwareInfo::checkIsLaptop () {
  */
 void HardwareInfo::checkPowermanagement() {
 	kdDebugFuncIn(trace);
-	
+
 	TQString ret;
 
 	has_APM = false;
@@ -506,7 +506,7 @@ void HardwareInfo::checkPowermanagement() {
 	if (hwlist.count() > 0) {
 		has_ACPI = true;
 	}
-	
+
 	// FIXME
 	// Do we even need to detect APM and PMU devices in the year 2012?!?
 
@@ -519,7 +519,7 @@ void HardwareInfo::checkPowermanagement() {
  */
 void HardwareInfo::checkSuspend() {
 	kdDebugFuncIn(trace);
-	
+
 	suspend_states = SuspendStates();
 
 	suspend_states.suspend2ram = false;
@@ -528,6 +528,9 @@ void HardwareInfo::checkSuspend() {
 	suspend_states.suspend2disk = false;
 	suspend_states.suspend2disk_can = false;
 	suspend_states.suspend2disk_allowed = -1;
+	suspend_states.freeze = false;
+	suspend_states.freeze_can = false;
+	suspend_states.freeze_allowed = -1;
 	suspend_states.standby = false;
 	suspend_states.standby_can = false;
 	suspend_states.standby_allowed = -1;
@@ -545,6 +548,11 @@ void HardwareInfo::checkSuspend() {
 				suspend_states.standby_allowed = rdevice->canStandby();
 				suspend_states.standby_can = suspend_states.standby_allowed & suspend_states.standby;
 			}
+			if ((*it) == TDESystemPowerState::Freeze) {
+				suspend_states.freeze = true;
+				suspend_states.freeze_allowed = rdevice->canFreeze();
+				suspend_states.freeze_can = suspend_states.freeze_allowed & suspend_states.freeze;
+			}
 			if ((*it) == TDESystemPowerState::Suspend) {
 				suspend_states.suspend2ram = true;
 				suspend_states.suspend2ram_allowed = rdevice->canSuspend();
@@ -575,7 +583,7 @@ void HardwareInfo::checkCPUFreq() {
 	TDEGenericDevice *hwdevice;
 	hwdevice = hwlist.first();
 	TDECPUDevice *cpudevice = static_cast<TDECPUDevice*>(hwdevice);
-	
+
 	if (!cpudevice->scalingDriver().isNull()) {
 		cpuFreq = true;
 		cpuFreqAllowed = cpudevice->canSetGovernor();
@@ -600,7 +608,7 @@ cpufreq_type HardwareInfo::checkCurrentCPUFreqPolicy() {
 	TDEGenericDevice *hwdevice;
 	hwdevice = hwlist.first();
 	TDECPUDevice *cpudevice = static_cast<TDECPUDevice*>(hwdevice);
-	
+
 	TQString gov = cpudevice->governor();
 
 	cpufreq_type _current = UNKNOWN_CPUFREQ;
@@ -622,7 +630,7 @@ cpufreq_type HardwareInfo::checkCurrentCPUFreqPolicy() {
 			kdWarning() << "Could not get information about current governor" << endl;
 		}
 	} else {
-		kdWarning() << "CPU Frequency interface not supported by machine or HAL" << endl;
+		kdWarning() << "CPU Frequency interface not supported by machine or TDE hardware library" << endl;
 	}
 
 	if (_current != currentCPUFreqPolicy) {
@@ -632,14 +640,14 @@ cpufreq_type HardwareInfo::checkCurrentCPUFreqPolicy() {
 	} else {
 		update_info_cpufreq_policy_changed = false;
 	}
-	
+
 	kdDebugFuncOut(trace);
 	return currentCPUFreqPolicy;
 }
 
 
 /*!
- * The function checks whether the machine provide a brightness interface and init 
+ * The function checks whether the machine provide a brightness interface and init
  * (if needed) brightness information.
  */
 void HardwareInfo::checkBrightness() {
@@ -682,7 +690,7 @@ void HardwareInfo::checkBrightness() {
 		kdDebugFuncOut(trace);
 		return;
 	}
-	
+
 	kdDebugFuncOut(trace);
 }
 
@@ -699,19 +707,19 @@ void HardwareInfo::checkCurrentBrightness() {
 		TDEGenericDevice *hwdevice;
 		hwdevice = hwlist.first();
 		TDEBacklightDevice *backlightdevice = static_cast<TDEBacklightDevice*>(hwdevice);
-	
+
 		if (backlightdevice) {
 			currentBrightnessLevel = backlightdevice->rawBrightness();
 		}
 	}
-	
+
 	kdDebugFuncOut(trace);
 }
 
 
 /*!
  * The function initialise the hardware information and collect all
- * initial information from HAL.
+ * initial information from TDE hardware library.
  * \return boolean with result of the operation
  * \retval true  if successful
  * \retval false else, if a error occurs
@@ -817,7 +825,7 @@ void HardwareInfo::checkLidcloseState() {
 }
 
 /*!
- * This funtion is used to call a update of a battery value for a given 
+ * This funtion is used to call a update of a battery value for a given
  * UDI and the given changed property
  * \param udi 		TQString with the UDI of the battery
  * \param property	TQString with the changed property
@@ -855,7 +863,7 @@ void HardwareInfo::updatePrimaryBatteries () {
 		if (primaryBatteries->getNumBatteries() < 1) {
 			setPrimaryBatteriesWarningLevel();
 			primaryBatteries->refreshInfo( BatteryList );
-			connect(primaryBatteries, TQT_SIGNAL(batteryChanged()), this, 
+			connect(primaryBatteries, TQT_SIGNAL(batteryChanged()), this,
 				TQT_SLOT(setPrimaryBatteriesChanges()));
 			connect(primaryBatteries, TQT_SIGNAL(batteryWarnState(int,int)), this,
 				TQT_SLOT(emitBatteryWARNState(int,int)));
@@ -888,7 +896,7 @@ void HardwareInfo::setPrimaryBatteriesChanges () {
 void HardwareInfo::emitBatteryWARNState (int type, int state) {
 	kdDebugFuncIn(trace);
 
-	if (type == BAT_PRIMARY) 
+	if (type == BAT_PRIMARY)
 		emit primaryBatteryChanged();
 	else
 		emit generalDataChanged();
@@ -899,10 +907,10 @@ void HardwareInfo::emitBatteryWARNState (int type, int state) {
 }
 
 // --> init HW information section -- END <---
-// --> HAL method call (trigger actions) section -- START <---
+// --> TDE hardware library method call (trigger actions) section -- START <---
 
 /*!
- * Function to trigger a suspend via HAL 
+ * Function to trigger a suspend via TDE hardware library
  * \param suspend 	enum of suspend_type with the requested suspend
  * \return boolean with result of the operation
  * \retval true  	if successful
@@ -928,7 +936,7 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
 						return false;
 					}
 				} else {
-					if ( !suspend_states.suspend2disk ) 
+					if ( !suspend_states.suspend2disk )
 						kdDebug() << "The machine does not support suspend to disk." << endl;
 					else
 						kdWarning() << "Policy forbid user to trigger suspend to disk" << endl;
@@ -947,11 +955,30 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
 						return false;
 					}
 				} else {
-					if ( !suspend_states.suspend2ram ) 
+					if ( !suspend_states.suspend2ram )
 						kdDebug() << "The machine does not support suspend to ram." << endl;
 					else
 						kdWarning() << "Policy forbid user to trigger suspend to ram" << endl;
-					
+
+					return false;
+				}
+				break;
+			case FREEZE:
+				if (suspend_states.freeze && (suspend_states.freeze_allowed != 0)) {
+					if (rdevice->setPowerState(TDESystemPowerState::Freeze)) {
+						calledSuspend.start();
+						handleResumeSignal(0);
+						return true;
+					} else {
+						handleResumeSignal(-1);
+						return false;
+					}
+				} else {
+					if ( !suspend_states.freeze )
+						kdDebug() << "The machine does not support freeze." << endl;
+					else
+						kdWarning() << "Policy forbid user to trigger freeze" << endl;
+
 					return false;
 				}
 				break;
@@ -966,7 +993,7 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
 						return false;
 					}
 				} else {
-					if ( !suspend_states.standby ) 
+					if ( !suspend_states.standby )
 						kdDebug() << "The machine does not support standby." << endl;
 					else
 						kdWarning() << "Policy forbid user to trigger standby" << endl;
@@ -978,13 +1005,13 @@ bool HardwareInfo::suspend( suspend_type suspend ) {
 				return false;
 		}
 	}
-	
+
 	kdDebugFuncOut(trace);
 	return false;
 }
 
 /*!
- * Function to set brightness via HAL (if supported by hardware)
+ * Function to set brightness via TDE hardware library (if supported by hardware)
  * \param level		Integer with the level to set, (range: 0 - \ref availableBrightnessLevels )
  * \param percent	Integer with the brightness percentage to set
  * \return boolean with result of the operation
@@ -1037,10 +1064,10 @@ bool HardwareInfo::setBrightness ( int level, int percent ){
 	checkCurrentBrightness();
 	kdDebugFuncOut(trace);
 	return retval;
-} 
+}
 
 /*!
- * Function to set the CPU frequency policy via HAL. 
+ * Function to set the CPU frequency policy via TDE hardware library.
  * \param cpufreq 	enum of cpufreq_type with the policy to set
  * \param limit 	integer with range 0 - 100 (only if cpufreq == DYNAMIC)
  * \return boolean with result of the operation
@@ -1051,10 +1078,10 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) {
 	if (trace) kdDebug() << funcinfo << "IN: " <<  "cpufreq_type: " << cpufreq << " limit: " << limit << endl;
 
 	if (!cpuFreq) {
-		kdError() << "This machine does not support change the CPU Freq via HAL" << endl;
+		kdError() << "This machine does not support change the CPU Freq via TDE hardware library" << endl;
 		return false;
 	}
-	
+
 	if (cpuFreqAllowed  == 0) {
 		kdError() << "Could not set CPU Freq, this not the needed privileges." << endl;
 		return false;
@@ -1088,7 +1115,7 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) {
 
 				for (TQStringList::Iterator it = dynamic.begin(); it != dynamic.end(); it++){
 					kdDebug() << "Try to set dynamic CPUFreq to: " << *it << endl;
-					
+
 					if (setCPUFreqGovernor((*it).latin1())) {
 						kdDebug() << "Set dynamic successful to: " << *it << endl;
 						break;
@@ -1120,7 +1147,7 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) {
 					cpuLimit = (cpuLimit * limit) / 100.0;
 					cpuLimit = cpudevice->maxFrequency() + cpuLimit;
 					cpudevice->setMaximumScalingFrequency(cpuLimit);
-					
+
 				}
 
 				break;
@@ -1134,7 +1161,7 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) {
 				kdWarning() << "Unknown cpufreq_type: " << cpufreq << endl;
 				return false;
 		}
-		
+
 		// check if the policy was really set (and emit signal)
 		if (checkCurrentCPUFreqPolicy() == cpufreq) {
 //			update_info_cpufreq_policy_changed = true;
@@ -1143,13 +1170,13 @@ bool HardwareInfo::setCPUFreq ( cpufreq_type cpufreq, int limit ) {
 		} else {
 			return false;
 		}
-	} else {	
+	} else {
 		return false;
 	}
 }
 
 /*!
- * Function to set the CPU governor via HAL. 
+ * Function to set the CPU governor via TDE hardware library.
  * \param governor	char * with the name of the governor
  * \return boolean with result of the operation
  * \retval true  	if successful
@@ -1172,14 +1199,14 @@ bool HardwareInfo::setCPUFreqGovernor( const char *governor ) {
 			ret = false;
 		}
 	}
-	
+
 	kdDebugFuncOut(trace);
 	return ret;
 }
 
 
 /*!
- * Function to set the powersave mode (incl. e.g. disk settings) via HAL. 
+ * Function to set the powersave mode (incl. e.g. disk settings) via TDE hardware library.
  * \param  on		boolean which tell if enable/disable powersave mode
  * \return boolean with result of the operation
  * \retval true  	if successful
@@ -1192,14 +1219,14 @@ bool HardwareInfo::setPowerSave( bool on ) {
 
 	// FIXME
 	// Set up power saving to the best of our ability using "raw" functions
-	printf("[FIXME] HardwareInfo::setPowerSave unimplemented!\n\r"); fflush(stdout);
-	
+	printf("[FIXME] HardwareInfo::setPowerSave unimplemented!\n"); fflush(stdout);
+
 	kdDebugFuncOut(trace);
 	return retval;
 }
 
 /*!
- * Function to call GetSchedPowerSavings() via HAL. 
+ * Function to call GetSchedPowerSavings() via TDE hardware library.
  * \return boolean with result of the operation
  * \retval true  	if successful
  * \retval false 	else, if a error occurs
@@ -1216,8 +1243,8 @@ bool HardwareInfo::getSchedPowerSavings() {
 }
 
 /*!
- * Function to call SetSchedPowerSavings() via HAL. Note: this would only work on
- * Multiprocessor/-core machines.
+ * Function to call SetSchedPowerSavings() via TDE hardware library.
+ * Note: this would only work on multiprocessor/-core machines.
  * \return boolean with result of the operation
  * \retval true  	if successful
  * \retval false 	else, if a error occurs
@@ -1234,7 +1261,7 @@ bool HardwareInfo::setSchedPowerSavings( bool enable ) {
 }
 
 
-// --> HAL method call (trigger actions) section -- END <---
+// --> TDE hardware library method call (trigger actions) section -- END <---
 
 // --> private helper functions/slots to forward/handle events  -- START <--
 //     need this functions to make events from HAL/D-Bus independent
@@ -1242,7 +1269,7 @@ bool HardwareInfo::setSchedPowerSavings( bool enable ) {
 //     blocked by normal KDE/QT (GUI) calls
 /*!
  * Function to emit the signal for the Power button.
- */ 
+ */
 void HardwareInfo::emitPowerButtonPressed() {
 	if (sessionIsActive) {
 		emit powerButtonPressed();
@@ -1294,17 +1321,17 @@ void HardwareInfo::emitSessionActiveState() {
  * Function to set the brightess a step up.
  * \param percentageStep Integer of next step should get set
  * \return result of the operation
- * \retval true		if could get set 
+ * \retval true		if could get set
  * \retval false	else
  */
 bool HardwareInfo::setBrightnessUp(int percentageStep) {
 	kdDebugFuncIn(trace);
-	
+
 	bool retval = false;
-	
+
 	checkCurrentBrightness();
 
-	if (supportBrightness() && (getCurrentBrightnessLevel() >= 0) && 
+	if (supportBrightness() && (getCurrentBrightnessLevel() >= 0) &&
             (getCurrentBrightnessLevel() != (getMaxBrightnessLevel()-1))) {
 		int setTo = 0;
 		int minPercStep = 10;
@@ -1312,7 +1339,7 @@ bool HardwareInfo::setBrightnessUp(int percentageStep) {
 
 		if (percentageStep > 0 && (percentageStep <= (100-currentPerc))) {
 			minPercStep = percentageStep;
-		} 
+		}
 
 		if ((currentPerc + minPercStep) > 100) {
 			// set to 100 %
@@ -1325,16 +1352,16 @@ bool HardwareInfo::setBrightnessUp(int percentageStep) {
 		}
 
 		if (trace) {
-			kdDebug() << "Max: " << getMaxBrightnessLevel() 
-				  << " Current: " << getCurrentBrightnessLevel() 
+			kdDebug() << "Max: " << getMaxBrightnessLevel()
+				  << " Current: " << getCurrentBrightnessLevel()
 				  << " minPercStep: " << minPercStep
 				  << " currentPerc: " << currentPerc
 				  << " setTo: " << setTo << endl;
 		}
-	
+
 		retval = setBrightness(setTo, -1);
 	}
- 
+
 	kdDebugFuncOut(trace);
 	return retval;
 }
@@ -1343,7 +1370,7 @@ bool HardwareInfo::setBrightnessUp(int percentageStep) {
  * Function to set the brightess a step up.
  * \param percentageStep Integer of next step should get set
  * \return result of the operation
- * \retval true		if could get set 
+ * \retval true		if could get set
  * \retval false	else
  */
 bool HardwareInfo::setBrightnessDown(int percentageStep) {
@@ -1372,8 +1399,8 @@ bool HardwareInfo::setBrightnessDown(int percentageStep) {
 		}
 
 		if (trace) {
-			kdDebug() << "Max: " << getMaxBrightnessLevel() 
-				  << " Current: " << getCurrentBrightnessLevel() 
+			kdDebug() << "Max: " << getMaxBrightnessLevel()
+				  << " Current: " << getCurrentBrightnessLevel()
 				  << " minPercStep: " << minPercStep
 				  << " currentPerc: " << currentPerc
 				  << " setTo: " << setTo << endl;
@@ -1391,7 +1418,7 @@ bool HardwareInfo::setBrightnessDown(int percentageStep) {
  */
 void HardwareInfo::brightnessUpPressed() {
 	kdDebugFuncIn(trace);
-	
+
 	if (brightness) {
 		if (!sessionIsActive) {
 			kdWarning() << "Session is not active, don't react on brightness up key event!" << endl;
@@ -1431,9 +1458,9 @@ void HardwareInfo::brightnessDownPressed() {
 
 /*!
  * The function return the current state of the ac adapter.
- * \return boolean with the current state 
+ * \return boolean with the current state
  * \retval true 	if adapter is present/connected or unknown
- * \retval false 	if not 
+ * \retval false 	if not
  */
 bool HardwareInfo::getAcAdapter() const {
 	return acadapter;
@@ -1441,7 +1468,7 @@ bool HardwareInfo::getAcAdapter() const {
 
 /*!
  * The function return the current state of the lidclose button.
- * \return boolean with the current state 
+ * \return boolean with the current state
  * \retval true 	if the lid is closed
  * \retval false 	if the lid is opend
  */
@@ -1508,7 +1535,7 @@ TQPtrList<Battery> HardwareInfo::getAllBatteries() const {
 
 /*!
  * The function return the status of \ref laptop.
- * \return boolean with info if machine is a laptop 
+ * \return boolean with info if machine is a laptop
  * \retval true 	if a laptop
  * \retval false 	else/if not a laptop
  */
@@ -1517,9 +1544,9 @@ bool HardwareInfo::isLaptop() const {
 }
 
 /*!
- * The function return info if there is a working connection to D-Bus and HAL.
+ * The function return info if there is a working connection to TDE hardware library.
  * This mean if we get hardwareinformation
- * \return boolean with info if D-Bus and HAL work
+ * \return boolean with info if TDE hardware library work
  * \retval true 	if connected
  * \retval false 	if not connected
  */
@@ -1531,7 +1558,7 @@ bool HardwareInfo::isOnline() const {
 
 /*!
  * The function return the status of \ref has_ACPI.
- * \return boolean with info if machine support ACPI 
+ * \return boolean with info if machine support ACPI
  * \retval true 	if support ACPI
  * \retval false 	else
  */
@@ -1551,7 +1578,7 @@ bool HardwareInfo::hasAPM() const {
 
 /*!
  * The function return the status of \ref has_PMU.
- * \return boolean with info if machine support PMU 
+ * \return boolean with info if machine support PMU
  * \retval true 	if support PMU
  * \retval false 	else
  */
@@ -1561,7 +1588,7 @@ bool HardwareInfo::hasPMU() const {
 
 /*!
  * The function return the status of \ref brightness.
- * \return boolean with info if machine support brightness changes via HAL
+ * \return boolean with info if machine support brightness changes via TDE hardware library
  * \retval true 	if support brightness changes
  * \retval false 	else
  */
@@ -1571,7 +1598,7 @@ bool HardwareInfo::supportBrightness() const {
 
 /*!
  * The function return the status of \ref cpuFreq.
- * \return boolean with info if machine support change the CPU frequency via HAL
+ * \return boolean with info if machine support change the CPU frequency via TDE hardware library
  * \retval true 	if support brightness changes
  * \retval false 	else
  */