Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 64efc076184547c5d23863fb027dd3a01d552f19)

18 files changed, 115 insertions, 115 deletions

diff --git a/tdescreensaver/kdesavers/Euphoria.cpp b/tdescreensaver/kdesavers/Euphoria.cpp
index 3237439c..ab28e5ab 100644
--- a/tdescreensaver/kdesavers/Euphoria.cpp
+++ b/tdescreensaver/kdesavers/Euphoria.cpp
@@ -465,7 +465,7 @@ EuphoriaWidget::EuphoriaWidget( TQWidget* parent, const char* name )
 
     _frameTime = 1000 / 60;
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextFrame()) );
 }
 
 
@@ -1022,7 +1022,7 @@ KEuphoriaSetup::KEuphoriaSetup( TQWidget* parent, const char* name )
 
     // Now that we have _saver...
     modeW->setCurrentItem( _saver->mode() );    // set before we connect
-    connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
+    connect( modeW, TQ_SIGNAL(activated(int)), _saver, TQ_SLOT(setMode(int)) );
 
     setMinimumSize( sizeHint() );
 }
diff --git a/tdescreensaver/kdesavers/Flux.cpp b/tdescreensaver/kdesavers/Flux.cpp
index bdd358f2..072d791a 100644
--- a/tdescreensaver/kdesavers/Flux.cpp
+++ b/tdescreensaver/kdesavers/Flux.cpp
@@ -436,7 +436,7 @@ FluxWidget::FluxWidget( TQWidget* parent, const char* name )
 
     _frameTime = 1000 / 60;
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextFrame()) );
 }
 
 
@@ -905,7 +905,7 @@ KFluxSetup::KFluxSetup( TQWidget* parent, const char* name )
 
     // Now that we have _saver...
     modeW->setCurrentItem( _saver->mode() );    // set before we connect
-    connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
+    connect( modeW, TQ_SIGNAL(activated(int)), _saver, TQ_SLOT(setMode(int)) );
 }
 
 
diff --git a/tdescreensaver/kdesavers/SolarWinds.cpp b/tdescreensaver/kdesavers/SolarWinds.cpp
index a52affbc..3d88edfa 100644
--- a/tdescreensaver/kdesavers/SolarWinds.cpp
+++ b/tdescreensaver/kdesavers/SolarWinds.cpp
@@ -317,7 +317,7 @@ SWindsWidget::SWindsWidget( TQWidget* parent, const char* name )
 
     _frameTime = 1000 / 60;
     _timer = new TQTimer( this );
-    connect( _timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(nextFrame()) );
+    connect( _timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(nextFrame()) );
 }
 
 
@@ -717,7 +717,7 @@ KSWindsSetup::KSWindsSetup( TQWidget* parent, const char* name )
 
     // Now that we have _saver...
     modeW->setCurrentItem( _saver->mode() );    // set before we connect
-    connect( modeW, TQT_SIGNAL(activated(int)), _saver, TQT_SLOT(setMode(int)) );
+    connect( modeW, TQ_SIGNAL(activated(int)), _saver, TQ_SLOT(setMode(int)) );
 }
 
 
diff --git a/tdescreensaver/kdesavers/banner.cpp b/tdescreensaver/kdesavers/banner.cpp
index a51579ba..853e9fee 100644
--- a/tdescreensaver/kdesavers/banner.cpp
+++ b/tdescreensaver/kdesavers/banner.cpp
@@ -83,8 +83,8 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	TDEFontCombo* comboFonts = new TDEFontCombo( TQFontDatabase().families(), group );
 	comboFonts->setCurrentFont( fontFamily );
 	gl->addWidget(comboFonts, 1, 1);
-	connect( comboFonts, TQT_SIGNAL( activated( const TQString& ) ),
-			TQT_SLOT( slotFamily( const TQString& ) ) );
+	connect( comboFonts, TQ_SIGNAL( activated( const TQString& ) ),
+			TQ_SLOT( slotFamily( const TQString& ) ) );
 
 	label = new TQLabel( i18n("Size:"), group );
 	gl->addWidget(label, 2, 0);
@@ -92,33 +92,33 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	comboSizes = new TQComboBox( TRUE, group );
         fillFontSizes();
 	gl->addWidget(comboSizes, 2, 1);
-	connect( comboSizes, TQT_SIGNAL( activated( int ) ), TQT_SLOT( slotSize( int ) ) );
-	connect( comboSizes, TQT_SIGNAL( textChanged( const TQString & ) ),
-			TQT_SLOT( slotSizeEdit( const TQString &  ) ) );
+	connect( comboSizes, TQ_SIGNAL( activated( int ) ), TQ_SLOT( slotSize( int ) ) );
+	connect( comboSizes, TQ_SIGNAL( textChanged( const TQString & ) ),
+			TQ_SLOT( slotSizeEdit( const TQString &  ) ) );
 
 	TQCheckBox *cb = new TQCheckBox( i18n("Bold"),
 				       group );
 	cb->setChecked( bold );
-	connect( cb, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotBold( bool ) ) );
+	connect( cb, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotBold( bool ) ) );
 	gl->addWidget(cb, 3, 0);
 
 	cb = new TQCheckBox( i18n("Italic"), group );
 	cb->setChecked( italic );
 	gl->addWidget(cb, 3, 1);
-	connect( cb, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( slotItalic( bool ) ) );
+	connect( cb, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( slotItalic( bool ) ) );
 
 	label = new TQLabel( i18n("Color:"), group );
 	gl->addWidget(label, 4, 0);
 
 	colorPush = new KColorButton( fontColor, group );
 	gl->addWidget(colorPush, 4, 1);
-	connect( colorPush, TQT_SIGNAL( changed(const TQColor &) ),
-		 TQT_SLOT( slotColor(const TQColor &) ) );
+	connect( colorPush, TQ_SIGNAL( changed(const TQColor &) ),
+		 TQ_SLOT( slotColor(const TQColor &) ) );
 
    TQCheckBox *cyclingColorCb=new TQCheckBox(i18n("Cycling color"),group);
    cyclingColorCb->setMinimumSize(cyclingColorCb->sizeHint());
    gl->addMultiCellWidget(cyclingColorCb,5,5,0,1);
-   connect(cyclingColorCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotCyclingColor(bool)));
+   connect(cyclingColorCb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotCyclingColor(bool)));
    cyclingColorCb->setChecked(cyclingColor);
 
 	preview = new TQWidget( main );
@@ -140,7 +140,7 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
     sb->setTickmarks(TQSlider::Below);
     sb->setTickInterval(10);
 	tl11->addWidget(sb);
-	connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+	connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
 
 	TQHBoxLayout *tl2 = new TQHBoxLayout;
 	tl->addLayout(tl2);
@@ -151,13 +151,13 @@ KBannerSetup::KBannerSetup( TQWidget *parent, const char *name )
 	ed = new TQLineEdit( main );
 	tl2->addWidget(ed);
 	ed->setText( message );
-	connect( ed, TQT_SIGNAL( textChanged( const TQString & ) ),
-			TQT_SLOT( slotMessage( const TQString &  ) ) );
+	connect( ed, TQ_SIGNAL( textChanged( const TQString & ) ),
+			TQ_SLOT( slotMessage( const TQString &  ) ) );
 
    TQCheckBox *timeCb=new TQCheckBox( i18n("Show current time"), main);
    timeCb->setFixedSize(timeCb->sizeHint());
    tl->addWidget(timeCb,0,TQt::AlignLeft);
-   connect(timeCb,TQT_SIGNAL(toggled(bool)),this,TQT_SLOT(slotTimeToggled(bool)));
+   connect(timeCb,TQ_SIGNAL(toggled(bool)),this,TQ_SLOT(slotTimeToggled(bool)));
    timeCb->setChecked(showTime);
 
    tl->addStretch();
@@ -353,7 +353,7 @@ KBannerSaver::KBannerSaver( WId id ) : KScreenSaver( id )
 	colorContext = TQColor::enterAllocContext();
 	needBlank = TRUE;
 	timer.start( speed );
-	connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+	connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
 }
 
 KBannerSaver::~KBannerSaver()
diff --git a/tdescreensaver/kdesavers/blob.cpp b/tdescreensaver/kdesavers/blob.cpp
index 106628b0..7f558859 100644
--- a/tdescreensaver/kdesavers/blob.cpp
+++ b/tdescreensaver/kdesavers/blob.cpp
@@ -169,7 +169,7 @@ KBlobSaver::KBlobSaver ( WId id)
 
 	// start timer which will update blob painter
 	timer.start(SPEED);
-	connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+	connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 }
 
 KBlobSaver::~KBlobSaver()
@@ -485,8 +485,8 @@ KBlobSetup::KBlobSetup
 	tl->addStretch();
 
 	// so selecting an algorithm will start previewing that alg
-	connect(algs, TQT_SIGNAL(highlighted(int)), saver,
-		TQT_SLOT(setAlgorithm(int)));
+	connect(algs, TQ_SIGNAL(highlighted(int)), saver,
+		TQ_SLOT(setAlgorithm(int)));
 }
 
 void KBlobSetup::readSettings()
diff --git a/tdescreensaver/kdesavers/fountain.cpp b/tdescreensaver/kdesavers/fountain.cpp
index 07b1311a..9ffb7a40 100644
--- a/tdescreensaver/kdesavers/fountain.cpp
+++ b/tdescreensaver/kdesavers/fountain.cpp
@@ -85,11 +85,11 @@ KFountainSetup::KFountainSetup( TQWidget *parent, const char *name )
 	//KButtonBox *bbox = new KButtonBox(this);
 	//bbox->addStretch(1);
 ;
-	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)));
+	connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) );
+	connect( PushButton2, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
+	connect( PushButton3, TQ_SIGNAL( clicked() ), TQ_SLOT( aboutPressed() ) );
+	connect(  SpinBox1, TQ_SIGNAL( valueChanged(int)), saver, TQ_SLOT( updateSize(int)));
+	connect( RadioButton1, TQ_SIGNAL( toggled(bool)), saver, TQ_SLOT( doStars(bool)));
 
 }
 
@@ -158,7 +158,7 @@ KFountainSaver::KFountainSaver( WId id ) : KScreenSaver( id )
 	fountain = new Fountain();
 	embed(fountain);
 	fountain->show();
-	connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) );
+	connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blank()) );
 }
 
 KFountainSaver::~KFountainSaver()
diff --git a/tdescreensaver/kdesavers/gravity.cpp b/tdescreensaver/kdesavers/gravity.cpp
index 411d90c6..01d86a97 100644
--- a/tdescreensaver/kdesavers/gravity.cpp
+++ b/tdescreensaver/kdesavers/gravity.cpp
@@ -66,11 +66,11 @@ KGravitySetup::KGravitySetup( TQWidget *parent, const char *name )
 #endif
 	saver = new KGravitySaver( preview->winId() );
 ;
-	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)));
+	connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) );
+	connect( PushButton2, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
+	connect( PushButton3, TQ_SIGNAL( clicked() ), TQ_SLOT( aboutPressed() ) );
+	connect(  SpinBox1, TQ_SIGNAL( valueChanged(int)), saver, TQ_SLOT( updateSize(int)));
+	connect( RadioButton1, TQ_SIGNAL( toggled(bool)), saver, TQ_SLOT( doStars(bool)));
 
 }
 
@@ -146,7 +146,7 @@ KGravitySaver::KGravitySaver( WId id ) : KScreenSaver( id )
 #ifdef TQ_WS_X11
 	gravity->show();
 #endif
-	connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) );
+	connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blank()) );
 }
 
 KGravitySaver::~KGravitySaver()
diff --git a/tdescreensaver/kdesavers/kclock.cpp b/tdescreensaver/kdesavers/kclock.cpp
index c3983bff..7322cddb 100644
--- a/tdescreensaver/kdesavers/kclock.cpp
+++ b/tdescreensaver/kdesavers/kclock.cpp
@@ -92,8 +92,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 	KColorButton *colorButton = new KColorButton(m_hourColor, colgroup);
 	colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
 	label->setBuddy(colorButton);
-	connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
-			TQT_SLOT(slotHourColor(const TQColor &)));
+	connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+			TQ_SLOT(slotHourColor(const TQColor &)));
 	grid->addWidget( label, 1, 1 );
 	grid->addWidget( colorButton, 1, 2 );
 
@@ -101,8 +101,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 	colorButton = new KColorButton(m_minColor, colgroup);
 	colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
 	label->setBuddy(colorButton);
-	connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
-			TQT_SLOT(slotMinColor(const TQColor &)));
+	connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+			TQ_SLOT(slotMinColor(const TQColor &)));
 	grid->addWidget( label, 2, 1 );
 	grid->addWidget( colorButton, 2, 2 );
 
@@ -110,8 +110,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 	colorButton = new KColorButton(m_secColor, colgroup);
 	colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
 	label->setBuddy(colorButton);
-	connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
-			TQT_SLOT(slotSecColor(const TQColor &)));
+	connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+			TQ_SLOT(slotSecColor(const TQColor &)));
 	grid->addWidget( label, 3, 1 );
 	grid->addWidget( colorButton, 3, 2 );
 
@@ -119,8 +119,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 	colorButton = new KColorButton(m_scaleColor, colgroup);
 	colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
 	label->setBuddy(colorButton);
-	connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
-			TQT_SLOT(slotScaleColor(const TQColor &)));
+	connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+			TQ_SLOT(slotScaleColor(const TQColor &)));
 	grid->addWidget( label, 4, 1 );
 	grid->addWidget( colorButton, 4, 2 );
 
@@ -128,8 +128,8 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 	colorButton = new KColorButton(m_bgndColor, colgroup);
 	colorButton->setFixedWidth(COLOR_BUTTON_WIDTH);
 	label->setBuddy(colorButton);
-	connect(colorButton, TQT_SIGNAL(changed(const TQColor &)),
-			TQT_SLOT(slotBgndColor(const TQColor &)));
+	connect(colorButton, TQ_SIGNAL(changed(const TQColor &)),
+			TQ_SLOT(slotBgndColor(const TQColor &)));
 	grid->addWidget( label, 5, 1 );
 	grid->addWidget( colorButton, 5, 2 );
 
@@ -147,7 +147,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 	label->setBuddy( qs );
 	qs->setTickInterval(1);
 	qs->setTickmarks(TQSlider::Below);
-	connect(qs, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotSliderMoved(int)));
+	connect(qs, TQ_SIGNAL(valueChanged(int)), this, TQ_SLOT(slotSliderMoved(int)));
 	top->addWidget( qs );
 
 	bool rtl = kapp->reverseLayout();
@@ -162,7 +162,7 @@ KClockSetup::KClockSetup(TQWidget *parent, const char *name)
 
 	TQCheckBox *keepCentered = new TQCheckBox(i18n("&Keep clock centered"), main);
 	keepCentered->setChecked(m_keepCentered);
-	connect(keepCentered, TQT_SIGNAL(stateChanged(int)), TQT_SLOT(slotKeepCenteredChanged(int)));
+	connect(keepCentered, TQ_SIGNAL(stateChanged(int)), TQ_SLOT(slotKeepCenteredChanged(int)));
 	top->addWidget(keepCentered);
 	top->addStretch();
 }
@@ -426,7 +426,7 @@ KClockSaver::KClockSaver(WId id)
 {
 	readSettings();
 	setBackgroundColor(m_bgndColor);
-	connect(&m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+	connect(&m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 	start(m_size);
 	m_timer.start(TIMER_INTERVALL);
 }
diff --git a/tdescreensaver/kdesavers/kvm.cpp b/tdescreensaver/kdesavers/kvm.cpp
index 9464e2ef..17b686a0 100644
--- a/tdescreensaver/kdesavers/kvm.cpp
+++ b/tdescreensaver/kdesavers/kvm.cpp
@@ -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, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+	connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
         timer.start( 100 - speed );
 }
 
@@ -296,8 +296,8 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name )
 	slider->setTickmarks( TQSlider::Below );
 	slider->setTickInterval( 10 );
 	slider->setValue( speed );
-	connect( slider, TQT_SIGNAL( valueChanged( int ) ),
-		 TQT_SLOT( slotSpeed( int ) ) );
+	connect( slider, TQ_SIGNAL( valueChanged( int ) ),
+		 TQ_SLOT( slotSpeed( int ) ) );
 	tl1->addWidget(slider);
 
 	label = new TQLabel( i18n("Display update speed:"), main );
@@ -310,8 +310,8 @@ kVmSetup::kVmSetup( TQWidget *parent, const char *name )
 	slider->setTickmarks( TQSlider::Below );
 	slider->setTickInterval( MAX_REFRESH_TIMEOUT/10 );
 	slider->setValue( MAX_REFRESH_TIMEOUT - refreshTimeout );
-	connect( slider, TQT_SIGNAL( valueChanged( int ) ),
-		 TQT_SLOT( slotRefreshTimeout( int ) ) );
+	connect( slider, TQ_SIGNAL( valueChanged( int ) ),
+		 TQ_SLOT( slotRefreshTimeout( int ) ) );
 	tl1->addWidget(slider);
 	tl1->addStretch();
 
diff --git a/tdescreensaver/kdesavers/lines.cpp b/tdescreensaver/kdesavers/lines.cpp
index e80d85c6..07123934 100644
--- a/tdescreensaver/kdesavers/lines.cpp
+++ b/tdescreensaver/kdesavers/lines.cpp
@@ -133,7 +133,7 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name)
 	sb->setMinimumSize(120, 20);
 	sb->setTickmarks(TQSlider::Below);
 	sb->setTickInterval(32);
-	connect(sb, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotLength(int)));
+	connect(sb, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotLength(int)));
 	tl1->addWidget(sb);
 
 	label=new TQLabel(i18n("Speed:"), main);
@@ -143,31 +143,31 @@ kLinesSetup::kLinesSetup(TQWidget *parent, const char *name)
 	sb->setMinimumSize(120, 20);
 	sb->setTickmarks(TQSlider::Below);
 	sb->setTickInterval(10);
-	connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+	connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
 	tl1->addWidget(sb);
 
 	label=new TQLabel(i18n("Beginning:"), main);
 	tl1->addWidget(label);
 
 	colorPush0=new KColorButton(colstart, main);
-	connect(colorPush0, TQT_SIGNAL(changed(const TQColor &)),
-		TQT_SLOT(slotColstart(const TQColor &)));
+	connect(colorPush0, TQ_SIGNAL(changed(const TQColor &)),
+		TQ_SLOT(slotColstart(const TQColor &)));
 	tl1->addWidget(colorPush0);
 
 	label=new TQLabel(i18n("Middle:"), main);
 	tl1->addWidget(label);
 
 	colorPush1=new KColorButton(colmid, main);
-	connect(colorPush1, TQT_SIGNAL(changed(const TQColor &)),
-		TQT_SLOT(slotColmid(const TQColor &)));
+	connect(colorPush1, TQ_SIGNAL(changed(const TQColor &)),
+		TQ_SLOT(slotColmid(const TQColor &)));
 	tl1->addWidget(colorPush1);
 
 	label=new TQLabel(i18n("End:"), main);
 	tl1->addWidget(label);
 
 	colorPush2=new KColorButton(colend, main);
-	connect(colorPush2, TQT_SIGNAL(changed(const TQColor &)),
-		TQT_SLOT(slotColend(const TQColor &)));
+	connect(colorPush2, TQ_SIGNAL(changed(const TQColor &)),
+		TQ_SLOT(slotColend(const TQColor &)));
 	tl1->addWidget(colorPush2);
 	tl1->addStretch();
 
@@ -283,7 +283,7 @@ kLinesSaver::kLinesSaver( WId id ) : KScreenSaver( id ){
 	initialiseColor();
 	initialiseLines();
 	timer.start(speed);
-	connect(&timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+	connect(&timer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 }
 
 kLinesSaver::~kLinesSaver(){
diff --git a/tdescreensaver/kdesavers/lorenz.cpp b/tdescreensaver/kdesavers/lorenz.cpp
index 50ac9b5c..6f5b4c70 100644
--- a/tdescreensaver/kdesavers/lorenz.cpp
+++ b/tdescreensaver/kdesavers/lorenz.cpp
@@ -86,7 +86,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name )
     sps->setMinimumSize( 120, 20 );
     sps->setTickmarks(TQSlider::Below);
     sps->setTickInterval(150);
-    connect( sps, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+    connect( sps, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
     tl1->addWidget(sps);
 
     label = new TQLabel( i18n("Epoch:"), main );
@@ -96,7 +96,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name )
     eps->setMinimumSize( 120, 20 );
     eps->setTickmarks(TQSlider::Below);
     eps->setTickInterval(3000);
-    connect( eps, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotEpoch( int ) ) );
+    connect( eps, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotEpoch( int ) ) );
     tl1->addWidget(eps);
 
     label = new TQLabel( i18n("Color rate:"), main );
@@ -106,7 +106,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name )
     crs->setMinimumSize( 120, 20 );
     crs->setTickmarks(TQSlider::Below);
     crs->setTickInterval(10);
-    connect( crs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotCRate( int ) ) );
+    connect( crs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotCRate( int ) ) );
     tl1->addWidget(crs);
 
     label = new TQLabel( i18n("Rotation Z:"), main );
@@ -116,7 +116,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name )
     zrs->setMinimumSize( 120, 20 );
     zrs->setTickmarks(TQSlider::Below);
     zrs->setTickInterval(36);
-    connect( zrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotZRot( int ) ) );
+    connect( zrs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotZRot( int ) ) );
     tl1->addWidget(zrs);
 
     label = new TQLabel( i18n("Rotation Y:"), main );
@@ -126,7 +126,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name )
     yrs->setMinimumSize( 120, 20 );
     yrs->setTickmarks(TQSlider::Below);
     yrs->setTickInterval(36);
-    connect( yrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotYRot( int ) ) );
+    connect( yrs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotYRot( int ) ) );
     tl1->addWidget(yrs);
 
     label = new TQLabel( i18n("Rotation X:"), main );
@@ -136,7 +136,7 @@ KLorenzSetup::KLorenzSetup( TQWidget *parent, const char *name )
     xrs->setMinimumSize( 120, 20 );
     xrs->setTickmarks(TQSlider::Below);
     xrs->setTickInterval(36);
-    connect( xrs, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotXRot( int ) ) );
+    connect( xrs, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotXRot( int ) ) );
     tl1->addWidget(xrs);
 
     preview = new TQWidget( main );
@@ -446,7 +446,7 @@ KLorenzSaver::KLorenzSaver( WId id ) : KScreenSaver( id )
     newEpoch();
 
     timer.start( 10 );
-    connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( drawOnce() ) );
+    connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( drawOnce() ) );
 }
 
 KLorenzSaver::~KLorenzSaver()
diff --git a/tdescreensaver/kdesavers/pendulum.cpp b/tdescreensaver/kdesavers/pendulum.cpp
index 83f77d70..d8e8d0ae 100644
--- a/tdescreensaver/kdesavers/pendulum.cpp
+++ b/tdescreensaver/kdesavers/pendulum.cpp
@@ -379,7 +379,7 @@ KPendulumSaver::KPendulumSaver(WId id) :
    // set up and start cyclic timer
    timer = new TQTimer(this);
    timer->start(deltaT, TRUE);
-   connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimeStep()));
+   connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimeStep()));
 }
 
 KPendulumSaver::~KPendulumSaver()
@@ -754,8 +754,8 @@ KPendulumSetup::KPendulumSetup(TQWidget* 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, TQT_SIGNAL(resized(TQResizeEvent*)),
-           saver,   TQT_SLOT(resizeGlArea(TQResizeEvent*)));
+   connect(preview, TQ_SIGNAL(resized(TQResizeEvent*)),
+           saver,   TQ_SLOT(resizeGlArea(TQResizeEvent*)));
 }
 
 KPendulumSetup::~KPendulumSetup()
diff --git a/tdescreensaver/kdesavers/polygon.cpp b/tdescreensaver/kdesavers/polygon.cpp
index 46c7c94a..96787756 100644
--- a/tdescreensaver/kdesavers/polygon.cpp
+++ b/tdescreensaver/kdesavers/polygon.cpp
@@ -71,7 +71,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name )
 	sb->setMinimumSize( 90, 20 );
     sb->setTickmarks(TQSlider::Below);
     sb->setTickInterval(10);
-	connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotLength( int ) ) );
+	connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotLength( int ) ) );
 	tl1->addWidget(sb);
 
 	label = new TQLabel( i18n("Vertices:"), main );
@@ -81,7 +81,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name )
 	sb->setMinimumSize( 90, 20 );
     sb->setTickmarks(TQSlider::Below);
     sb->setTickInterval(2);
-	connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotVertices( int ) ) );
+	connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotVertices( int ) ) );
 	tl1->addWidget(sb);
 
 	label = new TQLabel( i18n("Speed:"), main );
@@ -91,7 +91,7 @@ kPolygonSetup::kPolygonSetup( TQWidget *parent, const char *name )
 	sb->setMinimumSize( 90, 20 );
     sb->setTickmarks(TQSlider::Below);
     sb->setTickInterval(10);
-	connect( sb, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+	connect( sb, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
 	tl1->addWidget(sb);
 	tl1->addStretch();
 
@@ -205,7 +205,7 @@ kPolygonSaver::kPolygonSaver( WId id ) : KScreenSaver( id )
 	initialisePolygons();
 
 	timer.start( speed );
-	connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+	connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
 }
 
 kPolygonSaver::~kPolygonSaver()
diff --git a/tdescreensaver/kdesavers/rotation.cpp b/tdescreensaver/kdesavers/rotation.cpp
index a00f7bbc..6ae1aba6 100644
--- a/tdescreensaver/kdesavers/rotation.cpp
+++ b/tdescreensaver/kdesavers/rotation.cpp
@@ -491,7 +491,7 @@ KRotationSaver::KRotationSaver(WId id)
 
    timer = new TQTimer(this);
    timer->start(deltaT, TRUE);
-   connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(doTimeStep()));
+   connect(timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(doTimeStep()));
 }
 
 KRotationSaver::~KRotationSaver()
@@ -754,8 +754,8 @@ KRotationSetup::KRotationSetup(TQWidget* 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, TQT_SIGNAL(resized(TQResizeEvent*)),
-           saver,   TQT_SLOT(resizeGlArea(TQResizeEvent*)));
+   connect(preview, TQ_SIGNAL(resized(TQResizeEvent*)),
+           saver,   TQ_SLOT(resizeGlArea(TQResizeEvent*)));
 }
 
 KRotationSetup::~KRotationSetup()
diff --git a/tdescreensaver/kdesavers/science.cpp b/tdescreensaver/kdesavers/science.cpp
index 2f1534bc..6eb59a0a 100644
--- a/tdescreensaver/kdesavers/science.cpp
+++ b/tdescreensaver/kdesavers/science.cpp
@@ -149,7 +149,7 @@ KScienceSaver::KScienceSaver( WId id, bool s, bool gP )
 		do_refresh( TQRect ( 0, 0, width(), height() ) );
 	}
 
-	connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+	connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
 	timer.start( SCI_MAX_SPEED - speed[mode] );
 }
 
@@ -870,26 +870,26 @@ KScienceSetup::KScienceSetup(  TQWidget *parent, const char *name )
 		c->insertItem( modeInfo[i].name );
 	c->setCurrentItem( mode );
 	c->setFixedHeight( 5 * c->fontMetrics().height() );
-	connect( c, TQT_SIGNAL( highlighted( int ) ), TQT_SLOT( slotMode( int ) ) );
+	connect( c, TQ_SIGNAL( highlighted( int ) ), TQ_SLOT( slotMode( int ) ) );
 	ltm->addWidget( c );
 
 	// inverse
 	TQCheckBox *cbox = checkInverse = new TQCheckBox( i18n("Inverse"), main );
 	cbox->setEnabled( modeInfo[mode].inverseEnable );
 	cbox->setChecked( inverse[mode] );
-	connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotInverse() ) );
+	connect( cbox, TQ_SIGNAL( clicked() ), TQ_SLOT( slotInverse() ) );
 	ltm->addWidget( cbox );
 
 	// gravity
 	cbox = checkGravity = new TQCheckBox( i18n("Gravity"), main );
 	cbox->setChecked( gravity[mode] );
-	connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotGravity() ) );
+	connect( cbox, TQ_SIGNAL( clicked() ), TQ_SLOT( slotGravity() ) );
 	ltm->addWidget( cbox );
 
 	// hide background
 	cbox = checkHideBG = new TQCheckBox( i18n("Hide background"), main );
 	cbox->setChecked( hideBG[mode] );
-	connect( cbox, TQT_SIGNAL( clicked() ), TQT_SLOT( slotHideBG() ) );
+	connect( cbox, TQ_SIGNAL( clicked() ), TQ_SLOT( slotHideBG() ) );
 	ltm->addWidget( cbox );
 	ltm->addStretch();
 
@@ -902,12 +902,12 @@ KScienceSetup::KScienceSetup(  TQWidget *parent, const char *name )
 	slideSize->setMinimumSize( 90, 20 );
     slideSize->setTickmarks(TQSlider::Below);
     slideSize->setTickInterval(5);
-	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() ) );
+	connect( slideSize, TQ_SIGNAL( sliderMoved( int ) ),
+		TQ_SLOT( slotSize( int ) ) );
+	connect( slideSize, TQ_SIGNAL( sliderPressed() ),
+		TQ_SLOT( slotSliderPressed() ) );
+	connect( slideSize, TQ_SIGNAL( sliderReleased() ),
+		TQ_SLOT( slotSliderReleased() ) );
 
 	ltc->addWidget( slideSize );
 
@@ -920,12 +920,12 @@ KScienceSetup::KScienceSetup(  TQWidget *parent, const char *name )
 	slideIntensity->setMinimumSize( 90, 20 );
     slideIntensity->setTickmarks(TQSlider::Below);
     slideIntensity->setTickInterval(1);
-	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() ) );
+	connect( slideIntensity, TQ_SIGNAL( sliderMoved( int ) ),
+		TQ_SLOT( slotIntensity( int )) );
+	connect( slideIntensity, TQ_SIGNAL( sliderPressed() ),
+		TQ_SLOT( slotSliderPressed() ) );
+	connect( slideIntensity, TQ_SIGNAL( sliderReleased() ),
+		TQ_SLOT( slotSliderReleased() ) );
 	ltc->addWidget( slideIntensity );
 
 	// speed
@@ -937,8 +937,8 @@ KScienceSetup::KScienceSetup(  TQWidget *parent, const char *name )
 	slideSpeed->setMinimumSize( 90, 20 );
     slideSpeed->setTickmarks(TQSlider::Below);
     slideSpeed->setTickInterval(10);
-	connect( slideSpeed, TQT_SIGNAL( sliderMoved( int ) ),
-		TQT_SLOT( slotSpeed( int ) ) );
+	connect( slideSpeed, TQ_SIGNAL( sliderMoved( int ) ),
+		TQ_SLOT( slotSpeed( int ) ) );
 	ltc->addWidget( slideSpeed );
 
 	// motion
@@ -953,8 +953,8 @@ KScienceSetup::KScienceSetup(  TQWidget *parent, const char *name )
 	slideMoveX->setMinimumSize( 40, 20 );
     slideMoveX->setTickmarks(TQSlider::Below);
     slideMoveX->setTickInterval(5);
-	connect( slideMoveX, TQT_SIGNAL( sliderMoved( int ) ),
-		TQT_SLOT( slotMoveX( int ) ) );
+	connect( slideMoveX, TQ_SIGNAL( sliderMoved( int ) ),
+		TQ_SLOT( slotMoveX( int ) ) );
 	ltcm->addWidget( slideMoveX );
 
 	slideMoveY = new TQSlider(0, SCI_MAX_MOVE, 5, moveY[mode],
@@ -962,8 +962,8 @@ KScienceSetup::KScienceSetup(  TQWidget *parent, const char *name )
 	slideMoveY->setMinimumSize( 40, 20 );
     slideMoveY->setTickmarks(TQSlider::Below);
     slideMoveY->setTickInterval(5);
-	connect( slideMoveY, TQT_SIGNAL( sliderMoved( int ) ),
-		TQT_SLOT( slotMoveY( int ) ) );
+	connect( slideMoveY, TQ_SIGNAL( sliderMoved( int ) ),
+		TQ_SLOT( slotMoveY( int ) ) );
 	ltcm->addWidget( slideMoveY );
 
 	ltc->addStretch();
diff --git a/tdescreensaver/kdesavers/slideshow.cpp b/tdescreensaver/kdesavers/slideshow.cpp
index 09e9777a..9cf31ddb 100644
--- a/tdescreensaver/kdesavers/slideshow.cpp
+++ b/tdescreensaver/kdesavers/slideshow.cpp
@@ -92,7 +92,7 @@ kSlideShowSaver::kSlideShowSaver( WId id ): KScreenSaver(id)
   mEffectRunning = false;
 
   mTimer.start(10, true);
-  connect(&mTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
+  connect(&mTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotTimeout()));
 
   TQDesktopWidget *d = TQApplication::desktop();
   if( geometry() == d->geometry() && d->numScreens() > 1)
@@ -939,10 +939,10 @@ kSlideShowSetup::kSlideShowSetup(TQWidget *aParent, const char *aName)
   mSaver = new kSlideShowSaver(cfg->mPreview->winId());
 
   cfg->mDirChooser->setMode(KFile::Directory | KFile::ExistingOnly);
-  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 &)));
+  connect(cfg->mDirChooser, TQ_SIGNAL(returnPressed(const TQString &)),
+      TQ_SLOT(slotDirSelected(const TQString &)));
+  connect(cfg->mDirChooser, TQ_SIGNAL(urlSelected(const TQString &)),
+      TQ_SLOT(slotDirSelected(const TQString &)));
 
   readSettings();
 }
diff --git a/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp b/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp
index ade5abc1..f14e5c63 100644
--- a/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp
+++ b/tdescreensaver/kdesavers/tdeasciiquarium/screen.cpp
@@ -35,7 +35,7 @@ Screen::Screen(AASaver* widget): m_widget(widget)
 
     // Setup animation timer.
     TQTimer* timer = new TQTimer(this);
-    connect(timer, SIGNAL(timeout()), SLOT(doAnimate()));
+    connect(timer, TQ_SIGNAL(timeout()), TQ_SLOT(doAnimate()));
 
     timer->start(msPerTick());
 }
diff --git a/tdescreensaver/kdesavers/wave.cpp b/tdescreensaver/kdesavers/wave.cpp
index edc3be93..84d5365e 100644
--- a/tdescreensaver/kdesavers/wave.cpp
+++ b/tdescreensaver/kdesavers/wave.cpp
@@ -66,11 +66,11 @@ KWaveSetup::KWaveSetup( TQWidget *parent, const char *name )
 	preview->show();    // otherwise saver does not get correct size
 	saver = new KWaveSaver( preview->winId() );
 
-	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)));
+	connect( PushButton1, TQ_SIGNAL( clicked() ), TQ_SLOT( slotOkPressed() ) );
+	connect( PushButton2, TQ_SIGNAL( clicked() ), TQ_SLOT( reject() ) );
+	connect( PushButton3, TQ_SIGNAL( clicked() ), TQ_SLOT( aboutPressed() ) );
+	connect(  SpinBox1, TQ_SIGNAL( valueChanged(int)), saver, TQ_SLOT( updateSize(int)));
+	connect( RadioButton1, TQ_SIGNAL( toggled(bool)), saver, TQ_SLOT( doStars(bool)));
 
 }
 
@@ -122,7 +122,7 @@ KWaveSaver::KWaveSaver( WId id ) : KScreenSaver( id )
 	wave = new Wave();
 	embed(wave);
 	wave->show();
-	connect( timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(blank()) );;
+	connect( timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(blank()) );;
 }
 
 KWaveSaver::~KWaveSaver()