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

List:       kde-commits
Subject:    KDE/kdemultimedia/libkcddb
From:       Richard Lärkäng <richard () goteborg ! utfors ! se>
Date:       2007-07-15 15:39:21
Message-ID: 1184513961.546231.23147.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 688253 by larkang:

Don't show progress window when downloading sites-list

But since the changes to freedb.org, only the default server
seems available so maybe it should be removed


 M  +7 -13     sites.cpp  
 M  +1 -1      sites.h  


--- trunk/KDE/kdemultimedia/libkcddb/sites.cpp #688252:688253
@@ -20,6 +20,7 @@
 #include "sites.h"
 #include <kurl.h>
 #include <kio/netaccess.h>
+#include <kio/job.h>
 #include <QFile>
 #include <QTextStream>
 #include <kdebug.h>
@@ -52,30 +53,23 @@
 
     QList<Mirror> result;
 
-    QString tmpFile;
-    if( KIO::NetAccess::download( url, tmpFile, 0 ) )
+    KIO::Job* job = KIO::get( url, false, false );
+    QByteArray data;
+    if( KIO::NetAccess::synchronousRun( job, 0, &data ) )
     {
-      result = readFile( tmpFile );
-      KIO::NetAccess::removeTempFile( tmpFile );
+      result = readData( data );
     }
 
     return result;
   }
 
     QList<Mirror>
-  Sites::readFile(const QString& fileName)
+  Sites::readData(const QByteArray& data)
   {
     QList<Mirror> result;
 
-    QFile f(fileName);
-    if (!f.open(QIODevice::ReadOnly))
-    {
-      kDebug(60010) << "Couldn't read: " << fileName << endl;
-      return result;
-    }
+    QTextStream ts(data);
 
-    QTextStream ts(&f);
-
     if (CDDB::statusCode(ts.readLine()) != 210)
       return result;
 
--- trunk/KDE/kdemultimedia/libkcddb/sites.h #688252:688253
@@ -43,7 +43,7 @@
 
       QList<Mirror> siteList();
     private:
-      QList<Mirror> readFile(const QString& fileName);
+      QList<Mirror> readData(const QByteArray& data);
       Mirror parseLine(const QString& line);
   } ;
 }
[prev in list] [next in list] [prev in thread] [next in thread]