MCL/sf/os/cellularsrv: comparison smsprotocols/smsstack/smsprot/Src/smspbear.cpp

equal deleted inserted replaced

-:630d2f34d719
+:07a122eea281
-// Copyright (c) 1997-2010 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // 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".
 /**
 @file
 */
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "smspbearTraces.h"
-#endif
 #include <commsdattypesv1_1.h>
 #include <cdbcols.h>
 #include "smspmain.h"
 #include "smsuset.h"
 #include "smspcdb.h"
 *  @leave Leaves if ContructL() leaves, or not enough memory is available.
 *  @return a new CSmspSetBearer object
 */
 CSmspSetBearer* CSmspSetBearer::NewL(const TSmsSettings& aSmsSettings,RMobileSmsMessaging& aSmsMessaging, TInt aPriority)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NEWL_1, "CSmspSetBearer::NewL aPriority = %d", aPriority);
+	LOGSMSPROT2("CSmspSetBearer::NewL aPriority = %d", aPriority);
 	CSmspSetBearer* smsSetBearer=new(ELeave) CSmspSetBearer(aSmsSettings,aSmsMessaging, aPriority);
 	CleanupStack::PushL(smsSetBearer);
 	smsSetBearer->ConstructL();
 	CleanupStack::Pop();
 /**
 *  2-phase constructor, perform construction that can leave
 */
 void CSmspSetBearer::ConstructL()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_CONSTRUCTL_1, "CSmspSetBearer::ConstructL()");
+	LOGSMSPROT1("CSmspSetBearer::ConstructL()");
 	CSmspCommDbEvent::ConstructL();
 	User::LeaveIfError(iProperty.Attach(KUidSystemCategory, KUidCommDbSMSBearerChange.iUid));
 	} // CSmspSetBearer::ConstructL
 *  Notifies if SMS bearer is set to the TSY. Start setting bearer
 *  process if bearer is not set.
 */
 void CSmspSetBearer::NotifyBearerSet(TRequestStatus& aStatus)
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_1, "CSmspSetBearer::NotifyBearerSet, aStatus = %d", aStatus.Int());
+	LOGSMSPROT2("CSmspSetBearer::NotifyBearerSet, aStatus = %d", aStatus.Int());
 	if (!iBearerSet && IsActive())
 		{
 		Cancel();
 		}
 	Queue(aStatus);
 	if (iBearerSet)
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_2, "CSmspSetBearer::NotifyBearerSet RequestComplete called");
+		LOGSMSPROT1("CSmspSetBearer::NotifyBearerSet RequestComplete called");
 		CSmsuActiveBase::Complete(KErrNone);
 		}
 	else
 		{
-		OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYBEARERSET_3, "CSmspSetBearer::NotifyBearerSet started");
+		LOGSMSPROT1("CSmspSetBearer::NotifyBearerSet started");
 		Start();
 		}
 	} // CSmspSetBearer::NotifyBearerSet
 /**
 *  Starts the sequence for configuring the current SMS bearer on the phone/TSY.
 */
 void CSmspSetBearer::Start()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_1, "CSmspSetBearer::Start");
+	LOGSMSPROT1("CSmspSetBearer::Start");
 	// Cancel any outstanding request
 	TRAPD(err, GetSmsBearerL(iBearer));
 	iBearerSet = EFalse;
 	if (err == KErrNone)
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_2, "CSmspSetBearer::GetSmsBearerL() left with %d", err);
+		LOGSMSPROT2("CSmspSetBearer::GetSmsBearerL() left with %d", err);
 		// Set the previous bearer to the one that has been read
 		// from CommDB so that iPreviousBearer has an initial value
 		// when the smsstack is first started.
 		iPreviousBearer = iBearer;
 		SetSmsBearer();
 		}
 	else
 		{
-		OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_START_3, "CSmspSetBearer::Start failed to get SMS bearer, error = %d", err);
+		LOGSMSPROT2("CSmspSetBearer::Start failed to get SMS bearer, error = %d", err);
 		Complete(err);
 		}
 	} // CSmspSetBearer::Start
 *
 *  @leave Panic if RunL is called while object is in idle state.
 */
 void CSmspSetBearer::DoRunL()
 	{
-	OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_1, "CSmspSetBearer::DoRunL(): iState=%d iStatus=%d", iState, iStatus.Int());
+	LOGSMSPROT3("CSmspSetBearer::DoRunL(): iState=%d iStatus=%d", iState, iStatus.Int());
 	switch (iState)
 		{
 		case ESmsSetBearerNotifyOnEvent:
 			{
 				CleanupStack::PushL(dbSession);
 				CMDBRecordSet<CCDGlobalSettingsRecord> globalSettingsRecord(KCDTIdGlobalSettingsRecord);
 				TRAPD(err, globalSettingsRecord.LoadL(*dbSession));
 				if (err != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_2, "CSmspSetBearer::DoRunL, could not load global settings, leave error code = %d", err);
+					LOGSMSPROT2("CSmspSetBearer::DoRunL, could not load global settings, leave error code = %d", err);
 					User::Leave(err);
 					}
 				iPreviousBearer = iBearer;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_3, "CSmspSetBearer::DoRunL Storing previous bearer setting. Previous bearer now = %d", iBearer);
+				LOGSMSPROT2("CSmspSetBearer::DoRunL Storing previous bearer setting. Previous bearer now = %d", iBearer);
 				tempBearer = ((CCDGlobalSettingsRecord*)globalSettingsRecord.iRecords[0])->iSMSBearer;
 				iBearer = static_cast<RMobileSmsMessaging::TMobileSmsBearer>(tempBearer);
 				CleanupStack::PopAndDestroy(dbSession);
 				{
 				// Set bearer to previous value, if status!=KErrNone
 				// (e.g. KErrNotSupported)
 				// Set global setting to previous value,
 				// then complete.
-				OstTraceDefExt2(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_4, "CSmspSetBearer::DoRunL TSY failed to set MO SMS bearer. status = %d. Bearer = %d", iStatus.Int(), iBearer);
+				LOGSMSPROT3("CSmspSetBearer::DoRunL TSY failed to set MO SMS bearer. status = %d. Bearer = %d", iStatus.Int(), iBearer);
 				iBearer = iPreviousBearer;
-				OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_5, "CSmspSetBearer::DoRunL Setting bearer back to previous setting. Bearer = %d", iBearer);
+				LOGSMSPROT2("CSmspSetBearer::DoRunL Setting bearer back to previous setting. Bearer = %d", iBearer);
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 				CMDBSession *dbSession = CMDBSession::NewL(KCDVersion1_2);
 #else
 				CMDBSession *dbSession = CMDBSession::NewL(KCDVersion1_1);
 				CleanupStack::PushL(dbSession);
 				CMDBRecordSet<CCDGlobalSettingsRecord> globalSettingsRecord(KCDTIdGlobalSettingsRecord);
 				TRAPD(err, globalSettingsRecord.LoadL(*dbSession));
 				if (err != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_6, "CSmspSetBearer::DoRunL could not load global settings, error = %d", err);
+					LOGSMSPROT2("CSmspSetBearer::DoRunL could not load global settings, error = %d", err);
 					User::Leave(err);
 					}
 				((CCDGlobalSettingsRecord*)globalSettingsRecord.iRecords[0])->iSMSBearer = iPreviousBearer;
 				TRAP(err, globalSettingsRecord.ModifyL(*dbSession));
 				if (err != KErrNone)
 					{
-					OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DORUNL_7, "CSmspSetBearer::DoRunL could not modify global settings, error = %d", err);
+					LOGSMSPROT2("CSmspSetBearer::DoRunL could not modify global settings, error = %d", err);
 					User::Leave(err);
 					}
 				CleanupStack::PopAndDestroy(dbSession);
 				}
 *  Handles a request to cancel the state machine.
 *  Cancels any outstanding request and calls Complete().
 */
 void CSmspSetBearer::DoCancel()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_DOCANCEL_1, "CSmspSetBearer::DoCancel");
+	LOGSMSPROT1("CSmspSetBearer::DoCancel");
 	TimedSetActiveCancel();
 	// Explicitly set iBearerSet to false to ensure new bearer is set on each execution
 	iBearerSet = EFalse;
 *
 *  @param aBearer a reference to the TMobileSmsBearer.
 */
 void CSmspSetBearer::GetSmsBearerL(RMobileSmsMessaging::TMobileSmsBearer& aBearer)
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_GETSMSBEARERL_1, "CSmspSetBearer::GetSmsBearerL()");
+	LOGSMSPROT1("CSmspSetBearer::GetSmsBearerL()");
 #ifdef SYMBIAN_NON_SEAMLESS_NETWORK_BEARER_MOBILITY
 	CMDBSession* sess = CMDBSession::NewL(KCDVersion1_2);
 #else
 	CMDBSession* sess = CMDBSession::NewL(KCDVersion1_1);
 	smsBearerField->SetRecordId(1);
 	smsBearerField->LoadL(*sess);
 	aBearer = static_cast<RMobileSmsMessaging::TMobileSmsBearer>(static_cast<TUint32>(*smsBearerField));
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_GETSMSBEARERL_2, "CSmspSetBearer::GetSmsBearerL(): aBearer=%d", aBearer);
+	LOGSMSPROT2("CSmspSetBearer::GetSmsBearerL(): aBearer=%d", aBearer);
 	CleanupStack::PopAndDestroy(smsBearerField);
 	CleanupStack::PopAndDestroy(sess);
 	} // CSmspSetBearer::GetSmsBearerL
 *  Performs the state transition to CSmspSetBearer::ESmsSetBearerStateSettingBearer
 *  by trying to set the sms bearer on the phone/TSY.
 */
 void CSmspSetBearer::SetSmsBearer()
 	{
-	OstTraceDef1(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_SETSMSBEARER_1, "CSmspSetBearer::SetSmsBearer, iBearer = %d", iBearer);
+	LOGSMSPROT2("CSmspSetBearer::SetSmsBearer, iBearer = %d", iBearer);
 	iBearerSet = EFalse;
 	iState = ESmsSetBearerStateSettingBearer;
 	iSmsMessaging.SetMoSmsBearer(iStatus, iBearer);
 /**
 *  Wait for notification from property for when the CommDB global setting SMS_BEARER changes
 */
 void CSmspSetBearer::NotifyOnEvent()
 	{
-	OstTraceDef0(OST_TRACE_CATEGORY_DEBUG, TRACE_INTERNALS, CSMSPSETBEARER_NOTIFYONEVENT_1, "CSmspSetBearer::NotifyOnEvent");
+	LOGSMSPROT1("CSmspSetBearer::NotifyOnEvent");
 	iState = ESmsSetBearerNotifyOnEvent;
 	CSmspCommDbEvent::NotifyOnEvent();
 	} // CSmspSetBearer::NotifyOnEvent

branch	RCL_3
changeset 20	07a122eea281
parent 19	630d2f34d719