From 089118c18533dfa3e6ce5065dbebdd4db94051f1 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 18 Dec 2011 18:33:51 -0600 Subject: Rename old tq methods that no longer need a unique name --- kopete/protocols/oscar/aim/aimaccount.cpp | 80 ++++++++++----------- kopete/protocols/oscar/aim/aimcontact.cpp | 84 +++++++++++------------ kopete/protocols/oscar/aim/aimprotocol.cpp | 6 +- kopete/protocols/oscar/aim/ui/aimeditaccountui.ui | 8 +-- kopete/protocols/oscar/aim/ui/aiminfobase.ui | 4 +- kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui | 6 +- 6 files changed, 94 insertions(+), 94 deletions(-) (limited to 'kopete/protocols/oscar/aim') diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 33a4b365..93209b04 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -127,53 +127,53 @@ void AIMMyselfContact::sendMessage( Kopete::Message& message, Kopete::ChatSessio //font-size:xxpt -> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("([^<]*)")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("\\2")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); + s.replace ( TQRegExp ( TQString::fromLatin1("")), TQString::fromLatin1("
") ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -300,12 +300,12 @@ KActionMenu* AIMAccount::actionMenu() // mActionMenu is managed by Kopete::Account. It is deleted when // it is no longer shown, so we can (safely) just make a new one here. KActionMenu *mActionMenu = new KActionMenu(accountId(), - myself()->onlinetqStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); + myself()->onlineStatus().iconFor( this ), this, "AIMAccount::mActionMenu"); AIMProtocol *p = AIMProtocol::protocol(); TQString accountNick = myself()->property( Kopete::Global::Properties::self()->nickName() ).value().toString(); - mActionMenu->popupMenu()->insertTitle( myself()->onlinetqStatus().iconFor( myself() ), + mActionMenu->popupMenu()->insertTitle( myself()->onlineStatus().iconFor( myself() ), i18n( "%2 <%1>" ).tqarg( accountId(), accountNick )); mActionMenu->insert( new KAction( i18n("Online"), p->statusOnline.iconFor( this ), 0, this, @@ -344,14 +344,14 @@ void AIMAccount::setAway(bool away, const TQString &awayReason) // kdDebug(14152) << k_funcinfo << accountId() << "reason is " << awayReason << endl; if ( away ) { - engine()->settqStatus( Client::Away, awayReason ); + engine()->setStatus( Client::Away, awayReason ); AIMMyselfContact* me = static_cast ( myself() ); me->setLastAwayMessage(awayReason); me->setProperty( Kopete::Global::Properties::self()->awayMessage(), awayReason ); } else { - engine()->settqStatus( Client::Online ); + engine()->setStatus( Client::Online ); AIMMyselfContact* me = static_cast ( myself() ); me->setLastAwayMessage(TQString()); me->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); @@ -374,7 +374,7 @@ void AIMAccount::setUserProfile(const TQString &profile) AIMMyselfContact* aimmc = dynamic_cast( myself() ); if ( aimmc ) aimmc->setOwnProfile( profile ); - configGroup()->writeEntry( TQString::tqfromLatin1( "Profile" ), profile ); + configGroup()->writeEntry( TQString::fromLatin1( "Profile" ), profile ); } void AIMAccount::slotEditInfo() @@ -532,13 +532,13 @@ void AIMAccount::slotJoinChat() void AIMAccount::slotGoOnline() { - if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) + if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) { kdDebug(14152) << k_funcinfo << accountId() << " was away. welcome back." << endl; - engine()->settqStatus( Client::Online ); + engine()->setStatus( Client::Online ); myself()->removeProperty( Kopete::Global::Properties::self()->awayMessage() ); } - else if ( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Offline ) + else if ( myself()->onlineStatus().status() == Kopete::OnlineStatus::Offline ) { kdDebug(14152) << k_funcinfo << accountId() << " was offline. time to connect" << endl; OscarAccount::connect(); @@ -606,7 +606,7 @@ void AIMAccount::messageReceived( const Oscar::Message& message ) // Might be duplicate code from the parent class to get some needed information // Perhaps a refactoring is needed. kdDebug(14152) << k_funcinfo << "Checking to see if I'm online.." << endl; - if( myself()->onlinetqStatus().status() == Kopete::OnlineStatus::Away ) + if( myself()->onlineStatus().status() == Kopete::OnlineStatus::Away ) { TQString sender = Oscar::normalize( message.sender() ); AIMContact* aimSender = static_cast ( contacts()[sender] ); //should exist now @@ -759,7 +759,7 @@ void AIMAccount::connectWithPassword( const TQString & ) // Get the screen name for this account TQString screenName = accountId(); - 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 ); @@ -771,7 +771,7 @@ void AIMAccount::connectWithPassword( const TQString & ) << "AIM network because no password was specified in the " << "preferences." << endl; } - else if ( myself()->onlinetqStatus() == static_cast( protocol() )->statusOffline ) + else if ( myself()->onlineStatus() == static_cast( protocol() )->statusOffline ) { kdDebug(14152) << k_funcinfo << "Logging in as " << accountId() << endl ; updateVersionUpdaterStamp(); diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index ffa81067..ed380b15 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -56,7 +56,7 @@ AIMContact::AIMContact( Kopete::Account* account, const TQString& name, Kopete:: m_haveAwayMessage = false; m_mobile = false; // Set the last autoresponse time to the current time yesterday - m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime().addDays(-1); + m_lastAutoresponseTime = TQDateTime::currentDateTime().addDays(-1); TQObject::connect( mAccount->engine(), TQT_SIGNAL( receivedUserInfo( const TQString&, const UserDetails& ) ), this, TQT_SLOT( userInfoUpdated( const TQString&, const UserDetails& ) ) ); @@ -128,15 +128,15 @@ void AIMContact::setAwayMessage(const TQString &message) "Called for '" << contactId() << "', away msg='" << message << "'" << endl; TQString filteredMessage = message; filteredMessage.replace( - TQRegExp(TQString::tqfromLatin1("<[hH][tT][mM][lL].*>(.*)")), - TQString::tqfromLatin1("\\1")); + TQRegExp(TQString::fromLatin1("<[hH][tT][mM][lL].*>(.*)")), + TQString::fromLatin1("\\1")); filteredMessage.replace( - TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)")), - TQString::tqfromLatin1("\\1") ); - TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)") ); + TQRegExp(TQString::fromLatin1("<[bB][oO][dD][yY].*>(.*)")), + TQString::fromLatin1("\\1") ); + TQRegExp fontRemover( TQString::fromLatin1("<[fF][oO][nN][tT].*>(.*)") ); fontRemover.setMinimal(true); while ( filteredMessage.find( fontRemover ) != -1 ) - filteredMessage.replace( fontRemover, TQString::tqfromLatin1("\\1") ); + filteredMessage.replace( fontRemover, TQString::fromLatin1("\\1") ); setProperty(mProtocol->awayMessage, filteredMessage); } @@ -148,7 +148,7 @@ int AIMContact::warningLevel() const void AIMContact::updateSSIItem() { if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false && - onlinetqStatus() == Kopete::OnlineStatus::Unknown ) + onlineStatus() == Kopete::OnlineStatus::Unknown ) { //make sure they're offline setOnlineStatus( static_cast( protocol() )->statusOffline ); @@ -392,59 +392,59 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *) //font-size:xxpt -> s=message.escapedBody(); - s.replace ( TQRegExp( TQString::tqfromLatin1("([^<]*)")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("([^<]*)")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("")); - s.replace ( TQRegExp( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("\\2")); + s.replace ( TQRegExp( TQString::fromLatin1("")), + TQString::fromLatin1("\\2")); //okay now change the to //0-9 are size 1 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //10-11 are size 2 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //12-13 are size 3 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //14-16 are size 4 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //17-22 are size 5 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), - TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")), + TQString::fromLatin1("")); //23-29 are size 6 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); //30- (and any I missed) are size 7 - s.replace ( TQRegExp ( TQString::tqfromLatin1("")),TQString::tqfromLatin1("")); + s.replace ( TQRegExp ( TQString::fromLatin1("")),TQString::fromLatin1("")); // strip left over line break - s.remove(TQRegExp(TQString::tqfromLatin1("]*>$"))); + s.remove(TQRegExp(TQString::fromLatin1("]*>$"))); - s.replace ( TQRegExp ( TQString::tqfromLatin1("")), TQString::tqfromLatin1("
") ); + s.replace ( TQRegExp ( TQString::fromLatin1("")), TQString::fromLatin1("
") ); // strip left over line break - s.remove( TQRegExp( TQString::tqfromLatin1( "
$" ) ) ); + s.remove( TQRegExp( TQString::fromLatin1( "
$" ) ) ); kdDebug(14190) << k_funcinfo << "sending " << s << endl; @@ -475,9 +475,9 @@ void AIMContact::updateFeatures() void AIMContact::sendAutoResponse(Kopete::Message& msg) { // The target time is 2 minutes later than the last message - int delta = m_lastAutoresponseTime.secsTo( TQDateTime::tqcurrentDateTime() ); + int delta = m_lastAutoresponseTime.secsTo( TQDateTime::currentDateTime() ); kdDebug(14152) << k_funcinfo << "Last autoresponse time: " << m_lastAutoresponseTime << endl; - kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::tqcurrentDateTime() << endl; + kdDebug(14152) << k_funcinfo << "Current time: " << TQDateTime::currentDateTime() << endl; kdDebug(14152) << k_funcinfo << "Difference: " << delta << endl; // Check to see if we're past that time if(delta > 120) @@ -509,7 +509,7 @@ void AIMContact::sendAutoResponse(Kopete::Message& msg) manager(Kopete::Contact::CanCreate)->appendMessage(msg); manager(Kopete::Contact::CanCreate)->messageSucceeded(); // Update the last autoresponse time - m_lastAutoresponseTime = TQDateTime::tqcurrentDateTime(); + m_lastAutoresponseTime = TQDateTime::currentDateTime(); } else { diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index fe4dbf22..2e412491 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -46,7 +46,7 @@ AIMProtocol* AIMProtocol::protocolStatic_ = 0L; AIMProtocolHandler::AIMProtocolHandler() : Kopete::MimeTypeHandler(false) { - registerAsProtocolHandler(TQString::tqfromLatin1("aim")); + registerAsProtocolHandler(TQString::fromLatin1("aim")); } void AIMProtocolHandler::handleURL(const KURL &url) const @@ -286,8 +286,8 @@ Kopete::Contact *AIMProtocol::deserializeContact(Kopete::MetaContact *metaContac if ( serializedData.contains( "ssi_type" ) ) { ssiName = serializedData["ssi_name"]; - TQString authtqStatus = serializedData["ssi_waitingAuth"]; - if ( authtqStatus == "true" ) + TQString authStatus = serializedData["ssi_waitingAuth"]; + if ( authStatus == "true" ) ssiWaitingAuth = true; ssiGid = serializedData["ssi_gid"].toUInt(); ssiBid = serializedData["ssi_bid"].toUInt(); diff --git a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui index deaa2ff2..4d9352ee 100644 --- a/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui +++ b/kopete/protocols/oscar/aim/ui/aimeditaccountui.ui @@ -165,7 +165,7 @@ 0 - + 0 0 @@ -198,7 +198,7 @@ Expanding - + 20 90 @@ -342,7 +342,7 @@ Expanding - + 20 200 @@ -455,7 +455,7 @@ Expanding - + 31 225 diff --git a/kopete/protocols/oscar/aim/ui/aiminfobase.ui b/kopete/protocols/oscar/aim/ui/aiminfobase.ui index 9457068e..7de495f2 100644 --- a/kopete/protocols/oscar/aim/ui/aiminfobase.ui +++ b/kopete/protocols/oscar/aim/ui/aiminfobase.ui @@ -12,7 +12,7 @@ 408 - + 360 400 @@ -213,7 +213,7 @@ 0 - + 64 16 diff --git a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui index fdfe2a53..5b2d084b 100644 --- a/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui +++ b/kopete/protocols/oscar/aim/ui/aimjoinchatbase.ui @@ -37,7 +37,7 @@ Fixed - + 20 16 @@ -54,7 +54,7 @@ Maximum - + 60 20 @@ -111,7 +111,7 @@ Expanding - + 20 16 -- cgit v1.2.1