--- a/securitysettings/inc/cpeapplugininterface.h	Thu Jun 10 16:12:28 2010 +0300
+++ b/securitysettings/inc/cpeapplugininterface.h	Thu Jun 24 11:23:08 2010 +0300
@@ -2,7 +2,7 @@
  * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
- * under the terms of the License "Eclipse Public License v1.0"
+ * under the terms of "Eclipse Public License v1.0"
  * which accompanies this distribution, and is available
  * at the URL "http://www.eclipse.org/legal/epl-v10.html".
  *
@@ -12,55 +12,59 @@
  * Contributors:
  *
  * Description:
- *   Control Panel plug-in interface for EAP method configuration QT UIs
+ *   Control Panel plugin interface for EAP
+ *   method configuration QT UIs
  *
  */
 
 /*
- * %version: 2 %
+ * %version: 4 %
  */
 
 #ifndef CPEAPPLUGININTERFACE_H
 #define CPEAPPLUGININTERFACE_H
 
+// System includes
 #include <QtPlugin>
+#include <QString>
 #include <eapqtconfiginterface.h>
 
+// User includes
+
+// Forward declarations
 class CpBaseSettingView;
 class EapQtPluginInfo;
 class EapQtPluginHandle;
 
-/*!
- * @addtogroup group_eap_ui_plugin
- * @{
- */
+// External data types
+
+// Constants
 
-/*! Qt Plugin interface for EAP settings in Control Panel application.
- * 
- * All plugin stubs MUST be in 
- * /resource/qt/plugins/controlpanel/eapsettings
- */
+// All plugin stubs MUST be located in /resource/qt/plugins/controlpanel/eapsecurity
+static const QString CpEapPluginInterfacePluginDirectory(
+    "\\resource\\qt\\plugins\\controlpanel\\eapsecurity");
+
+// Class declaration
 class CpEapPluginInterface
 {
+
 public:
-    /*! Destructor */
-    virtual ~CpEapPluginInterface()
-    {
-    }
-    ;
+
+    // Data types
+
+    virtual ~CpEapPluginInterface() {};
 
     virtual void setSettingsReference(const EapQtConfigInterface::EapBearerType bearer,
         const int iapId) = 0;
 
     virtual QList<EapQtPluginInfo> pluginInfo() = 0;
 
-    virtual CpBaseSettingView* uiInstance(const EapQtPluginHandle& outerHandle,
-        const EapQtPluginInfo& plugin) = 0;
+    virtual CpBaseSettingView* uiInstance(const EapQtPluginHandle &outerHandle,
+        const EapQtPluginInfo &plugin) = 0;
+
 };
 
 Q_DECLARE_INTERFACE(CpEapPluginInterface,
     "com.nokia.plugin.controlpanel.eap.platform.interface/1.0");
 
-/*! @} */
-
-#endif
+#endif // CPEAPPLUGININTERFACE_H