diff -r 1e962b12a8db -r d2f833ab7940 contentstorage/cahandler/app/src/caapphandlerplugin.cpp
--- a/contentstorage/cahandler/app/src/caapphandlerplugin.cpp	Tue Jun 01 11:30:17 2010 +0300
+++ b/contentstorage/cahandler/app/src/caapphandlerplugin.cpp	Fri Jun 11 16:13:51 2010 +0300
@@ -34,7 +34,7 @@
     \param descriptor Service descriptor.
     \param context Ignored.
     \param session Ignored.
-    \return An instance of the CaS60HandlerAdapter<CaAppHandler> when descriptor interface name
+    \retval an instance of the CaAppHandler when descriptor interface name
     is "com.nokia.homescreen.ICommandHandler", NULL otherwise.
 */
 QObject *CaAppHandlerPlugin::createInstance(const QServiceInterfaceDescriptor &descriptor,
@@ -51,37 +51,14 @@
         return 0;
     }
 }
+
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC SKIP
+#endif //COVERAGE_MEASUREMENT (QT macro)
+
 Q_EXPORT_PLUGIN2(caapphandlerplugin, CaAppHandlerPlugin)
 
-
-/*!
-    \class CaHandler
-    \ingroup
-    \brief Interface for command handlers
-*/
-
-/*!
-    \fn int CaHandler::execute(const CaEntry &entry, const QString &commandName) = 0
-    \param entry Subject of the command.
-    \param commandName The name of the command to execute.
-    Returns 0 on success, error code otherwise.
-    \sa e32err.h for error code descriptions.
-*/
+#ifdef COVERAGE_MEASUREMENT
+#pragma CTC ENDSKIP
+#endif //COVERAGE_MEASUREMENT
 
-/*!
-    \class CaS60HandlerAdapter<typename Plugin>
-    \ingroup
-    \brief Adapter for S60 command handlers.
-
-    Adapts S60 command handlers to CaHandler interface
-
-    \sa CaHandler
-*/
-
-/*!
-    \fn int CaS60HandlerAdapter<typename Plugin>::execute(const CaEntry &entry, const QString &commandName)
-    \param entry Subject of the command.
-    \param commandName The name of the command to execute.
-    \return 0 on success, error code otherwise.
-    \sa e32err.h for error code descriptions.
-*/