Revert automated changes

Sorry guys, they are just not ready for prime time
Work will continue as always


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdelibs@1212479 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 15 insertions, 15 deletions

diff --git a/kdecore/netsupp.cpp b/kdecore/netsupp.cpp
index 87368c121..6d56e147d 100644
--- a/kdecore/netsupp.cpp
+++ b/kdecore/netsupp.cpp
@@ -104,7 +104,7 @@ void kde_freeaddrinfo(struct kde_addrinfo *ai)
     {
       struct addrinfo *p, *last = NULL;
       /* We've added one AF_UNIX socket in here, to the
-       * tail of the linked list. We have to tqfind it */
+       * tail of the linked list. We have to find it */
       for (p = ai->data; p; p = p->ai_next)
 	{
 	  if (p->ai_family == AF_UNIX)
@@ -324,7 +324,7 @@ int kde_getaddrinfo(const char *name, const char *service,
   if (err == 0)
     for (p = res->data; p; p = p->ai_next)
       {
-	last = p;			// we have to tqfind out which one is last anyways
+	last = p;			// we have to find out which one is last anyways
 	if (p->ai_family == AF_UNIX)
 	  // there is an Unix node
 	  goto out;
@@ -715,9 +715,9 @@ static int make_inet(const char *name, int portnum, int protonum, struct addrinf
 # endif
 	  sin->sin_port = portnum;
 	  if (hint->ai_flags & AI_PASSIVE)
-	    *(TQ_UINT32*)&sin->sin_addr = INADDR_ANY;
+	    *(Q_UINT32*)&sin->sin_addr = INADDR_ANY;
 	  else
-	    *(TQ_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK);
+	    *(Q_UINT32*)&sin->sin_addr = htonl(INADDR_LOOPBACK);
 	  q->ai_flags = 0;
 	  q->ai_family = AF_INET;
 	  q->ai_socktype = hint->ai_socktype;
@@ -909,7 +909,7 @@ char *gai_strerror(int errorcode)
   return buffer;
 }
 
-static void tqfindport(unsigned short port, char *serv, size_t servlen, int flags)
+static void findport(unsigned short port, char *serv, size_t servlen, int flags)
 {
   if (serv == NULL)
     return;
@@ -978,7 +978,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 	    return 1;		// error
 	}
 
-      tqfindport(s.sin->sin_port, serv, servlen, flags);
+      findport(s.sin->sin_port, serv, servlen, flags);
     }
 # ifdef AF_INET6
   else if (s.sa->sa_family == AF_INET6)
@@ -1003,7 +1003,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 	    return 1;		// error
 	}
 
-      tqfindport(s.sin6->sin6_port, serv, servlen, flags);
+      findport(s.sin6->sin6_port, serv, servlen, flags);
     }
 # endif // AF_INET6
 
@@ -1016,7 +1016,7 @@ int getnameinfo(const struct sockaddr *sa, ksocklen_t salen,
 
 #define KRF_inet_ntop	KRF_USING_OWN_INET_NTOP
 
-static void add_dwords(char *buf, TQ_UINT16 *dw, int count)
+static void add_dwords(char *buf, Q_UINT16 *dw, int count)
 {
   int i = 1;
   sprintf(buf + strlen(buf), "%x", ntohs(dw[0]));
@@ -1027,7 +1027,7 @@ static void add_dwords(char *buf, TQ_UINT16 *dw, int count)
 const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 {
   char buf2[sizeof "1234:5678:9abc:def0:1234:5678:255.255.255.255" + 1];
-  TQ_UINT8 *data = (TQ_UINT8*)cp;
+  Q_UINT8 *data = (Q_UINT8*)cp;
 
   if (af == AF_INET)
     {
@@ -1046,8 +1046,8 @@ const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 # ifdef AF_INET6
   if (af == AF_INET6)
     {
-      TQ_UINT16 *p = (TQ_UINT16*)data;
-      TQ_UINT16 *longest = NULL, *cur = NULL;
+      Q_UINT16 *p = (Q_UINT16*)data;
+      Q_UINT16 *longest = NULL, *cur = NULL;
       int longest_length = 0, cur_length;
       int i;
 
@@ -1057,7 +1057,7 @@ const char* inet_ntop(int af, const void *cp, char *buf, size_t len)
 		buf[12], buf[13], buf[14], buf[15]);
       else
 	{
-	  // tqfind the longest sequence of zeroes
+	  // find the longest sequence of zeroes
 	  for (i = 0; i < 8; i++)
 	    if (cur == NULL && p[i] == 0)
 	      {
@@ -1150,7 +1150,7 @@ int inet_pton(int af, const char *cp, void *buf)
 # ifdef AF_INET6
   else if (af == AF_INET6)
     {
-      TQ_UINT16 addr[8];
+      Q_UINT16 addr[8];
       const char *p = cp;
       int n = 0, start = 8;
       bool has_v4 = strchr(p, '.') != NULL;
@@ -1200,8 +1200,8 @@ int inet_pton(int af, const char *cp, void *buf)
       // n < 8 means that we have to move n - start words 8 - n words to the right
       if (start == 8 && n != 8)
 	return 0;		// bad conversion
-      memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(TQ_UINT16));
-      memset(addr + start, 0, (8 - n) * sizeof(TQ_UINT16));
+      memmove(addr + start + (8 - n), addr + start, (n - start) * sizeof(Q_UINT16));
+      memset(addr + start, 0, (8 - n) * sizeof(Q_UINT16));
 
       // check the byte order
       // The compiler should optimise this out in big endian machines