Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.

1 files changed, 26 insertions, 26 deletions

diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp
index 8a1b6c4e..77a6c72b 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_extendedStatus = 0;
+	m_extendedtqStatus = 0;
 	m_capabilities = 0;
 	m_dcPort = 0;
 	m_dcType = 0;
@@ -107,9 +107,9 @@ int UserDetails::userClass() const
 	return m_userClass;
 }
 
-DWORD UserDetails::extendedStatus() const
+DWORD UserDetails::extendedtqStatus() const
 {
-	return m_extendedStatus;
+	return m_extendedtqStatus;
 }
 
 BYTE UserDetails::iconCheckSumType() const
@@ -126,7 +126,7 @@ TQString UserDetails::clientName() const
 {
 	if ( !m_clientVersion.isEmpty() )
 		return i18n("Translators: client-name client-version",
-	                "%1 %2").arg(m_clientName, m_clientVersion);
+	                "%1 %2").tqarg(m_clientName, m_clientVersion);
 	else
 		return m_clientName;
 }
@@ -183,10 +183,10 @@ void UserDetails::fill( Buffer * buffer )
 #endif
 				break;
 			case 0x0006: //extended user status
-				m_extendedStatus = b.getDWord();
+				m_extendedtqStatus = b.getDWord();
 				m_extendedStatusSpecified = true;
 #ifdef OSCAR_USERINFO_DEBUG
-				kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedStatus, 16 ) << endl;
+				kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << "Extended status is " << TQString::number( m_extendedtqStatus, 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::fromLatin1("Miranda alpha");
+						m_clientName=TQString::tqfromLatin1("Miranda alpha");
 					else
-						m_clientName=TQString::fromLatin1("Miranda");
+						m_clientName=TQString::tqfromLatin1("Miranda");
 
 					DWORD version = (m_dcLastExtInfoUpdateTime & 0xFFFFFF);
 					BYTE major1 = ((version >> 24) & 0xFF);
@@ -391,25 +391,25 @@ void UserDetails::detectClient()
 				}
 				break;
 			case 0xFFFFFF8FL:
-				m_clientName = TQString::fromLatin1("StrICQ");
+				m_clientName = TQString::tqfromLatin1("StrICQ");
 				break;
 			case 0xFFFFFF42L:
-				m_clientName = TQString::fromLatin1("mICQ");
+				m_clientName = TQString::tqfromLatin1("mICQ");
 				break;
 			case 0xFFFFFFBEL:
-				m_clientName = TQString::fromLatin1("alicq");
+				m_clientName = TQString::tqfromLatin1("alicq");
 				break;
 			case 0xFFFFFF7FL:
-				m_clientName = TQString::fromLatin1("&RQ");
+				m_clientName = TQString::tqfromLatin1("&RQ");
 				break;
 			case 0xFFFFFFABL:
-				m_clientName = TQString::fromLatin1("YSM");
+				m_clientName = TQString::tqfromLatin1("YSM");
 				break;
 			case 0x3AA773EEL:
 				if ((m_dcLastExtStatusUpdateTime == 0x3AA66380L) &&
 				    (m_dcLastExtInfoUpdateTime == 0x3A877A42L))
 				{
-					m_clientName=TQString::fromLatin1("libicq2000");
+					m_clientName=TQString::tqfromLatin1("libicq2000");
 				}
 				break;
 			default:
@@ -427,48 +427,48 @@ void UserDetails::detectClient()
 			switch (m_dcProtoVersion)
 			{
 			case 10:
-				m_clientName=TQString::fromLatin1("ICQ 2003b");
+				m_clientName=TQString::tqfromLatin1("ICQ 2003b");
 				break;
 			case 9:
-				m_clientName=TQString::fromLatin1("ICQ Lite");
+				m_clientName=TQString::tqfromLatin1("ICQ Lite");
 				break;
 			case 8:
-				m_clientName=TQString::fromLatin1("Miranda");
+				m_clientName=TQString::tqfromLatin1("Miranda");
 				break;
 			default:
-				m_clientName=TQString::fromLatin1("ICQ2go");
+				m_clientName=TQString::tqfromLatin1("ICQ2go");
 			}
 		}
 		else if (hasCap(CAP_BUDDYICON)) // only gaim seems to advertize this on ICQ
 		{
-			m_clientName = TQString::fromLatin1("Gaim");
+			m_clientName = TQString::tqfromLatin1("Gaim");
 		}
 		else if (hasCap(CAP_XTRAZ))
 		{
-			m_clientName = TQString::fromLatin1("ICQ 4.0 Lite");
+			m_clientName = TQString::tqfromLatin1("ICQ 4.0 Lite");
 		}
 		else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
 		         hasCap(CAP_IS_2001))
 		{
-			m_clientName = TQString::fromLatin1( "ICQ 2001");
+			m_clientName = TQString::tqfromLatin1( "ICQ 2001");
 		}
 		else if ((hasCap(CAP_STR_2001) || hasCap(CAP_ICQSERVERRELAY)) &&
 		         hasCap(CAP_STR_2002))
 		{
-			m_clientName = TQString::fromLatin1("ICQ 2002");
+			m_clientName = TQString::tqfromLatin1("ICQ 2002");
 		}
 		else if (hasCap(CAP_RTFMSGS) && hasCap(CAP_UTF8) &&
 		         hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
 		{
-			m_clientName = TQString::fromLatin1("ICQ 2003a");
+			m_clientName = TQString::tqfromLatin1("ICQ 2003a");
 		}
 		else if (hasCap(CAP_ICQSERVERRELAY) && hasCap(CAP_ISICQ))
 		{
-			m_clientName =TQString::fromLatin1("ICQ 2001b");
+			m_clientName =TQString::tqfromLatin1("ICQ 2001b");
 		}
 		else if ((m_dcProtoVersion == 7) && hasCap(CAP_RTFMSGS))
 		{
-			m_clientName = TQString::fromLatin1("GnomeICU");
+			m_clientName = TQString::tqfromLatin1("GnomeICU");
 		}
 	}
 
@@ -514,7 +514,7 @@ void UserDetails::merge( const UserDetails& ud )
 	}
 	if ( ud.m_extendedStatusSpecified )
 	{
-		m_extendedStatus = ud.m_extendedStatus;
+		m_extendedtqStatus = ud.m_extendedtqStatus;
 		m_extendedStatusSpecified = true;
 	}
 	if ( ud.m_capabilitiesSpecified )