Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

10 files changed, 231 insertions, 231 deletions

diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
index de06b9e0..df6ba03c 100644
--- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
+++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp
@@ -78,8 +78,8 @@ ChatMembersListWidget::ContactItem::ContactItem( ChatMembersListWidget *parent,
 	setText( 0, nick );
 	setDragEnabled(true);
 
-	connect( m_contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
-	         this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
+	connect( m_contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
+	         this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
 
 	setStatus( parent->session()->contactOnlineStatus(m_contact) );
 	reposition();
@@ -154,17 +154,17 @@ ChatMembersListWidget::ChatMembersListWidget( Kopete::ChatSession *session, TQWi
 	for ( TQPtrListIterator<Kopete::Contact> it( session->members() ); it.current(); ++it )
 		slotContactAdded( *it );
 
-	connect( this, TQT_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &) ),
-	         TQT_SLOT( slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint & ) ) );
-	connect( this, TQT_SIGNAL( executed( TQListViewItem* ) ),
-	         TQT_SLOT( slotExecute( TQListViewItem * ) ) );
-
-	connect( session, TQT_SIGNAL( contactAdded(const Kopete::Contact*, bool) ),
-	         this, TQT_SLOT( slotContactAdded(const Kopete::Contact*) ) );
-	connect( session, TQT_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ),
-	         this, TQT_SLOT( slotContactRemoved(const Kopete::Contact*) ) );
-	connect( session, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ),
-	         this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & ) ) );
+	connect( this, TQ_SIGNAL( contextMenu( TDEListView*, TQListViewItem *, const TQPoint &) ),
+	         TQ_SLOT( slotContextMenu(TDEListView*, TQListViewItem *, const TQPoint & ) ) );
+	connect( this, TQ_SIGNAL( executed( TQListViewItem* ) ),
+	         TQ_SLOT( slotExecute( TQListViewItem * ) ) );
+
+	connect( session, TQ_SIGNAL( contactAdded(const Kopete::Contact*, bool) ),
+	         this, TQ_SLOT( slotContactAdded(const Kopete::Contact*) ) );
+	connect( session, TQ_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ),
+	         this, TQ_SLOT( slotContactRemoved(const Kopete::Contact*) ) );
+	connect( session, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ),
+	         this, TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & ) ) );
 }
 
 ChatMembersListWidget::~ChatMembersListWidget()
@@ -176,7 +176,7 @@ void ChatMembersListWidget::slotContextMenu( TDEListView*, TQListViewItem *item,
 	if ( ContactItem *contactItem = dynamic_cast<ContactItem*>(item) )
 	{
 		TDEPopupMenu *p = contactItem->contact()->popupMenu( session() );
-		connect( p, TQT_SIGNAL( aboutToHide() ), p, TQT_SLOT( deleteLater() ) );
+		connect( p, TQ_SIGNAL( aboutToHide() ), p, TQ_SLOT( deleteLater() ) );
 		p->popup( point );
 	}
 }
diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp
index a9bcdcba..5471d528 100644
--- a/kopete/kopete/chatwindow/chatmessagepart.cpp
+++ b/kopete/kopete/chatwindow/chatmessagepart.cpp
@@ -238,33 +238,33 @@ ChatMessagePart::ChatMessagePart( Kopete::ChatSession *mgr, TQWidget *parent, co
 	// It is not possible to drag and drop on our widget
 	view()->setAcceptDrops(false);
 
-	connect( KopetePrefs::prefs(), TQT_SIGNAL(messageAppearanceChanged()),
-	         this, TQT_SLOT( slotAppearanceChanged() ) );
-	connect( KopetePrefs::prefs(), TQT_SIGNAL(windowAppearanceChanged()),
-	         this, TQT_SLOT( slotRefreshView() ) );
-	connect( KopetePrefs::prefs(), TQT_SIGNAL(styleChanged(const TQString &)),
-			 this, TQT_SLOT( setStyle(const TQString &) ) );
-	connect( KopetePrefs::prefs(), TQT_SIGNAL(styleVariantChanged(const TQString &)),
-			 this, TQT_SLOT( setStyleVariant(const TQString &) ) );
+	connect( KopetePrefs::prefs(), TQ_SIGNAL(messageAppearanceChanged()),
+	         this, TQ_SLOT( slotAppearanceChanged() ) );
+	connect( KopetePrefs::prefs(), TQ_SIGNAL(windowAppearanceChanged()),
+	         this, TQ_SLOT( slotRefreshView() ) );
+	connect( KopetePrefs::prefs(), TQ_SIGNAL(styleChanged(const TQString &)),
+			 this, TQ_SLOT( setStyle(const TQString &) ) );
+	connect( KopetePrefs::prefs(), TQ_SIGNAL(styleVariantChanged(const TQString &)),
+			 this, TQ_SLOT( setStyleVariant(const TQString &) ) );
 	// Refresh the style if the display name change.
-	connect( d->manager, TQT_SIGNAL(displayNameChanged()), this, TQT_SLOT(slotUpdateHeaderDisplayName()) );
-	connect( d->manager, TQT_SIGNAL(photoChanged()), this, TQT_SLOT(slotUpdateHeaderPhoto()) );
+	connect( d->manager, TQ_SIGNAL(displayNameChanged()), this, TQ_SLOT(slotUpdateHeaderDisplayName()) );
+	connect( d->manager, TQ_SIGNAL(photoChanged()), this, TQ_SLOT(slotUpdateHeaderPhoto()) );
 
-	connect ( browserExtension(), TQT_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
-	          this, TQT_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
+	connect ( browserExtension(), TQ_SIGNAL( openURLRequestDelayed( const KURL &, const KParts::URLArgs & ) ),
+	          this, TQ_SLOT( slotOpenURLRequest( const KURL &, const KParts::URLArgs & ) ) );
 
-	connect( this, TQT_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
-	         this, TQT_SLOT(slotRightClick(const TQString &, const TQPoint &)) );
-	connect( view(), TQT_SIGNAL(contentsMoving(int,int)),
-	         this, TQT_SLOT(slotScrollingTo(int,int)) );
+	connect( this, TQ_SIGNAL(popupMenu(const TQString &, const TQPoint &)),
+	         this, TQ_SLOT(slotRightClick(const TQString &, const TQPoint &)) );
+	connect( view(), TQ_SIGNAL(contentsMoving(int,int)),
+	         this, TQ_SLOT(slotScrollingTo(int,int)) );
 
 	//initActions
-	d->copyAction = KStdAction::copy( this, TQT_SLOT(copy()), actionCollection() );
-	d->saveAction = KStdAction::saveAs( this, TQT_SLOT(save()), actionCollection() );
-	d->printAction = KStdAction::print( this, TQT_SLOT(print()),actionCollection() );
-	d->closeAction = KStdAction::close( this, TQT_SLOT(slotCloseView()),actionCollection() );
-        d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQT_SLOT( slotImportEmoticon() ), actionCollection() );
-	d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQT_SLOT( slotCopyURL() ), actionCollection() );
+	d->copyAction = KStdAction::copy( this, TQ_SLOT(copy()), actionCollection() );
+	d->saveAction = KStdAction::saveAs( this, TQ_SLOT(save()), actionCollection() );
+	d->printAction = KStdAction::print( this, TQ_SLOT(print()),actionCollection() );
+	d->closeAction = KStdAction::close( this, TQ_SLOT(slotCloseView()),actionCollection() );
+        d->importEmoticon = new TDEAction( i18n( "Import Emoticon"), TQString::fromLatin1( "importemot" ), 0, this, TQ_SLOT( slotImportEmoticon() ), actionCollection() );
+	d->copyURLAction = new TDEAction( i18n( "Copy Link Address" ), TQString::fromLatin1( "edit-copy" ), 0, this, TQ_SLOT( slotCopyURL() ), actionCollection() );
 
 	// read formatting override flags
 	readOverrides();
@@ -330,7 +330,7 @@ void ChatMessagePart::slotImportEmoticon()
     TQTextStream emoStream(fp);
     emoStream << themeXml.toString(4);
     fp->close();
-    TQTimer::singleShot( 1500, Kopete::Emoticons::self(), TQT_SLOT( reload() ) );
+    TQTimer::singleShot( 1500, Kopete::Emoticons::self(), TQ_SLOT( reload() ) );
 }
 
 void ChatMessagePart::save()
@@ -420,7 +420,7 @@ void ChatMessagePart::setStyle( const TQString &stylePath )
 
 	// Do the actual style switch
 	// Wait for the event loop before switching the style
-	TQTimer::singleShot( 0, this, TQT_SLOT(changeStyle()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(changeStyle()) );
 }
 
 void ChatMessagePart::setStyle( ChatWindowStyle *style )
@@ -430,7 +430,7 @@ void ChatMessagePart::setStyle( ChatWindowStyle *style )
 
 	// Do the actual style switch
 	// Wait for the event loop before switching the style
-	TQTimer::singleShot( 0, this, TQT_SLOT(changeStyle()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(changeStyle()) );
 }
 
 void ChatMessagePart::setStyleVariant( const TQString &variantPath )
@@ -593,7 +593,7 @@ void ChatMessagePart::appendMessage( Kopete::Message &message, bool restoring )
 	}
 
 	if ( !d->scrollPressed )
-		TQTimer::singleShot( 1, this, TQT_SLOT( slotScrollView() ) );
+		TQTimer::singleShot( 1, this, TQ_SLOT( slotScrollView() ) );
 
 #ifdef STYLE_TIMETEST
 	kdDebug(14000) << "Message time: " << beforeMessage.msecsTo( TQTime::currentTime()) << endl;
@@ -613,7 +613,7 @@ void ChatMessagePart::slotRefreshView()
 void ChatMessagePart::keepScrolledDown()
 {
 	if ( !d->scrollPressed )
-		TQTimer::singleShot( 1, this, TQT_SLOT( slotScrollView() ) );
+		TQTimer::singleShot( 1, this, TQ_SLOT( slotScrollView() ) );
 }
 
 const TQString ChatMessagePart::styleHTML() const
@@ -715,7 +715,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
 	if ( Kopete::Contact *contact = contactFromNode( d->activeElement ) )
 	{
 		chatWindowPopup = contact->popupMenu( d->manager );
-		connect( chatWindowPopup, TQT_SIGNAL( aboutToHide() ), chatWindowPopup , TQT_SLOT( deleteLater() ) );
+		connect( chatWindowPopup, TQ_SIGNAL( aboutToHide() ), chatWindowPopup , TQ_SLOT( deleteLater() ) );
 	}
 	else
 	{
@@ -741,7 +741,7 @@ void ChatMessagePart::slotRightClick( const TQString &, const TQPoint &point )
 		chatWindowPopup->insertSeparator();
 		d->closeAction->plug( chatWindowPopup );
 
-		connect( chatWindowPopup, TQT_SIGNAL( aboutToHide() ), chatWindowPopup, TQT_SLOT( deleteLater() ) );
+		connect( chatWindowPopup, TQ_SIGNAL( aboutToHide() ), chatWindowPopup, TQ_SLOT( deleteLater() ) );
 		chatWindowPopup->popup( point );
 	}
 
@@ -941,7 +941,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
 
 	if(text.isEmpty()) return;
 
-	disconnect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), this, TQT_SLOT( slotClearSelection()));
+	disconnect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), this, TQ_SLOT( slotClearSelection()));
 
 #ifndef TQT_NO_MIMECLIPBOARD
 	if(!justselection)
@@ -963,7 +963,7 @@ void ChatMessagePart::copy(bool justselection /* default false */)
     	TQApplication::clipboard()->setText( text, TQClipboard::Clipboard );
 	TQApplication::clipboard()->setText( text, TQClipboard::Selection );
 #endif
-	connect( kapp->clipboard(), TQT_SIGNAL( selectionChanged()), TQT_SLOT( slotClearSelection()));
+	connect( kapp->clipboard(), TQ_SIGNAL( selectionChanged()), TQ_SLOT( slotClearSelection()));
 
 }
 
@@ -1291,7 +1291,7 @@ void ChatMessagePart::slotUpdateHeaderPhoto()
 {
 	// Do the actual style switch
 	// Wait for the event loop before switching the style
-	TQTimer::singleShot( 0, this, TQT_SLOT(changeStyle()) );
+	TQTimer::singleShot( 0, this, TQ_SLOT(changeStyle()) );
 }
 
 void ChatMessagePart::changeStyle()
diff --git a/kopete/kopete/chatwindow/chattexteditpart.cpp b/kopete/kopete/chatwindow/chattexteditpart.cpp
index 3eebf508..1822a96e 100644
--- a/kopete/kopete/chatwindow/chattexteditpart.cpp
+++ b/kopete/kopete/chatwindow/chattexteditpart.cpp
@@ -49,21 +49,21 @@ ChatTextEditPart::ChatTextEditPart( Kopete::ChatSession *session, TQWidget *pare
 	edit()->setAutoFormatting( TQTextEdit::AutoNone );
 
 	// some signals and slots connections
-	connect( edit(), TQT_SIGNAL( textChanged()), this, TQT_SLOT( slotTextChanged() ) );
+	connect( edit(), TQ_SIGNAL( textChanged()), this, TQ_SLOT( slotTextChanged() ) );
 
 	// timers for typing notifications
 	m_typingRepeatTimer = new TQTimer(this, "m_typingRepeatTimer");
 	m_typingStopTimer   = new TQTimer(this, "m_typingStopTimer");
 
-	connect( m_typingRepeatTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotRepeatTypingTimer() ) );
-	connect( m_typingStopTimer,   TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotStoppedTypingTimer() ) );
+	connect( m_typingRepeatTimer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotRepeatTypingTimer() ) );
+	connect( m_typingStopTimer,   TQ_SIGNAL( timeout() ), this, TQ_SLOT( slotStoppedTypingTimer() ) );
 
-	connect( session, TQT_SIGNAL( contactAdded(const Kopete::Contact*, bool) ),
-	         this, TQT_SLOT( slotContactAdded(const Kopete::Contact*) ) );
-	connect( session, TQT_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ),
-	         this, TQT_SLOT( slotContactRemoved(const Kopete::Contact*) ) );
-	connect( session, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ),
-	         this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) );
+	connect( session, TQ_SIGNAL( contactAdded(const Kopete::Contact*, bool) ),
+	         this, TQ_SLOT( slotContactAdded(const Kopete::Contact*) ) );
+	connect( session, TQ_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ),
+	         this, TQ_SLOT( slotContactRemoved(const Kopete::Contact*) ) );
+	connect( session, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ),
+	         this, TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) );
 	
 	slotContactAdded( session->myself() );
 	for ( TQPtrListIterator<Kopete::Contact> it( session->members() ); it.current(); ++it )
@@ -195,8 +195,8 @@ void ChatTextEditPart::slotPropertyChanged( Kopete::Contact*, const TQString &ke
 
 void ChatTextEditPart::slotContactAdded( const Kopete::Contact *contact )
 {
-	connect( contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
-	         this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
+	connect( contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
+	         this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
 	
 	TQString contactName = contact->property(Kopete::Global::Properties::self()->nickName()).value().toString();
 	mComplete->addItem( contactName );
@@ -204,8 +204,8 @@ void ChatTextEditPart::slotContactAdded( const Kopete::Contact *contact )
 
 void ChatTextEditPart::slotContactRemoved( const Kopete::Contact *contact )
 {
-	disconnect( contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
-	            this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
+	disconnect( contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
+	            this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
 	
 	TQString contactName = contact->property(Kopete::Global::Properties::self()->nickName()).value().toString();
 	mComplete->removeItem( contactName );
diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp
index bc4d3227..9d75badc 100644
--- a/kopete/kopete/chatwindow/chatview.cpp
+++ b/kopete/kopete/chatwindow/chatview.cpp
@@ -103,14 +103,14 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
 	m_editPart = new ChatTextEditPart( mgr, editDock, "kopeterichtexteditpart" );
 
 	// FIXME: is this used these days? it seems totally unnecessary
-	connect( editPart(), TQT_SIGNAL( toggleToolbar(bool)), this, TQT_SLOT(slotToggleRtfToolbar(bool)) );
+	connect( editPart(), TQ_SIGNAL( toggleToolbar(bool)), this, TQ_SLOT(slotToggleRtfToolbar(bool)) );
 
-	connect( editPart(), TQT_SIGNAL( messageSent( Kopete::Message & ) ),
-	         this, TQT_SIGNAL( messageSent( Kopete::Message & ) ) );
-	connect( editPart(), TQT_SIGNAL( canSendChanged( bool ) ),
-	         this, TQT_SIGNAL( canSendChanged(bool) ) );
-	connect( editPart(), TQT_SIGNAL( typing(bool) ),
-		 mgr, TQT_SLOT( typing(bool) ) );
+	connect( editPart(), TQ_SIGNAL( messageSent( Kopete::Message & ) ),
+	         this, TQ_SIGNAL( messageSent( Kopete::Message & ) ) );
+	connect( editPart(), TQ_SIGNAL( canSendChanged( bool ) ),
+	         this, TQ_SIGNAL( canSendChanged(bool) ) );
+	connect( editPart(), TQ_SIGNAL( typing(bool) ),
+		 mgr, TQ_SLOT( typing(bool) ) );
 
 	//Make the edit area dockable for now
 	editDock->setWidget( editPart()->widget() );
@@ -129,28 +129,28 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
 	m_remoteTypingMap.setAutoDelete( true );
 
 	//Manager signals
-	connect( mgr, TQT_SIGNAL( displayNameChanged() ),
-	         this, TQT_SLOT( slotChatDisplayNameChanged() ) );
-	connect( mgr, TQT_SIGNAL( contactAdded(const Kopete::Contact*, bool) ),
-	         this, TQT_SLOT( slotContactAdded(const Kopete::Contact*, bool) ) );
-	connect( mgr, TQT_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ),
-	         this, TQT_SLOT( slotContactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ) );
-	connect( mgr, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ),
-	         this, TQT_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) );
-	connect( mgr, TQT_SIGNAL( remoteTyping( const Kopete::Contact *, bool) ),
-		 this, TQT_SLOT( remoteTyping(const Kopete::Contact *, bool) ) );
-	connect( mgr, TQT_SIGNAL( eventNotification( const TQString& ) ),
-		 this, TQT_SLOT( setStatusText( const TQString& ) ) );
+	connect( mgr, TQ_SIGNAL( displayNameChanged() ),
+	         this, TQ_SLOT( slotChatDisplayNameChanged() ) );
+	connect( mgr, TQ_SIGNAL( contactAdded(const Kopete::Contact*, bool) ),
+	         this, TQ_SLOT( slotContactAdded(const Kopete::Contact*, bool) ) );
+	connect( mgr, TQ_SIGNAL( contactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ),
+	         this, TQ_SLOT( slotContactRemoved(const Kopete::Contact*, const TQString&, Kopete::Message::MessageFormat, bool) ) );
+	connect( mgr, TQ_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus & , const Kopete::OnlineStatus &) ),
+	         this, TQ_SLOT( slotContactStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ) );
+	connect( mgr, TQ_SIGNAL( remoteTyping( const Kopete::Contact *, bool) ),
+		 this, TQ_SLOT( remoteTyping(const Kopete::Contact *, bool) ) );
+	connect( mgr, TQ_SIGNAL( eventNotification( const TQString& ) ),
+		 this, TQ_SLOT( setStatusText( const TQString& ) ) );
 
 	//Connections to the manager and the ViewManager that every view should have
-	connect( this, TQT_SIGNAL( closing( KopeteView * ) ),
-		 KopeteViewManager::viewManager(), TQT_SLOT( slotViewDestroyed( KopeteView * ) ) );
-	connect( this, TQT_SIGNAL( activated( KopeteView * ) ),
-		 KopeteViewManager::viewManager(), TQT_SLOT( slotViewActivated( KopeteView * ) ) );
-	connect( this, TQT_SIGNAL( messageSent(Kopete::Message &) ),
-		 mgr, TQT_SLOT( sendMessage(Kopete::Message &) ) );
-	connect( mgr, TQT_SIGNAL( messageSuccess() ),
-		 this, TQT_SLOT( messageSentSuccessfully() ));
+	connect( this, TQ_SIGNAL( closing( KopeteView * ) ),
+		 KopeteViewManager::viewManager(), TQ_SLOT( slotViewDestroyed( KopeteView * ) ) );
+	connect( this, TQ_SIGNAL( activated( KopeteView * ) ),
+		 KopeteViewManager::viewManager(), TQ_SLOT( slotViewActivated( KopeteView * ) ) );
+	connect( this, TQ_SIGNAL( messageSent(Kopete::Message &) ),
+		 mgr, TQ_SLOT( sendMessage(Kopete::Message &) ) );
+	connect( mgr, TQ_SIGNAL( messageSuccess() ),
+		 this, TQ_SLOT( messageSentSuccessfully() ));
 
 	// add contacts
 	slotContactAdded( mgr->myself(), true );
@@ -161,8 +161,8 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch
 	editPart()->widget()->setFocus();
 
 	// init actions
-	KStdAction::copy( this, TQT_SLOT(copy()), actionCollection() );
-	KStdAction::close( this, TQT_SLOT(closeView()),actionCollection() );
+	KStdAction::copy( this, TQ_SLOT(copy()), actionCollection() );
+	KStdAction::close( this, TQ_SLOT(closeView()),actionCollection() );
 
 	setCaption( m_manager->displayName(), false );
 
@@ -521,7 +521,7 @@ void ChatView::remoteTyping( const Kopete::Contact *contact, bool isTyping )
 	if( isTyping )
 	{
 		m_remoteTypingMap.insert( key, new TQTimer(this) );
-		connect( m_remoteTypingMap[ key ], TQT_SIGNAL( timeout() ), TQT_SLOT( slotRemoteTypingTimeout() ) );
+		connect( m_remoteTypingMap[ key ], TQ_SIGNAL( timeout() ), TQ_SLOT( slotRemoteTypingTimeout() ) );
 		m_remoteTypingMap[ key ]->start( 6000, true );
 	}
 
@@ -622,13 +622,13 @@ void ChatView::slotContactAdded(const Kopete::Contact *contact, bool suppress)
 
 	if( contact->metaContact() && contact->metaContact() != Kopete::ContactList::self()->myself() )
 	{
-		connect( contact->metaContact(), TQT_SIGNAL( displayNameChanged(const TQString&, const TQString&) ),
-			this, TQT_SLOT( slotDisplayNameChanged(const TQString &, const TQString &) ) );
+		connect( contact->metaContact(), TQ_SIGNAL( displayNameChanged(const TQString&, const TQString&) ),
+			this, TQ_SLOT( slotDisplayNameChanged(const TQString &, const TQString &) ) );
 	}
 	else
 	{
-		connect( contact, TQT_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
-		this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
+		connect( contact, TQ_SIGNAL( propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ),
+		this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
 	}
 
 	if( !suppress && m_manager->members().count() > 1 )
@@ -670,13 +670,13 @@ void ChatView::slotContactRemoved( const Kopete::Contact *contact, const TQStrin
 		{
 			if( contact->metaContact() )
 			{
-				disconnect( contact->metaContact(), TQT_SIGNAL( displayNameChanged(const TQString&, const TQString&) ),
-				this, TQT_SLOT( slotDisplayNameChanged(const TQString&, const TQString&) ) );
+				disconnect( contact->metaContact(), TQ_SIGNAL( displayNameChanged(const TQString&, const TQString&) ),
+				this, TQ_SLOT( slotDisplayNameChanged(const TQString&, const TQString&) ) );
 			}
 			else
 			{
-				disconnect(contact,TQT_SIGNAL(propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & )),
-				this, TQT_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
+				disconnect(contact,TQ_SIGNAL(propertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & )),
+				this, TQ_SLOT( slotPropertyChanged( Kopete::Contact *, const TQString &, const TQVariant &, const TQVariant & ) ) ) ;
 			}
 		}
 
@@ -758,7 +758,7 @@ void ChatView::appendMessage(Kopete::Message &message)
 		{
 			unreadMessageFrom = message.from()->nickName();
 		}
-		TQTimer::singleShot( 1000, this, TQT_SLOT( slotMarkMessageRead() ) );
+		TQTimer::singleShot( 1000, this, TQ_SLOT( slotMarkMessageRead() ) );
 	}
 	else
 		unreadMessageFrom = TQString();
@@ -1067,7 +1067,7 @@ void ChatView::dropEvent ( TQDropEvent * event )
 void ChatView::registerContextMenuHandler( TQObject *target, const char* slot )
 {
 	connect( m_messagePart,
-		TQT_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, TDEPopupMenu * ) ),
+		TQ_SIGNAL( contextMenuEvent( Kopete::Message &, const TQString &, TDEPopupMenu * ) ),
 		target,
 		slot
 	);
@@ -1076,7 +1076,7 @@ void ChatView::registerContextMenuHandler( TQObject *target, const char* slot )
 void ChatView::registerTooltipHandler( TQObject *target, const char* slot )
 {
 	connect( m_messagePart,
-		TQT_SIGNAL( tooltipEvent( Kopete::Message &, const TQString &, TQString & ) ),
+		TQ_SIGNAL( tooltipEvent( Kopete::Message &, const TQString &, TQString & ) ),
 		target,
 		slot
 	);
diff --git a/kopete/kopete/chatwindow/emoticonselector.cpp b/kopete/kopete/chatwindow/emoticonselector.cpp
index fac6fc40..eeed01dd 100644
--- a/kopete/kopete/chatwindow/emoticonselector.cpp
+++ b/kopete/kopete/chatwindow/emoticonselector.cpp
@@ -89,7 +89,7 @@ void EmoticonSelector::prepareList(void)
 	{
 		TQWidget *w = new EmoticonLabel(it.data().first(), it.key(), this);
 		movieList.push_back( ((TQLabel*)w)->movie() );
-		connect(w, TQT_SIGNAL(clicked(const TQString&)), this, TQT_SLOT(emoticonClicked(const TQString&)));
+		connect(w, TQ_SIGNAL(clicked(const TQString&)), this, TQ_SLOT(emoticonClicked(const TQString&)));
 //		kdDebug(14000) << "adding Emoticon to row=" << row << ", col=" << col << "." << endl;
 		lay->addWidget(w, row, col);
 		if ( col == emoticonsPerRow )
diff --git a/kopete/kopete/chatwindow/kopetechatwindow.cpp b/kopete/kopete/chatwindow/kopetechatwindow.cpp
index eef4ab09..20549de2 100644
--- a/kopete/kopete/chatwindow/kopetechatwindow.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindow.cpp
@@ -196,7 +196,7 @@ KopeteChatWindow::KopeteChatWindow( TQWidget *parent, const char* name )
 		m_button_send->setEnabled( false );
 		m_button_send->setFont( statusBar()->font() );
 		m_button_send->setFixedHeight( statusBar()->sizeHint().height() );
-		connect( m_button_send, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotSendMessage() ) );
+		connect( m_button_send, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotSendMessage() ) );
 		statusBar()->addWidget( m_button_send, 0, true );
 	}
 	else
@@ -314,86 +314,86 @@ void KopeteChatWindow::initActions(void)
 	createStandardStatusBarAction();
 
 	chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), TQKeySequence(Key_Return) ,
-		this, TQT_SLOT( slotSendMessage() ), coll, "chat_send" );
+		this, TQ_SLOT( slotSendMessage() ), coll, "chat_send" );
 	chatSend->setEnabled( false );
 
- 	KStdAction::save ( this, TQT_SLOT(slotChatSave()), coll );
- 	KStdAction::print ( this, TQT_SLOT(slotChatPrint()), coll );
-	TDEAction* quitAction = KStdAction::quit ( this, TQT_SLOT(close()), coll );
+ 	KStdAction::save ( this, TQ_SLOT(slotChatSave()), coll );
+ 	KStdAction::print ( this, TQ_SLOT(slotChatPrint()), coll );
+	TDEAction* quitAction = KStdAction::quit ( this, TQ_SLOT(close()), coll );
 	quitAction->setText( i18n("Close All Chats") );
 
-	tabClose = KStdAction::close ( this, TQT_SLOT(slotChatClosed()), coll, "tabs_close" );
+	tabClose = KStdAction::close ( this, TQ_SLOT(slotChatClosed()), coll, "tabs_close" );
 
 	tabRight=new TDEAction( i18n( "&Activate Next Tab" ), 0, TDEStdAccel::tabNext(),
-		this, TQT_SLOT( slotNextTab() ), coll, "tabs_right" );
+		this, TQ_SLOT( slotNextTab() ), coll, "tabs_right" );
 	tabLeft=new TDEAction( i18n( "&Activate Previous Tab" ), 0, TDEStdAccel::tabPrev(),
-		this, TQT_SLOT( slotPreviousTab() ), coll, "tabs_left" );
+		this, TQ_SLOT( slotPreviousTab() ), coll, "tabs_left" );
 	tabLeft->setEnabled( false );
 	tabRight->setEnabled( false );
 
-	nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQT_SLOT( slotNickComplete() ), coll , "nick_compete");
+	nickComplete = new TDEAction( i18n( "Nic&k Completion" ), TQString(), 0, this, TQ_SLOT( slotNickComplete() ), coll , "nick_compete");
 	nickComplete->setShortcut( TQKeySequence( Key_Tab ) );
 
 	tabDetach = new TDEAction( i18n( "&Detach Chat" ), TQString::fromLatin1( "tab_breakoff" ), 0,
-		this, TQT_SLOT( slotDetachChat() ), coll, "tabs_detach" );
+		this, TQ_SLOT( slotDetachChat() ), coll, "tabs_detach" );
 	tabDetach->setEnabled( false );
 
 	actionDetachMenu = new TDEActionMenu( i18n( "&Move Tab to Window" ), TQString::fromLatin1( "tab_breakoff" ), coll, "tabs_detachmove" );
 	actionDetachMenu->setDelayed( false );
 
-	connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareDetachMenu()) );
-	connect ( actionDetachMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotDetachChat(int)) );
+	connect ( actionDetachMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPrepareDetachMenu()) );
+	connect ( actionDetachMenu->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotDetachChat(int)) );
 
 	actionTabPlacementMenu = new TDEActionMenu( i18n( "&Tab Placement" ), coll, "tabs_placement" );
-	connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPreparePlacementMenu()) );
-	connect ( actionTabPlacementMenu->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotPlaceTabs(int)) );
+	connect ( actionTabPlacementMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPreparePlacementMenu()) );
+	connect ( actionTabPlacementMenu->popupMenu(), TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotPlaceTabs(int)) );
 
 	tabDetach->setShortcut( TQKeySequence(CTRL + SHIFT + Key_B) );
 
-	KStdAction::cut( this, TQT_SLOT(slotCut()), coll);
-	KStdAction::copy( this, TQT_SLOT(slotCopy()), coll);
-	KStdAction::paste( this, TQT_SLOT(slotPaste()), coll);
+	KStdAction::cut( this, TQ_SLOT(slotCut()), coll);
+	KStdAction::copy( this, TQ_SLOT(slotCopy()), coll);
+	KStdAction::paste( this, TQ_SLOT(slotPaste()), coll);
 
-	new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQT_SLOT( slotSetFont() ), coll, "format_font" );
-	new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQT_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
-	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQT_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
+	new TDEAction( i18n( "Set Default &Font..." ), TQString::fromLatin1( "charset" ), 0, this, TQ_SLOT( slotSetFont() ), coll, "format_font" );
+	new TDEAction( i18n( "Set Default Text &Color..." ), TQString::fromLatin1( "pencil" ), 0, this, TQ_SLOT( slotSetFgColor() ), coll, "format_fgcolor" );
+	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0, this, TQ_SLOT( slotSetBgColor() ), coll, "format_bgcolor" );
 
 	historyUp = new TDEAction( i18n( "Previous History" ), TQString(), 0,
-		this, TQT_SLOT( slotHistoryUp() ), coll, "history_up" );
+		this, TQ_SLOT( slotHistoryUp() ), coll, "history_up" );
 	historyUp->setShortcut( TQKeySequence(CTRL + Key_Up) );
 
 	historyDown = new TDEAction( i18n( "Next History" ), TQString(), 0,
-		this, TQT_SLOT( slotHistoryDown() ), coll, "history_down" );
+		this, TQ_SLOT( slotHistoryDown() ), coll, "history_down" );
 	historyDown->setShortcut( TQKeySequence(CTRL + Key_Down) );
 
-	KStdAction::prior( this, TQT_SLOT( slotPageUp() ), coll, "scroll_up" );
-	KStdAction::next( this, TQT_SLOT( slotPageDown() ), coll, "scroll_down" );
+	KStdAction::prior( this, TQ_SLOT( slotPageUp() ), coll, "scroll_up" );
+	KStdAction::next( this, TQ_SLOT( slotPageDown() ), coll, "scroll_down" );
 
-	KStdAction::showMenubar( this, TQT_SLOT(slotViewMenuBar()), coll );
+	KStdAction::showMenubar( this, TQ_SLOT(slotViewMenuBar()), coll );
 
 	membersLeft = new TDEToggleAction( i18n( "Place to Left of Chat Area" ), TQString(), 0,
-		this, TQT_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
+		this, TQ_SLOT( slotViewMembersLeft() ), coll, "options_membersleft" );
 	membersRight = new TDEToggleAction( i18n( "Place to Right of Chat Area" ), TQString(), 0,
-		this, TQT_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
+		this, TQ_SLOT( slotViewMembersRight() ), coll, "options_membersright" );
 	toggleMembers = new TDEToggleAction( i18n( "Show" ), TQString(), 0,
-		this, TQT_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
+		this, TQ_SLOT( slotToggleViewMembers() ), coll, "options_togglemembers" );
 	toggleMembers->setCheckedState(i18n("Hide"));
 	toggleAutoSpellCheck = new TDEToggleAction( i18n( "Automatic Spell Checking" ), TQString(), 0,
-		this, TQT_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
+		this, TQ_SLOT( toggleAutoSpellChecking() ), coll, "enable_auto_spell_check" );
 	toggleAutoSpellCheck->setChecked( true );
 
 	actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
 	actionSmileyMenu->setDelayed( false );
-	connect(actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &)));
+	connect(actionSmileyMenu, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSmileyActivated(const TQString &)));
 
 	actionContactMenu = new TDEActionMenu(i18n("Co&ntacts"), coll, "contacts_menu" );
 	actionContactMenu->setDelayed( false );
-	connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(slotPrepareContactMenu()) );
+	connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(slotPrepareContactMenu()) );
 
 	// add configure key bindings menu item
-	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll );
+	KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), coll );
 
-	KStdAction::configureToolbars(this, TQT_SLOT(slotConfToolbar()), coll);
+	KStdAction::configureToolbars(this, TQ_SLOT(slotConfToolbar()), coll);
 	KopeteStdAction::preferences( coll , "settings_prefs" );
 
 	//The Sending movie
@@ -422,7 +422,7 @@ void KopeteChatWindow::initActions(void)
 	createGUI( 0L );
 
 	// Special handling for remembering whether the format toolbar is visible or not
-	connect ( toolBar("formatToolBar"), TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(slotToggleFormatToolbar(bool)) );
+	connect ( toolBar("formatToolBar"), TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(slotToggleFormatToolbar(bool)) );
 }
 
 const TQString KopeteChatWindow::fileContents( const TQString &path ) const
@@ -599,10 +599,10 @@ void KopeteChatWindow::createTabBar()
 #if KDE_IS_VERSION(3,4,0)
 		m_tabBar->setAutomaticResizeTabs(true);
 #endif
-		connect( m_tabBar, TQT_SIGNAL( closeRequest( TQWidget* )), this, TQT_SLOT( slotCloseChat( TQWidget* ) ) );
+		connect( m_tabBar, TQ_SIGNAL( closeRequest( TQWidget* )), this, TQ_SLOT( slotCloseChat( TQWidget* ) ) );
 
 		TQToolButton* m_rightWidget = new TQToolButton( m_tabBar );
-		connect( m_rightWidget, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotChatClosed() ) );
+		connect( m_rightWidget, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotChatClosed() ) );
 		m_rightWidget->setIconSet( SmallIcon( "tab_remove" ) );
 		m_rightWidget->adjustSize();
 		TQToolTip::add( m_rightWidget, i18n("Close the current tab"));
@@ -610,8 +610,8 @@ void KopeteChatWindow::createTabBar()
 
 		mainLayout->addWidget( m_tabBar );
 		m_tabBar->show();
-		connect ( m_tabBar, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(setActiveView(TQWidget *)) );
-		connect ( m_tabBar, TQT_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
+		connect ( m_tabBar, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(setActiveView(TQWidget *)) );
+		connect ( m_tabBar, TQ_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
 
 		for( ChatView *view = chatViewList.first(); view; view = chatViewList.next() )
 			addTab( view );
@@ -648,8 +648,8 @@ void KopeteChatWindow::addTab( ChatView *view )
 		view->show();
 	else
 		view->hide();
-	connect( view, TQT_SIGNAL( captionChanged( bool ) ), this, TQT_SLOT( updateChatLabel() ) );
-	connect( view, TQT_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQT_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
+	connect( view, TQ_SIGNAL( captionChanged( bool ) ), this, TQ_SLOT( updateChatLabel() ) );
+	connect( view, TQ_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQ_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
 	view->setCaption( view->caption(), false );
 }
 
@@ -670,8 +670,8 @@ void KopeteChatWindow::deleteTabBar()
 {
 	if( m_tabBar )
 	{
-		disconnect ( m_tabBar, TQT_SIGNAL(currentChanged(TQWidget *)), this, TQT_SLOT(setActiveView(TQWidget *)) );
-		disconnect ( m_tabBar, TQT_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQT_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
+		disconnect ( m_tabBar, TQ_SIGNAL(currentChanged(TQWidget *)), this, TQ_SLOT(setActiveView(TQWidget *)) );
+		disconnect ( m_tabBar, TQ_SIGNAL(contextMenu(TQWidget *, const TQPoint & )), this, TQ_SLOT(slotTabContextMenu( TQWidget *, const TQPoint & )) );
 
 		if( !chatViewList.isEmpty() )
 			setPrimaryChatView( chatViewList.first() );
@@ -700,17 +700,17 @@ void KopeteChatWindow::attachChatView( ChatView* newView )
 	newView->editWidget()->installEventFilter( this );
 
 	KCursor::setAutoHideCursor( newView->editWidget(), true, true );
-	connect( newView, TQT_SIGNAL(captionChanged( bool)), this, TQT_SLOT(slotSetCaption(bool)) );
-	connect( newView, TQT_SIGNAL(messageSuccess( ChatView* )), this, TQT_SLOT(slotStopAnimation( ChatView* )) );
-	connect( newView, TQT_SIGNAL(rtfEnabled( ChatView*, bool ) ), this, TQT_SLOT( slotRTFEnabled( ChatView*, bool ) ) );
-	connect( newView, TQT_SIGNAL(updateStatusIcon( ChatView* ) ), this, TQT_SLOT(slotUpdateCaptionIcons( ChatView* ) ) );
-	connect( newView, TQT_SIGNAL(updateChatState( ChatView*, int ) ), this, TQT_SLOT( updateChatState( ChatView*, int ) ) );
+	connect( newView, TQ_SIGNAL(captionChanged( bool)), this, TQ_SLOT(slotSetCaption(bool)) );
+	connect( newView, TQ_SIGNAL(messageSuccess( ChatView* )), this, TQ_SLOT(slotStopAnimation( ChatView* )) );
+	connect( newView, TQ_SIGNAL(rtfEnabled( ChatView*, bool ) ), this, TQ_SLOT( slotRTFEnabled( ChatView*, bool ) ) );
+	connect( newView, TQ_SIGNAL(updateStatusIcon( ChatView* ) ), this, TQ_SLOT(slotUpdateCaptionIcons( ChatView* ) ) );
+	connect( newView, TQ_SIGNAL(updateChatState( ChatView*, int ) ), this, TQ_SLOT( updateChatState( ChatView*, int ) ) );
 
 	updateSpellCheckAction();
 	checkDetachEnable();
 	newView->loadChatSettings();
-	connect( newView, TQT_SIGNAL(autoSpellCheckEnabled( ChatView*, bool ) ),
-	         this, TQT_SLOT( slotAutoSpellCheckEnabled( ChatView*, bool ) ) );
+	connect( newView, TQ_SIGNAL(autoSpellCheckEnabled( ChatView*, bool ) ),
+	         this, TQ_SLOT( slotAutoSpellCheckEnabled( ChatView*, bool ) ) );
 }
 
 void KopeteChatWindow::checkDetachEnable()
@@ -730,9 +730,9 @@ void KopeteChatWindow::detachChatView( ChatView *view )
 	if( !chatViewList.removeRef( view ) )
 		return;
 
-	disconnect( view, TQT_SIGNAL(captionChanged( bool)), this, TQT_SLOT(slotSetCaption(bool)) );
-	disconnect( view, TQT_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQT_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
-	disconnect( view, TQT_SIGNAL( updateChatState( ChatView*, int ) ), this, TQT_SLOT( updateChatState( ChatView*, int ) ) );
+	disconnect( view, TQ_SIGNAL(captionChanged( bool)), this, TQ_SLOT(slotSetCaption(bool)) );
+	disconnect( view, TQ_SIGNAL( updateStatusIcon( ChatView* ) ), this, TQ_SLOT( slotUpdateCaptionIcons( ChatView* ) ) );
+	disconnect( view, TQ_SIGNAL( updateChatState( ChatView*, int ) ), this, TQ_SLOT( updateChatState( ChatView*, int ) ) );
 	view->editWidget()->removeEventFilter( this );
 
 	if( m_tabBar )
@@ -831,7 +831,7 @@ void KopeteChatWindow::updateBackground( const TQPixmap &pm )
 
 		backgroundFile = new KTempFile( TQString(), TQString::fromLatin1( ".bmp" ) );
 		pm.save( backgroundFile->name(), "BMP" );
-		TQTimer::singleShot( 100, this, TQT_SLOT( slotEnableUpdateBg() ) );
+		TQTimer::singleShot( 100, this, TQ_SLOT( slotEnableUpdateBg() ) );
 	}
 }
 
@@ -844,7 +844,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget )
 
 	if(m_activeView)
 	{
-		disconnect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) );
+		disconnect( m_activeView, TQ_SIGNAL( canSendChanged(bool) ), this, TQ_SLOT( slotUpdateSendEnabled() ) );
 		guiFactory()->removeClient(m_activeView->msgManager());
 		m_activeView->saveChatSettings();
 	}
@@ -860,7 +860,7 @@ void KopeteChatWindow::setActiveView( TQWidget *widget )
 	if( !chatViewList.contains( view ) )
 		attachChatView( view );
 
-	connect( m_activeView, TQT_SIGNAL( canSendChanged(bool) ), this, TQT_SLOT( slotUpdateSendEnabled() ) );
+	connect( m_activeView, TQ_SIGNAL( canSendChanged(bool) ), this, TQ_SLOT( slotUpdateSendEnabled() ) );
 
 	//Tell it it is active
 	m_activeView->setActive( true );
@@ -982,8 +982,8 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
 	for ( contact = m_them.first(); contact; contact = m_them.next() )
 	{
 		TDEPopupMenu *p = contact->popupMenu();
-		connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
-			p, TQT_SLOT(deleteLater() ) );
+		connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToHide()),
+			p, TQ_SLOT(deleteLater() ) );
 
 		if( contact->metaContact() )
 			contactsMenu->insertItem( contact->onlineStatus().iconFor( contact ) , contact->metaContact()->displayName(), p );
@@ -995,8 +995,8 @@ void KopeteChatWindow::slotPrepareContactMenu(void)
 		{
 			TDEActionMenu *moreMenu = new TDEActionMenu( i18n("More..."),
 				 TQString::fromLatin1("folder_open"), contactsMenu );
-			connect ( actionContactMenu->popupMenu(), TQT_SIGNAL(aboutToHide()),
-				moreMenu, TQT_SLOT(deleteLater() ) );
+			connect ( actionContactMenu->popupMenu(), TQ_SIGNAL(aboutToHide()),
+				moreMenu, TQ_SLOT(deleteLater() ) );
 			moreMenu->plug( contactsMenu );
 			contactsMenu = moreMenu->popupMenu();
 			contactCount = 0;
diff --git a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
index 2badcaa8..4eeccab7 100644
--- a/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
+++ b/kopete/kopete/chatwindow/kopetechatwindowstylemanager.cpp
@@ -111,8 +111,8 @@ void ChatWindowStyleManager::loadStyles()
 	d->styleDirLister = new KDirLister(this);
 	d->styleDirLister->setDirOnlyMode(true);
 
-	connect(d->styleDirLister, TQT_SIGNAL(newItems(const KFileItemList &)), this, TQT_SLOT(slotNewStyles(const KFileItemList &)));
-	connect(d->styleDirLister, TQT_SIGNAL(completed()), this, TQT_SLOT(slotDirectoryFinished()));
+	connect(d->styleDirLister, TQ_SIGNAL(newItems(const KFileItemList &)), this, TQ_SLOT(slotNewStyles(const KFileItemList &)));
+	connect(d->styleDirLister, TQ_SIGNAL(completed()), this, TQ_SLOT(slotDirectoryFinished()));
 
 	if( !d->styleDirs.isEmpty() )
 		d->styleDirLister->openURL(d->styleDirs.pop(), true);
diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
index 4f0b24ea..0fda236e 100644
--- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp
+++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp
@@ -129,22 +129,22 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP
 	doc.documentElement().removeChild( doc.documentElement().childNodes().item(1) ); //Remove MainToolbar
 	doc.documentElement().removeChild( doc.documentElement().lastChild() ); // Remove Edit popup
 	*/
-	connect( d->editPart, TQT_SIGNAL( messageSent( Kopete::Message & ) ),
-	         this, TQT_SIGNAL( messageSent( Kopete::Message & ) ) );
-	connect( d->editPart, TQT_SIGNAL( canSendChanged( bool ) ),
-	         this, TQT_SLOT( slotUpdateReplySend() ) );
-	connect( d->editPart, TQT_SIGNAL( typing(bool) ),
-		 manager, TQT_SIGNAL( typing(bool) ) );
+	connect( d->editPart, TQ_SIGNAL( messageSent( Kopete::Message & ) ),
+	         this, TQ_SIGNAL( messageSent( Kopete::Message & ) ) );
+	connect( d->editPart, TQ_SIGNAL( canSendChanged( bool ) ),
+	         this, TQ_SLOT( slotUpdateReplySend() ) );
+	connect( d->editPart, TQ_SIGNAL( typing(bool) ),
+		 manager, TQ_SIGNAL( typing(bool) ) );
 
 	//Connections to the manager and the ViewManager that every view should have
-	connect( this, TQT_SIGNAL( closing( KopeteView * ) ),
-		 KopeteViewManager::viewManager(), TQT_SLOT( slotViewDestroyed( KopeteView * ) ) );
-	connect( this, TQT_SIGNAL( activated( KopeteView * ) ),
-		 KopeteViewManager::viewManager(), TQT_SLOT( slotViewActivated( KopeteView * ) ) );
-	connect( this, TQT_SIGNAL( messageSent(Kopete::Message &) ),
-		 manager, TQT_SLOT( sendMessage(Kopete::Message &) ) );
-	connect( manager, TQT_SIGNAL( messageSuccess() ),
-		 this, TQT_SLOT( messageSentSuccessfully() ));
+	connect( this, TQ_SIGNAL( closing( KopeteView * ) ),
+		 KopeteViewManager::viewManager(), TQ_SLOT( slotViewDestroyed( KopeteView * ) ) );
+	connect( this, TQ_SIGNAL( activated( KopeteView * ) ),
+		 KopeteViewManager::viewManager(), TQ_SLOT( slotViewActivated( KopeteView * ) ) );
+	connect( this, TQ_SIGNAL( messageSent(Kopete::Message &) ),
+		 manager, TQ_SLOT( sendMessage(Kopete::Message &) ) );
+	connect( manager, TQ_SIGNAL( messageSuccess() ),
+		 this, TQ_SLOT( messageSentSuccessfully() ));
 
 	TQWidget *containerWidget = new TQWidget( v );
 	containerWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum) );
@@ -153,16 +153,16 @@ KopeteEmailWindow::KopeteEmailWindow( Kopete::ChatSession *manager, EmailWindowP
 	h->addStretch();
 
 	d->btnReadPrev = new KPushButton( i18n( "<< Prev" ), containerWidget );
-	connect( d->btnReadPrev, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReadPrev() ) );
+	connect( d->btnReadPrev, TQ_SIGNAL( pressed() ), this, TQ_SLOT( slotReadPrev() ) );
 	h->addWidget( d->btnReadPrev, 0, TQt::AlignRight | TQt::AlignVCenter );
 	d->btnReadPrev->setEnabled( false );
 
 	d->btnReadNext = new KPushButton( i18n( "(0) Next >>" ), containerWidget );
-	connect( d->btnReadNext, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReadNext() ) );
+	connect( d->btnReadNext, TQ_SIGNAL( pressed() ), this, TQ_SLOT( slotReadNext() ) );
 	h->addWidget( d->btnReadNext, 0, TQt::AlignRight | TQt::AlignVCenter );
 
 	d->btnReplySend = new KPushButton( containerWidget );
-	connect( d->btnReplySend, TQT_SIGNAL( pressed() ), this, TQT_SLOT( slotReplySend() ) );
+	connect( d->btnReplySend, TQ_SIGNAL( pressed() ), this, TQ_SLOT( slotReplySend() ) );
 	h->addWidget( d->btnReplySend, 0, TQt::AlignRight | TQt::AlignVCenter );
 
 	initActions();
@@ -207,33 +207,33 @@ void KopeteEmailWindow::initActions(void)
 	TDEActionCollection *coll = actionCollection();
 
 	d->chatSend = new TDEAction( i18n( "&Send Message" ), TQString::fromLatin1( "mail-send" ), 0,
-		this, TQT_SLOT( slotReplySend() ), coll, "chat_send" );
+		this, TQ_SLOT( slotReplySend() ), coll, "chat_send" );
 	//Default to 'Return' for sending messages
 	d->chatSend->setShortcut( TQKeySequence( Key_Return ) );
 
-	KStdAction::quit ( this, TQT_SLOT( slotCloseView() ), coll );
+	KStdAction::quit ( this, TQ_SLOT( slotCloseView() ), coll );
 
-	KStdAction::cut( d->editPart->widget(), TQT_SLOT( cut() ), coll );
-	KStdAction::copy( this, TQT_SLOT(slotCopy()), coll);
-	KStdAction::paste( d->editPart->widget(), TQT_SLOT( paste() ), coll );
+	KStdAction::cut( d->editPart->widget(), TQ_SLOT( cut() ), coll );
+	KStdAction::copy( this, TQ_SLOT(slotCopy()), coll);
+	KStdAction::paste( d->editPart->widget(), TQ_SLOT( paste() ), coll );
 
 	new TDEAction( i18n( "&Set Font..." ), TQString::fromLatin1( "charset" ), 0,
-	             d->editPart, TQT_SLOT( setFont() ), coll, "format_font" );
+	             d->editPart, TQ_SLOT( setFont() ), coll, "format_font" );
 	new TDEAction( i18n( "Set Text &Color..." ), TQString::fromLatin1( "pencil" ), 0,
-	             d->editPart, TQT_SLOT( setFgColor() ), coll, "format_color" );
+	             d->editPart, TQ_SLOT( setFgColor() ), coll, "format_color" );
 	new TDEAction( i18n( "Set &Background Color..." ), TQString::fromLatin1( "fill" ), 0,
-	             d->editPart, TQT_SLOT( setBgColor() ), coll, "format_bgcolor" );
+	             d->editPart, TQ_SLOT( setBgColor() ), coll, "format_bgcolor" );
 
-	KStdAction::showMenubar( this, TQT_SLOT( slotViewMenuBar() ), coll );
+	KStdAction::showMenubar( this, TQ_SLOT( slotViewMenuBar() ), coll );
 	setStandardToolBarMenuEnabled( true );
 
 	d->actionSmileyMenu = new KopeteEmoticonAction( coll, "format_smiley" );
 	d->actionSmileyMenu->setDelayed( false );
-	connect(d->actionSmileyMenu, TQT_SIGNAL(activated(const TQString &)), this, TQT_SLOT(slotSmileyActivated(const TQString &)));
+	connect(d->actionSmileyMenu, TQ_SIGNAL(activated(const TQString &)), this, TQ_SLOT(slotSmileyActivated(const TQString &)));
 
 	// add configure key bindings menu item
-	KStdAction::keyBindings( guiFactory(), TQT_SLOT( configureShortcuts() ), coll );
-	KStdAction::configureToolbars(this, TQT_SLOT( slotConfToolbar() ), coll);
+	KStdAction::keyBindings( guiFactory(), TQ_SLOT( configureShortcuts() ), coll );
+	KStdAction::configureToolbars(this, TQ_SLOT( slotConfToolbar() ), coll);
 	//FIXME: no longer works?
 	KopeteStdAction::preferences( coll , "settings_prefs" );
 
@@ -319,7 +319,7 @@ void KopeteEmailWindow::appendMessage(Kopete::Message &message)
 
 		d->unreadMessageFrom = message.from()->metaContact() ?
 			message.from()->metaContact()->displayName() : message.from()->contactId();
-		TQTimer::singleShot( 1000, this, TQT_SLOT(slotMarkMessageRead()) );
+		TQTimer::singleShot( 1000, this, TQ_SLOT(slotMarkMessageRead()) );
 	}
 }
 
diff --git a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
index e53d27e4..9e0c520f 100644
--- a/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
+++ b/kopete/kopete/chatwindow/kopeteemoticonaction.cpp
@@ -46,7 +46,7 @@ public:
 		emoticonSelector = new EmoticonSelector( m_popup, "KopeteEmoticonActionPrivate::emoticonSelector");
 		m_popup->insertItem( emoticonSelector );
 		// TODO: Maybe connect to kopeteprefs and redo list only on config changes
-		connect( m_popup, TQT_SIGNAL( aboutToShow() ), emoticonSelector, TQT_SLOT( prepareList() ) );
+		connect( m_popup, TQ_SIGNAL( aboutToShow() ), emoticonSelector, TQ_SLOT( prepareList() ) );
 	}
 
 	~KopeteEmoticonActionPrivate()
@@ -86,8 +86,8 @@ KopeteEmoticonAction::KopeteEmoticonAction( TQObject* parent, const char* name )
 		setIconSet( TQIconSet( icon ) );
 
 	setShortcutConfigurable( false );
-	connect( d->emoticonSelector, TQT_SIGNAL( ItemSelected( const TQString & ) ),
-		this, TQT_SIGNAL( activated( const TQString & ) ) );
+	connect( d->emoticonSelector, TQ_SIGNAL( ItemSelected( const TQString & ) ),
+		this, TQ_SIGNAL( activated( const TQString & ) ) );
 }
 
 KopeteEmoticonAction::~KopeteEmoticonAction()
@@ -149,7 +149,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 			menu->setItemEnabled( id, false );
 
 		addContainer( menu, id );
-		connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+		connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
 		if ( m_parentCollection )
 			m_parentCollection->connectHighlight( menu, this );
@@ -166,8 +166,8 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 		if ( icon().isEmpty() && !iconSet(TDEIcon::Small).isNull() )
 		{
 			bar->insertButton(
-				iconSet(TDEIcon::Small).pixmap(), id_, TQT_SIGNAL(clicked()), this,
-				TQT_SLOT(slotActivated()), isEnabled(), plainText(),
+				iconSet(TDEIcon::Small).pixmap(), id_, TQ_SIGNAL(clicked()), this,
+				TQ_SLOT(slotActivated()), isEnabled(), plainText(),
 				index );
 		}
 		else
@@ -179,8 +179,8 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 			else
 			instance = TDEGlobal::instance();
 
-			bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-									TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+			bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+									TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
 									index, instance );
 		}
 
@@ -189,7 +189,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 		if (!whatsThis().isEmpty())
 			TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-		connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+		connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
 		if (delayed())
 			bar->setDelayedPopup(id_, popupMenu(), stickyMenu());
@@ -214,7 +214,7 @@ int KopeteEmoticonAction::plug( TQWidget* widget, int index )
 			bar->setItemEnabled( id, false );
 
 		addContainer( bar, id );
-		connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+		connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
 		return containerCount() - 1;
 	}
diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp
index 70b0692f..52f156d3 100644
--- a/kopete/kopete/chatwindow/krichtexteditpart.cpp
+++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp
@@ -127,86 +127,86 @@ void KopeteRichTextEditPart::createActions( TDEActionCollection *ac )
 	enableRichText = new TDEToggleAction(i18n("Enable &Rich Text"), "pencil", 0,
 				ac, "enableRichText" );
 	enableRichText->setCheckedState(i18n("Disable &Rich Text"));
-	connect( enableRichText, TQT_SIGNAL( toggled(bool) ),
-			this, TQT_SLOT( slotSetRichTextEnabled(bool) ) );
+	connect( enableRichText, TQ_SIGNAL( toggled(bool) ),
+			this, TQ_SLOT( slotSetRichTextEnabled(bool) ) );
 
 	checkSpelling = new TDEAction( i18n("Check &Spelling"), "tools-check-spelling", 0,
-				editor, TQT_SLOT( checkSpelling() ), ac, "check_spelling" );
+				editor, TQ_SLOT( checkSpelling() ), ac, "check_spelling" );
 
 	//Fg Color
 	actionFgColor = new TDEAction( i18n("Text &Color..."), "color_line", 0,
-		this, TQT_SLOT( setFgColor() ),
+		this, TQ_SLOT( setFgColor() ),
 		ac, "format_color" );
 
 	//BG Color
 	actionBgColor = new TDEAction( i18n("Background Co&lor..."), "color_fill", 0,
-		this, TQT_SLOT( setBgColor() ),
+		this, TQ_SLOT( setBgColor() ),
 		ac, "format_bgcolor" );
 
 	//Font Family
 	action_font = new TDEFontAction( i18n("&Font"), 0,
 			ac, "format_font" );
-	connect( action_font, TQT_SIGNAL( activated( const TQString & ) ),
-		this, TQT_SLOT( setFont( const TQString & ) ) );
+	connect( action_font, TQ_SIGNAL( activated( const TQString & ) ),
+		this, TQ_SLOT( setFont( const TQString & ) ) );
 
 	//Font Size
 	action_font_size = new TDEFontSizeAction( i18n("Font &Size"), 0,
 			ac, "format_font_size" );
-	connect( action_font_size, TQT_SIGNAL( fontSizeChanged(int) ),
-		this, TQT_SLOT( setFontSize(int) ) );
+	connect( action_font_size, TQ_SIGNAL( fontSizeChanged(int) ),
+		this, TQ_SLOT( setFontSize(int) ) );
 
 	//Formatting
 	action_bold = new TDEToggleAction( i18n("&Bold"), "format-text-bold", CTRL+Key_B,
 			ac, "format_bold" );
-	connect( action_bold, TQT_SIGNAL( toggled(bool) ),
-		this, TQT_SLOT( setBold(bool) ) );
+	connect( action_bold, TQ_SIGNAL( toggled(bool) ),
+		this, TQ_SLOT( setBold(bool) ) );
 
 	action_italic = new TDEToggleAction( i18n("&Italic"), "format-text-italic", CTRL+Key_I,
 			ac, "format_italic" );
-	connect( action_italic, TQT_SIGNAL( toggled(bool) ),
-		this, TQT_SLOT( setItalic(bool) ) );
+	connect( action_italic, TQ_SIGNAL( toggled(bool) ),
+		this, TQ_SLOT( setItalic(bool) ) );
 
 	action_underline = new TDEToggleAction( i18n("&Underline"), "format-text-underline", CTRL+Key_U,
 				ac, "format_underline" );
-	connect( action_underline, TQT_SIGNAL( toggled(bool) ),
-		this, TQT_SLOT( setUnderline(bool) ) );
+	connect( action_underline, TQ_SIGNAL( toggled(bool) ),
+		this, TQ_SLOT( setUnderline(bool) ) );
 
-	connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
-		this, TQT_SLOT( updateCharFmt() ) );
+	connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ),
+		this, TQ_SLOT( updateCharFmt() ) );
 	updateCharFmt();
 
-	connect( editor, TQT_SIGNAL( currentFontChanged( const TQFont & ) ),
-		this, TQT_SLOT( updateFont() ) );
+	connect( editor, TQ_SIGNAL( currentFontChanged( const TQFont & ) ),
+		this, TQ_SLOT( updateFont() ) );
 	updateFont();
 
 	//Alignment
 	action_align_left = new TDEToggleAction( i18n("Align &Left"), "format-text-direction-ltr", 0,
 			ac, "format_align_left" );
-	connect( action_align_left, TQT_SIGNAL( toggled(bool) ),
-		this, TQT_SLOT( setAlignLeft(bool) ) );
+	connect( action_align_left, TQ_SIGNAL( toggled(bool) ),
+		this, TQ_SLOT( setAlignLeft(bool) ) );
 
 	action_align_center = new TDEToggleAction( i18n("Align &Center"), "text_center", 0,
 			ac, "format_align_center" );
-	connect( action_align_center, TQT_SIGNAL( toggled(bool) ),
-		this, TQT_SLOT( setAlignCenter(bool) ) );
+	connect( action_align_center, TQ_SIGNAL( toggled(bool) ),
+		this, TQ_SLOT( setAlignCenter(bool) ) );
 
 	action_align_right = new TDEToggleAction( i18n("Align &Right"), "format-text-direction-rtl", 0,
 			ac, "format_align_right" );
-	connect( action_align_right, TQT_SIGNAL( toggled(bool) ),
-		this, TQT_SLOT( setAlignRight(bool) ) );
+	connect( action_align_right, TQ_SIGNAL( toggled(bool) ),
+		this, TQ_SLOT( setAlignRight(bool) ) );
 
 	action_align_justify = new TDEToggleAction( i18n("&Justify"), "text_block", 0,
 			ac, "format_align_justify" );
-	connect( action_align_justify, TQT_SIGNAL( toggled(bool) ),
-		this, TQT_SLOT( setAlignJustify(bool) ) );
+	connect( action_align_justify, TQ_SIGNAL( toggled(bool) ),
+		this, TQ_SLOT( setAlignJustify(bool) ) );
 
 	action_align_left->setExclusiveGroup( "alignment" );
 	action_align_center->setExclusiveGroup( "alignment" );
 	action_align_right->setExclusiveGroup( "alignment" );
 	action_align_justify->setExclusiveGroup( "alignment" );
 
-	connect( editor, TQT_SIGNAL( cursorPositionChanged( int,int ) ),
-		this, TQT_SLOT( updateAligment() ) );
+	connect( editor, TQ_SIGNAL( cursorPositionChanged( int,int ) ),
+		this, TQ_SLOT( updateAligment() ) );
 
 	updateAligment();
 }