From 47c8a359c5276062c4bc17f0e82410f29081b502 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 31 Jul 2010 19:48:06 +0000
Subject: Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kopete/protocols/oscar/liboscar/oscarutils.cpp | 38 +++++++++++++-------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'kopete/protocols/oscar/liboscar/oscarutils.cpp')

diff --git a/kopete/protocols/oscar/liboscar/oscarutils.cpp b/kopete/protocols/oscar/liboscar/oscarutils.cpp
index 13e28d9e..e07e0e12 100644
--- a/kopete/protocols/oscar/liboscar/oscarutils.cpp
+++ b/kopete/protocols/oscar/liboscar/oscarutils.cpp
@@ -17,16 +17,16 @@
 */
 
 #include "oscarutils.h"
-#include <qhostaddress.h>
+#include <tqhostaddress.h>
 #include <kapplication.h>
 #include <kdebug.h>
 
 
 using namespace Oscar;
 
-QString Oscar::normalize( const QString& contact )
+TQString Oscar::normalize( const TQString& contact )
 {
-	QString normal = contact.lower();
+	TQString normal = contact.lower();
 	normal.remove( ' ' );
 	return normal;
 }
@@ -39,10 +39,10 @@ bool Oscar::operator==( TLV a, TLV b )
 		return false;
 }
 
-TLV Oscar::findTLV( const QValueList<TLV>& list, int type )
+TLV Oscar::findTLV( const TQValueList<TLV>& list, int type )
 {
 	TLV t;
-	QValueList<TLV>::const_iterator it;
+	TQValueList<TLV>::const_iterator it;
 	for ( it = list.begin(); it != list.end(); ++it )
 	{
 		if ( ( *it ).type == type )
@@ -52,12 +52,12 @@ TLV Oscar::findTLV( const QValueList<TLV>& list, int type )
 	return t;
 }
 
-bool Oscar::uptateTLVs( SSI& item, const QValueList<TLV>& list )
+bool Oscar::uptateTLVs( SSI& item, const TQValueList<TLV>& list )
 {
 	bool changed = false;
-	QValueList<TLV> tList( item.tlvList() );
+	TQValueList<TLV> tList( item.tlvList() );
 
-	QValueList<TLV>::const_iterator it;
+	TQValueList<TLV>::const_iterator it;
 	for ( it = list.begin(); it != list.end(); ++it )
 	{
 		TLV t = Oscar::findTLV( tList, ( *it ).type );
@@ -92,9 +92,9 @@ int Oscar::parseCap( char* cap )
 	return capflag;
 }
 
-const QString Oscar::capToString( char* cap )
+const TQString Oscar::capToString( char* cap )
 {
-	QString dbg;
+	TQString dbg;
 
 	dbg.sprintf( "{%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
 		cap[0], cap[1], cap[2], cap[3], cap[4], cap[5], cap[6], cap[7], cap[8], cap[9],
@@ -103,17 +103,17 @@ const QString Oscar::capToString( char* cap )
 	return dbg;
 }
 
-DWORD Oscar::parseCapabilities( Buffer &inbuf, QString &versionString )
+DWORD Oscar::parseCapabilities( Buffer &inbuf, TQString &versionString )
 {
 	//
 	// FIXME: port capabilities array to some qt based list class, makes usage of memcmp obsolete
 	//
 	DWORD capflags = 0;
-	QString dbgCaps = "CAPS: ";
+	TQString dbgCaps = "CAPS: ";
 	
 	while(inbuf.length() >= 16)
 	{
-		QByteArray cap;
+		TQByteArray cap;
 		cap.duplicate( inbuf.getBlock(16) );
 		
 		for (int i=0; i < CAP_LAST; i++)
@@ -184,9 +184,9 @@ DWORD Oscar::parseCapabilities( Buffer &inbuf, QString &versionString )
 	return capflags;
 }
 
-const QString Oscar::capName( int capNumber )
+const TQString Oscar::capName( int capNumber )
 {
-	QString capString;
+	TQString capString;
 
 	switch ( capNumber )
 	{
@@ -279,18 +279,18 @@ const QString Oscar::capName( int capNumber )
 	return capString;
 }
 
-DWORD Oscar::getNumericalIP(const QString &address)
+DWORD Oscar::getNumericalIP(const TQString &address)
 {
-	QHostAddress addr;
+	TQHostAddress addr;
 	if ( addr.setAddress( address ) == false )
 		return 0;
 
 	return (DWORD)addr.toIPv4Address();
 }
 
-QString Oscar::getDottedDecimal( DWORD address )
+TQString Oscar::getDottedDecimal( DWORD address )
 {
-	QHostAddress addr;
+	TQHostAddress addr;
 	addr.setAddress((Q_UINT32)address);
 	return addr.toString();
 }
-- 
cgit v1.2.1