Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 67 insertions, 67 deletions

diff --git a/kmail/templatesinsertcommand.cpp b/kmail/templatesinsertcommand.cpp
index d629bc8e3..8817711c9 100644
--- a/kmail/templatesinsertcommand.cpp
+++ b/kmail/templatesinsertcommand.cpp
@@ -35,15 +35,15 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
   : TQPushButton( parent, name )
 {
   setText( i18n( "&Insert Command..." ) );
-  connect( this, TQT_SIGNAL( clicked() ),
-           this, TQT_SLOT( slotClicked() ) );
+  connect( this, TQ_SIGNAL( clicked() ),
+           this, TQ_SLOT( slotClicked() ) );
 
   TDEAction *action;
   TDEActionMenu *menu;
 
   TQSignalMapper *mapper = new TQSignalMapper( this );
-  connect( mapper, TQT_SIGNAL( mapped(int) ),
-           this, TQT_SLOT( slotMapped(int) ) );
+  connect( mapper, TQ_SIGNAL( mapped(int) ),
+           this, TQ_SLOT( slotMapped(int) ) );
 
   mMenu = new TDEActionMenu( i18n( "Insert Command..." ), this );
 
@@ -52,110 +52,110 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
   mMenu->insert( menu );
 
   action = new TDEAction( i18n("Quoted Message"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CQuote );
   menu->insert( action );
   action = new TDEAction( i18n("Message Text as Is"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CText );
   menu->insert( action );
   action = new TDEAction( i18n("Message Id"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COMsgId );
   menu->insert( action );
   action = new TDEAction( i18n("Date"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CODate );
   menu->insert( action );
   action = new TDEAction( i18n("Date in Short Format"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CODateShort );
   menu->insert( action );
   action = new TDEAction( i18n("Date in C Locale"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CODateEn );
   menu->insert( action );
   action = new TDEAction( i18n("Day of Week"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CODow );
   menu->insert( action );
   action = new TDEAction( i18n("Time"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COTime );
   menu->insert( action );
   action = new TDEAction( i18n("Time in Long Format"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COTimeLong );
   menu->insert( action );
   action = new TDEAction( i18n("Time in C Locale"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COTimeLongEn );
   menu->insert( action );
   action = new TDEAction( i18n("To Field Address"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COToAddr );
   menu->insert( action );
   action = new TDEAction( i18n("To Field Name"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COToName );
   menu->insert( action );
   action = new TDEAction( i18n("To Field First Name"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COToFName );
   menu->insert( action );
   action = new TDEAction( i18n("To Field Last Name"),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COToLName );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field Address" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COCCAddr );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COCCName );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field First Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COCCFName );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field Last Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COCCLName );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field Address" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COFromAddr );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COFromName );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field First Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COFromFName );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field Last Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COFromLName );
   menu->insert( action );
   action = new TDEAction( i18n( "Addresses of all original recipients" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COAddresseesAddr );
   action = new TDEAction( i18n( "Subject" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COFullSubject );
   menu->insert( action );
   action = new TDEAction( i18n( "Quoted Headers" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CTQHeaders );
   menu->insert( action );
   action = new TDEAction( i18n( "Headers as Is" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CHeaders );
   menu->insert( action );
   action = new TDEAction( i18n( "Header Content" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, COHeader );
   menu->insert( action );
 
@@ -164,91 +164,91 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
   mMenu->insert( menu );
 
   action = new TDEAction( i18n( "Message Id" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CMsgId );
   menu->insert( action );
   action = new TDEAction( i18n( "Date" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CDate );
   menu->insert( action );
   action = new TDEAction( i18n( "Date in Short Format" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CDateShort );
   menu->insert( action );
   action = new TDEAction( i18n( "Date in C Locale" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CDateEn );
   menu->insert( action );
   action = new TDEAction( i18n( "Day of Week" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CDow );
   menu->insert( action );
   action = new TDEAction( i18n( "Time" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CTime );
   menu->insert( action );
   action = new TDEAction( i18n( "Time in Long Format" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CTimeLong );
   menu->insert( action );
   action = new TDEAction( i18n( "Time in C Locale" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CTimeLongEn );
   menu->insert( action );
   action = new TDEAction( i18n( "To Field Address" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CToAddr );
   menu->insert( action );
   action = new TDEAction( i18n( "To Field Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CToName );
   menu->insert( action );
   action = new TDEAction( i18n( "To Field First Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CToFName );
   menu->insert( action );
   action = new TDEAction( i18n( "To Field Last Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CToLName );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field Address" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CCCAddr );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CCCName );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field First Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CCCFName );
   menu->insert( action );
   action = new TDEAction( i18n( "CC Field Last Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CCCLName );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field Address" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CFromAddr );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CFromName );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field First Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CFromFName );
   menu->insert( action );
   action = new TDEAction( i18n( "From Field Last Name" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CFromLName );
   menu->insert( action );
   action = new TDEAction( i18n( "Subject" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CFullSubject );
   menu->insert( action );
   action = new TDEAction( i18n( "Header Content" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CHeader );
   menu->insert( action );
 
@@ -257,27 +257,27 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
   mMenu->insert( menu );
 
   action = new TDEAction( i18n( "Insert Result of Command" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CSystem );
   menu->insert( action );
   action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Quoted Text" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CQuotePipe );
   menu->insert( action );
   action = new TDEAction( i18n( "Pipe Original Message Body and Insert Result as Is" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CTextPipe );
   menu->insert( action );
   action = new TDEAction( i18n( "Pipe Original Message with Headers and Insert Result as Is" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CMsgPipe );
   menu->insert( action );
   action = new TDEAction( i18n( "Pipe Current Message Body and Insert Result as Is" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CBodyPipe );
   menu->insert( action );
   action = new TDEAction( i18n( "Pipe Current Message Body and Replace with Result" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CClearPipe );
   menu->insert( action );
 
@@ -286,35 +286,35 @@ TemplatesInsertCommand::TemplatesInsertCommand( TQWidget *parent,
   mMenu->insert( menu );
 
   action = new TDEAction( i18n( "Set Cursor Position" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CCursor );
   menu->insert( action );
   action = new TDEAction( i18n( "Insert File Content" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CInsert );
   menu->insert( action );
   action = new TDEAction( i18n( "DNL" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CDnl );
   menu->insert( action );
   action = new TDEAction( i18n( "Template Comment" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CRem );
   menu->insert( action );
   action = new TDEAction( i18n( "No Operation" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CNop );
   menu->insert( action );
   action = new TDEAction( i18n( "Clear Generated Message" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CClear );
   menu->insert( action );
   action = new TDEAction( i18n( "Turn Debug On" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CDebug );
   menu->insert( action );
   action = new TDEAction( i18n( "Turn Debug Off" ),
-                        0, mapper, TQT_SLOT( map() ), menu );
+                        0, mapper, TQ_SLOT( map() ), menu );
   mapper->setMapping( action, CDebugOff );
   menu->insert( action );
 }