# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1268649739 -7200 # Node ID 19bff11d6c18b8969dcc934b4d5bfb1c7dbc5ddd # Parent f3bd2a0973b950f8fee9d3e30d570a3992881f00 Revision: 201009 Kit: 201010 diff -r f3bd2a0973b9 -r 19bff11d6c18 locationmapnavfw/aiwprovider/inc/mnaiwdebug.h --- a/locationmapnavfw/aiwprovider/inc/mnaiwdebug.h Fri Mar 12 15:44:22 2010 +0200 +++ b/locationmapnavfw/aiwprovider/inc/mnaiwdebug.h Mon Mar 15 12:42:19 2010 +0200 @@ -47,7 +47,9 @@ inline void Log( TRefByValue aFmt, ... ) { + // coverity[var_decl : FALSE] VA_LIST list; + // coverity[ uninit_use_in_call : FALSE] VA_START( list, aFmt ); HBufC* buf = HBufC::New(512); @@ -55,6 +57,7 @@ { TPtr ptr( buf->Des() ); Prefix( ptr ); + // coverity[ uninit_use_in_call : FALSE] ptr.AppendFormatList( aFmt, list ); RDebug::RawPrint( ptr ); diff -r f3bd2a0973b9 -r 19bff11d6c18 locationmapnavfw/library/inc/mndebug.h --- a/locationmapnavfw/library/inc/mndebug.h Fri Mar 12 15:44:22 2010 +0200 +++ b/locationmapnavfw/library/inc/mndebug.h Mon Mar 15 12:42:19 2010 +0200 @@ -47,7 +47,9 @@ inline void Log( TRefByValue aFmt, ... ) { + // coverity[var_decl : FALSE] VA_LIST list; + // coverity[ uninit_use_in_call : FALSE] VA_START( list, aFmt ); HBufC* buf = HBufC::New(512); @@ -55,6 +57,7 @@ { TPtr ptr( buf->Des() ); Prefix( ptr ); + // coverity[ uninit_use_in_call : FALSE] ptr.AppendFormatList( aFmt, list ); RDebug::RawPrint( ptr ); diff -r f3bd2a0973b9 -r 19bff11d6c18 locationmapnavfw/library/src/mngeocoder.cpp --- a/locationmapnavfw/library/src/mngeocoder.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationmapnavfw/library/src/mngeocoder.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -74,15 +74,22 @@ void CopyCoordinatesL( CPosLandmark& aSrc, CPosLandmark& aTrg ) { TLocality loc; - aSrc.GetPosition( loc ); - aTrg.SetPositionL( loc ); + TInt posErr = aSrc.GetPosition( loc ); + if( !posErr ) + { + aTrg.SetPositionL( loc ); + } TRealX nan; nan.SetNaN(); TReal32 coverage( nan ); - aSrc.GetCoverageRadius( coverage ); - aTrg.SetCoverageRadius( coverage ); + TInt radiusErr = aSrc.GetCoverageRadius( coverage ); + if( !radiusErr ) + { + aTrg.SetCoverageRadius( coverage ); + } + } // ======== MEMBER FUNCTIONS ======== diff -r f3bd2a0973b9 -r 19bff11d6c18 locationmapnavfw/library/src/mnmapviewserviceclient.cpp --- a/locationmapnavfw/library/src/mnmapviewserviceclient.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationmapnavfw/library/src/mnmapviewserviceclient.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -79,7 +79,7 @@ args.Set( EMnIpcMapLmIdsParamIndex, &idsDes ); TInt err = SendReceive( EMnIpcAddLmIdsToShow, args ); - delete ids; + delete[] ids; User::LeaveIfError( err ); } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locblidsatelliteinfo/data/SatInfo.rss --- a/locationsystemui/locationsysui/locblidsatelliteinfo/data/SatInfo.rss Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locblidsatelliteinfo/data/SatInfo.rss Mon Mar 15 12:42:19 2010 +0200 @@ -122,7 +122,7 @@ flags = EEikDialogFlagNoDrag | EEikDialogFlagButtonsRight | EEikDialogFlagNoTitleBar | EEikDialogFlagCbaButtons | EEikDialogFlagWait | EEikDialogFlagFillScreen; - buttons = R_AVKON_SOFTKEYS_CLOSE; + buttons = r_satellite_dialog_cba; items = { DLG_LINE diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellitecontrol.h --- a/locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellitecontrol.h Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locblidsatelliteinfo/inc/satellitecontrol.h Mon Mar 15 12:42:19 2010 +0200 @@ -56,7 +56,7 @@ TAknWindowLineLayout WindowLayout() const; TRect CalculateDialogRect() const; void Layout(); - void ChangeView(); + void ChangeViewL(); void SetLaunchView(TSatDialogView aView); diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteDialog.cpp --- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteDialog.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locblidsatelliteinfo/src/CSatelliteDialog.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -121,7 +121,7 @@ { // Change view soft key pressed.Notify the control to change // the view and draw. - iSatelliteControl->ChangeView(); + iSatelliteControl->ChangeViewL(); DrawNow(); return EFalse; } @@ -210,7 +210,6 @@ // void CSatelliteDialog::UpdateL() { -/* CEikButtonGroupContainer& buttonContainer = ButtonGroupContainer(); // Dim the "ChangeView" command when satellite data is not @@ -225,7 +224,6 @@ buttonContainer.SetCommandSetL(R_SATELLITE_DIALOG_CBA); buttonContainer.DrawNow(); } -*/ DrawNow(); } @@ -239,7 +237,7 @@ if ( aType == EEventKey && aKeyEvent.iCode == EKeyEnter || aType == EEventKey && aKeyEvent.iScanCode == EStdKeyEnter ) { - iSatelliteControl->ChangeView(); + iSatelliteControl->ChangeViewL(); DrawNow(); return EKeyWasConsumed; } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locblidsatelliteinfo/src/Debug.cpp --- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/Debug.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locblidsatelliteinfo/src/Debug.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -50,11 +50,12 @@ void Debug( TRefByValue aText, ... ) { RDebug::Print(aText); - + // coverity[var_decl : FALSE] VA_LIST args; VA_START( args, aText ); TBuf buf; + // coverity[uninit_use_in_call : FALSE] buf.FormatList( aText, args ); RFileLogger logger; diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locblidsatelliteinfo/src/satellitecontrol.cpp --- a/locationsystemui/locationsysui/locblidsatelliteinfo/src/satellitecontrol.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locblidsatelliteinfo/src/satellitecontrol.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -279,7 +279,7 @@ // CBlidManualWayPointCtrl::ChangeView // --------------------------------------------------------- // -void CSatelliteControl::ChangeView() +void CSatelliteControl::ChangeViewL() { // Change the view variable and update the rects switch ( iCurrentSatelliteView ) @@ -701,8 +701,6 @@ // void CSatelliteControl::ConstructFromResourceL(TResourceReader& /*aReader*/) { - MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - MAknsControlContext* cc = AknsDrawUtils::ControlContext( this ); iEditorContext = CAknsFrameBackgroundControlContext::NewL( KAknsIIDQsnFrInput, TRect(0,0,1,1), TRect(0,0,1,1), EFalse ); ActivateL(); @@ -812,7 +810,6 @@ CWindowGc& gc=SystemGc(); MAknsSkinInstance* skin = AknsUtils::SkinInstance(); - MAknsControlContext* cc = AknsDrawUtils::ControlContext( this ); // get parent's cc TRgb rgb; AknsUtils::GetCachedColor( skin, @@ -1436,7 +1433,7 @@ #endif //RD_TACTILE_FEEDBACK // Change view soft key pressed.Notify the control to change // the view and draw. - ChangeView(); + ChangeViewL(); DrawNow(); } } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierdebug.cpp --- a/locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierdebug.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locbtnotifier/src/locbtnotifierdebug.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -48,10 +48,12 @@ // void DebugLocBtNotifier( TRefByValue aText, ... ) { + // coverity[var_decl : FALSE] VA_LIST args; VA_START( args, aText ); TBuf buf; + // coverity[uninit_use_in_call : FALSE] buf.FormatList( aText, args ); #ifdef _DEBUG diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locnotprefplugin/data/locnotprefpluginview.rss --- a/locationsystemui/locationsysui/locnotprefplugin/data/locnotprefpluginview.rss Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locnotprefplugin/data/locnotprefpluginview.rss Mon Mar 15 12:42:19 2010 +0200 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locpsysettings/locpsysettingsui/data/locpsysettingsuiview.rss --- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/data/locpsysettingsuiview.rss Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/data/locpsysettingsuiview.rss Mon Mar 15 12:42:19 2010 +0200 @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsview.cpp --- a/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsview.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locpsysettings/locpsysettingsui/src/locpsysettingsview.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -291,6 +291,10 @@ void CLocPsySettingsView::NotifyL() { MLocPsySettings* psySettings = iLocationEngine->SettingsModel(); + + if(!psySettings) + return; + // Disable the Middle soft Key if there are no PSYs if( psySettings && !psySettings->PSYCount()) { @@ -368,6 +372,10 @@ TEventCode aType ) { MLocPsySettings* psySettings = iLocationEngine->SettingsModel(); + + if(!psySettings) + return EKeyWasNotConsumed; + if( psySettings && !psySettings->PSYCount()) { return EKeyWasNotConsumed; diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsettingsui.rss --- a/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsettingsui.rss Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locsuplsettingsui/data/locsuplsettingsui.rss Mon Mar 15 12:42:19 2010 +0200 @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp --- a/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locsuplsettingsui/src/locsuplservereditor.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -841,6 +841,7 @@ else { CServerParams *params = CServerParams::NewL(); + CleanupStack::PushL( params ); TRAP_IGNORE( iEngine.GetSlpInfoFromIdL( iSlpId, params ) ); HBufC* hslpAddr = HBufC::NewL( KMaxHSLPAddrLen ); @@ -907,7 +908,7 @@ delete iapName; delete hslpAddr; - delete params; + CleanupStack::PopAndDestroy( params ); // update the title pane caption ChangeTitlePaneTextL( *iServerAddress ); diff -r f3bd2a0973b9 -r 19bff11d6c18 locationsystemui/locationsysui/locsysuiview/data/locsysuiviewrsc.rss --- a/locationsystemui/locationsysui/locsysuiview/data/locsysuiviewrsc.rss Fri Mar 12 15:44:22 2010 +0200 +++ b/locationsystemui/locationsysui/locsysuiview/data/locsysuiviewrsc.rss Mon Mar 15 12:42:19 2010 +0200 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/lbtmgmtui/data/lbtmgmtpluginview.rss --- a/locationtriggering/lbtmgmtui/data/lbtmgmtpluginview.rss Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/lbtmgmtui/data/lbtmgmtpluginview.rss Mon Mar 15 12:42:19 2010 +0200 @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/lbtmgmtui/src/lbtmgmtdebug.cpp --- a/locationtriggering/lbtmgmtui/src/lbtmgmtdebug.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/lbtmgmtui/src/lbtmgmtdebug.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -50,6 +50,7 @@ // void Debug( TRefByValue aText, ... ) { + // coverity[var_decl : FALSE] VA_LIST args; VA_START( args, aText ); diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltcontainer/src/lbtcontainerareafilter.cpp --- a/locationtriggering/ltcontainer/src/lbtcontainerareafilter.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltcontainer/src/lbtcontainerareafilter.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -306,8 +306,7 @@ // Add rectangular filtering here. if(aEntry != NULL) { - CLbtTriggerEntry* trigEntry=aEntry->TriggerEntry(); - CLbtGeoRect* rectArea=static_cast(iArea); + CLbtGeoRect* rectArea=static_cast(iArea); TReal northLat,southLat,eastLong,westLong; rectArea->GetBorder(southLat,northLat,westLong,eastLong); CLbtExtendedTriggerInfo* contExtInfo = aEntry->ExtendedTriggerInfo(); diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltcontainer/src/lbtcontainertriggerentry.cpp --- a/locationtriggering/ltcontainer/src/lbtcontainertriggerentry.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltcontainer/src/lbtcontainertriggerentry.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -228,7 +228,7 @@ } else { - entry=CLbtStartupTrigger::NewL(); + // We use clone only for session triggers. } if(dynInfo!=NULL) diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp --- a/locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltcontainer/src/lbtdbtriggersmanager.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -1367,7 +1367,13 @@ CompleteClientRequest( KErrServerBusy ); return; } - + + if( aFilter == NULL ) + { + CompleteClientRequest( KErrArgument ); + return; + } + // Check if this filter is application for the type of triggers supported by DB CLbtListTriggerOptions* options = aFilter->ListOptions(); if(options) @@ -1379,12 +1385,6 @@ } } - if( aFilter == NULL ) - { - CompleteClientRequest( KErrArgument ); - return; - } - // Store the parameters first for later references iFilter = aFilter; iTriggers = &aTriggers; @@ -2478,7 +2478,6 @@ if( !(aAttrMask & CLbtTriggerEntry::EAttributeCondition) ) { - CLbtTriggerConditionBase* condBase = clientEntry->GetCondition(); clientEntry->SetCondition(NULL); } @@ -2938,7 +2937,6 @@ CLbtExtendedTriggerInfo* extdInfo = iEntry->ExtendedTriggerInfo(); CLbtTriggerConditionArea* cond = static_cast(trigger->GetCondition()); CLbtGeoAreaBase * areaBase = cond->TriggerArea(); - CLbtGeoCircle* area = static_cast(cond->TriggerArea()); // Insert a Row in the View iView.InsertL(); // Insert a row. Column order matches sql select statement diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltcontainer/src/lbtramtriggersmanager.cpp --- a/locationtriggering/ltcontainer/src/lbtramtriggersmanager.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltcontainer/src/lbtramtriggersmanager.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -238,8 +238,6 @@ return; } - CLbtListTriggerOptions* listOptions=aFilter->ListOptions(); - // Store client data iFilter = aFilter; iClientSecurityPolicy = aSecurityPolicy; @@ -272,7 +270,6 @@ break; CLbtListTriggerOptions* listOptions = iFilter->ListOptions(); - CLbtContainerFilter* contFilter = iFilter->ContainerFilter(); CLbtExtendedTriggerInfo* contExtInfo = tEntry->ExtendedTriggerInfo(); TLbtTriggerDynamicInfoFieldsMask dynInfoMask; TLbtTriggerAttributeFieldsMask attrMask; @@ -281,7 +278,6 @@ ++count; if( !LbtContainerUtilities::RunSecurityPolicy( tEntry, iClientSecurityPolicy ) ) { - continue; } @@ -296,9 +292,10 @@ if(isFilterPresent > 0 && isEntryRequested) { entry = CLbtContainerTriggerEntry::NewL(); - CleanupStack::PushL( entry ); + iClientTriggerArray->Append( entry ); + clientEntry = CLbtSessionTrigger::NewL(); - entry->SetTriggerEntry(clientEntry); + entry->SetTriggerEntry( clientEntry ); if( attrMask & CLbtTriggerEntry::EAttributeId ) { @@ -324,10 +321,11 @@ { CLbtTriggerConditionArea* cond = static_cast(trigEntry->GetCondition()); // Condition area to be sent back to client - CLbtTriggerConditionArea* condArea=CLbtTriggerConditionArea::NewL(); + CLbtTriggerConditionArea* condArea=CLbtTriggerConditionArea::NewLC(); CLbtGeoAreaBase* area = LbtContainerUtilities::CopyGeoAreaL( cond->TriggerArea() ); condArea->SetTriggerArea( area ); condArea->SetDirection( cond->Direction() ); + CleanupStack::Pop( condArea ); clientEntry->SetCondition( condArea ); } @@ -352,6 +350,16 @@ info->iFiredLocality=tEntry->DynInfo()->iFiredLocality; } + if(isDynInfoPresent) + { + entry->SetDynInfo(info); + } + else + { + delete info; + } + + if( dataMask & CLbtContainerTriggerEntry::EContainerAttributeHysteresisRadius ) { if(clientExtInfo == NULL) @@ -419,19 +427,7 @@ { entry->SetExtendedTriggerInfo(clientExtInfo); } - - if(isDynInfoPresent) - { - entry->SetDynInfo(info); - } - - if( entry != NULL ) - { - iClientTriggerArray->Append( entry ); - CleanupStack::Pop( entry ); - } } - } if( tEntry == NULL ) @@ -645,93 +641,72 @@ CLbtTriggerEntry* trigEntry = iClientTriggerEntry->TriggerEntry(); CLbtExtendedTriggerInfo* trigExtInfo = iClientTriggerEntry->ExtendedTriggerInfo(); TLbtTriggerDynamicInfo* trigDynInfo = iClientTriggerEntry->DynInfo(); - + + // Append the modification information + MLbtTriggerStore::TLbtTriggerModifiedInfo info; + info.iTriggerId = entry->TriggerEntry()->Id(); + TSecureId sid = entry->ExtendedTriggerInfo()->OwnerSid(); + info.iOwner.iUid= (TInt)(sid.iId); + iIdArray.Append(info); /* contTrigEntry is the trigger entry which is a part of * the container trigger entry retrieved from the tree */ - CLbtSessionTrigger* contTrigEntry = static_cast (entry->TriggerEntry()); + CLbtSessionTrigger* contTrigEntry = NULL; + if( entry->TriggerEntry() ) + { + contTrigEntry = static_cast (entry->TriggerEntry()); + + CLbtTriggerConditionArea* condArea = static_cast (contTrigEntry->GetCondition()); + CLbtGeoAreaBase* geoArea = condArea->TriggerArea(); + info.iAreaType = geoArea->Type(); + } + else + { + contTrigEntry=CLbtSessionTrigger::NewL(); + entry->SetTriggerEntry( contTrigEntry ); + } /* Contextinfo is the extended information present in the entry * retrieved from the tree */ CLbtExtendedTriggerInfo* contExtInfo = entry->ExtendedTriggerInfo(); - TLbtTriggerDynamicInfo* contDynInfo = NULL; - contDynInfo = entry->DynInfo(); - - // Append the modification information - MLbtTriggerStore::TLbtTriggerModifiedInfo info; - info.iTriggerId = entry->TriggerEntry()->Id(); - CLbtTriggerConditionArea* condArea = static_cast (contTrigEntry->GetCondition()); - CLbtGeoAreaBase* geoArea = condArea->TriggerArea(); - info.iAreaType = geoArea->Type(); - TSecureId sid = entry->ExtendedTriggerInfo()->OwnerSid(); - info.iOwner.iUid= (TInt)(sid.iId); - iIdArray.Append(info); + TLbtTriggerDynamicInfo* contDynInfo = entry->DynInfo(); if(trigEntry!=NULL) { if( iAttrMask & CLbtTriggerEntry::EAttributeId ) { - if(contTrigEntry==NULL) - { - contTrigEntry=CLbtSessionTrigger::NewL(); - } - contTrigEntry->SetId(trigEntry->Id()); + contTrigEntry->SetId(trigEntry->Id()); } if( iAttrMask & CLbtTriggerEntry::EAttributeName ) { - if(contTrigEntry==NULL) - { - contTrigEntry=CLbtSessionTrigger::NewL(); - } contTrigEntry->SetNameL(trigEntry->Name()); } if( iAttrMask & CLbtTriggerEntry::EAttributeState ) { - if(contTrigEntry==NULL) - { - contTrigEntry=CLbtSessionTrigger::NewL(); - } contTrigEntry->SetState(trigEntry->State()); } if( iAttrMask & CLbtTriggerEntry::EAttributeRearmTime ) { - if(contTrigEntry==NULL) - { - contTrigEntry=CLbtSessionTrigger::NewL(); - } contTrigEntry->SetTimeToRearm((trigEntry->TimeToRearm())); } if( iAttrMask & CLbtTriggerEntry::EAttributeRequestor ) { - if(contTrigEntry==NULL) - { - contTrigEntry=CLbtSessionTrigger::NewL(); - } //clientEntry->SetRequestorL(trigEntry->GetRequestor()); } if( iAttrMask & CLbtTriggerEntry::EAttributeManagerUi ) { - if(contTrigEntry==NULL) - { - contTrigEntry=CLbtSessionTrigger::NewL(); - } contTrigEntry->SetManagerUi(trigEntry->ManagerUi()); } if( iAttrMask & CLbtTriggerEntry::EAttributeCondition ) { - if(contTrigEntry==NULL) - { - contTrigEntry=CLbtSessionTrigger::NewL(); - } - CLbtTriggerConditionArea* condArea = static_cast (contTrigEntry->GetCondition()); CLbtGeoAreaBase* geoArea = condArea->TriggerArea(); CLbtTriggerConditionArea* cond=static_cast (trigEntry->GetCondition()); @@ -750,7 +725,6 @@ CLbtGeoCell* containerCell = static_cast(geoArea); CLbtGeoCell* geoCell = static_cast (cond->TriggerArea()); - // TODO: Check if we need to retreive GSM and WCDMA info containerCell->SetNetworkType(geoCell->NetworkType()); containerCell->SetNetworkCountryCode(geoCell->NetworkCountryCode()); containerCell->SetNetworkIdentityCode(geoCell->NetworkIdentityCode()); @@ -840,6 +814,7 @@ if(contExtInfo==NULL) { contExtInfo=CLbtExtendedTriggerInfo::NewL(); + entry->SetExtendedTriggerInfo( contExtInfo ); } contExtInfo->SetHysteresisRadius(trigExtInfo->HysteresisRadius()); } @@ -849,6 +824,7 @@ if(contExtInfo==NULL) { contExtInfo=CLbtExtendedTriggerInfo::NewL(); + entry->SetExtendedTriggerInfo( contExtInfo ); } contExtInfo->SetTriggerFiredState(trigExtInfo->IsTriggerFired()); } @@ -858,6 +834,7 @@ if(contExtInfo==NULL) { contExtInfo=CLbtExtendedTriggerInfo::NewL(); + entry->SetExtendedTriggerInfo( contExtInfo ); } contExtInfo->SetFiredInfo( trigExtInfo->GetFiredInfo() ); } @@ -867,6 +844,7 @@ if(contExtInfo==NULL) { contExtInfo=CLbtExtendedTriggerInfo::NewL(); + entry->SetExtendedTriggerInfo( contExtInfo ); } contExtInfo->SetOwnerSid(trigExtInfo->OwnerSid()); } @@ -876,6 +854,7 @@ if(contExtInfo==NULL) { contExtInfo=CLbtExtendedTriggerInfo::NewL(); + entry->SetExtendedTriggerInfo( contExtInfo ); } contExtInfo->SetTriggerRectangleArea(trigExtInfo->TriggerReactangleArea()); } @@ -885,6 +864,7 @@ if(contExtInfo==NULL) { contExtInfo=CLbtExtendedTriggerInfo::NewL(); + entry->SetExtendedTriggerInfo( contExtInfo ); } contExtInfo->SetStrategyDataL(trigExtInfo->StategyData()); } @@ -894,6 +874,7 @@ if(contExtInfo==NULL) { contExtInfo=CLbtExtendedTriggerInfo::NewL(); + entry->SetExtendedTriggerInfo( contExtInfo ); } contExtInfo->SetTriggerFireOnCreation(trigExtInfo->IsTriggerFireOnCreation()); } @@ -906,6 +887,7 @@ if(contDynInfo == NULL) { contDynInfo = new TLbtTriggerDynamicInfo; + entry->SetDynInfo( contDynInfo ); } contDynInfo->iValidity = trigDynInfo->iValidity; } @@ -965,8 +947,7 @@ filter->ProcessFilter(tEntry,isFilterPresent,isEntryRequested); if(isFilterPresent>0 && isEntryRequested) { - CLbtTriggerEntry* trigEntry = tEntry->TriggerEntry(); - AppendTriggerInfo(tEntry); + AppendTriggerInfo(tEntry); } } tEntry=iTriggerIdTree->GetNextEntryL(); @@ -1094,7 +1075,6 @@ info->iValidity = aValidity; entry->SetDynInfo(info); } - CLbtTriggerEntry* trigEntry = entry->TriggerEntry(); AppendTriggerInfo(entry); } } @@ -1193,7 +1173,6 @@ iFilterBase->ProcessFilter(tEntry,isFilterPresent,isEntryRequested); if(isFilterPresent > 0 && isEntryRequested) { - CLbtTriggerEntry* trigEntry = tEntry->TriggerEntry(); AppendTriggerInfo(tEntry); } } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltcontextsourceplugin/src/lbtcontextsourceplugin.cpp --- a/locationtriggering/ltcontextsourceplugin/src/lbtcontextsourceplugin.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltcontextsourceplugin/src/lbtcontextsourceplugin.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -189,9 +189,7 @@ LBTCONTEXTSOURCEPLUGINDEBUG( "CLBTContextSourcePlugin::ParseTriggerInformationL : IN " ); - const RSettingParameterArray& parameters - = aItem.Parameters(); - + // Add check for improper syntax of XML file if ( aItem.Name() != KTriggerLocation ) { @@ -533,9 +531,6 @@ { const CCFContextSourceSetting& item = aSettingList.Item( i ); - const RSettingParameterArray& parameters - = item.Parameters(); - // Add check for improper syntax of XML file if ( item.Name() != KTriggerLocation ) { diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltserver/ltserverlogic/src/lbtlistaooperation.cpp --- a/locationtriggering/ltserver/ltserverlogic/src/lbtlistaooperation.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltserver/ltserverlogic/src/lbtlistaooperation.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -436,9 +436,8 @@ // HandleOperationClosureL method internally calls LoadOrUnloadStrategyPluginL // method which may leave only during the loading operation,but here the expected // behaviour is the unloading of strategy plugin which never fails .Hence we have ignored. - + LbtGlobal::RequestComplete(iMessage,KErrCancel); TRAP_IGNORE( iObserver.HandleOperationClosureL(this,KErrCancel) ); - LbtGlobal::RequestComplete(iMessage,KErrCancel); } } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltserver/ltserverlogic/src/lbtserverlogic.cpp --- a/locationtriggering/ltserver/ltserverlogic/src/lbtserverlogic.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltserver/ltserverlogic/src/lbtserverlogic.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -335,8 +335,7 @@ } // The request can only be through the LT management API. - // ToDo : Check for capabilities. - if ( TLbtManagementLibrary != aType ) + if ( TLbtManagementLibrary != aType ) { // This is not a management library. Hence return access denied. aMessage.Complete( KErrAccessDenied ); @@ -982,11 +981,7 @@ FUNC_ENTER("CLbtServerLogic::ValidateCreateTriggerMessage"); // The server should check for the following parameters // 1. capability checks for security. - // 2. checks for the Trigger area, ie. radius. (ToDo) - - // Check if the requesting process has location and write user data capability - // ToDo : check the required set of capabilities from req spec. - if( !aMessage.HasCapability(ECapabilityLocation) || + if( !aMessage.HasCapability(ECapabilityLocation) || !aMessage.HasCapability(ECapabilityWriteUserData) ) { return KErrPermissionDenied; @@ -1133,6 +1128,7 @@ // Populate the change event structure to send the information to the client based // on the message for which the notification needs to be made + // coverity[var_decl : FALSE] TLbtTriggerChangeEvent event; switch(aOperation->GetFunction()) @@ -1207,6 +1203,7 @@ RArray array; RMessage2 message; + // coverity[var_decl : FALSE] TLbtTriggerChangeEvent event; // sort by SID the retrieved list of triggers that were modified. @@ -1611,6 +1608,7 @@ FUNC_ENTER("CLbtServerLogic::HandleContainerTriggerChange"); RMessage2 message; + // coverity[var_decl : FALSE] TLbtTriggerChangeEvent event; // If there is change in the single trigger, set the trigger id else // update KLbtNullTriggerId for trigger id diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltserver/ltserverlogic/src/lbttriggermodifyaooperation.cpp --- a/locationtriggering/ltserver/ltserverlogic/src/lbttriggermodifyaooperation.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltserver/ltserverlogic/src/lbttriggermodifyaooperation.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -222,15 +222,18 @@ { FUNC_ENTER("CLbtTriggerModifyAOOperation::CancelModifyOperation"); Cancel(); - - if( iStatus.Int() == KLbtErrPartial ) + + // HandleOperationClosureL might leave either when it tries to unload strategy + // or during notification. Nothing can be done when this happens. Hence it will + // be ignored. + if( iStatus.Int() == KLbtErrPartial ) { LOG("Partial completion"); - iObserver.HandleOperationClosureL( this,KErrNone ); + TRAP_IGNORE( iObserver.HandleOperationClosureL( this,KErrNone ) ); } - else + else { - iObserver.HandleOperationClosureL( this,iStatus.Int() ); + TRAP_IGNORE( iObserver.HandleOperationClosureL( this,iStatus.Int() ) ); } } @@ -313,7 +316,6 @@ filter->AddTriggerIdL( iTriggerId ); options->SetFilter( filter ); CleanupStack::Pop(filter); - // ToDo : if msg from LT client API then add SID filter as well. break; } case ELbtDeleteTriggers: @@ -323,8 +325,7 @@ InternalizeFilterFromIpcLC( iMessage, KParamFilter ); options->SetFilter( filter ); CleanupStack::Pop(filter); - // ToDo : if msg from LT client API then add SID filter as well. - break; + break; } } @@ -512,6 +513,7 @@ { FUNC_ENTER("CLbtTriggerModifyAOOperation::HandleModifyTriggerStateOpL"); CLbtTriggerFilterBase* filter = NULL; + // coverity[var_decl : FALSE] CLbtTriggerEntry::TLbtTriggerState triggerState; switch ( iFunction ) diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/group/lbtstrategy.mmp --- a/locationtriggering/ltstrategyengine/group/lbtstrategy.mmp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/group/lbtstrategy.mmp Mon Mar 15 12:42:19 2010 +0200 @@ -21,7 +21,7 @@ #include #include - + TARGET lbtstrategy.dll TARGETTYPE PLUGIN UID 0x10009d8d 0x10283132 @@ -45,7 +45,7 @@ SOURCE lbtpsychangelistner.cpp SOURCE lbtcelliddatabase.cpp -/* TODO: Need to add location monitor */ + USERINCLUDE ../inc USERINCLUDE ../../inc diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/inc/lbtcellsupervisor.h --- a/locationtriggering/ltstrategyengine/inc/lbtcellsupervisor.h Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/inc/lbtcellsupervisor.h Mon Mar 15 12:42:19 2010 +0200 @@ -93,7 +93,7 @@ void Resume(); /** - * TODO: Check if this needed. + * Resets cell supervision */ void Reset(); diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/inc/lbtcoordinatesupervisor.h --- a/locationtriggering/ltstrategyengine/inc/lbtcoordinatesupervisor.h Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/inc/lbtcoordinatesupervisor.h Mon Mar 15 12:42:19 2010 +0200 @@ -45,9 +45,7 @@ class CLbtCoOrdinateSupervisor : public CActive, public MCellChangeObserver, public MLbtPsyChangeObserver - { - struct TTriggerArea; /** * Enum that specifies whether we need proper fix using any of the psy diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/src/lbtcellsupervisor.cpp --- a/locationtriggering/ltstrategyengine/src/lbtcellsupervisor.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/src/lbtcellsupervisor.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -150,7 +150,7 @@ // void CLbtCellSupervisor::Reset() { - // TODO: Check if this needed. + iRecentlyFiredTriggerArray.Reset(); } @@ -326,8 +326,8 @@ if(dataMask) { + // This is dummy position info. It has no significance. TPositionInfo dummy; - // TODO : Remove dummy position info iView->UpdateTriggerInfo( CLbtGeoAreaBase::ECellular,dummy, aTrigger, dataMask ); } } @@ -335,7 +335,7 @@ // EXIT Trigger else { - + //This is not currently supported. } aTrigger->SetStrategyData( strategyData ); } @@ -427,8 +427,8 @@ if(dataMask) { + // This is dummy position info. It has no significance. TPositionInfo dummy; - // TODO : Remove dummy position info iView->UpdateTriggerInfo( CLbtGeoAreaBase::ECellular,dummy, aTrigger, dataMask ); } } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/src/lbtcoordinatesupervisor.cpp --- a/locationtriggering/ltstrategyengine/src/lbtcoordinatesupervisor.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/src/lbtcoordinatesupervisor.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -438,7 +438,6 @@ if( iStatus.Int() == KPositionQualityLoss ) { - // TODO: Remove this. Only for Debug TPosition currentPosition; iPosInfo.GetPosition( currentPosition ); LOG("Received KPositionQualityLoss"); @@ -692,7 +691,6 @@ } break; - // TODO: Cell ID triggers need to be handled default: break; } @@ -1169,7 +1167,6 @@ { FUNC_ENTER("CLbtCoOrdinateSupervisor::EstimateSleepInterval"); - // TODO: Need to use GPS speed for observed speed values TReal maxUserSpeed = iSettings.iMaximumUserSpeed; TReal actualEstimatedSpeed = KMinProjSpeed; @@ -1365,30 +1362,6 @@ iProcessingInterval = seconds.Int(); iSleepInterval = iSleepInterval.Int() - iProcessingInterval; } - - // TODO: Check with Krishna on the commented code - // Check to determine if GPS method used for location information. If - // true, then need to use the GPS tracking mode interval here - /*if( iLocationRequestor->GPSUsed() ) - { - if( ( iSleepInterval.Int() < - iSettings.iMinimumLocationUpdateInterval ) || - ( iSleepInterval.Int() - iSettings.iGpsTrackingModeInterval ) < 5 ) - { - iSleepInterval = iSettings.iGpsTrackingModeInterval; - } - } - else - // - { - // If GPS not used check if sleep interval is less than minimum - // update interval. If true then use minimum update interval - if( iSleepInterval.Int() < - iSettings.iMinimumLocationUpdateInterval ) - { - iSleepInterval = iSettings.iMinimumLocationUpdateInterval; - } - }*/ } // If sleep interval is less than KMinSleepInterval and the UE is travelling in @@ -1584,20 +1557,12 @@ } else if( KErrNone == iStatus.Int() || KErrAbort == iStatus.Int() ) { - // TODO: Check accuracy of movement monitor and - // if there was any detection made. - // For accuracy, pass the distance to nearest trigger as a reference - // for movement detector plugin. If accuracy cannot be met then - // go ahead with acquiring current location else need to switch to - // movement detection mode. RequestTerminalPosition( iSettings.iLocationRequestTimeout ); } - - // Error in timer operation else { + LOG1("Error in timer:%d",iStatus.Int()); } - } @@ -1802,14 +1767,14 @@ { if( KErrNotFound == err ) { - // determine update interval iState = iProjectedState = EIdle; } else { + // TODO: Report error to server. This can be done only after + // introducing new state to strategy dynamic info. Term(); - // TODO: Server needs to be notified about termination of supervision } return err; } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/src/lbtstatusmanager.cpp --- a/locationtriggering/ltstrategyengine/src/lbtstatusmanager.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/src/lbtstatusmanager.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -19,9 +19,8 @@ #include #include - #include "lbtstatusmanager.h" - +#include "lbtlogger.h" // ======== MEMBER FUNCTIONS ======== @@ -72,7 +71,7 @@ iLastLocAcqStatus = aStatus; if( KErrNone != msg ) { - // TODO: log error message here + LOG1("Error updating status info:%d",msg); } } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/src/lbtstrategyengine.cpp --- a/locationtriggering/ltstrategyengine/src/lbtstrategyengine.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/src/lbtstrategyengine.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -154,7 +154,7 @@ } else { - iCellSupervisor->Reset(); // TODO: Check if this needed + iCellSupervisor->Reset(); } } @@ -215,7 +215,7 @@ iCellSupervisor->StopSupervision(); } - // Todo: Remove the dummy positionInfo + // This is dummy position info, this is no significance. TPositionInfo dummy; iView->Refresh( dummy, aEventMask, aTriggerIds ); } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/ltstrategyengine/src/lbttriggerview.cpp --- a/locationtriggering/ltstrategyengine/src/lbttriggerview.cpp Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/ltstrategyengine/src/lbttriggerview.cpp Mon Mar 15 12:42:19 2010 +0200 @@ -407,7 +407,7 @@ } ); if( KErrNone != err ) { - // TODO: Log warning message that entries could not be deleted + LOG("Entries could not be deleted"); } } @@ -1100,7 +1100,7 @@ } else { - // TODO: Log error message mentioning the trigger ID + LOG1("Invalid trigger ID:%d",( *aIDs )[index]); InvalidateTrigger( ( *aIDs )[index] ); } } @@ -1353,7 +1353,7 @@ FUNC_ENTER("CLbtTriggerView::RunL"); if( KErrNone != iStatus.Int() ) { - // TODO: Log error here + LOG1("iStatus.Int = %d",iStatus.Int() ); // TODO: Check if error needs to be reported through the // observer interface } diff -r f3bd2a0973b9 -r 19bff11d6c18 locationtriggering/rom/locationtriggering.iby --- a/locationtriggering/rom/locationtriggering.iby Fri Mar 12 15:44:22 2010 +0200 +++ b/locationtriggering/rom/locationtriggering.iby Mon Mar 15 12:42:19 2010 +0200 @@ -51,7 +51,7 @@ // Backup and restore registeration file data=DATAZ_\private\1028312B\backup_registration.xml \private\1028312B\backup_registration.xml -// TODO: This is temporary untill cenrep CR is approved +// Central repository file data=DATAZ_\private\10202be9\1028312F.txt \private\10202be9\1028312F.txt // Location Triggering Management Library diff -r f3bd2a0973b9 -r 19bff11d6c18 supl/locationomasuplprotocolhandler/notifier/notifier/data/epos_omasuplnotifier.rss --- a/supl/locationomasuplprotocolhandler/notifier/notifier/data/epos_omasuplnotifier.rss Fri Mar 12 15:44:22 2010 +0200 +++ b/supl/locationomasuplprotocolhandler/notifier/notifier/data/epos_omasuplnotifier.rss Mon Mar 15 12:42:19 2010 +0200 @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include