diff -r 923ff622b8b9 -r 4633027730f5 src/hbcore/cssparser/hbwidgetstyleloader_p.h --- a/src/hbcore/cssparser/hbwidgetstyleloader_p.h Tue Jul 06 14:36:53 2010 +0300 +++ b/src/hbcore/cssparser/hbwidgetstyleloader_p.h Wed Aug 18 10:05:37 2010 +0300 @@ -65,32 +65,42 @@ FileSetType_WidgetML }; + enum PatternType { + PatternType_None, + PatternType_CSS, + PatternType_WidgetML + }; + bool doAddFileSet( const QString &path, FileSetType type, + PatternType patternType, const HbLayeredStyleLoader::Concern concern, const HbLayeredStyleLoader::LayerPriority priority); bool doRemoveFileSet( const QString &path, - const HbLayeredStyleLoader::Concern *concern = 0, - const HbLayeredStyleLoader::LayerPriority *priority = 0); + const HbLayeredStyleLoader::Concern concern, + const HbLayeredStyleLoader::LayerPriority priority); struct FileSet { QString path; FileSetType type; + PatternType patternType; HbLayeredStyleLoader::Concern concern; HbLayeredStyleLoader::LayerPriority priority; - QHash loadedCss; - QStringList missedCss; + QHash loadedCss; + QList missedCss; int referenceCount; FileSet(const QString &pat, FileSetType typ, + PatternType pattern, const HbLayeredStyleLoader::Concern con, const HbLayeredStyleLoader::LayerPriority pri) { path = pat; type = typ; + patternType = pattern; concern = con; priority = pri; referenceCount = 1;