--- a/src/hbtools/hbbincssmaker/hboffsetmapbuilder.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbtools/hbbincssmaker/hboffsetmapbuilder.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -25,6 +25,7 @@
 
 #include "hboffsetmapbuilder_p.h"
 #include "hblayoutparameters_p.h"
+#include "hbhash_p.h"
 
 #include <QFileInfo>
 
@@ -42,7 +43,7 @@
         return true;
     }
     bool retValue = true;
-    quint32 nameHash = HbSharedCache::hash(QStringRef(&className));
+    quint32 nameHash = hbHash(QStringRef(&className));
     HbBinMakerOffsetItem mapItem = mMapItems.value(nameHash, HbBinMakerOffsetItem());
     if (mapItem.isNull()) {
         if (fileInfo) {
@@ -77,8 +78,8 @@
         QList<HbLayoutIndexItem> &layoutIndexTable = offsetItem.value().layoutIndexItemList;
         Q_FOREACH(const LayoutItem &layoutInfo, layoutInfoList) {
             HbLayoutIndexItem item;
-            item.layoutNameHash = HbSharedCache::hash(QStringRef(&layoutInfo.layout->layoutname));
-            item.sectionNameHash = HbSharedCache::hash(QStringRef(&layoutInfo.layout->section));
+            item.layoutNameHash = hbHash(QStringRef(&layoutInfo.layout->layoutname));
+            item.sectionNameHash = hbHash(QStringRef(&layoutInfo.layout->section));
             quint64 hash = (quint64(item.layoutNameHash) << 32) | item.sectionNameHash;
             if (!hashCheck.contains(hash)) {
                 hashCheck.insert(hash);
@@ -103,7 +104,7 @@
 
     QHash<QString, HbParameterValueItem>::const_iterator end = parameters.end();
     for (QHash<QString, HbParameterValueItem>::const_iterator i = parameters.begin(); i != end; ++i) {
-        quint32 hash = HbSharedCache::hash(QStringRef(&i.key()));
+        quint32 hash = hbHash(QStringRef(&i.key()));
         if (mParameters.contains(hash)) {
             err << "duplicate parameter hash found for: " << i.key();
             status = false;