Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 65 insertions, 65 deletions

diff --git a/kmail/kmreaderwin.cpp b/kmail/kmreaderwin.cpp
index 0692ec7bd..feac1d07c 100644
--- a/kmail/kmreaderwin.cpp
+++ b/kmail/kmreaderwin.cpp
@@ -469,14 +469,14 @@ KMReaderWin::KMReaderWin(TQWidget *aParent,
 
   mLevelQuote = GlobalSettings::self()->collapseQuoteLevelSpin() - 1;
 
-  connect( &mUpdateReaderWinTimer, TQT_SIGNAL(timeout()),
-  	   this, TQT_SLOT(updateReaderWin()) );
-  connect( &mResizeTimer, TQT_SIGNAL(timeout()),
-  	   this, TQT_SLOT(slotDelayedResize()) );
-  connect( &mDelayedMarkTimer, TQT_SIGNAL(timeout()),
-           this, TQT_SLOT(slotTouchMessage()) );
-  connect( &mHeaderRefreshTimer, TQT_SIGNAL(timeout()),
-           this, TQT_SLOT(updateHeader()) );
+  connect( &mUpdateReaderWinTimer, TQ_SIGNAL(timeout()),
+  	   this, TQ_SLOT(updateReaderWin()) );
+  connect( &mResizeTimer, TQ_SIGNAL(timeout()),
+  	   this, TQ_SLOT(slotDelayedResize()) );
+  connect( &mDelayedMarkTimer, TQ_SIGNAL(timeout()),
+           this, TQ_SLOT(slotTouchMessage()) );
+  connect( &mHeaderRefreshTimer, TQ_SIGNAL(timeout()),
+           this, TQ_SLOT(updateHeader()) );
 
 }
 
@@ -491,46 +491,46 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
     new TDEActionMenu( i18n("View->", "&Headers"), ac, "view_headers" );
   headerMenu->setToolTip( i18n("Choose display style of message headers") );
 
-  connect( headerMenu, TQT_SIGNAL(activated()),
-           this, TQT_SLOT(slotCycleHeaderStyles()) );
+  connect( headerMenu, TQ_SIGNAL(activated()),
+           this, TQ_SLOT(slotCycleHeaderStyles()) );
 
   raction = new TDERadioAction( i18n("View->headers->", "&Enterprise Headers"), 0,
-                              this, TQT_SLOT(slotEnterpriseHeaders()),
+                              this, TQ_SLOT(slotEnterpriseHeaders()),
                               ac, "view_headers_enterprise" );
   raction->setToolTip( i18n("Show the list of headers in Enterprise style") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert(raction);
 
   raction = new TDERadioAction( i18n("View->headers->", "&Fancy Headers"), 0,
-                              this, TQT_SLOT(slotFancyHeaders()),
+                              this, TQ_SLOT(slotFancyHeaders()),
                               ac, "view_headers_fancy" );
   raction->setToolTip( i18n("Show the list of headers in a fancy format") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
   raction = new TDERadioAction( i18n("View->headers->", "&Brief Headers"), 0,
-                              this, TQT_SLOT(slotBriefHeaders()),
+                              this, TQ_SLOT(slotBriefHeaders()),
                               ac, "view_headers_brief" );
   raction->setToolTip( i18n("Show brief list of message headers") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
   raction = new TDERadioAction( i18n("View->headers->", "&Standard Headers"), 0,
-                              this, TQT_SLOT(slotStandardHeaders()),
+                              this, TQ_SLOT(slotStandardHeaders()),
                               ac, "view_headers_standard" );
   raction->setToolTip( i18n("Show standard list of message headers") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
   raction = new TDERadioAction( i18n("View->headers->", "&Long Headers"), 0,
-                              this, TQT_SLOT(slotLongHeaders()),
+                              this, TQ_SLOT(slotLongHeaders()),
                               ac, "view_headers_long" );
   raction->setToolTip( i18n("Show long list of message headers") );
   raction->setExclusiveGroup( "view_headers_group" );
   headerMenu->insert( raction );
 
   raction = new TDERadioAction( i18n("View->headers->", "&All Headers"), 0,
-                              this, TQT_SLOT(slotAllHeaders()),
+                              this, TQ_SLOT(slotAllHeaders()),
                               ac, "view_headers_all" );
   raction->setToolTip( i18n("Show all message headers") );
   raction->setExclusiveGroup( "view_headers_group" );
@@ -540,39 +540,39 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
   TDEActionMenu *attachmentMenu =
     new TDEActionMenu( i18n("View->", "&Attachments"), ac, "view_attachments" );
   attachmentMenu->setToolTip( i18n("Choose display style of attachments") );
-  connect( attachmentMenu, TQT_SIGNAL(activated()),
-           this, TQT_SLOT(slotCycleAttachmentStrategy()) );
+  connect( attachmentMenu, TQ_SIGNAL(activated()),
+           this, TQ_SLOT(slotCycleAttachmentStrategy()) );
 
   raction = new TDERadioAction( i18n("View->attachments->", "&As Icons"), 0,
-                              this, TQT_SLOT(slotIconicAttachments()),
+                              this, TQ_SLOT(slotIconicAttachments()),
                               ac, "view_attachments_as_icons" );
   raction->setToolTip( i18n("Show all attachments as icons. Click to see them.") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
   raction = new TDERadioAction( i18n("View->attachments->", "&Smart"), 0,
-                              this, TQT_SLOT(slotSmartAttachments()),
+                              this, TQ_SLOT(slotSmartAttachments()),
                               ac, "view_attachments_smart" );
   raction->setToolTip( i18n("Show attachments as suggested by sender.") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
   raction = new TDERadioAction( i18n("View->attachments->", "&Inline"), 0,
-                              this, TQT_SLOT(slotInlineAttachments()),
+                              this, TQ_SLOT(slotInlineAttachments()),
                               ac, "view_attachments_inline" );
   raction->setToolTip( i18n("Show all attachments inline (if possible)") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
   raction = new TDERadioAction( i18n("View->attachments->", "&Hide"), 0,
-                              this, TQT_SLOT(slotHideAttachments()),
+                              this, TQ_SLOT(slotHideAttachments()),
                               ac, "view_attachments_hide" );
   raction->setToolTip( i18n("Do not show attachments in the message viewer") );
   raction->setExclusiveGroup( "view_attachments_group" );
   attachmentMenu->insert( raction );
 
   mHeaderOnlyAttachmentsAction = new TDERadioAction( i18n( "View->attachments->", "In Header &Only" ), 0,
-                              this, TQT_SLOT( slotHeaderOnlyAttachments() ),
+                              this, TQ_SLOT( slotHeaderOnlyAttachments() ),
                               ac, "view_attachments_headeronly" );
   mHeaderOnlyAttachmentsAction->setToolTip( i18n( "Show Attachments only in the header of the mail" ) );
   mHeaderOnlyAttachmentsAction->setExclusiveGroup( "view_attachments_group" );
@@ -580,7 +580,7 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
 
   // Set Encoding submenu
   mSelectEncodingAction = new TDESelectAction( i18n( "&Set Encoding" ), "charset", 0,
-                                 this, TQT_SLOT( slotSetEncoding() ),
+                                 this, TQ_SLOT( slotSetEncoding() ),
                                  ac, "encoding" );
   TQStringList encodings = KMMsgBase::supportedEncodings( false );
   encodings.prepend( i18n( "Auto" ) );
@@ -588,45 +588,45 @@ void KMReaderWin::createActions( TDEActionCollection * ac ) {
   mSelectEncodingAction->setCurrentItem( 0 );
 
   mMailToComposeAction = new TDEAction( i18n("New Message To..."), "mail-message-new",
-                                      0, this, TQT_SLOT(slotMailtoCompose()), ac,
+                                      0, this, TQ_SLOT(slotMailtoCompose()), ac,
                                       "mailto_compose" );
   mMailToReplyAction = new TDEAction( i18n("Reply To..."), "mail-reply-sender",
-                                    0, this, TQT_SLOT(slotMailtoReply()), ac,
+                                    0, this, TQ_SLOT(slotMailtoReply()), ac,
 				    "mailto_reply" );
   mMailToForwardAction = new TDEAction( i18n("Forward To..."), "mail-forward",
-                                      0, this, TQT_SLOT(slotMailtoForward()), ac,
+                                      0, this, TQ_SLOT(slotMailtoForward()), ac,
                                       "mailto_forward" );
   mAddAddrBookAction = new TDEAction( i18n("Add to Address Book"),
-				    0, this, TQT_SLOT(slotMailtoAddAddrBook()),
+				    0, this, TQ_SLOT(slotMailtoAddAddrBook()),
 				    ac, "add_addr_book" );
   mOpenAddrBookAction = new TDEAction( i18n("Open in Address Book"),
-                                     0, this, TQT_SLOT(slotMailtoOpenAddrBook()),
+                                     0, this, TQ_SLOT(slotMailtoOpenAddrBook()),
                                      ac, "openin_addr_book" );
-  mCopyAction = KStdAction::copy( this, TQT_SLOT(slotCopySelectedText()), ac, "kmail_copy");
+  mCopyAction = KStdAction::copy( this, TQ_SLOT(slotCopySelectedText()), ac, "kmail_copy");
   mSelectAllAction = new TDEAction( i18n("Select All Text"), CTRL+SHIFT+Key_A, this,
-                                  TQT_SLOT(selectAll()), ac, "mark_all_text" );
+                                  TQ_SLOT(selectAll()), ac, "mark_all_text" );
   mCopyURLAction = new TDEAction( i18n("Copy Link Address"), 0, this,
-				TQT_SLOT(slotUrlCopy()), ac, "copy_url" );
+				TQ_SLOT(slotUrlCopy()), ac, "copy_url" );
   mUrlOpenAction = new TDEAction( i18n("Open URL"), 0, this,
-                                TQT_SLOT(slotUrlOpen()), ac, "open_url" );
+                                TQ_SLOT(slotUrlOpen()), ac, "open_url" );
   mAddBookmarksAction = new TDEAction( i18n("Bookmark This Link"),
                                      "bookmark_add",
-                                     0, this, TQT_SLOT(slotAddBookmarks()),
+                                     0, this, TQ_SLOT(slotAddBookmarks()),
                                      ac, "add_bookmarks" );
   mUrlSaveAsAction = new TDEAction( i18n("Save Link As..."), 0, this,
-                                  TQT_SLOT(slotUrlSave()), ac, "saveas_url" );
+                                  TQ_SLOT(slotUrlSave()), ac, "saveas_url" );
 
   mToggleFixFontAction = new TDEToggleAction( i18n("Use Fi&xed Font"),
-                                            Key_X, this, TQT_SLOT(slotToggleFixedFont()),
+                                            Key_X, this, TQ_SLOT(slotToggleFixedFont()),
                                             ac, "toggle_fixedfont" );
 
   mToggleMimePartTreeAction = new TDEToggleAction( i18n("Show Message Structure"),
                                             0, ac, "toggle_mimeparttree" );
-  connect(mToggleMimePartTreeAction, TQT_SIGNAL(toggled(bool)),
-          this, TQT_SLOT(slotToggleMimePartTree()));
+  connect(mToggleMimePartTreeAction, TQ_SIGNAL(toggled(bool)),
+          this, TQ_SLOT(slotToggleMimePartTree()));
 
   mStartIMChatAction = new TDEAction( i18n("Chat &With..."), 0, this,
-				    TQT_SLOT(slotIMChat()), ac, "start_im_chat" );
+				    TQ_SLOT(slotIMChat()), ac, "start_im_chat" );
 }
 
 // little helper function
@@ -1021,17 +1021,17 @@ void KMReaderWin::initHtmlWidget(void)
 #endif
 
   connect(mViewer->browserExtension(),
-          TQT_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this,
-          TQT_SLOT(slotUrlOpen(const KURL &)));
+          TQ_SIGNAL(openURLRequest(const KURL &, const KParts::URLArgs &)),this,
+          TQ_SLOT(slotUrlOpen(const KURL &)));
   connect(mViewer->browserExtension(),
-          TQT_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this,
-          TQT_SLOT(slotUrlOpen(const KURL &)));
-  connect(mViewer,TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
-          TQT_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
-  connect( kmkernel->imProxy(), TQT_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
-          this, TQT_SLOT( contactStatusChanged( const TQString & ) ) );
-  connect( kmkernel->imProxy(), TQT_SIGNAL( sigPresenceInfoExpired() ),
-          this, TQT_SLOT( updateReaderWin() ) );
+          TQ_SIGNAL(createNewWindow(const KURL &, const KParts::URLArgs &)),this,
+          TQ_SLOT(slotUrlOpen(const KURL &)));
+  connect(mViewer,TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
+          TQ_SLOT(slotUrlPopup(const TQString &, const TQPoint &)));
+  connect( kmkernel->imProxy(), TQ_SIGNAL( sigContactPresenceChanged( const TQString & ) ),
+          this, TQ_SLOT( contactStatusChanged( const TQString & ) ) );
+  connect( kmkernel->imProxy(), TQ_SIGNAL( sigPresenceInfoExpired() ),
+          this, TQ_SLOT( updateReaderWin() ) );
 }
 
 void KMReaderWin::contactStatusChanged( const TQString &uid)
@@ -1497,7 +1497,7 @@ void KMReaderWin::displayMessage() {
   htmlWriter()->queue("</body></html>");
   htmlWriter()->flush();
 
-  TQTimer::singleShot( 1, this, TQT_SLOT(injectAttachments()) );
+  TQTimer::singleShot( 1, this, TQ_SLOT(injectAttachments()) );
 }
 
 static bool message_was_saved_decrypted_before( const KMMessage * msg ) {
@@ -2065,7 +2065,7 @@ void KMReaderWin::showAttachmentPopup( int id, const TQString & name, const TQPo
     menu->insertItem( i18n("Scroll To"), 10 );
   }
 
-  connect(menu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHandleAttachment(int)));
+  connect(menu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotHandleAttachment(int)));
   menu->exec( p ,0 );
   delete menu;
 }
@@ -2105,8 +2105,8 @@ void KMReaderWin::slotHandleAttachment( int choice )
   KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand(
       node, message(), mAtmCurrent, mAtmCurrentName,
       KMHandleAttachmentCommand::AttachmentAction( choice ), 0, this );
-  connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
-      this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+  connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ),
+      this, TQ_SLOT( slotAtmView( int, const TQString& ) ) );
   command->start();
   } else if ( choice == 7 ) {
     slotDeleteAttachment( node );
@@ -2393,8 +2393,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
     KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node,
         message(), mAtmCurrent, mAtmCurrentName, KMHandleAttachmentCommand::Save,
         offer, this );
-    connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
-        this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+    connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ),
+        this, TQ_SLOT( slotAtmView( int, const TQString& ) ) );
     command->start();
   }
   else if( choice == KMessageBox::No ) {	// Open
@@ -2403,8 +2403,8 @@ void KMReaderWin::openAttachment( int id, const TQString & name )
     mAtmUpdate = true;
     KMHandleAttachmentCommand* command = new KMHandleAttachmentCommand( node,
         message(), mAtmCurrent, mAtmCurrentName, action, offer, this );
-    connect( command, TQT_SIGNAL( showAttachment( int, const TQString& ) ),
-        this, TQT_SLOT( slotAtmView( int, const TQString& ) ) );
+    connect( command, TQ_SIGNAL( showAttachment( int, const TQString& ) ),
+        this, TQ_SLOT( slotAtmView( int, const TQString& ) ) );
     command->start();
   } else {					// Cancel
     kdDebug(5006) << "Canceled opening attachment" << endl;
@@ -2853,10 +2853,10 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
   if ( msg && nodeId != -1 ) {
     KMDeleteAttachmentCommand* command = new KMDeleteAttachmentCommand( nodeId, msg, this );
     command->start();
-    connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
-             this, TQT_SLOT( updateReaderWin() ) );
-    connect( command, TQT_SIGNAL( completed( KMCommand * ) ),
-             this, TQT_SLOT( disconnectMsgAdded() ) );
+    connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+             this, TQ_SLOT( updateReaderWin() ) );
+    connect( command, TQ_SIGNAL( completed( KMCommand * ) ),
+             this, TQ_SLOT( disconnectMsgAdded() ) );
 
     // ### HACK: Since the command will do delete + add, a new message will arrive. However, we don't
     // want the selection to change. Therefore, as soon as a new message arrives, select it, and then
@@ -2864,8 +2864,8 @@ void KMReaderWin::slotDeleteAttachment(partNode * node)
     // Of course the are races, another message can arrive before ours, but we take the risk.
     // And it won't work properly with multiple main windows
     const KMHeaders * const headers = KMKernel::self()->getKMMainWidget()->headers();
-    connect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
-             this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+    connect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
+             this, TQ_SLOT( msgAdded( TQListViewItem* ) ) );
   }
 
   // If we are operating on a copy of parts of the message, make sure to update the copy as well.
@@ -2890,8 +2890,8 @@ void KMReaderWin::msgAdded( TQListViewItem *item )
 void KMReaderWin::disconnectMsgAdded()
 {
   const KMHeaders *const headers = KMKernel::self()->getKMMainWidget()->headers();
-  disconnect( headers, TQT_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
-              this, TQT_SLOT( msgAdded( TQListViewItem* ) ) );
+  disconnect( headers, TQ_SIGNAL( msgAddedToListView( TQListViewItem* ) ),
+              this, TQ_SLOT( msgAdded( TQListViewItem* ) ) );
 }
 
 void KMReaderWin::slotEditAttachment(partNode * node)