--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/BWINS/lbslocationinfoconverteru.def	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-EXPORTS
-	??1CLbsLocationInfoConverter@@UAE@XZ @ 1 NONAME ; CLbsLocationInfoConverter::~CLbsLocationInfoConverter(void)
-	??1CLbsLocationResolver@@UAE@XZ @ 2 NONAME ; CLbsLocationResolver::~CLbsLocationResolver(void)
-	?CancelConvertLocationInfo@CLbsLocationInfoConverter@@QAEXXZ @ 3 NONAME ; void CLbsLocationInfoConverter::CancelConvertLocationInfo(void)
-	?CancelResolveLocation@CLbsLocationResolver@@QAEXXZ @ 4 NONAME ; void CLbsLocationResolver::CancelResolveLocation(void)
-	?ConvertLocationInfoL@CLbsLocationInfoConverter@@QAEXAAV?$RPointerArray@VCLbsLocationInfoBase@@@@KK@Z @ 5 NONAME ; void CLbsLocationInfoConverter::ConvertLocationInfoL(class RPointerArray<class CLbsLocationInfoBase> &, unsigned long, unsigned long)
-	?ConvertLocationInfoL@CLbsLocationInfoConverter@@QAEXAAVCLbsLocationInfoBase@@KK@Z @ 6 NONAME ; void CLbsLocationInfoConverter::ConvertLocationInfoL(class CLbsLocationInfoBase &, unsigned long, unsigned long)
-	?NewL@CLbsLocationInfoConverter@@SAPAV1@AAVMLbsLocationInfoConverterObserver@@@Z @ 7 NONAME ; class CLbsLocationInfoConverter * CLbsLocationInfoConverter::NewL(class MLbsLocationInfoConverterObserver &)
-	?NewL@CLbsLocationInfoConverter@@SAPAV1@AAVMLbsLocationInfoConverterObserver@@VTUid@@@Z @ 8 NONAME ; class CLbsLocationInfoConverter * CLbsLocationInfoConverter::NewL(class MLbsLocationInfoConverterObserver &, class TUid)
-	?NewL@CLbsLocationResolver@@SAPAV1@AAVMLbsLocationResolverObserver@@@Z @ 9 NONAME ; class CLbsLocationResolver * CLbsLocationResolver::NewL(class MLbsLocationResolverObserver &)
-	?NewL@CLbsLocationResolver@@SAPAV1@AAVMLbsLocationResolverObserver@@VTUid@@@Z @ 10 NONAME ; class CLbsLocationResolver * CLbsLocationResolver::NewL(class MLbsLocationResolverObserver &, class TUid)
-	?ResolveLocationL@CLbsLocationResolver@@QAEXABVCLbsLocationInfo@@@Z @ 11 NONAME ; void CLbsLocationResolver::ResolveLocationL(class CLbsLocationInfo const &)
-	?Version@MLbsLocationInfoConverterObserver@@UBE?AVTVersion@@XZ @ 12 NONAME ; class TVersion MLbsLocationInfoConverterObserver::Version(void) const
-	?Version@MLbsLocationResolverObserver@@UBE?AVTVersion@@XZ @ 13 NONAME ; class TVersion MLbsLocationResolverObserver::Version(void) const
-

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/EABI/lbslocationinfoconverteru.def	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-EXPORTS
-	_ZN20CLbsLocationResolver16ResolveLocationLERK16CLbsLocationInfo @ 1 NONAME
-	_ZN20CLbsLocationResolver21CancelResolveLocationEv @ 2 NONAME
-	_ZN20CLbsLocationResolver4NewLER28MLbsLocationResolverObserver @ 3 NONAME
-	_ZN20CLbsLocationResolver4NewLER28MLbsLocationResolverObserver4TUid @ 4 NONAME
-	_ZN20CLbsLocationResolverD0Ev @ 5 NONAME
-	_ZN20CLbsLocationResolverD1Ev @ 6 NONAME
-	_ZN20CLbsLocationResolverD2Ev @ 7 NONAME
-	_ZN25CLbsLocationInfoConverter20ConvertLocationInfoLER13RPointerArrayI20CLbsLocationInfoBaseEmm @ 8 NONAME
-	_ZN25CLbsLocationInfoConverter20ConvertLocationInfoLER20CLbsLocationInfoBasemm @ 9 NONAME
-	_ZN25CLbsLocationInfoConverter25CancelConvertLocationInfoEv @ 10 NONAME
-	_ZN25CLbsLocationInfoConverter4NewLER33MLbsLocationInfoConverterObserver @ 11 NONAME
-	_ZN25CLbsLocationInfoConverter4NewLER33MLbsLocationInfoConverterObserver4TUid @ 12 NONAME
-	_ZN25CLbsLocationInfoConverterD0Ev @ 13 NONAME
-	_ZN25CLbsLocationInfoConverterD1Ev @ 14 NONAME
-	_ZN25CLbsLocationInfoConverterD2Ev @ 15 NONAME
-	_ZNK28MLbsLocationResolverObserver7VersionEv @ 16 NONAME
-	_ZNK33MLbsLocationInfoConverterObserver7VersionEv @ 17 NONAME
-	_ZTI28MLbsLocationResolverObserver @ 18 NONAME ; #<TI>#
-	_ZTI33MLbsLocationInfoConverterObserver @ 19 NONAME ; #<TI>#
-	_ZTV28MLbsLocationResolverObserver @ 20 NONAME ; #<VT>#
-	_ZTV33MLbsLocationInfoConverterObserver @ 21 NONAME ; #<VT>#
-

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/group/bld.inf	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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:
-//
-
-
-PRJ_EXPORTS
-../inc/lbslocationinfoconverter.h	lbs/lbslocationinfoconverter.h
-../inc/lbslocationresolver.h		lbs/lbslocationresolver.h
-
-
-lbslocationinfoconverter.iby      /epoc32/rom/include/lbslocationinfoconverter.iby
-
-
-PRJ_MMPFILES
-lbslocationinfoconverter.mmp

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/group/lbslocationinfoconverter.iby	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +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:
-*
-*/
-#ifndef __LBS_LOCATIONINFOCONVERTER_IBY__
-#define __LBS_LOCATIONINFOCONVERTER_IBY__
-//#if !defined(SYMBIAN_EXCLUDE_LOCATION)
-
-file=ABI_DIR\DEBUG_DIR\lbslocationinfoconverter.dll			sys\bin\lbslocationinfoconverter.dll
-
-//#endif // SYMBIAN_EXCLUDE_LOCATION
-
-#endif //__LBS_LOCATIONINFOCONVERTER_IBY__

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/group/lbslocationinfoconverter.mmp	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +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 the License "Symbian Foundation License v1.0"
-// which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/sfl-v10.html".
-//
-// Initial Contributors:
-// Nokia Corporation - initial contribution.
-//
-// Contributors:
-//
-// Description:
-//
-
-
-TARGET          lbslocationinfoconverter.dll
-TARGETTYPE      dll
-UID             0x1000008d 0x102871F9
-
-VENDORID        0x70000001
-CAPABILITY      ALL -TCB
-
-SOURCEPATH      ../src
-SOURCE          lbslocationinfoconverter.cpp 
-SOURCE          lbslocationresolver.cpp 
-
-
-USERINCLUDE     ../inc
-
-SYSTEMINCLUDE	/epoc32/include
-
-LIBRARY         euser.lib
-LIBRARY         lbslocationinfodatatypes.lib
-LIBRARY			lbs.lib
-LIBRARY			estor.lib 
-
-SMPSAFE
-

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/inc/lbslocationinfoconverter.h	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,224 +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: Class used by client applications to convert location 
-* information
-*
-*/
-
-/**
-@file
-@publishedPartner
-@prototype
-*/
-
-#ifndef LBS_LOCATION_INFO_CONVERTER_H
-#define LBS_LOCATION_INFO_CONVERTER_H
-
-
-// OS wide
-#include <e32base.h>
-
-// LBS wide
-#include <lbs/lbslocationcommon.h>
-#include <lbs/lbslocationinfo.h>
-#include <lbs/lbslocationinfoconvertercommon.h>
-
-
-/**
-* The MLbsLocationInfoConverterObserver class is used in partnership with
-* CLbsLocationInfoConverter. The observer interface is used by the LBS
-* subsystem to inform a client application when a Locality conversion
-* process initiated through the CLbsLocationInfoConverter class has been
-* finished. In OnResolveLocationComplete the results will be returned 
-* as an argument of the function, while OnConversionComplete indicates that the results
-* have been written in to the data that was passed in using ConvertLocationInfoL.
-*
-* Although all the interface methods in the MLbsLocationInfoConverterObserver 
-* class are synchronous, the client application should ensure they return quickly
-* (e.g. any extensive processing of the received data is scheduled in another 
-* active object).
-*/
-class MLbsLocationInfoConverterObserver
-    {
-        
-public:
-
-    /** 
-     * Gets the current version of the observer interface.
-     * Derived classes should not change the implementation.
-     *
-     * @return Version number (currently 1.0.0) 
-     */
-    IMPORT_C virtual TVersion Version()  const;
-    
-     /** 
-     * The callback is used by the LBS subsystem to inform a client application 
-     * that a general purpose Locality conversion process initiated through the 
-     * CLbsLocationInfoConverter::ConvertLocationInfoL method has been finished.
-     *
-     * Receiving the callback indicates that, unless the conversion was not successful,
-     * the location data structures passed through the 
-     * CLbsLocationInfoConverter::ConvertLocationInfoL method have been updated with the
-     * requested information.
-     *
-     * @param aStatusCode Result of the conversion operation; 
-     * KErrNone if at least one conversion have been successful and 
-     *   the related location data structure(s) passed through the 
-     *   CLbsLocationInfoConverter::ConvertLocationInfoL method 
-     *   have been updated with the requested information;
-     * KErrNotSupported if the conversion type specified by 
-     *       aRequestedInfo is not supported by converter plugin
-     * KErrNotFound if none of conversions have been successful;
-     * Or other system wide error code othervise.
-In here I think we should say that when the caller uses ConvertLocationInfoL( RLbsLocationInfoBaseArray& aLocationInfoArray, ..) then on  OnConversionComplete the caller should iterate around all 'n' of the  entries of the aLocationInfoArray and call GetAreaInfoL to see if there is any conversion results.  OH I see below that you say something near the ConvertLocationInfoL method. Maybe should say it here as well to ti e together
-     */
-    virtual void OnConversionComplete(TInt aStatusCode) = 0;
-
-    };
-
-
-
-
-/**
-* The CLbsLocationInfoConverter interface is used in partnership with MLbsLocationInfoConverterObserver 
-* and provides the services to convert location information between different formats.
-*
-* Completion of conversions is indicated by the LBS subsystem by invoking callbacks defined
-* by the MLbsLocationInfoConverterObserver class.
-*
-* Currently the only supported conversion is from WLAN and/or GSM and/or WCDMA info into a geographic
-* Locality.
-*/
-NONSHARABLE_CLASS(CLbsLocationInfoConverter) : public CBase
-    {
-
-public:
-
-    /**
-     * Allocates and construct a new CLbsLocationInfoConverter
-     * @param[in] aObserver An observer for location conversion event.
-     * @param[in] aConverterModuleId UID of the conversion plugin to be used.
-     */
-    IMPORT_C static CLbsLocationInfoConverter* NewL( 
-                                                MLbsLocationInfoConverterObserver& aObserver,
-                                                const TUid aConverterModuleId);
-    
-    /** 
-     * Allocates and construct a new CLbsLocationInfoConverter
-     * Note here to say that impementations for both  OnResolveLocationComplete and OnConversionComplete MUST be provided even though only  interested in say, ConvertLocationFingerPrintToLocalityL
-     * Opens the default module. 
-     * @param[in] aObserver An observer for location conversion event.
-     */
-    IMPORT_C static CLbsLocationInfoConverter* NewL( 
-                                                MLbsLocationInfoConverterObserver& aObserver);
-
-    /** 
-     * Destructor. 
-     */
-    IMPORT_C ~CLbsLocationInfoConverter();
-    
-    /** 
-     * A general purpose function that converts a single locationinfo.
-     * Completion of the conversion is indicated by the LBS subsystem by invoking the
-     * MLbsLocationInfoConverterObserver::OnConversionComplete 
-     * and the caller can then iterate through the results returned in aLocationInfo
-     *   
-     * @capability Location
-     *
-     * @param[in] aLocationInfo location information to be converted.
-     * @param[in] aConversionPrefs Conversion preferences suggested by client
-     * @param[in] aRequestedInfo Location information that is requested. Currently
-     * the only supported conversion is from WLAN and/or GSM and/or WCDMA info into 
-     * a geographic position, hence the parameter should be set to ELbsConversionOutputPosition)
-     * Need to say that can only do one of either ConvertLocationFingerPrintToLocalityL  or ConvertLocationInfoL at a time or else user is panicked
-
-     * @leave KErrNoMemory if there is not enough memory available to perform the conversion.
-     *       KErrArgument If the location info pointer is NULL.
-     */
-    IMPORT_C void ConvertLocationInfoL( CLbsLocationInfoBase& aLocationInfo,
-               const TLbsConversionPrefs aConversionPrefs,
-               const TLbsConversionOutputInfoMask aRequestedInfo );    
-
-
-    /** 
-     * A general purpose function that converts multiple locationinfos. 
-     * The maximum allowable batch size is defined by KPositionMaxBatchSize which is 500. 
-     * Exceeding KPositionMaxBatchSize will result in KErrNotSupported being reported.
-     *
-     * Completion of the conversion is indicated by the LBS subsystem by invoking the
-     * MLbsLocationInfoConverterObserver::OnConversionComplete
-     * and the caller can then iterate through the results returned in aLocationInfoArray
-     *
-     * @capability Location
-     *
-     * @param[in] aLocationInfo An array of location information to be converted.
-     * @param[in] aConversionPrefs Conversion preferences suggested by client
-     * @param[in] aRequestedInfo Location information that is requested. Currently
-     * the only supported conversion is from WLAN and/or GSM and/or WCDMA info into 
-     * a geographic position, hence the parameter should be set to ELbsConversionOutputPosition)
-     *
-     * @leave KErrNoMemory if there is not enough memory available to perform the conversion.
-     *       KErrArgument If the location info pointer is NULL.
-     *       KErrNotSupported if the conversion type specified by 
-     *       aRequestedInfo is not supported or if the bitmask specified by the
-     *       client has all options set. This error is also returned if the 
-     *       batch size exceeds KPositionMaxBatchSize.
-     */
-    IMPORT_C void ConvertLocationInfoL( RLbsLocationInfoBaseArray& aLocationInfoArray,
-                                       const TLbsConversionPrefs aConversionPrefs, 
-                                       const TLbsConversionOutputInfoMask aRequestedInfo );
-    
-    /** 
-     * Cancels an ongoing conversion operation.
-     * If there is no ongoing conversion the cancellation request is ignored.
-     *
-     * Neither of the The MLbsLocationInfoConverterObserver callbacks will not be invoked if cancellation is successful.
-     */
-    IMPORT_C void CancelConvertLocationInfo();
-
-private:
-   
-    /** 
-     * Default constructor 
-     */
-    CLbsLocationInfoConverter();
-    
-    /** 
-     * Symbian 2nd phase constructor. 
-     */
-    void ConstructL(MLbsLocationInfoConverterObserver& aObserver,
-                              const TUid aConverterModuleId);
-
-    /** 
-     * Copy constructor. Restricted by default. 
-     */
-    CLbsLocationInfoConverter( CLbsLocationInfoConverter& );
-    
-    /** 
-     * Overloaded assignment operator. Restricted by default. 
-     */
-    CLbsLocationInfoConverter& operator=( CLbsLocationInfoConverter& );
-    
-private:
-
-    /** 
-     * Pointer to implementation class 
-     */
-    TAny* iLocationInfoConverterImpl;
-    
-    };
-
-
-
-#endif // LBS_LOCATION_INFO_CONVERTER_H

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/inc/lbslocationresolver.h	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,142 +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: Class used by client applications to convert data 
-* such as such as WlanInfo or CellIds into TLocality position information
-*
-*/
-
-/**
-@file
-@publishedPartner
-@prototype
-*/
-
-#ifndef LBS_LOCATIONRESOLVER_H
-#define LBS_LOCATIONRESOLVER_H
-
-
-#include <e32base.h>
-#include <lbs/lbslocationcommon.h>
-#include <lbs/lbslocationinfo.h>
-#include <lbs/lbslocationinfoconvertercommon.h>
-
-
-class MLbsLocationResolverObserver
-    {
-        
-public:
-
-    /** 
-     * Gets the current version of the observer interface.
-     * Derived classes should not change the implementation.
-     *
-     * @return Version number (currently 1.0.0) 
-     */
-    IMPORT_C virtual TVersion Version()  const;
-    
-    /**
-     * The callback is used by the LBS subsystem to inform a client application 
-     * that a simple CLbsLocationResolver conversion process initiated through the 
-     * CLbsLocationResolver::ResolveLocationL method has been finished.
-     * 
-     * @param aStatus status of conversion, KErrNone for success, standard system error code
-     *  in other cases. Note that in the event of a cancellation this method will not execute.
-     * @param aBasicLocationInfo the location conversion that was requested. 
-     * If the conversion has failed the values will be uninitialised 
-     */
-    virtual void OnResolveLocationComplete(TInt aStatus, const TLocality& aLocality) = 0;
-    
-    };
-
-
-NONSHARABLE_CLASS(CLbsLocationResolver) : public CBase
-    {
-
-public:
-
-    /**
-     * Allocates and construct a new CLbsLocationResolver
-     * @param[in] aObserver An observer for location conversion event.
-     * @param[in] aConverterModuleId UID of the conversion plugin to be used.
-     */
-    IMPORT_C static CLbsLocationResolver* NewL(MLbsLocationResolverObserver& aObserver,
-                                                const TUid aConverterModuleId);
-    
-    /** 
-     * Allocates and construct a new CLbsLocationResolver
-     * @param[in] aObserver An observer for location conversion event.
-     */
-    IMPORT_C static CLbsLocationResolver* NewL(MLbsLocationResolverObserver& aObserver);
-
-    /** 
-     * Destructor. 
-     */
-    IMPORT_C ~CLbsLocationResolver();
-    
-    /**
-     * A simple function that converts a single Location Info into a TLocality
-     * No preferences or masks may be set. 
-     * The result is returned in the MLbsLocationResolverObserver 
-     * callback via OnResolveLocationComplete
-     * 
-     * Only one outstanding conversion can be open at a time for each client.
-     * Attempting to perform more than one will result in a leave with KErrInUse
-     * 
-     * @param[in] aLocationInfo the information to be converted into a location.
-     */
-    IMPORT_C void ResolveLocationL(const CLbsLocationInfo& aLocationInfo); 
-     
-    /** 
-     * Cancels an ongoing conversion operation.
-     * If there is no ongoing conversion the cancellation request is ignored.
-     *
-     * The MLbsLocationResolverObserver callback will not be invoked 
-     * if cancellation is successful.
-     */
-    IMPORT_C void CancelResolveLocation();
-
-protected:
-    /** 
-     * Default constructor 
-     */
-    CLbsLocationResolver();
-    
-    /** 
-     * Symbian 2nd phase constructor. 
-     */
-    void ConstructL(MLbsLocationResolverObserver& aObserver, const TUid aConverterModuleId);
-
-
-private:
-    /** 
-     * Copy constructor. Restricted by default. 
-     */
-    CLbsLocationResolver(CLbsLocationResolver&);
-    
-    /** 
-     * Overloaded assignment operator. Restricted by default. 
-     */
-    CLbsLocationResolver& operator=(CLbsLocationResolver&);
-    
-private:
-
-    /** 
-     * Pointer to implementation class 
-     */
-    TAny* iLocationResolverImpl;
-    
-    };
-
-
-#endif // LBS_LOCATIONRESOLVER_H

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/src/lbslocationinfoconverter.cpp	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,117 +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: Class used by client applications to convert location 
-* information
-*
-*/
-
-#include <e32base.h>
-#include <lbs/lbslocationinfoconverter.h>
-#include <lbs/lbslocationinfoconvertercommon.h>
-
-
-EXPORT_C TVersion MLbsLocationInfoConverterObserver::Version()  const
-	{
-	return TVersion(1, 0, 0);
-	}
-
-
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::NewL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C CLbsLocationInfoConverter* CLbsLocationInfoConverter::NewL(
-                                     MLbsLocationInfoConverterObserver& aObserver, 
-                                     const TUid aConverterModuleId )
-    {
-    CLbsLocationInfoConverter* self = new( ELeave ) CLbsLocationInfoConverter;
-    CleanupStack::PushL( self );
-    self->ConstructL( aObserver,aConverterModuleId );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::NewL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C CLbsLocationInfoConverter* CLbsLocationInfoConverter::NewL(
-                                     MLbsLocationInfoConverterObserver& aObserver )
-    {
-    CLbsLocationInfoConverter* self = new( ELeave ) CLbsLocationInfoConverter;
-    CleanupStack::PushL( self );
-    self->ConstructL( aObserver,TUid::Uid( KNullUidValue ) );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::~CLbsLocationInfoConverter
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C CLbsLocationInfoConverter::~CLbsLocationInfoConverter()
-    {
-    delete iLocationInfoConverterImpl;
-    iLocationInfoConverterImpl = NULL;
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::ConvertLocationInfoL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C void CLbsLocationInfoConverter::ConvertLocationInfoL( 
-                                CLbsLocationInfoBase& /*aLocationInfo*/,
-                                const TLbsConversionPrefs /*aConversionPrefs*/,
-                                const TLbsConversionOutputInfoMask /*aRequestedInfo*/ )
-    {
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::ConvertLocationInfoL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C void CLbsLocationInfoConverter::ConvertLocationInfoL( 
-                                RLbsLocationInfoBaseArray& /*aLocationInfoArray*/,
-                                const TLbsConversionPrefs /*aConversionPrefs*/, 
-                                const TLbsConversionOutputInfoMask /*aRequestedInfo*/ )
-    {
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::CancelConvertLocationInfo
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C void CLbsLocationInfoConverter::CancelConvertLocationInfo()
-    {
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::ConstructL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-void CLbsLocationInfoConverter::ConstructL( 
-                        MLbsLocationInfoConverterObserver& /*aObserver*/, 
-                        const TUid /*aConverterModuleId*/ )
-    {
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationInfoConverter::CLbsLocationInfoConverter
-// (other items were commented in a header).
-//----------------------------------------------------------------
-CLbsLocationInfoConverter::CLbsLocationInfoConverter()
-    {
-    
-    }

--- a/locationmgmt/locmonitor/ConversionApi/ConversionClientApi/src/lbslocationresolver.cpp	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,105 +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: Class used by client applications to convert location 
-* information
-*
-*/
-
-#include <e32base.h>
-#include <lbs/lbslocationresolver.h>
-#include <lbs/lbslocationinfoconvertercommon.h>
-
-
-EXPORT_C TVersion MLbsLocationResolverObserver::Version()  const
-	{
-	return TVersion(1, 0, 0);
-	}
-
-
-
-//----------------------------------------------------------------
-// CLbsLocationResolver::NewL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C CLbsLocationResolver* CLbsLocationResolver::NewL(
-                                     MLbsLocationResolverObserver& aObserver, 
-                                     const TUid aConverterModuleId )
-    {
-    CLbsLocationResolver* self = new( ELeave ) CLbsLocationResolver;
-    CleanupStack::PushL( self );
-    self->ConstructL( aObserver,aConverterModuleId );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationResolver::NewL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C CLbsLocationResolver* CLbsLocationResolver::NewL(
-                                     MLbsLocationResolverObserver& aObserver )
-    {
-    CLbsLocationResolver* self = new( ELeave ) CLbsLocationResolver;
-    CleanupStack::PushL( self );
-    self->ConstructL( aObserver,TUid::Uid( KNullUidValue ) );
-    CleanupStack::Pop( self );
-    return self;
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationResolver::~CLbsLocationResolver
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C CLbsLocationResolver::~CLbsLocationResolver()
-    {
-    delete iLocationResolverImpl;
-    iLocationResolverImpl = NULL;
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationResolver::ConvertLocationInfoToBasicLocationInfoL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C void CLbsLocationResolver::ResolveLocationL(const CLbsLocationInfo& /*aLocationInfo*/)
-    {
-    }
-
-
-
-//----------------------------------------------------------------
-// CLbsLocationResolver::CancelResolveLocation
-// (other items were commented in a header).
-//----------------------------------------------------------------
-EXPORT_C void CLbsLocationResolver::CancelResolveLocation()
-    {
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationResolver::ConstructL
-// (other items were commented in a header).
-//----------------------------------------------------------------
-void CLbsLocationResolver::ConstructL( 
-                        MLbsLocationResolverObserver& /*aObserver*/, 
-                        const TUid /*aConverterModuleId*/ )
-    {
-    }
-
-//----------------------------------------------------------------
-// CLbsLocationResolver::CLbsLocationResolver
-// (other items were commented in a header).
-//----------------------------------------------------------------
-CLbsLocationResolver::CLbsLocationResolver()
-    {
-    
-    }

--- a/locationmgmt/locmonitor/ConversionApi/ConversionCommon/group/bld.inf	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +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:
-//
-
-
-PRJ_EXPORTS
-../inc/lbslocationinfoconvertercommon.h	lbs/lbslocationinfoconvertercommon.h

--- a/locationmgmt/locmonitor/ConversionApi/ConversionCommon/inc/lbslocationinfoconvertercommon.h	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +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: Common enumerations used by client applications and plugins 
-* for conversion of location information.
-*
-*/
-
-/**
-@file
-@publishedPartner
-@prototype
-*/
-
-#ifndef LBS_LOCATION_INFO_CONVERTER_COMMON_H
-#define LBS_LOCATION_INFO_CONVERTER_COMMON_H
-
-#include <e32std.h>
-
-/**
- * Conversion preferences
- */ 
-typedef TUint32 TLbsConversionPrefs;
-
-
-/**
- * Enumeration to define the preferences a client can specify while requesting
- * location information. The conversion preferences enumeration shall not be 
- * used as a bitmask. 
- * The preferences are used by conversion module in order to decide if/how
- * a connection to an external server should be established.
- */
-enum _TLbsConversionPrefs
-    {
-    	
-    /**
-     * Indicates that no preferences are specified.
-     */
-    ELbsConversionNotDefined = 0x0000,
-    	
-    /**
-     * Use only local cache to retrieve information.
-     */
-    ELbsConversionCacheOnly  = 0x0001,
-  
-    /**
-     * Disable prompt while making a connection to an external service for
-     * conversion.
-	 * Ignored if a conversion module does not require external connection.
-     */
-    ELbsConversionSilent     = 0x0002,
-  
-    /**
-     * Allow prompt while making a connection to an external service for 
-     * conversion.
-	 * Ignored if a conversion module does not require external connection.
-     */
-    ELbsConversionPrompt     = 0x0004
-  
-    };  
-
-
-/**
- * Output Location Information
- */ 
-typedef TUint32 TLbsConversionOutputInfoMask;
-
-
-/**
- * Enumeration to define the type(s) of location information being communicated
- */
-enum _TLbsConversionOutputInfoMask
-    { 
-    
-    /**
-     * Used to initialise data only. Should not be used when requesting conversions.
-     */
-    ELbsConversionOutputNotDefined = 0x0000,
-
-    /**
-     * Indicates that the input data should be converted to a geographical coordinate
-	 * @see CLbsPositionInfo
-     */
-    ELbsConversionOutputPosition = 0x0001,
-    
-    /**
-     * Indicates that the input data should be converted to a GSM Cell information 
-	 * @see CLbsGsmCellInfo
-     */
-    ELbsConversionOutputGsm = 0x0002,
-    
-    /**
-     * Indicates that the input data should be converted to a WCDMA Cell information 
-	 * @see CLbsWcdmaCellInfo
-     */
-    ELbsConversionOutputWcdma = 0x0004,
-    
-    /**
-     * Indicates that the input data should be converted to a WLAN information 
-	 * @see CLbsWlanInfo
-     */
-    ELbsConversionOutputWlan = 0x0008
-    };
-
-#endif // LBS_LOCATION_INFO_CONVERTER_COMMON_H

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/BWINS/lbslocationinfoconverterpluginu.def	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-EXPORTS
-	??0TLbsLocInfoConverterPluginClassTypeBase@@IAE@XZ @ 1 NONAME ; TLbsLocInfoConverterPluginClassTypeBase::TLbsLocInfoConverterPluginClassTypeBase(void)
-	??0TLbsLocInfoConverterPluginParams@@QAE@AAVMLbsLocInfoConverterPluginObserver@@@Z @ 2 NONAME ; TLbsLocInfoConverterPluginParams::TLbsLocInfoConverterPluginParams(class MLbsLocInfoConverterPluginObserver &)
-	??1CLbsLocInfoConverterPluginBase@@UAE@XZ @ 3 NONAME ; CLbsLocInfoConverterPluginBase::~CLbsLocInfoConverterPluginBase(void)
-	?ClassSize@TLbsLocInfoConverterPluginClassTypeBase@@QBEIXZ @ 4 NONAME ; unsigned int TLbsLocInfoConverterPluginClassTypeBase::ClassSize(void) const
-	?ClassType@TLbsLocInfoConverterPluginClassTypeBase@@QBEKXZ @ 5 NONAME ; unsigned long TLbsLocInfoConverterPluginClassTypeBase::ClassType(void) const
-	?ExtendedInterface@CLbsLocInfoConverterPluginBase@@UAEPAXHPAX0@Z @ 6 NONAME ; void * CLbsLocInfoConverterPluginBase::ExtendedInterface(int, void *, void *)
-	?ExtendedInterface@MLbsLocInfoConverterPluginObserver@@EAEPAXHPAX0@Z @ 7 NONAME ; void * MLbsLocInfoConverterPluginObserver::ExtendedInterface(int, void *, void *)
-	?NewL@CLbsLocInfoConverterPluginBase@@SAPAV1@VTUid@@AAVTLbsLocInfoConverterPluginParams@@@Z @ 8 NONAME ; class CLbsLocInfoConverterPluginBase * CLbsLocInfoConverterPluginBase::NewL(class TUid, class TLbsLocInfoConverterPluginParams &)
-	?Observer@TLbsLocInfoConverterPluginParams@@QBEAAVMLbsLocInfoConverterPluginObserver@@XZ @ 9 NONAME ; class MLbsLocInfoConverterPluginObserver & TLbsLocInfoConverterPluginParams::Observer(void) const
-	?Version@CLbsLocInfoConverterPluginBase@@UBE?AVTVersion@@XZ @ 10 NONAME ; class TVersion CLbsLocInfoConverterPluginBase::Version(void) const
-	?Version@MLbsLocInfoConverterPluginObserver@@UBE?AVTVersion@@XZ @ 11 NONAME ; class TVersion MLbsLocInfoConverterPluginObserver::Version(void) const
-

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/EABI/lbslocationinfoconverterpluginu.def	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-EXPORTS
-	_ZN30CLbsLocInfoConverterPluginBase17ExtendedInterfaceEiPvS0_ @ 1 NONAME
-	_ZN30CLbsLocInfoConverterPluginBase4NewLE4TUidR32TLbsLocInfoConverterPluginParams @ 2 NONAME
-	_ZN30CLbsLocInfoConverterPluginBaseD0Ev @ 3 NONAME
-	_ZN30CLbsLocInfoConverterPluginBaseD1Ev @ 4 NONAME
-	_ZN30CLbsLocInfoConverterPluginBaseD2Ev @ 5 NONAME
-	_ZN32TLbsLocInfoConverterPluginParamsC1ER34MLbsLocInfoConverterPluginObserver @ 6 NONAME
-	_ZN32TLbsLocInfoConverterPluginParamsC2ER34MLbsLocInfoConverterPluginObserver @ 7 NONAME
-	_ZN34MLbsLocInfoConverterPluginObserver17ExtendedInterfaceEiPvS0_ @ 8 NONAME
-	_ZN39TLbsLocInfoConverterPluginClassTypeBaseC1Ev @ 9 NONAME
-	_ZN39TLbsLocInfoConverterPluginClassTypeBaseC2Ev @ 10 NONAME
-	_ZNK30CLbsLocInfoConverterPluginBase7VersionEv @ 11 NONAME
-	_ZNK32TLbsLocInfoConverterPluginParams8ObserverEv @ 12 NONAME
-	_ZNK34MLbsLocInfoConverterPluginObserver7VersionEv @ 13 NONAME
-	_ZNK39TLbsLocInfoConverterPluginClassTypeBase9ClassSizeEv @ 14 NONAME
-	_ZNK39TLbsLocInfoConverterPluginClassTypeBase9ClassTypeEv @ 15 NONAME
-	_ZTI30CLbsLocInfoConverterPluginBase @ 16 NONAME ; #<TI>#
-	_ZTI34MLbsLocInfoConverterPluginObserver @ 17 NONAME ; #<TI>#
-	_ZTV30CLbsLocInfoConverterPluginBase @ 18 NONAME ; #<VT>#
-	_ZTV34MLbsLocInfoConverterPluginObserver @ 19 NONAME ; #<VT>#
-

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/group/bld.inf	Fri Apr 09 17:19:12 2010 +0100
+++ /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:
-//
-
-
-PRJ_EXPORTS
-../inc/lbslocinfoconverterpluginbase.h			lbs/lbslocinfoconverterpluginbase.h
-../inc/lbslocinfoconverterpluginclasstypes.h    lbs/lbslocinfoconverterpluginclasstypes.h
-../inc/lbslocinfoconverterplugincommon.h        lbs/lbslocinfoconverterplugincommon.h
-../inc/lbslocinfoconverterpluginbase.hrh        lbs/lbslocinfoconverterpluginbase.hrh
-
-lbslocationinfoconverterplugin.iby      /epoc32/rom/include/lbslocationinfoconverterplugin.iby
-
-
-PRJ_MMPFILES
-lbslocationinfoconverterplugin.mmp

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/group/lbslocationinfoconverterplugin.iby	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +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:
-*
-*/
-//#ifndef __LBS_LOCATIONINFOCONVERTERPLUGIN_IBY__
-#define __LBS_LOCATIONINFOCONVERTERPLUGIN_IBY__
-//#if !defined(SYMBIAN_EXCLUDE_LOCATION)
-
-file=ABI_DIR\DEBUG_DIR\lbslocationinfoconverterplugin.dll			sys\bin\lbslocationinfoconverterplugin.dll
-
-
-//#endif // SYMBIAN_EXCLUDE_LOCATION
-
-//#endif //__LBS_LOCATIONINFOCONVERTERPLUGIN_IBY__

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/group/lbslocationinfoconverterplugin.mmp	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +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:
-//
-
-
-TARGET          lbslocationinfoconverterplugin.dll
-TARGETTYPE      dll
-UID             0x1000008d 0x102871FA
-
-VENDORID        0x70000001
-CAPABILITY      ALL -TCB
-
-SOURCEPATH      ../src
-SOURCE          lbslocinfoconverterpluginbase.cpp
-SOURCE          lbslocinfoconverterplugincommon.cpp
-
-USERINCLUDE     ../inc
-SYSTEMINCLUDE	/epoc32/include
-
-LIBRARY         euser.lib
-LIBRARY			ecom.lib
-LIBRARY         lbslocationinfodatatypes.lib
-
-SMPSAFE

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/inc/lbslocinfoconverterpluginbase.h	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,294 +0,0 @@
-/*
-* Copyright (c) 2008 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: Location information converter plug in API
-*
-*/
-
-
-/**
-* @file
-* @publishedPartner
-* @prototype
-*/
-
-
-#ifndef LBS_LOC_INFO_CONVERSION_PLUGIN_BASE_H
-#define LBS_LOC_INFO_CONVERSION_PLUGIN_BASE_H
-
-
-// System wide
-#include <e32base.h>
-
-// Common LBS data types
-#include <lbs/lbslocationinfo.h>
-#include <lbs/lbslocationinfoconvertercommon.h>
-
-// Component specific
-#include <lbs/lbslocinfoconverterplugincommon.h>
-#include <lbs/lbslocinfoconverterpluginclasstypes.h>
-
-
-class TLbsLocInfoConverterPluginParams;
-
-
-/**
-* The MLbsLocInfoConverterPluginObserver class is used in partnership with
-* CLbsLocInfoConverterPluginBase. The observer interface is used by a 
-* conversion plugin to inform LBS when a coordinate conversion process 
-* initiated through the CLbsLocInfoConverterPluginBase class is completed. 
-*
-* Although all the interface methods in the MLbsLocInfoConverterPluginObserver
-* class are synchronous, the LBS subsystem ensures they return quickly.
-*/
-class MLbsLocInfoConverterPluginObserver
-    {
-    
-public:
-
-	/** 
-	 * Gets the current version of the observer interface.
-	 * Derived classes should not change the implementation.
-	 * 
-	 * @return Version number (currently 1.0.0) 
-     */
-	IMPORT_C virtual TVersion Version() const;
-	
-	/**
-	 * The callback is used by the conversion plugin to inform the LBS
-	 * subsystem that a validation request initiated through the 
-	 * CLbsLocInfoConverterPluginBase::ValidateClient method is completed. 
-	 *
-	 * @param aStatusCode Result of the validation operation. 
-	 *         KErrNone if the access is granted.
-	 *         KErrPermissionDenied due to a potential security violation.
-         *         Other system wide error codes.
-	 */
-	IMPORT_C virtual void OnValidationComplete( TInt aStatusCode ) = 0;
-
-    /** 
-     * The callback is used by the conversion plugin to inform the LBS 
-     * subsystem that a coordinate conversion process initiated through the 
-     * CLbsLocInfoConverterPluginBase::ConvertLocationInfoL method is 
-     * completed.
-     *
-     * Receiving the callback indicates that, unless the conversion was not 
-     * successful, the location data structures passed through the 
-     * CLbsLocInfoConverterPluginBase::ConvertLocationInfoL method have been 
-     * updated with the requested information.
-     *
-     * @param aStatusCode Result of the conversion operation. 
-     *         KErrNone if at least one conversion have been successful and 
-     *         the related location data structure(s) passed through the 
-     *         CLbsLocInfoConverterPluginBase::ConvertLocationInfoL method 
-     *         have been updated with the requested information;
-     *         KErrKErrNotFound if none of conversions have been successful
-     *         Or other system wide error code otherwise.
-     */
-    IMPORT_C virtual void OnConversionComplete( TInt aStatusCode ) = 0;
-
-private:
-    
-	/** 
-	 * This methods is reserved for future expansion and should not be used or 
-	 * implemented by derived classes.
-	 */	
-	IMPORT_C virtual TAny* ExtendedInterface( TInt aFunctionNumber, 
-                                              TAny* aPtr1, 
-                                              TAny* aPtr2 );
-	
-    };
-
-
-/**
-* The CLbsLocInfoConverterPluginBase is the abstract Ecom interface to a 
-* coordinate conversion Plugin. All coordinate conversion Plugins must derive 
-* from and implement this interface.
-*
-* The interface is used in partnership with MLbsLocInfoConverterPluginObserver
-* and is used by the LBS subsystem to request conversion of location 
-* information between different formats.
-*
-* Completion of conversions must be indicated by a plugin by invoking 
-* callback(s) defined by the MLbsLocInfoConverterPluginObserver class.
-*
-* Although all the interface methods in the class are synchronous they must 
-* return immediately. When the LBS subsystem makes a request via 
-* CLbsLocInfoConverterPluginBase the Plugin must queue the request internally 
-* and return control to the caller immediately. Later on, when plugin provides
-* a response, it uses the corresponding notification method in the
-* MLbsLocInfoConverterPluginObserver class.
-*/
-class CLbsLocInfoConverterPluginBase : public CBase
-    {
-    	
-public:
-    
-    /**
-     * Loads a coordinate conversion Plugin and initalises it.
-     *
-     * @param[in] aImplementationUid An implementation Uid of the module to be 
-     * loaded.
-     * @param[in] aParams Arguments sent to conversion plugin.
-     *
-     * @return Pointer to the new coordinate conversion plugin.
-     */
-    IMPORT_C static CLbsLocInfoConverterPluginBase* NewL( 
-                                   TUid aImplementationUid,
-                                   TLbsLocInfoConverterPluginParams& aParams );
-                                                           
-    /**
-     * Destructor 
-     */
-    IMPORT_C virtual ~CLbsLocInfoConverterPluginBase();
-
-	/** 
-	 * Gets the current version of the interface implemented by a Plugin.
-     * Derived classes should not change the implementation.
-     *
-     * @return Version number (currently 1.0.0) 
-     */
-	IMPORT_C virtual TVersion Version() const;
-	
-	/**
-	 * Validates a client before a request is processed. This method is called
-	 * by the Location Monitor Server, everytime, before a conversion request is 
-	 * sent. 
-	 * The result of validation is indicated by the plugin by invoking the 
-	 * MLbsLocInfoConverterPluginObserver::OnValidationComplete callback.
-	 *
-	 * @param[in] aSecureId The secure ID of the client application/process
-	 * @param[in] aVendorId The vendor ID of the client application/process
-	 * @param{in] aRequestedInfo The requested converted information. This 
-	 * bit field would be checked by the plugin to determine if the specified
-	 * conversion can be supported for the requesting client. 
-	 */
-	IMPORT_C virtual void ValidateClient( const TSecureId& aSecureId, 
-	                    const TVendorId& aVendorId, 
-	                    const TLbsConversionOutputInfoMask aRequestedInfo) = 0;
-	                    
-	/**
-	 * Cancels an ongoing validation operation.
-	 * If there is no ongoing validation operation, the cancellation request 
-	 * is ignored.
-	 *
-	 * The MLbsLocInfoConverterPluginObserver::OnValidationComplete callback is
-	 * not invoked.
-	 */
-	IMPORT_C virtual void CancelValidateClient() = 0;
-    
-    /** 
-     * Converts multiple location information.
-     * 
-     * Completion of the conversion is indicated by a Plugin by invoking the
-     * MLbsLocInfoConverterPluginObserver::OnConversionComplete callback
-     *
-     * @param[in] aLocationInfo An array of location information for which 
-     * corresponding position information is expected.
-     * @param[in] aConversionPrefs Conversion preferences suggested by client
-     * @param[in] aRequestedInfo Location information that is requested.
-        
-     * @leave KErrNoMemory if there is not enough memory available to perform 
-     * the conversion.
-     *   KErrArgument If the location info pointer is NULL.
-     *   KErrNotSupported if the conversion type specified by aRequestedInfo is 
-     *   not supported.
-     *   Or any other system wide error code.
-     */                                                       
-    IMPORT_C virtual void ConvertLocationInfoL( 
-                       RLbsLocationInfoArray& aLocationInfoArray,
-                       const TLbsConversionPrefs aConversionPrefs, 
-                       const TLbsConversionOutputInfoMask aRequestedInfo ) = 0;
-
-    /** 
-     * Cancels an ongoing conversion operation.
-     * If there is no ongoing conversion the cancellation request is ignored.
-     *
-     * The MLbsLocInfoConverterPluginObserver::OnConversionComplete callback is 
-     * not invoked.
-     */
-    IMPORT_C virtual void CancelConvertLocationInfo() = 0;
-
-	/** 
-	 * This method is reserved for future expansion and should not be used 
-	 * or implemented by derived classes.
-	 */								
-	IMPORT_C virtual TAny* ExtendedInterface( TInt aFunctionNumber, 
-                                               TAny* aPtr1, 
-                                               TAny* aPtr2 );
-
-private: // data
-
-    /**
-     * Instance identifier key. When instance of an implementation is
-     * created by ECOM framework, the framework will assign UID
-     * for it. The UID is used in destructor to notify framework that 
-     * this instance is being destroyed and resources can be released.
-     */
-     TUid iDtor_ID_Key;
-     
-    };
-
-
-/**
-* This class encapsulates the construction parameters for a Coordinate 
-* Conversion plugin.
-*
-* These parameters are passed by the LBS subsystem to the implementation
-* of the Plugin module via ECom. The ECom constructor
-* should take a single TAny* parameter. That parameter should be cast to
-* a variable of type TLbsLocInfoConverterPluginParams.
-*
-* @see CLbsLocInfoConverterPluginBase::NewL
-*/
-class TLbsLocInfoConverterPluginParams : public TLbsLocInfoConverterPluginClassTypeBase
-	{
-	
-public:
-    
-	/**
-	 * This class encapsulates the construction parameters for a Coordinate 
-	 * Conversion plugin implementation.
-     *
-	 * When created, the LBS subsystem must provide a reference to the 
-	 * plugin's observer.  
-     *
-	 * @see MLbsLocInfoConverterPluginObserver
-     * @see CLbsLocInfoConverterPluginBase::NewL
-     */
-    IMPORT_C TLbsLocInfoConverterPluginParams( 
-		MLbsLocInfoConverterPluginObserver& aObserver );
-
-	/**
-	 * Returns a reference to the observer.
-     *
-	 * @see MLbsLocInfoConverterPluginObserver
-	 * @see CLbsLocInfoConverterPluginBase::NewL
-	 */
-	IMPORT_C MLbsLocInfoConverterPluginObserver& Observer() const;
-	
-protected:
-    
-	/**
-	 *  Handle to the plugin observer
-	 */
-    MLbsLocInfoConverterPluginObserver& iObserver;
-    
-    /**
-     * Reserved for future use
-     */
-	TUint8 iReserved[20];
-	
-	};
-
-#endif // LBS_LOC_INFO_CONVERSION_PLUGIN_BASE_H

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/inc/lbslocinfoconverterpluginbase.hrh	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,33 +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:  Resource headers for project
-*
-*/
-
-
-/**
-* @file
-* @publishedPartner
-* @prototype
-*/
-
-
-#ifndef LBSLOCINFOCONVERTERPLUGINBASE_HRH
-#define LBSLOCINFOCONVERTERPLUGINBASE_HRH
-
-// ECom interface ID for Location information converter Plugin API
-#define KLbsLocInfoConverterPlugInInterfaceId (0x10287201)
-
-
-#endif // LBSLOCINFOCONVERTERPLUGINBASE_HRH

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/inc/lbslocinfoconverterpluginclasstypes.h	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +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: Common enumerations used by client applications and plugins 
-* for conversion of location information.
-*
-*/
-
-/**
-@file
-@publishedPartner
-@prototype
-*/
-
-
-#ifndef LBS_LOC_INFO_CONV_PLUGIN_CLASS_TYPES_H
-#define LBS_LOC_INFO_CONV_PLUGIN_CLASS_TYPES_H
-
-
-/** Type used for identifying class types */
-typedef TUint32 TLbsLocInfoConverterPluginParamsClassType;
-
-
-/**
- * Class types for TLbsLocInfoConverterPluginParams and its derived classes 
- */
-enum _TLbsLocInfoConverterPluginParamsClassType
-	{
-	/** Should be used for data initialisation only */
-	ELbsLocInfoConverterPluginParamsUnknownClass = 0x00,
-
-	/** Identifier for TLbsLocInfoConverterPluginParams class */
-	ELbsLocInfoConverterPluginParamsClass        = 0x01,
-
-	/** Not used. */
-	ELbsLocInfoConverterPluginParamsLastClass    = 0xFFFFFFFF
-	};
-
-
-#endif // LBS_LOC_INFO_CONV_PLUGIN_CLASS_TYPES_H
-

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/inc/lbslocinfoconverterplugincommon.h	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +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: Base class for all the class representing
-* location informations.
-*
-*/
-
-/**
-@file
-@publishedPartner
-@prototype
-*/
-
-#ifndef LBS_LOCATION_CONVERTER_PLUGIN_COMMON_H
-#define LBS_LOCATION_CONVERTER_PLUGIN_COMMON_H
-
-#include <e32std.h>
-
-
-/**
-The generic base for classes that store conversion Plugin Interface 
-related information
-*/
-class TLbsLocInfoConverterPluginClassTypeBase
-	{
-public:
-	IMPORT_C TUint32 ClassType() const;
-	IMPORT_C TUint ClassSize() const;
-
-protected:
-	IMPORT_C TLbsLocInfoConverterPluginClassTypeBase();
-
-protected:
-	/** The type of the derived class */
-	TUint32 iClassType;
-	/** The size of the derived class */
-	TUint iClassSize;
-	};
-
-
-#endif // LBS_LOCATION_CONVERTER_PLUGIN_COMMON_H

--- a/locationmgmt/locmonitor/ConversionApi/ConversionPluginApi/src/lbslocinfoconverterpluginbase.cpp	Fri Apr 09 17:19:12 2010 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +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: Implentation of functions shared between all 
-* implementations of the LBS Network Protocol Module 
-* interface/ECom plugin.
-*
-*/
-
-
-#include <e32base.h>
-#include <ecom/ecom.h>
-
-#include <lbs/lbslocinfoconverterpluginbase.h>
-#include <lbs/lbslocinfoconverterpluginclasstypes.h>
-
-
-// ---------------------------------------------------------------------------
-// MLbsLocInfoConverterPluginObserver::ExtendedInterface()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TVersion MLbsLocInfoConverterPluginObserver::Version() const
-    {
-    return TVersion( 1, 0, 0 );
-    }
-
-// ---------------------------------------------------------------------------
-// MLbsLocInfoConverterPluginObserver::ExtendedInterface()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TAny* MLbsLocInfoConverterPluginObserver::ExtendedInterface( 
-                TInt  /*aFunctionNumber*/,
-                TAny* /*aPtr1*/,
-                TAny* /*aPtr2*/ )
-    {
-    return NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// CLbsLocInfoConverterPluginBase::NewL()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLbsLocInfoConverterPluginBase* CLbsLocInfoConverterPluginBase::NewL( 
-                                    TUid aImplementationUid,
-                                    TLbsLocInfoConverterPluginParams& aParams )
-    {
-    TAny* ptr = REComSession::CreateImplementationL( aImplementationUid, 
-                         _FOFF( CLbsLocInfoConverterPluginBase, iDtor_ID_Key ),
-                         reinterpret_cast<TAny*>( &aParams ) );
-
-    return reinterpret_cast<CLbsLocInfoConverterPluginBase*>(ptr);
-    }  
-
-// ---------------------------------------------------------------------------
-// CLbsLocInfoConverterPluginBase::~CLbsLocInfoConverterPluginBase()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C CLbsLocInfoConverterPluginBase::~CLbsLocInfoConverterPluginBase()
-    {
-    REComSession::DestroyedImplementation( iDtor_ID_Key );
-    }
-
-// ---------------------------------------------------------------------------
-// CLbsLocInfoConverterPluginBase::Version()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TVersion CLbsLocInfoConverterPluginBase::Version() const
-    {
-    return TVersion( 1, 0, 0 );
-    }
-
-// ---------------------------------------------------------------------------
-// CLbsLocInfoConverterPluginBase::ExtendedInterface()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TAny* CLbsLocInfoConverterPluginBase::ExtendedInterface(
-                                    TInt  /*aFunctionNumber*/,
-                                    TAny* /*aPtr1*/,
-                                    TAny* /*aPtr2*/ )
-    {
-    return NULL;
-    }
-
-// ---------------------------------------------------------------------------
-// TLbsLocInfoConverterPluginParams::TLbsLocInfoConverterPluginParams()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C TLbsLocInfoConverterPluginParams::TLbsLocInfoConverterPluginParams(
-           MLbsLocInfoConverterPluginObserver& aObserver ):iObserver(aObserver)
-    {
-    iClassType = ELbsLocInfoConverterPluginParamsClass;
-    iClassSize = sizeof(TLbsLocInfoConverterPluginParams);
-    }
-		
-// ---------------------------------------------------------------------------
-// TLbsLocInfoConverterPluginParams::Observer()
-// other items were commented in the header
-// ---------------------------------------------------------------------------
-//
-EXPORT_C MLbsLocInfoConverterPluginObserver& TLbsLocInfoConverterPluginParams::Observer() const
-	{
-	return iObserver;
-	}