--- a/smsprotocols/smsstack/smsprot/Test/TE_SMSPRTSTRESS/TE_smsprtstressutils.h	Fri Mar 19 09:55:57 2010 +0200
+++ b/smsprotocols/smsstack/smsprot/Test/TE_SMSPRTSTRESS/TE_smsprtstressutils.h	Fri Apr 16 16:12:37 2010 +0300
@@ -19,8 +19,8 @@
  @file
 */
 
-#ifndef __TE_SMSPRTSTRESSUTILS_H__
-#define __TE_SMSPRTSTRESSUTILS_H__
+#ifndef TE_SMSPRTSTRESSUTILS_H
+#define TE_SMSPRTSTRESSUTILS_H
 
 #include "TE_smsprtstressbase.h"
 
@@ -35,6 +35,7 @@
 	{
 public:
 	CTestSmsActiveBase(TInt aHowManyRequests);
+	
 protected:
 	RSocket iSocket;
 	TPckgBuf<TUint> iSbuf;
@@ -57,13 +58,12 @@
 public:
 	CTestSmsActiveStop(RPointerArray<CTestSmsActiveBase>& aTestSmsActives,TInt& aRet);
 	void StopTests(TInt aStatus);
+	
 private:
 	RPointerArray<CTestSmsActiveBase>& iTestSmsActives;
 	TInt& iRet;
 	};
 
-
-
 /*
 -------------------------------------------------------------------------------
 
@@ -82,10 +82,12 @@
 	void CreateSmsWithStatusReportReqL(const TDesC& aDes, TSmsDataCodingScheme::TSmsAlphabet aAlphabet, RFs& aFs) ;
 	~CTestSmsSendActive();
 	void StartL();
+	
 protected:
 	void DoCancel();
 	void RunL();
 	TInt RunError(TInt aError);
+	
 private:
 	void SendMessageL();
 	CSmsMessage* CreateSmsMessageL(const TDesC& aDes, TSmsDataCodingScheme::TSmsAlphabet aAlphabet, RFs& aFs, CSmsPDU::TSmsPDUType aType = CSmsPDU::ESmsSubmit);
@@ -96,7 +98,6 @@
 	TSmsServiceCenterAddress iTelephoneNumber;
 	TSmsServiceCenterAddress iServiceCenterNumber;
 	CTestStep* iTestStep;
-
 	};
 
 /*
@@ -117,14 +118,17 @@
 	CTestSmsParametersActive(CTestSmsActiveStop& aTestSmsActiveStop,TInt aHowManyRequests, CSmsStackTestUtils* aSmsStackTestUtils, CTestStep* aTestStep);
 	~CTestSmsParametersActive();
 	void StartL();
+	
 protected:
 	void DoCancel();
 	void RunL();
 	TInt RunError(TInt aError);
+	
 private:
 	void StoreParametersL();
 	void RetrieveParameters();
 	void GetParametersL();
+	
 private:
 	enum TSmsDeleteAndEnumState
 		{
@@ -132,6 +136,7 @@
 		ESmsNextRetrieveParameters,
 		ESmsNextGetParameters
 		};
+	
 private:
 	TSmsDeleteAndEnumState iState;
 	CMobilePhoneSmspList* iStoreSmspList;
@@ -157,10 +162,12 @@
 	CTestSmsStorageActive(CTestSmsActiveStop& aTestSmsActiveStop,TInt aHowManyRequests, RFs& aFs, CTestStep* aTestStep);
 	~CTestSmsStorageActive();
 	void StartL();
+	
 protected:
 	void DoCancel();
 	void RunL();
 	TInt RunError(TInt aError);
+	
 private:
 	void WriteMessageL();
 	void DeleteMessageL();
@@ -168,6 +175,7 @@
 	void GetMessagesL();
 	CSmsMessage* CreateSmsMessageL(const TDesC& aDes, TSmsDataCodingScheme::TSmsAlphabet aAlphabet, RFs& aFs, CSmsPDU::TSmsPDUType aType = CSmsPDU::ESmsSubmit);
 	void TestSmsListsL(RPointerArray<CSmsMessage>& aLeft,RPointerArray<CSmsMessage>& aRight) ;
+	
 private:
 	enum TSmsDeleteAndEnumState
 		{
@@ -176,6 +184,7 @@
 		ESmsNextGetMessages,
 		ESmsNextDeleteMessage
 		};
+	
 private:
 	CTestSmsActiveStop& iTestSmsActiveStop;
 	RPointerArray<CSmsMessage> iEnumeratedMessages;
@@ -205,21 +214,25 @@
 	CTestSmsReceiveActive(CTestSmsActiveStop& aTestSmsActiveStop,TInt aHowManyRequests, RFs& aFs, CTestStep* aTestStep);
 	~CTestSmsReceiveActive();
 	void StartL();
+	
 protected:
 	void DoCancel();
 	void RunL();
 	TInt RunError(TInt aError);
+	
 private:
 	void ReceiveMessage();
 	void GetMessagesL();
 	void PrintMessageL(const CSmsMessage* aSms);
 	TText8 IsCharDisplayable( const TText8 aChar );
+	
 private:
 	enum TSmsReceiveState
 		{
 		ESmsNextReceiveMessage,
 		ESmsNextGetMessage,
 		};
+	
 private:
 	TSmsReceiveState iState;
 	CTestSmsActiveStop& iTestSmsActiveStop;
@@ -228,4 +241,4 @@
 	CTestStep* iTestStep ;
 	};
 
-#endif  //__TE_SMSPRTSTRESSUTILS
+#endif  // TE_SMSPRTSTRESSUTILS_H