Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

27 files changed, 144 insertions, 144 deletions

diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index 36d716fac..17cd5862c 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -53,7 +53,7 @@ AkregatorPlugin::AkregatorPlugin( Kontact::Core *core, const char *, const TQStr
 {
     setInstance( PluginFactory::instance() );
 
-    insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQT_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
+    insertNewAction( new TDEAction( i18n( "New Feed..." ), "bookmark_add", CTRL+SHIFT+Key_F, this, TQ_SLOT( addFeed() ), actionCollection(), "feed_new" ) );
 
     m_uniqueAppWatcher = new Kontact::UniqueAppWatcher(
 	new Kontact::UniqueAppHandlerFactory<Akregator::UniqueAppHandler>(), this );
@@ -89,7 +89,7 @@ MyBasePart* AkregatorPlugin::createPart()
 {
     MyBasePart* p = loadPart();
 
-    connect(p, TQT_SIGNAL(showPart()), this, TQT_SLOT(showPart()));
+    connect(p, TQ_SIGNAL(showPart()), this, TQ_SLOT(showPart()));
     m_stub = new Akregator::AkregatorPartIface_stub( dcopClient(), "akregator",
                                       "AkregatorIface" );
     m_stub->openStandardFeedList();
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index bc9393e5b..8cdef7588 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -58,14 +58,14 @@ KAddressbookPlugin::KAddressbookPlugin( Kontact::Core *core, const char *, const
   setInstance( KAddressbookPluginFactory::instance() );
 
   insertNewAction( new TDEAction( i18n( "New Contact..." ), "identity",
-			             CTRL+SHIFT+Key_C, this, TQT_SLOT( slotNewContact() ), actionCollection(),
+			             CTRL+SHIFT+Key_C, this, TQ_SLOT( slotNewContact() ), actionCollection(),
                    "new_contact" ) );
 
   insertNewAction( new TDEAction( i18n( "&New Distribution List..." ), "kontact_contacts", 0, this,
-                                TQT_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) );
+                                TQ_SLOT( slotNewDistributionList() ), actionCollection(), "new_distributionlist" ) );
 
   insertSyncAction( new TDEAction( i18n( "Synchronize Contacts" ), "reload",
-                    0, this, TQT_SLOT( slotSyncContacts() ), actionCollection(),
+                    0, this, TQ_SLOT( slotSyncContacts() ), actionCollection(),
                    "kaddressbook_sync" ) );
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
       new Kontact::UniqueAppHandlerFactory<KABUniqueAppHandler>(), this );
diff --git a/kontact/plugins/karm/karm_plugin.cpp b/kontact/plugins/karm/karm_plugin.cpp
index f927e826e..a84dd63b2 100644
--- a/kontact/plugins/karm/karm_plugin.cpp
+++ b/kontact/plugins/karm/karm_plugin.cpp
@@ -42,7 +42,7 @@ KarmPlugin::KarmPlugin( Kontact::Core *core, const char *, const TQStringList& )
   setInstance( KarmPluginFactory::instance() );
   (void)dcopClient();
   insertNewAction( new TDEAction( i18n( "New Task" ), "karm",
-                   CTRL+SHIFT+Key_W, this, TQT_SLOT( newTask() ), actionCollection(),
+                   CTRL+SHIFT+Key_W, this, TQ_SLOT( newTask() ), actionCollection(),
                    "new_task" ) );
 }
 
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index e2f9126f7..690cbc500 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -52,8 +52,8 @@ KCMKMailSummary::KCMKMailSummary( TQWidget *parent, const char *name )
 {
   initGUI();
 
-  connect( mFolderView, TQT_SIGNAL( clicked( TQListViewItem* ) ), TQT_SLOT( modified() ) );
-  connect( mFullPath, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( modified() ) );
+  connect( mFolderView, TQ_SIGNAL( clicked( TQListViewItem* ) ), TQ_SLOT( modified() ) );
+  connect( mFullPath, TQ_SIGNAL( toggled( bool ) ), TQ_SLOT( modified() ) );
 
   TDEAcceleratorManager::manage( this );
 
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 3f4249dc4..1a8186940 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -62,11 +62,11 @@ KMailPlugin::KMailPlugin(Kontact::Core *core, const char *, const TQStringList&
   setInstance( KMailPluginFactory::instance() );
 
   insertNewAction( new TDEAction( i18n( "New Message..." ), "mail-message-new",
-                   CTRL+SHIFT+Key_M, this, TQT_SLOT( slotNewMail() ), actionCollection(),
+                   CTRL+SHIFT+Key_M, this, TQ_SLOT( slotNewMail() ), actionCollection(),
                    "new_mail" ) );
 
   insertSyncAction( new TDEAction( i18n( "Synchronize Mail" ), "reload",
-                   0, this, TQT_SLOT( slotSyncFolders() ), actionCollection(),
+                   0, this, TQ_SLOT( slotSyncFolders() ), actionCollection(),
                    "sync_mail" ) );
 
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index 8b9f4e538..31e229921 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -133,8 +133,8 @@ void SummaryWidget::updateFolderList( const TQStringList& folders )
       urlLabel->installEventFilter( this );
       urlLabel->setAlignment( AlignLeft );
       urlLabel->show();
-      connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-               TQT_SLOT( selectFolder( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+               TQ_SLOT( selectFolder( const TQString& ) ) );
       mLayout->addWidget( urlLabel, counter, 0 );
       mLabels.append( urlLabel );
 
diff --git a/kontact/plugins/knode/knode_plugin.cpp b/kontact/plugins/knode/knode_plugin.cpp
index a25a0258c..8a6fb54fd 100644
--- a/kontact/plugins/knode/knode_plugin.cpp
+++ b/kontact/plugins/knode/knode_plugin.cpp
@@ -50,7 +50,7 @@ KNodePlugin::KNodePlugin( Kontact::Core *core, const char *, const TQStringList&
   setInstance( KNodePluginFactory::instance() );
 
   insertNewAction( new TDEAction( i18n( "New Article..." ), "mail-message-new", CTRL+SHIFT+Key_A,
-                   this, TQT_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) );
+                   this, TQ_SLOT( slotPostArticle() ), actionCollection(), "post_article" ) );
 
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
       new Kontact::UniqueAppHandlerFactory<KNodeUniqueAppHandler>(), this );
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 20e8d6c9e..7ec3df6c7 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -50,13 +50,13 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   setInstance( new TDEInstance( "knotes" ) );
 
   // create the actions
-  new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQT_SLOT( newNote() ),
+  new TDEAction( i18n( "&New" ), "knotes", CTRL+Key_N, this, TQ_SLOT( newNote() ),
                actionCollection(), "file_new" );
-  new TDEAction( i18n( "Rename..." ), "text", this, TQT_SLOT( renameNote() ),
+  new TDEAction( i18n( "Rename..." ), "text", this, TQ_SLOT( renameNote() ),
                actionCollection(), "edit_rename" );
-  new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQT_SLOT( killSelectedNotes() ),
+  new TDEAction( i18n( "Delete" ), "edit-delete", Key_Delete, this, TQ_SLOT( killSelectedNotes() ),
                actionCollection(), "edit_delete" );
-  new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQT_SLOT( printSelectedNotes() ),
+  new TDEAction( i18n( "Print Selected Notes..." ), "print", CTRL+Key_P, this, TQ_SLOT( printSelectedNotes() ),
                actionCollection(), "print_note" );
 
   // TODO icons: s/editdelete/knotes_delete/ or the other way round in knotes
@@ -68,20 +68,20 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   mNotesView->setAutoArrange( true );
   mNotesView->setSorting( true );
 
-  connect( mNotesView, TQT_SIGNAL( executed( TQIconViewItem* ) ),
-           this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( returnPressed( TQIconViewItem* ) ),
-           this, TQT_SLOT( editNote( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( itemRenamed( TQIconViewItem* ) ),
-           this, TQT_SLOT( renamedNote( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
-           this, TQT_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
-  connect( mNotesView, TQT_SIGNAL( onItem( TQIconViewItem* ) ),
-           this, TQT_SLOT( slotOnItem( TQIconViewItem* ) ) );
-  connect( mNotesView, TQT_SIGNAL( onViewport() ),
-           this, TQT_SLOT( slotOnViewport() ) );
-  connect( mNotesView, TQT_SIGNAL( currentChanged( TQIconViewItem* ) ),
-           this, TQT_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( executed( TQIconViewItem* ) ),
+           this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( returnPressed( TQIconViewItem* ) ),
+           this, TQ_SLOT( editNote( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( itemRenamed( TQIconViewItem* ) ),
+           this, TQ_SLOT( renamedNote( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( contextMenuRequested( TQIconViewItem*, const TQPoint& ) ),
+           this, TQ_SLOT( popupRMB( TQIconViewItem*, const TQPoint& ) ) );
+  connect( mNotesView, TQ_SIGNAL( onItem( TQIconViewItem* ) ),
+           this, TQ_SLOT( slotOnItem( TQIconViewItem* ) ) );
+  connect( mNotesView, TQ_SIGNAL( onViewport() ),
+           this, TQ_SLOT( slotOnViewport() ) );
+  connect( mNotesView, TQ_SIGNAL( currentChanged( TQIconViewItem* ) ),
+           this, TQ_SLOT( slotOnCurrentChanged( TQIconViewItem* ) ) );
 
   slotOnCurrentChanged( 0 );
 
@@ -91,10 +91,10 @@ KNotesPart::KNotesPart( TQObject *parent, const char *name )
   setXMLFile( "knotes_part.rc" );
 
   // connect the resource manager
-  connect( mManager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
-           this, TQT_SLOT( createNote( KCal::Journal* ) ) );
-  connect( mManager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
-           this, TQT_SLOT( killNote( KCal::Journal* ) ) );
+  connect( mManager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+           this, TQ_SLOT( createNote( KCal::Journal* ) ) );
+  connect( mManager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+           this, TQ_SLOT( killNote( KCal::Journal* ) ) );
 
   // read the notes
   mManager->load();
diff --git a/kontact/plugins/knotes/knotes_plugin.cpp b/kontact/plugins/knotes/knotes_plugin.cpp
index 7c3a2bd4f..1b66eea12 100644
--- a/kontact/plugins/knotes/knotes_plugin.cpp
+++ b/kontact/plugins/knotes/knotes_plugin.cpp
@@ -45,9 +45,9 @@ KNotesPlugin::KNotesPlugin( Kontact::Core *core, const char *, const TQStringLis
   setInstance( KNotesPluginFactory::instance() );
 
   insertNewAction( new TDEAction( i18n( "New Note..." ), "knotes", CTRL+SHIFT+Key_N,
-                   this, TQT_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
+                   this, TQ_SLOT( slotNewNote() ), actionCollection(), "new_note" ) );
   insertSyncAction( new TDEAction( i18n( "Synchronize Notes" ), "reload", 0,
-                   this, TQT_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
+                   this, TQ_SLOT( slotSyncNotes() ), actionCollection(), "knotes_sync" ) );
 }
 
 KNotesPlugin::~KNotesPlugin()
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index b8568bf47..89ae1ec15 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -61,10 +61,10 @@ KNotesSummaryWidget::KNotesSummaryWidget( Kontact::Plugin *plugin,
   mCalendar = new KCal::CalendarLocal( TQString::fromLatin1("UTC") );
   KNotesResourceManager *manager = new KNotesResourceManager();
 
-  TQObject::connect( manager, TQT_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
-                    this, TQT_SLOT( addNote( KCal::Journal* ) ) );
-  TQObject::connect( manager, TQT_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
-                    this, TQT_SLOT( removeNote( KCal::Journal* ) ) );
+  TQObject::connect( manager, TQ_SIGNAL( sigRegisteredNote( KCal::Journal* ) ),
+                    this, TQ_SLOT( addNote( KCal::Journal* ) ) );
+  TQObject::connect( manager, TQ_SIGNAL( sigDeregisteredNote( KCal::Journal* ) ),
+                    this, TQ_SLOT( removeNote( KCal::Journal* ) ) );
   manager->load();
 
 
@@ -111,8 +111,8 @@ void KNotesSummaryWidget::updateView()
         TQToolTip::add( urlLabel, (*it)->description().left( 80 ) );
       }
 
-      connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-               this, TQT_SLOT( urlClicked( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+               this, TQ_SLOT( urlClicked( const TQString& ) ) );
       counter++;
     }
 
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index ab5306ac9..a028d9379 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -50,10 +50,10 @@ JournalPlugin::JournalPlugin( Kontact::Core *core, const char *, const TQStringL
   instance()->iconLoader()->addAppDir("tdepim");
 
   insertNewAction( new TDEAction( i18n( "New Journal..." ), "newjournal",
-                   CTRL+SHIFT+Key_J, this, TQT_SLOT( slotNewJournal() ), actionCollection(),
+                   CTRL+SHIFT+Key_J, this, TQ_SLOT( slotNewJournal() ), actionCollection(),
                    "new_journal" ) );
   insertSyncAction( new TDEAction( i18n( "Synchronize Journal" ), "reload",
-                   0, this, TQT_SLOT( slotSyncJournal() ), actionCollection(),
+                   0, this, TQ_SLOT( slotSyncJournal() ), actionCollection(),
                    "journal_sync" ) );
 
 
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index eda11019e..4c0945e79 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -54,11 +54,11 @@ KCMKOrgSummary::KCMKOrgSummary( TQWidget *parent, const char *name )
 
   customDaysChanged( 1 );
 
-  connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
-  connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
-  connect( mTodoGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
-  connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
-  connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
+  connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+  connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
+  connect( mTodoGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+  connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+  connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) );
 
   TDEAcceleratorManager::manage( this );
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 0479c53c2..475c64a9f 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -65,11 +65,11 @@ KOrganizerPlugin::KOrganizerPlugin( Kontact::Core *core, const char *, const TQS
   instance()->iconLoader()->addAppDir("tdepim");
 
   insertNewAction( new TDEAction( i18n( "New Event..." ), "newappointment",
-                   CTRL+SHIFT+Key_E, this, TQT_SLOT( slotNewEvent() ), actionCollection(),
+                   CTRL+SHIFT+Key_E, this, TQ_SLOT( slotNewEvent() ), actionCollection(),
                    "new_event" ) );
 
   insertSyncAction( new TDEAction( i18n( "Synchronize Calendar" ), "reload",
-                   0, this, TQT_SLOT( slotSyncEvents() ), actionCollection(),
+                   0, this, TQ_SLOT( slotSyncEvents() ), actionCollection(),
                    "korganizer_sync" ) );
 
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index de567b8b5..6a3c04325 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -66,9 +66,9 @@ SummaryWidget::SummaryWidget( KOrganizerPlugin *plugin, TQWidget *parent,
 
   mCalendar = KOrg::StdCalendar::self();
 
-  connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
-  connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
-           TQT_SLOT( updateView() ) );
+  connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) );
+  connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+           TQ_SLOT( updateView() ) );
 
   updateView();
 }
@@ -202,10 +202,10 @@ void SummaryWidget::updateView()
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
-      connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-               this, TQT_SLOT( viewEvent( const TQString& ) ) );
-      connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
-               this, TQT_SLOT( popupMenu( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+               this, TQ_SLOT( viewEvent( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+               this, TQ_SLOT( popupMenu( const TQString& ) ) );
 
       TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, ev, dt, true ) );
       if ( !tipText.isEmpty() ) {
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index 0b9e426e0..bcb2c5661 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -62,11 +62,11 @@ TodoPlugin::TodoPlugin( Kontact::Core *core, const char *, const TQStringList& )
   instance()->iconLoader()->addAppDir("tdepim");
 
   insertNewAction( new TDEAction( i18n( "New To-do..." ), "newtodo",
-                   CTRL+SHIFT+Key_T, this, TQT_SLOT( slotNewTodo() ), actionCollection(),
+                   CTRL+SHIFT+Key_T, this, TQ_SLOT( slotNewTodo() ), actionCollection(),
                    "new_todo" ) );
 
   insertSyncAction( new TDEAction( i18n( "Synchronize To-do List" ), "reload",
-                   0, this, TQT_SLOT( slotSyncTodos() ), actionCollection(),
+                   0, this, TQ_SLOT( slotSyncTodos() ), actionCollection(),
                    "todo_sync" ) );
 
   mUniqueAppWatcher = new Kontact::UniqueAppWatcher(
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index adce6c332..bdab72a9b 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -68,9 +68,9 @@ TodoSummaryWidget::TodoSummaryWidget( TodoPlugin *plugin,
 
   mCalendar = KOrg::StdCalendar::self();
 
-  connect( mCalendar, TQT_SIGNAL( calendarChanged() ), TQT_SLOT( updateView() ) );
-  connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
-           TQT_SLOT( updateView() ) );
+  connect( mCalendar, TQ_SIGNAL( calendarChanged() ), TQ_SLOT( updateView() ) );
+  connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+           TQ_SLOT( updateView() ) );
 
   updateView();
 }
@@ -163,10 +163,10 @@ void TodoSummaryWidget::updateView()
       mLayout->addWidget( urlLabel, counter, 2 );
       mLabels.append( urlLabel );
 
-      connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-               this, TQT_SLOT( viewTodo( const TQString& ) ) );
-      connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
-               this, TQT_SLOT( popupMenu( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+               this, TQ_SLOT( viewTodo( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+               this, TQ_SLOT( popupMenu( const TQString& ) ) );
 
       TQString tipText( KCal::IncidenceFormatter::toolTipStr( mCalendar, todo, currentDate, true ) );
       if ( !tipText.isEmpty() ) {
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index 9ab256d2f..cc91632f5 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -71,8 +71,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mLayout->addWidget( mSyncTimeLabel, row, 1 );
   mShowSyncLogLabel = new KURLLabel( "", i18n( "[View Sync Log]" ), this );
   mLayout->addWidget( mShowSyncLogLabel, row, 3 );
-  connect( mShowSyncLogLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-    this, TQT_SLOT( showSyncLog( const TQString& ) ) );
+  connect( mShowSyncLogLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+    this, TQ_SLOT( showSyncLog( const TQString& ) ) );
 
   // User
   row++;
@@ -110,8 +110,8 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mLayout->addMultiCellWidget( mNoConnectionLabel, row, row, 1, 2 );
   mNoConnectionStartLabel = new KURLLabel( "", i18n( "[Start KPilot]" ), this );
   mLayout->addWidget( mNoConnectionStartLabel, row, 3 );
-  connect( mNoConnectionStartLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-           this, TQT_SLOT( startKPilot() ) );
+  connect( mNoConnectionStartLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+           this, TQ_SLOT( startKPilot() ) );
 
   if ( !kapp->dcopClient()->isApplicationRegistered( "kpilotDaemon" ) ) {
     startKPilot();
@@ -119,7 +119,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
 
   connectDCOPSignal( 0, 0, "kpilotDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)",
                      "receiveDaemonStatusDetails(TQDateTime,TQString,TQStringList,TQString,TQString,TQString,bool)", false );
-	connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString & ) ), TQT_SLOT( slotAppRemoved( const TQCString& ) ) );
+	connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString & ) ), TQ_SLOT( slotAppRemoved( const TQCString& ) ) );
 }
 
 SummaryWidget::~SummaryWidget()
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 2eee85ea8..4a698ff83 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -80,10 +80,10 @@ NewsEditDialog::NewsEditDialog( const TQString& title, const TQString& url, TQWi
   mTitle->setText( title );
   mURL->setText( url );
   mTitle->setFocus();
-  connect( mTitle, TQT_SIGNAL( textChanged( const TQString& ) ),
-           this, TQT_SLOT( modified() ) );
-  connect( mURL, TQT_SIGNAL( textChanged( const TQString& ) ),
-           this, TQT_SLOT( modified() ) );
+  connect( mTitle, TQ_SIGNAL( textChanged( const TQString& ) ),
+           this, TQ_SLOT( modified() ) );
+  connect( mURL, TQ_SIGNAL( textChanged( const TQString& ) ),
+           this, TQ_SLOT( modified() ) );
 
   modified();
 }
@@ -133,18 +133,18 @@ KCMKontactKNT::KCMKontactKNT( TQWidget *parent, const char *name )
 {
   initGUI();
 
-  connect( mAllNews, TQT_SIGNAL( currentChanged( TQListViewItem* ) ),
-           this, TQT_SLOT( allCurrentChanged( TQListViewItem* ) ) );
-  connect( mSelectedNews, TQT_SIGNAL( selectionChanged( TQListViewItem* ) ),
-           this, TQT_SLOT( selectedChanged( TQListViewItem* ) ) );
+  connect( mAllNews, TQ_SIGNAL( currentChanged( TQListViewItem* ) ),
+           this, TQ_SLOT( allCurrentChanged( TQListViewItem* ) ) );
+  connect( mSelectedNews, TQ_SIGNAL( selectionChanged( TQListViewItem* ) ),
+           this, TQ_SLOT( selectedChanged( TQListViewItem* ) ) );
 
-  connect( mUpdateInterval, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
-  connect( mArticleCount, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
+  connect( mUpdateInterval, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+  connect( mArticleCount, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
 
-  connect( mAddButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( addNews() ) );
-  connect( mRemoveButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( removeNews() ) );
-  connect( mNewButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( newFeed() ) );
-  connect( mDeleteButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( deleteFeed() ) );
+  connect( mAddButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( addNews() ) );
+  connect( mRemoveButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( removeNews() ) );
+  connect( mNewButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( newFeed() ) );
+  connect( mDeleteButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( deleteFeed() ) );
 
   TDEAcceleratorManager::manage( this );
 
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 72c65baaf..b7b3f8660 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -68,7 +68,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
   mBaseWidget = new TQWidget( this, "baseWidget" );
   vlay->addWidget( mBaseWidget );
 
-  connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( updateDocuments() ) );
+  connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( updateDocuments() ) );
 
   readConfig();
 
@@ -223,10 +223,10 @@ void SummaryWidget::updateView()
     urlLabel->setMaximumSize( urlLabel->minimumSizeHint() );
     mLabels.append( urlLabel );
 
-    connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-             kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
-    connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
-             this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+    connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+             kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+    connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+             this, TQ_SLOT( rmbMenu( const TQString& ) ) );
 
     // header
     TQLabel *label = new TQLabel( hbox );
@@ -252,10 +252,10 @@ void SummaryWidget::updateView()
       mLabels.append( urlLabel );
       mLayout->addWidget( urlLabel );
 
-      connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-               kapp, TQT_SLOT( invokeBrowser( const TQString& ) ) );
-      connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
-               this, TQT_SLOT( rmbMenu( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+               kapp, TQ_SLOT( invokeBrowser( const TQString& ) ) );
+      connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+               this, TQ_SLOT( rmbMenu( const TQString& ) ) );
 
 
       numArticles++;
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index c0512fae6..f35cc2b49 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -56,12 +56,12 @@ KCMSDSummary::KCMSDSummary( TQWidget *parent, const char *name )
 
   customDaysChanged( 1 );
 
-  connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
-  connect( mDaysGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( buttonClicked( int ) ) );
-  connect( mCalendarGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
-  connect( mContactGroup, TQT_SIGNAL( clicked( int ) ), TQT_SLOT( modified() ) );
-  connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( modified() ) );
-  connect( mCustomDays, TQT_SIGNAL( valueChanged( int ) ), TQT_SLOT( customDaysChanged( int ) ) );
+  connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+  connect( mDaysGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( buttonClicked( int ) ) );
+  connect( mCalendarGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+  connect( mContactGroup, TQ_SIGNAL( clicked( int ) ), TQ_SLOT( modified() ) );
+  connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( modified() ) );
+  connect( mCustomDays, TQ_SIGNAL( valueChanged( int ) ), TQ_SLOT( customDaysChanged( int ) ) );
 
   TDEAcceleratorManager::manage( this );
 
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index c8c9b7164..fb9167c65 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -95,10 +95,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
 
   // Setup the Addressbook
   TDEABC::StdAddressBook *ab = TDEABC::StdAddressBook::self( true );
-  connect( ab, TQT_SIGNAL( addressBookChanged( AddressBook* ) ),
-           this, TQT_SLOT( updateView() ) );
-  connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
-           this, TQT_SLOT( updateView() ) );
+  connect( ab, TQ_SIGNAL( addressBookChanged( AddressBook* ) ),
+           this, TQ_SLOT( updateView() ) );
+  connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+           this, TQ_SLOT( updateView() ) );
 
   // Setup the Calendar
   mCalendar = new KCal::CalendarResources( KPimPrefs::timezone() );
@@ -128,10 +128,10 @@ SDSummaryWidget::SDSummaryWidget( Kontact::Plugin *plugin, TQWidget *parent,
   }
   mCalendar = KOrg::StdCalendar::self();
 
-  connect( mCalendar, TQT_SIGNAL( calendarChanged() ),
-           this, TQT_SLOT( updateView() ) );
-  connect( mPlugin->core(), TQT_SIGNAL( dayChanged( const TQDate& ) ),
-           this, TQT_SLOT( updateView() ) );
+  connect( mCalendar, TQ_SIGNAL( calendarChanged() ),
+           this, TQ_SLOT( updateView() ) );
+  connect( mPlugin->core(), TQ_SIGNAL( dayChanged( const TQDate& ) ),
+           this, TQ_SLOT( updateView() ) );
 
   // Update Configuration
   configUpdated();
@@ -506,10 +506,10 @@ void SDSummaryWidget::updateView()
         mLayout->addWidget( urlLabel, counter, 4 );
         mLabels.append( urlLabel );
 
-        connect( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-                 this, TQT_SLOT( mailContact( const TQString& ) ) );
-        connect( urlLabel, TQT_SIGNAL( rightClickedURL( const TQString& ) ),
-                 this, TQT_SLOT( popupMenu( const TQString& ) ) );
+        connect( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+                 this, TQ_SLOT( mailContact( const TQString& ) ) );
+        connect( urlLabel, TQ_SIGNAL( rightClickedURL( const TQString& ) ),
+                 this, TQ_SLOT( popupMenu( const TQString& ) ) );
       } else {
         label = new TQLabel( this );
         label->setText( (*addrIt).summary );
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 65bd13e5b..591cb033b 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -103,8 +103,8 @@ KCMKontactSummary::KCMKontactSummary( TQWidget *parent, const char *name )
 
   layout->setStretchFactor( mPluginView, 1 );
 
-  connect( mPluginView, TQT_SIGNAL( clicked( TQListViewItem* ) ),
-           this, TQT_SLOT( itemClicked( TQListViewItem* ) ) );
+  connect( mPluginView, TQ_SIGNAL( clicked( TQListViewItem* ) ),
+           this, TQ_SLOT( itemClicked( TQListViewItem* ) ) );
   load();
 
   TDEAboutData *about = new TDEAboutData( I18N_NOOP( "kontactsummary" ),
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index ddb43d71a..5c64d9348 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -77,25 +77,25 @@ SummaryViewPart::SummaryViewPart( Kontact::Core *core, const char*,
 
   initGUI( core );
 
-  connect( kapp, TQT_SIGNAL( tdedisplayPaletteChanged() ), TQT_SLOT( slotAdjustPalette() ) );
+  connect( kapp, TQ_SIGNAL( tdedisplayPaletteChanged() ), TQ_SLOT( slotAdjustPalette() ) );
   slotAdjustPalette();
 
   setDate( TQDate::currentDate() );
-  connect( mCore, TQT_SIGNAL( dayChanged( const TQDate& ) ),
-           TQT_SLOT( setDate( const TQDate& ) ) );
+  connect( mCore, TQ_SIGNAL( dayChanged( const TQDate& ) ),
+           TQ_SLOT( setDate( const TQDate& ) ) );
 
   KParts::InfoExtension *info = new KParts::InfoExtension( this, "Summary" );
-  connect( this, TQT_SIGNAL( textChanged( const TQString& ) ),
-           info, TQT_SIGNAL( textChanged( const TQString& ) ) );
+  connect( this, TQ_SIGNAL( textChanged( const TQString& ) ),
+           info, TQ_SIGNAL( textChanged( const TQString& ) ) );
 
   mConfigAction = new TDEAction( i18n( "&Configure Summary View..." ),
                                "configure", 0, this,
-                               TQT_SLOT( slotConfigure() ), actionCollection(),
+                               TQ_SLOT( slotConfigure() ), actionCollection(),
                                "summaryview_configure" );
 
   setXMLFile( "kontactsummary_part.rc" );
 
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotTextChanged() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotTextChanged() ) );
 }
 
 SummaryViewPart::~SummaryViewPart()
@@ -142,8 +142,8 @@ void SummaryViewPart::updateWidgets()
   mSummaries.clear();
 
   mFrame = new DropWidget( mMainWidget );
-  connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
-           this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+  connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+           this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
   mMainLayout->insertWidget( 2, mFrame );
 
@@ -176,10 +176,10 @@ void SummaryViewPart::updateWidgets()
       if ( summary->summaryHeight() > 0 ) {
         mSummaries.insert( plugin->identifier(), summary );
 
-        connect( summary, TQT_SIGNAL( message( const TQString& ) ),
-                 BroadcastStatus::instance(), TQT_SLOT( setStatusMsg( const TQString& ) ) );
-        connect( summary, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
-                 this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+        connect( summary, TQ_SIGNAL( message( const TQString& ) ),
+                 BroadcastStatus::instance(), TQ_SLOT( setStatusMsg( const TQString& ) ) );
+        connect( summary, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+                 this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
         if ( !mLeftColumnSummaries.contains( plugin->identifier() ) &&
              !mRightColumnSummaries.contains( plugin->identifier() ) ) {
@@ -327,8 +327,8 @@ void SummaryViewPart::slotConfigure()
 
   TQStringList modules = configModules();
   modules.prepend( "kcmkontactsummary.desktop" );
-  connect( &dlg, TQT_SIGNAL( configCommitted() ),
-           this, TQT_SLOT( updateWidgets() ) );
+  connect( &dlg, TQ_SIGNAL( configCommitted() ),
+           this, TQ_SLOT( updateWidgets() ) );
 
   TQStringList::ConstIterator strIt;
   for ( strIt = modules.begin(); strIt != modules.end(); ++strIt )
@@ -384,8 +384,8 @@ void SummaryViewPart::initGUI( Kontact::Core *core )
   mFrame = new DropWidget( mMainWidget );
   mMainLayout->insertWidget( 2, mFrame );
 
-  connect( mFrame, TQT_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
-           this, TQT_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
+  connect( mFrame, TQ_SIGNAL( summaryWidgetDropped( TQWidget*, TQWidget*, int ) ),
+           this, TQ_SLOT( summaryWidgetMoved( TQWidget*, TQWidget*, int ) ) );
 
   updateWidgets();
 }
diff --git a/kontact/plugins/summary/summaryview_plugin.cpp b/kontact/plugins/summary/summaryview_plugin.cpp
index 0523e2ac6..711c2b39e 100644
--- a/kontact/plugins/summary/summaryview_plugin.cpp
+++ b/kontact/plugins/summary/summaryview_plugin.cpp
@@ -42,8 +42,8 @@ SummaryView::SummaryView( Kontact::Core *core, const char *name, const TQStringL
   mSyncAction = new TDESelectAction( i18n( "Synchronize All" ), "reload", 0, 0, 
                                    0, actionCollection(),
                                    "kontact_summary_sync" );
-  connect( mSyncAction, TQT_SIGNAL( activated( const TQString& ) ), this, TQT_SLOT( syncAccount( const TQString& ) ) );
-  connect( mSyncAction->popupMenu(), TQT_SIGNAL( aboutToShow() ), this, TQT_SLOT( fillSyncActionSubEntries() ) );
+  connect( mSyncAction, TQ_SIGNAL( activated( const TQString& ) ), this, TQ_SLOT( syncAccount( const TQString& ) ) );
+  connect( mSyncAction->popupMenu(), TQ_SIGNAL( aboutToShow() ), this, TQ_SLOT( fillSyncActionSubEntries() ) );
 
   insertSyncAction( mSyncAction );
   fillSyncActionSubEntries();
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index 2e712ae82..12a7b4833 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -48,14 +48,14 @@ TestPart::TestPart(TQObject *parent, const char *name) // ## parentWidget
   m_edit = new TQTextEdit;
   setWidget(m_edit);
   setXMLFile("testpartui.rc");
-  new TDEAction( "new contact (test)", 0, this, TQT_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
+  new TDEAction( "new contact (test)", 0, this, TQ_SLOT( newContact() ), actionCollection(), "test_deleteevent" );
   m_kab_stub = 0L;
 
   new KParts::SideBarExtension(new TQComboBox(this), this, "sbe");
 
   kapp->dcopClient()->setNotifications( true );
-  connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString&)),
-           this, TQT_SLOT( unregisteredFromDCOP( const TQCString& )) );
+  connect( kapp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString&)),
+           this, TQ_SLOT( unregisteredFromDCOP( const TQCString& )) );
 }
 
 TestPart::~TestPart()
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index 03d76ad6c..e98cd4f23 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -39,7 +39,7 @@ TestPlugin::TestPlugin(Kontact::Core *_core, const char *name, const TQStringLis
 {
   setInstance(TestPluginFactory::instance());
 
-  insertNewAction(new TDEAction("Test", 0, this, TQT_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
+  insertNewAction(new TDEAction("Test", 0, this, TQ_SLOT(slotTestMenu()), actionCollection(), "edit_test"));
 
   setXMLFile("kptestplugin.rc");
 }
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 37fbe74d0..323ad8de7 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -69,7 +69,7 @@ SummaryWidget::SummaryWidget( TQWidget *parent, const char *name )
     if ( reply.isValid() ) {
       mStations = reply;
 
-      connect( &mTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( timeout() ) );
+      connect( &mTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( timeout() ) );
       mTimer.start( 0 );
     } else {
       kdDebug(5602) << "ERROR: dcop reply not valid..." << endl;
@@ -117,8 +117,8 @@ void SummaryWidget::updateView()
     urlLabel->setAlignment( AlignTop );
     layout->addMultiCellWidget( urlLabel, 0, 1, 0, 0 );
     mLabels.append( urlLabel );
-    connect ( urlLabel, TQT_SIGNAL( leftClickedURL( const TQString& ) ),
-              this, TQT_SLOT( showReport( const TQString& ) ) );
+    connect ( urlLabel, TQ_SIGNAL( leftClickedURL( const TQString& ) ),
+              this, TQ_SLOT( showReport( const TQString& ) ) );
 
     TQLabel* label = new TQLabel( this );
     label->setText( TQString( "%1 (%2)" ).arg( (*it).name() ).arg( (*it).temperature() ) );
@@ -210,8 +210,8 @@ void SummaryWidget::updateSummary( bool )
 void SummaryWidget::showReport( const TQString &stationID )
 {
   mProc = new TDEProcess;
-  TQApplication::connect( mProc, TQT_SIGNAL( processExited( TDEProcess* ) ),
-                         this, TQT_SLOT( reportFinished( TDEProcess* ) ) );
+  TQApplication::connect( mProc, TQ_SIGNAL( processExited( TDEProcess* ) ),
+                         this, TQ_SLOT( reportFinished( TDEProcess* ) ) );
   *mProc << "kweatherreport";
   *mProc << stationID;