--- a/landmarks/locationlandmarks/server/src/EPos_CPosLmLocalAccessSubsession.cpp Wed Apr 14 16:23:43 2010 +0300
+++ b/landmarks/locationlandmarks/server/src/EPos_CPosLmLocalAccessSubsession.cpp Tue Apr 27 17:05:00 2010 +0300
@@ -751,7 +751,8 @@
TPtr name( lmBuf->Des() );
readStream.ReadL( name, nameLen );
-
+
+ CleanupStack::Pop( lmBuf );//ownership of lmBuf is transferred in the call to UpdateL/InsertL
if ( aMessage.Int0() == EPosLmServerUpdateLandmarks )
{
//coverity[freed_arg : FALSE]
@@ -762,7 +763,6 @@
index.InsertL( id, lmBuf );
}
//coverity[pass_freed_arg : FALSE]
- CleanupStack::Pop( lmBuf );
}
readStream.Close();
--- a/landmarks/locationlandmarks/server/src/EPos_CPosLmNameIndex.cpp Wed Apr 14 16:23:43 2010 +0300
+++ b/landmarks/locationlandmarks/server/src/EPos_CPosLmNameIndex.cpp Tue Apr 27 17:05:00 2010 +0300
@@ -329,14 +329,16 @@
// the original item has been changed
item->SetInvalid();
}
- // add new item for this ID
+
+ CleanupStack::Pop( name );//ownership of name is transferred in the call to DoInsertL
+
+ // add new item for this ID
// here comparison must be done using collation
CIndexItem* newItem = DoInsertL( id, name ); // takes onwership of name
newItem->SetValid();
TLinearOrder<CIndexItem> order( CIndexItem::CompareById );
iIdSortedArray.InsertInOrder( newItem, order );
- CleanupStack::Pop( name );
}
else
{
@@ -440,8 +442,8 @@
void CPosLmNameIndex::InsertL( TPosLmItemId aLmid, const TDesC& aName )
{
HBufC* name = aName.AllocLC();
+ CleanupStack::Pop( name );//ownership of name is transferred in the call to UpdateL/InsertL
InsertL( aLmid, name );
- CleanupStack::Pop( name );
}
//--------------------------------------------------------------------
@@ -459,13 +461,16 @@
//
CPosLmNameIndex::CIndexItem* CPosLmNameIndex::DoInsertL( TPosLmItemId aLmid, HBufC* aName )
{
- if ( Find( aLmid ) >= 0 ) // finds valid item
+ CleanupStack::PushL( aName );//ownership of aName is transferred to this class
+ if ( Find( aLmid ) >= 0 ) // finds valid item
{
User::Leave( KErrAlreadyExists ); // duplicate ID found
}
CIndexItem* landmark = new (ELeave) CIndexItem( aLmid, aName ); // takes ownership of aName
- CleanupStack::PushL( landmark );
+
+ CleanupStack::Pop( aName );
+ CleanupStack::PushL( landmark );
TLmIndexNameKey key;
iArray->InsertIsqAllowDuplicatesL( landmark, key );
@@ -487,8 +492,12 @@
//
void CPosLmNameIndex::AppendL( TPosLmItemId aLmid, HBufC* aName )
{
+ //Ownership of aName is transferred in this call
+ CleanupStack::PushL( aName );
CIndexItem* landmark = new (ELeave) CIndexItem( aLmid, aName );
- CleanupStack::PushL( landmark );
+ CleanupStack::Pop( aName );
+
+ CleanupStack::PushL( landmark );
AppendL( landmark );
CleanupStack::Pop( landmark );
}
@@ -527,8 +536,8 @@
{
iDataSize -= entry->Size();
ASSERT( iDataSize >= 0 );
- delete entry;
iArray->Delete( aIndex );
+ delete entry;
}
else
{
@@ -542,10 +551,10 @@
void CPosLmNameIndex::UpdateL( TPosLmItemId aId, const TDesC& aName )
{
HBufC* name = aName.AllocLC();
+ CleanupStack::Pop( name );//ownership of name is transferred in the call to UpdateL
//coverity[freed_arg : FALSE]
UpdateL( aId, name );
//coverity[pass_freed_arg : FALSE]
- CleanupStack::Pop( name );
}
//--------------------------------------------------------------------
@@ -640,8 +649,8 @@
for ( TInt i = 0; i < count; i++ )
{
CIndexItem* item = CIndexItem::NewLC( aIn );
+ CleanupStack::Pop( item ); //Ownership of item is transferred in the AppendL call
AppendL( item ); // array takes ownership
- CleanupStack::Pop( item );
}
iStatus = KErrNone;
}
@@ -844,8 +853,8 @@
CIndexItem* item = iArray->At( i );
if ( !item->IsValid() )
{
- delete item;
iArray->Delete( i );
+ delete item;
}
}
}
@@ -878,8 +887,8 @@
}
else if ( !item->IsValid() )
{
- delete item;
iArray->Delete( i );
+ delete item;
}
}
iInTransaction = EFalse;
@@ -899,8 +908,8 @@
CIndexItem* item = iArray->At( i );
if ( item->IsTemp() )
{
- delete item;
iArray->Delete( i );
+ delete item;
}
else if ( !item->IsValid() )
{
--- a/locationsystemui/locationsysui/group/bld.inf Wed Apr 14 16:23:43 2010 +0300
+++ b/locationsystemui/locationsysui/group/bld.inf Tue Apr 27 17:05:00 2010 +0300
@@ -42,7 +42,7 @@
../rom/locationsysui.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locationsysui.iby)
../rom/locgpsindicatorplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locgpsindicatorplugin.iby)
../rom/locnotprefplugin.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locnotprefplugin.iby)
-../rom/locpossettingsapp.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locpossettingsapp.iby)
+
../rom/locpsysettings.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locpsysettings.iby)
../rom/locsettingsuiservice.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locsettingsuiservice.iby)
../rom/locsuplsettings.iby CORE_MW_LAYER_IBY_EXPORT_PATH(locsuplsettings.iby)
@@ -53,7 +53,7 @@
../rom/locationsysui_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locationsysui_resources.iby)
../rom/locgpsindicatorplugin_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locgpsindicatorplugin_resources.iby)
../rom/locnotprefplugin_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locnotprefplugin_resources.iby)
-../rom/locpossettingsapp_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locpossettingsapp_resources.iby)
+
../rom/locpsysettings_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locpsysettings_resources.iby)
../rom/locsettingsuiservice_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locsettingsuiservice_resources.iby)
../rom/locsuplsettings_resources.iby LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(locsuplsettings_resources.iby)
@@ -105,9 +105,6 @@
//GPS indicator
#include "../locgpsindicatorplugin/group/bld.inf"
-// Positioning Settings Application
-#include "../locpossettingsapp/group/bld.inf"
-
// Location BT Notifiers
#include "../locbtnotifier/group/bld.inf"
--- a/locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp.rss Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Resource file for Positioning Settings Application for Location Centre
-*
-*/
-
-
-
-NAME PSAP
-
-#include <eikon.rh>
-#include <appinfo.rh>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <bldvariant.hrh>
-#include <avkon.hrh>
-#include <data_caging_paths_strings.hrh>
-
-#include <location.loc>
-
-// CONSTANTS
-
-#define KLocIconFileMif APP_BITMAP_DIR"\\locpossettingsapp_aif.mif"
-
-RESOURCE RSS_SIGNATURE
- {
- }
-
-RESOURCE TBUF
- {
- buf="locposapp";
- }
-
-RESOURCE EIK_APP_INFO
- {
- }
-
-// ---------------------------------------------------------------------------
-// r_t_locposapp_localisable_app_info
-// Localizable Application Information structure.
-// ---------------------------------------------------------------------------
-//
-RESOURCE LOCALISABLE_APP_INFO r_t_locposapp_localisable_app_info
- {
- short_caption = qtn_loc_app_settings;
-
- caption_and_icon = CAPTION_AND_ICON_INFO
- {
- caption = qtn_loc_app_settings;
- number_of_icons = 1;
- icon_file = KLocIconFileMif;
- };
- }
--- a/locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp_reg.rss Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Resource file for Positioning Settings Application for Location Centre
-*
-*/
-
-
-// SYSTEM INCLUDES
-#include <appinfo.rh>
-#include <locpossettingsapp.rsg>
-#include <data_caging_paths_strings.hrh>
-
-UID2 KUidAppRegistrationResourceFile
-UID3 0x1028313B
-
-// ---------------------------------------------------------------------------
-// APP_REGISTRATION_INFO
-// Application registration information for Positioning Settings Application
-// ---------------------------------------------------------------------------
-//
-RESOURCE APP_REGISTRATION_INFO
- {
- app_file = "locpossettingsapp";
- hidden = KAppIsHidden;
- embeddability = KAppEmbeddable;
- localisable_resource_file = APP_RESOURCE_DIR"\\locpossettingsapp";
- localisable_resource_id = R_T_LOCPOSAPP_LOCALISABLE_APP_INFO;
- }
--- a/locationsystemui/locationsysui/locpossettingsapp/data/locpossettingsapp_reg.xml Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<location_centre_registration>
- <service uuid="1028313B">
- <feature>Settings</feature>
- <runmode default="child"/>
- <application>
- <native sid="[1028313B]"/>
- </application>
- </service>
-</location_centre_registration>
\ No newline at end of file
--- a/locationsystemui/locationsysui/locpossettingsapp/group/bld.inf Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
-* Copyright (c) 2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Build information file for project Positioning Settings
-* Application
-*
-*/
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-../data/locpossettingsapp_reg.xml /epoc32/data/z/private/10283138/import/locpossettingsapp_reg.xml
-../data/locpossettingsapp_reg.xml /epoc32/release/winscw/udeb/z/private/10283138/import/locpossettingsapp_reg.xml
-
-PRJ_MMPFILES
-// Positioning Settings Application Project defintion file.
-locpossettingsapp.mmp
-
-PRJ_TESTMMPFILES
-
-PRJ_TESTMMPFILES
-
-PRJ_EXTENSIONS
-START EXTENSION s60/mifconv
-OPTION TARGETFILE locpossettingsapp_aif.mif
-OPTION SOURCES -c8 qgn_prop_set_gene_loc.svg
-END
-
\ No newline at end of file
--- a/locationsystemui/locationsysui/locpossettingsapp/group/locpossettingsapp.mmp Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,64 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: mmp for Positioning Settings for Location Center
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-
-#include <platform_paths.hrh> // For the MW_LAYER_SYSTEMINCLUDE
-#include "./../inc/locpossettingsuid.hrh" // UID of Positioning Settings Application
-
-
-TARGET locpossettingsapp.exe
-TARGETTYPE exe
-UID KAppUid2 KCLocPosSettingsAppUid3
-
-//CAPABILITY CAP_APPLICATION TrustedUI
-CAPABILITY CAP_APPLICATION NetworkControl
-VENDORID VID_DEFAULT
-
-SOURCEPATH ../src
-SOURCE locpossettingsapp.cpp
-SOURCE locpossettingsappdocument.cpp
-SOURCE locpossettingsappui.cpp
-
-START RESOURCE ../data/locpossettingsapp.rss
-HEADER
-TARGETPATH APP_RESOURCE_DIR
-LANGUAGE_IDS
-END
-
-USERINCLUDE .
-USERINCLUDE ../src
-USERINCLUDE ../data
-USERINCLUDE ../inc
-USERINCLUDE ../../inc
-USERINCLUDE ../../../inc
-USERINCLUDE ../../../../inc
-
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY euser.lib
-LIBRARY apparc.lib
-LIBRARY cone.lib
-LIBRARY eikcore.lib
-LIBRARY avkon.lib
-LIBRARY locsysuiview.lib
-
-START RESOURCE ../data/locpossettingsapp_reg.rss
-DEPENDS locpossettingsapp.rsg
- TARGETPATH /private/10003a3f/apps
-END
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsapp.h Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-#ifndef C_LOCPOSSETTINGSAPP_H
-#define C_LOCPOSSETTINGSAPP_H
-
-// System Includes
-#include <aknapp.h>
-
-/**
- * Application class
- * Application class creates document class object and return application UID
- *
- * @lib locpossettingsapp.exe
- * @since S60 v 5.0
- */
- class CLocPosSettingsApp : public CAknApplication
- {
- private:
- /**
- * From CApaApplication, returns application's UID (KCLocPosSettingsAppUid3).
- * @return The value of KCLocPosSettingsAppUid3.
- */
- TUid AppDllUid() const;
-
- /**
- * From CApaApplication, creates CLocPosSettingsAppDocument object.
- * @return A pointer to the created document object.
- */
- CApaDocument* CreateDocumentL();
- };
-
-#endif // C_LOCPOSSETTINGSAPP_H
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsappdocument.h Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2006 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Application to launch Positioning Settings for Location Center
-*
-*/
-
-
-#ifndef C_LOCPOSSETTINGSAPPDOCUMENT_H
-#define C_LOCPOSSETTINGSAPPDOCUMENT_H
-
-// System Includes
-#include <AknDoc.h>
-
-// Forward Declarations
-class CEikAppUi;
-
-/**
- * Positioning Settings Application Document Class
- *
- * @lib locpossettingsapp.exe
- * @since S60 v 5.0
- */
-class CLocPosSettingsAppDocument : public CAknDocument
- {
-public:
- /**
- * Two-phased constructor.
- * @param CEikApplication& EikApplication reference
- * @return pointer to CLocPosSettingsAppDocument
- */
- static CLocPosSettingsAppDocument* NewL(CEikApplication& aApp);
-
- /**
- * Destructor.
- */
- virtual ~CLocPosSettingsAppDocument();
-
-private:
- /**
- * Overloaded C++ constructor
- */
- CLocPosSettingsAppDocument(CEikApplication& aApp);
-
- /**
- * Second phase of the two phase constuctor
- */
- void ConstructL();
-
-private: // Inherited from Base classes
- /**
- * From CEikDocument, create CLocPosSettingsAppUi "App UI" object.
- */
- CEikAppUi* CreateAppUiL();
- };
-
-#endif // C_LOCPOSSETTINGSAPPDOCUMENT_H
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsappui.h Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-/*
-* Copyright (c) 2006 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-#ifndef C_LOCPOSSETTINGSAPPUI_H
-#define C_LOCPOSSETTINGSAPPUI_H
-
-// System Includes
-#include <eikapp.h>
-#include <eikdoc.h>
-#include <e32std.h>
-#include <coeccntx.h>
-#include <aknappui.h>
-
-// User Includes
-#include "locsysuiview.h"
-
-/**
- * Application UI class
- * Provides support for the following features:
- * - EIKON control architecture
- *
- * @lib locpossettingsapp.exe
- * @since S60 v 5.0
- */
-class CLosPosSettingsAppUi : public CAknViewAppUi
- {
-public:
- /**
- * Second phase of the two phase constructor.
- */
- void ConstructL();
-
- /**
- * Destructor.
- */
- virtual ~CLosPosSettingsAppUi();
-
-public: // Inherited from Base classes
- /**
- * Inherited from CAknViewAppUi
- */
- void HandleCommandL(TInt aCommand);
- };
-
-#endif // C_LOCPOSSETTINGSAPPUI_H
--- a/locationsystemui/locationsysui/locpossettingsapp/inc/locpossettingsuid.hrh Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-#ifndef LOCPOSSETTINGSUID_H
-#define LOCPOSSETTINGSUID_H
-
-
-/** UID2 of the application */
-#define KAppUid2 0x100039CE
-
-/** UID3 of the application */
-#define KCLocPosSettingsAppUid3 0x1028313B
-
-#endif // LOCPOSSETTINGSUID_H
--- a/locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsapp.cpp Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,67 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-// System Includes
-#include <eikstart.h>
-
-// User Includes
-#include "locpossettingsapp.h"
-#include "locpossettingsappdocument.h"
-#include "locpossettingsuid.hrh"
-
-// ======== Member functions for class CLocPosSettingsApp ===================
-
-// ---------------------------------------------------------------------------
-// TUid CLocPosSettingsApp::AppDllUid
-// ---------------------------------------------------------------------------
-//
-TUid CLocPosSettingsApp::AppDllUid() const
- {
- return TUid::Uid( KCLocPosSettingsAppUid3 );
- }
-
-// ---------------------------------------------------------------------------
-// CApaDocument* CLocPosSettingsApp::CreateDocumentL
-// ---------------------------------------------------------------------------
-//
-CApaDocument* CLocPosSettingsApp::CreateDocumentL()
- {
- return CLocPosSettingsAppDocument::NewL( *this );
- }
-
-// =========================Global Functions =================================
-
-// ---------------------------------------------------------------------------
-// CApaApplication* NewApplication
-// ---------------------------------------------------------------------------
-//
-LOCAL_C CApaApplication* NewApplication()
- {
- return new CLocPosSettingsApp ;
- }
-
-
-// ---------------------------------------------------------------------------
-// TInt E32Main
-// ---------------------------------------------------------------------------
-//
-GLDEF_C TInt E32Main()
- {
- return EikStart::RunApplication( NewApplication );
- }
-
--- a/locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsappdocument.cpp Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-// User Includes
-#include "locpossettingsappdocument.h"
-#include "locpossettingsappui.h"
-
-
-// ======== Member functions for class CLocPosSettingsAppDocument ===========
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::NewL()
-// ---------------------------------------------------------------------------
-//
-CLocPosSettingsAppDocument* CLocPosSettingsAppDocument::NewL(
- CEikApplication& aApp)
- {
- CLocPosSettingsAppDocument* self = new (ELeave) CLocPosSettingsAppDocument( aApp );
- CleanupStack::PushL( self );
- self->ConstructL();
- CleanupStack::Pop( self );
- return self;
- }
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::~CLocPosSettingsAppDocument()
-// ---------------------------------------------------------------------------
-//
-CLocPosSettingsAppDocument::~CLocPosSettingsAppDocument()
- {
- // No Implementation
- }
-
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::CLocPosSettingsAppDocument()
-// Constructs.
-// ---------------------------------------------------------------------------
-//
-CLocPosSettingsAppDocument::CLocPosSettingsAppDocument( CEikApplication& aApp )
- :CAknDocument( aApp )
- {
- }
-
-// ---------------------------------------------------------------------------
-// CLocPosSettingsAppDocument::ConstructL()
-// ---------------------------------------------------------------------------
-//
-void CLocPosSettingsAppDocument::ConstructL()
- {
- // No Implementation
- }
-
-// ----------------------------------------------------
-// CLocPosSettingsAppDocument::CreateAppUiL()
-// ----------------------------------------------------
-//
-CEikAppUi* CLocPosSettingsAppDocument::CreateAppUiL()
- {
- return new ( ELeave ) CLosPosSettingsAppUi;
- }
-
--- a/locationsystemui/locationsysui/locpossettingsapp/src/locpossettingsappui.cpp Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2006-2007 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: Application to launch Positioning Settings for Location Centre
-*
-*/
-
-
-// System Includes
-#include <avkon.hrh>
-#include <eikserverapp.h>
-
-// User Includes
-#include "locpossettingsappui.h"
-
-// ======== Member functions for class CLosPosSettingsAppUi ==================
-
-
-// ---------------------------------------------------------------------------
-// void CLosPosSettingsAppUi::ConstructL
-// ---------------------------------------------------------------------------
-//
-void CLosPosSettingsAppUi::ConstructL()
- {
- BaseConstructL( EAknEnableSkin | EAknEnableMSK | EAknSingleClickCompatible);
-
- // Create the Postioning Settings View
- CLocSysUiView* view = CLocSysUiView::NewL();
- view->LaunchedfromPosSettingsApp();
- CleanupStack::PushL( view );
- AddViewL( view ); // transfer ownership to CAknViewAppUi
- CleanupStack::Pop( view );
- SetDefaultViewL( *view );
- }
-
-
-// ---------------------------------------------------------------------------
-// CLosPosSettingsAppUi::~CLosPosSettingsAppUi
-// ---------------------------------------------------------------------------
-//
-CLosPosSettingsAppUi::~CLosPosSettingsAppUi()
- {
- }
-
-// ---------------------------------------------------------------------------
-// void CLosPosSettingsAppUi::HandleCommandL
-// ---------------------------------------------------------------------------
-//
-void CLosPosSettingsAppUi::HandleCommandL( TInt aCommand )
- {
- switch ( aCommand )
- {
- case EAknSoftkeyExit:
- {
- // The User has pressed the Back key from the Application or the
- // Exit key using the Right soft key. In this case the parent
- // application need not exit. Hence, the application can exit
- // with EEikCmdExit itself
- Exit();
- break;
- }
- case EEikCmdExit:
- {
- // The User has exited the application using the Exit option from
- //.Options menu. But, thats possible only if we exit the application
- // with EAknCmdExit.
- // A bit of convoluted logic but needed because we are using the
- // same components for the Settings UI Server as well as LC.
-
- CEikAppServer* server = iEikonEnv->AppServer();
- if ( server )
- {
- server->NotifyServerExit(EAknCmdExit);
- }
- Exit();
- break;
- }
- default:
- break;
- }
- }
--- a/locationsystemui/locationsysui/rom/locpossettingsapp.iby Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: IBY file for Location Position Settings Application
-*
-*/
-#ifndef __LOCPOSSETTINGSAPP_IBY__
-#define __LOCPOSSETTINGSAPP_IBY__
-
-#ifdef __LOCATIONSYSUI
-
-// Postioning Settings Application EXE
-file=ABI_DIR\BUILD_DIR\locpossettingsapp.exe PROGRAMS_DIR\locpossettingsapp.exe
-
-// Positioning Settings Application Icon
-S60_APP_AIF_ICONS(locpossettingsapp)
-
-// Positioning Settings Application Registration Info
-S60_UPGRADABLE_APP_REG_RSC(locpossettingsapp)
-
-// Location Centre Registration file
-data=ZPRIVATE\10283138\import\locpossettingsapp_reg.xml \private\10283138\import\locpossettingsapp_reg.xml
-
-#endif // ( __LOCPOSSETTINGSAPP_IBY__ )
-
-#endif
--- a/locationsystemui/locationsysui/rom/locpossettingsapp_resources.iby Wed Apr 14 16:23:43 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-/*
-* Copyright (c) 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".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: IBY file for Location Position Settings Application Resource
-*
-*/
-#ifndef __LOCPOSSETTINGSAPP_RESOURCES_IBY__
-#define __LOCPOSSETTINGSAPP_RESOURCES_IBY__
-
-#ifdef __LOCATIONSYSUI
-
- // Postioning Settings application Resource
- data=ZRESOURCE\apps\locpossettingsapp.rsc APP_RESOURCE_DIR\locpossettingsapp.rsc
-
-#endif // (__LOCATIONSYSUI)
-
-#endif // __LOCPOSSETTINGSAPP_RESOURCES_IBY__
\ No newline at end of file
--- a/locationtriggering/tsrc/lbtengine_test/Additionaltests/DeleteTest/group/DeleteTest.mmp Wed Apr 14 16:23:43 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/Additionaltests/DeleteTest/group/DeleteTest.mmp Tue Apr 27 17:05:00 2010 +0300
@@ -33,8 +33,7 @@
//TARGETPATH ?target_path
//DEFFILE CreateTest.def
-SOURCEPATH ../src ../../src
-
+SOURCEPATH ../src
SOURCE DeleteTest.cpp
SOURCE t_triggerfireobserver.cpp
--- a/locationtriggering/tsrc/lbtengine_test/Additionaltests/HandlingprocessTest/group/HandlingprocessTest.mmp Wed Apr 14 16:23:43 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/Additionaltests/HandlingprocessTest/group/HandlingprocessTest.mmp Tue Apr 27 17:05:00 2010 +0300
@@ -33,7 +33,7 @@
//TARGETPATH ?target_path
//DEFFILE CreateTest.def
-SOURCEPATH ../src ../../src
+SOURCEPATH ../src
SOURCE HandlingprocessTest.cpp
SOURCE t_triggerfireobserver.cpp
--- a/locationtriggering/tsrc/lbtengine_test/Additionaltests/ModifyTest/group/ModifyTest.mmp Wed Apr 14 16:23:43 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/Additionaltests/ModifyTest/group/ModifyTest.mmp Tue Apr 27 17:05:00 2010 +0300
@@ -33,7 +33,7 @@
//TARGETPATH ?target_path
//DEFFILE CreateTest.def
-SOURCEPATH ../src ../../src
+SOURCEPATH ../src
SOURCE ModifyTest.cpp
SOURCE t_triggerfireobserver.cpp
--- a/locationtriggering/tsrc/lbtengine_test/Additionaltests/NotificationTest/group/NotificationTest.mmp Wed Apr 14 16:23:43 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/Additionaltests/NotificationTest/group/NotificationTest.mmp Tue Apr 27 17:05:00 2010 +0300
@@ -33,7 +33,7 @@
//TARGETPATH ?target_path
//DEFFILE CreateTest.def
-SOURCEPATH ../src ../../src
+SOURCEPATH ../src
SOURCE NotificationTest.cpp
SOURCE t_triggerfireobserver.cpp
--- a/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/CreateTest/group/CreateTest.mmp Wed Apr 14 16:23:43 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/t_mgmtsettings/CreateTest/group/CreateTest.mmp Tue Apr 27 17:05:00 2010 +0300
@@ -33,7 +33,7 @@
//TARGETPATH ?target_path
//DEFFILE CreateTest.def
-SOURCEPATH ../src ../../src
+SOURCEPATH ../src
SOURCE CreateTest.cpp
SOURCE t_triggerfireobserver.cpp
--- a/locsrv_plat/supl_settings_api/tsrc/src/settingsapiblocks.cpp Wed Apr 14 16:23:43 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/src/settingsapiblocks.cpp Tue Apr 27 17:05:00 2010 +0300
@@ -240,28 +240,27 @@
ENTRY( "GetFallBack",CSettingsApi::GetFallBack),
ENTRY( "SetGetTriggerParams",CSettingsApi::SetGetTriggerParamsL),
- ENTRY( "AddTriggerSession",CSettingsApi::AddTriggerSessionL),
- ENTRY( "DeleteTriggerSession",CSettingsApi::DeleteTriggerSessionL),
+ /* ENTRY( "AddTriggerSession",CSettingsApi::AddTriggerSessionL),
+ ENTRY( "DeleteTriggerSession",CSettingsApi::DeleteTriggerSessionL), */
ENTRY( "GetAllSessionSetApi",CSettingsApi::GetAllSessionSetApiL),
- ENTRY( "SetNotStatusSetApi",CSettingsApi::SetNotStatusSetApiL),
+ /*ENTRY( "SetNotStatusSetApi",CSettingsApi::SetNotStatusSetApiL),
ENTRY( "AddTriggerSessionTwice",CSettingsApi::AddTriggerSessionTwiceL),
ENTRY( "DeleteTriggerSessionInvalid",CSettingsApi::DeleteTriggerSessionInvalidL),
- ENTRY( "SetNotStatusSetApiInvalid",CSettingsApi::SetNotStatusSetApiInvalidL),
+ ENTRY( "SetNotStatusSetApiInvalid",CSettingsApi::SetNotStatusSetApiInvalidL), */
ENTRY( "SetSessionObserver",CSettingsApi::SetSessionObserverL),
ENTRY( "SetSessionObserverTwice",CSettingsApi::SetSessionObserverTwiceL),
ENTRY( "RemoveSessionObserver",CSettingsApi::RemoveSessionObserverL),
ENTRY( "RemoveSessionObserverWithoutSet",CSettingsApi::RemoveSessionObserverWithoutSetL),
ENTRY( "CheckSessionChangeEvents",CSettingsApi::CheckSessionChangeEventsL),
- ENTRY( "GetASessionParam",CSettingsApi::GetASessionParamL),
+ /* ENTRY( "GetASessionParam",CSettingsApi::GetASessionParamL), */
ENTRY( "GetASessionParamNull",CSettingsApi::GetASessionParamNullL),
ENTRY( "GetASessionParamInValid",CSettingsApi::GetASessionParamInValidL),
ENTRY( "CancelTriggerSession",CSettingsApi::CancelTriggerSessionL),
- ENTRY( "SetOutstandingTriggers",CSettingsApi::SetOutstandingTriggersL),
+ /* ENTRY( "SetOutstandingTriggers",CSettingsApi::SetOutstandingTriggersL),
ENTRY( "SetOutstandingTriggersInvalid",CSettingsApi::SetOutstandingTriggersInvalidL),
- ENTRY( "DeleteAllSessions",CSettingsApi::DeleteAllSessionsL),
+ ENTRY( "DeleteAllSessions",CSettingsApi::DeleteAllSessionsL), */
ENTRY( "SetTriggerEmptySessionName",CSettingsApi::SetTriggerEmptySessionNameL),
ENTRY( "SetTriggerLongSessionName",CSettingsApi::SetTriggerLongSessionNameL),
-
};
const TInt count = sizeof( KFunctions ) /
--- a/supl/locationomasuplpostester/epos_comasuplpostestermodulecfg/group/epos_comasuplpostestermodulecfg.mmp Wed Apr 14 16:23:43 2010 +0300
+++ b/supl/locationomasuplpostester/epos_comasuplpostestermodulecfg/group/epos_comasuplpostestermodulecfg.mmp Tue Apr 27 17:05:00 2010 +0300
@@ -78,7 +78,7 @@
START RESOURCE ../data/postester.rss
HEADER
-TARGETPATH Resource
+TARGETPATH resource
END
// End of File
--- a/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp Wed Apr 14 16:23:43 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandler/src/epos_comasuplprotocolmanager.cpp Tue Apr 27 17:05:00 2010 +0300
@@ -369,25 +369,36 @@
{
HandlePacketError(errorCode);
return;
- }
+ }
+
+ //Work out what SUPL Protocol Hanlder version should be used
if( major == 1 )
{
+ //SUPL v1
if(iOMASuplProtocolHandler1)
{
iOMASuplProtocolHandler1->HandlePacket(aPacket,aPortNum);
}
}
- else
+ else if ( major == 2 )
{
+ //SUPL v2
if(iOMASuplProtocolHandler2)
{
iOMASuplProtocolHandler2->HandlePacket(aPacket,aPortNum);
- }
- else
- if (iOMASuplProtocolHandler1)
+ }
+ }
+ else
+ {
+ //Use either of the Protocol Handlers to handle the packet
+ if (iOMASuplProtocolHandler1)
{
iOMASuplProtocolHandler1->HandlePacket(aPacket,aPortNum);
}
+ else if(iOMASuplProtocolHandler2)
+ {
+ iOMASuplProtocolHandler2->HandlePacket(aPacket,aPortNum);
+ }
}
}
@@ -506,25 +517,35 @@
return;
}
+ //Work out what SUPL Protocol Hanlder version should be used
TInt major = aSuplSession->GetSUPLVersion();
if( major == 1 )
{
+ //SUPL v1
if(iOMASuplProtocolHandler1)
{
iOMASuplProtocolHandler1->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
}
}
- else
+ else if( major == 2 )
{
+ //SUPL v2
if(iOMASuplProtocolHandler2)
{
iOMASuplProtocolHandler2->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
}
- else
- if (iOMASuplProtocolHandler1)
+ }
+ else
+ {
+ //Use either of the Protocol Handlers (if they exist) to handle the packet
+ if (iOMASuplProtocolHandler1)
{
iOMASuplProtocolHandler1->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
}
+ else if(iOMASuplProtocolHandler2)
+ {
+ iOMASuplProtocolHandler2->HandleSuplMessageL(aSuplSession,aStatus,aMessage);
+ }
}
}
--- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstartstate.cpp Wed Apr 14 16:23:43 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/src/epos_comasuplstartstate.cpp Tue Apr 27 17:05:00 2010 +0300
@@ -655,29 +655,32 @@
}
}
- COMASuplGSMCellInfo* cellInfo;
+ COMASuplGSMCellInfo* cellInfo = COMASuplGSMCellInfo::NewL();
COMASuplLocationId::TOMASuplStatus status;
- aLocationId->SuplLocationId(cellInfo, status);
+ TInt err = aLocationId->SuplLocationId(cellInfo, status);
- TInt refMNC,refMCC,refCI,refLac;
- cellInfo->SuplGSMCellInfo(refMNC,refMCC,refCI,refLac);
-
- COMASuplGSMCellInfo* cellInfoClone = COMASuplGSMCellInfo::NewL();
- cellInfoClone->SetSuplGSMCellInfo(refMNC,refMCC,refCI,refLac);
- iLocationId2->SetSuplLocationId(cellInfoClone, status);
+ if(err == KErrNone)
+ {
+ TInt refMNC,refMCC,refCI,refLac;
+ cellInfo->SuplGSMCellInfo(refMNC,refMCC,refCI,refLac);
+
+ COMASuplGSMCellInfo* cellInfoClone = COMASuplGSMCellInfo::NewL();
+ cellInfoClone->SetSuplGSMCellInfo(refMNC,refMCC,refCI,refLac);
+ iLocationId2->SetSuplLocationId(cellInfoClone, status);
- iLocationId = aLocationId;
+ iLocationId = aLocationId;
- if(iECId)
- {
- iTrace->Trace(_L("COMASuplStartState::LocationIDRequestCompletedL...Retrive E-CellId"), KTraceFileName, __LINE__);
- iGenerationStatus = ETrue;
- iLocationIDRequestor->GetECellID();
+ if(iECId)
+ {
+ iTrace->Trace(_L("COMASuplStartState::LocationIDRequestCompletedL...Retrive E-CellId"), KTraceFileName, __LINE__);
+ iGenerationStatus = ETrue;
+ iLocationIDRequestor->GetECellID();
+ }
+ else
+ {
+ GetAssistceDataFromPluginL(aErrorCode);
+ }
}
- else
- {
- GetAssistceDataFromPluginL(aErrorCode);
- }
}
// -----------------------------------------------------------------------------