Fix inadvertent TQt changes

This closes Bug 752

2 files changed, 11 insertions, 11 deletions

diff --git a/kresources/groupwise/soap/stdsoap2.cpp b/kresources/groupwise/soap/stdsoap2.cpp
index 2852eb9ce..834051c5d 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_TQUOTED_PRINTABLE, "quoted-printable" },
+  { SOAP_MIME_QUOTED_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_RETQUIRE_CLIENT_AUTHENTICATION);
+  soap->require_client_auth = (flags & SOAP_SSL_REQUIRE_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_RETQUIRE_SERVER_AUTHENTICATION);
+  soap->require_server_auth = (flags & SOAP_SSL_REQUIRE_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_RETQUIRED;
+    soap->error = SOAP_REQUIRED;
   return NULL;
 }
 #endif
@@ -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_RETQUIRED:
+    case SOAP_REQUIRED:
       *s = soap_set_validation_fault(soap, "missing required attribute", NULL);
       break;
     case SOAP_PROHIBITED:
diff --git a/kresources/groupwise/soap/stdsoap2.h b/kresources/groupwise/soap/stdsoap2.h
index 4ff4725a7..b68c24077 100644
--- a/kresources/groupwise/soap/stdsoap2.h
+++ b/kresources/groupwise/soap/stdsoap2.h
@@ -849,12 +849,12 @@ extern const struct soap_double_nan { unsigned int n1, n2; } soap_double_nan;
 #define SOAP_VERSIONMISMATCH		32
 #define SOAP_PLUGIN_ERROR		33
 #define SOAP_DATAENCODINGUNKNOWN	34
-#define SOAP_RETQUIRED			35
+#define SOAP_REQUIRED			35
 #define SOAP_PROHIBITED			36
 #define SOAP_OCCURS			37
 #define SOAP_LENGTH			38
 
-#define soap_xml_error_check(e) ((e) == SOAP_TAG_MISMATCH || (e) == SOAP_TAG_END || (e) == SOAP_SYNTAX_ERROR || (e) == SOAP_NAMESPACE || (e) == SOAP_MULTI_ID || (e) == SOAP_MISSING_ID || (e) == SOAP_RETQUIRED || (e) == SOAP_PROHIBITED || (e) == SOAP_OCCURS || (e) == SOAP_LENGTH || (e) == SOAP_NULL || (e) == SOAP_HREF)
+#define soap_xml_error_check(e) ((e) == SOAP_TAG_MISMATCH || (e) == SOAP_TAG_END || (e) == SOAP_SYNTAX_ERROR || (e) == SOAP_NAMESPACE || (e) == SOAP_MULTI_ID || (e) == SOAP_MISSING_ID || (e) == SOAP_REQUIRED || (e) == SOAP_PROHIBITED || (e) == SOAP_OCCURS || (e) == SOAP_LENGTH || (e) == SOAP_NULL || (e) == SOAP_HREF)
 #define soap_soap_error_check(e) ((e) == SOAP_CLI_FAULT || (e) == SOAP_SVR_FAULT || (e) == SOAP_VERSIONMISMATCH || (e) == SOAP_MUSTUNDERSTAND || (e) == SOAP_FAULT || (e) == SOAP_NO_METHOD)
 #define soap_tcp_error_check(e) ((e) == SOAP_EOF || (e) == SOAP_TCP_ERROR)
 #define soap_ssl_error_check(e) ((e) == SOAP_SSL_ERROR)
@@ -936,10 +936,10 @@ typedef soap_int32 soap_mode;
 /* SSL client/server authentication settings */
 
 #define SOAP_SSL_NO_AUTHENTICATION		0x00	/* for testing purposes */
-#define SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION	0x01	/* client requires server to authenticate */
-#define SOAP_SSL_RETQUIRE_CLIENT_AUTHENTICATION	0x02	/* server requires client to authenticate */
+#define SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION	0x01	/* client requires server to authenticate */
+#define SOAP_SSL_REQUIRE_CLIENT_AUTHENTICATION	0x02	/* server requires client to authenticate */
 
-#define SOAP_SSL_DEFAULT			SOAP_SSL_RETQUIRE_SERVER_AUTHENTICATION
+#define SOAP_SSL_DEFAULT			SOAP_SSL_REQUIRE_SERVER_AUTHENTICATION
 
 /* */
 
@@ -1157,7 +1157,7 @@ enum soap_mime_encoding
   SOAP_MIME_7BIT,
   SOAP_MIME_8BIT,
   SOAP_MIME_BINARY,
-  SOAP_MIME_TQUOTED_PRINTABLE,
+  SOAP_MIME_QUOTED_PRINTABLE,
   SOAP_MIME_BASE64,
   SOAP_MIME_IETF_TOKEN,
   SOAP_MIME_X_TOKEN