Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

23 files changed, 129 insertions, 129 deletions

diff --git a/korn/accountmanager.cpp b/korn/accountmanager.cpp
index 187f79bd..5a30e56a 100644
--- a/korn/accountmanager.cpp
+++ b/korn/accountmanager.cpp
@@ -84,12 +84,12 @@ void AccountManager::readConfig( TDEConfig* config, const int index )
 		}
 		
 		//TODO: connect some stuff
-		connect( kiodrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) );
-		connect( kiodrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
-			 this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
-		connect( kiodrop, TQT_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ),
-			 this, TQT_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) );
-		connect( kiodrop, TQT_SIGNAL( validChanged( bool ) ), this, TQT_SLOT( slotValidChanged( bool ) ) );
+		connect( kiodrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) );
+		connect( kiodrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
+			 this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
+		connect( kiodrop, TQ_SIGNAL( showPassivePopup( const TQString&, const TQString& ) ),
+			 this, TQ_SLOT( slotShowPassivePopup( const TQString&, const TQString& ) ) );
+		connect( kiodrop, TQ_SIGNAL( validChanged( bool ) ), this, TQ_SLOT( slotValidChanged( bool ) ) );
 		
 		kiodrop->readGeneralConfigGroup( *masterGroup );
 		if( !kiodrop->readConfigGroup( *accountGroup ) || !kiodrop->readConfigGroup( *configmap, nproto ) )
@@ -119,9 +119,9 @@ void AccountManager::readConfig( TDEConfig* config, const int index )
 		DCOPDrop *dcopdrop = new DCOPDrop;
 		Dropinfo *info = new Dropinfo;
 		
-		connect( dcopdrop, TQT_SIGNAL( changed( int, KMailDrop* ) ), this, TQT_SLOT( slotChanged( int, KMailDrop* ) ) );
-		connect( dcopdrop, TQT_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
-			 this, TQT_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
+		connect( dcopdrop, TQ_SIGNAL( changed( int, KMailDrop* ) ), this, TQ_SLOT( slotChanged( int, KMailDrop* ) ) );
+		connect( dcopdrop, TQ_SIGNAL( showPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ),
+			 this, TQ_SLOT( slotShowPassivePopup( TQPtrList< KornMailSubject >*, int, bool, const TQString& ) ) );
 		
 		dcopdrop->readConfigGroup( *masterGroup );
 		dcopdrop->setDCOPName( *it );
diff --git a/korn/boxcontainer.cpp b/korn/boxcontainer.cpp
index d881b6c8..44e1e8ab 100644
--- a/korn/boxcontainer.cpp
+++ b/korn/boxcontainer.cpp
@@ -76,7 +76,7 @@ void BoxContainer::slotShowConfiguration()
 
 void BoxContainer::addItem( BoxContainerItem* item )
 {
-	connect( item, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( slotShowConfiguration() ) );
+	connect( item, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( slotShowConfiguration() ) );
 	_items->append( item );
 }
 
diff --git a/korn/boxcontaineritem.cpp b/korn/boxcontaineritem.cpp
index 386baaef..7575ba7c 100644
--- a/korn/boxcontaineritem.cpp
+++ b/korn/boxcontaineritem.cpp
@@ -164,7 +164,7 @@ void BoxContainerItem::runCommand( const TQString& cmd )
 	TDEProcess *process = new TDEProcess;
 	process->setUseShell( true );
 	*process << cmd;
-	connect( process, TQT_SIGNAL( processExited (TDEProcess *) ), this, TQT_SLOT( processExited( TDEProcess * ) ) );
+	connect( process, TQ_SIGNAL( processExited (TDEProcess *) ), this, TQ_SLOT( processExited( TDEProcess * ) ) );
 	process->start();
 }
 
@@ -194,21 +194,21 @@ void BoxContainerItem::mouseButtonPressed( TQt::ButtonState state )
 
 void BoxContainerItem::fillTDEPopupMenu( TDEPopupMenu* popupMenu, TDEActionCollection* actions ) const
 {
-	/*popupMenu->insertItem( i18n( "&Configure" ), this, TQT_SLOT( slotConfigure() ) );
-	popupMenu->insertItem( i18n( "&Recheck" ), this, TQT_SLOT( slotRecheck() ) );
-	popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQT_SLOT( slotReset() ) );
-	popupMenu->insertItem( i18n( "&View Emails" ), this, TQT_SLOT( slotView() ) );
-	popupMenu->insertItem( i18n( "R&un Command" ), this, TQT_SLOT( slotRunCommand() ) );*/
-	
-	(new TDEAction( i18n("&Configure"),     TDEShortcut(), this, TQT_SLOT( slotConfigure()  ), actions ))->plug( popupMenu );
-	(new TDEAction( i18n("&Recheck"),       TDEShortcut(), this, TQT_SLOT( slotRecheck()    ), actions ))->plug( popupMenu );
-	(new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQT_SLOT( slotReset()      ), actions ))->plug( popupMenu );
-	(new TDEAction( i18n("&View Emails"),   TDEShortcut(), this, TQT_SLOT( slotView()       ), actions ))->plug( popupMenu );
-	(new TDEAction( i18n("R&un Command"),   TDEShortcut(), this, TQT_SLOT( slotRunCommand() ), actions ))->plug( popupMenu );
+	/*popupMenu->insertItem( i18n( "&Configure" ), this, TQ_SLOT( slotConfigure() ) );
+	popupMenu->insertItem( i18n( "&Recheck" ), this, TQ_SLOT( slotRecheck() ) );
+	popupMenu->insertItem( i18n( "R&eset Counter" ), this, TQ_SLOT( slotReset() ) );
+	popupMenu->insertItem( i18n( "&View Emails" ), this, TQ_SLOT( slotView() ) );
+	popupMenu->insertItem( i18n( "R&un Command" ), this, TQ_SLOT( slotRunCommand() ) );*/
+	
+	(new TDEAction( i18n("&Configure"),     TDEShortcut(), this, TQ_SLOT( slotConfigure()  ), actions ))->plug( popupMenu );
+	(new TDEAction( i18n("&Recheck"),       TDEShortcut(), this, TQ_SLOT( slotRecheck()    ), actions ))->plug( popupMenu );
+	(new TDEAction( i18n("R&eset Counter"), TDEShortcut(), this, TQ_SLOT( slotReset()      ), actions ))->plug( popupMenu );
+	(new TDEAction( i18n("&View Emails"),   TDEShortcut(), this, TQ_SLOT( slotView()       ), actions ))->plug( popupMenu );
+	(new TDEAction( i18n("R&un Command"),   TDEShortcut(), this, TQ_SLOT( slotRunCommand() ), actions ))->plug( popupMenu );
 	popupMenu->insertSeparator();
-	KStdAction::help(      this, TQT_SLOT( help()      ), actions )->plug( popupMenu );
-	KStdAction::reportBug( this, TQT_SLOT( reportBug() ), actions )->plug( popupMenu );
-	KStdAction::aboutApp(  this, TQT_SLOT( about()     ), actions )->plug( popupMenu );
+	KStdAction::help(      this, TQ_SLOT( help()      ), actions )->plug( popupMenu );
+	KStdAction::reportBug( this, TQ_SLOT( reportBug() ), actions )->plug( popupMenu );
+	KStdAction::aboutApp(  this, TQ_SLOT( about()     ), actions )->plug( popupMenu );
 }
 
 void BoxContainerItem::showPassivePopup( TQWidget* parent, TQPtrList< KornMailSubject >* list, int total,
diff --git a/korn/dcopdrop.cpp b/korn/dcopdrop.cpp
index 660bc849..55edda74 100644
--- a/korn/dcopdrop.cpp
+++ b/korn/dcopdrop.cpp
@@ -106,7 +106,7 @@ TQValueVector< KornMailSubject >* DCOPDrop::doReadSubjects( bool * )
 	 * This way, the function is really asynchrone.
 	 * So, the return value arraves before any data arrives.
 	 */
-	TQTimer::singleShot( 1, this, TQT_SLOT( doReadSubjectsASync( void ) ) );
+	TQTimer::singleShot( 1, this, TQ_SLOT( doReadSubjectsASync( void ) ) );
 	
 	/*
          * A empty TQValueVector is made here.
diff --git a/korn/dockeditem.cpp b/korn/dockeditem.cpp
index b197a2d0..34b483cc 100644
--- a/korn/dockeditem.cpp
+++ b/korn/dockeditem.cpp
@@ -42,9 +42,9 @@ DockedItem::DockedItem( TQWidget * parent, const char * name )
 {
 	this->fillTDEPopupMenu( _systemtray->contextMenu(), _systemtray->actionCollection() );
 	
-	connect( _systemtray, TQT_SIGNAL( quitSelected() ), kapp, TQT_SLOT( quit() ) );
-	connect( _systemtray, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ),
-		 this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
+	connect( _systemtray, TQ_SIGNAL( quitSelected() ), kapp, TQ_SLOT( quit() ) );
+	connect( _systemtray, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ),
+		 this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
 }
 
 DockedItem::~DockedItem()
diff --git a/korn/hvitem.cpp b/korn/hvitem.cpp
index aaedb649..12954379 100644
--- a/korn/hvitem.cpp
+++ b/korn/hvitem.cpp
@@ -39,9 +39,9 @@ HVItem::HVItem( TQWidget *parent, const char *name )
 	_popup->insertTitle( kapp->miniIcon(), kapp->caption() );
 	this->fillTDEPopupMenu( _popup, _actions );
 	_popup->insertSeparator();
-	KStdAction::quit( kapp, TQT_SLOT( quit() ), _actions )->plug( _popup );
+	KStdAction::quit( kapp, TQ_SLOT( quit() ), _actions )->plug( _popup );
 	
-	connect( _label, TQT_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQT_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
+	connect( _label, TQ_SIGNAL( mouseButtonPressed( TQt::ButtonState ) ), this, TQ_SLOT( mouseButtonPressed( TQt::ButtonState ) ) );
 }
 
 HVItem::~HVItem()
diff --git a/korn/imap_proto.cpp b/korn/imap_proto.cpp
index caedb459..aae646d9 100644
--- a/korn/imap_proto.cpp
+++ b/korn/imap_proto.cpp
@@ -50,15 +50,15 @@ void Imap_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 	result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) );
 	result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "143", "port" ) );
 	result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) );
-	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ),
-	                  configDialog, TQT_SLOT( slotSSLChanged() ) );
+	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ),
+	                  configDialog, TQ_SLOT( slotSSLChanged() ) );
 	
 	result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) );
 	result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Mailbox" ), TextInput::text, "INBOX", "mailbox" ) );
 	result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) );
 	result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) );
-	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ),
-			  (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) );
+	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ),
+			  (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) );
 	result->last()->setValue( "false" );
 	result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "auth=*", "auth" ) );
 }
diff --git a/korn/keditlistboxman.cpp b/korn/keditlistboxman.cpp
index 440b2c83..a3e8b4d4 100644
--- a/korn/keditlistboxman.cpp
+++ b/korn/keditlistboxman.cpp
@@ -96,12 +96,12 @@ void KEditListBoxManager::setSubGroupName( const TQString& name )
 
 void KEditListBoxManager::init()
 {
-	connect( this, TQT_SIGNAL( changed() ), this, TQT_SLOT( slotChanged() ) );
-	connect( this, TQT_SIGNAL( added( const TQString& ) ), this, TQT_SLOT( slotAdded( const TQString& ) ) );
-	connect( this, TQT_SIGNAL( removed( const TQString& ) ), this, TQT_SLOT( slotRemoved( const TQString& ) ) );
+	connect( this, TQ_SIGNAL( changed() ), this, TQ_SLOT( slotChanged() ) );
+	connect( this, TQ_SIGNAL( added( const TQString& ) ), this, TQ_SLOT( slotAdded( const TQString& ) ) );
+	connect( this, TQ_SIGNAL( removed( const TQString& ) ), this, TQ_SLOT( slotRemoved( const TQString& ) ) );
 	
-	connect( this->listBox(), TQT_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) );
-	connect( this->listBox(), TQT_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQT_SLOT( slotActivated( TQListBoxItem * ) ) );
+	connect( this->listBox(), TQ_SIGNAL( doubleClicked( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) );
+	connect( this->listBox(), TQ_SIGNAL( returnPressed( TQListBoxItem * ) ), this, TQ_SLOT( slotActivated( TQListBoxItem * ) ) );
 }
 
 void KEditListBoxManager::readNames()
diff --git a/korn/kornaccountcfgimpl.cpp b/korn/kornaccountcfgimpl.cpp
index 439a4aea..bf1e614c 100644
--- a/korn/kornaccountcfgimpl.cpp
+++ b/korn/kornaccountcfgimpl.cpp
@@ -49,8 +49,8 @@ KornAccountCfgImpl::KornAccountCfgImpl( TQWidget * parent, const char * name )
 	_groupBoxes( 0 ),
 	_accountinput( new TQPtrList< AccountInput >() )
 {
-	connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
-	connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+	connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) );
+	connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) );
 	
 	this->cbProtocol->insertStringList( Protocols::getProtocols() );
 
diff --git a/korn/kornboxcfgimpl.cpp b/korn/kornboxcfgimpl.cpp
index 7d29e1f5..cd9cbdf3 100644
--- a/korn/kornboxcfgimpl.cpp
+++ b/korn/kornboxcfgimpl.cpp
@@ -56,13 +56,13 @@ KornBoxCfgImpl::KornBoxCfgImpl( TQWidget * parent, const char * name )
 	if( lbRight->text() == "Right" )
 		lbRight->setText( i18n( "Right" ) );
 	
-	connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
-	connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
+	connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) );
+	connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) );
 	
 	elbAccounts->setTitle( i18n( "Accounts" ) );
 
-	connect( elbAccounts, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotAccountsSwapped( int, int ) ) );
-	connect( elbAccounts, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotAccountDeleted( int ) ) );
+	connect( elbAccounts, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotAccountsSwapped( int, int ) ) );
+	connect( elbAccounts, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotAccountDeleted( int ) ) );
 }
 
 KornBoxCfgImpl::~KornBoxCfgImpl()
@@ -247,7 +247,7 @@ void KornBoxCfgImpl::slotEditBox()
 
 	_base->setMainWidget( widget );
 	
-	connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) );
+	connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) );
 
 	_group = new TDEConfigGroup( _config, TQString( "korn-%1-%2" ).
 			arg( _index ).arg(elbAccounts->listBox()->currentItem() ) );
diff --git a/korn/korncfgimpl.cpp b/korn/korncfgimpl.cpp
index c4fa1359..f0e4f983 100644
--- a/korn/korncfgimpl.cpp
+++ b/korn/korncfgimpl.cpp
@@ -47,12 +47,12 @@ KornCfgImpl::KornCfgImpl( TQWidget * parent, const char * name )
 	elbBoxes->setConfig( _config );
 	elbBoxes->setTitle( i18n( "Boxes" ) );
 	
-	connect( parent, TQT_SIGNAL( okClicked() ), this, TQT_SLOT( slotOK() ) );
-	connect( parent, TQT_SIGNAL( cancelClicked() ), this, TQT_SLOT( slotCancel() ) );
-	connect( parent, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) );
+	connect( parent, TQ_SIGNAL( okClicked() ), this, TQ_SLOT( slotOK() ) );
+	connect( parent, TQ_SIGNAL( cancelClicked() ), this, TQ_SLOT( slotCancel() ) );
+	connect( parent, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) );
 
-	connect( elbBoxes, TQT_SIGNAL( elementsSwapped( int, int ) ), this, TQT_SLOT( slotElementsSwapped( int, int ) ) );
-	connect( elbBoxes, TQT_SIGNAL( elementDeleted( int ) ), this, TQT_SLOT( slotElementDeleted( int ) ) );
+	connect( elbBoxes, TQ_SIGNAL( elementsSwapped( int, int ) ), this, TQ_SLOT( slotElementsSwapped( int, int ) ) );
+	connect( elbBoxes, TQ_SIGNAL( elementDeleted( int ) ), this, TQ_SLOT( slotElementDeleted( int ) ) );
 	
 	readConfig();
 }
@@ -74,7 +74,7 @@ void KornCfgImpl::slotEditBox()
 					     KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true );
 	KornBoxCfgImpl *widget = new KornBoxCfgImpl( _base, "Box Widget" );
 	
-	connect( _base, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogDestroyed() ) );
+	connect( _base, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogDestroyed() ) );
 	
 	_base->setMainWidget( widget );
 	widget->readConfig( _config, elbBoxes->listBox()->currentItem() );
diff --git a/korn/kornshell.cpp b/korn/kornshell.cpp
index 60c090b1..ec3c7caf 100644
--- a/korn/kornshell.cpp
+++ b/korn/kornshell.cpp
@@ -43,7 +43,7 @@ KornShell::KornShell( TQWidget * parent, const char * name )
 	if( kapp->isRestored() )
 	{
 		_config->setGroup( "korn" );
-		TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQT_SLOT(readConfig()) );
+		TQTimer::singleShot( _config->readNumEntry( "session_startup_delay", 2000 ), this, TQ_SLOT(readConfig()) );
 		kdDebug() << "startup delayed" << endl;
 	}
 	else
@@ -84,8 +84,8 @@ void KornShell::optionDlg()
 	KornCfgImpl *widget = new KornCfgImpl( _configDialog, "Configuration widget" );
 	_configDialog->setMainWidget( widget );
 	
-	connect( _configDialog, TQT_SIGNAL( finished() ), this, TQT_SLOT( slotDialogClosed() ) );
-	connect( _configDialog, TQT_SIGNAL( applyClicked() ), this, TQT_SLOT( slotApply() ) );
+	connect( _configDialog, TQ_SIGNAL( finished() ), this, TQ_SLOT( slotDialogClosed() ) );
+	connect( _configDialog, TQ_SIGNAL( applyClicked() ), this, TQ_SLOT( slotApply() ) );
 	
 	_configDialog->show();
 }
@@ -105,7 +105,7 @@ void KornShell::readConfig()
 	else
 		_box = new DockedContainer( this, "docked container" );
 
-	connect( _box, TQT_SIGNAL( showConfiguration() ), this, TQT_SLOT( optionDlg() ) );
+	connect( _box, TQ_SIGNAL( showConfiguration() ), this, TQ_SLOT( optionDlg() ) );
 			
 	_box->readConfig( _config );
 
diff --git a/korn/maildlg.cpp b/korn/maildlg.cpp
index d912c447..71db3da3 100644
--- a/korn/maildlg.cpp
+++ b/korn/maildlg.cpp
@@ -17,7 +17,7 @@ KornMailDlg::KornMailDlg( TQWidget *parent )
 	_editCtrl = new KEdit(page);
 	topLayout->addWidget(_editCtrl, 10);
 	_editCtrl->setReadOnly(true);
-	connect(this, TQT_SIGNAL(user1Clicked()), this, TQT_SLOT(showFullMessage()));
+	connect(this, TQ_SIGNAL(user1Clicked()), this, TQ_SLOT(showFullMessage()));
 	setInitialSize(TQSize(TQApplication::desktop()->width()*9/10, TQApplication::desktop()->height()/2));
 }
 
@@ -46,14 +46,14 @@ void KornMailDlg::showFullMessage()
 	tqApp->processEvents();
 
 	// connect the mailbox with the progress dialog in case it supports progress bars
-	connect(_mailDrop, TQT_SIGNAL(readMailTotalSteps(int)), _progress, TQT_SLOT(setTotalSteps(int)));
-	connect(_mailDrop, TQT_SIGNAL(readMailProgress(int)), _progress, TQT_SLOT(setProgress(int)));
+	connect(_mailDrop, TQ_SIGNAL(readMailTotalSteps(int)), _progress, TQ_SLOT(setTotalSteps(int)));
+	connect(_mailDrop, TQ_SIGNAL(readMailProgress(int)), _progress, TQ_SLOT(setProgress(int)));
 	tqApp->processEvents();
 
 	// connect the mailbox's cancel button
-	connect(_progress, TQT_SIGNAL(canceled()), this, TQT_SLOT(loadMailCanceled()));
+	connect(_progress, TQ_SIGNAL(canceled()), this, TQ_SLOT(loadMailCanceled()));
 	
-	connect(_mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*)));
+	connect(_mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*)));
 
 	// now load the mail fully
 	if( _mailDrop->synchrone() )
@@ -100,7 +100,7 @@ void KornMailDlg::deleteProgress()
 	_progress->setProgress(_progress->totalSteps());
 	_progress->hide();
 	
-	disconnect( _mailDrop, TQT_SIGNAL(readMailReady(TQString*)), this, TQT_SLOT(readMailReady(TQString*)));
+	disconnect( _mailDrop, TQ_SIGNAL(readMailReady(TQString*)), this, TQ_SLOT(readMailReady(TQString*)));
 	
 	delete _progress;
 	_progress = 0;
diff --git a/korn/maildrop.cpp b/korn/maildrop.cpp
index 2224c74e..b9747906 100644
--- a/korn/maildrop.cpp
+++ b/korn/maildrop.cpp
@@ -37,7 +37,7 @@ KMailDrop::KMailDrop()
   : _style(Plain),
     _lastCount(0)
 {
-  connect(this, TQT_SIGNAL(changed( int, KMailDrop* )), TQT_SLOT(setCount( int, KMailDrop* )));
+  connect(this, TQ_SIGNAL(changed( int, KMailDrop* )), TQ_SLOT(setCount( int, KMailDrop* )));
   
   //Set default colours; this prevents black (TQColor::invalid) boxes after creating a new box.
   _bgColour  = TQApplication::palette().active().background();
diff --git a/korn/nntp_proto.cpp b/korn/nntp_proto.cpp
index f5c59a77..645f73bc 100644
--- a/korn/nntp_proto.cpp
+++ b/korn/nntp_proto.cpp
@@ -41,8 +41,8 @@ void Nntp_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 	result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) );
 	result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) );
 	result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) );
-	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ),
-			  (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) );
+	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ),
+			  (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) );
 	result->last()->setValue( "false" );
 }
 
diff --git a/korn/pop3_proto.cpp b/korn/pop3_proto.cpp
index 732f85cf..37b44dc3 100644
--- a/korn/pop3_proto.cpp
+++ b/korn/pop3_proto.cpp
@@ -50,14 +50,14 @@ void Pop3_Protocol::configFields( TQPtrVector< TQWidget >* vector, const TQObjec
 	result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Server" ), TextInput::text, "", "server" ) );
 	result->append( new TextInput( (TQWidget*)vector->at( 0 ), i18n( "Port" ), 0, 65535, "110", "port" ) );
 	result->append( new ComboInput( (TQWidget*)vector->at( 0 ), i18n( "Encryption" ), encrList, "tls=auto", "encryption" ) );
-	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( activated( int) ),
-	                  configDialog, TQT_SLOT( slotSSLChanged() ) );
+	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( activated( int) ),
+	                  configDialog, TQ_SLOT( slotSSLChanged() ) );
 	
 	result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Username" ), TextInput::text, "", "username" ) );
 	result->append( new TextInput( (TQWidget*)vector->at( 1 ), i18n( "Password" ), TextInput::password, "", "password" ) );
 	result->append( new CheckboxInput( (TQWidget*)vector->at( 1 ), i18n( "Save password" ), "true", "savepassword" ) );
-	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQT_SIGNAL( toggled( bool ) ),
-			  (TQObject*)result->prev()->rightWidget(), TQT_SLOT( setEnabled( bool ) ) );
+	TQObject::connect( (TQObject*)result->last()->rightWidget(), TQ_SIGNAL( toggled( bool ) ),
+			  (TQObject*)result->prev()->rightWidget(), TQ_SLOT( setEnabled( bool ) ) );
 	result->last()->setValue( "false" );
 	result->append( new ComboInput( (TQWidget*)vector->at( 1 ), i18n( "Authentication" ), authList, "", "auth" ) );
 }
diff --git a/korn/subjectsdlg.cpp b/korn/subjectsdlg.cpp
index f3e4b3f4..4b10691d 100644
--- a/korn/subjectsdlg.cpp
+++ b/korn/subjectsdlg.cpp
@@ -93,14 +93,14 @@ KornSubjectsDlg::KornSubjectsDlg( TQWidget *parent )
 	_list->setItemMargin(3);
 
 	// connect the selection changed and double click events of the list view
-	connect(_list, TQT_SIGNAL(selectionChanged()), this, TQT_SLOT(listSelectionChanged()));
-	connect(_list, TQT_SIGNAL(executed(TQListViewItem *)), this, TQT_SLOT(doubleClicked(TQListViewItem *)));
+	connect(_list, TQ_SIGNAL(selectionChanged()), this, TQ_SLOT(listSelectionChanged()));
+	connect(_list, TQ_SIGNAL(executed(TQListViewItem *)), this, TQ_SLOT(doubleClicked(TQListViewItem *)));
 
 	// connect the buttons
-	connect(invertSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(invertSelection()));
-	connect(clearSelButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(removeSelection()));
-	connect(showButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(showMessage()));
-	connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteMessage()));
+	connect(invertSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(invertSelection()));
+	connect(clearSelButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(removeSelection()));
+	connect(showButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(showMessage()));
+	connect(deleteButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteMessage()));
 	setInitialSize(TQSize(TQApplication::desktop()->width(), TQApplication::desktop()->height()));
 }
 
@@ -215,7 +215,7 @@ void KornSubjectsDlg::showSubjectsDlg( const TQString& name )
 
 void KornSubjectsDlg::closeDialog( )
 {
-	disconnect( this, TQT_SIGNAL( finished() ), this, TQT_SLOT( closeDialog() ) );	
+	disconnect( this, TQ_SIGNAL( finished() ), this, TQ_SLOT( closeDialog() ) );	
 }
 
 //----------------------------
@@ -253,13 +253,13 @@ void KornSubjectsDlg::prepareStep1Subjects( KMailDrop *drop )
 	_subjects->progress->setProgress( 0 );
 	_subjects->atRechecking = true;
 	
-	connect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) );
+	connect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) );
 	drop->recheck();
 }
 
 void KornSubjectsDlg::removeStep1Subjects( KMailDrop *drop )
 {
-	disconnect( drop, TQT_SIGNAL( rechecked() ), this, TQT_SLOT( slotReloadRechecked() ) );
+	disconnect( drop, TQ_SIGNAL( rechecked() ), this, TQ_SLOT( slotReloadRechecked() ) );
 }
 
 void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop )
@@ -267,11 +267,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop )
 	_subjects->progress->setText( i18n( "Fetching messages..." ) );
 	_subjects->atRechecking = false;
 	
-	connect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) );
-	connect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) );
-	connect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) );
-	connect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) );
-	connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) );
+	connect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) );
+	connect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) );
+	connect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) );
+	connect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) );
+	connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) );
 	
 	if( _subjects->it->current()->canReadSubjects() )
 		_subjects->it->current()->readSubjects( 0 );
@@ -281,11 +281,11 @@ void KornSubjectsDlg::prepareStep2Subjects( KMailDrop *drop )
 
 void KornSubjectsDlg::removeStep2Subjects( KMailDrop *drop )
 {
-	disconnect( drop, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( subjectAvailable( KornMailSubject* ) ) );
-	disconnect( drop, TQT_SIGNAL( readSubjectsReady( bool ) ), this, TQT_SLOT( subjectsReady( bool ) ) );
-	disconnect( drop, TQT_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQT_SLOT( setNumberOfSteps( int ) ) );
-	disconnect( drop, TQT_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQT_SLOT( setProgress( int ) ) );
-	disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), drop, TQT_SLOT( readSubjectsCanceled() ) );
+	disconnect( drop, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( subjectAvailable( KornMailSubject* ) ) );
+	disconnect( drop, TQ_SIGNAL( readSubjectsReady( bool ) ), this, TQ_SLOT( subjectsReady( bool ) ) );
+	disconnect( drop, TQ_SIGNAL( readSubjectsTotalSteps( int ) ), _subjects->progress, TQ_SLOT( setNumberOfSteps( int ) ) );
+	disconnect( drop, TQ_SIGNAL( readSubjectsProgress( int ) ), _subjects->progress, TQ_SLOT( setProgress( int ) ) );
+	disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), drop, TQ_SLOT( readSubjectsCanceled() ) );
 }
 
 bool KornSubjectsDlg::makeSubjectsStruct()
@@ -299,7 +299,7 @@ bool KornSubjectsDlg::makeSubjectsStruct()
 	_subjects->progress = new DoubleProgressDialog( this, "progress" );
 	_subjects->atRechecking = true;
 	
-	connect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) );
+	connect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) );
 	
 	return true;
 }
@@ -309,7 +309,7 @@ void KornSubjectsDlg::deleteSubjectsStruct()
 	if( !_subjects )
 		return;
 
-	disconnect( _subjects->progress, TQT_SIGNAL( cancelPressed() ), this, TQT_SLOT( slotSubjectsCanceled() ) );
+	disconnect( _subjects->progress, TQ_SIGNAL( cancelPressed() ), this, TQ_SLOT( slotSubjectsCanceled() ) );
 
 	this->unsetCursor();
 	
@@ -441,12 +441,12 @@ void KornSubjectsDlg::makeDeleteStruct()
 	_delete->progress = new TQProgressDialog( this, "progress" );
 	_delete->totalNumberOfMessages = 0;
 
-	connect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) );
+	connect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) );
 }
 
 void KornSubjectsDlg::deleteDeleteStruct()
 {
-	disconnect( _delete->progress, TQT_SIGNAL( canceled() ), this, TQT_SLOT( slotDeleteCanceled() ) );
+	disconnect( _delete->progress, TQ_SIGNAL( canceled() ), this, TQ_SLOT( slotDeleteCanceled() ) );
 
 	delete _delete->messages;
 	delete _delete->ids;
@@ -487,7 +487,7 @@ void KornSubjectsDlg::deleteNextMessage()
 {
 	if( _delete->messages->count() == 0 ) //No more messages to delete
 	{
-		TQTimer::singleShot( 100, this, TQT_SLOT( reloadSubjects() ) );
+		TQTimer::singleShot( 100, this, TQ_SLOT( reloadSubjects() ) );
 		deleteDeleteStruct();
 		//reloadSubjects(); //Reload all subjects again
 		return;
@@ -499,12 +499,12 @@ void KornSubjectsDlg::deleteNextMessage()
 	fillDeleteIdList( _delete->drop );
 	
 	// Connect the progress bar signals of the mail box
-	connect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) );
-	connect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) );
-	connect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) );
+	connect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) );
+	connect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) );
+	connect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) );
 
 	// connect the cancel button of the progress bar
-	connect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) );
+	connect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) );
 
 	// delete the mails
 	_delete->drop->deleteMails( _delete->ids, 0 );
@@ -515,12 +515,12 @@ void KornSubjectsDlg::deleteMailsReady( bool /*success*/ )
 	if( !_delete )
 		return;
 	
-	disconnect( _delete->drop, TQT_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQT_SLOT( setTotalSteps( int ) ) );
-	disconnect( _delete->drop, TQT_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQT_SLOT( setProgress( int ) ) );
-	disconnect( _delete->drop, TQT_SIGNAL( deleteMailsReady( bool ) ), this, TQT_SLOT( deleteMailsReady( bool ) ) );
+	disconnect( _delete->drop, TQ_SIGNAL( deleteMailsTotalSteps( int ) ), _delete->progress, TQ_SLOT( setTotalSteps( int ) ) );
+	disconnect( _delete->drop, TQ_SIGNAL( deleteMailsProgress( int ) ), _delete->progress, TQ_SLOT( setProgress( int ) ) );
+	disconnect( _delete->drop, TQ_SIGNAL( deleteMailsReady( bool ) ), this, TQ_SLOT( deleteMailsReady( bool ) ) );
 
 	// disconnect the cancel button of the progress bar
-	disconnect( _delete->progress, TQT_SIGNAL( canceled() ), _delete->drop, TQT_SLOT( deleteMailsCanceled() ) );
+	disconnect( _delete->progress, TQ_SIGNAL( canceled() ), _delete->drop, TQ_SLOT( deleteMailsCanceled() ) );
 	
 	deleteNextMessage();
 }
diff --git a/korn/tdeio.cpp b/korn/tdeio.cpp
index faf05214..afabf5a3 100644
--- a/korn/tdeio.cpp
+++ b/korn/tdeio.cpp
@@ -466,10 +466,10 @@ bool KKioDrop::startProcess()
 
 	// only reading stdin yet
 	
-	connect( _process,TQT_SIGNAL(receivedStdout( TDEProcess *, char *, int)),
-		 this, TQT_SLOT(receivedStdout( TDEProcess *,char *,int)) );
-	connect( _process, TQT_SIGNAL(processExited(TDEProcess*)),
-		 this, TQT_SLOT(processExit(TDEProcess*)) );
+	connect( _process,TQ_SIGNAL(receivedStdout( TDEProcess *, char *, int)),
+		 this, TQ_SLOT(receivedStdout( TDEProcess *,char *,int)) );
+	connect( _process, TQ_SIGNAL(processExited(TDEProcess*)),
+		 this, TQ_SLOT(processExit(TDEProcess*)) );
 	*_process << _kurl->path();
 	_process->start( TDEProcess::NotifyOnExit, TDEProcess::Stdout );
 
diff --git a/korn/tdeio_count.cpp b/korn/tdeio_count.cpp
index 515e322b..3c35a6a4 100644
--- a/korn/tdeio_count.cpp
+++ b/korn/tdeio_count.cpp
@@ -95,9 +95,9 @@ void TDEIO_Count::count( KKioDrop *drop )
 			return;
 		}
 
-		connect( _slave, TQT_SIGNAL( error( int, const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionError( int, const TQString& ) ) );
-		connect( _slave, TQT_SIGNAL( warning( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionWarning( const TQString& ) ) );
-		connect( _slave, TQT_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQT_SLOT( slotConnectionInfoMessage( const TQString& ) ) );
+		connect( _slave, TQ_SIGNAL( error( int, const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionError( int, const TQString& ) ) );
+		connect( _slave, TQ_SIGNAL( warning( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionWarning( const TQString& ) ) );
+		connect( _slave, TQ_SIGNAL( infoMessage( const TQString& ) ), _tdeio, TQ_SLOT( slotConnectionInfoMessage( const TQString& ) ) );
 
 		/*
 		 * _protocol->recheckConnectKURL could have change kurl and metadata in order to have the right
@@ -125,9 +125,9 @@ void TDEIO_Count::count( KKioDrop *drop )
 	_job = TDEIO::listDir( kurl, false );
 	_job->addMetaData( metadata );
 
-	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-	         this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+	connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) );
+	connect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	         this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
 	if( _protocol->connectionBased() )
 		TDEIO::Scheduler::assignJobToSlave( _slave, _job );
@@ -140,9 +140,9 @@ void TDEIO_Count::stopActiveCount()
 	if( !_new_mailurls )
 		return;
 
-	disconnect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
-	disconnect( _job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-	            this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+	disconnect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) );
+	disconnect( _job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	            this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
 	TDEIO::Scheduler::cancelJob( _job );
 
@@ -175,8 +175,8 @@ void TDEIO_Count::showPassive( const TQString& id )
 
 	_subjects_pending++;
 
-	connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( addtoPassivePopup( KornMailSubject* ) ) );
-        connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) );
+	connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( addtoPassivePopup( KornMailSubject* ) ) );
+        connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( deleteSingleSubject( TDEIO_Single_Subject* ) ) );
 }
 
 void TDEIO_Count::disconnectSlave()
@@ -213,9 +213,9 @@ void TDEIO_Count::result( TDEIO::Job* job )
 		_tdeio->emitValidChanged();
 	}
 
-	disconnect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( result( TDEIO::Job* ) ) );
-	disconnect( job, TQT_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
-	            this, TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+	disconnect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( result( TDEIO::Job* ) ) );
+	disconnect( job, TQ_SIGNAL( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ),
+	            this, TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
 
 	disconnectSlave();
 
diff --git a/korn/tdeio_delete.cpp b/korn/tdeio_delete.cpp
index f26b5fe3..6b8b06fe 100644
--- a/korn/tdeio_delete.cpp
+++ b/korn/tdeio_delete.cpp
@@ -142,7 +142,7 @@ void TDEIO_Delete::deleteItem( const KornMailId *item, KURL kurl, TDEIO::MetaDat
 	else
 		return; //Unknown deleteFunction
 		
-	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
 		
 	job->addMetaData( metadata );
 	
@@ -161,7 +161,7 @@ void TDEIO_Delete::commitDelete( KURL kurl, TDEIO::MetaData metadata, const TDEI
 	
 	TDEIO::TransferJob *job = TDEIO::get( kurl, true, false );
 	job->addMetaData( metadata );
-	connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
 	
 	_jobs->append( dynamic_cast< TDEIO::Job* >( job ) );
 	
diff --git a/korn/tdeio_read.cpp b/korn/tdeio_read.cpp
index c34e7429..ee61243d 100644
--- a/korn/tdeio_read.cpp
+++ b/korn/tdeio_read.cpp
@@ -60,8 +60,8 @@ void TDEIO_Read::readMail( const KornMailId *& mailid, KKioDrop* drop )
 	_job = TDEIO::get( kurl, false, false );
 	_job->addMetaData( metadata );
 	
-	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
+	connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( _job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ), this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray & ) ) );
 }
 
 void TDEIO_Read::canceled( )
diff --git a/korn/tdeio_single_subject.cpp b/korn/tdeio_single_subject.cpp
index 3ac765de..9e3975cc 100644
--- a/korn/tdeio_single_subject.cpp
+++ b/korn/tdeio_single_subject.cpp
@@ -65,9 +65,9 @@ void TDEIO_Single_Subject::init( TDEIO::Slave *& slave)
 	_job = TDEIO::get( *_kurl, false, false );
 	_job->addMetaData( *_metadata );
 	
-	connect( _job, TQT_SIGNAL( result( TDEIO::Job* ) ), this, TQT_SLOT( slotResult( TDEIO::Job* ) ) );
-	connect( _job, TQT_SIGNAL( data         (TDEIO::Job *, const TQByteArray &) ),
-	         this, TQT_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
+	connect( _job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotResult( TDEIO::Job* ) ) );
+	connect( _job, TQ_SIGNAL( data         (TDEIO::Job *, const TQByteArray &) ),
+	         this, TQ_SLOT( slotData(TDEIO::Job *, const TQByteArray &) ) );
 	
 	if( _protocol->connectionBased( ) && slave )
 		TDEIO::Scheduler::assignJobToSlave( slave , _job );
diff --git a/korn/tdeio_subjects.cpp b/korn/tdeio_subjects.cpp
index 985a89e5..47b51458 100644
--- a/korn/tdeio_subjects.cpp
+++ b/korn/tdeio_subjects.cpp
@@ -127,8 +127,8 @@ void TDEIO_Subjects::startJob( const TQString &name, const long size )
 	
 	subject = new TDEIO_Single_Subject( this, name.latin1(), kurl, metadata, _protocol, _slave, name, size );
 	
-	connect( subject, TQT_SIGNAL( readSubject( KornMailSubject* ) ), this, TQT_SLOT( slotReadSubject( KornMailSubject* ) ) );
-	connect( subject, TQT_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQT_SLOT( slotFinished( TDEIO_Single_Subject* ) ) );
+	connect( subject, TQ_SIGNAL( readSubject( KornMailSubject* ) ), this, TQ_SLOT( slotReadSubject( KornMailSubject* ) ) );
+	connect( subject, TQ_SIGNAL( finished( TDEIO_Single_Subject* ) ), this, TQ_SLOT( slotFinished( TDEIO_Single_Subject* ) ) );
 	
 	_jobs->append( subject );
 }