# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1271424496 -10800 # Node ID bdd4df282e3e25e706d50925e86bc0a4317f47ee # Parent 9cfd9a3ee49c5aa53f5f0cda4a0ec790062b00f6 Revision: 201011 Kit: 201015 diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourceadaptation/gpsdatasourceadaptation/group/EPos_PluginFw.mmp --- a/datasourceadaptation/gpsdatasourceadaptation/group/EPos_PluginFw.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourceadaptation/gpsdatasourceadaptation/group/EPos_PluginFw.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -33,7 +33,7 @@ SOURCE EPos_CPositionerRegistry.cpp USERINCLUDE ../inc - +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp --- a/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourceadaptation/gpsdatasourceadaptation/group/lbs_gps_data_source_adaptation.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_gps_data_source_adaptation source \sf\os\lbs\datasourceadaptation\gpsdatasourceadaptation diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourceadaptation/gpsdatasourceadaptation/src/EPos_CPositioner.cpp --- a/datasourceadaptation/gpsdatasourceadaptation/src/EPos_CPositioner.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourceadaptation/gpsdatasourceadaptation/src/EPos_CPositioner.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -23,6 +23,11 @@ #include "EPos_PositionerConstructParams.h" #include "EPos_CPositionerExtension.h" #include "EPos_CPosPsyExtension.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "EPos_CPositionerTraces.h" +#endif + // ================= MEMBER FUNCTIONS ======================= @@ -36,6 +41,7 @@ EXPORT_C CPositioner* CPositioner::NewL( TAny* aConstructionParameters) { + OstTraceFunctionEntry0( CPOSITIONER_NEWL_ENTRY ); TUid implUid = reinterpret_cast (aConstructionParameters)->iImplementationUid; @@ -68,6 +74,7 @@ TUid aImplementationUid, const CPositioner& aPositioner) { + OstTraceFunctionEntry0( DUP1_CPOSITIONER_NEWL_ENTRY ); TPositionerConstructParams params; params.iImplementationUid = aImplementationUid; @@ -83,8 +90,10 @@ */ EXPORT_C CPositioner::~CPositioner() { + OstTraceFunctionEntry1( CPOSITIONER_CPOSITIONER_ENTRY, this ); delete iExtension; REComSession::DestroyedImplementation(iDtorIdKey); + OstTraceFunctionExit1( CPOSITIONER_CPOSITIONER_EXIT, this ); } /** @@ -92,6 +101,8 @@ */ EXPORT_C CPositioner::CPositioner() { + OstTraceFunctionEntry1( DUP1_CPOSITIONER_CPOSITIONER_ENTRY, this ); + OstTraceFunctionExit1( DUP1_CPOSITIONER_CPOSITIONER_EXIT, this ); } /** @@ -105,6 +116,7 @@ */ EXPORT_C void CPositioner::BaseConstructL(TAny* aConstructionParameters) { + OstTraceFunctionEntry1( CPOSITIONER_BASECONSTRUCTL_ENTRY, this ); TPositionerConstructParams* params = reinterpret_cast(aConstructionParameters); @@ -112,6 +124,7 @@ params->iImplementationUid, params->iStatusObserver, params->iParamObserver); + OstTraceFunctionExit1( CPOSITIONER_BASECONSTRUCTL_EXIT, this ); } /** @@ -122,6 +135,7 @@ */ EXPORT_C TBool CPositioner::TrackingOverridden() const { + OstTraceFunctionEntry1( CPOSITIONER_TRACKINGOVERRIDDEN_ENTRY, this ); return EFalse; } @@ -133,7 +147,9 @@ EXPORT_C void CPositioner::StartTrackingL( const TTimeIntervalMicroSeconds& /*aInterval*/) { + OstTraceFunctionEntry1( CPOSITIONER_STARTTRACKINGL_ENTRY, this ); User::Leave(KErrNotSupported); + OstTraceFunctionExit1( CPOSITIONER_STARTTRACKINGL_EXIT, this ); } /** @@ -142,6 +158,8 @@ */ EXPORT_C void CPositioner::StopTracking() { + OstTraceFunctionEntry1( CPOSITIONER_STOPTRACKING_ENTRY, this ); + OstTraceFunctionExit1( CPOSITIONER_STOPTRACKING_EXIT, this ); } /** @@ -157,7 +175,9 @@ */ EXPORT_C void CPositioner::ServiceL(RMessage2& /*aMessage*/) { + OstTraceFunctionEntry1( CPOSITIONER_SERVICEL_ENTRY, this ); User::Leave(KErrNotSupported); + OstTraceFunctionExit1( CPOSITIONER_SERVICEL_EXIT, this ); } /** @@ -167,6 +187,7 @@ */ EXPORT_C TUid CPositioner::ImplementationUid() const { + OstTraceFunctionEntry1( CPOSITIONER_IMPLEMENTATIONUID_ENTRY, this ); return iExtension->iPsyExtension->iImplementationUid; } @@ -183,6 +204,7 @@ EXPORT_C TInt CPositioner::GetRequiredPositionQuality( TPositionQuality& aPositionQuality) const { + OstTraceFunctionEntry1( CPOSITIONER_GETREQUIREDPOSITIONQUALITY_ENTRY, this ); return iExtension->iParamObserver->GetRequiredPositionQuality( aPositionQuality); } @@ -203,7 +225,9 @@ */ EXPORT_C void CPositioner::GetMaxAge(TTime& aMaxAge) const { + OstTraceFunctionEntry1( CPOSITIONER_GETMAXAGE_ENTRY, this ); iExtension->iParamObserver->GetMaxAge(aMaxAge); + OstTraceFunctionExit1( CPOSITIONER_GETMAXAGE_EXIT, this ); } /** @@ -222,6 +246,7 @@ */ EXPORT_C TBool CPositioner::IsPartialUpdateAllowed() const { + OstTraceFunctionEntry1( CPOSITIONER_ISPARTIALUPDATEALLOWED_ENTRY, this ); return iExtension->iParamObserver->IsPartialUpdateAllowed(); } @@ -232,6 +257,7 @@ */ EXPORT_C MPositionerStatus* CPositioner::PositionerStatus() { + OstTraceFunctionEntry1( CPOSITIONER_POSITIONERSTATUS_ENTRY, this ); return iExtension->iPsyExtension; } @@ -247,7 +273,9 @@ EXPORT_C void CPositioner::CancelNotifyPositionUpdate(TInt /*aError*/) { + OstTraceFunctionEntry1( CPOSITIONER_CANCELNOTIFYPOSITIONUPDATE_ENTRY, this ); CancelNotifyPositionUpdate(); + OstTraceFunctionExit1( CPOSITIONER_CANCELNOTIFYPOSITIONUPDATE_EXIT, this ); } //EXPORT_C void CPositioner::CPositioner_Reserved1() @@ -259,6 +287,8 @@ */ EXPORT_C void CPositioner::CPositioner_Reserved2() { + OstTraceFunctionEntry1( CPOSITIONER_CPOSITIONER_RESERVED2_ENTRY, this ); + OstTraceFunctionExit1( CPOSITIONER_CPOSITIONER_RESERVED2_EXIT, this ); } /** @@ -272,7 +302,9 @@ */ EXPORT_C void CPositioner::GetUpdateTimeOut(TTimeIntervalMicroSeconds& aUpdateTimeOut) const { + OstTraceFunctionEntry1( CPOSITIONER_GETUPDATETIMEOUT_ENTRY, this ); iExtension->iParamObserver->GetUpdateTimeOut(aUpdateTimeOut); + OstTraceFunctionExit1( CPOSITIONER_GETUPDATETIMEOUT_EXIT, this ); } /** @@ -287,7 +319,9 @@ */ EXPORT_C void CPositioner::SetPsyDefaultUpdateTimeOut(const TTimeIntervalMicroSeconds& aUpdateTimeOut) { + OstTraceFunctionEntry1( CPOSITIONER_SETPSYDEFAULTUPDATETIMEOUT_ENTRY, this ); iExtension->iParamObserver->SetPsyDefaultUpdateTimeOut(aUpdateTimeOut); + OstTraceFunctionExit1( CPOSITIONER_SETPSYDEFAULTUPDATETIMEOUT_EXIT, this ); } /** @@ -302,7 +336,9 @@ */ EXPORT_C void CPositioner::ExtendUpdateTimeOut(const TTimeIntervalMicroSeconds& aAdditionalTime) { + OstTraceFunctionEntry1( CPOSITIONER_EXTENDUPDATETIMEOUT_ENTRY, this ); iExtension->iParamObserver->ExtendUpdateTimeOut(aAdditionalTime); + OstTraceFunctionExit1( CPOSITIONER_EXTENDUPDATETIMEOUT_EXIT, this ); } diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/datasourceadaptation/gpsdatasourceadaptation/traces/osttracedefinitions.h Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,22 @@ +/* +* Copyright (c) 2010 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 __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ + +#include +#endif diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsy_name.rss --- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsy_name.rss Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/data/nlabtgpspsy_name.rss Fri Apr 16 16:28:16 2010 +0300 @@ -21,7 +21,7 @@ // INCLUDES #include -#include "Nla_btgpspsy.loc" +#include // RESOURCE DEFINITIONS diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/bld.inf --- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/bld.inf Fri Apr 16 16:28:16 2010 +0300 @@ -23,6 +23,8 @@ PRJ_EXPORTS ./101fe999.cre z:/private/10202be9/101fe999.cre +../data/Nla_btgpspsy.loc OS_LAYER_LOC_EXPORT_PATH(Nla_btgpspsy.loc) + ../inc/Settings/BtGpsPsyPrivateCRKeys.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/btgpspsyprivatecrkeys.h) ../inc/Settings/BtGpsPsyPrivatePSKeys.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/btgpspsyprivatepskeys.h) diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/nla_btgpspsy.mmp --- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/nla_btgpspsy.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/group/nla_btgpspsy.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -13,7 +13,7 @@ // Description: // - +#include TARGET nlabtgpspsy.dll TARGETTYPE PLUGIN @@ -22,7 +22,7 @@ CAPABILITY ALL -TCB - +OS_LAYER_SYSTEMINCLUDE START RESOURCE ../data/101FE99A.rss TARGET nlabtgpspsy.rsc diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/src/Connecting/BTGPSDeviceSelector.cpp --- a/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/src/Connecting/BTGPSDeviceSelector.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/bluetoothgpspositioningmodule/btgpspsy/src/Connecting/BTGPSDeviceSelector.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -94,11 +94,13 @@ //Set UUID selectionFilter().SetUUID(KSerialPortServiceClass); - - TBTDeviceClass selectionDeviceClass( - EMajorServicePositioning, - EMajorDeviceUnclassified, - 0); //Minor device class unspecified + //Apply No filter: To support BC - Some older Nokia (or other) devices do not specify + //one or other Class causing filter out if filtered for Positioning + //Major Service Class, Major Device Class and Minor device class unspecified + TBTDeviceClass selectionDeviceClass( + 0, + 0, + 0); //Set device class selectionFilter().SetDeviceClass(selectionDeviceClass); diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp --- a/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/bluetoothgpspositioningmodule/group/lbs_bt_positioning_module.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_bt_positioning_module source \sf\os\lbs\datasourcemodules\bluetoothgpspositioningmodule diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp --- a/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/defaultpositioningmodule/group/lbs_default_positioning_module.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_default_positioning_module source \sf\os\lbs\datasourcemodules\defaultpositioningmodule diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/defaultpositioningmodule/src/epos_cposconstmanager.cpp --- a/datasourcemodules/defaultpositioningmodule/src/epos_cposconstmanager.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/defaultpositioningmodule/src/epos_cposconstmanager.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -132,7 +132,6 @@ { switch ( aDeviceStatus ) { - case TPositionModuleStatus::EDeviceReady: case TPositionModuleStatus::EDeviceActive: return Min( KPosTimeshiftValueMultiplier*aTtnf.Int64(), diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp --- a/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/gpspositioningmodule/group/lbs_agps_positioning_module.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_agps_positioning_module source \sf\os\lbs\datasourcemodules\gpspositioningmodule diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/locationapesuplpsy/src/lbssuplpsyadaptation.cpp --- a/datasourcemodules/locationapesuplpsy/src/lbssuplpsyadaptation.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/locationapesuplpsy/src/lbssuplpsyadaptation.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -25,7 +25,7 @@ #include "LbsPsyNgMsgs.h" #include "lbscommoninternaldatatypes.h" -#include +#include const TUid KSuplPsyUid = {KSuplPsyImplUid}; //KSuplPsyImplUid defined in "suplpsy.hrh" // ----------------------------------------------------------------------------- diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp --- a/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/networkpositioningmodule/group/lbs_network_positioning_module.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_network_positioning_module source \sf\os\lbs\datasourcemodules\networkpositioningmodule diff -r 9cfd9a3ee49c -r bdd4df282e3e datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp --- a/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/datasourcemodules/simulationpositioningmodule/group/lbs_simulation_positioning_module.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_simulation_positioning_module source \sf\os\lbs\datasourcemodules\simulationpositioningmodule diff -r 9cfd9a3ee49c -r bdd4df282e3e lbs_info/lbs_metadata/lbs_metadata.mrp --- a/lbs_info/lbs_metadata/lbs_metadata.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/lbs_info/lbs_metadata/lbs_metadata.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_metadata source \sf\os\lbs\lbs_info\lbs_metadata source \sf\os\lbs\package_definition.xml diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/group/lbs_testproduct.mrp --- a/lbstest/lbstestproduct/group/lbs_testproduct.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/group/lbs_testproduct.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_testproduct source \sf\os\lbs\lbstest\lbstestproduct\test_group diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/lbsprivacyfw/group/bld.inf --- a/lbstest/lbstestproduct/lbsprivacyfw/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/group/bld.inf Fri Apr 16 16:28:16 2010 +0300 @@ -16,7 +16,7 @@ //#include "../lbsprivfwutils/group/bld.inf" #include "../lbsprivfwtestchannel/group/BLD.INF" #include "../lbsprivfwproxy/group/bld.inf" -#include "../lbsprivfwnotifier/group/bld.inf" +//#include "../lbsprivfwnotifier/group/bld.inf" #include "../lbstestprivacycontroller/group/bld.inf" #include "../lbstestprivacycontrollersimple/group/bld.inf" diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/lbsprivacyfw/group/lbsprivacyfwsupport.iby --- a/lbstest/lbstestproduct/lbsprivacyfw/group/lbsprivacyfwsupport.iby Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/group/lbsprivacyfwsupport.iby Fri Apr 16 16:28:16 2010 +0300 @@ -20,7 +20,7 @@ REM LBS Privacy FW test support dlls -#include +REM #include #include #include REM #include diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwproxy/inc/lbsprivfwproxy.h --- a/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwproxy/inc/lbsprivfwproxy.h Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwproxy/inc/lbsprivfwproxy.h Fri Apr 16 16:28:16 2010 +0300 @@ -29,7 +29,7 @@ #include -#include +#include #include #include diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestchannelmsgtypes.h --- a/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestchannelmsgtypes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestchannelmsgtypes.h Fri Apr 16 16:28:16 2010 +0300 @@ -30,10 +30,9 @@ #include #include -#include #include #include - +#include #include #include diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestrequestinfo.h --- a/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestrequestinfo.h Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/lbsprivacyfw/lbsprivfwtestchannel/inc/tlbsprivfwtestrequestinfo.h Fri Apr 16 16:28:16 2010 +0300 @@ -31,8 +31,7 @@ #include #include #include - -#include +#include #include #include diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/lbssisinstall/group/te_lbssisinstall.mmp --- a/lbstest/lbstestproduct/lbssisinstall/group/te_lbssisinstall.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/lbssisinstall/group/te_lbssisinstall.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -36,6 +36,8 @@ USERINCLUDE ../inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN +MW_LAYER_SYSTEMINCLUDE_SYMBIAN + LIBRARY euser.lib LIBRARY efsrv.lib diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/s60privacyfw/group/bld.inf --- a/lbstest/lbstestproduct/s60privacyfw/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/s60privacyfw/group/bld.inf Fri Apr 16 16:28:16 2010 +0300 @@ -15,7 +15,7 @@ #include "../LcfFIPrivacyNotifier_1_0_ECom/Controller/group/Bld.inf" -#include "../LcfFIPrivacyNotifier_1_0_ECom/Notifier/group/Bld.inf" +//#include "../LcfFIPrivacyNotifier_1_0_ECom/Notifier/group/Bld.inf" #include "../Td_PrivFW_TEF/group/Bld.inf" PRJ_TESTEXPORTS diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/s60privacyfw/group/nilelbsplugin.iby --- a/lbstest/lbstestproduct/s60privacyfw/group/nilelbsplugin.iby Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/s60privacyfw/group/nilelbsplugin.iby Fri Apr 16 16:28:16 2010 +0300 @@ -18,11 +18,14 @@ #ifndef __NILE_LBS_PLUGIN_IBY__ #define __NILE_LBS_PLUGIN_IBY__ -#ifdef _DEBUG -ECOM_PLUGIN_UDEB(lcfnotifier.dll, lcfnotifier.rsc) -#else -ECOM_PLUGIN(lcfnotifier.dll, lcfnotifier.rsc) -#endif + +/* Wont build without QNN +* #ifdef _DEBUG +* ECOM_PLUGIN_UDEB(lcfnotifier.dll, lcfnotifier.rsc) +* #else +* ECOM_PLUGIN(lcfnotifier.dll, lcfnotifier.rsc) +* #endif +*/ file=ABI_DIR\DEBUG_DIR\LcfPluginCtrl.dll System\libs\LcfPluginCtrl.dll diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/sf/core/sflbsclient/group/ctsflbsclientserver.mmp --- a/lbstest/lbstestproduct/sf/core/sflbsclient/group/ctsflbsclientserver.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/sf/core/sflbsclient/group/ctsflbsclientserver.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -32,6 +32,8 @@ USERINCLUDE ../../../../../../datasourcemodules/networkpositioningmodule/inc //USERINCLUDE ../../lbsassdata/inc +MW_LAYER_SYSTEMINCLUDE_SYMBIAN + // Lbs Client framework code. SOURCEPATH ../src SOURCE ctlbsclienteventtimer.cpp diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxyPrivacySuite/TestExecuteServers/LbsPrivFwTestServer.xml --- a/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxyPrivacySuite/TestExecuteServers/LbsPrivFwTestServer.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxyPrivacySuite/TestExecuteServers/LbsPrivFwTestServer.xml Fri Apr 16 16:28:16 2010 +0300 @@ -17,12 +17,12 @@ networkprotocolmodules\suplproxyprotocolmodule\test\te_terminalplugin\group\BLD.INF - + lbsprivfwproxy.dll c:\sys\bin\lbsprivfwproxy.dll diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxySuite/TestExecuteServers/CTSuplProxyTestServer.xml --- a/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxySuite/TestExecuteServers/CTSuplProxyTestServer.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/tdxml/LbsSuite/LbsIntegrationSuite/LbsSuplProxySuite/TestExecuteServers/CTSuplProxyTestServer.xml Fri Apr 16 16:28:16 2010 +0300 @@ -54,12 +54,12 @@ c:\resource\plugins\testreflocplugin.rsc - + \epoc32\data\Z\resource\plugins\testqnnplugin.rsc diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/tdxml/LbsSuite/LbsPrivacySuite/LbsUnitSuite/te_Lbs_sppm_PrivFWCapSuite/testexecuteservers/LbsPrivFwTestServer.xml --- a/lbstest/lbstestproduct/tdxml/LbsSuite/LbsPrivacySuite/LbsUnitSuite/te_Lbs_sppm_PrivFWCapSuite/testexecuteservers/LbsPrivFwTestServer.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/tdxml/LbsSuite/LbsPrivacySuite/LbsUnitSuite/te_Lbs_sppm_PrivFWCapSuite/testexecuteservers/LbsPrivFwTestServer.xml Fri Apr 16 16:28:16 2010 +0300 @@ -11,12 +11,12 @@ - + \epoc32\data\Z\resource\plugins\lbsprivfwnotifier.rsc diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/testdata/featuredatabase.xml --- a/lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/testdata/featuredatabase.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/lbstestproduct/ut/lbsgpsdatasourcemodules/lbslocbtgpspsy/te_lbsbtgpspsy/testdata/featuredatabase.xml Fri Apr 16 16:28:16 2010 +0300 @@ -5,7 +5,7 @@ Copyright (c) 2005-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 "Eclipse Public License v1.0" + 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". diff -r 9cfd9a3ee49c -r bdd4df282e3e lbstest/locationprotocoltest/group/lbs_networktest.mrp --- a/lbstest/locationprotocoltest/group/lbs_networktest.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/lbstest/locationprotocoltest/group/lbs_networktest.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_networktest source \sf\os\lbs\lbstest\locationprotocoltest diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp --- a/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/agpslocationmgr/group/lbs_agpslocationmanager.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_agpslocationmanager source \sf\os\lbs\locationmgmt\agpslocationmgr diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/LbsClient/LbsApi/group/Lbs.mmp --- a/locationmgmt/locationcore/LbsClient/LbsApi/group/Lbs.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locationcore/LbsClient/LbsApi/group/Lbs.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -42,6 +42,7 @@ USERINCLUDE ../inc USERINCLUDE ../src +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositioner.cpp --- a/locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositioner.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locationcore/LbsClient/LbsApi/src/LbsPositioner.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -22,6 +22,11 @@ #include "lbslocservermessageenums.h" #include "LbsPtrHolder.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "LbsPositionerTraces.h" +#endif + #ifdef _DEBUG #include @@ -39,6 +44,8 @@ iPtrHolder(NULL), iReserved(NULL) { + OstTraceFunctionEntry1( RPOSITIONSERVER_RPOSITIONSERVER_ENTRY, this ); + OstTraceFunctionExit1( RPOSITIONSERVER_RPOSITIONSERVER_EXIT, this ); } /** @@ -47,9 +54,11 @@ */ void RPositionServer::ConstructL() { + OstTraceFunctionEntry1( RPOSITIONSERVER_CONSTRUCTL_ENTRY, this ); __ASSERT_ALWAYS(iPtrHolder == NULL, User::Panic(KPosClientFault, EPositionServerHandleNotClosed)); iPtrHolder = CServerPositioningPtrHolder::NewL(1, 1); + OstTraceFunctionExit1( RPOSITIONSERVER_CONSTRUCTL_EXIT, this ); } /** @@ -58,8 +67,10 @@ */ void RPositionServer::Destruct() { + OstTraceFunctionEntry1( RPOSITIONSERVER_DESTRUCT_ENTRY, this ); delete iPtrHolder; iPtrHolder = NULL; + OstTraceFunctionExit1( RPOSITIONSERVER_DESTRUCT_EXIT, this ); } /** @@ -73,6 +84,7 @@ */ EXPORT_C TInt RPositionServer::Connect() { + OstTraceFunctionEntry1( RPOSITIONSERVER_CONNECT_ENTRY, this ); TRAPD(ret, ConstructL()); if (ret == KErrNone) @@ -107,6 +119,7 @@ Destruct(); } + OstTraceFunctionExitExt( RPOSITIONSERVER_CONNECT_EXIT, this, ret ); return ret; } @@ -123,8 +136,10 @@ */ EXPORT_C void RPositionServer::Close() { + OstTraceFunctionEntry1( RPOSITIONSERVER_CLOSE_ENTRY, this ); RSessionBase::Close(); Destruct(); + OstTraceFunctionExit1( RPOSITIONSERVER_CLOSE_EXIT, this ); } /** @@ -144,6 +159,7 @@ */ EXPORT_C TInt RPositionServer::CancelRequest(TRequestId aRequestId) { + OstTraceFunctionEntry1( RPOSITIONSERVER_CANCELREQUEST_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); if (aRequestId != KServerNotifyModuleStatusEventSymbian && @@ -152,6 +168,7 @@ aRequestId != EReqEmptyLastKnownPositionStore ) { + OstTraceFunctionExitExt( RPOSITIONSERVER_CANCELREQUEST_EXIT, this, KErrNotSupported ); return KErrNotSupported; } @@ -183,6 +200,7 @@ */ EXPORT_C TVersion RPositionServer::Version() const { + OstTraceFunctionEntry1( RPOSITIONSERVER_VERSION_ENTRY, this ); return TVersion( KPosMajorVersionNumber, KPosMinorVersionNumber, @@ -206,6 +224,7 @@ */ EXPORT_C TInt RPositionServer::GetDefaultModuleId(TPositionModuleId& aModuleId) const { + OstTraceFunctionEntry1( RPOSITIONSERVER_GETDEFAULTMODULEID_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); TPckg moduleId(aModuleId); @@ -225,6 +244,7 @@ */ EXPORT_C TInt RPositionServer::GetNumModules(TUint& aNumModules) const { + OstTraceFunctionEntry1( RPOSITIONSERVER_GETNUMMODULES_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); TPckg numModules(aNumModules); @@ -248,6 +268,7 @@ TInt aModuleIndex, TPositionModuleInfoBase& aModuleInfo) const { + OstTraceFunctionEntry1( RPOSITIONSERVER_GETMODULEINFOBYINDEX_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); TPtr8 ptr(reinterpret_cast(&aModuleInfo), @@ -275,6 +296,7 @@ EXPORT_C TInt RPositionServer::GetModuleInfoById(TPositionModuleId aModuleId, TPositionModuleInfoBase& aModuleInfo) const { + OstTraceFunctionEntry1( RPOSITIONSERVER_GETMODULEINFOBYID_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); TPckg moduleId(aModuleId); @@ -297,6 +319,7 @@ EXPORT_C TInt RPositionServer::GetModuleStatus(TPositionModuleStatusBase& aPosModuleStatus, TPositionModuleId aModuleId) const { + OstTraceFunctionEntry1( RPOSITIONSERVER_GETMODULESTATUS_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); TPckg moduleId(aModuleId); @@ -337,6 +360,7 @@ TRequestStatus& aStatus, const TPositionModuleId aModuleId) const { + OstTraceFunctionEntry1( RPOSITIONSERVER_NOTIFYMODULESTATUSEVENT_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); __ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder)); @@ -349,6 +373,7 @@ SendReceive(ELbsNotifyModuleStatusEvent, TIpcArgs(&iPtrHolder->Ptr(0), &iPtrHolder->PtrC(0)), aStatus); + OstTraceFunctionExit1( RPOSITIONSERVER_NOTIFYMODULESTATUSEVENT_EXIT, this ); } /** @@ -366,6 +391,7 @@ */ EXPORT_C void RPositionServer::EmptyLastKnownPositionStore(TRequestStatus& aStatus) { + OstTraceFunctionEntry1( RPOSITIONSERVER_EMPTYLASTKNOWNPOSITIONSTORE_ENTRY, this ); __ASSERT_ALWAYS(Handle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); __ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder)); @@ -384,6 +410,8 @@ : RSubSessionBase(), iReserved(NULL) { + OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_RPOSITIONERSUBSESSIONBASE_ENTRY, this ); + OstTraceFunctionExit1( RPOSITIONERSUBSESSIONBASE_RPOSITIONERSUBSESSIONBASE_EXIT, this ); } @@ -406,6 +434,7 @@ */ EXPORT_C TInt RPositionerSubSessionBase::CancelRequest(TRequestId aRequestId) { + OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_CANCELREQUEST_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); if (aRequestId != KGetLastKnownPositionSymbian && @@ -416,6 +445,7 @@ aRequestId != EReqNotifyPositionUpdate && aRequestId != EReqGetLastKnownPositionArea) { + OstTraceFunctionExitExt( RPOSITIONERSUBSESSIONBASE_CANCELREQUEST_EXIT, this, KErrNotSupported ); return KErrNotSupported; } @@ -447,6 +477,8 @@ */ EXPORT_C TInt RPositionerSubSessionBase::CompleteRequest(TInt /*aRequestId*/) { + OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_COMPLETEREQUEST_ENTRY, this ); + OstTraceFunctionExitExt( RPOSITIONERSUBSESSIONBASE_COMPLETEREQUEST_EXIT, this, KErrNotSupported ); return KErrNotSupported; } @@ -462,6 +494,8 @@ TAny* /*aPtr1*/, TAny* /*aPtr2*/) { + OstTraceFunctionEntry1( RPOSITIONERSUBSESSIONBASE_EXTENDEDINTERFACE_ENTRY, this ); + OstTraceFunctionExitExt( RPOSITIONERSUBSESSIONBASE_EXTENDEDINTERFACE_EXIT, this, ( TUint )( NULL ) ); return NULL; } @@ -477,6 +511,8 @@ iPtrHolder(NULL), iReserved(NULL) { + OstTraceFunctionEntry1( RPOSITIONER_RPOSITIONER_ENTRY, this ); + OstTraceFunctionExit1( RPOSITIONER_RPOSITIONER_EXIT, this ); } /** @@ -484,10 +520,12 @@ */ EXPORT_C void RPositioner::ConstructL() { + OstTraceFunctionEntry1( RPOSITIONER_CONSTRUCTL_ENTRY, this ); __ASSERT_ALWAYS(iPtrHolder == NULL, User::Panic(KPosClientFault, EPositionServerHandleNotClosed)); // Pointers to as many messages/requests as can be supported concurrently (currently 4) iPtrHolder = CPositioningPtrHolder::NewL(4, 0); + OstTraceFunctionExit1( RPOSITIONER_CONSTRUCTL_EXIT, this ); } /** @@ -495,8 +533,10 @@ */ EXPORT_C void RPositioner::Destruct() { + OstTraceFunctionEntry1( RPOSITIONER_DESTRUCT_ENTRY, this ); delete iPtrHolder; iPtrHolder = NULL; + OstTraceFunctionExit1( RPOSITIONER_DESTRUCT_EXIT, this ); } /** @@ -518,6 +558,7 @@ */ EXPORT_C TInt RPositioner::Open(RPositionServer& aPosServer) { + OstTraceFunctionEntry1( RPOSITIONER_OPEN_ENTRY, this ); __ASSERT_ALWAYS(aPosServer.Handle() != 0, User::Panic(KPosClientFault, EPositionServerBadHandle)); @@ -530,6 +571,7 @@ { Destruct(); } + OstTraceFunctionExitExt( RPOSITIONER_OPEN_EXIT, this, ret ); return ret; } @@ -557,6 +599,7 @@ EXPORT_C TInt RPositioner::Open(RPositionServer& aPosServer, TPositionModuleId aModuleId) { + OstTraceFunctionEntry1( DUP1_RPOSITIONER_OPEN_ENTRY, this ); __ASSERT_ALWAYS(aPosServer.Handle() != 0, User::Panic(KPosClientFault, EPositionServerBadHandle)); @@ -570,6 +613,7 @@ { Destruct(); } + OstTraceFunctionExitExt( DUP1_RPOSITIONER_OPEN_EXIT, this, ret ); return ret; } @@ -587,6 +631,7 @@ EXPORT_C TInt RPositioner::Open(RPositionServer& aPosServer, const TPositionCriteriaBase& aCriteria) { + OstTraceFunctionEntry1( DUP2_RPOSITIONER_OPEN_ENTRY, this ); __ASSERT_ALWAYS(aPosServer.Handle() != 0, User::Panic(KPosClientFault, EPositionServerBadHandle)); @@ -601,6 +646,7 @@ { Destruct(); } + OstTraceFunctionExitExt( DUP2_RPOSITIONER_OPEN_EXIT, this, ret ); return ret; } @@ -617,8 +663,10 @@ */ EXPORT_C void RPositioner::Close() { + OstTraceFunctionEntry1( RPOSITIONER_CLOSE_ENTRY, this ); CloseSubSession(ELbsPositionerClose); Destruct(); + OstTraceFunctionExit1( RPOSITIONER_CLOSE_EXIT, this ); } /** @@ -640,8 +688,10 @@ CRequestor::TRequestorFormat /*aFormat*/, const TDesC& /*aData*/) { + OstTraceFunctionEntry1( RPOSITIONER_SETREQUESTOR_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); + OstTraceFunctionExitExt( RPOSITIONER_SETREQUESTOR_EXIT, this, KErrNone ); return KErrNone; } @@ -661,8 +711,10 @@ */ EXPORT_C TInt RPositioner::SetRequestor(const RRequestorStack& /*aRequestorStack*/) { + OstTraceFunctionEntry1( DUP1_RPOSITIONER_SETREQUESTOR_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); + OstTraceFunctionExitExt( DUP1_RPOSITIONER_SETREQUESTOR_EXIT, this, KErrNone ); return KErrNone; } @@ -701,6 +753,7 @@ EXPORT_C void RPositioner::GetLastKnownPosition(TPositionInfoBase& aPosInfo, TRequestStatus& aStatus) const { + OstTraceFunctionEntry1( RPOSITIONER_GETLASTKNOWNPOSITION_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); __ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder)); @@ -712,6 +765,7 @@ SendReceive(ELbsGetLastKnownPosition, TIpcArgs(&iPtrHolder->Ptr(0), aPosInfo.PositionClassType(), aPosInfo.PositionClassSize()), aStatus); + OstTraceFunctionExit1( RPOSITIONER_GETLASTKNOWNPOSITION_EXIT, this ); } /** @@ -775,6 +829,7 @@ TPositionAreaInfoBase& aAreaInfo, TRequestStatus& aStatus) const { + OstTraceFunctionEntry1( RPOSITIONER_GETLASTKNOWNPOSITIONAREA_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); __ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder)); @@ -791,6 +846,7 @@ SendReceive(ELbsGetLastKnownPositionArea, TIpcArgs(&iPtrHolder->Ptr(2),&iPtrHolder->Ptr(3)), aStatus); + OstTraceFunctionExit1( RPOSITIONER_GETLASTKNOWNPOSITIONAREA_EXIT, this ); } /** @@ -838,6 +894,7 @@ EXPORT_C void RPositioner::NotifyPositionUpdate(TPositionInfoBase& aPosInfo, TRequestStatus& aStatus) const { + OstTraceFunctionEntry1( RPOSITIONER_NOTIFYPOSITIONUPDATE_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); __ASSERT_ALWAYS(iPtrHolder != NULL, User::Panic(KPosClientFault, EPositionNullPointerHolder)); @@ -848,6 +905,7 @@ SendReceive(ELbsPosNotifyPositionUpdate, TIpcArgs(&iPtrHolder->Ptr(1)), aStatus); + OstTraceFunctionExit1( RPOSITIONER_NOTIFYPOSITIONUPDATE_EXIT, this ); } /** @@ -872,6 +930,7 @@ */ EXPORT_C TInt RPositioner::SetUpdateOptions(const TPositionUpdateOptionsBase& aPosOption) { + OstTraceFunctionEntry1( RPOSITIONER_SETUPDATEOPTIONS_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); TPtrC8 ptr( @@ -895,6 +954,7 @@ */ EXPORT_C TInt RPositioner::GetUpdateOptions(TPositionUpdateOptionsBase& aPosOption) const { + OstTraceFunctionEntry1( RPOSITIONER_GETUPDATEOPTIONS_ENTRY, this ); __ASSERT_ALWAYS(SubSessionHandle(), User::Panic(KPosClientFault, EPositionServerBadHandle)); TPtr8 ptr( @@ -918,5 +978,6 @@ TAny* aPtr1, TAny* aPtr2) { + OstTraceFunctionEntry1( RPOSITIONER_EXTENDEDINTERFACE_ENTRY, this ); return RPositionerSubSessionBase::ExtendedInterface(aFunctionNumber, aPtr1, aPtr2); } diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locationmgmt/locationcore/LbsClient/LbsApi/traces/osttracedefinitions.h Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,22 @@ +/* +* Copyright (c) 2010 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 __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ + +#include +#endif diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/LbsLogging/te_LbsLogging/Runtime Settings.xml --- a/locationmgmt/locationcore/LbsLogging/te_LbsLogging/Runtime Settings.xml Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ - - - - - - - - -]> - - - Debugger Runtime - - MWRuntimeSettings_WorkingDirectory - MWRuntimeSettings_CommandLine\testdata\scripts\te_LbsLoggingSuite.script - MWRuntimeSettings_HostApplication - PathEPOC32\RELEASE\WINSCW\UDEB\testexecute.exe - PathFormatWindows - PathRootdrive E - - MWRuntimeSettings_EnvVars - - diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/conf/locationsettings.confml Binary file locationmgmt/locationcore/conf/locationsettings.confml has changed diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/documentation/LBS UML Model.zip Binary file locationmgmt/locationcore/documentation/LBS UML Model.zip has changed diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/group/lbs_admin.mrp --- a/locationmgmt/locationcore/group/lbs_admin.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locationcore/group/lbs_admin.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_admin source \sf\os\lbs\locationmgmt\locationcore\documentation diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/lbslocsettings/data/101f500c.txt Binary file locationmgmt/locationcore/lbslocsettings/data/101f500c.txt has changed diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/lbslocsettings/group/101F500C.cre Binary file locationmgmt/locationcore/lbslocsettings/group/101F500C.cre has changed diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/lbsroot/inc/lbssystemstatelistener.h --- a/locationmgmt/locationcore/lbsroot/inc/lbssystemstatelistener.h Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locationcore/lbsroot/inc/lbssystemstatelistener.h Fri Apr 16 16:28:16 2010 +0300 @@ -126,6 +126,10 @@ * */ RSsmStateAwareSession iStateAwareSession; + /** + * Used to indicate if the System State Manager is available + */ + TBool iSystemStateManagerAvailable; #else /** * Handle to the startup property object diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locationcore/lbsroot/src/lbssystemstatelistener.cpp --- a/locationmgmt/locationcore/lbsroot/src/lbssystemstatelistener.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locationcore/lbsroot/src/lbssystemstatelistener.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -74,7 +74,15 @@ void CLbsSystemStateListener::ConstructL() { #ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT - User::LeaveIfError( iStateAwareSession.Connect( KSM2GenMiddlewareDomain3 ) ); + TInt err = iStateAwareSession.Connect( KSM2GenMiddlewareDomain3 ); + if (err != KErrNone) + { + iSystemStateManagerAvailable = EFalse; + } + else + { + iSystemStateManagerAvailable = ETrue; + } #else User::LeaveIfError( iStartupObserver.Attach( KPSUidStartup, KPSGlobalSystemState, EOwnerThread ) ); @@ -102,15 +110,23 @@ { // Listen to global system state changes #ifdef SYMBIAN_SYSTEM_STATE_MANAGEMENT // From 9.2 onwards - TSsmState ssmState = iStateAwareSession.State(); - if( ssmState.MainState() != ESsmNormal ) + if (!iSystemStateManagerAvailable) { - iStateAwareSession.RequestStateNotification( iStatus ); - SetActive(); - } - else{ iObserver.HandleStartupCompletionL(); } + else + { + TSsmState ssmState = iStateAwareSession.State(); + if( ssmState.MainState() != ESsmNormal ) + { + iStateAwareSession.RequestStateNotification( iStatus ); + SetActive(); + } + else + { + iObserver.HandleStartupCompletionL(); + } + } #else // Prior to 9.2 TInt systemStatus = 0; User::LeaveIfError( iStartupObserver.Get( systemStatus ) ); diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp --- a/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/group/lbs_locationmonitor.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_locationmonitor source \sf\os\lbs\locationmgmt\locmonitor\lbslocmonitorserver diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h --- a/locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/inc/clbslocmonitordbengine.h Fri Apr 16 16:28:16 2010 +0300 @@ -68,6 +68,7 @@ RSqlStatement iSqlSaveStatement; TRequestStatus* iClientStatus; + TBool iDBInitialised; TInt iLastMcc; TInt iLastMnc; TInt iLastLac; diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp --- a/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/locmonitor/lbslocmonitorserver/src/clbslocmonitordbengine.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -51,27 +51,34 @@ TInt error = iDatabase.Open(KSecureLocMonDB); if(KErrNotFound == error) { - RSqlSecurityPolicy securityPolicy; - User::LeaveIfError(securityPolicy.Create(TSecurityPolicy(TSecurityPolicy::EAlwaysPass))); - CleanupClosePushL(securityPolicy); - User::LeaveIfError(securityPolicy.SetDbPolicy(RSqlSecurityPolicy::EWritePolicy, TSecurityPolicy(TSecurityPolicy::EAlwaysPass))); - #ifdef LBS_LOCMONITORDB_TEST - User::LeaveIfError(iDatabase.Create(KSecureLocMonDB)); - #else - User::LeaveIfError(iDatabase.Create(KSecureLocMonDB, securityPolicy)); + RSqlSecurityPolicy securityPolicy; + User::LeaveIfError(securityPolicy.Create(TSecurityPolicy(TSecurityPolicy::EAlwaysPass))); + CleanupClosePushL(securityPolicy); + User::LeaveIfError(securityPolicy.SetDbPolicy(RSqlSecurityPolicy::EWritePolicy, TSecurityPolicy(TSecurityPolicy::EAlwaysPass))); + #ifdef LBS_LOCMONITORDB_TEST + User::LeaveIfError(iDatabase.Create(KSecureLocMonDB)); + #else + User::LeaveIfError(iDatabase.Create(KSecureLocMonDB, securityPolicy)); #endif - CleanupStack::PopAndDestroy(&securityPolicy); + CleanupStack::PopAndDestroy(&securityPolicy); + iDBInitialised = ETrue; User::LeaveIfError(iDatabase.Exec(KCreateTable)); User::LeaveIfError(iDatabase.Exec(KCreateIndex4)); User::LeaveIfError(iDatabase.Exec(KCreateIndex3)); } + else + { + User::LeaveIfError(error); + iDBInitialised = ETrue; + } User::LeaveIfError(iDatabase.Exec(KCreateTempTable)); User::LeaveIfError(iDatabase.Exec(KCreateTempIndex4)); } CLbsLocMonitorDbEngine::CLbsLocMonitorDbEngine(): -CActive(EPriorityStandard) +CActive(EPriorityStandard), +iDBInitialised(EFalse) { LBSLOG(ELogP1,"->CLbsLocMonitorDbEngine::CLbsLocMonitorDbEngine"); CActiveScheduler::Add(this); @@ -82,16 +89,23 @@ { LBSLOG(ELogP1,"->CLbsLocMonitorDbEngine::~CLbsLocMonitorDbEngine"); Cancel(); - iPeriodic->Cancel(); - delete iPeriodic; - iSqlSaveStatement.Close(); - if(iIsLastValid) + if(iPeriodic) + { + iPeriodic->Cancel(); + delete iPeriodic; + } + if(iDBInitialised) { - Insert(ETrue); + iSqlSaveStatement.Close(); + if(iIsLastValid) + { + Insert(ETrue); + } + + Flush(ETrue); + + iDatabase.Close(); } - Flush(ETrue); - - iDatabase.Close(); } diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/networkgateway/group/lbs_networkgateway.mrp --- a/locationmgmt/networkgateway/group/lbs_networkgateway.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/networkgateway/group/lbs_networkgateway.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_networkgateway source \sf\os\lbs\locationmgmt\networkgateway diff -r 9cfd9a3ee49c -r bdd4df282e3e locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp --- a/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationmgmt/networklocationmgr/group/lbs_networklocationmanager.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_networklocationmanager source \sf\os\lbs\locationmgmt\networklocationmgr diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/locationserver/group/EPos_Server.mmp --- a/locationrequestmgmt/locationserver/group/EPos_Server.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/locationserver/group/EPos_Server.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -67,6 +67,7 @@ USERINCLUDE ../../../locationmgmt/locationcore/LbsLocCommon/ServerFramework/inc USERINCLUDE ../../../locationmgmt/locationcore/LbsNetRegStatusInt/inc USERINCLUDE ../../../locationmgmt/locationcore/inc +USERINCLUDE ../traces OS_LAYER_SYSTEMINCLUDE_SYMBIAN diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/locationserver/group/lbs_locationserver.mrp --- a/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/locationserver/group/lbs_locationserver.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_locationserver diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/locationserver/src/EPos_CPositionRequest.cpp --- a/locationrequestmgmt/locationserver/src/EPos_CPositionRequest.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/locationserver/src/EPos_CPositionRequest.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -30,6 +30,11 @@ //TODO Verify #include "EPos_CPosLocMonitorReqHandlerHub.h" +#include "OstTraceDefinitions.h" +#ifdef OST_TRACE_COMPILER_IN_USE +#include "EPos_CPositionRequestTraces.h" +#endif + @@ -435,6 +440,7 @@ */ void CPositionRequest::DoCancel() { + OstTraceFunctionEntry1( CPOSITIONREQUEST_DOCANCEL_ENTRY, this ); LBS_RDEBUG_VAR_INT("CPositionRequest::DoCancel() iRequestPhase", iRequestPhase); iTimeoutTimer->Cancel(); @@ -482,6 +488,7 @@ } iRequestPhase = EPosReqInactive; + OstTraceFunctionExit1( CPOSITIONREQUEST_DOCANCEL_EXIT, this ); } diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/locationserver/traces/osttracedefinitions.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/locationrequestmgmt/locationserver/traces/osttracedefinitions.h Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,22 @@ +/* +* Copyright (c) 2010 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 __OSTTRACEDEFINITIONS_H__ +#define __OSTTRACEDEFINITIONS_H__ + +#include +#endif diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/PrivacyDataTypes/group/EPos_PrivacyTypes.mmp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/PrivacyDataTypes/group/EPos_PrivacyTypes.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/PrivacyDataTypes/group/EPos_PrivacyTypes.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -29,8 +29,8 @@ SOURCE EPos_RPosRequestorStack.cpp USERINCLUDE ../inc -// OS_LAYER_SYSTEMINCLUDE_SYMBIAN illigal depenancy on cntdef.h in APP layer. Needs fixing -APP_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN //Needs macro for system include for epoc32\include\lbs + LIBRARY euser.lib LIBRARY estor.lib diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/BWINS/EPOSPRVQNIFU.DEF --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/BWINS/EPOSPRVQNIFU.DEF Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -EXPORTS - ??0CPosPrivacyNotifier@@IAE@XZ @ 1 NONAME ; CPosPrivacyNotifier::CPosPrivacyNotifier(void) - ??1CPosPrivacyNotifier@@UAE@XZ @ 2 NONAME ; CPosPrivacyNotifier::~CPosPrivacyNotifier(void) - ?BaseConstructL@CPosPrivacyNotifier@@IAEXVTUid@@H@Z @ 3 NONAME ; void CPosPrivacyNotifier::BaseConstructL(class TUid, int) - ?CancelReason@CPosPrivacyNotifier@@QBE?AW4TPosVerifyCancelReason@@XZ @ 4 NONAME ; enum TPosVerifyCancelReason CPosPrivacyNotifier::CancelReason(void) const - ?CheckClientSecureId@CPosPrivacyNotifier@@QAEHVTSecureId@@@Z @ 5 NONAME ; int CPosPrivacyNotifier::CheckClientSecureId(class TSecureId) - ?CompleteAllRequests@CPosPrivacyNotifier@@QAEXH@Z @ 6 NONAME ; void CPosPrivacyNotifier::CompleteAllRequests(int) - ?CompleteRequest@CPosPrivacyNotifier@@QAEXJH@Z @ 7 NONAME ; void CPosPrivacyNotifier::CompleteRequest(long, int) - ?CurrentRequest@CPosPrivacyNotifier@@QBEJXZ @ 8 NONAME ; long CPosPrivacyNotifier::CurrentRequest(void) const - ?GetRequestsL@CPosPrivacyNotifier@@QBEXAAV?$RArray@J@@@Z @ 9 NONAME ; void CPosPrivacyNotifier::GetRequestsL(class RArray &) const - ?LocationRequestDecision@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 10 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::LocationRequestDecision(void) const - ?NotificationReason@CPosPrivacyNotifier@@QBE?AW4TPosNotificationReason@@XZ @ 11 NONAME ; enum TPosNotificationReason CPosPrivacyNotifier::NotificationReason(void) const - ?NotifierBase@CPosPrivacyNotifier@@QBEPAVMEikSrvNotifierBase2@@XZ @ 12 NONAME ; class MEikSrvNotifierBase2 * CPosPrivacyNotifier::NotifierBase(void) const - ?QueryTimeoutStrategy@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 13 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::QueryTimeoutStrategy(void) const - ?RequestSource@CPosPrivacyNotifier@@QBE?AW4TPosRequestSource@@XZ @ 14 NONAME ; enum TPosRequestSource CPosPrivacyNotifier::RequestSource(void) const - ?RequestTypeL@CPosPrivacyNotifier@@QBE?AW4TRequestType@1@J@Z @ 15 NONAME ; enum CPosPrivacyNotifier::TRequestType CPosPrivacyNotifier::RequestTypeL(long) const - ?RequestorCountL@CPosPrivacyNotifier@@QBEHXZ @ 16 NONAME ; int CPosPrivacyNotifier::RequestorCountL(void) const - ?RequestorLC@CPosPrivacyNotifier@@QBEPAVCPosRequestor@@H@Z @ 17 NONAME ; class CPosRequestor * CPosPrivacyNotifier::RequestorLC(int) const - ?SetCurrentRequestL@CPosPrivacyNotifier@@QAEXJ@Z @ 18 NONAME ; void CPosPrivacyNotifier::SetCurrentRequestL(long) - diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/EABI/eposprvqnifU.DEF --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/EABI/eposprvqnifU.DEF Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -EXPORTS - _ZN19CPosPrivacyNotifier14BaseConstructLE4TUidi @ 1 NONAME - _ZN19CPosPrivacyNotifier15CompleteRequestEli @ 2 NONAME - _ZN19CPosPrivacyNotifier18SetCurrentRequestLEl @ 3 NONAME - _ZN19CPosPrivacyNotifier19CheckClientSecureIdE9TSecureId @ 4 NONAME - _ZN19CPosPrivacyNotifier19CompleteAllRequestsEi @ 5 NONAME - _ZN19CPosPrivacyNotifierC2Ev @ 6 NONAME - _ZN19CPosPrivacyNotifierD0Ev @ 7 NONAME - _ZN19CPosPrivacyNotifierD1Ev @ 8 NONAME - _ZN19CPosPrivacyNotifierD2Ev @ 9 NONAME - _ZNK19CPosPrivacyNotifier11RequestorLCEi @ 10 NONAME - _ZNK19CPosPrivacyNotifier12CancelReasonEv @ 11 NONAME - _ZNK19CPosPrivacyNotifier12GetRequestsLER6RArrayIlE @ 12 NONAME - _ZNK19CPosPrivacyNotifier12NotifierBaseEv @ 13 NONAME - _ZNK19CPosPrivacyNotifier12RequestTypeLEl @ 14 NONAME - _ZNK19CPosPrivacyNotifier13RequestSourceEv @ 15 NONAME - _ZNK19CPosPrivacyNotifier14CurrentRequestEv @ 16 NONAME - _ZNK19CPosPrivacyNotifier15RequestorCountLEv @ 17 NONAME - _ZNK19CPosPrivacyNotifier18NotificationReasonEv @ 18 NONAME - _ZNK19CPosPrivacyNotifier20QueryTimeoutStrategyEv @ 19 NONAME - _ZNK19CPosPrivacyNotifier23LocationRequestDecisionEv @ 20 NONAME - _ZTI19CPosPrivacyNotifier @ 21 NONAME ; ## - _ZTV19CPosPrivacyNotifier @ 22 NONAME ; ## - diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/Bld.inf Fri Apr 16 16:28:16 2010 +0300 @@ -14,21 +14,13 @@ // - -#include "../test/group/bld.inf" - PRJ_EXPORTS ../inc/EPos_PrivacyNotifier.hrh /epoc32/include/lbs/epos_privacynotifier.hrh -../inc/EPos_CPosPrivacyNotifier.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/epos_cposprivacynotifier.h) - -lbsqueryandnotification.iby /epoc32/rom/include/lbsqueryandnotification.iby -// This file does not have to be exported. NRH should use relative path instead. -//..\inc\EPos_TPosQNInputData.h OSEXT_LAYER_SOURCE_PATH(locationextensions\privacyframework\inc\EPos_TPosQNInputData.h) +// File needs to be exported to allow UI layer to access it. Otherwise code duplication/differentiation will occur. +..\inc\EPos_TPosQNInputData.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/EPos_TPosQNInputData.h) -PRJ_MMPFILES -EPos_PrivacyQNInterface.mmp // End of file diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/EPos_PrivacyQNInterface.mmp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/EPos_PrivacyQNInterface.mmp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,39 +0,0 @@ -// Copyright (c) 2005-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 eposprvqnif.dll -TARGETTYPE dll -UID 0x1000008d 0x101f7a88 - -VENDORID 0x70000001 -CAPABILITY ALL -TCB - -SOURCEPATH ../src -SOURCE EPos_CPosPrivacyNotifier.cpp -SOURCE EPos_CPosPrivacyNotifierExtension.cpp -SOURCE EPos_CPosRequestHandler.cpp - -USERINCLUDE ../inc -// OS_LAYER_SYSTEMINCLUDE_SYMBIAN illigal dependancy. depends on cntdef.h in app layer. needs fixing -APP_LAYER_SYSTEMINCLUDE_SYMBIAN - -LIBRARY euser.lib -LIBRARY estor.lib -LIBRARY eiksrv.lib -LIBRARY eposprvtyp.lib - -SMPSAFE diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/lbsqueryandnotification.iby --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/group/lbsqueryandnotification.iby Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +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_QUERYANDNOTIFICATION_IBY__ -#define __LBS_QUERYANDNOTIFICATION_IBY__ - - -REM LBS Query And Notification Api - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) && defined(SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG) - -file=ABI_DIR\DEBUG_DIR\eposprvqnif.dll System\libs\eposprvqnif.dll - -#endif // SYMBIAN_EXCLUDE_LOCATION && SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG - -#endif diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifier.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifier.h Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,144 +0,0 @@ -/* -* Copyright (c) 2005-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 CPOSPRIVACYNOTIFIER_H -#define CPOSPRIVACYNOTIFIER_H - -// INCLUDES -#include -#include - -// DATA TYPES -/** -@publishedPartner -@deprecated -*/ -typedef TInt32 TPosQNRequestId; - -// CONSTANT DECLARATIONS -/** -@publishedPartner -@deprecated -*/ -const TPosQNRequestId KPosNullQNRequestId = -1; - -// FORWARD DECLARATIONS -class CPosPrivacyNotifierExtension; -class CPosRequestor; -class MEikSrvNotifierBase2; - -// CLASS DECLARATION -/** -Base class for LBS Privacy Query & Notify (Q&N) privacy notifiers. - -A privacy notifier is a UI plug-in which handles privacy query and -notification requests. - -This class contains declarations for event methods that must be implemented -by the notifier in order to receive information about new requests or -cancelled requests. - -It also contains methods for accessing information about a request and for -completing a request. - -@publishedPartner -@deprecated -*/ -class CPosPrivacyNotifier : public CBase - { - public: - /** - Specifies whether the requested dialog should be a query or a - notification dialog. - */ - enum TRequestType { - /** Query dialog requested. */ - EQuery = 0, - /** Notification dialog requested. */ - ENotification - }; - - public: - IMPORT_C virtual ~CPosPrivacyNotifier(); - - public: - - /** - * This method is called when a new privacy query or notification has - * been requested. - * - * @param aRequestId The ID of the new query or notification request. - */ - virtual void HandleNewRequestL( - /* IN */ TPosQNRequestId aRequestId - ) = 0; - - /** - * This method is called when a privacy query or notification request is - * cancelled. - * - * It is not necessary to call @ref CompleteRequest for a cancelled - * request. - * - * @param aRequestId The ID of the cancelled query or notification - * request. - */ - virtual void HandleRequestCancelled( - /* IN */ TPosQNRequestId aRequestId - ) = 0; - - /** - * This method is called to cancel all outstanding requests. - * - * It is not necessary to call @ref CompleteRequest for a cancelled - * request. - */ - virtual void HandleAllRequestCancelled() = 0; - - IMPORT_C MEikSrvNotifierBase2* NotifierBase() const; - IMPORT_C TPosVerifyCancelReason CancelReason() const; - IMPORT_C void GetRequestsL(RArray& aRequestArray) const; - IMPORT_C TRequestType RequestTypeL(TPosQNRequestId aRequestId) const; - IMPORT_C void SetCurrentRequestL(TPosQNRequestId aRequestId); - IMPORT_C TPosQNRequestId CurrentRequest() const; - IMPORT_C TPosRequestDecision QueryTimeoutStrategy() const; - IMPORT_C TPosRequestSource RequestSource() const; - IMPORT_C TPosRequestDecision LocationRequestDecision() const; - IMPORT_C TPosNotificationReason NotificationReason() const; - IMPORT_C TInt RequestorCountL() const; - IMPORT_C CPosRequestor* RequestorLC(TInt aRequestorIndex) const; - IMPORT_C void CompleteRequest(TPosQNRequestId aRequestId, TInt aCompletionCode); - IMPORT_C void CompleteAllRequests(TInt aCompletionCode); - IMPORT_C TBool CheckClientSecureId(TSecureId aSecureId); - - protected: - IMPORT_C CPosPrivacyNotifier(); - IMPORT_C void BaseConstructL(TUid aChannel,TInt aPriority); - - private: - // By default, prohibit copy constructor - CPosPrivacyNotifier( const CPosPrivacyNotifier& ); - // Prohibit assigment operator - CPosPrivacyNotifier& operator= ( const CPosPrivacyNotifier& ); - - private: - CPosPrivacyNotifierExtension* iExtension; - }; - -#endif // CPOSPRIVACYNOTIFIER_H diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifierExtension.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosPrivacyNotifierExtension.h Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,204 +0,0 @@ -/* -* Copyright (c) 2005-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: -* -*/ - - - - -/** - @file - @internalComponent - @released -*/ - -#ifndef CPOSPRIVACYNOTIFIEREXTENSION_H -#define CPOSPRIVACYNOTIFIEREXTENSION_H - -// INCLUDES -#include -#include -#include "EPos_TPosQNInputData.h" - -// FORWARD DECLARATIONS -class CPosRequestHandler; - -// CLASS DECLARATION - -/** -* The privacy notifier extension helper class. -*/ -NONSHARABLE_CLASS(CPosPrivacyNotifierExtension) : public CBase, public MEikSrvNotifierBase2 - { - public: - - /** - * Two-phased constructor. - */ - static CPosPrivacyNotifierExtension* NewL( - CPosPrivacyNotifier* aPrivNotifier); - - /** - * Destructor. - */ - ~CPosPrivacyNotifierExtension(); - - public: // New functions - - /** - * Finds the request id in the array which matches the specified - * request id. - * @param aRequestId The id of a query or notification request. - * @return The index of the matching request id within the array. - * KErrNotFound, if no matching request id can be found. - */ - TInt Find(TPosQNRequestId aRequestId) const; - - /** - * Resets data - */ - void ResetData(); - - /** - * Removes a request from the array containing all outstanding requests. - * @param aRequestId The id of a query or notification request. - * @return The index of the matching request id within the array. - * KErrNotFound, if no matching request id can be found. - */ - TInt RemoveRequestFromArray(TPosQNRequestId aRequestId); - - /** - * Empties the array containing all outstanding requests. - */ -// void RemoveAllRequestsFromArray(); - - /** - * Prepares the current request by getting RequestorStack. - */ - void PrepareL(TPosQNRequestId aRequestId); - - /** - * This method completes a privacy query or notification request. - * - * @param aRequestId The id of the privacy query or notification request - * to complete. - * @param aCompletionCode The request completion code. - */ - void CompleteRequest( - /* IN */ TPosQNRequestId aRequestId, - /* IN */ TInt aCompletionCode - ); - - /** - * This method completes all outstanding requests. - * - * This function should be used if a serious error is encountered. All - * requests can then be completed with the same error code. - * - * @param aCompletionCode The request completion code. - */ - void CompleteAllRequests( - /* IN */ TInt aCompletionCode - ); - - public: // Functions from base classes - - /** - * From MEikSrvNotifierBase2 Called to destroy notifier. - */ - void Release(); - - /** - * From MEikSrvNotifierBase2 Called when the DLL is loaded. - * @return info object containing UID, channel and priority - */ - TNotifierInfo RegisterL(); - - /** - * From MEikSrvNotifierBase2 - * @return info object containing UID, channel and priority - */ - TNotifierInfo Info() const; - - /** - * From MEikSrvNotifierBase2 - * - * Not supported, leaves if called. - * @param aBuffer Input descriptor. Not used. - * @return TPtrC8 - */ - TPtrC8 StartL(const TDesC8& aBuffer); - - /** - * From MEikSrvNotifierBase2 - * - * @param aBuffer Input descriptor, contains the format. Not used. - * @param aReplySlot Reply slot. Not used. - * @param aMessage Used to write data back to client - */ - void StartL( - const TDesC8& aBuffer, - TInt aReplySlot, - const RMessagePtr2& aMessage - ); - - /** - * From MEikSrvNotifierBase2 - * Cancels all outstanding requests. - */ - void Cancel(); - - /** - * From MEikSrvNotifierBase2 - * Starts the notifier dialog. - * @param aBuffer Input descriptor, contains the format. - * A TPosQNInputData is expected as input. - * @return TPtrC8 - */ - TPtrC8 UpdateL(const TDesC8& aBuffer); - - private: - /** - * C++ default constructor. - */ - CPosPrivacyNotifierExtension(); - - /** - * By default Symbian 2nd phase constructor is private. - */ - void ConstructL(CPosPrivacyNotifier* aPrivNotifier); - - // By default, prohibit copy constructor - CPosPrivacyNotifierExtension(const CPosPrivacyNotifierExtension&); - // Prohibit assigment operator - CPosPrivacyNotifierExtension& operator= ( - const CPosPrivacyNotifierExtension&); - - public: // Data - TNotifierInfo iNotifierInfo; - RArray iRequestArray; - TPosQNRequestId iCurrentRequestId; - RPosRequestorStack iRequestorStack; - RMessagePtr2 iMessage; - - private: // Data - CPosPrivacyNotifier* iPrivacyNotifier; - CPosRequestHandler* iRequestHandler; - - }; - -#endif // CPOSPRIVACYNOTIFIEREXTENSION_H - -// End of File diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosRequestHandler.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_CPosRequestHandler.h Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,106 +0,0 @@ -/* -* Copyright (c) 2005-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: -* -*/ - - - - -/** - @file - @internalComponent - @released -*/ - -#ifndef EPOS_CPOSREQUESTHANDLER_H -#define EPOS_CPOSREQUESTHANDLER_H - -// INCLUDES -#include -#include "EPos_TPosQNInputData.h" - -// FORWARD DECLARATIONS -class CPosPrivacyNotifier; - -// CLASS DECLARATION - -/** -* The privacy notifier request handling helper class. -*/ -NONSHARABLE_CLASS(CPosRequestHandler) : public CActive - { - public: // Constructors and destructors - - /** - * Two-phased constructor. - */ - static CPosRequestHandler* NewL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension); - - /** - * Destructor. - */ - ~CPosRequestHandler(); - - public: // New functions - - /** - * Starts the active scheduler. - * @param aInputData Data containing update parameters. - */ - void ScheduleRequest(const TPosQNInputData& aInputData); - - protected: // Functions from base classes - - /** - * From CActive. - */ - void RunL(); - - /** - * From CActive. - */ - void DoCancel(); - - /** - * From CActive. - */ - TInt RunError(TInt aError); - - private: - - /** - * Private C++ default constructor. - */ - CPosRequestHandler(); - - /** - * By default Symbian 2nd phase constructor is private. - */ - void ConstructL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension); - - private: // Data - - CPosPrivacyNotifier* iPrivacyNotifier; - CPosPrivacyNotifierExtension* iExtension; - TPosQNInputData iInputData; - -}; - -#endif // EPOS_CPOSREQUESTHANDLER_H - diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_TPosQNInputData.h --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_TPosQNInputData.h Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc/EPos_TPosQNInputData.h Fri Apr 16 16:28:16 2010 +0300 @@ -29,13 +29,14 @@ // INCLUDES #include -#include + // FORWARD DECLARATIONS // CLASS DECLARATION const TInt KPosQNInputDataClassSize = 36; +typedef TInt32 TPosQNRequestId; /** * Data sent in Query/Notification communication. diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifier.cpp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifier.cpp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,488 +0,0 @@ -// Copyright (c) 2005-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: -// - - - -#include -#include -#include -#include -#include "EPos_CPosPrivacyNotifierExtension.h" - -#if defined(NRH_UNIT_TEST) -// For the NRH unit test, use a custom notifier UID. -// This is so that we can have both the unit test -// Q&N notifier and the integration test Q&N notifier -// (using the real UID) in the same ROM. -const TUid KNotifierUid = { 0x10283744 }; -#else -const TUid KNotifierUid = { KPosPrivacyNotifierImplUid }; -#endif // NRH_UNIT_TEST - - -// --------------------------------------------------------------------------- -/** -Default constructor. - -This constructor assumes that the notifier only supports -EBasicCapabilities, i.e. the notifier supports queries but only -notifications of accepted requests are supported. If the notifier -is more advanced, the overloaded constructor should be used. -*/ -EXPORT_C CPosPrivacyNotifier::CPosPrivacyNotifier() - { - } - -// --------------------------------------------------------------------------- -/** -Symbian 2nd phase constructor. Must be called first thing during construction. - -The notifier must specify channel and priority. These attributes are -defined by the Notifier Framework in eiknotapi.h. - -The different priority values are defined in -MEikSrvNotifierBase2::TNotifierPriority. - -@param aChannel A channel. See definition in Notifier Framework. -@param aPriority A notifier priority. See definition in Notifier Framework. - -@see MEikSrvNotifierBase2::TNotifierPriority -*/ -EXPORT_C void CPosPrivacyNotifier::BaseConstructL( - TUid aChannel, - TInt aPriority) - { - iExtension = CPosPrivacyNotifierExtension::NewL(this); - iExtension->iNotifierInfo.iChannel = aChannel; - iExtension->iNotifierInfo.iPriority = aPriority; - iExtension->iNotifierInfo.iUid = KNotifierUid; - } - -// --------------------------------------------------------------------------- -EXPORT_C CPosPrivacyNotifier::~CPosPrivacyNotifier() - { - delete iExtension; - } - -// --------------------------------------------------------------------------- -/** -Retrieves a handle to the notifier base. - -This handle is needed to populate the notifier base array in the -notifier factory method. - -@return A handle to the notifier base. -*/ -EXPORT_C MEikSrvNotifierBase2* CPosPrivacyNotifier::NotifierBase() const - { - return iExtension; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the cancel reason. - -Cancel reason can only be retrieved when HandleRequestCancelled or -HandleAllRequestCancelled is running. If the method is called at another -time, it will return ECancelReasonNotAvailable. - -Note that the TCancelReason enum is designed to be extendable, -i.e. new values may be added in the future. This means that any -unrecognized value must be treated like ECancelReasonNotAvailable. - -@return The cancel reason. - -@see HandleRequestCancelled() -@see HandleAllRequestCancelled() -@see ECancelReasonNotAvailable -@see TCancelReason -*/ -EXPORT_C TPosVerifyCancelReason - CPosPrivacyNotifier::CancelReason() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound) - { - return EPosCancelReasonNotAvailable; - } - - return iExtension->iRequestArray[index].iCancelReason; - } - -// --------------------------------------------------------------------------- -/** -Returns a list of all outstanding privacy query and notification requests. - -If there are no outstanding requests, an empty array will be returned. - -@param aRequestArray On return, this array will contain all - outstanding query and notification requests. -*/ -EXPORT_C void CPosPrivacyNotifier::GetRequestsL( - RArray& aRequestArray) const - { - aRequestArray.Reset(); - for (TInt i = 0; i < iExtension->iRequestArray.Count(); i++) - { - User::LeaveIfError( - aRequestArray.Append(iExtension->iRequestArray[i].iId)); - } - } - -// --------------------------------------------------------------------------- -/** -Checks whether a request is privacy query or notification type. - -@param aRequestId The ID of the request to check. -@return @p EQuery if query type and ENotification if notification type. - -@leave If the specified request is not an outstanding request, this method - will leave with error code KErrNotFound. -*/ -EXPORT_C CPosPrivacyNotifier::TRequestType CPosPrivacyNotifier::RequestTypeL( - TPosQNRequestId aRequestId) const - { - TInt index = iExtension->Find(aRequestId); - __ASSERT_ALWAYS(index != KErrNotFound, User::Leave(KErrNotFound)); - - if (iExtension->iRequestArray[index].iType == - TPosQNInputData::EQuery) - { - return CPosPrivacyNotifier::EQuery; - } - - return CPosPrivacyNotifier::ENotification; - } - -// --------------------------------------------------------------------------- -/** -Sets the request which the notifier wants to read information about. - -Current request specifies the request which will be accessed when -RequestorCountL and RequestorLC are called. - -@param aRequestId The ID of the current request. - -@leave If the specified request is not an outstanding request, this method - will leave with error code KErrNotFound. -*/ -EXPORT_C void CPosPrivacyNotifier::SetCurrentRequestL( - TPosQNRequestId aRequestId) - { - iExtension->PrepareL(aRequestId); - } - -// --------------------------------------------------------------------------- -/** -Returns the ID of the current request. - -Current request specifies the request which will be accessed when -RequestorCountL and RequestorLC are called. - -@return The ID of the current request. If the current request has - become invalid, e.g. the request set as current has been cancelled, - KPosNullQNRequestId will be returned. - -@see RequestorCountL() -@see RequestorLC() -*/ -EXPORT_C TPosQNRequestId CPosPrivacyNotifier::CurrentRequest() const - { - return iExtension->iCurrentRequestId; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the timeout strategy for a query. - -Timeout strategy specifies what the decision will be if the -verification query times out. The decision is either -EPosDecisionRejected or EPosDecisionAccepted. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -Timeout strategy can only be retrieved for a query request. If the -current request is a notification, this method will return -EPosDecisionNotAvailable. - -Note that the TPosRequestDecision enum is designed to be -extendable, i.e. new values may be added in the future. This means -that any unrecognized value must be treated like -EPosDecisionNotAvailable. - -@return The timeout strategy. - -@see SetCurrentRequestL() -*/ -EXPORT_C TPosRequestDecision CPosPrivacyNotifier::QueryTimeoutStrategy() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound || - iExtension->iRequestArray[index].iType == - TPosQNInputData::ENotification) - { - return EPosDecisionNotAvailable; - } - - return iExtension->iRequestArray[index].iTimeoutStrategy; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the source of the location request. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -Note that the TPosRequestSource enum is designed to be extendable, -i.e. new values may be added in the future. This means that any -unrecognized value must be treated like EPosRequestSourceNotAvailable. - -@return The request source, e.g. EPosRequestSourceNetwork or - EPosRequestSourceNotAvailable if the request source is not specified. - -@see SetCurrentRequestL() -@see TPosRequestSource -*/ -EXPORT_C TPosRequestSource CPosPrivacyNotifier::RequestSource() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound) - { - return EPosRequestSourceNotAvailable; - } - - return iExtension->iRequestArray[index].iRequestSource; - } - -// --------------------------------------------------------------------------- -/** -Retrieves whether the location request was accepted or rejected. - -For notification requests, this method will return the request -decision. For queries, this method will return EPosDecisionNotAvailable. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL, otherwise this method will return -EPosDecisionNotAvailable. - -Note that the TPosRequestDecision enum is designed to be -extendable, i.e. new values may be added in the future. -This means that any unrecognized value must be treated like -EPosDecisionNotAvailable. - -@return Whether the location request was accepted or rejected, or - EPosDecisionNotAvailable if the outcome has not yet been decided. - -@see SetCurrentRequestL() -@see TPosRequestDecision -*/ -EXPORT_C TPosRequestDecision - CPosPrivacyNotifier::LocationRequestDecision() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound || - iExtension->iRequestArray[index].iType == TPosQNInputData::EQuery) - { - return EPosDecisionNotAvailable; - } - - return iExtension->iRequestArray[index].iRequestDecision; - } - -// --------------------------------------------------------------------------- -/** -Retrieves the reason for a notification. - -Note that the TPosNotificationReason enum is designed to be -extendable, i.e. new values may be added in the future. This means -that any unrecognized value must be treated like -EPosNotificationReasonNotAvailable. -If the notification reason is not known, the notification request -should be completed with code KErrNotSupported. - -@return The notification reason. - For queries, this method will return EPosNotificationReasonNotAvailable. - - Before calling this method, current request must first be set by - calling SetCurrentRequestL, otherwise this method will return - EPosNotificationReasonNotAvailable. - -@see EPosNotificationReasonNotAvailable -@see SetCurrentRequestL() -@see TPosNotificationReason -*/ -EXPORT_C TPosNotificationReason CPosPrivacyNotifier::NotificationReason() const - { - TPosQNRequestId requestId = CurrentRequest(); - TInt index = iExtension->Find(requestId); - - if (index == KErrNotFound || - iExtension->iRequestArray[index].iType == TPosQNInputData::EQuery) - { - return EPosNotificationReasonNotAvailable; - } - - return iExtension->iRequestArray[index].iNotificationReason; - } - -// --------------------------------------------------------------------------- -/** -Returns the number of requestors in the current request. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -@return The number of requestors in the current request. - -@leave If the current request has not been set or the current request is no - longer valid, e.g. because it has been cancelled or completed, this - method will leave with error code KErrNotFound. - -@see SetCurrentRequestL() -*/ -EXPORT_C TInt CPosPrivacyNotifier::RequestorCountL() const - { - __ASSERT_ALWAYS(CurrentRequest() != KPosNullQNRequestId, - User::Leave(KErrNotFound)); - - return iExtension->iRequestorStack.Count(); - } - -// --------------------------------------------------------------------------- -/** -Returns basic information about the requestor at a specified index. - -Before calling this method, current request must first be set by -calling SetCurrentRequestL. - -Whether the requestor is a contact or a service can be found by -calling CPosRequestor::RequestorType. - -If the requestor is a contact, the requestor object can be cast to -CPosContactRequestor. - -If the requestor is a service, the requestor object can be cast to -CPosServiceRequestor. - -@param aRequestorIndex The index of the requestor. -@return Information about the requestor. - -@leave If the specified requestor index is not valid, i.e. less than 0 or - larger than or equal to RequestorCountL, this method will - leave with error code KErrArgument. - - If the current request has not been set or the current request is no - longer valid, e.g. because it has been cancelled or completed, this method - will leave with error code KErrNotFound. - -@see SetCurrentRequestL() -@see RequestorCountL() -@see CPosContactRequestor -@see CPosServiceRequestor -@see CPosRequestor::RequestorType -*/ -EXPORT_C CPosRequestor* CPosPrivacyNotifier::RequestorLC( - TInt aRequestorIndex) const - { - __ASSERT_ALWAYS(CurrentRequest() != KPosNullQNRequestId, - User::Leave(KErrNotFound)); - - __ASSERT_ALWAYS(aRequestorIndex >= 0 && - aRequestorIndex < iExtension->iRequestorStack.Count(), - User::Leave(KErrArgument)); - - CPosRequestor* requestor = iExtension->iRequestorStack[aRequestorIndex]; - TInt type = requestor->RequestorType(); - CPosRequestor::TRequestorIdFormat format = requestor->RequestorIdFormat(); - TPtrC idString = requestor->RequestorIdString(); - - if (type == CPosRequestor::ERequestorService) - { - CPosServiceRequestor* serviceRequestor = CPosServiceRequestor::NewLC(format, idString); - serviceRequestor->SetRequestType(requestor->RequestType()); - serviceRequestor->SetNetworkType(requestor->NetworkType()); - return serviceRequestor; - } - - CPosContactRequestor* contactRequestor = CPosContactRequestor::NewLC(format, idString); - contactRequestor->SetRequestType(requestor->RequestType()); - contactRequestor->SetNetworkType(requestor->NetworkType()); - return contactRequestor; - } - -// --------------------------------------------------------------------------- -/** -This method completes a privacy query or notification request. - -@param aRequestId The ID of the privacy query or notification request - to complete. -@param aCompletionCode The request completion code. - If the request is a privacy query, the completion code should be one of: - - KErrNone if query is accepted by the phone user. - - KErrAccessDenied if query is rejected by the phone user. - - KErrTimedOut if the query times out. - - If the request is a privacy notification, the completion code should be one of: - - KErrNone if the phone user dismisses the privacy notification - - KErrTimedOut if the notification times out. -*/ -EXPORT_C void CPosPrivacyNotifier::CompleteRequest( - TPosQNRequestId aRequestId, - TInt aCompletionCode) - { - iExtension->CompleteRequest(aRequestId, aCompletionCode); - } - -// --------------------------------------------------------------------------- -/** -This method completes all outstanding requests. - -This method can be used to accept or reject all outstanding -requests by completing with codes @p KErrNone or @p KErrAccessDenied -respectively. All notification requests will also be completed with -this code. - -@param aCompletionCode The request completion code. -*/ -EXPORT_C void CPosPrivacyNotifier::CompleteAllRequests(TInt aCompletionCode) - { - iExtension->CompleteAllRequests(aCompletionCode); - } - -// --------------------------------------------------------------------------- -/** -Checks that the Privacy UI was launched by the expected client. - -The caller specifies the secure ID of the expected client and this -method returns whether the Privacy UI was launched by that client or not. - -@param aSecureId The secureID of the expected client -@return ETrue if the client that called the notifier is the expected client -*/ -#pragma message("NOTE: CPosPrivacyNotifier::CheckClientSecureId has no type/return definition.") -EXPORT_C TBool CPosPrivacyNotifier::CheckClientSecureId(TSecureId aSecureId) - { - return iExtension->iMessage.SecureId() == aSecureId; - } diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifierExtension.cpp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosPrivacyNotifierExtension.cpp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,279 +0,0 @@ -// Copyright (c) 2005-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: -// - - - -// INCLUDE FILES -#include -#include -#include "EPos_CPosPrivacyNotifierExtension.h" -#include "EPos_CPosRequestHandler.h" - -// ================= MEMBER FUNCTIONS ======================= - -// C++ default constructor can NOT contain any code, that -// might leave. -// -CPosPrivacyNotifierExtension::CPosPrivacyNotifierExtension() - { - } - -// ----------------------------------------------------------------------------- -// CPosPrivacyNotifierExtension::ConstructL -// Symbian 2nd phase constructor can leave. -// ----------------------------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::ConstructL( - CPosPrivacyNotifier* aPrivNotifier) - { - iRequestHandler = CPosRequestHandler::NewL(aPrivNotifier, this); - iPrivacyNotifier = aPrivNotifier; - ResetData(); - } - -// Two-phased constructor -CPosPrivacyNotifierExtension* CPosPrivacyNotifierExtension::NewL( - CPosPrivacyNotifier* aPrivNotifier) - { - CPosPrivacyNotifierExtension* self = new (ELeave) - CPosPrivacyNotifierExtension; - CleanupStack::PushL(self); - self->ConstructL(aPrivNotifier); - CleanupStack::Pop(self); - return self; - } - -// Destructor -CPosPrivacyNotifierExtension::~CPosPrivacyNotifierExtension() - { - iRequestorStack.ResetAndDestroy(); - iRequestArray.Close(); - delete iRequestHandler; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Find -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TInt CPosPrivacyNotifierExtension::Find(TPosQNRequestId aRequestId) const - { - for (TInt index = 0; index < iRequestArray.Count(); index++) - { - if (iRequestArray[index].iId == aRequestId) - { - return index; - } - } - return KErrNotFound; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::ResetData -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::ResetData() - { - iRequestorStack.ResetAndDestroy(); - iCurrentRequestId = KPosNullQNRequestId; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::RemoveRequestFromArray -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TInt CPosPrivacyNotifierExtension::RemoveRequestFromArray( - TPosQNRequestId aRequestId) - { - TInt index = Find(aRequestId); - if (index == KErrNotFound) - { - return KErrNotFound; - } - - iRequestArray.Remove(index); - return index; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::PrepareL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::PrepareL( - TPosQNRequestId aRequestId) - { - TInt index = Find(aRequestId); - __ASSERT_ALWAYS(index != KErrNotFound, User::Leave(KErrNotFound)); - - iCurrentRequestId = aRequestId; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::CompleteRequest -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::CompleteRequest( - TPosQNRequestId aRequestId, - TInt aCompletionCode) - { - if (RemoveRequestFromArray(aRequestId) != KErrNotFound) - { - iMessage.Complete(aCompletionCode); - ResetData(); - } - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::CompleteAllRequests -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::CompleteAllRequests(TInt aCompletionCode) - { - CompleteRequest(iCurrentRequestId, aCompletionCode); - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Release -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::Release() - { - delete iPrivacyNotifier; - iPrivacyNotifier = NULL; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::RegisterL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -CPosPrivacyNotifierExtension::TNotifierInfo - CPosPrivacyNotifierExtension::RegisterL() - { - return iNotifierInfo; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Info -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -CPosPrivacyNotifierExtension::TNotifierInfo - CPosPrivacyNotifierExtension::Info() const - { - return iNotifierInfo; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::StartL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TPtrC8 CPosPrivacyNotifierExtension::StartL(const TDesC8& /*aBuffer*/) - { - User::Leave(KErrNotSupported); - return TPtrC8(); - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::StartL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::StartL( - const TDesC8& /*aBuffer*/, - TInt /*aReplySlot*/, - const RMessagePtr2& aMessage) - { - iMessage = aMessage; - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::Cancel -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosPrivacyNotifierExtension::Cancel() - { - if (iRequestArray.Count() > 0) - { - TPosQNRequestId reqId = iRequestArray[0].iId; - iPrivacyNotifier->HandleRequestCancelled(reqId); - CompleteRequest(reqId, KErrCancel); - } - } - -// --------------------------------------------------------- -// CPosPrivacyNotifierExtension::UpdateL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TPtrC8 CPosPrivacyNotifierExtension::UpdateL(const TDesC8& aBuffer) - { - TPtrC8 tposQnData = aBuffer.Left(KPosQNInputDataClassSize); - - TPckgBuf input; - input.Copy(tposQnData); - TPosQNInputData update = input(); - - TInt index = Find(update.iId); - if (update.iCancelReason == EPosCancelReasonNotAvailable || - (update.iCancelReason == EPosCancelReasonTimeout && - update.iNotificationReason == EPosVerificationTimeout) ) - { - HBufC8* buf = HBufC8::NewLC(update.iDataSize); - TPtrC8 bufPtr = aBuffer.Mid(KPosQNInputDataClassSize); - - RDesReadStream stream(bufPtr); - CleanupClosePushL(stream); - iRequestorStack.InternalizeL(stream); - CleanupStack::PopAndDestroy(2, buf); //buf, stream - - User::LeaveIfError(iRequestArray.Append(update)); - iRequestHandler->ScheduleRequest(update); - } - else - { - if (index == KErrNotFound) - { - User::Leave(KErrArgument); - } - - iRequestArray[index].iCancelReason = update.iCancelReason; - } - - return TPtrC8(); - } - -// End of File diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosRequestHandler.cpp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/src/EPos_CPosRequestHandler.cpp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,109 +0,0 @@ -// Copyright (c) 2005-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: -// - - - -#include "EPos_CPosRequestHandler.h" -#include -#include "EPos_CPosPrivacyNotifierExtension.h" - -// ================= MEMBER FUNCTIONS ======================= - -// C++ default constructor can NOT contain any code, that -// might leave. -// -CPosRequestHandler::CPosRequestHandler() : - CActive(CActive::EPriorityHigh) - { - } - -// EPOC default constructor can leave. -void CPosRequestHandler::ConstructL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension) - { - iPrivacyNotifier = aNotifier; - iExtension = aExtension; - CActiveScheduler::Add(this); - } - -// Two-phased constructor. -CPosRequestHandler* CPosRequestHandler::NewL( - CPosPrivacyNotifier* aNotifier, - CPosPrivacyNotifierExtension* aExtension) - { - CPosRequestHandler* self = - new(ELeave) CPosRequestHandler; - CleanupStack::PushL(self); - self->ConstructL(aNotifier, aExtension); - CleanupStack::Pop(self); - return self; - } - -// Destructor -CPosRequestHandler::~CPosRequestHandler() - { - Cancel(); - } - -// --------------------------------------------------------- -// CPosRequestHandler::ScheduleRequest -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosRequestHandler::ScheduleRequest(const TPosQNInputData& aInputData) - { - iInputData = aInputData; - - SetActive(); - TRequestStatus* status = &iStatus; - User::RequestComplete(status, KErrNone); - } - -// --------------------------------------------------------- -// CPosRequestHandler::RunL -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosRequestHandler::RunL() - { - iPrivacyNotifier->HandleNewRequestL(iInputData.iId); - } - -// --------------------------------------------------------- -// CPosRequestHandler::DoCancel -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -void CPosRequestHandler::DoCancel() - { - } - -// --------------------------------------------------------- -// CPosRequestHandler::RunError -// -// (other items were commented in a header). -// --------------------------------------------------------- -// -TInt CPosRequestHandler::RunError(TInt aError) - { - iExtension->CompleteRequest(iInputData.iId, aError); - return KErrNone; - } - -// End of File diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/bwins/t_eposprvqnifu.def --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/bwins/t_eposprvqnifu.def Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -EXPORTS - ??0CPosPrivacyNotifier@@IAE@XZ @ 1 NONAME ; CPosPrivacyNotifier::CPosPrivacyNotifier(void) - ??1CPosPrivacyNotifier@@UAE@XZ @ 2 NONAME ; CPosPrivacyNotifier::~CPosPrivacyNotifier(void) - ?BaseConstructL@CPosPrivacyNotifier@@IAEXVTUid@@H@Z @ 3 NONAME ; void CPosPrivacyNotifier::BaseConstructL(class TUid, int) - ?CancelReason@CPosPrivacyNotifier@@QBE?AW4TPosVerifyCancelReason@@XZ @ 4 NONAME ; enum TPosVerifyCancelReason CPosPrivacyNotifier::CancelReason(void) const - ?CheckClientSecureId@CPosPrivacyNotifier@@QAEHVTSecureId@@@Z @ 5 NONAME ; int CPosPrivacyNotifier::CheckClientSecureId(class TSecureId) - ?CompleteAllRequests@CPosPrivacyNotifier@@QAEXH@Z @ 6 NONAME ; void CPosPrivacyNotifier::CompleteAllRequests(int) - ?CompleteRequest@CPosPrivacyNotifier@@QAEXJH@Z @ 7 NONAME ; void CPosPrivacyNotifier::CompleteRequest(long, int) - ?CurrentRequest@CPosPrivacyNotifier@@QBEJXZ @ 8 NONAME ; long CPosPrivacyNotifier::CurrentRequest(void) const - ?GetRequestsL@CPosPrivacyNotifier@@QBEXAAV?$RArray@J@@@Z @ 9 NONAME ; void CPosPrivacyNotifier::GetRequestsL(class RArray &) const - ?LocationRequestDecision@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 10 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::LocationRequestDecision(void) const - ?NotificationReason@CPosPrivacyNotifier@@QBE?AW4TPosNotificationReason@@XZ @ 11 NONAME ; enum TPosNotificationReason CPosPrivacyNotifier::NotificationReason(void) const - ?NotifierBase@CPosPrivacyNotifier@@QBEPAVMEikSrvNotifierBase2@@XZ @ 12 NONAME ; class MEikSrvNotifierBase2 * CPosPrivacyNotifier::NotifierBase(void) const - ?QueryTimeoutStrategy@CPosPrivacyNotifier@@QBE?AW4TPosRequestDecision@@XZ @ 13 NONAME ; enum TPosRequestDecision CPosPrivacyNotifier::QueryTimeoutStrategy(void) const - ?RequestSource@CPosPrivacyNotifier@@QBE?AW4TPosRequestSource@@XZ @ 14 NONAME ; enum TPosRequestSource CPosPrivacyNotifier::RequestSource(void) const - ?RequestTypeL@CPosPrivacyNotifier@@QBE?AW4TRequestType@1@J@Z @ 15 NONAME ; enum CPosPrivacyNotifier::TRequestType CPosPrivacyNotifier::RequestTypeL(long) const - ?RequestorCountL@CPosPrivacyNotifier@@QBEHXZ @ 16 NONAME ; int CPosPrivacyNotifier::RequestorCountL(void) const - ?RequestorLC@CPosPrivacyNotifier@@QBEPAVCPosRequestor@@H@Z @ 17 NONAME ; class CPosRequestor * CPosPrivacyNotifier::RequestorLC(int) const - ?SetCurrentRequestL@CPosPrivacyNotifier@@QAEXJ@Z @ 18 NONAME ; void CPosPrivacyNotifier::SetCurrentRequestL(long) - diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/eabi/t_eposprvqnifu.def --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/eabi/t_eposprvqnifu.def Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -EXPORTS - _ZN19CPosPrivacyNotifier14BaseConstructLE4TUidi @ 1 NONAME - _ZN19CPosPrivacyNotifier15CompleteRequestEli @ 2 NONAME - _ZN19CPosPrivacyNotifier18SetCurrentRequestLEl @ 3 NONAME - _ZN19CPosPrivacyNotifier19CheckClientSecureIdE9TSecureId @ 4 NONAME - _ZN19CPosPrivacyNotifier19CompleteAllRequestsEi @ 5 NONAME - _ZN19CPosPrivacyNotifierC2Ev @ 6 NONAME - _ZN19CPosPrivacyNotifierD0Ev @ 7 NONAME - _ZN19CPosPrivacyNotifierD1Ev @ 8 NONAME - _ZN19CPosPrivacyNotifierD2Ev @ 9 NONAME - _ZNK19CPosPrivacyNotifier11RequestorLCEi @ 10 NONAME - _ZNK19CPosPrivacyNotifier12CancelReasonEv @ 11 NONAME - _ZNK19CPosPrivacyNotifier12GetRequestsLER6RArrayIlE @ 12 NONAME - _ZNK19CPosPrivacyNotifier12NotifierBaseEv @ 13 NONAME - _ZNK19CPosPrivacyNotifier12RequestTypeLEl @ 14 NONAME - _ZNK19CPosPrivacyNotifier13RequestSourceEv @ 15 NONAME - _ZNK19CPosPrivacyNotifier14CurrentRequestEv @ 16 NONAME - _ZNK19CPosPrivacyNotifier15RequestorCountLEv @ 17 NONAME - _ZNK19CPosPrivacyNotifier18NotificationReasonEv @ 18 NONAME - _ZNK19CPosPrivacyNotifier20QueryTimeoutStrategyEv @ 19 NONAME - _ZNK19CPosPrivacyNotifier23LocationRequestDecisionEv @ 20 NONAME - _ZTI19CPosPrivacyNotifier @ 21 NONAME - _ZTV19CPosPrivacyNotifier @ 22 NONAME - diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/bld.inf --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,19 +0,0 @@ -// Copyright (c) 2007-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_TESTEXPORTS - -PRJ_TESTMMPFILES -t_eposprvqnif.mmp diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/t_eposprvqnif.mmp --- a/locationrequestmgmt/networkrequesthandler/LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/test/group/t_eposprvqnif.mmp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,46 +0,0 @@ -// Copyright (c) 2005-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: -// This is a special build of the Q&N API for the NRH unit test. -// For the unit test, the UID of the RNotifier used is different, -// so that we can have both the unit test Q&N notifier and the -// integration test Q&N notifiers in the same ROM. -// - - - -MACRO NRH_UNIT_TEST - -TARGET t_eposprvqnif.dll -TARGETTYPE dll -UID 0x1000008d 0x10283745 - -VENDORID 0x70000001 -CAPABILITY ALL -TCB - -SOURCEPATH ../../src -SOURCE EPos_CPosPrivacyNotifier.cpp -SOURCE EPos_CPosPrivacyNotifierExtension.cpp -SOURCE EPos_CPosRequestHandler.cpp - -USERINCLUDE ../../inc - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -APP_LAYER_SYSTEMINCLUDE_SYMBIAN - -LIBRARY euser.lib -LIBRARY estor.lib -LIBRARY eiksrv.lib -LIBRARY eposprvtyp.lib - -SMPSAFE diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp --- a/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/group/lbs_networkrequesthandler.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_networkrequesthandler source \sf\os\lbs\locationrequestmgmt\networkrequesthandler @@ -14,5 +30,4 @@ ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\test ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\LBSPrivacyNotification\LbsPrivacyExtNotifiers\test -ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\LBSPrivacyNotification\LbsQueryAndNotification\QueryAndNotificationAPI\test ipr T \sf\os\lbs\locationrequestmgmt\networkrequesthandler\LbsX3P\LbsX3PApi\test diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.iby --- a/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.iby Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.iby Fri Apr 16 16:28:16 2010 +0300 @@ -26,7 +26,6 @@ #include "lbsprivacyexnotifiers.iby" #ifdef SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG #include "lbsprivacydatatypes.iby" - #include "lbsqueryandnotification.iby" #endif //SYMBIAN_INCLUDE_LOCATION_ADVANCED_DIALOG #endif // SYMBIAN_EXCLUDE_LOCATION diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp --- a/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/group/lbsnetworkrequesthandler.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -97,7 +97,6 @@ USERINCLUDE ../../../locationmgmt/locationcore/LbsLocDataSource/inc USERINCLUDE ../../../locationmgmt/locationcore/LbsPartnerCommon/inc USERINCLUDE ../LBSPrivacyNotification/LbsPrivacyController/inc -USERINCLUDE ../LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc USERINCLUDE ../../../locationmgmt/locationcore/inc USERINCLUDE ../../../locationmgmt/locationcore/LbsLocCommon/ServerFramework/inc USERINCLUDE ../../../locationmgmt/locationcore/LbsDebug/inc @@ -108,8 +107,8 @@ USERINCLUDE ../../../locationmgmt/locationcore/LbsLocCommon/inc -// OS_LAYER_SYSTEMINCLUDE_SYMBIAN relies on cntdef.h in app layer. This dependancy should be broken -APP_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_SYSTEMINCLUDE_SYMBIAN //Needs macro for system include for epoc32\include\lbs + LIBRARY euser.lib LIBRARY estor.lib diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h --- a/locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/inc/EPos_CPosDialogCtrl.h Fri Apr 16 16:28:16 2010 +0300 @@ -31,7 +31,7 @@ #include #include #include -#include "EPos_TPosQNInputData.h" +#include #include "EPos_PrivacyInternal.h" #include diff -r 9cfd9a3ee49c -r bdd4df282e3e locationrequestmgmt/networkrequesthandler/test/group/t_lbsnetworkrequesthandler.mmp --- a/locationrequestmgmt/networkrequesthandler/test/group/t_lbsnetworkrequesthandler.mmp Tue Feb 02 01:50:39 2010 +0200 +++ b/locationrequestmgmt/networkrequesthandler/test/group/t_lbsnetworkrequesthandler.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -105,7 +105,6 @@ USERINCLUDE ../../../../locationmgmt/locationcore/LbsLocDataSource/inc USERINCLUDE ../../../../locationmgmt/locationcore/LbsPartnerCommon/inc USERINCLUDE ../../LBSPrivacyNotification/LbsPrivacyController/inc -USERINCLUDE ../../LBSPrivacyNotification/LbsQueryAndNotification/QueryAndNotificationAPI/inc USERINCLUDE ../../../../locationmgmt/locationcore/inc USERINCLUDE ../../../../locationmgmt/locationcore/LbsLocCommon/ServerFramework/inc USERINCLUDE ../../../../locationmgmt/locationcore/LbsDebug/inc @@ -116,7 +115,7 @@ USERINCLUDE ../../../../locationmgmt/locationcore/LbsLocCommon/inc OS_LAYER_SYSTEMINCLUDE_SYMBIAN -APP_LAYER_SYSTEMINCLUDE_SYMBIAN + LIBRARY euser.lib LIBRARY estor.lib diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CBitStr.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CBitStr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CBitStr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CGeneralizedTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CGeneralizedTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CGeneralizedTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CSeqOfList.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CSeqOfList.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CSeqOfList.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CUTCTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CUTCTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1CUTCTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1Context.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1Context.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1Context.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TObjId.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TObjId.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TObjId.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TOctStr.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TOctStr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TOctStr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/ASN1TTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CEvtHndlr.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CEvtHndlr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CEvtHndlr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CharSet.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CharSet.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CharSet.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppEvtHndlr.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppEvtHndlr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppEvtHndlr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppTypes.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppTypes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1CppTypes.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1ErrCodes.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1ErrCodes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1ErrCodes.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1PerCppTypes.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1PerCppTypes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1PerCppTypes.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -20,7 +20,7 @@ // 10/31/03 CZ Class descriptions // 11/04/03 CZ Augment Documentation // -//////////////////////////////////////////////////////////////////////////// +// /** * @file asn1PerCppTypes.h diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1compat.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1compat.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1compat.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1intl.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1intl.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1intl.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1per.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1per.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1per.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -25,7 +25,7 @@ // 11/06/02 AB PD_BYTE_ALIGN0 added // 10/31/03 CZ Expand mainpage text. // -//////////////////////////////////////////////////////////////////////////// +// */ /** * @file rtpersrc/asn1per.h diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1tag.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1tag.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1tag.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1type.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1type.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1type.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1version.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1version.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/asn1version.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtBCD.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtBCD.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtBCD.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCompare.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCompare.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCompare.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtContext.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtContext.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtContext.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCopy.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCopy.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtCopy.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtExternDefs.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtExternDefs.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtExternDefs.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrint.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrint.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrint.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToString.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToString.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtPrintToString.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtSocketSelect.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtSocketSelect.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtSocketSelect.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtTable.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtTable.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtTable.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtToken.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtToken.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtToken.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtbench.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtbench.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtbench.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtpersrc/rtconv.h --- a/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtconv.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtpersrc/rtconv.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CBitStr.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CBitStr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CBitStr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -30,7 +30,7 @@ * @addtogroup asn1ctrl * @{ */ -////////////////////////////////////////////////////////////////////// +// // // ASN1CBitStr // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CGeneralizedTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CGeneralizedTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CGeneralizedTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -36,7 +36,7 @@ * @addtogroup asn1ctime * @{ */ -////////////////////////////////////////////////////////////////////// +// // // ASN1CGeneralizedTime // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CSeqOfList.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CSeqOfList.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CSeqOfList.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -37,7 +37,7 @@ * @{ */ -////////////////////////////////////////////////////////////////////// +// // // ASN1CSeqOfList // @@ -60,7 +60,7 @@ class EXTRTCLASS ASN1CSeqOfList; -////////////////////////////////////////////////////////////////////// +// // // ASN1CSeqOfListIterator // @@ -193,7 +193,7 @@ } ; -////////////////////////////////////////////////////////////////////// +// // // ASN1CSeqOfList // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -44,7 +44,7 @@ * @{ */ -////////////////////////////////////////////////////////////////////// +// // // ASN1CTime // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CUTCTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CUTCTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1CUTCTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -24,7 +24,7 @@ #include "rtsrc/ASN1CTime.h" -////////////////////////////////////////////////////////////////////// +// // // ASN1CUTCTime // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1Context.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1Context.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1Context.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TObjId.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TObjId.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TObjId.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -17,7 +17,7 @@ // CHANGE LOG // Date Init Description // -//////////////////////////////////////////////////////////////////////////// +// /** * @file rtsrc/ASN1TObjId.h * ASN.1 object identifier class definition. diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TOctStr.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TOctStr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TOctStr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -17,7 +17,7 @@ // CHANGE LOG // Date Init Description // -//////////////////////////////////////////////////////////////////////////// +// /** * @file rtsrc/ASN1TOctStr.h * ASN.1 OCTET string class definition. diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/ASN1TTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -31,7 +31,7 @@ #define LOG_TTMERR(stat) (mStatus = stat, stat) -////////////////////////////////////////////////////////////////////// +// // // ASN1TTime // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CEvtHndlr.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CEvtHndlr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CEvtHndlr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CharSet.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CharSet.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CharSet.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -20,7 +20,7 @@ // CHANGE LOG // Date Init Description // -//////////////////////////////////////////////////////////////////////////// +// */ /* asn1CharSet.h - ASN.1 character set definitions */ diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppEvtHndlr.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppEvtHndlr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppEvtHndlr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppTypes.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppTypes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1CppTypes.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -26,7 +26,7 @@ // 07/16/02 AB added 'const' to RTLError::getStatus // 10/29/02 CZ Added/modified doxygen code for groups. // -//////////////////////////////////////////////////////////////////////////// +// /** * @file rtsrc/asn1CppTypes.h diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1ErrCodes.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1ErrCodes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1ErrCodes.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1compat.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1compat.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1compat.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1intl.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1intl.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1intl.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1tag.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1tag.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1tag.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1type.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1type.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1type.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/asn1version.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1version.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/asn1version.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtBCD.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtBCD.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtBCD.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtCompare.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCompare.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCompare.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtContext.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtContext.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtContext.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtCopy.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCopy.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtCopy.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtExternDefs.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtExternDefs.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtExternDefs.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrint.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrint.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrint.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToString.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToString.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtPrintToString.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtSocketSelect.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtSocketSelect.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtSocketSelect.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtTable.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtTable.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtTable.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtToken.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtToken.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtToken.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtbench.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtbench.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtbench.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtsrc/rtconv.h --- a/networkprotocolmodules/common/asn1export/inc/rtsrc/rtconv.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtsrc/rtconv.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTBaseType.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTBaseType.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTBaseType.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTContext.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTContext.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTContext.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolder.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolder.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolder.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolderIF.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolderIF.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTCtxtHolderIF.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFastString.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFastString.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFastString.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileInputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileInputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileInputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileOutputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileOutputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTFileOutputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStreamIF.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStreamIF.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTInputStreamIF.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemBuf.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemBuf.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemBuf.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryInputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryInputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryInputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryOutputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryOutputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMemoryOutputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBuf.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBuf.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBuf.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBufIF.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBufIF.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTMsgBufIF.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStreamIF.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStreamIF.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTOutputStreamIF.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocket.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocket.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocket.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -44,10 +44,10 @@ */ class EXTRTCLASS OSRTSocket { protected: - OSRTSOCKET mSocket; ///< handle of the socket + OSRTSOCKET mSocket; //< handle of the socket int mInitStatus; int mStatus; - OSBOOL mOwner; ///< indicates this class owns the socket + OSBOOL mOwner; //< indicates this class owns the socket inline OSBOOL isInitialized () { return mInitStatus == 0; } diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketInputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketInputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketInputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -35,7 +35,7 @@ */ class EXTRTCLASS OSRTSocketInputStream : public OSRTInputStream { protected: - OSRTSocket mSocket; ///< a socket + OSRTSocket mSocket; //< a socket public: /** * Creates and initializes a socket input stream using the OSRTSocket diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketOutputStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketOutputStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTSocketOutputStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -35,7 +35,7 @@ */ class EXTRTCLASS OSRTSocketOutputStream : public OSRTOutputStream { protected: - OSRTSocket mSocket; ///< a socket + OSRTSocket mSocket; //< a socket public: /** * Creates and initializes a socket output stream using the OSRTSocket diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // @@ -41,9 +41,9 @@ */ class EXTRTCLASS OSRTStream : public OSRTCtxtHolder, public OSRTStreamIF { protected: - OSBOOL mbAttached; ///< Flag, TRUE for "attached" streams - int mStatus; ///< Last stream operation status - int mInitStatus; ///< Initialization status. 0 if initialized successfully + OSBOOL mbAttached; //< Flag, TRUE for "attached" streams + int mStatus; //< Last stream operation status + int mInitStatus; //< Initialization status. 0 if initialized successfully EXTRTMETHOD OSRTStream (OSRTContext* pContext, OSBOOL attachStream = FALSE); EXTRTMETHOD OSRTStream (OSRTStream& original); diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStreamIF.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStreamIF.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStreamIF.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTString.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTString.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTString.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStringIF.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStringIF.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTStringIF.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTUTF8String.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTUTF8String.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/OSRTUTF8String.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/osMacros.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/osMacros.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/osMacros.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/osSysTypes.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/osSysTypes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/osSysTypes.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxArrayList.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxArrayList.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxArrayList.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBase64.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBase64.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBase64.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBigInt.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBigInt.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBigInt.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitDecode.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitDecode.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitDecode.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitEncode.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitEncode.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitEncode.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitString.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitString.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBitString.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBuffer.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBuffer.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxBuffer.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCharStr.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCharStr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCharStr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxClock.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxClock.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxClock.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommon.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommon.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommon.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommonDefs.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommonDefs.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCommonDefs.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxContext.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxContext.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxContext.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCtype.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCtype.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxCtype.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDList.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDList.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDList.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDateTime.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDateTime.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDateTime.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDecimal.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDecimal.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDecimal.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiag.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiag.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiag.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiagBitTrace.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiagBitTrace.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDiagBitTrace.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynBitSet.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynBitSet.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynBitSet.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynPtrArray.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynPtrArray.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxDynPtrArray.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxEnum.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxEnum.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxEnum.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxErrCodes.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxErrCodes.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxErrCodes.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxError.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxError.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxError.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxExternDefs.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxExternDefs.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxExternDefs.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFile.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFile.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFile.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFloat.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFloat.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxFloat.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMap.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMap.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMap.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2Int.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2Int.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2Int.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2UInt.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2UInt.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapStr2UInt.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapUndef.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapUndef.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxHashMapUndef.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemBuf.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemBuf.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemBuf.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemLeakCheck.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemLeakCheck.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemLeakCheck.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemory.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemory.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxMemory.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPattern.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPattern.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPattern.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrint.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrint.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrint.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintToStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintToStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxPrintToStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxReal.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxReal.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxReal.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSList.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSList.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSList.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxScalarDList.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxScalarDList.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxScalarDList.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSocket.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSocket.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxSocket.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStack.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStack.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStack.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStream.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStream.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStream.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamBuffered.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamBuffered.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamBuffered.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamCtxtBuf.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamCtxtBuf.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamCtxtBuf.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamFile.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamFile.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamFile.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamMemory.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamMemory.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamMemory.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamSocket.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamSocket.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamSocket.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamZlib.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamZlib.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxStreamZlib.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxToken.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxToken.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxToken.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxTokenConst.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxTokenConst.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxTokenConst.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUTF8.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUTF8.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUTF8.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUtil.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUtil.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxUtil.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlQName.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlQName.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlQName.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlStr.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlStr.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/rtxXmlStr.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/asn1export/inc/rtxsrc/wceAddon.h --- a/networkprotocolmodules/common/asn1export/inc/rtxsrc/wceAddon.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/common/asn1export/inc/rtxsrc/wceAddon.h Fri Apr 16 16:28:16 2010 +0300 @@ -1,7 +1,7 @@ // Copyright (c) 2001-2009 Objective Systems, Inc. (http://www.obj-sys.com) // All rights reserved. // This component and the accompanying materials are made available -// under the terms of the License "Eclipse Public License v1.0" +// 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". // diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/utils/eabi/netpmutilsu.def --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/common/utils/eabi/netpmutilsu.def Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,5 @@ +EXPORTS + _ZN10NetPmUtils11UncertaintyERKf @ 1 NONAME + _ZN10NetPmUtils14EncodeAltitudeERKf @ 2 NONAME + _ZN10NetPmUtils19UncertaintyAltitudeERKf @ 3 NONAME + diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/utils/group/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/common/utils/group/bld.inf Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,26 @@ +// Copyright (c) 2008-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 + +netpmutils.iby /epoc32/rom/include/netpmutils.iby + +//../inc/netpmutils.h SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(lbs/netpmutils.h) + +PRJ_MMPFILES +netpmutils.mmp + +PRJ_TESTEXPORTS +PRJ_TESTMMPFILES diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/utils/group/netpmutils.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/common/utils/group/netpmutils.iby Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,22 @@ +// Copyright (c) 2008-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: +// An iby file for the network PM utilities library +// + +#ifndef __NETPM_UTILS_IBY__ +#define __NETPM_UTILS_IBY__ + +file=ABI_DIR\DEBUG_DIR\netpmutils.dll System\libs\netpmutils.dll + +#endif //__NETPM_UTILS_IBY__ diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/utils/group/netpmutils.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/common/utils/group/netpmutils.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,35 @@ +// Copyright (c) 2008-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 netpmutils.dll +TARGETTYPE dll +CAPABILITY ALL -TCB +UID 0x1000008d 0x102871F4 +VENDORID 0x70000001 + +MACRO ENABLE_SUPL_DEV_LOGGER + +SOURCEPATH ../src +SOURCE netpmutils.cpp + +OS_LAYER_SYSTEMINCLUDE_SYMBIAN + +USERINCLUDE ../inc + +// Standard Libraries +LIBRARY euser.lib +LIBRARY estlib.lib + +SMPSAFE diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/utils/inc/netpmutils.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/common/utils/inc/netpmutils.h Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,57 @@ +// Copyright (c) 2008-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: +// + +/** + @file + @internalTechnology + +*/ + +#ifndef NET_PM_UTILS_H +#define NET_PM_UTILS_H + +//************************************************************************************************************ +#include + +// Literals used +_LIT(KNetPMUtils, "NetPMUtils"); + +/** +Constants used in the encoding of position values. +*/ +const TReal KLbsLatitudeConst = (8388608 / 90); // 2^23 / 90 +const TReal KLbsLongitudeConst = (16777216 / 360); // 2^24 / 360 +const TInt KLbsMaxAltitude = 32767; // 2^15 - 1 + +/** +Constants used in velocity conversion +1 meter per second = 3.6 kilometers per hour +*/ +const TReal KLbsMpsKmphConstant = 3.6; + +class NetPmUtils + { + public: + + public: // New functions + IMPORT_C static TInt NetPmUtils::Uncertainty(const TReal32& aDistance); + IMPORT_C static TInt EncodeAltitude(const TReal32& aAltitude); + IMPORT_C static TInt UncertaintyAltitude(const TReal32& aDistance); + private: + NetPmUtils( const NetPmUtils& ); + }; + + +#endif //NET_PM_UTILS_H diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/common/utils/src/netpmutils.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/common/utils/src/netpmutils.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,129 @@ +// Copyright (c) 2008-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: +// System +// +// + +/** + @file + @internalTechnology + +*/ + +#include +#include + +// Component +#include "netpmutils.h" + +/** +Constants used in encoding of uncertainty data + +@see CSuplStart::Uncertainty() +@see CSuplStart::UncertaintyAltitude() +*/ +const TReal KLbsLogOnePointOne = 0.095310179804324860043952123280765; +const TReal KLbsLogOnePointZeroTwoFive = 0.02469261259037150101430767543669; +const TInt KLbsMaxUncert = 127; + +/** + * TODO: update asn1 code to use this version and delete the CSuplMessageBase version? +Uncertainty() + +Converts a minumum accuracy value in meters to an uncertainty value K as +described in 3GPP 23.032 (Universal Geographical Area Description) section 6.2. + +r = C((1+x)^K - 1) + +where r = distance in meters + C = 10 + x = 0.1 + K = uncertainty value + +hence K = ln(r/C + 1) / ln(1.1) + +@param aDistance - distance measurement in meters +@return uncertainty value K +*/ +EXPORT_C TInt NetPmUtils::Uncertainty(const TReal32& aDistance) + { + TReal uncert; + Math::Ln(uncert, (aDistance/10) + 1 ); + uncert /= KLbsLogOnePointOne; + if (uncert>KLbsMaxUncert) + { + uncert = KLbsMaxUncert; + } + + // round to nearest whole number + TReal uncertRounded; + Math::Round(uncertRounded, uncert, 0); + + return (TInt)uncertRounded; + } + + +/** +UncertaintyAltitude() + +Converts a minumum accuracy value in meters to an uncertainty altitude value K as +described in 3GPP 23.032 (Universal Geographical Area Description) section 6.4. + +r = C((1+x)^K - 1) + +where r = distance in meters + C = 45 + x = 0.1 + K = uncertainty value + +hence K = ln(r/C + 1) / ln(1.1) + +@param aDistance - altitude accuracy in meters +@return uncertainty altitude value K +*/ +EXPORT_C TInt NetPmUtils::UncertaintyAltitude(const TReal32& aDistance) + { + + TReal uncert; + Math::Ln(uncert, (aDistance/45) + 1 ); + uncert /= KLbsLogOnePointZeroTwoFive; + if (uncert>KLbsMaxUncert) + { + uncert = KLbsMaxUncert; + } + // round to nearest whole number + TReal uncertRounded; + Math::Round(uncertRounded, uncert, 0); + + return (TInt)uncertRounded; + } + +/** +EncodeAltitude() + +Converts an value for altiutude to an 15 bit binary coded number N + +@param aAltitude - altitude in meters +@return uncertainty altitude value K +*/ +EXPORT_C TInt NetPmUtils::EncodeAltitude(const TReal32& aAltitude) + { + TInt altEncoded = (TInt)aAltitude; + if (altEncoded>KLbsMaxAltitude) + { + altEncoded = KLbsMaxAltitude; + } + + return altEncoded; + } diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/ethernetced.xml --- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/ethernetced.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/ethernetced.xml Fri Apr 16 16:28:16 2010 +0300 @@ -3,7 +3,7 @@ Copyright (c) 2003-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 "Eclipse Public License v1.0" + 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". diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/h4ethernetced.xml --- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/h4ethernetced.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/h4ethernetced.xml Fri Apr 16 16:28:16 2010 +0300 @@ -3,7 +3,7 @@ Copyright (c) 2003-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 "Eclipse Public License v1.0" + 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". diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/naviethernetced.xml --- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/naviethernetced.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/naviethernetced.xml Fri Apr 16 16:28:16 2010 +0300 @@ -3,7 +3,7 @@ Copyright (c) 2008-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 "Eclipse Public License v1.0" + 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". diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/winscwethernetced.xml --- a/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/winscwethernetced.xml Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/networkprotocolmodule/LbsSuplTestProtocol/data/winscwethernetced.xml Fri Apr 16 16:28:16 2010 +0300 @@ -3,7 +3,7 @@ Copyright (c) 2003-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 "Eclipse Public License v1.0" + 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". diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp --- a/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/privacyprotocolmodule/group/lbs_privacyprotocolmodule.mrp Fri Apr 16 16:28:16 2010 +0300 @@ -1,3 +1,19 @@ +# +# Copyright (c) 2010 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: +# + component lbs_privacyprotocolmodule source \sf\os\lbs\networkprotocolmodules\privacyprotocolmodule diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/bld.inf --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,25 +0,0 @@ -// Copyright (c) 2008-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_PLATFORMS -DEFAULT - -PRJ_EXPORTS -suplrrlpprotocol.iby /epoc32/rom/include/suplrrlpprotocol.iby - -PRJ_MMPFILES -suplrrlpprotocol.mmp - -#include "../test/group/bld.inf" diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.iby --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.iby Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,29 +0,0 @@ -// Copyright (c) 2008-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 __SUPL_RRLP_PROTOCOL_IBY__ -#define __SUPL_RRLP_PROTOCOL_IBY__ - - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) -#if defined(SYMBIAN_INCLUDE_LOCATION_SUPLv10) || defined(SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY) - -file=ABI_DIR\DEBUG_DIR\suplrrlpprotocol.dll System\libs\suplrrlpprotocol.dll - -#endif // SYMBIAN_INCLUDE_LOCATION_SUPLv10 || SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY -#endif // SYMBIAN_EXCLUDE_LOCATION - - -#endif // __SUPL_RRLP_PROTOCOL_IBY__ diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.mmp --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/group/suplrrlpprotocol.mmp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,49 +0,0 @@ - -// Copyright (c) 2008-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: suplrrlpprotocol.mmp - This is the project specification file for SuplRRLPProtocol. -// -// - -TARGET suplrrlpprotocol.dll -TARGETTYPE DLL -UID 0 0x10283764 - -CAPABILITY ALL -TCB - -// Sources -SOURCEPATH ../src -SOURCE suplrrlpstatemachine.cpp -SOURCE dllmain.cpp - -// -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -OS_LAYER_LIBC_SYSTEMINCLUDE - -// Includes -USERINCLUDE ../inc -USERINCLUDE ../../suplpositioningprotbase/inc/ -USERINCLUDE ../../../../common/suplrrlpasn1/inc/ -USERINCLUDE ../../../../../locationmgmt/locationcore/LbsPartnerCommon/inc -USERINCLUDE ../../../../common/supldevlogger/inc - -// Libraries -LIBRARY lbspartnercommon.lib -LIBRARY euser.lib -LIBRARY lbsnetprotocol.lib -LIBRARY lbsassistancedata.lib -LIBRARY lbs.lib -LIBRARY suplrrlpasn1.lib -LIBRARY supldevlogger.lib - -SMPSAFE diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/bld.inf Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,24 @@ +// Copyright (c) 2008-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_PLATFORMS +DEFAULT + +PRJ_EXPORTS +suplrrlpprotocol.iby /epoc32/rom/include/suplrrlpprotocol.iby + +PRJ_MMPFILES +suplrrlpprotocol.mmp + diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.iby Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,29 @@ +// Copyright (c) 2008-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 __SUPL_RRLP_PROTOCOL_IBY__ +#define __SUPL_RRLP_PROTOCOL_IBY__ + + +#if !defined(SYMBIAN_EXCLUDE_LOCATION) +#if defined(SYMBIAN_INCLUDE_LOCATION_SUPLv10) || defined(SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY) + +file=ABI_DIR\DEBUG_DIR\suplrrlpprotocol.dll System\libs\suplrrlpprotocol.dll + +#endif // SYMBIAN_INCLUDE_LOCATION_SUPLv10 || SYMBIAN_INCLUDE_LOCATION_SUPL_PROXY +#endif // SYMBIAN_EXCLUDE_LOCATION + + +#endif // __SUPL_RRLP_PROTOCOL_IBY__ diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.mmp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/suplrrlpprotocol.mmp Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,49 @@ + +// Copyright (c) 2008-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: suplrrlpprotocol.mmp - This is the project specification file for SuplRRLPProtocol. +// +// + +TARGET suplrrlpprotocol.dll +TARGETTYPE DLL +UID 0 0x10283764 + +CAPABILITY ALL -TCB + +// Sources +SOURCEPATH ../src +SOURCE suplrrlpstatemachine.cpp +SOURCE dllmain.cpp + +// +OS_LAYER_SYSTEMINCLUDE_SYMBIAN +OS_LAYER_LIBC_SYSTEMINCLUDE + +// Includes +USERINCLUDE ../inc +USERINCLUDE ../../suplpositioningprotbase/inc/ +USERINCLUDE ../../../../common/suplrrlpasn1/inc/ +USERINCLUDE ../../../../../locationmgmt/locationcore/LbsPartnerCommon/inc +USERINCLUDE ../../../../common/supldevlogger/inc + +// Libraries +LIBRARY lbspartnercommon.lib +LIBRARY euser.lib +LIBRARY lbsnetprotocol.lib +LIBRARY lbsassistancedata.lib +LIBRARY lbs.lib +LIBRARY suplrrlpasn1.lib +LIBRARY supldevlogger.lib + +SMPSAFE diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/bld.inf --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,24 +0,0 @@ -// Copyright (c) 2006-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: -// - - -// #include "../test/group/bld.inf" - -PRJ_EXPORTS -./rrlptestmessage.iby /epoc32/rom/include/rrlptestmessage.iby - -PRJ_TESTMMPFILES -rrlptestmessage.mmp - diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.iby --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.iby Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +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 __SUPLASN1_IBY__ -#define __SUPLASN1_IBY__ - -REM SUPL ASN1 Encode - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) - -file=ABI_DIR\DEBUG_DIR\rrlptestmessage.dll System\Libs\rrlptestmessage.dll - -#endif // SYMBIAN_EXCLUDE_LOCATION - -#endif \ No newline at end of file diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.mmp --- a/networkprotocolmodules/suplcontrolplaneprotocols/common/test/suplrrlptestmessages/group/rrlptestmessage.mmp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,77 +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 suplrrlptestmessages.dll -TARGETTYPE DLL -CAPABILITY ALL -TCB -UID 0x1000008d 0x10283763 - -USERINCLUDE ../rrlp/inc -USERINCLUDE ../../../../../common/asn1export/inc -USERINCLUDE ../../../../../common/asn1export/inc/rtpersrc -USERINCLUDE ../../../../../common/asn1export/inc/rtsrc -USERINCLUDE ../../../../../common/asn1export/inc/rtxsrc - -OS_LAYER_SYSTEMINCLUDE_SYMBIAN -OS_LAYER_ESTLIB_SYSTEMINCLUDE -OS_LAYER_LIBC_SYSTEMINCLUDE - - -SOURCEPATH ../rrlp/src - -SOURCE rrlpmessagebase.cpp - -SOURCE rrlpprotocolerror.cpp -SOURCE rrlpmeasureposrequest.cpp -SOURCE rrlpmeasureposresponse.cpp -SOURCE rrlpassistancedata.cpp -SOURCE rrlpassistancedataack.cpp - - -SOURCE suplmessagebase.cpp -SOURCE suplmessagecommon.cpp -SOURCE suplpospayload.cpp -SOURCE suplinit.cpp -SOURCE suplposinit.cpp -SOURCE suplstart.cpp -SOURCE suplresponse.cpp -SOURCE suplpos.cpp -SOURCE suplend.cpp - -SOURCE suplasn1decoder.cpp -SOURCE suplasn1decoderimpl.cpp - -// SUPL source files (required for ASN1 decode of SUPL INIT) -SOURCE SUPL-INIT.cpp -SOURCE SUPL-INITDec.cpp -SOURCE ULP.cpp -SOURCE ULP-Components.cpp -SOURCE ULP-ComponentsDec.cpp -SOURCE ULPDec.cpp - - -LIBRARY euser.lib lbsassistancedata.lib lbsnetprotocol.lib lbs.lib lbsloccommon.lib - -// libraries used by Objective Systems stuff (required for ASN1 decode of SUPL INIT) -LIBRARY estlib.lib -LIBRARY asn1rt.lib -LIBRARY asn1per.lib - -// Macro definitions for generated ASN1 code -macro USEASN1RTDLL USEASN1PERDLL _NO_LICENSE_CHECK _NO_INT64_SUPPORT _COMPACT - - -SMPSAFE diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/src/socketwriter.cpp --- a/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/src/socketwriter.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/suplprotocolmodule/SuplConnectionManager/src/socketwriter.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -32,7 +32,7 @@ #include // Timeout timer -const TInt KTimeoutTime = 10; // Seconds, will convert to TTimeIntervalSeconds. +const TInt KTimeoutTime = 15; // Seconds, will convert to TTimeIntervalSeconds. CSocketWriterBase::CSocketWriterBase(const TLbsHostSettingsId& aSlpId, TInt aCallbackIndex, diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplprotocolmodule/SuplProtocol/inc/suplfsmsessionbase.h --- a/networkprotocolmodules/suplprotocolmodule/SuplProtocol/inc/suplfsmsessionbase.h Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/suplprotocolmodule/SuplProtocol/inc/suplfsmsessionbase.h Fri Apr 16 16:28:16 2010 +0300 @@ -75,7 +75,7 @@ /** KSessionConnectedTimerDurationInSec Timer duration for when connection confirmation expected from Connection Manager */ -const TInt KSessionConnectedTimerDurationInSec = 10; +const TInt KSessionConnectedTimerDurationInSec = 15; /** SUPL State Machine observer mixin definition. diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplprotocolmodule/group/bld.inf --- a/networkprotocolmodules/suplprotocolmodule/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -// Copyright (c) 2008-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 -lbssupl.iby /epoc32/rom/include/lbssupl.iby - -// ConfML files -../conf/suplprotocolmodule.confml OS_LAYER_EXPORTS_CONFML(suplprotocolmodule.confml) -../conf/suplprotocolmodule_10285AA8.crml OS_LAYER_EXPORTS_CRML(suplprotocolmodule_10285aa8.crml) - -// Main projects, in build order -#include "../HostSettingsApi/group/BLD.INF" -#include "../SuplConnectionManager/group/bld.inf" -#include "../SuplProtocol/group/bld.inf" - -#include "../SuplPushAPI/group/BLD.INF" diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp --- a/networkprotocolmodules/suplprotocolmodule/group/lbs_suplprotocolmodule.mrp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -component lbs_suplprotocolmodule - -source \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\ - -binary \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group all - -exports \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\group - -notes_source \component_defs\release.src - - -ipr E -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\HostSettingsAPI\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplConnectionManager\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplRrlpProtocol\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplProtocol\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplPushAPI\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\SuplRrlpAsn1\test -ipr T \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\test -ipr B \sf\os\lbs\networkprotocolmodules\suplprotocolmodule\test\export - diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplprotocolmodule/group/lbssupl.iby --- a/networkprotocolmodules/suplprotocolmodule/group/lbssupl.iby Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,36 +0,0 @@ -// Copyright (c) 2008-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_SUPL_IBY__ -#define __LBS_SUPL_IBY__ - - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) && defined(SYMBIAN_INCLUDE_LOCATION_SUPLv10) - -#include "supldevlogger.iby" -#include "asn1export.iby" -#include "asn1supl.iby" -#include "asn1rrlp.iby" -#include "lbshostsettings.iby" -#include "suplrrlpprotocol.iby" -#include "lbssuplconnectionmanager.iby" -#include "suplprotocolmodule.iby" -#include "lbssuplpush.iby" -#include "suplrrlpasn1.iby" - -#endif // SYMBIAN_EXCLUDE_LOCATION, SYMBIAN_INCLUDE_LOCATION_SUPLv10 - - -#endif // __LBS_SUPL_IBY__ diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplproxyprotocolmodule/group/bld.inf --- a/networkprotocolmodules/suplproxyprotocolmodule/group/bld.inf Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,27 +0,0 @@ -// Copyright (c) 2007-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: -// - -#include "../../common/group/bld.inf" -#include "../../suplcontrolplaneprotocols/common/group/bld.inf" -#include "../clientapi/common/posmsgapi/group/bld.inf" -#include "../clientapi/suplposmsgpluginapi/group/bld.inf" -#include "../clientapi/suplposmsgplugin/group/bld.inf" -#include "../supltiapi/group/bld.inf" -#include "../suplproxyprotocolmodule/group/bld.inf" - -#include "../test/group/bld.inf" - -PRJ_EXPORTS -lbs_suplproxyprotocolmodule.iby /epoc32/rom/include/lbs_suplproxyprotocolmodule.iby diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.iby --- a/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.iby Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,40 +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_SUPLPROXYPROTOCOLMODULE_IBY__ -#define __LBS_SUPLPROXYPROTOCOLMODULE_IBY__ - -REM LBS SUPL Proxy Protocol Module - -#if !defined(SYMBIAN_EXCLUDE_LOCATION) -#include "lbsnetworkprivacy.iby" -#include "lbsprivacyrequest.iby" - -#include "suplproxyclientpossession.iby" -#include "epos_omasuplposmsgpluginimpl.iby" -#include "netpmutils.iby" -#include "epos_omasuplposmessageplugin.iby" -#include "supltiapi.iby" -#include "suplrrlpprotocol.iby" -#include "suplrrlpasn1.iby" -#include "asn1export.iby" -#include "asn1supl.iby" -#include "asn1rrlp.iby" - -#include "lbssuplproxyprotocolmodule.iby" - -#endif // SYMBIAN_EXCLUDE_LOCATION -#endif diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp --- a/networkprotocolmodules/suplproxyprotocolmodule/group/lbs_suplproxyprotocolmodule.mrp Tue Feb 02 01:50:39 2010 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,21 +0,0 @@ -component lbs_suplproxyprotocolmodule - -source \sf\os\lbs\networkprotocolmodules\common -source \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols -source \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule - -binary \sf\os\lbs\networkprotocolmodules\common\group all -binary \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\common\group all -binary \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group all - -exports \sf\os\lbs\networkprotocolmodules\common\group -exports \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\common\group -exports \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\group - -notes_source \component_defs\release.src - -ipr E - -ipr T \sf\os\lbs\networkprotocolmodules\common\test -ipr T \sf\os\lbs\networkprotocolmodules\suplcontrolplaneprotocols\common\test -ipr T \sf\os\lbs\networkprotocolmodules\suplproxyprotocolmodule\test diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplproxyprotocolmodule/sfgroup/bld.inf --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/bld.inf Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,35 @@ +// Copyright (c) 2007-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 components: +#include "../../common/supldevlogger/group/bld.inf" +#include "../../common/utils/group/bld.inf" +#include "../../common/suplrrlpasn1/group/bld.inf" + +// RRLP protocol: +#include "../../suplcontrolplaneprotocols/common/suplrrlpprotocol/sfgroup/bld.inf" + + +// SUPL Proxy Protocol Module specific: +#include "../clientapi/common/posmsgapi/group/bld.inf" +#include "../clientapi/suplposmsgpluginapi/group/bld.inf" +#include "../clientapi/suplposmsgplugin/group/bld.inf" +#include "../supltiapi/group/bld.inf" +#include "../suplproxyprotocolmodule/group/bld.inf" + +#include "../test/group/bld.inf" + +PRJ_EXPORTS +lbs_suplproxyprotocolmodule.iby /epoc32/rom/include/lbs_suplproxyprotocolmodule.iby diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.iby --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/networkprotocolmodules/suplproxyprotocolmodule/sfgroup/lbs_suplproxyprotocolmodule.iby Fri Apr 16 16:28:16 2010 +0300 @@ -0,0 +1,40 @@ +/* +* 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_SUPLPROXYPROTOCOLMODULE_IBY__ +#define __LBS_SUPLPROXYPROTOCOLMODULE_IBY__ + +REM LBS SUPL Proxy Protocol Module + +#if !defined(SYMBIAN_EXCLUDE_LOCATION) +#include "lbsnetworkprivacy.iby" +#include "lbsprivacyrequest.iby" + +#include "suplproxyclientpossession.iby" +#include "epos_omasuplposmsgpluginimpl.iby" +#include "netpmutils.iby" +#include "epos_omasuplposmessageplugin.iby" +#include "supltiapi.iby" +#include "suplrrlpprotocol.iby" +#include "suplrrlpasn1.iby" +#include "asn1export.iby" +#include "asn1supl.iby" +#include "asn1rrlp.iby" + +#include "lbssuplproxyprotocolmodule.iby" + +#endif // SYMBIAN_EXCLUDE_LOCATION +#endif diff -r 9cfd9a3ee49c -r bdd4df282e3e networkprotocolmodules/suplproxyprotocolmodule/suplproxyprotocolmodule/src/suplproxymodule.cpp --- a/networkprotocolmodules/suplproxyprotocolmodule/suplproxyprotocolmodule/src/suplproxymodule.cpp Tue Feb 02 01:50:39 2010 +0200 +++ b/networkprotocolmodules/suplproxyprotocolmodule/suplproxyprotocolmodule/src/suplproxymodule.cpp Fri Apr 16 16:28:16 2010 +0300 @@ -549,6 +549,15 @@ const TLbsNetPosRequestOptionsBase& aOptions) { LBSLOG(ELogP1, "CSuplProxyProtocol::RequestNetworkLocation() Begin\n"); + + if(!iSuplTiApiWrapper) + { + //Error, TI Plugin not available. Complete the request with error + LBSLOG_ERR(ELogP1, "Error, TI Plugin not available, not able to complete request"); + LBSLOG2(ELogP1, "-->ProcessSessionComplete(0x%x)\n", aSessionId.SessionNum()); + iObserver.ProcessSessionComplete(aSessionId, KErrNotReady); + return; + } const TLbsNetPosRequestOptions reqParams = static_cast (aOptions); @@ -642,6 +651,13 @@ LBSLOG2(ELogP1, "-->ProcessSessionComplete(0x%x)\n", aSessionId.SessionNum()); iObserver.ProcessSessionComplete(aSessionId, KErrNone); } + else if(!iSuplTiApiWrapper) + { + //Error, TI Plugin not available. Complete the request with error + LBSLOG_ERR(ELogP1, "Error, TI Plugin not available, not able to complete request"); + LBSLOG2(ELogP1, "-->ProcessSessionComplete(0x%x)\n", aSessionId.SessionNum()); + iObserver.ProcessSessionComplete(aSessionId, KErrNotReady); + } else { @@ -857,6 +873,7 @@ void CSuplProxyProtocol::ConstructL() { LBSLOG(ELogP1, "CSuplProxyProtocol::ConstructL() Begin\n"); + TInt err = KErrNone; CRepository* cenRep = CRepository::NewLC(KLbsSuplProxyProtocolModuleCenRepUid); TInt refLocSourceId(KErrNone); @@ -876,14 +893,18 @@ LBSLOG(ELogP9, "->A CLbsSuplTiApi::NewL() SUPL-FW\n"); LBSLOG2(ELogP9, " > Uid = 0x%08X\n", suplTiPluginImplUid); - iSuplTiApiWrapper = CLbsSuplTiApi::NewL(*this, TUid::Uid(suplTiPluginImplUid)); + TRAP(err, iSuplTiApiWrapper = CLbsSuplTiApi::NewL(*this, TUid::Uid(suplTiPluginImplUid))); + if(err != KErrNone) + { + LBSLOG_ERR2(ELogP1, "Failed to load the Terminal Initiation API Plugin (error: %d)", err); + } CLbsAdmin* admin = CLbsAdmin::NewL(); CleanupStack::PushL(admin); // Read admin setting for maximum number of external locate requests TUint maxExternalLocateRequests = KLbsDefaultMaximumExternalLocateRequests; - TInt err = admin->Get(KLbsSettingMaximumExternalLocateRequests, maxExternalLocateRequests); + err = admin->Get(KLbsSettingMaximumExternalLocateRequests, maxExternalLocateRequests); if (err != KErrNone) { LBSLOG_ERR2(ELogP4, "Failed to get KLbsSettingMaximumExternalLocateRequests (err %d)", err); @@ -1523,7 +1544,7 @@ const TLbsNetSessionId& aSessionId) { LBSLOG(ELogP1, "CSuplProxyProtocol::RequestComplete() Begin\n"); - + TInt index = iLbsNetSessions.Find(aSessionId, CLbsNetSession::IsSessionMatch);