--- a/controlpanel/controlpanel_plat/inc/cpbasesettingview.h	Fri May 14 13:29:47 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cpbasesettingview.h	Tue May 25 04:13:06 2010 +0800
@@ -33,11 +33,11 @@
 	explicit CpBaseSettingView(QGraphicsWidget *widget = 0, QGraphicsItem *parent = 0);
     virtual ~CpBaseSettingView();    
     
-    //Deprecated! please use HbView::setWidget
+    //\deprecated please use HbView::setWidget
     void setSettingForm(HbDataForm *settingForm)
     {
     }
-    //Deprecated! please use HbView::widget
+    //\deprecated HbDataForm *settingForm(), please use HbView::widget() instead
     HbDataForm *settingForm() const
     {
         return 0;

--- a/controlpanel/controlpanel_plat/inc/cppluginloader.h	Fri May 14 13:29:47 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cppluginloader.h	Tue May 25 04:13:06 2010 +0800
@@ -29,12 +29,12 @@
 class CP_EXPORT CpPluginLoader
 {
 public:    
-    /* OLD INTERFACES* DPRECATED!!! */
+    /* OLD INTERFACES* DPRECATED!!! \deprecated static CpPluginInterface     *loadCpPlugin(const QString &pluginFile)*/
     static CpPluginInterface     *loadCpPlugin(const QString &pluginFile)
     {
         return 0;
     }
-    /* OLD INTERFACES* DPRECATED!!! */
+    /* OLD INTERFACES* DPRECATED!!! \deprecated static CpPluginPlatInterface *loadPlatCpPlugin(const QString &pluginFile)*/
     static CpPluginPlatInterface *loadPlatCpPlugin(const QString &pluginFile)
     {
         return 0;

--- a/controlpanel/controlpanel_plat/inc/cppluginplatinterface.h	Fri May 14 13:29:47 2010 +0800
+++ b/controlpanel/controlpanel_plat/inc/cppluginplatinterface.h	Tue May 25 04:13:06 2010 +0800
@@ -21,6 +21,7 @@
 #include <QtPlugin>
 
 /*!
+		\deprecated class CpPluginPlatInterface
     \class CpPluginPlatInterface
     \brief The class is Deprecated! please use CpPluginInterface instead.
  */
@@ -39,6 +40,7 @@
     }
     
     /*!
+    \deprecated CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper)
      Create a data form mode item, by which the control panel framework can build a data form model.
      */
     virtual CpSettingFormItemData *createSettingFormItemData(CpItemDataHelper &itemDataHelper) const = 0;

--- a/controlpanel/src/cpframework/src/cppluginlauncher.cpp	Fri May 14 13:29:47 2010 +0800
+++ b/controlpanel/src/cpframework/src/cppluginlauncher.cpp	Tue May 25 04:13:06 2010 +0800
@@ -24,9 +24,14 @@
 #include <cpitemdatahelper.h>
 #include "cpviewlauncher.h"
 /*!
+
+*/
+/*!
     \class CpPluginLauncher
     \brief The CpPluginLauncher class loads a controlpanel plugin at run-time.And display the specify plugin view in client process.
- */
+		\deprecated CpPluginLauncher::launchCpPluginView(const QString &pluginFile,int index )
+    is deprecated. Use pPluginLauncher::launchSettingView instead.
+*/
 bool CpPluginLauncher::launchCpPluginView(const QString &pluginFile,int index /*= 0*/)
 {
     return false;