Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

2 files changed, 12 insertions, 12 deletions

diff --git a/kaddressbook/interfaces/core.h b/kaddressbook/interfaces/core.h
index 05ab8d915..1c578e23b 100644
--- a/kaddressbook/interfaces/core.h
+++ b/kaddressbook/interfaces/core.h
@@ -155,32 +155,32 @@ class KDE_EXPORT Core : public TQObject
     virtual void setContactSelected( const TQString &uid ) = 0;
 
     /**
-      DCOP METHOD: Adds the given email address to address book.
+      DCOP method: Adds the given email address to address book.
      */
     virtual void addEmail( const TQString& addr ) = 0;
 
     /**
-      DCOP METHOD: Imports the vCard, located at the given url.
+      DCOP method: Imports the vCard, located at the given url.
      */
     virtual void importVCard( const KURL& url ) = 0;
 
     /**
-      DCOP METHOD: Imports the given vCard.
+      DCOP method: Imports the given vCard.
      */
     virtual void importVCardFromData( const TQString& vCard ) = 0;
 
     /**
-      DCOP METHOD: Opens contact editor to input a new contact.
+      DCOP method: Opens contact editor to input a new contact.
      */
     virtual void newContact() = 0;
 
     /**
-      DCOP METHOD: Opens distribution list editor to input a new distribution list.
+      DCOP method: Opens distribution list editor to input a new distribution list.
      */
     virtual void newDistributionList() = 0;
 
     /**
-      DCOP METHOD: Returns the name of the contact, that matches the given
+      DCOP method: Returns the name of the contact, that matches the given
                    phone number.
      */
     virtual TQString getNameByPhone( const TQString& phone ) = 0;
diff --git a/kaddressbook/interfaces/xxport.cpp b/kaddressbook/interfaces/xxport.cpp
index a2874e8c6..ca7da285f 100644
--- a/kaddressbook/interfaces/xxport.cpp
+++ b/kaddressbook/interfaces/xxport.cpp
@@ -50,10 +50,10 @@ XXPort::XXPort( TDEABC::AddressBook *ab, TQWidget *parent,
   d->mExportMapper = new TQSignalMapper( this );
   d->mImportMapper = new TQSignalMapper( this );
 
-  connect( d->mExportMapper, TQT_SIGNAL( mapped( const TQString& ) ),
-           TQT_SLOT( slotExportActivated( const TQString& ) ) );
-  connect( d->mImportMapper, TQT_SIGNAL( mapped( const TQString& ) ),
-           TQT_SLOT( slotImportActivated( const TQString& ) ) );
+  connect( d->mExportMapper, TQ_SIGNAL( mapped( const TQString& ) ),
+           TQ_SLOT( slotExportActivated( const TQString& ) ) );
+  connect( d->mImportMapper, TQ_SIGNAL( mapped( const TQString& ) ),
+           TQ_SLOT( slotImportActivated( const TQString& ) ) );
 }
 
 XXPort::~XXPort()
@@ -77,7 +77,7 @@ TDEABC::AddresseeList XXPort::importContacts( const TQString& ) const
 void XXPort::createImportAction( const TQString &label, const TQString &data )
 {
   TQString id = "file_import_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data );
-  TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
+  TDEAction *action = new TDEAction( label, 0, d->mImportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() );
 
   d->mImportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) );
 
@@ -87,7 +87,7 @@ void XXPort::createImportAction( const TQString &label, const TQString &data )
 void XXPort::createExportAction( const TQString &label, const TQString &data )
 {
   TQString id = "file_export_" + identifier() + ( data.isEmpty() ? TQString( "" ) : "_" + data );
-  TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQT_SLOT( map() ), actionCollection(), id.latin1() );
+  TDEAction *action = new TDEAction( label, 0, d->mExportMapper, TQ_SLOT( map() ), actionCollection(), id.latin1() );
 
   d->mExportMapper->setMapping( action, ( data.isEmpty() ? TQString( "<empty>" ) : data ) );