diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-14 05:14:51 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-08-14 05:14:51 +0000 |
| commit | 1d077caf68127ab1a5518df84cc5592a1b47a965 (patch) | |
| tree | 9729a338937930e9014ccbd70296f3313d6dc2cc /kscreensaver | |
| parent | 771e57c60b52ff27c4d92cddc8e6bfc0b8dafd1a (diff) | |
| download | tdeartwork-1d077caf68127ab1a5518df84cc5592a1b47a965.tar.gz tdeartwork-1d077caf68127ab1a5518df84cc5592a1b47a965.zip | |
TQt4 port kdeartwork
This enables compilation under both Qt3 and Qt4
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1246991 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kscreensaver')
69 files changed, 619 insertions, 560 deletions
diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index 8fc5811d..199d339d 100644 --- a/kscreensaver/kdesavers/Euphoria.cpp +++ b/kscreensaver/kdesavers/Euphoria.cpp @@ -638,15 +638,15 @@ void EuphoriaWidget::initializeGL() #ifdef UNIT_TEST void EuphoriaWidget::keyPressEvent( TQKeyEvent* e ) { - if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } - if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } - if( e->key() == Qt::Key_2 ) { setDefaults( 2 ); updateParameters(); } - if( e->key() == Qt::Key_3 ) { setDefaults( 3 ); updateParameters(); } - if( e->key() == Qt::Key_4 ) { setDefaults( 4 ); updateParameters(); } - if( e->key() == Qt::Key_5 ) { setDefaults( 5 ); updateParameters(); } - if( e->key() == Qt::Key_6 ) { setDefaults( 6 ); updateParameters(); } - if( e->key() == Qt::Key_7 ) { setDefaults( 7 ); updateParameters(); } - if( e->key() == Qt::Key_8 ) { setDefaults( 8 ); updateParameters(); } + if( e->key() == TQt::Key_0 ) { setDefaults( 0 ); updateParameters(); } + if( e->key() == TQt::Key_1 ) { setDefaults( 1 ); updateParameters(); } + if( e->key() == TQt::Key_2 ) { setDefaults( 2 ); updateParameters(); } + if( e->key() == TQt::Key_3 ) { setDefaults( 3 ); updateParameters(); } + if( e->key() == TQt::Key_4 ) { setDefaults( 4 ); updateParameters(); } + if( e->key() == TQt::Key_5 ) { setDefaults( 5 ); updateParameters(); } + if( e->key() == TQt::Key_6 ) { setDefaults( 6 ); updateParameters(); } + if( e->key() == TQt::Key_7 ) { setDefaults( 7 ); updateParameters(); } + if( e->key() == TQt::Key_8 ) { setDefaults( 8 ); updateParameters(); } } #endif @@ -1024,7 +1024,7 @@ KEuphoriaSetup::KEuphoriaSetup( TQWidget* parent, const char* name ) modeW->setCurrentItem( _saver->mode() ); // set before we connect connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) ); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } @@ -1038,7 +1038,7 @@ void KEuphoriaSetup::slotHelp() { KMessageBox::about(this, i18n("<h3>Euphoria 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"), - TQString::null, KMessageBox::AllowLink); + TQString(), KMessageBox::AllowLink); } @@ -1062,7 +1062,7 @@ void KEuphoriaSetup::slotOk() #ifdef UNIT_TEST -// moc Euphoria.h -o Euphoria.moc +// tqmoc Euphoria.h -o Euphoria.tqmoc // g++ -g -DUNIT_TEST Euphoria.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL #include <tqapplication.h> diff --git a/kscreensaver/kdesavers/Euphoria.h b/kscreensaver/kdesavers/Euphoria.h index b0ec94c5..ba50c9d3 100644 --- a/kscreensaver/kdesavers/Euphoria.h +++ b/kscreensaver/kdesavers/Euphoria.h @@ -17,9 +17,10 @@ class wisp; class TQTimer; -class EuphoriaWidget : public QGLWidget +class EuphoriaWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: @@ -111,6 +112,7 @@ private: class KEuphoriaScreenSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: @@ -137,6 +139,7 @@ class TQComboBox; class KEuphoriaSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KEuphoriaSetup( TQWidget* parent = 0, const char* name = 0 ); diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp index c38b6627..d04a6d3d 100644 --- a/kscreensaver/kdesavers/Flux.cpp +++ b/kscreensaver/kdesavers/Flux.cpp @@ -546,12 +546,12 @@ void FluxWidget::initializeGL() #ifdef UNIT_TEST void FluxWidget::keyPressEvent( TQKeyEvent* e ) { - if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } - if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } - if( e->key() == Qt::Key_2 ) { setDefaults( 2 ); updateParameters(); } - if( e->key() == Qt::Key_3 ) { setDefaults( 3 ); updateParameters(); } - if( e->key() == Qt::Key_4 ) { setDefaults( 4 ); updateParameters(); } - if( e->key() == Qt::Key_5 ) { setDefaults( 5 ); updateParameters(); } + if( e->key() == TQt::Key_0 ) { setDefaults( 0 ); updateParameters(); } + if( e->key() == TQt::Key_1 ) { setDefaults( 1 ); updateParameters(); } + if( e->key() == TQt::Key_2 ) { setDefaults( 2 ); updateParameters(); } + if( e->key() == TQt::Key_3 ) { setDefaults( 3 ); updateParameters(); } + if( e->key() == TQt::Key_4 ) { setDefaults( 4 ); updateParameters(); } + if( e->key() == TQt::Key_5 ) { setDefaults( 5 ); updateParameters(); } } #endif @@ -919,7 +919,7 @@ void KFluxSetup::slotHelp() { KMessageBox::about(this, i18n("<h3>Flux 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"), - TQString::null, KMessageBox::AllowLink); + TQString(), KMessageBox::AllowLink); } @@ -945,7 +945,7 @@ void KFluxSetup::slotOk() #ifdef UNIT_TEST -// moc Flux.h -o Flux.moc +// tqmoc Flux.h -o Flux.tqmoc // g++ -g -DUNIT_TEST Flux.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL #include <tqapplication.h> diff --git a/kscreensaver/kdesavers/Flux.h b/kscreensaver/kdesavers/Flux.h index 5f0cd64e..eb921fb0 100644 --- a/kscreensaver/kdesavers/Flux.h +++ b/kscreensaver/kdesavers/Flux.h @@ -20,9 +20,10 @@ class flux; class particle; class TQTimer; -class FluxWidget : public QGLWidget +class FluxWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: @@ -99,6 +100,7 @@ private: class KFluxScreenSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: @@ -125,6 +127,7 @@ class TQComboBox; class KFluxSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp index ea3e916a..ee3229f2 100644 --- a/kscreensaver/kdesavers/SolarWinds.cpp +++ b/kscreensaver/kdesavers/SolarWinds.cpp @@ -399,12 +399,12 @@ void SWindsWidget::initializeGL() #ifdef UNIT_TEST void SWindsWidget::keyPressEvent( TQKeyEvent* e ) { - if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } - if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } - if( e->key() == Qt::Key_2 ) { setDefaults( 2 ); updateParameters(); } - if( e->key() == Qt::Key_3 ) { setDefaults( 3 ); updateParameters(); } - if( e->key() == Qt::Key_4 ) { setDefaults( 4 ); updateParameters(); } - if( e->key() == Qt::Key_5 ) { setDefaults( 5 ); updateParameters(); } + if( e->key() == TQt::Key_0 ) { setDefaults( 0 ); updateParameters(); } + if( e->key() == TQt::Key_1 ) { setDefaults( 1 ); updateParameters(); } + if( e->key() == TQt::Key_2 ) { setDefaults( 2 ); updateParameters(); } + if( e->key() == TQt::Key_3 ) { setDefaults( 3 ); updateParameters(); } + if( e->key() == TQt::Key_4 ) { setDefaults( 4 ); updateParameters(); } + if( e->key() == TQt::Key_5 ) { setDefaults( 5 ); updateParameters(); } } #endif @@ -731,7 +731,7 @@ void KSWindsSetup::slotHelp() { KMessageBox::about(this, i18n("<h3>Solar Winds 1.0</h3>\n<p>Copyright (c) 2002 Terence M. Welsh<br>\n<a href=\"http://www.reallyslick.com/\">http://www.reallyslick.com/</a></p>\n\n<p>Ported to KDE by Karl Robillard</p>"), - TQString::null, KMessageBox::AllowLink); + TQString(), KMessageBox::AllowLink); } @@ -757,7 +757,7 @@ void KSWindsSetup::slotOk() #ifdef UNIT_TEST -// moc SolarWinds.h -o SolarWinds.moc +// tqmoc SolarWinds.h -o SolarWinds.tqmoc // g++ -g -DUNIT_TEST SolarWinds.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL #include <tqapplication.h> diff --git a/kscreensaver/kdesavers/SolarWinds.h b/kscreensaver/kdesavers/SolarWinds.h index e98252e1..70da2bd4 100644 --- a/kscreensaver/kdesavers/SolarWinds.h +++ b/kscreensaver/kdesavers/SolarWinds.h @@ -19,9 +19,10 @@ class wind; class TQTimer; -class SWindsWidget : public QGLWidget +class SWindsWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: @@ -90,6 +91,7 @@ private: class KSWindsScreenSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: @@ -116,6 +118,7 @@ class TQComboBox; class KSWindsSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index f33a7ca0..e49ca556 100644 --- a/kscreensaver/kdesavers/banner.cpp +++ b/kscreensaver/kdesavers/banner.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Martin R. Jones 1996 // -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> // clock function and color cycling added 2000/01/09 by Alexander Neundorf <alexander.neundorf@rz.tu-ilmenau.de> // 2001/03/04 Converted to use libkscreensaver by Martin R. Jones // 2002/04/07 Added random vertical position of text, @@ -74,13 +74,13 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQVBoxLayout *tl11 = new TQVBoxLayout( 0, 0, spacingHint() ); tl1->addLayout(tl11); - TQGroupBox *group = new TQGroupBox( 0, Vertical, i18n("Font"), main ); - TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() ); + TQGroupBox *group = new TQGroupBox( 0,Qt::Vertical, i18n("Font"), main ); + TQGridLayout *gl = new TQGridLayout(group->tqlayout(), 6, 2, spacingHint() ); label = new TQLabel( i18n("Family:"), group ); gl->addWidget(label, 1, 0); - KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group ); + KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().tqfamilies(), group ); comboFonts->setCurrentFont( fontFamily ); gl->addWidget(comboFonts, 1, 1); connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ), @@ -116,7 +116,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQT_SLOT( slotColor(const TQColor &) ) ); TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group); - cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint()); + cyclingColorCb->setMinimumSize(cyclingColorCb->tqsizeHint()); gl->addMultiCellWidget(cyclingColorCb,5,5,0,1); connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool))); cyclingColorCb->setChecked(cyclingColor); @@ -134,7 +134,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) tl11->addStretch(1); tl11->addWidget(label); - TQSlider *sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main ); + TQSlider *sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main ); sb->setMinimumWidth( 180); sb->setFixedHeight(20); sb->setTickmarks(TQSlider::Below); @@ -155,8 +155,8 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) TQT_SLOT( slotMessage( const TQString & ) ) ); TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main); - timeCb->setFixedSize(timeCb->sizeHint()); - tl->addWidget(timeCb,0,Qt::AlignLeft); + timeCb->setFixedSize(timeCb->tqsizeHint()); + tl->addWidget(timeCb,0,TQt::AlignLeft); connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool))); timeCb->setChecked(showTime); @@ -191,7 +191,7 @@ void KBannerSetup::fillFontSizes() comboSizes->blockSignals( true ); comboSizes->clear(); int i = 0; - sizes = TQFontDatabase().pointSizes( fontFamily ); + sizes = TQFontDatabase().tqpointSizes( fontFamily ); sizes << 96 << 128 << 156 << 0; int current = 0; while ( sizes[i] ) diff --git a/kscreensaver/kdesavers/banner.h b/kscreensaver/kdesavers/banner.h index 57309787..73dac562 100644 --- a/kscreensaver/kdesavers/banner.h +++ b/kscreensaver/kdesavers/banner.h @@ -23,6 +23,7 @@ class KRandomSequence; class KBannerSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KBannerSaver( WId id ); virtual ~KBannerSaver(); @@ -44,30 +45,31 @@ protected slots: protected: TQFont font; - QTimer timer; - QString fontFamily; + TQTimer timer; + TQString fontFamily; int fontSize; bool bold; bool italic; - QColor fontColor; + TQColor fontColor; bool cyclingColor; int currentHue; bool needUpdate; bool needBlank; - QString message; + TQString message; bool showTime; int xpos, ypos, step, fsize; KRandomSequence *krnd; int speed; int colorContext; - QPixmap pixmap; - QSize pixmapSize; + TQPixmap pixmap; + TQSize pixmapSize; }; class KBannerSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KBannerSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/kdesavers/blob.cpp b/kscreensaver/kdesavers/blob.cpp index c8860781..4877866e 100644 --- a/kscreensaver/kdesavers/blob.cpp +++ b/kscreensaver/kdesavers/blob.cpp @@ -369,7 +369,7 @@ void KBlobSaver::box ( int x, int y ) y = 0; // get the box region from the display to upgrade - TQImage img = TQPixmap::grabWindow(winId(), x, y, dim, dim).convertToImage(); + TQImage img = TQPixmap(TQPixmap::grabWindow(winId(), x, y, dim, dim)).convertToImage(); // depending on the depth of the display, use either lookup table for // next rgb val ( 8-bit ) or ramp the color directly for other displays @@ -392,7 +392,7 @@ void KBlobSaver::box ( int x, int y ) { for (int i = 0; i < img.width(); i++) { - QRgb p = img.pixel( i, j ); + TQRgb p = img.pixel( i, j ); p += (colorInc<<18); img.setPixel( i, j, p ); } diff --git a/kscreensaver/kdesavers/blob.h b/kscreensaver/kdesavers/blob.h index 2ef4bcf6..123a4855 100644 --- a/kscreensaver/kdesavers/blob.h +++ b/kscreensaver/kdesavers/blob.h @@ -28,6 +28,7 @@ enum blob_alg { class KBlobSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KBlobSaver( WId id ); @@ -53,7 +54,7 @@ public: }; private: - QTimer timer; + TQTimer timer; uint colors[RAMP]; uint lookup[256]; int colorContext, colorInc; @@ -93,6 +94,7 @@ class KIntNumInput; class KBlobSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT int showtime; int alg; diff --git a/kscreensaver/kdesavers/firesaver.ChangeLog b/kscreensaver/kdesavers/firesaver.ChangeLog index 98749856..2d3792bd 100644 --- a/kscreensaver/kdesavers/firesaver.ChangeLog +++ b/kscreensaver/kdesavers/firesaver.ChangeLog @@ -95,7 +95,7 @@ 2004-01-28 Enrico Ros <eros.kde@email.it> * firesaverparticle.cpp: keep a particle independent from the - 'shape' of the firework it belongs to. Added depth (level) of + 'tqshape' of the firework it belongs to. Added depth (level) of explosion (normal particles reach level 1, splitters reach 2). * name syntax: converted filenames to match the style of the ones diff --git a/kscreensaver/kdesavers/firesaver.cpp b/kscreensaver/kdesavers/firesaver.cpp index c8b605fc..3695acb8 100644 --- a/kscreensaver/kdesavers/firesaver.cpp +++ b/kscreensaver/kdesavers/firesaver.cpp @@ -479,7 +479,7 @@ void KFireSaver :: paintGL () glBegin( GL_QUADS ); flashedScreen = true; } - // generating children and removing parent + // generating tqchildren and removing parent int elementIndex = particleList.at(); explodeFirework(particle); particleList.remove(elementIndex); @@ -907,8 +907,8 @@ void KFireSaver :: burnLogo(TQImage * image) { for (int x=0 ; x<imageW ; x+=step) { - QRgb pixel = image->pixel(x,y); - if ( qAlpha(pixel) < 250 ) + TQRgb pixel = image->pixel(x,y); + if ( tqAlpha(pixel) < 250 ) continue; //if ( DRAND > 0.9 ) // continue; @@ -924,9 +924,9 @@ void KFireSaver :: burnLogo(TQImage * image) particle->xspeed = xI * speed + speedXOffs; particle->zspeed = yI * speed + speedYOffs; - particle->colour[0] = qRed(pixel) / 255.0f; - particle->colour[1] = qGreen(pixel) / 255.0f; - particle->colour[2] = qBlue(pixel) / 255.0f; + particle->colour[0] = tqRed(pixel) / 255.0f; + particle->colour[1] = tqGreen(pixel) / 255.0f; + particle->colour[2] = tqBlue(pixel) / 255.0f; particleList.append(particle); } @@ -1019,7 +1019,7 @@ void KFireSaver :: readConfig () parameters.particleSize = 5; if ( parameters.enableBottomFire = config.readBoolEntry( "enable-BottomFire", true ) ) { - TQColor blue = Qt::darkBlue; + TQColor blue = TQt::darkBlue; parameters.bottomFireColor = config.readColorEntry( "BottomFireColor", &blue ); } parameters.enableSound = config.readBoolEntry( "enable-Sounds", false ); diff --git a/kscreensaver/kdesavers/firesaver.h b/kscreensaver/kdesavers/firesaver.h index dfc713b0..8a34c5e9 100644 --- a/kscreensaver/kdesavers/firesaver.h +++ b/kscreensaver/kdesavers/firesaver.h @@ -43,7 +43,7 @@ class Particle; class Writer; -class KFireSaver : public QGLWidget +class KFireSaver : public TQGLWidget { public: KFireSaver( TQWidget *parent=0, const char *name=0 ); @@ -99,7 +99,7 @@ class KFireSaver : public QGLWidget KArtsDispatcher artsDispatcher; KArtsServer artsServer; TQPtrList<KPlayObject> playObjectList; - QString sound_explosion, + TQString sound_explosion, sound_debris; //other stuff @@ -133,7 +133,7 @@ class KFireSaver : public QGLWidget flashOpacity, //effects fadeAmount, megaFlares; - QColor + TQColor bottomFireColor; int colorsCount, colorsT[8], diff --git a/kscreensaver/kdesavers/firesaversetup.ui b/kscreensaver/kdesavers/firesaversetup.ui index 37614afa..5fbadc0c 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui +++ b/kscreensaver/kdesavers/firesaversetup.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KFireSaverSetup</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>KFireSaverSetup</cstring> </property> @@ -30,7 +30,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QPushButton" row="0" column="2"> + <widget class="TQPushButton" row="0" column="2"> <property name="name"> <cstring>useButton</cstring> </property> @@ -38,7 +38,7 @@ <string>&Load</string> </property> </widget> - <widget class="QComboBox" row="0" column="1"> + <widget class="TQComboBox" row="0" column="1"> <item> <property name="text"> <string>KDE (default)</string> @@ -76,7 +76,7 @@ </sizepolicy> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>presetLabel</cstring> </property> @@ -94,21 +94,21 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>201</width> <height>31</height> </size> </property> </spacer> - <widget class="QTabWidget" row="1" column="0" rowspan="1" colspan="4"> + <widget class="TQTabWidget" row="1" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>tabWidget</cstring> </property> <property name="tabShape"> <enum>Rounded</enum> </property> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -129,7 +129,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>220</height> @@ -146,16 +146,16 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>210</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>layout118</cstring> + <cstring>tqlayout118</cstring> </property> <grid> <property name="name"> @@ -171,24 +171,24 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>43</width> <height>180</height> </size> </property> </spacer> - <widget class="QFrame" row="1" column="1"> + <widget class="TQFrame" row="1" column="1"> <property name="name"> <cstring>previewFrame</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>240</width> <height>180</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>240</width> <height>180</height> @@ -210,7 +210,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>previewLabel</cstring> </property> @@ -220,7 +220,7 @@ <property name="text"> <string>P R E V I E W</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>AlignCenter</set> </property> </widget> @@ -236,14 +236,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>30</width> <height>180</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>detachBox</cstring> </property> @@ -251,7 +251,7 @@ <string>&Show in separate window</string> </property> </widget> - <widget class="QPushButton" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQPushButton" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>applyButton</cstring> </property> @@ -263,7 +263,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>tab</cstring> </property> @@ -274,7 +274,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS1</cstring> </property> @@ -282,7 +282,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel1</cstring> </property> @@ -298,7 +298,7 @@ <string>Show type:</string> </property> </widget> - <widget class="QComboBox"> + <widget class="TQComboBox"> <item> <property name="text"> <string>Simple Show</string> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>260</width> <height>21</height> @@ -342,7 +342,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS2</cstring> </property> @@ -350,7 +350,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel2</cstring> </property> @@ -358,7 +358,7 @@ <string>Number of fireworks:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel3</cstring> </property> @@ -366,7 +366,7 @@ <string>few</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>fireworksSlider</cstring> </property> @@ -394,7 +394,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>showLabel4</cstring> </property> @@ -412,7 +412,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>125</width> <height>21</height> @@ -421,7 +421,7 @@ </spacer> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS2_2</cstring> </property> @@ -429,7 +429,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>particlesLabel1</cstring> </property> @@ -437,7 +437,7 @@ <string>Size of particles:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>particlesLabel2</cstring> </property> @@ -445,7 +445,7 @@ <string>small</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>particlesSlider</cstring> </property> @@ -470,7 +470,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>particlesLabel3</cstring> </property> @@ -488,7 +488,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>125</width> <height>21</height> @@ -497,7 +497,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>bottomfireBox</cstring> </property> @@ -508,7 +508,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>layS3</cstring> </property> @@ -526,14 +526,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>bottomfireLabel1</cstring> </property> @@ -562,7 +562,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>309</width> <height>21</height> @@ -571,7 +571,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>soundsBox</cstring> </property> @@ -579,7 +579,7 @@ <string>Enable sounds</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>overheadBox</cstring> </property> @@ -587,7 +587,7 @@ <string>Limit overload (recommended)</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>frameskipBox</cstring> </property> @@ -605,7 +605,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -614,7 +614,7 @@ </spacer> </vbox> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -635,14 +635,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>21</width> <height>0</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="3" column="0"> + <widget class="TQLayoutWidget" row="3" column="0"> <property name="name"> <cstring>layF2</cstring> </property> @@ -650,7 +650,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>whiteBox</cstring> </property> @@ -658,7 +658,7 @@ <string>Blinding white</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>purpleBox</cstring> </property> @@ -666,7 +666,7 @@ <string>Velvet purple</string> </property> </widget> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>seagreenBox</cstring> </property> @@ -674,7 +674,7 @@ <string>Deep-sea green</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>redBox</cstring> </property> @@ -682,7 +682,7 @@ <string>Deep red</string> </property> </widget> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>combosBox</cstring> </property> @@ -696,7 +696,7 @@ <string>This allow a random creation of fireworks that explodes in 2 colors</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>blueBox</cstring> </property> @@ -714,14 +714,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>80</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>orangeBox</cstring> </property> @@ -729,7 +729,7 @@ <string>Hot orange</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>greenBox</cstring> </property> @@ -739,7 +739,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="2" column="0"> + <widget class="TQLabel" row="2" column="0"> <property name="name"> <cstring>colorsLabel1</cstring> </property> @@ -747,7 +747,7 @@ <string>Colors</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>fireworksLabel1</cstring> </property> @@ -755,7 +755,7 @@ <string>Fireworks</string> </property> </widget> - <widget class="QLayoutWidget" row="1" column="0"> + <widget class="TQLayoutWidget" row="1" column="0"> <property name="name"> <cstring>layF1</cstring> </property> @@ -763,7 +763,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="2" column="1"> + <widget class="TQCheckBox" row="2" column="1"> <property name="name"> <cstring>fire3Box</cstring> </property> @@ -774,7 +774,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="1" column="2"> + <widget class="TQCheckBox" row="1" column="2"> <property name="name"> <cstring>fire6Box</cstring> </property> @@ -785,7 +785,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>fire5Box</cstring> </property> @@ -796,7 +796,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>fire1Box</cstring> </property> @@ -807,7 +807,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>fire2Box</cstring> </property> @@ -828,14 +828,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>80</height> </size> </property> </spacer> - <widget class="QCheckBox" row="3" column="2"> + <widget class="TQCheckBox" row="3" column="2"> <property name="name"> <cstring>fire8Box</cstring> </property> @@ -856,7 +856,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="2" column="2"> + <widget class="TQCheckBox" row="2" column="2"> <property name="name"> <cstring>fire7Box</cstring> </property> @@ -867,7 +867,7 @@ <string>try me</string> </property> </widget> - <widget class="QCheckBox" row="3" column="1"> + <widget class="TQCheckBox" row="3" column="1"> <property name="name"> <cstring>fire4Box</cstring> </property> @@ -882,7 +882,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -903,14 +903,14 @@ <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>41</width> <height>20</height> </size> </property> </spacer> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>logosBox</cstring> </property> @@ -927,7 +927,7 @@ <string>Enable images explosion.</string> </property> </widget> - <widget class="QFrame" row="1" column="0"> + <widget class="TQFrame" row="1" column="0"> <property name="name"> <cstring>logosFrame</cstring> </property> @@ -954,14 +954,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>70</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layP1</cstring> </property> @@ -969,7 +969,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>logosIconsBox</cstring> </property> @@ -983,7 +983,7 @@ <string>Enables random KDE Icons explosions.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>logosTuxBox</cstring> </property> @@ -1000,7 +1000,7 @@ <string>Enables random Tux explosions.</string> </property> </widget> - <widget class="QCheckBox" row="1" column="1"> + <widget class="TQCheckBox" row="1" column="1"> <property name="name"> <cstring>logosDetailBox</cstring> </property> @@ -1014,7 +1014,7 @@ <string>When enabled speeds up logo explosion but reduces quality.</string> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>logosKonquiBox</cstring> </property> @@ -1030,7 +1030,7 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layP2</cstring> </property> @@ -1038,7 +1038,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>frequencyLabel</cstring> </property> @@ -1046,7 +1046,7 @@ <string>Frequency:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>neverLabel</cstring> </property> @@ -1054,7 +1054,7 @@ <string>sometimes</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>logosSlider</cstring> </property> @@ -1079,7 +1079,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>oftenLabel</cstring> </property> @@ -1097,7 +1097,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>91</width> <height>21</height> @@ -1108,7 +1108,7 @@ </widget> </grid> </widget> - <widget class="QFrame" row="3" column="0"> + <widget class="TQFrame" row="3" column="0"> <property name="name"> <cstring>starsFrame</cstring> </property> @@ -1135,14 +1135,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>50</height> </size> </property> </spacer> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>layP3</cstring> </property> @@ -1150,7 +1150,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>starsFlickerBox</cstring> </property> @@ -1164,7 +1164,7 @@ <string>This option produces a sort of vibration in the lightness of the star.</string> </property> </widget> - <widget class="QCheckBox"> + <widget class="TQCheckBox"> <property name="name"> <cstring>starsGradientBox</cstring> </property> @@ -1180,7 +1180,7 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget" row="1" column="1"> + <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> <cstring>layP4</cstring> </property> @@ -1188,7 +1188,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4_5</cstring> </property> @@ -1196,7 +1196,7 @@ <string>Number:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2_6</cstring> </property> @@ -1204,7 +1204,7 @@ <string>less</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>starsSlider</cstring> </property> @@ -1229,7 +1229,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3_2_2_5</cstring> </property> @@ -1247,7 +1247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>149</width> <height>21</height> @@ -1258,7 +1258,7 @@ </widget> </grid> </widget> - <widget class="QCheckBox" row="2" column="0"> + <widget class="TQCheckBox" row="2" column="0"> <property name="name"> <cstring>starsBox</cstring> </property> @@ -1275,7 +1275,7 @@ <string>Enable stars in the sky.</string> </property> </widget> - <widget class="QCheckBox" row="4" column="0"> + <widget class="TQCheckBox" row="4" column="0"> <property name="name"> <cstring>writingsBox</cstring> </property> @@ -1294,7 +1294,7 @@ </widget> </grid> </widget> - <widget class="QWidget"> + <widget class="TQWidget"> <property name="name"> <cstring>TabPage</cstring> </property> @@ -1305,7 +1305,7 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="1" column="0"> + <widget class="TQCheckBox" row="1" column="0"> <property name="name"> <cstring>flashBox</cstring> </property> @@ -1316,7 +1316,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="4" column="0"> + <widget class="TQLayoutWidget" row="4" column="0"> <property name="name"> <cstring>layE2</cstring> </property> @@ -1334,14 +1334,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fadeLabel1</cstring> </property> @@ -1349,7 +1349,7 @@ <string>Intensity:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fadeLabel2</cstring> </property> @@ -1357,7 +1357,7 @@ <string>small</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>fadeSlider</cstring> </property> @@ -1382,7 +1382,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>fadeLabel3</cstring> </property> @@ -1400,7 +1400,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>131</width> <height>21</height> @@ -1409,7 +1409,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="5" column="0"> + <widget class="TQCheckBox" row="5" column="0"> <property name="name"> <cstring>flaresBox</cstring> </property> @@ -1420,7 +1420,7 @@ <bool>true</bool> </property> </widget> - <widget class="QLayoutWidget" row="6" column="0"> + <widget class="TQLayoutWidget" row="6" column="0"> <property name="name"> <cstring>layE3</cstring> </property> @@ -1438,14 +1438,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flaresLabel1</cstring> </property> @@ -1453,7 +1453,7 @@ <string>Dimension:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flaresLabel2</cstring> </property> @@ -1461,7 +1461,7 @@ <string>small</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>flaresSlider</cstring> </property> @@ -1486,7 +1486,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flaresLabel3</cstring> </property> @@ -1504,7 +1504,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>117</width> <height>21</height> @@ -1513,7 +1513,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="7" column="0"> + <widget class="TQCheckBox" row="7" column="0"> <property name="name"> <cstring>trailBox</cstring> </property> @@ -1527,7 +1527,7 @@ <string>not yet ported</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="0"> + <widget class="TQLayoutWidget" row="2" column="0"> <property name="name"> <cstring>layE1</cstring> </property> @@ -1545,14 +1545,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>16</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flashLabel1</cstring> </property> @@ -1560,7 +1560,7 @@ <string>Flash opacity:</string> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flashLabel2</cstring> </property> @@ -1568,7 +1568,7 @@ <string>min</string> </property> </widget> - <widget class="QSlider"> + <widget class="TQSlider"> <property name="name"> <cstring>flashSlider</cstring> </property> @@ -1593,7 +1593,7 @@ <enum>Horizontal</enum> </property> </widget> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>flashLabel3</cstring> </property> @@ -1611,7 +1611,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>110</width> <height>21</height> @@ -1620,7 +1620,7 @@ </spacer> </hbox> </widget> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>fadeBox</cstring> </property> @@ -1631,7 +1631,7 @@ <bool>true</bool> </property> </widget> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>lightBox</cstring> </property> @@ -1655,7 +1655,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>20</height> @@ -1837,13 +1837,13 @@ <variables> <variable access="private">KFireSaver * fireSaverWidget;</variable> </variables> -<slots> +<Q_SLOTS> <slot>applyButton_clicked()</slot> <slot>updatePreview()</slot> <slot>writeConfig()</slot> <slot>readConfig()</slot> <slot>useButton_clicked()</slot> -</slots> +</Q_SLOTS> <functions> <function access="private" specifier="non virtual">init()</function> <function access="private">destroy()</function> diff --git a/kscreensaver/kdesavers/firesaversetup.ui.h b/kscreensaver/kdesavers/firesaversetup.ui.h index 09480126..5602cc6d 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui.h +++ b/kscreensaver/kdesavers/firesaversetup.ui.h @@ -2,7 +2,7 @@ ** ui.h extension file, included from the uic-generated form implementation. ** ** If you wish to add, delete or rename functions or slots use -** Qt Designer which will update this file, preserving your code. Create an +** TQt Designer which will update this file, preserving your code. Create an ** init() function in place of a constructor, and a destroy() function in ** place of a destructor. *****************************************************************************/ @@ -137,7 +137,7 @@ void KFireSaverSetup::readConfig() fireworksSlider->setValue(config.readNumEntry( "FireworksFrequency", 7 )); particlesSlider->setValue(config.readNumEntry( "ParticlesSize", 0 )); bottomfireBox->setChecked(config.readBoolEntry( "enable-BottomFire", true )); - TQColor blue = Qt::darkBlue; + TQColor blue = TQt::darkBlue; bottomfireColorButton->setColor(config.readColorEntry( "BottomFireColor", &blue )); soundsBox->setChecked(config.readBoolEntry( "enable-Sounds", false )); overheadBox->setChecked(config.readBoolEntry( "enable-NoOverhead", true )); @@ -205,7 +205,7 @@ void KFireSaverSetup::useButton_clicked() showCombo->setCurrentItem( 1 ); fireworksSlider->setValue( 7 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::darkBlue ); + bottomfireColorButton->setColor( TQt::darkBlue ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( false ); @@ -243,7 +243,7 @@ void KFireSaverSetup::useButton_clicked() case 1: // Elegant white fireworksSlider->setValue( 7 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::blue ); + bottomfireColorButton->setColor( TQt::blue ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( false ); @@ -320,7 +320,7 @@ void KFireSaverSetup::useButton_clicked() case 3: //Enhanced reality fireworksSlider->setValue( 8 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::magenta ); + bottomfireColorButton->setColor( TQt::magenta ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( true ); @@ -358,7 +358,7 @@ void KFireSaverSetup::useButton_clicked() case 4: //Hypnotic illusions fireworksSlider->setValue( 9 ); bottomfireBox->setChecked( true ); - bottomfireColorButton->setColor( Qt::red ); + bottomfireColorButton->setColor( TQt::red ); frameskipBox->setChecked( true ); fire1Box->setChecked( true ); fire2Box->setChecked( true ); diff --git a/kscreensaver/kdesavers/firesaverwriter.cpp b/kscreensaver/kdesavers/firesaverwriter.cpp index 4f98ae60..82b592d3 100644 --- a/kscreensaver/kdesavers/firesaverwriter.cpp +++ b/kscreensaver/kdesavers/firesaverwriter.cpp @@ -95,9 +95,9 @@ Writer::Writer( TQString descFileName ) return; TQString welcomeString = i18n("Welcome to KDE %1.%2.%3") - .arg(KDE_VERSION_MAJOR) - .arg(KDE_VERSION_MINOR) - .arg(KDE_VERSION_RELEASE); + .tqarg(KDE_VERSION_MAJOR) + .tqarg(KDE_VERSION_MINOR) + .tqarg(KDE_VERSION_RELEASE); spawnWords(welcomeString, Fun1); } diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index 23d90104..2c208b4c 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -19,7 +19,7 @@ #include <kglobal.h> #include "fountain.h" #include "fountain.moc" -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else @@ -218,8 +218,8 @@ Fountain::~Fountain() /** load the particle file */ bool Fountain::loadParticle() { - /* Status indicator */ - bool Status = TRUE; + /* tqStatus indicator */ + bool tqStatus = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -232,13 +232,13 @@ bool Fountain::loadParticle() else { TQImage dummy( 32, 32, 32 ); - dummy.fill( Qt::white.rgb() ); + dummy.fill( TQt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); } /* Set the status to true */ - //Status = TRUE; + //tqStatus = TRUE; glGenTextures(1, &texture[0]); /* create three textures */ glBindTexture(GL_TEXTURE_2D, texture[0]); /* use linear filtering */ @@ -250,7 +250,7 @@ bool Fountain::loadParticle() - return Status; + return tqStatus; } /** setup the GL enviroment */ void Fountain::initializeGL () @@ -303,8 +303,8 @@ void Fountain::initializeGL () particle[loop].xi=float((KApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis particle[loop].yi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis particle[loop].zi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis - particle[loop].xg=0.0f; // Set Horizontal Pull To Zero - particle[loop].yg=-0.8f; // Set Vertical Pull Downward + particle[loop].xg=0.0f; // SetQt::Horizontal Pull To Zero + particle[loop].yg=-0.8f; // SetQt::Vertical Pull Downward particle[loop].zg=0.0f; // Set Pull On Z Axis To Zero particle[loop].size=size; // Set particle size. } @@ -424,8 +424,8 @@ void Fountain::paintGL () particle[loop].xi=float((KApplication::random()%50)-26.0f)*10.0f; // Random Speed On X Axis particle[loop].yi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Y Axis particle[loop].zi=float((KApplication::random()%50)-25.0f)*10.0f; // Random Speed On Z Axis - particle[loop].xg=0.0f; // Set Horizontal Pull To Zero - particle[loop].yg=-0.8f; // Set Vertical Pull Downward + particle[loop].xg=0.0f; // SetQt::Horizontal Pull To Zero + particle[loop].yg=-0.8f; // SetQt::Vertical Pull Downward particle[loop].zg=0.0f; // Set Pull On Z Axis To Zero particle[loop].size=size; // Set particle size. } diff --git a/kscreensaver/kdesavers/fountain.h b/kscreensaver/kdesavers/fountain.h index 1a31f99e..5835e973 100644 --- a/kscreensaver/kdesavers/fountain.h +++ b/kscreensaver/kdesavers/fountain.h @@ -16,7 +16,7 @@ #include <tqdialog.h> #include <tqgl.h> -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/gl.h> #include <OpenGL/glu.h> #else @@ -34,9 +34,10 @@ #define MAX_PARTICLES 1000 -class Fountain : public QGLWidget +class Fountain : public TQGLWidget { Q_OBJECT + TQ_OBJECT class particles // Create A Structure For Particle { public: @@ -103,6 +104,7 @@ private: class KFountainSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KFountainSaver( WId drawable ); virtual ~KFountainSaver(); @@ -120,6 +122,7 @@ private: class KFountainSetup : public SetupUi { Q_OBJECT + TQ_OBJECT public: KFountainSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/kdesavers/fountaincfg.ui b/kscreensaver/kdesavers/fountaincfg.ui index 94759b2f..f77750aa 100644 --- a/kscreensaver/kdesavers/fountaincfg.ui +++ b/kscreensaver/kdesavers/fountaincfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SetupUi</cstring> </property> @@ -12,7 +12,7 @@ <height>209</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>209</height> @@ -37,7 +37,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -51,7 +51,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -59,7 +59,7 @@ <string>Use textures</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -67,7 +67,7 @@ <string>&About</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -84,7 +84,7 @@ <number>75</number> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -92,7 +92,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -103,7 +103,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -120,7 +120,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -134,7 +134,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -145,7 +145,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -157,12 +157,12 @@ </widget> </grid> </widget> - <widget class="QWidget" row="0" column="1" rowspan="4" colspan="2"> + <widget class="TQWidget" row="0" column="1" rowspan="4" colspan="2"> <property name="name"> <cstring>preview</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp index c8415e49..93ae1660 100644 --- a/kscreensaver/kdesavers/gravity.cpp +++ b/kscreensaver/kdesavers/gravity.cpp @@ -18,7 +18,7 @@ #include <kcolorbutton.h> #include "gravity.h" #include "gravity.moc" -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -61,7 +61,7 @@ KGravitySetup::KGravitySetup( TQWidget *parent, const char *name ) preview->setFixedSize( 220, 170 ); preview->setBackgroundColor( black ); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 preview->show(); // otherwise saver does not get correct size #endif saver = new KGravitySaver( preview->winId() ); @@ -143,7 +143,7 @@ KGravitySaver::KGravitySaver( WId id ) : KScreenSaver( id ) erase(); gravity = new Gravity(); embed(gravity); -#ifdef Q_WS_X11 +#ifdef TQ_WS_X11 gravity->show(); #endif connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) ); @@ -206,8 +206,8 @@ Gravity::~Gravity() /** load the particle file */ bool Gravity::loadParticle() { - /* Status indicator */ - bool Status = TRUE; + /* tqStatus indicator */ + bool tqStatus = TRUE; TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; @@ -220,13 +220,13 @@ bool Gravity::loadParticle() else { TQImage dummy( 32, 32, 32 ); - dummy.fill( Qt::white.rgb() ); + dummy.fill( TQt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); } /* Set the status to true */ - //Status = TRUE; + //tqStatus = TRUE; glGenTextures(1, &texture[0]); /* create three textures */ glBindTexture(GL_TEXTURE_2D, texture[0]); /* use linear filtering */ @@ -238,7 +238,7 @@ bool Gravity::loadParticle() - return Status; + return tqStatus; } /** setup the GL enviroment */ void Gravity::initializeGL () diff --git a/kscreensaver/kdesavers/gravity.h b/kscreensaver/kdesavers/gravity.h index 53d60a25..654d3e32 100644 --- a/kscreensaver/kdesavers/gravity.h +++ b/kscreensaver/kdesavers/gravity.h @@ -16,7 +16,7 @@ #include <tqdialog.h> #include <tqgl.h> -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -34,9 +34,10 @@ #define MAX_PARTICLES 100 -class Gravity : public QGLWidget +class Gravity : public TQGLWidget { Q_OBJECT + TQ_OBJECT class particles // Create A Structure For Particle { public: @@ -101,6 +102,7 @@ private: class KGravitySaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KGravitySaver( WId drawable ); virtual ~KGravitySaver(); @@ -118,6 +120,7 @@ private: class KGravitySetup : public SetupUi { Q_OBJECT + TQ_OBJECT public: KGravitySetup( TQWidget *parent = NULL, const char *name = NULL ); ~KGravitySetup(); diff --git a/kscreensaver/kdesavers/gravitycfg.ui b/kscreensaver/kdesavers/gravitycfg.ui index acdd2c80..062b6e83 100644 --- a/kscreensaver/kdesavers/gravitycfg.ui +++ b/kscreensaver/kdesavers/gravitycfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SetupUi</cstring> </property> @@ -12,7 +12,7 @@ <height>209</height> </rect> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>209</height> @@ -37,7 +37,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -51,7 +51,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -59,7 +59,7 @@ <string>Use textures</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -67,7 +67,7 @@ <string>&About</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -84,7 +84,7 @@ <number>75</number> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -92,7 +92,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -103,7 +103,7 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -120,7 +120,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLayoutWidget" row="0" column="0"> + <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -134,7 +134,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -145,7 +145,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -157,12 +157,12 @@ </widget> </grid> </widget> - <widget class="QWidget" row="0" column="1" rowspan="4" colspan="2"> + <widget class="TQWidget" row="0" column="1" rowspan="4" colspan="2"> <property name="name"> <cstring>preview</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index 5079aa57..5ecea27c 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -84,8 +84,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) top->addLayout( hbox ); TQGroupBox *colgroup = new TQGroupBox(i18n("Colors"), main); - colgroup->setColumnLayout( 0, Horizontal ); - TQGridLayout *grid = new TQGridLayout( colgroup->layout(), + colgroup->setColumnLayout( 0,Qt::Horizontal ); + TQGridLayout *grid = new TQGridLayout( colgroup->tqlayout(), 5, 2, spacingHint() ); TQLabel *label = new TQLabel(i18n("&Hour-hand:"), colgroup); @@ -143,7 +143,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) label = new TQLabel( i18n( "Si&ze:" ), main ); top->addWidget( label ); - TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size, Horizontal, main); + TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size,Qt::Horizontal, main); label->setBuddy( qs ); qs->setTickInterval(1); qs->setTickmarks(TQSlider::Below); @@ -153,11 +153,11 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name) bool rtl = kapp->reverseLayout(); TQHBox *qsscale = new TQHBox(main); label = new TQLabel(i18n("Small"), qsscale); - label->setAlignment(rtl ? AlignRight : AlignLeft); + label->tqsetAlignment(rtl ? AlignRight : AlignLeft); label = new TQLabel(i18n("Medium"), qsscale); - label->setAlignment(AlignHCenter); + label->tqsetAlignment(AlignHCenter); label = new TQLabel(i18n("Big"), qsscale); - label->setAlignment(rtl ? AlignLeft : AlignRight); + label->tqsetAlignment(rtl ? AlignLeft : AlignRight); top->addWidget(qsscale); TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main); @@ -183,15 +183,15 @@ void KClockSetup::readSettings() m_size = MAX_CLOCK_SIZE; config->setGroup("Colors"); - TQColor c = Qt::black; + TQColor c = TQt::black; m_bgndColor = config->readColorEntry("Background", &c); - c = Qt::white; + c = TQt::white; m_scaleColor = config->readColorEntry("Scale", &c); m_hourColor = config->readColorEntry("HourHand", &c); m_minColor = config->readColorEntry("MinuteHand", &c); - c = Qt::red; + c = TQt::red; m_secColor = config->readColorEntry("SecondHand", &c); if (m_saver) { @@ -229,7 +229,7 @@ void KClockSetup::slotHelp() "Version 1.0<br>" "<nobr>Melchior FRANZ (c) 2003</nobr>") + "<br><a href=\"mailto:mfranz@kde.org\">mfranz@kde.org</a>" - "</qt>", TQString::null, KMessageBox::AllowLink); + "</qt>", TQString(), KMessageBox::AllowLink); } @@ -296,7 +296,7 @@ KClockPainter::KClockPainter(int width, int height) : m_width(width), m_height(height) { - m_buf = new Q_UINT8[m_width * m_height * 3]; + m_buf = new TQ_UINT8[m_width * m_height * 3]; // build Cartesian coordinate system ranging from -1000 to +1000; // points with positive x and y are in the top right quarter m_matrix[0] = m_width / 2000.0; @@ -324,9 +324,9 @@ void KClockPainter::drawToImage(TQImage *q, int xoffs = 0, int yoffs = 0) { unsigned char *src = (unsigned char *)image(); for (int y = 0; y < m_height; y++) { - QRgb *dest = reinterpret_cast<QRgb *>(q->scanLine(y + yoffs)) + xoffs; + TQRgb *dest = reinterpret_cast<TQRgb *>(q->scanLine(y + yoffs)) + xoffs; for (int x = 0; x < m_width; x++, src += 3) - *dest++ = qRgba(src[0], src[1], src[2], 255); + *dest++ = tqRgba(src[0], src[1], src[2], 255); } } @@ -441,7 +441,7 @@ KClockSaver::~KClockSaver() void KClockSaver::start(int size) { - m_diameter = int(QMIN(width(), height()) * (size + 4) / 14.0); + m_diameter = int(TQMIN(width(), height()) * (size + 4) / 14.0); m_x = (width() - m_diameter) / 2; m_y = (height() - m_diameter) / 2; @@ -449,7 +449,7 @@ void KClockSaver::start(int size) m_scale = new KClockPainter(m_diameter, m_diameter); m_clock = new KClockPainter(m_diameter, m_diameter); - m_clock->setShadowColor(qRgb((m_bgndColor.red() + m_scaleColor.red()) / 2, + m_clock->setShadowColor(tqRgb((m_bgndColor.red() + m_scaleColor.red()) / 2, (m_bgndColor.green() + m_scaleColor.green()) / 2, (m_bgndColor.blue() + m_scaleColor.blue()) / 2)); drawScale(); @@ -497,15 +497,15 @@ void KClockSaver::readSettings() m_size = MAX_CLOCK_SIZE; config->setGroup("Colors"); - TQColor c = Qt::black; + TQColor c = TQt::black; m_bgndColor = config->readColorEntry("Background", &c); - c = Qt::white; + c = TQt::white; m_scaleColor = config->readColorEntry("Scale", &c); m_hourColor = config->readColorEntry("HourHand", &c); m_minColor = config->readColorEntry("MinuteHand", &c); - c = Qt::red; + c = TQt::red; m_secColor = config->readColorEntry("SecondHand", &c); } @@ -557,7 +557,7 @@ void KClockSaver::slotTimeout() if (width() < 256) { // intended for the control module preview: always fill the whole area TQImage *img = new TQImage(width(), height(), 32); - img->fill(qRgb(m_bgndColor.red(), m_bgndColor.green(), m_bgndColor.blue())); + img->fill(tqRgb(m_bgndColor.red(), m_bgndColor.green(), m_bgndColor.blue())); m_clock->drawToImage(img, m_x, m_y); p.drawImage(0, 0, *img); delete img; diff --git a/kscreensaver/kdesavers/kclock.h b/kscreensaver/kdesavers/kclock.h index 2afc42a6..662d24b8 100644 --- a/kscreensaver/kdesavers/kclock.h +++ b/kscreensaver/kdesavers/kclock.h @@ -19,10 +19,10 @@ class KClockPainter { int m_width; int m_height; - Q_UINT8 *m_buf; + TQ_UINT8 *m_buf; double m_matrix[6]; - Q_UINT32 m_color; - Q_UINT32 m_shadow; + TQ_UINT32 m_color; + TQ_UINT32 m_shadow; public: KClockPainter(int width, int height); @@ -45,6 +45,7 @@ class KClockPainter class KClockSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KClockSaver(WId id); virtual ~KClockSaver(); @@ -94,6 +95,7 @@ class KClockSaver : public KScreenSaver class KClockSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KClockSetup(TQWidget *parent = 0, const char *name = 0); ~KClockSetup(); diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp index e0d54265..6e064e29 100644 --- a/kscreensaver/kdesavers/kvm.cpp +++ b/kscreensaver/kdesavers/kvm.cpp @@ -21,7 +21,7 @@ * implied warranty. * */ -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> #ifdef HAVE_CONFIG_H #include <config.h> @@ -166,8 +166,8 @@ draw_pool (m_state *state) if( state->modified[index] == 1 ) pos_x += 2; TQPainter p(state->w); - p.setPen( Qt::green ); - p.setBrush( Qt::black ); + p.setPen( TQt::green ); + p.setBrush( TQt::black ); p.drawPixmap( state->grid_margin_x + x*state->char_width, state->grid_margin_y + y*state->char_height, state->images, pos_x*state->char_width, @@ -289,7 +289,7 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Virtual machine speed:"), main ); tl1->addWidget(label); - TQSlider *slider = new TQSlider( TQSlider::Horizontal, main ); + TQSlider *slider = new TQSlider( Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, 100 ); slider->setSteps( 10, 20 ); @@ -303,7 +303,7 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Display update speed:"), main ); tl1->addWidget(label); - slider = new TQSlider( TQSlider::Horizontal, main ); + slider = new TQSlider( Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, MAX_REFRESH_TIMEOUT ); slider->setSteps( MAX_REFRESH_TIMEOUT/10, MAX_REFRESH_TIMEOUT/5 ); diff --git a/kscreensaver/kdesavers/kvm.h b/kscreensaver/kdesavers/kvm.h index 0f705e21..7b618c9d 100644 --- a/kscreensaver/kdesavers/kvm.h +++ b/kscreensaver/kdesavers/kvm.h @@ -44,6 +44,7 @@ typedef struct { class kVmSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: kVmSaver( WId id ); virtual ~kVmSaver(); @@ -74,6 +75,7 @@ protected: class kVmSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kVmSetup( TQWidget *parent = NULL, const char *name = NULL ); ~kVmSetup(); diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp index 86919eca..9ea6551b 100644 --- a/kscreensaver/kdesavers/lines.cpp +++ b/kscreensaver/kdesavers/lines.cpp @@ -5,7 +5,7 @@ // based on kpolygon from Martin R. Jones 1996 // mailto:dirk.staneker@student.uni-tuebingen.de // -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> // 2001/03/04 Converted to libkscreensaver by Martin R. Jones #include <config.h> @@ -128,7 +128,7 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) TQLabel *label=new TQLabel(i18n("Length:"), main); tl1->addWidget(label); - TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, TQSlider::Horizontal, + TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, Qt::Horizontal, main); sb->setMinimumSize(120, 20); sb->setTickmarks(TQSlider::Below); @@ -139,7 +139,7 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) label=new TQLabel(i18n("Speed:"), main); tl1->addWidget(label); - sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main); sb->setMinimumSize(120, 20); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); diff --git a/kscreensaver/kdesavers/lines.h b/kscreensaver/kdesavers/lines.h index c5e7f42a..fe9331bd 100644 --- a/kscreensaver/kdesavers/lines.h +++ b/kscreensaver/kdesavers/lines.h @@ -38,6 +38,7 @@ class Lines{ class kLinesSaver:public KScreenSaver{ Q_OBJECT + TQ_OBJECT public: kLinesSaver( WId id ); virtual ~kLinesSaver(); @@ -68,6 +69,7 @@ class kLinesSaver:public KScreenSaver{ class kLinesSetup : public KDialogBase{ Q_OBJECT + TQ_OBJECT public: kLinesSetup(TQWidget *parent=NULL, const char *name=NULL); ~kLinesSetup(); diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp index 86bd0d80..e98410fb 100644 --- a/kscreensaver/kdesavers/lorenz.cpp +++ b/kscreensaver/kdesavers/lorenz.cpp @@ -82,7 +82,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQSlider::Horizontal, main); + sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal, main); sps->setMinimumSize( 120, 20 ); sps->setTickmarks(TQSlider::Below); sps->setTickInterval(150); @@ -92,7 +92,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Epoch:"), main ); tl1->addWidget(label); - eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, TQSlider::Horizontal, main); + eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, Qt::Horizontal, main); eps->setMinimumSize( 120, 20 ); eps->setTickmarks(TQSlider::Below); eps->setTickInterval(3000); @@ -102,7 +102,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Color rate:"), main ); tl1->addWidget(label); - crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, TQSlider::Horizontal, main); + crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, Qt::Horizontal, main); crs->setMinimumSize( 120, 20 ); crs->setTickmarks(TQSlider::Below); crs->setTickInterval(10); @@ -112,7 +112,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation Z:"), main ); tl1->addWidget(label); - zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, TQSlider::Horizontal, main); + zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, Qt::Horizontal, main); zrs->setMinimumSize( 120, 20 ); zrs->setTickmarks(TQSlider::Below); zrs->setTickInterval(36); @@ -122,7 +122,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation Y:"), main ); tl1->addWidget(label); - yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, TQSlider::Horizontal, main); + yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, Qt::Horizontal, main); yrs->setMinimumSize( 120, 20 ); yrs->setTickmarks(TQSlider::Below); yrs->setTickInterval(36); @@ -132,7 +132,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Rotation X:"), main ); tl1->addWidget(label); - xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, TQSlider::Horizontal, main); + xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, Qt::Horizontal, main); xrs->setMinimumSize( 120, 20 ); xrs->setTickmarks(TQSlider::Below); xrs->setTickInterval(36); diff --git a/kscreensaver/kdesavers/lorenz.h b/kscreensaver/kdesavers/lorenz.h index 4993273e..5a69634e 100644 --- a/kscreensaver/kdesavers/lorenz.h +++ b/kscreensaver/kdesavers/lorenz.h @@ -22,6 +22,7 @@ class Matrix3D; class KLorenzSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KLorenzSaver( WId id ); virtual ~KLorenzSaver(); @@ -56,6 +57,7 @@ class TQSlider; class KLorenzSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KLorenzSetup(TQWidget *parent = 0, const char *name = 0 ); ~KLorenzSetup(); diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp index 18f03be8..4694ccd3 100644 --- a/kscreensaver/kdesavers/pendulum.cpp +++ b/kscreensaver/kdesavers/pendulum.cpp @@ -29,7 +29,7 @@ // std. C++ headers #include <cstdlib> -// Qt headers +// TQt headers #include <tqlineedit.h> #include <tqspinbox.h> #include <tqvalidator.h> @@ -44,7 +44,7 @@ #include "sspreviewarea.h" -// pendulum.moc includes pendulum.h +// pendulum.tqmoc includes pendulum.h #include "pendulum.moc" #define KPENDULUM_VERSION "1.1" @@ -654,7 +654,7 @@ void KPendulumSaver::doTimeStep() glArea->setEyePhi(eyePhi); // set new perspective } - glArea->updateGL(); // repaint scenery + glArea->updateGL(); // tqrepaint scenery timer->start(deltaT, TRUE); // restart timer } @@ -704,28 +704,28 @@ KPendulumSetup::KPendulumSetup(TQWidget* parent, const char* name) TQToolTip::add( mEdit, i18n("Ratio of 2nd mass to sum of both masses.\nValid values from %1 to %2.") - .arg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2) - .arg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::massRatioLimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::massRatioLimitUpper, 0, 'f', 2)); TQToolTip::add( lEdit, i18n("Ratio of 2nd pendulum part length to the sum of both part lengths.\nValid values from %1 to %2.") - .arg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2) - .arg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::lengthRatioLimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::lengthRatioLimitUpper, 0, 'f', 2)); TQToolTip::add( gEdit, i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.") - .arg(KPendulumSaver::gLimitLower, 0, 'f', 2) - .arg(KPendulumSaver::gLimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::gLimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::gLimitUpper, 0, 'f', 2)); TQToolTip::add( eEdit, i18n("Energy in units of the maximum potential energy of the given configuration.\nValid values from %1 to %2.") - .arg(KPendulumSaver::ELimitLower, 0, 'f', 2) - .arg(KPendulumSaver::ELimitUpper, 0, 'f', 2)); + .tqarg(KPendulumSaver::ELimitLower, 0, 'f', 2) + .tqarg(KPendulumSaver::ELimitUpper, 0, 'f', 2)); TQToolTip::add( persSpinBox, i18n("Time in seconds after which a random perspective change occurs.\nValid values from %1 to %2.") - .arg(KPendulumSaver::persChangeIntervalLimitLower) - .arg(KPendulumSaver::persChangeIntervalLimitUpper)); + .tqarg(KPendulumSaver::persChangeIntervalLimitLower) + .tqarg(KPendulumSaver::persChangeIntervalLimitUpper)); // init preview area preview->setBackgroundColor(black); @@ -851,7 +851,7 @@ void KPendulumSetup::persChangeEnteredSlot(int t) void KPendulumSetup::barColorButtonClickedSlot(void) { - TQColor color = QColorDialog::getColor( + TQColor color = TQColorDialog::getColor( saver->barColor(), this, "bar color dialog"); if (color.isValid()) { @@ -861,7 +861,7 @@ void KPendulumSetup::barColorButtonClickedSlot(void) } void KPendulumSetup::m1ColorButtonClickedSlot(void) { - TQColor color = QColorDialog::getColor( + TQColor color = TQColorDialog::getColor( saver->m1Color(), this, "mass 1 color dialog"); if (color.isValid()) { @@ -871,7 +871,7 @@ void KPendulumSetup::m1ColorButtonClickedSlot(void) } void KPendulumSetup::m2ColorButtonClickedSlot(void) { - TQColor color = QColorDialog::getColor( + TQColor color = TQColorDialog::getColor( saver->m2Color(), this, "mass 2 color dialog"); if (color.isValid()) { diff --git a/kscreensaver/kdesavers/pendulum.h b/kscreensaver/kdesavers/pendulum.h index 3c26a1ef..af933de9 100644 --- a/kscreensaver/kdesavers/pendulum.h +++ b/kscreensaver/kdesavers/pendulum.h @@ -15,7 +15,7 @@ // STL headers #include <valarray> -// Qt headers +// TQt headers #include <tqwidget.h> #include <tqtimer.h> #include <tqgl.h> @@ -79,14 +79,15 @@ class PendulumOdeSolver : public RkOdeSolver<double> /** @brief GL widget class for the KPendulum screen saver * * Class implements TQGLWidget to display the KPendulum screen saver. */ -class PendulumGLWidget : public QGLWidget +class PendulumGLWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of KPendulum's GL widget - * @param parent parent widget, passed to QGLWidget's constructor - * @param name name of widget, passed to QGLWidget's constructor */ + * @param parent parent widget, passed to TQGLWidget's constructor + * @param name name of widget, passed to TQGLWidget's constructor */ PendulumGLWidget(TQWidget* parent=0, const char* name=0); /** @brief Destructor of KPendulum's GL widget */ ~PendulumGLWidget(void); @@ -184,6 +185,7 @@ class PendulumGLWidget : public QGLWidget class KPendulumSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of the KPendulum screen saver object @@ -332,6 +334,7 @@ class KPendulumSaver : public KScreenSaver class KPendulumSetup : public KPendulumSetupUi { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor for the KPendulum screen saver setup dialog diff --git a/kscreensaver/kdesavers/pendulumcfg.ui b/kscreensaver/kdesavers/pendulumcfg.ui index 51454a00..0b28fc61 100644 --- a/kscreensaver/kdesavers/pendulumcfg.ui +++ b/kscreensaver/kdesavers/pendulumcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.3" stdsetdef="1"> <class>KPendulumSetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KPendulumSetupUi</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>2</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>1200</width> <height>900</height> @@ -48,31 +48,31 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout16</cstring> + <cstring>tqlayout16</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -90,7 +90,7 @@ m<sub>1</sub>+m<sub>2</sub> </p></string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>mEdit</cstring> </property> @@ -102,7 +102,7 @@ m<sub>1</sub>+m<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -114,15 +114,15 @@ m<sub>1</sub>+m<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout14</cstring> + <cstring>tqlayout14</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -134,7 +134,7 @@ l<sub>1</sub>+l<sub>2</sub> </p></string> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>lEdit</cstring> </property> @@ -146,7 +146,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -158,26 +158,26 @@ l<sub>1</sub>+l<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13</cstring> + <cstring>tqlayout13</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel3</cstring> </property> <property name="text"> <string>g</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>gEdit</cstring> </property> @@ -189,7 +189,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -201,26 +201,26 @@ l<sub>1</sub>+l<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout13_2</cstring> + <cstring>tqlayout13_2</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel4</cstring> </property> <property name="text"> <string>E</string> </property> - <property name="alignment"> + <property name="tqalignment"> <set>WordBreak|AlignCenter</set> </property> </widget> - <widget class="QLineEdit"> + <widget class="TQLineEdit"> <property name="name"> <cstring>eEdit</cstring> </property> @@ -232,7 +232,7 @@ l<sub>1</sub>+l<sub>2</sub> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -244,15 +244,15 @@ l<sub>1</sub>+l<sub>2</sub> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout18</cstring> + <cstring>tqlayout18</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLabel"> + <widget class="TQLabel"> <property name="name"> <cstring>textLabel2_2</cstring> </property> @@ -264,7 +264,7 @@ Change [s]</string> <string>specify the time in seconds after which a random perspective change occurs</string> </property> </widget> - <widget class="QSpinBox"> + <widget class="TQSpinBox"> <property name="name"> <cstring>persSpinBox</cstring> </property> @@ -276,13 +276,13 @@ Change [s]</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>60</width> <height>32767</height> @@ -291,19 +291,19 @@ Change [s]</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout15</cstring> + <cstring>tqlayout15</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>barColorButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -313,11 +313,11 @@ Change [s]</string> <string>Bars</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m1ColorButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -327,11 +327,11 @@ Change [s]</string> <string>M1</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m2ColorButton</cstring> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -353,7 +353,7 @@ Change [s]</string> <property name="sizeType"> <enum>MinimumExpanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>0</height> @@ -374,7 +374,7 @@ Change [s]</string> <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>150</height> @@ -383,9 +383,9 @@ Change [s]</string> </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout19</cstring> + <cstring>tqlayout19</cstring> </property> <hbox> <property name="name"> @@ -401,14 +401,14 @@ Change [s]</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>66</width> <height>31</height> </size> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>OkButton</cstring> </property> @@ -419,7 +419,7 @@ Change [s]</string> <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>CancelButton</cstring> </property> @@ -427,7 +427,7 @@ Change [s]</string> <string>&Cancel</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>AboutButton</cstring> </property> @@ -445,7 +445,7 @@ Change [s]</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>65</width> <height>31</height> @@ -547,7 +547,7 @@ Change [s]</string> <slot>m2ColorButtonClickedSlot()</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>okButtonClickedSlot()</slot> <slot>aboutButtonClickedSlot()</slot> <slot>mEditLostFocusSlot(void)</slot> @@ -558,7 +558,7 @@ Change [s]</string> <slot>barColorButtonClickedSlot(void)</slot> <slot>m1ColorButtonClickedSlot(void)</slot> <slot>m2ColorButtonClickedSlot(void)</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>sspreviewarea.h</includehint> diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp index 41274711..c4e8057c 100644 --- a/kscreensaver/kdesavers/polygon.cpp +++ b/kscreensaver/kdesavers/polygon.cpp @@ -4,7 +4,7 @@ // // Copyright (c) Martin R. Jones 1996 // -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> // 2001/03/04 Converted to libkscreensaver by Martin R. Jones #include <config.h> @@ -66,7 +66,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) TQLabel *label = new TQLabel( i18n("Length:"), main ); tl1->addWidget(label); - TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, TQSlider::Horizontal, + TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, Qt::Horizontal, main ); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); @@ -77,7 +77,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Vertices:"), main ); tl1->addWidget(label); - sb = new TQSlider(3, MAXVERTICES, 2, vertices, TQSlider::Horizontal, main); + sb = new TQSlider(3, MAXVERTICES, 2, vertices, Qt::Horizontal, main); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(2); @@ -87,7 +87,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, Qt::Horizontal, main); sb->setMinimumSize( 90, 20 ); sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); @@ -102,7 +102,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) saver = new kPolygonSaver( preview->winId() ); tl->addWidget(preview); - setMinimumSize( sizeHint() ); + setMinimumSize( tqsizeHint() ); } kPolygonSetup::~kPolygonSetup() diff --git a/kscreensaver/kdesavers/polygon.h b/kscreensaver/kdesavers/polygon.h index fed640c1..563d3b39 100644 --- a/kscreensaver/kdesavers/polygon.h +++ b/kscreensaver/kdesavers/polygon.h @@ -18,6 +18,7 @@ class kPolygonSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: kPolygonSaver( WId id ); virtual ~kPolygonSaver(); @@ -37,12 +38,12 @@ protected slots: void slotTimeout(); protected: - QTimer timer; + TQTimer timer; unsigned numLines; int numVertices; int colorContext; int speed; - QColor colors[64]; + TQColor colors[64]; int currentColor; TQPtrList<TQPointArray> polygons; TQMemArray<TQPoint> directions; @@ -52,6 +53,7 @@ protected: class kPolygonSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kPolygonSetup( TQWidget *parent = 0, const char *name = 0 ); ~kPolygonSetup(); diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp index 4868c9dc..7eb757d0 100644 --- a/kscreensaver/kdesavers/rotation.cpp +++ b/kscreensaver/kdesavers/rotation.cpp @@ -31,7 +31,7 @@ #include <cstdlib> // STL #include <deque> -// Qt headers +// TQt headers #include <tqcheckbox.h> #include <tqlineedit.h> #include <tqvalidator.h> @@ -44,7 +44,7 @@ #include "sspreviewarea.h" -// rotation.moc includes rotation.h +// rotation.tqmoc includes rotation.h #include "rotation.moc" /** Version number of this screen saver */ @@ -716,18 +716,18 @@ KRotationSetup::KRotationSetup(TQWidget* parent, const char* name) TQToolTip::add( lengthEdit, i18n("Length of traces in seconds of visibility.\nValid values from %1 to %2.") - .arg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2) - .arg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2)); + .tqarg(KRotationSaver::traceLengthSecondsLimitLower, 0, 'f', 2) + .tqarg(KRotationSaver::traceLengthSecondsLimitUpper, 0, 'f', 2)); TQToolTip::add( LzEdit, i18n("Angular momentum in z direction in arbitrary units.\nValid values from %1 to %2.") - .arg(KRotationSaver::LzLimitLower, 0, 'f', 2) - .arg(KRotationSaver::LzLimitUpper, 0, 'f', 2)); + .tqarg(KRotationSaver::LzLimitLower, 0, 'f', 2) + .tqarg(KRotationSaver::LzLimitUpper, 0, 'f', 2)); TQToolTip::add( thetaEdit, i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.") - .arg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2) - .arg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2)); + .tqarg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2) + .tqarg(KRotationSaver::initEulerThetaLimitUpper, 0, 'f', 2)); // init preview area preview->setBackgroundColor(black); diff --git a/kscreensaver/kdesavers/rotation.h b/kscreensaver/kdesavers/rotation.h index 0144275d..1086ca3e 100644 --- a/kscreensaver/kdesavers/rotation.h +++ b/kscreensaver/kdesavers/rotation.h @@ -12,7 +12,7 @@ #include <math.h> // STL headers #include <valarray> -// Qt headers +// TQt headers #include <tqwidget.h> #include <tqtimer.h> #include <tqgl.h> @@ -79,14 +79,15 @@ class EulerOdeSolver : public RkOdeSolver<double> /** @brief GL widget class for the KRotation screen saver * * Class implements TQGLWidget to display the KRotation screen saver. */ -class RotationGLWidget : public QGLWidget +class RotationGLWidget : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of KRotation's GL widget - * @param parent parent widget, passed to QGLWidget's constructor - * @param name name of widget, passed to QGLWidget's constructor + * @param parent parent widget, passed to TQGLWidget's constructor + * @param name name of widget, passed to TQGLWidget's constructor * @param omega current rotation vector * @param e1 x trace data * @param e2 y trace data @@ -172,6 +173,7 @@ class RotationGLWidget : public QGLWidget class KRotationSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor of the KRotation screen saver object @@ -299,6 +301,7 @@ class KRotationSaver : public KScreenSaver class KRotationSetup : public KRotationSetupUi { Q_OBJECT + TQ_OBJECT public: KRotationSetup(TQWidget* parent = NULL, const char* name = NULL); diff --git a/kscreensaver/kdesavers/rotationcfg.ui b/kscreensaver/kdesavers/rotationcfg.ui index d7e95d3b..8aa3cb53 100644 --- a/kscreensaver/kdesavers/rotationcfg.ui +++ b/kscreensaver/kdesavers/rotationcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>KRotationSetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>KRotationSetupUi</cstring> </property> @@ -20,13 +20,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>1200</width> <height>900</height> @@ -48,23 +48,23 @@ <property name="resizeMode"> <enum>Minimum</enum> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout17</cstring> + <cstring>tqlayout17</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout6</cstring> + <cstring>tqlayout6</cstring> </property> <vbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>buttonGroup1</cstring> </property> @@ -83,15 +83,15 @@ <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> - <cstring>layout5</cstring> + <cstring>tqlayout5</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QCheckBox" row="0" column="0"> + <widget class="TQCheckBox" row="0" column="0"> <property name="name"> <cstring>xTrace</cstring> </property> @@ -102,7 +102,7 @@ <string>x</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>randTraces</cstring> </property> @@ -110,7 +110,7 @@ <string>Random</string> </property> </widget> - <widget class="QCheckBox" row="0" column="1"> + <widget class="TQCheckBox" row="0" column="1"> <property name="name"> <cstring>yTrace</cstring> </property> @@ -118,7 +118,7 @@ <string>y</string> </property> </widget> - <widget class="QCheckBox" row="0" column="2"> + <widget class="TQCheckBox" row="0" column="2"> <property name="name"> <cstring>zTrace</cstring> </property> @@ -128,7 +128,7 @@ </widget> </grid> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -136,7 +136,7 @@ <string>Length:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>lengthEdit</cstring> </property> @@ -148,7 +148,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>40</width> <height>32767</height> @@ -166,15 +166,15 @@ </widget> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout10</cstring> + <cstring>tqlayout10</cstring> </property> <grid> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QLineEdit" row="0" column="1"> + <widget class="TQLineEdit" row="0" column="1"> <property name="name"> <cstring>LzEdit</cstring> </property> @@ -186,7 +186,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -196,7 +196,7 @@ <number>5</number> </property> </widget> - <widget class="QLabel" row="1" column="0"> + <widget class="TQLabel" row="1" column="0"> <property name="name"> <cstring>textLabel3</cstring> </property> @@ -212,7 +212,7 @@ <string>Theta:</string> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>textLabel2</cstring> </property> @@ -228,7 +228,7 @@ <string>Lz:</string> </property> </widget> - <widget class="QLineEdit" row="1" column="1"> + <widget class="TQLineEdit" row="1" column="1"> <property name="name"> <cstring>thetaEdit</cstring> </property> @@ -240,7 +240,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="maximumSize"> + <property name="tqmaximumSize"> <size> <width>50</width> <height>32767</height> @@ -262,7 +262,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>31</width> <height>51</height> @@ -275,7 +275,7 @@ <property name="name"> <cstring>preview</cstring> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>200</width> <height>150</height> @@ -284,9 +284,9 @@ </widget> </hbox> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout9</cstring> + <cstring>tqlayout9</cstring> </property> <hbox> <property name="name"> @@ -302,22 +302,22 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>51</width> <height>31</height> </size> </property> </spacer> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> - <cstring>layout4</cstring> + <cstring>tqlayout4</cstring> </property> <hbox> <property name="name"> <cstring>unnamed</cstring> </property> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>OkButton</cstring> </property> @@ -328,7 +328,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>CancelButton</cstring> </property> @@ -336,7 +336,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>AboutButton</cstring> </property> @@ -356,7 +356,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>61</width> <height>31</height> @@ -470,7 +470,7 @@ <slot>thetaEnteredSlot(const QString&)</slot> </connection> </connections> -<slots> +<Q_SLOTS> <slot>okButtonClickedSlot()</slot> <slot>aboutButtonClickedSlot()</slot> <slot>randomTracesToggled(bool)</slot> @@ -480,7 +480,7 @@ <slot>lengthEnteredSlot(const QString&)</slot> <slot>LzEnteredSlot(const QString&)</slot> <slot>thetaEnteredSlot(const QString&)</slot> -</slots> +</Q_SLOTS> <layoutdefaults spacing="6" margin="11"/> <includehints> <includehint>sspreviewarea.h</includehint> diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp index 57443e78..f0f61ffe 100644 --- a/kscreensaver/kdesavers/science.cpp +++ b/kscreensaver/kdesavers/science.cpp @@ -31,7 +31,7 @@ #include "science.h" #include "science.moc" -#if defined Q_WS_X11 && !defined K_WS_QTONLY +#if defined Q_WS_X11 && !defined K_WS_TQTONLY #include <X11/Xlib.h> #include <X11/Xutil.h> #endif @@ -897,7 +897,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Size:"), main ); ltc->addWidget( label ); - slideSize = new TQSlider(9, 50, 5, size[mode], TQSlider::Horizontal, + slideSize = new TQSlider(9, 50, 5, size[mode], Qt::Horizontal, main ); slideSize->setMinimumSize( 90, 20 ); slideSize->setTickmarks(TQSlider::Below); @@ -916,7 +916,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addWidget( label ); slideIntensity = new TQSlider(0, 10, 1, intensity[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideIntensity->setMinimumSize( 90, 20 ); slideIntensity->setTickmarks(TQSlider::Below); slideIntensity->setTickInterval(1); @@ -933,7 +933,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addWidget( label ); slideSpeed = new TQSlider(0, SCI_MAX_SPEED, 10, speed[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideSpeed->setMinimumSize( 90, 20 ); slideSpeed->setTickmarks(TQSlider::Below); slideSpeed->setTickInterval(10); @@ -949,7 +949,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltc->addLayout( ltcm ); slideMoveX = new TQSlider(0, SCI_MAX_MOVE, 5, moveX[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideMoveX->setMinimumSize( 40, 20 ); slideMoveX->setTickmarks(TQSlider::Below); slideMoveX->setTickInterval(5); @@ -958,7 +958,7 @@ KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) ltcm->addWidget( slideMoveX ); slideMoveY = new TQSlider(0, SCI_MAX_MOVE, 5, moveY[mode], - TQSlider::Horizontal, main ); + Qt::Horizontal, main ); slideMoveY->setMinimumSize( 40, 20 ); slideMoveY->setTickmarks(TQSlider::Below); slideMoveY->setTickInterval(5); diff --git a/kscreensaver/kdesavers/science.h b/kscreensaver/kdesavers/science.h index eb92d339..48635bff 100644 --- a/kscreensaver/kdesavers/science.h +++ b/kscreensaver/kdesavers/science.h @@ -22,9 +22,10 @@ typedef signed int T32bit; class KScienceSaver; -class KPreviewWidget : public QWidget +class KPreviewWidget : public TQWidget { Q_OBJECT + TQ_OBJECT public: KPreviewWidget( TQWidget *parent ); void paintEvent( TQPaintEvent *event ); @@ -38,6 +39,7 @@ struct KScienceData; class KScienceSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KScienceSaver( WId id, bool setup=false, bool gP=false); virtual ~KScienceSaver(); @@ -106,6 +108,7 @@ protected: class KScienceSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KScienceSetup(TQWidget *parent=0, const char *name=0); ~KScienceSetup(); diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp index de88fe3d..42c702ee 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( geometry() == d->geometry() && d->numScreens() > 1) + if( tqgeometry() == d->tqgeometry() && d->numScreens() > 1) { for(int i = 0; i < d->numScreens(); ++i) { @@ -285,7 +285,7 @@ int kSlideShowSaver::effectSpiralIn(bool aInit) my0 += miy; } - bitBlt(this, mx, my, &mNextScreen, mx, my, mix, miy, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, mix, miy, CopyROP, true); mx += mdx; my += mdy; @@ -321,8 +321,8 @@ int kSlideShowSaver::effectMeltdown(bool aInit) if (y >= mh) continue; done = false; if ((KApplication::random()&15) < 6) continue; - bitBlt(this, x, y+mdy, this, x, y, mdx, mh-y-mdy, CopyROP, true); - bitBlt(this, x, y, &mNextScreen, x, y, mdx, mdy, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, y+mdy, TQT_TQPAINTDEVICE(this), x, y, mdx, mh-y-mdy, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, mdx, mdy, CopyROP, true); mIntArray[i] += mdy; } @@ -407,7 +407,7 @@ int kSlideShowSaver::effectSweep(bool aInit) } for (w=2,i=4,x=mx; i>0; i--, w<<=1, x-=mdx) { - bitBlt(this, x, 0, &mNextScreen, x, 0, w, mh, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, w, mh, CopyROP, true); } mx += mdx; } @@ -421,7 +421,7 @@ int kSlideShowSaver::effectSweep(bool aInit) } for (h=2,i=4,y=my; i>0; i--, h<<=1, y-=mdy) { - bitBlt(this, 0, y, &mNextScreen, 0, y, mw, h, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, h, CopyROP, true); } my += mdy; } @@ -477,7 +477,7 @@ int kSlideShowSaver::effectRandom(bool /*aInit*/) { x = (KApplication::random() % w) << fact; y = (KApplication::random() % h) << fact; - bitBlt(this, x, y, &mNextScreen, x, y, sz, sz, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, y, TQT_TQPAINTDEVICE(&mNextScreen), x, y, sz, sz, CopyROP, true); } showNextScreen(); @@ -509,7 +509,7 @@ int kSlideShowSaver::effectGrowing(bool aInit) return -1; } - bitBlt(this, mx, my, &mNextScreen, mx, my, + bitBlt(TQT_TQPAINTDEVICE(this), mx, my, TQT_TQPAINTDEVICE(&mNextScreen), mx, my, mw - (mx<<1), mh - (my<<1), CopyROP, true); return 20; @@ -548,9 +548,9 @@ int kSlideShowSaver::effectChessboard(bool aInit) for (y=0; y<mw; y+=(mdy<<1)) { - bitBlt(this, mix, y+miy, &mNextScreen, mix, y+miy, + bitBlt(TQT_TQPAINTDEVICE(this), mix, y+miy, TQT_TQPAINTDEVICE(&mNextScreen), mix, y+miy, mdx, mdy, CopyROP, true); - bitBlt(this, mx, y+my, &mNextScreen, mx, y+my, + bitBlt(TQT_TQPAINTDEVICE(this), mx, y+my, TQT_TQPAINTDEVICE(&mNextScreen), mx, y+my, mdx, mdy, CopyROP, true); } @@ -591,18 +591,18 @@ int kSlideShowSaver::effectIncomingEdges(bool aInit) if (mSubType) { // moving image edges - bitBlt(this, 0, 0, &mNextScreen, mix-mx, miy-my, mx, my, CopyROP, true); - bitBlt(this, x1, 0, &mNextScreen, mix, miy-my, mx, my, CopyROP, true); - bitBlt(this, 0, y1, &mNextScreen, mix-mx, miy, mx, my, CopyROP, true); - bitBlt(this, x1, y1, &mNextScreen, mix, miy, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy-my, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy-my, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix-mx, miy, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), mix, miy, mx, my, CopyROP, true); } else { // fixed image edges - bitBlt(this, 0, 0, &mNextScreen, 0, 0, mx, my, CopyROP, true); - bitBlt(this, x1, 0, &mNextScreen, x1, 0, mx, my, CopyROP, true); - bitBlt(this, 0, y1, &mNextScreen, 0, y1, mx, my, CopyROP, true); - bitBlt(this, x1, y1, &mNextScreen, x1, y1, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, 0, TQT_TQPAINTDEVICE(&mNextScreen), x1, 0, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y1, TQT_TQPAINTDEVICE(&mNextScreen), 0, y1, mx, my, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x1, y1, TQT_TQPAINTDEVICE(&mNextScreen), x1, y1, mx, my, CopyROP, true); } return 20; } @@ -625,7 +625,7 @@ int kSlideShowSaver::effectHorizLines(bool aInit) for (y=iyPos[mi]; y<mh; y+=8) { - bitBlt(this, 0, y, &mNextScreen, 0, y, mw, 1, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), 0, y, TQT_TQPAINTDEVICE(&mNextScreen), 0, y, mw, 1, CopyROP, true); } mi++; @@ -651,7 +651,7 @@ int kSlideShowSaver::effectVertLines(bool aInit) for (x=ixPos[mi]; x<mw; x+=8) { - bitBlt(this, x, 0, &mNextScreen, x, 0, 1, mh, CopyROP, true); + bitBlt(TQT_TQPAINTDEVICE(this), x, 0, TQT_TQPAINTDEVICE(&mNextScreen), x, 0, 1, mh, CopyROP, true); } mi++; @@ -661,7 +661,7 @@ int kSlideShowSaver::effectVertLines(bool aInit) //----------------------------------------------------------------------------- -void kSlideShowSaver::startPainter(Qt::PenStyle aPen) +void kSlideShowSaver::startPainter(TQt::PenStyle aPen) { TQBrush brush; brush.setPixmap(mNextScreen); @@ -716,7 +716,7 @@ void kSlideShowSaver::slotTimeout() //---------------------------------------------------------------------------- void kSlideShowSaver::showNextScreen() { - bitBlt(this, 0, 0, &mNextScreen, 0, 0, + bitBlt(TQT_TQPAINTDEVICE(this), 0, 0, TQT_TQPAINTDEVICE(&mNextScreen), 0, 0, mNextScreen.width(), mNextScreen.height(), CopyROP, true); } @@ -798,7 +798,7 @@ void kSlideShowSaver::createNextScreen() y = ((wh - ih) >> 1) + geoptr->mYorg; } - // bitBlt(&mNextScreen, x, y, &mImage, 0, 0, iw, ih, CopyROP, false); + // bitBlt(TQT_TQPAINTDEVICE(&mNextScreen), x, y, TQT_TQPAINTDEVICE(&mImage), 0, 0, iw, ih, CopyROP, false); p.drawImage(x, y, mImage); } } @@ -884,8 +884,8 @@ void kSlideShowSaver::traverseDirectory(const TQString &dirName) } dir.setFilter(TQDir::Dirs | TQDir::Files); - const QFileInfoList *fileinfolist = dir.entryInfoList(); - QFileInfoListIterator it(*fileinfolist); + const TQFileInfoList *fileinfolist = dir.entryInfoList(); + TQFileInfoListIterator it(*fileinfolist); TQFileInfo *fi; while ((fi = it.current())) { diff --git a/kscreensaver/kdesavers/slideshow.h b/kscreensaver/kdesavers/slideshow.h index c52dbda9..96655392 100644 --- a/kscreensaver/kdesavers/slideshow.h +++ b/kscreensaver/kdesavers/slideshow.h @@ -25,6 +25,7 @@ class SlideShowCfg; class kSlideShowSaver: public KScreenSaver { Q_OBJECT + TQ_OBJECT public: kSlideShowSaver( WId id ); virtual ~kSlideShowSaver(); @@ -82,7 +83,7 @@ protected: protected: /** Init mPainter with next-screen's pixmap and call mPainter.begin(&mWidget) */ - void startPainter(Qt::PenStyle penStyle=NoPen); + void startPainter(TQt::PenStyle penStyle=NoPen); protected: struct mScreenGeo { @@ -128,6 +129,7 @@ protected: class kSlideShowSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kSlideShowSetup(TQWidget *parent=NULL, const char *name=NULL); ~kSlideShowSetup(); diff --git a/kscreensaver/kdesavers/slideshowcfg.ui b/kscreensaver/kdesavers/slideshowcfg.ui index 544ea60b..89856efe 100644 --- a/kscreensaver/kdesavers/slideshowcfg.ui +++ b/kscreensaver/kdesavers/slideshowcfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.2" stdsetdef="1"> <class>SlideShowCfg</class> -<widget class="QWidget"> +<widget class="TQWidget"> <property name="name"> <cstring>Form1</cstring> </property> @@ -19,7 +19,7 @@ <property name="margin"> <number>0</number> </property> - <widget class="QCheckBox" row="7" column="0" rowspan="1" colspan="4"> + <widget class="TQCheckBox" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> <cstring>mCbxSubdirectory</cstring> </property> @@ -27,7 +27,7 @@ <string>&Include images from sub-folders</string> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxRandom</cstring> </property> @@ -40,7 +40,7 @@ <cstring>mDirChooser</cstring> </property> </widget> - <widget class="QCheckBox" row="0" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="0" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxZoom</cstring> </property> @@ -58,14 +58,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>161</width> <height>20</height> </size> </property> </spacer> - <widget class="QLabel" row="6" column="0" rowspan="1" colspan="2"> + <widget class="TQLabel" row="6" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>textLabel1</cstring> </property> @@ -76,7 +76,7 @@ <cstring>mDirChooser</cstring> </property> </widget> - <widget class="QCheckBox" row="2" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="2" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxShowName</cstring> </property> @@ -94,14 +94,14 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>19</height> </size> </property> </spacer> - <widget class="QSpinBox" row="4" column="1" rowspan="1" colspan="2"> + <widget class="TQSpinBox" row="4" column="1" rowspan="1" colspan="2"> <property name="name"> <cstring>mDelay</cstring> </property> @@ -118,7 +118,7 @@ <number>1</number> </property> </widget> - <widget class="QLabel" row="4" column="0"> + <widget class="TQLabel" row="4" column="0"> <property name="name"> <cstring>textLabel1_2</cstring> </property> @@ -129,7 +129,7 @@ <cstring>mDelay</cstring> </property> </widget> - <widget class="QCheckBox" row="3" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="3" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>mCbxRandomPosition</cstring> </property> @@ -137,7 +137,7 @@ <string>Random &position</string> </property> </widget> - <widget class="QFrame" row="0" column="3" rowspan="6" colspan="2"> + <widget class="TQFrame" row="0" column="3" rowspan="6" colspan="2"> <property name="name"> <cstring>mPreview</cstring> </property> diff --git a/kscreensaver/kdesavers/sspreviewarea.h b/kscreensaver/kdesavers/sspreviewarea.h index e0c9fc51..54450bcb 100644 --- a/kscreensaver/kdesavers/sspreviewarea.h +++ b/kscreensaver/kdesavers/sspreviewarea.h @@ -25,13 +25,14 @@ * function calls the reimplemented TQGLWidget::resizeGL() method of the GL * widgets (PendulumGLWidget::resizeGL(), RotationGLWidget::resizeGL()) which * really resizes the GL scenery. */ -class SsPreviewArea : public QWidget +class SsPreviewArea : public TQWidget { Q_OBJECT + TQ_OBJECT public: /** @brief Constructor for SsPreviewArea - * @param parent Pointer tp parent widget, forwarded to the QWidget + * @param parent Pointer tp parent widget, forwarded to the TQWidget * constructor * @param name Pointer to widget name, forwarded to the TQWidget constructor * diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp index e65d04ac..7d94057f 100644 --- a/kscreensaver/kdesavers/wave.cpp +++ b/kscreensaver/kdesavers/wave.cpp @@ -16,7 +16,7 @@ #include <kglobal.h> #include "wave.h" #include "wave.moc" -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -288,8 +288,8 @@ void Wave::paintGL () bool Wave::LoadGLTextures() { - /* Status indicator */ - bool Status = TRUE; + /* tqStatus indicator */ + bool tqStatus = TRUE; TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage(); kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl; @@ -302,12 +302,12 @@ bool Wave::LoadGLTextures() else { TQImage dummy( 64, 64, 64 ); - dummy.fill( Qt::white.rgb() ); + dummy.fill( TQt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); } /* Set the status to true */ - //Status = TRUE; + //tqStatus = TRUE; glGenTextures(1, &texture[0]); /* create three textures */ glBindTexture(GL_TEXTURE_2D, texture[0]); /* use linear filtering */ @@ -320,5 +320,5 @@ bool Wave::LoadGLTextures() kdDebug() << "Texture Loaded: " << tex.width() << "," << tex.height() << endl; - return Status; + return tqStatus; } diff --git a/kscreensaver/kdesavers/wave.h b/kscreensaver/kdesavers/wave.h index 4d0f614f..d7c65671 100644 --- a/kscreensaver/kdesavers/wave.h +++ b/kscreensaver/kdesavers/wave.h @@ -16,7 +16,7 @@ #include <tqdialog.h> #include <tqgl.h> -#ifdef Q_WS_MACX +#ifdef TQ_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> #else @@ -29,9 +29,10 @@ #include "wavecfg.h" -class Wave : public QGLWidget +class Wave : public TQGLWidget { Q_OBJECT + TQ_OBJECT public: Wave( TQWidget * parent=0, const char * name=0 ); @@ -62,6 +63,7 @@ private: class KWaveSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KWaveSaver( WId drawable ); virtual ~KWaveSaver(); @@ -77,6 +79,7 @@ private: class KWaveSetup : public SetupUi { Q_OBJECT + TQ_OBJECT public: KWaveSetup( TQWidget *parent = NULL, const char *name = NULL ); ~KWaveSetup( ); diff --git a/kscreensaver/kdesavers/wavecfg.ui b/kscreensaver/kdesavers/wavecfg.ui index 7fcab67a..fddbdae1 100644 --- a/kscreensaver/kdesavers/wavecfg.ui +++ b/kscreensaver/kdesavers/wavecfg.ui @@ -1,6 +1,6 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>SetupUi</class> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>SetupUi</cstring> </property> @@ -20,7 +20,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="minimumSize"> + <property name="tqminimumSize"> <size> <width>400</width> <height>209</height> @@ -35,7 +35,7 @@ <property name="caption"> <string>Bitmap Flag Setup</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -57,7 +57,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QCheckBox" row="3" column="0"> + <widget class="TQCheckBox" row="3" column="0"> <property name="name"> <cstring>CheckBox1</cstring> </property> @@ -65,7 +65,7 @@ <string>Use textures</string> </property> </widget> - <widget class="QPushButton" row="4" column="2"> + <widget class="TQPushButton" row="4" column="2"> <property name="name"> <cstring>PushButton3</cstring> </property> @@ -73,7 +73,7 @@ <string>&About</string> </property> </widget> - <widget class="QSpinBox" row="1" column="0"> + <widget class="TQSpinBox" row="1" column="0"> <property name="name"> <cstring>SpinBox1</cstring> </property> @@ -87,7 +87,7 @@ <number>10</number> </property> </widget> - <widget class="QPushButton" row="4" column="1"> + <widget class="TQPushButton" row="4" column="1"> <property name="name"> <cstring>PushButton2</cstring> </property> @@ -95,7 +95,7 @@ <string>&Cancel</string> </property> </widget> - <widget class="QPushButton" row="4" column="0"> + <widget class="TQPushButton" row="4" column="0"> <property name="name"> <cstring>PushButton1</cstring> </property> @@ -106,14 +106,14 @@ <bool>true</bool> </property> </widget> - <widget class="QGroupBox" row="2" column="0"> + <widget class="TQGroupBox" row="2" column="0"> <property name="name"> <cstring>GroupBox1</cstring> </property> <property name="title"> <string>Shapes</string> </property> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout3</cstring> </property> @@ -135,7 +135,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1</cstring> </property> @@ -146,7 +146,7 @@ <bool>true</bool> </property> </widget> - <widget class="QRadioButton"> + <widget class="TQRadioButton"> <property name="name"> <cstring>RadioButton1_2</cstring> </property> @@ -157,12 +157,12 @@ </vbox> </widget> </widget> - <widget class="QWidget" row="0" column="1" rowspan="4" colspan="2"> + <widget class="TQWidget" row="0" column="1" rowspan="4" colspan="2"> <property name="name"> <cstring>preview</cstring> </property> </widget> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>TextLabel1</cstring> </property> diff --git a/kscreensaver/kpartsaver/configwidget.ui b/kscreensaver/kpartsaver/configwidget.ui index ddcf2247..816784b6 100644 --- a/kscreensaver/kpartsaver/configwidget.ui +++ b/kscreensaver/kpartsaver/configwidget.ui @@ -1,7 +1,7 @@ <!DOCTYPE UI><UI version="3.0" stdsetdef="1"> <class>ConfigWidget</class> <author>Stefan Schimanski <1Stein@gmx.de></author> -<widget class="QDialog"> +<widget class="TQDialog"> <property name="name"> <cstring>ConfigWidget</cstring> </property> @@ -26,7 +26,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QGroupBox"> + <widget class="TQGroupBox"> <property name="name"> <cstring>GroupBox1</cstring> </property> @@ -43,12 +43,12 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QListBox" row="0" column="0" rowspan="2" colspan="1"> + <widget class="TQListBox" row="0" column="0" rowspan="2" colspan="1"> <property name="name"> <cstring>m_files</cstring> </property> </widget> - <widget class="QLayoutWidget" row="0" column="1"> + <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> <cstring>Layout2</cstring> </property> @@ -62,7 +62,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QPushButton" row="2" column="1"> + <widget class="TQPushButton" row="2" column="1"> <property name="name"> <cstring>m_down</cstring> </property> @@ -73,7 +73,7 @@ <string>&Down</string> </property> </widget> - <widget class="QPushButton" row="2" column="0"> + <widget class="TQPushButton" row="2" column="0"> <property name="name"> <cstring>m_up</cstring> </property> @@ -84,7 +84,7 @@ <string>&Up</string> </property> </widget> - <widget class="QPushButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_add</cstring> </property> @@ -92,7 +92,7 @@ <string>&Add...</string> </property> </widget> - <widget class="QPushButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQPushButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_remove</cstring> </property> @@ -118,7 +118,7 @@ </spacer> </grid> </widget> - <widget class="QButtonGroup"> + <widget class="TQButtonGroup"> <property name="name"> <cstring>ButtonGroup1</cstring> </property> @@ -135,7 +135,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QRadioButton" row="0" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="0" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_single</cstring> </property> @@ -153,14 +153,14 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="sizeHint"> + <property name="tqsizeHint"> <size> <width>20</width> <height>21</height> </size> </property> </spacer> - <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2"> + <widget class="TQRadioButton" row="1" column="0" rowspan="1" colspan="2"> <property name="name"> <cstring>m_multiple</cstring> </property> @@ -168,7 +168,7 @@ <string>Switch to another medium after a delay</string> </property> </widget> - <widget class="QLayoutWidget" row="2" column="1"> + <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> <cstring>Layout4</cstring> </property> @@ -182,7 +182,7 @@ <property name="spacing"> <number>6</number> </property> - <widget class="QLabel" row="0" column="0"> + <widget class="TQLabel" row="0" column="0"> <property name="name"> <cstring>m_delayLabel</cstring> </property> @@ -193,7 +193,7 @@ <string>Delay:</string> </property> </widget> - <widget class="QSpinBox" row="0" column="1"> + <widget class="TQSpinBox" row="0" column="1"> <property name="name"> <cstring>m_delay</cstring> </property> @@ -201,7 +201,7 @@ <bool>false</bool> </property> </widget> - <widget class="QCheckBox" row="1" column="0" rowspan="1" colspan="3"> + <widget class="TQCheckBox" row="1" column="0" rowspan="1" colspan="3"> <property name="name"> <cstring>m_random</cstring> </property> @@ -212,7 +212,7 @@ <string>Choose next medium randomly</string> </property> </widget> - <widget class="QLabel" row="0" column="2"> + <widget class="TQLabel" row="0" column="2"> <property name="name"> <cstring>m_secondsLabel</cstring> </property> @@ -238,7 +238,7 @@ </spacer> </grid> </widget> - <widget class="QLayoutWidget"> + <widget class="TQLayoutWidget"> <property name="name"> <cstring>Layout1</cstring> </property> @@ -263,7 +263,7 @@ <enum>Expanding</enum> </property> </spacer> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_ok</cstring> </property> @@ -277,7 +277,7 @@ <bool>true</bool> </property> </widget> - <widget class="QPushButton"> + <widget class="TQPushButton"> <property name="name"> <cstring>m_cancel</cstring> </property> diff --git a/kscreensaver/kpartsaver/kpartsaver.cpp b/kscreensaver/kpartsaver/kpartsaver.cpp index e1699e73..84050b3e 100644 --- a/kscreensaver/kpartsaver/kpartsaver.cpp +++ b/kscreensaver/kpartsaver/kpartsaver.cpp @@ -123,7 +123,7 @@ KPartSaver::KPartSaver( WId id ) // create background widget m_back = new TQLabel( i18n("The screen saver is not configured yet."), this ); - m_back->setAlignment( AlignCenter ); + m_back->tqsetAlignment( AlignCenter ); embed( m_back ); m_back->show(); @@ -187,7 +187,7 @@ bool KPartSaver::openURL( KURL url ) } // create kpart - m_part = (KParts::ReadOnlyPart *)factory->create( this, "kpart", "KParts::ReadOnlyPart" ); + m_part = (KParts::ReadOnlyPart *)factory->create( TQT_TQOBJECT(this), "kpart", "KParts::ReadOnlyPart" ); if( !m_part ) { kdDebug() << "Part for " << url.url() << " can't be constructed" << endl; return false; @@ -257,7 +257,7 @@ void KPartSaver::next( bool random ) // create background widget m_back = new TQLabel( i18n("All of your files are unsupported"), this ); - m_back->setAlignment( AlignCenter ); + m_back->tqsetAlignment( AlignCenter ); embed( m_back ); m_back->show(); @@ -337,7 +337,7 @@ void SaverConfig::apply() void SaverConfig::add() { - KURL::List files = KFileDialog::getOpenURLs( TQString::null, TQString::null, + KURL::List files = KFileDialog::getOpenURLs( TQString(), TQString(), this, i18n("Select Media Files") ); for( unsigned int n=0; n<files.count(); n++ ) m_files->insertItem( files[n].prettyURL(), -1 ); diff --git a/kscreensaver/kpartsaver/kpartsaver.h b/kscreensaver/kpartsaver/kpartsaver.h index 40e9c342..e23dedff 100644 --- a/kscreensaver/kpartsaver/kpartsaver.h +++ b/kscreensaver/kpartsaver/kpartsaver.h @@ -50,6 +50,7 @@ class SaverConfig : public ConfigWidget { Q_OBJECT + TQ_OBJECT public: SaverConfig( TQWidget* parent = 0, const char* name = 0 ); @@ -67,6 +68,7 @@ Q_OBJECT class KPartSaver : public KScreenSaver { Q_OBJECT + TQ_OBJECT public: KPartSaver( WId id=0 ); diff --git a/kscreensaver/kxsconfig/XScreenSaver_ad.h b/kscreensaver/kxsconfig/XScreenSaver_ad.h index 42452482..568338f7 100644 --- a/kscreensaver/kxsconfig/XScreenSaver_ad.h +++ b/kscreensaver/kxsconfig/XScreenSaver_ad.h @@ -366,10 +366,10 @@ "*up.labelString: /\\\\ ", "*frameLabel.labelString: ", "*cmdLabel.labelString: Command Line:", -"*cmdLabel.alignment: ALIGNMENT_BEGINNING", +"*cmdLabel.tqalignment: ALIGNMENT_BEGINNING", "*enabled.labelString: Enabled", "*visLabel.labelString: Visual:", -"*visLabel.alignment: ALIGNMENT_END", +"*visLabel.tqalignment: ALIGNMENT_END", "*visLabel.leftOffset: 20", "*demo.labelString: Demo", "*man.labelString: Documentation...", diff --git a/kscreensaver/kxsconfig/kxsconfig.cpp b/kscreensaver/kxsconfig/kxsconfig.cpp index ca3093de..6020bcdb 100644 --- a/kscreensaver/kxsconfig/kxsconfig.cpp +++ b/kscreensaver/kxsconfig/kxsconfig.cpp @@ -92,11 +92,11 @@ KXSConfigDialog::KXSConfigDialog(const TQString &filename, const TQString &name) bool KXSConfigDialog::create() { TQVBoxLayout *topLayout = new TQVBoxLayout(plainPage(), spacingHint()); - TQHBoxLayout *layout = new TQHBoxLayout(topLayout, spacingHint()); + TQHBoxLayout *tqlayout = new TQHBoxLayout(topLayout, spacingHint()); TQVBox *controlLayout = new TQVBox(plainPage()); controlLayout->setSpacing(spacingHint()); - layout->addWidget(controlLayout); - ((TQBoxLayout*)controlLayout->layout())->addStrut(120); + tqlayout->addWidget(controlLayout); + ((TQBoxLayout*)controlLayout->tqlayout())->addStrut(120); KConfig config(mConfigFile); @@ -118,14 +118,14 @@ bool KXSConfigDialog::create() descr.replace('\n',' '); descr = descr.simplifyWhiteSpace(); TQLabel *l = new TQLabel( i18n( descr.utf8() ), plainPage() ); - l->setAlignment ( WordBreak ); + l->tqsetAlignment ( WordBreak ); topLayout->addWidget( l ); } } else { // fall back to KDE's old config files. int idx = 0; while (true) { - TQString group = TQString("Arg%1").arg(idx); + TQString group = TQString("Arg%1").tqarg(idx); if (config.hasGroup(group)) { config.setGroup(group); TQString type = config.readEntry("Type"); @@ -175,9 +175,9 @@ bool KXSConfigDialog::create() mPreview = new TQWidget(plainPage()); mPreview->setFixedSize(250, 200); // mPreview->setBackgroundMode(TQWidget::NoBackground); - mPreview->setBackgroundColor(Qt::black); + mPreview->setBackgroundColor(TQt::black); - layout->add(mPreview); + tqlayout->add(mPreview); show(); // So that hacks can XSelectInput ButtonPressMask @@ -229,7 +229,7 @@ void KXSConfigDialog::slotPreviewExited(KProcess *) while ( !saver[i].isSpace() ) word += saver[i++]; //work around a KStandarDirs::findExe() "feature" where it looks in $KDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(word); + TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(word); TQString path; checkExe.setFile(saverdir); if (checkExe.exists() && checkExe.isExecutable() && checkExe.isFile()) @@ -354,7 +354,7 @@ int main(int argc, char *argv[]) int dummyargc = 1; progname = dummyargs[0]; - // Teach Xt to use the Display that Qt has already opened. + // Teach Xt to use the Display that TQt has already opened. XtToolkitInitialize (); XtAppContext xtApp = XtCreateApplicationContext (); Display *dpy = qt_xdisplay(); @@ -378,7 +378,7 @@ int main(int argc, char *argv[]) app.exec(); } else { KMessageBox::sorry(0, - i18n("No configuration available for %1").arg(name), + i18n("No configuration available for %1").tqarg(name), name ); } diff --git a/kscreensaver/kxsconfig/kxsconfig.h b/kscreensaver/kxsconfig/kxsconfig.h index cb74eacb..5bda2ed6 100644 --- a/kscreensaver/kxsconfig/kxsconfig.h +++ b/kscreensaver/kxsconfig/kxsconfig.h @@ -31,6 +31,7 @@ class TQLabel; class KXSConfigDialog : public KDialogBase { Q_OBJECT + TQ_OBJECT public: KXSConfigDialog(const TQString &file, const TQString &name); ~KXSConfigDialog(); diff --git a/kscreensaver/kxsconfig/kxscontrol.h b/kscreensaver/kxsconfig/kxscontrol.h index ad75103c..0af889a6 100644 --- a/kscreensaver/kxsconfig/kxscontrol.h +++ b/kscreensaver/kxsconfig/kxscontrol.h @@ -37,6 +37,7 @@ class TQLineEdit; class KXSRangeControl : public TQWidget, public KXSRangeItem { Q_OBJECT + TQ_OBJECT public: KXSRangeControl(TQWidget *parent, const TQString &name, KConfig &config); KXSRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -58,6 +59,7 @@ protected: class KXSDoubleRangeControl : public TQWidget, public KXSDoubleRangeItem { Q_OBJECT + TQ_OBJECT public: KXSDoubleRangeControl(TQWidget *parent, const TQString &name, KConfig &config); KXSDoubleRangeControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -79,6 +81,7 @@ protected: class KXSCheckBoxControl : public TQCheckBox, public KXSBoolItem { Q_OBJECT + TQ_OBJECT public: KXSCheckBoxControl(TQWidget *parent, const TQString &name, KConfig &config); KXSCheckBoxControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -96,6 +99,7 @@ protected slots: class KXSDropListControl : public TQWidget, public KXSSelectItem { Q_OBJECT + TQ_OBJECT public: KXSDropListControl(TQWidget *parent, const TQString &name, KConfig &config); KXSDropListControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -118,6 +122,7 @@ protected: class KXSLineEditControl : public TQWidget, public KXSStringItem { Q_OBJECT + TQ_OBJECT public: KXSLineEditControl(TQWidget *parent, const TQString &name, KConfig &config); KXSLineEditControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); @@ -138,6 +143,7 @@ protected: class KXSFileControl : public TQWidget, public KXSStringItem { Q_OBJECT + TQ_OBJECT public: KXSFileControl(TQWidget *parent, const TQString &name, KConfig &config); KXSFileControl(TQWidget *parent, const TQString &name, const TQXmlAttributes &attr ); diff --git a/kscreensaver/kxsconfig/kxsitem.cpp b/kscreensaver/kxsconfig/kxsitem.cpp index 7d9ab034..022657c0 100644 --- a/kscreensaver/kxsconfig/kxsitem.cpp +++ b/kscreensaver/kxsconfig/kxsitem.cpp @@ -65,7 +65,7 @@ KXSRangeItem::KXSRangeItem(const TQString &name, const TQXmlAttributes &attr ) TQString KXSRangeItem::command() { - return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue); } void KXSRangeItem::read(KConfig &config) @@ -109,7 +109,7 @@ KXSDoubleRangeItem::KXSDoubleRangeItem(const TQString &name, const TQXmlAttribut TQString KXSDoubleRangeItem::command() { - return mSwitch.arg(mInvert?mMaximum-(mValue-mMinimum):mValue); + return mSwitch.tqarg(mInvert?mMaximum-(mValue-mMinimum):mValue); } void KXSDoubleRangeItem::read(KConfig &config) @@ -232,7 +232,7 @@ KXSStringItem::KXSStringItem(const TQString &name, const TQXmlAttributes &attr ) TQString KXSStringItem::command() { if (!mValue.isEmpty()) - return mSwitch.arg(mValue); + return mSwitch.tqarg(mValue); return ""; } diff --git a/kscreensaver/kxsconfig/kxsrun.cpp b/kscreensaver/kxsconfig/kxsrun.cpp index 0f212c10..540d8f6c 100644 --- a/kscreensaver/kxsconfig/kxsrun.cpp +++ b/kscreensaver/kxsconfig/kxsrun.cpp @@ -108,7 +108,7 @@ int main(int argc, char *argv[]) int idx = 0; while (true) { - TQString group = TQString("Arg%1").arg(idx); + TQString group = TQString("Arg%1").tqarg(idx); if (config.hasGroup(group)) { config.setGroup(group); TQString type = config.readEntry("Type"); @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) // find the xscreensaver executable //work around a KStandarDirs::findExe() "feature" where it looks in $KDEDIR/bin first no matter what and sometimes finds the wrong executable TQFileInfo checkExe; - TQString saverdir = TQString("%1/%2").arg(XSCREENSAVER_HACKS_DIR).arg(filename); + TQString saverdir = TQString("%1/%2").tqarg(XSCREENSAVER_HACKS_DIR).tqarg(filename); kdDebug() << "saverdir is" << saverdir << endl; TQString exeFile; checkExe.setFile(saverdir); diff --git a/kscreensaver/kxsconfig/kxsxml.cpp b/kscreensaver/kxsconfig/kxsxml.cpp index e35294dd..6ea0c7b7 100644 --- a/kscreensaver/kxsconfig/kxsxml.cpp +++ b/kscreensaver/kxsconfig/kxsxml.cpp @@ -36,7 +36,7 @@ bool KXSXml::parse( const TQString &filename ) { TQFile file( filename ); handler = new KXSXmlHandler( parent ); - TQXmlInputSource source( &file ); + TQXmlInputSource source( TQT_TQIODEVICE(&file) ); TQXmlSimpleReader reader; reader.setContentHandler( handler ); if ( !reader.parse( &source, FALSE ) ) diff --git a/kscreensaver/kxsconfig/kxsxml.h b/kscreensaver/kxsconfig/kxsxml.h index c7278c20..4f02a33c 100644 --- a/kscreensaver/kxsconfig/kxsxml.h +++ b/kscreensaver/kxsconfig/kxsxml.h @@ -42,7 +42,7 @@ private: KXSXmlHandler *handler; }; -class KXSXmlHandler : public QXmlDefaultHandler +class KXSXmlHandler : public TQXmlDefaultHandler { public: KXSXmlHandler( TQWidget *p ); diff --git a/kscreensaver/xsavers/demowin.h b/kscreensaver/xsavers/demowin.h index d31fc353..9c67d8bb 100644 --- a/kscreensaver/xsavers/demowin.h +++ b/kscreensaver/xsavers/demowin.h @@ -21,9 +21,10 @@ //---------------------------------------------------------------------------- -class DemoWindow : public QWidget +class DemoWindow : public TQWidget { Q_OBJECT + TQ_OBJECT public: DemoWindow() : TQWidget() { diff --git a/kscreensaver/xsavers/helpers.cpp b/kscreensaver/xsavers/helpers.cpp index ef700545..242d2f75 100644 --- a/kscreensaver/xsavers/helpers.cpp +++ b/kscreensaver/xsavers/helpers.cpp @@ -3,27 +3,27 @@ #include <kapplication.h> void min_width(TQWidget *w) { - w->setMinimumWidth(w->sizeHint().width()); + w->setMinimumWidth(w->tqsizeHint().width()); } void fixed_width(TQWidget *w) { - w->setFixedWidth(w->sizeHint().width()); + w->setFixedWidth(w->tqsizeHint().width()); } void min_height(TQWidget *w) { - w->setMinimumHeight(w->sizeHint().height()); + w->setMinimumHeight(w->tqsizeHint().height()); } void fixed_height(TQWidget *w) { - w->setFixedHeight(w->sizeHint().height()); + w->setFixedHeight(w->tqsizeHint().height()); } void min_size(TQWidget *w) { - w->setMinimumSize(w->sizeHint()); + w->setMinimumSize(w->tqsizeHint()); } void fixed_size(TQWidget *w) { - w->setFixedSize(w->sizeHint()); + w->setFixedSize(w->tqsizeHint()); } KConfig *klock_config() diff --git a/kscreensaver/xsavers/main.cpp b/kscreensaver/xsavers/main.cpp index 78e5351d..3cfa4b86 100644 --- a/kscreensaver/xsavers/main.cpp +++ b/kscreensaver/xsavers/main.cpp @@ -87,7 +87,7 @@ int main(int argc, char *argv[]) { demoWidget = new DemoWindow(); demoWidget->setBackgroundMode(TQWidget::NoBackground); -// demoWidget->setBackgroundColor(Qt::black); +// demoWidget->setBackgroundColor(TQt::black); demoWidget->show(); saveWin = demoWidget->winId(); app.setMainWidget(demoWidget); diff --git a/kscreensaver/xsavers/mode.h b/kscreensaver/xsavers/mode.h index c2bc7f1d..10213f0a 100644 --- a/kscreensaver/xsavers/mode.h +++ b/kscreensaver/xsavers/mode.h @@ -38,7 +38,7 @@ typedef struct LockStruct_s { ModeHook *init_hook; /* func to init a mode */ ModeHook *callback_hook; /* func to run (tick) a mode */ ModeHook *release_hook; /* func to shutdown a mode */ - ModeHook *refresh_hook; /* tells mode to repaint */ + ModeHook *refresh_hook; /* tells mode to tqrepaint */ ModeHook *change_hook; /* user wants mode to change */ ModeHook *unused_hook; /* for future expansion */ ModeSpecOpt *msopt; /* this mode's def resources */ @@ -313,10 +313,10 @@ extern ModeHook release_galaxy; extern ModeHook refresh_galaxy; extern ModeSpecOpt galaxy_opts; -extern ModeHook init_geometry; -extern ModeHook draw_geometry; -extern ModeHook release_geometry; -extern ModeHook refresh_geometry; +extern ModeHook init_tqgeometry; +extern ModeHook draw_tqgeometry; +extern ModeHook release_tqgeometry; +extern ModeHook refresh_tqgeometry; extern ModeSpecOpt geometry_opts; extern ModeHook init_grav; @@ -504,11 +504,11 @@ extern ModeHook release_rotor; extern ModeHook refresh_rotor; extern ModeSpecOpt rotor_opts; -extern ModeHook init_shape; -extern ModeHook draw_shape; -extern ModeHook release_shape; -extern ModeHook refresh_shape; -extern ModeSpecOpt shape_opts; +extern ModeHook init_tqshape; +extern ModeHook draw_tqshape; +extern ModeHook release_tqshape; +extern ModeHook refresh_tqshape; +extern ModeSpecOpt tqshape_opts; extern ModeHook init_slip; extern ModeHook draw_slip; diff --git a/kscreensaver/xsavers/saver.h b/kscreensaver/xsavers/saver.h index 318728fc..b531ed4b 100644 --- a/kscreensaver/xsavers/saver.h +++ b/kscreensaver/xsavers/saver.h @@ -10,9 +10,10 @@ extern void stopScreenSaver(); extern int setupScreenSaver(); //----------------------------------------------------------------------------- -class kScreenSaver : public QObject +class kScreenSaver : public TQObject { Q_OBJECT + TQ_OBJECT public: kScreenSaver( Drawable drawable ); virtual ~kScreenSaver(); diff --git a/kscreensaver/xsavers/space.cpp b/kscreensaver/xsavers/space.cpp index 77070ad2..99c7d10d 100644 --- a/kscreensaver/xsavers/space.cpp +++ b/kscreensaver/xsavers/space.cpp @@ -47,7 +47,7 @@ */ #define LONG64 -//#define QT_CLEAN_NAMESPACE +//#define TQT_CLEAN_NAMESPACE #include <tqslider.h> #include <tqlayout.h> @@ -275,7 +275,7 @@ static void Init(void) glDisable(GL_DITHER); } -void reshape(int width, int height) +void retqshape(int width, int height) { windW = (GLint)width; @@ -444,7 +444,7 @@ initSpace(Window window) glClearIndex(BlackPixel(display, screen)); } - reshape(xwa.width, xwa.height); + retqshape(xwa.width, xwa.height); Init(); } @@ -593,7 +593,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Speed:"), page ); vb->addWidget( label ); - slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQSlider::Horizontal, + slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, Qt::Horizontal, page ); vb->addWidget( slider ); slider->setTickmarks(TQSlider::Below); @@ -603,7 +603,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name ) label = new TQLabel( i18n("Warp interval:"), page ); vb->addWidget( label ); - slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval, Horizontal, page ); + slider = new TQSlider(MINWARP, MAXWARP, 3, warpinterval,Qt::Horizontal, page ); vb->addWidget( slider ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(3); @@ -725,8 +725,8 @@ void main(int argc, char **argv) Init(); - tkExposeFunc(Reshape); - tkReshapeFunc(Reshape); + tkExposeFunc(Retqshape); + tkRetqshapeFunc(Retqshape); tkKeyDownFunc(Key); tkIdleFunc(Idle); tkExec(); diff --git a/kscreensaver/xsavers/space.h b/kscreensaver/xsavers/space.h index f20db852..84ad22fc 100644 --- a/kscreensaver/xsavers/space.h +++ b/kscreensaver/xsavers/space.h @@ -11,6 +11,7 @@ class kSpaceSaver : public kScreenSaver { Q_OBJECT + TQ_OBJECT public: kSpaceSaver( Drawable drawable ); virtual ~kSpaceSaver(); @@ -38,6 +39,7 @@ protected: class kSpaceSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kSpaceSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/xsavers/swarm.cpp b/kscreensaver/xsavers/swarm.cpp index efc04c28..5b2c8fae 100644 --- a/kscreensaver/xsavers/swarm.cpp +++ b/kscreensaver/xsavers/swarm.cpp @@ -12,7 +12,7 @@ Contact me in case of problems, not the original author! Last revised: 10-Jul-97 */ -// layout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> +// tqlayout management added 1998/04/19 by Mario Weilguni <mweilguni@kde.org> #define MAXSPEED 100 #define MINSPEED 0 @@ -330,7 +330,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name ) left->addWidget(label); TQSlider *slider = new TQSlider(MINSPEED, MAXSPEED, 10, speed, - Horizontal, main ); + Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(10); @@ -342,7 +342,7 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name ) min_size(label); left->addWidget(label); - slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels, Horizontal, main ); + slider = new TQSlider(MINBATCH, MAXBATCH, 20, maxLevels,Qt::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setTickmarks(TQSlider::Below); slider->setTickInterval(20); diff --git a/kscreensaver/xsavers/swarm.h b/kscreensaver/xsavers/swarm.h index 0e34049c..90dac900 100644 --- a/kscreensaver/xsavers/swarm.h +++ b/kscreensaver/xsavers/swarm.h @@ -15,6 +15,7 @@ class kSwarmSaver : public kScreenSaver { Q_OBJECT + TQ_OBJECT public: kSwarmSaver( Drawable drawable ); virtual ~kSwarmSaver(); @@ -40,6 +41,7 @@ protected: class kSwarmSetup : public KDialogBase { Q_OBJECT + TQ_OBJECT public: kSwarmSetup( TQWidget *parent = NULL, const char *name = NULL ); diff --git a/kscreensaver/xsavers/xlock.h b/kscreensaver/xsavers/xlock.h index ab58fe9c..ff309c63 100644 --- a/kscreensaver/xsavers/xlock.h +++ b/kscreensaver/xsavers/xlock.h @@ -15,7 +15,7 @@ * Changes of David Bagley <bagleyd@source.asset.com> * 12-May-95: Added defines for SunOS's Adjunct password file * Dale A. Harris <rodmur@ecst.csuchico.edu> - * 18-Nov-94: Modified for QNX 4.2 w/ Metrolink X server from Brian Campbell + * 18-Nov-94: Modified for TQNX 4.2 w/ Metrolink X server from Brian Campbell * <brianc@qnx.com>. * 11-Jul-94: added Bool flag: inwindow, which tells xlock to run in a * window from Greg Bowering <greg@cs.adelaide.edu.au> @@ -62,7 +62,7 @@ void initXLock( GC gc ); #define ICONW 64 #define ICONH 64 -#if defined VMS || defined __QNX__ +#if defined VMS || defined __TQNX__ #ifdef VMS /*#define VMS_PLAY*/ #include <unixlib.h> @@ -139,7 +139,7 @@ extern char *text_pass; extern char *text_info; extern char *text_valid; extern char *text_invalid; -extern char *geometry; +extern char *tqgeometry; extern float saturation; extern int nicelevel; extern int delay; diff --git a/kscreensaver/xsavers/xlockmore.h b/kscreensaver/xsavers/xlockmore.h index 496b48f2..277783ae 100644 --- a/kscreensaver/xsavers/xlockmore.h +++ b/kscreensaver/xsavers/xlockmore.h @@ -15,7 +15,7 @@ * Changes of David Bagley <bagleyd@bigfoot.com> * 12-May-95: Added defines for SunOS's Adjunct password file * Dale A. Harris <rodmur@ecst.csuchico.edu> - * 18-Nov-94: Modified for QNX 4.2 w/ Metrolink X server from Brian Campbell + * 18-Nov-94: Modified for TQNX 4.2 w/ Metrolink X server from Brian Campbell * <brianc@qnx.com>. * 11-Jul-94: added Bool flag: inwindow, which tells xlock to run in a * window from Greg Bowering <greg@cs.adelaide.edu.au> |