--- a/contentstorage/caclient/stub/inc/caobjectadapter.h	Fri Jun 11 13:58:37 2010 +0300
+++ b/contentstorage/caclient/stub/inc/caobjectadapter.h	Wed Jun 23 18:33:40 2010 +0300
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef OBJECTADAPTER_H
-#define OBJECTADAPTER_H
+#ifndef CAOBJECTADAPTER_H
+#define CAOBJECTADAPTER_H
 
 // INCLUDES
 #include <QPixmap>
@@ -28,46 +28,18 @@
 class CaIconDescription;
 class HbIcon;
 
-/**
- *  CaObjectAdapter
- *
- */
 class CaObjectAdapter
 {
 public:
 
-    /**
-     * Create an icon.
-     * @param entry entry.
-     * @param size size of the icon
-     * @return QPixmap.
-     */
-    static HbIcon makeIcon(
-        const CaEntry &entry,
-        const QSize &size);
+    static HbIcon makeIcon(const CaEntry &entry, const QSize &size);
+
+    static void setId(CaEntry &entry, int id);
 
-    /**
-     * Set entry id.
-     * @param entry entry.
-     * @param id entry id.
-     */
-    static void setId(CaEntry &entry,
-                      int id);
-
-    /**
-     * Set icon description id.
-     * @param iconDescription icon description.
-     * @param id icon description id.
-     */
-    static void setId(CaIconDescription &iconDescription,
-                      int id);
+    static void setId(CaIconDescription &iconDescription, int id);
                       
-    /**
-     * Converts symbian error code to error code (used in QT code).
-     */
-    static ErrorCode convertErrorCode(
-        int internalErrorCode);
+    static ErrorCode convertErrorCode(int internalErrorCode);
 
 };
 
-#endif // OBJECTADAPTER_H
+#endif // CAOBJECTADAPTER_H