summaryrefslogtreecommitdiffstats
path: root/kopete/libkopete/kopetechatsession.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:59:34 -0600
commit83677e35509b4dafac63b76995652bdf3b49f209 (patch)
tree591f1dc22278addb439726c42896376b17bb42bd /kopete/libkopete/kopetechatsession.cpp
parent808e453c56036211f57482ed847d54aca01bba68 (diff)
downloadtdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.tar.gz
tdenetwork-83677e35509b4dafac63b76995652bdf3b49f209.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
Diffstat (limited to 'kopete/libkopete/kopetechatsession.cpp')
-rw-r--r--kopete/libkopete/kopetechatsession.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/kopete/libkopete/kopetechatsession.cpp b/kopete/libkopete/kopetechatsession.cpp
index 41083d5e..d49e135c 100644
--- a/kopete/libkopete/kopetechatsession.cpp
+++ b/kopete/libkopete/kopetechatsession.cpp
@@ -49,7 +49,7 @@ class KMMPrivate
public:
Kopete::ContactPtrList mContactList;
const Kopete::Contact *mUser;
- TQMap<const Kopete::Contact *, Kopete::OnlineStatus> contactStatus;
+ TQMap<const Kopete::Contact *, Kopete::OnlineStatus> contacttqStatus;
Kopete::Protocol *mProtocol;
bool isEmpty;
bool mCanBeDeleted;
@@ -101,27 +101,27 @@ Kopete::ChatSession::~ChatSession()
delete d;
}
-void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldStatus )
+void Kopete::ChatSession::slotOnlineStatusChanged( Kopete::Contact *c, const Kopete::OnlineStatus &status, const Kopete::OnlineStatus &oldtqStatus )
{
slotUpdateDisplayName();
- emit onlineStatusChanged((Kopete::Contact*)c, status, oldStatus);
+ emit onlineStatusChanged((Kopete::Contact*)c, status, oldtqStatus);
}
void Kopete::ChatSession::setContactOnlineStatus( const Kopete::Contact *contact, const Kopete::OnlineStatus &status )
{
- Kopete::OnlineStatus oldStatus = d->contactStatus[ contact ];
- d->contactStatus[ contact ] = status;
+ Kopete::OnlineStatus oldtqStatus = d->contacttqStatus[ contact ];
+ d->contacttqStatus[ contact ] = status;
disconnect( contact, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus & ) ),
this, TQT_SIGNAL( onlineStatusChanged( Kopete::Contact *, const Kopete::OnlineStatus &, const Kopete::OnlineStatus &) ) );
- emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldStatus );
+ emit onlineStatusChanged( (Kopete::Contact*)contact, status, oldtqStatus );
}
const Kopete::OnlineStatus Kopete::ChatSession::contactOnlineStatus( const Kopete::Contact *contact ) const
{
- if ( d->contactStatus.contains( contact ) )
- return d->contactStatus[ contact ];
+ if ( d->contacttqStatus.contains( contact ) )
+ return d->contacttqStatus[ contact ];
- return contact->onlineStatus();
+ return contact->onlinetqStatus();
}
const TQString Kopete::ChatSession::displayName()
@@ -156,7 +156,7 @@ void Kopete::ChatSession::slotUpdateDisplayName()
do
{
if(! d->displayName.isNull() )
- d->displayName.append( TQString::fromLatin1( ", " ) ) ;
+ d->displayName.append( TQString::tqfromLatin1( ", " ) ) ;
if ( c->metaContact() )
d->displayName.append( c->metaContact()->displayName() );
@@ -171,7 +171,7 @@ void Kopete::ChatSession::slotUpdateDisplayName()
//If we have only 1 contact, add the status of him
if ( d->mContactList.count() == 1 )
{
- d->displayName.append( TQString::fromLatin1( " (%1)" ).arg( d->mContactList.first()->onlineStatus().description() ) );
+ d->displayName.append( TQString::tqfromLatin1( " (%1)" ).tqarg( d->mContactList.first()->onlinetqStatus().description() ) );
}
emit displayNameChanged();
@@ -248,7 +248,7 @@ void Kopete::ChatSession::sendMessage( Kopete::Message &message )
emit messageSent( sentMessage, this );
if ( !account()->isAway() || KopetePrefs::prefs()->soundIfAway() )
{
- KNotification::event(TQString::fromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) );
+ KNotification::event(TQString::tqfromLatin1( "kopete_outgoing" ), i18n( "Outgoing Message Sent" ) );
}
}
else
@@ -264,7 +264,7 @@ void Kopete::ChatSession::messageSucceeded()
void Kopete::ChatSession::emitNudgeNotification()
{
- KNotification::event( TQString::fromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") );
+ KNotification::event( TQString::tqfromLatin1("buzz_nudge"), i18n("A contact sent you a buzz/nudge.") );
}
void Kopete::ChatSession::appendMessage( Kopete::Message &msg )
@@ -275,7 +275,7 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg )
{
TQString nick=myself()->property(Kopete::Global::Properties::self()->nickName()).value().toString();
if ( KopetePrefs::prefs()->highlightEnabled() && !nick.isEmpty() &&
- msg.plainBody().contains( TQRegExp( TQString::fromLatin1( "\\b(%1)\\b" ).arg( nick ), false ) ) )
+ msg.plainBody().contains( TQRegExp( TQString::tqfromLatin1( "\\b(%1)\\b" ).tqarg( nick ), false ) ) )
{
msg.setImportance( Kopete::Message::Highlight );
}
@@ -294,10 +294,10 @@ void Kopete::ChatSession::appendMessage( Kopete::Message &msg )
// emit messageAppended( msg, this );
}
-void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialStatus, bool suppress )
+void Kopete::ChatSession::addContact( const Kopete::Contact *c, const Kopete::OnlineStatus &initialtqStatus, bool suppress )
{
- if( !d->contactStatus.contains(c) )
- d->contactStatus[ c ] = initialStatus;
+ if( !d->contacttqStatus.contains(c) )
+ d->contacttqStatus[ c ] = initialtqStatus;
addContact( c, suppress );
}
@@ -386,7 +386,7 @@ void Kopete::ChatSession::removeContact( const Kopete::Contact *c, const TQStrin
slotUpdateDisplayName();
}
- d->contactStatus.remove( c );
+ d->contacttqStatus.remove( c );
emit contactRemoved( c, reason, format, suppressNotification );
}