Rename old tq methods that no longer need a unique name

40 files changed, 249 insertions, 249 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();
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].*>(.*)</[hH][tT][mM][lL]>")),
-		TQString::tqfromLatin1("\\1"));
+		TQRegExp(TQString::fromLatin1("<[hH][tT][mM][lL].*>(.*)</[hH][tT][mM][lL]>")),
+		TQString::fromLatin1("\\1"));
 	filteredMessage.replace(
-		TQRegExp(TQString::tqfromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")),
-		TQString::tqfromLatin1("\\1") );
-	TQRegExp fontRemover( TQString::tqfromLatin1("<[fF][oO][nN][tT].*>(.*)</[fF][oO][nN][tT]>") );
+		TQRegExp(TQString::fromLatin1("<[bB][oO][dD][yY].*>(.*)</[bB][oO][dD][yY]>")),
+		TQString::fromLatin1("\\1") );
+	TQRegExp fontRemover( TQString::fromLatin1("<[fF][oO][nN][tT].*>(.*)</[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<AIMProtocol*>( protocol() )->statusOffline );
@@ -392,59 +392,59 @@ void AIMContact::slotSendMsg(Kopete::Message& message, Kopete::ChatSession *)
 	//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\">"));
 
 	// strip left over line break
-	s.remove(TQRegExp(TQString::tqfromLatin1("<br\b[^>]*>$")));
+	s.remove(TQRegExp(TQString::fromLatin1("<br\b[^>]*>$")));
 
-	s.replace ( TQRegExp ( TQString::tqfromLatin1("<br[ /]*>")), TQString::tqfromLatin1("<br>") );
+	s.replace ( TQRegExp ( TQString::fromLatin1("<br[ /]*>")), TQString::fromLatin1("<br>") );
 
 	// strip left over line break
-	s.remove( TQRegExp( TQString::tqfromLatin1( "<br>$" ) ) );
+	s.remove( TQRegExp( TQString::fromLatin1( "<br>$" ) ) );
 
 	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 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -198,7 +198,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>90</height>
@@ -342,7 +342,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>200</height>
@@ -455,7 +455,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>31</width>
                                 <height>225</height>
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 @@
             <height>408</height>
         </rect>
     </property>
-    <property name="tqminimumSize">
+    <property name="minimumSize">
         <size>
             <width>360</width>
             <height>400</height>
@@ -213,7 +213,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="tqminimumSize">
+            <property name="minimumSize">
                 <size>
                     <width>64</width>
                     <height>16</height>
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 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -54,7 +54,7 @@
             <property name="sizeType">
                 <enum>Maximum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>60</width>
                     <height>20</height>
@@ -111,7 +111,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
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 );
 	}
 }
 
diff --git a/kopete/protocols/oscar/icq/icqaccount.h b/kopete/protocols/oscar/icq/icqaccount.h
index a5335dbc..f3a62c73 100644
--- a/kopete/protocols/oscar/icq/icqaccount.h
+++ b/kopete/protocols/oscar/icq/icqaccount.h
@@ -84,7 +84,7 @@ private:
 	void setPresenceType( ICQ::Presence::Type, const TQString &awayMessage = TQString() );
 	void setPresenceTarget( const ICQ::Presence &presence, const TQString &message = TQString() );
 
-	//const unsigned long fulltqStatus( const unsigned long plaintqStatus );
+	//const unsigned long fullStatus( const unsigned long plainStatus );
 
 private slots:
 	void slotToggleInvisible();
diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp
index 30563ae0..d5f1245c 100644
--- a/kopete/protocols/oscar/icq/icqcontact.cpp
+++ b/kopete/protocols/oscar/icq/icqcontact.cpp
@@ -103,7 +103,7 @@ void ICQContact::updateSSIItem()
 		setOnlineStatus( mProtocol->statusManager()->waitingForAuth() );
 
 	if ( m_ssiItem.type() != 0xFFFF && m_ssiItem.waitingAuth() == false &&
-	     onlinetqStatus() == Kopete::OnlineStatus::Unknown )
+	     onlineStatus() == Kopete::OnlineStatus::Unknown )
 	{
 		//make sure they're offline
 		setOnlineStatus( ICQ::Presence( ICQ::Presence::Offline, ICQ::Presence::Visible ).toOnlineStatus() );
@@ -121,8 +121,8 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
 	if ( !isOnline() )
 		removeProperty( mProtocol->awayMessage );
 
-	kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedtqStatus() << endl;
-	ICQ::Presence presence = ICQ::Presence::fromOscartqStatus( details.extendedtqStatus() & 0xffff );
+	kdDebug( OSCAR_ICQ_DEBUG ) << k_funcinfo << "extendedStatus is " << details.extendedStatus() << endl;
+	ICQ::Presence presence = ICQ::Presence::fromOscarStatus( details.extendedStatus() & 0xffff );
 	setOnlineStatus( presence.toOnlineStatus() );
 
 	// ICQ does not support status messages for state Online
@@ -133,7 +133,7 @@ void ICQContact::userInfoUpdated( const TQString& contact, const UserDetails& de
 	}
 	else
 	{
-		if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlinetqStatus() ).visibility() == ICQ::Presence::Visible )
+		if ( ICQ::Presence::fromOnlineStatus( account()->myself()->onlineStatus() ).visibility() == ICQ::Presence::Visible )
 		{
 			switch ( presence.type() )
 			{
@@ -561,27 +561,27 @@ void ICQContact::slotContactChanged(const UserInfo &u)
 	else
 		removeProperty(mProtocol->clientFeatures);
 
-	unsigned int newtqStatus = 0;
+	unsigned int newStatus = 0;
 	mInvisible = (mInfo.icqextstatus & ICQ_STATUS_IS_INVIS);
 
 	if (mInfo.icqextstatus & ICQ_STATUS_IS_FFC)
-		newtqStatus = OSCAR_FFC;
+		newStatus = OSCAR_FFC;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_DND)
-		newtqStatus = OSCAR_DND;
+		newStatus = OSCAR_DND;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_OCC)
-		newtqStatus = OSCAR_OCC;
+		newStatus = OSCAR_OCC;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_NA)
-		newtqStatus = OSCAR_NA;
+		newStatus = OSCAR_NA;
 	else if (mInfo.icqextstatus & ICQ_STATUS_IS_AWAY)
-		newtqStatus = OSCAR_AWAY;
+		newStatus = OSCAR_AWAY;
 	else
-		newtqStatus = OSCAR_ONLINE;
+		newStatus = OSCAR_ONLINE;
 
 	if (this != account()->myself())
 	{
-		if(newtqStatus != onlinetqStatus().internalStatus())
+		if(newStatus != onlineStatus().internalStatus())
 		{
-			if(newtqStatus != OSCAR_ONLINE) // if user changed to some state other than online
+			if(newStatus != OSCAR_ONLINE) // if user changed to some state other than online
 			{
 				mAccount->engine()->requestAwayMessage(this);
 			}
@@ -592,7 +592,7 @@ void ICQContact::slotContactChanged(const UserInfo &u)
 		}
 	}
 
-	settqStatus(newtqStatus);
+	setStatus(newStatus);
 }
 
 void ICQContact::slotOffgoingBuddy(TQString sender)
@@ -655,7 +655,7 @@ TQPtrList<KAction> *ICQContact::customContextMenuActions()
 /*
 	TQString awTxt;
 	TQString awIcn;
-	unsigned int status = onlinetqStatus().internalStatus();
+	unsigned int status = onlineStatus().internalStatus();
 	if (status >= 15)
 		status -= 15; // get rid of invis addon
 	switch(status)
diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp
index 520153a6..b0a051d7 100644
--- a/kopete/protocols/oscar/icq/icqpresence.cpp
+++ b/kopete/protocols/oscar/icq/icqpresence.cpp
@@ -49,7 +49,7 @@ struct PresenceTypeData
 
 	static const PresenceTypeData *all();
 	static const PresenceTypeData &forType( Presence::Type type );
-	static const PresenceTypeData &fortqStatus( unsigned long status );
+	static const PresenceTypeData &forStatus( unsigned long status );
 	static const PresenceTypeData &forOnlineStatusType( const Kopete::OnlineStatus::StatusType statusType );
 };
 
@@ -89,7 +89,7 @@ const PresenceTypeData &PresenceTypeData::forType( Presence::Type type )
 	return array[0];
 }
 
-const PresenceTypeData &PresenceTypeData::fortqStatus( unsigned long status )
+const PresenceTypeData &PresenceTypeData::forStatus( unsigned long status )
 {
 	const PresenceTypeData *array = all();
 	for ( uint n = 0; n < Presence::TypeCount; ++n )
@@ -216,12 +216,12 @@ Kopete::OnlineStatus OnlineStatusManager::onlineStatusOf( const Presence &presen
 		return d->invisibleStatusList[ presence.type() ];
 }
 
-Kopete::OnlineStatus OnlineStatusManager::connectingtqStatus()
+Kopete::OnlineStatus OnlineStatusManager::connectingStatus()
 {
 	return d->connecting;
 }
 
-Kopete::OnlineStatus OnlineStatusManager::unknowntqStatus()
+Kopete::OnlineStatus OnlineStatusManager::unknownStatus()
 {
 	return d->unknown;
 }
@@ -258,31 +258,31 @@ Kopete::OnlineStatus Presence::toOnlineStatus() const
 }
 
 
-unsigned long Presence::toOscartqStatus() const
+unsigned long Presence::toOscarStatus() const
 {
-	unsigned long basictqStatus = basicOscartqStatus();
+	unsigned long basicStatus = basicOscarStatus();
 	if ( _visibility == Invisible )
-		basictqStatus |= StatusCode::INVISIBLE;
-	return basictqStatus;
+		basicStatus |= StatusCode::INVISIBLE;
+	return basicStatus;
 }
 
-Presence Presence::fromOscartqStatus( unsigned long code )
+Presence Presence::fromOscarStatus( unsigned long code )
 {
-	Type type = typeFromOscartqStatus( code & ~StatusCode::INVISIBLE );
+	Type type = typeFromOscarStatus( code & ~StatusCode::INVISIBLE );
 	bool invisible = (code & StatusCode::INVISIBLE) == StatusCode::INVISIBLE;
 	return Presence( type, invisible ? Invisible : Visible );
 }
 
 
-unsigned long Presence::basicOscartqStatus() const
+unsigned long Presence::basicOscarStatus() const
 {
 	const PresenceTypeData &data = PresenceTypeData::forType( _type );
 	return data.setFlag;
 }
 
-Presence::Type Presence::typeFromOscartqStatus( unsigned long status )
+Presence::Type Presence::typeFromOscarStatus( unsigned long status )
 {
-	const PresenceTypeData &data = PresenceTypeData::fortqStatus( status );
+	const PresenceTypeData &data = PresenceTypeData::forStatus( status );
 	return data.type;
 }
 
diff --git a/kopete/protocols/oscar/icq/icqpresence.h b/kopete/protocols/oscar/icq/icqpresence.h
index 360cadeb..d7ef9ed2 100644
--- a/kopete/protocols/oscar/icq/icqpresence.h
+++ b/kopete/protocols/oscar/icq/icqpresence.h
@@ -78,8 +78,8 @@ public:
 	~OnlineStatusManager();
 	ICQ::Presence presenceOf( uint internalStatus );
 	Kopete::OnlineStatus onlineStatusOf( const ICQ::Presence &presence );
-	Kopete::OnlineStatus connectingtqStatus();
-	Kopete::OnlineStatus unknowntqStatus();
+	Kopete::OnlineStatus connectingStatus();
+	Kopete::OnlineStatus unknownStatus();
 	Kopete::OnlineStatus waitingForAuth();
 	
 private:
@@ -117,23 +117,23 @@ public:
 	Kopete::OnlineStatus toOnlineStatus() const;
 	
 	/**
-	 * Get the status code to pass to liboscar to set us to this tqStatus.
+	 * Get the status code to pass to liboscar to set us to this Status.
 	 * @note This is not the opposite of fromOnlineStatus(). The set and get codes don't match.
 	 */
-	unsigned long toOscartqStatus() const;
+	unsigned long toOscarStatus() const;
 	
 	/**
 	 * Get the status a contact is at based on liboscar's view of its status.
 	 * @note This is not the opposite of toOnlineStatus().
 	 */
-	static Presence fromOscartqStatus( unsigned long code );
+	static Presence fromOscarStatus( unsigned long code );
 	
 	bool operator==( const Presence &other ) const { return other._type == _type && other._visibility == _visibility; }
 	bool operator!=( const Presence &other ) const { return !(*this == other); }
 	
 private:
-	unsigned long basicOscartqStatus() const;
-	static Type typeFromOscartqStatus( unsigned long status );
+	unsigned long basicOscarStatus() const;
+	static Type typeFromOscarStatus( unsigned long status );
 private:
 	Type _type;
 	Visibility _visibility;
diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp
index dad58726..9e85c1ad 100644
--- a/kopete/protocols/oscar/icq/icqprotocol.cpp
+++ b/kopete/protocols/oscar/icq/icqprotocol.cpp
@@ -66,7 +66,7 @@ K_EXPORT_COMPONENT_FACTORY( kopete_icq, ICQProtocolFactory( "kopete_icq" ) )
 
 ICQProtocolHandler::ICQProtocolHandler() : Kopete::MimeTypeHandler(false)
 {
-	registerAsMimeHandler(TQString::tqfromLatin1("application/x-icq"));
+	registerAsMimeHandler(TQString::fromLatin1("application/x-icq"));
 }
 
 void ICQProtocolHandler::handleURL(const TQString &mimeType, const KURL & url) const
@@ -219,7 +219,7 @@ void ICQProtocol::initGenders()
 void ICQProtocol::initCountries()
 {
 	mCountries.insert(0, ""); // unspecified
-	KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("kopete"));
+	KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete"));
 
 	mCountries.insert(93, kl->twoAlphaToCountryName("af"));
 	mCountries.insert(355, kl->twoAlphaToCountryName("al"));
@@ -468,7 +468,7 @@ void ICQProtocol::initCountries()
 void ICQProtocol::initLang()
 {
 
-	KLocale *kl = KGlobal::locale(); //KLocale(TQString::tqfromLatin1("kopete"));
+	KLocale *kl = KGlobal::locale(); //KLocale(TQString::fromLatin1("kopete"));
 
 	mLanguages.insert(0 , "");
 	mLanguages.insert(1 , kl->twoAlphaToLanguageName("ar") /*i18n("Arabic")*/);
@@ -775,8 +775,8 @@ Kopete::Contact *ICQProtocol::deserializeContact( Kopete::MetaContact *metaConta
 
     if ( serializedData.contains( "ssi_waitingAuth" ) )
     {
-	TQString authtqStatus = serializedData["ssi_waitingAuth"];
-	if ( authtqStatus == "true" )
+	TQString authStatus = serializedData["ssi_waitingAuth"];
+	if ( authStatus == "true" )
 		ssiWaitingAuth = true;
     }
 
diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp
index 94eaa063..abbc8eb2 100644
--- a/kopete/protocols/oscar/icq/icqreadaway.cpp
+++ b/kopete/protocols/oscar/icq/icqreadaway.cpp
@@ -37,7 +37,7 @@ ICQReadAway::ICQReadAway(ICQContact *c, TQWidget *parent, const char* name)
 
 	mAccount = static_cast<ICQAccount*>(c->account());
 	mContact = c;
-	setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlinetqStatus().description()));
+	setCaption(i18n("'%2' Message for %1").tqarg(c->displayName()).tqarg(c->onlineStatus().description()));
 
 	TQVBox *mMainWidget = makeVBoxMainWidget();
 
@@ -74,12 +74,12 @@ void ICQReadAway::slotFetchAwayMessage()
 
 	mAccount->engine()->requestAwayMessage(mContact);
 
-	setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description()));
+	setCaption(i18n("Fetching '%2' Message for %1...").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description()));
 } // END slotFetchAwayMessage()
 
 void ICQReadAway::slotAwayMessageChanged()
 {
-	setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlinetqStatus().description()));
+	setCaption(i18n("'%2' Message for %1").tqarg(mContact->displayName()).tqarg(mContact->onlineStatus().description()));
 	awayMessageBrowser->setText(mContact->awayMessage());
 
 	awayMessageBrowser->setDisabled(false);
diff --git a/kopete/protocols/oscar/icq/ui/icqadd.ui b/kopete/protocols/oscar/icq/ui/icqadd.ui
index 5ac8d973..6ae1f092 100644
--- a/kopete/protocols/oscar/icq/ui/icqadd.ui
+++ b/kopete/protocols/oscar/icq/ui/icqadd.ui
@@ -71,7 +71,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>47</width>
                             <height>26</height>
@@ -101,7 +101,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
index 61fc84cb..370bef8b 100644
--- a/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqauthreplyui.ui
@@ -68,7 +68,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>50</width>
                             <height>20</height>
@@ -131,7 +131,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>220</width>
                             <height>21</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
index 1bc5d379..541308e2 100644
--- a/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
+++ b/kopete/protocols/oscar/icq/ui/icqeditaccountui.ui
@@ -149,7 +149,7 @@
                                         <verstretch>0</verstretch>
                                     </sizepolicy>
                                 </property>
-                                <property name="tqminimumSize">
+                                <property name="minimumSize">
                                     <size>
                                         <width>0</width>
                                         <height>0</height>
@@ -183,7 +183,7 @@ If you do not currently have an ICQ account, please click the button to create o
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -372,7 +372,7 @@ If you do not currently have an ICQ account, please click the button to create o
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
index c48e8ff9..1af12007 100644
--- a/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
+++ b/kopete/protocols/oscar/icq/ui/icqgeneralinfo.ui
@@ -331,7 +331,7 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="tqminimumSize">
+                    <property name="minimumSize">
                         <size>
                             <width>125</width>
                             <height>0</height>
@@ -579,7 +579,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>20</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
index 009780f0..1dd7134b 100644
--- a/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqinterestinfowidget.ui
@@ -103,7 +103,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>220</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
index d5d77c09..088fc302 100644
--- a/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqotherinfowidget.ui
@@ -26,7 +26,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>30</height>
diff --git a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
index 140f17fa..161444f6 100644
--- a/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
+++ b/kopete/protocols/oscar/icq/ui/icqsearchbase.ui
@@ -114,7 +114,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>41</width>
                     <height>190</height>
@@ -162,7 +162,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>105</height>
@@ -328,7 +328,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>20</width>
                                 <height>16</height>
@@ -345,7 +345,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="tqsizeHint">
+                        <property name="sizeHint">
                             <size>
                                 <width>166</width>
                                 <height>20</height>
diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
index 1eb1c934..44fd5afd 100644
--- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
+++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp
@@ -47,28 +47,28 @@ ICQUserInfoWidget::ICQUserInfoWidget( TQWidget * parent, const char * name )
 	
 	TQFrame* genInfo = addPage( i18n( "General Info" ),
 	                                         i18n( "General ICQ Information" ),
-	                                         KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "identity" ), KIcon::Desktop ) );
+	                                         KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "identity" ), KIcon::Desktop ) );
 	TQVBoxLayout* genLayout = new TQVBoxLayout( genInfo );
 	m_genInfoWidget = new ICQGeneralInfoWidget( genInfo, "Basic Information" );
 	genLayout->addWidget( m_genInfoWidget );
 	
 	TQFrame* workInfo = addPage( i18n( "Work Info" ),
 	                                          i18n( "Work Information" ),
-	                                          KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "attach" ), KIcon::Desktop ) );
+	                                          KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "attach" ), KIcon::Desktop ) );
 	TQVBoxLayout* workLayout = new TQVBoxLayout( workInfo );
 	m_workInfoWidget = new ICQWorkInfoWidget( workInfo, "Work Information" );
 	workLayout->addWidget( m_workInfoWidget );
 	
 	TQFrame* otherInfo = addPage( i18n( "Other Info" ),
 	                                           i18n( "Other ICQ Information" ),
-	                                           KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) );
+	                                           KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
 	TQVBoxLayout* otherLayout = new TQVBoxLayout( otherInfo );
 	m_otherInfoWidget = new ICQOtherInfoWidget( otherInfo, "Other Information"  );
 	otherLayout->addWidget( m_otherInfoWidget );
 	
 	TQFrame* interestInfo = addPage( i18n( "Interest Info" ),
 	                                           i18n( "Interest" ),
-	                                           KGlobal::iconLoader()->loadIcon( TQString::tqfromLatin1( "email" ), KIcon::Desktop ) );
+	                                           KGlobal::iconLoader()->loadIcon( TQString::fromLatin1( "email" ), KIcon::Desktop ) );
 	TQVBoxLayout* interestLayout = new TQVBoxLayout( interestInfo );
 	m_interestInfoWidget = new ICQInterestInfoWidget( interestInfo, "Other Information"  );
 	interestLayout->addWidget( m_interestInfoWidget );
diff --git a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
index 4707dbe8..8f243f20 100644
--- a/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
+++ b/kopete/protocols/oscar/icq/ui/icqworkinfowidget.ui
@@ -236,7 +236,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>70</height>
diff --git a/kopete/protocols/oscar/liboscar/chatservicetask.cpp b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
index ff3159f4..3e649b97 100644
--- a/kopete/protocols/oscar/liboscar/chatservicetask.cpp
+++ b/kopete/protocols/oscar/liboscar/chatservicetask.cpp
@@ -341,7 +341,7 @@ void ChatServiceTask::parseChatMessage()
     Oscar::Message omessage;
     omessage.setReceiver( client()->userId() );
     omessage.setSender( sender );
-    omessage.setTimestamp( TQDateTime::tqcurrentDateTime() );
+    omessage.setTimestamp( TQDateTime::currentDateTime() );
     omessage.setText( Oscar::Message::UTF8, msgText );
     omessage.setType( 0x03 );
     omessage.setExchange( m_exchange );
diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp
index 00431434..28f841c2 100644
--- a/kopete/protocols/oscar/liboscar/client.cpp
+++ b/kopete/protocols/oscar/liboscar/client.cpp
@@ -98,7 +98,7 @@ public:
 	TQValueList<WORD> redirectionServices;
     WORD currentRedirect;
 	TQByteArray cookie;
-	DWORD connectAstqStatus; // icq only
+	DWORD connectAsStatus; // icq only
 	TQString connectWithMessage; // icq only
 	Oscar::Settings* settings;
 
@@ -128,7 +128,7 @@ public:
 	struct AwayMsgRequest
 	{
 		TQString contact;
-		ICQtqStatus contacttqStatus;
+		ICQStatus contactStatus;
 	};
 	TQValueList<AwayMsgRequest> awayMsgRequestQueue;
 	TQTimer* awayMsgRequestTimer;
@@ -149,7 +149,7 @@ Client::Client( TQObject* parent )
 	d->isIcq = false; //default to AIM
 	d->redirectRequested = false;
     d->currentRedirect = 0;
-	d->connectAstqStatus = 0x0; // default to online
+	d->connectAsStatus = 0x0; // default to online
 	d->ssiManager = new SSIManager( this );
 	d->settings = new Oscar::Settings();
 	d->errorTask = 0L;
@@ -222,7 +222,7 @@ void Client::close()
 	//don't clear the stored status between stage one and two
 	if ( d->stage == ClientPrivate::StageTwo )
 	{
-		d->connectAstqStatus = 0x0;
+		d->connectAsStatus = 0x0;
 		d->connectWithMessage = TQString();
 	}
 
@@ -233,7 +233,7 @@ void Client::close()
     d->ssiManager->clear();
 }
 
-void Client::settqStatus( AIMtqStatus status, const TQString &_message )
+void Client::setStatus( AIMStatus status, const TQString &_message )
 {
 	// AIM: you're away exactly when your away message isn't empty.
 	// can't use TQString() as a message either; ProfileTask
@@ -257,7 +257,7 @@ void Client::settqStatus( AIMtqStatus status, const TQString &_message )
 	pt->go( true );
 }
 
-void Client::settqStatus( DWORD status, const TQString &message )
+void Client::setStatus( DWORD status, const TQString &message )
 {
 	// remember the message to reply with, when requested
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Setting status message to "<< message << endl;
@@ -292,7 +292,7 @@ void Client::settqStatus( DWORD status, const TQString &message )
 	}
 	else
 	{
-		d->connectAstqStatus = status;
+		d->connectAsStatus = status;
 		d->connectWithMessage = message;
 	}
 }
@@ -399,7 +399,7 @@ void Client::serviceSetupFinished()
 	d->active = true;
 
 	if ( isIcq() )
-		settqStatus( d->connectAstqStatus, d->connectWithMessage );
+		setStatus( d->connectAsStatus, d->connectWithMessage );
 
 	d->ownStatusTask->go();
 
@@ -862,14 +862,14 @@ void Client::requestAIMAwayMessage( const TQString& contact )
 	d->userInfoTask->requestInfoFor( contact, UserInfoTask::AwayMessage );
 }
 
-void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus )
+void Client::requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus )
 {
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "requesting away message for " << contact << endl;
 	Oscar::Message msg;
 	msg.setType( 2 );
 	msg.setReceiver( contact );
 	msg.addProperty( Oscar::Message::StatusMessageRequest );
-	switch ( contacttqStatus )
+	switch ( contactStatus )
 	{
 	case ICQAway:
 		msg.setMessageType( 0xE8 ); // away
@@ -894,7 +894,7 @@ void Client::requestICQAwayMessage( const TQString& contact, ICQtqStatus contact
 	sendMessage( msg );
 }
 
-void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus )
+void Client::addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus )
 {
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "adding away message request for "
 	                         << contact << " to queue" << endl;
@@ -902,7 +902,7 @@ void Client::addICQAwayMessageRequest( const TQString& contact, ICQtqStatus cont
 	//remove old request if still exists
 	removeICQAwayMessageRequest( contact );
 
-	ClientPrivate::AwayMsgRequest amr = { contact, contacttqStatus };
+	ClientPrivate::AwayMsgRequest amr = { contact, contactStatus };
 	d->awayMsgRequestQueue.prepend( amr );
 	
 	if ( !d->awayMsgRequestTimer->isActive() )
@@ -959,7 +959,7 @@ void Client::nextICQAwayMessageRequest()
 
 	amr = d->awayMsgRequestQueue.back();
 	d->awayMsgRequestQueue.pop_back();
-	requestICQAwayMessage( amr.contact, amr.contacttqStatus );
+	requestICQAwayMessage( amr.contact, amr.contactStatus );
 }
 
 void Client::requestStatusInfo( const TQString& contact )
@@ -1139,7 +1139,7 @@ void Client::haveServerForRedirect( const TQString& host, const TQByteArray& coo
 	else
 	{
 		realHost = host;
-		realPort = TQString::tqfromLatin1("5190");
+		realPort = TQString::fromLatin1("5190");
 	}
 
 	Connection* c = createConnection( realHost, realPort );
diff --git a/kopete/protocols/oscar/liboscar/client.h b/kopete/protocols/oscar/liboscar/client.h
index 976f43be..b09be40e 100644
--- a/kopete/protocols/oscar/liboscar/client.h
+++ b/kopete/protocols/oscar/liboscar/client.h
@@ -68,8 +68,8 @@ public:
 		FatalProtocolError = 3
 	};
 
-	enum AIMtqStatus { Online = 0, Away };
-	enum ICQtqStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat };
+	enum AIMStatus { Online = 0, Away };
+	enum ICQStatus { ICQOnline = 0, ICQAway, ICQNotAvailable, ICQOccupied, ICQDoNotDisturb, ICQFreeForChat };
 
 	/*************
 	  EXTERNAL API
@@ -103,9 +103,9 @@ public:
 	/** Logout and disconnect */
 	void close();
 	/** Set our status for AIM */
-	void settqStatus( AIMtqStatus status, const TQString &message = TQString() );
+	void setStatus( AIMStatus status, const TQString &message = TQString() );
 	/** Set our status for ICQ */
- 	void settqStatus( DWORD status, const TQString &message = TQString() );
+ 	void setStatus( DWORD status, const TQString &message = TQString() );
 
 	/** Retrieve our user info */
 	UserDetails ourInfo() const;
@@ -256,7 +256,7 @@ public:
 	 * Add the icq away message request to queue
 	 * \param contact the contact to get info for
 	 */
-	void addICQAwayMessageRequest( const TQString& contact, ICQtqStatus contacttqStatus );
+	void addICQAwayMessageRequest( const TQString& contact, ICQStatus contactStatus );
 
 	/**
 	 * Remove the icq away message request from queue
@@ -505,7 +505,7 @@ private:
 	 * \param contact the contact to get info for
 	 */
 	//TODO only made a default for testing w/o frontend
-	void requestICQAwayMessage( const TQString& contact, ICQtqStatus contacttqStatus = ICQAway );
+	void requestICQAwayMessage( const TQString& contact, ICQStatus contactStatus = ICQAway );
 
 private:
 	class ClientPrivate;
diff --git a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
index 1bbe6622..b5b78f2b 100644
--- a/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
+++ b/kopete/protocols/oscar/liboscar/messagereceivertask.cpp
@@ -176,7 +176,7 @@ void MessageReceiverTask::handleType1Message()
 
 	msg.setSender( m_fromUser );
 	msg.setReceiver( client()->userId() );
-	msg.setTimestamp( TQDateTime::tqcurrentDateTime() );
+	msg.setTimestamp( TQDateTime::currentDateTime() );
 	msg.setType( 0x01 );
 
 	emit receivedMessage( msg );
@@ -332,7 +332,7 @@ void MessageReceiverTask::handleType4Message()
 	}
 
 	msg.setType( 0x04 );
-	msg.setTimestamp( TQDateTime::tqcurrentDateTime() );
+	msg.setTimestamp( TQDateTime::currentDateTime() );
 	msg.setSender( msgSender );
 	msg.setReceiver( client()->userId() );
 	msg.setEncoding( Oscar::Message::UserDefined );
@@ -437,7 +437,7 @@ void MessageReceiverTask::parseRendezvousData( Buffer* b, Oscar::Message* msg )
 		
 		msg->setSender( m_fromUser );
 		msg->setReceiver( client()->userId() );
-		msg->setTimestamp( TQDateTime::tqcurrentDateTime() );
+		msg->setTimestamp( TQDateTime::currentDateTime() );
 		msg->setType( 0x02 );
 		msg->setIcbmCookie( m_icbmCookie );
 		msg->setProtocolVersion( protocolVersion );
diff --git a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
index 958a5d49..97751352 100644
--- a/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
+++ b/kopete/protocols/oscar/liboscar/oscartypeclasses.cpp
@@ -224,7 +224,7 @@ TQByteArray Oscar::SSI::iconHash( ) const
 
 TQString Oscar::SSI::toString() const
 {
-	TQString ssiString = TQString::tqfromLatin1( "name: " );
+	TQString ssiString = TQString::fromLatin1( "name: " );
 	ssiString += m_name;
 	ssiString += " gid: ";
 	ssiString += TQString::number( m_gid );
diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
index 3bd07cb5..1a0e57c8 100644
--- a/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
+++ b/kopete/protocols/oscar/liboscar/senddcinfotask.cpp
@@ -25,7 +25,7 @@
 #include "oscarutils.h"
 #include "transfer.h"
 
-SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mtqStatus(status)
+SendDCInfoTask::SendDCInfoTask(Task* parent, DWORD status): Task(parent), mStatus(status)
 {
 }
 
@@ -70,7 +70,7 @@ void SendDCInfoTask::onGo()
 		statusFlag |= 0x10000000;  // Direct connection upon authorization, hides IP
 	}
 	
-	buffer->addDWord( statusFlag | mtqStatus );
+	buffer->addDWord( statusFlag | mStatus );
 
 	/* Fill in the DC Info 
 	 * We don't support Direct Connection yet. So fill in some
diff --git a/kopete/protocols/oscar/liboscar/senddcinfotask.h b/kopete/protocols/oscar/liboscar/senddcinfotask.h
index a98b9612..d130cc40 100644
--- a/kopete/protocols/oscar/liboscar/senddcinfotask.h
+++ b/kopete/protocols/oscar/liboscar/senddcinfotask.h
@@ -33,7 +33,7 @@ public:
 	virtual void onGo();
 	
 private:
-	DWORD mtqStatus;
+	DWORD mStatus;
 };
 
 #endif
diff --git a/kopete/protocols/oscar/liboscar/ssimanager.cpp b/kopete/protocols/oscar/liboscar/ssimanager.cpp
index ce39965f..1351c237 100644
--- a/kopete/protocols/oscar/liboscar/ssimanager.cpp
+++ b/kopete/protocols/oscar/liboscar/ssimanager.cpp
@@ -141,7 +141,7 @@ void SSIManager::setParameters( WORD maxContacts, WORD maxGroups, WORD maxVisibl
 {
 	//I'm not using k_funcinfo for these debug statements because of
 	//the function's long signature
-	TQString funcName = TQString::tqfromLatin1( "[void SSIManager::setParameters] " );
+	TQString funcName = TQString::fromLatin1( "[void SSIManager::setParameters] " );
 	kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of contacts allowed in SSI: "
 		<< maxContacts << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << funcName << "Max number of groups allowed in SSI: "
diff --git a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
index 6f62ebe6..a7c16cea 100644
--- a/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/clientstream_test.cpp
@@ -27,7 +27,7 @@ ClientStreamTest::~ClientStreamTest()
 
 void ClientStreamTest::slotDoTest()
 {
-	TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+	TQString server = TQString::fromLatin1("login.oscar.aol.com");
 	// connect to server
 	qDebug( "connecting to server ");
 	myTestObject->connectToServer( server, true ); // fine up to here...
diff --git a/kopete/protocols/oscar/liboscar/tests/logintest.cpp b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
index 540aa35c..1d3728aa 100644
--- a/kopete/protocols/oscar/liboscar/tests/logintest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/logintest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
 
 void LoginTest::slotDoTest()
 {
-	TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+	TQString server = TQString::fromLatin1("login.oscar.aol.com");
 	// connect to server
 	qDebug( "connecting to server ");
 
diff --git a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
index 9849bbbb..6ca733cc 100644
--- a/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/ssigrouptest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
 
 void LoginTest::slotDoTest()
 {
-	TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+	TQString server = TQString::fromLatin1("login.oscar.aol.com");
 	// connect to server
 	qDebug( "connecting to server ");
 
@@ -57,7 +57,7 @@ int main(int argc, char ** argv)
 void LoginTest::runAddGroupTest()
 {
 	qDebug( "running ssi group add test" );
-	TQString group = TQString::tqfromLatin1( "dummygroup" );
+	TQString group = TQString::fromLatin1( "dummygroup" );
 	myClient->addGroup( group );
 	TQTimer::singleShot( 5000, this, TQT_SLOT( runDelGroupTest() ) );
 }
@@ -65,7 +65,7 @@ void LoginTest::runAddGroupTest()
 void LoginTest::runDelGroupTest()
 {
 	qDebug( "running ssi group del test" );
-	TQString group = TQString::tqfromLatin1( "dummygroup" );
+	TQString group = TQString::fromLatin1( "dummygroup" );
 	myClient->removeGroup( group );
 }
 
diff --git a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
index 663ec2fb..fb346d26 100644
--- a/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
+++ b/kopete/protocols/oscar/liboscar/tests/userinfotest.cpp
@@ -29,7 +29,7 @@ LoginTest::~LoginTest()
 
 void LoginTest::slotDoTest()
 {
-	TQString server = TQString::tqfromLatin1("login.oscar.aol.com");
+	TQString server = TQString::fromLatin1("login.oscar.aol.com");
 	// connect to server
 	qDebug( "connecting to server ");
 
@@ -58,7 +58,7 @@ int main(int argc, char ** argv)
 void LoginTest::runUserInfoTest()
 {
 	qDebug( "running user info test" );
-	TQString contact = TQString::tqfromLatin1( "userid" );
+	TQString contact = TQString::fromLatin1( "userid" );
 	myClient->requestFullInfo( contact );
 
 }
diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp
index 77a6c72b..bc6ac70a 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.cpp
+++ b/kopete/protocols/oscar/liboscar/userdetails.cpp
@@ -34,7 +34,7 @@ UserDetails::UserDetails()
 	m_warningLevel = 0;
 	m_userClass = 0;
 	m_idleTime = 0;
-	m_extendedtqStatus = 0;
+	m_extendedStatus = 0;
 	m_capabilities = 0;
 	m_dcPort = 0;
 	m_dcType = 0;
@@ -107,9 +107,9 @@ int UserDetails::userClass() const
 	return m_userClass;
 }
 
-DWORD UserDetails::extendedtqStatus() const
+DWORD UserDetails::extendedStatus() const
 {
-	return m_extendedtqStatus;
+	return m_extendedStatus;
 }
 
 BYTE UserDetails::iconCheckSumType() const
@@ -183,10 +183,10 @@ void UserDetails::fill( Buffer * buffer )
 #endif
 				break;
 			case 0x0006: //extended user status
-				m_extendedtqStatus = b.getDWord();
+				m_extendedStatus = b.getDWord();
 				m_extendedStatusSpecified = true;
 #ifdef OSCAR_USERINFO_DEBUG
-				kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedtqStatus, 16 ) << endl;
+				kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedStatus, 16 ) << endl;
 #endif
                 break;
 			case 0x000A: //external IP address
@@ -366,9 +366,9 @@ void UserDetails::detectClient()
 			case 0xFFFFFFFFL: //gaim behaves like official AIM so we can't detect them, only look for miranda
 				{
 					if (m_dcLastExtStatusUpdateTime & 0x80000000)
-						m_clientName=TQString::tqfromLatin1("Miranda alpha");
+						m_clientName=TQString::fromLatin1("Miranda alpha");
 					else
-						m_clientName=TQString::tqfromLatin1("Miranda");
+						m_clientName=TQString::fromLatin1("Miranda");
 
 					DWORD version = (m_dcLastExtInfoUpdateTime & 0xFFFFFF);
 					BYTE major1 = ((version >> 24) & 0xFF);
@@ -391,25 +391,25 @@ void UserDetails::detectClient()
 				}
 				break;
 			case 0xFFFFFF8FL:
-				m_clientName = TQString::tqfromLatin1("StrICQ");
+				m_clientName = TQString::fromLatin1("StrICQ");
 				break;
 			case 0xFFFFFF42L:
-				m_clientName = TQString::tqfromLatin1("mICQ");
+				m_clientName = TQString::fromLatin1("mICQ");
 				break;
 			case 0xFFFFFFBEL:
-				m_clientName = TQString::tqfromLatin1("alicq");
+				m_clientName = TQString::fromLatin1("alicq");
 				break;
 			case 0xFFFFFF7FL:
-				m_clientName = TQString::tqfromLatin1("&RQ");
+				m_clientName = TQString::fromLatin1("&RQ");
 				break;
 			case 0xFFFFFFABL:
-				m_clientName = TQString::tqfromLatin1("YSM");
+				m_clientName = TQString::fromLatin1("YSM");
 				break;
 			case 0x3AA773EEL:
 				if ((m_dcLastExtStatusUpdateTime == 0x3AA66380L) &&
 				    (m_dcLastExtInfoUpdateTime == 0x3A877A42L))
 				{
-					m_clientName=TQString::tqfromLatin1("libicq2000");
+					m_clientName=TQString::fromLatin1("libicq2000");
 				}
 				break;
 			default:
@@ -427,48 +427,48 @@ void UserDetails::detectClient()
 			switch (m_dcProtoVersion)
 			{
 			case 10:
-				m_clientName=TQString::tqfromLatin1("ICQ 2003b");
+				m_clientName=TQString::fromLatin1("ICQ 2003b");
 				break;
 			case 9:
-				m_clientName=TQString::tqfromLatin1("ICQ Lite");
+				m_clientName=TQString::fromLatin1("ICQ Lite");
 				break;
 			case 8:
-				m_clientName=TQString::tqfromLatin1("Miranda");
+				m_clientName=TQString::fromLatin1("Miranda");
 				break;
 			default:
-				m_clientName=TQString::tqfromLatin1("ICQ2go");
+				m_clientName=TQString::fromLatin1("ICQ2go");
 			}
 		}
 		else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ
 		{
-			m_clientName = TQString::tqfromLatin1("Gaim");
+			m_clientName = TQString::fromLatin1("Gaim");
 		}
 		else if (hasCap(CAP_XTRAZ))
 		{
-			m_clientName = TQString::tqfromLatin1("ICQ 4.0 Lite");
+			m_clientName = TQString::fromLatin1("ICQ 4.0 Lite");
 		}
 		else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
 		         hasCap(CAP_IS_2001))
 		{
-			m_clientName = TQString::tqfromLatin1( "ICQ 2001");
+			m_clientName = TQString::fromLatin1( "ICQ 2001");
 		}
 		else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
 		         hasCap(CAP_STR_2002))
 		{
-			m_clientName = TQString::tqfromLatin1("ICQ 2002");
+			m_clientName = TQString::fromLatin1("ICQ 2002");
 		}
 		else if (hasCap(CAP_RTFMSGS) && hasCap(CAP_UTF8) &&
 		         hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
 		{
-			m_clientName = TQString::tqfromLatin1("ICQ 2003a");
+			m_clientName = TQString::fromLatin1("ICQ 2003a");
 		}
 		else if (hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
 		{
-			m_clientName =TQString::tqfromLatin1("ICQ 2001b");
+			m_clientName =TQString::fromLatin1("ICQ 2001b");
 		}
 		else if ((m_dcProtoVersion == 7) && hasCap(CAP_RTFMSGS))
 		{
-			m_clientName = TQString::tqfromLatin1("GnomeICU");
+			m_clientName = TQString::fromLatin1("GnomeICU");
 		}
 	}
 
@@ -514,7 +514,7 @@ void UserDetails::merge( const UserDetails& ud )
 	}
 	if ( ud.m_extendedStatusSpecified )
 	{
-		m_extendedtqStatus = ud.m_extendedtqStatus;
+		m_extendedStatus = ud.m_extendedStatus;
 		m_extendedStatusSpecified = true;
 	}
 	if ( ud.m_capabilitiesSpecified )
diff --git a/kopete/protocols/oscar/liboscar/userdetails.h b/kopete/protocols/oscar/liboscar/userdetails.h
index 367d8999..8835f6f9 100644
--- a/kopete/protocols/oscar/liboscar/userdetails.h
+++ b/kopete/protocols/oscar/liboscar/userdetails.h
@@ -44,7 +44,7 @@ public:
 	TQDateTime onlineSinceTime() const; //! Online since accessor
 	TQDateTime memberSinceTime() const; //! Member since accessor
 	int userClass() const; //! User class accessor
-	DWORD extendedtqStatus() const; //!User status accessor
+	DWORD extendedStatus() const; //!User status accessor
 	BYTE iconCheckSumType() const; //!Buddy icon hash type
 	TQByteArray buddyIconHash() const; //! Buddy icon md5 hash accessor
 	TQString clientName() const; //! Client name and version
@@ -85,7 +85,7 @@ private:
 	TQDateTime m_onlineSince; /// how long the contact's been online - TLV 0x03
 	DWORD m_numSecondsOnline; /// how long the contact's been online in seconds
 	WORD m_idleTime; /// the idle time of the contact - TLV 0x0F
-	DWORD m_extendedtqStatus; /// the extended status of the contact - TLV 0x06	
+	DWORD m_extendedStatus; /// the extended status of the contact - TLV 0x06	
 	DWORD m_capabilities; //TLV 0x05
 	TQString m_clientVersion; /// the version of client they're using
 	TQString m_clientName; /// the name of the client they're using
diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp
index 89d72641..da6d534b 100644
--- a/kopete/protocols/oscar/oscaraccount.cpp
+++ b/kopete/protocols/oscar/oscaraccount.cpp
@@ -276,7 +276,7 @@ void OscarAccount::processSSIList()
     }
     kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "the following contacts are not on the server side list"
                              << nonServerContactList << endl;
-	bool showMissingContactsDialog = configGroup()->readBoolEntry(TQString::tqfromLatin1("ShowMissingContactsDialog"), true);
+	bool showMissingContactsDialog = configGroup()->readBoolEntry(TQString::fromLatin1("ShowMissingContactsDialog"), true);
     if ( !nonServerContactList.isEmpty() && showMissingContactsDialog )
     {
         d->olnscDialog = new OscarListNonServerContacts( Kopete::UI::Global::mainWidget() );
@@ -334,7 +334,7 @@ void OscarAccount::nonServerAddContactDialogClosed()
     }
 
 	bool showOnce = d->olnscDialog->onlyShowOnce();
-	configGroup()->writeEntry( TQString::tqfromLatin1("ShowMissingContactsDialog") , !showOnce);
+	configGroup()->writeEntry( TQString::fromLatin1("ShowMissingContactsDialog") , !showOnce);
 	configGroup()->sync();
 	
     d->olnscDialog->delayedDestruct();
@@ -429,15 +429,15 @@ void OscarAccount::messageReceived( const Oscar::Message& message )
 
 void OscarAccount::setServerAddress(const TQString &server)
 {
-	configGroup()->writeEntry( TQString::tqfromLatin1( "Server" ), server );
+	configGroup()->writeEntry( TQString::fromLatin1( "Server" ), server );
 }
 
 void OscarAccount::setServerPort(int port)
 {
 	if ( port > 0 )
-		configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), port );
+		configGroup()->writeEntry( TQString::fromLatin1( "Port" ), port );
 	else //set to default 5190
-		configGroup()->writeEntry( TQString::tqfromLatin1( "Port" ), 5190 );
+		configGroup()->writeEntry( TQString::fromLatin1( "Port" ), 5190 );
 }
 
 TQTextCodec* OscarAccount::defaultCodec() const
@@ -729,7 +729,7 @@ void OscarAccount::slotSocketError( int errCode, const TQString& errString )
 	Q_UNUSED( errCode );
 	KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ),
 	                        errString,
-	                        myself()->onlinetqStatus().protocolIcon(),
+	                        myself()->onlineStatus().protocolIcon(),
 	                        Kopete::UI::Global::mainWidget() );
 	logOff( Kopete::Account::ConnectionReset );
 }
@@ -745,7 +745,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal )
 	{
 		message = getFLAPErrorMessage( code );
 		KPassivePopup::message( i18n( "account has been disconnected", "%1 disconnected" ).tqarg( accountId() ),
-		                        message, myself()->onlinetqStatus().protocolIcon(),
+		                        message, myself()->onlineStatus().protocolIcon(),
 		                        Kopete::UI::Global::mainWidget() );
 		switch ( code )
 		{
@@ -772,7 +772,7 @@ void OscarAccount::slotTaskError( const Oscar::SNAC& s, int code, bool fatal )
 	else
 		message = i18n("There was an error in the protocol handling; automatic reconnection occurring.");
 
-	KPassivePopup::message( i18n("OSCAR Protocol error"), message, myself()->onlinetqStatus().protocolIcon(),
+	KPassivePopup::message( i18n("OSCAR Protocol error"), message, myself()->onlineStatus().protocolIcon(),
 	                        Kopete::UI::Global::mainWidget() );
 	if ( fatal )
 		logOff( Kopete::Account::ConnectionReset );
diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp
index ada01291..936c61f3 100644
--- a/kopete/protocols/oscar/oscarcontact.cpp
+++ b/kopete/protocols/oscar/oscarcontact.cpp
@@ -66,7 +66,7 @@ void OscarContact::serialize(TQMap<TQString, TQString> &serializedData,
 	serializedData["ssi_gid"] = TQString::number( m_ssiItem.gid() );
 	serializedData["ssi_bid"] = TQString::number( m_ssiItem.bid() );
 	serializedData["ssi_alias"] = m_ssiItem.alias();
-	serializedData["ssi_waitingAuth"] = m_ssiItem.waitingAuth() ? TQString::tqfromLatin1( "true" ) : TQString::tqfromLatin1( "false" );
+	serializedData["ssi_waitingAuth"] = m_ssiItem.waitingAuth() ? TQString::fromLatin1( "true" ) : TQString::fromLatin1( "false" );
 }
 
 bool OscarContact::isOnServer() const
diff --git a/kopete/protocols/oscar/oscarencodingselectionbase.ui b/kopete/protocols/oscar/oscarencodingselectionbase.ui
index 97ef3f74..7a6d82ff 100644
--- a/kopete/protocols/oscar/oscarencodingselectionbase.ui
+++ b/kopete/protocols/oscar/oscarencodingselectionbase.ui
@@ -45,7 +45,7 @@
             <property name="sizeType">
                 <enum>Maximum</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>20</width>
                     <height>0</height>
diff --git a/kopete/protocols/oscar/oscarvisibilitybase.ui b/kopete/protocols/oscar/oscarvisibilitybase.ui
index 4a3bb1a1..b7db0d40 100644
--- a/kopete/protocols/oscar/oscarvisibilitybase.ui
+++ b/kopete/protocols/oscar/oscarvisibilitybase.ui
@@ -47,7 +47,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>31</width>
                     <height>40</height>
@@ -80,7 +80,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
@@ -110,7 +110,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>
@@ -140,7 +140,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>21</width>
                     <height>40</height>