--- a/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_StatusReportSchemeTransfer.h	Fri Mar 19 09:55:57 2010 +0200
+++ b/smsprotocols/smsstack/smsprot/Test/TE_Smsprt/Te_StatusReportSchemeTransfer.h	Fri Apr 16 16:12:37 2010 +0300
@@ -14,87 +14,81 @@
 //
 
 
-#ifndef __TE_STATUS_REPORT_SCHEME_SENDING_H__
-#define __TE_STATUS_REPORT_SCHEME_SENDING_H__
+#ifndef TE_STATUSREPORTSCHEMETRANSFER_H
+#define TE_STATUSREPORTSCHEMETRANSFER_H
 
 #include "Te_StatusReportScheme.h"
 
 /**
 Base class for all sending test cases
-*/
-class CTestSchemeSending : public CTestStatusReportScheme
-{
+ */
+class CTestSchemeSending : public CSmsStatusReportSchemeTestStep
+    {
 public:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-};
+    virtual TVerdict doTestStepPreambleL();
+    virtual TVerdict doTestStepPostambleL();
+    };
 
 /**
 Base class for all sending of messages with TP-SRR
-*/
+ */
 class CTestSendingTPSRRScheme : public CTestSchemeSending
-{
+    {
 public:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-	virtual TVerdict doTestStepL();
-}; 
+    virtual TVerdict doTestStepPreambleL();
+    virtual TVerdict doTestStepPostambleL();
+    virtual TVerdict doTestStepL();
+    }; 
 
 /**
 Base class for all sending of messages with SMSC
-*/
+ */
 class CTestSendingSMSCScheme : public CTestSchemeSending
-{
+    {
 public:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();
-	virtual TVerdict doTestStepL();
-}; 
-
+    virtual TVerdict doTestStepPreambleL();
+    virtual TVerdict doTestStepPostambleL();
+    virtual TVerdict doTestStepL();
+    }; 
 
 /**
 Base class for all receiving test cases
-*/
-class CTestSchemeReceiving : public CTestStatusReportScheme
-{
+ */
+class CTestSchemeReceiving : public CSmsStatusReportSchemeTestStep
+    {
 public:
-	virtual TVerdict doTestStepPreambleL();
-
-};
-
+    virtual TVerdict doTestStepPreambleL();
+    };
 
 /**
 Base class for receiving status reports
-*/
+ */
 class CTestReceivingStatusReports : public CTestSchemeReceiving
-{
+    {
 public:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();	
-	void ReceiveStatusReportL(TSmsStatus::TSmsStatusValue&);		
-	virtual TVerdict doTestStepL();
-	
+    virtual TVerdict doTestStepPreambleL();
+    virtual TVerdict doTestStepPostambleL();	
+    void ReceiveStatusReportL(TSmsStatus::TSmsStatusValue&);		
+    virtual TVerdict doTestStepL();
+
 private:
-	void GetExpectedStatus();
-	
+    void GetExpectedStatus();
+
 protected:
-	TSmsStatus::TSmsStatusValue iExpectedStatus;	
-
-};
+    TSmsStatus::TSmsStatusValue iExpectedStatus;	
+    };
 
 /**
 Base class for receiving Delivered messages
-*/
+ */
 class CTestReceivingMessages : public CTestSchemeReceiving
-{
+    {
 public:
-	virtual TVerdict doTestStepPreambleL();
-	virtual TVerdict doTestStepPostambleL();	
-	
+    virtual TVerdict doTestStepPreambleL();
+    virtual TVerdict doTestStepPostambleL();	
+
 protected:
-	TSmsStatusReportScheme iExpectedScheme;
-	
-};
+    TSmsStatusReportScheme iExpectedScheme;
+    };
 
-
-#endif
+#endif // TE_STATUSREPORTSCHEMETRANSFER_H