Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

39 files changed, 297 insertions, 297 deletions

diff --git a/styles/dotnet/dotnet.cpp b/styles/dotnet/dotnet.cpp
index 089170b4..e939cfc2 100644
--- a/styles/dotnet/dotnet.cpp
+++ b/styles/dotnet/dotnet.cpp
@@ -85,7 +85,7 @@ dotNETstyle::dotNETstyle() : TDEStyle( AllowMenuTransparency ), kickerMode(false
 	}
 
 	if (tqApp->inherits("TDEApplication")) {
-		connect( tqApp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( paletteChanged() ));
+		connect( tqApp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( paletteChanged() ));
 	}
 
 	TQSettings settings;
diff --git a/styles/phase/config/phasestyleconfig.cpp b/styles/phase/config/phasestyleconfig.cpp
index df48f9e3..4a3b7bcd 100644
--- a/styles/phase/config/phasestyleconfig.cpp
+++ b/styles/phase/config/phasestyleconfig.cpp
@@ -39,10 +39,10 @@ PhaseStyleConfig::PhaseStyleConfig(TQWidget* parent) : StyleDialog(parent)
     highlights->setChecked(oldhighlights);
 
     // connections
-    connect(gradients, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SLOT(updateChanged()));
-    connect(highlights, TQT_SIGNAL(toggled(bool)),
-            this, TQT_SLOT(updateChanged()));
+    connect(gradients, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SLOT(updateChanged()));
+    connect(highlights, TQ_SIGNAL(toggled(bool)),
+            this, TQ_SLOT(updateChanged()));
 }
 
 //////////////////////////////////////////////////////////////////////////////
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()
diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp
index f91b0321..2fde6f49 100644
--- a/tdescreensaver/kxsconfig/kxsconfig.cpp
+++ b/tdescreensaver/kxsconfig/kxsconfig.cpp
@@ -171,16 +171,16 @@ bool KXSConfigDialog::create()
 	item->read( config );
         TQWidget *i = dynamic_cast<TQWidget*>(item);
         if (i) {
-            connect( i, TQT_SIGNAL(changed()), TQT_SLOT(slotChanged()) );
+            connect( i, TQ_SIGNAL(changed()), TQ_SLOT(slotChanged()) );
         }
     }
 
     mPreviewProc = new TDEProcess;
-    connect(mPreviewProc, TQT_SIGNAL(processExited(TDEProcess *)),
-	    TQT_SLOT(slotPreviewExited(TDEProcess *)));
+    connect(mPreviewProc, TQ_SIGNAL(processExited(TDEProcess *)),
+	    TQ_SLOT(slotPreviewExited(TDEProcess *)));
 
     mPreviewTimer = new TQTimer(this);
-    connect(mPreviewTimer, TQT_SIGNAL(timeout()), TQT_SLOT(slotNewPreview()));
+    connect(mPreviewTimer, TQ_SIGNAL(timeout()), TQ_SLOT(slotNewPreview()));
 
     mPreview = new TQWidget(plainPage());
     mPreview->setFixedSize(250, 200);
diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp
index 26e7ad6f..0e9d502b 100644
--- a/tdescreensaver/kxsconfig/kxscontrol.cpp
+++ b/tdescreensaver/kxsconfig/kxscontrol.cpp
@@ -40,7 +40,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(mLabel, this);
   l->add(label);
   mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, TQt::Horizontal, this);
-  connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+  connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
   l->add(mSlider);
 }
 
@@ -56,7 +56,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name,
 	}
 	mSpinBox = new TQSpinBox(mMinimum, mMaximum, 1, this);
 	mSpinBox->setValue(mValue);
-	connect(mSpinBox, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+	connect(mSpinBox, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
 	hb->add(mSpinBox);
     } else {
 	TQString lowLabel = attr.value("_low-label");
@@ -72,7 +72,7 @@ KXSRangeControl::KXSRangeControl(TQWidget *parent, const TQString &name,
 	    hb->addWidget(l);
 	}
 	mSlider = new TQSlider(mMinimum, mMaximum, 10, mValue, TQt::Horizontal, this);
-	connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+	connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
 	hb->add(mSlider);
 	if (!highLabel.isEmpty()){
             TQLabel *l = new TQLabel(i18n(highLabel.utf8()), this);
@@ -108,7 +108,7 @@ KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent,
   int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum));
 
   mSlider = new TQSlider(0, 100, 10, value, TQt::Horizontal, this);
-  connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+  connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
   l->add(mSlider);
 }
 
@@ -130,7 +130,7 @@ KXSDoubleRangeControl::KXSDoubleRangeControl(TQWidget *parent,
     }
     int value = int((mValue - mMinimum) * 100 / (mMaximum - mMinimum));
     mSlider = new TQSlider(0, 100, 10, value, TQt::Horizontal, this);
-    connect(mSlider, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(slotValueChanged(int)));
+    connect(mSlider, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(slotValueChanged(int)));
     hb->add(mSlider);
     if (!highLabel.isEmpty()){
         TQLabel *l = new TQLabel(i18n(highLabel.utf8()), this);
@@ -158,7 +158,7 @@ KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name,
 {
   setText(mLabel);
   setChecked(mValue);
-  connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
+  connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
 }
 
 KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name,
@@ -167,7 +167,7 @@ KXSCheckBoxControl::KXSCheckBoxControl(TQWidget *parent, const TQString &name,
 {
   setText(i18n(mLabel.utf8()));
   setChecked(mValue);
-  connect(this, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotToggled(bool)));
+  connect(this, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotToggled(bool)));
 }
 
 void KXSCheckBoxControl::slotToggled(bool state)
@@ -194,7 +194,7 @@ KXSDropListControl::KXSDropListControl(TQWidget *parent, const TQString &name,
   for(uint i=0; i < mOptions.count(); i++)
       mCombo->insertItem( i18n(mOptions[i].utf8()) );
   mCombo->setCurrentItem(mValue);
-  connect(mCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+  connect(mCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
   l->add(mCombo);
 }
 
@@ -206,7 +206,7 @@ KXSDropListControl::KXSDropListControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(i18n(mLabel.utf8()), this);
   l->add(label);
   mCombo = new TQComboBox(this);
-  connect(mCombo, TQT_SIGNAL(activated(int)), TQT_SLOT(slotActivated(int)));
+  connect(mCombo, TQ_SIGNAL(activated(int)), TQ_SLOT(slotActivated(int)));
   l->add(mCombo);
 }
 
@@ -239,7 +239,7 @@ KXSLineEditControl::KXSLineEditControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(mLabel, this);
   l->add(label);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   l->add(mEdit);
 }
 
@@ -251,7 +251,7 @@ KXSLineEditControl::KXSLineEditControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(i18n(mLabel.utf8()), this);
   l->add(label);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   l->add(mEdit);
 }
 
@@ -276,7 +276,7 @@ KXSFileControl::KXSFileControl(TQWidget *parent, const TQString &name,
   TQLabel *label = new TQLabel(mLabel, this);
   l->add(label);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   l->add(mEdit);
 }
 
@@ -289,10 +289,10 @@ KXSFileControl::KXSFileControl(TQWidget *parent, const TQString &name,
   l->add(label);
   TQHBoxLayout *hb = new TQHBoxLayout(l);
   mEdit = new TQLineEdit(this);
-  connect(mEdit, TQT_SIGNAL(textChanged(const TQString &)), TQT_SLOT(textChanged(const TQString &)));
+  connect(mEdit, TQ_SIGNAL(textChanged(const TQString &)), TQ_SLOT(textChanged(const TQString &)));
   hb->add(mEdit);
   TQPushButton *pb = new TQPushButton( "...", this );
-  connect( pb, TQT_SIGNAL(clicked()), this, TQT_SLOT(selectFile()) );
+  connect( pb, TQ_SIGNAL(clicked()), this, TQ_SLOT(selectFile()) );
   hb->addWidget(pb);
 }
 
diff --git a/tdescreensaver/tdepartsaver/tdepartsaver.cpp b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
index 98a20ee3..8a5ea76c 100644
--- a/tdescreensaver/tdepartsaver/tdepartsaver.cpp
+++ b/tdescreensaver/tdepartsaver/tdepartsaver.cpp
@@ -140,7 +140,7 @@ KPartSaver::KPartSaver( WId id )
             next( m_random );
             m_timer = new TQTimer( this );
             m_timer->start( m_delay*1000, true );
-            connect( m_timer, TQT_SIGNAL(timeout()), TQT_SLOT(timeout()) );
+            connect( m_timer, TQ_SIGNAL(timeout()), TQ_SLOT(timeout()) );
         }
     }
 }
@@ -272,20 +272,20 @@ void KPartSaver::next( bool random )
 SaverConfig::SaverConfig( TQWidget* parent, const char* name )
     : ConfigWidget( parent, name, true )
 {
-    connect( m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(apply()) );
-    connect( m_ok, TQT_SIGNAL(clicked()), TQT_SLOT(accept()) );
-    connect( m_cancel, TQT_SIGNAL(clicked()), TQT_SLOT(reject()) );
-
-    connect( m_multiple, TQT_SIGNAL(toggled(bool)), m_delayLabel, TQT_SLOT(setEnabled(bool)) );
-    connect( m_multiple, TQT_SIGNAL(toggled(bool)), m_delay, TQT_SLOT(setEnabled(bool)) );
-    connect( m_multiple, TQT_SIGNAL(toggled(bool)), m_secondsLabel, TQT_SLOT(setEnabled(bool)) );
-    connect( m_multiple, TQT_SIGNAL(toggled(bool)), m_random, TQT_SLOT(setEnabled(bool)) );
-
-    connect( m_files, TQT_SIGNAL(selectionChanged()), TQT_SLOT(select()) );
-    connect( m_add, TQT_SIGNAL(clicked()), TQT_SLOT(add()) );
-    connect( m_remove, TQT_SIGNAL(clicked()), TQT_SLOT(remove()) );
-    connect( m_up, TQT_SIGNAL(clicked()), TQT_SLOT(up()) );
-    connect( m_down, TQT_SIGNAL(clicked()), TQT_SLOT(down()) );
+    connect( m_ok, TQ_SIGNAL(clicked()), TQ_SLOT(apply()) );
+    connect( m_ok, TQ_SIGNAL(clicked()), TQ_SLOT(accept()) );
+    connect( m_cancel, TQ_SIGNAL(clicked()), TQ_SLOT(reject()) );
+
+    connect( m_multiple, TQ_SIGNAL(toggled(bool)), m_delayLabel, TQ_SLOT(setEnabled(bool)) );
+    connect( m_multiple, TQ_SIGNAL(toggled(bool)), m_delay, TQ_SLOT(setEnabled(bool)) );
+    connect( m_multiple, TQ_SIGNAL(toggled(bool)), m_secondsLabel, TQ_SLOT(setEnabled(bool)) );
+    connect( m_multiple, TQ_SIGNAL(toggled(bool)), m_random, TQ_SLOT(setEnabled(bool)) );
+
+    connect( m_files, TQ_SIGNAL(selectionChanged()), TQ_SLOT(select()) );
+    connect( m_add, TQ_SIGNAL(clicked()), TQ_SLOT(add()) );
+    connect( m_remove, TQ_SIGNAL(clicked()), TQ_SLOT(remove()) );
+    connect( m_up, TQ_SIGNAL(clicked()), TQ_SLOT(up()) );
+    connect( m_down, TQ_SIGNAL(clicked()), TQ_SLOT(down()) );
 
     m_up->setIconSet( SmallIconSet("go-up") );
     m_down->setIconSet( SmallIconSet("go-down") );
diff --git a/tdescreensaver/xsavers/space.cpp b/tdescreensaver/xsavers/space.cpp
index 4660d79a..01d4cddf 100644
--- a/tdescreensaver/xsavers/space.cpp
+++ b/tdescreensaver/xsavers/space.cpp
@@ -509,7 +509,7 @@ kSpaceSaver::kSpaceSaver( Drawable drawable ) : kScreenSaver( drawable )
 	initSpace( mDrawable );
 
 	timer.start( speed );
-	connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+	connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
 }
 
 kSpaceSaver::~kSpaceSaver()
@@ -597,7 +597,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name )
     vb->addWidget( slider );
     slider->setTickmarks(TQSlider::Below);
     slider->setTickInterval(10);
-    connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotSpeed( int ) ) );
+    connect( slider, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotSpeed( int ) ) );
 
     label = new TQLabel( i18n("Warp interval:"), page );
     vb->addWidget( label );
@@ -606,7 +606,7 @@ kSpaceSetup::kSpaceSetup( TQWidget *parent, const char *name )
     vb->addWidget( slider );
     slider->setTickmarks(TQSlider::Below);
     slider->setTickInterval(3);
-    connect( slider, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( slotWarp( int ) ) );
+    connect( slider, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( slotWarp( int ) ) );
 
     vb->addStrut( 150 );
     vb->addStretch();
diff --git a/tdescreensaver/xsavers/swarm.cpp b/tdescreensaver/xsavers/swarm.cpp
index 72c0d2d1..2983a948 100644
--- a/tdescreensaver/xsavers/swarm.cpp
+++ b/tdescreensaver/xsavers/swarm.cpp
@@ -272,7 +272,7 @@ kSwarmSaver::kSwarmSaver( Drawable drawable ) : kScreenSaver( drawable )
 	initswarm( mDrawable, rnd );
 
 	timer.start( speed );
-	connect( &timer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotTimeout() ) );
+	connect( &timer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotTimeout() ) );
 }
 
 kSwarmSaver::~kSwarmSaver()
@@ -334,8 +334,8 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name )
 	slider->setMinimumSize( 120, 20 );
     slider->setTickmarks(TQSlider::Below);
     slider->setTickInterval(10);
-	connect( slider, TQT_SIGNAL( valueChanged( int ) ),
-		 TQT_SLOT( slotSpeed( int ) ) );
+	connect( slider, TQ_SIGNAL( valueChanged( int ) ),
+		 TQ_SLOT( slotSpeed( int ) ) );
 	left->addWidget(slider);
 
 	label = new TQLabel( i18n("Number of bees:"), main );
@@ -346,8 +346,8 @@ kSwarmSetup::kSwarmSetup( TQWidget *parent, const char *name )
 	slider->setMinimumSize( 120, 20 );
     slider->setTickmarks(TQSlider::Below);
     slider->setTickInterval(20);
-	connect( slider, TQT_SIGNAL( valueChanged( int ) ),
-		 TQT_SLOT( slotLevels( int ) ) );
+	connect( slider, TQ_SIGNAL( valueChanged( int ) ),
+		 TQ_SLOT( slotLevels( int ) ) );
 	left->addWidget(slider);
 	left->addStretch();
 
diff --git a/twin-styles/cde/cdeclient.cpp b/twin-styles/cde/cdeclient.cpp
index 5aa8215e..1c89f218 100644
--- a/twin-styles/cde/cdeclient.cpp
+++ b/twin-styles/cde/cdeclient.cpp
@@ -329,8 +329,8 @@ void CdeClient::addClientButtons( const TQString& s )
                     if ( ! button[BtnMenu] )
                     {
                         button[BtnMenu] = new CdeButton( this, "menu", BtnMenu, i18n("Menu"), TQt::LeftButton|TQt::RightButton );
-                        connect( button[BtnMenu], TQT_SIGNAL(pressed()), TQT_SLOT(menuButtonPressed()) );
-                        connect( button[BtnMenu], TQT_SIGNAL(released()), TQT_SLOT(menuButtonReleased()) );
+                        connect( button[BtnMenu], TQ_SIGNAL(pressed()), TQ_SLOT(menuButtonPressed()) );
+                        connect( button[BtnMenu], TQ_SIGNAL(released()), TQ_SLOT(menuButtonReleased()) );
                         titleLayout->addWidget( button[BtnMenu] );
                     }
                     break;
@@ -341,7 +341,7 @@ void CdeClient::addClientButtons( const TQString& s )
                     {
                         button[BtnHelp] = new CdeButton( this, "help", BtnHelp, i18n("Help") );
                         connect(button[BtnHelp],
-				TQT_SIGNAL(clicked()), TQT_SLOT(showContextHelp()));
+				TQ_SIGNAL(clicked()), TQ_SLOT(showContextHelp()));
                         titleLayout->addWidget( button[BtnHelp] );
                     }
                     break;
@@ -352,7 +352,7 @@ void CdeClient::addClientButtons( const TQString& s )
                     {
                         button[BtnIconify] = new CdeButton( this, "iconify", BtnIconify, i18n("Minimize") );
                         connect(button[BtnIconify],
-				TQT_SIGNAL(clicked()), TQT_SLOT(minimize()));
+				TQ_SIGNAL(clicked()), TQ_SLOT(minimize()));
                         titleLayout->addWidget( button[BtnIconify] );
                     }
                     break;
@@ -362,8 +362,8 @@ void CdeClient::addClientButtons( const TQString& s )
                     if ( (! button[BtnMax] ) && isMaximizable() )
                     {
                         button[BtnMax] = new CdeButton(this, "maximize", BtnMax, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
-                        connect(button[BtnMax], TQT_SIGNAL(clicked()),
-				TQT_SLOT(maximizeButtonClicked()));
+                        connect(button[BtnMax], TQ_SIGNAL(clicked()),
+				TQ_SLOT(maximizeButtonClicked()));
                         titleLayout->addWidget( button[BtnMax] );
                     }
                     break;
@@ -373,7 +373,7 @@ void CdeClient::addClientButtons( const TQString& s )
                     if ( !button[BtnClose] && isCloseable())
                     {
                         button[BtnClose] = new CdeButton(this, "close", BtnClose, i18n("Close"));
-                        connect( button[BtnClose], TQT_SIGNAL( clicked()), TQT_SLOT(closeWindow()) );
+                        connect( button[BtnClose], TQ_SIGNAL( clicked()), TQ_SLOT(closeWindow()) );
                         titleLayout->addWidget( button[BtnClose] );
                     }
 		// Add onAlldesktops button and spacers
diff --git a/twin-styles/cde/config/config.cpp b/twin-styles/cde/config/config.cpp
index 48b5c791..e14c82b0 100644
--- a/twin-styles/cde/config/config.cpp
+++ b/twin-styles/cde/config/config.cpp
@@ -54,9 +54,9 @@ CdeConfig::CdeConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( cbColorBorder, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-//	connect( cbTitlebarButton, TQT_SIGNAL(clicked()), TQT_SLOT(slotSelectionChanged()) );
-	connect( bgAlign, TQT_SIGNAL(clicked(int)), TQT_SLOT(slotSelectionChanged(int)) );
+	connect( cbColorBorder, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+//	connect( cbTitlebarButton, TQ_SIGNAL(clicked()), TQ_SLOT(slotSelectionChanged()) );
+	connect( bgAlign, TQ_SIGNAL(clicked(int)), TQ_SLOT(slotSelectionChanged(int)) );
 
 	// Make the widgets visible in twindecoration
 	groupBox->show();
diff --git a/twin-styles/glow/config/glowconfigdialog.cpp b/twin-styles/glow/config/glowconfigdialog.cpp
index af13655e..98234175 100644
--- a/twin-styles/glow/config/glowconfigdialog.cpp
+++ b/twin-styles/glow/config/glowconfigdialog.cpp
@@ -73,8 +73,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
         _theme_list_view->setResizeMode(TQListView::AllColumns);
 
 	main_group_boxLayout->addWidget (_theme_list_view);
-	TQObject::connect (_theme_list_view, TQT_SIGNAL(selectionChanged()),
-			this, TQT_SLOT(slotThemeListViewSelectionChanged()));
+	TQObject::connect (_theme_list_view, TQ_SIGNAL(selectionChanged()),
+			this, TQ_SLOT(slotThemeListViewSelectionChanged()));
 	slotLoadThemeList();
 
 	_button_glow_color_group_box = new TQGroupBox(
@@ -121,14 +121,14 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
 	_titleButtonMapper = new TQSignalMapper(this);
 	for( uint i=0; i<_titleButtonList.size(); i++ ) {
 		_titleButtonMapper->setMapping(_titleButtonList[i], i);
-		connect(_titleButtonList[i], TQT_SIGNAL(clicked()),_titleButtonMapper, TQT_SLOT(map()));
+		connect(_titleButtonList[i], TQ_SIGNAL(clicked()),_titleButtonMapper, TQ_SLOT(map()));
 	}
-	connect(_titleButtonMapper, TQT_SIGNAL(mapped(int)),this, TQT_SLOT(slotTitleButtonClicked(int)));
+	connect(_titleButtonMapper, TQ_SIGNAL(mapped(int)),this, TQ_SLOT(slotTitleButtonClicked(int)));
 
 	_colorButton = new KColorButton(_button_glow_color_group_box);
 	_colorButton->setEnabled(false);
-	connect(_colorButton, TQT_SIGNAL(changed(const TQColor&)),
-		this, TQT_SLOT(slotColorButtonChanged(const TQColor&)));
+	connect(_colorButton, TQ_SIGNAL(changed(const TQColor&)),
+		this, TQ_SLOT(slotColorButtonChanged(const TQColor&)));
 
 	colorHBoxLayout->addItem(new TQSpacerItem(
 		200, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum));
@@ -156,8 +156,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
 		_titlebarGradientTypeComboBox->insertItem(gradPixmap, i);
 	}
 
-	connect(_titlebarGradientTypeComboBox, TQT_SIGNAL(activated(int)),
-		this, TQT_SLOT(slotTitlebarGradientTypeChanged(int)));
+	connect(_titlebarGradientTypeComboBox, TQ_SIGNAL(activated(int)),
+		this, TQ_SLOT(slotTitlebarGradientTypeChanged(int)));
 	titlebarGradientTypeLayout->addWidget(
 		new TQLabel(i18n("Titlebar gradient:"), _main_group_box));
 	titlebarGradientTypeLayout->addWidget(_titlebarGradientTypeComboBox, 0, TQt::AlignLeft);
@@ -167,8 +167,8 @@ GlowConfigDialog::GlowConfigDialog( TDEConfig * conf, TQWidget * parent )
 
 	_showResizeHandleCheckBox = new TQCheckBox(
 			i18n("Show resize handle"),	_main_group_box);
-	connect(_showResizeHandleCheckBox, TQT_SIGNAL(clicked()),
-		this, TQT_SLOT(slotResizeHandleCheckBoxChanged()));
+	connect(_showResizeHandleCheckBox, TQ_SIGNAL(clicked()),
+		this, TQ_SLOT(slotResizeHandleCheckBoxChanged()));
 	main_group_boxLayout->addWidget(_showResizeHandleCheckBox);
 
 	// load config and update user interface
diff --git a/twin-styles/glow/glowbutton.cpp b/twin-styles/glow/glowbutton.cpp
index 9baa98a3..a3f70741 100644
--- a/twin-styles/glow/glowbutton.cpp
+++ b/twin-styles/glow/glowbutton.cpp
@@ -90,7 +90,7 @@ GlowButton::GlowButton(TQWidget *parent, const char *name,
 	m_pixmapName = TQString();
 
 	m_timer = new TQTimer(this);
-	connect(m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()));
+	connect(m_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotTimeout()));
 	m_pos = 0;
 	m_timerStatus = Stop;
 
diff --git a/twin-styles/glow/glowclient.cpp b/twin-styles/glow/glowclient.cpp
index d4650246..7c905e99 100644
--- a/twin-styles/glow/glowclient.cpp
+++ b/twin-styles/glow/glowclient.cpp
@@ -654,31 +654,31 @@ void GlowClient::createButtons()
 	m_stickyButton = factory->createGlowButton(widget(),
 					"StickyButton", isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"), TQt::LeftButton|TQt::RightButton);
 	m_stickyButton->setFixedSize(size);
-	connect(m_stickyButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(toggleOnAllDesktops()));
+	connect(m_stickyButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(toggleOnAllDesktops()));
 	m_buttonList.insert(m_buttonList.end(), m_stickyButton);
 
 	m_helpButton = factory->createGlowButton(widget(),
 					"HelpButton", i18n("Help"));
 	m_helpButton->setFixedSize(size);
-	connect(m_helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showContextHelp()));
+	connect(m_helpButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showContextHelp()));
 	m_buttonList.insert(m_buttonList.end(), m_helpButton);
 
 	m_minimizeButton = factory->createGlowButton(widget(),
 					"IconifyButton", i18n("Minimize"));
 	m_minimizeButton->setFixedSize(size);
-	connect(m_minimizeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(minimize()));
+	connect(m_minimizeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(minimize()));
 	m_buttonList.insert(m_buttonList.end(), m_minimizeButton);
 
 	m_maximizeButton=factory->createGlowButton(widget(),
 					"MaximizeButton", i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
 	m_maximizeButton->setFixedSize(size);
-	connect(m_maximizeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotMaximize()));
+	connect(m_maximizeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(slotMaximize()));
 	m_buttonList.insert(m_buttonList.end(), m_maximizeButton);
 
 	m_closeButton = factory->createGlowButton(widget(),
 					"CloseButton", i18n("Close"));
 	m_closeButton->setFixedSize(size);
-	connect(m_closeButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(closeWindow()));
+	connect(m_closeButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(closeWindow()));
 	m_buttonList.insert(m_buttonList.end(), m_closeButton);
 }
 
diff --git a/twin-styles/icewm/config/config.cpp b/twin-styles/icewm/config/config.cpp
index 88905c80..3b6b77a6 100644
--- a/twin-styles/icewm/config/config.cpp
+++ b/twin-styles/icewm/config/config.cpp
@@ -112,20 +112,20 @@ IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent )
 	load( conf );
 
 	// Ensure we track user changes properly
-	connect( themeListBox, TQT_SIGNAL(selectionChanged()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( themeListBox, TQ_SIGNAL(selectionChanged()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
-	connect( urlLabel, TQT_SIGNAL(leftClickedURL(const TQString&)),
-			 this, TQT_SLOT(callURL(const TQString&)));
+	connect( urlLabel, TQ_SIGNAL(leftClickedURL(const TQString&)),
+			 this, TQ_SLOT(callURL(const TQString&)));
 
-	connect( cbThemeTitleTextColors, TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbThemeTitleTextColors, TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
-	connect( cbTitleBarOnTop, TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbTitleBarOnTop, TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
-	connect( cbShowMenuButtonIcon, TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(slotSelectionChanged()) );
+	connect( cbShowMenuButtonIcon, TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(slotSelectionChanged()) );
 
 	// Create the theme directory (if not found) ... and obtain the path as we do so.
 	localThemeString = TDEGlobal::dirs()->saveLocation("data", "twin");
@@ -135,9 +135,9 @@ IceWMConfig::IceWMConfig( TDEConfig* conf, TQWidget* parent )
 
 	// Watch the icewm theme directory for theme additions/removals
 	KDirWatch::self()->addDir(localThemeString);
-	connect( KDirWatch::self(), TQT_SIGNAL(dirty(const TQString&)), this, TQT_SLOT(findIceWMThemes()) );
-	connect( KDirWatch::self(), TQT_SIGNAL(created(const TQString&)), this, TQT_SLOT(findIceWMThemes()) );
-	connect( KDirWatch::self(), TQT_SIGNAL(deleted(const TQString&)), this, TQT_SLOT(findIceWMThemes()) );
+	connect( KDirWatch::self(), TQ_SIGNAL(dirty(const TQString&)), this, TQ_SLOT(findIceWMThemes()) );
+	connect( KDirWatch::self(), TQ_SIGNAL(created(const TQString&)), this, TQ_SLOT(findIceWMThemes()) );
+	connect( KDirWatch::self(), TQ_SIGNAL(deleted(const TQString&)), this, TQ_SLOT(findIceWMThemes()) );
 
 	// Set the konqui link url
 	TQString urlThemeString = TQString("file://") + localThemeString;
diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index 3e4b9c08..4ce0a2c8 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-styles/icewm/icewm.cpp
@@ -982,10 +982,10 @@ void IceWMClient::addClientButtons( const TQString& s )
 							button[BtnSysMenu] = new IceWMButton(this, "menu",
 								&menuButtonPix, false, i18n("Menu"));
 
-						connect( button[BtnSysMenu], TQT_SIGNAL(pressed()),
-								 this, TQT_SLOT(menuButtonPressed()));
-						connect( button[BtnSysMenu], TQT_SIGNAL(released()),
-								 this, TQT_SLOT(menuButtonReleased()));
+						connect( button[BtnSysMenu], TQ_SIGNAL(pressed()),
+								 this, TQ_SLOT(menuButtonPressed()));
+						connect( button[BtnSysMenu], TQ_SIGNAL(released()),
+								 this, TQ_SLOT(menuButtonReleased()));
 						hb->addWidget( button[BtnSysMenu] );
 					}
 					break;
@@ -996,8 +996,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 						button[BtnClose] = new IceWMButton(this, "close",
 								&closePix, false, i18n("Close"));
 						hb->addWidget( button[BtnClose] );
-						connect( button[BtnClose], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(closeWindow()));
+						connect( button[BtnClose], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(closeWindow()));
 					}
 					break;
 
@@ -1007,8 +1007,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 						button[BtnMaximize] = new IceWMButton(this, "maximize",
 								&maximizePix, false, i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
 						hb->addWidget( button[BtnMaximize] );
-						connect( button[BtnMaximize], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(slotMaximize()));
+						connect( button[BtnMaximize], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(slotMaximize()));
 					}
 					break;
 
@@ -1019,8 +1019,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 						button[BtnMinimize] = new IceWMButton(this, "minimize",
 								&minimizePix, false, i18n("Minimize"));
 						hb->addWidget( button[BtnMinimize] );
-						connect( button[BtnMinimize], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(minimize()));
+						connect( button[BtnMinimize], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(minimize()));
 					}
 					break;
 
@@ -1038,8 +1038,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 							isSetShade() ? &rolldownPix : &rollupPix,
 										    false, i18n("Rollup"));
 						hb->addWidget( button[BtnRollup] );
-						connect( button[BtnRollup], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(toggleShade()));
+						connect( button[BtnRollup], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(toggleShade()));
 					}
 					break;
 
@@ -1051,8 +1051,8 @@ void IceWMClient::addClientButtons( const TQString& s )
 								&depthPix, true, isOnAllDesktops()?i18n("Not on all desktops"):i18n("On all desktops"));
 						button[BtnDepth]->turnOn( isOnAllDesktops() );
 						hb->addWidget( button[BtnDepth] );
-						connect( button[BtnDepth], TQT_SIGNAL(clicked()),
-								 this, TQT_SLOT(toggleOnAllDesktops()));
+						connect( button[BtnDepth], TQ_SIGNAL(clicked()),
+								 this, TQ_SLOT(toggleOnAllDesktops()));
 					}
 					break;
 			}
diff --git a/twin-styles/kde1/kde1client.cpp b/twin-styles/kde1/kde1client.cpp
index c06af33d..1dbc4535 100644
--- a/twin-styles/kde1/kde1client.cpp
+++ b/twin-styles/kde1/kde1client.cpp
@@ -312,7 +312,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                           button[ButtonMenu]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix);
                       else
                           button[ButtonMenu]->setIconSet( icon().pixmap( TQIconSet::Small, TQIconSet::Normal ));
-                      connect( button[0], TQT_SIGNAL( pressed() ), this, TQT_SLOT( menuButtonPressed() ) );
+                      connect( button[0], TQ_SIGNAL( pressed() ), this, TQ_SLOT( menuButtonPressed() ) );
                       hb->addWidget(button[ButtonMenu]);
                   }
                   break;
@@ -325,7 +325,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                      button[ButtonSticky]->setCursor(ArrowCursor);
                      button[ButtonSticky]->setIconSet(isOnAllDesktops() ? isActive() ? *pindown_pix : *dis_pindown_pix :
                                                       isActive() ? *pinup_pix : *dis_pinup_pix );
-                     connect( button[ButtonSticky], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( toggleOnAllDesktops() ) ) );
+                     connect( button[ButtonSticky], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( toggleOnAllDesktops() ) ) );
                      hb->addWidget(button[ButtonSticky]);
                   }
                   break;
@@ -335,7 +335,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       button[ButtonHelp] = new TQToolButton( widget(), 0 );
                       TQToolTip::add( button[ButtonHelp], i18n("Help") );
                       button[ButtonHelp]->setIconSet( isActive() ? *question_mark_pix : *dis_question_mark_pix);
-                      connect( button[ButtonHelp], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( showContextHelp() ) ) );
+                      connect( button[ButtonHelp], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( showContextHelp() ) ) );
                       button[ButtonHelp]->setCursor(ArrowCursor);
                       hb->addWidget(button[ButtonHelp]);
                   }
@@ -347,7 +347,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       TQToolTip::add( button[ButtonMinimize], i18n("Minimize") );
                       button[ButtonMinimize]->setCursor(ArrowCursor);
                       button[ButtonMinimize]->setIconSet(isActive() ? *minimize_pix : *dis_minimize_pix);
-                      connect( button[ButtonMinimize], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( minimize() ) ) );
+                      connect( button[ButtonMinimize], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( minimize() ) ) );
                       hb->addWidget(button[ButtonMinimize]);
                   }
                   break;
@@ -359,8 +359,8 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       TQToolTip::add( button[ButtonMaximize], max?i18n("Restore"):i18n("Maximize") );
                       button[ButtonMaximize]->setCursor(ArrowCursor);
                       button[ButtonMaximize]->setIconSet( max?(isActive() ? *normalize_pix : *dis_normalize_pix):(isActive() ? *maximize_pix : *dis_maximize_pix) );
-                      connect( button[ButtonMaximize], TQT_SIGNAL( clicked(ButtonState) ),
-                               this, ( TQT_SLOT( maxButtonClicked(ButtonState) ) ) );
+                      connect( button[ButtonMaximize], TQ_SIGNAL( clicked(ButtonState) ),
+                               this, ( TQ_SLOT( maxButtonClicked(ButtonState) ) ) );
                       hb->addWidget(button[ButtonMaximize]);
                   }
                   break;
@@ -371,7 +371,7 @@ void StdClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       TQToolTip::add( button[ButtonClose], i18n("Close") );
                       button[ButtonClose]->setCursor(ArrowCursor);
                       button[ButtonClose]->setIconSet(isActive() ? *close_pix : *dis_close_pix);
-                      connect( button[ButtonClose], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( closeWindow() ) ) );
+                      connect( button[ButtonClose], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) );
                       hb->addWidget(button[ButtonClose]);
                   }
                   break;
@@ -615,7 +615,7 @@ void StdToolClient::init()
 
     closeBtn = new TQToolButton( widget(), 0 );
     TQToolTip::add( closeBtn, i18n("Close") );
-    connect( closeBtn, TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( closeWindow() ) ) );
+    connect( closeBtn, TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) );
     closeBtn->setFixedSize( 13, 13);
     reset( -1U );
 
diff --git a/twin-styles/kde1/kde1client.h b/twin-styles/kde1/kde1client.h
index 407c3993..be0a8bfa 100644
--- a/twin-styles/kde1/kde1client.h
+++ b/twin-styles/kde1/kde1client.h
@@ -110,7 +110,7 @@ public:
   ThreeButtonButton ( TQWidget *parent = 0, const char* name = 0 )
       : TQToolButton( parent, name )
     {
-	connect( this, TQT_SIGNAL( clicked() ), this, TQT_SLOT( handleClicked() ) );
+	connect( this, TQ_SIGNAL( clicked() ), this, TQ_SLOT( handleClicked() ) );
         setCursor( arrowCursor );
     }
     ~ThreeButtonButton () {}
diff --git a/twin-styles/kstep/nextclient.cpp b/twin-styles/kstep/nextclient.cpp
index fefcf019..8cb138bc 100644
--- a/twin-styles/kstep/nextclient.cpp
+++ b/twin-styles/kstep/nextclient.cpp
@@ -481,8 +481,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
                     new NextButton(this, "maximize", maximize_bits, 10, 10,
                                    i18n("Maximize"), TQt::LeftButton|TQt::MidButton|TQt::RightButton);
                 titleLayout->addWidget( button[MAXIMIZE_IDX] );
-                connect( button[MAXIMIZE_IDX], TQT_SIGNAL(clicked()),
-                         this, TQT_SLOT(maximizeButtonClicked()) );
+                connect( button[MAXIMIZE_IDX], TQ_SIGNAL(clicked()),
+                         this, TQ_SLOT(maximizeButtonClicked()) );
             }
             break;
 
@@ -491,8 +491,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 		button[HELP_IDX] = new NextButton(this,
 			"help", question_bits, 10, 10, i18n("Help"));
 		titleLayout->addWidget( button[HELP_IDX] );
-		connect( button[HELP_IDX], TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(showContextHelp()) );
+		connect( button[HELP_IDX], TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(showContextHelp()) );
 	    }
             break;
 
@@ -502,8 +502,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
                     new NextButton(this, "iconify", iconify_bits, 10, 10,
                                    i18n("Minimize"));
                 titleLayout->addWidget( button[ICONIFY_IDX] );
-                connect( button[ICONIFY_IDX], TQT_SIGNAL(clicked()),
-                         this, TQT_SLOT(minimize()) );
+                connect( button[ICONIFY_IDX], TQ_SIGNAL(clicked()),
+                         this, TQ_SLOT(minimize()) );
             }
             break;
 
@@ -512,16 +512,16 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
                 new NextButton(this, "menu", NULL, 10, 10, i18n("Menu"), TQt::LeftButton|TQt::RightButton);
             titleLayout->addWidget( button[MENU_IDX] );
             // NOTE DIFFERENCE: capture pressed(), not clicked()
-            connect( button[MENU_IDX], TQT_SIGNAL(pressed()),
-                     this, TQT_SLOT(menuButtonPressed()) );
+            connect( button[MENU_IDX], TQ_SIGNAL(pressed()),
+                     this, TQ_SLOT(menuButtonPressed()) );
             break;
 
         case 'L':
             button[SHADE_IDX] =
                 new NextButton(this, "shade", NULL, 0, 0, i18n("Shade"));
             titleLayout->addWidget( button[SHADE_IDX] );
-            connect( button[SHADE_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(shadeClicked()) );
+            connect( button[SHADE_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(shadeClicked()) );
             // NOTE DIFFERENCE: set the pixmap separately (2 states)
 	    shadeChange();
             break;
@@ -530,8 +530,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
             button[STICKY_IDX] =
                 new NextButton(this, "sticky", NULL, 0, 0, i18n("On all desktops"));
             titleLayout->addWidget( button[STICKY_IDX] );
-            connect( button[STICKY_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(toggleOnAllDesktops()) );
+            connect( button[STICKY_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(toggleOnAllDesktops()) );
             // NOTE DIFFERENCE: set the pixmap separately (2 states)
 	    desktopChange();
             break;
@@ -539,20 +539,20 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 	case 'F':
             button[ABOVE_IDX] = new NextButton(this, "above", NULL, 0, 0, "");
             titleLayout->addWidget( button[ABOVE_IDX] );
-            connect( button[ABOVE_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(aboveClicked()) );
-	    connect(this, TQT_SIGNAL(keepAboveChanged(bool)), 
-		    TQT_SLOT(keepAboveChange(bool)));
+            connect( button[ABOVE_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(aboveClicked()) );
+	    connect(this, TQ_SIGNAL(keepAboveChanged(bool)), 
+		    TQ_SLOT(keepAboveChange(bool)));
 	    keepAboveChange(keepAbove());
 	    break;
 	    
 	case 'B':
             button[BELOW_IDX] = new NextButton(this, "below", NULL, 0, 0, "");
             titleLayout->addWidget( button[BELOW_IDX] );
-            connect( button[BELOW_IDX], TQT_SIGNAL(clicked()),
-                     this, TQT_SLOT(belowClicked()) );
-	    connect(this, TQT_SIGNAL(keepBelowChanged(bool)), 
-		    TQT_SLOT(keepBelowChange(bool)));
+            connect( button[BELOW_IDX], TQ_SIGNAL(clicked()),
+                     this, TQ_SLOT(belowClicked()) );
+	    connect(this, TQ_SIGNAL(keepBelowChanged(bool)), 
+		    TQ_SLOT(keepBelowChange(bool)));
 	    keepBelowChange(keepBelow());
 	    break;
         
@@ -562,8 +562,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 		    new NextButton(this, "close", close_bits, 10, 10,
 				   i18n("Close"));
 		titleLayout->addWidget(button[CLOSE_IDX]);
-		connect(button[CLOSE_IDX], TQT_SIGNAL(clicked()),
-			 this, TQT_SLOT(closeWindow()));
+		connect(button[CLOSE_IDX], TQ_SIGNAL(clicked()),
+			 this, TQ_SLOT(closeWindow()));
             }
             break;
 
@@ -574,8 +574,8 @@ void NextClient::addButtons(TQBoxLayout* titleLayout, const TQString& spec)
 				   i18n("Resize"));
 		titleLayout->addWidget(button[RESIZE_IDX]);
 		// NOTE DIFFERENCE: capture pressed(), not clicked()
-		connect(button[RESIZE_IDX], TQT_SIGNAL(pressed()),
-			 this, TQT_SLOT(resizePressed()));
+		connect(button[RESIZE_IDX], TQ_SIGNAL(pressed()),
+			 this, TQ_SLOT(resizePressed()));
             }
 	    break;
         case '_':
diff --git a/twin-styles/riscos/Manager.cpp b/twin-styles/riscos/Manager.cpp
index 9eb26720..dafac2ff 100644
--- a/twin-styles/riscos/Manager.cpp
+++ b/twin-styles/riscos/Manager.cpp
@@ -593,9 +593,9 @@ void Manager::createTitle()
       {
          case 'S': // Sticky
             tb = new StickyButton(widget());
-            connect(this, TQT_SIGNAL(stickyChanged(bool)),
-                    tb, TQT_SLOT(setOn(bool)));
-            connect(tb, TQT_SIGNAL(toggleSticky()), this, TQT_SLOT(slotToggleSticky()));
+            connect(this, TQ_SIGNAL(stickyChanged(bool)),
+                    tb, TQ_SLOT(setOn(bool)));
+            connect(tb, TQ_SIGNAL(toggleSticky()), this, TQ_SLOT(slotToggleSticky()));
             emit(stickyChanged(isOnAllDesktops()));
             break;
 
@@ -603,7 +603,7 @@ void Manager::createTitle()
             if (providesContextHelp())
             {
                tb = new HelpButton(widget());
-               connect(tb, TQT_SIGNAL(help()), this, TQT_SLOT(showContextHelp()));
+               connect(tb, TQ_SIGNAL(help()), this, TQ_SLOT(showContextHelp()));
             }
             break;
 
@@ -611,7 +611,7 @@ void Manager::createTitle()
             if (isMinimizable())
             {
                tb = new IconifyButton(widget());
-               connect(tb, TQT_SIGNAL(iconify()), this, TQT_SLOT(minimize()));
+               connect(tb, TQ_SIGNAL(iconify()), this, TQ_SLOT(minimize()));
             }
             break;
 
@@ -619,29 +619,29 @@ void Manager::createTitle()
             if (isMaximizable())
             {
                tb = new MaximiseButton(widget());
-               connect(tb, TQT_SIGNAL(maximizeClicked(ButtonState)),
-                       this, TQT_SLOT(slotMaximizeClicked(ButtonState)));
-               connect(this, TQT_SIGNAL(maximizeChanged(bool)),
-                       tb, TQT_SLOT(setOn(bool)));
+               connect(tb, TQ_SIGNAL(maximizeClicked(ButtonState)),
+                       this, TQ_SLOT(slotMaximizeClicked(ButtonState)));
+               connect(this, TQ_SIGNAL(maximizeChanged(bool)),
+                       tb, TQ_SLOT(setOn(bool)));
                emit(maximizeChanged(maximizeMode() == MaximizeFull));
             }
             break;
 
          case 'F': // Above
             tb = new AboveButton(widget());
-            connect(tb, TQT_SIGNAL(above()), this, TQT_SLOT(slotAbove()));
+            connect(tb, TQ_SIGNAL(above()), this, TQ_SLOT(slotAbove()));
             break;
 
          case 'B': // Lower
             tb = new LowerButton(widget());
-            connect(tb, TQT_SIGNAL(lower()), this, TQT_SLOT(slotLower()));
+            connect(tb, TQ_SIGNAL(lower()), this, TQ_SLOT(slotLower()));
             break;
 
          case 'X': // Close
             if (isCloseable())
             {
                tb = new CloseButton(widget());
-               connect(tb, TQT_SIGNAL(closeWindow()), this, TQT_SLOT(closeWindow()));
+               connect(tb, TQ_SIGNAL(closeWindow()), this, TQ_SLOT(closeWindow()));
             }
             break;
 
@@ -652,7 +652,7 @@ void Manager::createTitle()
 
       if (tb != NULL)
       {
-         connect(this, TQT_SIGNAL(activeChanged(bool)), tb, TQT_SLOT(setActive(bool)));
+         connect(this, TQ_SIGNAL(activeChanged(bool)), tb, TQ_SLOT(setActive(bool)));
          buttonList->append(tb);
       }
    }
diff --git a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp
index f3c5c545..7f6a2d0d 100644
--- a/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp
+++ b/twin-styles/smooth-blend/client/config/smoothblendconfig.cpp
@@ -41,20 +41,20 @@ smoothblendConfig::smoothblendConfig(TDEConfig* config, TQWidget* parent)
     load(config_);
 
     // setup the connections for title align
-    connect(dialog_->titlealign, TQT_SIGNAL(clicked(int)),this, TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->titlealign, TQ_SIGNAL(clicked(int)),this, TQ_SLOT(selectionChanged(int)));
     // setup the connections for corner rounding
-    connect(dialog_->roundCorners, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->roundCorners, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup title shadow
-    connect(dialog_->titleshadow, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->titleshadow, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup button actions
-    connect(dialog_->animatebuttons, TQT_SIGNAL(stateChanged(int)),this,TQT_SLOT(selectionChanged(int)));
-    connect(dialog_->btnComboBox, TQT_SIGNAL(activated(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->animatebuttons, TQ_SIGNAL(stateChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->btnComboBox, TQ_SIGNAL(activated(int)),this,TQ_SLOT(selectionChanged(int)));
     // setup the connections for spin boxes
-    connect(dialog_->titlesize, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int)));
-    connect(dialog_->buttonsize, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int)));
-    connect(dialog_->framesize, TQT_SIGNAL(valueChanged(int)),this,TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->titlesize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->buttonsize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
+    connect(dialog_->framesize, TQ_SIGNAL(valueChanged(int)),this,TQ_SLOT(selectionChanged(int)));
     // double click the menu 
-    connect(dialog_->menuClose, TQT_SIGNAL(stateChanged(int)),this, TQT_SLOT(selectionChanged(int)));
+    connect(dialog_->menuClose, TQ_SIGNAL(stateChanged(int)),this, TQ_SLOT(selectionChanged(int)));
 }
 
 //////////////////////////////////////////////////////////////////////////////
diff --git a/twin-styles/smooth-blend/client/smoothblend.cpp b/twin-styles/smooth-blend/client/smoothblend.cpp
index ba9d5973..be1d5bb4 100644
--- a/twin-styles/smooth-blend/client/smoothblend.cpp
+++ b/twin-styles/smooth-blend/client/smoothblend.cpp
@@ -178,9 +178,9 @@ smoothblendButton::smoothblendButton(smoothblendClient *parent, const char *name
     setToggleButton(toggle);
     //button animation setup
     animTmr = new TQTimer(this);
-    connect(animTmr, TQT_SIGNAL(timeout() ), this, TQT_SLOT(animate() ) );
-    connect(this, TQT_SIGNAL(pressed() ), this, TQT_SLOT(buttonClicked() ) );
-    connect(this, TQT_SIGNAL(released() ), this, TQT_SLOT(buttonReleased() ) );
+    connect(animTmr, TQ_SIGNAL(timeout() ), this, TQ_SLOT(animate() ) );
+    connect(this, TQ_SIGNAL(pressed() ), this, TQ_SLOT(buttonClicked() ) );
+    connect(this, TQ_SIGNAL(released() ), this, TQ_SLOT(buttonReleased() ) );
     animProgress = 0;
     m_clicked=false;
 }
@@ -697,8 +697,8 @@ void smoothblendClient::_resetLayout()
     mainLayout_->addItem( bottomSpacer_ );
     
     // connections
-    connect(this, TQT_SIGNAL(keepAboveChanged(bool)), TQT_SLOT(keepAboveChange(bool)));
-    connect(this, TQT_SIGNAL(keepBelowChanged(bool)), TQT_SLOT(keepBelowChange(bool)));
+    connect(this, TQ_SIGNAL(keepAboveChanged(bool)), TQ_SLOT(keepAboveChange(bool)));
+    connect(this, TQ_SIGNAL(keepBelowChanged(bool)), TQ_SLOT(keepBelowChange(bool)));
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -715,8 +715,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if (!button[ButtonMenu]) {
                     button[ButtonMenu] =
                         new smoothblendButton(this, "splat.png", i18n("Menu"),ButtonMenu,button_size);
-                    connect(button[ButtonMenu], TQT_SIGNAL(pressed()), this, TQT_SLOT(menuButtonPressed()));
-                    connect(button[ButtonMenu], TQT_SIGNAL(released()), this, TQT_SLOT(menuButtonReleased()));
+                    connect(button[ButtonMenu], TQ_SIGNAL(pressed()), this, TQ_SLOT(menuButtonPressed()));
+                    connect(button[ButtonMenu], TQ_SIGNAL(released()), this, TQ_SLOT(menuButtonReleased()));
                     layout->addWidget(button[ButtonMenu]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -731,8 +731,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     }
                     button[ButtonSticky] =
                         new smoothblendButton(this, "circle.png", tip, ButtonSticky, button_size, true);
-                    connect(button[ButtonSticky], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(toggleOnAllDesktops()));
+                    connect(button[ButtonSticky], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(toggleOnAllDesktops()));
                     layout->addWidget(button[ButtonSticky]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -742,8 +742,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if ((!button[ButtonHelp]) && providesContextHelp()) {
                     button[ButtonHelp] =
                         new smoothblendButton(this, "help.png", i18n("Help"), ButtonHelp, button_size);
-                    connect(button[ButtonHelp], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(showContextHelp()));
+                    connect(button[ButtonHelp], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(showContextHelp()));
                     layout->addWidget(button[ButtonHelp]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -753,8 +753,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if ((!button[ButtonMin]) && isMinimizable())  {
                     button[ButtonMin] =
                         new smoothblendButton(this, "minimize.png", i18n("Minimize"), ButtonMin, button_size);
-                    connect(button[ButtonMin], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(minimize()));
+                    connect(button[ButtonMin], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(minimize()));
                     layout->addWidget(button[ButtonMin]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -769,8 +769,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     }
                     button[ButtonMax]  =
                         new smoothblendButton(this, "maximize.png", tip, ButtonMax, button_size, true);
-                    connect(button[ButtonMax], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(maxButtonPressed()));
+                    connect(button[ButtonMax], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(maxButtonPressed()));
                     layout->addWidget(button[ButtonMax]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -780,8 +780,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                 if ((!button[ButtonClose]) && isCloseable()) {
                     button[ButtonClose] =
                         new smoothblendButton(this, "close.png", i18n("Close"), ButtonClose, button_size);
-                    connect(button[ButtonClose], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(closeWindow()));
+                    connect(button[ButtonClose], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(closeWindow()));
                     layout->addWidget(button[ButtonClose]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -792,8 +792,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     button[ButtonAbove] =
                         new smoothblendButton(this, "keep_above.png",
                                           i18n("Keep Above Others"), ButtonAbove, button_size, true);
-                    connect(button[ButtonAbove], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(aboveButtonPressed()));
+                    connect(button[ButtonAbove], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(aboveButtonPressed()));
                     layout->addWidget(button[ButtonAbove]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -804,8 +804,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     button[ButtonBelow] =
                         new smoothblendButton(this, "keep_below.png",
                                           i18n("Keep Below Others"), ButtonBelow, button_size, true);
-                    connect(button[ButtonBelow], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(belowButtonPressed()));
+                    connect(button[ButtonBelow], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(belowButtonPressed()));
                     layout->addWidget(button[ButtonBelow]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
@@ -820,8 +820,8 @@ void smoothblendClient::addButtons(TQBoxLayout *layout, const TQString& s, int b
                     }
                     button[ButtonShade] =
                         new smoothblendButton(this, "shade.png", tip, ButtonShade, button_size, true);
-                    connect(button[ButtonShade], TQT_SIGNAL(clicked()),
-                            this, TQT_SLOT(shadeButtonPressed()));
+                    connect(button[ButtonShade], TQ_SIGNAL(clicked()),
+                            this, TQ_SLOT(shadeButtonPressed()));
                     layout->addWidget(button[ButtonShade]);
                     if (n < s.length()-1) layout->addSpacing(1);
                 }
diff --git a/twin-styles/system/systemclient.cpp b/twin-styles/system/systemclient.cpp
index f3577630..24ca3ba5 100644
--- a/twin-styles/system/systemclient.cpp
+++ b/twin-styles/system/systemclient.cpp
@@ -351,7 +351,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
               case 'X': // Close button
                   if ((!button[ButtonClose]) && isCloseable()) {
                       button[ButtonClose] = new SystemButton(this, "close", NULL, i18n("Close"));
-                      connect( button[ButtonClose], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( closeWindow() ) ) );
+                      connect( button[ButtonClose], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( closeWindow() ) ) );
                       hb->addWidget(button[ButtonClose]);
                       hb->addSpacing(1);
                   }
@@ -364,7 +364,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
                          button[ButtonSticky]->setBitmap(unsticky_bits);
                      else
                          button[ButtonSticky]->setBitmap(sticky_bits);
-                     connect( button[ButtonSticky], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( toggleOnAllDesktops() ) ) );
+                     connect( button[ButtonSticky], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( toggleOnAllDesktops() ) ) );
                      hb->addWidget(button[ButtonSticky]);
                      hb->addSpacing(1);
                   }
@@ -373,7 +373,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
               case 'I': // Minimize button
                   if ((!button[ButtonMinimize]) && isMinimizable())  {
                       button[ButtonMinimize] = new SystemButton(this, "iconify", iconify_bits, i18n("Minimize"));
-                      connect( button[ButtonMinimize], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( minimize() ) ) );
+                      connect( button[ButtonMinimize], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( minimize() ) ) );
                       hb->addWidget(button[ButtonMinimize]);
                       hb->addSpacing(1);
                   }
@@ -390,7 +390,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
                       }
                       else
                           button[ButtonMaximize] = new SystemButton(this, "maximize", maximize_bits, i18n("Maximize"));
-                      connect( button[ButtonMaximize], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( maxButtonClicked() ) ) );
+                      connect( button[ButtonMaximize], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( maxButtonClicked() ) ) );
                       hb->addWidget(button[ButtonMaximize]);
                       hb->addSpacing(1);
                   }
@@ -399,7 +399,7 @@ void SystemClient::addButtons(TQBoxLayout *hb, const TQString& s)
               case 'H': // Help button
                   if ((!button[ButtonHelp]) && providesContextHelp()) {
                       button[ButtonHelp] = new SystemButton(this, "help", question_bits, i18n("Help"));
-                      connect( button[ButtonHelp], TQT_SIGNAL( clicked() ), this, ( TQT_SLOT( showContextHelp() ) ) );
+                      connect( button[ButtonHelp], TQ_SIGNAL( clicked() ), this, ( TQ_SLOT( showContextHelp() ) ) );
                       hb->addWidget(button[ButtonHelp]);
                       hb->addSpacing(1);
                   }