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

This reverts commit 6981c239dedc72969f6f539afeef646a19c867c0.

20 files changed, 54 insertions, 54 deletions

diff --git a/src/sources/acpithermalsrc.cpp b/src/sources/acpithermalsrc.cpp
index 054c0e0..f762d00 100644
--- a/src/sources/acpithermalsrc.cpp
+++ b/src/sources/acpithermalsrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "acpithermalsrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqdir.h>
 #include <klocale.h>
 
diff --git a/src/sources/cpuinfofreqsrc.cpp b/src/sources/cpuinfofreqsrc.cpp
index c7b863f..6b1b55d 100644
--- a/src/sources/cpuinfofreqsrc.cpp
+++ b/src/sources/cpuinfofreqsrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "cpuinfofreqsrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqfile.h>
 #include <klocale.h>
 
diff --git a/src/sources/hddtempsrc.cpp b/src/sources/hddtempsrc.cpp
index 34995d5..b22a6c8 100644
--- a/src/sources/hddtempsrc.cpp
+++ b/src/sources/hddtempsrc.cpp
@@ -38,7 +38,7 @@ HDDTempSrc::HDDTempSrc(TQWidget* inParent, uint inIndex, const TQString& inDevic
 		mTrigger(this){
 	mID = "HDDTemp" + TQString().setNum(inIndex);
 	mName = mID;
-	mDescription = i18n("This source is provided by hddtemp. (%1, %2)").arg(inDevice).arg(inModelName);
+	mDescription = i18n("This source is provided by hddtemp. (%1, %2)").tqarg(inDevice).tqarg(inModelName);
 }
 
 HDDTempSrc::~HDDTempSrc(){
diff --git a/src/sources/hwmonfansrc.cpp b/src/sources/hwmonfansrc.cpp
index 6674111..17f57ae 100644
--- a/src/sources/hwmonfansrc.cpp
+++ b/src/sources/hwmonfansrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "hwmonfansrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqdir.h>
 #include <klocale.h>
 
@@ -30,7 +30,7 @@ HwMonFanSrc::HwMonFanSrc(TQWidget* inParent, const TQFile& inSourceFile, unsigne
 	//mName = "HwMon " + inSourceFile.name()[inSourceFile.name().length() - 7];
 	mID = "hwmonFan" + TQString::number(inIndex);
 	mName = mID;
-	mDescription = i18n("This fan source is provided by hwmon. (%1)").arg(inSourceFile.name());
+	mDescription = i18n("This fan source is provided by hwmon. (%1)").tqarg(inSourceFile.name());
 }
 
 HwMonFanSrc::~HwMonFanSrc(){
diff --git a/src/sources/hwmonthermalsrc.cpp b/src/sources/hwmonthermalsrc.cpp
index d244d88..96af141 100644
--- a/src/sources/hwmonthermalsrc.cpp
+++ b/src/sources/hwmonthermalsrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "hwmonthermalsrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqdir.h>
 #include <klocale.h>
 
@@ -30,7 +30,7 @@ HwMonThermalSrc::HwMonThermalSrc(TQWidget* inParent, const TQFile& inSourceFile,
 	//mName = "HwMon " + inSourceFile.name()[inSourceFile.name().length() - 7];
 	mID = "hwmon" + TQString::number(inIndex);
 	mName = mID;
-	mDescription = i18n("This thermal source is provided by hwmon. (%1)").arg(inSourceFile.name());
+	mDescription = i18n("This thermal source is provided by hwmon. (%1)").tqarg(inSourceFile.name());
 }
 
 HwMonThermalSrc::~HwMonThermalSrc(){
diff --git a/src/sources/i8ksrc.cpp b/src/sources/i8ksrc.cpp
index 235c665..50c1bf5 100644
--- a/src/sources/i8ksrc.cpp
+++ b/src/sources/i8ksrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "i8ksrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqdir.h>
 #include <klocale.h>
 
diff --git a/src/sources/ibmacpifansrc.cpp b/src/sources/ibmacpifansrc.cpp
index 8b517a8..a311bda 100644
--- a/src/sources/ibmacpifansrc.cpp
+++ b/src/sources/ibmacpifansrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "ibmacpifansrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqfile.h>
 #include <klocale.h>
 
diff --git a/src/sources/ibmacpithermalsrc.cpp b/src/sources/ibmacpithermalsrc.cpp
index ba18019..770c885 100644
--- a/src/sources/ibmacpithermalsrc.cpp
+++ b/src/sources/ibmacpithermalsrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "ibmacpithermalsrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqfile.h>
 #include <klocale.h>
 //#include "hal/libhal.h" 
diff --git a/src/sources/ibmhdaps.cpp b/src/sources/ibmhdaps.cpp
index a748c61..64d3d9a 100644
--- a/src/sources/ibmhdaps.cpp
+++ b/src/sources/ibmhdaps.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "ibmhdaps.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqdir.h>
 #include <klocale.h>
 
diff --git a/src/sources/ibookg4thermalsrc.cpp b/src/sources/ibookg4thermalsrc.cpp
index f9bbdaa..54f5a91 100644
--- a/src/sources/ibookg4thermalsrc.cpp
+++ b/src/sources/ibookg4thermalsrc.cpp
@@ -20,7 +20,7 @@
  ***************************************************************************/
 
 #include "ibookg4thermalsrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <klocale.h>
 
 IbookG4ThermalSrc::IbookG4ThermalSrc(TQWidget* inParent, const TQFile& inSourceFile, const TQString& inName):
diff --git a/src/sources/labelsource.cpp b/src/sources/labelsource.cpp
index ef98492..d4d2182 100644
--- a/src/sources/labelsource.cpp
+++ b/src/sources/labelsource.cpp
@@ -60,7 +60,7 @@ void LabelSource::updatePrefsGUI(){
 	TriggeredSource::updatePrefsGUI(); // update prefs of the super class
 	mLabelSourcePrefs->colorButton->setColor(mLabel->paletteForegroundColor());
 	mLabelSourcePrefs->fontRequester->setFont(mLabel->font());
-	switch (mLabel->alignment()) {
+	switch (mLabel->tqalignment()) {
 		case TQt::AlignCenter:
 			mLabelSourcePrefs->alignmentComboBox->setCurrentItem(1);
 			break;
@@ -95,7 +95,7 @@ void LabelSource::applyPrefs(){
 	}else if(alignID == 2){
 		align = TQt::AlignRight;
 	}
-	mLabel->setAlignment(align);
+	mLabel->tqsetAlignment(align);
 	updateLabel(mValue);
 }
 
@@ -103,7 +103,7 @@ void LabelSource::savePrefs(KConfig* inKConfig){
 	TriggeredSource::savePrefs(inKConfig);
 	inKConfig->writeEntry(mID + "_color", mLabelSourcePrefs->colorButton->color());
 	inKConfig->writeEntry(mID + "_font", mLabelSourcePrefs->fontRequester->font());
-	inKConfig->writeEntry(mID + "_align", mLabel->alignment());
+	inKConfig->writeEntry(mID + "_align", mLabel->tqalignment());
 }
 
 void LabelSource::loadPrefs(KConfig* inKConfig){
@@ -113,7 +113,7 @@ void LabelSource::loadPrefs(KConfig* inKConfig){
 		color.setRgb(0,0,0);
 	mLabel->setPaletteForegroundColor(color);
 	mLabel->setFont(inKConfig->readFontEntry(mID + "_font"));
-	mLabel->setAlignment(inKConfig->readNumEntry(mID + "_align"));
+	mLabel->tqsetAlignment(inKConfig->readNumEntry(mID + "_align"));
 }
 
 void LabelSource::updateLabel(const TQString& inValue){
diff --git a/src/sources/labelsourcePrefs.cpp b/src/sources/labelsourcePrefs.cpp
index 99a8470..db9b675 100644
--- a/src/sources/labelsourcePrefs.cpp
+++ b/src/sources/labelsourcePrefs.cpp
@@ -18,7 +18,7 @@
 #include <kcolorbutton.h>
 #include <kfontrequester.h>
 #include <tqcombobox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -44,39 +44,39 @@ LabelSourcePrefs::LabelSourcePrefs( TQWidget* parent, const char* name, WFlags f
     taskbartitleLabel->setFont( taskbartitleLabel_font ); 
     defaultSourcePrefsFrameLayout->addWidget( taskbartitleLabel );
 
-    layout13 = new TQHBoxLayout( 0, 0, 6, "layout13"); 
+    tqlayout13 = new TQHBoxLayout( 0, 0, 6, "tqlayout13"); 
 
     colorLabel = new TQLabel( defaultSourcePrefsFrame, "colorLabel" );
-    layout13->addWidget( colorLabel );
+    tqlayout13->addWidget( colorLabel );
 
     colorButton = new KColorButton( defaultSourcePrefsFrame, "colorButton" );
-    layout13->addWidget( colorButton );
+    tqlayout13->addWidget( colorButton );
     spacer1 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    layout13->addItem( spacer1 );
-    defaultSourcePrefsFrameLayout->addLayout( layout13 );
+    tqlayout13->addItem( spacer1 );
+    defaultSourcePrefsFrameLayout->addLayout( tqlayout13 );
 
-    layout17 = new TQHBoxLayout( 0, 0, 6, "layout17"); 
+    tqlayout17 = new TQHBoxLayout( 0, 0, 6, "tqlayout17"); 
 
     fontLabel = new TQLabel( defaultSourcePrefsFrame, "fontLabel" );
-    layout17->addWidget( fontLabel );
+    tqlayout17->addWidget( fontLabel );
 
     fontRequester = new KFontRequester( defaultSourcePrefsFrame, "fontRequester" );
-    layout17->addWidget( fontRequester );
-    defaultSourcePrefsFrameLayout->addLayout( layout17 );
+    tqlayout17->addWidget( fontRequester );
+    defaultSourcePrefsFrameLayout->addLayout( tqlayout17 );
 
-    layout18 = new TQHBoxLayout( 0, 0, 6, "layout18"); 
+    tqlayout18 = new TQHBoxLayout( 0, 0, 6, "tqlayout18"); 
 
     alignmentLabel = new TQLabel( defaultSourcePrefsFrame, "alignmentLabel" );
-    layout18->addWidget( alignmentLabel );
+    tqlayout18->addWidget( alignmentLabel );
 
     alignmentComboBox = new TQComboBox( FALSE, defaultSourcePrefsFrame, "alignmentComboBox" );
-    layout18->addWidget( alignmentComboBox );
+    tqlayout18->addWidget( alignmentComboBox );
     spacer2 = new TQSpacerItem( 350, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum );
-    layout18->addItem( spacer2 );
-    defaultSourcePrefsFrameLayout->addLayout( layout18 );
+    tqlayout18->addItem( spacer2 );
+    defaultSourcePrefsFrameLayout->addLayout( tqlayout18 );
     LabelSourcePrefsLayout->addWidget( defaultSourcePrefsFrame );
     languageChange();
-    resize( TQSize(299, 135).expandedTo(minimumSizeHint()) );
+    resize( TQSize(299, 135).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
diff --git a/src/sources/labelsourcePrefs.ui b/src/sources/labelsourcePrefs.ui
index 2458413..a7f49db 100644
--- a/src/sources/labelsourcePrefs.ui
+++ b/src/sources/labelsourcePrefs.ui
@@ -55,7 +55,7 @@ Taskbar visual settings</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout13</cstring>
+                        <cstring>tqlayout13</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -87,7 +87,7 @@ Taskbar visual settings</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>350</width>
                                     <height>20</height>
@@ -98,7 +98,7 @@ Taskbar visual settings</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout17</cstring>
+                        <cstring>tqlayout17</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -121,7 +121,7 @@ Taskbar visual settings</string>
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout18</cstring>
+                        <cstring>tqlayout18</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -165,7 +165,7 @@ Taskbar visual settings</string>
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>350</width>
                                     <height>20</height>
diff --git a/src/sources/omnibookthermalsrc.cpp b/src/sources/omnibookthermalsrc.cpp
index ea91f95..11f8cd9 100644
--- a/src/sources/omnibookthermalsrc.cpp
+++ b/src/sources/omnibookthermalsrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "omnibookthermalsrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqfile.h>
 #include <klocale.h>
 
diff --git a/src/sources/source.cpp b/src/sources/source.cpp
index 8ba4376..20885b0 100644
--- a/src/sources/source.cpp
+++ b/src/sources/source.cpp
@@ -20,7 +20,7 @@
 
 #include "source.h"
 #include <math.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
 #include <tqlabel.h>
@@ -107,7 +107,7 @@ TQWidget* Source::createPrefs(TQWidget* inParent){
 		createSubPrefs(mSourcePrefs);
 			
 		// add bottom vspacer
-		mSourcePrefs->layout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
+		mSourcePrefs->tqlayout()->addItem(new TQSpacerItem(0, 0, TQSizePolicy::Minimum, TQSizePolicy::Expanding) );
 
 		updatePrefsGUI(); // fill the prefs gui
 	}
@@ -140,7 +140,7 @@ void Source::setPrefsWidgetsEnabled(bool isEnabled, bool isShownOnApplet){
 
 void Source::addPrefs(TQWidget* inParent){
 	if(inParent != NULL)
-		mSourcePrefs->layout()->add(inParent);
+		mSourcePrefs->tqlayout()->add(inParent);
 }
 
 void Source::applyPrefs(){
diff --git a/src/sources/source.h b/src/sources/source.h
index ff01049..6ae53c5 100644
--- a/src/sources/source.h
+++ b/src/sources/source.h
@@ -48,12 +48,12 @@ public:
 	const TQString& getID() const;
 
 	/**
-	 * Returns the position of this source in the layout
+	 * Returns the position of this source in the tqlayout
 	 */
 	int getPosition() const;
 
 	/**
-	 * Sets the position of this source in the layout
+	 * Sets the position of this source in the tqlayout
 	 */
 	void setPosition(int inPosition, KConfig* inKConfig);
 
@@ -145,9 +145,9 @@ signals:
 	/**
 	 * This signal is emitted whenever the enabled flag (mEnabled) of this source has changed
 	 */
-	void enabledChanged(bool inEnabled, Source* inSource); // needed by kima.cpp to add sources to its layout
+	void enabledChanged(bool inEnabled, Source* inSource); // needed by kima.cpp to add sources to its tqlayout
 	/**
-	 * This signal is emitted whenever this Source should be added or removed from the display (layout) of the kicker applet
+	 * This signal is emitted whenever this Source should be added or removed from the display (tqlayout) of the kicker applet
 	 */
 	void displaySource(bool inDisplay, Source* inSource);
 
@@ -179,7 +179,7 @@ protected:
 	 */
 	TQString mID;
 	/**
-	 * The Position of the source in the layout
+	 * The Position of the source in the tqlayout
 	 */
 	int mPosition;
 	/** 
diff --git a/src/sources/sourceprefs.cpp b/src/sources/sourceprefs.cpp
index 4fbd5a7..160cfd0 100644
--- a/src/sources/sourceprefs.cpp
+++ b/src/sources/sourceprefs.cpp
@@ -16,7 +16,7 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 
@@ -59,7 +59,7 @@ SourcePrefs::SourcePrefs( TQWidget* parent, const char* name, WFlags fl )
     tooltipCheckBox = new TQCheckBox( this, "tooltipCheckBox" );
     SourcePrefsLayout->addWidget( tooltipCheckBox );
     languageChange();
-    resize( TQSize(203, 127).expandedTo(minimumSizeHint()) );
+    resize( TQSize(203, 127).expandedTo(tqminimumSizeHint()) );
     clearWState( WState_Polished );
 }
 
diff --git a/src/sources/sourceprefs.ui b/src/sources/sourceprefs.ui
index 46c3b8e..e063d39 100644
--- a/src/sources/sourceprefs.ui
+++ b/src/sources/sourceprefs.ui
@@ -61,7 +61,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -96,7 +96,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
diff --git a/src/sources/sysfreqsrc.cpp b/src/sources/sysfreqsrc.cpp
index 26e57c5..a90c127 100644
--- a/src/sources/sysfreqsrc.cpp
+++ b/src/sources/sysfreqsrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "sysfreqsrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <tqfile.h>
 #include <tqdir.h>
 #include <klocale.h>
diff --git a/src/sources/uptimesrc.cpp b/src/sources/uptimesrc.cpp
index a43ce92..cc9d0b5 100644
--- a/src/sources/uptimesrc.cpp
+++ b/src/sources/uptimesrc.cpp
@@ -19,7 +19,7 @@
  ***************************************************************************/
 
 #include "uptimesrc.h"
-#include <textstream.h> 
+#include <tqtextstream.h> 
 #include <klocale.h>
 
 UptimeSrc::UptimeSrc(TQWidget* inParent, const TQFile& inSourceFile):
@@ -55,9 +55,9 @@ TQString UptimeSrc::fetchValue(){
 		TQString hours = TQString::number(secs / 3600 % 24).rightJustify(2, '0');
 		TQString days = TQString::number(secs / 86400);
 		if(days != "0")
-			s = mTimeFormatLong.arg(days).arg(hours).arg(minutes);
+			s = mTimeFormatLong.tqarg(days).tqarg(hours).tqarg(minutes);
 		else
-			s = mTimeFormatShort.arg(hours).arg(minutes);
+			s = mTimeFormatShort.tqarg(hours).tqarg(minutes);
         mSourceFile.close();
 	}
 	return s;