Remove additional unneeded tq method conversions

16 files changed, 52 insertions, 52 deletions

diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp
index 30978cae..67c88d3f 100644
--- a/kscreensaver/kdesavers/banner.cpp
+++ b/kscreensaver/kdesavers/banner.cpp
@@ -80,7 +80,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	label = new TQLabel( i18n("Family:"), group );
 	gl->addWidget(label, 1, 0);
 
-	KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().tqfamilies(), group );
+	KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group );
 	comboFonts->setCurrentFont( fontFamily );
 	gl->addWidget(comboFonts, 1, 1);
 	connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ),
diff --git a/kscreensaver/kdesavers/firesaver.ChangeLog b/kscreensaver/kdesavers/firesaver.ChangeLog
index c3af0e5e..5168f6ce 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
-	'tqshape' of the firework it belongs to. Added depth (level) of
+	'shape' 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 3695acb8..0087dd8c 100644
--- a/kscreensaver/kdesavers/firesaver.cpp
+++ b/kscreensaver/kdesavers/firesaver.cpp
@@ -479,7 +479,7 @@ void KFireSaver :: paintGL ()
 					glBegin( GL_QUADS );
 					flashedScreen = true;
 				}
-				// generating tqchildren and removing parent
+				// generating children 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 8adcaa35..7e4516fd 100644
--- a/kscreensaver/kdesavers/firesaversetup.ui
+++ b/kscreensaver/kdesavers/firesaversetup.ui
@@ -220,7 +220,7 @@
                                         <property name="text">
                                             <string>P R E V I E W</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignCenter</set>
                                         </property>
                                     </widget>
diff --git a/kscreensaver/kdesavers/firesaverwriter.cpp b/kscreensaver/kdesavers/firesaverwriter.cpp
index 58b6c180..ff78fc5e 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")
-	    .tqarg(TDE_VERSION_MAJOR)
-	    .tqarg(TDE_VERSION_MINOR)
-	    .tqarg(TDE_VERSION_RELEASE);
+	    .arg(TDE_VERSION_MAJOR)
+	    .arg(TDE_VERSION_MINOR)
+	    .arg(TDE_VERSION_RELEASE);
 	spawnWords(welcomeString, Fun1);
 }
 
diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp
index 4694ccd3..4fe36f7e 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();          // tqrepaint scenery
+   glArea->updateGL();          // repaint 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.")
-      .tqarg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2)
-      .tqarg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2));
+      .arg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2)
+      .arg(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.")
-      .tqarg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2)
-      .tqarg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2));
+      .arg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2)
+      .arg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       gEdit,
       i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.")
-      .tqarg(KPendulumSaver::gLimitLower, 0, 'f', 2)
-      .tqarg(KPendulumSaver::gLimitUpper, 0, 'f', 2));
+      .arg(KPendulumSaver::gLimitLower, 0, 'f', 2)
+      .arg(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.")
-      .tqarg(KPendulumSaver::ELimitLower, 0, 'f', 2)
-      .tqarg(KPendulumSaver::ELimitUpper, 0, 'f', 2));
+      .arg(KPendulumSaver::ELimitLower, 0, 'f', 2)
+      .arg(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.")
-      .tqarg(KPendulumSaver::persChangeIntervalLimitLower)
-      .tqarg(KPendulumSaver::persChangeIntervalLimitUpper));
+      .arg(KPendulumSaver::persChangeIntervalLimitLower)
+      .arg(KPendulumSaver::persChangeIntervalLimitUpper));
 
    // init preview area
    preview->setBackgroundColor(black);
diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/kscreensaver/kdesavers/pendulumcfg.ui
index d25cf5e0..59470086 100644
--- a/kscreensaver/kdesavers/pendulumcfg.ui
+++ b/kscreensaver/kdesavers/pendulumcfg.ui
@@ -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="tqalignment">
+                                    <property name="alignment">
                                         <set>WordBreak|AlignCenter</set>
                                     </property>
                                 </widget>
@@ -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="tqalignment">
+                                    <property name="alignment">
                                         <set>WordBreak|AlignCenter</set>
                                     </property>
                                 </widget>
diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp
index 7eb757d0..8b3f6283 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.")
-      .tqarg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2)
-      .tqarg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2));
+      .arg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2)
+      .arg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       LzEdit,
       i18n("Angular momentum in z direction in arbitrary units.\nValid values from %1 to %2.")
-      .tqarg(KRotationSaver::LzLimitLower, 0, 'f', 2)
-      .tqarg(KRotationSaver::LzLimitUpper, 0, 'f', 2));
+      .arg(KRotationSaver::LzLimitLower, 0, 'f', 2)
+      .arg(KRotationSaver::LzLimitUpper, 0, 'f', 2));
    TQToolTip::add(
       thetaEdit,
       i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.")
-      .tqarg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2)
-      .tqarg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2));
+      .arg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2)
+      .arg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2));
 
    // init preview area
    preview->setBackgroundColor(black);
diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp
index 42c702ee..5ce30caf 100644
--- a/kscreensaver/kdesavers/slideshow.cpp
+++ b/kscreensaver/kdesavers/slideshow.cpp
@@ -95,7 +95,7 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id)
   connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
 
   TQDesktopWidget *d = TQApplication::desktop();
-  if( tqgeometry() == d->tqgeometry() && d->numScreens() > 1)
+  if( geometry() == d->geometry() && d->numScreens() > 1)
   {
 	for(int i = 0; i < d->numScreens(); ++i)
 	{
diff --git a/kscreensaver/kxsconfig/XScreenSaver_ad.h b/kscreensaver/kxsconfig/XScreenSaver_ad.h
index 568338f7..42452482 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.tqalignment:		ALIGNMENT_BEGINNING",
+"*cmdLabel.alignment:		ALIGNMENT_BEGINNING",
 "*enabled.labelString:		Enabled",
 "*visLabel.labelString:		Visual:",
-"*visLabel.tqalignment:		ALIGNMENT_END",
+"*visLabel.alignment:		ALIGNMENT_END",
 "*visLabel.leftOffset:		20",
 "*demo.labelString:		Demo",
 "*man.labelString:		Documentation...",
diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp
index c2eaab25..9d5e009d 100644
--- a/kscreensaver/kxsconfig/kxsconfig.cpp
+++ b/kscreensaver/kxsconfig/kxsconfig.cpp
@@ -125,7 +125,7 @@ bool KXSConfigDialog::create()
         // fall back to KDE's old config files.
 	int idx = 0;
 	while (true) {
-	    TQString group = TQString("Arg%1").tqarg(idx);
+	    TQString group = TQString("Arg%1").arg(idx);
 	    if (config.hasGroup(group)) {
 		config.setGroup(group);
 		TQString type = config.readEntry("Type");
@@ -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").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(word);
+	TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(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").tqarg(name),
+	      i18n("No configuration available for %1").arg(name),
 	      name );
   }
 
diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp
index 022657c0..7d9ab034 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.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue);
+  return mSwitch.arg(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.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue);
+  return mSwitch.arg(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.tqarg(mValue);
+      return mSwitch.arg(mValue);
   return "";
 }
 
diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp
index 3eb12c12..41e9f1d0 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").tqarg(idx);
+	    TQString group = TQString("Arg%1").arg(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").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(filename);
+    TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(filename);
     kdDebug() << "saverdir is" << saverdir << endl;
     TQString exeFile;
     checkExe.setFile(saverdir);
diff --git a/kscreensaver/xsavers/mode.h b/kscreensaver/xsavers/mode.h
index 10213f0a..c2bc7f1d 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 tqrepaint */
+	ModeHook   *refresh_hook;	/* tells mode to repaint */
 	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_tqgeometry;
-extern ModeHook draw_tqgeometry;
-extern ModeHook release_tqgeometry;
-extern ModeHook refresh_tqgeometry;
+extern ModeHook init_geometry;
+extern ModeHook draw_geometry;
+extern ModeHook release_geometry;
+extern ModeHook refresh_geometry;
 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_tqshape;
-extern ModeHook draw_tqshape;
-extern ModeHook release_tqshape;
-extern ModeHook refresh_tqshape;
-extern ModeSpecOpt tqshape_opts;
+extern ModeHook init_shape;
+extern ModeHook draw_shape;
+extern ModeHook release_shape;
+extern ModeHook refresh_shape;
+extern ModeSpecOpt shape_opts;
 
 extern ModeHook init_slip;
 extern ModeHook draw_slip;
diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp
index 99c7d10d..c1cea946 100644
--- a/kscreensaver/xsavers/space.cpp
+++ b/kscreensaver/xsavers/space.cpp
@@ -275,7 +275,7 @@ static void Init(void)
     glDisable(GL_DITHER);
 }
 
-void retqshape(int width, int height)
+void reshape(int width, int height)
 {
 
     windW = (GLint)width;
@@ -444,7 +444,7 @@ initSpace(Window window)
 	  glClearIndex(BlackPixel(display, screen));
 	}
 
-	retqshape(xwa.width, xwa.height);
+	reshape(xwa.width, xwa.height);
 	Init();
 }
 
@@ -725,8 +725,8 @@ void main(int argc, char **argv)
 
     Init();
 
-    tkExposeFunc(Retqshape);
-    tkRetqshapeFunc(Retqshape);
+    tkExposeFunc(Reshape);
+    tkReshapeFunc(Reshape);
     tkKeyDownFunc(Key);
     tkIdleFunc(Idle);
     tkExec();
diff --git a/kscreensaver/xsavers/xlock.h b/kscreensaver/xsavers/xlock.h
index ff309c63..77530a9f 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  *tqgeometry;
+extern char  *geometry;
 extern float saturation;
 extern int   nicelevel;
 extern int   delay;