Rename old tq methods that no longer need a unique name

(cherry picked from commit 089118c18533dfa3e6ce5065dbebdd4db94051f1)

1 files changed, 40 insertions, 40 deletions

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 -> <font ptsize=xx>
 
     s=message.escapedBody();
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
-            TQString::tqfromLatin1("<style>\\1;\"\\2</style>"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<span style=\"([^\"]*)\">([^<]*)</span>")),
+            TQString::fromLatin1("<style>\\1;\"\\2</style>"));
 
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
-                TQString::tqfromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-style:italic;([^\"]*)\"([^<]*)</style>")),
+                TQString::fromLatin1("<i><style>\\1\\2\"\\3</style></i>"));
 
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
-                TQString::tqfromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-weight:600;([^\"]*)\"([^<]*)</style>")),
+                TQString::fromLatin1("<b><style>\\1\\2\"\\3</style></b>"));
 
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
-                TQString::tqfromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)text-decoration:underline;([^\"]*)\"([^<]*)</style>")),
+                TQString::fromLatin1("<u><style>\\1\\2\"\\3</style></u>"));
 
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
-                TQString::tqfromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-family:([^;]*);([^\"]*)\"([^<]*)</style>")),
+                TQString::fromLatin1("<font face=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
-                TQString::tqfromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)font-size:([^p]*)pt;([^\"]*)\"([^<]*)</style>")),
+                TQString::fromLatin1("<font ptsize=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
-                TQString::tqfromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)color:([^;]*);([^\"]*)\"([^<]*)</style>")),
+                TQString::fromLatin1("<font color=\"\\2\"><style>\\1\\3\"\\4</style></font>"));
 
-    s.replace ( TQRegExp( TQString::tqfromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
-                TQString::tqfromLatin1("\\2"));
+    s.replace ( TQRegExp( TQString::fromLatin1("<style>([^\"]*)\"([^<]*)</style>")),
+                TQString::fromLatin1("\\2"));
 
     //okay now change the <font ptsize="xx"> to <font size="xx">
 
     //0-9 are size 1
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"\\d\">")),
-                TQString::tqfromLatin1("<font size=\"1\">"));
+    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"\\d\">")),
+                TQString::fromLatin1("<font size=\"1\">"));
     //10-11 are size 2
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[01]\">")),
-                TQString::tqfromLatin1("<font size=\"2\">"));
+    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[01]\">")),
+                TQString::fromLatin1("<font size=\"2\">"));
     //12-13 are size 3
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[23]\">")),
-                TQString::tqfromLatin1("<font size=\"3\">"));
+    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[23]\">")),
+                TQString::fromLatin1("<font size=\"3\">"));
     //14-16 are size 4
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"1[456]\">")),
-                TQString::tqfromLatin1("<font size=\"4\">"));
+    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"1[456]\">")),
+                TQString::fromLatin1("<font size=\"4\">"));
     //17-22 are size 5
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
-                TQString::tqfromLatin1("<font size=\"5\">"));
+    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"(?:1[789]|2[012])\">")),
+                TQString::fromLatin1("<font size=\"5\">"));
     //23-29 are size 6
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"2[3456789]\">")),TQString::tqfromLatin1("<font size=\"6\">"));
+    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"2[3456789]\">")),TQString::fromLatin1("<font size=\"6\">"));
     //30- (and any I missed) are size 7
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<font ptsize=\"[^\"]*\">")),TQString::tqfromLatin1("<font size=\"7\">"));
+    s.replace ( TQRegExp ( TQString::fromLatin1("<font ptsize=\"[^\"]*\">")),TQString::fromLatin1("<font size=\"7\">"));
 
-    s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
+    s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") );
 
     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<AIMMyselfContact *> ( 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<AIMMyselfContact *> ( 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<AIMMyselfContact*>( 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<AIMContact *> ( 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<AIMProtocol*>( protocol() )->statusOffline )
+	else if ( myself()->onlineStatus() == static_cast<AIMProtocol*>( protocol() )->statusOffline )
 	{
 		kdDebug(14152) << k_funcinfo << "Logging in as " << accountId() << endl ;
 		updateVersionUpdaterStamp();