Changeset 11053

Timestamp:

Jul 25, 2010, 5:42:43 PM (12 years ago)

Author:

charles

Message:

(trunk qt) readability changes to the favicon cache

Location:

trunk/qt

Files:

• favicon.cc (modified) (6 diffs)
• favicon.h (modified) (1 diff)

trunk/qt/favicon.cc

@@ -11 +11 @@
  */
 
-#include <iostream>
-
 #include <QDesktopServices>
 #include <QDir>
@@ -24 +22 @@
 ****
 ***/
-
-QString
-Favicons :: getCacheDir( )
-{
-    const QString base = QDesktopServices::storageLocation( QDesktopServices::CacheLocation );
-    return QDir( base ).absoluteFilePath( "favicons" );
-};
-
 
 Favicons :: Favicons( )
@@ -48 +38 @@
 ***/
 
+QString
+Favicons :: getCacheDir( )
+{
+    const QString base = QDesktopServices::storageLocation( QDesktopServices::CacheLocation );
+    return QDir( base ).absoluteFilePath( "favicons" );
+}
+
 void
 Favicons :: ensureCacheDirHasBeenScanned( )
@@ -59 +56 @@
         QDir cacheDir( getCacheDir( ) );
         cacheDir.mkpath( cacheDir.absolutePath( ) );
+
         QStringList files = cacheDir.entryList( QDir::Files|QDir::Readable );
         foreach( QString file, files ) {
@@ -91 +89 @@
 
 void
-Favicons :: add( const QUrl& url_in )
+Favicons :: add( const QUrl& url )
 {
     ensureCacheDirHasBeenScanned( );
 
-    const QString host = getHost(url_in);
-    if( !myPixmaps.contains(host) && !myPending.contains(host) )
+    const QString host = getHost( url );
+    if( !myPixmaps.contains( host ) && !myPending.contains( host ) )
     {
-        const int IMAGE_TYPES = 4;
-        const QString image_types[IMAGE_TYPES] = { "ico", "png", "gif", "jpg" };
+        myPending.append( host ); 
 
-        myPending.append( host ); 
-        for( int i=0; i<IMAGE_TYPES; ++i )
-        {
-            QString url( "http://" + host + "/favicon." + image_types[i]);
-            myNAM->get( QNetworkRequest( url ) );
-        }
+        const QString path = "http://" + host + "/favicon.";
+        QStringList suffixes;
+        suffixes << "ico" << "png" << "gif" << "jpg";
+        foreach( QString suffix, suffixes )
+            myNAM->get( QNetworkRequest( path + suffix ) );
     }
 }
@@ -114 +110 @@
 {
     const QString host = reply->url().host();
-
     myPending.removeAll( host );
-
-    const QByteArray content = reply->readAll( );
 
     QPixmap pixmap;
 
+    const QByteArray content = reply->readAll( );
     if( !reply->error( ) )
         pixmap.loadFromData( content );

trunk/qt/favicon.h

@@ -52 +52 @@
 
         QString getCacheDir( );
-
         void ensureCacheDirHasBeenScanned( );