From 6b41ad2b1c1b934cf801bedd73f2358db1972378 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Mon, 19 Dec 2011 11:52:59 -0600 Subject: Remove additional unneeded tq method conversions --- kscreensaver/kdesavers/banner.cpp | 2 +- kscreensaver/kdesavers/firesaver.ChangeLog | 2 +- kscreensaver/kdesavers/firesaver.cpp | 2 +- kscreensaver/kdesavers/firesaversetup.ui | 2 +- kscreensaver/kdesavers/firesaverwriter.cpp | 6 +++--- kscreensaver/kdesavers/pendulum.cpp | 22 +++++++++++----------- kscreensaver/kdesavers/pendulumcfg.ui | 4 ++-- kscreensaver/kdesavers/rotation.cpp | 12 ++++++------ kscreensaver/kdesavers/slideshow.cpp | 2 +- 9 files changed, 27 insertions(+), 27 deletions(-) (limited to 'kscreensaver/kdesavers') 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 * 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 @@ P R E V I E W - + AlignCenter 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<sub>1</sub>+l<sub>2</sub> g - + WordBreak|AlignCenter @@ -216,7 +216,7 @@ l<sub>1</sub>+l<sub>2</sub> E - + WordBreak|AlignCenter 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) { -- cgit v1.2.1