diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-21 14:49:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 16:02:06 +0200 |
commit | 33fb856a6da3a1897cc7ac6ea8e482006b7196b1 (patch) | |
tree | c81fe679725aafb9235b927952fff1997f796b9f /src/widgets | |
parent | 061968d0825b2f12dd99ec94ef03b87955af894a (diff) |
QCssParser: Remove temporary structure storing QIcon data.
This is no longer needed after QIcon moved to QtGui. It is a
revert of 5a0eb4e768435b9ce32b074e620fca33be4df2fb, compile
fixes and uncommenting of commented-out code.
Change-Id: I6cfe6d2582b3e37161862a28e55cc3b010e18a8b
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/styles/qstylesheetstyle.cpp | 23 |
1 files changed, 5 insertions, 18 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index 46bf836369..8341ae72a9 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -860,19 +860,6 @@ static QStyle::StandardPixmap subControlIcon(int pe) return QStyle::SP_CustomBase; } -static inline QIcon cssIconValueToIcon(const QCss::IconValue &iconValue) -{ - if (iconValue.entries.isEmpty()) - return QIcon(); - QIcon icon = QIcon(iconValue.entries.first().uri); - for (int i = 1; i < iconValue.entries.size(); ++i) { - const QCss::IconValue::IconEntry &entry = iconValue.entries.at(i); - icon.addPixmap(entry.uri, static_cast<QIcon::Mode>(entry.mode), - static_cast<QIcon::State>(entry.state)); - } - return icon; -} - QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QWidget *widget) : features(0), hasFont(false), pal(0), b(0), bg(0), bd(0), ou(0), geo(0), p(0), img(0), clipset(0) { @@ -932,11 +919,11 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QWidget if (v.extractPalette(&fg, &sfg, &sbg, &abg)) pal = new QStyleSheetPaletteData(fg, sfg, sbg, abg); + QIcon icon; alignment = Qt::AlignCenter; QSize size; - QCss::IconValue iconValue; - if (v.extractImage(&iconValue, &alignment, &size)) - img = new QStyleSheetImageData(cssIconValueToIcon(iconValue), alignment, size); + if (v.extractImage(&icon, &alignment, &size)) + img = new QStyleSheetImageData(icon, alignment, size); int adj = -255; hasFont = v.extractFont(&font, &adj); @@ -992,7 +979,7 @@ QRenderRule::QRenderRule(const QVector<Declaration> &declarations, const QWidget } else if (hintName.endsWith(QLatin1String("size"))) { hintValue = decl.sizeValue(); } else if (hintName.endsWith(QLatin1String("icon"))) { - hintValue = cssIconValueToIcon(decl.iconValue()); + hintValue = decl.iconValue(); } else if (hintName == QLatin1String("button-layout") && decl.d->values.count() != 0 && decl.d->values.at(0).type == Value::String) { hintValue = subControlLayout(decl.d->values.at(0).variant.toString()); @@ -2538,7 +2525,7 @@ void QStyleSheetStyle::setProperties(QWidget *w) QVariant v; const QVariant value = w->property(property.toLatin1()); switch (value.type()) { - case QVariant::Icon: v = cssIconValueToIcon(decl.iconValue()); break; + case QVariant::Icon: v = decl.iconValue(); break; case QVariant::Image: v = QImage(decl.uriValue()); break; case QVariant::Pixmap: v = QPixmap(decl.uriValue()); break; case QVariant::Rect: v = decl.rectValue(); break; |