diff -r 13d7c31c74e0 -r b183ec05bd8c terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h
--- a/terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h	Thu Aug 19 10:44:50 2010 +0300
+++ b/terminalsecurity/SCP/SCPTimestampPlugin/inc/SCPTimestampPlugin.h	Tue Aug 31 16:04:06 2010 +0300
@@ -26,7 +26,7 @@
 #include <barsc.h>
 
 #include <TerminalControl3rdPartyAPI.h>
-#include "SCPUserInf.h"
+
 
 // LOCAL CONSTANTS
 const TInt KSCPMaxExpiration = 365;
@@ -51,8 +51,6 @@
 const TInt KSCPTypeHours = 1;
 const TInt KSCPTypeDays = 2;
 
-const TInt KSCPNoteTimeout = 2000000;
-
 _LIT( KSCPTSConfigFile, "SCPTimestampPlugin.ini");
 _LIT( KDriveZ, "Z:" );
 _LIT(KSCPTimestampPluginResFilename, "\\Resource\\SCPTimestampPluginLang.rsc");
@@ -88,7 +86,7 @@
         /**
         * Event handler
         */		
-		CSCPParamObject* HandleEvent( TInt aID, CSCPParamObject& aParam );
+	    void HandleEventL( TInt aID, CSCPParamObject& aParam, CSCPParamObject& aOutParam );
 		
 		void SetEventHandler( MSCPPluginEventHandler* aHandler );
 
@@ -109,25 +107,25 @@
 		/**        
         * Checks if the minimum timeout has expired since the last change
         */
-		void IsChangeAllowedL( CSCPParamObject& aParam, CSCPParamObject*& aRetParams );	 
+		void IsChangeAllowedL( CSCPParamObject& aParam, CSCPParamObject& aRetParams );	 
 		
 		/**        
         * Updates the status when the password is changed
         */
-        void PasswordChanged( CSCPParamObject& aParam, CSCPParamObject*& aRetParams );
+        void PasswordChanged( CSCPParamObject& aParam, CSCPParamObject& aRetParams );
         
 		/**
         * Updates the status when after an authentication attempt
         */
         void AuthenticationAttempt( TBool aIsSuccessful, 
                                     CSCPParamObject& aParam,
-                                    CSCPParamObject*& aRetParams );
+                                    CSCPParamObject& aRetParams );
                                     
 		/**
         * Updates the status after successful authentication
         */
         void SuccessfulAuthenticationL( CSCPParamObject& aParam,
-                                       CSCPParamObject*& aRetParams );
+                                       CSCPParamObject& aRetParams );
         
         
 		/**
@@ -141,12 +139,12 @@
         */
         void ConfigurationQuery(    TInt aParamID, 
                                     CSCPParamObject& aParam, 
-                                    CSCPParamObject*& aRetParams );
+                                    CSCPParamObject& aRetParams );
                                     
         /**
         * Initiates RFS Deep (device wipe)
         */
-        void WipeDeviceL( CSCPParamObject*& aRetParams );
+        void WipeDeviceL( CSCPParamObject& aRetParams );
                                     
 		/**
         * Read the configuration from flash.
@@ -196,7 +194,6 @@
 	    
 	    /* Resource-file indicator */
 	    TBool iResOpen;   
-	    CSCPUserInf *iUserInfo;
     };
 
 #endif // __CSCPPTIMESTAMPPLUGIN_H