1 files changed, 26 insertions, 22 deletions

diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp
index 851d844..8390f29 100644
--- a/src/detaileddialog.cpp
+++ b/src/detaileddialog.cpp
@@ -27,12 +27,16 @@
  * \date	2006-2007
  */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // KDE headers:
 #include <kled.h>
 #include <kiconloader.h>
 #include <tdelocale.h>
 
-// QT headers:
+// TQt headers:
 #include <tqpushbutton.h>
 #include <tqlayout.h>
 #include <tqlabel.h>
@@ -93,12 +97,12 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
 		BatteryFrame->adjustSize();
 		tl_powerConsDesc->hide();
 		tl_powerConsValue->hide();
-		connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setBattery()));
-		connect(primaryBatteries, TQT_SIGNAL(batteryChanged()), this, TQT_SLOT(setBattery()));
-		connect(primaryBatteries, TQT_SIGNAL(batteryChargingStateChanged(int)), this,
-			TQT_SLOT(setPowerConsumption()));
-		connect(primaryBatteries, TQT_SIGNAL(batteryRateChanged()), this, 
-			TQT_SLOT(setPowerConsumption()));
+		connect(hwinfo, TQ_SIGNAL(generalDataChanged()), this, TQ_SLOT(setBattery()));
+		connect(primaryBatteries, TQ_SIGNAL(batteryChanged()), this, TQ_SLOT(setBattery()));
+		connect(primaryBatteries, TQ_SIGNAL(batteryChargingStateChanged(int)), this,
+			TQ_SLOT(setPowerConsumption()));
+		connect(primaryBatteries, TQ_SIGNAL(batteryRateChanged()), this, 
+			TQ_SLOT(setPowerConsumption()));
 		setBattery();
 		setPowerConsumption();
 	} else {
@@ -122,21 +126,21 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
 	}
 	ProcessorFrame->adjustSize();
 	
-	connect(OkButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeDetailedDlg()));
-	connect(hwinfo, TQT_SIGNAL(ACStatus(bool)), this, TQT_SLOT(setAC()));
+	connect(OkButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeDetailedDlg()));
+	connect(hwinfo, TQ_SIGNAL(ACStatus(bool)), this, TQ_SLOT(setAC()));
 	// TODO: replace event
-	//connect(pd, TQT_SIGNAL(schemeDataChanged()), this, TQT_SLOT(setInfos()));
-	connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setInfos()));
+	//connect(pd, TQ_SIGNAL(schemeDataChanged()), this, TQ_SLOT(setInfos()));
+	connect(hwinfo, TQ_SIGNAL(generalDataChanged()), this, TQ_SLOT(setInfos()));
 
 	if (hwinfo->supportCPUFreq() || cpuInfo->cpuFreqHW) {
 		// Check if cpufreq is available
 		cpuInfo->getCPUMaxSpeed();
 		setProcessor();
-		connect(hwinfo, TQT_SIGNAL(currentCPUFreqPolicyChanged()), this, TQT_SLOT(setInfos()));
+		connect(hwinfo, TQ_SIGNAL(currentCPUFreqPolicyChanged()), this, TQ_SLOT(setInfos()));
 	} else {
 		// .. if not, use cpu throttling
 		if (!cpuInfo->getCPUThrottlingState() || numOfCPUs <= 1) {
-			connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setProcessorThrottling()));
+			connect(hwinfo, TQ_SIGNAL(generalDataChanged()), this, TQ_SLOT(setProcessorThrottling()));
 		}
 		setProcessorThrottling();
 	}
@@ -154,7 +158,7 @@ detaileddialog::~detaileddialog() {
 }
 
 /*!
- * \b TQT_SLOT called if the dialog is closed by the user.
+ * \b Slot called if the dialog is closed by the user.
  * We do some cleanups here.
  */
 void detaileddialog::closeDetailedDlg() {
@@ -165,7 +169,7 @@ void detaileddialog::closeDetailedDlg() {
 }
 
 /*!
- * \b TQT_SLOT to set up the battery progress widgets.
+ * \b Slot to set up the battery progress widgets.
  */
 void detaileddialog::setBattery() {
 	kdDebugFuncIn(trace);
@@ -266,7 +270,7 @@ void detaileddialog::setBattery() {
 }
 
 /*!
- * \b TQT_SLOT to set up the Processor/CPU progress bar widgets.
+ * \b Slot to set up the Processor/CPU progress bar widgets.
  */
 void detaileddialog::setPowerConsumption() {
 	kdDebugFuncIn(trace);
@@ -303,7 +307,7 @@ void detaileddialog::setPowerConsumption() {
 }
 
 /*!
- * \b TQT_SLOT to set up the Processor/CPU progress bar widgets.
+ * \b Slot to set up the Processor/CPU progress bar widgets.
  */
 void detaileddialog::setProcessor() {
 	kdDebugFuncIn(trace);
@@ -337,12 +341,12 @@ void detaileddialog::setProcessor() {
 			ProcessorPBar[i]->setEnabled(false);
 		}
 	}
-	TQTimer::singleShot(333, this, TQT_SLOT(setProcessor()));	
+	TQTimer::singleShot(333, this, TQ_SLOT(setProcessor()));	
 	kdDebugFuncOut(trace);
 }
 
 /*!
- * \b TQT_SLOT to set up the Processor/CPU bar widgets for cpu throttling machines.
+ * \b Slot to set up the Processor/CPU bar widgets for cpu throttling machines.
  */
 void detaileddialog::setProcessorThrottling() {
 	kdDebugFuncOut(trace);
@@ -380,14 +384,14 @@ void detaileddialog::setProcessorThrottling() {
 		// currently there are no events we can use to get actual data
 		// so we recheck data ever 2 secs to register changes in the 
 		// throttling state and if a CPU/core online state change
-		TQTimer::singleShot(2000, this, TQT_SLOT(setProcessorThrottling()));
+		TQTimer::singleShot(2000, this, TQ_SLOT(setProcessorThrottling()));
 	}
 
 	kdDebugFuncOut(trace);
 }
 
 /*!
- * \b TQT_SLOT to set up the AC status within the Led widget.
+ * \b Slot to set up the AC status within the Led widget.
  */
 void detaileddialog::setAC() {
 	kdDebugFuncIn(trace);
@@ -405,7 +409,7 @@ void detaileddialog::setAC() {
 }
 
 /*!
- * \b TQT_SLOT to set all additional informtation as e.g. CPUFrequency policy
+ * \b Slot to set all additional informtation as e.g. CPUFrequency policy
  * or current scheme
  */
 void detaileddialog::setInfos() {