Changeset 846 for trunk/src/gui/image/qiconloader.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/image/qiconloader.cpp (modified) (6 diffs)

trunk/src/gui/image/qiconloader.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -63 +63 @@
 #include <private/qt_x11_p.h>
 #endif
+
+
 
 QT_BEGIN_NAMESPACE
@@ -150 +152 @@
     if (m_iconDirs.isEmpty()) {
         m_iconDirs = qt_guiPlatformPlugin()->iconThemeSearchPaths();
-        // Allways add resource directory as search path
+        // Always add resource directory as search path
         m_iconDirs.append(QLatin1String(":/icons"));
     }
@@ -265 +267 @@
             iconEntry->dir = dirInfo;
             iconEntry->filename = currentDir.filePath(iconName + pngext);
-            // Notice we ensure that pixmap entries allways come before
+            // Notice we ensure that pixmap entries always come before
             // scalable to preserve search order afterwards
             entries.prepend(iconEntry);
@@ -489 +491 @@
 
     int actualSize = qMin(size.width(), size.height());
-    QString key = QLatin1String("$qt_theme_")
-                  + QString::number(basePixmap.cacheKey(), 16)
-                  + QLatin1Char('_')
-                  + QString::number(mode)
-                  + QLatin1Char('_')
-                  + QString::number(qApp->palette().cacheKey(), 16)
-                  + QLatin1Char('_')
-                  + QString::number(actualSize);
+
+    QString key = QLatin1Literal("$qt_theme_")
+                  % HexString<qint64>(basePixmap.cacheKey())
+                  % HexString<int>(mode)
+                  % HexString<qint64>(qApp->palette().cacheKey())
+                  % HexString<int>(actualSize);
 
     QPixmap cachedPixmap;
@@ -555 +555 @@
         }
         break;
+
+
+
+
+
+
     default:
         QIconEngineV2::virtual_hook(id, data);