From 68b5e38626333b0c1c0396ef8b4b9221e425465a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 24 Nov 2012 16:19:37 +0100
Subject: Rename QCA to TQCA Fix FTBFS

---
 .../jabber/libiris/iris/xmpp-core/stream.cpp       | 38 +++++++++++-----------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp')

diff --git a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
index 51041c1d..69b91a86 100644
--- a/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
+++ b/kopete/protocols/jabber/libiris/iris/xmpp-core/stream.cpp
@@ -81,10 +81,10 @@ static TQByteArray randomArray(int size)
 static TQString genId()
 {
 	// need SHA1 here
-	if(!QCA::isSupported(QCA::CAP_SHA1))
-		QCA::insertProvider(createProviderHash());
+	if(!TQCA::isSupported(TQCA::CAP_SHA1))
+		TQCA::insertProvider(createProviderHash());
 
-	return QCA::SHA1::hashToString(randomArray(128));
+	return TQCA::SHA1::hashToString(randomArray(128));
 }
 
 //----------------------------------------------------------------------------
@@ -584,8 +584,8 @@ public:
 	Connector *conn;
 	ByteStream *bs;
 	TLSHandler *tlsHandler;
-	QCA::TLS *tls;
-	QCA::SASL *sasl;
+	TQCA::TLS *tls;
+	TQCA::SASL *sasl;
 	SecureStream *ss;
 	CoreProtocol client;
 	CoreProtocol srv;
@@ -627,7 +627,7 @@ ClientStream::ClientStream(Connector *conn, TLSHandler *tlsHandler, TQObject *pa
 	d->tlsHandler = tlsHandler;
 }
 
-ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, QCA::TLS *tls, TQObject *parent)
+ClientStream::ClientStream(const TQString &host, const TQString &defRealm, ByteStream *bs, TQCA::TLS *tls, TQObject *parent)
 :Stream(parent)
 {
 	d = new Private;
@@ -1162,7 +1162,7 @@ void ClientStream::srvProcessNext()
 			}
 			else if(need == CoreProtocol::NSASLMechs) {
 				if(!d->sasl) {
-					d->sasl = new QCA::SASL;
+					d->sasl = new TQCA::SASL;
 					connect(d->sasl, TQT_SIGNAL(authCheck(const TQString &, const TQString &)), TQT_SLOT(sasl_authCheck(const TQString &, const TQString &)));
 					connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &)));
 					connect(d->sasl, TQT_SIGNAL(authenticated()), TQT_SLOT(sasl_authenticated()));
@@ -1241,9 +1241,9 @@ void ClientStream::srvProcessNext()
 				printf("Break (RecvOpen)\n");
 
 				// calculate key
-				TQCString str = QCA::SHA1::hashToString(TQCString("secret")).utf8();
-				str = QCA::SHA1::hashToString(str + "im.pyxa.org").utf8();
-				str = QCA::SHA1::hashToString(str + d->srv.id.utf8()).utf8();
+				TQCString str = TQCA::SHA1::hashToString(TQCString("secret")).utf8();
+				str = TQCA::SHA1::hashToString(str + "im.pyxa.org").utf8();
+				str = TQCA::SHA1::hashToString(str + d->srv.id.utf8()).utf8();
 				d->srv.setDialbackKey(str);
 
 				//d->srv.setDialbackKey("3c5d721ea2fcc45b163a11420e4e358f87e3142a");
@@ -1472,14 +1472,14 @@ bool ClientStream::handleNeed()
 			printf("Need SASL First Step\n");
 #endif
 			// no SASL plugin?  fall back to Simple SASL
-			if(!QCA::isSupported(QCA::CAP_SASL)) {
+			if(!TQCA::isSupported(TQCA::CAP_SASL)) {
 				// Simple SASL needs MD5.  do we have that either?
-				if(!QCA::isSupported(QCA::CAP_MD5))
-					QCA::insertProvider(createProviderHash());
-				QCA::insertProvider(createProviderSimpleSASL());
+				if(!TQCA::isSupported(TQCA::CAP_MD5))
+					TQCA::insertProvider(createProviderHash());
+				TQCA::insertProvider(createProviderSimpleSASL());
 			}
 
-			d->sasl = new QCA::SASL;
+			d->sasl = new TQCA::SASL;
 			connect(d->sasl, TQT_SIGNAL(clientFirstStep(const TQString &, const TQByteArray *)), TQT_SLOT(sasl_clientFirstStep(const TQString &, const TQByteArray *)));
 			connect(d->sasl, TQT_SIGNAL(nextStep(const TQByteArray &)), TQT_SLOT(sasl_nextStep(const TQByteArray &)));
 			connect(d->sasl, TQT_SIGNAL(needParams(bool, bool, bool, bool)), TQT_SLOT(sasl_needParams(bool, bool, bool, bool)));
@@ -1557,13 +1557,13 @@ bool ClientStream::handleNeed()
 int ClientStream::convertedSASLCond() const
 {
 	int x = d->sasl->errorCondition();
-	if(x == QCA::SASL::NoMech)
+	if(x == TQCA::SASL::NoMech)
 		return NoMech;
-	else if(x == QCA::SASL::BadProto)
+	else if(x == TQCA::SASL::BadProto)
 		return BadProto;
-	else if(x == QCA::SASL::BadServ)
+	else if(x == TQCA::SASL::BadServ)
 		return BadServ;
-	else if(x == QCA::SASL::TooWeak)
+	else if(x == TQCA::SASL::TooWeak)
 		return MechTooWeak;
 	else
 		return GenericAuthError;
-- 
cgit v1.2.1