Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7)

22 files changed, 165 insertions, 165 deletions

diff --git a/tdeabc/HOWTO b/tdeabc/HOWTO
index 199e48646..d53cd8725 100644
--- a/tdeabc/HOWTO
+++ b/tdeabc/HOWTO
@@ -365,8 +365,8 @@ changed. So to make your application aware of changes use the following code:
 
      #include <tdeabc/distributionlist.h>
 
- 1:  connect( TDEABC::DistributionListWatcher::self(), SIGNAL( changed() ),
- 2:           this, SLOT( slotDistributionListChanged() ) );
+ 1:  connect( TDEABC::DistributionListWatcher::self(), TQ_SIGNAL( changed() ),
+ 2:           this, TQ_SLOT( slotDistributionListChanged() ) );
 
 You see, as usual, easy ;)
 
diff --git a/tdeabc/addressbook.cpp b/tdeabc/addressbook.cpp
index b9d239ef4..a472b2bd0 100644
--- a/tdeabc/addressbook.cpp
+++ b/tdeabc/addressbook.cpp
@@ -711,15 +711,15 @@ bool AddressBook::addResource( Resource *resource )
   d->mManager->add( resource );
   resource->setAddressBook( this );
 
-  connect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ),
-           this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
-  connect( resource, TQT_SIGNAL( savingFinished( Resource* ) ),
-           this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
+  connect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ),
+           this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) );
+  connect( resource, TQ_SIGNAL( savingFinished( Resource* ) ),
+           this, TQ_SLOT( resourceSavingFinished( Resource* ) ) );
 
-  connect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
-           this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
-  connect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
-           this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
+  connect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ),
+           this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+  connect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ),
+           this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
 
   return true;
 }
@@ -733,15 +733,15 @@ bool AddressBook::removeResource( Resource *resource )
 
   resource->setAddressBook( 0 );
 
-  disconnect( resource, TQT_SIGNAL( loadingFinished( Resource* ) ),
-              this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
-  disconnect( resource, TQT_SIGNAL( savingFinished( Resource* ) ),
-              this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
+  disconnect( resource, TQ_SIGNAL( loadingFinished( Resource* ) ),
+              this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) );
+  disconnect( resource, TQ_SIGNAL( savingFinished( Resource* ) ),
+              this, TQ_SLOT( resourceSavingFinished( Resource* ) ) );
 
-  disconnect( resource, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
-              this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
-  disconnect( resource, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
-              this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+  disconnect( resource, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ),
+              this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+  disconnect( resource, TQ_SIGNAL( savingError( Resource*, const TQString& ) ),
+              this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
 
   d->mManager->remove( resource );
 
diff --git a/tdeabc/addresseedialog.cpp b/tdeabc/addresseedialog.cpp
index 657878546..73e7b7172 100644
--- a/tdeabc/addresseedialog.cpp
+++ b/tdeabc/addresseedialog.cpp
@@ -72,15 +72,15 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
   mAddresseeList->setAllColumnsShowFocus( true );
   mAddresseeList->setFullWidth( true );
   listLayout->addWidget( mAddresseeList );
-  connect( mAddresseeList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           TQT_SLOT( slotOk() ) );
-  connect( mAddresseeList, TQT_SIGNAL( selectionChanged( TQListViewItem * ) ),
-           TQT_SLOT( updateEdit( TQListViewItem * ) ) );
+  connect( mAddresseeList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           TQ_SLOT( slotOk() ) );
+  connect( mAddresseeList, TQ_SIGNAL( selectionChanged( TQListViewItem * ) ),
+           TQ_SLOT( updateEdit( TQListViewItem * ) ) );
 
   mAddresseeEdit = new KLineEdit( topWidget );
   mAddresseeEdit->setCompletionMode( TDEGlobalSettings::CompletionAuto );
-  connect( mAddresseeEdit->completionObject(), TQT_SIGNAL( match( const TQString & ) ),
-           TQT_SLOT( selectItem( const TQString & ) ) );
+  connect( mAddresseeEdit->completionObject(), TQ_SIGNAL( match( const TQString & ) ),
+           TQ_SLOT( selectItem( const TQString & ) ) );
   mAddresseeEdit->setFocus();
   mAddresseeEdit->completionObject()->setIgnoreCase( true );
   listLayout->addWidget( mAddresseeEdit );
@@ -101,23 +101,23 @@ AddresseeDialog::AddresseeDialog( TQWidget *parent, bool multiple ) :
     mSelectedList->addColumn( i18n("Email") );
     mSelectedList->setAllColumnsShowFocus( true );
     mSelectedList->setFullWidth( true );
-    connect( mSelectedList, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-             TQT_SLOT( removeSelected() ) );
+    connect( mSelectedList, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+             TQ_SLOT( removeSelected() ) );
 
     TQPushButton *unselectButton = new TQPushButton( i18n("Unselect"), selectedGroup );
-    connect ( unselectButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeSelected() ) );
+    connect ( unselectButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeSelected() ) );
 
-    connect( mAddresseeList, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-             TQT_SLOT( addSelected( TQListViewItem * ) ) );
+    connect( mAddresseeList, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+             TQ_SLOT( addSelected( TQListViewItem * ) ) );
 
     setInitialSize( TQSize( 650, 350 ) );
   }
 
   mAddressBook = StdAddressBook::self( true );
-  connect( mAddressBook, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
-           TQT_SLOT( addressBookChanged() ) );
-  connect( mAddressBook, TQT_SIGNAL( loadingFinished( Resource* ) ),
-           TQT_SLOT( addressBookChanged() ) );
+  connect( mAddressBook, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+           TQ_SLOT( addressBookChanged() ) );
+  connect( mAddressBook, TQ_SIGNAL( loadingFinished( Resource* ) ),
+           TQ_SLOT( addressBookChanged() ) );
 
   loadAddressBook();
 }
diff --git a/tdeabc/addresslineedit.cpp b/tdeabc/addresslineedit.cpp
index 1b4911318..ef6537e28 100644
--- a/tdeabc/addresslineedit.cpp
+++ b/tdeabc/addresslineedit.cpp
@@ -104,22 +104,22 @@ void AddressLineEdit::init()
         ldapSearchDeleter.setObject( s_LDAPSearch, new LdapSearch );
         ldapTextDeleter.setObject( s_LDAPText, new TQString );
       }
-      connect( s_LDAPTimer, TQT_SIGNAL( timeout()), TQT_SLOT( slotStartLDAPLookup()));
-      connect( s_LDAPSearch, TQT_SIGNAL( searchData( const TQStringList& )),
-        TQT_SLOT( slotLDAPSearchData( const TQStringList& )));
+      connect( s_LDAPTimer, TQ_SIGNAL( timeout()), TQ_SLOT( slotStartLDAPLookup()));
+      connect( s_LDAPSearch, TQ_SIGNAL( searchData( const TQStringList& )),
+        TQ_SLOT( slotLDAPSearchData( const TQStringList& )));
   }
 
   if ( m_useCompletion && !m_completionInitialized )
   {
       setCompletionObject( s_completion, false ); // we handle it ourself
-      connect( this, TQT_SIGNAL( completion(const TQString&)),
-               this, TQT_SLOT(slotCompletion() ));
+      connect( this, TQ_SIGNAL( completion(const TQString&)),
+               this, TQ_SLOT(slotCompletion() ));
       
       TDECompletionBox *box = completionBox();
-      connect( box, TQT_SIGNAL( highlighted( const TQString& )),
-               this, TQT_SLOT( slotPopupCompletion( const TQString& ) ));
-      connect( box, TQT_SIGNAL( userCancelled( const TQString& )),
-               TQT_SLOT( userCancelled( const TQString& )));
+      connect( box, TQ_SIGNAL( highlighted( const TQString& )),
+               this, TQ_SLOT( slotPopupCompletion( const TQString& ) ));
+      connect( box, TQ_SIGNAL( userCancelled( const TQString& )),
+               TQ_SLOT( userCancelled( const TQString& )));
 
       m_completionInitialized = true; // don't connect muliple times. That's
                                       // ugly, tho, better have completionBox()
diff --git a/tdeabc/distributionlist.cpp b/tdeabc/distributionlist.cpp
index 496883d15..3456418de 100644
--- a/tdeabc/distributionlist.cpp
+++ b/tdeabc/distributionlist.cpp
@@ -275,7 +275,7 @@ DistributionListWatcher::DistributionListWatcher()
   mDirWatch = new KDirWatch;
   mDirWatch->addFile( locateLocal( "data", "tdeabc/distlists" ) );
   
-  connect( mDirWatch, TQT_SIGNAL( dirty( const TQString& ) ), TQT_SIGNAL( changed() ) );
+  connect( mDirWatch, TQ_SIGNAL( dirty( const TQString& ) ), TQ_SIGNAL( changed() ) );
   mDirWatch->startScan();
 }
 
diff --git a/tdeabc/distributionlist.h b/tdeabc/distributionlist.h
index acd4ee22b..ef1b1fece 100644
--- a/tdeabc/distributionlist.h
+++ b/tdeabc/distributionlist.h
@@ -182,7 +182,7 @@ class KABC_EXPORT DistributionListManager
   \code
   TDEABC::DistributionListWatcher *watchdog = TDEABC::DistributionListWatcher::self()
 
-  connect( watchdog, TQT_SIGNAL( changed() ), TQT_SLOT( doSomething() ) );
+  connect( watchdog, TQ_SIGNAL( changed() ), TQ_SLOT( doSomething() ) );
   \endcode
 */
 
diff --git a/tdeabc/distributionlistdialog.cpp b/tdeabc/distributionlistdialog.cpp
index 5db7c976e..9d424a927 100644
--- a/tdeabc/distributionlistdialog.cpp
+++ b/tdeabc/distributionlistdialog.cpp
@@ -46,7 +46,7 @@ DistributionListDialog::DistributionListDialog( AddressBook *addressBook, TQWidg
   mEditor = new DistributionListEditorWidget( addressBook, this );
   setMainWidget( mEditor );
 
-  connect( this, TQT_SIGNAL( okClicked() ), mEditor, TQT_SLOT( save() ) );
+  connect( this, TQ_SIGNAL( okClicked() ), mEditor, TQ_SLOT( save() ) );
 }
 
 DistributionListDialog::~DistributionListDialog()
@@ -147,19 +147,19 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
 
   mNameCombo = new TQComboBox( this );
   nameLayout->addWidget( mNameCombo );
-  connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) );
+  connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) );
 
   mNewButton = new TQPushButton( i18n("New List..."), this );
   nameLayout->addWidget( mNewButton );
-  connect( mNewButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) );
+  connect( mNewButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) );
 
   mEditButton = new TQPushButton( i18n("Rename List..."), this );
   nameLayout->addWidget( mEditButton );
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editList() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editList() ) );
 
   mRemoveButton = new TQPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( mRemoveButton );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) );
 
   TQGridLayout *gridLayout = new TQGridLayout( topLayout, 3, 3 );
   gridLayout->setColStretch(1, 1);
@@ -175,15 +175,15 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
   mAddresseeView->addColumn( i18n("Preferred Email") );
   mAddresseeView->setAllColumnsShowFocus( true );
   gridLayout->addWidget( mAddresseeView, 1, 0 );
-  connect( mAddresseeView, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelectionAddresseeViewChanged() ) );
-  connect( mAddresseeView, TQT_SIGNAL( doubleClicked( TQListViewItem * ) ),
-           TQT_SLOT( addEntry() ) );
+  connect( mAddresseeView, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelectionAddresseeViewChanged() ) );
+  connect( mAddresseeView, TQ_SIGNAL( doubleClicked( TQListViewItem * ) ),
+           TQ_SLOT( addEntry() ) );
 
   mAddEntryButton = new TQPushButton( i18n("Add Entry"), this );
   mAddEntryButton->setEnabled(false);
   gridLayout->addWidget( mAddEntryButton, 2, 0 );
-  connect( mAddEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) );
+  connect( mAddEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) );
 
   mEntryView = new TQListView( this );
   mEntryView->addColumn( i18n("Name") );
@@ -192,16 +192,16 @@ DistributionListEditorWidget::DistributionListEditorWidget( AddressBook *address
   mEntryView->setEnabled(false);
   mEntryView->setAllColumnsShowFocus( true );
   gridLayout->addMultiCellWidget( mEntryView, 1, 1, 1, 2 );
-  connect( mEntryView, TQT_SIGNAL( selectionChanged() ),
-           TQT_SLOT( slotSelectionEntryViewChanged() ) );
+  connect( mEntryView, TQ_SIGNAL( selectionChanged() ),
+           TQ_SLOT( slotSelectionEntryViewChanged() ) );
 
   mChangeEmailButton = new TQPushButton( i18n("Change Email..."), this );
   gridLayout->addWidget( mChangeEmailButton, 2, 1 );
-  connect( mChangeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
+  connect( mChangeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) );
 
   mRemoveEntryButton = new TQPushButton( i18n("Remove Entry"), this );
   gridLayout->addWidget( mRemoveEntryButton, 2, 2 );
-  connect( mRemoveEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) );
+  connect( mRemoveEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) );
 
   mManager = new DistributionListManager( mAddressBook );
   mManager->load();
diff --git a/tdeabc/distributionlisteditor.cpp b/tdeabc/distributionlisteditor.cpp
index 8ccb97951..e2882378f 100644
--- a/tdeabc/distributionlisteditor.cpp
+++ b/tdeabc/distributionlisteditor.cpp
@@ -128,34 +128,34 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg
 
   mNameCombo = new TQComboBox( this );
   nameLayout->addWidget( mNameCombo );
-  connect( mNameCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( updateEntryView() ) );
+  connect( mNameCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( updateEntryView() ) );
 
   newButton = new TQPushButton( i18n("New List"), this );
   nameLayout->addWidget( newButton );
-  connect( newButton, TQT_SIGNAL( clicked() ), TQT_SLOT( newList() ) );
+  connect( newButton, TQ_SIGNAL( clicked() ), TQ_SLOT( newList() ) );
 
   removeButton = new TQPushButton( i18n("Remove List"), this );
   nameLayout->addWidget( removeButton );
-  connect( removeButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeList() ) );
+  connect( removeButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeList() ) );
 
   mEntryView = new TQListView( this );
   mEntryView->addColumn( i18n("Name") );
   mEntryView->addColumn( i18n("Email") );
   mEntryView->addColumn( i18n("Use Preferred") );
   topLayout->addWidget( mEntryView );
-  connect(mEntryView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionEntryViewChanged()));
+  connect(mEntryView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionEntryViewChanged()));
 
   changeEmailButton = new TQPushButton( i18n("Change Email"), this );
   topLayout->addWidget( changeEmailButton );
-  connect( changeEmailButton, TQT_SIGNAL( clicked() ), TQT_SLOT( changeEmail() ) );
+  connect( changeEmailButton, TQ_SIGNAL( clicked() ), TQ_SLOT( changeEmail() ) );
 
   removeEntryButton = new TQPushButton( i18n("Remove Entry"), this );
   topLayout->addWidget( removeEntryButton );
-  connect( removeEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( removeEntry() ) );
+  connect( removeEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( removeEntry() ) );
 
   addEntryButton = new TQPushButton( i18n("Add Entry"), this );
   topLayout->addWidget( addEntryButton );
-  connect( addEntryButton, TQT_SIGNAL( clicked() ), TQT_SLOT( addEntry() ) );
+  connect( addEntryButton, TQ_SIGNAL( clicked() ), TQ_SLOT( addEntry() ) );
 
   mAddresseeView = new TQListView( this );
   mAddresseeView->addColumn( i18n("Name") );
@@ -163,7 +163,7 @@ DistributionListEditor::DistributionListEditor( AddressBook *addressBook, TQWidg
   topLayout->addWidget( mAddresseeView );
 
 
-  connect(mAddresseeView,TQT_SIGNAL(selectionChanged ()),this, TQT_SLOT(slotSelectionAddresseeViewChanged()));
+  connect(mAddresseeView,TQ_SIGNAL(selectionChanged ()),this, TQ_SLOT(slotSelectionAddresseeViewChanged()));
 
   mManager = new DistributionListManager( mAddressBook );
   mManager->load();
diff --git a/tdeabc/ldapclient.cpp b/tdeabc/ldapclient.cpp
index a70a4eb69..5ae18b848 100644
--- a/tdeabc/ldapclient.cpp
+++ b/tdeabc/ldapclient.cpp
@@ -138,12 +138,12 @@ void LdapClient::startQuery( const TQString& filter )
   startParseLDIF();
   mActive = true;
   mJob = TDEIO::get( url, false, false );
-  connect( mJob, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-           this, TQT_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect( mJob, TQT_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
-           this, TQT_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
-  connect( mJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( slotDone() ) );
+  connect( mJob, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+           this, TQ_SLOT( slotData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( mJob, TQ_SIGNAL( infoMessage( TDEIO::Job*, const TQString& ) ),
+           this, TQ_SLOT( slotInfoMessage( TDEIO::Job*, const TQString& ) ) );
+  connect( mJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( slotDone() ) );
 }
 
 void LdapClient::cancelQuery()
@@ -285,18 +285,18 @@ LdapSearch::LdapSearch()
       attrs << "cn" << "mail" << "givenname" << "sn";
       ldapClient->setAttrs( attrs );
 
-      connect( ldapClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
-               this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
-      connect( ldapClient, TQT_SIGNAL( done() ),
-               this, TQT_SLOT( slotLDAPDone() ) );
-      connect( ldapClient, TQT_SIGNAL( error( const TQString& ) ),
-               this, TQT_SLOT( slotLDAPError( const TQString& ) ) );
+      connect( ldapClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ),
+               this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
+      connect( ldapClient, TQ_SIGNAL( done() ),
+               this, TQ_SLOT( slotLDAPDone() ) );
+      connect( ldapClient, TQ_SIGNAL( error( const TQString& ) ),
+               this, TQ_SLOT( slotLDAPError( const TQString& ) ) );
 
       mClients.append( ldapClient );
     }
   }
 
-  connect( &mDataTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( slotDataTimer() ) );
+  connect( &mDataTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( slotDataTimer() ) );
 }
 
 void LdapSearch::startSearch( const TQString& txt )
diff --git a/tdeabc/ldapconfigwidget.cpp b/tdeabc/ldapconfigwidget.cpp
index 902e2b04c..0c5b845be 100644
--- a/tdeabc/ldapconfigwidget.cpp
+++ b/tdeabc/ldapconfigwidget.cpp
@@ -180,7 +180,7 @@ void LdapConfigWidget::initWidget()
     //without host query doesn't make sense
     if ( mHost ) {
       TQPushButton *dnquery = new TQPushButton( i18n( "Query Server" ), this );
-      connect( dnquery, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryDNClicked() ) );
+      connect( dnquery, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryDNClicked() ) );
       mainLayout->addMultiCellWidget( dnquery, row, row, 2, 3 );
     }
     row++;
@@ -202,9 +202,9 @@ void LdapConfigWidget::initWidget()
     mSecSSL = new TQRadioButton( i18n( "SSL" ), btgroup, "kcfg_ldapssl" );
     mainLayout->addMultiCellWidget( btgroup, row, row, 0, 3 );
 
-    connect( mSecNO, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) );
-    connect( mSecTLS, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPPort() ) );
-    connect( mSecSSL, TQT_SIGNAL( clicked() ), TQT_SLOT( setLDAPSPort( ) ) );
+    connect( mSecNO, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) );
+    connect( mSecTLS, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPPort() ) );
+    connect( mSecSSL, TQ_SIGNAL( clicked() ), TQ_SLOT( setLDAPSPort( ) ) );
 
     mSecNO->setChecked( true );
     row++;
@@ -229,14 +229,14 @@ void LdapConfigWidget::initWidget()
     //without host query doesn't make sense
     if ( mHost ) {
       mQueryMech = new TQPushButton( i18n( "Query Server" ), authbox );
-      connect( mQueryMech, TQT_SIGNAL( clicked() ), TQT_SLOT( mQueryMechClicked() ) );
+      connect( mQueryMech, TQ_SIGNAL( clicked() ), TQ_SLOT( mQueryMechClicked() ) );
     }
 
     mainLayout->addMultiCellWidget( authbox, row, row+1, 0, 3 );
 
-    connect( mAnonymous, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setAnonymous(int) ) );
-    connect( mSimple, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSimple(int) ) );
-    connect( mSASL, TQT_SIGNAL( stateChanged(int) ), TQT_SLOT( setSASL(int) ) );
+    connect( mAnonymous, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setAnonymous(int) ) );
+    connect( mSimple, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSimple(int) ) );
+    connect( mSASL, TQ_SIGNAL( stateChanged(int) ), TQ_SLOT( setSASL(int) ) );
 
     mAnonymous->setChecked( true );
   }
@@ -293,10 +293,10 @@ void LdapConfigWidget::sendQuery()
   mLdif.startParsing();
   TDEIO::Job *job = TDEIO::get( _url, true, false );
   job->addMetaData("no-auth-prompt","true");
-  connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-    this, TQT_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-    this, TQT_SLOT( loadResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+    this, TQ_SLOT( loadData( TDEIO::Job*, const TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQ_SLOT( loadResult( TDEIO::Job* ) ) );
 
   if ( mProg == NULL )
     mProg = new KProgressDialog( this, 0, i18n("LDAP Query"), _url.prettyURL(), true );
diff --git a/tdeabc/plugins/dir/resourcedir.cpp b/tdeabc/plugins/dir/resourcedir.cpp
index 304f585f0..7502084aa 100644
--- a/tdeabc/plugins/dir/resourcedir.cpp
+++ b/tdeabc/plugins/dir/resourcedir.cpp
@@ -87,9 +87,9 @@ void ResourceDir::init( const TQString &path, const TQString &format )
 
   mLock = 0;
 
-  connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( pathChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( pathChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( pathChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( pathChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( pathChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( pathChanged() ) );
 
   setPath( path );
 }
diff --git a/tdeabc/plugins/file/resourcefile.cpp b/tdeabc/plugins/file/resourcefile.cpp
index 3fa2a9406..2b25db4c4 100644
--- a/tdeabc/plugins/file/resourcefile.cpp
+++ b/tdeabc/plugins/file/resourcefile.cpp
@@ -83,9 +83,9 @@ void ResourceFile::init( const TQString &fileName, const TQString &formatName )
     mFormat = factory->format( mFormatName );
   }
 
-  connect( &mDirWatch, TQT_SIGNAL( dirty(const TQString&) ), TQT_SLOT( fileChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( created(const TQString&) ), TQT_SLOT( fileChanged() ) );
-  connect( &mDirWatch, TQT_SIGNAL( deleted(const TQString&) ), TQT_SLOT( fileChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( dirty(const TQString&) ), TQ_SLOT( fileChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( created(const TQString&) ), TQ_SLOT( fileChanged() ) );
+  connect( &mDirWatch, TQ_SIGNAL( deleted(const TQString&) ), TQ_SLOT( fileChanged() ) );
 
   setFileName( fileName );
 
@@ -333,9 +333,9 @@ bool ResourceFile::asyncSave( Ticket *ticket )
   bool ok = save( ticket );
 
   if ( !ok )
-    TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingError() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingError() ) );
   else
-    TQTimer::singleShot( 0, this, TQT_SLOT( emitSavingFinished() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( emitSavingFinished() ) );
 
   return ok;
 }
diff --git a/tdeabc/plugins/file/resourcefileconfig.cpp b/tdeabc/plugins/file/resourcefileconfig.cpp
index 2c8e0fce6..7995f3be1 100644
--- a/tdeabc/plugins/file/resourcefileconfig.cpp
+++ b/tdeabc/plugins/file/resourcefileconfig.cpp
@@ -51,8 +51,8 @@ ResourceFileConfig::ResourceFileConfig( TQWidget* parent,  const char* name )
   label = new TQLabel( i18n( "Location:" ), this );
   mFileNameEdit = new KURLRequester( this );
 
-  connect( mFileNameEdit, TQT_SIGNAL( textChanged( const TQString & ) ),
-           TQT_SLOT( checkFilePermissions( const TQString & ) ) );
+  connect( mFileNameEdit, TQ_SIGNAL( textChanged( const TQString & ) ),
+           TQ_SLOT( checkFilePermissions( const TQString & ) ) );
 
   mainLayout->addWidget( label, 1, 0 );
   mainLayout->addWidget( mFileNameEdit, 1, 1 );
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
index 84c62370d..f7c6ed36a 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeio.cpp
@@ -173,10 +173,10 @@ TQString ResourceLDAPTDEIO::findUid( const TQString &uid )
   
   TDEIO::ListJob * listJob = TDEIO::listDir( url, false /* no GUI */ );
   connect( listJob, 
-    TQT_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
-    TQT_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
-  connect( listJob, TQT_SIGNAL( result( TDEIO::Job* ) ), 
-    this, TQT_SLOT( listResult( TDEIO::Job* ) ) );
+    TQ_SIGNAL( entries( TDEIO::Job *, const TDEIO::UDSEntryList& ) ),
+    TQ_SLOT( entries( TDEIO::Job*, const TDEIO::UDSEntryList& ) ) );
+  connect( listJob, TQ_SIGNAL( result( TDEIO::Job* ) ), 
+    this, TQ_SLOT( listResult( TDEIO::Job* ) ) );
 
   enter_loop();
   return d->mResultDn;
@@ -511,8 +511,8 @@ TDEIO::Job *ResourceLDAPTDEIO::loadFromCache()
   
     KURL url( d->mCacheDst );
     job = TDEIO::get( url, true, false );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
   }
   return job;
 }
@@ -535,17 +535,17 @@ bool ResourceLDAPTDEIO::load()
   createCache();
   if ( d->mCachePolicy != Cache_Always ) {
     job = TDEIO::get( d->mLDAPUrl, true, false );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
     enter_loop();
   }
 
   job = loadFromCache();    
   if ( job ) {
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
     enter_loop();
   }
   if ( mErrorMsg.isEmpty() ) {
@@ -572,10 +572,10 @@ bool ResourceLDAPTDEIO::asyncLoad()
   createCache();
   if ( d->mCachePolicy != Cache_Always ) {
     TDEIO::Job *job = TDEIO::get( d->mLDAPUrl, true, false );
-    connect( job, TQT_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
-      this, TQT_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
-    connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( result( TDEIO::Job* ) ) );
+    connect( job, TQ_SIGNAL( data( TDEIO::Job*, const TQByteArray& ) ),
+      this, TQ_SLOT( data( TDEIO::Job*, const TQByteArray& ) ) );
+    connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( result( TDEIO::Job* ) ) );
   } else {
     result( NULL );
   }
@@ -714,8 +714,8 @@ void ResourceLDAPTDEIO::result( TDEIO::Job *job )
   TDEIO::Job *cjob;
   cjob = loadFromCache();
   if ( cjob ) {
-    connect( cjob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-      this, TQT_SLOT( loadCacheResult( TDEIO::Job* ) ) );
+    connect( cjob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+      this, TQ_SLOT( loadCacheResult( TDEIO::Job* ) ) );
   } else {
     if ( !mErrorMsg.isEmpty() )
       emit loadingError( this, mErrorMsg );
@@ -730,10 +730,10 @@ bool ResourceLDAPTDEIO::save( Ticket* )
   
   d->mSaveIt = begin();
   TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
-  connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
-    this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-    this, TQT_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+    this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQ_SLOT( syncLoadSaveResult( TDEIO::Job* ) ) );
   enter_loop();
   if ( mErrorMsg.isEmpty() ) {
     kdDebug(7125) << "ResourceLDAPTDEIO save ok!" << endl; 
@@ -750,10 +750,10 @@ bool ResourceLDAPTDEIO::asyncSave( Ticket* )
   kdDebug(7125) << "ResourceLDAPTDEIO asyncSave" << endl;
   d->mSaveIt = begin();
   TDEIO::Job *job = TDEIO::put( d->mLDAPUrl, -1, true, false, false );
-  connect( job, TQT_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
-    this, TQT_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
-  connect( job, TQT_SIGNAL( result( TDEIO::Job* ) ),
-    this, TQT_SLOT( saveResult( TDEIO::Job* ) ) );
+  connect( job, TQ_SIGNAL( dataReq( TDEIO::Job*, TQByteArray& ) ),
+    this, TQ_SLOT( saveData( TDEIO::Job*, TQByteArray& ) ) );
+  connect( job, TQ_SIGNAL( result( TDEIO::Job* ) ),
+    this, TQ_SLOT( saveResult( TDEIO::Job* ) ) );
   return true;
 }
 
diff --git a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
index 5239062aa..9dc8a8a57 100644
--- a/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
+++ b/tdeabc/plugins/ldaptdeio/resourceldaptdeioconfig.cpp
@@ -58,8 +58,8 @@ ResourceLDAPTDEIOConfig::ResourceLDAPTDEIOConfig( TQWidget* parent,  const char*
   mEditButton = new TQPushButton( i18n( "Edit Attributes..." ), box );
   mCacheButton = new TQPushButton( i18n( "Offline Use..." ), box );
 
-  connect( mEditButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editAttributes() ) );
-  connect( mCacheButton, TQT_SIGNAL( clicked() ), TQT_SLOT( editCache() ) );
+  connect( mEditButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editAttributes() ) );
+  connect( mCacheButton, TQ_SIGNAL( clicked() ), TQ_SLOT( editCache() ) );
 }
 
 void ResourceLDAPTDEIOConfig::loadSettings( KRES::Resource *res )
@@ -247,7 +247,7 @@ AttributesDialog::AttributesDialog( const TQMap<TQString, TQString> &attributes,
   mMapCombo->insertItem( i18n( "Netscape" ) );
   mMapCombo->insertItem( i18n( "Evolution" ) );
   mMapCombo->insertItem( i18n( "Outlook" ) );
-  connect( mMapCombo, TQT_SIGNAL( activated( int ) ), TQT_SLOT( mapChanged( int ) ) );
+  connect( mMapCombo, TQ_SIGNAL( activated( int ) ), TQ_SLOT( mapChanged( int ) ) );
 
   label = new TQLabel( i18n( "RDN prefix attribute:" ), page );
   layout->addWidget( label, 1, 0 );
@@ -356,10 +356,10 @@ OfflineDialog::OfflineDialog( bool autoCache, int cachePolicy, const KURL &src,
   mAutoCache->setChecked( autoCache );
   mAutoCache->setEnabled( bt->isChecked() );
 
-  connect( bt, TQT_SIGNAL(toggled(bool)), mAutoCache, TQT_SLOT(setEnabled(bool)) );
+  connect( bt, TQ_SIGNAL(toggled(bool)), mAutoCache, TQ_SLOT(setEnabled(bool)) );
   
   TQPushButton *lcache = new TQPushButton( i18n("Load into Cache"), page );
-  connect( lcache, TQT_SIGNAL( clicked() ), TQT_SLOT( loadCache() ) );
+  connect( lcache, TQ_SIGNAL( clicked() ), TQ_SLOT( loadCache() ) );
 }
 
 OfflineDialog::~OfflineDialog()
diff --git a/tdeabc/plugins/net/resourcenet.cpp b/tdeabc/plugins/net/resourcenet.cpp
index cb908cd22..08fa8764a 100644
--- a/tdeabc/plugins/net/resourcenet.cpp
+++ b/tdeabc/plugins/net/resourcenet.cpp
@@ -192,8 +192,8 @@ bool ResourceNet::asyncLoad()
   TDEIO::Scheduler::checkSlaveOnHold( true );
   d->mLoadJob = TDEIO::file_copy( mUrl, dest, -1, true, false, false );
   d->mIsLoading = true;
-  connect( d->mLoadJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( downloadFinished( TDEIO::Job* ) ) );
+  connect( d->mLoadJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( downloadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -286,8 +286,8 @@ bool ResourceNet::asyncSave( Ticket* )
   TDEIO::Scheduler::checkSlaveOnHold( true );
   d->mIsSaving = true;
   d->mSaveJob = TDEIO::file_copy( src, mUrl, -1, true, false, false );
-  connect( d->mSaveJob, TQT_SIGNAL( result( TDEIO::Job* ) ),
-           this, TQT_SLOT( uploadFinished( TDEIO::Job* ) ) );
+  connect( d->mSaveJob, TQ_SIGNAL( result( TDEIO::Job* ) ),
+           this, TQ_SLOT( uploadFinished( TDEIO::Job* ) ) );
 
   return true;
 }
@@ -352,7 +352,7 @@ void ResourceNet::downloadFinished( TDEIO::Job* )
 
   if ( !hasTempFile() || mTempFile->status() != 0 ) {
     d->mLastErrorString = i18n( "Download failed: Unable to create temporary file" );
-    TQTimer::singleShot( 0, this, TQT_SLOT( signalError() ) );
+    TQTimer::singleShot( 0, this, TQ_SLOT( signalError() ) );
     return;
   }
 
diff --git a/tdeabc/resourceselectdialog.cpp b/tdeabc/resourceselectdialog.cpp
index 186924aa2..1bede4a84 100644
--- a/tdeabc/resourceselectdialog.cpp
+++ b/tdeabc/resourceselectdialog.cpp
@@ -54,8 +54,8 @@ ResourceSelectDialog::ResourceSelectDialog( AddressBook *ab, TQWidget *parent, c
   KButtonBox *buttonBox = new KButtonBox( this );
 
   buttonBox->addStretch();
-  buttonBox->addButton(  KStdGuiItem::ok(), this, TQT_SLOT( accept() ) );
-  buttonBox->addButton(  KStdGuiItem::cancel(), this, TQT_SLOT( reject() ) );
+  buttonBox->addButton(  KStdGuiItem::ok(), this, TQ_SLOT( accept() ) );
+  buttonBox->addButton(  KStdGuiItem::cancel(), this, TQ_SLOT( reject() ) );
   buttonBox->layout();
 
   mainLayout->addWidget( buttonBox );
diff --git a/tdeabc/stdaddressbook.cpp b/tdeabc/stdaddressbook.cpp
index 73343d8a9..d834215c3 100644
--- a/tdeabc/stdaddressbook.cpp
+++ b/tdeabc/stdaddressbook.cpp
@@ -103,15 +103,15 @@ void StdAddressBook::init( bool asynchronous )
       error( TQString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
       continue;
     }
-    connect( *it, TQT_SIGNAL( loadingFinished( Resource* ) ),
-             this, TQT_SLOT( resourceLoadingFinished( Resource* ) ) );
-    connect( *it, TQT_SIGNAL( savingFinished( Resource* ) ),
-             this, TQT_SLOT( resourceSavingFinished( Resource* ) ) );
-
-    connect( *it, TQT_SIGNAL( loadingError( Resource*, const TQString& ) ),
-             this, TQT_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
-    connect( *it, TQT_SIGNAL( savingError( Resource*, const TQString& ) ),
-             this, TQT_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
+    connect( *it, TQ_SIGNAL( loadingFinished( Resource* ) ),
+             this, TQ_SLOT( resourceLoadingFinished( Resource* ) ) );
+    connect( *it, TQ_SIGNAL( savingFinished( Resource* ) ),
+             this, TQ_SLOT( resourceSavingFinished( Resource* ) ) );
+
+    connect( *it, TQ_SIGNAL( loadingError( Resource*, const TQString& ) ),
+             this, TQ_SLOT( resourceLoadingError( Resource*, const TQString& ) ) );
+    connect( *it, TQ_SIGNAL( savingError( Resource*, const TQString& ) ),
+             this, TQ_SLOT( resourceSavingError( Resource*, const TQString& ) ) );
   }
 
   Resource *res = standardResource();
diff --git a/tdeabc/tests/testaddresslineedit.cpp b/tdeabc/tests/testaddresslineedit.cpp
index 80bd311da..ee4513d98 100644
--- a/tdeabc/tests/testaddresslineedit.cpp
+++ b/tdeabc/tests/testaddresslineedit.cpp
@@ -21,7 +21,7 @@ int main( int argc,char **argv )
   lineEdit->show();
   app.setMainWidget( lineEdit );
   
-  TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+  TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
 
   app.exec();
   
diff --git a/tdeabc/tests/testdistlist.cpp b/tdeabc/tests/testdistlist.cpp
index 833dca84e..4a46f8e83 100644
--- a/tdeabc/tests/testdistlist.cpp
+++ b/tdeabc/tests/testdistlist.cpp
@@ -51,7 +51,7 @@ int main(int argc,char **argv)
   editor->show();
   app.setMainWidget(editor);
   
-  TQObject::connect( &app, TQT_SIGNAL( lastWindowClosed() ), &app, TQT_SLOT( quit() ) );
+  TQObject::connect( &app, TQ_SIGNAL( lastWindowClosed() ), &app, TQ_SLOT( quit() ) );
 
   app.exec();
   
diff --git a/tdeabc/tests/testldapclient.cpp b/tdeabc/tests/testldapclient.cpp
index a48ce043f..338d703f3 100644
--- a/tdeabc/tests/testldapclient.cpp
+++ b/tdeabc/tests/testldapclient.cpp
@@ -97,12 +97,12 @@ void TestLDAPClient::testIntevation()
   // But this certainly looks fishy, it might break on non-utf8 systems.
   TQString filter = "&(|(objectclass=person)(objectclass=groupofnames)(mail=*))(|(cn=*�gypten MDK*)(sn=*�gypten MDK*))";
 
-  connect( mClient, TQT_SIGNAL( result( const TDEABC::LdapObject& ) ),
-           this, TQT_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
-  connect( mClient, TQT_SIGNAL( done() ),
-           this, TQT_SLOT( slotLDAPDone() ) );
-  connect( mClient, TQT_SIGNAL( error( const TQString& ) ),
-           this, TQT_SLOT( slotLDAPError( const TQString& ) ) );
+  connect( mClient, TQ_SIGNAL( result( const TDEABC::LdapObject& ) ),
+           this, TQ_SLOT( slotLDAPResult( const TDEABC::LdapObject& ) ) );
+  connect( mClient, TQ_SIGNAL( done() ),
+           this, TQ_SLOT( slotLDAPDone() ) );
+  connect( mClient, TQ_SIGNAL( error( const TQString& ) ),
+           this, TQ_SLOT( slotLDAPError( const TQString& ) ) );
   mClient->startQuery( filter );
   kapp->eventLoop()->enterLoop();
   delete mClient; mClient = 0;
diff --git a/tdeabc/tests/testlock.cpp b/tdeabc/tests/testlock.cpp
index f9d880753..d593945bf 100644
--- a/tdeabc/tests/testlock.cpp
+++ b/tdeabc/tests/testlock.cpp
@@ -77,11 +77,11 @@ LockWidget::LockWidget( const TQString &identifier )
 
     TQPushButton *button = new TQPushButton( "Lock", this );
     topLayout->addWidget( button );
-    connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( lock() ) );
+    connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( lock() ) );
 
     button = new TQPushButton( "Unlock", this );
     topLayout->addWidget( button );
-    connect( button, TQT_SIGNAL( clicked() ), TQT_SLOT( unlock() ) );
+    connect( button, TQ_SIGNAL( clicked() ), TQ_SLOT( unlock() ) );
   }
 
   mLockView = new TQListView( this );
@@ -94,15 +94,15 @@ LockWidget::LockWidget( const TQString &identifier )
 
   TQPushButton *quitButton = new TQPushButton( "Quit", this );
   topLayout->addWidget( quitButton );
-  connect( quitButton, TQT_SIGNAL( clicked() ), TQT_SLOT( close() ) );
+  connect( quitButton, TQ_SIGNAL( clicked() ), TQ_SLOT( close() ) );
   
   KDirWatch *watch = KDirWatch::self();
-  connect( watch, TQT_SIGNAL( dirty( const TQString & ) ),
-           TQT_SLOT( updateLockView() ) );
-  connect( watch, TQT_SIGNAL( created( const TQString & ) ),
-           TQT_SLOT( updateLockView() ) );
-  connect( watch, TQT_SIGNAL( deleted( const TQString & ) ),
-           TQT_SLOT( updateLockView() ) );
+  connect( watch, TQ_SIGNAL( dirty( const TQString & ) ),
+           TQ_SLOT( updateLockView() ) );
+  connect( watch, TQ_SIGNAL( created( const TQString & ) ),
+           TQ_SLOT( updateLockView() ) );
+  connect( watch, TQ_SIGNAL( deleted( const TQString & ) ),
+           TQ_SLOT( updateLockView() ) );
   watch->addDir( Lock::locksDir() );
   watch->startScan();
 }