Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

20 files changed, 157 insertions, 157 deletions

diff --git a/kshowmail/configelem.cpp b/kshowmail/configelem.cpp
index 4ebabed..9ac5f0f 100644
--- a/kshowmail/configelem.cpp
+++ b/kshowmail/configelem.cpp
@@ -83,7 +83,7 @@ void ConfigElem::init( )
 {
   //initialize timeout timer
   pop3Timer = new TQTimer( this );
-  connect( pop3Timer, SIGNAL( timeout() ), this, SLOT( slotTimeout() ) );
+  connect( pop3Timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotTimeout() ) );
 
   //state is idle
   state = AccountIdle;
@@ -351,7 +351,7 @@ void ConfigElem::deleteNextMail( )
 
   //start job
   startKIOJob( TQString( "/remove/%1" ).arg( *MailsToDelete.begin() ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotMailDeleted( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotMailDeleted( TDEIO::Job* ) ) );
 }
 
 void ConfigElem::slotMailDeleted( TDEIO::Job* job )
@@ -483,7 +483,7 @@ void ConfigElem::commitDeletion( )
 {
   //start job to commit
   startKIOJob( TQString( "/commit" ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotFinalizeDeletion( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotFinalizeDeletion( TDEIO::Job* ) ) );
 }
 
 unsigned int ConfigElem::getTimeoutTime( )
@@ -586,8 +586,8 @@ void ConfigElem::showNextMail( )
 
   //start job
   startKIOJob( TQString( "/download/%1" ).arg( *MailsToShow.begin() ) );
-  connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotDataMailBody( TDEIO::Job*, const TQByteArray & ) ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotBodyDownloaded( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), TQ_SLOT( slotDataMailBody( TDEIO::Job*, const TQByteArray & ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotBodyDownloaded( TDEIO::Job* ) ) );
 
 }
 
@@ -692,7 +692,7 @@ void ConfigElem::commitDownloading( )
 {
   //start job to commit
   startKIOJob( TQString( "/commit" ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotFinalizeShowMail( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotFinalizeShowMail( TDEIO::Job* ) ) );
 }
 
 void ConfigElem::refreshMailList( FilterLog* log )
@@ -744,8 +744,8 @@ void ConfigElem::getUIDs( )
 
   //start job
   startKIOJob( TQString( "/uidl" ) );
-  connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotReceiveUID( TDEIO::Job*, const TQByteArray & ) ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotUIDsReceived( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), TQ_SLOT( slotReceiveUID( TDEIO::Job*, const TQByteArray & ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotUIDsReceived( TDEIO::Job* ) ) );
 
 }
 
@@ -917,7 +917,7 @@ void ConfigElem::commitRefresh( )
 {
   //start job to commit
   startKIOJob( TQString( "/commit" ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotFinalizeRefresh( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotFinalizeRefresh( TDEIO::Job* ) ) );
 }
 
 void ConfigElem::getSizes( )
@@ -927,8 +927,8 @@ void ConfigElem::getSizes( )
 
   //start job
   startKIOJob( TQString( "/index" ) );
-  connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotReceiveSize( TDEIO::Job*, const TQByteArray & ) ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotSizesReceived( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), TQ_SLOT( slotReceiveSize( TDEIO::Job*, const TQByteArray & ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotSizesReceived( TDEIO::Job* ) ) );
 
 }
 
@@ -1055,8 +1055,8 @@ void ConfigElem::getNextHeader( )
 
   //start job
   startKIOJob( TQString( "/headers/%1" ).arg( *newMails.begin() ) );
-  connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, SLOT( slotReceiveHeader( TDEIO::Job*, const TQByteArray & ) ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotHeaderDownloaded( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), this, TQ_SLOT( slotReceiveHeader( TDEIO::Job*, const TQByteArray & ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotHeaderDownloaded( TDEIO::Job* ) ) );
 
 }
 
@@ -1490,8 +1490,8 @@ void ConfigElem::getNextMailForDownloadActions()
 
   //start job
   startKIOJob( TQString( "/download/%1" ).arg( MailsToDownload.begin().key() ) );
-  connect( pop3Job, SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), SLOT( slotDataMailBody( TDEIO::Job*, const TQByteArray & ) ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotMailDownloadedForAction( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray & ) ), TQ_SLOT( slotDataMailBody( TDEIO::Job*, const TQByteArray & ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotMailDownloadedForAction( TDEIO::Job* ) ) );
 
 }
 
@@ -1748,7 +1748,7 @@ void ConfigElem::commitBeforeRefresh()
 {
   //start job to commit
   startKIOJob( TQString( "/commit" ) );
-  connect( pop3Job, SIGNAL( result( TDEIO::Job* ) ), this, SLOT( slotCommitBeforeRefreshDone( TDEIO::Job* ) ) );
+  connect( pop3Job, TQ_SIGNAL( result( TDEIO::Job* ) ), this, TQ_SLOT( slotCommitBeforeRefreshDone( TDEIO::Job* ) ) );
 
 }
 
diff --git a/kshowmail/configlist.cpp b/kshowmail/configlist.cpp
index ae0d311..184bb48 100644
--- a/kshowmail/configlist.cpp
+++ b/kshowmail/configlist.cpp
@@ -349,12 +349,12 @@ void ConfigList::connectAccounts( )
     account->disconnect();
 
     //connect
-    connect( account, SIGNAL( sigConfigChanged() ), this, SLOT( slotAccountConfigChanged() ) );
-    connect( account, SIGNAL( sigDeleteReady( TQString ) ), this, SLOT( slotCheckDeletionState( TQString ) ) );
-    connect( account, SIGNAL( sigShowBodiesReady( TQString ) ), this, SLOT( slotCheckShowBodiesState( TQString ) ) );
-    connect( account, SIGNAL( sigMessageWindowOpened() ), this, SLOT( slotMessageWindowOpened() ) );
-    connect( account, SIGNAL( sigMessageWindowClosed() ), this, SLOT( slotMessageWindowClosed() ) );
-    connect( account, SIGNAL( sigRefreshReady( TQString ) ), this, SLOT( slotCheckRefreshState( TQString ) ) );
+    connect( account, TQ_SIGNAL( sigConfigChanged() ), this, TQ_SLOT( slotAccountConfigChanged() ) );
+    connect( account, TQ_SIGNAL( sigDeleteReady( TQString ) ), this, TQ_SLOT( slotCheckDeletionState( TQString ) ) );
+    connect( account, TQ_SIGNAL( sigShowBodiesReady( TQString ) ), this, TQ_SLOT( slotCheckShowBodiesState( TQString ) ) );
+    connect( account, TQ_SIGNAL( sigMessageWindowOpened() ), this, TQ_SLOT( slotMessageWindowOpened() ) );
+    connect( account, TQ_SIGNAL( sigMessageWindowClosed() ), this, TQ_SLOT( slotMessageWindowClosed() ) );
+    connect( account, TQ_SIGNAL( sigRefreshReady( TQString ) ), this, TQ_SLOT( slotCheckRefreshState( TQString ) ) );
 
     //get next account
     ++it;
diff --git a/kshowmail/filterlogview.cpp b/kshowmail/filterlogview.cpp
index af944ce..0384899 100644
--- a/kshowmail/filterlogview.cpp
+++ b/kshowmail/filterlogview.cpp
@@ -47,7 +47,7 @@ FilterLogView::FilterLogView( TQWidget *parent, FilterLog* log )
 
   KPushButton* btnClearDeleted = new KPushButton( KStdGuiItem::clear(), pgMain, "btnClearDeleted" );
   TQToolTip::add( btnClearDeleted, i18n( "Clear the list of deleted mails" ) );
-  connect( btnClearDeleted, SIGNAL( clicked() ), this, SLOT( slotClearDeletedMails() ) );
+  connect( btnClearDeleted, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearDeletedMails() ) );
   btnClearDeleted->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
   layMain->addWidget( btnClearDeleted );
 
@@ -76,7 +76,7 @@ FilterLogView::FilterLogView( TQWidget *parent, FilterLog* log )
 
   KPushButton* btnClearMoved = new KPushButton( KStdGuiItem::clear(), pgMain, "btnClearMoved" );
   TQToolTip::add( btnClearMoved, i18n( "Clear the list of moved mails" ) );
-  connect( btnClearMoved, SIGNAL( clicked() ), this, SLOT( slotClearMovedMails() ) );
+  connect( btnClearMoved, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotClearMovedMails() ) );
   btnClearMoved->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
   layMain->addWidget( btnClearMoved );
 
diff --git a/kshowmail/kcmconfigs/accountsetupdialog.cpp b/kshowmail/kcmconfigs/accountsetupdialog.cpp
index be1ce1a..e4d3b54 100644
--- a/kshowmail/kcmconfigs/accountsetupdialog.cpp
+++ b/kshowmail/kcmconfigs/accountsetupdialog.cpp
@@ -84,7 +84,7 @@ AccountSetupDialog::AccountSetupDialog( TQWidget* parent, TDEListView* view, Acc
 
   //radio buttons to set storage of the password
   grpPasswordStorage = new TQButtonGroup( NULL, "grpPasswordStorage" );
-  connect( grpPasswordStorage, SIGNAL( clicked( int ) ), this, SLOT( slotPasswordStorageChanged( int ) ) );
+  connect( grpPasswordStorage, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotPasswordStorageChanged( int ) ) );
 
   TQRadioButton* btnPasswordDontSave = new TQRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
   TQRadioButton* btnPasswordSaveFile = new TQRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
@@ -124,7 +124,7 @@ AccountSetupDialog::AccountSetupDialog( TQWidget* parent, TDEListView* view, Acc
 
   //radio buttons to set secure transfer
   grpSecureTransfer = new TQButtonGroup( NULL, "grpSecureTransfer" );
-  connect( grpSecureTransfer, SIGNAL( clicked( int ) ), this, SLOT( slotSecureTransferChanged ( int ) ) );
+  connect( grpSecureTransfer, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotSecureTransferChanged ( int ) ) );
 
   TQRadioButton* btnSecureTransferNone = new TQRadioButton( i18n( "None" ), gboxSecureTransfer, "btnSecureTransferNone" );
   TQRadioButton* btnSecureTransferSSL = new TQRadioButton( i18n( "SSL"), gboxSecureTransfer, "btnSecureTransferSSL" );
diff --git a/kshowmail/kcmconfigs/configaccounts.cpp b/kshowmail/kcmconfigs/configaccounts.cpp
index 327b8aa..47f7f11 100644
--- a/kshowmail/kcmconfigs/configaccounts.cpp
+++ b/kshowmail/kcmconfigs/configaccounts.cpp
@@ -44,17 +44,17 @@ ConfigAccounts::ConfigAccounts( TQWidget * parent, const char * name, const TQSt
   btnAdd = new KPushButton( KStdGuiItem::add(), this, "btnAdd" );
   layButtons->addWidget( btnAdd );
   btnAdd->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
-  connect( btnAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) );
+  connect( btnAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) );
 
   btnEdit = new KPushButton( KStdGuiItem::configure(), this, "btnEdit" );
   layButtons->addWidget( btnEdit );
   btnEdit->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
-  connect( btnEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) );
+  connect( btnEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) );
 
   btnRemove = new KPushButton( KStdGuiItem::remove(), this, "btnRemove" );
   layButtons->addWidget( btnRemove );
   btnRemove->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Maximum );
-  connect( btnRemove, SIGNAL( clicked() ), this, SLOT( slotRemove() ) );
+  connect( btnRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) );
 
   layButtons->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Minimum, TQSizePolicy::Expanding ) );
 
diff --git a/kshowmail/kcmconfigs/configactions.cpp b/kshowmail/kcmconfigs/configactions.cpp
index dccc8cd..4b41314 100644
--- a/kshowmail/kcmconfigs/configactions.cpp
+++ b/kshowmail/kcmconfigs/configactions.cpp
@@ -88,27 +88,27 @@ ConfigActions::ConfigActions( TQWidget * parent, const char * name, const TQStri
   TQToolTip::add( chkNoNewMailsTerminate, i18n( "Terminate kshowmail if no new mail" ) );
 
   //connect file choose buttons
-  connect( btnNewMailsChooseSound, SIGNAL( clicked() ), this, SLOT( slotChooseSound() ) );
-  connect( btnNewMailsChooseCommand, SIGNAL( clicked() ), this, SLOT( slotChooseCommand() ) );
+  connect( btnNewMailsChooseSound, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChooseSound() ) );
+  connect( btnNewMailsChooseCommand, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChooseCommand() ) );
 
   //connect test buttons
-  connect( btnNewMailsPlaySound, SIGNAL( clicked() ), this, SLOT( slotPlaySound() ) );
-  connect( btnNewMailsExecCommand, SIGNAL( clicked() ), this, SLOT( slotExecuteCommand() ) );
+  connect( btnNewMailsPlaySound, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotPlaySound() ) );
+  connect( btnNewMailsExecCommand, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotExecuteCommand() ) );
 
   //connect sound and command check boxes to enable or disable the configuration items
-  connect( chkNewMailsSound, SIGNAL( toggled( bool ) ), this, SLOT( slotSoundToggled( bool ) ) );
-  connect( chkNewMailsCommand, SIGNAL( toggled( bool ) ), this, SLOT( slotCommandToggled( bool ) ) );
+  connect( chkNewMailsSound, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotSoundToggled( bool ) ) );
+  connect( chkNewMailsCommand, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotCommandToggled( bool ) ) );
 
   //connect all configuration items with slot changed() to notify the dialog about changes
-  connect( chkNewMailsAlertWindow, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkNewMailsMainWindow, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkNewMailsBeep, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkNewMailsSound, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkNewMailsCommand, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( txtNewMailsSound, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotChanged() ) );
-  connect( txtNewMailsCommand, SIGNAL( textChanged( const TQString& ) ), this, SLOT( slotChanged() ) );
-  connect( chkNoNewMailsMinimize, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkNoNewMailsTerminate, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
+  connect( chkNewMailsAlertWindow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkNewMailsMainWindow, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkNewMailsBeep, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkNewMailsSound, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkNewMailsCommand, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( txtNewMailsSound, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( txtNewMailsCommand, TQ_SIGNAL( textChanged( const TQString& ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkNoNewMailsMinimize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkNoNewMailsTerminate, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
 
 
diff --git a/kshowmail/kcmconfigs/configdisplay.cpp b/kshowmail/kcmconfigs/configdisplay.cpp
index 4aa22d5..abcd1d6 100644
--- a/kshowmail/kcmconfigs/configdisplay.cpp
+++ b/kshowmail/kcmconfigs/configdisplay.cpp
@@ -108,22 +108,22 @@ ConfigDisplay::ConfigDisplay( TQWidget * parent, const char * name, const TQStri
   layMessageContent->addWidget( chkAllowHTML, 0, 0 );
 
   //connect all configuration itmes with slot changed() to notify the dialog about changes
-  connect( chkAccountlistActive, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkAccountlistAccount, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkAccountlistServer, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkAccountlistUser, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkAccountlistMessages, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkAccountlistSize, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistNumber, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistAccount, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistFrom, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistTo, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistSubject, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistDate, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistSize, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistContent, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMessagelistState, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkAllowHTML, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
+  connect( chkAccountlistActive, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkAccountlistAccount, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkAccountlistServer, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkAccountlistUser, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkAccountlistMessages, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkAccountlistSize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistNumber, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistAccount, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistFrom, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistTo, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistSubject, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistDate, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistSize, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistContent, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMessagelistState, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkAllowHTML, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
 
   //get application config object (kshowmailrc)
diff --git a/kshowmail/kcmconfigs/configfilter.cpp b/kshowmail/kcmconfigs/configfilter.cpp
index 708898c..1384d0d 100644
--- a/kshowmail/kcmconfigs/configfilter.cpp
+++ b/kshowmail/kcmconfigs/configfilter.cpp
@@ -33,8 +33,8 @@ ConfigFilter::ConfigFilter( TQWidget * parent, const char * name, const TQString
   chkActivateFilter = new TQCheckBox( i18n( "Activate Filter" ), this, "chkActivateFilter" );
   layMain->addWidget( chkActivateFilter );
   TQToolTip::add( chkActivateFilter, i18n( "Check to activate the header filter." ) );
-  connect( chkActivateFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotFilterActiveToggled( bool ) ) );
-  connect( chkActivateFilter, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
+  connect( chkActivateFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotFilterActiveToggled( bool ) ) );
+  connect( chkActivateFilter, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
 
   //GUI of sender lists
   //-------------------
@@ -47,14 +47,14 @@ ConfigFilter::ConfigFilter( TQWidget * parent, const char * name, const TQString
   laySender->addWidget( btnOpenWhitelist );
   laySender->setStretchFactor( btnOpenWhitelist, 3 );
   btnOpenWhitelist->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
-  connect( btnOpenWhitelist, SIGNAL( clicked() ), this, SLOT( slotOpenWhitelist() ) );
+  connect( btnOpenWhitelist, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenWhitelist() ) );
 
   btnOpenBlacklist = new KPushButton( KGuiItem( TQString( i18n( "Blacklist" ) ), TQString( "mail_delete" ) ), gboxSenderLists, "btnOpenBlacklist" );
   TQToolTip::add( btnOpenBlacklist, i18n( "Click here to edit the list of senders whose mails shall be deleted or marked." ) );
   laySender->addWidget( btnOpenBlacklist );
   laySender->setStretchFactor( btnOpenBlacklist, 3 );
   btnOpenBlacklist->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
-  connect( btnOpenBlacklist, SIGNAL( clicked() ), this, SLOT( slotOpenBlacklist() ) );
+  connect( btnOpenBlacklist, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenBlacklist() ) );
 
   laySender->insertStretch( 0, 2 );
   laySender->insertStretch( 2, 2 );
@@ -102,13 +102,13 @@ ConfigFilter::ConfigFilter( TQWidget * parent, const char * name, const TQString
   layFiltersButtons->addWidget( btnMoveUp );
   layFiltersButtons->addWidget( btnMoveDown );
   layFiltersButtons->addWidget( btnMoveBottom );
-  connect( btnAdd, SIGNAL( clicked() ), this, SLOT( slotAdd() ) );
-  connect( btnEdit, SIGNAL( clicked() ), this, SLOT( slotEdit() ) );
-  connect( btnRemove, SIGNAL( clicked() ), this, SLOT( slotRemove() ) );
-  connect( btnMoveTop, SIGNAL( clicked() ), this, SLOT( slotMoveTop() ) );
-  connect( btnMoveBottom, SIGNAL( clicked() ), this, SLOT( slotMoveBottom() ) );
-  connect( btnMoveUp, SIGNAL( clicked() ), this, SLOT( slotMoveUp() ) );
-  connect( btnMoveDown, SIGNAL( clicked() ), this, SLOT( slotMoveDown() ) );
+  connect( btnAdd, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAdd() ) );
+  connect( btnEdit, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotEdit() ) );
+  connect( btnRemove, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemove() ) );
+  connect( btnMoveTop, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveTop() ) );
+  connect( btnMoveBottom, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveBottom() ) );
+  connect( btnMoveUp, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveUp() ) );
+  connect( btnMoveDown, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotMoveDown() ) );
 
 
   //GUI of Others
@@ -121,8 +121,8 @@ ConfigFilter::ConfigFilter( TQWidget * parent, const char * name, const TQString
   cmbActionOthers = new KComboBox( gboxOthers, "cmbActionOthers" );
   layOthers->addWidget( cmbActionOthers );
   TQToolTip::add( cmbActionOthers, i18n( "Choose the action for all mails which are not filtered by the steps before." ) );
-  connect( cmbActionOthers, SIGNAL( activated( int ) ), this, SLOT( slotOtherActionChanged( int ) ) );
-  connect( cmbActionOthers, SIGNAL( activated( int ) ), this, SLOT( slotChanged() ) );
+  connect( cmbActionOthers, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotOtherActionChanged( int ) ) );
+  connect( cmbActionOthers, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   //insert items
   cmbActionOthers->insertItem( i18n( "Show" ), ID_COMBO_FILTER_OTHERS_ACTION_PASS );
@@ -135,13 +135,13 @@ ConfigFilter::ConfigFilter( TQWidget * parent, const char * name, const TQString
   //create edit line to defined the mailbox for move
   txtMailbox = new KLineEdit( gboxOthers );
   layOthers->addWidget( txtMailbox );
-  connect( txtMailbox, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotChanged() ) );
+  connect( txtMailbox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 
   //create wizard button to configure mailbox
   btnMailboxWizard= new KPushButton( KGuiItem( TQString::null, "wizard" ), gboxOthers );
   layOthers->addWidget( btnMailboxWizard );
   TQToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
-  connect( btnMailboxWizard, SIGNAL( clicked() ), this, SLOT( slotOpenMailBoxWizard() ) );
+  connect( btnMailboxWizard, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenMailBoxWizard() ) );
 
   //set defaults
   switch( DEFAULT_FILTER_OTHERS_ACTION )
diff --git a/kshowmail/kcmconfigs/configgeneral.cpp b/kshowmail/kcmconfigs/configgeneral.cpp
index 0b79257..b96d0a0 100644
--- a/kshowmail/kcmconfigs/configgeneral.cpp
+++ b/kshowmail/kcmconfigs/configgeneral.cpp
@@ -98,16 +98,16 @@ ConfigGeneral::ConfigGeneral( TQWidget * parent, const char * name, const TQStri
 
 
   //connect all configuration itmes with slot changed() to notify the dialog about changes
-  connect( chkConfirmClose, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkConfirmDelete, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkStartMinimized, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkCloseToTray, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkMinimizeToTray, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkShowConnectionErrors, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkKeepNew, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( spbInitial, SIGNAL( valueChanged( int ) ), this, SLOT( slotChanged() ) );
-  connect( spbInterval, SIGNAL( valueChanged( int ) ), this, SLOT( slotChanged() ) );
-  connect( spbTimeout, SIGNAL( valueChanged( int ) ), this, SLOT( slotChanged() ) );
+  connect( chkConfirmClose, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkConfirmDelete, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkStartMinimized, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkCloseToTray, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkMinimizeToTray, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkShowConnectionErrors, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkKeepNew, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( spbInitial, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( spbInterval, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( spbTimeout, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChanged() ) );
 
 
   //get application config object (kshowmailrc)
diff --git a/kshowmail/kcmconfigs/configlog.cpp b/kshowmail/kcmconfigs/configlog.cpp
index 4f28464..54bf579 100644
--- a/kshowmail/kcmconfigs/configlog.cpp
+++ b/kshowmail/kcmconfigs/configlog.cpp
@@ -34,15 +34,15 @@ ConfigLog::ConfigLog( TQWidget * parent, const char * name, const TQStringList &
   chkLogDeletedMails = new TQCheckBox( i18n( "Log mails deleted by filter" ), this, "chkLogDeletedMails" );
   layDelMails->addWidget( chkLogDeletedMails );
   TQToolTip::add( chkLogDeletedMails, i18n( "Check to activate the log of mails deleted by filter." ) );
-  connect( chkLogDeletedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkLogDeletedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChangeItems() ) );
+  connect( chkLogDeletedMails, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkLogDeletedMails, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChangeItems() ) );
 
   TQVBoxLayout* layDelMailsConfig = new TQVBoxLayout( layDelMails, 10, "layDelMailsConfig" );
   layDelMailsConfig->setMargin( 10 );
 
   grpDelMailsRemove = new TQButtonGroup( NULL, "grpDelMailsRemove" );
-  connect( grpDelMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChanged() ) );
-  connect( grpDelMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChangeItems() ) );
+  connect( grpDelMailsRemove, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( grpDelMailsRemove, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChangeItems() ) );
   btnDelMailsRemoveExit = new TQRadioButton( i18n( "Remove log entries at exit" ), this, "btnDelMailsRemoveExit" );
   grpDelMailsRemove->insert( btnDelMailsRemoveExit, ID_BUTTON_REMOVE_AT_EXIT );
   layDelMailsConfig->addWidget( btnDelMailsRemoveExit );
@@ -53,8 +53,8 @@ ConfigLog::ConfigLog( TQWidget * parent, const char * name, const TQStringList &
   grpDelMailsRemove->insert( btnDelMailsRemoveDays, ID_BUTTON_REMOVE_AFTER_DAYS );
   layDelMailsConfigDays->addWidget( btnDelMailsRemoveDays );
   spbDelDays = new TQSpinBox( 1, 999999, 1, this, "spbDelDays" );
-  connect( spbDelDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChanged() ) );
-  connect( spbDelDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChangeItems() ) );
+  connect( spbDelDays, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( spbDelDays, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChangeItems() ) );
   spbDelDays->setSuffix( i18n( " Days" ) );
   spbDelDays->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
   layDelMailsConfigDays->addWidget( spbDelDays );
@@ -66,15 +66,15 @@ ConfigLog::ConfigLog( TQWidget * parent, const char * name, const TQStringList &
   chkLogMovedMails = new TQCheckBox( i18n( "Log mails moved by filter" ), this, "chkLogMovedMails" );
   layMovMails->addWidget( chkLogMovedMails );
   TQToolTip::add( chkLogMovedMails, i18n( "Check to activate the log of mails moved by filter." ) );
-  connect( chkLogMovedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChanged() ) );
-  connect( chkLogMovedMails, SIGNAL( toggled( bool ) ), this, SLOT( slotChangeItems() ) );
+  connect( chkLogMovedMails, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( chkLogMovedMails, TQ_SIGNAL( toggled( bool ) ), this, TQ_SLOT( slotChangeItems() ) );
 
   TQVBoxLayout* layMovMailsConfig = new TQVBoxLayout( layMovMails, 10, "layMovMailsConfig" );
   layMovMailsConfig->setMargin( 10 );
 
   grpMovMailsRemove = new TQButtonGroup( NULL, "grpMovMailsRemove" );
-  connect( grpMovMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChanged() ) );
-  connect( grpMovMailsRemove, SIGNAL( clicked( int ) ), this, SLOT( slotChangeItems() ) );
+  connect( grpMovMailsRemove, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( grpMovMailsRemove, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotChangeItems() ) );
   btnMovMailsRemoveExit = new TQRadioButton( i18n( "Remove log entries at exit" ), this, "btnMovMailsRemoveExit" );
   grpMovMailsRemove->insert( btnMovMailsRemoveExit, ID_BUTTON_REMOVE_AT_EXIT );
   layMovMailsConfig->addWidget( btnMovMailsRemoveExit );
@@ -85,8 +85,8 @@ ConfigLog::ConfigLog( TQWidget * parent, const char * name, const TQStringList &
   grpMovMailsRemove->insert( btnMovMailsRemoveDays, ID_BUTTON_REMOVE_AFTER_DAYS );
   layMovMailsConfigDays->addWidget( btnMovMailsRemoveDays );
   spbMovDays = new TQSpinBox( 1, 999999, 1, this, "spbMovDays" );
-  connect( spbMovDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChanged() ) );
-  connect( spbMovDays, SIGNAL( valueChanged( int ) ), this, SLOT( slotChangeItems() ) );
+  connect( spbMovDays, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChanged() ) );
+  connect( spbMovDays, TQ_SIGNAL( valueChanged( int ) ), this, TQ_SLOT( slotChangeItems() ) );
   spbMovDays->setSuffix( i18n( " Days" ) );
   spbMovDays->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Minimum );
   layMovMailsConfigDays->addWidget( spbMovDays );
diff --git a/kshowmail/kcmconfigs/configspamcheck.cpp b/kshowmail/kcmconfigs/configspamcheck.cpp
index 0b4d11e..7d23719 100644
--- a/kshowmail/kcmconfigs/configspamcheck.cpp
+++ b/kshowmail/kcmconfigs/configspamcheck.cpp
@@ -42,7 +42,7 @@ ConfigSpamcheck::ConfigSpamcheck(TQWidget * parent, const char * name, const TQS
   btnTest = new KPushButton( KStdGuiItem::test(), this, "btnTest" );
   btnTest->setSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Maximum );
   layMain->addWidget( btnTest );
-  connect( btnTest, SIGNAL( clicked() ), this, SLOT( slotTestSpamAssassin() ) );
+  connect( btnTest, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotTestSpamAssassin() ) );
 
   //action
   gboxAction = new TQGroupBox( 0, TQt::Horizontal, i18n( "Action for Spam" ), this, "gboxAction" );
@@ -52,8 +52,8 @@ ConfigSpamcheck::ConfigSpamcheck(TQWidget * parent, const char * name, const TQS
   cmbAction = new KComboBox( gboxAction, "cmbAction" );
   layAction->addWidget( cmbAction );
   TQToolTip::add( cmbAction, i18n( "Choose the action for spam mails." ) );
-  connect( cmbAction, SIGNAL( activated( int ) ), this, SLOT( slotActionChanged( int ) ) );
-  connect( cmbAction, SIGNAL( activated( int ) ), this, SLOT( slotChanged() ) );
+  connect( cmbAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActionChanged( int ) ) );
+  connect( cmbAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotChanged() ) );
 
   //insert items
   cmbAction->insertItem( i18n( "Delete" ), ID_SPAM_ACTION_BUTTONS_DELETE );
@@ -63,13 +63,13 @@ ConfigSpamcheck::ConfigSpamcheck(TQWidget * parent, const char * name, const TQS
   //create edit line to defined the mailbox for move
   txtMailbox = new KLineEdit( gboxAction );
   layAction->addWidget( txtMailbox );
-  connect( txtMailbox, SIGNAL( textChanged( const TQString & ) ), this, SLOT( slotChanged() ) );
+  connect( txtMailbox, TQ_SIGNAL( textChanged( const TQString & ) ), this, TQ_SLOT( slotChanged() ) );
 
   //create wizard button to configure mailbox
   btnMailboxWizard= new KPushButton( KGuiItem( TQString::null, "wizard" ), gboxAction );
   layAction->addWidget( btnMailboxWizard );
   TQToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
-  connect( btnMailboxWizard, SIGNAL( clicked() ), this, SLOT( slotOpenMailBoxWizard() ) );
+  connect( btnMailboxWizard, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenMailBoxWizard() ) );
 
   //set defaults
   switch( DEFAULT_SPAMCHECK_ACTION )
diff --git a/kshowmail/kcmconfigs/filtercriteriawidget.cpp b/kshowmail/kcmconfigs/filtercriteriawidget.cpp
index ae4709c..ac724f6 100644
--- a/kshowmail/kcmconfigs/filtercriteriawidget.cpp
+++ b/kshowmail/kcmconfigs/filtercriteriawidget.cpp
@@ -30,7 +30,7 @@ FilterCriteriaWidget::FilterCriteriaWidget( TQWidget *parent, const char *name )
   cmbSource->insertItem( i18n( "Header" ), ID_COMBO_SOURCE_HEADER );
   cmbSource->insertItem( i18n( "Account" ), ID_COMBO_SOURCE_ACCOUNT );
   layLine1->addWidget( cmbSource );
-  connect( cmbSource, SIGNAL( activated( int ) ), this, SLOT( slotSetWidgets() ) );
+  connect( cmbSource, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotSetWidgets() ) );
 
   switch( DEFAULT_FILTER_CRITERIA_SOURCE )
   {
@@ -52,7 +52,7 @@ FilterCriteriaWidget::FilterCriteriaWidget( TQWidget *parent, const char *name )
   cmbConditionText->insertItem( i18n( "matches regular expression" ), ID_COMBO_COND_TEXT_REGEXPR );
   cmbConditionText->insertItem( i18n( "does not match reg. expr." ), ID_COMBO_COND_TEXT_NOT_REGEXPR );
   layLine1->addWidget( cmbConditionText );
-  connect( cmbConditionText, SIGNAL( activated( int ) ), this, SLOT( slotSetWidgets() ) );
+  connect( cmbConditionText, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotSetWidgets() ) );
 
   switch( DEFAULT_FILTER_CRITERIA_COND_TEXT )
   {
@@ -98,7 +98,7 @@ FilterCriteriaWidget::FilterCriteriaWidget( TQWidget *parent, const char *name )
   //Button to open the regular expression editor
   btnOpenRegExpEditor = new KPushButton( KGuiItem( "", "edit", "Edit Regualar Expression" ), this, "btnOpenRegExpEditor" );
   layLine1->addWidget( btnOpenRegExpEditor );
-  connect( btnOpenRegExpEditor, SIGNAL( clicked() ), this, SLOT( slotOpenRegExpEditor() ) );
+  connect( btnOpenRegExpEditor, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenRegExpEditor() ) );
 
   //check whether the KRegExpEditor is available
   kRegExpEditorAvailable = !TDETrader::self()->query( "KRegExpEditor/KRegExpEditor" ).isEmpty();
diff --git a/kshowmail/kcmconfigs/filtersetupdialog.cpp b/kshowmail/kcmconfigs/filtersetupdialog.cpp
index 7b5c297..69fa0db 100644
--- a/kshowmail/kcmconfigs/filtersetupdialog.cpp
+++ b/kshowmail/kcmconfigs/filtersetupdialog.cpp
@@ -77,14 +77,14 @@ FilterSetupDialog::FilterSetupDialog( TQWidget* parent, FilterSetupItem* item )
   layButtons->addWidget( btnAddCriteria );
   layButtons->addWidget( btnRemoveCriteria );
   layButtons->addStretch();
-  connect( btnAddCriteria, SIGNAL( clicked() ), this, SLOT( slotAddCriteriaWidget() ) );
-  connect( btnRemoveCriteria, SIGNAL( clicked() ), this, SLOT( slotRemoveCriteriaWidget() ) );
+  connect( btnAddCriteria, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotAddCriteriaWidget() ) );
+  connect( btnRemoveCriteria, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotRemoveCriteriaWidget() ) );
 
   //create combobox to select action
   cmbAction = new KComboBox( gboxAction, "cmbAction" );
   layAction->addWidget( cmbAction );
   TQToolTip::add( cmbAction, i18n( "Choose the action for all mails which are filtered by this filter." ) );
-  connect( cmbAction, SIGNAL( activated( int ) ), this, SLOT( slotActionChanged( int ) ) );
+  connect( cmbAction, TQ_SIGNAL( activated( int ) ), this, TQ_SLOT( slotActionChanged( int ) ) );
 
   //insert items
   cmbAction->insertItem( i18n( "Show" ), ID_COMBO_FILTER_ACTION_PASS );
@@ -102,7 +102,7 @@ FilterSetupDialog::FilterSetupDialog( TQWidget* parent, FilterSetupItem* item )
   btnMailboxWizard= new KPushButton( KGuiItem( TQString::null, "wizard" ), gboxAction );
   layAction->addWidget( btnMailboxWizard );
   TQToolTip::add( btnMailboxWizard, i18n( "Choose the mailbox" ) );
-  connect( btnMailboxWizard, SIGNAL( clicked() ), this, SLOT( slotOpenMailBoxWizard() ) );
+  connect( btnMailboxWizard, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenMailBoxWizard() ) );
 
   //set default action
   switch( DEFAULT_FILTER_ACTION )
diff --git a/kshowmail/kcmconfigs/mailboxwizard.cpp b/kshowmail/kcmconfigs/mailboxwizard.cpp
index 6c8a2b9..a64f1ad 100644
--- a/kshowmail/kcmconfigs/mailboxwizard.cpp
+++ b/kshowmail/kcmconfigs/mailboxwizard.cpp
@@ -27,7 +27,7 @@ MailBoxWizard::MailBoxWizard( TQWidget* parent, const char* name )
   btnMailDir = new KPushButton( KGuiItem( TQString(), TQString( "folder" ), i18n( "Press to choose the mail directory" ), i18n( "Press to choose the mail directory" ) ), page1, "btnMailDir" );
   btnMailDir->setSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed );
   layMain1->addWidget( btnMailDir );
-  connect( btnMailDir, SIGNAL( clicked() ), this, SLOT( slotOpenDirDialog() ) );
+  connect( btnMailDir, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotOpenDirDialog() ) );
 
   title1 = i18n( "Please choose the path to the mailboxes.\nKShowmail supports only MailDir boxes." );
   addPage( page1, title1 );
@@ -48,7 +48,7 @@ MailBoxWizard::MailBoxWizard( TQWidget* parent, const char* name )
   addPage( page2, title2 );
   setFinishEnabled( page2, true );
 
-  connect( this, SIGNAL( selected( const TQString& ) ), this, SLOT( slotPageChanged( const TQString& ) ) );
+  connect( this, TQ_SIGNAL( selected( const TQString& ) ), this, TQ_SLOT( slotPageChanged( const TQString& ) ) );
 }
 
 
diff --git a/kshowmail/kcmconfigs/senderlistdialog.cpp b/kshowmail/kcmconfigs/senderlistdialog.cpp
index 9406bac..1e21f40 100644
--- a/kshowmail/kcmconfigs/senderlistdialog.cpp
+++ b/kshowmail/kcmconfigs/senderlistdialog.cpp
@@ -44,8 +44,8 @@ SenderListDialog::SenderListDialog(TQWidget *parent, ListType list, const char *
 
   layMain->addWidget( editFrame );
 
-  connect( editFrame->addButton(), SIGNAL( clicked() ), this, SLOT( slotSort() ) );
-  connect( editFrame->lineEdit(), SIGNAL( returnPressed( const TQString & ) ), this, SLOT( slotSort() ) );
+  connect( editFrame->addButton(), TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSort() ) );
+  connect( editFrame->lineEdit(), TQ_SIGNAL( returnPressed( const TQString & ) ), this, TQ_SLOT( slotSort() ) );
 
   //this radio buttons we just need in the blacklist
   if( list == Black )
diff --git a/kshowmail/kfeedback.cpp b/kshowmail/kfeedback.cpp
index af1c0eb..2041413 100644
--- a/kshowmail/kfeedback.cpp
+++ b/kshowmail/kfeedback.cpp
@@ -47,17 +47,17 @@ KFeedbackDialog::KFeedbackDialog( const TQString & feedbackMailAddress, const TQ
     layout->addWidget( _form );
     checkSendButton();
 
-    connect( this,  SIGNAL( applyClicked() ),
-	     _form, SLOT  ( sendMail()  ) );
+    connect( this,  TQ_SIGNAL( applyClicked() ),
+	     _form, TQ_SLOT  ( sendMail()  ) );
 
-    connect( _form, SIGNAL( mailSent() 	),
-	     this,  SLOT  ( hide()	) );
+    connect( _form, TQ_SIGNAL( mailSent() 	),
+	     this,  TQ_SLOT  ( hide()	) );
 
-    connect( _form, SIGNAL( mailSent()	),
-	     this,  SIGNAL( mailSent()  ) );
+    connect( _form, TQ_SIGNAL( mailSent()	),
+	     this,  TQ_SIGNAL( mailSent()  ) );
 
-    connect( _form, SIGNAL( checkComplete()   ),
-	     this,  SLOT  ( checkSendButton() ) );
+    connect( _form, TQ_SIGNAL( checkComplete()   ),
+	     this,  TQ_SLOT  ( checkSendButton() ) );
 }
 
 
@@ -98,8 +98,8 @@ KFeedbackForm::KFeedbackForm( const TQString &	feedbackMailAddress,
     _questionList = new KFeedbackQuestionList( this );
     TQ_CHECK_PTR( _questionList );
 
-    connect( _questionList, SIGNAL( checkComplete()     ),
-	     this,	    SLOT  ( slotCheckComplete() ) );
+    connect( _questionList, TQ_SIGNAL( checkComplete()     ),
+	     this,	    TQ_SLOT  ( slotCheckComplete() ) );
 
 
     //
diff --git a/kshowmail/kshowmail.cpp b/kshowmail/kshowmail.cpp
index 780f7f4..ce59f69 100644
--- a/kshowmail/kshowmail.cpp
+++ b/kshowmail/kshowmail.cpp
@@ -60,16 +60,16 @@ KShowMailApp::KShowMailApp()
 
   //connect signals with slots
 
-  connect (m_pDockWindow, SIGNAL (quitSelected ()), SLOT (slotForceClose ()));
-  connect (m_pTimer, SIGNAL (timeout ()), SLOT (slotRefresh ()));
-  connect (m_pView->m_pListAccounts, SIGNAL (currentChanged(TQListViewItem*)), SLOT(slotAccountActivated(TQListViewItem*)));
-  connect (m_pView, SIGNAL (signalActiveChanged()), SLOT (slotRefreshView()));
+  connect (m_pDockWindow, TQ_SIGNAL (quitSelected ()), TQ_SLOT (slotForceClose ()));
+  connect (m_pTimer, TQ_SIGNAL (timeout ()), TQ_SLOT (slotRefresh ()));
+  connect (m_pView->m_pListAccounts, TQ_SIGNAL (currentChanged(TQListViewItem*)), TQ_SLOT(slotAccountActivated(TQListViewItem*)));
+  connect (m_pView, TQ_SIGNAL (signalActiveChanged()), TQ_SLOT (slotRefreshView()));
 
-  connect( &m_ConfigList, SIGNAL( sigDeleteReady() ), this, SLOT( slotDeletionReady() ) );
-  connect( &m_ConfigList, SIGNAL( sigShowBodiesReady() ), this, SLOT( slotShowMessageReady() ) );
-  connect( &m_ConfigList, SIGNAL( sigMessageWindowOpened() ), this, SLOT( slotNormalCursor() ) );
-  connect( &m_ConfigList, SIGNAL( sigAllMessageWindowsClosed() ), this, SLOT( slotWaitingCursor() ) );
-  connect( &m_ConfigList, SIGNAL( sigRefreshReady() ), this, SLOT( slotRefreshReady() ) );
+  connect( &m_ConfigList, TQ_SIGNAL( sigDeleteReady() ), this, TQ_SLOT( slotDeletionReady() ) );
+  connect( &m_ConfigList, TQ_SIGNAL( sigShowBodiesReady() ), this, TQ_SLOT( slotShowMessageReady() ) );
+  connect( &m_ConfigList, TQ_SIGNAL( sigMessageWindowOpened() ), this, TQ_SLOT( slotNormalCursor() ) );
+  connect( &m_ConfigList, TQ_SIGNAL( sigAllMessageWindowsClosed() ), this, TQ_SLOT( slotWaitingCursor() ) );
+  connect( &m_ConfigList, TQ_SIGNAL( sigRefreshReady() ), this, TQ_SLOT( slotRefreshReady() ) );
 
   //show welcome message
   KMessageBox::information( NULL, i18n( "Thank You for using KShowmail.\nPlease use the feedback dialog to tell us your experience with this program." ), i18n("Welcome"), "WelcomeMessage" );
@@ -126,31 +126,31 @@ void KShowMailApp::timerEvent (TQTimerEvent *)
 void KShowMailApp::initActions ()
 {
   // file menu
-  KStdAction::quit( this, SLOT( slotFileQuit() ), actionCollection() );
+  KStdAction::quit( this, TQ_SLOT( slotFileQuit() ), actionCollection() );
 
   // action menu
-  m_actionRefresh = new TDEAction( i18n( "&Refresh messages" ), "reload", Key_F5, this, SLOT( slotRefresh() ), actionCollection(), "refresh" );
-  new TDEAction( i18n( "Show &header of highlighted messages" ), "letter-closed", Key_F2, this, SLOT( slotShowHeader() ), actionCollection(), "show_header" );
-  new TDEAction( i18n( "Show &complete highlighted messages" ), "letter-open", Key_F3, this, SLOT( slotShowMessage() ), actionCollection(), "show_complete" );
-  new TDEAction( i18n( "&Delete highlighted messages" ), "eraser", Key_Delete, this, SLOT( slotDelete() ), actionCollection(), "delete" );
-  new TDEAction( i18n( "S&top current transfer" ), "process-stop", 0, this, SLOT( slotStop() ), actionCollection(), "stop" );
-  new TDEAction( i18n( "Show Filter Log" ), "text-x-log", Key_F4, this, SLOT( slotShowFilterLog() ), actionCollection(), "show_filterlog" );
-  new TDEAction( i18n( "Add sender to whitelist" ), "add_user", 0, this, SLOT( slotAddToWhitelist() ), actionCollection(), "addWhitelist" );
-  new TDEAction( i18n( "Add sender to blacklist" ), "delete_user", 0, this, SLOT( slotAddToBlacklist() ), actionCollection(), "addBlacklist" );
+  m_actionRefresh = new TDEAction( i18n( "&Refresh messages" ), "reload", Key_F5, this, TQ_SLOT( slotRefresh() ), actionCollection(), "refresh" );
+  new TDEAction( i18n( "Show &header of highlighted messages" ), "letter-closed", Key_F2, this, TQ_SLOT( slotShowHeader() ), actionCollection(), "show_header" );
+  new TDEAction( i18n( "Show &complete highlighted messages" ), "letter-open", Key_F3, this, TQ_SLOT( slotShowMessage() ), actionCollection(), "show_complete" );
+  new TDEAction( i18n( "&Delete highlighted messages" ), "eraser", Key_Delete, this, TQ_SLOT( slotDelete() ), actionCollection(), "delete" );
+  new TDEAction( i18n( "S&top current transfer" ), "process-stop", 0, this, TQ_SLOT( slotStop() ), actionCollection(), "stop" );
+  new TDEAction( i18n( "Show Filter Log" ), "text-x-log", Key_F4, this, TQ_SLOT( slotShowFilterLog() ), actionCollection(), "show_filterlog" );
+  new TDEAction( i18n( "Add sender to whitelist" ), "add_user", 0, this, TQ_SLOT( slotAddToWhitelist() ), actionCollection(), "addWhitelist" );
+  new TDEAction( i18n( "Add sender to blacklist" ), "delete_user", 0, this, TQ_SLOT( slotAddToBlacklist() ), actionCollection(), "addBlacklist" );
 
   // setup menu
-  KStdAction::preferences( this, SLOT( slotSetup() ), actionCollection() );
-  KStdAction::configureToolbars( this, SLOT( slotEditToolbars() ), actionCollection() );
+  KStdAction::preferences( this, TQ_SLOT( slotSetup() ), actionCollection() );
+  KStdAction::configureToolbars( this, TQ_SLOT( slotEditToolbars() ), actionCollection() );
 
   //create menu items for toggle tool and status bar
   setStandardToolBarMenuEnabled( true );
   createStandardStatusBarAction();
 
   //help menu
-  new TDEAction( i18n( "Send &Feedback Mail" ), "email", 0, this, SLOT( slotSendFeedbackMail() ),actionCollection(), "sendFeedback" );
+  new TDEAction( i18n( "Send &Feedback Mail" ), "email", 0, this, TQ_SLOT( slotSendFeedbackMail() ),actionCollection(), "sendFeedback" );
 
   //for account context menu
-  new TDEAction(i18n( "Setup &account" ), "tool", 0, this, SLOT( slotSetupAccount() ), actionCollection(), "setupAccount" );
+  new TDEAction(i18n( "Setup &account" ), "tool", 0, this, TQ_SLOT( slotSetupAccount() ), actionCollection(), "setupAccount" );
 }
 
 
@@ -619,8 +619,8 @@ void KShowMailApp::slotRefreshReady( )
       {
         //create a message dialog
         m_pAlertDialog = new AlertDialog( this );
-        connect( m_pAlertDialog, SIGNAL( destroyed() ), SLOT( slotAlertDestroyed() ) );
-        connect( m_pAlertDialog, SIGNAL( signalOk() ), SLOT( slotAlertOk() ) );
+        connect( m_pAlertDialog, TQ_SIGNAL( destroyed() ), TQ_SLOT( slotAlertDestroyed() ) );
+        connect( m_pAlertDialog, TQ_SIGNAL( signalOk() ), TQ_SLOT( slotAlertOk() ) );
       }
     }
 
@@ -760,7 +760,7 @@ void KShowMailApp::slotSetup( )
     SetupDialog->addModule( "kshowmailconfiglog.desktop" );
 
     //If the configuration was changed, it will call slotConfChanged
-    connect( SetupDialog, SIGNAL( configCommitted() ), this, SLOT( slotConfChanged() ) );
+    connect( SetupDialog, TQ_SIGNAL( configCommitted() ), this, TQ_SLOT( slotConfChanged() ) );
   }
 
   //execute preferences dialog
diff --git a/kshowmail/kshowmaildock.cpp b/kshowmail/kshowmaildock.cpp
index aa324f6..8e2486f 100644
--- a/kshowmail/kshowmaildock.cpp
+++ b/kshowmail/kshowmaildock.cpp
@@ -40,8 +40,8 @@ KShowMailDock::KShowMailDock(TQWidget* parent, TDEAction *actionRefresh )
 
   actionRefresh->plug( contextMenu() );
   //((KShowMailApp*)parent)->m_actionRefresh->plug (contextMenu());
-  connect (contextMenu(),SIGNAL(activated(int)),this, SIGNAL(sigActivated(int)));
-  connect (contextMenu(),SIGNAL(highlighted(int)),this, SIGNAL(sigHighlighted(int)));
+  connect (contextMenu(),TQ_SIGNAL(activated(int)),this, TQ_SIGNAL(sigActivated(int)));
+  connect (contextMenu(),TQ_SIGNAL(highlighted(int)),this, TQ_SIGNAL(sigHighlighted(int)));
 }
 
 void KShowMailDock::drawText (const TQString str, const TQColor& color)
diff --git a/kshowmail/kshowmailview.cpp b/kshowmail/kshowmailview.cpp
index 49bfc1d..aba1934 100644
--- a/kshowmail/kshowmailview.cpp
+++ b/kshowmail/kshowmailview.cpp
@@ -57,8 +57,8 @@ KshowmailView::KshowmailView(TQWidget *parent, const char *name):
   m_pListAccounts->addColumn( i18n( "Messages" ), DEFAULT_WIDTH_ACCOUNT_MESSAGES );
   m_pListAccounts->addColumn( i18n( "Size" ), DEFAULT_WIDTH_ACCOUNT_SIZE );
   m_pListAccounts->setAllColumnsShowFocus( true );
-  connect( m_pListAccounts, SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint &, int ) ), SLOT( slotAccountContext( TQListViewItem*, const TQPoint &, int ) ) );
-  connect( m_pListAccounts, SIGNAL( clicked( TQListViewItem*, const TQPoint &, int) ), SLOT( slotAccountClicked( TQListViewItem*, const TQPoint &, int ) ) );
+  connect( m_pListAccounts, TQ_SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint &, int ) ), TQ_SLOT( slotAccountContext( TQListViewItem*, const TQPoint &, int ) ) );
+  connect( m_pListAccounts, TQ_SIGNAL( clicked( TQListViewItem*, const TQPoint &, int) ), TQ_SLOT( slotAccountClicked( TQListViewItem*, const TQPoint &, int ) ) );
 
   //create message list
   m_pListMessages = new TDEListView( this, "messages" );
@@ -75,9 +75,9 @@ KshowmailView::KshowmailView(TQWidget *parent, const char *name):
   m_pListMessages->addColumn( i18n( "Size" ), DEFAULT_WIDTH_MESSAGE_SIZE );
   m_pListMessages->addColumn( i18n( "Content" ), DEFAULT_WIDTH_MESSAGE_CONTENT );
   m_pListMessages->addColumn( i18n( "State" ),  DEFAULT_WIDTH_MESSAGE_STATE );
-  connect( m_pListMessages, SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint &, int) ), SLOT( slotMessageContext( TQListViewItem*, const TQPoint &, int ) ) );
-  connect( m_pListMessages, SIGNAL( doubleClicked( TQListViewItem* ) ), SLOT( slotMessageDoubleClicked( TQListViewItem* ) ) );
-  connect( m_pListMessages, SIGNAL( clicked( TQListViewItem* ) ), SLOT( slotMessageClicked( TQListViewItem* ) ) );
+  connect( m_pListMessages, TQ_SIGNAL( rightButtonClicked( TQListViewItem*, const TQPoint &, int) ), TQ_SLOT( slotMessageContext( TQListViewItem*, const TQPoint &, int ) ) );
+  connect( m_pListMessages, TQ_SIGNAL( doubleClicked( TQListViewItem* ) ), TQ_SLOT( slotMessageDoubleClicked( TQListViewItem* ) ) );
+  connect( m_pListMessages, TQ_SIGNAL( clicked( TQListViewItem* ) ), TQ_SLOT( slotMessageClicked( TQListViewItem* ) ) );
 
   //read the geometry from the application config file
   readOptions();
diff --git a/kshowmail/serverdialog.cpp b/kshowmail/serverdialog.cpp
index 17b6496..7adecd6 100644
--- a/kshowmail/serverdialog.cpp
+++ b/kshowmail/serverdialog.cpp
@@ -90,7 +90,7 @@ ServerDialog::ServerDialog( TQWidget* parent, ConfigElem* item )
 
   //radio buttons to set storage of the password
   grpPasswordStorage = new TQButtonGroup( NULL, "grpPasswordStorage" );
-  connect( grpPasswordStorage, SIGNAL( clicked( int ) ), this, SLOT( slotPasswordStorageChanged( int ) ) );
+  connect( grpPasswordStorage, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotPasswordStorageChanged( int ) ) );
 
   TQRadioButton* btnPasswordDontSave = new TQRadioButton( i18n( "Don't save" ), gboxPassword, "btnPasswordDontSave" );
   TQRadioButton* btnPasswordSaveFile = new TQRadioButton( i18n( "Save password"), gboxPassword, "btnPasswordSaveFile" );
@@ -130,7 +130,7 @@ ServerDialog::ServerDialog( TQWidget* parent, ConfigElem* item )
 
   //radio buttons to set secure transfer
   grpSecureTransfer = new TQButtonGroup( NULL, "grpSecureTransfer" );
-  connect( grpSecureTransfer, SIGNAL( clicked( int ) ), this, SLOT( slotSecureTransferChanged ( int ) ) );
+  connect( grpSecureTransfer, TQ_SIGNAL( clicked( int ) ), this, TQ_SLOT( slotSecureTransferChanged ( int ) ) );
 
   TQRadioButton* btnSecureTransferNone = new TQRadioButton( i18n( "None" ), gboxSecureTransfer, "btnSecureTransferNone" );
   TQRadioButton* btnSecureTransferSSL = new TQRadioButton( i18n( "SSL"), gboxSecureTransfer, "btnSecureTransferSSL" );