summaryrefslogtreecommitdiffstats
path: root/tderesources/groupwise/soap
diff options
context:
space:
mode:
Diffstat (limited to 'tderesources/groupwise/soap')
-rw-r--r--tderesources/groupwise/soap/groupwiseserver.cpp2
-rw-r--r--tderesources/groupwise/soap/ksslsocket.cpp6
-rw-r--r--tderesources/groupwise/soap/patches/socklen.diff4
-rw-r--r--tderesources/groupwise/soap/stdsoap2.cpp12
-rw-r--r--tderesources/groupwise/soap/stdsoap2.h31
5 files changed, 9 insertions, 46 deletions
diff --git a/tderesources/groupwise/soap/groupwiseserver.cpp b/tderesources/groupwise/soap/groupwiseserver.cpp
index 07342ec4..3ba461b9 100644
--- a/tderesources/groupwise/soap/groupwiseserver.cpp
+++ b/tderesources/groupwise/soap/groupwiseserver.cpp
@@ -114,7 +114,7 @@ int GroupwiseServer::gSoapOpen( struct soap *soap, const char *,
// kdDebug() << "Creating KSSLSocket()" << endl;
m_sock = new KSSLSocket();
m_sock->setTimeout( KProtocolManager::connectTimeout() );
- connect( m_sock, TQT_SIGNAL( sslFailure() ), TQT_SLOT( slotSslError() ) );
+ connect( m_sock, TQ_SIGNAL( sslFailure() ), TQ_SLOT( slotSslError() ) );
} else {
m_sock = new KExtendedSocket();
}
diff --git a/tderesources/groupwise/soap/ksslsocket.cpp b/tderesources/groupwise/soap/ksslsocket.cpp
index 2f085cf2..b753249d 100644
--- a/tderesources/groupwise/soap/ksslsocket.cpp
+++ b/tderesources/groupwise/soap/ksslsocket.cpp
@@ -57,9 +57,9 @@ KSSLSocket::KSSLSocket() : KExtendedSocket()
setBlockingMode(false);
//Connect internal slots
- TQObject::connect( this, TQT_SIGNAL(connectionSuccess()), this, TQT_SLOT(slotConnected()) );
- TQObject::connect( this, TQT_SIGNAL(closed(int)), this, TQT_SLOT(slotDisconnected()) );
- TQObject::connect( this, TQT_SIGNAL(connectionFailed(int)), this, TQT_SLOT(slotDisconnected()));
+ TQObject::connect( this, TQ_SIGNAL(connectionSuccess()), this, TQ_SLOT(slotConnected()) );
+ TQObject::connect( this, TQ_SIGNAL(closed(int)), this, TQ_SLOT(slotDisconnected()) );
+ TQObject::connect( this, TQ_SIGNAL(connectionFailed(int)), this, TQ_SLOT(slotDisconnected()));
}
KSSLSocket::~KSSLSocket()
diff --git a/tderesources/groupwise/soap/patches/socklen.diff b/tderesources/groupwise/soap/patches/socklen.diff
index e6494bc9..8355e1c3 100644
--- a/tderesources/groupwise/soap/patches/socklen.diff
+++ b/tderesources/groupwise/soap/patches/socklen.diff
@@ -6,7 +6,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp
--- soap/stdsoap2.cpp 3 Dec 2004 17:15:43 -0000 1.3
+++ soap/stdsoap2.cpp 6 Dec 2004 21:27:25 -0000
@@ -3072,7 +3072,7 @@ tcp_connect(struct soap *soap, const cha
- #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
+ #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS)
int n = sizeof(struct sockaddr_in);
#else
- size_t n = sizeof(struct sockaddr_in);
@@ -15,7 +15,7 @@ diff -u -3 -p -r1.3 stdsoap2.cpp
fd_set fds;
if (soap->connect_timeout > 0)
@@ -3503,7 +3503,10 @@ tcp_accept(struct soap *soap, int s, str
- #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
+ #elif defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS)
fd = (int)accept((SOAP_SOCKET)s, a, n);
#else
- fd = (int)accept((SOAP_SOCKET)s, a, (size_t*)n);
diff --git a/tderesources/groupwise/soap/stdsoap2.cpp b/tderesources/groupwise/soap/stdsoap2.cpp
index e3d42998..95987858 100644
--- a/tderesources/groupwise/soap/stdsoap2.cpp
+++ b/tderesources/groupwise/soap/stdsoap2.cpp
@@ -2996,7 +2996,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr)
strncpy(addrcopy, addr, strlen(addr)+1);
iadd = inet_addr(addrcopy);
#else
-#if defined(_AIXVERSION_431) || defined(__osf__)
+#if defined(_AIXVERSION_431)
struct hostent_data ht_data;
#endif
iadd = inet_addr(addr);
@@ -3011,7 +3011,7 @@ tcp_gethost(struct soap *soap, const char *addr, struct in_addr *inaddr)
#if defined(__GLIBC__)
if (gethostbyname_r(addr, &hostent, soap->buf, SOAP_BUFLEN, &host, &soap->errnum) < 0)
host = NULL;
-#elif defined(_AIXVERSION_431) || defined(__osf__)
+#elif defined(_AIXVERSION_431)
memset((void*)&ht_data, 0, sizeof(ht_data));
if (gethostbyname_r(addr, &hostent, &ht_data) < 0)
{ host = NULL;
@@ -4243,15 +4243,11 @@ soap_begin_send(struct soap *soap)
#ifndef UNDER_CE
#ifndef WITH_FASTCGI
if (!soap_valid_socket(soap->socket)) /* Set win32 stdout or soap->sendfd to BINARY, e.g. to support DIME */
-#ifdef __BORLANDC__
- setmode((SOAP_SOCKET)soap->sendfd, O_BINARY);
-#else
_setmode((SOAP_SOCKET)soap->sendfd, _O_BINARY);
#endif
#endif
#endif
#endif
-#endif
if (soap->mode & SOAP_IO)
{ soap->bufidx = 0;
soap->buflen = 0;
@@ -10818,14 +10814,10 @@ soap_begin_recv(struct soap *soap)
#ifndef UNDER_CE
#ifndef WITH_FASTCGI
if (!soap_valid_socket(soap->socket))
-#ifdef __BORLANDC__
- setmode((SOAP_SOCKET)soap->recvfd, O_BINARY);
-#else
_setmode((SOAP_SOCKET)soap->recvfd, _O_BINARY);
#endif
#endif
#endif
-#endif
#ifdef WITH_ZLIB
soap->mode &= ~SOAP_ENC_ZLIB;
soap->zlib_in = SOAP_ZLIB_NONE;
diff --git a/tderesources/groupwise/soap/stdsoap2.h b/tderesources/groupwise/soap/stdsoap2.h
index adb5037b..05fee0bc 100644
--- a/tderesources/groupwise/soap/stdsoap2.h
+++ b/tderesources/groupwise/soap/stdsoap2.h
@@ -139,14 +139,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# endif
#endif
-#ifdef __BORLANDC__
-# ifdef __WIN32__
-# ifndef WIN32
-# define WIN32
-# endif
-# endif
-#endif
-
#ifdef __CYGWIN__
# ifndef CYGWIN
# define CYGWIN
@@ -286,24 +278,6 @@ A commercial use license is available from Genivia, Inc., contact@genivia.com
# define HAVE_WCTOMB
# define HAVE_MBTOWC
# define HAVE_ISNAN
-# elif defined(__osf__)
-# define HAVE_STRRCHR
-# define HAVE_STRTOD
-# define HAVE_SSCANF
-# define HAVE_STRTOL
-# define HAVE_STRTOUL
-# define HAVE_STRTOLL
-# define HAVE_STRTOULL
-# define HAVE_GETTIMEOFDAY
-# define HAVE_SYS_TIMEB_H
-# define HAVE_RAND_R
-# define HAVE_GMTIME_R
-# define HAVE_LOCALTIME_R
-# define __USE_STD_IOSTREAM
-# define HAVE_WCTOMB
-# define HAVE_MBTOWC
-# define SOAP_LONG_FORMAT "%ld"
-# define SOAP_ULONG_FORMAT "%lu"
# elif defined(MAC_CARBON)
# define WITH_NOIO
# define HAVE_STRRCHR
@@ -536,7 +510,7 @@ extern "C" {
# define SOAP_SOCKLEN_T SOCKLEN_T
#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__TQNX__) || defined(TQNX) || defined(_AIX) || defined(__NetBSD__) || defined(__DragonFly__)
# define SOAP_SOCKLEN_T socklen_t
-#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(__osf__) || defined(VXWORKS)
+#elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(VXWORKS)
# define SOAP_SOCKLEN_T int
#else
# define SOAP_SOCKLEN_T size_t
@@ -560,9 +534,6 @@ extern "C" {
#elif defined(UNDER_CE)
# define LONG64 __int64
# define ULONG64 unsigned LONG64
-#elif defined(__BORLANDC__)
-# define LONG64 __int64
-# define ULONG64 unsigned LONG64
#endif
#if defined(WIN32)
generated by cgit v1.2.3 (git 2.46.0) at 2025-10-26 04:16:06 +0000