diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 12:02:43 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-07-15 12:08:32 (GMT) |
commit | a6782030bc6077b3b1ffe380dfd303cfb7662795 (patch) | |
tree | f2fcb24dc0d9df08babe7f87e5ba2a335a0f4b2e /src/gui/styles/qwindowsstyle.cpp | |
parent | 271358459d605e909f4ec093b971a420ff730e8f (diff) | |
download | Qt-a6782030bc6077b3b1ffe380dfd303cfb7662795.zip Qt-a6782030bc6077b3b1ffe380dfd303cfb7662795.tar.gz Qt-a6782030bc6077b3b1ffe380dfd303cfb7662795.tar.bz2 |
Fix warnings for mingw
did a small refactor and used QStyleHelper::uniqueName in plastique and
windows styles
Diffstat (limited to 'src/gui/styles/qwindowsstyle.cpp')
-rw-r--r-- | src/gui/styles/qwindowsstyle.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/styles/qwindowsstyle.cpp b/src/gui/styles/qwindowsstyle.cpp index 4f25e68..4c66bbb 100644 --- a/src/gui/styles/qwindowsstyle.cpp +++ b/src/gui/styles/qwindowsstyle.cpp @@ -1061,6 +1061,8 @@ QPixmap QWindowsStyle::standardPixmap(StandardPixmap standardPixmap, const QStyl } } break; + default: + break; } if (!desktopIcon.isNull()) { return desktopIcon; @@ -1375,11 +1377,8 @@ void QWindowsStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QRect r = opt->rect; int size = qMin(r.height(), r.width()); QPixmap pixmap; - QString pixmapName; - pixmapName.sprintf("%s-%s-%d-%d-%d-%lld", - "$qt_ia", metaObject()->className(), - uint(opt->state), pe, - size, opt->palette.cacheKey()); + QString pixmapName = QStyleHelper::uniqueName(QLatin1String("$qt_ia-") + QLatin1String(metaObject()->className()), opt, QSize(size, size)) + + QLatin1Char('-') + QString::number(pe); if (!QPixmapCache::find(pixmapName, pixmap)) { int border = size/5; int sqsize = 2*(size/2); |