Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1157648 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 31 insertions, 31 deletions

diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp
index 6e2cea09..75f38b74 100644
--- a/kopete/protocols/oscar/oscarversionupdater.cpp
+++ b/kopete/protocols/oscar/oscarversionupdater.cpp
@@ -16,8 +16,8 @@
 
 #include "oscarversionupdater.h"
 
-#include <qdom.h>
-#include <qmutex.h>
+#include <tqdom.h>
+#include <tqmutex.h>
 
 #include <kdebug.h>
 #include <kio/job.h>
@@ -25,7 +25,7 @@
 #include <kglobal.h>
 
 
-QMutex updateMutex;
+TQMutex updateMutex;
 OscarVersionUpdater *OscarVersionUpdater::versionUpdaterStatic = 0L;
 
 OscarVersionUpdater::OscarVersionUpdater()
@@ -67,14 +67,14 @@ bool OscarVersionUpdater::update( unsigned int stamp )
 		mVersionData.resize( 0 );
 		
 		KConfigGroup config( KGlobal::config(), "Oscar" );
-		QString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" );
+		TQString url = config.readEntry( "NewVersionURL", "http://kopete.kde.org/oscarversions.xml" );
 		mTransferJob = KIO::get ( url );
 		kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Download version info from server."<< endl;
 		
-		connect ( mTransferJob, SIGNAL ( result ( KIO::Job* ) ),
-		          this, SLOT ( slotTransferResult ( KIO::Job* ) ) );
-		connect ( mTransferJob, SIGNAL ( data ( KIO::Job*, const QByteArray& ) ),
-		          this, SLOT ( slotTransferData ( KIO::Job*, const QByteArray& ) ) );
+		connect ( mTransferJob, TQT_SIGNAL ( result ( KIO::Job* ) ),
+		          this, TQT_SLOT ( slotTransferResult ( KIO::Job* ) ) );
+		connect ( mTransferJob, TQT_SIGNAL ( data ( KIO::Job*, const TQByteArray& ) ),
+		          this, TQT_SLOT ( slotTransferData ( KIO::Job*, const TQByteArray& ) ) );
 	}
 	return isUpdating;
 }
@@ -121,30 +121,30 @@ void OscarVersionUpdater::printDebug()
 {
 	kdDebug(OSCAR_RAW_DEBUG) << "*************** AIM VERSION INFO ***************" << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "client string: " << mAIMVersion.clientString << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "client id: "  << QString::number( mAIMVersion.clientId, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "major: "  << QString::number( mAIMVersion.major, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "minor: "  << QString::number( mAIMVersion.minor, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "point: "  << QString::number( mAIMVersion.point, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "build: "  << QString::number( mAIMVersion.build, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "other: "  << QString::number( mAIMVersion.other, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "client id: "  << TQString::number( mAIMVersion.clientId, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "major: "  << TQString::number( mAIMVersion.major, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "minor: "  << TQString::number( mAIMVersion.minor, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "point: "  << TQString::number( mAIMVersion.point, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "build: "  << TQString::number( mAIMVersion.build, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "other: "  << TQString::number( mAIMVersion.other, 16 ) << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "country: "  << mAIMVersion.country << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "lang: "  << mAIMVersion.lang << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "************************************************" << endl;
 	
 	kdDebug(OSCAR_RAW_DEBUG) << "*************** ICQ VERSION INFO ***************" << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "client string: " << mICQVersion.clientString << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "client id: "  << QString::number( mICQVersion.clientId, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "major: "  << QString::number( mICQVersion.major, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "minor: "  << QString::number( mICQVersion.minor, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "point: "  << QString::number( mICQVersion.point, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "build: "  << QString::number( mICQVersion.build, 16 ) << endl;
-	kdDebug(OSCAR_RAW_DEBUG) << "other: "  << QString::number( mICQVersion.other, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "client id: "  << TQString::number( mICQVersion.clientId, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "major: "  << TQString::number( mICQVersion.major, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "minor: "  << TQString::number( mICQVersion.minor, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "point: "  << TQString::number( mICQVersion.point, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "build: "  << TQString::number( mICQVersion.build, 16 ) << endl;
+	kdDebug(OSCAR_RAW_DEBUG) << "other: "  << TQString::number( mICQVersion.other, 16 ) << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "country: "  << mICQVersion.country << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "lang: "  << mICQVersion.lang << endl;
 	kdDebug(OSCAR_RAW_DEBUG) << "************************************************" << endl;
 }
 
-void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const QByteArray &data )
+void OscarVersionUpdater::slotTransferData ( KIO::Job */*job*/, const TQByteArray &data )
 {
 	unsigned oldSize = mVersionData.size();
 	mVersionData.resize ( oldSize + data.size() );
@@ -165,7 +165,7 @@ void OscarVersionUpdater::slotTransferResult ( KIO::Job *job )
 	{
 		kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Updating version info" << endl;
 		
-		QDomDocument doc;
+		TQDomDocument doc;
 		if ( doc.setContent ( mVersionData ) )
 		{
 			Oscar::ClientVersion tmpICQ = mICQVersion;
@@ -198,15 +198,15 @@ void OscarVersionUpdater::slotTransferResult ( KIO::Job *job )
 	updateMutex.unlock();
 }
 
-void OscarVersionUpdater::parseDocument( QDomDocument& doc )
+void OscarVersionUpdater::parseDocument( TQDomDocument& doc )
 {
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
 	
-	QDomElement root = doc.documentElement();
+	TQDomElement root = doc.documentElement();
 	if ( root.tagName() != "oscar" )
 		return;
 	
-	QDomElement versionElement = root.firstChild().toElement();
+	TQDomElement versionElement = root.firstChild().toElement();
 	while( !versionElement.isNull() )
 	{
 		if ( versionElement.tagName() == "icq" )
@@ -218,22 +218,22 @@ void OscarVersionUpdater::parseDocument( QDomDocument& doc )
 	}
 }
 
-bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, QDomElement& element )
+bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, TQDomElement& element )
 {
 	kdDebug(OSCAR_RAW_DEBUG) << k_funcinfo << endl;
 	
 	// clear structure
-	version.clientString = QString::null;
+	version.clientString = TQString::null;
 	version.clientId = 0x0000;
 	version.major = 0x0000;
 	version.minor = 0x0000;
 	version.point = 0x0000;
 	version.build = 0x0000;
 	version.other = 0x00000000;
-	version.country = QString::null;
-	version.lang = QString::null;
+	version.country = TQString::null;
+	version.lang = TQString::null;
 	
-	QDomElement versionChild = element.firstChild().toElement();
+	TQDomElement versionChild = element.firstChild().toElement();
 	while ( !versionChild.isNull() )
 	{
 		if ( versionChild.tagName() == "client" )
@@ -261,7 +261,7 @@ bool OscarVersionUpdater::parseVersion( Oscar::ClientVersion& version, QDomEleme
 	return true;
 }
 
-void OscarVersionUpdater::storeVersionInfo( const QString& group, const Oscar::ClientVersion& version ) const
+void OscarVersionUpdater::storeVersionInfo( const TQString& group, const Oscar::ClientVersion& version ) const
 {
 	kdDebug(OSCAR_GEN_DEBUG) << k_funcinfo << "Storing version info to group: " << group << endl;
 	KConfigGroup config( KGlobal::config(), group );