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

This reverts commit 5c194e6e7059ddcc96b0e0166ce6157c35fc183e.

41 files changed, 187 insertions, 187 deletions

diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp
index 598d2dab..199d339d 100644
--- a/kscreensaver/kdesavers/Euphoria.cpp
+++ b/kscreensaver/kdesavers/Euphoria.cpp
@@ -966,7 +966,7 @@ void KEuphoriaScreenSaver::setMode( int id )
 //----------------------------------------------------------------------------
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <kmessagebox.h>
@@ -1024,7 +1024,7 @@ KEuphoriaSetup::KEuphoriaSetup( TQWidget* parent, const char* name )
     modeW->setCurrentItem( _saver->mode() );    // set before we connect
     connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
 
-    setMinimumSize( sizeHint() );
+    setMinimumSize( tqsizeHint() );
 }
 
 
diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp
index 57f86bbe..d04a6d3d 100644
--- a/kscreensaver/kdesavers/Flux.cpp
+++ b/kscreensaver/kdesavers/Flux.cpp
@@ -850,7 +850,7 @@ void KFluxScreenSaver::setMode( int id )
 //----------------------------------------------------------------------------
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpushbutton.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp
index b54cbf1a..ee3229f2 100644
--- a/kscreensaver/kdesavers/SolarWinds.cpp
+++ b/kscreensaver/kdesavers/SolarWinds.cpp
@@ -664,7 +664,7 @@ void KSWindsScreenSaver::setMode( int id )
 //----------------------------------------------------------------------------
 
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqcombobox.h>
 #include <kmessagebox.h>
diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp
index bc950ac7..e49ca556 100644
--- a/kscreensaver/kdesavers/banner.cpp
+++ b/kscreensaver/kdesavers/banner.cpp
@@ -4,7 +4,7 @@
 //
 // Copyright (c)  Martin R. Jones 1996
 //
-// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 // clock function and color cycling added 2000/01/09 by Alexander Neundorf <alexander.neundorf@rz.tu-ilmenau.de>
 // 2001/03/04 Converted to use libkscreensaver by Martin R. Jones
 // 2002/04/07 Added random vertical position of text,
@@ -20,7 +20,7 @@
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdatetime.h>
 #include <tqfontdatabase.h>
 #include <tqpainter.h>
@@ -75,12 +75,12 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	tl1->addLayout(tl11);
 
 	TQGroupBox *group = new TQGroupBox( 0,Qt::Vertical, i18n("Font"), main );
-	TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() );
+	TQGridLayout *gl = new TQGridLayout(group->tqlayout(), 6, 2, spacingHint() );
 
 	label = new TQLabel( i18n("Family:"), group );
 	gl->addWidget(label, 1, 0);
 
-	KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group );
+	KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().tqfamilies(), group );
 	comboFonts->setCurrentFont( fontFamily );
 	gl->addWidget(comboFonts, 1, 1);
 	connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ),
@@ -116,7 +116,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 		 TQT_SLOT( slotColor(const TQColor &) ) );
 
    TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group);
-   cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint());
+   cyclingColorCb->setMinimumSize(cyclingColorCb->tqsizeHint());
    gl->addMultiCellWidget(cyclingColorCb,5,5,0,1);
    connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool)));
    cyclingColorCb->setChecked(cyclingColor);
@@ -155,7 +155,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 			TQT_SLOT( slotMessage( const TQString &  ) ) );
 
    TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main);
-   timeCb->setFixedSize(timeCb->sizeHint());
+   timeCb->setFixedSize(timeCb->tqsizeHint());
    tl->addWidget(timeCb,0,TQt::AlignLeft);
    connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool)));
    timeCb->setChecked(showTime);
@@ -191,7 +191,7 @@ void KBannerSetup::fillFontSizes()
     comboSizes->blockSignals( true );
     comboSizes->clear();
     int i = 0;
-    sizes = TQFontDatabase().pointSizes( fontFamily );
+    sizes = TQFontDatabase().tqpointSizes( fontFamily );
     sizes << 96 << 128 << 156 << 0;
     int current = 0;
     while ( sizes[i] )
diff --git a/kscreensaver/kdesavers/blob.cpp b/kscreensaver/kdesavers/blob.cpp
index 6565f23f..4877866e 100644
--- a/kscreensaver/kdesavers/blob.cpp
+++ b/kscreensaver/kdesavers/blob.cpp
@@ -25,7 +25,7 @@
 #include <tqcolor.h>
 #include <tqlabel.h>
 #include <tqlistbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
 #include <tqimage.h>
diff --git a/kscreensaver/kdesavers/firesaver.ChangeLog b/kscreensaver/kdesavers/firesaver.ChangeLog
index 5168f6ce..c3af0e5e 100644
--- a/kscreensaver/kdesavers/firesaver.ChangeLog
+++ b/kscreensaver/kdesavers/firesaver.ChangeLog
@@ -95,7 +95,7 @@
 2004-01-28  Enrico Ros  <eros.kde@email.it>
 
 	* firesaverparticle.cpp: keep a particle independent from the
-	'shape' of the firework it belongs to. Added depth (level) of
+	'tqshape' of the firework it belongs to. Added depth (level) of
 	explosion (normal particles reach level 1, splitters reach 2).
 
 	* name syntax: converted filenames to match the style of the ones
diff --git a/kscreensaver/kdesavers/firesaver.cpp b/kscreensaver/kdesavers/firesaver.cpp
index 0087dd8c..3695acb8 100644
--- a/kscreensaver/kdesavers/firesaver.cpp
+++ b/kscreensaver/kdesavers/firesaver.cpp
@@ -479,7 +479,7 @@ void KFireSaver :: paintGL ()
 					glBegin( GL_QUADS );
 					flashedScreen = true;
 				}
-				// generating children and removing parent
+				// generating tqchildren and removing parent
 				int elementIndex = particleList.at();
 				explodeFirework(particle);
 				particleList.remove(elementIndex);
diff --git a/kscreensaver/kdesavers/firesaversetup.ui b/kscreensaver/kdesavers/firesaversetup.ui
index 3a3f3536..5fbadc0c 100644
--- a/kscreensaver/kdesavers/firesaversetup.ui
+++ b/kscreensaver/kdesavers/firesaversetup.ui
@@ -94,7 +94,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>201</width>
                     <height>31</height>
@@ -129,7 +129,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>30</width>
                                 <height>220</height>
@@ -146,7 +146,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>30</width>
                                 <height>210</height>
@@ -155,7 +155,7 @@
                     </spacer>
                     <widget class="TQLayoutWidget" row="1" column="1">
                         <property name="name">
-                            <cstring>layout118</cstring>
+                            <cstring>tqlayout118</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -171,7 +171,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>43</width>
                                         <height>180</height>
@@ -182,13 +182,13 @@
                                 <property name="name">
                                     <cstring>previewFrame</cstring>
                                 </property>
-                                <property name="minimumSize">
+                                <property name="tqminimumSize">
                                     <size>
                                         <width>240</width>
                                         <height>180</height>
                                     </size>
                                 </property>
-                                <property name="maximumSize">
+                                <property name="tqmaximumSize">
                                     <size>
                                         <width>240</width>
                                         <height>180</height>
@@ -220,7 +220,7 @@
                                         <property name="text">
                                             <string>P R E V I E W</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignCenter</set>
                                         </property>
                                     </widget>
@@ -236,7 +236,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>30</width>
                                         <height>180</height>
@@ -333,7 +333,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>260</width>
                                         <height>21</height>
@@ -412,7 +412,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>125</width>
                                         <height>21</height>
@@ -488,7 +488,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>125</width>
                                         <height>21</height>
@@ -526,7 +526,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -562,7 +562,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>309</width>
                                         <height>21</height>
@@ -605,7 +605,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>31</width>
                                 <height>20</height>
@@ -635,7 +635,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>21</width>
                                 <height>0</height>
@@ -714,7 +714,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>80</height>
@@ -828,7 +828,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>80</height>
@@ -903,7 +903,7 @@
                         <property name="sizeType">
                             <enum>MinimumExpanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>41</width>
                                 <height>20</height>
@@ -954,7 +954,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>70</height>
@@ -1097,7 +1097,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>91</width>
                                                 <height>21</height>
@@ -1135,7 +1135,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>50</height>
@@ -1247,7 +1247,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="sizeHint">
+                                        <property name="tqsizeHint">
                                             <size>
                                                 <width>149</width>
                                                 <height>21</height>
@@ -1334,7 +1334,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -1400,7 +1400,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>131</width>
                                         <height>21</height>
@@ -1438,7 +1438,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -1504,7 +1504,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>117</width>
                                         <height>21</height>
@@ -1545,7 +1545,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>16</width>
                                         <height>20</height>
@@ -1611,7 +1611,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>110</width>
                                         <height>21</height>
@@ -1655,7 +1655,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>31</width>
                                 <height>20</height>
diff --git a/kscreensaver/kdesavers/firesaverwriter.cpp b/kscreensaver/kdesavers/firesaverwriter.cpp
index ff78fc5e..58b6c180 100644
--- a/kscreensaver/kdesavers/firesaverwriter.cpp
+++ b/kscreensaver/kdesavers/firesaverwriter.cpp
@@ -95,9 +95,9 @@ Writer::Writer( TQString descFileName )
 		return;
 
 	TQString welcomeString = i18n("Welcome to KDE %1.%2.%3")
-	    .arg(TDE_VERSION_MAJOR)
-	    .arg(TDE_VERSION_MINOR)
-	    .arg(TDE_VERSION_RELEASE);
+	    .tqarg(TDE_VERSION_MAJOR)
+	    .tqarg(TDE_VERSION_MINOR)
+	    .tqarg(TDE_VERSION_RELEASE);
 	spawnWords(welcomeString, Fun1);
 }
 
diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp
index c4578418..2c208b4c 100644
--- a/kscreensaver/kdesavers/fountain.cpp
+++ b/kscreensaver/kdesavers/fountain.cpp
@@ -9,7 +9,7 @@
 //
 #include <stdlib.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kconfig.h>
@@ -218,8 +218,8 @@ Fountain::~Fountain()
 /** load the particle file */
 bool Fountain::loadParticle()
 {
-    /* Status indicator */
-    bool Status = TRUE;
+    /* tqStatus indicator */
+    bool tqStatus = TRUE;
 	TQImage buf;
 
     kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl;
@@ -238,7 +238,7 @@ bool Fountain::loadParticle()
 	}
 
             /* Set the status to true */
-            //Status = TRUE;
+            //tqStatus = TRUE;
 	glGenTextures(1, &texture[0]);   /* create three textures */
 	glBindTexture(GL_TEXTURE_2D, texture[0]);
 	/* use linear filtering */
@@ -250,7 +250,7 @@ bool Fountain::loadParticle()
 
 
 
-    return Status;
+    return tqStatus;
 }
 /** setup the GL enviroment */
 void Fountain::initializeGL ()
diff --git a/kscreensaver/kdesavers/fountain.h b/kscreensaver/kdesavers/fountain.h
index 55f58537..5835e973 100644
--- a/kscreensaver/kdesavers/fountain.h
+++ b/kscreensaver/kdesavers/fountain.h
@@ -29,7 +29,7 @@
 #include "fountaincfg.h"
 #include <kinstance.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #define	MAX_PARTICLES	1000
 
diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/kscreensaver/kdesavers/fountaincfg.ui
index 3b5eacd7..f77750aa 100644
--- a/kscreensaver/kdesavers/fountaincfg.ui
+++ b/kscreensaver/kdesavers/fountaincfg.ui
@@ -12,7 +12,7 @@
             <height>209</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>209</height>
diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp
index 49cc7300..93ae1660 100644
--- a/kscreensaver/kdesavers/gravity.cpp
+++ b/kscreensaver/kdesavers/gravity.cpp
@@ -9,7 +9,7 @@
 //
 #include <stdlib.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kconfig.h>
@@ -206,8 +206,8 @@ Gravity::~Gravity()
 /** load the particle file */
 bool Gravity::loadParticle()
 {
-    /* Status indicator */
-    bool Status = TRUE;
+    /* tqStatus indicator */
+    bool tqStatus = TRUE;
 	TQImage buf;
 
     kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl;
@@ -226,7 +226,7 @@ bool Gravity::loadParticle()
 	}
 
             /* Set the status to true */
-            //Status = TRUE;
+            //tqStatus = TRUE;
 	glGenTextures(1, &texture[0]);   /* create three textures */
 	glBindTexture(GL_TEXTURE_2D, texture[0]);
 	/* use linear filtering */
@@ -238,7 +238,7 @@ bool Gravity::loadParticle()
 
 
 
-    return Status;
+    return tqStatus;
 }
 /** setup the GL enviroment */
 void Gravity::initializeGL ()
diff --git a/kscreensaver/kdesavers/gravity.h b/kscreensaver/kdesavers/gravity.h
index c15068a5..654d3e32 100644
--- a/kscreensaver/kdesavers/gravity.h
+++ b/kscreensaver/kdesavers/gravity.h
@@ -29,7 +29,7 @@
 #include "gravitycfg.h"
 #include <kinstance.h>
 #include <tqfile.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 
 #define	MAX_PARTICLES	100
 
diff --git a/kscreensaver/kdesavers/gravitycfg.ui b/kscreensaver/kdesavers/gravitycfg.ui
index 2d809c1f..062b6e83 100644
--- a/kscreensaver/kdesavers/gravitycfg.ui
+++ b/kscreensaver/kdesavers/gravitycfg.ui
@@ -12,7 +12,7 @@
             <height>209</height>
         </rect>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>209</height>
diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp
index 95df32cc..5ecea27c 100644
--- a/kscreensaver/kdesavers/kclock.cpp
+++ b/kscreensaver/kdesavers/kclock.cpp
@@ -17,7 +17,7 @@
 #include <tqhbox.h>
 #include <tqimage.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqslider.h>
 
@@ -85,7 +85,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 
 	TQGroupBox *colgroup = new TQGroupBox(i18n("Colors"), main);
 	colgroup->setColumnLayout( 0,Qt::Horizontal );
-	TQGridLayout *grid = new TQGridLayout( colgroup->layout(),
+	TQGridLayout *grid = new TQGridLayout( colgroup->tqlayout(),
 		5, 2, spacingHint() );
 
 	TQLabel *label = new TQLabel(i18n("&Hour-hand:"), colgroup);
@@ -153,11 +153,11 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 	bool rtl = kapp->reverseLayout();
 	TQHBox *qsscale = new TQHBox(main);
 	label = new TQLabel(i18n("Small"), qsscale);
-	label->setAlignment(rtl ? AlignRight : AlignLeft);
+	label->tqsetAlignment(rtl ? AlignRight : AlignLeft);
 	label = new TQLabel(i18n("Medium"), qsscale);
-	label->setAlignment(AlignHCenter);
+	label->tqsetAlignment(AlignHCenter);
 	label = new TQLabel(i18n("Big"), qsscale);
-	label->setAlignment(rtl ? AlignLeft : AlignRight);
+	label->tqsetAlignment(rtl ? AlignLeft : AlignRight);
 	top->addWidget(qsscale);
 
 	TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main);
diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp
index 3cb9ba52..6e064e29 100644
--- a/kscreensaver/kdesavers/kvm.cpp
+++ b/kscreensaver/kdesavers/kvm.cpp
@@ -21,7 +21,7 @@
  * implied warranty.
  *
  */
-// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
@@ -35,7 +35,7 @@
 
 #include <tqcolor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqslider.h>
 #include <tqpainter.h>
 #include <tqbitmap.h>
diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp
index a78e213f..9ea6551b 100644
--- a/kscreensaver/kdesavers/lines.cpp
+++ b/kscreensaver/kdesavers/lines.cpp
@@ -5,7 +5,7 @@
 // based on kpolygon from Martin R. Jones 1996
 // mailto:dirk.staneker@student.uni-tuebingen.de
 //
-// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 // 2001/03/04 Converted to libkscreensaver by Martin R. Jones
 
 #include <config.h>
@@ -23,7 +23,7 @@
 #include "lines.h"
 #include "lines.moc"
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kglobal.h>
 #include <tqpainter.h>
diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp
index 93b740a9..e98410fb 100644
--- a/kscreensaver/kdesavers/lorenz.cpp
+++ b/kscreensaver/kdesavers/lorenz.cpp
@@ -13,7 +13,7 @@
 
 #include <tqpainter.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
 
diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp
index 4fe36f7e..4694ccd3 100644
--- a/kscreensaver/kdesavers/pendulum.cpp
+++ b/kscreensaver/kdesavers/pendulum.cpp
@@ -654,7 +654,7 @@ void KPendulumSaver::doTimeStep()
       glArea->setEyePhi(eyePhi); // set new perspective
    }
 
-   glArea->updateGL();          // repaint scenery
+   glArea->updateGL();          // tqrepaint scenery
    timer->start(deltaT, TRUE);  // restart timer
 }
 
@@ -704,28 +704,28 @@ KPendulumSetup::KPendulumSetup(TQWidget* parent, const char* name)
    TQToolTip::add(
       mEdit,
       i18n("Ratio of 2nd mass to sum of both masses.\nValid values from %1 to %2.")
-      .arg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2)
-      .arg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2));
+      .tqarg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2)
+      .tqarg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       lEdit,
       i18n("Ratio of 2nd pendulum part length to the sum of both part lengths.\nValid values from %1 to %2.")
-      .arg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2)
-      .arg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2));
+      .tqarg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2)
+      .tqarg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       gEdit,
       i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.")
-      .arg(KPendulumSaver::gLimitLower, 0, 'f', 2)
-      .arg(KPendulumSaver::gLimitUpper, 0, 'f', 2));
+      .tqarg(KPendulumSaver::gLimitLower, 0, 'f', 2)
+      .tqarg(KPendulumSaver::gLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       eEdit,
       i18n("Energy in units of the maximum potential energy of the given configuration.\nValid values from %1 to %2.")
-      .arg(KPendulumSaver::ELimitLower, 0, 'f', 2)
-      .arg(KPendulumSaver::ELimitUpper, 0, 'f', 2));
+      .tqarg(KPendulumSaver::ELimitLower, 0, 'f', 2)
+      .tqarg(KPendulumSaver::ELimitUpper, 0, 'f', 2));
    TQToolTip::add(
       persSpinBox,
       i18n("Time in seconds after which a random perspective change occurs.\nValid values from %1 to %2.")
-      .arg(KPendulumSaver::persChangeIntervalLimitLower)
-      .arg(KPendulumSaver::persChangeIntervalLimitUpper));
+      .tqarg(KPendulumSaver::persChangeIntervalLimitLower)
+      .tqarg(KPendulumSaver::persChangeIntervalLimitUpper));
 
    // init preview area
    preview->setBackgroundColor(black);
diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/kscreensaver/kdesavers/pendulumcfg.ui
index 4fa13d4f..0b28fc61 100644
--- a/kscreensaver/kdesavers/pendulumcfg.ui
+++ b/kscreensaver/kdesavers/pendulumcfg.ui
@@ -20,13 +20,13 @@
             <verstretch>2</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>1200</width>
             <height>900</height>
@@ -50,7 +50,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout18</cstring>
+                <cstring>tqlayout18</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -58,7 +58,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout16</cstring>
+                        <cstring>tqlayout16</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -66,7 +66,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout15</cstring>
+                                <cstring>tqlayout15</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -102,7 +102,7 @@ m&lt;sub&gt;1&lt;/sub&gt;+m&lt;sub&gt;2&lt;/sub&gt;
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -116,7 +116,7 @@ m&lt;sub&gt;1&lt;/sub&gt;+m&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout14</cstring>
+                                <cstring>tqlayout14</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -146,7 +146,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -160,7 +160,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout13</cstring>
+                                <cstring>tqlayout13</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -173,7 +173,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                                     <property name="text">
                                         <string>g</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>WordBreak|AlignCenter</set>
                                     </property>
                                 </widget>
@@ -189,7 +189,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -203,7 +203,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout13_2</cstring>
+                                <cstring>tqlayout13_2</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -216,7 +216,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                                     <property name="text">
                                         <string>E</string>
                                     </property>
-                                    <property name="alignment">
+                                    <property name="tqalignment">
                                         <set>WordBreak|AlignCenter</set>
                                     </property>
                                 </widget>
@@ -232,7 +232,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -246,7 +246,7 @@ l&lt;sub&gt;1&lt;/sub&gt;+l&lt;sub&gt;2&lt;/sub&gt;
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout18</cstring>
+                                <cstring>tqlayout18</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -276,13 +276,13 @@ Change [s]</string>
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="minimumSize">
+                                    <property name="tqminimumSize">
                                         <size>
                                             <width>60</width>
                                             <height>0</height>
                                         </size>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>60</width>
                                             <height>32767</height>
@@ -293,7 +293,7 @@ Change [s]</string>
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout15</cstring>
+                                <cstring>tqlayout15</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -303,7 +303,7 @@ Change [s]</string>
                                     <property name="name">
                                         <cstring>barColorButton</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>40</width>
                                             <height>32767</height>
@@ -317,7 +317,7 @@ Change [s]</string>
                                     <property name="name">
                                         <cstring>m1ColorButton</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>40</width>
                                             <height>32767</height>
@@ -331,7 +331,7 @@ Change [s]</string>
                                     <property name="name">
                                         <cstring>m2ColorButton</cstring>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>40</width>
                                             <height>32767</height>
@@ -353,7 +353,7 @@ Change [s]</string>
                             <property name="sizeType">
                                 <enum>MinimumExpanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>0</height>
@@ -374,7 +374,7 @@ Change [s]</string>
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>150</height>
@@ -385,7 +385,7 @@ Change [s]</string>
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout19</cstring>
+                <cstring>tqlayout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -401,7 +401,7 @@ Change [s]</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>66</width>
                             <height>31</height>
@@ -445,7 +445,7 @@ Change [s]</string>
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>65</width>
                             <height>31</height>
diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp
index 486ae7c6..c4e8057c 100644
--- a/kscreensaver/kdesavers/polygon.cpp
+++ b/kscreensaver/kdesavers/polygon.cpp
@@ -4,7 +4,7 @@
 //
 // Copyright (c)  Martin R. Jones 1996
 //
-// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 // 2001/03/04 Converted to libkscreensaver by Martin R. Jones
 
 #include <config.h>
@@ -13,7 +13,7 @@
 #include <tqcolor.h>
 #include <tqlabel.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <klocale.h>
 #include <kconfig.h>
 #include <kglobal.h>
@@ -102,7 +102,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name )
 	saver = new kPolygonSaver( preview->winId() );
 	tl->addWidget(preview);
 
-	setMinimumSize( sizeHint() );
+	setMinimumSize( tqsizeHint() );
 }
 
 kPolygonSetup::~kPolygonSetup()
diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp
index 8b3f6283..7eb757d0 100644
--- a/kscreensaver/kdesavers/rotation.cpp
+++ b/kscreensaver/kdesavers/rotation.cpp
@@ -716,18 +716,18 @@ KRotationSetup::KRotationSetup(TQWidget* parent, const char* name)
    TQToolTip::add(
       lengthEdit,
       i18n("Length of traces in seconds of visibility.\nValid values from %1 to %2.")
-      .arg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2)
-      .arg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2));
+      .tqarg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2)
+      .tqarg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       LzEdit,
       i18n("Angular momentum in z direction in arbitrary units.\nValid values from %1 to %2.")
-      .arg(KRotationSaver::LzLimitLower, 0, 'f', 2)
-      .arg(KRotationSaver::LzLimitUpper, 0, 'f', 2));
+      .tqarg(KRotationSaver::LzLimitLower, 0, 'f', 2)
+      .tqarg(KRotationSaver::LzLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       thetaEdit,
       i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.")
-      .arg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2)
-      .arg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2));
+      .tqarg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2)
+      .tqarg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2));
 
    // init preview area
    preview->setBackgroundColor(black);
diff --git a/kscreensaver/kdesavers/rotationcfg.ui b/kscreensaver/kdesavers/rotationcfg.ui
index b9335f1e..8aa3cb53 100644
--- a/kscreensaver/kdesavers/rotationcfg.ui
+++ b/kscreensaver/kdesavers/rotationcfg.ui
@@ -20,13 +20,13 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>0</width>
             <height>0</height>
         </size>
     </property>
-    <property name="maximumSize">
+    <property name="tqmaximumSize">
         <size>
             <width>1200</width>
             <height>900</height>
@@ -50,7 +50,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout17</cstring>
+                <cstring>tqlayout17</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -58,7 +58,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -85,7 +85,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                                     <property name="name">
-                                        <cstring>layout5</cstring>
+                                        <cstring>tqlayout5</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -148,7 +148,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>40</width>
                                             <height>32767</height>
@@ -168,7 +168,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout10</cstring>
+                                <cstring>tqlayout10</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -186,7 +186,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>50</width>
                                             <height>32767</height>
@@ -240,7 +240,7 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="maximumSize">
+                                    <property name="tqmaximumSize">
                                         <size>
                                             <width>50</width>
                                             <height>32767</height>
@@ -262,7 +262,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>31</width>
                                     <height>51</height>
@@ -275,7 +275,7 @@
                     <property name="name">
                         <cstring>preview</cstring>
                     </property>
-                    <property name="minimumSize">
+                    <property name="tqminimumSize">
                         <size>
                             <width>200</width>
                             <height>150</height>
@@ -286,7 +286,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -302,7 +302,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>51</width>
                             <height>31</height>
@@ -311,7 +311,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -356,7 +356,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>61</width>
                             <height>31</height>
diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp
index 2515302c..f0f61ffe 100644
--- a/kscreensaver/kdesavers/science.cpp
+++ b/kscreensaver/kdesavers/science.cpp
@@ -18,7 +18,7 @@
 #include <tqlistbox.h>
 #include <tqcheckbox.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <kapplication.h>
 #include <kglobal.h>
diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp
index 35c61bd0..42c702ee 100644
--- a/kscreensaver/kdesavers/slideshow.cpp
+++ b/kscreensaver/kdesavers/slideshow.cpp
@@ -13,7 +13,7 @@
 #include <tqdir.h>
 #include <tqcolor.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfile.h>
 #include <tqpaintdevicemetrics.h>
 #include <tqcheckbox.h>
@@ -95,7 +95,7 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id)
   connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
 
   TQDesktopWidget *d = TQApplication::desktop();
-  if( geometry() == d->geometry() && d->numScreens() > 1)
+  if( tqgeometry() == d->tqgeometry() && d->numScreens() > 1)
   {
 	for(int i = 0; i < d->numScreens(); ++i)
 	{
diff --git a/kscreensaver/kdesavers/slideshowcfg.ui b/kscreensaver/kdesavers/slideshowcfg.ui
index e63dbd55..89856efe 100644
--- a/kscreensaver/kdesavers/slideshowcfg.ui
+++ b/kscreensaver/kdesavers/slideshowcfg.ui
@@ -58,7 +58,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>161</width>
                     <height>20</height>
@@ -94,7 +94,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>19</height>
diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp
index 73278272..7d94057f 100644
--- a/kscreensaver/kdesavers/wave.cpp
+++ b/kscreensaver/kdesavers/wave.cpp
@@ -6,7 +6,7 @@
 //
 #include <stdlib.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kconfig.h>
@@ -288,8 +288,8 @@ void Wave::paintGL ()
 
 bool Wave::LoadGLTextures()
 {
-    /* Status indicator */
-    bool Status = TRUE;
+    /* tqStatus indicator */
+    bool tqStatus = TRUE;
 
 	TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage();
    kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl;
@@ -307,7 +307,7 @@ bool Wave::LoadGLTextures()
                 tex = convertToGLFormat( buf );
         }
             /* Set the status to true */
-            //Status = TRUE;
+            //tqStatus = TRUE;
 	glGenTextures(1, &texture[0]);   /* create three textures */
  	glBindTexture(GL_TEXTURE_2D, texture[0]);
 	/* use linear filtering */
@@ -320,5 +320,5 @@ bool Wave::LoadGLTextures()
 	kdDebug() << "Texture Loaded: " << tex.width() << "," << tex.height() << endl;
 
 
-    return Status;
+    return tqStatus;
 }
diff --git a/kscreensaver/kdesavers/wavecfg.ui b/kscreensaver/kdesavers/wavecfg.ui
index 9ad24416..fddbdae1 100644
--- a/kscreensaver/kdesavers/wavecfg.ui
+++ b/kscreensaver/kdesavers/wavecfg.ui
@@ -20,7 +20,7 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="minimumSize">
+    <property name="tqminimumSize">
         <size>
             <width>400</width>
             <height>209</height>
diff --git a/kscreensaver/kpartsaver/configwidget.ui b/kscreensaver/kpartsaver/configwidget.ui
index a246d8f4..816784b6 100644
--- a/kscreensaver/kpartsaver/configwidget.ui
+++ b/kscreensaver/kpartsaver/configwidget.ui
@@ -153,7 +153,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>21</height>
diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp
index 57caa762..84050b3e 100644
--- a/kscreensaver/kpartsaver/kpartsaver.cpp
+++ b/kscreensaver/kpartsaver/kpartsaver.cpp
@@ -123,7 +123,7 @@ KPartSaver::KPartSaver( WId id )
         // create background widget
         m_back = new TQLabel( i18n("The screen saver is not configured yet."), this );
 
-        m_back->setAlignment( AlignCenter );
+        m_back->tqsetAlignment( AlignCenter );
         embed( m_back );
         m_back->show();
 
@@ -257,7 +257,7 @@ void KPartSaver::next( bool random )
     // create background widget
     m_back = new TQLabel( i18n("All of your files are unsupported"), this );
 
-    m_back->setAlignment( AlignCenter );
+    m_back->tqsetAlignment( AlignCenter );
     embed( m_back );
     m_back->show();
 
diff --git a/kscreensaver/kxsconfig/XScreenSaver_ad.h b/kscreensaver/kxsconfig/XScreenSaver_ad.h
index 42452482..568338f7 100644
--- a/kscreensaver/kxsconfig/XScreenSaver_ad.h
+++ b/kscreensaver/kxsconfig/XScreenSaver_ad.h
@@ -366,10 +366,10 @@
 "*up.labelString:		/\\\\ ",
 "*frameLabel.labelString:	",
 "*cmdLabel.labelString:		Command Line:",
-"*cmdLabel.alignment:		ALIGNMENT_BEGINNING",
+"*cmdLabel.tqalignment:		ALIGNMENT_BEGINNING",
 "*enabled.labelString:		Enabled",
 "*visLabel.labelString:		Visual:",
-"*visLabel.alignment:		ALIGNMENT_END",
+"*visLabel.tqalignment:		ALIGNMENT_END",
 "*visLabel.leftOffset:		20",
 "*demo.labelString:		Demo",
 "*man.labelString:		Documentation...",
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp
index 336ffd94..39da69bc 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/kscreensaver/kxsconfig/kxsconfig.cpp
@@ -37,7 +37,7 @@
 #include <config.h>
 
 #include <stdlib.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtimer.h>
 #include <tqvbox.h>
 #include <tqlabel.h>
@@ -92,11 +92,11 @@ KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name)
 bool KXSConfigDialog::create()
 {
     TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint());
-    TQHBoxLayout *layout = new TQHBoxLayout(topLayout, spacingHint());
+    TQHBoxLayout *tqlayout = new TQHBoxLayout(topLayout, spacingHint());
     TQVBox *controlLayout = new TQVBox(plainPage());
     controlLayout->setSpacing(spacingHint());
-    layout->addWidget(controlLayout);
-    ((TQBoxLayout*)controlLayout->layout())->addStrut(120);
+    tqlayout->addWidget(controlLayout);
+    ((TQBoxLayout*)controlLayout->tqlayout())->addStrut(120);
 
     KConfig config(mConfigFile);
 
@@ -118,14 +118,14 @@ bool KXSConfigDialog::create()
 	    descr.replace('\n',' ');
 	    descr = descr.simplifyWhiteSpace();
 	    TQLabel *l = new TQLabel( i18n( descr.utf8() ), plainPage() );
-	    l->setAlignment ( WordBreak );
+	    l->tqsetAlignment ( WordBreak );
  	    topLayout->addWidget( l );
  	}
     } else {
         // fall back to KDE's old config files.
 	int idx = 0;
 	while (true) {
-	    TQString group = TQString("Arg%1").arg(idx);
+	    TQString group = TQString("Arg%1").tqarg(idx);
 	    if (config.hasGroup(group)) {
 		config.setGroup(group);
 		TQString type = config.readEntry("Type");
@@ -177,7 +177,7 @@ bool KXSConfigDialog::create()
     //  mPreview->setBackgroundMode(TQWidget::NoBackground);
     mPreview->setBackgroundColor(TQt::black);
 
-    layout->add(mPreview);
+    tqlayout->add(mPreview);
     show();
 
     // So that hacks can XSelectInput ButtonPressMask
@@ -229,7 +229,7 @@ void KXSConfigDialog::slotPreviewExited(KProcess *)
 	while ( !saver[i].isSpace() ) word += saver[i++];
 	//work around a KStandarDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable
 	TQFileInfo checkExe;
-	TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(word);
+	TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(word);
 	TQString path;
 	checkExe.setFile(saverdir);
 	if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile())
@@ -378,7 +378,7 @@ int main(int argc, char *argv[])
       app.exec();
   } else {
       KMessageBox::sorry(0,
-	      i18n("No configuration available for %1").arg(name),
+	      i18n("No configuration available for %1").tqarg(name),
 	      name );
   }
 
diff --git a/kscreensaver/kxsconfig/kxscontrol.cpp b/kscreensaver/kxsconfig/kxscontrol.cpp
index 4bf10039..aca1993c 100644
--- a/kscreensaver/kxsconfig/kxscontrol.cpp
+++ b/kscreensaver/kxsconfig/kxscontrol.cpp
@@ -21,7 +21,7 @@
 
 #include <tqlabel.h>
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcombobox.h>
 #include <tqlineedit.h>
 #include <tqspinbox.h>
diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp
index 7d9ab034..022657c0 100644
--- a/kscreensaver/kxsconfig/kxsitem.cpp
+++ b/kscreensaver/kxsconfig/kxsitem.cpp
@@ -65,7 +65,7 @@ KXSRangeItem::KXSRangeItem(const TQString &name, const TQXmlAttributes &attr )
 
 TQString KXSRangeItem::command()
 {
-  return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue);
+  return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue);
 }
 
 void KXSRangeItem::read(KConfig &config)
@@ -109,7 +109,7 @@ KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, const TQXmlAttribut
 
 TQString KXSDoubleRangeItem::command()
 {
-  return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue);
+  return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue);
 }
 
 void KXSDoubleRangeItem::read(KConfig &config)
@@ -232,7 +232,7 @@ KXSStringItem::KXSStringItem(const TQString &name, const TQXmlAttributes &attr )
 TQString KXSStringItem::command()
 {
   if (!mValue.isEmpty())
-      return mSwitch.arg(mValue);
+      return mSwitch.tqarg(mValue);
   return "";
 }
 
diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp
index 41e9f1d0..3eb12c12 100644
--- a/kscreensaver/kxsconfig/kxsrun.cpp
+++ b/kscreensaver/kxsconfig/kxsrun.cpp
@@ -108,7 +108,7 @@ int main(int argc, char *argv[])
 	int idx = 0;
 	while (true)
 	{
-	    TQString group = TQString("Arg%1").arg(idx);
+	    TQString group = TQString("Arg%1").tqarg(idx);
 	    if (config.hasGroup(group)) {
 		config.setGroup(group);
 		TQString type = config.readEntry("Type");
@@ -135,7 +135,7 @@ int main(int argc, char *argv[])
     // find the xscreensaver executable
     //work around a KStandarDirs::findExe() "feature" where it looks in $TDEDIR/bin first no matter what and sometimes finds the wrong executable
     TQFileInfo checkExe;
-    TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(filename);
+    TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(filename);
     kdDebug() << "saverdir is" << saverdir << endl;
     TQString exeFile;
     checkExe.setFile(saverdir);
diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp
index ef700545..242d2f75 100644
--- a/kscreensaver/xsavers/helpers.cpp
+++ b/kscreensaver/xsavers/helpers.cpp
@@ -3,27 +3,27 @@
 #include <kapplication.h>
 
 void min_width(TQWidget *w) {
-  w->setMinimumWidth(w->sizeHint().width());
+  w->setMinimumWidth(w->tqsizeHint().width());
 }
 
 void fixed_width(TQWidget *w) {
-  w->setFixedWidth(w->sizeHint().width());
+  w->setFixedWidth(w->tqsizeHint().width());
 }
 
 void min_height(TQWidget *w) {
-  w->setMinimumHeight(w->sizeHint().height());
+  w->setMinimumHeight(w->tqsizeHint().height());
 }
 
 void fixed_height(TQWidget *w) {
-  w->setFixedHeight(w->sizeHint().height());
+  w->setFixedHeight(w->tqsizeHint().height());
 }
 
 void min_size(TQWidget *w) {
-  w->setMinimumSize(w->sizeHint());
+  w->setMinimumSize(w->tqsizeHint());
 }
 
 void fixed_size(TQWidget *w) {
-  w->setFixedSize(w->sizeHint());
+  w->setFixedSize(w->tqsizeHint());
 }
 
 KConfig *klock_config()
diff --git a/kscreensaver/xsavers/mode.h b/kscreensaver/xsavers/mode.h
index c2bc7f1d..10213f0a 100644
--- a/kscreensaver/xsavers/mode.h
+++ b/kscreensaver/xsavers/mode.h
@@ -38,7 +38,7 @@ typedef struct LockStruct_s {
 	ModeHook   *init_hook;	/* func to init a mode */
 	ModeHook   *callback_hook;	/* func to run (tick) a mode */
 	ModeHook   *release_hook;	/* func to shutdown a mode */
-	ModeHook   *refresh_hook;	/* tells mode to repaint */
+	ModeHook   *refresh_hook;	/* tells mode to tqrepaint */
 	ModeHook   *change_hook;	/* user wants mode to change */
 	ModeHook   *unused_hook;	/* for future expansion */
 	ModeSpecOpt *msopt;	/* this mode's def resources */
@@ -313,10 +313,10 @@ extern ModeHook release_galaxy;
 extern ModeHook refresh_galaxy;
 extern ModeSpecOpt galaxy_opts;
 
-extern ModeHook init_geometry;
-extern ModeHook draw_geometry;
-extern ModeHook release_geometry;
-extern ModeHook refresh_geometry;
+extern ModeHook init_tqgeometry;
+extern ModeHook draw_tqgeometry;
+extern ModeHook release_tqgeometry;
+extern ModeHook refresh_tqgeometry;
 extern ModeSpecOpt geometry_opts;
 
 extern ModeHook init_grav;
@@ -504,11 +504,11 @@ extern ModeHook release_rotor;
 extern ModeHook refresh_rotor;
 extern ModeSpecOpt rotor_opts;
 
-extern ModeHook init_shape;
-extern ModeHook draw_shape;
-extern ModeHook release_shape;
-extern ModeHook refresh_shape;
-extern ModeSpecOpt shape_opts;
+extern ModeHook init_tqshape;
+extern ModeHook draw_tqshape;
+extern ModeHook release_tqshape;
+extern ModeHook refresh_tqshape;
+extern ModeSpecOpt tqshape_opts;
 
 extern ModeHook init_slip;
 extern ModeHook draw_slip;
diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp
index 434b5802..99c7d10d 100644
--- a/kscreensaver/xsavers/space.cpp
+++ b/kscreensaver/xsavers/space.cpp
@@ -50,7 +50,7 @@
 //#define TQT_CLEAN_NAMESPACE
 
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <kglobal.h>
 #include <kconfig.h>
 #include <krandomsequence.h>
@@ -275,7 +275,7 @@ static void Init(void)
     glDisable(GL_DITHER);
 }
 
-void reshape(int width, int height)
+void retqshape(int width, int height)
 {
 
     windW = (GLint)width;
@@ -444,7 +444,7 @@ initSpace(Window window)
 	  glClearIndex(BlackPixel(display, screen));
 	}
 
-	reshape(xwa.width, xwa.height);
+	retqshape(xwa.width, xwa.height);
 	Init();
 }
 
@@ -725,8 +725,8 @@ void main(int argc, char **argv)
 
     Init();
 
-    tkExposeFunc(Reshape);
-    tkReshapeFunc(Reshape);
+    tkExposeFunc(Retqshape);
+    tkRetqshapeFunc(Retqshape);
     tkKeyDownFunc(Key);
     tkIdleFunc(Idle);
     tkExec();
diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp
index c9ae3487..5b2c8fae 100644
--- a/kscreensaver/xsavers/swarm.cpp
+++ b/kscreensaver/xsavers/swarm.cpp
@@ -12,7 +12,7 @@
    Contact me in case of problems, not the original author!
    Last revised: 10-Jul-97
 */
-// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
+// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org>
 
 #define MAXSPEED 100
 #define MINSPEED 0
@@ -220,7 +220,7 @@ drawswarm(Window win, KRandomSequence &rnd)
 #include <tqcheckbox.h>
 #include <tqlabel.h>
 #include <tqcolor.h>
-#include <layout.h>
+#include <tqlayout.h>
 
 #include <klocale.h>
 #include <kmessagebox.h>
diff --git a/kscreensaver/xsavers/xlock.h b/kscreensaver/xsavers/xlock.h
index 77530a9f..ff309c63 100644
--- a/kscreensaver/xsavers/xlock.h
+++ b/kscreensaver/xsavers/xlock.h
@@ -139,7 +139,7 @@ extern char  *text_pass;
 extern char  *text_info;
 extern char  *text_valid;
 extern char  *text_invalid;
-extern char  *geometry;
+extern char  *tqgeometry;
 extern float saturation;
 extern int   nicelevel;
 extern int   delay;