summaryrefslogtreecommitdiffstats
path: root/kscreensaver/kdesavers
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:45:12 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-15 15:45:12 -0600
commit5c194e6e7059ddcc96b0e0166ce6157c35fc183e (patch)
tree0738f35b062d40a4899e85d801ccc3395e56e0ff /kscreensaver/kdesavers
parent19904387391902d5944ef4209a255cbb1a912940 (diff)
downloadtdeartwork-5c194e6e7059ddcc96b0e0166ce6157c35fc183e.tar.gz
tdeartwork-5c194e6e7059ddcc96b0e0166ce6157c35fc183e.zip
Rename a number of old tq methods that are no longer tq specific
Diffstat (limited to 'kscreensaver/kdesavers')
-rw-r--r--kscreensaver/kdesavers/Euphoria.cpp4
-rw-r--r--kscreensaver/kdesavers/Flux.cpp2
-rw-r--r--kscreensaver/kdesavers/SolarWinds.cpp2
-rw-r--r--kscreensaver/kdesavers/banner.cpp14
-rw-r--r--kscreensaver/kdesavers/blob.cpp2
-rw-r--r--kscreensaver/kdesavers/firesaver.ChangeLog2
-rw-r--r--kscreensaver/kdesavers/firesaver.cpp2
-rw-r--r--kscreensaver/kdesavers/firesaversetup.ui60
-rw-r--r--kscreensaver/kdesavers/firesaverwriter.cpp6
-rw-r--r--kscreensaver/kdesavers/fountain.cpp10
-rw-r--r--kscreensaver/kdesavers/fountain.h2
-rw-r--r--kscreensaver/kdesavers/fountaincfg.ui2
-rw-r--r--kscreensaver/kdesavers/gravity.cpp10
-rw-r--r--kscreensaver/kdesavers/gravity.h2
-rw-r--r--kscreensaver/kdesavers/gravitycfg.ui2
-rw-r--r--kscreensaver/kdesavers/kclock.cpp10
-rw-r--r--kscreensaver/kdesavers/kvm.cpp4
-rw-r--r--kscreensaver/kdesavers/lines.cpp4
-rw-r--r--kscreensaver/kdesavers/lorenz.cpp2
-rw-r--r--kscreensaver/kdesavers/pendulum.cpp22
-rw-r--r--kscreensaver/kdesavers/pendulumcfg.ui52
-rw-r--r--kscreensaver/kdesavers/polygon.cpp6
-rw-r--r--kscreensaver/kdesavers/rotation.cpp12
-rw-r--r--kscreensaver/kdesavers/rotationcfg.ui30
-rw-r--r--kscreensaver/kdesavers/science.cpp2
-rw-r--r--kscreensaver/kdesavers/slideshow.cpp4
-rw-r--r--kscreensaver/kdesavers/slideshowcfg.ui4
-rw-r--r--kscreensaver/kdesavers/wave.cpp10
-rw-r--r--kscreensaver/kdesavers/wavecfg.ui2
29 files changed, 143 insertions, 143 deletions
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 <tqlayout.h>
+#include <layout.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( 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 <tqlayout.h>
+#include <layout.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
#include <tqcombobox.h>
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 <tqlayout.h>
+#include <layout.h>
#include <tqlabel.h>
#include <tqcombobox.h>
#include <kmessagebox.h>
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 <mweilguni@kde.org>
+// layout 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 <tqlayout.h>
+#include <layout.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->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 <tqcolor.h>
#include <tqlabel.h>
#include <tqlistbox.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqpainter.h>
#include <tqpixmap.h>
#include <tqimage.h>
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 5fbadc0c..3a3f3536 100644
--- a/kscreensaver/kdesavers/firesaversetup.ui
+++ b/kscreensaver/kdesavers/firesaversetup.ui
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>201</width>
<height>31</height>
@@ -129,7 +129,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>220</height>
@@ -146,7 +146,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>210</height>
@@ -155,7 +155,7 @@
</spacer>
<widget class="TQLayoutWidget" row="1" column="1">
<property name="name">
- <cstring>tqlayout118</cstring>
+ <cstring>layout118</cstring>
</property>
<grid>
<property name="name">
@@ -171,7 +171,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>43</width>
<height>180</height>
@@ -182,13 +182,13 @@
<property name="name">
<cstring>previewFrame</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>240</width>
<height>180</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<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="tqalignment">
+ <property name="alignment">
<set>AlignCenter</set>
</property>
</widget>
@@ -236,7 +236,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>30</width>
<height>180</height>
@@ -333,7 +333,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>260</width>
<height>21</height>
@@ -412,7 +412,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>125</width>
<height>21</height>
@@ -488,7 +488,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>125</width>
<height>21</height>
@@ -526,7 +526,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -562,7 +562,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>309</width>
<height>21</height>
@@ -605,7 +605,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
@@ -635,7 +635,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>21</width>
<height>0</height>
@@ -714,7 +714,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>80</height>
@@ -828,7 +828,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>80</height>
@@ -903,7 +903,7 @@
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>41</width>
<height>20</height>
@@ -954,7 +954,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>70</height>
@@ -1097,7 +1097,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>91</width>
<height>21</height>
@@ -1135,7 +1135,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>50</height>
@@ -1247,7 +1247,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>149</width>
<height>21</height>
@@ -1334,7 +1334,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -1400,7 +1400,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>131</width>
<height>21</height>
@@ -1438,7 +1438,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -1504,7 +1504,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>117</width>
<height>21</height>
@@ -1545,7 +1545,7 @@
<property name="sizeType">
<enum>Fixed</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>16</width>
<height>20</height>
@@ -1611,7 +1611,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>110</width>
<height>21</height>
@@ -1655,7 +1655,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>20</height>
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 <stdlib.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <klocale.h>
#include <kconfig.h>
@@ -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 <kinstance.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#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 @@
<height>209</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>209</height>
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 <stdlib.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <klocale.h>
#include <kconfig.h>
@@ -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 <kinstance.h>
#include <tqfile.h>
-#include <tqtextstream.h>
+#include <textstream.h>
#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 @@
<height>209</height>
</rect>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>209</height>
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 <tqhbox.h>
#include <tqimage.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.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->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 <mweilguni@kde.org>
+// layout 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 <tqlayout.h>
+#include <layout.h>
#include <tqslider.h>
#include <tqpainter.h>
#include <tqbitmap.h>
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 <mweilguni@kde.org>
+// layout 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 <tqlayout.h>
+#include <layout.h>
#include <klocale.h>
#include <kglobal.h>
#include <tqpainter.h>
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 <tqpainter.h>
#include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <tqcolor.h>
#include <tqlabel.h>
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 @@
<verstretch>2</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>1200</width>
<height>900</height>
@@ -50,7 +50,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -58,7 +58,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout16</cstring>
+ <cstring>layout16</cstring>
</property>
<vbox>
<property name="name">
@@ -66,7 +66,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</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="tqmaximumSize">
+ <property name="maximumSize">
<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>tqlayout14</cstring>
+ <cstring>layout14</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="tqmaximumSize">
+ <property name="maximumSize">
<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>tqlayout13</cstring>
+ <cstring>layout13</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="tqalignment">
+ <property name="alignment">
<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="tqmaximumSize">
+ <property name="maximumSize">
<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>tqlayout13_2</cstring>
+ <cstring>layout13_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="tqalignment">
+ <property name="alignment">
<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="tqmaximumSize">
+ <property name="maximumSize">
<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>tqlayout18</cstring>
+ <cstring>layout18</cstring>
</property>
<hbox>
<property name="name">
@@ -276,13 +276,13 @@ Change [s]</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>60</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>60</width>
<height>32767</height>
@@ -293,7 +293,7 @@ Change [s]</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout15</cstring>
+ <cstring>layout15</cstring>
</property>
<hbox>
<property name="name">
@@ -303,7 +303,7 @@ Change [s]</string>
<property name="name">
<cstring>barColorButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>40</width>
<height>32767</height>
@@ -317,7 +317,7 @@ Change [s]</string>
<property name="name">
<cstring>m1ColorButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>40</width>
<height>32767</height>
@@ -331,7 +331,7 @@ Change [s]</string>
<property name="name">
<cstring>m2ColorButton</cstring>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>40</width>
<height>32767</height>
@@ -353,7 +353,7 @@ Change [s]</string>
<property name="sizeType">
<enum>MinimumExpanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>0</height>
@@ -374,7 +374,7 @@ Change [s]</string>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>150</height>
@@ -385,7 +385,7 @@ Change [s]</string>
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout19</cstring>
+ <cstring>layout19</cstring>
</property>
<hbox>
<property name="name">
@@ -401,7 +401,7 @@ Change [s]</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>66</width>
<height>31</height>
@@ -445,7 +445,7 @@ Change [s]</string>
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>65</width>
<height>31</height>
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 <mweilguni@kde.org>
+// layout 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 <tqlayout.h>
+#include <layout.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( 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 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>1200</width>
<height>900</height>
@@ -50,7 +50,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout17</cstring>
+ <cstring>layout17</cstring>
</property>
<hbox>
<property name="name">
@@ -58,7 +58,7 @@
</property>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout6</cstring>
+ <cstring>layout6</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>tqlayout5</cstring>
+ <cstring>layout5</cstring>
</property>
<grid>
<property name="name">
@@ -148,7 +148,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>40</width>
<height>32767</height>
@@ -168,7 +168,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout10</cstring>
+ <cstring>layout10</cstring>
</property>
<grid>
<property name="name">
@@ -186,7 +186,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -240,7 +240,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqmaximumSize">
+ <property name="maximumSize">
<size>
<width>50</width>
<height>32767</height>
@@ -262,7 +262,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>31</width>
<height>51</height>
@@ -275,7 +275,7 @@
<property name="name">
<cstring>preview</cstring>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>200</width>
<height>150</height>
@@ -286,7 +286,7 @@
</widget>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout9</cstring>
+ <cstring>layout9</cstring>
</property>
<hbox>
<property name="name">
@@ -302,7 +302,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>51</width>
<height>31</height>
@@ -311,7 +311,7 @@
</spacer>
<widget class="TQLayoutWidget">
<property name="name">
- <cstring>tqlayout4</cstring>
+ <cstring>layout4</cstring>
</property>
<hbox>
<property name="name">
@@ -356,7 +356,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>61</width>
<height>31</height>
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 <tqlistbox.h>
#include <tqcheckbox.h>
#include <tqslider.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <kglobal.h>
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 <tqdir.h>
#include <tqcolor.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.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( 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 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>161</width>
<height>20</height>
@@ -94,7 +94,7 @@
<property name="sizeType">
<enum>Expanding</enum>
</property>
- <property name="tqsizeHint">
+ <property name="sizeHint">
<size>
<width>20</width>
<height>19</height>
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 <stdlib.h>
#include <tqlabel.h>
-#include <tqlayout.h>
+#include <layout.h>
#include <kapplication.h>
#include <klocale.h>
#include <kconfig.h>
@@ -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 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="tqminimumSize">
+ <property name="minimumSize">
<size>
<width>400</width>
<height>209</height>