Mercurial Mercurial > oss > MCL > sf > mw > locationsrv / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: 201023 RCL_3 PDK_3.0.1
authorDremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
Mon, 21 Jun 2010 16:08:35 +0300
branchRCL_3
changeset 16 380473e13443
parent 14 b88ebe0cbbbe
child 18 d746aee05493
Revision: 201023 Kit: 2010125
genericpositioningplugins/locationnpppsy/inc/npppsysingletonhandler.h file | annotate | diff | comparison | revisions
landmarks/locationlandmarks/internalservices/group/bld.inf file | annotate | diff | comparison | revisions
landmarks/locationlandmarks/localaccess/inc/epos_cposlmlocaldatabase.h file | annotate | diff | comparison | revisions
landmarks/locationlandmarks/server/group/bld.inf file | annotate | diff | comparison | revisions
locationsystemui/locationsysui/locbtnotifier/group/bld.inf file | annotate | diff | comparison | revisions
locationsystemui/locationsysui/locnotprefplugin/group/bld.inf file | annotate | diff | comparison | revisions
locationtriggering/group/bld.inf file | annotate | diff | comparison | revisions
locationtriggering/ltcontainer/group/bld.inf file | annotate | diff | comparison | revisions
locationtriggering/tsrc/lbtengine_test/Additionaltests/inc/AsynOperationAO.h file | annotate | diff | comparison | revisions
locationtriggering/tsrc/lbtengine_test/CellbasedtriggerOperations/inc/AsynOperationAO.h file | annotate | diff | comparison | revisions
locationtriggering/tsrc/lbtengine_test/TestHybridTriggers/inc/AsynOperationAO.h file | annotate | diff | comparison | revisions
locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplinitver2.h file | annotate | diff | comparison | revisions
locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasupllocationidver2.h file | annotate | diff | comparison | revisions
locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplsetcapabilitiesver2.h file | annotate | diff | comparison | revisions
locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplstartver2.h file | annotate | diff | comparison | revisions
locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h file | annotate | diff | comparison | revisions
locsrv_pub/location_triggering_api/inc/lbttriggerinfo.h file | annotate | diff | comparison | revisions
supl/locationomasuplprotocolhandler/supllistener/group/bld.inf file | annotate | diff | comparison | revisions
supl/locationsuplfw/gateway/group/bld.inf file | annotate | diff | comparison | revisions
supl/locationsuplfw/protocolhandlerapi/group/epos_suplprotocolhandlerplugin.mmp file | annotate | diff | comparison | revisions 
--- a/genericpositioningplugins/locationnpppsy/inc/npppsysingletonhandler.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/genericpositioningplugins/locationnpppsy/inc/npppsysingletonhandler.h	Mon Jun 21 16:08:35 2010 +0300
@@ -51,7 +51,7 @@
         *                         status.
         * @reuturn the pointer the the singleton handler
         */
-        static CNppPsySingletonHandler* CNppPsySingletonHandler::GetInstanceL( 
+        static CNppPsySingletonHandler* GetInstanceL( 
             MPositionerStatus& aStatusInterface );
 
         /**
--- a/landmarks/locationlandmarks/internalservices/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/landmarks/locationlandmarks/internalservices/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -43,10 +43,8 @@
 ../inc/EPos_CPosLmSettingsHandler.h         |../../../inc/epos_cposlmsettingshandler.h
 ../inc/EPos_PosLmLongTextColHandler.h       |../../../inc/epos_poslmlongtextcolhandler.h
 
-../data/101FE99B.txt                        /epoc32/release/winscw/udeb/z/private/10202be9/101fe99b.txt
 
 PRJ_MMPFILES
-//gnumakefile epos_landmarksglobalcategories_icons.mk
 EPos_LmInternalServices.mmp
 EPos_LandmarksGlobalCategories.mmp
 
--- a/landmarks/locationlandmarks/localaccess/inc/epos_cposlmlocaldatabase.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/landmarks/locationlandmarks/localaccess/inc/epos_cposlmlocaldatabase.h	Mon Jun 21 16:08:35 2010 +0300
@@ -360,7 +360,7 @@
         *   full information.
         * @return The landmark.
         */
-        CPosLandmark* CPosLmLocalDatabase::ReadLmLC(
+        CPosLandmark* ReadLmLC(
             TPosLmItemId aLandmarkId,
             TBool aIsPartial );
 
--- a/landmarks/locationlandmarks/server/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/landmarks/locationlandmarks/server/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -25,7 +25,7 @@
 // Internal APIs
 ../inc/EPos_PosLmServerCommon.h     |../../../inc/epos_poslmservercommon.h
 
-../data/backup_registration.xml     /epoc32/data/z/private/101fdf81/backup_registration.xml
+../data/backup_registration.xml     z:/private/101fdf81/backup_registration.xml
 
 PRJ_MMPFILES
 EPos_LandmarksServer.mmp
--- a/locationsystemui/locationsysui/locbtnotifier/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/locationsystemui/locationsysui/locbtnotifier/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -24,8 +24,8 @@
 
 PRJ_EXPORTS
 
-../data/locbtgpspsypscontextstate.xml  /epoc32/data/Z/private/10282BC4/Settings/10282C74/locbtgpspsypscontextstate.xml
-../data/locbtgpspsypscontextstate.rul  /epoc32/data/Z/private/10282BC4/Rules/locbtgpspsypscontextstate.rul
+../data/locbtgpspsypscontextstate.xml  Z:/private/10282BC4/Settings/10282C74/locbtgpspsypscontextstate.xml
+../data/locbtgpspsypscontextstate.rul  Z:/private/10282BC4/Rules/locbtgpspsypscontextstate.rul
 
 
 PRJ_MMPFILES
--- a/locationsystemui/locationsysui/locnotprefplugin/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/locationsystemui/locationsysui/locnotprefplugin/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -24,7 +24,7 @@
 DEFAULT
 
 PRJ_EXPORTS
-../data/backup_registration.xml     /epoc32/data/z/private/10281861/backup_registration.xml
+../data/backup_registration.xml     z:/private/10281861/backup_registration.xml
 
 PRJ_MMPFILES
 locnotprefplugin.mmp    
--- a/locationtriggering/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/locationtriggering/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -25,6 +25,9 @@
 #ifdef CORE_MW_LAYER_IBY_EXPORT_PATH
 ../rom/locationtriggering.iby                         CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggering.iby)
 ../rom/locationtriggeringstub.iby                     CORE_MW_LAYER_IBY_EXPORT_PATH(locationtriggeringstub.iby)
+
+// Export SIS File
+../data/lbtstub.sis  					/epoc32/data/z/system/install/lbtstub.sis
 #endif
 
 #ifdef MW_LAYER_CONFML
--- a/locationtriggering/ltcontainer/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/locationtriggering/ltcontainer/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -31,8 +31,7 @@
 ../inc/lbtsecuritypolicy.h 						|../../inc/lbtsecuritypolicy.h
 
 // Registration file for backup and restore
-../data/backup_registration.xml     /epoc32/winscw/c/private/1028312B/backup_registration.xml
-../data/backup_registration.xml     /epoc32/data/z/private/1028312B/backup_registration.xml
+../data/backup_registration.xml     z:/private/1028312B/backup_registration.xml
 
 
 PRJ_MMPFILES
--- a/locationtriggering/tsrc/lbtengine_test/Additionaltests/inc/AsynOperationAO.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/Additionaltests/inc/AsynOperationAO.h	Mon Jun 21 16:08:35 2010 +0300
@@ -96,7 +96,7 @@
        void ListTriggerIdsList(RLbt& aLbt, RArray < TLbtTriggerId >& aTriggerIdList,
             CActiveSchedulerWait* aWait,CLbtListTriggerOptions* aListOptions=NULL);                          
         void CreateIterator(RLbt& aLbt,CActiveSchedulerWait* aWait,CLbtListTriggerOptions* aListOptions=NULL);   
-        void CTriggerFireObserver::DeleteFilteredTriggers( RLbt& aLbt,CLbtTriggerFilterBase* aFilter,CActiveSchedulerWait* aWait ); 
+        void DeleteFilteredTriggers( RLbt& aLbt,CLbtTriggerFilterBase* aFilter,CActiveSchedulerWait* aWait ); 
         TInt GetFireCount( ) ; 
         TInt GetError( ) ; 
         
@@ -104,7 +104,7 @@
         void UpdateTriggersState(RLbt& aLbt, CLbtTriggerEntry::TLbtTriggerState aState, 
             CActiveSchedulerWait* aWait,CLbtTriggerFilterBase *  aFilter=NULL) ;
             
-        void CTriggerFireObserver::PopulateFromCurrentCell(CLbtGeoCell& cell,CActiveSchedulerWait* aWait )  ;             
+        void PopulateFromCurrentCell(CLbtGeoCell& cell,CActiveSchedulerWait* aWait )  ;             
         
         void RunL( );
         
--- a/locationtriggering/tsrc/lbtengine_test/CellbasedtriggerOperations/inc/AsynOperationAO.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/CellbasedtriggerOperations/inc/AsynOperationAO.h	Mon Jun 21 16:08:35 2010 +0300
@@ -84,7 +84,7 @@
        void ListTriggerIdsList(RLbt& aLbt, RArray < TLbtTriggerId >& aTriggerIdList,
             CActiveSchedulerWait* aWait,CLbtListTriggerOptions* aListOptions=NULL);                          
         void CreateIterator(RLbt& aLbt,CActiveSchedulerWait* aWait,CLbtListTriggerOptions* aListOptions=NULL);   
-        void CTriggerFireObserver::DeleteFilteredTriggers( RLbt& aLbt,CLbtTriggerFilterBase* aFilter,CActiveSchedulerWait* aWait ); 
+        void DeleteFilteredTriggers( RLbt& aLbt,CLbtTriggerFilterBase* aFilter,CActiveSchedulerWait* aWait ); 
         TInt GetFireCount( ) ; 
         TInt GetError( ) ; 
         
@@ -92,7 +92,7 @@
         void UpdateTriggersState(RLbt& aLbt, CLbtTriggerEntry::TLbtTriggerState aState, 
             CActiveSchedulerWait* aWait,CLbtTriggerFilterBase *  aFilter=NULL) ;
             
-        void CTriggerFireObserver::PopulateFromCurrentCell(CLbtGeoCell& cell,CActiveSchedulerWait* aWait )  ;             
+        void PopulateFromCurrentCell(CLbtGeoCell& cell,CActiveSchedulerWait* aWait )  ;             
         
         void RunL( );
         
--- a/locationtriggering/tsrc/lbtengine_test/TestHybridTriggers/inc/AsynOperationAO.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locationtriggering/tsrc/lbtengine_test/TestHybridTriggers/inc/AsynOperationAO.h	Mon Jun 21 16:08:35 2010 +0300
@@ -83,7 +83,7 @@
        void ListTriggerIdsList(RLbt& aLbt, RArray < TLbtTriggerId >& aTriggerIdList,
             CActiveSchedulerWait* aWait,CLbtListTriggerOptions* aListOptions=NULL);                          
         void CreateIterator(RLbt& aLbt,CActiveSchedulerWait* aWait,CLbtListTriggerOptions* aListOptions=NULL);   
-        void CTriggerFireObserver::DeleteFilteredTriggers( RLbt& aLbt,CLbtTriggerFilterBase* aFilter,CActiveSchedulerWait* aWait ); 
+        void DeleteFilteredTriggers( RLbt& aLbt,CLbtTriggerFilterBase* aFilter,CActiveSchedulerWait* aWait ); 
         TInt GetFireCount( ) ; 
         TInt GetError( ) ; 
         
@@ -92,7 +92,7 @@
             CActiveSchedulerWait* aWait,CLbtTriggerFilterBase *  aFilter=NULL) ;
         void UpdateTrigger(RLbt& aLbt,CLbtTriggerEntry& aTrigger,TLbtTriggerAttributeFieldsMask aFieldMask,CActiveSchedulerWait* aWait,
                     TLbtFireOnUpdate aFireOnUpdate) ;       
-        void CTriggerFireObserver::PopulateFromCurrentCell(CLbtGeoCell& cell,CActiveSchedulerWait* aWait )  ;             
+        void PopulateFromCurrentCell(CLbtGeoCell& cell,CActiveSchedulerWait* aWait )  ;             
         
         void RunL( );
         
--- a/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplinitver2.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplinitver2.h	Mon Jun 21 16:08:35 2010 +0300
@@ -152,7 +152,7 @@
     /**
      *Constructor for TOMASuplHistoricReporting
      */
-    TOMASuplHistoricReporting();
+    IMPORT_C TOMASuplHistoricReporting();
 
     /**
      * Setter method  for allowed reporting criteria type
--- a/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasupllocationidver2.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasupllocationidver2.h	Mon Jun 21 16:08:35 2010 +0300
@@ -233,7 +233,7 @@
       * @param aTOMASuplVer2CellInfo TOMASuplVer2CellInfoExtn
       * @return None                                           
       */   
-     void SetVer2CellInfo(TOMASuplVer2CellInfoExtn aTOMASuplVer2CellInfo);
+     IMPORT_C void SetVer2CellInfo(TOMASuplVer2CellInfoExtn aTOMASuplVer2CellInfo);
 
      /**
       * Clone Method for COMASuplLocationIdVer2
--- a/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplsetcapabilitiesver2.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplsetcapabilitiesver2.h	Mon Jun 21 16:08:35 2010 +0300
@@ -312,14 +312,14 @@
 class TOMASuplSessionCapabilities
     {
 public:
-    TOMASuplSessionCapabilities();
-    TInt GetMaxNumberTotalSessions(TInt &aMaxNumberTotalSessions)const;
-    TInt GetMaxNumberPeriodicSessions(TInt8 &aMaxNumberPeriodicSessions)const;
-    TInt GetMaxNumberTriggeredSessions(TInt8 &aMaxNumberTriggeredSessions)const;
+		IMPORT_C TOMASuplSessionCapabilities();
+    IMPORT_C TInt GetMaxNumberTotalSessions(TInt &aMaxNumberTotalSessions)const;
+    IMPORT_C TInt GetMaxNumberPeriodicSessions(TInt8 &aMaxNumberPeriodicSessions)const;
+    IMPORT_C TInt GetMaxNumberTriggeredSessions(TInt8 &aMaxNumberTriggeredSessions)const;
 public:
-    void SetMaxNumberTotalSessions(const TInt aMaxNumberTotalSessions);
-    void SetMaxNumberPeriodicSessions(const TInt8 aMaxNumberPeriodicSessions);
-    void SetMaxNumberTriggeredSessions(const TInt8 aMaxNumberTriggeredSessions);
+    IMPORT_C void SetMaxNumberTotalSessions(const TInt aMaxNumberTotalSessions);
+    IMPORT_C void SetMaxNumberPeriodicSessions(const TInt8 aMaxNumberPeriodicSessions);
+    IMPORT_C void SetMaxNumberTriggeredSessions(const TInt8 aMaxNumberTriggeredSessions);
 
 private:
     TInt iOptionalMask;
@@ -390,16 +390,16 @@
 class TOMAServiceCapabilities
     {
 public:
-    TOMAServiceCapabilities();
-    TInt GetSuplServiceSupported(TOMASuplServiceSupported& aServicesSupported)const;
-    TInt GetSuplReportingCap(TOMASuplReportingCap& aReportingCapabilities)const;
-    TInt GetEventTriggerCapabilities(TOMASuplEventTriggerCapabilities& aEventTriggerCapabilities)const;
-    TInt GetSuplSessionCapabilities(TOMASuplSessionCapabilities& aSessionCapabilities)const;
+    IMPORT_C TOMAServiceCapabilities();
+    IMPORT_C TInt GetSuplServiceSupported(TOMASuplServiceSupported& aServicesSupported)const;
+    IMPORT_C TInt GetSuplReportingCap(TOMASuplReportingCap& aReportingCapabilities)const;
+    IMPORT_C TInt GetEventTriggerCapabilities(TOMASuplEventTriggerCapabilities& aEventTriggerCapabilities)const;
+    IMPORT_C TInt GetSuplSessionCapabilities(TOMASuplSessionCapabilities& aSessionCapabilities)const;
 public:
-    void SetSuplServiceSupported(const TOMASuplServiceSupported aServicesSupported);
-    void SetSuplReportingCap(const TOMASuplReportingCap aReportingCapabilities);
-    void SetEventTriggerCapabilities(const TOMASuplEventTriggerCapabilities aEventTriggerCapabilities);
-    void SetSuplSessionCapabilities(const TOMASuplSessionCapabilities aSessionCapabilities);
+    IMPORT_C void SetSuplServiceSupported(const TOMASuplServiceSupported aServicesSupported);
+    IMPORT_C void SetSuplReportingCap(const TOMASuplReportingCap aReportingCapabilities);
+    IMPORT_C void SetEventTriggerCapabilities(const TOMASuplEventTriggerCapabilities aEventTriggerCapabilities);
+    IMPORT_C void SetSuplSessionCapabilities(const TOMASuplSessionCapabilities aSessionCapabilities);
 
 private:
 
--- a/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplstartver2.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locsrv_plat/oma_supl_asn_codec_plugin_api/inc/epos_comasuplstartver2.h	Mon Jun 21 16:08:35 2010 +0300
@@ -602,9 +602,9 @@
          
    	protected: 
       
-      void ConstructL();        
+      IMPORT_C void ConstructL();        
       
-      COMASuplStartVer2(); 
+      IMPORT_C COMASuplStartVer2(); 
       
 	  
     protected:    // Data
--- a/locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locsrv_plat/supl_settings_api/tsrc/inc/settingsapi.h	Mon Jun 21 16:08:35 2010 +0300
@@ -188,112 +188,112 @@
         TInt RemoveServer_Invalid_negative(CStifItemParser& aItem);
         TInt RemoveServer_Id_NotExisting(CStifItemParser& aItem);
         TInt RemoveServer_Invalid_zero(CStifItemParser& aItem);
-        TInt CSettingsApi::ChangePriority_Increase(CStifItemParser& aItem);
-        TInt CSettingsApi::ChangePriority_Decrease(CStifItemParser& aItem);
-        TInt CSettingsApi::ChangePriority_invalid_positive(CStifItemParser& aItem);
-        TInt CSettingsApi::ChangePriority_priority0(CStifItemParser& aItem);
-        TInt CSettingsApi::ChangePriority_Negative(CStifItemParser& aItem);
-        TInt CSettingsApi::ChangePriority_InvalidServer(CStifItemParser& aItem);
-      	TInt CSettingsApi::ChangePriority_invalidserverpriority(CStifItemParser& aItem);
-        TInt CSettingsApi::GetDefaultServer();
-				TInt CSettingsApi::AddNewServerWithDefault(CStifItemParser& aItem);
-				TInt CSettingsApi::AddNewServerWithoutDefault(CStifItemParser& aItem);
-				TInt CSettingsApi::AddNewServer_Duplicate(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSlpInfoFromId(TInt64 Slpid);
-				TInt CSettingsApi::GetSlpInfoFromId(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSlpInfoFromId_invalid_positive(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSlpInfoFromId_invalid_negative(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSlpInfoFromId_invalid_zero(CStifItemParser& aItem);
-				TInt CSettingsApi::SetServerAddress(CStifItemParser& aItem);
-				TInt CSettingsApi::SetServerAddress_invalidpositive(CStifItemParser& aItem);
-				TInt CSettingsApi::SetServerAddress_invalidnegative(CStifItemParser& aItem);
-				TInt CSettingsApi::SetServerAddress_invalidzero(CStifItemParser& aItem);
-				TInt CSettingsApi::SetServerAddress_AddressNull(CStifItemParser& aItem);
-				TInt CSettingsApi::SetServerAddress_InvalidAddressId(CStifItemParser& aItem);
-				TInt CSettingsApi::GetServerAddress(CStifItemParser& aItem);
-				TInt CSettingsApi::GetServerAddress_invalidpositive(CStifItemParser& aItem);
-				TInt CSettingsApi::GetServerAddress_invalidnegative(CStifItemParser& aItem);
-				TInt CSettingsApi::GetServerAddress_invalidzero(CStifItemParser& aItem);
-				TInt CSettingsApi::GetServerAddress(TInt64 aSlpId1);
-				TInt CSettingsApi::SetIAPName_InvalidAddressId(CStifItemParser& aItem);
-				TInt CSettingsApi::SetIAPName_invalidzero(CStifItemParser& aItem);
-				TInt CSettingsApi::SetIAPName_invalidnegative(CStifItemParser& aItem);
-				TInt CSettingsApi::SetIAPName_invalidpositive(CStifItemParser& aItem);
-				TInt CSettingsApi::SetIAPName(CStifItemParser& aItem);
-				 TInt CSettingsApi::GetIAPName_invalidzero(CStifItemParser& aItem);
-				 TInt CSettingsApi::GetIAPName_invalidnegative(CStifItemParser& aItem);
-				 TInt CSettingsApi::GetIAPName_invalidpositive(CStifItemParser& aItem);
-				 TInt CSettingsApi::GetIAPName(CStifItemParser& aItem);
-				 TInt CSettingsApi::GetIAPName(TInt64 aSlpId1);
-				 TInt CSettingsApi::SetServerEnabledFlag_Etrue(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetServerEnabledFlag_EFalse(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetServerEnabledFlag_id_negative(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetServerEnabledFlag_id_positive(CStifItemParser& aItem);
-				  TInt CSettingsApi::SetServerEnabledFlag_id_zero(CStifItemParser& aItem);
-				 TInt CSettingsApi::GetServerEnabledFlag_id_negative(CStifItemParser& aItem);
-				  TInt CSettingsApi::GetServerEnabledFlag_id_positive(CStifItemParser& aItem);
-				  TInt CSettingsApi::GetServerEnabledFlag_id_zero(CStifItemParser& aItem);
-				  TInt CSettingsApi::GetServerEnabledFlag_EFalse(CStifItemParser& aItem);
-				  TInt CSettingsApi::GetServerEnabledFlag_Etrue(CStifItemParser& aItem);
-				  TInt CSettingsApi::GetUsageInHomeNwFlag(TInt64 aSlpId1);
-				  TInt CSettingsApi::SetUsageInHomwNwFlag_Etrue(CStifItemParser& aItem);
-				  TInt CSettingsApi::SetUsageInHomwNwFlag_EFalse(CStifItemParser& aItem);
-				  TInt CSettingsApi::SetUsageInHomwNwFlag_id_negative(CStifItemParser& aItem);
-				  TInt CSettingsApi::SetUsageInHomwNwFlag_id_positive(CStifItemParser& aItem);
-				   TInt CSettingsApi::SetUsageInHomwNwFlag_id_zero(CStifItemParser& aItem);
-					 TInt CSettingsApi::GetUsageInHomwNwFlag_Etrue(CStifItemParser& aItem);
-				   TInt CSettingsApi::GetUsageInHomwNwFlag_EFalse(CStifItemParser& aItem);
-				   TInt CSettingsApi::GetUsageInHomwNwFlag_id_negative(CStifItemParser& aItem);
-				   TInt CSettingsApi::GetUsageInHomwNwFlag_id_positive(CStifItemParser& aItem);
-				   TInt CSettingsApi::GetUsageInHomwNwFlag_id_zero(CStifItemParser& aItem);
-				   TInt CSettingsApi::GetUsageInHomwNwFlag(TInt64 aSlpId1);
-				 TInt CSettingsApi::AddNewServer_aServerAddress_Null(CStifItemParser& aItem);
-				  TInt CSettingsApi::AddNewServer_aIapNAme_Null(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetDefaultServer_aServerAddress_Null(CStifItemParser& aItem);
-	 TInt CSettingsApi::SetDefaultServerWithDefaultValues(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetAllParameter_aServerAddress_Null(CStifItemParser& aItem);
-  TInt CSettingsApi::SetAllParameter_WithDefaultValues(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetAllParameter_Invalid_Positive(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetAllParameter_Invalid_Negative(CStifItemParser& aItem);
-				 TInt CSettingsApi::SetAllParameter_Invalid_Zero(CStifItemParser& aItem);
-				TInt CSettingsApi::GetServerEnabledFlag(TInt64 aSlpId1);
-				TInt CSettingsApi::SetEditableFlag_Etrue(CStifItemParser& aItem);
-				TInt CSettingsApi::SetEditableFlag_EFalse(CStifItemParser& aItem);
-				TInt CSettingsApi::SetEditableFlag_id_negative(CStifItemParser& aItem);
-				TInt CSettingsApi::SetEditableFlag_id_positive(CStifItemParser& aItem);
-				TInt CSettingsApi::SetEditableFlag_id_zero(CStifItemParser& aItem);
-				TBool CSettingsApi::IsSLPExists(CStifItemParser& aItem);
-				TBool CSettingsApi::IsSLPExists_invalid_negative(CStifItemParser& aItem);
-				TBool CSettingsApi::IsSLPExists_invalid_positive(CStifItemParser& aItem);
-				TBool CSettingsApi::IsSLPExists_invalid_zero(CStifItemParser& aItem);
-				TInt CSettingsApi::GetAllSlp_sync(CStifItemParser& aItem);
-				TInt CSettingsApi::GetAllSlp_async(CStifItemParser& aItem);
-				TInt CSettingsApi::SetSimChangeRemoveFlag_Etrue(CStifItemParser& aItem);
-				TInt CSettingsApi::SetSimChangeRemoveFlag_EFalse(CStifItemParser& aItem);
-				TInt CSettingsApi::SetSimChangeRemoveFlag_id_negative(CStifItemParser& aItem);
-				TInt CSettingsApi::SetSimChangeRemoveFlag_id_positive(CStifItemParser& aItem);
-				TInt CSettingsApi::SetSimChangeRemoveFlag_id_zero(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSimChangeRemoveFlag_Etrue(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSimChangeRemoveFlag(TInt64 aSlpId1);
-				TInt CSettingsApi::GetSimChangeRemoveFlag_EFalse(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSimChangeRemoveFlag_id_negative(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSimChangeRemoveFlag_id_positive(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSimChangeRemoveFlag_id_zero(CStifItemParser& aItem);
-				TInt CSettingsApi::GetEditableFlag_Etrue(CStifItemParser& aItem);
-				TInt CSettingsApi::GetEditableFlag(TInt64 aSlpId1);
-				TInt CSettingsApi::GetEditableFlag_EFalse(CStifItemParser& aItem);
-				TInt CSettingsApi::GetEditableFlag_id_negative(CStifItemParser& aItem);
-				TInt CSettingsApi::GetEditableFlag_id_positive(CStifItemParser& aItem);
-				TInt CSettingsApi::GetEditableFlag_id_zero(CStifItemParser& aItem);
-				TInt CSettingsApi::SetFallBack_ETrue();
-				TInt CSettingsApi::SetFallBack_EFalse();
-				TInt CSettingsApi::GetFallBack();
-				TInt CSettingsApi::IsSLPExistsString();
-				TInt CSettingsApi::IsSLPExistsString_Null();
-				TInt CSettingsApi::IsSLPExistsString_invalid();
-				TInt CSettingsApi::SlpCount();
-				TInt CSettingsApi::GetSlpInfoFromAddress(CStifItemParser& aItem);
-				TInt CSettingsApi::GetSlpInfoFromAddress_invalid(CStifItemParser& aItem);
+        TInt ChangePriority_Increase(CStifItemParser& aItem);
+        TInt ChangePriority_Decrease(CStifItemParser& aItem);
+        TInt ChangePriority_invalid_positive(CStifItemParser& aItem);
+        TInt ChangePriority_priority0(CStifItemParser& aItem);
+        TInt ChangePriority_Negative(CStifItemParser& aItem);
+        TInt ChangePriority_InvalidServer(CStifItemParser& aItem);
+      	TInt ChangePriority_invalidserverpriority(CStifItemParser& aItem);
+        TInt GetDefaultServer();
+				TInt AddNewServerWithDefault(CStifItemParser& aItem);
+				TInt AddNewServerWithoutDefault(CStifItemParser& aItem);
+				TInt AddNewServer_Duplicate(CStifItemParser& aItem);
+				TInt GetSlpInfoFromId(TInt64 Slpid);
+				TInt GetSlpInfoFromId(CStifItemParser& aItem);
+				TInt GetSlpInfoFromId_invalid_positive(CStifItemParser& aItem);
+				TInt GetSlpInfoFromId_invalid_negative(CStifItemParser& aItem);
+				TInt GetSlpInfoFromId_invalid_zero(CStifItemParser& aItem);
+				TInt SetServerAddress(CStifItemParser& aItem);
+				TInt SetServerAddress_invalidpositive(CStifItemParser& aItem);
+				TInt SetServerAddress_invalidnegative(CStifItemParser& aItem);
+				TInt SetServerAddress_invalidzero(CStifItemParser& aItem);
+				TInt SetServerAddress_AddressNull(CStifItemParser& aItem);
+				TInt SetServerAddress_InvalidAddressId(CStifItemParser& aItem);
+				TInt GetServerAddress(CStifItemParser& aItem);
+				TInt GetServerAddress_invalidpositive(CStifItemParser& aItem);
+				TInt GetServerAddress_invalidnegative(CStifItemParser& aItem);
+				TInt GetServerAddress_invalidzero(CStifItemParser& aItem);
+				TInt GetServerAddress(TInt64 aSlpId1);
+				TInt SetIAPName_InvalidAddressId(CStifItemParser& aItem);
+				TInt SetIAPName_invalidzero(CStifItemParser& aItem);
+				TInt SetIAPName_invalidnegative(CStifItemParser& aItem);
+				TInt SetIAPName_invalidpositive(CStifItemParser& aItem);
+				TInt SetIAPName(CStifItemParser& aItem);
+				 TInt GetIAPName_invalidzero(CStifItemParser& aItem);
+				 TInt GetIAPName_invalidnegative(CStifItemParser& aItem);
+				 TInt GetIAPName_invalidpositive(CStifItemParser& aItem);
+				 TInt GetIAPName(CStifItemParser& aItem);
+				 TInt GetIAPName(TInt64 aSlpId1);
+				 TInt SetServerEnabledFlag_Etrue(CStifItemParser& aItem);
+				 TInt SetServerEnabledFlag_EFalse(CStifItemParser& aItem);
+				 TInt SetServerEnabledFlag_id_negative(CStifItemParser& aItem);
+				 TInt SetServerEnabledFlag_id_positive(CStifItemParser& aItem);
+				  TInt SetServerEnabledFlag_id_zero(CStifItemParser& aItem);
+				 TInt GetServerEnabledFlag_id_negative(CStifItemParser& aItem);
+				  TInt GetServerEnabledFlag_id_positive(CStifItemParser& aItem);
+				  TInt GetServerEnabledFlag_id_zero(CStifItemParser& aItem);
+				  TInt GetServerEnabledFlag_EFalse(CStifItemParser& aItem);
+				  TInt GetServerEnabledFlag_Etrue(CStifItemParser& aItem);
+				  TInt GetUsageInHomeNwFlag(TInt64 aSlpId1);
+				  TInt SetUsageInHomwNwFlag_Etrue(CStifItemParser& aItem);
+				  TInt SetUsageInHomwNwFlag_EFalse(CStifItemParser& aItem);
+				  TInt SetUsageInHomwNwFlag_id_negative(CStifItemParser& aItem);
+				  TInt SetUsageInHomwNwFlag_id_positive(CStifItemParser& aItem);
+				   TInt SetUsageInHomwNwFlag_id_zero(CStifItemParser& aItem);
+					 TInt GetUsageInHomwNwFlag_Etrue(CStifItemParser& aItem);
+				   TInt GetUsageInHomwNwFlag_EFalse(CStifItemParser& aItem);
+				   TInt GetUsageInHomwNwFlag_id_negative(CStifItemParser& aItem);
+				   TInt GetUsageInHomwNwFlag_id_positive(CStifItemParser& aItem);
+				   TInt GetUsageInHomwNwFlag_id_zero(CStifItemParser& aItem);
+				   TInt GetUsageInHomwNwFlag(TInt64 aSlpId1);
+				 TInt AddNewServer_aServerAddress_Null(CStifItemParser& aItem);
+				  TInt AddNewServer_aIapNAme_Null(CStifItemParser& aItem);
+				 TInt SetDefaultServer_aServerAddress_Null(CStifItemParser& aItem);
+	 TInt SetDefaultServerWithDefaultValues(CStifItemParser& aItem);
+				 TInt SetAllParameter_aServerAddress_Null(CStifItemParser& aItem);
+  TInt SetAllParameter_WithDefaultValues(CStifItemParser& aItem);
+				 TInt SetAllParameter_Invalid_Positive(CStifItemParser& aItem);
+				 TInt SetAllParameter_Invalid_Negative(CStifItemParser& aItem);
+				 TInt SetAllParameter_Invalid_Zero(CStifItemParser& aItem);
+				TInt GetServerEnabledFlag(TInt64 aSlpId1);
+				TInt SetEditableFlag_Etrue(CStifItemParser& aItem);
+				TInt SetEditableFlag_EFalse(CStifItemParser& aItem);
+				TInt SetEditableFlag_id_negative(CStifItemParser& aItem);
+				TInt SetEditableFlag_id_positive(CStifItemParser& aItem);
+				TInt SetEditableFlag_id_zero(CStifItemParser& aItem);
+				TBool IsSLPExists(CStifItemParser& aItem);
+				TBool IsSLPExists_invalid_negative(CStifItemParser& aItem);
+				TBool IsSLPExists_invalid_positive(CStifItemParser& aItem);
+				TBool IsSLPExists_invalid_zero(CStifItemParser& aItem);
+				TInt GetAllSlp_sync(CStifItemParser& aItem);
+				TInt GetAllSlp_async(CStifItemParser& aItem);
+				TInt SetSimChangeRemoveFlag_Etrue(CStifItemParser& aItem);
+				TInt SetSimChangeRemoveFlag_EFalse(CStifItemParser& aItem);
+				TInt SetSimChangeRemoveFlag_id_negative(CStifItemParser& aItem);
+				TInt SetSimChangeRemoveFlag_id_positive(CStifItemParser& aItem);
+				TInt SetSimChangeRemoveFlag_id_zero(CStifItemParser& aItem);
+				TInt GetSimChangeRemoveFlag_Etrue(CStifItemParser& aItem);
+				TInt GetSimChangeRemoveFlag(TInt64 aSlpId1);
+				TInt GetSimChangeRemoveFlag_EFalse(CStifItemParser& aItem);
+				TInt GetSimChangeRemoveFlag_id_negative(CStifItemParser& aItem);
+				TInt GetSimChangeRemoveFlag_id_positive(CStifItemParser& aItem);
+				TInt GetSimChangeRemoveFlag_id_zero(CStifItemParser& aItem);
+				TInt GetEditableFlag_Etrue(CStifItemParser& aItem);
+				TInt GetEditableFlag(TInt64 aSlpId1);
+				TInt GetEditableFlag_EFalse(CStifItemParser& aItem);
+				TInt GetEditableFlag_id_negative(CStifItemParser& aItem);
+				TInt GetEditableFlag_id_positive(CStifItemParser& aItem);
+				TInt GetEditableFlag_id_zero(CStifItemParser& aItem);
+				TInt SetFallBack_ETrue();
+				TInt SetFallBack_EFalse();
+				TInt GetFallBack();
+				TInt IsSLPExistsString();
+				TInt IsSLPExistsString_Null();
+				TInt IsSLPExistsString_invalid();
+				TInt SlpCount();
+				TInt GetSlpInfoFromAddress(CStifItemParser& aItem);
+				TInt GetSlpInfoFromAddress_invalid(CStifItemParser& aItem);
 		
 				TInt SetGetTriggerParamsL( CStifItemParser& aItem ); 
 				
--- a/locsrv_pub/location_triggering_api/inc/lbttriggerinfo.h	Wed Jun 09 10:08:56 2010 +0300
+++ b/locsrv_pub/location_triggering_api/inc/lbttriggerinfo.h	Mon Jun 21 16:08:35 2010 +0300
@@ -132,7 +132,7 @@
     /**
      * Default constructor.
      */
-    CLbtTriggerInfo();
+    IMPORT_C CLbtTriggerInfo();
 
 private:    
     /**
--- a/supl/locationomasuplprotocolhandler/supllistener/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/supl/locationomasuplprotocolhandler/supllistener/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -25,5 +25,5 @@
 ./epos_omasupllistener.mmp
 // for backup restore 
 PRJ_EXPORTS
-../data/backup_registration.xml     /epoc32/data/z/private/1027509E/backup_registration.xml
+../data/backup_registration.xml     z:/private/1027509E/backup_registration.xml
 ../inc/epos_comasuplproductconfigcrkeys.h  |../../../inc/epos_comasuplproductconfigcrkeys.h
\ No newline at end of file
--- a/supl/locationsuplfw/gateway/group/bld.inf	Wed Jun 09 10:08:56 2010 +0300
+++ b/supl/locationsuplfw/gateway/group/bld.inf	Mon Jun 21 16:08:35 2010 +0300
@@ -24,7 +24,7 @@
 
 PRJ_EXPORTS
 
-../data/backup_registration.xml    z/private/102073ca/backup_registration.xml
+../data/backup_registration.xml    z:/private/102073ca/backup_registration.xml
 
 PRJ_MMPFILES
 epos_csuplserver.mmp
--- a/supl/locationsuplfw/protocolhandlerapi/group/epos_suplprotocolhandlerplugin.mmp	Wed Jun 09 10:08:56 2010 +0300
+++ b/supl/locationsuplfw/protocolhandlerapi/group/epos_suplprotocolhandlerplugin.mmp	Mon Jun 21 16:08:35 2010 +0300
@@ -55,5 +55,5 @@
 LIBRARY flogger.lib
 /* LIBRARY         gba.lib */
 
-exportunfrozen 
+//exportunfrozen 
 epocallowdlldata
MCL/sf/mw/locationsrv