diff -r 594d59766373 -r 7d48bed6ce0c cbs/CbsServer/ServerSrc/CCbsReceiverHelper.cpp --- a/cbs/CbsServer/ServerSrc/CCbsReceiverHelper.cpp Thu Aug 19 10:28:14 2010 +0300 +++ b/cbs/CbsServer/ServerSrc/CCbsReceiverHelper.cpp Tue Aug 31 15:45:17 2010 +0300 @@ -40,16 +40,20 @@ #include "CCbsDbImpTopicMessages.h" #include "CCbsDbImpTopicCollection.h" #include "CCbsRecMessage.h" -#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS -#include // View server access -#else -#include -#endif -#include // ECellBroadcastNotification -#include // Soft Notification API +// <-- QT PHONE START --> +//#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS +//#include // View server access +//#else +//#include +//#endif +//#include // ECellBroadcastNotification +//#include // Soft Notification API +// <-- QT PHONE END --> #include #include -#include +// <-- QT PHONE START --> +//#include +// <-- QT PHONE END --> #include #include "CbsLogger.h" @@ -60,15 +64,20 @@ // CONSTANTS +// <-- QT PHONE START --> // UID of CBS UI application -#define KUidCbsUiappDef 0x101F4CD3 -const TUid KUidCbsUiappApp = { KUidCbsUiappDef }; +//#define KUidCbsUiappDef 0x101F4CD3 +//const TUid KUidCbsUiappApp = { KUidCbsUiappDef }; +// <-- QT PHONE END --> -const TInt KCbsImmediateMessageIdInt = 313; -const TUid KCbsImmediateMessageId = { KCbsImmediateMessageIdInt }; +// <-- QT PHONE START --> +//const TInt KCbsImmediateMessageIdInt = 313; +//const TUid KCbsImmediateMessageId = { KCbsImmediateMessageIdInt }; +// <-- QT PHONE END --> -const TInt KCbsMessageTone = 2; // See SharedDataKeysVariant.h or NcnListInternalPSKeys.h - +// <-- QT PHONE START --> +//const TInt KCbsMessageTone = 2; // See SharedDataKeysVariant.h or NcnListInternalPSKeys.h +// <-- QT PHONE END --> // DATA TYPES // CbsUi application view ID's enum TCbsUiViewIds @@ -323,7 +332,11 @@ { CBSLOGSTRING("CBSSERVER: >>> CCbsReceiverHelper::ConstructL()"); + // <-- QT PHONE START --> + /* iVwsSession = CVwsSessionWrapper::NewL(); + */ + // <-- QT PHONE END--> // Array for SIM Topic numbers. This way we know which topics // to delete also from the SIM card (when deleting all topics). @@ -364,7 +377,11 @@ CBSLOGSTRING("CBSSERVER: >>> CCbsReceiverHelper::~CCbsReceiverHelper()"); delete iSimTopics; + // <-- QT PHONE START --> + /* delete iVwsSession; + */ + // <-- QT PHONE END--> CBSLOGSTRING("CBSSERVER: <<< CCbsReceiverHelper::~CCbsReceiverHelper()"); } @@ -833,8 +850,10 @@ // (other items were commented in a header). // ----------------------------------------------------------------------------- // -void CCbsReceiverHelper::LaunchMessageSoftNotificationL( const TBool aPlayTone ) +void CCbsReceiverHelper::LaunchMessageSoftNotificationL( const TBool /*aPlayTone*/ ) { + // <-- QT PHONE START --> + /* TInt numberOfHotMsgs( 0 ); numberOfHotMsgs = iDatabase.TopicListL().UnreadHotmarkedMessageCount(); @@ -849,6 +868,8 @@ notifier->SetNotificationCountL( ECellBroadcastNotification, numberOfHotMsgs ); CleanupStack::PopAndDestroy( notifier ); + */ + // <-- QT PHONE END--> } // ----------------------------------------------------------------------------- @@ -858,14 +879,18 @@ // ----------------------------------------------------------------------------- // void CCbsReceiverHelper::LaunchMessageImmediateDisplay( - const TCbsDbMessage& aMessage ) + const TCbsDbMessage& /*aMessage*/ ) { + // <-- QT PHONE START --> + /* TUid uiViewUid( TUid::Uid( ECbsUiMsgViewId ) ); TVwsViewId id( KUidCbsUiappApp, uiViewUid ); TPckgBuf pckg( aMessage.iHandle ); // Ignore result value. iVwsSession->CreateActivateViewEvent( id, KCbsImmediateMessageId, pckg ); + */ + // <-- QT PHONE END--> } // ----------------------------------------------------------------------------- @@ -888,9 +913,13 @@ // void CCbsReceiverHelper::PlayCbsTone() { + // <-- QT PHONE START --> + /* RProperty::Define( KPSUidNcnList, KNcnPlayAlertTone, RProperty::EInt, ECapability_None , ECapabilityWriteDeviceData ); RProperty::Set( KPSUidNcnList, KNcnPlayAlertTone, KCbsMessageTone ); + */ + // <-- QT PHONE END--> } // ================= OTHER EXPORTED FUNCTIONS ==============