From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 22 Jun 2011 00:30:31 +0000
Subject: TQt4 port kdenetwork This enables compilation under both Qt3 and Qt4

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 .../jingle/libjingle/talk/base/socketadapters.cc   | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc')

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
index f57043e3..5cdc4743 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
@@ -353,7 +353,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len,
 
     std::string A2 = method + ":" + uri;
     std::string middle;
-    if (args.find("qop") != args.end()) {
+    if (args.tqfind("qop") != args.end()) {
       args["qop"] = "auth";
       middle = args["nonce"] + ":" + ncount + ":" + cnonce + ":" + args["qop"];
     } else {
@@ -375,13 +375,13 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len,
     ss << ", realm=" << Quote(args["realm"]);
     ss << ", nonce=" << Quote(args["nonce"]);
     ss << ", uri=" << Quote(uri);
-    if (args.find("qop") != args.end()) {
+    if (args.tqfind("qop") != args.end()) {
       ss << ", qop=" << args["qop"];
       ss << ", nc="  << ncount;
       ss << ", cnonce=" << Quote(cnonce);
     }
     ss << ", response=\"" << dig_response << "\"";
-    if (args.find("opaque") != args.end()) {
+    if (args.tqfind("opaque") != args.end()) {
       ss << ", opaque=" << Quote(args["opaque"]);
     }
     response = ss.str();
@@ -418,14 +418,14 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len,
     out_buf_desc.pBuffers  = &out_sec;
 
     const ULONG NEG_FLAGS_DEFAULT =
-      //ISC_REQ_ALLOCATE_MEMORY
-      ISC_REQ_CONFIDENTIALITY
-      //| ISC_REQ_EXTENDED_ERROR
-      //| ISC_REQ_INTEGRITY
-      | ISC_REQ_REPLAY_DETECT
-      | ISC_REQ_SEQUENCE_DETECT
-      //| ISC_REQ_STREAM
-      //| ISC_REQ_USE_SUPPLIED_CREDS
+      //ISC_RETQ_ALLOCATE_MEMORY
+      ISC_RETQ_CONFIDENTIALITY
+      //| ISC_RETQ_EXTENDED_ERROR
+      //| ISC_RETQ_INTEGRITY
+      | ISC_RETQ_REPLAY_DETECT
+      | ISC_RETQ_SEQUENCE_DETECT
+      //| ISC_RETQ_STREAM
+      //| ISC_RETQ_USE_SUPPLIED_CREDS
       ;
 
     TimeStamp lifetime;
@@ -483,7 +483,7 @@ AsyncHttpsProxySocket::Authenticate(const char * challenge, size_t len,
         size_t len = password.GetLength()+1;
         char * sensitive = new char[len];
         password.CopyTo(sensitive, true);
-        std::string::size_type pos = username.find('\\');
+        std::string::size_type pos = username.tqfind('\\');
         if (pos == std::string::npos) {
           auth_id.UserLength = static_cast<unsigned long>(
             _min(sizeof(userbuf) - 1, username.size()));
@@ -1100,7 +1100,7 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) {
   const char * direction = (input ? " << " : " >> ");
   std::string str(data, len);
   while (!str.empty()) {
-    std::string::size_type pos = str.find('\n');
+    std::string::size_type pos = str.tqfind('\n');
     std::string substr = str;
     if (pos == std::string::npos) {
       substr = str;
@@ -1114,9 +1114,9 @@ LoggingAdapter::LogMultiline(bool input, const char * data, size_t len) {
     }
 
     // Filter out any private data
-    std::string::size_type pos_private = substr.find("Email");
+    std::string::size_type pos_private = substr.tqfind("Email");
     if (pos_private == std::string::npos) {
-      pos_private = substr.find("Passwd");
+      pos_private = substr.tqfind("Passwd");
     }
     if (pos_private == std::string::npos) {
         LOG(level_) << label_ << direction << substr;
-- 
cgit v1.2.1