Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 232 insertions, 232 deletions

diff --git a/kmail/kmcomposewin.cpp b/kmail/kmcomposewin.cpp
index 9815a17b..794aa67c 100644
--- a/kmail/kmcomposewin.cpp
+++ b/kmail/kmcomposewin.cpp
@@ -225,8 +225,8 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mEdtReplyTo = new KMLineEdit(true,mHeadersArea, "replyToLine");
   TQToolTip::add( mEdtReplyTo,
                  i18n( "Set the \"Reply-To:\" email address for this message" ) );
-  connect(mEdtReplyTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-          TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+  connect(mEdtReplyTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+          TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
 
   if ( mClassicalRecipients ) {
     mRecipientsEditor = 0;
@@ -254,17 +254,17 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
     mBtnBcc->setFocusPolicy(TQWidget::NoFocus);
     //mBtnFrom->setFocusPolicy(TQWidget::NoFocus);
 
-    connect(mBtnTo,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
-    connect(mBtnCc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
-    connect(mBtnBcc,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookTo()));
-    //connect(mBtnFrom,TQT_SIGNAL(clicked()),TQT_SLOT(slotAddrBookFrom()));
+    connect(mBtnTo,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo()));
+    connect(mBtnCc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo()));
+    connect(mBtnBcc,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookTo()));
+    //connect(mBtnFrom,TQ_SIGNAL(clicked()),TQ_SLOT(slotAddrBookFrom()));
 
-    connect(mEdtTo,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-            TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
-    connect(mEdtCc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-            TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
-    connect(mEdtBcc,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-            TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+    connect(mEdtTo,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+            TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+    connect(mEdtCc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+            TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+    connect(mEdtBcc,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+            TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
 
     mEdtTo->setFocus();
   } else {
@@ -283,9 +283,9 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
 
     mRecipientsEditor = new RecipientsEditor( mHeadersArea );
     connect( mRecipientsEditor,
-             TQT_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
-             TQT_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) );
-    connect( mRecipientsEditor, TQT_SIGNAL(sizeHintChanged()), TQT_SLOT(recipientEditorSizeHintChanged()) );
+             TQ_SIGNAL( completionModeChanged( TDEGlobalSettings::Completion ) ),
+             TQ_SLOT( slotCompletionModeChanged( TDEGlobalSettings::Completion ) ) );
+    connect( mRecipientsEditor, TQ_SIGNAL(sizeHintChanged()), TQ_SLOT(recipientEditorSizeHintChanged()) );
 
     mRecipientsEditor->setFocus();
   }
@@ -413,20 +413,20 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
   mAtmListView->setAllColumnsShowFocus( true );
 
   connect( mAtmListView,
-           TQT_SIGNAL( doubleClicked( TQListViewItem* ) ),
-           TQT_SLOT( slotAttachEdit() ) );
+           TQ_SIGNAL( doubleClicked( TQListViewItem* ) ),
+           TQ_SLOT( slotAttachEdit() ) );
   connect( mAtmListView,
-           TQT_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ),
-           TQT_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) );
+           TQ_SIGNAL( rightButtonPressed( TQListViewItem*, const TQPoint&, int ) ),
+           TQ_SLOT( slotAttachPopupMenu( TQListViewItem*, const TQPoint&, int ) ) );
   connect( mAtmListView,
-           TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotUpdateAttachActions() ) );
+           TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotUpdateAttachActions() ) );
   connect( mAtmListView,
-           TQT_SIGNAL( attachmentDeleted() ),
-           TQT_SLOT( slotAttachRemove() ) );
+           TQ_SIGNAL( attachmentDeleted() ),
+           TQ_SLOT( slotAttachRemove() ) );
   connect( mAtmListView,
-           TQT_SIGNAL( dragStarted() ),
-           TQT_SLOT( slotAttachmentDragStarted() ) );
+           TQ_SIGNAL( dragStarted() ),
+           TQ_SLOT( slotAttachmentDragStarted() ) );
   mAttachMenu = 0;
 
   readConfig();
@@ -437,32 +437,32 @@ KMComposeWin::KMComposeWin( KMMessage *aMsg, uint id  )
 
   applyMainWindowSettings(KMKernel::config(), "Composer");
 
-  connect( mEdtSubject, TQT_SIGNAL( subjectTextSpellChecked() ),
-           TQT_SLOT( slotSubjectTextSpellChecked() ) );
-  connect(mEdtSubject,TQT_SIGNAL(textChanged(const TQString&)),
-          TQT_SLOT(slotUpdWinTitle(const TQString&)));
-  connect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
-          TQT_SLOT(slotIdentityChanged(uint)));
-  connect( kmkernel->identityManager(), TQT_SIGNAL(changed(uint)),
-          TQT_SLOT(slotIdentityChanged(uint)));
-
-  connect(mEdtFrom,TQT_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
-          TQT_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
-  connect(kmkernel->folderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
-                                  TQT_SLOT(slotFolderRemoved(KMFolder*)));
-  connect(kmkernel->imapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
-                                  TQT_SLOT(slotFolderRemoved(KMFolder*)));
-  connect(kmkernel->dimapFolderMgr(),TQT_SIGNAL(folderRemoved(KMFolder*)),
-                                  TQT_SLOT(slotFolderRemoved(KMFolder*)));
-  connect( kmkernel, TQT_SIGNAL( configChanged() ),
-           this, TQT_SLOT( slotConfigChanged() ) );
-
-  connect (mEditor, TQT_SIGNAL (spellcheck_done(int)),
-    this, TQT_SLOT (slotSpellcheckDone (int)));
-  connect (mEditor, TQT_SIGNAL( attachPNGImageData(const TQByteArray &) ),
-    this, TQT_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) );
-  connect (mEditor, TQT_SIGNAL( focusChanged(bool) ),
-    this, TQT_SLOT (editorFocusChanged(bool)) );
+  connect( mEdtSubject, TQ_SIGNAL( subjectTextSpellChecked() ),
+           TQ_SLOT( slotSubjectTextSpellChecked() ) );
+  connect(mEdtSubject,TQ_SIGNAL(textChanged(const TQString&)),
+          TQ_SLOT(slotUpdWinTitle(const TQString&)));
+  connect(mIdentity,TQ_SIGNAL(identityChanged(uint)),
+          TQ_SLOT(slotIdentityChanged(uint)));
+  connect( kmkernel->identityManager(), TQ_SIGNAL(changed(uint)),
+          TQ_SLOT(slotIdentityChanged(uint)));
+
+  connect(mEdtFrom,TQ_SIGNAL(completionModeChanged(TDEGlobalSettings::Completion)),
+          TQ_SLOT(slotCompletionModeChanged(TDEGlobalSettings::Completion)));
+  connect(kmkernel->folderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)),
+                                  TQ_SLOT(slotFolderRemoved(KMFolder*)));
+  connect(kmkernel->imapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)),
+                                  TQ_SLOT(slotFolderRemoved(KMFolder*)));
+  connect(kmkernel->dimapFolderMgr(),TQ_SIGNAL(folderRemoved(KMFolder*)),
+                                  TQ_SLOT(slotFolderRemoved(KMFolder*)));
+  connect( kmkernel, TQ_SIGNAL( configChanged() ),
+           this, TQ_SLOT( slotConfigChanged() ) );
+
+  connect (mEditor, TQ_SIGNAL (spellcheck_done(int)),
+    this, TQ_SLOT (slotSpellcheckDone (int)));
+  connect (mEditor, TQ_SIGNAL( attachPNGImageData(const TQByteArray &) ),
+    this, TQ_SLOT ( slotAttachPNGImageData(const TQByteArray &) ) );
+  connect (mEditor, TQ_SIGNAL( focusChanged(bool) ),
+    this, TQ_SLOT (editorFocusChanged(bool)) );
 
   mMainWidget->resize(480,510);
   setCentralWidget(mMainWidget);
@@ -553,7 +553,7 @@ void KMComposeWin::addAttachmentsAndSend(const KURL::List &urls, const TQString
   }
   mAttachFilesSend = how;
   mAttachFilesPending = urls;
-  connect(this, TQT_SIGNAL(attachmentAdded(const KURL&, bool)), TQT_SLOT(slotAttachedFile(const KURL&)));
+  connect(this, TQ_SIGNAL(attachmentAdded(const KURL&, bool)), TQ_SLOT(slotAttachedFile(const KURL&)));
   for( KURL::List::ConstIterator itr = urls.begin(); itr != urls.end(); ++itr ) {
     if (!addAttach( *itr ))
       mAttachFilesPending.remove(mAttachFilesPending.find(*itr)); // only remove one copy of the url
@@ -815,8 +815,8 @@ void KMComposeWin::autoSaveMessage()
   if ( mAutoSaveTimer )
     mAutoSaveTimer->stop();
 
-  connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
-           this, TQT_SLOT( slotContinueAutoSave() ) );
+  connect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+           this, TQ_SLOT( slotContinueAutoSave() ) );
   // This method is called when KMail crashed, so don't try signing/encryption
   // and don't disable controls because it is also called from a timer and
   // then the disabling is distracting.
@@ -827,8 +827,8 @@ void KMComposeWin::autoSaveMessage()
 
 void KMComposeWin::slotContinueAutoSave()
 {
-  disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
-              this, TQT_SLOT( slotContinueAutoSave() ) );
+  disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+              this, TQ_SLOT( slotContinueAutoSave() ) );
 
   // Ok, it's done now - continue dead letter saving
   if ( mComposedMessages.isEmpty() ) {
@@ -1076,22 +1076,22 @@ void KMComposeWin::rethinkFields(bool fromSlot)
     ++row;
 
     if ( showHeaders & HDR_REPLY_TO ) {
-      connect( mEdtReplyTo, TQT_SIGNAL( focusDown() ), mRecipientsEditor,
-        TQT_SLOT( setFocusTop() ) );
+      connect( mEdtReplyTo, TQ_SIGNAL( focusDown() ), mRecipientsEditor,
+        TQ_SLOT( setFocusTop() ) );
     } else {
-    connect( mEdtFrom, TQT_SIGNAL( focusDown() ), mRecipientsEditor,
-      TQT_SLOT( setFocusTop() ) );
+    connect( mEdtFrom, TQ_SIGNAL( focusDown() ), mRecipientsEditor,
+      TQ_SLOT( setFocusTop() ) );
     }
     if ( showHeaders & HDR_REPLY_TO ) {
-      connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtReplyTo, TQT_SLOT( setFocus() ) );
+      connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtReplyTo, TQ_SLOT( setFocus() ) );
     } else {
-      connect( mRecipientsEditor, TQT_SIGNAL( focusUp() ), mEdtFrom, TQT_SLOT( setFocus() ) );
+      connect( mRecipientsEditor, TQ_SIGNAL( focusUp() ), mEdtFrom, TQ_SLOT( setFocus() ) );
     }
 
-    connect( mRecipientsEditor, TQT_SIGNAL( focusDown() ), mEdtSubject,
-      TQT_SLOT( setFocus() ) );
-    connect( mEdtSubject, TQT_SIGNAL( focusUp() ), mRecipientsEditor,
-      TQT_SLOT( setFocusBottom() ) );
+    connect( mRecipientsEditor, TQ_SIGNAL( focusDown() ), mEdtSubject,
+      TQ_SLOT( setFocus() ) );
+    connect( mEdtSubject, TQ_SIGNAL( focusUp() ), mRecipientsEditor,
+      TQ_SLOT( setFocusBottom() ) );
 
     prevFocus = mRecipientsEditor;
   }
@@ -1131,8 +1131,8 @@ void KMComposeWin::rethinkFields(bool fromSlot)
 
 TQWidget *KMComposeWin::connectFocusMoving( TQWidget *prev, TQWidget *next )
 {
-  connect( prev, TQT_SIGNAL( focusDown() ), next, TQT_SLOT( setFocus() ) );
-  connect( next, TQT_SIGNAL( focusUp() ), prev, TQT_SLOT( setFocus() ) );
+  connect( prev, TQ_SIGNAL( focusDown() ), next, TQ_SLOT( setFocus() ) );
+  connect( next, TQ_SIGNAL( focusUp() ), prev, TQ_SLOT( setFocus() ) );
 
   return next;
 }
@@ -1233,14 +1233,14 @@ void KMComposeWin::setupActions(void)
   {
     //default = send now, alternative = queue
     ( void )  new TDEAction( i18n("&Send Mail"), "mail-send", CTRL+Key_Return,
-                        this, TQT_SLOT(slotSendNow()), actionCollection(),"send_default");
+                        this, TQ_SLOT(slotSendNow()), actionCollection(),"send_default");
 
     // FIXME: change to mail_send_via icon when this exits.
     actActionNowMenu =  new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
 		    actionCollection(), "send_default_via" );
 
     (void) new TDEAction (i18n("Send &Later"), "queue", 0, this,
-			TQT_SLOT(slotSendLater()), actionCollection(),"send_alternative");
+			TQ_SLOT(slotSendLater()), actionCollection(),"send_alternative");
     actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
 		    actionCollection(), "send_alternative_via" );
 
@@ -1250,12 +1250,12 @@ void KMComposeWin::setupActions(void)
     //default = queue, alternative = send now
     (void) new TDEAction (i18n("Send &Later"), "queue",
                         CTRL+Key_Return,
-                        this, TQT_SLOT(slotSendLater()), actionCollection(),"send_default");
+                        this, TQ_SLOT(slotSendLater()), actionCollection(),"send_default");
     actActionLaterMenu = new TDEActionMenu (i18n("Send &Later Via"), "queue",
 		    actionCollection(), "send_default_via" );
 
    ( void )  new TDEAction( i18n("&Send Mail"), "mail-send", 0,
-                        this, TQT_SLOT(slotSendNow()), actionCollection(),"send_alternative");
+                        this, TQ_SLOT(slotSendNow()), actionCollection(),"send_alternative");
 
     // FIXME: change to mail_send_via icon when this exits.
     actActionNowMenu =  new TDEActionMenu (i18n("&Send Mail Via"), "mail-send",
@@ -1267,102 +1267,102 @@ void KMComposeWin::setupActions(void)
   actActionNowMenu->setDelayed(true);
   actActionLaterMenu->setDelayed(true);
 
-  connect(  actActionNowMenu, TQT_SIGNAL(  activated() ), this,
-		    TQT_SLOT( slotSendNow() ) );
-  connect(  actActionLaterMenu, TQT_SIGNAL(  activated() ), this,
-		    TQT_SLOT( slotSendLater() ) );
+  connect(  actActionNowMenu, TQ_SIGNAL(  activated() ), this,
+		    TQ_SLOT( slotSendNow() ) );
+  connect(  actActionLaterMenu, TQ_SIGNAL(  activated() ), this,
+		    TQ_SLOT( slotSendLater() ) );
 
 
   mActNowMenu = actActionNowMenu->popupMenu();
   mActLaterMenu = actActionLaterMenu->popupMenu();
 
-  connect(  mActNowMenu, TQT_SIGNAL(  activated( int ) ), this,
-		    TQT_SLOT( slotSendNowVia( int ) ) );
-  connect(  mActNowMenu, TQT_SIGNAL(  aboutToShow() ), this,
-		    TQT_SLOT( getTransportMenu() ) );
+  connect(  mActNowMenu, TQ_SIGNAL(  activated( int ) ), this,
+		    TQ_SLOT( slotSendNowVia( int ) ) );
+  connect(  mActNowMenu, TQ_SIGNAL(  aboutToShow() ), this,
+		    TQ_SLOT( getTransportMenu() ) );
 
-  connect(  mActLaterMenu, TQT_SIGNAL(  activated( int ) ), this,
-		  TQT_SLOT( slotSendLaterVia( int ) ) );
-  connect(  mActLaterMenu, TQT_SIGNAL(  aboutToShow() ), this,
-		  TQT_SLOT( getTransportMenu() ) );
+  connect(  mActLaterMenu, TQ_SIGNAL(  activated( int ) ), this,
+		  TQ_SLOT( slotSendLaterVia( int ) ) );
+  connect(  mActLaterMenu, TQ_SIGNAL(  aboutToShow() ), this,
+		  TQ_SLOT( getTransportMenu() ) );
 
 
 
 
   (void) new TDEAction (i18n("Save as &Draft"), "document-save", 0,
-                      this, TQT_SLOT(slotSaveDraft()),
+                      this, TQ_SLOT(slotSaveDraft()),
                       actionCollection(), "save_in_drafts");
   (void) new TDEAction (i18n("Save as &Template"), "document-save", 0,
-                      this, TQT_SLOT(slotSaveTemplate()),
+                      this, TQ_SLOT(slotSaveTemplate()),
                       actionCollection(), "save_in_templates");
   (void) new TDEAction (i18n("&Insert File..."), "document-open", 0,
-                      this,  TQT_SLOT(slotInsertFile()),
+                      this,  TQ_SLOT(slotInsertFile()),
                       actionCollection(), "insert_file");
   mRecentAction = new TDERecentFilesAction (i18n("&Insert File Recent"),
 		      "document-open", 0,
-		      this,  TQT_SLOT(slotInsertRecentFile(const KURL&)),
+		      this,  TQ_SLOT(slotInsertRecentFile(const KURL&)),
 		      actionCollection(), "insert_file_recent");
 
   mRecentAction->loadEntries( KMKernel::config() );
 
   (void) new TDEAction (i18n("&Address Book"), "contents",0,
-                      this, TQT_SLOT(slotAddrBook()),
+                      this, TQ_SLOT(slotAddrBook()),
                       actionCollection(), "addressbook");
   (void) new TDEAction (i18n("&New Composer"), "mail-message-new",
                       TDEStdAccel::shortcut(TDEStdAccel::New),
-                      this, TQT_SLOT(slotNewComposer()),
+                      this, TQ_SLOT(slotNewComposer()),
                       actionCollection(), "new_composer");
   (void) new TDEAction (i18n("New Main &Window"), "window-new", 0,
-                      this, TQT_SLOT(slotNewMailReader()),
+                      this, TQ_SLOT(slotNewMailReader()),
                       actionCollection(), "open_mailreader");
 
   if ( !mClassicalRecipients ) {
     new TDEAction( i18n("Select &Recipients..."), CTRL + Key_L, mRecipientsEditor,
-      TQT_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
+      TQ_SLOT( selectRecipients() ), actionCollection(), "select_recipients" );
     new TDEAction( i18n("Save &Distribution List..."), 0, mRecipientsEditor,
-      TQT_SLOT( saveDistributionList() ), actionCollection(),
+      TQ_SLOT( saveDistributionList() ), actionCollection(),
       "save_distribution_list" );
   }
 
-  //KStdAction::save(this, TQT_SLOT(), actionCollection(), "save_message");
-  KStdAction::print (this, TQT_SLOT(slotPrint()), actionCollection());
-  KStdAction::close (this, TQT_SLOT(slotClose()), actionCollection());
+  //KStdAction::save(this, TQ_SLOT(), actionCollection(), "save_message");
+  KStdAction::print (this, TQ_SLOT(slotPrint()), actionCollection());
+  KStdAction::close (this, TQ_SLOT(slotClose()), actionCollection());
 
-  KStdAction::undo (this, TQT_SLOT(slotUndo()), actionCollection());
-  KStdAction::redo (this, TQT_SLOT(slotRedo()), actionCollection());
-  KStdAction::cut (this, TQT_SLOT(slotCut()), actionCollection());
-  KStdAction::copy (this, TQT_SLOT(slotCopy()), actionCollection());
-  KStdAction::pasteText (this, TQT_SLOT(slotPasteClipboard()), actionCollection());
-  KStdAction::selectAll (this, TQT_SLOT(slotMarkAll()), actionCollection());
+  KStdAction::undo (this, TQ_SLOT(slotUndo()), actionCollection());
+  KStdAction::redo (this, TQ_SLOT(slotRedo()), actionCollection());
+  KStdAction::cut (this, TQ_SLOT(slotCut()), actionCollection());
+  KStdAction::copy (this, TQ_SLOT(slotCopy()), actionCollection());
+  KStdAction::pasteText (this, TQ_SLOT(slotPasteClipboard()), actionCollection());
+  KStdAction::selectAll (this, TQ_SLOT(slotMarkAll()), actionCollection());
 
-  KStdAction::find (this, TQT_SLOT(slotFind()), actionCollection());
-  KStdAction::findNext(this, TQT_SLOT(slotSearchAgain()), actionCollection());
+  KStdAction::find (this, TQ_SLOT(slotFind()), actionCollection());
+  KStdAction::findNext(this, TQ_SLOT(slotSearchAgain()), actionCollection());
 
-  KStdAction::replace (this, TQT_SLOT(slotReplace()), actionCollection());
-  KStdAction::spelling (this, TQT_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
+  KStdAction::replace (this, TQ_SLOT(slotReplace()), actionCollection());
+  KStdAction::spelling (this, TQ_SLOT(slotSpellcheck()), actionCollection(), "tools-check-spelling");
 
-  mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQT_SLOT( slotPasteClipboardAsQuotation()),
+  mPasteQuotation = new TDEAction (i18n("Pa&ste as Quotation"),0,this,TQ_SLOT( slotPasteClipboardAsQuotation()),
                       actionCollection(), "paste_quoted");
 
-  (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQT_SLOT( slotPasteClipboardAsAttachment()),
+  (void) new TDEAction (i18n("Paste as Attac&hment"),0,this,TQ_SLOT( slotPasteClipboardAsAttachment()),
                       actionCollection(), "paste_att");
 
   TDEAction * addq = new TDEAction(i18n("Add &Quote Characters"), 0, this,
-              TQT_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
-  connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
-           addq, TQT_SLOT(setEnabled(bool)) );
+              TQ_SLOT(slotAddQuotes()), actionCollection(), "tools_quote");
+  connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)),
+           addq, TQ_SLOT(setEnabled(bool)) );
 
   TDEAction * remq = new TDEAction(i18n("Re&move Quote Characters"), 0, this,
-              TQT_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
-  connect( mEditor, TQT_SIGNAL(selectionAvailable(bool)),
-           remq, TQT_SLOT(setEnabled(bool)) );
+              TQ_SLOT(slotRemoveQuotes()), actionCollection(), "tools_unquote");
+  connect( mEditor, TQ_SIGNAL(selectionAvailable(bool)),
+           remq, TQ_SLOT(setEnabled(bool)) );
 
 
-  (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQT_SLOT(slotCleanSpace()),
+  (void) new TDEAction (i18n("Cl&ean Spaces"), 0, this, TQ_SLOT(slotCleanSpace()),
                       actionCollection(), "clean_spaces");
 
   mFixedFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"), 0, this,
-                      TQT_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
+                      TQ_SLOT(slotUpdateFont()), actionCollection(), "toggle_fixedfont" );
   mFixedFontAction->setChecked( GlobalSettings::self()->useFixedFont() );
 
   //these are checkable!!!
@@ -1375,16 +1375,16 @@ void KMComposeWin::setupActions(void)
   mRequestMDNAction->setChecked(GlobalSettings::self()->requestMDN());
   //----- Message-Encoding Submenu
   mEncodingAction = new TDESelectAction( i18n( "Se&t Encoding" ), "charset",
-                                      0, this, TQT_SLOT(slotSetCharset() ),
+                                      0, this, TQ_SLOT(slotSetCharset() ),
                                       actionCollection(), "charsets" );
   mWordWrapAction = new TDEToggleAction (i18n("&Wordwrap"), 0,
                       actionCollection(), "wordwrap");
   mWordWrapAction->setChecked(GlobalSettings::self()->wordWrap());
-  connect(mWordWrapAction, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotWordWrapToggled(bool)));
+  connect(mWordWrapAction, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotWordWrapToggled(bool)));
 
   mSnippetAction = new TDEToggleAction ( i18n("&Snippets"), 0,
                                        actionCollection(), "snippets");
-  connect(mSnippetAction, TQT_SIGNAL(toggled(bool)), mSnippetWidget, TQT_SLOT(setShown(bool)) );
+  connect(mSnippetAction, TQ_SIGNAL(toggled(bool)), mSnippetWidget, TQ_SLOT(setShown(bool)) );
   mSnippetAction->setChecked( GlobalSettings::self()->showSnippetManager() );
 
   mAutoSpellCheckingAction =
@@ -1394,8 +1394,8 @@ void KMComposeWin::setupActions(void)
   mAutoSpellCheckingAction->setEnabled( !GlobalSettings::self()->useExternalEditor() );
   mAutoSpellCheckingAction->setChecked( !GlobalSettings::self()->useExternalEditor() && spellChecking );
   slotAutoSpellCheckingToggled( !GlobalSettings::self()->useExternalEditor() && spellChecking );
-  connect( mAutoSpellCheckingAction, TQT_SIGNAL( toggled( bool ) ),
-           this, TQT_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
+  connect( mAutoSpellCheckingAction, TQ_SIGNAL( toggled( bool ) ),
+           this, TQ_SLOT( slotAutoSpellCheckingToggled( bool ) ) );
 
   TQStringList encodings = KMMsgBase::supportedEncodings(true);
   encodings.prepend( i18n("Auto-Detect"));
@@ -1404,83 +1404,83 @@ void KMComposeWin::setupActions(void)
 
   //these are checkable!!!
   markupAction = new TDEToggleAction (i18n("Formatting (HTML)"), 0, this,
-                                    TQT_SLOT(slotToggleMarkup()),
+                                    TQ_SLOT(slotToggleMarkup()),
                       actionCollection(), "html");
 
   mAllFieldsAction = new TDEToggleAction (i18n("&All Fields"), 0, this,
-                                       TQT_SLOT(slotView()),
+                                       TQ_SLOT(slotView()),
                                        actionCollection(), "show_all_fields");
   mIdentityAction = new TDEToggleAction (i18n("&Identity"), 0, this,
-                                      TQT_SLOT(slotView()),
+                                      TQ_SLOT(slotView()),
                                       actionCollection(), "show_identity");
   mDictionaryAction = new TDEToggleAction (i18n("&Dictionary"), 0, this,
-                                         TQT_SLOT(slotView()),
+                                         TQ_SLOT(slotView()),
                                          actionCollection(), "show_dictionary");
   mFccAction = new TDEToggleAction (i18n("&Sent-Mail Folder"), 0, this,
-                                 TQT_SLOT(slotView()),
+                                 TQ_SLOT(slotView()),
                                  actionCollection(), "show_fcc");
   mTransportAction = new TDEToggleAction (i18n("&Mail Transport"), 0, this,
-                                      TQT_SLOT(slotView()),
+                                      TQ_SLOT(slotView()),
                                       actionCollection(), "show_transport");
   mFromAction = new TDEToggleAction (i18n("&From"), 0, this,
-                                  TQT_SLOT(slotView()),
+                                  TQ_SLOT(slotView()),
                                   actionCollection(), "show_from");
   mReplyToAction = new TDEToggleAction (i18n("&Reply To"), 0, this,
-                                       TQT_SLOT(slotView()),
+                                       TQ_SLOT(slotView()),
                                        actionCollection(), "show_reply_to");
   if ( mClassicalRecipients ) {
     mToAction = new TDEToggleAction (i18n("&To"), 0, this,
-                                  TQT_SLOT(slotView()),
+                                  TQ_SLOT(slotView()),
                                   actionCollection(), "show_to");
     mCcAction = new TDEToggleAction (i18n("&CC"), 0, this,
-                                  TQT_SLOT(slotView()),
+                                  TQ_SLOT(slotView()),
                                   actionCollection(), "show_cc");
     mBccAction = new TDEToggleAction (i18n("&BCC"), 0, this,
-                                   TQT_SLOT(slotView()),
+                                   TQ_SLOT(slotView()),
                                    actionCollection(), "show_bcc");
   }
   mSubjectAction = new TDEToggleAction (i18n("S&ubject"), 0, this,
-                                     TQT_SLOT(slotView()),
+                                     TQ_SLOT(slotView()),
                                      actionCollection(), "show_subject");
   //end of checkable
 
   mAppendSignatureAction = new TDEAction (i18n("Append S&ignature"), 0, this,
-                      TQT_SLOT(slotAppendSignature()),
+                      TQ_SLOT(slotAppendSignature()),
                       actionCollection(), "append_signature");
   mPrependSignatureAction =  new TDEAction (i18n("Prepend S&ignature"), 0, this,
-                      TQT_SLOT(slotPrependSignature()),
+                      TQ_SLOT(slotPrependSignature()),
                       actionCollection(), "prepend_signature");
 
   mInsertSignatureAction =  new TDEAction (i18n("Insert Signature At C&ursor Position"), "edit", 0, this,
-                      TQT_SLOT(slotInsertSignatureAtCursor()),
+                      TQ_SLOT(slotInsertSignatureAtCursor()),
                       actionCollection(), "insert_signature_at_cursor_position");
 
   mAttachPK  = new TDEAction (i18n("Attach &Public Key..."), 0, this,
-                           TQT_SLOT(slotInsertPublicKey()),
+                           TQ_SLOT(slotInsertPublicKey()),
                            actionCollection(), "attach_public_key");
   mAttachMPK = new TDEAction (i18n("Attach &My Public Key"), 0, this,
-                           TQT_SLOT(slotInsertMyPublicKey()),
+                           TQ_SLOT(slotInsertMyPublicKey()),
                            actionCollection(), "attach_my_public_key");
   (void) new TDEAction (i18n("&Attach File..."), "attach",
-                      0, this, TQT_SLOT(slotAttachFile()),
+                      0, this, TQ_SLOT(slotAttachFile()),
                       actionCollection(), "attach");
   mAttachRemoveAction = new TDEAction (i18n("&Remove Attachment"), 0, this,
-                      TQT_SLOT(slotAttachRemove()),
+                      TQ_SLOT(slotAttachRemove()),
                       actionCollection(), "remove");
   mAttachSaveAction = new TDEAction (i18n("&Save Attachment As..."), "document-save",0,
-                      this, TQT_SLOT(slotAttachSave()),
+                      this, TQ_SLOT(slotAttachSave()),
                       actionCollection(), "attach_save");
   mAttachPropertiesAction = new TDEAction (i18n("Attachment Pr&operties"), 0, this,
-                      TQT_SLOT(slotAttachProperties()),
+                      TQ_SLOT(slotAttachProperties()),
                       actionCollection(), "attach_properties");
 
   setStandardToolBarMenuEnabled(true);
 
-  KStdAction::keyBindings(this, TQT_SLOT(slotEditKeys()), actionCollection());
-  KStdAction::configureToolbars(this, TQT_SLOT(slotEditToolbars()), actionCollection());
-  KStdAction::preferences(kmkernel, TQT_SLOT(slotShowConfigurationDialog()), actionCollection());
+  KStdAction::keyBindings(this, TQ_SLOT(slotEditKeys()), actionCollection());
+  KStdAction::configureToolbars(this, TQ_SLOT(slotEditToolbars()), actionCollection());
+  KStdAction::preferences(kmkernel, TQ_SLOT(slotShowConfigurationDialog()), actionCollection());
 
-  (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQT_SLOT(slotSpellcheckConfig()),
+  (void) new TDEAction (i18n("&Spellchecker..."), 0, this, TQ_SLOT(slotSpellcheckConfig()),
                       actionCollection(), "setup_spellchecker");
 
   if ( Kleo::CryptoBackendFactory::instance()->protocol( "Chiasmus" ) ) {
@@ -1489,8 +1489,8 @@ void KMComposeWin::setupActions(void)
                                            "encrypt_message_chiasmus" );
     a->setCheckedState( KGuiItem( i18n( "Encrypt Message with Chiasmus..." ), "chiencrypted" ) );
     mEncryptChiasmusAction = a;
-    connect( mEncryptChiasmusAction, TQT_SIGNAL(toggled(bool)),
-             this, TQT_SLOT(slotEncryptChiasmusToggled(bool)) );
+    connect( mEncryptChiasmusAction, TQ_SIGNAL(toggled(bool)),
+             this, TQ_SLOT(slotEncryptChiasmusToggled(bool)) );
   } else {
     mEncryptChiasmusAction = 0;
   }
@@ -1536,17 +1536,17 @@ void KMComposeWin::setupActions(void)
     setSigning( ( canOpenPGPSign || canSMIMESign ) && GlobalSettings::self()->pgpAutoSign() );
   }
 
-  connect(mEncryptAction, TQT_SIGNAL(toggled(bool)),
-                         TQT_SLOT(slotEncryptToggled( bool )));
-  connect(mSignAction,    TQT_SIGNAL(toggled(bool)),
-                         TQT_SLOT(slotSignToggled(    bool )));
+  connect(mEncryptAction, TQ_SIGNAL(toggled(bool)),
+                         TQ_SLOT(slotEncryptToggled( bool )));
+  connect(mSignAction,    TQ_SIGNAL(toggled(bool)),
+                         TQ_SLOT(slotSignToggled(    bool )));
 
   TQStringList l;
   for ( int i = 0 ; i < numCryptoMessageFormats ; ++i )
     l.push_back( Kleo::cryptoMessageFormatToLabel( cryptoMessageFormats[i] ) );
 
   mCryptoModuleAction = new TDESelectAction( i18n( "&Cryptographic Message Format" ), 0,
-					   this, TQT_SLOT(slotSelectCryptoModule()),
+					   this, TQ_SLOT(slotSelectCryptoModule()),
 					   actionCollection(), "options_select_crypto" );
   mCryptoModuleAction->setItems( l );
   mCryptoModuleAction->setCurrentItem( format2cb( ident.preferredCryptoMessageFormat() ) );
@@ -1566,50 +1566,50 @@ void KMComposeWin::setupActions(void)
                                  "text_list" );
   listAction->setItems( styleItems );
   listAction->setToolTip( i18n( "Select a list style" ) );
-  connect( listAction, TQT_SIGNAL( activated( const TQString& ) ),
-           TQT_SLOT( slotListAction( const TQString& ) ) );
+  connect( listAction, TQ_SIGNAL( activated( const TQString& ) ),
+           TQ_SLOT( slotListAction( const TQString& ) ) );
   fontAction = new TDEFontAction( "Select Font", 0, actionCollection(),
                                "text_font" );
   fontAction->setToolTip( i18n( "Select a font" ) );
-  connect( fontAction, TQT_SIGNAL( activated( const TQString& ) ),
-           TQT_SLOT( slotFontAction( const TQString& ) ) );
+  connect( fontAction, TQ_SIGNAL( activated( const TQString& ) ),
+           TQ_SLOT( slotFontAction( const TQString& ) ) );
   fontSizeAction = new TDEFontSizeAction( "Select Size", 0, actionCollection(),
                                        "text_size" );
   fontSizeAction->setToolTip( i18n( "Select a font size" ) );
-  connect( fontSizeAction, TQT_SIGNAL( fontSizeChanged( int ) ),
-           TQT_SLOT( slotSizeAction( int ) ) );
+  connect( fontSizeAction, TQ_SIGNAL( fontSizeChanged( int ) ),
+           TQ_SLOT( slotSizeAction( int ) ) );
 
   alignLeftAction = new TDEToggleAction (i18n("Align Left"), "format-text-direction-ltr", 0,
-                      this, TQT_SLOT(slotAlignLeft()), actionCollection(),
+                      this, TQ_SLOT(slotAlignLeft()), actionCollection(),
                       "align_left");
   alignLeftAction->setChecked( true );
   alignRightAction = new TDEToggleAction (i18n("Align Right"), "format-text-direction-rtl", 0,
-                      this, TQT_SLOT(slotAlignRight()), actionCollection(),
+                      this, TQ_SLOT(slotAlignRight()), actionCollection(),
                       "align_right");
   alignCenterAction = new TDEToggleAction (i18n("Align Center"), "text_center", 0,
-                       this, TQT_SLOT(slotAlignCenter()), actionCollection(),
+                       this, TQ_SLOT(slotAlignCenter()), actionCollection(),
                        "align_center");
   textBoldAction = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
-                                     this, TQT_SLOT(slotTextBold()),
+                                     this, TQ_SLOT(slotTextBold()),
                                      actionCollection(), "format-text-bold");
   textItalicAction = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
-                                       this, TQT_SLOT(slotTextItalic()),
+                                       this, TQ_SLOT(slotTextItalic()),
                                        actionCollection(), "format-text-italic");
   textUnderAction = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
-                                     this, TQT_SLOT(slotTextUnder()),
+                                     this, TQ_SLOT(slotTextUnder()),
                                      actionCollection(), "format-text-underline");
   actionFormatReset = new TDEAction( i18n( "Reset Font Settings" ), "eraser", 0,
-                                     this, TQT_SLOT( slotFormatReset() ),
+                                     this, TQ_SLOT( slotFormatReset() ),
                                      actionCollection(), "format_reset");
   actionFormatColor = new TDEAction( i18n( "Text Color..." ), "colorize", 0,
-                                     this, TQT_SLOT( slotTextColor() ),
+                                     this, TQ_SLOT( slotTextColor() ),
                                      actionCollection(), "format_color");
 
   //  editorFocusChanged(false);
   createGUI("kmcomposerui.rc");
 
-  connect( toolBar("htmlToolBar"), TQT_SIGNAL( visibilityChanged(bool) ),
-           this, TQT_SLOT( htmlToolBarVisibilityChanged(bool) ) );
+  connect( toolBar("htmlToolBar"), TQ_SIGNAL( visibilityChanged(bool) ),
+           this, TQ_SLOT( htmlToolBarVisibilityChanged(bool) ) );
 
   // In Kontact, this entry would read "Configure Kontact", but bring
   // up KMail's config dialog. That's sensible, though, so fix the label.
@@ -1663,28 +1663,28 @@ void KMComposeWin::setupEditor(void)
   menu = new TQPopupMenu(this);
   //#ifdef BROKEN
   menu->insertItem(i18n("Undo"),mEditor,
-                   TQT_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo));
+                   TQ_SLOT(undo()), TDEStdAccel::shortcut(TDEStdAccel::Undo));
   menu->insertItem(i18n("Redo"),mEditor,
-                   TQT_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo));
+                   TQ_SLOT(redo()), TDEStdAccel::shortcut(TDEStdAccel::Redo));
   menu->insertSeparator();
   //#endif //BROKEN
-  menu->insertItem(i18n("Cut"), this, TQT_SLOT(slotCut()));
-  menu->insertItem(i18n("Copy"), this, TQT_SLOT(slotCopy()));
-  menu->insertItem(i18n("Paste"), this, TQT_SLOT(slotPasteClipboard()));
-  menu->insertItem(i18n("Mark All"),this, TQT_SLOT(slotMarkAll()));
+  menu->insertItem(i18n("Cut"), this, TQ_SLOT(slotCut()));
+  menu->insertItem(i18n("Copy"), this, TQ_SLOT(slotCopy()));
+  menu->insertItem(i18n("Paste"), this, TQ_SLOT(slotPasteClipboard()));
+  menu->insertItem(i18n("Mark All"),this, TQ_SLOT(slotMarkAll()));
   menu->insertSeparator();
-  menu->insertItem(i18n("Find..."), this, TQT_SLOT(slotFind()));
-  menu->insertItem(i18n("Replace..."), this, TQT_SLOT(slotReplace()));
+  menu->insertItem(i18n("Find..."), this, TQ_SLOT(slotFind()));
+  menu->insertItem(i18n("Replace..."), this, TQ_SLOT(slotReplace()));
   menu->insertSeparator();
-  menu->insertItem(i18n("Fixed Font Widths"), this, TQT_SLOT(slotUpdateFont()));
+  menu->insertItem(i18n("Fixed Font Widths"), this, TQ_SLOT(slotUpdateFont()));
   mEditor->installRBPopup(menu);
   */
   updateCursorPosition();
-  connect(mEditor,TQT_SIGNAL(CursorPositionChanged()),TQT_SLOT(updateCursorPosition()));
-  connect( mEditor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
-          this, TQT_SLOT( fontChanged( const TQFont & ) ) );
-  connect( mEditor, TQT_SIGNAL( currentAlignmentChanged( int ) ),
-          this, TQT_SLOT( alignmentChanged( int ) ) );
+  connect(mEditor,TQ_SIGNAL(CursorPositionChanged()),TQ_SLOT(updateCursorPosition()));
+  connect( mEditor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ),
+          this, TQ_SLOT( fontChanged( const TQFont & ) ) );
+  connect( mEditor, TQ_SIGNAL( currentAlignmentChanged( int ) ),
+          this, TQ_SLOT( alignmentChanged( int ) ) );
 
 }
 
@@ -1874,15 +1874,15 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
   // don't overwrite the header values with identity specific values
   // unless the identity is sticky
   if ( !stickyIdentity ) {
-    disconnect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
-               this, TQT_SLOT(slotIdentityChanged(uint)));
+    disconnect(mIdentity,TQ_SIGNAL(identityChanged(uint)),
+               this, TQ_SLOT(slotIdentityChanged(uint)));
   }
   // load the mId into the gui, sticky or not, without emitting
   mIdentity->setCurrentIdentity( mId );
   const uint idToApply = mId;
   if ( !stickyIdentity ) {
-    connect(mIdentity,TQT_SIGNAL(identityChanged(uint)),
-            this, TQT_SLOT(slotIdentityChanged(uint)));
+    connect(mIdentity,TQ_SIGNAL(identityChanged(uint)),
+            this, TQ_SLOT(slotIdentityChanged(uint)));
   }  else {
     // load the message's state into the mId, without applying it to the gui
     // that's so we can detect that the id changed (because a sticky was set)
@@ -2165,11 +2165,11 @@ void KMComposeWin::setMsg(KMMessage* newMsg, bool mayAutoSign,
     // Not user friendy if this modal fileseletor opens before the
     // composer.
     //
-    //TQTimer::singleShot( 200, this, TQT_SLOT(slotAppendSignature()) );
+    //TQTimer::singleShot( 200, this, TQ_SLOT(slotAppendSignature()) );
       if ( GlobalSettings::self()->prependSignature() ) {
-        TQTimer::singleShot( 0, this, TQT_SLOT(slotPrependSignature()) );
+        TQTimer::singleShot( 0, this, TQ_SLOT(slotPrependSignature()) );
       } else {
-        TQTimer::singleShot( 0, this, TQT_SLOT(slotAppendSignature()) );
+        TQTimer::singleShot( 0, this, TQ_SLOT(slotAppendSignature()) );
       }
   }
 
@@ -2358,8 +2358,8 @@ void KMComposeWin::applyChanges( bool dontSignNorEncrypt, bool dontDisable )
 
   // Make new job and execute it
   mComposer = new MessageComposer( this );
-  connect( mComposer, TQT_SIGNAL( done( bool ) ),
-           this, TQT_SLOT( slotComposerDone( bool ) ) );
+  connect( mComposer, TQ_SIGNAL( done( bool ) ),
+           this, TQ_SLOT( slotComposerDone( bool ) ) );
 
   // TODO: Add a cancel button for the following operations?
   // Disable any input to the window, so that we have a snapshot of the
@@ -2435,10 +2435,10 @@ bool KMComposeWin::addAttach(const KURL aUrl)
 
   mMapAtmLoadData.insert(job, ld);
   mAttachJobs[job] = aUrl;
-  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
-          this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
-  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-          this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
+  connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+          this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
   return true;
 }
 
@@ -2467,10 +2467,10 @@ void KMComposeWin::addAttach(const KMMessagePart* msgPart)
     mTempDir = 0;
   }
 
-  connect( lvi, TQT_SIGNAL( compress( int ) ),
-      this, TQT_SLOT( compressAttach( int ) ) );
-  connect( lvi, TQT_SIGNAL( uncompress( int ) ),
-      this, TQT_SLOT( uncompressAttach( int ) ) );
+  connect( lvi, TQ_SIGNAL( compress( int ) ),
+      this, TQ_SLOT( compressAttach( int ) ) );
+  connect( lvi, TQ_SIGNAL( uncompress( int ) ),
+      this, TQ_SLOT( uncompressAttach( int ) ) );
 
   slotUpdateAttachActions();
 }
@@ -3019,10 +3019,10 @@ void KMComposeWin::slotInsertRecentFile(const KURL& u)
     }
   }
   mMapAtmLoadData.insert(job, ld);
-  connect(job, TQT_SIGNAL(result(TDEIO::Job *)),
-          this, TQT_SLOT(slotAttachFileResult(TDEIO::Job *)));
-  connect(job, TQT_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
-          this, TQT_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
+  connect(job, TQ_SIGNAL(result(TDEIO::Job *)),
+          this, TQ_SLOT(slotAttachFileResult(TDEIO::Job *)));
+  connect(job, TQ_SIGNAL(data(TDEIO::Job *, const TQByteArray &)),
+          this, TQ_SLOT(slotAttachFileData(TDEIO::Job *, const TQByteArray &)));
 }
 
 
@@ -3149,8 +3149,8 @@ void KMComposeWin::startPublicKeyExport() {
   Kleo::ExportJob * job = Kleo::CryptoBackendFactory::instance()->openpgp()->publicKeyExportJob( true );
   assert( job );
 
-  connect( job, TQT_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
-	   this, TQT_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) );
+  connect( job, TQ_SIGNAL(result(const GpgME::Error&,const TQByteArray&)),
+	   this, TQ_SLOT(slotPublicKeyExportResult(const GpgME::Error&,const TQByteArray&)) );
 
   const GpgME::Error err = job->start( mFingerprint );
   if ( err )
@@ -3206,21 +3206,21 @@ void KMComposeWin::slotAttachPopupMenu(TQListViewItem *, const TQPoint &, int)
      mAttachMenu = new TQPopupMenu(this);
 
      mOpenId = mAttachMenu->insertItem(i18n("to open", "Open"), this,
-                             TQT_SLOT(slotAttachOpen()));
+                             TQ_SLOT(slotAttachOpen()));
      mOpenWithId = mAttachMenu->insertItem(i18n("Open With..."), this,
-                             TQT_SLOT(slotAttachOpenWith()));
+                             TQ_SLOT(slotAttachOpenWith()));
      mViewId = mAttachMenu->insertItem(i18n("to view", "View"), this,
-                             TQT_SLOT(slotAttachView()));
-     mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQT_SLOT(slotAttachEdit()) );
+                             TQ_SLOT(slotAttachView()));
+     mEditId = mAttachMenu->insertItem( i18n("Edit"), this, TQ_SLOT(slotAttachEdit()) );
      mEditWithId = mAttachMenu->insertItem( i18n("Edit With..."), this,
-                                            TQT_SLOT(slotAttachEditWith()) );
-     mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQT_SLOT(slotAttachRemove()));
+                                            TQ_SLOT(slotAttachEditWith()) );
+     mRemoveId = mAttachMenu->insertItem(i18n("Remove"), this, TQ_SLOT(slotAttachRemove()));
      mSaveAsId = mAttachMenu->insertItem( SmallIconSet("document-save-as"), i18n("Save As..."), this,
-                                          TQT_SLOT( slotAttachSave() ) );
+                                          TQ_SLOT( slotAttachSave() ) );
      mPropertiesId = mAttachMenu->insertItem( i18n("Properties"), this,
-                                              TQT_SLOT( slotAttachProperties() ) );
+                                              TQ_SLOT( slotAttachProperties() ) );
      mAttachMenu->insertSeparator();
-     mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQT_SLOT(slotAttachFile()));
+     mAttachMenu->insertItem(i18n("Add Attachment..."), this, TQ_SLOT(slotAttachFile()));
   }
 
   int selectedCount = 0;
@@ -3576,7 +3576,7 @@ void KMComposeWin::editAttach(int index, bool openWith)
   KMail::EditorWatcher *watcher =
           new KMail::EditorWatcher( KURL( atmTempFile->name() ), contentTypeStr, openWith,
                                     this, this );
-  connect( watcher, TQT_SIGNAL(editDone(KMail::EditorWatcher*)), TQT_SLOT(slotEditDone(KMail::EditorWatcher*)) );
+  connect( watcher, TQ_SIGNAL(editDone(KMail::EditorWatcher*)), TQ_SLOT(slotEditDone(KMail::EditorWatcher*)) );
   if ( watcher->start() ) {
     mEditorMap.insert( watcher, msgPart );
     mEditorTempFiles.insert( watcher, atmTempFile );
@@ -4082,15 +4082,15 @@ void KMComposeWin::ignoreStickyFields()
 void KMComposeWin::slotPrint()
 {
   mMessageWasModified = isModified();
-  connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
-           this, TQT_SLOT( slotContinuePrint( bool ) ) );
+  connect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+           this, TQ_SLOT( slotContinuePrint( bool ) ) );
   applyChanges( true );
 }
 
 void KMComposeWin::slotContinuePrint( bool rc )
 {
-  disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
-              this, TQT_SLOT( slotContinuePrint( bool ) ) );
+  disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+              this, TQ_SLOT( slotContinuePrint( bool ) ) );
 
   if( rc ) {
     if ( mComposedMessages.isEmpty() ) {
@@ -4220,8 +4220,8 @@ void KMComposeWin::doSend( KMail::MessageSender::SendMethod method,
 
   const bool neverEncrypt = ( mDisableBreaking && GlobalSettings::self()->neverEncryptDrafts() )
                            || mSigningAndEncryptionExplicitlyDisabled;
-  connect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
-           TQT_SLOT( slotContinueDoSend( bool ) ) );
+  connect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+           TQ_SLOT( slotContinueDoSend( bool ) ) );
 
   if ( mEditor->textFormat() == TQt::RichText )
     mMsg->setHeaderField( "X-KMail-Markup", "true" );
@@ -4333,8 +4333,8 @@ void KMComposeWin::slotContinueDoSend( bool sentOk )
 {
   kdDebug(5006) << "KMComposeWin::slotContinueDoSend( " << sentOk << " )"
                 << endl;
-  disconnect( this, TQT_SIGNAL( applyChangesDone( bool ) ),
-              this, TQT_SLOT( slotContinueDoSend( bool ) ) );
+  disconnect( this, TQ_SIGNAL( applyChangesDone( bool ) ),
+              this, TQ_SLOT( slotContinueDoSend( bool ) ) );
 
   if ( !sentOk ) {
     mDisableBreaking = false;
@@ -4735,8 +4735,8 @@ void KMComposeWin::slotSpellcheck()
   mSubjectTextWasSpellChecked = false;
   mSpellCheckInProgress=true;
   /*
-    connect (mEditor, TQT_SIGNAL (spellcheck_progress (unsigned)),
-    this, TQT_SLOT (spell_progress (unsigned)));
+    connect (mEditor, TQ_SIGNAL (spellcheck_progress (unsigned)),
+    this, TQ_SLOT (spell_progress (unsigned)));
     */
 
   mEditor->spellcheck();
@@ -4791,7 +4791,7 @@ void KMComposeWin::slotSpellcheckDone(int result)
       statusBar()->changeItem(i18n(" Spell check complete."),0);
       break;
   }
-  TQTimer::singleShot( 2000, this, TQT_SLOT(slotSpellcheckDoneClearStatus()) );
+  TQTimer::singleShot( 2000, this, TQ_SLOT(slotSpellcheckDoneClearStatus()) );
 }
 
 void KMComposeWin::slotSpellcheckDoneClearStatus()
@@ -5017,8 +5017,8 @@ void KMComposeWin::slotEditToolbars()
   saveMainWindowSettings(KMKernel::config(), "Composer");
   KEditToolbar dlg(guiFactory(), this);
 
-  connect( &dlg, TQT_SIGNAL(newToolbarConfig()),
-           TQT_SLOT(slotUpdateToolbars()) );
+  connect( &dlg, TQ_SIGNAL(newToolbarConfig()),
+           TQ_SLOT(slotUpdateToolbars()) );
 
   dlg.exec();
 }
@@ -5078,8 +5078,8 @@ void KMComposeWin::updateAutoSave()
   else {
     if ( !mAutoSaveTimer ) {
       mAutoSaveTimer = new TQTimer( this, "mAutoSaveTimer" );
-      connect( mAutoSaveTimer, TQT_SIGNAL( timeout() ),
-               this, TQT_SLOT( autoSaveMessage() ) );
+      connect( mAutoSaveTimer, TQ_SIGNAL( timeout() ),
+               this, TQ_SLOT( autoSaveMessage() ) );
     }
     mAutoSaveTimer->start( autoSaveInterval() );
   }
@@ -5410,7 +5410,7 @@ void KMComposeWin::slotAttachmentDragStarted()
 
 void KMComposeWin::recipientEditorSizeHintChanged()
 {
-  TQTimer::singleShot( 1, this, TQT_SLOT(setMaximumHeaderSize()) );
+  TQTimer::singleShot( 1, this, TQ_SLOT(setMaximumHeaderSize()) );
 }
 
 void KMComposeWin::setMaximumHeaderSize()