--- a/src/hbtools/hbthemeindexer/main.cpp	Thu Sep 02 20:44:51 2010 +0300
+++ b/src/hbtools/hbthemeindexer/main.cpp	Fri Sep 17 08:32:10 2010 +0300
@@ -25,6 +25,8 @@
 
 #include <hbiconsource_p.h>
 #include <hbthemeindex_p.h>
+#include <hbhash_p.h>
+
 #include <assert.h>
 #include <iostream>
 #include <QApplication>
@@ -231,7 +233,7 @@
             // If we come here, the filename must end with .* (e.g. .svg)
             iconname = filename.left(filename.lastIndexOf('.'));
 
-            itemData.itemNameHash = HbThemeIndex::hash(iconname);
+            itemData.itemNameHash = hbHash(iconname);
 
             // Define default size
             QSize defaultSize = getDefaultSize(fullFilename);
@@ -288,7 +290,7 @@
         case HbThemeIndexItemData::FxmlItem:
             {
             // Define fileName (file extension not removed)
-            itemData.itemNameHash = HbThemeIndex::hash(filename);
+            itemData.itemNameHash = hbHash(filename);
 
             if (LockedList.contains(filename)) {
                 itemData.flags |= HbThemeIndexItemData::Locked;
@@ -342,7 +344,7 @@
                     value = line.mid(startIndex, endIndex - startIndex).trimmed();
                 }
 
-                itemData.itemNameHash = HbThemeIndex::hash(name);
+                itemData.itemNameHash = hbHash(name);
                 itemData.itemType = HbThemeIndexItemData::ColorItem;
                 bool ok = false;
                 itemData.colorValue = (quint32)value.toUInt(&ok, 16);   // Might cause compiler warning in 64 bit systems
@@ -387,7 +389,7 @@
         // So just create empty items for the rest of mirrored items in list
         foreach (QString mirrored, MirroredList) {
             HbThemeIndexItemData itemData;
-            itemData.itemNameHash = HbThemeIndex::hash(mirrored);
+            itemData.itemNameHash = hbHash(mirrored);
             itemData.flags |= HbThemeIndexItemData::Mirrorable;
             appendItem(itemData, mirrored);
         }