diff options
author | Timothy Pearson <[email protected]> | 2011-12-18 18:33:51 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-18 18:33:51 -0600 |
commit | 089118c18533dfa3e6ce5065dbebdd4db94051f1 (patch) | |
tree | ce014fb2326a80fcfafa2362b7ff88486aa17c96 /kopete/protocols/oscar/icq/icqaccount.cpp | |
parent | 83677e35509b4dafac63b76995652bdf3b49f209 (diff) | |
download | tdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.tar.gz tdenetwork-089118c18533dfa3e6ce5065dbebdd4db94051f1.zip |
Rename old tq methods that no longer need a unique name
Diffstat (limited to 'kopete/protocols/oscar/icq/icqaccount.cpp')
-rw-r--r-- | kopete/protocols/oscar/icq/icqaccount.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 245e365c..9d996724 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -50,9 +50,9 @@ ICQMyselfContact::ICQMyselfContact( ICQAccount *acct ) : OscarMyselfContact( acc void ICQMyselfContact::userInfoUpdated() { - DWORD extendedtqStatus = details().extendedtqStatus(); - kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedtqStatus, 16 ) << endl; - ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( extendedtqStatus & 0xffff ); + DWORD extendedStatus = details().extendedStatus(); + kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << TQString::number( extendedStatus, 16 ) << endl; + ICQ::Presence presence = ICQ::Presence::fromOscarStatus( extendedStatus & 0xffff ); setOnlineStatus( presence.toOnlineStatus() ); setProperty( Kopete::Global::Properties::self()->awayMessage(), static_cast<ICQAccount*>( account() )->engine()->statusMessage() ); } @@ -100,7 +100,7 @@ ICQAccount::ICQAccount(Kopete::Protocol *parent, TQString accountID, const char { kdDebug(14153) << k_funcinfo << "sending status to reflect HideIP and WebAware settings" << endl; - //settqStatus(mtqStatus, TQString()); + //setStatus(mStatus, TQString()); }*/ } @@ -116,7 +116,7 @@ ICQProtocol* ICQAccount::protocol() ICQ::Presence ICQAccount::presence() { - return ICQ::Presence::fromOnlineStatus( myself()->onlinetqStatus() ); + return ICQ::Presence::fromOnlineStatus( myself()->onlineStatus() ); } @@ -150,21 +150,21 @@ void ICQAccount::connectWithPassword( const TQString &password ) kdDebug(14153) << k_funcinfo << "accountId='" << accountId() << "'" << endl; - Kopete::OnlineStatus status = initialtqStatus(); + Kopete::OnlineStatus status = initialStatus(); if ( status == Kopete::OnlineStatus() && status.status() == Kopete::OnlineStatus::Unknown ) //use default online in case of invalid online status for connecting status = Kopete::OnlineStatus( Kopete::OnlineStatus::Online ); ICQ::Presence pres = ICQ::Presence::fromOnlineStatus( status ); bool accountIsOffline = ( presence().type() == ICQ::Presence::Offline || - myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() ); + myself()->onlineStatus() == protocol()->statusManager()->connectingStatus() ); if ( accountIsOffline ) { - myself()->setOnlineStatus( protocol()->statusManager()->connectingtqStatus() ); + myself()->setOnlineStatus( protocol()->statusManager()->connectingStatus() ); TQString icqNumber = accountId(); kdDebug(14153) << k_funcinfo << "Logging in as " << icqNumber << endl ; - TQString server = configGroup()->readEntry( "Server", TQString::tqfromLatin1( "login.oscar.aol.com" ) ); + TQString server = configGroup()->readEntry( "Server", TQString::fromLatin1( "login.oscar.aol.com" ) ); uint port = configGroup()->readNumEntry( "Port", 5190 ); Connection* c = setupConnection( server, port ); @@ -172,15 +172,15 @@ void ICQAccount::connectWithPassword( const TQString &password ) Oscar::Settings* oscarSettings = engine()->clientSettings(); oscarSettings->setWebAware( configGroup()->readBoolEntry( "WebAware", false ) ); oscarSettings->setHideIP( configGroup()->readBoolEntry( "HideIP", true ) ); - //FIXME: also needed for the other call to settqStatus (in setPresenceTarget) - DWORD status = pres.toOscartqStatus(); + //FIXME: also needed for the other call to setStatus (in setPresenceTarget) + DWORD status = pres.toOscarStatus(); if ( !mHideIP ) status |= ICQ::StatusCode::SHOWIP; if ( mWebAware ) status |= ICQ::StatusCode::WEBAWARE; - engine()->settqStatus( status, mInitialStatusMessage ); + engine()->setStatus( status, mInitialStatusMessage ); updateVersionUpdaterStamp(); engine()->start( server, port, accountId(), password ); engine()->connectToServer( c, server, true /* doAuth */ ); @@ -331,7 +331,7 @@ void ICQAccount::setPresenceTarget( const ICQ::Presence &newPres, const TQString { bool targetIsOffline = (newPres.type() == ICQ::Presence::Offline); bool accountIsOffline = ( presence().type() == ICQ::Presence::Offline || - myself()->onlinetqStatus() == protocol()->statusManager()->connectingtqStatus() ); + myself()->onlineStatus() == protocol()->statusManager()->connectingStatus() ); if ( targetIsOffline ) { @@ -346,7 +346,7 @@ void ICQAccount::setPresenceTarget( const ICQ::Presence &newPres, const TQString } else { - engine()->settqStatus( newPres.toOscartqStatus(), message ); + engine()->setStatus( newPres.toOscarStatus(), message ); } } |