diff options
Diffstat (limited to 'kopete/kopete/chatwindow/chatview.cpp')
-rw-r--r-- | kopete/kopete/chatwindow/chatview.cpp | 82 |
1 files changed, 41 insertions, 41 deletions
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 ); |