--- a/contentstorage/caclient/s60/src/caqtsfhandlerloader.cpp	Tue Mar 23 23:55:55 2010 +0200
+++ b/contentstorage/caclient/s60/src/caqtsfhandlerloader.cpp	Wed Mar 24 03:15:43 2010 +0200
@@ -24,7 +24,7 @@
 
 #include "cahandler.h"
 #include "caqtsfhandlerloader.h"
-#include "caobjectadapter.h"
+#include "caclient_defines.h"
 #include "caapphandler.h"
 #include "caurlhandler.h"
 #include "catapphandler.h" 
@@ -59,13 +59,12 @@
 
     CaHandler *implementation(0);
 
-    if (entryTypeName == CaObjectAdapter::applicationEntryTypeName()
-        || entryTypeName == CaObjectAdapter::widgetEntryTypeName()) {
+    if (entryTypeName == APPLICATION_ENTRY_TYPE_NAME
+        || entryTypeName == WIDGET_ENTRY_TYPE_NAME) {
         implementation = new CaS60HandlerAdapter<CCaAppHandler>;
-    } else if (entryTypeName == CaObjectAdapter::urlEntryTypeName()) {
+    } else if (entryTypeName == URL_ENTRY_TYPE_NAME) {
         implementation = new CaS60HandlerAdapter<CCaUrlHandler>;
-    } else if (entryTypeName == 
-               CaObjectAdapter::templateApplicationEntryTypeName()) {
+    } else if (entryTypeName == TEMPLATED_APPLICATION_ENTRY_TYPE_NAME) {
         implementation = new CaTappHandler;
     }