Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 3b3f9ec8f31978030c17309fae48335bea5c1587)

1 files changed, 25 insertions, 25 deletions

diff --git a/kmail/managesievescriptsdialog.cpp b/kmail/managesievescriptsdialog.cpp
index 560fac90e..bd8d99558 100644
--- a/kmail/managesievescriptsdialog.cpp
+++ b/kmail/managesievescriptsdialog.cpp
@@ -46,12 +46,12 @@ KMail::ManageSieveScriptsDialog::ManageSieveScriptsDialog( TQWidget * parent, co
   mListView->setResizeMode( TQListView::LastColumn );
   mListView->setRootIsDecorated( true );
   mListView->setSelectionMode( TQListView::Single );
-  connect( mListView, TQT_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
-           this, TQT_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) );
-  connect( mListView, TQT_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
-           this, TQT_SLOT(slotDoubleClicked(TQListViewItem*)) );
-  connect( mListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
-           this, TQT_SLOT(slotSelectionChanged(TQListViewItem*)) );
+  connect( mListView, TQ_SIGNAL(contextMenuRequested(TQListViewItem*,const TQPoint&,int)),
+           this, TQ_SLOT(slotContextMenuRequested(TQListViewItem*, const TQPoint&)) );
+  connect( mListView, TQ_SIGNAL(doubleClicked(TQListViewItem*,const TQPoint&,int)),
+           this, TQ_SLOT(slotDoubleClicked(TQListViewItem*)) );
+  connect( mListView, TQ_SIGNAL(selectionChanged(TQListViewItem*)),
+           this, TQ_SLOT(slotSelectionChanged(TQListViewItem*)) );
   vlay->addWidget( mListView );
 
   resize( 2 * sizeHint().width(), sizeHint().height() );
@@ -111,10 +111,10 @@ void KMail::ManageSieveScriptsDialog::slotRefresh() {
       if ( u.isEmpty() )
         continue;
       SieveJob * job = SieveJob::list( u );
-      connect( job, TQT_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)),
-               this, TQT_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) );
-      connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
-               this, TQT_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) );
+      connect( job, TQ_SIGNAL(item(KMail::SieveJob*,const TQString&,bool)),
+               this, TQ_SLOT(slotItem(KMail::SieveJob*,const TQString&,bool)) );
+      connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+               this, TQ_SLOT(slotResult(KMail::SieveJob*,bool,const TQString&,bool)) );
       mJobs.insert( job, last );
       mUrls.insert( last, u );
     } else {
@@ -162,12 +162,12 @@ void KMail::ManageSieveScriptsDialog::slotContextMenuRequested( TQListViewItem *
   mContextMenuItem = item;
   if ( item->depth() ) {
     // script items:
-    menu.insertItem( i18n( "Delete Script" ), this, TQT_SLOT(slotDeleteScript()) );
-    menu.insertItem( i18n( "Edit Script..." ), this, TQT_SLOT(slotEditScript()) );
-    menu.insertItem( i18n( "Deactivate Script" ), this, TQT_SLOT(slotDeactivateScript()) );
+    menu.insertItem( i18n( "Delete Script" ), this, TQ_SLOT(slotDeleteScript()) );
+    menu.insertItem( i18n( "Edit Script..." ), this, TQ_SLOT(slotEditScript()) );
+    menu.insertItem( i18n( "Deactivate Script" ), this, TQ_SLOT(slotDeactivateScript()) );
   } else {
     // top-levels:
-    menu.insertItem( i18n( "New Script..." ), this, TQT_SLOT(slotNewScript()) );
+    menu.insertItem( i18n( "New Script..." ), this, TQ_SLOT(slotNewScript()) );
   }
   menu.exec( p );
   mContextMenuItem = 0;
@@ -219,8 +219,8 @@ void KMail::ManageSieveScriptsDialog::changeActiveScript( TQCheckListItem * item
     job = SieveJob::activate( u );
   else
     job = SieveJob::desactivate( u );
-  connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
-           this, TQT_SLOT(slotRefresh()) );
+  connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+           this, TQ_SLOT(slotRefresh()) );
 }
 
 void KMail::ManageSieveScriptsDialog::slotDoubleClicked( TQListViewItem * i ) {
@@ -259,8 +259,8 @@ void KMail::ManageSieveScriptsDialog::slotDeleteScript() {
        != KMessageBox::Continue )
     return;
   SieveJob * job = SieveJob::del( u );
-  connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
-           this, TQT_SLOT(slotRefresh()) );
+  connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+           this, TQ_SLOT(slotRefresh()) );
 }
 
 void KMail::ManageSieveScriptsDialog::slotEditScript() {
@@ -277,8 +277,8 @@ void KMail::ManageSieveScriptsDialog::slotEditScript() {
   url.setFileName( mContextMenuItem->text( 0 ) );
   mCurrentURL = url;
   SieveJob * job = SieveJob::get( url );
-  connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
-           this, TQT_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) );
+  connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+           this, TQ_SLOT(slotGetResult(KMail::SieveJob*,bool,const TQString&,bool)) );
 }
 
 void KMail::ManageSieveScriptsDialog::slotNewScript() {
@@ -321,7 +321,7 @@ KMail::SieveEditor::SieveEditor( TQWidget * parent, const char * name )
   mTextEdit->setTextFormat( TQTextEdit::PlainText );
   mTextEdit->setWordWrap( TQTextEdit::NoWrap );
   mTextEdit->setFont( TDEGlobalSettings::fixedFont() );
-  connect( mTextEdit, TQT_SIGNAL( textChanged () ), TQT_SLOT( slotTextChanged() ) );
+  connect( mTextEdit, TQ_SIGNAL( textChanged () ), TQ_SLOT( slotTextChanged() ) );
   resize( 3 * sizeHint() );
 }
 
@@ -342,8 +342,8 @@ void KMail::ManageSieveScriptsDialog::slotGetResult( KMail::SieveJob *, bool suc
 
   mSieveEditor = new SieveEditor( this );
   mSieveEditor->setScript( script );
-  connect( mSieveEditor, TQT_SIGNAL(okClicked()), this, TQT_SLOT(slotSieveEditorOkClicked()) );
-  connect( mSieveEditor, TQT_SIGNAL(cancelClicked()), this, TQT_SLOT(slotSieveEditorCancelClicked()) );
+  connect( mSieveEditor, TQ_SIGNAL(okClicked()), this, TQ_SLOT(slotSieveEditorOkClicked()) );
+  connect( mSieveEditor, TQ_SIGNAL(cancelClicked()), this, TQ_SLOT(slotSieveEditorCancelClicked()) );
   mSieveEditor->show();
   mWasActive = isActive;
 }
@@ -352,8 +352,8 @@ void KMail::ManageSieveScriptsDialog::slotSieveEditorOkClicked() {
   if ( !mSieveEditor )
     return;
   SieveJob * job = SieveJob::put( mCurrentURL,mSieveEditor->script(), mWasActive, mWasActive );
-  connect( job, TQT_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
-           this, TQT_SLOT(slotPutResult(KMail::SieveJob*,bool)) );
+  connect( job, TQ_SIGNAL(result(KMail::SieveJob*,bool,const TQString&,bool)),
+           this, TQ_SLOT(slotPutResult(KMail::SieveJob*,bool)) );
 }
 
 void KMail::ManageSieveScriptsDialog::slotSieveEditorCancelClicked() {