summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qcssparser_p.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2012-05-21 14:49:29 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-21 16:02:06 +0200
commit33fb856a6da3a1897cc7ac6ea8e482006b7196b1 (patch)
treec81fe679725aafb9235b927952fff1997f796b9f /src/gui/text/qcssparser_p.h
parent061968d0825b2f12dd99ec94ef03b87955af894a (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/gui/text/qcssparser_p.h')
-rw-r--r--src/gui/text/qcssparser_p.h21
1 files changed, 2 insertions, 19 deletions
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index b19fd8326e..a5601fe58a 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -411,22 +411,6 @@ struct BorderData {
BrushData color;
};
-struct Q_GUI_EXPORT IconValue
-{
- enum Mode { Normal, Disabled, Active, Selected }; // In sync with QIcon.
- enum State { On, Off };
-
- struct Q_GUI_EXPORT IconEntry
- {
- IconEntry() : mode(Normal) , state(On) {}
-
- Mode mode;
- State state;
- QString uri;
- };
-
- QList<IconEntry> entries;
-};
// 1. StyleRule - x:hover, y:clicked > z:checked { prop1: value1; prop2: value2; }
// 2. QVector<Selector> - x:hover, y:clicked z:checked
@@ -471,7 +455,7 @@ struct Q_GUI_EXPORT Declaration
QSize sizeValue() const;
QRect rectValue() const;
QString uriValue() const;
- IconValue iconValue() const;
+ QIcon iconValue() const;
void borderImageValue(QString *image, int *cuts, TileMode *h, TileMode *v) const;
};
@@ -598,7 +582,7 @@ struct Q_GUI_EXPORT ValueExtractor
bool extractOutline(int *borders, QBrush *colors, BorderStyle *Styles, QSize *radii, int *offsets);
bool extractPalette(QBrush *fg, QBrush *sfg, QBrush *sbg, QBrush *abg);
int extractStyleFeatures();
- bool extractImage(QCss::IconValue *icon, Qt::Alignment *a, QSize *size);
+ bool extractImage(QIcon *icon, Qt::Alignment *a, QSize *size);
int lengthValue(const Declaration &decl);
@@ -858,7 +842,6 @@ QT_END_NAMESPACE
Q_DECLARE_METATYPE( QCss::BackgroundData )
Q_DECLARE_METATYPE( QCss::LengthData )
Q_DECLARE_METATYPE( QCss::BorderData )
-Q_DECLARE_METATYPE( QCss::IconValue )
#endif // QT_NO_CSSPARSER