7 files changed, 16 insertions, 16 deletions
diff --git a/kdecore/network/khttpproxysocketdevice.cpp b/kdecore/network/khttpproxysocketdevice.cpp
index 0d72b4b3d..648f4e571 100644
--- a/kdecore/network/khttpproxysocketdevice.cpp
+++ b/kdecore/network/khttpproxysocketdevice.cpp
@@ -222,7 +222,7 @@ bool KHttpProxySocketDevice::parseServerReply()
 
       TQCString fullHeaders = d->reply + buf.data();
       // search for the end of the headers
-      index = fullHeaders.tqfind("\r\n\r\n");
+      index = fullHeaders.find("\r\n\r\n");
       if (index == -1)
 	{
 	  // no, headers not yet finished...
@@ -265,9 +265,9 @@ bool KHttpProxySocketDevice::parseServerReply()
 
   // now really parse the reply
   qDebug("KHttpProxySocketDevice: get reply: %s\n",
-	 d->reply.left(d->reply.tqfind('\r')).data());
+	 d->reply.left(d->reply.find('\r')).data());
   if (d->reply.left(7) != "HTTP/1." ||
-      (index = d->reply.tqfind(' ')) == -1 ||
+      (index = d->reply.find(' ')) == -1 ||
       d->reply[index + 1] != '2')
     {
       setError(IO_ConnectError, NetFailure);
diff --git a/kdecore/network/kresolver.cpp b/kdecore/network/kresolver.cpp
index d58d02cb0..93c029b8e 100644
--- a/kdecore/network/kresolver.cpp
+++ b/kdecore/network/kresolver.cpp
@@ -917,7 +917,7 @@ TQString KResolver::localHostName()
   if (name.isEmpty())
     return TQString::tqfromLatin1("localhost");
 
-  if (name.tqfind('.') == -1)
+  if (name.find('.') == -1)
     {
       // not fully qualified
       // must resolve
@@ -961,7 +961,7 @@ TQCString KResolver::domainToAscii(const TQString& tqunicodeDomain)
   TQStringList input = splitLabels(tqunicodeDomain);
 
   // Do we allow IDN names for this TLD?
-  if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower()))
+  if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
     return input.join(".").lower().latin1(); // No IDN allowed for this TLD
 
   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
@@ -1009,7 +1009,7 @@ TQString KResolver::domainToUnicode(const TQString& asciiDomain)
   TQStringList input = splitLabels(asciiDomain);
 
   // Do we allow IDN names for this TLD?
-  if (input.count() && !idnDomains->tqcontains(input[input.count()-1].lower()))
+  if (input.count() && !idnDomains->contains(input[input.count()-1].lower()))
     return asciiDomain.lower(); // No TLDs allowed
 
   // 3) decide whether to enforce the STD3 rules for chars < 0x7F
diff --git a/kdecore/network/kresolverstandardworkers.cpp b/kdecore/network/kresolverstandardworkers.cpp
index 185879841..6236cc15d 100644
--- a/kdecore/network/kresolverstandardworkers.cpp
+++ b/kdecore/network/kresolverstandardworkers.cpp
@@ -547,8 +547,8 @@ bool KStandardWorker::sanityCheck()
   if (!nodeName().isEmpty())
     {
       TQString node = nodeName();
-      if (node.tqfind('%') != -1)
-	node.truncate(node.tqfind('%'));
+      if (node.find('%') != -1)
+	node.truncate(node.find('%'));
 
       if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
 	  node == TQString::tqfromLatin1("localhost"))
@@ -584,7 +584,7 @@ bool KStandardWorker::resolveScopeId()
 {
   // we must test the original name, not the encoded one
   scopeid = 0;
-  int pos = nodeName().tqfindRev('%');
+  int pos = nodeName().findRev('%');
   if (pos == -1)
     return true;
 
diff --git a/kdecore/network/ksocketaddress.cpp b/kdecore/network/ksocketaddress.cpp
index a6fd14cf5..feaabfab5 100644
--- a/kdecore/network/ksocketaddress.cpp
+++ b/kdecore/network/ksocketaddress.cpp
@@ -131,7 +131,7 @@ bool KIpAddress::setAddress(const TQString& address)
   m_version = 0;
 
   // try to guess the address version
-  if (address.tqfind(':') != -1)
+  if (address.find(':') != -1)
     {
 #ifdef AF_INET6
       // guessing IPv6
diff --git a/kdecore/network/ksocketbuffer.cpp b/kdecore/network/ksocketbuffer.cpp
index ad4864be7..aacffde45 100644
--- a/kdecore/network/ksocketbuffer.cpp
+++ b/kdecore/network/ksocketbuffer.cpp
@@ -75,9 +75,9 @@ bool KSocketBuffer::canReadLine() const
   // walk the buffer
   for ( ; it != end; ++it)
     {
-      if ((*it).tqfind('\n', offset) != -1)
+      if ((*it).find('\n', offset) != -1)
 	return true;
-      if ((*it).tqfind('\r', offset) != -1)
+      if ((*it).find('\r', offset) != -1)
 	return true;
       offset = 0;
     }
@@ -101,7 +101,7 @@ TQCString KSocketBuffer::readLine()
   // walk the buffer
   for ( ; it != end; ++it)
     {
-      int posnl = (*it).tqfind('\n', offset);
+      int posnl = (*it).find('\n', offset);
       if (posnl == -1)
 	{
 	  // not found in this one
diff --git a/kdecore/network/ksocketdevice.cpp b/kdecore/network/ksocketdevice.cpp
index 36e0a5c7b..68651b8e2 100644
--- a/kdecore/network/ksocketdevice.cpp
+++ b/kdecore/network/ksocketdevice.cpp
@@ -884,7 +884,7 @@ KSocketDevice::setDefaultImpl(KSocketDeviceFactoryBase* factory)
 void KSocketDevice::addNewImpl(KSocketDeviceFactoryBase* factory, int capabilities)
 {
   TQMutexLocker locker(&defaultImplFactoryMutex);
-  if (factories.tqcontains(capabilities))
+  if (factories.contains(capabilities))
     delete factories[capabilities];
   factories.insert(capabilities, factory);
 }
diff --git a/kdecore/network/ksrvresolverworker.cpp b/kdecore/network/ksrvresolverworker.cpp
index e217507f3..2ec5bb4bf 100644
--- a/kdecore/network/ksrvresolverworker.cpp
+++ b/kdecore/network/ksrvresolverworker.cpp
@@ -51,8 +51,8 @@ bool KSrvResolverWorker::preprocess()
     return false;
 
   TQString node = nodeName();
-  if (node.tqfind('%') != -1)
-    node.truncate(node.tqfind('%'));
+  if (node.find('%') != -1)
+    node.truncate(node.find('%'));
 
   if (node.isEmpty() || node == TQString::tqfromLatin1("*") ||
       node == TQString::tqfromLatin1("localhost"))