From 5c194e6e7059ddcc96b0e0166ce6157c35fc183e Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Thu, 15 Dec 2011 15:45:12 -0600 Subject: Rename a number of old tq methods that are no longer tq specific --- kscreensaver/kdesavers/Euphoria.cpp | 4 +- kscreensaver/kdesavers/Flux.cpp | 2 +- kscreensaver/kdesavers/SolarWinds.cpp | 2 +- kscreensaver/kdesavers/banner.cpp | 14 +++---- kscreensaver/kdesavers/blob.cpp | 2 +- kscreensaver/kdesavers/firesaver.ChangeLog | 2 +- kscreensaver/kdesavers/firesaver.cpp | 2 +- kscreensaver/kdesavers/firesaversetup.ui | 60 +++++++++++++++--------------- kscreensaver/kdesavers/firesaverwriter.cpp | 6 +-- kscreensaver/kdesavers/fountain.cpp | 10 ++--- kscreensaver/kdesavers/fountain.h | 2 +- kscreensaver/kdesavers/fountaincfg.ui | 2 +- kscreensaver/kdesavers/gravity.cpp | 10 ++--- kscreensaver/kdesavers/gravity.h | 2 +- kscreensaver/kdesavers/gravitycfg.ui | 2 +- kscreensaver/kdesavers/kclock.cpp | 10 ++--- kscreensaver/kdesavers/kvm.cpp | 4 +- kscreensaver/kdesavers/lines.cpp | 4 +- kscreensaver/kdesavers/lorenz.cpp | 2 +- kscreensaver/kdesavers/pendulum.cpp | 22 +++++------ kscreensaver/kdesavers/pendulumcfg.ui | 52 +++++++++++++------------- kscreensaver/kdesavers/polygon.cpp | 6 +-- kscreensaver/kdesavers/rotation.cpp | 12 +++--- kscreensaver/kdesavers/rotationcfg.ui | 30 +++++++-------- kscreensaver/kdesavers/science.cpp | 2 +- kscreensaver/kdesavers/slideshow.cpp | 4 +- kscreensaver/kdesavers/slideshowcfg.ui | 4 +- kscreensaver/kdesavers/wave.cpp | 10 ++--- kscreensaver/kdesavers/wavecfg.ui | 2 +- kscreensaver/kpartsaver/configwidget.ui | 2 +- kscreensaver/kpartsaver/kpartsaver.cpp | 4 +- kscreensaver/kxsconfig/XScreenSaver_ad.h | 4 +- kscreensaver/kxsconfig/kxsconfig.cpp | 18 ++++----- kscreensaver/kxsconfig/kxscontrol.cpp | 2 +- kscreensaver/kxsconfig/kxsitem.cpp | 6 +-- kscreensaver/kxsconfig/kxsrun.cpp | 4 +- kscreensaver/xsavers/helpers.cpp | 12 +++--- kscreensaver/xsavers/mode.h | 20 +++++----- kscreensaver/xsavers/space.cpp | 10 ++--- kscreensaver/xsavers/swarm.cpp | 4 +- kscreensaver/xsavers/xlock.h | 2 +- 41 files changed, 187 insertions(+), 187 deletions(-) (limited to 'kscreensaver') diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index 199d339d..598d2dab 100644 --- a/kscreensaver/kdesavers/Euphoria.cpp +++ b/kscreensaver/kdesavers/Euphoria.cpp @@ -966,7 +966,7 @@ void KEuphoriaScreenSaver::setMode( int id ) //---------------------------------------------------------------------------- -#include +#include #include #include #include @@ -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( tqsizeHint() ); + setMinimumSize( sizeHint() ); } diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp index d04a6d3d..57f86bbe 100644 --- a/kscreensaver/kdesavers/Flux.cpp +++ b/kscreensaver/kdesavers/Flux.cpp @@ -850,7 +850,7 @@ void KFluxScreenSaver::setMode( int id ) //---------------------------------------------------------------------------- -#include +#include #include #include #include diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp index ee3229f2..b54cbf1a 100644 --- a/kscreensaver/kdesavers/SolarWinds.cpp +++ b/kscreensaver/kdesavers/SolarWinds.cpp @@ -664,7 +664,7 @@ void KSWindsScreenSaver::setMode( int id ) //---------------------------------------------------------------------------- -#include +#include #include #include #include diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index e49ca556..bc950ac7 100644 --- a/kscreensaver/kdesavers/banner.cpp +++ b/kscreensaver/kdesavers/banner.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Martin R. Jones 1996 // -// tqlayout management added 1998/04/19 by Mario Weilguni +// layout management added 1998/04/19 by Mario Weilguni // clock function and color cycling added 2000/01/09 by Alexander Neundorf // 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 #include #include -#include +#include #include #include #include @@ -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->tqlayout(), 6, 2, spacingHint() ); + TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() ); 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& ) ), @@ -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->tqsizeHint()); + cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint()); 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->tqsizeHint()); + timeCb->setFixedSize(timeCb->sizeHint()); 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().tqpointSizes( fontFamily ); + sizes = TQFontDatabase().pointSizes( 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 4877866e..6565f23f 100644 --- a/kscreensaver/kdesavers/blob.cpp +++ b/kscreensaver/kdesavers/blob.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include 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 5fbadc0c..3a3f3536 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui +++ b/kscreensaver/kdesavers/firesaversetup.ui @@ -94,7 +94,7 @@ Expanding - + 201 31 @@ -129,7 +129,7 @@ Expanding - + 30 220 @@ -146,7 +146,7 @@ Expanding - + 30 210 @@ -155,7 +155,7 @@ - tqlayout118 + layout118 @@ -171,7 +171,7 @@ Expanding - + 43 180 @@ -182,13 +182,13 @@ previewFrame - + 240 180 - + 240 180 @@ -220,7 +220,7 @@ P R E V I E W - + AlignCenter @@ -236,7 +236,7 @@ Expanding - + 30 180 @@ -333,7 +333,7 @@ Expanding - + 260 21 @@ -412,7 +412,7 @@ Expanding - + 125 21 @@ -488,7 +488,7 @@ Expanding - + 125 21 @@ -526,7 +526,7 @@ Fixed - + 16 20 @@ -562,7 +562,7 @@ Expanding - + 309 21 @@ -605,7 +605,7 @@ Expanding - + 31 20 @@ -635,7 +635,7 @@ Expanding - + 21 0 @@ -714,7 +714,7 @@ Fixed - + 16 80 @@ -828,7 +828,7 @@ Fixed - + 16 80 @@ -903,7 +903,7 @@ MinimumExpanding - + 41 20 @@ -954,7 +954,7 @@ Fixed - + 16 70 @@ -1097,7 +1097,7 @@ Expanding - + 91 21 @@ -1135,7 +1135,7 @@ Fixed - + 16 50 @@ -1247,7 +1247,7 @@ Expanding - + 149 21 @@ -1334,7 +1334,7 @@ Fixed - + 16 20 @@ -1400,7 +1400,7 @@ Expanding - + 131 21 @@ -1438,7 +1438,7 @@ Fixed - + 16 20 @@ -1504,7 +1504,7 @@ Expanding - + 117 21 @@ -1545,7 +1545,7 @@ Fixed - + 16 20 @@ -1611,7 +1611,7 @@ Expanding - + 110 21 @@ -1655,7 +1655,7 @@ Expanding - + 31 20 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/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index 2c208b4c..c4578418 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -9,7 +9,7 @@ // #include #include -#include +#include #include #include #include @@ -218,8 +218,8 @@ Fountain::~Fountain() /** load the particle file */ bool Fountain::loadParticle() { - /* tqStatus indicator */ - bool tqStatus = TRUE; + /* Status indicator */ + bool Status = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -238,7 +238,7 @@ bool Fountain::loadParticle() } /* Set the status to true */ - //tqStatus = TRUE; + //Status = 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 tqStatus; + return Status; } /** setup the GL enviroment */ void Fountain::initializeGL () diff --git a/kscreensaver/kdesavers/fountain.h b/kscreensaver/kdesavers/fountain.h index 5835e973..55f58537 100644 --- a/kscreensaver/kdesavers/fountain.h +++ b/kscreensaver/kdesavers/fountain.h @@ -29,7 +29,7 @@ #include "fountaincfg.h" #include #include -#include +#include #define MAX_PARTICLES 1000 diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/kscreensaver/kdesavers/fountaincfg.ui index f77750aa..3b5eacd7 100644 --- a/kscreensaver/kdesavers/fountaincfg.ui +++ b/kscreensaver/kdesavers/fountaincfg.ui @@ -12,7 +12,7 @@ 209 - + 400 209 diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp index 93ae1660..49cc7300 100644 --- a/kscreensaver/kdesavers/gravity.cpp +++ b/kscreensaver/kdesavers/gravity.cpp @@ -9,7 +9,7 @@ // #include #include -#include +#include #include #include #include @@ -206,8 +206,8 @@ Gravity::~Gravity() /** load the particle file */ bool Gravity::loadParticle() { - /* tqStatus indicator */ - bool tqStatus = TRUE; + /* Status indicator */ + bool Status = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -226,7 +226,7 @@ bool Gravity::loadParticle() } /* Set the status to true */ - //tqStatus = TRUE; + //Status = 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 tqStatus; + return Status; } /** setup the GL enviroment */ void Gravity::initializeGL () diff --git a/kscreensaver/kdesavers/gravity.h b/kscreensaver/kdesavers/gravity.h index 654d3e32..c15068a5 100644 --- a/kscreensaver/kdesavers/gravity.h +++ b/kscreensaver/kdesavers/gravity.h @@ -29,7 +29,7 @@ #include "gravitycfg.h" #include #include -#include +#include #define MAX_PARTICLES 100 diff --git a/kscreensaver/kdesavers/gravitycfg.ui b/kscreensaver/kdesavers/gravitycfg.ui index 062b6e83..2d809c1f 100644 --- a/kscreensaver/kdesavers/gravitycfg.ui +++ b/kscreensaver/kdesavers/gravitycfg.ui @@ -12,7 +12,7 @@ 209 - + 400 209 diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index 5ecea27c..95df32cc 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include @@ -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->tqlayout(), + TQGridLayout *grid = new TQGridLayout( colgroup->layout(), 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->tqsetAlignment(rtl ? AlignRight : AlignLeft); + label->setAlignment(rtl ? AlignRight : AlignLeft); label = new TQLabel(i18n("Medium"), qsscale); - label->tqsetAlignment(AlignHCenter); + label->setAlignment(AlignHCenter); label = new TQLabel(i18n("Big"), qsscale); - label->tqsetAlignment(rtl ? AlignLeft : AlignRight); + label->setAlignment(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 6e064e29..3cb9ba52 100644 --- a/kscreensaver/kdesavers/kvm.cpp +++ b/kscreensaver/kdesavers/kvm.cpp @@ -21,7 +21,7 @@ * implied warranty. * */ -// tqlayout management added 1998/04/19 by Mario Weilguni +// layout management added 1998/04/19 by Mario Weilguni #ifdef HAVE_CONFIG_H #include @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp index 9ea6551b..a78e213f 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 // -// tqlayout management added 1998/04/19 by Mario Weilguni +// layout management added 1998/04/19 by Mario Weilguni // 2001/03/04 Converted to libkscreensaver by Martin R. Jones #include @@ -23,7 +23,7 @@ #include "lines.h" #include "lines.moc" -#include +#include #include #include #include diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp index e98410fb..93b740a9 100644 --- a/kscreensaver/kdesavers/lorenz.cpp +++ b/kscreensaver/kdesavers/lorenz.cpp @@ -13,7 +13,7 @@ #include #include -#include +#include #include #include 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 0b28fc61..4fa13d4f 100644 --- a/kscreensaver/kdesavers/pendulumcfg.ui +++ b/kscreensaver/kdesavers/pendulumcfg.ui @@ -20,13 +20,13 @@ 2 - + 0 0 - + 1200 900 @@ -50,7 +50,7 @@ - tqlayout18 + layout18 @@ -58,7 +58,7 @@ - tqlayout16 + layout16 @@ -66,7 +66,7 @@ - tqlayout15 + layout15 @@ -102,7 +102,7 @@ m<sub>1</sub>+m<sub>2</sub> 0 - + 60 32767 @@ -116,7 +116,7 @@ m<sub>1</sub>+m<sub>2</sub> - tqlayout14 + layout14 @@ -146,7 +146,7 @@ l<sub>1</sub>+l<sub>2</sub> 0 - + 60 32767 @@ -160,7 +160,7 @@ l<sub>1</sub>+l<sub>2</sub> - tqlayout13 + layout13 @@ -173,7 +173,7 @@ l<sub>1</sub>+l<sub>2</sub> g - + WordBreak|AlignCenter @@ -189,7 +189,7 @@ l<sub>1</sub>+l<sub>2</sub> 0 - + 60 32767 @@ -203,7 +203,7 @@ l<sub>1</sub>+l<sub>2</sub> - tqlayout13_2 + layout13_2 @@ -216,7 +216,7 @@ l<sub>1</sub>+l<sub>2</sub> E - + WordBreak|AlignCenter @@ -232,7 +232,7 @@ l<sub>1</sub>+l<sub>2</sub> 0 - + 60 32767 @@ -246,7 +246,7 @@ l<sub>1</sub>+l<sub>2</sub> - tqlayout18 + layout18 @@ -276,13 +276,13 @@ Change [s] 0 - + 60 0 - + 60 32767 @@ -293,7 +293,7 @@ Change [s] - tqlayout15 + layout15 @@ -303,7 +303,7 @@ Change [s] barColorButton - + 40 32767 @@ -317,7 +317,7 @@ Change [s] m1ColorButton - + 40 32767 @@ -331,7 +331,7 @@ Change [s] m2ColorButton - + 40 32767 @@ -353,7 +353,7 @@ Change [s] MinimumExpanding - + 20 0 @@ -374,7 +374,7 @@ Change [s] 0 - + 200 150 @@ -385,7 +385,7 @@ Change [s] - tqlayout19 + layout19 @@ -401,7 +401,7 @@ Change [s] Expanding - + 66 31 @@ -445,7 +445,7 @@ Change [s] Expanding - + 65 31 diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp index c4e8057c..486ae7c6 100644 --- a/kscreensaver/kdesavers/polygon.cpp +++ b/kscreensaver/kdesavers/polygon.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Martin R. Jones 1996 // -// tqlayout management added 1998/04/19 by Mario Weilguni +// layout management added 1998/04/19 by Mario Weilguni // 2001/03/04 Converted to libkscreensaver by Martin R. Jones #include @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -102,7 +102,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) saver = new kPolygonSaver( preview->winId() ); tl->addWidget(preview); - setMinimumSize( tqsizeHint() ); + setMinimumSize( sizeHint() ); } kPolygonSetup::~kPolygonSetup() 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/rotationcfg.ui b/kscreensaver/kdesavers/rotationcfg.ui index 8aa3cb53..b9335f1e 100644 --- a/kscreensaver/kdesavers/rotationcfg.ui +++ b/kscreensaver/kdesavers/rotationcfg.ui @@ -20,13 +20,13 @@ 0 - + 0 0 - + 1200 900 @@ -50,7 +50,7 @@ - tqlayout17 + layout17 @@ -58,7 +58,7 @@ - tqlayout6 + layout6 @@ -85,7 +85,7 @@ - tqlayout5 + layout5 @@ -148,7 +148,7 @@ 0 - + 40 32767 @@ -168,7 +168,7 @@ - tqlayout10 + layout10 @@ -186,7 +186,7 @@ 0 - + 50 32767 @@ -240,7 +240,7 @@ 0 - + 50 32767 @@ -262,7 +262,7 @@ Expanding - + 31 51 @@ -275,7 +275,7 @@ preview - + 200 150 @@ -286,7 +286,7 @@ - tqlayout9 + layout9 @@ -302,7 +302,7 @@ Expanding - + 51 31 @@ -311,7 +311,7 @@ - tqlayout4 + layout4 @@ -356,7 +356,7 @@ Expanding - + 61 31 diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp index f0f61ffe..2515302c 100644 --- a/kscreensaver/kdesavers/science.cpp +++ b/kscreensaver/kdesavers/science.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp index 42c702ee..35c61bd0 100644 --- a/kscreensaver/kdesavers/slideshow.cpp +++ b/kscreensaver/kdesavers/slideshow.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include @@ -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/kdesavers/slideshowcfg.ui b/kscreensaver/kdesavers/slideshowcfg.ui index 89856efe..e63dbd55 100644 --- a/kscreensaver/kdesavers/slideshowcfg.ui +++ b/kscreensaver/kdesavers/slideshowcfg.ui @@ -58,7 +58,7 @@ Expanding - + 161 20 @@ -94,7 +94,7 @@ Expanding - + 20 19 diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp index 7d94057f..73278272 100644 --- a/kscreensaver/kdesavers/wave.cpp +++ b/kscreensaver/kdesavers/wave.cpp @@ -6,7 +6,7 @@ // #include #include -#include +#include #include #include #include @@ -288,8 +288,8 @@ void Wave::paintGL () bool Wave::LoadGLTextures() { - /* tqStatus indicator */ - bool tqStatus = TRUE; + /* Status indicator */ + bool Status = 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 */ - //tqStatus = TRUE; + //Status = 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 tqStatus; + return Status; } diff --git a/kscreensaver/kdesavers/wavecfg.ui b/kscreensaver/kdesavers/wavecfg.ui index fddbdae1..9ad24416 100644 --- a/kscreensaver/kdesavers/wavecfg.ui +++ b/kscreensaver/kdesavers/wavecfg.ui @@ -20,7 +20,7 @@ 0 - + 400 209 diff --git a/kscreensaver/kpartsaver/configwidget.ui b/kscreensaver/kpartsaver/configwidget.ui index 816784b6..a246d8f4 100644 --- a/kscreensaver/kpartsaver/configwidget.ui +++ b/kscreensaver/kpartsaver/configwidget.ui @@ -153,7 +153,7 @@ Fixed - + 20 21 diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index 84050b3e..57caa762 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->tqsetAlignment( AlignCenter ); + m_back->setAlignment( 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->tqsetAlignment( AlignCenter ); + m_back->setAlignment( AlignCenter ); embed( m_back ); m_back->show(); 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 39da69bc..336ffd94 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include @@ -92,11 +92,11 @@ KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name) bool KXSConfigDialog::create() { TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint()); - TQHBoxLayout *tqlayout = new TQHBoxLayout(topLayout, spacingHint()); + TQHBoxLayout *layout = new TQHBoxLayout(topLayout, spacingHint()); TQVBox *controlLayout = new TQVBox(plainPage()); controlLayout->setSpacing(spacingHint()); - tqlayout->addWidget(controlLayout); - ((TQBoxLayout*)controlLayout->tqlayout())->addStrut(120); + layout->addWidget(controlLayout); + ((TQBoxLayout*)controlLayout->layout())->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->tqsetAlignment ( WordBreak ); + l->setAlignment ( WordBreak ); topLayout->addWidget( l ); } } else { // 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"); @@ -177,7 +177,7 @@ bool KXSConfigDialog::create() // mPreview->setBackgroundMode(TQWidget::NoBackground); mPreview->setBackgroundColor(TQt::black); - tqlayout->add(mPreview); + layout->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").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/kxscontrol.cpp b/kscreensaver/kxsconfig/kxscontrol.cpp index aca1993c..4bf10039 100644 --- a/kscreensaver/kxsconfig/kxscontrol.cpp +++ b/kscreensaver/kxsconfig/kxscontrol.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include 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/helpers.cpp b/kscreensaver/xsavers/helpers.cpp index 242d2f75..ef700545 100644 --- a/kscreensaver/xsavers/helpers.cpp +++ b/kscreensaver/xsavers/helpers.cpp @@ -3,27 +3,27 @@ #include void min_width(TQWidget *w) { - w->setMinimumWidth(w->tqsizeHint().width()); + w->setMinimumWidth(w->sizeHint().width()); } void fixed_width(TQWidget *w) { - w->setFixedWidth(w->tqsizeHint().width()); + w->setFixedWidth(w->sizeHint().width()); } void min_height(TQWidget *w) { - w->setMinimumHeight(w->tqsizeHint().height()); + w->setMinimumHeight(w->sizeHint().height()); } void fixed_height(TQWidget *w) { - w->setFixedHeight(w->tqsizeHint().height()); + w->setFixedHeight(w->sizeHint().height()); } void min_size(TQWidget *w) { - w->setMinimumSize(w->tqsizeHint()); + w->setMinimumSize(w->sizeHint()); } void fixed_size(TQWidget *w) { - w->setFixedSize(w->tqsizeHint()); + w->setFixedSize(w->sizeHint()); } KConfig *klock_config() 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..434b5802 100644 --- a/kscreensaver/xsavers/space.cpp +++ b/kscreensaver/xsavers/space.cpp @@ -50,7 +50,7 @@ //#define TQT_CLEAN_NAMESPACE #include -#include +#include #include #include #include @@ -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/swarm.cpp b/kscreensaver/xsavers/swarm.cpp index 5b2c8fae..c9ae3487 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 */ -// tqlayout management added 1998/04/19 by Mario Weilguni +// layout management added 1998/04/19 by Mario Weilguni #define MAXSPEED 100 #define MINSPEED 0 @@ -220,7 +220,7 @@ drawswarm(Window win, KRandomSequence &rnd) #include #include #include -#include +#include #include #include 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; -- cgit v1.2.1