diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2012-04-16 13:16:11 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-25 01:56:56 +0200 |
| commit | 6fb0110f972b8d9de22c7c06246b68bd7b6ebe50 (patch) | |
| tree | 5f9139317ca0e4ed93774efbccebbc58d79a286d /src/widgets/kernel | |
| parent | b9790a04eeba664ecdf9ace24911094a71b5f0bd (diff) | |
Using QLatin1String instead of QLatin1Literal
QLatin1Literal is just a typedef of QLatin1String.
Change-Id: If20ca225e57a7fb45a7775f0fc81aedb6da88c96
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets/kernel')
| -rw-r--r-- | src/widgets/kernel/qicon.cpp | 2 | ||||
| -rw-r--r-- | src/widgets/kernel/qiconloader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/widgets/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp index 369e26c21e..62c99a64c8 100644 --- a/src/widgets/kernel/qicon.cpp +++ b/src/widgets/kernel/qicon.cpp @@ -266,7 +266,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St actualSize.scale(size, Qt::KeepAspectRatio); // #### Qt5 no idea what this really does, but we need to remove the QApp and style references - QString key = QLatin1Literal("qt_") + QString key = QLatin1String("qt_") % HexString<quint64>(pm.cacheKey()) % HexString<uint>(pe->mode) % HexString<quint64>(QApplication::palette().cacheKey()) diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp index a0ee95c80c..e1828fd1f1 100644 --- a/src/widgets/kernel/qiconloader.cpp +++ b/src/widgets/kernel/qiconloader.cpp @@ -507,7 +507,7 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st basePixmap.load(filename); int actualSize = qMin(size.width(), size.height()); - QString key = QLatin1Literal("$qt_theme_") + QString key = QLatin1String("$qt_theme_") % HexString<qint64>(basePixmap.cacheKey()) % HexString<int>(mode) % HexString<qint64>(qApp->palette().cacheKey()) |