[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/kdecore/network
From:       David Faure <faure () kde ! org>
Date:       2005-09-29 9:56:56
Message-ID: 1127987816.848874.4972.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 465274 by dfaure:

Compile without QT3_SUPPORT, unfinished.


 M  +3 -3      kresolver.cpp  
 M  +8 -7      kresolverstandardworkers.cpp  


--- trunk/KDE/kdelibs/kdecore/network/kresolver.cpp #465273:465274
@@ -896,7 +896,7 @@
   if (name.isEmpty())
     return QLatin1String("localhost");
 
-  if (name.find('.') == -1)
+  if (name.indexOf('.') == -1)
     {
       // not fully qualified
       // must resolve
@@ -921,7 +921,7 @@
   const char *kde_use_idn = getenv("KDE_USE_IDN");
   if (!kde_use_idn)
      kde_use_idn = "at:br:ch:cn:de:dk:kr:jp:li:no:se:tw";
-  return new QStringList(QStringList::split(':', QString::fromLatin1(kde_use_idn).toLower()));
+  return new QStringList(QString::fromLatin1(kde_use_idn).toLower().split(':'));
 }
 
 // implement the ToAscii function, as described by IDN documents
@@ -1089,7 +1089,7 @@
   delete [] ucs4;
   return retval;
 #else
-  return label.latin1();
+  return label.toLatin1();
 #endif
 }
 
--- trunk/KDE/kdelibs/kdecore/network/kresolverstandardworkers.cpp #465273:465274
@@ -111,7 +111,7 @@
 	continue;
 
       QTextStream stream(&f);
-      stream.setEncoding(QTextStream::Latin1);
+      stream.setCodec("latin1");
       for (QString line = stream.readLine(); !line.isNull();
 	   line = stream.readLine())
 	{
@@ -982,15 +982,16 @@
   // keep track of any Unix-domain sockets
 
   bool seen_unix = false;
-  KResolverResults::Iterator it = results.begin();
-  for ( ; it != results.end(); )
+  int i = 0;
+  while ( i < results.count() )
     {
-      if ((*it).family() == AF_UNIX)
+      const KResolverEntry& res = results[i];
+      if (res.family() == AF_UNIX)
 	seen_unix = true;
-      if (!wantThis((*it).family()))
-	it = results.remove(it);
+      if (!wantThis(res.family()))
+	results.removeAt(i);
       else
-	++it;
+	++i;
     }
 
   if (!seen_unix)
[prev in list] [next in list] [prev in thread] [next in thread]