--- a/contentstorage/caclient/s60/inc/caobjectadapter.h	Fri Mar 19 09:35:23 2010 +0200
+++ b/contentstorage/caclient/s60/inc/caobjectadapter.h	Fri Apr 16 15:16:09 2010 +0300
@@ -38,6 +38,7 @@
 class HbIcon;
 class CFbsBitmap;
 
+
 /**
  *  CaObjectAdapter
  *
@@ -75,22 +76,6 @@
         CCaInnerQuery &toQuery);
 
     /**
-     * Wraps a QString internal buffer into TPtrC object.
-     * The returned object is valid until QString internal buffer changes
-     * or the object is destroyed.
-     * @param string QString.
-     * @return descriptor.
-     */
-    static const TPtrC convertToDescriptor(const QString &string);
-
-    /**
-     * Converts descriptor to QString.
-     * @param des descriptor.
-     * @return QString.
-     */
-    static QString convertToString(const TDesC &des);
-
-    /**
      * Converts inner entry table to QList of pointers to entries.
      * @param fromEntriesArray an array containing inner entries
      * for conversion.
@@ -156,21 +141,6 @@
         CCaInnerNotifierFilter &to);
 
     /**
-     * @return  uid attribute name
-     */
-    static const QString &applicationUidAttributeName();
-
-    /**
-     * @return  attribute type name
-     */
-    static const QString &applicationEntryName();
-
-    /**
-     * @return  widget type name
-     */
-    static const QString &widgetEntryName();
-
-    /**
      * Set entry id.
      * @param entry entry.
      * @param id entry id.