--- a/ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h	Thu Aug 19 09:38:05 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/IpsSosAOMboxLogic.h	Tue Aug 31 15:04:17 2010 +0300
@@ -15,38 +15,39 @@
 *     Contains mailbox specified always online logic
 *
 */
-
-#ifndef IPSSOSAOMBOXLOGIC_CPP_
-#define IPSSOSAOMBOXLOGIC_CPP_
-
+//<Qmail>
+#ifndef IPSSOSAOMBOXLOGIC_H
+#define IPSSOSAOMBOXLOGIC_H
+//</Qmail>
 #include <e32base.h> 
 #include <msvapi.h>
 
-//<cmail> removing internal dependency
-/*#ifdef _DEBUG
-#include "../../internal/IpsSosAOPluginTester/inc/IpsSosAOPluginTester.hrh"
-#endif // _DEBUG*/
-//</cmail>
 
 #include "IpsSosAOBaseAgent.h"
-#include "ipssetdataextension.h"
+//<QMail>
+
+//</QMail>
 #include "IpsSosAOPluginTimer.h"
-//<cmail>
-//</cmail>
+
+//<QMail>
 
-class CIpsSetDataApi;
+//</QMail>
 class CIpsSosAOBaseAgent;
-class CIpsSetDataExtension;
+//<QMail>
+
+//</QMail>
 class CIpsSosAOImapPopLogic;
 
 /**
 * class CIpsSosAOImapPopLogic;
 *
 */
-class CIpsSosAOMBoxLogic : 
+//<Qmail>
+NONSHARABLE_CLASS (CIpsSosAOMBoxLogic) : 
+//</Qmail>
     public CBase, 
-                           public MIpsSosAOPluginTimerCallBack,
-                           public MIpsSosAOAgentOperationResponse
+    public MIpsSosAOPluginTimerCallBack,
+    public MIpsSosAOAgentOperationResponse
     {
 
 public:
@@ -182,18 +183,14 @@
      * mailbox settings
      * @param aNewValue new value of flag
      */
-     //<cmail>
     void SetEmnReceivedFlagL( TBool aNewValue );
-    //</cmail>
     
     /*
      * Gets mailbox roaming stopped status
      * @return ETrue if roaming and mailbox logic is stopped during roaming
      */
-     //<cmail>
     TBool IsMailboxRoamingStoppedL();
-    //</cmail>
-
+    
 	/**
      * Has mailbox ever received and OMA EMN
      */
@@ -259,9 +256,7 @@
     /*
      * checks is operation completion error fatal and should timed sync swithc off
      */
-     //<cmail>
     TBool IsErrorFatalL( TInt aError );
-    //</cmail>
     
     /*
      * Suspends ongoing sync (or fetch) and swiths logic to suspend state
@@ -299,11 +294,6 @@
      */
     TBool CanConnectIfRoamingL();
 
-// <cmail> removing flags    
-/*#ifdef IPSSOSIMAPPOLOGGING_ON
-    void WriteDebugData( TInt aEvent );
-#endif*/
-//</cmail>
     
 private:
     
@@ -312,13 +302,19 @@
     TMBoxLogicState                 iState;
     TInt                            iErrorCounter;
     TInt                            iError;
-    CIpsSosAOPluginTimer*           iTimer;
+	//<Qmail>
+    CIpsSosAOPluginTimer*           iTimer;//owned
     // message fetch is not currently used
-    RArray<TMsvId>                  iFetchMsgArray;
-    CIpsSetDataApi*                 iDataApi;
-    CIpsSosAOBaseAgent*             iAgent;
-    CIpsSetDataExtension*           iExtendedSettings;
+    RArray<TMsvId>                  iFetchMsgArray;//owned
+	//<QMail>
+
+	//</QMail>
+    CIpsSosAOBaseAgent*             iAgent;//owned
+	//</Qmail>
+	//<QMail>
+
+	//</QMail>
     TBool                           iIsRoaming;
     };
 
-#endif /*IPSSOSAOMBOXLOGIC_CPP_*/
+#endif /*IPSSOSAOMBOXLOGIC_H*/