Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit f3cf754cc9c54fc1de34ef06110a6810d655390a.

1 files changed, 10 insertions, 10 deletions

diff --git a/src/detaileddialog.cpp b/src/detaileddialog.cpp
index 573d1bb..56910b1 100644
--- a/src/detaileddialog.cpp
+++ b/src/detaileddialog.cpp
@@ -34,7 +34,7 @@
 
 // QT headers:
 #include <tqpushbutton.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqtimer.h>
 #include <tqgroupbox.h>
@@ -78,9 +78,9 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
 			if ((primaryBatteries->getNumBatteries() > 1) && (i == 0))
 				Label->setText( i18n( "Total:" ));
 			else if ((primaryBatteries->getNumBatteries() > 1) && (i > 0))
-				Label->setText( i18n( "Battery %1" ).arg(i));
+				Label->setText( i18n( "Battery %1" ).tqarg(i));
 			else 
-				Label->setText( i18n( "Battery %1" ).arg(i + 1));
+				Label->setText( i18n( "Battery %1" ).tqarg(i + 1));
 	
 			BatteryGridLayout->addWidget( Label, i , 0);
 	
@@ -111,7 +111,7 @@ detaileddialog::detaileddialog( HardwareInfo *_hwinfo, TQPixmap *_pixmap, Settin
 
 	for (int i = 0; i < numOfCPUs; i++) {
 		TQLabel *Label = new TQLabel(ProcessorFrame, "ProcessorLabel");
-		Label->setText( i18n( "Processor %1" ).arg(i + 1));
+		Label->setText( i18n( "Processor %1" ).tqarg(i + 1));
 		ProcessorGridLayout->addWidget( Label, i , 0);
 
 		KProgress *CPUPBar = new KProgress(ProcessorFrame, "ProcessorPBar");
@@ -123,7 +123,7 @@ 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(hwinfo, TQT_SIGNAL(ACtqStatus(bool)), this, TQT_SLOT(setAC()));
 	// TODO: replace event
 	//connect(pd, TQT_SIGNAL(schemeDataChanged()), this, TQT_SLOT(setInfos()));
 	connect(hwinfo, TQT_SIGNAL(generalDataChanged()), this, TQT_SLOT(setInfos()));
@@ -242,10 +242,10 @@ void detaileddialog::setBattery() {
 				// this should fix apm, where we have no time info if charging
 				BatteryPBar[i]->setFormat("%p% " + i18n("charged"));
 			} else if (_c_state == CHARGING) {
-				TQString temp = i18n("%1:%2 h until charged").arg(hours).arg(minutes);
+				TQString temp = i18n("%1:%2 h until charged").tqarg(hours).tqarg(minutes);
 				BatteryPBar[i]->setFormat(temp);
 			} else if (_c_state == DISCHARGING) {
-				TQString temp = i18n("%1:%2 h remaining").arg(hours).arg(minutes);
+				TQString temp = i18n("%1:%2 h remaining").tqarg(hours).tqarg(minutes);
 				BatteryPBar[i]->setFormat(temp);
 			
 			} else {
@@ -355,7 +355,7 @@ void detaileddialog::setProcessorThrottling() {
 		if (throttling && cpuInfo->cpufreq_speed[i] > 0 && cpuInfo->cpu_throttling[i] >= 0) {
 			// get max cpu freq and set it to the max of the progressbar
 			ProcessorPBar[i]->setTotalSteps(100);
-			TQString ProgressString = TQString("%1% (%2 MHz)").arg(100 - cpuInfo->cpu_throttling[i]).arg(cpuInfo->cpufreq_speed[i]);
+			TQString ProgressString = TQString("%1% (%2 MHz)").tqarg(100 - cpuInfo->cpu_throttling[i]).tqarg(cpuInfo->cpufreq_speed[i]);
 			ProcessorPBar[i]->setFormat(i18n(ProgressString.ascii()));
 			ProcessorPBar[i]->setProgress(100 - cpuInfo->cpu_throttling[i]);
 			ProcessorPBar[i]->setEnabled(true);
@@ -388,11 +388,11 @@ void detaileddialog::setAC() {
 	kdDebugFuncIn(trace);
 
 	if (hwinfo->getAcAdapter()) {
-		LabelACStatus->setText( i18n("plugged in") );
+		LabelACtqStatus->setText( i18n("plugged in") );
 		LedAC->on();
 	} else {
 		LedAC->off();
-		LabelACStatus->setText( i18n("unplugged") );
+		LabelACtqStatus->setText( i18n("unplugged") );
 	}
 
 	setInfos();