diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:27:15 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2010-07-31 19:27:15 +0000 |
| commit | b5d38fd2e94066885d4620b0c35c48a2faa5aa44 (patch) | |
| tree | 7e7e611e0e3ef23dc2efd327a7455bcf4d7c9b7f /kscreensaver/kdesavers | |
| parent | 019ebb9a949a97c898e5d563f0699a3ff49e6588 (diff) | |
| download | tdeartwork-b5d38fd2e94066885d4620b0c35c48a2faa5aa44.tar.gz tdeartwork-b5d38fd2e94066885d4620b0c35c48a2faa5aa44.zip | |
Trinity Qt initial conversion
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeartwork@1157637 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kscreensaver/kdesavers')
42 files changed, 942 insertions, 942 deletions
diff --git a/kscreensaver/kdesavers/Euphoria.cpp b/kscreensaver/kdesavers/Euphoria.cpp index 740e957c..dacc60e5 100644 --- a/kscreensaver/kdesavers/Euphoria.cpp +++ b/kscreensaver/kdesavers/Euphoria.cpp @@ -28,7 +28,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include <qtimer.h> +#include <tqtimer.h> #include "Euphoria.h" #include "Euphoria.moc" #include "EuphoriaTexture.h" @@ -457,15 +457,15 @@ void wisp::drawAsBackground() //---------------------------------------------------------------------------- -EuphoriaWidget::EuphoriaWidget( QWidget* parent, const char* name ) - : QGLWidget(parent, name), texName(0), _wisps(0), _backwisps(0), +EuphoriaWidget::EuphoriaWidget( TQWidget* parent, const char* name ) + : TQGLWidget(parent, name), texName(0), _wisps(0), _backwisps(0), feedbackmap(0), feedbacktex(0) { setDefaults( Regular ); _frameTime = 1000 / 60; - _timer = new QTimer( this ); - connect( _timer, SIGNAL(timeout()), this, SLOT(nextFrame()) ); + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) ); } @@ -636,7 +636,7 @@ void EuphoriaWidget::initializeGL() #ifdef UNIT_TEST -void EuphoriaWidget::keyPressEvent( QKeyEvent* e ) +void EuphoriaWidget::keyPressEvent( TQKeyEvent* e ) { if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } @@ -905,7 +905,7 @@ extern "C" return new KEuphoriaScreenSaver( id ); } - KDE_EXPORT QDialog* kss_setup() + KDE_EXPORT TQDialog* kss_setup() { return new KEuphoriaSetup; } @@ -966,9 +966,9 @@ void KEuphoriaScreenSaver::setMode( int id ) //---------------------------------------------------------------------------- -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <kmessagebox.h> @@ -988,22 +988,22 @@ static const char* defaultText[] = }; -KEuphoriaSetup::KEuphoriaSetup( QWidget* parent, const char* name ) +KEuphoriaSetup::KEuphoriaSetup( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n("Setup Euphoria Screen Saver"), Ok|Cancel|Help, Ok, true ) { setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout* top = new QHBoxLayout(main, 0, spacingHint()); - QVBoxLayout* leftCol = new QVBoxLayout; + TQHBoxLayout* top = new TQHBoxLayout(main, 0, spacingHint()); + TQVBoxLayout* leftCol = new QVBoxLayout; top->addLayout( leftCol ); - QLabel* label = new QLabel( i18n("Mode:"), main ); + TQLabel* label = new TQLabel( i18n("Mode:"), main ); leftCol->addWidget( label ); - modeW = new QComboBox( main ); + modeW = new TQComboBox( main ); int i = 0; while (defaultText[i]) modeW->insertItem( i18n(defaultText[i++]) ); @@ -1012,8 +1012,8 @@ KEuphoriaSetup::KEuphoriaSetup( QWidget* parent, const char* name ) leftCol->addStretch(); // Preview - QWidget* preview; - preview = new QWidget( main ); + TQWidget* preview; + preview = new TQWidget( main ); preview->setFixedSize( 220, 170 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -1022,7 +1022,7 @@ KEuphoriaSetup::KEuphoriaSetup( QWidget* parent, const char* name ) // Now that we have _saver... modeW->setCurrentItem( _saver->mode() ); // set before we connect - connect( modeW, SIGNAL(activated(int)), _saver, SLOT(setMode(int)) ); + connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) ); setMinimumSize( sizeHint() ); } @@ -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>"), - QString::null, KMessageBox::AllowLink); + TQString::null, KMessageBox::AllowLink); } @@ -1050,7 +1050,7 @@ void KEuphoriaSetup::slotOk() KConfig* config = KGlobal::config(); config->setGroup("Settings"); - QString val; + TQString val; val.setNum( modeW->currentItem() ); config->writeEntry("Mode", val ); @@ -1065,11 +1065,11 @@ void KEuphoriaSetup::slotOk() // moc Euphoria.h -o Euphoria.moc // g++ -g -DUNIT_TEST Euphoria.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL -#include <qapplication.h> +#include <tqapplication.h> int main( int argc, char** argv ) { - QApplication app( argc, argv ); + TQApplication app( argc, argv ); EuphoriaWidget w; w.setDefaults( EuphoriaWidget::UHFTEM ); diff --git a/kscreensaver/kdesavers/Euphoria.h b/kscreensaver/kdesavers/Euphoria.h index b7de2677..c2a8112a 100644 --- a/kscreensaver/kdesavers/Euphoria.h +++ b/kscreensaver/kdesavers/Euphoria.h @@ -10,7 +10,7 @@ //============================================================================ -#include <qgl.h> +#include <tqgl.h> #include <kdialogbase.h> @@ -37,7 +37,7 @@ public: DefaultModes }; - EuphoriaWidget( QWidget* parent=0, const char* name=0 ); + EuphoriaWidget( TQWidget* parent=0, const char* name=0 ); ~EuphoriaWidget(); void updateParameters(); @@ -49,7 +49,7 @@ protected: void resizeGL( int w, int h ); void initializeGL(); #ifdef UNIT_TEST - void keyPressEvent( QKeyEvent* ); + void keyPressEvent( TQKeyEvent* ); #endif private slots: @@ -93,10 +93,10 @@ private: int dPriority; - // Using QTimer rather than timerEvent() to avoid getting locked out of - // the QEvent loop on lower-end systems. Ian Geiser <[email protected]> + // Using TQTimer rather than timerEvent() to avoid getting locked out of + // the TQEvent loop on lower-end systems. Ian Geiser <[email protected]> // says this is the way to go. - QTimer* _timer; + TQTimer* _timer; int _frameTime; friend class wisp; @@ -104,7 +104,7 @@ private: #ifndef UNIT_TEST -#include <qdialog.h> +#include <tqdialog.h> #include <kscreensaver.h> @@ -139,7 +139,7 @@ class KEuphoriaSetup : public KDialogBase Q_OBJECT public: - KEuphoriaSetup( QWidget* parent = 0, const char* name = 0 ); + KEuphoriaSetup( TQWidget* parent = 0, const char* name = 0 ); ~KEuphoriaSetup(); private slots: @@ -147,7 +147,7 @@ private slots: void slotOk(); private: - QComboBox* modeW; + TQComboBox* modeW; KEuphoriaScreenSaver* _saver; }; #endif diff --git a/kscreensaver/kdesavers/Flux.cpp b/kscreensaver/kdesavers/Flux.cpp index 403c07b6..43cdd2a5 100644 --- a/kscreensaver/kdesavers/Flux.cpp +++ b/kscreensaver/kdesavers/Flux.cpp @@ -36,7 +36,7 @@ #include <stdlib.h> #include <math.h> #include <time.h> -#include <qtimer.h> +#include <tqtimer.h> #include "Flux.h" #include "Flux.moc" @@ -429,14 +429,14 @@ void flux::update() //---------------------------------------------------------------------------- -FluxWidget::FluxWidget( QWidget* parent, const char* name ) - : QGLWidget(parent, name), _fluxes(0) +FluxWidget::FluxWidget( TQWidget* parent, const char* name ) + : TQGLWidget(parent, name), _fluxes(0) { setDefaults( Regular ); _frameTime = 1000 / 60; - _timer = new QTimer( this ); - connect( _timer, SIGNAL(timeout()), this, SLOT(nextFrame()) ); + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) ); } @@ -544,7 +544,7 @@ void FluxWidget::initializeGL() #ifdef UNIT_TEST -void FluxWidget::keyPressEvent( QKeyEvent* e ) +void FluxWidget::keyPressEvent( TQKeyEvent* e ) { if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } @@ -789,7 +789,7 @@ extern "C" return new KFluxScreenSaver( id ); } - KDE_EXPORT QDialog* kss_setup() + KDE_EXPORT TQDialog* kss_setup() { return new KFluxSetup; } @@ -850,10 +850,10 @@ void KFluxScreenSaver::setMode( int id ) //---------------------------------------------------------------------------- -#include <qlayout.h> -#include <qpushbutton.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqpushbutton.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <kbuttonbox.h> #include <kmessagebox.h> @@ -871,22 +871,22 @@ static const char* defaultText[] = }; -KFluxSetup::KFluxSetup( QWidget* parent, const char* name ) +KFluxSetup::KFluxSetup( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Setup Flux Screen Saver" ), Ok|Cancel|Help, Ok, true ) { setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout* top = new QHBoxLayout( main, 0, spacingHint() ); - QVBoxLayout* leftCol = new QVBoxLayout; + TQHBoxLayout* top = new TQHBoxLayout( main, 0, spacingHint() ); + TQVBoxLayout* leftCol = new QVBoxLayout; top->addLayout( leftCol ); // Parameters - QLabel* label = new QLabel( i18n("Mode:"), main ); + TQLabel* label = new TQLabel( i18n("Mode:"), main ); leftCol->addWidget( label ); - modeW = new QComboBox( main ); + modeW = new TQComboBox( main ); int i = 0; while (defaultText[i]) modeW->insertItem( i18n(defaultText[i++]) ); @@ -895,8 +895,8 @@ KFluxSetup::KFluxSetup( QWidget* parent, const char* name ) leftCol->addStretch(); // Preview - QWidget* preview; - preview = new QWidget( main ); + TQWidget* preview; + preview = new TQWidget( main ); preview->setFixedSize( 220, 165 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -905,7 +905,7 @@ KFluxSetup::KFluxSetup( QWidget* parent, const char* name ) // Now that we have _saver... modeW->setCurrentItem( _saver->mode() ); // set before we connect - connect( modeW, SIGNAL(activated(int)), _saver, SLOT(setMode(int)) ); + connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) ); } @@ -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>"), - QString::null, KMessageBox::AllowLink); + TQString::null, KMessageBox::AllowLink); } @@ -931,7 +931,7 @@ void KFluxSetup::slotOk() KConfig* config = KGlobal::config(); config->setGroup("Settings"); - QString val; + TQString val; val.setNum( modeW->currentItem() ); config->writeEntry("Mode", val ); @@ -948,11 +948,11 @@ void KFluxSetup::slotOk() // moc Flux.h -o Flux.moc // g++ -g -DUNIT_TEST Flux.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL -#include <qapplication.h> +#include <tqapplication.h> int main( int argc, char** argv ) { - QApplication app( argc, argv ); + TQApplication app( argc, argv ); FluxWidget w; w.setDefaults( FluxWidget::Sparklers ); diff --git a/kscreensaver/kdesavers/Flux.h b/kscreensaver/kdesavers/Flux.h index 7fe20172..638e9cd3 100644 --- a/kscreensaver/kdesavers/Flux.h +++ b/kscreensaver/kdesavers/Flux.h @@ -10,7 +10,7 @@ //============================================================================ -#include <qgl.h> +#include <tqgl.h> #define LIGHTSIZE 64 @@ -37,7 +37,7 @@ public: DefaultModes }; - FluxWidget( QWidget* parent=0, const char* name=0 ); + FluxWidget( TQWidget* parent=0, const char* name=0 ); ~FluxWidget(); void setDefaults( int which ); @@ -49,7 +49,7 @@ protected: void resizeGL( int w, int h ); void initializeGL(); #ifdef UNIT_TEST - void keyPressEvent( QKeyEvent* ); + void keyPressEvent( TQKeyEvent* ); #endif private slots: @@ -80,10 +80,10 @@ private: flux* _fluxes; - // Using QTimer rather than timerEvent() to avoid getting locked out of - // the QEvent loop on lower-end systems. Ian Geiser <[email protected]> + // Using TQTimer rather than timerEvent() to avoid getting locked out of + // the TQEvent loop on lower-end systems. Ian Geiser <[email protected]> // says this is the way to go. - QTimer* _timer; + TQTimer* _timer; int _frameTime; friend class flux; @@ -128,7 +128,7 @@ class KFluxSetup : public KDialogBase public: - KFluxSetup( QWidget* parent = 0, const char* name = 0 ); + KFluxSetup( TQWidget* parent = 0, const char* name = 0 ); ~KFluxSetup(); private slots: @@ -138,7 +138,7 @@ private slots: private: - QComboBox* modeW; + TQComboBox* modeW; KFluxScreenSaver* _saver; }; #endif diff --git a/kscreensaver/kdesavers/SolarWinds.cpp b/kscreensaver/kdesavers/SolarWinds.cpp index ee3743c0..7220f1d6 100644 --- a/kscreensaver/kdesavers/SolarWinds.cpp +++ b/kscreensaver/kdesavers/SolarWinds.cpp @@ -28,7 +28,7 @@ #include <math.h> #include <stdlib.h> #include <time.h> -#include <qtimer.h> +#include <tqtimer.h> #include "SolarWinds.h" #include "SolarWinds.moc" @@ -310,14 +310,14 @@ void wind::update() //---------------------------------------------------------------------------- -SWindsWidget::SWindsWidget( QWidget* parent, const char* name ) - : QGLWidget(parent, name), _winds(0) +SWindsWidget::SWindsWidget( TQWidget* parent, const char* name ) + : TQGLWidget(parent, name), _winds(0) { setDefaults( Regular ); _frameTime = 1000 / 60; - _timer = new QTimer( this ); - connect( _timer, SIGNAL(timeout()), this, SLOT(nextFrame()) ); + _timer = new TQTimer( this ); + connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) ); } @@ -397,7 +397,7 @@ void SWindsWidget::initializeGL() #ifdef UNIT_TEST -void SWindsWidget::keyPressEvent( QKeyEvent* e ) +void SWindsWidget::keyPressEvent( TQKeyEvent* e ) { if( e->key() == Qt::Key_0 ) { setDefaults( 0 ); updateParameters(); } if( e->key() == Qt::Key_1 ) { setDefaults( 1 ); updateParameters(); } @@ -603,7 +603,7 @@ extern "C" return new KSWindsScreenSaver( id ); } - KDE_EXPORT QDialog* kss_setup() + KDE_EXPORT TQDialog* kss_setup() { return new KSWindsSetup; } @@ -664,9 +664,9 @@ void KSWindsScreenSaver::setMode( int id ) //---------------------------------------------------------------------------- -#include <qlayout.h> -#include <qlabel.h> -#include <qcombobox.h> +#include <tqlayout.h> +#include <tqlabel.h> +#include <tqcombobox.h> #include <kmessagebox.h> @@ -683,22 +683,22 @@ static const char* defaultText[] = }; -KSWindsSetup::KSWindsSetup( QWidget* parent, const char* name ) +KSWindsSetup::KSWindsSetup( TQWidget* parent, const char* name ) : KDialogBase( parent, name, true, i18n( "Setup Solar Wind" ), Ok|Cancel|Help, Ok, true ) { setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout* top = new QHBoxLayout( main, 0, spacingHint() ); + TQHBoxLayout* top = new TQHBoxLayout( main, 0, spacingHint() ); - QVBoxLayout* leftCol = new QVBoxLayout; + TQVBoxLayout* leftCol = new QVBoxLayout; top->addLayout( leftCol ); - QLabel* label = new QLabel( i18n("Mode:"), main ); + TQLabel* label = new TQLabel( i18n("Mode:"), main ); leftCol->addWidget( label ); - modeW = new QComboBox( main ); + modeW = new TQComboBox( main ); int i = 0; while (defaultText[i]) modeW->insertItem( i18n(defaultText[i++]) ); @@ -707,8 +707,8 @@ KSWindsSetup::KSWindsSetup( QWidget* parent, const char* name ) leftCol->addStretch(); // Preview - QWidget* preview; - preview = new QWidget( main ); + TQWidget* preview; + preview = new TQWidget( main ); preview->setFixedSize( 220, 165 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -717,7 +717,7 @@ KSWindsSetup::KSWindsSetup( QWidget* parent, const char* name ) // Now that we have _saver... modeW->setCurrentItem( _saver->mode() ); // set before we connect - connect( modeW, SIGNAL(activated(int)), _saver, SLOT(setMode(int)) ); + connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) ); } @@ -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>"), - QString::null, KMessageBox::AllowLink); + TQString::null, KMessageBox::AllowLink); } @@ -743,7 +743,7 @@ void KSWindsSetup::slotOk() KConfig* config = KGlobal::config(); config->setGroup("Settings"); - QString val; + TQString val; val.setNum( modeW->currentItem() ); config->writeEntry("Mode", val ); @@ -760,11 +760,11 @@ void KSWindsSetup::slotOk() // moc SolarWinds.h -o SolarWinds.moc // g++ -g -DUNIT_TEST SolarWinds.cpp -I/usr/lib/qt3/include -lqt -L/usr/lib/qt3/lib -lGLU -lGL -#include <qapplication.h> +#include <tqapplication.h> int main( int argc, char** argv ) { - QApplication app( argc, argv ); + TQApplication app( argc, argv ); SWindsWidget w; app.setMainWidget( &w ); diff --git a/kscreensaver/kdesavers/SolarWinds.h b/kscreensaver/kdesavers/SolarWinds.h index 8831c015..a5646715 100644 --- a/kscreensaver/kdesavers/SolarWinds.h +++ b/kscreensaver/kdesavers/SolarWinds.h @@ -10,7 +10,7 @@ //============================================================================ -#include <qgl.h> +#include <tqgl.h> #define LIGHTSIZE 64 @@ -37,7 +37,7 @@ public: DefaultModes }; - SWindsWidget( QWidget* parent=0, const char* name=0 ); + SWindsWidget( TQWidget* parent=0, const char* name=0 ); ~SWindsWidget(); void updateParameters(); @@ -49,7 +49,7 @@ protected: void resizeGL( int w, int h ); void initializeGL(); #ifdef UNIT_TEST - void keyPressEvent( QKeyEvent* ); + void keyPressEvent( TQKeyEvent* ); #endif private slots: @@ -72,10 +72,10 @@ private: int dBlur; - // Using QTimer rather than timerEvent() to avoid getting locked out of - // the QEvent loop on lower-end systems. Ian Geiser <[email protected]> + // Using TQTimer rather than timerEvent() to avoid getting locked out of + // the TQEvent loop on lower-end systems. Ian Geiser <[email protected]> // says this is the way to go. - QTimer* _timer; + TQTimer* _timer; int _frameTime; friend class wind; @@ -119,7 +119,7 @@ class KSWindsSetup : public KDialogBase public: - KSWindsSetup( QWidget* parent = 0, const char* name = 0 ); + KSWindsSetup( TQWidget* parent = 0, const char* name = 0 ); ~KSWindsSetup(); private slots: @@ -129,7 +129,7 @@ private slots: private: - QComboBox* modeW; + TQComboBox* modeW; KSWindsScreenSaver* _saver; }; #endif diff --git a/kscreensaver/kdesavers/banner.cpp b/kscreensaver/kdesavers/banner.cpp index 5309c05a..e3322dc5 100644 --- a/kscreensaver/kdesavers/banner.cpp +++ b/kscreensaver/kdesavers/banner.cpp @@ -14,16 +14,16 @@ // 2003/09/06 Converted to use KDialogBase - Nadeem Hasan <[email protected]> #include <stdlib.h> -#include <qlabel.h> -#include <qlineedit.h> -#include <qcombobox.h> -#include <qcheckbox.h> -#include <qgroupbox.h> -#include <qslider.h> -#include <qlayout.h> -#include <qdatetime.h> -#include <qfontdatabase.h> -#include <qpainter.h> +#include <tqlabel.h> +#include <tqlineedit.h> +#include <tqcombobox.h> +#include <tqcheckbox.h> +#include <tqgroupbox.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqdatetime.h> +#include <tqfontdatabase.h> +#include <tqpainter.h> #include <kapplication.h> #include <krandomsequence.h> @@ -49,7 +49,7 @@ extern "C" return new KBannerSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KBannerSetup(); } @@ -57,71 +57,71 @@ extern "C" //----------------------------------------------------------------------------- -KBannerSetup::KBannerSetup( QWidget *parent, const char *name ) +KBannerSetup::KBannerSetup( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Banner Screen Saver" ), Ok|Cancel|Help, Ok, true ), saver( 0 ), ed(0), speed( 50 ) { setButtonText( Help, i18n( "A&bout" ) ); readSettings(); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QLabel *label; + TQLabel *label; - QVBoxLayout *tl = new QVBoxLayout(main, 0, spacingHint()); - QHBoxLayout *tl1 = new QHBoxLayout( 0, 0, spacingHint() ); + TQVBoxLayout *tl = new TQVBoxLayout(main, 0, spacingHint()); + TQHBoxLayout *tl1 = new TQHBoxLayout( 0, 0, spacingHint() ); tl->addLayout(tl1); - QVBoxLayout *tl11 = new QVBoxLayout( 0, 0, spacingHint() ); + TQVBoxLayout *tl11 = new TQVBoxLayout( 0, 0, spacingHint() ); tl1->addLayout(tl11); - QGroupBox *group = new QGroupBox( 0, Vertical, i18n("Font"), main ); - QGridLayout *gl = new QGridLayout(group->layout(), 6, 2, spacingHint() ); + TQGroupBox *group = new TQGroupBox( 0, Vertical, i18n("Font"), main ); + TQGridLayout *gl = new TQGridLayout(group->layout(), 6, 2, spacingHint() ); - label = new QLabel( i18n("Family:"), group ); + label = new TQLabel( i18n("Family:"), group ); gl->addWidget(label, 1, 0); - KFontCombo* comboFonts = new KFontCombo( QFontDatabase().families(), group ); + KFontCombo* comboFonts = new KFontCombo( TQFontDatabase().families(), group ); comboFonts->setCurrentFont( fontFamily ); gl->addWidget(comboFonts, 1, 1); - connect( comboFonts, SIGNAL( activated( const QString& ) ), - SLOT( slotFamily( const QString& ) ) ); + connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ), + TQT_SLOT( slotFamily( const TQString& ) ) ); - label = new QLabel( i18n("Size:"), group ); + label = new TQLabel( i18n("Size:"), group ); gl->addWidget(label, 2, 0); - comboSizes = new QComboBox( TRUE, group ); + comboSizes = new TQComboBox( TRUE, group ); fillFontSizes(); gl->addWidget(comboSizes, 2, 1); - connect( comboSizes, SIGNAL( activated( int ) ), SLOT( slotSize( int ) ) ); - connect( comboSizes, SIGNAL( textChanged( const QString & ) ), - SLOT( slotSizeEdit( const QString & ) ) ); + connect( comboSizes, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSize( int ) ) ); + connect( comboSizes, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SLOT( slotSizeEdit( const TQString & ) ) ); - QCheckBox *cb = new QCheckBox( i18n("Bold"), + TQCheckBox *cb = new TQCheckBox( i18n("Bold"), group ); cb->setChecked( bold ); - connect( cb, SIGNAL( toggled( bool ) ), SLOT( slotBold( bool ) ) ); + connect( cb, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotBold( bool ) ) ); gl->addWidget(cb, 3, 0); - cb = new QCheckBox( i18n("Italic"), group ); + cb = new TQCheckBox( i18n("Italic"), group ); cb->setChecked( italic ); gl->addWidget(cb, 3, 1); - connect( cb, SIGNAL( toggled( bool ) ), SLOT( slotItalic( bool ) ) ); + connect( cb, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotItalic( bool ) ) ); - label = new QLabel( i18n("Color:"), group ); + label = new TQLabel( i18n("Color:"), group ); gl->addWidget(label, 4, 0); colorPush = new KColorButton( fontColor, group ); gl->addWidget(colorPush, 4, 1); - connect( colorPush, SIGNAL( changed(const QColor &) ), - SLOT( slotColor(const QColor &) ) ); + connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ), + TQT_SLOT( slotColor(const TQColor &) ) ); - QCheckBox *cyclingColorCb=new QCheckBox(i18n("Cycling color"),group); + TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group); cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint()); gl->addMultiCellWidget(cyclingColorCb,5,5,0,1); - connect(cyclingColorCb,SIGNAL(toggled(bool)),this,SLOT(slotCyclingColor(bool))); + connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool))); cyclingColorCb->setChecked(cyclingColor); - preview = new QWidget( main ); + preview = new TQWidget( main ); preview->setFixedSize( 220, 170 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -130,34 +130,34 @@ KBannerSetup::KBannerSetup( QWidget *parent, const char *name ) tl11->addWidget(group); - label = new QLabel( i18n("Speed:"), main ); + label = new TQLabel( i18n("Speed:"), main ); tl11->addStretch(1); tl11->addWidget(label); - QSlider *sb = new QSlider(0, 100, 10, speed, QSlider::Horizontal, main ); + TQSlider *sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main ); sb->setMinimumWidth( 180); sb->setFixedHeight(20); - sb->setTickmarks(QSlider::Below); + sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); tl11->addWidget(sb); - connect( sb, SIGNAL( valueChanged( int ) ), SLOT( slotSpeed( int ) ) ); + connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) ); - QHBoxLayout *tl2 = new QHBoxLayout; + TQHBoxLayout *tl2 = new QHBoxLayout; tl->addLayout(tl2); - label = new QLabel( i18n("Message:"), main ); + label = new TQLabel( i18n("Message:"), main ); tl2->addWidget(label); - ed = new QLineEdit( main ); + ed = new TQLineEdit( main ); tl2->addWidget(ed); ed->setText( message ); - connect( ed, SIGNAL( textChanged( const QString & ) ), - SLOT( slotMessage( const QString & ) ) ); + connect( ed, TQT_SIGNAL( textChanged( const TQString & ) ), + TQT_SLOT( slotMessage( const TQString & ) ) ); - QCheckBox *timeCb=new QCheckBox( i18n("Show current time"), main); + TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main); timeCb->setFixedSize(timeCb->sizeHint()); tl->addWidget(timeCb,0,Qt::AlignLeft); - connect(timeCb,SIGNAL(toggled(bool)),this,SLOT(slotTimeToggled(bool))); + connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool))); timeCb->setChecked(showTime); tl->addStretch(); @@ -177,7 +177,7 @@ void KBannerSetup::readSettings() message=config->readEntry("Message","KDE"); showTime=config->readBoolEntry("ShowTime",FALSE); - fontFamily=config->readEntry("FontFamily",(QApplication::font()).family()); + fontFamily=config->readEntry("FontFamily",(TQApplication::font()).family()); fontSize=config->readNumEntry("FontSize",48); fontColor.setNamedColor(config->readEntry("FontColor","red")); cyclingColor=config->readBoolEntry("CyclingColor",FALSE); @@ -191,12 +191,12 @@ void KBannerSetup::fillFontSizes() comboSizes->blockSignals( true ); comboSizes->clear(); int i = 0; - sizes = QFontDatabase().pointSizes( fontFamily ); + sizes = TQFontDatabase().pointSizes( fontFamily ); sizes << 96 << 128 << 156 << 0; int current = 0; while ( sizes[i] ) { - QString num; + TQString num; num.setNum( sizes[i] ); comboSizes->insertItem( num, i ); if ( fontSize == sizes[i] ) // fontsize equals one of the defined ones @@ -209,7 +209,7 @@ void KBannerSetup::fillFontSizes() } if ( current == 0 ) // fontsize seems to be entered by hand { - QString fsize; + TQString fsize; fsize.setNum( fontSize ); comboSizes->setEditText(fsize); slotSizeEdit( fsize ); @@ -217,7 +217,7 @@ void KBannerSetup::fillFontSizes() comboSizes->blockSignals( block ); } -void KBannerSetup::slotFamily( const QString& fam ) +void KBannerSetup::slotFamily( const TQString& fam ) { fontFamily = fam; fillFontSizes(); // different font, different sizes @@ -232,7 +232,7 @@ void KBannerSetup::slotSize( int indx ) saver->setFont( fontFamily, fontSize, fontColor, bold, italic ); } -void KBannerSetup::slotSizeEdit( const QString& fs ) +void KBannerSetup::slotSizeEdit( const TQString& fs ) { bool ok; fontSize = fs.toInt( &ok, 10 ); @@ -241,7 +241,7 @@ void KBannerSetup::slotSizeEdit( const QString& fs ) saver->setFont( fontFamily, fontSize, fontColor, bold, italic ); } -void KBannerSetup::slotColor( const QColor &col ) +void KBannerSetup::slotColor( const TQColor &col ) { fontColor = col; if ( saver ) @@ -282,7 +282,7 @@ void KBannerSetup::slotSpeed( int num ) saver->setSpeed( speed ); } -void KBannerSetup::slotMessage( const QString &msg ) +void KBannerSetup::slotMessage( const TQString &msg ) { message = msg; if ( saver ) @@ -316,7 +316,7 @@ void KBannerSetup::slotOk() config->writeEntry( "ShowTime", showTime ); config->writeEntry( "FontFamily", fontFamily ); - QString fsize; + TQString fsize; if (fontSize == 0) // an non-number was entered in the font size combo { fontSize = 48; @@ -324,7 +324,7 @@ void KBannerSetup::slotOk() fsize.setNum( fontSize ); config->writeEntry( "FontSize", fsize ); - QString colName; + TQString colName; colName.sprintf( "#%02x%02x%02x", fontColor.red(), fontColor.green(), fontColor.blue() ); config->writeEntry( "FontColor", colName ); @@ -350,17 +350,17 @@ KBannerSaver::KBannerSaver( WId id ) : KScreenSaver( id ) krnd = new KRandomSequence(); readSettings(); initialize(); - colorContext = QColor::enterAllocContext(); + colorContext = TQColor::enterAllocContext(); needBlank = TRUE; timer.start( speed ); - connect( &timer, SIGNAL( timeout() ), SLOT( slotTimeout() ) ); + connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); } KBannerSaver::~KBannerSaver() { timer.stop(); - QColor::leaveAllocContext(); - QColor::destroyAllocContext( colorContext ); + TQColor::leaveAllocContext(); + TQColor::destroyAllocContext( colorContext ); delete krnd; } @@ -372,7 +372,7 @@ void KBannerSaver::setSpeed( int spd ) timer.start( speed ); } -void KBannerSaver::setFont( const QString& family, int size, const QColor &color, +void KBannerSaver::setFont( const TQString& family, int size, const TQColor &color, bool b, bool i ) { fontFamily = family; @@ -384,7 +384,7 @@ void KBannerSaver::setFont( const QString& family, int size, const QColor &color initialize(); } -void KBannerSaver::setColor(QColor &color) +void KBannerSaver::setColor(TQColor &color) { fontColor = color; cyclingColor = FALSE; @@ -397,18 +397,18 @@ void KBannerSaver::setCyclingColor( bool on ) needUpdate = TRUE; } -void KBannerSaver::setMessage( const QString &msg ) +void KBannerSaver::setMessage( const TQString &msg ) { showTime = FALSE; message = msg; - pixmapSize = QSize(); + pixmapSize = TQSize(); needBlank = TRUE; } void KBannerSaver::setTimeDisplay() { showTime = TRUE; - pixmapSize = QSize(); + pixmapSize = TQSize(); needBlank = TRUE; } @@ -424,7 +424,7 @@ void KBannerSaver::readSettings() showTime=config->readBoolEntry("ShowTime",FALSE); - fontFamily=config->readEntry("FontFamily",(QApplication::font()).family()); + fontFamily=config->readEntry("FontFamily",(TQApplication::font()).family()); fontSize=config->readNumEntry("FontSize",48); @@ -445,16 +445,16 @@ void KBannerSaver::readSettings() // initialize font void KBannerSaver::initialize() { - fsize = fontSize * height() / QApplication::desktop()->height(); + fsize = fontSize * height() / TQApplication::desktop()->height(); - font = QFont( fontFamily, fsize, bold ? QFont::Bold : QFont::Normal, italic ); + font = TQFont( fontFamily, fsize, bold ? TQFont::Bold : TQFont::Normal, italic ); - pixmapSize = QSize(); + pixmapSize = TQSize(); needBlank = TRUE; xpos = width(); ypos = fsize + (int) ((double)(height()-fsize)*krnd->getDouble()); - step = 2 * width() / QApplication::desktop()->width(); // 6 -> 2 -hhjb- + step = 2 * width() / TQApplication::desktop()->width(); // 6 -> 2 -hhjb- if ( step == 0 ) step = 1; } @@ -470,22 +470,22 @@ void KBannerSaver::slotTimeout() } if (showTime) { - QString new_message = KGlobal::locale()->formatTime(QTime::currentTime(), true); + TQString new_message = KGlobal::locale()->formatTime(TQTime::currentTime(), true); if( new_message != message ) needUpdate = TRUE; message = new_message; } if ( !pixmapSize.isValid() || cyclingColor || needUpdate || needBlank ) { - QRect rect = QFontMetrics( font ).boundingRect( message ); + TQRect rect = TQFontMetrics( font ).boundingRect( message ); rect.setWidth( rect.width() + step ); if ( rect.width() > pixmapSize.width() ) pixmapSize.setWidth( rect.width() ); if ( rect.height() > pixmapSize.height() ) pixmapSize.setHeight( rect.height() ); - pixmap = QPixmap( pixmapSize ); + pixmap = TQPixmap( pixmapSize ); pixmap.fill( black ); - QPainter p( &pixmap ); + TQPainter p( &pixmap ); p.setFont( font ); p.setPen( fontColor ); p.drawText( -rect.x(), -rect.y(), message ); @@ -493,7 +493,7 @@ void KBannerSaver::slotTimeout() } xpos -= step; if ( xpos < -pixmapSize.width() ) { - QPainter p( this ); + TQPainter p( this ); p.fillRect( xpos + step, ypos, pixmapSize.width(), pixmapSize.height(), black ); xpos = width(); ypos = fsize + (int) ((double)(height()-2.0*fsize)*krnd->getDouble()); diff --git a/kscreensaver/kdesavers/banner.h b/kscreensaver/kdesavers/banner.h index 026b817d..1c1c57db 100644 --- a/kscreensaver/kdesavers/banner.h +++ b/kscreensaver/kdesavers/banner.h @@ -8,7 +8,7 @@ #ifndef __BANNER_H__ #define __BANNER_H__ -#include <qtimer.h> +#include <tqtimer.h> #include <kscreensaver.h> #include <kdialogbase.h> @@ -28,12 +28,12 @@ public: virtual ~KBannerSaver(); void setSpeed( int spd ); - void setFont( const QString &family, int size, const QColor &color, + void setFont( const TQString &family, int size, const TQColor &color, bool b, bool i ); - void setMessage( const QString &msg ); + void setMessage( const TQString &msg ); void setTimeDisplay(); void setCyclingColor(bool on); - void setColor( QColor &color); + void setColor( TQColor &color); private: void readSettings(); @@ -43,7 +43,7 @@ protected slots: void slotTimeout(); protected: - QFont font; + TQFont font; QTimer timer; QString fontFamily; int fontSize; @@ -69,43 +69,43 @@ class KBannerSetup : public KDialogBase { Q_OBJECT public: - KBannerSetup( QWidget *parent = NULL, const char *name = NULL ); + KBannerSetup( TQWidget *parent = NULL, const char *name = NULL ); protected: void readSettings(); void fillFontSizes(); private slots: - void slotFamily( const QString & ); + void slotFamily( const TQString & ); void slotSize( int ); - void slotSizeEdit(const QString &); - void slotColor(const QColor &); + void slotSizeEdit(const TQString &); + void slotColor(const TQColor &); void slotCyclingColor(bool on); void slotBold( bool ); void slotItalic( bool ); void slotSpeed( int ); - void slotMessage( const QString & ); + void slotMessage( const TQString & ); void slotOk(); void slotHelp(); void slotTimeToggled(bool on); private: - QWidget *preview; + TQWidget *preview; KColorButton *colorPush; KBannerSaver *saver; - QLineEdit *ed; - QComboBox* comboSizes; + TQLineEdit *ed; + TQComboBox* comboSizes; - QString message; + TQString message; bool showTime; - QString fontFamily; + TQString fontFamily; int fontSize; - QColor fontColor; + TQColor fontColor; bool cyclingColor; bool bold; bool italic; int speed; - QValueList<int> sizes; + TQValueList<int> sizes; }; #endif diff --git a/kscreensaver/kdesavers/blob.cpp b/kscreensaver/kdesavers/blob.cpp index e717c7ee..f258c149 100644 --- a/kscreensaver/kdesavers/blob.cpp +++ b/kscreensaver/kdesavers/blob.cpp @@ -22,13 +22,13 @@ #include <limits.h> #include <math.h> -#include <qcolor.h> -#include <qlabel.h> -#include <qlistbox.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qimage.h> +#include <tqcolor.h> +#include <tqlabel.h> +#include <tqlistbox.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqimage.h> #include <kapplication.h> #include <kconfig.h> @@ -56,7 +56,7 @@ extern "C" return new KBlobSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KBlobSetup(); } @@ -64,7 +64,7 @@ extern "C" static KRandomSequence *rnd = 0; -QString alg_str[5]; +TQString alg_str[5]; void initAlg() { alg_str[0] = i18n("Random Linear"); @@ -82,26 +82,26 @@ KBlobSaver::KBlobSaver ( WId id) { rnd = new KRandomSequence(); initAlg(); - QColor color; + TQColor color; float ramp = (256.0-64.0)/(float)RAMP; - QString msg = + TQString msg = i18n("This screen saver requires a color display."); blank(); // needs colors to work this one - if (QPixmap::defaultDepth() < 8) + if (TQPixmap::defaultDepth() < 8) { - QPainter p(this); + TQPainter p(this); p.setPen( white ); p.drawText( width()/2, height()/2, msg ); return; } - colorContext = QColor::enterAllocContext(); + colorContext = TQColor::enterAllocContext(); // if 8-bit, create lookup table for color ramping further down - if (QPixmap::defaultDepth() == 8) + if (TQPixmap::defaultDepth() == 8) { memset(lookup, 0, 256*sizeof(uint)); int i; @@ -120,14 +120,14 @@ KBlobSaver::KBlobSaver ( WId id) // make special provision for preview mode if (height() < 400) { - if (QPixmap::defaultDepth() > 8 ) + if (TQPixmap::defaultDepth() > 8 ) setColorInc(7); else setColorInc(4); } else { - if (QPixmap::defaultDepth() > 8 ) + if (TQPixmap::defaultDepth() > 8 ) setColorInc(3); else setColorInc(2); @@ -169,15 +169,15 @@ KBlobSaver::KBlobSaver ( WId id) // start timer which will update blob painter timer.start(SPEED); - connect(&timer, SIGNAL(timeout()), SLOT(slotTimeout())); + connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); } KBlobSaver::~KBlobSaver() { timer.stop(); - QColor::leaveAllocContext(); - QColor::destroyAllocContext(colorContext); + TQColor::leaveAllocContext(); + TQColor::destroyAllocContext(colorContext); delete rnd; rnd = 0; } @@ -369,7 +369,7 @@ void KBlobSaver::box ( int x, int y ) y = 0; // get the box region from the display to upgrade - QImage img = QPixmap::grabWindow(winId(), x, y, dim, dim).convertToImage(); + TQImage img = 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 @@ -400,7 +400,7 @@ void KBlobSaver::box ( int x, int y ) } // put the image back onto the screen - QPainter p(this); + TQPainter p(this); p.drawImage( x, y, img ); } @@ -432,7 +432,7 @@ void KBlobSaver::readSettings() // KBlobSetup::KBlobSetup ( - QWidget *parent, + TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Blob Screen Saver" ), @@ -445,23 +445,23 @@ KBlobSetup::KBlobSetup readSettings(); setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout *tl = new QHBoxLayout( main, 0, spacingHint() ); + TQHBoxLayout *tl = new TQHBoxLayout( main, 0, spacingHint() ); - QVBoxLayout *vbox = new QVBoxLayout; + TQVBoxLayout *vbox = new QVBoxLayout; tl->addLayout(vbox); // seconds to generate on a frame - QLabel *label = new QLabel(i18n("Frame duration:"), main); + TQLabel *label = new TQLabel(i18n("Frame duration:"), main); stime = new KIntNumInput( showtime, main ); stime->setSuffix( i18n( " sec" ) ); vbox->addWidget(label); vbox->addWidget(stime); // available algorithms - label = new QLabel(i18n("Algorithm:"), main); - algs = new QListBox(main); + label = new TQLabel(i18n("Algorithm:"), main); + algs = new TQListBox(main); algs->setMinimumSize(150, 105); for (int i = 0; i <= ALG_RANDOM; i++) algs->insertItem(alg_str[i]); @@ -470,14 +470,14 @@ KBlobSetup::KBlobSetup vbox->addWidget(algs); // preview window - QWidget *preview = new QWidget( main ); + TQWidget *preview = new TQWidget( main ); preview->setFixedSize(220, 170); preview->setBackgroundColor(black); preview->show(); tl->addWidget(preview); saver = new KBlobSaver(preview->winId()); saver->setDimension(3); - if (QPixmap::defaultDepth() > 8) + if (TQPixmap::defaultDepth() > 8) saver->setColorInc(7); else saver->setColorInc(4); @@ -485,8 +485,8 @@ KBlobSetup::KBlobSetup tl->addStretch(); // so selecting an algorithm will start previewing that alg - connect(algs, SIGNAL(highlighted(int)), saver, - SLOT(setAlgorithm(int))); + connect(algs, TQT_SIGNAL(highlighted(int)), saver, + TQT_SLOT(setAlgorithm(int))); } void KBlobSetup::readSettings() diff --git a/kscreensaver/kdesavers/blob.h b/kscreensaver/kdesavers/blob.h index 93a02998..290f7fbc 100644 --- a/kscreensaver/kdesavers/blob.h +++ b/kscreensaver/kdesavers/blob.h @@ -8,8 +8,8 @@ #ifndef __BLOB_H__ #define __BLOB_H__ -#include <qtimer.h> -#include <qptrlist.h> +#include <tqtimer.h> +#include <tqptrlist.h> #include <kdialogbase.h> #include <kscreensaver.h> @@ -47,7 +47,7 @@ public: typedef void (KBlobSaver::*AlgFunc)(); struct KBSAlg { - QString Name; + TQString Name; AlgFunc Init; AlgFunc NextFrame; }; @@ -96,11 +96,11 @@ class KBlobSetup : public KDialogBase int showtime; int alg; - QListBox *algs; + TQListBox *algs; KIntNumInput *stime; public: - KBlobSetup( QWidget *parent = NULL, const char *name = NULL ); + KBlobSetup( TQWidget *parent = NULL, const char *name = NULL ); protected: void readSettings(); diff --git a/kscreensaver/kdesavers/firesaver.cpp b/kscreensaver/kdesavers/firesaver.cpp index fff07dde..c8b605fc 100644 --- a/kscreensaver/kdesavers/firesaver.cpp +++ b/kscreensaver/kdesavers/firesaver.cpp @@ -69,7 +69,7 @@ class KFireSaverKSS : public KScreenSaver class KFireSaverSetupKDB : public KDialogBase { public: - KFireSaverSetupKDB( QWidget* parent = 0, const char* name = 0 ) + KFireSaverSetupKDB( TQWidget* parent = 0, const char* name = 0 ) : KDialogBase( parent, name, true, i18n("Setup Screen Saver"), Ok | Cancel | Help, Ok, true ) { @@ -104,7 +104,7 @@ extern "C" return new KFireSaverKSS( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KFireSaverSetupKDB; } @@ -114,8 +114,8 @@ extern "C" \* Factory code for KScreensaver ends *here* */ -KFireSaver :: KFireSaver( QWidget *parent, const char *name ) - : QGLWidget( parent, name ) +KFireSaver :: KFireSaver( TQWidget *parent, const char *name ) + : TQGLWidget( parent, name ) { // set random seed to initialize drand48() calls timeval tv; @@ -518,7 +518,7 @@ void KFireSaver :: paintGL () { int chance = (int) (1000.0 * DRAND); if ( !chance ) { - static const QString someStrings[] = { + static const TQString someStrings[] = { i18n("www.kde.org"), i18n("My KDE, please!"), i18n("KoNqUeR the World"), @@ -801,7 +801,7 @@ void KFireSaver :: explodeFirework(Particle* leaderParticle) } } -void KFireSaver :: timerEvent(QTimerEvent*) +void KFireSaver :: timerEvent(TQTimerEvent*) { timeval tv; gettimeofday(&tv,NULL); @@ -888,7 +888,7 @@ void KFireSaver :: timerEvent(QTimerEvent*) updateGL(); } -void KFireSaver :: burnLogo(QImage * image) +void KFireSaver :: burnLogo(TQImage * image) { if (!image || image->isNull()) return; @@ -935,7 +935,7 @@ void KFireSaver :: burnLogo(QImage * image) playSound(sound_debris); } -void KFireSaver :: playSound(QString file) +void KFireSaver :: playSound(TQString file) { //flush inactive players KPlayObject * playObject = playObjectList.first(); @@ -954,7 +954,7 @@ void KFireSaver :: playSound(QString file) return; // not needed when all of the files are in the distribution - //if (!QFile::exists(file)) + //if (!TQFile::exists(file)) //return; KPlayObjectFactory factory(artsServer.server()); @@ -967,18 +967,18 @@ void KFireSaver :: playSound(QString file) } } -bool KFireSaver :: loadTexture( QString fileName, unsigned int & textureID ) +bool KFireSaver :: loadTexture( TQString fileName, unsigned int & textureID ) { //reset texture ID to the default EMPTY value textureID = 0; //load image - QImage tmp; + TQImage tmp; if ( !tmp.load( fileName ) ) return false; //convert it to suitable format (flipped RGBA) - QImage texture = QGLWidget::convertToGLFormat( tmp ); + TQImage texture = TQGLWidget::convertToGLFormat( tmp ); if ( texture.isNull() ) return false; @@ -1019,7 +1019,7 @@ void KFireSaver :: readConfig () parameters.particleSize = 5; if ( parameters.enableBottomFire = config.readBoolEntry( "enable-BottomFire", true ) ) { - QColor blue = Qt::darkBlue; + TQColor blue = Qt::darkBlue; parameters.bottomFireColor = config.readColorEntry( "BottomFireColor", &blue ); } parameters.enableSound = config.readBoolEntry( "enable-Sounds", false ); @@ -1083,21 +1083,21 @@ void KFireSaver :: readConfig () config.setGroup( "Specials" ); if ( parameters.enableLogos = config.readBoolEntry( "enable-Logos", true ) ) { - QImage tempImage; + TQImage tempImage; tempImage.setAlphaBuffer( true ); if ( config.readBoolEntry( "LogosTux", true ) ) if ( tempImage.load(locate("data","kfiresaver/kfs_tux.png")) ) - imageList.append( new QImage(tempImage) ); + imageList.append( new TQImage(tempImage) ); if ( config.readBoolEntry( "LogosKonqui", true ) ) if ( tempImage.load(locate("data","kfiresaver/kfs_kde.png")) ) - imageList.append( new QImage(tempImage) ); + imageList.append( new TQImage(tempImage) ); if ( config.readBoolEntry( "LogosKDEIcons", true ) ) { - const QString icons[] = { + const TQString icons[] = { "3floppy_unmount", "cdrom_unmount", "hdd_mount", "kmix", "network", "my-computer", "folder_home", "konqueror", "kmail", "penguin", "personal" }; for ( int i = 0; i < 11; i++ ) - imageList.append( new QImage(DesktopIcon(icons[i],64).convertToImage()) ); + imageList.append( new TQImage(DesktopIcon(icons[i],64).convertToImage()) ); } parameters.enableReduceLogo = config.readBoolEntry( "LogosReduceDetail", true ); parameters.logoFrequency = 11 - config.readNumEntry( "LogosFrequency", 4 ); diff --git a/kscreensaver/kdesavers/firesaver.h b/kscreensaver/kdesavers/firesaver.h index 3757b64b..dfc713b0 100644 --- a/kscreensaver/kdesavers/firesaver.h +++ b/kscreensaver/kdesavers/firesaver.h @@ -30,11 +30,11 @@ #define FIELDW_2 (FIELDWIDTH/2.0) #define FIELDW_4 (FIELDWIDTH/4.0) -#include <qgl.h> -#include <qptrlist.h> -#include <qimage.h> -#include <qstring.h> -#include <qcolor.h> +#include <tqgl.h> +#include <tqptrlist.h> +#include <tqimage.h> +#include <tqstring.h> +#include <tqcolor.h> #include <arts/kplayobject.h> #include <arts/kartsserver.h> @@ -46,14 +46,14 @@ class Writer; class KFireSaver : public QGLWidget { public: - KFireSaver( QWidget *parent=0, const char *name=0 ); + KFireSaver( TQWidget *parent=0, const char *name=0 ); ~KFireSaver(); protected: void initializeGL(); void resizeGL( int, int ); void paintGL(); - void timerEvent( class QTimerEvent * ); + void timerEvent( class TQTimerEvent * ); private: enum enumFireworkType @@ -72,19 +72,19 @@ class KFireSaver : public QGLWidget inline enumFireworkType pickType(); inline int pickColour(); void explodeFirework(Particle* fireWorkLeaderParticle); - void burnLogo(QImage * image); - void playSound(QString file); - bool loadTexture(QString file, unsigned int & textureID); + void burnLogo(TQImage * image); + void playSound(TQString file); + bool loadTexture(TQString file, unsigned int & textureID); void freeTexture(unsigned int & textureID); void readConfig(); //list of particles and stars - QPtrList<Particle> + TQPtrList<Particle> particleList, starList; //stuff for 'exploding' pixmaps (kde, tux, icons..) - QPtrList<QImage> + TQPtrList<TQImage> imageList; //texture stuff @@ -98,7 +98,7 @@ class KFireSaver : public QGLWidget //sound stuff KArtsDispatcher artsDispatcher; KArtsServer artsServer; - QPtrList<KPlayObject> playObjectList; + TQPtrList<KPlayObject> playObjectList; QString sound_explosion, sound_debris; diff --git a/kscreensaver/kdesavers/firesaverparticle.h b/kscreensaver/kdesavers/firesaverparticle.h index de8d9ac2..e539adec 100644 --- a/kscreensaver/kdesavers/firesaverparticle.h +++ b/kscreensaver/kdesavers/firesaverparticle.h @@ -21,7 +21,7 @@ #ifndef KFIRESAVER_PARTICLE_H #define KFIRESAVER_PARTICLE_H -#include <qgl.h> +#include <tqgl.h> #define FLICKER_FRAMES_DELAY 8 #define DRAND ((float)rand() / (float)RAND_MAX) /*random float between 0 and 1*/ diff --git a/kscreensaver/kdesavers/firesaversetup.ui.h b/kscreensaver/kdesavers/firesaversetup.ui.h index 8cf478e2..09480126 100644 --- a/kscreensaver/kdesavers/firesaversetup.ui.h +++ b/kscreensaver/kdesavers/firesaversetup.ui.h @@ -11,8 +11,8 @@ #ifndef KFIRESAVER_SETUP_H #define KFIRESAVER_SETUP_H -#include <qcolor.h> -#include <qtimer.h> +#include <tqcolor.h> +#include <tqtimer.h> #include <kconfig.h> @@ -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 )); - QColor blue = Qt::darkBlue; + TQColor blue = Qt::darkBlue; bottomfireColorButton->setColor(config.readColorEntry( "BottomFireColor", &blue )); soundsBox->setChecked(config.readBoolEntry( "enable-Sounds", false )); overheadBox->setChecked(config.readBoolEntry( "enable-NoOverhead", true )); diff --git a/kscreensaver/kdesavers/firesaverwriter.cpp b/kscreensaver/kdesavers/firesaverwriter.cpp index 07209884..4f98ae60 100644 --- a/kscreensaver/kdesavers/firesaverwriter.cpp +++ b/kscreensaver/kdesavers/firesaverwriter.cpp @@ -11,10 +11,10 @@ #include <math.h> #include <stdlib.h> -#include <qimage.h> -#include <qgl.h> -#include <qfile.h> -#include <qstring.h> +#include <tqimage.h> +#include <tqgl.h> +#include <tqfile.h> +#include <tqstring.h> #include <kdebug.h> #include <kstandarddirs.h> #include <kdeversion.h> @@ -24,7 +24,7 @@ /* Word: SINGLE WORD */ -Word::Word( const char * _text, QMap<char, Symbol *> * sMap, float _scale ) +Word::Word( const char * _text, TQMap<char, Symbol *> * sMap, float _scale ) : width(0), scale(_scale), cX(0), cY(0), vScale(0), vX(0), vY(0), activateTime(0.0), lifeTime(2), currentTime(0) { @@ -86,7 +86,7 @@ inline bool Word::isDead() /* Writer: engine that spawns and manages words */ -Writer::Writer( QString descFileName ) +Writer::Writer( TQString descFileName ) : numTextures(0) { wordList.setAutoDelete( true ); @@ -94,7 +94,7 @@ Writer::Writer( QString descFileName ) if ( !loadMap( descFileName ) ) return; - QString welcomeString = i18n("Welcome to KDE %1.%2.%3") + TQString welcomeString = i18n("Welcome to KDE %1.%2.%3") .arg(KDE_VERSION_MAJOR) .arg(KDE_VERSION_MINOR) .arg(KDE_VERSION_RELEASE); @@ -105,21 +105,21 @@ Writer::~ Writer() { glDeleteTextures( numTextures, texArray ); wordList.clear(); - QMap<char, Symbol *>::Iterator it = symbolMap.begin(); + TQMap<char, Symbol *>::Iterator it = symbolMap.begin(); for ( ; it != symbolMap.end(); ++it ) delete (Symbol *)it.data(); } -void Writer::spawnWords( QString phrase, effectType fX ) +void Writer::spawnWords( TQString phrase, effectType fX ) { int wordCount = 0; float xCenter = 0, yCenter = drand48()*40 - 20, wordsWidth = 0; - QPtrList<Word> localWords; + TQPtrList<Word> localWords; while ( phrase.length() > 0 ) { - QString letters = phrase.section(" ",0,0); + TQString letters = phrase.section(" ",0,0); Word * word = new Word( letters.latin1(), &symbolMap ); wordList.append( word ); localWords.append( word ); @@ -184,9 +184,9 @@ void Writer::render( double dT ) * parses the description file to create the internal symbols map. * This map is then used when building words. **/ -bool Writer::loadMap( QString descFile ) +bool Writer::loadMap( TQString descFile ) { - QFile desc( locate("data","kfiresaver/"+descFile) ); + TQFile desc( locate("data","kfiresaver/"+descFile) ); if ( !desc.open( IO_ReadOnly ) ) return false; @@ -196,7 +196,7 @@ bool Writer::loadMap( QString descFile ) while ( !desc.atEnd() ) { - QString line; + TQString line; int count = desc.readLine( line, 100 ); //skip comments / invalid lines if ( count < 6 || line.at(0) == '#') @@ -205,8 +205,8 @@ bool Writer::loadMap( QString descFile ) if ( line.at(0) == '"' && numTextures < 15 ) { //load and generate texture - QString fileName = line.section("\"", 1,1 ); - QImage tmp; + TQString fileName = line.section("\"", 1,1 ); + TQImage tmp; if ( !tmp.load( locate("data","kfiresaver/"+fileName) ) ) { kdWarning() << "can't load filename:" << fileName << endl; generatedFirst = false; @@ -217,7 +217,7 @@ bool Writer::loadMap( QString descFile ) glBindTexture(GL_TEXTURE_2D, currentNumber); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR ); glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR ); - QImage texture = QGLWidget::convertToGLFormat( tmp ); + TQImage texture = TQGLWidget::convertToGLFormat( tmp ); xres = (float)texture.width(); yres = (float)texture.height(); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, (int)xres, (int)yres, 0, diff --git a/kscreensaver/kdesavers/firesaverwriter.h b/kscreensaver/kdesavers/firesaverwriter.h index b7bd2e78..e93f65be 100644 --- a/kscreensaver/kdesavers/firesaverwriter.h +++ b/kscreensaver/kdesavers/firesaverwriter.h @@ -12,10 +12,10 @@ #ifndef FIRESAVER_WRITER_H #define FIRESAVER_WRITER_H -#include <qgl.h> -#include <qptrlist.h> -#include <qmap.h> -#include <qstring.h> +#include <tqgl.h> +#include <tqptrlist.h> +#include <tqmap.h> +#include <tqstring.h> class Symbol { @@ -60,7 +60,7 @@ class Word { friend class Writer; public: - Word( const char * text, QMap<char, Symbol *> * map, float scale = 1.0 ); + Word( const char * text, TQMap<char, Symbol *> * map, float scale = 1.0 ); inline void renderWord( double dT ); inline bool isDead(); @@ -70,7 +70,7 @@ class Word float vScale, vX, vY; float activateTime, lifeTime, currentTime; float color[4]; - QPtrList<Symbol> symbolList; + TQPtrList<Symbol> symbolList; }; @@ -80,14 +80,14 @@ class Word class Writer { public: - Writer( QString descFileName ); + Writer( TQString descFileName ); ~Writer(); //types of effects implemented enum effectType { NoEffect = 0, Sequence, Fun1, Fun2 }; //call this function to add a sentence to the renderer - void spawnWords( QString phrase, effectType fx = NoEffect ); + void spawnWords( TQString phrase, effectType fx = NoEffect ); //called to get the words on screen using OpenGL //Note: the context must be set up. Words are drawn on XY plane @@ -96,15 +96,15 @@ class Writer private: //misc utility functions - bool loadMap( QString ); + bool loadMap( TQString ); //texture 'references' used by GL to delete allocated textures int numTextures; unsigned int texArray[16]; //list of words and map of symbols - QPtrList<Word> wordList; - QMap<char, Symbol *> symbolMap; + TQPtrList<Word> wordList; + TQMap<char, Symbol *> symbolMap; //disables standard constructor Writer(); diff --git a/kscreensaver/kdesavers/fountain.cpp b/kscreensaver/kdesavers/fountain.cpp index 51d88343..2149b53d 100644 --- a/kscreensaver/kdesavers/fountain.cpp +++ b/kscreensaver/kdesavers/fountain.cpp @@ -8,8 +8,8 @@ // Nick Betcher <[email protected]> 2001 // #include <stdlib.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kapplication.h> #include <klocale.h> #include <kconfig.h> @@ -26,11 +26,11 @@ #include <GL/glu.h> #include <GL/gl.h> #endif -#include <qimage.h> +#include <tqimage.h> #include <kdebug.h> -#include <qpainter.h> -#include <qradiobutton.h> -#include <qspinbox.h> +#include <tqpainter.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> #include <kstandarddirs.h> #include <math.h> #include <kmessagebox.h> @@ -46,7 +46,7 @@ extern "C" return new KFountainSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KFountainSetup(); } @@ -55,27 +55,27 @@ extern "C" //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -KFountainSetup::KFountainSetup( QWidget *parent, const char *name ) +KFountainSetup::KFountainSetup( TQWidget *parent, const char *name ) : SetupUi( parent, name, TRUE ) { readSettings(); - //QLabel *label; - //QPushButton *button; + //TQLabel *label; + //TQPushButton *button; //setCaption( i18n("Setup Particle Fountain") ); - //QVBoxLayout *tl = new QVBoxLayout(this, 10); - //QHBoxLayout *tl1 = new QHBoxLayout; + //TQVBoxLayout *tl = new TQVBoxLayout(this, 10); + //TQHBoxLayout *tl1 = new QHBoxLayout; //tl->addLayout(tl1); - //QVBoxLayout *tl11 = new QVBoxLayout(5); + //TQVBoxLayout *tl11 = new TQVBoxLayout(5); //tl1->addLayout(tl11); - //label = new QLabel( i18n("No options here yet...:"), this ); + //label = new TQLabel( i18n("No options here yet...:"), this ); ///tl11->addWidget(label);; - //preview = new QWidget( this ); + //preview = new TQWidget( this ); preview->setFixedSize( 220, 170 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -85,11 +85,11 @@ KFountainSetup::KFountainSetup( QWidget *parent, const char *name ) //KButtonBox *bbox = new KButtonBox(this); //bbox->addStretch(1); ; - connect( PushButton1, SIGNAL( clicked() ), SLOT( slotOkPressed() ) ); - connect( PushButton2, SIGNAL( clicked() ), SLOT( reject() ) ); - connect( PushButton3, SIGNAL( clicked() ), SLOT( aboutPressed() ) ); - connect( SpinBox1, SIGNAL( valueChanged(int)), saver, SLOT( updateSize(int))); - connect( RadioButton1, SIGNAL( toggled(bool)), saver, SLOT( doStars(bool))); + connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) ); + connect( PushButton2, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( PushButton3, TQT_SIGNAL( clicked() ), TQT_SLOT( aboutPressed() ) ); + connect( SpinBox1, TQT_SIGNAL( valueChanged(int)), saver, TQT_SLOT( updateSize(int))); + connect( RadioButton1, TQT_SIGNAL( toggled(bool)), saver, TQT_SLOT( doStars(bool))); } @@ -99,7 +99,7 @@ void KFountainSetup::readSettings() KConfig config("kssfountainrc", false, false); config.setGroup( "Settings" ); - QString boolval = config.readEntry( "Stars", "false" ); + TQString boolval = config.readEntry( "Stars", "false" ); if (boolval == "true") { RadioButton1->setDown(true); RadioButton1_2->setDown(false); @@ -111,7 +111,7 @@ void KFountainSetup::readSettings() } } - QString starammount = config.readEntry("StarSize", "75"); + TQString starammount = config.readEntry("StarSize", "75"); SpinBox1->setValue(starammount.toInt()); } @@ -131,7 +131,7 @@ void KFountainSetup::slotOkPressed() config.writeEntry( "Stars", "false" ); } } - config.writeEntry( "StarSize", QString::number(SpinBox1->value()) ); + config.writeEntry( "StarSize", TQString::number(SpinBox1->value()) ); config.sync(); @@ -151,14 +151,14 @@ KFountainSaver::KFountainSaver( WId id ) : KScreenSaver( id ) kdDebug() << "Blank" << endl; - timer = new QTimer( this ); + timer = new TQTimer( this ); timer->start( 25, TRUE ); setBackgroundColor( black ); erase(); fountain = new Fountain(); embed(fountain); fountain->show(); - connect( timer, SIGNAL(timeout()), this, SLOT(blank()) ); + connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) ); } KFountainSaver::~KFountainSaver() @@ -181,7 +181,7 @@ void KFountainSaver::blank() timer->start( 25, TRUE ); } -Fountain::Fountain( QWidget * parent, const char * name) : QGLWidget (parent,name) +Fountain::Fountain( TQWidget * parent, const char * name) : TQGLWidget (parent,name) { rainbow=true; slowdown=2.0f; @@ -193,7 +193,7 @@ Fountain::Fountain( QWidget * parent, const char * name) : QGLWidget (parent,nam // This has to be here because you can't update the fountain until 'fountain' is created! KConfig config("kssfountainrc", false, false); config.setGroup( "Settings" ); - QString boolval = config.readEntry( "Stars", "false" ); + TQString boolval = config.readEntry( "Stars", "false" ); if (boolval == "true") { setStars(true); } else { @@ -203,7 +203,7 @@ Fountain::Fountain( QWidget * parent, const char * name) : QGLWidget (parent,nam } } - QString starammount = config.readEntry("StarSize", "75"); + TQString starammount = config.readEntry("StarSize", "75"); float passvalue = (starammount.toInt() / 100.0); setSize(passvalue); @@ -220,7 +220,7 @@ bool Fountain::loadParticle() { /* Status indicator */ bool Status = TRUE; - QImage buf; + TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; if (buf.load( locate("data", "kscreensaver/particle.png") ) ) @@ -231,7 +231,7 @@ bool Fountain::loadParticle() } else { - QImage dummy( 32, 32, 32 ); + TQImage dummy( 32, 32, 32 ); dummy.fill( Qt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); diff --git a/kscreensaver/kdesavers/fountain.h b/kscreensaver/kdesavers/fountain.h index fa89e6f8..1a31f99e 100644 --- a/kscreensaver/kdesavers/fountain.h +++ b/kscreensaver/kdesavers/fountain.h @@ -14,8 +14,8 @@ #ifndef __FOUNTAIN_H__ #define __FOUNTAIN_H__ -#include <qdialog.h> -#include <qgl.h> +#include <tqdialog.h> +#include <tqgl.h> #ifdef Q_WS_MACX #include <OpenGL/gl.h> #include <OpenGL/glu.h> @@ -24,12 +24,12 @@ #include <GL/gl.h> #endif #include <kscreensaver.h> -#include <qtimer.h> -#include <qimage.h> +#include <tqtimer.h> +#include <tqimage.h> #include "fountaincfg.h" #include <kinstance.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #define MAX_PARTICLES 1000 @@ -59,7 +59,7 @@ Q_OBJECT }; public: - Fountain( QWidget * parent=0, const char * name=0 ); + Fountain( TQWidget * parent=0, const char * name=0 ); ~Fountain(); void setSize( float newSize ); void setStars( bool doStars ); @@ -93,7 +93,7 @@ private: GLuint col; // Current Color Selection GLuint delay; // Rainbow Effect Delay GLuint texture[1]; - QImage tex; + TQImage tex; float index; float transIndex; GLfloat scale; @@ -114,14 +114,14 @@ public slots: // void loadTextures(bool textures); private: Fountain *fountain; - QTimer *timer; + TQTimer *timer; }; class KFountainSetup : public SetupUi { Q_OBJECT public: - KFountainSetup( QWidget *parent = NULL, const char *name = NULL ); + KFountainSetup( TQWidget *parent = NULL, const char *name = NULL ); protected: void readSettings(); diff --git a/kscreensaver/kdesavers/gravity.cpp b/kscreensaver/kdesavers/gravity.cpp index d9f9bbd1..c8415e49 100644 --- a/kscreensaver/kdesavers/gravity.cpp +++ b/kscreensaver/kdesavers/gravity.cpp @@ -8,8 +8,8 @@ // Nick Betcher <[email protected]> 2001 // #include <stdlib.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kapplication.h> #include <klocale.h> #include <kconfig.h> @@ -25,11 +25,11 @@ #include <GL/glu.h> #include <GL/gl.h> #endif -#include <qimage.h> +#include <tqimage.h> #include <kdebug.h> -#include <qpainter.h> -#include <qradiobutton.h> -#include <qspinbox.h> +#include <tqpainter.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> #include <kstandarddirs.h> #include <math.h> #include <kmessagebox.h> @@ -45,7 +45,7 @@ extern "C" return new KGravitySaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KGravitySetup(); } @@ -54,7 +54,7 @@ extern "C" //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -KGravitySetup::KGravitySetup( QWidget *parent, const char *name ) +KGravitySetup::KGravitySetup( TQWidget *parent, const char *name ) : SetupUi( parent, name, TRUE ) { readSettings(); @@ -66,11 +66,11 @@ KGravitySetup::KGravitySetup( QWidget *parent, const char *name ) #endif saver = new KGravitySaver( preview->winId() ); ; - connect( PushButton1, SIGNAL( clicked() ), SLOT( slotOkPressed() ) ); - connect( PushButton2, SIGNAL( clicked() ), SLOT( reject() ) ); - connect( PushButton3, SIGNAL( clicked() ), SLOT( aboutPressed() ) ); - connect( SpinBox1, SIGNAL( valueChanged(int)), saver, SLOT( updateSize(int))); - connect( RadioButton1, SIGNAL( toggled(bool)), saver, SLOT( doStars(bool))); + connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) ); + connect( PushButton2, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( PushButton3, TQT_SIGNAL( clicked() ), TQT_SLOT( aboutPressed() ) ); + connect( SpinBox1, TQT_SIGNAL( valueChanged(int)), saver, TQT_SLOT( updateSize(int))); + connect( RadioButton1, TQT_SIGNAL( toggled(bool)), saver, TQT_SLOT( doStars(bool))); } @@ -85,7 +85,7 @@ void KGravitySetup::readSettings() KConfig config("kssgravityrc", false, false); config.setGroup( "Settings" ); - QString boolval = config.readEntry( "Stars", "false" ); + TQString boolval = config.readEntry( "Stars", "false" ); if (boolval == "true") { RadioButton1->setDown(true); RadioButton1_2->setDown(false); @@ -97,7 +97,7 @@ void KGravitySetup::readSettings() } } - QString starammount = config.readEntry("StarSize", "75"); + TQString starammount = config.readEntry("StarSize", "75"); SpinBox1->setValue(starammount.toInt()); } @@ -117,7 +117,7 @@ void KGravitySetup::slotOkPressed() config.writeEntry( "Stars", "false" ); } } - config.writeEntry( "StarSize", QString::number(SpinBox1->value()) ); + config.writeEntry( "StarSize", TQString::number(SpinBox1->value()) ); config.sync(); @@ -137,7 +137,7 @@ KGravitySaver::KGravitySaver( WId id ) : KScreenSaver( id ) kdDebug() << "Blank" << endl; - timer = new QTimer( this ); + timer = new TQTimer( this ); timer->start( 25, TRUE ); setBackgroundColor( black ); erase(); @@ -146,7 +146,7 @@ KGravitySaver::KGravitySaver( WId id ) : KScreenSaver( id ) #ifdef Q_WS_X11 gravity->show(); #endif - connect( timer, SIGNAL(timeout()), this, SLOT(blank()) ); + connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) ); } KGravitySaver::~KGravitySaver() @@ -169,7 +169,7 @@ void KGravitySaver::blank() timer->start( 25, TRUE ); } -Gravity::Gravity( QWidget * parent, const char * name) : QGLWidget (parent,name) +Gravity::Gravity( TQWidget * parent, const char * name) : TQGLWidget (parent,name) { rainbow=true; slowdown=2.0f; @@ -181,7 +181,7 @@ Gravity::Gravity( QWidget * parent, const char * name) : QGLWidget (parent,name) // This has to be here because you can't update the gravity until 'gravity' is created! KConfig config("kssgravityrc", false, false); config.setGroup( "Settings" ); - QString boolval = config.readEntry( "Stars", "false" ); + TQString boolval = config.readEntry( "Stars", "false" ); if (boolval == "true") { setStars(true); } else { @@ -191,7 +191,7 @@ Gravity::Gravity( QWidget * parent, const char * name) : QGLWidget (parent,name) } } - QString starammount = config.readEntry("StarSize", "75"); + TQString starammount = config.readEntry("StarSize", "75"); float passvalue = (starammount.toInt() / 100.0); setSize(passvalue); @@ -208,7 +208,7 @@ bool Gravity::loadParticle() { /* Status indicator */ bool Status = TRUE; - QImage buf; + TQImage buf; kdDebug() << "Loading: " << locate("data", "kscreensaver/particle.png") << endl; if (buf.load( locate("data", "kscreensaver/particle.png") ) ) @@ -219,7 +219,7 @@ bool Gravity::loadParticle() } else { - QImage dummy( 32, 32, 32 ); + TQImage dummy( 32, 32, 32 ); dummy.fill( Qt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); diff --git a/kscreensaver/kdesavers/gravity.h b/kscreensaver/kdesavers/gravity.h index 2cd7080f..53d60a25 100644 --- a/kscreensaver/kdesavers/gravity.h +++ b/kscreensaver/kdesavers/gravity.h @@ -14,8 +14,8 @@ #ifndef __GRAVITY_H__ #define __GRAVITY_H__ -#include <qdialog.h> -#include <qgl.h> +#include <tqdialog.h> +#include <tqgl.h> #ifdef Q_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> @@ -24,12 +24,12 @@ #include <GL/gl.h> #endif #include <kscreensaver.h> -#include <qtimer.h> -#include <qimage.h> +#include <tqtimer.h> +#include <tqimage.h> #include "gravitycfg.h" #include <kinstance.h> -#include <qfile.h> -#include <qtextstream.h> +#include <tqfile.h> +#include <tqtextstream.h> #define MAX_PARTICLES 100 @@ -58,7 +58,7 @@ Q_OBJECT }; public: - Gravity( QWidget * parent=0, const char * name=0 ); + Gravity( TQWidget * parent=0, const char * name=0 ); ~Gravity(); void setSize( float newSize ); void setStars( bool doStars ); @@ -91,7 +91,7 @@ private: GLuint col; // Current Color Selection GLuint delay; // Rainbow Effect Delay GLuint texture[1]; - QImage tex; + TQImage tex; float index; float transIndex; GLfloat scale; @@ -112,14 +112,14 @@ public slots: // void loadTextures(bool textures); private: Gravity *gravity; - QTimer *timer; + TQTimer *timer; }; class KGravitySetup : public SetupUi { Q_OBJECT public: - KGravitySetup( QWidget *parent = NULL, const char *name = NULL ); + KGravitySetup( TQWidget *parent = NULL, const char *name = NULL ); ~KGravitySetup(); protected: diff --git a/kscreensaver/kdesavers/kclock.cpp b/kscreensaver/kdesavers/kclock.cpp index ac24c4b1..2f3ab178 100644 --- a/kscreensaver/kdesavers/kclock.cpp +++ b/kscreensaver/kdesavers/kclock.cpp @@ -10,16 +10,16 @@ #include <stdlib.h> #include <string.h> -#include <qcheckbox.h> -#include <qcolor.h> -#include <qdatetime.h> -#include <qgroupbox.h> -#include <qhbox.h> -#include <qimage.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qpainter.h> -#include <qslider.h> +#include <tqcheckbox.h> +#include <tqcolor.h> +#include <tqdatetime.h> +#include <tqgroupbox.h> +#include <tqhbox.h> +#include <tqimage.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqpainter.h> +#include <tqslider.h> #include <kapplication.h> #include <kcolorbutton.h> @@ -58,7 +58,7 @@ extern "C" { return new KClockSaver(id); } - KDE_EXPORT QDialog *kss_setup() { + KDE_EXPORT TQDialog *kss_setup() { return new KClockSetup(); } } @@ -68,7 +68,7 @@ extern "C" { //----------------------------------------------------------------------------- -KClockSetup::KClockSetup(QWidget *parent, const char *name) +KClockSetup::KClockSetup(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n( "Setup Clock Screen Saver" ), Ok|Cancel|Help, Ok, true), m_saver(0) @@ -76,93 +76,93 @@ KClockSetup::KClockSetup(QWidget *parent, const char *name) readSettings(); setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QVBoxLayout *top = new QVBoxLayout(main, 0, spacingHint()); + TQVBoxLayout *top = new TQVBoxLayout(main, 0, spacingHint()); - QHBoxLayout *hbox = new QHBoxLayout; + TQHBoxLayout *hbox = new QHBoxLayout; top->addLayout( hbox ); - QGroupBox *colgroup = new QGroupBox(i18n("Colors"), main); + TQGroupBox *colgroup = new TQGroupBox(i18n("Colors"), main); colgroup->setColumnLayout( 0, Horizontal ); - QGridLayout *grid = new QGridLayout( colgroup->layout(), + TQGridLayout *grid = new TQGridLayout( colgroup->layout(), 5, 2, spacingHint() ); - QLabel *label = new QLabel(i18n("&Hour-hand:"), colgroup); + TQLabel *label = new TQLabel(i18n("&Hour-hand:"), colgroup); KColorButton *colorButton = new KColorButton(m_hourColor, colgroup); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotHourColor(const QColor &))); + connect(colorButton, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotHourColor(const TQColor &))); grid->addWidget( label, 1, 1 ); grid->addWidget( colorButton, 1, 2 ); - label = new QLabel(i18n("&Minute-hand:"), colgroup); + label = new TQLabel(i18n("&Minute-hand:"), colgroup); colorButton = new KColorButton(m_minColor, colgroup); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotMinColor(const QColor &))); + connect(colorButton, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotMinColor(const TQColor &))); grid->addWidget( label, 2, 1 ); grid->addWidget( colorButton, 2, 2 ); - label = new QLabel(i18n("&Second-hand:"), colgroup); + label = new TQLabel(i18n("&Second-hand:"), colgroup); colorButton = new KColorButton(m_secColor, colgroup); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotSecColor(const QColor &))); + connect(colorButton, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotSecColor(const TQColor &))); grid->addWidget( label, 3, 1 ); grid->addWidget( colorButton, 3, 2 ); - label = new QLabel(i18n("Scal&e:"), colgroup); + label = new TQLabel(i18n("Scal&e:"), colgroup); colorButton = new KColorButton(m_scaleColor, colgroup); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotScaleColor(const QColor &))); + connect(colorButton, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotScaleColor(const TQColor &))); grid->addWidget( label, 4, 1 ); grid->addWidget( colorButton, 4, 2 ); - label = new QLabel(i18n("&Background:"), colgroup); + label = new TQLabel(i18n("&Background:"), colgroup); colorButton = new KColorButton(m_bgndColor, colgroup); colorButton->setFixedWidth(COLOR_BUTTON_WIDTH); label->setBuddy(colorButton); - connect(colorButton, SIGNAL(changed(const QColor &)), - SLOT(slotBgndColor(const QColor &))); + connect(colorButton, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotBgndColor(const TQColor &))); grid->addWidget( label, 5, 1 ); grid->addWidget( colorButton, 5, 2 ); hbox->addWidget(colgroup); - QWidget *m_preview = new QWidget(main); + TQWidget *m_preview = new TQWidget(main); m_preview->setFixedSize(220, 165); m_preview->show(); m_saver = new KClockSaver(m_preview->winId()); hbox->addWidget(m_preview); - label = new QLabel( i18n( "Si&ze:" ), main ); + label = new TQLabel( i18n( "Si&ze:" ), main ); top->addWidget( label ); - QSlider *qs = new QSlider(0, MAX_CLOCK_SIZE, 1, m_size, Horizontal, main); + TQSlider *qs = new TQSlider(0, MAX_CLOCK_SIZE, 1, m_size, Horizontal, main); label->setBuddy( qs ); qs->setTickInterval(1); - qs->setTickmarks(QSlider::Below); - connect(qs, SIGNAL(valueChanged(int)), this, SLOT(slotSliderMoved(int))); + qs->setTickmarks(TQSlider::Below); + connect(qs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSliderMoved(int))); top->addWidget( qs ); bool rtl = kapp->reverseLayout(); - QHBox *qsscale = new QHBox(main); - label = new QLabel(i18n("Small"), qsscale); + TQHBox *qsscale = new TQHBox(main); + label = new TQLabel(i18n("Small"), qsscale); label->setAlignment(rtl ? AlignRight : AlignLeft); - label = new QLabel(i18n("Medium"), qsscale); + label = new TQLabel(i18n("Medium"), qsscale); label->setAlignment(AlignHCenter); - label = new QLabel(i18n("Big"), qsscale); + label = new TQLabel(i18n("Big"), qsscale); label->setAlignment(rtl ? AlignLeft : AlignRight); top->addWidget(qsscale); - QCheckBox *keepCentered = new QCheckBox(i18n("&Keep clock centered"), main); + TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main); keepCentered->setChecked(m_keepCentered); - connect(keepCentered, SIGNAL(stateChanged(int)), SLOT(slotKeepCenteredChanged(int))); + connect(keepCentered, TQT_SIGNAL(stateChanged(int)), TQT_SLOT(slotKeepCenteredChanged(int))); top->addWidget(keepCentered); top->addStretch(); } @@ -183,7 +183,7 @@ void KClockSetup::readSettings() m_size = MAX_CLOCK_SIZE; config->setGroup("Colors"); - QColor c = Qt::black; + TQColor c = Qt::black; m_bgndColor = config->readColorEntry("Background", &c); c = Qt::white; @@ -229,11 +229,11 @@ void KClockSetup::slotHelp() "Version 1.0<br>" "<nobr>Melchior FRANZ (c) 2003</nobr>") + "<br><a href=\"mailto:[email protected]\">[email protected]</a>" - "</qt>", QString::null, KMessageBox::AllowLink); + "</qt>", TQString::null, KMessageBox::AllowLink); } -void KClockSetup::slotBgndColor(const QColor &color) +void KClockSetup::slotBgndColor(const TQColor &color) { m_bgndColor = color; if (m_saver) @@ -241,7 +241,7 @@ void KClockSetup::slotBgndColor(const QColor &color) } -void KClockSetup::slotScaleColor(const QColor &color) +void KClockSetup::slotScaleColor(const TQColor &color) { m_scaleColor = color; if (m_saver) @@ -249,7 +249,7 @@ void KClockSetup::slotScaleColor(const QColor &color) } -void KClockSetup::slotHourColor(const QColor &color) +void KClockSetup::slotHourColor(const TQColor &color) { m_hourColor = color; if (m_saver) @@ -257,7 +257,7 @@ void KClockSetup::slotHourColor(const QColor &color) } -void KClockSetup::slotMinColor(const QColor &color) +void KClockSetup::slotMinColor(const TQColor &color) { m_minColor = color; if (m_saver) @@ -265,7 +265,7 @@ void KClockSetup::slotMinColor(const QColor &color) } -void KClockSetup::slotSecColor(const QColor &color) +void KClockSetup::slotSecColor(const TQColor &color) { m_secColor = color; if (m_saver) @@ -320,7 +320,7 @@ void KClockPainter::copy(KClockPainter *p) } -void KClockPainter::drawToImage(QImage *q, int xoffs = 0, int yoffs = 0) +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++) { @@ -331,19 +331,19 @@ void KClockPainter::drawToImage(QImage *q, int xoffs = 0, int yoffs = 0) } -void KClockPainter::setColor(const QColor &c) +void KClockPainter::setColor(const TQColor &c) { m_color = (c.red() << 24) | (c.green() << 16) | (c.blue() << 8) | 255; } -void KClockPainter::setShadowColor(const QColor &c) +void KClockPainter::setShadowColor(const TQColor &c) { m_shadow = (c.red() << 24) | (c.green() << 16) | (c.blue() << 8) | 255; } -void KClockPainter::fill(const QColor &c) +void KClockPainter::fill(const TQColor &c) { art_rgb_fill_run(m_buf, c.red(), c.green(), c.blue(), m_width * m_height); } @@ -398,7 +398,7 @@ void KClockPainter::drawDisc(double r) } -void KClockPainter::drawHand(const QColor &c, double angle, double length, +void KClockPainter::drawHand(const TQColor &c, double angle, double length, double width, bool disc = true) { const double shadow_width = 1.0; @@ -426,7 +426,7 @@ KClockSaver::KClockSaver(WId id) { readSettings(); setBackgroundColor(m_bgndColor); - connect(&m_timer, SIGNAL(timeout()), SLOT(slotTimeout())); + connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); start(m_size); m_timer.start(TIMER_INTERVALL); } @@ -445,7 +445,7 @@ void KClockSaver::start(int size) m_x = (width() - m_diameter) / 2; m_y = (height() - m_diameter) / 2; - m_image = new QImage(m_diameter, m_diameter, 32); + m_image = new TQImage(m_diameter, m_diameter, 32); m_scale = new KClockPainter(m_diameter, m_diameter); m_clock = new KClockPainter(m_diameter, m_diameter); @@ -497,7 +497,7 @@ void KClockSaver::readSettings() m_size = MAX_CLOCK_SIZE; config->setGroup("Colors"); - QColor c = Qt::black; + TQColor c = Qt::black; m_bgndColor = config->readColorEntry("Background", &c); c = Qt::white; @@ -542,7 +542,7 @@ void KClockSaver::drawClock() void KClockSaver::slotTimeout() { - QTime t = QTime::currentTime(); + TQTime t = TQTime::currentTime(); int s = t.second(); if (s == m_second) return; @@ -552,11 +552,11 @@ void KClockSaver::slotTimeout() m_minute = t.minute(); drawClock(); - QPainter p(this); + TQPainter p(this); if (width() < 256) { // intended for the control module preview: always fill the whole area - QImage *img = new QImage(width(), height(), 32); + TQImage *img = new TQImage(width(), height(), 32); img->fill(qRgb(m_bgndColor.red(), m_bgndColor.green(), m_bgndColor.blue())); m_clock->drawToImage(img, m_x, m_y); p.drawImage(0, 0, *img); diff --git a/kscreensaver/kdesavers/kclock.h b/kscreensaver/kdesavers/kclock.h index b16945d6..2afc42a6 100644 --- a/kscreensaver/kdesavers/kclock.h +++ b/kscreensaver/kdesavers/kclock.h @@ -10,7 +10,7 @@ #ifndef __KCLOCK_H__ #define __KCLOCK_H__ -#include <qtimer.h> +#include <tqtimer.h> #include <kdialogbase.h> #include <kscreensaver.h> @@ -28,16 +28,16 @@ class KClockPainter KClockPainter(int width, int height); ~KClockPainter(); void copy(KClockPainter *p); - void drawToImage(QImage *q, int x, int y); + void drawToImage(TQImage *q, int x, int y); inline int width() { return m_width; } inline int height() { return m_height; } inline void *image() { return (void *)m_buf; } - void setColor(const QColor &color); - void setShadowColor(const QColor &color); - void fill(const QColor &color); + void setColor(const TQColor &color); + void setShadowColor(const TQColor &color); + void fill(const TQColor &color); void drawRadial(double alpha, double r0, double r1, double width); void drawDisc(double radius); - void drawHand(const QColor &color, double angle, double length, + void drawHand(const TQColor &color, double angle, double length, double width, bool disc); }; @@ -48,11 +48,11 @@ class KClockSaver : public KScreenSaver public: KClockSaver(WId id); virtual ~KClockSaver(); - inline void setBgndColor(const QColor &c) { m_bgndColor = c; drawScale(); setBackgroundColor(c); }; - inline void setScaleColor(const QColor &c) { m_scaleColor = c; drawScale(); }; - inline void setHourColor(const QColor &c) { m_hourColor = c; forceRedraw(); }; - inline void setMinColor(const QColor &c) { m_minColor = c; forceRedraw(); }; - inline void setSecColor(const QColor &c) { m_secColor = c; forceRedraw(); }; + inline void setBgndColor(const TQColor &c) { m_bgndColor = c; drawScale(); setBackgroundColor(c); }; + inline void setScaleColor(const TQColor &c) { m_scaleColor = c; drawScale(); }; + inline void setHourColor(const TQColor &c) { m_hourColor = c; forceRedraw(); }; + inline void setMinColor(const TQColor &c) { m_minColor = c; forceRedraw(); }; + inline void setSecColor(const TQColor &c) { m_secColor = c; forceRedraw(); }; void setKeepCentered(bool b); void restart(int siz); inline void forceRedraw() { m_second = -1; } @@ -68,8 +68,8 @@ class KClockSaver : public KScreenSaver void slotTimeout(); protected: - QTimer m_timer; - QImage *m_image; + TQTimer m_timer; + TQImage *m_image; KClockPainter *m_scale; KClockPainter *m_clock; @@ -83,11 +83,11 @@ class KClockSaver : public KScreenSaver int m_minute; int m_second; - QColor m_bgndColor; - QColor m_scaleColor; - QColor m_hourColor; - QColor m_minColor; - QColor m_secColor; + TQColor m_bgndColor; + TQColor m_scaleColor; + TQColor m_hourColor; + TQColor m_minColor; + TQColor m_secColor; }; @@ -95,7 +95,7 @@ class KClockSetup : public KDialogBase { Q_OBJECT public: - KClockSetup(QWidget *parent = 0, const char *name = 0); + KClockSetup(TQWidget *parent = 0, const char *name = 0); ~KClockSetup(); protected: void readSettings(); @@ -104,22 +104,22 @@ class KClockSetup : public KDialogBase void slotOk(); void slotHelp(); - void slotBgndColor(const QColor &); - void slotScaleColor(const QColor &); - void slotHourColor(const QColor &); - void slotMinColor(const QColor &); - void slotSecColor(const QColor &); + void slotBgndColor(const TQColor &); + void slotScaleColor(const TQColor &); + void slotHourColor(const TQColor &); + void slotMinColor(const TQColor &); + void slotSecColor(const TQColor &); void slotSliderMoved(int); void slotKeepCenteredChanged(int); private: KClockSaver *m_saver; - QColor m_bgndColor; - QColor m_scaleColor; - QColor m_hourColor; - QColor m_minColor; - QColor m_secColor; + TQColor m_bgndColor; + TQColor m_scaleColor; + TQColor m_hourColor; + TQColor m_minColor; + TQColor m_secColor; int m_size; bool m_keepCentered; diff --git a/kscreensaver/kdesavers/kvm.cpp b/kscreensaver/kdesavers/kvm.cpp index 9d7a32fa..e0d54265 100644 --- a/kscreensaver/kdesavers/kvm.cpp +++ b/kscreensaver/kdesavers/kvm.cpp @@ -33,12 +33,12 @@ /* for AIX at least */ #include <time.h> -#include <qcolor.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qslider.h> -#include <qpainter.h> -#include <qbitmap.h> +#include <tqcolor.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqslider.h> +#include <tqpainter.h> +#include <tqbitmap.h> #include <kapplication.h> #include <kconfig.h> @@ -70,7 +70,7 @@ extern "C" return new kVmSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new kVmSetup(); } @@ -81,13 +81,13 @@ extern "C" static void load_images (m_state *state) { - if ( QPixmap::defaultDepth() > 1 ) + if ( TQPixmap::defaultDepth() > 1 ) { - state->images = QPixmap( vm ); + state->images = TQPixmap( vm ); } else { - state->images = QBitmap( vm_width, vm_height, vm_bits ); + state->images = TQBitmap( vm_width, vm_height, vm_bits ); } state->image_width = state->images.width(); state->image_height = state->images.height(); @@ -96,7 +96,7 @@ load_images (m_state *state) static m_state * -init_pool ( QWidget *w ) +init_pool ( TQWidget *w ) { m_state *state = new m_state; state->w = w; @@ -165,7 +165,7 @@ draw_pool (m_state *state) if( state->show_threads ) if( state->modified[index] == 1 ) pos_x += 2; - QPainter p(state->w); + TQPainter p(state->w); p.setPen( Qt::green ); p.setBrush( Qt::black ); p.drawPixmap( state->grid_margin_x + x*state->char_width, @@ -184,7 +184,7 @@ kVmSaver::kVmSaver( WId id ) : KScreenSaver( id ) { readSettings(); - colorContext = QColor::enterAllocContext(); + colorContext = TQColor::enterAllocContext(); blank(); setSpeed( speed ); @@ -194,7 +194,7 @@ kVmSaver::kVmSaver( WId id ) : KScreenSaver( id ) pool_state = init_pool( this ); vm_default_initstate( time(0), &(pool_state->pool->vm_random_data) ); - connect( &timer, SIGNAL( timeout() ), SLOT( slotTimeout() ) ); + connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); timer.start( 100 - speed ); } @@ -203,8 +203,8 @@ kVmSaver::~kVmSaver() timer.stop(); vm_done_pool( pool_state->pool ); delete[] pool_state->modified; - QColor::leaveAllocContext(); - QColor::destroyAllocContext( colorContext ); + TQColor::leaveAllocContext(); + TQColor::destroyAllocContext( colorContext ); } void kVmSaver::blank() @@ -273,49 +273,49 @@ void kVmSaver::slotTimeout() //----------------------------------------------------------------------------- -kVmSetup::kVmSetup( QWidget *parent, const char *name ) +kVmSetup::kVmSetup( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Virtual Machine" ), Ok|Cancel|Help, Ok, true ) { readSettings(); setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout *tl = new QHBoxLayout( main, 0, spacingHint() ); - QVBoxLayout *tl1 = new QVBoxLayout(); + TQHBoxLayout *tl = new TQHBoxLayout( main, 0, spacingHint() ); + TQVBoxLayout *tl1 = new TQVBoxLayout(); tl->addLayout(tl1); - QLabel *label = new QLabel( i18n("Virtual machine speed:"), main ); + TQLabel *label = new TQLabel( i18n("Virtual machine speed:"), main ); tl1->addWidget(label); - QSlider *slider = new QSlider( QSlider::Horizontal, main ); + TQSlider *slider = new TQSlider( TQSlider::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, 100 ); slider->setSteps( 10, 20 ); - slider->setTickmarks( QSlider::Below ); + slider->setTickmarks( TQSlider::Below ); slider->setTickInterval( 10 ); slider->setValue( speed ); - connect( slider, SIGNAL( valueChanged( int ) ), - SLOT( slotSpeed( int ) ) ); + connect( slider, TQT_SIGNAL( valueChanged( int ) ), + TQT_SLOT( slotSpeed( int ) ) ); tl1->addWidget(slider); - label = new QLabel( i18n("Display update speed:"), main ); + label = new TQLabel( i18n("Display update speed:"), main ); tl1->addWidget(label); - slider = new QSlider( QSlider::Horizontal, main ); + slider = new TQSlider( TQSlider::Horizontal, main ); slider->setMinimumSize( 120, 20 ); slider->setRange( 0, MAX_REFRESH_TIMEOUT ); slider->setSteps( MAX_REFRESH_TIMEOUT/10, MAX_REFRESH_TIMEOUT/5 ); - slider->setTickmarks( QSlider::Below ); + slider->setTickmarks( TQSlider::Below ); slider->setTickInterval( MAX_REFRESH_TIMEOUT/10 ); slider->setValue( MAX_REFRESH_TIMEOUT - refreshTimeout ); - connect( slider, SIGNAL( valueChanged( int ) ), - SLOT( slotRefreshTimeout( int ) ) ); + connect( slider, TQT_SIGNAL( valueChanged( int ) ), + TQT_SLOT( slotRefreshTimeout( int ) ) ); tl1->addWidget(slider); tl1->addStretch(); - preview = new QWidget( main ); + preview = new TQWidget( main ); preview->setFixedSize( 220, 165 ); preview->show(); // otherwise saver does not get correct size saver = new kVmSaver( preview->winId() ); @@ -362,7 +362,7 @@ void kVmSetup::slotOk() KConfig *config = KGlobal::config(); config->setGroup( "Settings" ); - QString sspeed; + TQString sspeed; sspeed.setNum( speed ); config->writeEntry( "Speed", sspeed ); sspeed.setNum( refreshTimeout ); diff --git a/kscreensaver/kdesavers/kvm.h b/kscreensaver/kdesavers/kvm.h index 44c7eeb3..0f705e21 100644 --- a/kscreensaver/kdesavers/kvm.h +++ b/kscreensaver/kdesavers/kvm.h @@ -6,8 +6,8 @@ #ifndef __KVM_H__ #define __KVM_H__ -#include <qtimer.h> -#include <qptrlist.h> +#include <tqtimer.h> +#include <tqptrlist.h> #include <kdialogbase.h> #include <kscreensaver.h> @@ -23,7 +23,7 @@ extern "C" { #define MAX_REFRESH_TIMEOUT 40 typedef struct { - QWidget *w; + TQWidget *w; int grid_width, grid_height; int grid_margin_x; int grid_margin_y; @@ -34,7 +34,7 @@ typedef struct { char* modified; int show_threads; - QPixmap images; + TQPixmap images; int image_width, image_height; int nglyphs; @@ -61,7 +61,7 @@ protected slots: void slotTimeout(); protected: - QTimer timer; + TQTimer timer; int colorContext; int speed; @@ -75,7 +75,7 @@ class kVmSetup : public KDialogBase { Q_OBJECT public: - kVmSetup( QWidget *parent = NULL, const char *name = NULL ); + kVmSetup( TQWidget *parent = NULL, const char *name = NULL ); ~kVmSetup(); protected: void readSettings(); @@ -87,7 +87,7 @@ private slots: void slotHelp(); private: - QWidget *preview; + TQWidget *preview; kVmSaver *saver; int speed; diff --git a/kscreensaver/kdesavers/lines.cpp b/kscreensaver/kdesavers/lines.cpp index fbe31056..02d895e6 100644 --- a/kscreensaver/kdesavers/lines.cpp +++ b/kscreensaver/kdesavers/lines.cpp @@ -11,9 +11,9 @@ #include <config.h> #include <stdlib.h> #include <time.h> -#include <qcolor.h> -#include <qlabel.h> -#include <qslider.h> +#include <tqcolor.h> +#include <tqlabel.h> +#include <tqslider.h> #include <kconfig.h> #include <kapplication.h> #include <kmessagebox.h> @@ -23,10 +23,10 @@ #include "lines.h" #include "lines.moc" -#include <qlayout.h> +#include <tqlayout.h> #include <klocale.h> #include <kglobal.h> -#include <qpainter.h> +#include <tqpainter.h> #define MAXLENGTH 256 @@ -42,7 +42,7 @@ extern "C" return new kLinesSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new kLinesSetup(); } @@ -112,66 +112,66 @@ void Lines::turn(const int& w, const int& h){ //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -kLinesSetup::kLinesSetup(QWidget *parent, const char *name) +kLinesSetup::kLinesSetup(TQWidget *parent, const char *name) : KDialogBase(parent, name, true, i18n( "Setup Lines Screen Saver" ), Ok|Cancel|Help, Ok, true ), saver( 0 ), length( 10 ), speed( 50 ) { readSettings(); setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout *tl = new QHBoxLayout(main, 0, spacingHint()); - QVBoxLayout *tl1 = new QVBoxLayout; + TQHBoxLayout *tl = new TQHBoxLayout(main, 0, spacingHint()); + TQVBoxLayout *tl1 = new QVBoxLayout; tl->addLayout(tl1); - QLabel *label=new QLabel(i18n("Length:"), main); + TQLabel *label=new TQLabel(i18n("Length:"), main); tl1->addWidget(label); - QSlider *sb= new QSlider(1, MAXLENGTH+1, 16, length, QSlider::Horizontal, + TQSlider *sb= new TQSlider(1, MAXLENGTH+1, 16, length, TQSlider::Horizontal, main); sb->setMinimumSize(120, 20); - sb->setTickmarks(QSlider::Below); + sb->setTickmarks(TQSlider::Below); sb->setTickInterval(32); - connect(sb, SIGNAL(valueChanged(int)), SLOT(slotLength(int))); + connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotLength(int))); tl1->addWidget(sb); - label=new QLabel(i18n("Speed:"), main); + label=new TQLabel(i18n("Speed:"), main); tl1->addWidget(label); - sb = new QSlider(0, 100, 10, speed, QSlider::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main); sb->setMinimumSize(120, 20); - sb->setTickmarks(QSlider::Below); + sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); - connect( sb, SIGNAL( valueChanged( int ) ), SLOT( slotSpeed( int ) ) ); + connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) ); tl1->addWidget(sb); - label=new QLabel(i18n("Beginning:"), main); + label=new TQLabel(i18n("Beginning:"), main); tl1->addWidget(label); colorPush0=new KColorButton(colstart, main); - connect(colorPush0, SIGNAL(changed(const QColor &)), - SLOT(slotColstart(const QColor &))); + connect(colorPush0, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotColstart(const TQColor &))); tl1->addWidget(colorPush0); - label=new QLabel(i18n("Middle:"), main); + label=new TQLabel(i18n("Middle:"), main); tl1->addWidget(label); colorPush1=new KColorButton(colmid, main); - connect(colorPush1, SIGNAL(changed(const QColor &)), - SLOT(slotColmid(const QColor &))); + connect(colorPush1, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotColmid(const TQColor &))); tl1->addWidget(colorPush1); - label=new QLabel(i18n("End:"), main); + label=new TQLabel(i18n("End:"), main); tl1->addWidget(label); colorPush2=new KColorButton(colend, main); - connect(colorPush2, SIGNAL(changed(const QColor &)), - SLOT(slotColend(const QColor &))); + connect(colorPush2, TQT_SIGNAL(changed(const TQColor &)), + TQT_SLOT(slotColend(const TQColor &))); tl1->addWidget(colorPush2); tl1->addStretch(); - preview = new QWidget( main ); + preview = new TQWidget( main ); preview->setFixedSize( 220, 170 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -189,7 +189,7 @@ void kLinesSetup::readSettings(){ KConfig *config = KGlobal::config(); config->setGroup( "Settings" ); - QString str; + TQString str; length = config->readNumEntry("Length", length); if(length>MAXLENGTH) length=MAXLENGTH; @@ -220,17 +220,17 @@ void kLinesSetup::slotSpeed(int num){ if(saver) saver->setSpeed(speed); } -void kLinesSetup::slotColstart(const QColor &col){ +void kLinesSetup::slotColstart(const TQColor &col){ colstart = col; if(saver) saver->setColor(colstart, colmid, colend); } -void kLinesSetup::slotColmid(const QColor &col){ +void kLinesSetup::slotColmid(const TQColor &col){ colmid = col; if(saver) saver->setColor(colstart, colmid, colend); } -void kLinesSetup::slotColend(const QColor &col){ +void kLinesSetup::slotColend(const TQColor &col){ colend = col; if(saver) saver->setColor(colstart, colmid, colend); } @@ -247,15 +247,15 @@ void kLinesSetup::slotOk(){ KConfig *config = KGlobal::config(); config->setGroup("Settings"); - QString slength; + TQString slength; slength.setNum(length); config->writeEntry("Length", slength); - QString sspeed; + TQString sspeed; sspeed.setNum( speed ); config->writeEntry( "Speed", sspeed ); - QString colName0, colName1, colName2; + TQString colName0, colName1, colName2; colName0.sprintf("#%02x%02x%02x", colstart.red(), colstart.green(), colstart.blue() ); config->writeEntry( "StartColor", colName0 ); @@ -278,18 +278,18 @@ void kLinesSetup::slotOk(){ kLinesSaver::kLinesSaver( WId id ) : KScreenSaver( id ){ readSettings(); lines=new Lines(numLines); - colorContext=QColor::enterAllocContext(); + colorContext=TQColor::enterAllocContext(); blank(); initialiseColor(); initialiseLines(); timer.start(speed); - connect(&timer, SIGNAL(timeout()), SLOT(slotTimeout())); + connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); } kLinesSaver::~kLinesSaver(){ timer.stop(); - QColor::leaveAllocContext(); - QColor::destroyAllocContext(colorContext); + TQColor::leaveAllocContext(); + TQColor::destroyAllocContext(colorContext); delete lines; } @@ -310,7 +310,7 @@ void kLinesSaver::setSpeed(int spd){ timer.start(speed); } -void kLinesSaver::setColor(const QColor& cs, const QColor& cm, const QColor& ce){ +void kLinesSaver::setColor(const TQColor& cs, const TQColor& cm, const TQColor& ce){ colstart=cs; colmid=cm; colend=ce; @@ -339,7 +339,7 @@ void kLinesSaver::slotTimeout(){ int col=0; lines->reset(); - QPainter p( this ); + TQPainter p( this ); p.setPen( black ); for(i=0; i<numLines; i++){ diff --git a/kscreensaver/kdesavers/lines.h b/kscreensaver/kdesavers/lines.h index d3f1062c..c5e7f42a 100644 --- a/kscreensaver/kdesavers/lines.h +++ b/kscreensaver/kdesavers/lines.h @@ -8,8 +8,8 @@ #ifndef __LINES_H__ #define __LINES_H__ -#include <qtimer.h> -#include <qptrlist.h> +#include <tqtimer.h> +#include <tqptrlist.h> #include <kdialogbase.h> #include <krandomsequence.h> @@ -44,7 +44,7 @@ class kLinesSaver:public KScreenSaver{ void setLines(int len); void setSpeed(int spd); - void setColor(const QColor&, const QColor&, const QColor&); + void setColor(const TQColor&, const TQColor&, const TQColor&); private: void readSettings(); @@ -57,11 +57,11 @@ class kLinesSaver:public KScreenSaver{ protected: KRandomSequence rnd; - QTimer timer; + TQTimer timer; unsigned numLines; int colorContext, speed; - QColor colors[64]; - QColor colstart, colmid, colend; + TQColor colors[64]; + TQColor colstart, colmid, colend; double colscale; Lines* lines; }; @@ -69,7 +69,7 @@ class kLinesSaver:public KScreenSaver{ class kLinesSetup : public KDialogBase{ Q_OBJECT public: - kLinesSetup(QWidget *parent=NULL, const char *name=NULL); + kLinesSetup(TQWidget *parent=NULL, const char *name=NULL); ~kLinesSetup(); protected: @@ -78,18 +78,18 @@ class kLinesSetup : public KDialogBase{ private slots: void slotLength(int); void slotSpeed(int); - void slotColstart(const QColor &); - void slotColmid(const QColor &); - void slotColend(const QColor &); + void slotColstart(const TQColor &); + void slotColmid(const TQColor &); + void slotColend(const TQColor &); void slotOk(); void slotHelp(); private: KColorButton *colorPush0, *colorPush1, *colorPush2; - QWidget *preview; + TQWidget *preview; kLinesSaver *saver; int length, speed; - QColor colstart, colmid, colend; + TQColor colstart, colmid, colend; }; #endif diff --git a/kscreensaver/kdesavers/lorenz.cpp b/kscreensaver/kdesavers/lorenz.cpp index c9017bb0..7c96a152 100644 --- a/kscreensaver/kdesavers/lorenz.cpp +++ b/kscreensaver/kdesavers/lorenz.cpp @@ -11,11 +11,11 @@ #include <math.h> #include <stdlib.h> -#include <qpainter.h> -#include <qslider.h> -#include <qlayout.h> -#include <qcolor.h> -#include <qlabel.h> +#include <tqpainter.h> +#include <tqslider.h> +#include <tqlayout.h> +#include <tqcolor.h> +#include <tqlabel.h> #include <kapplication.h> #include <klocale.h> @@ -38,7 +38,7 @@ extern "C" return new KLorenzSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KLorenzSetup(); } @@ -66,80 +66,80 @@ extern "C" //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -KLorenzSetup::KLorenzSetup( QWidget *parent, const char *name ) +KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Lorenz Attractor" ), Ok|Cancel|Default|Help, Ok, true ) { readSettings(); setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout *tl = new QHBoxLayout( main, 0, spacingHint() ); - QVBoxLayout *tl1 = new QVBoxLayout; + TQHBoxLayout *tl = new TQHBoxLayout( main, 0, spacingHint() ); + TQVBoxLayout *tl1 = new QVBoxLayout; tl->addLayout(tl1); - QLabel *label = new QLabel( i18n("Speed:"), main ); + TQLabel *label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sps = new QSlider(MINSPEED, MAXSPEED, 10, speed, QSlider::Horizontal, main); + sps = new TQSlider(MINSPEED, MAXSPEED, 10, speed, TQSlider::Horizontal, main); sps->setMinimumSize( 120, 20 ); - sps->setTickmarks(QSlider::Below); + sps->setTickmarks(TQSlider::Below); sps->setTickInterval(150); - connect( sps, SIGNAL( valueChanged( int ) ), SLOT( slotSpeed( int ) ) ); + connect( sps, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) ); tl1->addWidget(sps); - label = new QLabel( i18n("Epoch:"), main ); + label = new TQLabel( i18n("Epoch:"), main ); tl1->addWidget(label); - eps = new QSlider(MINEPOCH, MAXEPOCH, 100, epoch, QSlider::Horizontal, main); + eps = new TQSlider(MINEPOCH, MAXEPOCH, 100, epoch, TQSlider::Horizontal, main); eps->setMinimumSize( 120, 20 ); - eps->setTickmarks(QSlider::Below); + eps->setTickmarks(TQSlider::Below); eps->setTickInterval(3000); - connect( eps, SIGNAL( valueChanged( int ) ), SLOT( slotEpoch( int ) ) ); + connect( eps, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEpoch( int ) ) ); tl1->addWidget(eps); - label = new QLabel( i18n("Color rate:"), main ); + label = new TQLabel( i18n("Color rate:"), main ); tl1->addWidget(label); - crs = new QSlider(MINCOLOR, MAXCOLOR, 5, crate, QSlider::Horizontal, main); + crs = new TQSlider(MINCOLOR, MAXCOLOR, 5, crate, TQSlider::Horizontal, main); crs->setMinimumSize( 120, 20 ); - crs->setTickmarks(QSlider::Below); + crs->setTickmarks(TQSlider::Below); crs->setTickInterval(10); - connect( crs, SIGNAL( valueChanged( int ) ), SLOT( slotCRate( int ) ) ); + connect( crs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotCRate( int ) ) ); tl1->addWidget(crs); - label = new QLabel( i18n("Rotation Z:"), main ); + label = new TQLabel( i18n("Rotation Z:"), main ); tl1->addWidget(label); - zrs = new QSlider(MINZROT, MAXZROT, 18, zrot, QSlider::Horizontal, main); + zrs = new TQSlider(MINZROT, MAXZROT, 18, zrot, TQSlider::Horizontal, main); zrs->setMinimumSize( 120, 20 ); - zrs->setTickmarks(QSlider::Below); + zrs->setTickmarks(TQSlider::Below); zrs->setTickInterval(36); - connect( zrs, SIGNAL( valueChanged( int ) ), SLOT( slotZRot( int ) ) ); + connect( zrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotZRot( int ) ) ); tl1->addWidget(zrs); - label = new QLabel( i18n("Rotation Y:"), main ); + label = new TQLabel( i18n("Rotation Y:"), main ); tl1->addWidget(label); - yrs = new QSlider(MINYROT, MAXYROT, 18, yrot, QSlider::Horizontal, main); + yrs = new TQSlider(MINYROT, MAXYROT, 18, yrot, TQSlider::Horizontal, main); yrs->setMinimumSize( 120, 20 ); - yrs->setTickmarks(QSlider::Below); + yrs->setTickmarks(TQSlider::Below); yrs->setTickInterval(36); - connect( yrs, SIGNAL( valueChanged( int ) ), SLOT( slotYRot( int ) ) ); + connect( yrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotYRot( int ) ) ); tl1->addWidget(yrs); - label = new QLabel( i18n("Rotation X:"), main ); + label = new TQLabel( i18n("Rotation X:"), main ); tl1->addWidget(label); - xrs = new QSlider(MINXROT, MAXXROT, 18, xrot, QSlider::Horizontal, main); + xrs = new TQSlider(MINXROT, MAXXROT, 18, xrot, TQSlider::Horizontal, main); xrs->setMinimumSize( 120, 20 ); - xrs->setTickmarks(QSlider::Below); + xrs->setTickmarks(TQSlider::Below); xrs->setTickInterval(36); - connect( xrs, SIGNAL( valueChanged( int ) ), SLOT( slotXRot( int ) ) ); + connect( xrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotXRot( int ) ) ); tl1->addWidget(xrs); - preview = new QWidget( main ); + preview = new TQWidget( main ); preview->setFixedSize( 220, 165 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -441,12 +441,12 @@ KLorenzSaver::KLorenzSaver( WId id ) : KScreenSaver( id ) mat = new Matrix3D(); updateMatrix(); - colorContext = QColor::enterAllocContext(); + colorContext = TQColor::enterAllocContext(); setBackgroundColor( black ); newEpoch(); timer.start( 10 ); - connect( &timer, SIGNAL( timeout() ), SLOT( drawOnce() ) ); + connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( drawOnce() ) ); } KLorenzSaver::~KLorenzSaver() @@ -454,8 +454,8 @@ KLorenzSaver::~KLorenzSaver() delete mat; mat=0; timer.stop(); - QColor::leaveAllocContext(); - QColor::destroyAllocContext( colorContext ); + TQColor::leaveAllocContext(); + TQColor::destroyAllocContext( colorContext ); } // read configuration settings from config file @@ -544,7 +544,7 @@ void KLorenzSaver::drawOnce() double kx, ky, kz, dx, dy, dz; const double h = 0.0001; const double tqh = h * 3.0 / 4.0; - QPainter p(this); + TQPainter p(this); for (int i=0; i<speed; i++) { // Runge-Kutta formula @@ -557,7 +557,7 @@ void KLorenzSaver::drawOnce() mat->transform(x,y,z,kx,ky,kz); // Choose a color p.setPen( - QColor((int)(sin(t*crate/pi)*127+128), + TQColor((int)(sin(t*crate/pi)*127+128), (int)(sin(t*crate/(pi-1))*127+128), (int)(sin(t*crate/(pi-2))*127+128)).pixel() ); // Draw a point diff --git a/kscreensaver/kdesavers/lorenz.h b/kscreensaver/kdesavers/lorenz.h index f666db71..9d9390b4 100644 --- a/kscreensaver/kdesavers/lorenz.h +++ b/kscreensaver/kdesavers/lorenz.h @@ -11,8 +11,8 @@ #ifndef __LORENZKSCRN_H__ #define __LORENZKSCRN_H__ -#include <qtimer.h> -#include <qcolor.h> +#include <tqtimer.h> +#include <tqcolor.h> #include <kscreensaver.h> #include <kdialogbase.h> @@ -38,7 +38,7 @@ protected slots: void drawOnce(); protected: - QTimer timer; + TQTimer timer; int colorContext; private: @@ -57,7 +57,7 @@ class KLorenzSetup : public KDialogBase { Q_OBJECT public: - KLorenzSetup(QWidget *parent = 0, const char *name = 0 ); + KLorenzSetup(TQWidget *parent = 0, const char *name = 0 ); ~KLorenzSetup(); protected: @@ -76,8 +76,8 @@ private slots: void slotDefault(); private: - QWidget *preview; - QSlider *sps, *eps, *zrs, *yrs, *xrs, *crs; + TQWidget *preview; + TQSlider *sps, *eps, *zrs, *yrs, *xrs, *crs; KLorenzSaver *saver; int speed, epoch, zrot, yrot, xrot, crate; }; diff --git a/kscreensaver/kdesavers/pendulum.cpp b/kscreensaver/kdesavers/pendulum.cpp index 801b74dd..18f03be8 100644 --- a/kscreensaver/kdesavers/pendulum.cpp +++ b/kscreensaver/kdesavers/pendulum.cpp @@ -30,12 +30,12 @@ #include <cstdlib> // Qt headers -#include <qlineedit.h> -#include <qspinbox.h> -#include <qvalidator.h> -#include <qcolordialog.h> -#include <qpushbutton.h> -#include <qtooltip.h> +#include <tqlineedit.h> +#include <tqspinbox.h> +#include <tqvalidator.h> +#include <tqcolordialog.h> +#include <tqpushbutton.h> +#include <tqtooltip.h> // KDE headers #include <klocale.h> #include <kconfig.h> @@ -67,7 +67,7 @@ extern "C" } /// function to create setup dialog for screen saver - KDE_EXPORT QDialog* kss_setup() + KDE_EXPORT TQDialog* kss_setup() { return new KPendulumSetup(); } @@ -129,8 +129,8 @@ std::valarray<double> PendulumOdeSolver::f( // Rotation: screen saver widget //----------------------------------------------------------------------------- -PendulumGLWidget::PendulumGLWidget(QWidget* parent, const char* name) - : QGLWidget(parent, name), +PendulumGLWidget::PendulumGLWidget(TQWidget* parent, const char* name) + : TQGLWidget(parent, name), eyeR(30), // eye coordinates (polar) eyeTheta(M_PI*0.45), eyePhi(0), @@ -180,7 +180,7 @@ void PendulumGLWidget::setLengths(const double& _l1, const double& _l2) l2 = static_cast<GLfloat>(_l2); } -void PendulumGLWidget::setBarColor(const QColor& c) +void PendulumGLWidget::setBarColor(const TQColor& c) { if (c.isValid()) { @@ -188,14 +188,14 @@ void PendulumGLWidget::setBarColor(const QColor& c) } } -void PendulumGLWidget::setM1Color(const QColor& c) +void PendulumGLWidget::setM1Color(const TQColor& c) { if (c.isValid()) { m_m1Color = c; } } -void PendulumGLWidget::setM2Color(const QColor& c) +void PendulumGLWidget::setM2Color(const TQColor& c) { if (c.isValid()) { @@ -207,7 +207,7 @@ void PendulumGLWidget::setM2Color(const QColor& c) void PendulumGLWidget::initializeGL(void) { - qglClearColor(QColor(black)); // set color to clear the background + qglClearColor(TQColor(black)); // set color to clear the background glClearDepth(1); // depth buffer setup glEnable(GL_DEPTH_TEST); // depth testing @@ -377,9 +377,9 @@ KPendulumSaver::KPendulumSaver(WId id) : glArea->show(); // show gl widget // set up and start cyclic timer - timer = new QTimer(this); + timer = new TQTimer(this); timer->start(deltaT, TRUE); - connect(timer, SIGNAL(timeout()), this, SLOT(doTimeStep())); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimeStep())); } KPendulumSaver::~KPendulumSaver() @@ -465,38 +465,38 @@ void KPendulumSaver::initData() } -void KPendulumSaver::setBarColor(const QColor& c) +void KPendulumSaver::setBarColor(const TQColor& c) { glArea->setBarColor(c); } -QColor KPendulumSaver::barColor(void) const +TQColor KPendulumSaver::barColor(void) const { return glArea->barColor(); } -const QColor KPendulumSaver::barColorDefault(255, 255, 127); +const TQColor KPendulumSaver::barColorDefault(255, 255, 127); -void KPendulumSaver::setM1Color(const QColor& c) +void KPendulumSaver::setM1Color(const TQColor& c) { glArea->setM1Color(c); } -QColor KPendulumSaver::m1Color(void) const +TQColor KPendulumSaver::m1Color(void) const { return glArea->m1Color(); } -const QColor KPendulumSaver::m1ColorDefault(170, 0, 127); +const TQColor KPendulumSaver::m1ColorDefault(170, 0, 127); -void KPendulumSaver::setM2Color(const QColor& c) +void KPendulumSaver::setM2Color(const TQColor& c) { glArea->setM2Color(c); } -QColor KPendulumSaver::m2Color(void) const +TQColor KPendulumSaver::m2Color(void) const { return glArea->m2Color(); } -const QColor KPendulumSaver::m2ColorDefault( 85, 170, 127); +const TQColor KPendulumSaver::m2ColorDefault( 85, 170, 127); void KPendulumSaver::setMassRatio(const double& massRatio) @@ -660,7 +660,7 @@ void KPendulumSaver::doTimeStep() // public slot of KPendulumSaver, forward resize event to public slot of glArea // to allow the resizing of the gl area withing the setup dialog -void KPendulumSaver::resizeGlArea(QResizeEvent* e) +void KPendulumSaver::resizeGlArea(TQResizeEvent* e) { glArea->resize(e->size()); } @@ -669,7 +669,7 @@ void KPendulumSaver::resizeGlArea(QResizeEvent* e) // KPendulumSetup: dialog to setup screen saver parameters //----------------------------------------------------------------------------- -KPendulumSetup::KPendulumSetup(QWidget* parent, const char* name) +KPendulumSetup::KPendulumSetup(TQWidget* parent, const char* name) : KPendulumSetupUi(parent, name), // create saver and give it the WinID of the preview area saver(new KPendulumSaver(preview->winId())) @@ -679,19 +679,19 @@ KPendulumSetup::KPendulumSetup(QWidget* parent, const char* name) setModal(TRUE); // create input validators - mEdit->setValidator(new QDoubleValidator( + mEdit->setValidator(new TQDoubleValidator( KPendulumSaver::massRatioLimitLower, KPendulumSaver::massRatioLimitUpper, 5, mEdit)); - lEdit->setValidator(new QDoubleValidator( + lEdit->setValidator(new TQDoubleValidator( KPendulumSaver::lengthRatioLimitLower, KPendulumSaver::lengthRatioLimitUpper, 5, lEdit)); - gEdit->setValidator(new QDoubleValidator( + gEdit->setValidator(new TQDoubleValidator( KPendulumSaver::gLimitLower, KPendulumSaver::gLimitUpper, 5, gEdit)); - eEdit->setValidator(new QDoubleValidator( + eEdit->setValidator(new TQDoubleValidator( KPendulumSaver::ELimitLower, KPendulumSaver::ELimitUpper, 5, eEdit)); @@ -701,27 +701,27 @@ KPendulumSetup::KPendulumSetup(QWidget* parent, const char* name) persSpinBox->setMaxValue(KPendulumSaver::persChangeIntervalLimitUpper); // set tool tips of editable fields - QToolTip::add( + 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)); - QToolTip::add( + 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)); - QToolTip::add( + 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)); - QToolTip::add( + 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)); - QToolTip::add( + TQToolTip::add( persSpinBox, i18n("Time in seconds after which a random perspective change occurs.\nValid values from %1 to %2.") .arg(KPendulumSaver::persChangeIntervalLimitLower) @@ -735,7 +735,7 @@ KPendulumSetup::KPendulumSetup(QWidget* parent, const char* name) // has read settings in its constructor // set editable fields with stored values as defaults - QString text; + TQString text; text.setNum(saver->massRatio()); mEdit->setText(text); text.setNum(saver->lengthRatio()); @@ -754,8 +754,8 @@ KPendulumSetup::KPendulumSetup(QWidget* parent, const char* name) // if the preview area is resized it emmits the resized() event which is // caught by the saver. The embedded GlArea is resized to fit into the // preview area. - connect(preview, SIGNAL(resized(QResizeEvent*)), - saver, SLOT(resizeGlArea(QResizeEvent*))); + connect(preview, TQT_SIGNAL(resized(TQResizeEvent*)), + saver, TQT_SLOT(resizeGlArea(TQResizeEvent*))); } KPendulumSetup::~KPendulumSetup() @@ -800,7 +800,7 @@ void KPendulumSetup::mEditLostFocusSlot(void) } else { // write current setting back into input field - QString text; + TQString text; text.setNum(saver->massRatio()); mEdit->setText(text); } @@ -813,7 +813,7 @@ void KPendulumSetup::lEditLostFocusSlot(void) } else { // write current setting back into input field - QString text; + TQString text; text.setNum(saver->lengthRatio()); lEdit->setText(text); } @@ -826,7 +826,7 @@ void KPendulumSetup::gEditLostFocusSlot(void) } else { // write current setting back into input field - QString text; + TQString text; text.setNum(saver->g()); gEdit->setText(text); } @@ -839,7 +839,7 @@ void KPendulumSetup::eEditLostFocusSlot(void) } else { // write current setting back into input field - QString text; + TQString text; text.setNum(saver->E()); eEdit->setText(text); } @@ -851,7 +851,7 @@ void KPendulumSetup::persChangeEnteredSlot(int t) void KPendulumSetup::barColorButtonClickedSlot(void) { - QColor color = QColorDialog::getColor( + TQColor color = QColorDialog::getColor( saver->barColor(), this, "bar color dialog"); if (color.isValid()) { @@ -861,7 +861,7 @@ void KPendulumSetup::barColorButtonClickedSlot(void) } void KPendulumSetup::m1ColorButtonClickedSlot(void) { - QColor color = QColorDialog::getColor( + TQColor color = QColorDialog::getColor( saver->m1Color(), this, "mass 1 color dialog"); if (color.isValid()) { @@ -871,7 +871,7 @@ void KPendulumSetup::m1ColorButtonClickedSlot(void) } void KPendulumSetup::m2ColorButtonClickedSlot(void) { - QColor color = QColorDialog::getColor( + TQColor color = QColorDialog::getColor( saver->m2Color(), this, "mass 2 color dialog"); if (color.isValid()) { diff --git a/kscreensaver/kdesavers/pendulum.h b/kscreensaver/kdesavers/pendulum.h index 2b917a2b..3c26a1ef 100644 --- a/kscreensaver/kdesavers/pendulum.h +++ b/kscreensaver/kdesavers/pendulum.h @@ -16,9 +16,9 @@ // STL headers #include <valarray> // Qt headers -#include <qwidget.h> -#include <qtimer.h> -#include <qgl.h> +#include <tqwidget.h> +#include <tqtimer.h> +#include <tqgl.h> // GL headers #include <GL/glu.h> #include <GL/gl.h> @@ -78,7 +78,7 @@ class PendulumOdeSolver : public RkOdeSolver<double> /** @brief GL widget class for the KPendulum screen saver * - * Class implements QGLWidget to display the KPendulum screen saver. */ + * Class implements TQGLWidget to display the KPendulum screen saver. */ class PendulumGLWidget : public QGLWidget { Q_OBJECT @@ -87,7 +87,7 @@ class PendulumGLWidget : public QGLWidget /** @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 */ - PendulumGLWidget(QWidget* parent=0, const char* name=0); + PendulumGLWidget(TQWidget* parent=0, const char* name=0); /** @brief Destructor of KPendulum's GL widget */ ~PendulumGLWidget(void); @@ -111,22 +111,22 @@ class PendulumGLWidget : public QGLWidget /** @brief set color of the bars * @param c color */ - void setBarColor(const QColor& c); + void setBarColor(const TQColor& c); /** @brief get color of the bars * @return color */ - inline QColor barColor(void) const {return m_barColor;} + inline TQColor barColor(void) const {return m_barColor;} /** @brief set color of mass 1 * @param c color */ - void setM1Color(const QColor& c); + void setM1Color(const TQColor& c); /** @brief get color of mass 1 * @return color */ - inline QColor m1Color(void) const {return m_m1Color;} + inline TQColor m1Color(void) const {return m_m1Color;} /** @brief set color of mass 2 * @param c color */ - void setM2Color(const QColor& c); + void setM2Color(const TQColor& c); /** @brief get color of mass 2 * @return color */ - inline QColor m2Color(void) const {return m_m2Color;} + inline TQColor m2Color(void) const {return m_m2Color;} protected: /** paint the GL view */ @@ -169,11 +169,11 @@ class PendulumGLWidget : public QGLWidget GLUquadricObj* const quadM1; /** color of the pendulum bars */ - QColor m_barColor; + TQColor m_barColor; /** color of the 1. mass */ - QColor m_m1Color; + TQColor m_m1Color; /** color of the 2. mass */ - QColor m_m2Color; + TQColor m_m2Color; }; //-------------------------------------------------------------------- @@ -206,25 +206,25 @@ class KPendulumSaver : public KScreenSaver /* accessors for PendulumGLWidget member variables */ /** Set the displayed bar color of the pendulum */ - void setBarColor(const QColor& c); + void setBarColor(const TQColor& c); /** Get the displayed bar color of the pendulum */ - QColor barColor(void) const; + TQColor barColor(void) const; - static const QColor barColorDefault; + static const TQColor barColorDefault; /** Set the displayed color of the 1. pendulum mass */ - void setM1Color(const QColor& c); + void setM1Color(const TQColor& c); /** Get the displayed color of the 1. pendulum mass */ - QColor m1Color(void) const; + TQColor m1Color(void) const; - static const QColor m1ColorDefault; + static const TQColor m1ColorDefault; /** Set the displayed color of the 2. pendulum mass */ - void setM2Color(const QColor& c); + void setM2Color(const TQColor& c); /** Get the displayed color of the 2. pendulum mass */ - QColor m2Color(void) const; + TQColor m2Color(void) const; - static const QColor m2ColorDefault; + static const TQColor m2ColorDefault; /* accessors for own member variables */ @@ -287,7 +287,7 @@ class KPendulumSaver : public KScreenSaver void doTimeStep(); /** slot is called if setup dialog changes in size and the GL are should be * adjusted */ - void resizeGlArea(QResizeEvent* e); + void resizeGlArea(TQResizeEvent* e); private: /** The ode solver which is used to integrate the equations of motion */ @@ -295,7 +295,7 @@ class KPendulumSaver : public KScreenSaver /** Gl widget of simulation */ PendulumGLWidget* glArea; /** Timer for the real time integration of the eqs. of motion */ - QTimer* timer; + TQTimer* timer; /** Time step size for the integration in milliseconds. 20 ms corresponds to * a frame rate of 50 fps. */ @@ -340,7 +340,7 @@ class KPendulumSetup : public KPendulumSetupUi * * The dialog box is set up and the screen saver object KPendulumSetup::saver * is instantiated. */ - KPendulumSetup(QWidget* parent = 0, const char* name = 0); + KPendulumSetup(TQWidget* parent = 0, const char* name = 0); /** @brief Destructor of the KPendulum screen saver setup dialog * * Only KPendulumSetup::saver is deleted. */ diff --git a/kscreensaver/kdesavers/polygon.cpp b/kscreensaver/kdesavers/polygon.cpp index 55e052f1..8f4dadb2 100644 --- a/kscreensaver/kdesavers/polygon.cpp +++ b/kscreensaver/kdesavers/polygon.cpp @@ -10,17 +10,17 @@ #include <config.h> #include <stdlib.h> #include <time.h> -#include <qcolor.h> -#include <qlabel.h> -#include <qslider.h> -#include <qlayout.h> +#include <tqcolor.h> +#include <tqlabel.h> +#include <tqslider.h> +#include <tqlayout.h> #include <klocale.h> #include <kconfig.h> #include <kglobal.h> #include <kmessagebox.h> #include "polygon.h" -#include <qpainter.h> +#include <tqpainter.h> #include "polygon.moc" @@ -40,7 +40,7 @@ extern "C" return new kPolygonSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new kPolygonSetup(); } @@ -49,53 +49,53 @@ extern "C" //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -kPolygonSetup::kPolygonSetup( QWidget *parent, const char *name ) +kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Polygon Screen Saver" ), Ok|Cancel|Help, Ok, true ), saver( 0 ), length( 10 ), vertices( 3 ), speed( 50 ) { readSettings(); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); setButtonText( Help, i18n( "A&bout" ) ); - QHBoxLayout *tl = new QHBoxLayout(main, 0, spacingHint()); - QVBoxLayout *tl1 = new QVBoxLayout; + TQHBoxLayout *tl = new TQHBoxLayout(main, 0, spacingHint()); + TQVBoxLayout *tl1 = new QVBoxLayout; tl->addLayout(tl1); - QLabel *label = new QLabel( i18n("Length:"), main ); + TQLabel *label = new TQLabel( i18n("Length:"), main ); tl1->addWidget(label); - QSlider *sb = new QSlider(1, MAXLENGTH, 10, length, QSlider::Horizontal, + TQSlider *sb = new TQSlider(1, MAXLENGTH, 10, length, TQSlider::Horizontal, main ); sb->setMinimumSize( 90, 20 ); - sb->setTickmarks(QSlider::Below); + sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); - connect( sb, SIGNAL( valueChanged( int ) ), SLOT( slotLength( int ) ) ); + connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotLength( int ) ) ); tl1->addWidget(sb); - label = new QLabel( i18n("Vertices:"), main ); + label = new TQLabel( i18n("Vertices:"), main ); tl1->addWidget(label); - sb = new QSlider(3, MAXVERTICES, 2, vertices, QSlider::Horizontal, main); + sb = new TQSlider(3, MAXVERTICES, 2, vertices, TQSlider::Horizontal, main); sb->setMinimumSize( 90, 20 ); - sb->setTickmarks(QSlider::Below); + sb->setTickmarks(TQSlider::Below); sb->setTickInterval(2); - connect( sb, SIGNAL( valueChanged( int ) ), SLOT( slotVertices( int ) ) ); + connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotVertices( int ) ) ); tl1->addWidget(sb); - label = new QLabel( i18n("Speed:"), main ); + label = new TQLabel( i18n("Speed:"), main ); tl1->addWidget(label); - sb = new QSlider(0, 100, 10, speed, QSlider::Horizontal, main); + sb = new TQSlider(0, 100, 10, speed, TQSlider::Horizontal, main); sb->setMinimumSize( 90, 20 ); - sb->setTickmarks(QSlider::Below); + sb->setTickmarks(TQSlider::Below); sb->setTickInterval(10); - connect( sb, SIGNAL( valueChanged( int ) ), SLOT( slotSpeed( int ) ) ); + connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) ); tl1->addWidget(sb); tl1->addStretch(); - preview = new QWidget( main ); + preview = new TQWidget( main ); preview->setFixedSize( 220, 170 ); preview->setBackgroundColor( black ); preview->show(); // otherwise saver does not get correct size @@ -162,15 +162,15 @@ void kPolygonSetup::slotOk() KConfig *config = KGlobal::config(); config->setGroup( "Settings" ); - QString slength; + TQString slength; slength.setNum( length ); config->writeEntry( "Length", slength ); - QString svertices; + TQString svertices; svertices.setNum( vertices ); config->writeEntry( "Vertices", svertices ); - QString sspeed; + TQString sspeed; sspeed.setNum( speed ); config->writeEntry( "Speed", sspeed ); @@ -197,7 +197,7 @@ kPolygonSaver::kPolygonSaver( WId id ) : KScreenSaver( id ) readSettings(); directions.resize( numVertices ); - colorContext = QColor::enterAllocContext(); + colorContext = TQColor::enterAllocContext(); blank(); @@ -205,14 +205,14 @@ kPolygonSaver::kPolygonSaver( WId id ) : KScreenSaver( id ) initialisePolygons(); timer.start( speed ); - connect( &timer, SIGNAL( timeout() ), SLOT( slotTimeout() ) ); + connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); } kPolygonSaver::~kPolygonSaver() { timer.stop(); - QColor::leaveAllocContext(); - QColor::destroyAllocContext( colorContext ); + TQColor::leaveAllocContext(); + TQColor::destroyAllocContext( colorContext ); } // set polygon properties @@ -262,7 +262,7 @@ void kPolygonSaver::readSettings() // draw next polygon and erase tail void kPolygonSaver::slotTimeout() { - QPainter p( this ); + TQPainter p( this ); if ( polygons.count() > numLines ) { p.setPen( black ); @@ -276,7 +276,7 @@ void kPolygonSaver::slotTimeout() if ( polygons.count() > numLines ) polygons.removeFirst(); - polygons.append( new QPointArray( polygons.last()->copy() ) ); + polygons.append( new TQPointArray( polygons.last()->copy() ) ); moveVertices(); } @@ -291,9 +291,9 @@ void kPolygonSaver::initialisePolygons() { int i; - polygons.append( new QPointArray( numVertices + 1 ) ); + polygons.append( new TQPointArray( numVertices + 1 ) ); - QPointArray &poly = *polygons.last(); + TQPointArray &poly = *polygons.last(); for ( i = 0; i < numVertices; i++ ) { @@ -313,7 +313,7 @@ void kPolygonSaver::initialisePolygons() void kPolygonSaver::moveVertices() { int i; - QPointArray &poly = *polygons.last(); + TQPointArray &poly = *polygons.last(); for ( i = 0; i < numVertices; i++ ) { diff --git a/kscreensaver/kdesavers/polygon.h b/kscreensaver/kdesavers/polygon.h index bfaac8a4..fed640c1 100644 --- a/kscreensaver/kdesavers/polygon.h +++ b/kscreensaver/kdesavers/polygon.h @@ -8,8 +8,8 @@ #ifndef __POLYGON_H__ #define __POLYGON_H__ -#include <qtimer.h> -#include <qptrlist.h> +#include <tqtimer.h> +#include <tqptrlist.h> #include <kdialogbase.h> #include <kscreensaver.h> @@ -44,8 +44,8 @@ protected: int speed; QColor colors[64]; int currentColor; - QPtrList<QPointArray> polygons; - QMemArray<QPoint> directions; + TQPtrList<TQPointArray> polygons; + TQMemArray<TQPoint> directions; KRandomSequence rnd; }; @@ -53,7 +53,7 @@ class kPolygonSetup : public KDialogBase { Q_OBJECT public: - kPolygonSetup( QWidget *parent = 0, const char *name = 0 ); + kPolygonSetup( TQWidget *parent = 0, const char *name = 0 ); ~kPolygonSetup(); protected: @@ -67,7 +67,7 @@ private slots: void slotHelp(); private: - QWidget *preview; + TQWidget *preview; kPolygonSaver *saver; int length; diff --git a/kscreensaver/kdesavers/rotation.cpp b/kscreensaver/kdesavers/rotation.cpp index 38098cb0..4868c9dc 100644 --- a/kscreensaver/kdesavers/rotation.cpp +++ b/kscreensaver/kdesavers/rotation.cpp @@ -32,10 +32,10 @@ // STL #include <deque> // Qt headers -#include <qcheckbox.h> -#include <qlineedit.h> -#include <qvalidator.h> -#include <qtooltip.h> +#include <tqcheckbox.h> +#include <tqlineedit.h> +#include <tqvalidator.h> +#include <tqtooltip.h> // KDE headers #include <klocale.h> #include <kconfig.h> @@ -68,7 +68,7 @@ extern "C" } /** function to create setup dialog for screen saver */ - KDE_EXPORT QDialog* kss_setup() + KDE_EXPORT TQDialog* kss_setup() { return new KRotationSetup(); } @@ -137,13 +137,13 @@ std::valarray<double> EulerOdeSolver::f( //----------------------------------------------------------------------------- RotationGLWidget::RotationGLWidget( - QWidget* parent, const char* name, + TQWidget* parent, const char* name, const vec3<double>& _omega, const std::deque<vec3<double> >& e1_, const std::deque<vec3<double> >& e2_, const std::deque<vec3<double> >& e3_, const vec3<double>& J) - : QGLWidget(parent, name), + : TQGLWidget(parent, name), eyeR(25), eyeTheta(1), eyePhi(M_PI*0.25), boxSize(1,1,1), fixedAxses(0), @@ -185,7 +185,7 @@ RotationGLWidget::RotationGLWidget( void RotationGLWidget::initializeGL(void) { - qglClearColor(QColor(black)); // set color to clear the background + qglClearColor(TQColor(black)); // set color to clear the background glClearDepth(1); // depth buffer setup glEnable(GL_DEPTH_TEST); // depth testing @@ -221,17 +221,17 @@ void RotationGLWidget::initializeGL(void) glLoadIdentity(); // z-axis, blue - qglColor(QColor(blue)); + qglColor(TQColor(blue)); myGlArrow(fixedAxsesLength, 0.5f, 0.03f, 0.1f); // x-axis, red - qglColor(QColor(red)); + qglColor(TQColor(red)); glRotatef(90, 0, 1, 0); myGlArrow(fixedAxsesLength, 0.5f, 0.03f, 0.1f); // y-axis, green - qglColor(QColor(green)); + qglColor(TQColor(green)); glLoadIdentity(); glRotatef(-90, 1, 0, 0); myGlArrow(fixedAxsesLength, 0.5f, 0.03f, 0.1f); @@ -247,18 +247,18 @@ void RotationGLWidget::initializeGL(void) glNewList(bodyAxses, GL_COMPILE); // z-axis, blue - qglColor(QColor(blue)); + qglColor(TQColor(blue)); myGlArrow(bodyAxsesLength, 0.5f, 0.03f, 0.1f); // x-axis, red - qglColor(QColor(red)); + qglColor(TQColor(red)); glPushMatrix(); glRotatef(90, 0, 1, 0); myGlArrow(bodyAxsesLength, 0.5f, 0.03f, 0.1f); glPopMatrix(); // y-axis, green - qglColor(QColor(green)); + qglColor(TQColor(green)); glPushMatrix(); glRotatef(-90, 1, 0, 0); myGlArrow(bodyAxsesLength, 0.5f, 0.03f, 0.1f); @@ -340,7 +340,7 @@ void RotationGLWidget::paintGL(void) 180./M_PI * vec3<double>::angle(vec3<double>(0,0,1), omega); glPushMatrix(); glRotatef(rotdeg, rotvec[0], rotvec[1], rotvec[2]); - qglColor(QColor(white)); + qglColor(TQColor(white)); myGlArrow(7, .5f, .1f, 0.2f); glPopMatrix(); @@ -374,7 +374,7 @@ void RotationGLWidget::paintGL(void) // paint box glBegin(GL_QUADS); // front (z) - qglColor(QColor(blue)); + qglColor(TQColor(blue)); glNormal3f( 0,0,1); glVertex3f( 1, 1, 1); glVertex3f(-1, 1, 1); @@ -387,7 +387,7 @@ void RotationGLWidget::paintGL(void) glVertex3f(-1, -1, -1); glVertex3f( 1, -1, -1); // top (y) - qglColor(QColor(green)); + qglColor(TQColor(green)); glNormal3f( 0,1,0); glVertex3f( 1, 1, 1); glVertex3f( 1, 1, -1); @@ -401,7 +401,7 @@ void RotationGLWidget::paintGL(void) glVertex3f(-1, -1, -1); glVertex3f(-1, -1, 1); // left (-x) - qglColor(QColor(red)); + qglColor(TQColor(red)); glNormal3f( -1,0,0); glVertex3f(-1, 1, 1); glVertex3f(-1, 1, -1); @@ -489,9 +489,9 @@ KRotationSaver::KRotationSaver(WId id) embed(glArea); // embed gl widget and resize it glArea->show(); // show gl widget - timer = new QTimer(this); + timer = new TQTimer(this); timer->start(deltaT, TRUE); - connect(timer, SIGNAL(timeout()), this, SLOT(doTimeStep())); + connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimeStep())); } KRotationSaver::~KRotationSaver() @@ -678,7 +678,7 @@ void KRotationSaver::doTimeStep() // public slot of KRotationSaver, forward resize event to public slot of glArea // to allow the resizing of the gl area withing the setup dialog -void KRotationSaver::resizeGlArea(QResizeEvent* e) +void KRotationSaver::resizeGlArea(TQResizeEvent* e) { glArea->resize(e->size()); } @@ -687,7 +687,7 @@ void KRotationSaver::resizeGlArea(QResizeEvent* e) // KRotationSetup: dialog to setup screen saver parameters //----------------------------------------------------------------------------- -KRotationSetup::KRotationSetup(QWidget* parent, const char* name) +KRotationSetup::KRotationSetup(TQWidget* parent, const char* name) : KRotationSetupUi(parent, name), // create ssaver and give it the WinID of the preview area saver(new KRotationSaver(preview->winId())) @@ -697,33 +697,33 @@ KRotationSetup::KRotationSetup(QWidget* parent, const char* name) setModal(TRUE); lengthEdit->setValidator( - new QDoubleValidator( + new TQDoubleValidator( KRotationSaver::traceLengthSecondsLimitLower, KRotationSaver::traceLengthSecondsLimitUpper, 3, lengthEdit)); LzEdit->setValidator( - new QDoubleValidator( + new TQDoubleValidator( KRotationSaver::LzLimitLower, KRotationSaver::LzLimitUpper, 3, LzEdit)); thetaEdit->setValidator( - new QDoubleValidator( + new TQDoubleValidator( KRotationSaver::initEulerThetaLimitLower, KRotationSaver::initEulerThetaLimitUpper, 3, thetaEdit)); // set tool tips of editable fields - QToolTip::add( + 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)); - QToolTip::add( + 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)); - QToolTip::add( + TQToolTip::add( thetaEdit, i18n("Gravitational constant in arbitrary units.\nValid values from %1 to %2.") .arg(KRotationSaver::initEulerThetaLimitLower, 0, 'f', 2) @@ -741,7 +741,7 @@ KRotationSetup::KRotationSetup(QWidget* parent, const char* name) yTrace->setChecked(saver->traceFlag(1)); zTrace->setChecked(saver->traceFlag(2)); randTraces->setChecked(saver->randomTraces()); - QString text; + TQString text; text.setNum(saver->traceLengthSeconds()); lengthEdit->validateAndSet(text,0,0,0); text.setNum(saver->Lz()); @@ -752,8 +752,8 @@ KRotationSetup::KRotationSetup(QWidget* parent, const char* name) // if the preview area is resized it emmits the resized() event which is // caught by the saver. The embedded GlArea is resized to fit into the // preview area. - connect(preview, SIGNAL(resized(QResizeEvent*)), - saver, SLOT(resizeGlArea(QResizeEvent*))); + connect(preview, TQT_SIGNAL(resized(TQResizeEvent*)), + saver, TQT_SLOT(resizeGlArea(TQResizeEvent*))); } KRotationSetup::~KRotationSetup() @@ -809,16 +809,16 @@ void KRotationSetup::randomTracesToggled(bool state) saver->setTraceFlag(2, zTrace->isChecked()); } } -void KRotationSetup::lengthEnteredSlot(const QString& s) +void KRotationSetup::lengthEnteredSlot(const TQString& s) { saver->setTraceLengthSeconds(s.toDouble()); } -void KRotationSetup::LzEnteredSlot(const QString& s) +void KRotationSetup::LzEnteredSlot(const TQString& s) { saver->setLz(s.toDouble()); if (saver!=0) saver->initData(); } -void KRotationSetup::thetaEnteredSlot(const QString& s) +void KRotationSetup::thetaEnteredSlot(const TQString& s) { saver->setInitEulerTheta(s.toDouble()); if (saver!=0) saver->initData(); diff --git a/kscreensaver/kdesavers/rotation.h b/kscreensaver/kdesavers/rotation.h index a1a73867..0144275d 100644 --- a/kscreensaver/kdesavers/rotation.h +++ b/kscreensaver/kdesavers/rotation.h @@ -13,9 +13,9 @@ // STL headers #include <valarray> // Qt headers -#include <qwidget.h> -#include <qtimer.h> -#include <qgl.h> +#include <tqwidget.h> +#include <tqtimer.h> +#include <tqgl.h> // GL headers #include <GL/glu.h> #include <GL/gl.h> @@ -78,7 +78,7 @@ class EulerOdeSolver : public RkOdeSolver<double> /** @brief GL widget class for the KRotation screen saver * - * Class implements QGLWidget to display the KRotation screen saver. */ + * Class implements TQGLWidget to display the KRotation screen saver. */ class RotationGLWidget : public QGLWidget { Q_OBJECT @@ -93,7 +93,7 @@ class RotationGLWidget : public QGLWidget * @param e3 z trace data * @param J 3 vector with momenta of inertia with respect to the 3 figure * axes. */ - RotationGLWidget(QWidget* parent, const char* name, + RotationGLWidget(TQWidget* parent, const char* name, const vec3<double>& omega, const std::deque<vec3<double> >& e1, const std::deque<vec3<double> >& e2, @@ -144,7 +144,7 @@ class RotationGLWidget : public QGLWidget GLfloat lightPhi; /** stores position where the mouse button was pressed down */ - QPoint mouse_press_pos; + TQPoint mouse_press_pos; /** Length of the rotating coordinate system axses */ GLfloat bodyAxsesLength; @@ -245,7 +245,7 @@ class KRotationSaver : public KScreenSaver void doTimeStep(); /** slot is called if setup dialog changes in size and the GL area should be * adjusted */ - void resizeGlArea(QResizeEvent* e); + void resizeGlArea(TQResizeEvent* e); private: /** Momentum of inertia along figure axes */ @@ -260,7 +260,7 @@ class KRotationSaver : public KScreenSaver /** Gl widget of simulation */ RotationGLWidget* glArea; /** Timer for the real time integration of the Euler equations */ - QTimer* timer; + TQTimer* timer; /** current rotation vector */ vec3<double> omega; @@ -301,7 +301,7 @@ class KRotationSetup : public KRotationSetupUi Q_OBJECT public: - KRotationSetup(QWidget* parent = NULL, const char* name = NULL); + KRotationSetup(TQWidget* parent = NULL, const char* name = NULL); ~KRotationSetup(); public slots: @@ -313,9 +313,9 @@ class KRotationSetup : public KRotationSetupUi void xTraceToggled(bool state); void yTraceToggled(bool state); void zTraceToggled(bool state); - void lengthEnteredSlot(const QString& s); - void LzEnteredSlot(const QString& s); - void thetaEnteredSlot(const QString& s); + void lengthEnteredSlot(const TQString& s); + void LzEnteredSlot(const TQString& s); + void thetaEnteredSlot(const TQString& s); private: /// the screen saver widget which is displayed in the preview area diff --git a/kscreensaver/kdesavers/science.cpp b/kscreensaver/kdesavers/science.cpp index 185f3b55..7dbb89bf 100644 --- a/kscreensaver/kdesavers/science.cpp +++ b/kscreensaver/kdesavers/science.cpp @@ -12,13 +12,13 @@ #include <sys/types.h> #include <time.h> -#include <qpainter.h> -#include <qpixmap.h> -#include <qlabel.h> -#include <qlistbox.h> -#include <qcheckbox.h> -#include <qslider.h> -#include <qlayout.h> +#include <tqpainter.h> +#include <tqpixmap.h> +#include <tqlabel.h> +#include <tqlistbox.h> +#include <tqcheckbox.h> +#include <tqslider.h> +#include <tqlayout.h> #include <kapplication.h> #include <kglobal.h> @@ -63,14 +63,14 @@ extern "C" return new KScienceSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KScienceSetup(); } } static struct { - QString name; + TQString name; bool inverseEnable; } modeInfo[MAX_MODES]; @@ -101,10 +101,10 @@ void initModeInfo() // KPreviewWidget // -KPreviewWidget::KPreviewWidget( QWidget *parent ) : - QWidget ( parent ) { } +KPreviewWidget::KPreviewWidget( TQWidget *parent ) : + TQWidget ( parent ) { } -void KPreviewWidget::paintEvent( QPaintEvent *event ) +void KPreviewWidget::paintEvent( TQPaintEvent *event ) { if( saver != 0 ) saver->do_refresh( event->rect() ); @@ -146,10 +146,10 @@ KScienceSaver::KScienceSaver( WId id, bool s, bool gP ) { grabRootWindow(); initialize(); - do_refresh( QRect ( 0, 0, width(), height() ) ); + do_refresh( TQRect ( 0, 0, width(), height() ) ); } - connect( &timer, SIGNAL( timeout() ), SLOT( slotTimeout() ) ); + connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) ); timer.start( SCI_MAX_SPEED - speed[mode] ); } @@ -452,12 +452,12 @@ void KScienceSaver::setMode( int m ) int dm = diam; initLens(); if( hideBG[old] ^ hideBG[m] ) - do_refresh( QRect( 0, 0, width(), height() ) ); + do_refresh( TQRect( 0, 0, width(), height() ) ); else if( diam < dm ) { - do_refresh( QRect( (int) x+diam, (int) y, dm-diam, diam ) ); - do_refresh( QRect( (int) x, (int) y+diam, dm, dm-diam ) ); + do_refresh( TQRect( (int) x+diam, (int) y, dm-diam, diam ) ); + do_refresh( TQRect( (int) x, (int) y+diam, dm, dm-diam ) ); } timer.start( SCI_MAX_SPEED - speed[mode] ); @@ -498,8 +498,8 @@ void KScienceSaver::setSize( int s ) initLens(); if( diam < dm ) { - do_refresh( QRect( (int) x+diam, (int) y, dm-diam, diam ) ); - do_refresh( QRect( (int) x, (int) y+diam, dm, dm-diam ) ); + do_refresh( TQRect( (int) x+diam, (int) y, dm-diam, diam ) ); + do_refresh( TQRect( (int) x, (int) y+diam, dm, dm-diam ) ); } timer.start( SCI_MAX_SPEED - speed[mode] ); @@ -553,7 +553,7 @@ void KScienceSaver::setHideBG( bool b ) releaseLens(); hideBG[mode] = b; initLens(); - do_refresh( QRect( 0, 0, width(), height() ) ); + do_refresh( TQRect( 0, 0, width(), height() ) ); timer.start( SCI_MAX_SPEED - speed[mode]); } @@ -561,7 +561,7 @@ void KScienceSaver::setHideBG( bool b ) void KScienceSaver::readSettings() { KConfig *config = KGlobal::config(); - QString sMode; + TQString sMode; config->setGroup( "Settings" ); mode = config->readNumEntry( "ModeNr", SCI_DEFAULT_MODE ); @@ -584,7 +584,7 @@ void KScienceSaver::readSettings() vy = copysign( moveY[mode], vy ); } -void KScienceSaver::do_refresh( const QRect & rect ) +void KScienceSaver::do_refresh( const TQRect & rect ) { if( grabPixmap ) return; @@ -609,13 +609,13 @@ void KScienceSaver::do_refresh( const QRect & rect ) void KScienceSaver::slotTimeout() { if( grabPixmap ) { - if( !QWidget::find(winId())->isActiveWindow() ) + if( !TQWidget::find(winId())->isActiveWindow() ) return; grabPreviewWidget(); grabPixmap = false; initialize(); if( hideBG[mode] ) - do_refresh( QRect ( 0, 0, width(), height() ) ); + do_refresh( TQRect ( 0, 0, width(), height() ) ); } signed int oldx = xcoord, oldy = ycoord; @@ -724,7 +724,7 @@ void KScienceSaver::grabRootWindow() void KScienceSaver::grabPreviewWidget() { - myAssert( QWidget::find(winId())->isActiveWindow(), "can't grab preview widget: dialog not active()" ); + myAssert( TQWidget::find(winId())->isActiveWindow(), "can't grab preview widget: dialog not active()" ); if( d->xRootWin ) XDestroyImage( d->xRootWin ); @@ -846,124 +846,124 @@ void KScienceSaver::applyLens32bpp(int xs, int ys, int xd, int yd, int w, int h) //----------------------------------------------------------------------------- -KScienceSetup::KScienceSetup( QWidget *parent, const char *name ) +KScienceSetup::KScienceSetup( TQWidget *parent, const char *name ) : KDialogBase( parent, name, true, i18n( "Setup Science Screen Saver" ), Ok|Cancel|Help, Ok, true ), saver( 0 ) { readSettings(); initModeInfo(); - QWidget *main = makeMainWidget(); + TQWidget *main = makeMainWidget(); - QHBoxLayout *lt = new QHBoxLayout( main, 0, spacingHint()); - QVBoxLayout *ltm = new QVBoxLayout; + TQHBoxLayout *lt = new TQHBoxLayout( main, 0, spacingHint()); + TQVBoxLayout *ltm = new QVBoxLayout; lt->addLayout( ltm ); - QVBoxLayout *ltc = new QVBoxLayout; + TQVBoxLayout *ltc = new QVBoxLayout; lt->addLayout( ltc ); // mode - QLabel *label = new QLabel( i18n("Mode:"), main ); + TQLabel *label = new TQLabel( i18n("Mode:"), main ); ltm->addWidget( label ); - QListBox *c = new QListBox( main ); + TQListBox *c = new TQListBox( main ); for(int i = 0; i<MAX_MODES; i++) c->insertItem( modeInfo[i].name ); c->setCurrentItem( mode ); c->setFixedHeight( 5 * c->fontMetrics().height() ); - connect( c, SIGNAL( highlighted( int ) ), SLOT( slotMode( int ) ) ); + connect( c, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotMode( int ) ) ); ltm->addWidget( c ); // inverse - QCheckBox *cbox = checkInverse = new QCheckBox( i18n("Inverse"), main ); + TQCheckBox *cbox = checkInverse = new TQCheckBox( i18n("Inverse"), main ); cbox->setEnabled( modeInfo[mode].inverseEnable ); cbox->setChecked( inverse[mode] ); - connect( cbox, SIGNAL( clicked() ), SLOT( slotInverse() ) ); + connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotInverse() ) ); ltm->addWidget( cbox ); // gravity - cbox = checkGravity = new QCheckBox( i18n("Gravity"), main ); + cbox = checkGravity = new TQCheckBox( i18n("Gravity"), main ); cbox->setChecked( gravity[mode] ); - connect( cbox, SIGNAL( clicked() ), SLOT( slotGravity() ) ); + connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGravity() ) ); ltm->addWidget( cbox ); // hide background - cbox = checkHideBG = new QCheckBox( i18n("Hide background"), main ); + cbox = checkHideBG = new TQCheckBox( i18n("Hide background"), main ); cbox->setChecked( hideBG[mode] ); - connect( cbox, SIGNAL( clicked() ), SLOT( slotHideBG() ) ); + connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHideBG() ) ); ltm->addWidget( cbox ); ltm->addStretch(); // size - label = new QLabel( i18n("Size:"), main ); + label = new TQLabel( i18n("Size:"), main ); ltc->addWidget( label ); - slideSize = new QSlider(9, 50, 5, size[mode], QSlider::Horizontal, + slideSize = new TQSlider(9, 50, 5, size[mode], TQSlider::Horizontal, main ); slideSize->setMinimumSize( 90, 20 ); - slideSize->setTickmarks(QSlider::Below); + slideSize->setTickmarks(TQSlider::Below); slideSize->setTickInterval(5); - connect( slideSize, SIGNAL( sliderMoved( int ) ), - SLOT( slotSize( int ) ) ); - connect( slideSize, SIGNAL( sliderPressed() ), - SLOT( slotSliderPressed() ) ); - connect( slideSize, SIGNAL( sliderReleased() ), - SLOT( slotSliderReleased() ) ); + connect( slideSize, TQT_SIGNAL( sliderMoved( int ) ), + TQT_SLOT( slotSize( int ) ) ); + connect( slideSize, TQT_SIGNAL( sliderPressed() ), + TQT_SLOT( slotSliderPressed() ) ); + connect( slideSize, TQT_SIGNAL( sliderReleased() ), + TQT_SLOT( slotSliderReleased() ) ); ltc->addWidget( slideSize ); // intensity - label = new QLabel( i18n("Intensity:"), main ); + label = new TQLabel( i18n("Intensity:"), main ); ltc->addWidget( label ); - slideIntensity = new QSlider(0, 10, 1, intensity[mode], - QSlider::Horizontal, main ); + slideIntensity = new TQSlider(0, 10, 1, intensity[mode], + TQSlider::Horizontal, main ); slideIntensity->setMinimumSize( 90, 20 ); - slideIntensity->setTickmarks(QSlider::Below); + slideIntensity->setTickmarks(TQSlider::Below); slideIntensity->setTickInterval(1); - connect( slideIntensity, SIGNAL( sliderMoved( int ) ), - SLOT( slotIntensity( int )) ); - connect( slideIntensity, SIGNAL( sliderPressed() ), - SLOT( slotSliderPressed() ) ); - connect( slideIntensity, SIGNAL( sliderReleased() ), - SLOT( slotSliderReleased() ) ); + connect( slideIntensity, TQT_SIGNAL( sliderMoved( int ) ), + TQT_SLOT( slotIntensity( int )) ); + connect( slideIntensity, TQT_SIGNAL( sliderPressed() ), + TQT_SLOT( slotSliderPressed() ) ); + connect( slideIntensity, TQT_SIGNAL( sliderReleased() ), + TQT_SLOT( slotSliderReleased() ) ); ltc->addWidget( slideIntensity ); // speed - label = new QLabel( i18n("Speed:"), main ); + label = new TQLabel( i18n("Speed:"), main ); ltc->addWidget( label ); - slideSpeed = new QSlider(0, SCI_MAX_SPEED, 10, speed[mode], - QSlider::Horizontal, main ); + slideSpeed = new TQSlider(0, SCI_MAX_SPEED, 10, speed[mode], + TQSlider::Horizontal, main ); slideSpeed->setMinimumSize( 90, 20 ); - slideSpeed->setTickmarks(QSlider::Below); + slideSpeed->setTickmarks(TQSlider::Below); slideSpeed->setTickInterval(10); - connect( slideSpeed, SIGNAL( sliderMoved( int ) ), - SLOT( slotSpeed( int ) ) ); + connect( slideSpeed, TQT_SIGNAL( sliderMoved( int ) ), + TQT_SLOT( slotSpeed( int ) ) ); ltc->addWidget( slideSpeed ); // motion - label = new QLabel( i18n("Motion:"), main ); + label = new TQLabel( i18n("Motion:"), main ); ltc->addWidget( label ); - QHBoxLayout *ltcm = new QHBoxLayout; + TQHBoxLayout *ltcm = new QHBoxLayout; ltc->addLayout( ltcm ); - slideMoveX = new QSlider(0, SCI_MAX_MOVE, 5, moveX[mode], - QSlider::Horizontal, main ); + slideMoveX = new TQSlider(0, SCI_MAX_MOVE, 5, moveX[mode], + TQSlider::Horizontal, main ); slideMoveX->setMinimumSize( 40, 20 ); - slideMoveX->setTickmarks(QSlider::Below); + slideMoveX->setTickmarks(TQSlider::Below); slideMoveX->setTickInterval(5); - connect( slideMoveX, SIGNAL( sliderMoved( int ) ), - SLOT( slotMoveX( int ) ) ); + connect( slideMoveX, TQT_SIGNAL( sliderMoved( int ) ), + TQT_SLOT( slotMoveX( int ) ) ); ltcm->addWidget( slideMoveX ); - slideMoveY = new QSlider(0, SCI_MAX_MOVE, 5, moveY[mode], - QSlider::Horizontal, main ); + slideMoveY = new TQSlider(0, SCI_MAX_MOVE, 5, moveY[mode], + TQSlider::Horizontal, main ); slideMoveY->setMinimumSize( 40, 20 ); - slideMoveY->setTickmarks(QSlider::Below); + slideMoveY->setTickmarks(TQSlider::Below); slideMoveY->setTickInterval(5); - connect( slideMoveY, SIGNAL( sliderMoved( int ) ), - SLOT( slotMoveY( int ) ) ); + connect( slideMoveY, TQT_SIGNAL( sliderMoved( int ) ), + TQT_SLOT( slotMoveY( int ) ) ); ltcm->addWidget( slideMoveY ); ltc->addStretch(); @@ -971,7 +971,7 @@ KScienceSetup::KScienceSetup( QWidget *parent, const char *name ) // preview preview = new KPreviewWidget( main ); preview->setFixedSize( 220, 170 ); - QPixmap p( locate("data", "kscreensaver/pics/kscience.png") ); + TQPixmap p( locate("data", "kscreensaver/pics/kscience.png") ); if( p.isNull() ) preview->setBackgroundColor( black ); else @@ -1009,7 +1009,7 @@ void KScienceSetup::updateSettings() void KScienceSetup::readSettings() { KConfig *config = KGlobal::config(); - QString sMode; + TQString sMode; config->setGroup( "Settings" ); mode = config->readNumEntry( "ModeNr", SCI_DEFAULT_MODE ); @@ -1119,7 +1119,7 @@ void KScienceSetup::slotSliderReleased() void KScienceSetup::slotOk() { KConfig *config = KGlobal::config(); - QString sSize, sSpeed, sIntensity, sMode; + TQString sSize, sSpeed, sIntensity, sMode; config->setGroup( "Settings" ); config->writeEntry( "ModeNr", mode ); @@ -1145,7 +1145,7 @@ void KScienceSetup::slotOk() void KScienceSetup::slotHelp() { - QString about = i18n("Science Version 0.26.5\n\nWritten by Rene Beutler (1998)\[email protected]"); + TQString about = i18n("Science Version 0.26.5\n\nWritten by Rene Beutler (1998)\[email protected]"); KMessageBox::about(this, about); } diff --git a/kscreensaver/kdesavers/science.h b/kscreensaver/kdesavers/science.h index 7211f5d5..6c367c23 100644 --- a/kscreensaver/kdesavers/science.h +++ b/kscreensaver/kdesavers/science.h @@ -8,8 +8,8 @@ #ifndef __SCIENCE_H__ #define __SCIENCE_H__ -#include <qrect.h> -#include <qtimer.h> +#include <tqrect.h> +#include <tqtimer.h> #include <kdialogbase.h> #include <kscreensaver.h> @@ -26,8 +26,8 @@ class KPreviewWidget : public QWidget { Q_OBJECT public: - KPreviewWidget( QWidget *parent ); - void paintEvent( QPaintEvent *event ); + KPreviewWidget( TQWidget *parent ); + void paintEvent( TQPaintEvent *event ); void notifySaver( KScienceSaver *s = 0 ); private: KScienceSaver *saver; @@ -42,7 +42,7 @@ public: KScienceSaver( WId id, bool setup=false, bool gP=false); virtual ~KScienceSaver(); - void do_refresh( const QRect & rect ); + void do_refresh( const TQRect & rect ); void setMode ( int mode ); void setMoveX ( signed int s ); void setMoveY ( signed int s ); @@ -80,7 +80,7 @@ protected: void applyLens16bpp(int xs, int ys, int xd, int yd, int w, int h); void applyLens24bpp(int xs, int ys, int xd, int yd, int w, int h); void applyLens32bpp(int xs, int ys, int xd, int yd, int w, int h); - QTimer timer; + TQTimer timer; bool moveOn; bool setup; bool grabPixmap; @@ -107,7 +107,7 @@ class KScienceSetup : public KDialogBase { Q_OBJECT public: - KScienceSetup(QWidget *parent=0, const char *name=0); + KScienceSetup(TQWidget *parent=0, const char *name=0); ~KScienceSetup(); protected: void updateSettings(); @@ -131,9 +131,9 @@ private slots: private: KPreviewWidget *preview; KScienceSaver *saver; - QSlider *slideSize, *slideSpeed, *slideIntensity; - QSlider *slideMoveX, *slideMoveY; - QCheckBox *checkInverse, *checkGravity, *checkHideBG; + TQSlider *slideSize, *slideSpeed, *slideIntensity; + TQSlider *slideMoveX, *slideMoveY; + TQCheckBox *checkInverse, *checkGravity, *checkHideBG; int mode; bool inverse [MAX_MODES]; diff --git a/kscreensaver/kdesavers/slideshow.cpp b/kscreensaver/kdesavers/slideshow.cpp index 29df23ae..de88fe3d 100644 --- a/kscreensaver/kdesavers/slideshow.cpp +++ b/kscreensaver/kdesavers/slideshow.cpp @@ -10,17 +10,17 @@ */ -#include <qdir.h> -#include <qcolor.h> -#include <qlabel.h> -#include <qlayout.h> -#include <qfile.h> -#include <qpaintdevicemetrics.h> -#include <qcheckbox.h> -#include <qcombobox.h> -#include <qspinbox.h> -#include <qframe.h> -#include <qdesktopwidget.h> +#include <tqdir.h> +#include <tqcolor.h> +#include <tqlabel.h> +#include <tqlayout.h> +#include <tqfile.h> +#include <tqpaintdevicemetrics.h> +#include <tqcheckbox.h> +#include <tqcombobox.h> +#include <tqspinbox.h> +#include <tqframe.h> +#include <tqdesktopwidget.h> #include <kconfig.h> #include <kglobal.h> @@ -62,7 +62,7 @@ extern "C" return new kSlideShowSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new kSlideShowSetup(); } @@ -87,19 +87,19 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id) initNextScreen(); mFileIdx = 0; - mColorContext = QColor::enterAllocContext(); + mColorContext = TQColor::enterAllocContext(); mEffectRunning = false; mTimer.start(10, true); - connect(&mTimer, SIGNAL(timeout()), SLOT(slotTimeout())); + connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout())); - QDesktopWidget *d = QApplication::desktop(); + TQDesktopWidget *d = TQApplication::desktop(); if( geometry() == d->geometry() && d->numScreens() > 1) { for(int i = 0; i < d->numScreens(); ++i) { - QRect s = d->screenGeometry(i); + TQRect s = d->screenGeometry(i); mGeoList.append(new mScreenGeo(s.width(), s.height(), s.topLeft().x(), s.topLeft().y())); } } @@ -119,20 +119,20 @@ kSlideShowSaver::~kSlideShowSaver() mTimer.stop(); if (mPainter.isActive()) mPainter.end(); - QColor::leaveAllocContext(); - QColor::destroyAllocContext(mColorContext); + TQColor::leaveAllocContext(); + TQColor::destroyAllocContext(mColorContext); } //----------------------------------------------------------------------------- void kSlideShowSaver::initNextScreen() { - QPaintDeviceMetrics metric(this); + TQPaintDeviceMetrics metric(this); int w, h; w = width(); h = height(); - mNextScreen = QPixmap(w, h, metric.depth()); + mNextScreen = TQPixmap(w, h, metric.depth()); } @@ -182,7 +182,7 @@ int kSlideShowSaver::effectMultiCircleOut(bool aInit) { int x, y, i; double alpha; - static QPointArray pa(4); + static TQPointArray pa(4); if (aInit) { @@ -341,7 +341,7 @@ int kSlideShowSaver::effectMeltdown(bool aInit) int kSlideShowSaver::effectCircleOut(bool aInit) { int x, y; - static QPointArray pa(4); + static TQPointArray pa(4); if (aInit) { @@ -663,7 +663,7 @@ int kSlideShowSaver::effectVertLines(bool aInit) //----------------------------------------------------------------------------- void kSlideShowSaver::startPainter(Qt::PenStyle aPen) { - QBrush brush; + TQBrush brush; brush.setPixmap(mNextScreen); if (mPainter.isActive()) mPainter.end(); mPainter.begin(this); @@ -724,7 +724,7 @@ void kSlideShowSaver::showNextScreen() //---------------------------------------------------------------------------- void kSlideShowSaver::createNextScreen() { - QPainter p; + TQPainter p; int ww, wh, iw, ih, x, y; double fx, fy; @@ -747,7 +747,7 @@ void kSlideShowSaver::createNextScreen() if (mFileList.isEmpty()) { - p.setPen(QColor("white")); + p.setPen(TQColor("white")); p.drawText(20 + (KApplication::random() % (ww>>1)), 20 + (KApplication::random() % (wh>>1)), i18n("No images found")); } @@ -761,7 +761,7 @@ void kSlideShowSaver::createNextScreen() if (fx > 2) fx = 2; iw = (int)(iw * fx); ih = (int)(ih * fx); - QImage scaledImg = mImage.smoothScale(iw, ih); + TQImage scaledImg = mImage.smoothScale(iw, ih); x = ((ww - iw) >> 1) + geoptr->mXorg; y = ((wh - ih) >> 1) + geoptr->mYorg; @@ -778,7 +778,7 @@ void kSlideShowSaver::createNextScreen() if (fx > 2) fx = 2; iw = (int)(iw * fx); ih = (int)(ih * fx); - QImage scaledImg = mImage.smoothScale(iw, ih); + TQImage scaledImg = mImage.smoothScale(iw, ih); x = ((ww - iw) >> 1) + geoptr->mXorg; y = ((wh - ih) >> 1) + geoptr->mYorg; @@ -805,11 +805,11 @@ void kSlideShowSaver::createNextScreen() if (mPrintName) { - p.setPen(QColor("black")); + p.setPen(TQColor("black")); for (x=9; x<=11; x++) for (y=21; y>=19; y--) p.drawText(x + geoptr->mXorg, wh-y+geoptr->mYorg, mImageName); - p.setPen(QColor("white")); + p.setPen(TQColor("white")); p.drawText(10 + geoptr->mXorg, wh-20 + geoptr->mYorg, mImageName); } } @@ -821,7 +821,7 @@ void kSlideShowSaver::createNextScreen() //---------------------------------------------------------------------------- void kSlideShowSaver::loadNextImage() { - QString fname; + TQString fname; int num; num = mFileList.count(); @@ -875,18 +875,18 @@ void kSlideShowSaver::loadDirectory() mRandomList = mFileList; } -void kSlideShowSaver::traverseDirectory(const QString &dirName) +void kSlideShowSaver::traverseDirectory(const TQString &dirName) { - QDir dir(dirName); + TQDir dir(dirName); if (!dir.exists()) { return ; } - dir.setFilter(QDir::Dirs | QDir::Files); + dir.setFilter(TQDir::Dirs | TQDir::Files); const QFileInfoList *fileinfolist = dir.entryInfoList(); QFileInfoListIterator it(*fileinfolist); - QFileInfo *fi; + TQFileInfo *fi; while ((fi = it.current())) { if (fi->fileName() == "." || fi->fileName() == "..") @@ -920,14 +920,14 @@ void kSlideShowSaver::blank() //============================================================================= // Class kSlideShowSetup //============================================================================= -kSlideShowSetup::kSlideShowSetup(QWidget *aParent, const char *aName) +kSlideShowSetup::kSlideShowSetup(TQWidget *aParent, const char *aName) : KDialogBase(aParent, aName, true, i18n( "Setup Slide Show Screen Saver" ), Ok|Cancel|Help, Ok, true ) { setButtonText( Help, i18n( "A&bout" ) ); - QWidget *main = makeMainWidget(); - QVBoxLayout *top = new QVBoxLayout( main, 0, spacingHint() ); + TQWidget *main = makeMainWidget(); + TQVBoxLayout *top = new TQVBoxLayout( main, 0, spacingHint() ); cfg = new SlideShowCfg( main, "SlideShowCfg" ); top->addWidget( cfg ); @@ -939,10 +939,10 @@ kSlideShowSetup::kSlideShowSetup(QWidget *aParent, const char *aName) mSaver = new kSlideShowSaver(cfg->mPreview->winId()); cfg->mDirChooser->setMode(KFile::Directory | KFile::ExistingOnly); - connect(cfg->mDirChooser, SIGNAL(returnPressed(const QString &)), - SLOT(slotDirSelected(const QString &))); - connect(cfg->mDirChooser, SIGNAL(urlSelected(const QString &)), - SLOT(slotDirSelected(const QString &))); + connect(cfg->mDirChooser, TQT_SIGNAL(returnPressed(const TQString &)), + TQT_SLOT(slotDirSelected(const TQString &))); + connect(cfg->mDirChooser, TQT_SIGNAL(urlSelected(const TQString &)), + TQT_SLOT(slotDirSelected(const TQString &))); readSettings(); } @@ -993,7 +993,7 @@ void kSlideShowSetup::writeSettings() //----------------------------------------------------------------------------- -void kSlideShowSetup::slotDirSelected(const QString &) +void kSlideShowSetup::slotDirSelected(const TQString &) { writeSettings(); } diff --git a/kscreensaver/kdesavers/slideshow.h b/kscreensaver/kdesavers/slideshow.h index fa51670a..c52dbda9 100644 --- a/kscreensaver/kdesavers/slideshow.h +++ b/kscreensaver/kdesavers/slideshow.h @@ -7,12 +7,12 @@ #ifndef SLIDESHOW_H #define SLIDESHOW_H -#include <qtimer.h> -#include <qptrlist.h> -#include <qstringlist.h> -#include <qpixmap.h> -#include <qpainter.h> -#include <qimage.h> +#include <tqtimer.h> +#include <tqptrlist.h> +#include <tqstringlist.h> +#include <tqpixmap.h> +#include <tqpainter.h> +#include <tqimage.h> #include <kscreensaver.h> #include <kdialogbase.h> @@ -45,7 +45,7 @@ protected: virtual void loadDirectory(); /** Helper for loadDirectory() */ - virtual void traverseDirectory(const QString &dirName); + virtual void traverseDirectory(const TQString &dirName); /** Load next image from list. If the file cannot be read it is automatically removed from the file list. @@ -92,20 +92,20 @@ protected: int mXorg; int mYorg; }; - QPtrList<mScreenGeo> mGeoList; + TQPtrList<mScreenGeo> mGeoList; bool mEffectRunning; - QTimer mTimer; + TQTimer mTimer; int mColorContext; - QStringList mFileList; - QStringList mRandomList; + TQStringList mFileList; + TQStringList mRandomList; int mFileIdx; - QImage mImage; - QPixmap mNextScreen; + TQImage mImage; + TQPixmap mNextScreen; EffectMethod* mEffectList; EffectMethod mEffect; int mNumEffects; - QPainter mPainter; - QString mImageName; + TQPainter mPainter; + TQString mImageName; // config settings: bool mShowRandom; @@ -114,7 +114,7 @@ protected: bool mSubdirectory; bool mRandomPosition; int mDelay; - QString mDirectory; + TQString mDirectory; // values for state of various effects: int mx, my, mw, mh, mdx, mdy, mix, miy, mi, mj, mSubType; @@ -129,7 +129,7 @@ class kSlideShowSetup : public KDialogBase { Q_OBJECT public: - kSlideShowSetup(QWidget *parent=NULL, const char *name=NULL); + kSlideShowSetup(TQWidget *parent=NULL, const char *name=NULL); ~kSlideShowSetup(); protected: @@ -139,7 +139,7 @@ protected slots: void slotOk(); void slotHelp(); void writeSettings(); - void slotDirSelected(const QString &where); + void slotDirSelected(const TQString &where); private: kSlideShowSaver *mSaver; diff --git a/kscreensaver/kdesavers/sspreviewarea.cpp b/kscreensaver/kdesavers/sspreviewarea.cpp index d189c409..2b8b3c65 100644 --- a/kscreensaver/kdesavers/sspreviewarea.cpp +++ b/kscreensaver/kdesavers/sspreviewarea.cpp @@ -9,12 +9,12 @@ #include "sspreviewarea.h" #include "sspreviewarea.moc" -SsPreviewArea::SsPreviewArea(QWidget* parent, const char* name) - : QWidget(parent, name) +SsPreviewArea::SsPreviewArea(TQWidget* parent, const char* name) + : TQWidget(parent, name) { } -void SsPreviewArea::resizeEvent(QResizeEvent* e) +void SsPreviewArea::resizeEvent(TQResizeEvent* e) { emit resized(e); } diff --git a/kscreensaver/kdesavers/sspreviewarea.h b/kscreensaver/kdesavers/sspreviewarea.h index 5b14f09d..e0c9fc51 100644 --- a/kscreensaver/kdesavers/sspreviewarea.h +++ b/kscreensaver/kdesavers/sspreviewarea.h @@ -9,11 +9,11 @@ #ifndef SSPREVIEWAREA_H #define SSPREVIEWAREA_H -#include <qwidget.h> +#include <tqwidget.h> -/** @brief Reimplementation of QWidget emitting a signal if resized. +/** @brief Reimplementation of TQWidget emitting a signal if resized. * - * This class is equalt to QWidget except for the fact that the signal resized() + * This class is equalt to TQWidget except for the fact that the signal resized() * is emitted if the widget gets resized. By this signaling mechanism it is * possible to resize the embedded GL area object within the screen saver setup * dialog. @@ -22,7 +22,7 @@ * KRotationSetup::KRotationSetup()) the signal SsPreviewArea::resized() is * connected with a slot of the screensaver class * (KPendulumSaver::resizeGlArea(), KRotationSaver::resizeGlArea()). This slot - * function calls the reimplemented QGLWidget::resizeGL() method of the GL + * 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 @@ -33,25 +33,25 @@ class SsPreviewArea : public QWidget /** @brief Constructor for SsPreviewArea * @param parent Pointer tp parent widget, forwarded to the QWidget * constructor - * @param name Pointer to widget name, forwarded to the QWidget constructor + * @param name Pointer to widget name, forwarded to the TQWidget constructor * - * The constructor just calls QWidget::QWidget() with the given arguments. + * The constructor just calls TQWidget::TQWidget() with the given arguments. */ - SsPreviewArea(QWidget* parent = NULL, const char* name = NULL); + SsPreviewArea(TQWidget* parent = NULL, const char* name = NULL); protected: /** @brief Called if widget gets resized. - * @param e Pointer to the corresponding QResizeEvent object containing the + * @param e Pointer to the corresponding TQResizeEvent object containing the * resize information * - * Reimplemented event handler from QWidget. Only the signal resized() is + * Reimplemented event handler from TQWidget. Only the signal resized() is * emitted. */ - virtual void resizeEvent(QResizeEvent* e); + virtual void resizeEvent(TQResizeEvent* e); signals: /** @brief Signal which is emitted in the resizeEvent() method. - * @param e Pointer to the corresponding QResizeEvent object */ - void resized(QResizeEvent* e); + * @param e Pointer to the corresponding TQResizeEvent object */ + void resized(TQResizeEvent* e); }; #endif diff --git a/kscreensaver/kdesavers/wave.cpp b/kscreensaver/kdesavers/wave.cpp index e8a999a5..e65d04ac 100644 --- a/kscreensaver/kdesavers/wave.cpp +++ b/kscreensaver/kdesavers/wave.cpp @@ -5,8 +5,8 @@ // Copyright (c) Ian Reinhart Geiser 2001 // #include <stdlib.h> -#include <qlabel.h> -#include <qlayout.h> +#include <tqlabel.h> +#include <tqlayout.h> #include <kapplication.h> #include <klocale.h> #include <kconfig.h> @@ -23,11 +23,11 @@ #include <GL/glu.h> #include <GL/gl.h> #endif -#include <qimage.h> +#include <tqimage.h> #include <kdebug.h> -#include <qpainter.h> -#include <qradiobutton.h> -#include <qspinbox.h> +#include <tqpainter.h> +#include <tqradiobutton.h> +#include <tqspinbox.h> #include <kstandarddirs.h> #include <math.h> #include <kmessagebox.h> @@ -47,7 +47,7 @@ extern "C" return new KWaveSaver( id ); } - KDE_EXPORT QDialog *kss_setup() + KDE_EXPORT TQDialog *kss_setup() { return new KWaveSetup(); } @@ -56,7 +56,7 @@ extern "C" //----------------------------------------------------------------------------- // dialog to setup screen saver parameters // -KWaveSetup::KWaveSetup( QWidget *parent, const char *name ) +KWaveSetup::KWaveSetup( TQWidget *parent, const char *name ) : SetupUi( parent, name, TRUE ) { readSettings(); @@ -66,11 +66,11 @@ KWaveSetup::KWaveSetup( QWidget *parent, const char *name ) preview->show(); // otherwise saver does not get correct size saver = new KWaveSaver( preview->winId() ); - connect( PushButton1, SIGNAL( clicked() ), SLOT( slotOkPressed() ) ); - connect( PushButton2, SIGNAL( clicked() ), SLOT( reject() ) ); - connect( PushButton3, SIGNAL( clicked() ), SLOT( aboutPressed() ) ); - connect( SpinBox1, SIGNAL( valueChanged(int)), saver, SLOT( updateSize(int))); - connect( RadioButton1, SIGNAL( toggled(bool)), saver, SLOT( doStars(bool))); + connect( PushButton1, TQT_SIGNAL( clicked() ), TQT_SLOT( slotOkPressed() ) ); + connect( PushButton2, TQT_SIGNAL( clicked() ), TQT_SLOT( reject() ) ); + connect( PushButton3, TQT_SIGNAL( clicked() ), TQT_SLOT( aboutPressed() ) ); + connect( SpinBox1, TQT_SIGNAL( valueChanged(int)), saver, TQT_SLOT( updateSize(int))); + connect( RadioButton1, TQT_SIGNAL( toggled(bool)), saver, TQT_SLOT( doStars(bool))); } @@ -115,14 +115,14 @@ KWaveSaver::KWaveSaver( WId id ) : KScreenSaver( id ) kdDebug() << "Blank" << endl; readSettings(); - timer = new QTimer( this ); + timer = new TQTimer( this ); timer->start( 50, TRUE ); setBackgroundColor( black ); erase(); wave = new Wave(); embed(wave); wave->show(); - connect( timer, SIGNAL(timeout()), this, SLOT(blank()) );; + connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) );; } KWaveSaver::~KWaveSaver() @@ -147,7 +147,7 @@ void KWaveSaver::blank() timer->start( 100, TRUE ); } -Wave::Wave( QWidget * parent, const char * name) : QGLWidget (parent,name) +Wave::Wave( TQWidget * parent, const char * name) : TQGLWidget (parent,name) { pNurb = 0; @@ -291,7 +291,7 @@ bool Wave::LoadGLTextures() /* Status indicator */ bool Status = TRUE; - QImage buf; // = QPixmap::grabWindow ( 0 ).convertToImage(); + TQImage buf; // = TQPixmap::grabWindow ( 0 ).convertToImage(); kdDebug() << "Loading: " << locate("data", "kscreensaver/image.png") << endl; if (buf.load( locate("data", "kscreensaver/image.png") ) ) @@ -301,7 +301,7 @@ bool Wave::LoadGLTextures() } else { - QImage dummy( 64, 64, 64 ); + TQImage dummy( 64, 64, 64 ); dummy.fill( Qt::white.rgb() ); buf = dummy; tex = convertToGLFormat( buf ); diff --git a/kscreensaver/kdesavers/wave.h b/kscreensaver/kdesavers/wave.h index ea2f64f3..4d0f614f 100644 --- a/kscreensaver/kdesavers/wave.h +++ b/kscreensaver/kdesavers/wave.h @@ -14,8 +14,8 @@ #ifndef __WAVE_H__ #define __WAVE_H__ -#include <qdialog.h> -#include <qgl.h> +#include <tqdialog.h> +#include <tqgl.h> #ifdef Q_WS_MACX #include <OpenGL/glu.h> #include <OpenGL/gl.h> @@ -24,8 +24,8 @@ #include <GL/gl.h> #endif #include <kscreensaver.h> -#include <qtimer.h> -#include <qimage.h> +#include <tqtimer.h> +#include <tqimage.h> #include "wavecfg.h" @@ -34,7 +34,7 @@ class Wave : public QGLWidget Q_OBJECT public: - Wave( QWidget * parent=0, const char * name=0 ); + Wave( TQWidget * parent=0, const char * name=0 ); ~Wave(); protected: @@ -55,7 +55,7 @@ private: int index; bool LoadGLTextures(); GLuint texture[1]; - QImage tex; + TQImage tex; }; @@ -71,14 +71,14 @@ public slots: private: Wave *wave; - QTimer *timer; + TQTimer *timer; }; class KWaveSetup : public SetupUi { Q_OBJECT public: - KWaveSetup( QWidget *parent = NULL, const char *name = NULL ); + KWaveSetup( TQWidget *parent = NULL, const char *name = NULL ); ~KWaveSetup( ); protected: void readSettings(); |