diff -r 923ff622b8b9 -r 4633027730f5 src/hbtools/hbbincssmaker/hboffsetmapbuilder_p.h --- a/src/hbtools/hbbincssmaker/hboffsetmapbuilder_p.h Tue Jul 06 14:36:53 2010 +0300 +++ b/src/hbtools/hbbincssmaker/hboffsetmapbuilder_p.h Wed Aug 18 10:05:37 2010 +0300 @@ -54,7 +54,7 @@ } const CSSLayoutInfo* layout; - int offset; + qptrdiff offset; }; struct HbBinMakerOffsetItem : public HbOffsetItem @@ -69,28 +69,42 @@ } }; +struct HbParameterValueItem +{ + HbParameterValueItem(qptrdiff offset, bool special = false) + : offset(offset), special(special) {} + qptrdiff offset; + bool special; +}; + class HbOffsetMapBuilder { public: - HbOffsetMapBuilder() {} + HbOffsetMapBuilder() : mGlobalParameterOffset(-1) {} bool addWidgetOffsets(const QString &className, const QFileInfo *fileInfo, - int offsets[]); + qptrdiff offsets[]); bool addWidgetMLOffsets(const QString &fileName, quint32 classNameHash, const QList &layoutInfoList); + bool addGlobalParameters(int zoomLevel, + const QHash ¶meters); QByteArray result(); - int size() const { return _mapItems.count(); } + int size() const { return mMapItems.count(); } + int globalParameterOffset() const { return mGlobalParameterOffset;} QList items() const { - return _mapItems.values(); + return mMapItems.values(); } private: - QMap _mapItems; + typedef QMap > ParameterMap; + QMap mMapItems; + ParameterMap mParameters; + int mGlobalParameterOffset; }; #endif // HBOFFSETMAPBUILDER_P_H