From 67e29a054cfcb1b0d2fe6b0a316cf6b3eec087b7 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 13 Apr 2011 00:46:47 +0000
Subject: Initial conversion of kdepim to TQt This will probably require some
 tweaking before it will build under Qt4, however Qt3 builds are OK.  Any
 alterations this commit makes to kdepim behaviour under Qt3 are unintentional
 and should be fixed.

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1227832 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kresources/groupwise/soap/stdsoap2.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'kresources/groupwise/soap/stdsoap2.cpp')

diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index 175387686..dd43419b0 100644
--- a/kresources/groupwise/soap/stdsoap2.cpp
+++ b/kresources/groupwise/soap/stdsoap2.cpp
@@ -399,7 +399,7 @@ static const struct soap_code_map mime_codes[] =
 { { SOAP_MIME_7BIT,		"7bit" },
   { SOAP_MIME_8BIT,		"8bit" },
   { SOAP_MIME_BINARY,		"binary" },
-  { SOAP_MIME_QUOTED_PRINTABLE, "quoted-printable" },
+  { SOAP_MIME_TQUOTED_PRINTABLE, "quoted-printable" },
   { SOAP_MIME_BASE64,		"base64" },
   { SOAP_MIME_IETF_TOKEN,	"ietf-token" },
   { SOAP_MIME_X_TOKEN,		"x-token" },
@@ -2493,7 +2493,7 @@ soap_ssl_server_context(struct soap *soap, unsigned short flags, const char *key
     soap->rsa = 1;
   }
   soap->randfile = randfile;
-  soap->require_client_auth = (flags & SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION);
+  soap->require_client_auth = (flags & SOAP_SSL_RETQUIRE_CLIENT_AUTHENTICATION);
   if (!(err = soap->fsslauth(soap)))
     if (sid)
       SSL_CTX_set_session_id_context(soap->ctx, (unsigned char*)sid, strlen(sid));
@@ -2514,7 +2514,7 @@ soap_ssl_client_context(struct soap *soap, unsigned short flags, const char *key
   soap->dhfile = NULL;
   soap->rsa = 0;
   soap->randfile = randfile;
-  soap->require_server_auth = (flags & SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION);
+  soap->require_server_auth = (flags & SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION);
   return soap->fsslauth(soap);
 }
 #endif
@@ -6460,7 +6460,7 @@ soap_attr_value(struct soap *soap, const char *name, int flag)
       return tp->value;
   }
   else if (flag == 1 && (soap->mode & SOAP_XML_STRICT))
-    soap->error = SOAP_REQUIRED;
+    soap->error = SOAP_RETQUIRED;
   return NULL;
 }
 #endif
@@ -7452,7 +7452,7 @@ end:
     return NULL;
   }
   if (flag == 2)
-    if (soap_s2QName(soap, t, &t))
+    if (soap_s2TQName(soap, t, &t))
       return NULL;
   if (soap->peeked && *soap->tag)
   { soap->peeked = 0;
@@ -8641,7 +8641,7 @@ soap_s2string(struct soap *soap, const char *s, char **t)
 SOAP_FMAC1
 int
 SOAP_FMAC2
-soap_s2QName(struct soap *soap, const char *s, char **t)
+soap_s2TQName(struct soap *soap, const char *s, char **t)
 { if (s)
   { struct soap_nlist *np;
     const char *p;
@@ -8692,7 +8692,7 @@ soap_s2QName(struct soap *soap, const char *s, char **t)
 SOAP_FMAC1
 const char*
 SOAP_FMAC2
-soap_QName2s(struct soap *soap, const char *s)
+soap_TQName2s(struct soap *soap, const char *s)
 { struct Namespace *p;
   char *t;
   int n;
@@ -11951,7 +11951,7 @@ http_response(struct soap *soap, int status, size_t count)
       if ((err = soap->fposthdr(soap, soap->tmpbuf, NULL)))
         return err;
     }
-    else if ((err = soap->fposthdr(soap, "Status", "200 OK")))
+    else if ((err = soap->fposthdr(soap, "tqStatus", "200 OK")))
       return err;
   }
   else if (status > 200 && status < 600)
@@ -11986,7 +11986,7 @@ http_response(struct soap *soap, int status, size_t count)
       if ((err = soap->fposthdr(soap, soap->tmpbuf, NULL)))
         return err;
     }
-    else if ((err = soap->fposthdr(soap, "Status", s)))
+    else if ((err = soap->fposthdr(soap, "tqStatus", s)))
       return err;
   }
   if ((err = soap->fposthdr(soap, "Server", "gSOAP/2.7"))
@@ -12185,7 +12185,7 @@ soap_set_fault(struct soap *soap)
       *s = "Zlib/gzip not installed for (de)compression: recompile with -DWITH_GZIP";
 #endif
       break;
-    case SOAP_REQUIRED:
+    case SOAP_RETQUIRED:
       *s = soap_set_validation_fault(soap, "missing required attribute", NULL);
       break;
     case SOAP_PROHIBITED:
-- 
cgit v1.2.1