Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

3 files changed, 60 insertions, 60 deletions

diff --git a/kaddressbook/features/distributionlistngwidget.cpp b/kaddressbook/features/distributionlistngwidget.cpp
index 4a4a20a2..181744ad 100644
--- a/kaddressbook/features/distributionlistngwidget.cpp
+++ b/kaddressbook/features/distributionlistngwidget.cpp
@@ -131,51 +131,51 @@ KAB::DistributionListNg::MainWidget::MainWidget( KAB::Core *core, TQWidget *pare
     mAddButton = new TQPushButton( this );
     mAddButton->setIconSet( SmallIconSet( "add" ) );
     TQToolTip::add( mAddButton, i18n( "Add distribution list" ) );
-    connect( mAddButton, TQT_SIGNAL(clicked()), core, TQT_SLOT(newDistributionList()) );
+    connect( mAddButton, TQ_SIGNAL(clicked()), core, TQ_SLOT(newDistributionList()) );
     buttonLayout->addWidget( mAddButton );
 
     mEditButton = new TQPushButton( this );
     mEditButton->setIconSet( SmallIconSet( "edit" ) );
     TQToolTip::add( mEditButton, i18n( "Edit distribution list" ) );
-    connect( mEditButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(editSelectedDistributionList()) );
+    connect( mEditButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(editSelectedDistributionList()) );
     buttonLayout->addWidget( mEditButton );
 
     mRemoveButton = new TQPushButton( this );
     mRemoveButton->setIconSet( SmallIconSet( "remove" ) );
     TQToolTip::add( mRemoveButton, i18n( "Remove distribution list" ) );
-    connect( mRemoveButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(deleteSelectedDistributionList()) );
+    connect( mRemoveButton, TQ_SIGNAL(clicked()), this, TQ_SLOT(deleteSelectedDistributionList()) );
     buttonLayout->addWidget( mRemoveButton );
 
     mListBox = new ListBox( this );
-    connect( mListBox, TQT_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
-             this, TQT_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) );
-    connect( mListBox, TQT_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ),
-             this, TQT_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) );
-    connect( mListBox, TQT_SIGNAL( highlighted( int ) ),
-             this, TQT_SLOT( itemSelected( int ) ) );
-    connect( mListBox, TQT_SIGNAL(doubleClicked(TQListBoxItem*)), TQT_SLOT(editSelectedDistributionList()) );
+    connect( mListBox, TQ_SIGNAL( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ),
+             this, TQ_SLOT( contextMenuRequested( TQListBoxItem*, const TQPoint& ) ) );
+    connect( mListBox, TQ_SIGNAL( dropped( const TQString &, const TDEABC::Addressee::List & ) ),
+             this, TQ_SLOT( contactsDropped( const TQString &, const TDEABC::Addressee::List & ) ) );
+    connect( mListBox, TQ_SIGNAL( highlighted( int ) ),
+             this, TQ_SLOT( itemSelected( int ) ) );
+    connect( mListBox, TQ_SIGNAL(doubleClicked(TQListBoxItem*)), TQ_SLOT(editSelectedDistributionList()) );
     layout->addWidget( mListBox );
 
-    connect( core, TQT_SIGNAL( contactsUpdated() ),
-             this, TQT_SLOT( updateEntries() ) );
-    connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
-             this, TQT_SLOT( updateEntries() ) );
+    connect( core, TQ_SIGNAL( contactsUpdated() ),
+             this, TQ_SLOT( updateEntries() ) );
+    connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+             this, TQ_SLOT( updateEntries() ) );
 
     // When contacts are changed, update both distr list combo and contents of displayed distr list
-    connect( core, TQT_SIGNAL( contactsUpdated() ),
-             this, TQT_SLOT( updateEntries() ) );
+    connect( core, TQ_SIGNAL( contactsUpdated() ),
+             this, TQ_SLOT( updateEntries() ) );
 
-    TQTimer::singleShot( 0, this, TQT_SLOT( updateEntries() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( updateEntries() ) );
 }
 
 void KAB::DistributionListNg::MainWidget::contextMenuRequested( TQListBoxItem *item, const TQPoint &point )
 {
     TQGuardedPtr<TDEPopupMenu> menu = new TDEPopupMenu( this );
-    menu->insertItem( i18n( "New Distribution List..." ), core(), TQT_SLOT( newDistributionList() ) );
+    menu->insertItem( i18n( "New Distribution List..." ), core(), TQ_SLOT( newDistributionList() ) );
     if ( item && ( item->text() !=i18n( "All Contacts" ) ) )
     {
-        menu->insertItem( i18n( "Edit..." ), this, TQT_SLOT( editSelectedDistributionList() ) );
-        menu->insertItem( i18n( "Delete" ), this, TQT_SLOT( deleteSelectedDistributionList() ) );
+        menu->insertItem( i18n( "Edit..." ), this, TQ_SLOT( editSelectedDistributionList() ) );
+        menu->insertItem( i18n( "Delete" ), this, TQ_SLOT( deleteSelectedDistributionList() ) );
     }
     menu->exec( point );
     delete menu;
diff --git a/kaddressbook/features/distributionlistwidget.cpp b/kaddressbook/features/distributionlistwidget.cpp
index 28a6f8ff..76324853 100644
--- a/kaddressbook/features/distributionlistwidget.cpp
+++ b/kaddressbook/features/distributionlistwidget.cpp
@@ -158,19 +158,19 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
 
   mNameCombo = new TQComboBox( this );
   topLayout->addWidget( mNameCombo, 0, 0 );
-  connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateContactView() ) );
+  connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateContactView() ) );
 
   mCreateListButton = new TQPushButton( i18n( "New List..." ), this );
   topLayout->addWidget( mCreateListButton, 0, 1 );
-  connect( mCreateListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( createList() ) );
+  connect( mCreateListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( createList() ) );
 
   mEditListButton = new TQPushButton( i18n( "Rename List..." ), this );
   topLayout->addWidget( mEditListButton, 0, 2 );
-  connect( mEditListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) );
+  connect( mEditListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) );
 
   mRemoveListButton = new TQPushButton( i18n( "Remove List" ), this );
   topLayout->addWidget( mRemoveListButton, 0, 3 );
-  connect( mRemoveListButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
+  connect( mRemoveListButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) );
 
   mContactView = new DistributionListView( this );
   mContactView->addColumn( i18n( "Name" ) );
@@ -180,40 +180,40 @@ DistributionListWidget::DistributionListWidget( KAB::Core *core, TQWidget *paren
   mContactView->setAllColumnsShowFocus( true );
   mContactView->setFullWidth( true );
   topLayout->addMultiCellWidget( mContactView, 1, 1, 0, 3 );
-  connect( mContactView, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( selectionContactViewChanged() ) );
-  connect( mContactView, TQT_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ),
-           TQT_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) );
+  connect( mContactView, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( selectionContactViewChanged() ) );
+  connect( mContactView, TQ_SIGNAL( dropped( TQDropEvent*, TQListViewItem* ) ),
+           TQ_SLOT( dropped( TQDropEvent*, TQListViewItem* ) ) );
 
   mAddContactButton = new TQPushButton( i18n( "Add Contact" ), this );
   mAddContactButton->setEnabled( false );
   topLayout->addWidget( mAddContactButton, 2, 0 );
-  connect( mAddContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addContact() ) );
+  connect( mAddContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addContact() ) );
 
   mEntryCountLabel = new TQLabel( this );
   topLayout->addWidget( mEntryCountLabel, 2, 1 );
 
   mChangeEmailButton = new TQPushButton( i18n( "Change Email..." ), this );
   topLayout->addWidget( mChangeEmailButton, 2, 2 );
-  connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
+  connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) );
 
   mRemoveContactButton = new TQPushButton( i18n( "Remove Contact" ), this );
   topLayout->addWidget( mRemoveContactButton, 2, 3 );
-  connect( mRemoveContactButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeContact() ) );
+  connect( mRemoveContactButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeContact() ) );
 
 #ifdef TDEPIM_NEW_DISTRLISTS
   // When contacts are changed, update both distr list combo and contents of displayed distr list
-  connect( core, TQT_SIGNAL( contactsUpdated() ),
-           this, TQT_SLOT( updateNameCombo() ) );
+  connect( core, TQ_SIGNAL( contactsUpdated() ),
+           this, TQ_SLOT( updateNameCombo() ) );
 #else
   mManager = new TDEABC::DistributionListManager( core->addressBook() );
 
-  connect( TDEABC::DistributionListWatcher::self(), TQT_SIGNAL( changed() ),
-           this, TQT_SLOT( updateNameCombo() ) );
+  connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ),
+           this, TQ_SLOT( updateNameCombo() ) );
 #endif
 
-  connect( core->addressBook(), TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
-           this, TQT_SLOT( updateNameCombo() ) );
+  connect( core->addressBook(), TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+           this, TQ_SLOT( updateNameCombo() ) );
 
   updateNameCombo();
 
diff --git a/kaddressbook/features/resourceselection.cpp b/kaddressbook/features/resourceselection.cpp
index 1d80c915..4a16c598 100644
--- a/kaddressbook/features/resourceselection.cpp
+++ b/kaddressbook/features/resourceselection.cpp
@@ -142,19 +142,19 @@ ResourceSelection::ResourceSelection( KAB::Core *core, TQWidget *parent, const c
   AddressBookWrapper *wrapper = static_cast<AddressBookWrapper*>( core->addressBook() );
   mManager = wrapper->getResourceManager();
 
-  connect( mAddButton, TQT_SIGNAL( clicked() ), TQT_SLOT( add() ) );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( edit() ) );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( remove() ) );
+  connect( mAddButton, TQ_SIGNAL( clicked() ), TQ_SLOT( add() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( edit() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( remove() ) );
 
-  connect( mListView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
-           TQT_SLOT( currentChanged( TQListViewItem* ) ) );
+  connect( mListView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+           TQ_SLOT( currentChanged( TQListViewItem* ) ) );
 
-  connect( mListView, TQT_SIGNAL( contextMenuRequested ( TQListViewItem *,
+  connect( mListView, TQ_SIGNAL( contextMenuRequested ( TQListViewItem *,
                                                      const TQPoint &, int ) ),
-           TQT_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
+           TQ_SLOT( contextMenuRequested( TQListViewItem *, const TQPoint &,
                                        int ) ) );
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( updateView() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( updateView() ) );
 }
 
 ResourceSelection::~ResourceSelection()
@@ -167,24 +167,24 @@ void ResourceSelection::contextMenuRequested ( TQListViewItem *i,
   ResourceItem *item = static_cast<ResourceItem *>( i );
 
   TQPopupMenu *menu = new TQPopupMenu( this );
-  connect( menu, TQT_SIGNAL( aboutToHide() ), menu, TQT_SLOT( deleteLater() ) );
+  connect( menu, TQ_SIGNAL( aboutToHide() ), menu, TQ_SLOT( deleteLater() ) );
   if ( item ) {
     int reloadId = menu->insertItem( i18n("Re&load"), this,
-                                     TQT_SLOT( reloadResource() ) );
+                                     TQ_SLOT( reloadResource() ) );
     menu->setItemEnabled( reloadId, item->resource()->isActive() );
     int saveId = menu->insertItem( i18n("&Save"), this,
-                                   TQT_SLOT( saveResource() ) );
+                                   TQ_SLOT( saveResource() ) );
     menu->setItemEnabled( saveId, item->resource()->isActive() );
     menu->insertSeparator();
 
-//     menu->insertItem( i18n("Show &Info"), this, TQT_SLOT( showInfo() ) );
+//     menu->insertItem( i18n("Show &Info"), this, TQ_SLOT( showInfo() ) );
 
-    menu->insertItem( i18n("&Edit..."), this, TQT_SLOT( edit() ) );
-    menu->insertItem( i18n("&Remove"), this, TQT_SLOT( remove() ) );
+    menu->insertItem( i18n("&Edit..."), this, TQ_SLOT( edit() ) );
+    menu->insertItem( i18n("&Remove"), this, TQ_SLOT( remove() ) );
 
     menu->insertSeparator();
  }
-  menu->insertItem( i18n("&Add..."), this, TQT_SLOT( add() ) );
+  menu->insertItem( i18n("&Add..."), this, TQ_SLOT( add() ) );
 
   menu->popup( pos );
 }
@@ -368,23 +368,23 @@ void ResourceSelection::updateView()
     KPIM::ResourceABC* resource = dynamic_cast<KPIM::ResourceABC *>( *it );
     if ( resource ) {
       disconnect( resource, 0, this, 0 );
-      connect( resource, TQT_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *,
+      connect( resource, TQ_SIGNAL( signalSubresourceAdded( KPIM::ResourceABC *,
                                                          const TQString &, const TQString & ) ),
-               TQT_SLOT( slotSubresourceAdded( KPIM::ResourceABC *,
+               TQ_SLOT( slotSubresourceAdded( KPIM::ResourceABC *,
                                            const TQString &, const TQString & ) ) );
 
-      connect( resource, TQT_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *,
+      connect( resource, TQ_SIGNAL( signalSubresourceRemoved( KPIM::ResourceABC *,
                                                            const TQString &, const TQString & ) ),
-               TQT_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *,
+               TQ_SLOT( slotSubresourceRemoved( KPIM::ResourceABC *,
                                              const TQString &, const TQString & ) ) );
 
-      connect( resource, TQT_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *,
+      connect( resource, TQ_SIGNAL( signalSubresourceChanged( KPIM::ResourceABC *,
                                                            const TQString &, const TQString & ) ),
-               TQT_SLOT( slotSubresourceChanged( KPIM::ResourceABC *,
+               TQ_SLOT( slotSubresourceChanged( KPIM::ResourceABC *,
                                              const TQString &, const TQString & ) ) );
 
-      //connect( resource, TQT_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ),
-      //         TQT_SLOT( closeResource( KPIM::ResourceABC * ) ) );
+      //connect( resource, TQ_SIGNAL( resourceSaved( KPIM::ResourceABC * ) ),
+      //         TQ_SLOT( closeResource( KPIM::ResourceABC * ) ) );
       item->createSubresourceItems();
     }
   }