--- a/basiclocationinfodisplay/blid/group/bld.inf Tue May 25 12:34:45 2010 +0300
+++ b/basiclocationinfodisplay/blid/group/bld.inf Mon Jun 21 15:33:15 2010 +0300
@@ -37,17 +37,11 @@
../conf/odometersettings.confml APP_LAYER_CONFML(odometersettings.confml)
../conf/odometersettings_101F85A0.crml APP_LAYER_CRML(odometersettings_101F85A0.crml)
-// TODO: Remove it after Crml
-../cenrep/101F85A0.txt /epoc32/data/Z/private/10202be9/101F85A0.txt
-../cenrep/101F85A0.txt /epoc32/release/winscw/udeb/Z/private/10202be9/101F85A0.txt
-
// Backup CenRep Settings
-../data/backup_registration.xml /epoc32/RELEASE/winscw/udeb/z/private/101F85A0/backup_registration.xml
-../data/backup_registration.xml /epoc32/data/z/private/101F85A0/backup_registration.xml
+../data/backup_registration.xml Z:/private/101F85A0/backup_registration.xml
#include "../engine/group/bld.inf"
#include "../ui/group/bld.inf"
#include "../help/group/bld.inf"
-PRJ_MMPFILES
// End of File
--- a/basiclocationinfodisplay/blid/ui/inc/CBlidMainView.h Tue May 25 12:34:45 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/inc/CBlidMainView.h Mon Jun 21 15:33:15 2010 +0300
@@ -78,7 +78,7 @@
void HandleResourceChangeL( TInt aType );
#ifdef RD_SCALABLE_UI_V2
- void CBlidMainView::HandleListBoxSelectionL();
+ void HandleListBoxSelectionL();
#endif //RD_SCALABLE_UI_V2
public: //From MBlidEngObserver
--- a/basiclocationinfodisplay/blid/ui/inc/CBlidSatelliteView.h Tue May 25 12:34:45 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/inc/CBlidSatelliteView.h Mon Jun 21 15:33:15 2010 +0300
@@ -75,7 +75,7 @@
void HandleResourceChangeL( TInt aType );
#ifdef RD_SCALABLE_UI_V2
- void CBlidSatelliteView::HandleListBoxSelectionL();
+ void HandleListBoxSelectionL();
#endif //RD_SCALABLE_UI_V2
public: //From MBlidEngObserver
--- a/eventsui/eventsengine/inc/evtmgmtuilbtadapter.h Tue May 25 12:34:45 2010 +0300
+++ b/eventsui/eventsengine/inc/evtmgmtuilbtadapter.h Mon Jun 21 15:33:15 2010 +0300
@@ -333,7 +333,7 @@
* @param [in] aCenter - location of the trigger.
* @param [out] CLbtTriggerConditionArea - Condition Area for Trigger.
*/
- CLbtTriggerConditionArea* CEvtMgmtUiLbtAdapter::GetConditionAreaL(
+ CLbtTriggerConditionArea* GetConditionAreaL(
const TCoordinate& aCenter,
TReal aRadiusInKiloMeters );
private:
--- a/eventsui/eventsmgmtui/group/bld.inf Tue May 25 12:34:45 2010 +0300
+++ b/eventsui/eventsmgmtui/group/bld.inf Mon Jun 21 15:33:15 2010 +0300
@@ -42,6 +42,3 @@
OPTION SOURCES -c32,8 qgn_prop_locev_new.svg -c32,8 qgn_prop_locev_draft.svg -c32,8 qgn_prop_locev_invalid.svg -c32,8 qgn_prop_locev_completed.svg -c32,8 qgn_prop_locev_trigger -c8,8 qgn_indi_repeat_add
END
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
--- a/eventsui/eventsmgmtui/inc/evtmgmtuiappui.h Tue May 25 12:34:45 2010 +0300
+++ b/eventsui/eventsmgmtui/inc/evtmgmtuiappui.h Mon Jun 21 15:33:15 2010 +0300
@@ -77,7 +77,7 @@
/**
* Retrieve the application specific status pane
*/
- CEikStatusPane* CEvtMgmtUiAppUi::StatusPane();
+ CEikStatusPane* StatusPane();
/**
* Legal Note
--- a/eventsui/eventsmgmtui/inc/evtmgmtuimodel.h Tue May 25 12:34:45 2010 +0300
+++ b/eventsui/eventsmgmtui/inc/evtmgmtuimodel.h Mon Jun 21 15:33:15 2010 +0300
@@ -84,7 +84,7 @@
* It will return Events array object reference.
* @ret Events array object reference
*/
- RPointerArray<CEvtBasicEventInfo>& CEvtMgmtUiModel::EventsArray();
+ RPointerArray<CEvtBasicEventInfo>& EventsArray();
/**
* returns eventinfo object.
--- a/eventsui/group/bld.inf Tue May 25 12:34:45 2010 +0300
+++ b/eventsui/group/bld.inf Mon Jun 21 15:33:15 2010 +0300
@@ -40,16 +40,9 @@
../conf/evtstorage.confml APP_LAYER_CONFML(evtstorage.confml)
../conf/evtstorage_2001E66D.crml APP_LAYER_CRML(evtstorage_2001E66D.crml)
-// Localization resource files
-// Stub sis files
-
-// TODO: Remove it after Crml
-../cenrep/2001E66D.txt /epoc32/data/Z/private/10202be9/2001E66D.txt
-../cenrep/2001E66D.txt /epoc32/release/winscw/udeb/Z/private/10202be9/2001E66D.txt
// Backup Db files
-../data/backup_registration.xml /epoc32/RELEASE/winscw/udeb/z/private/2001E663/backup_registration.xml
-../data/backup_registration.xml /epoc32/data/z/private/2001E663/backup_registration.xml
+../data/backup_registration.xml z:/private/2001E663/backup_registration.xml
PRJ_MMPFILES
@@ -68,6 +61,3 @@
// Events Management UI
#include "../eventsmgmtui/group/bld.inf"
-PRJ_TESTMMPFILES
-
-PRJ_TESTEXPORTS
\ No newline at end of file
--- a/landmarksui/engine/inc/CLmkEncoder.h Tue May 25 12:34:45 2010 +0300
+++ b/landmarksui/engine/inc/CLmkEncoder.h Mon Jun 21 15:33:15 2010 +0300
@@ -88,7 +88,7 @@
* @param aFile where parsed data is stored
* @param aLandmarks
*/
- IMPORT_C void CLmkEncoder::StartEncodingL(const TDesC& aFileName,
+ IMPORT_C void StartEncodingL(const TDesC& aFileName,
const RPointerArray<CLmkLandmark>& aLandmarks );
/**
--- a/landmarksui/engine/inc/CLmkLandmark.h Tue May 25 12:34:45 2010 +0300
+++ b/landmarksui/engine/inc/CLmkLandmark.h Mon Jun 21 15:33:15 2010 +0300
@@ -74,7 +74,7 @@
const RPointerArray<CPosLandmarkCategory>& aCategories
);
- IMPORT_C static CLmkLandmark* CLmkLandmark::NewL(
+ IMPORT_C static CLmkLandmark* NewL(
const CLmkLandmark& aLandmark);
--- a/landmarksui/engine/inc/CLmkLmItemListProvider.h Tue May 25 12:34:45 2010 +0300
+++ b/landmarksui/engine/inc/CLmkLmItemListProvider.h Mon Jun 21 15:33:15 2010 +0300
@@ -85,7 +85,7 @@
RArray<TPosLmItemId>& aSelectedItems,
const CArrayFix<TInt>& aSelectedIndexes ) const;
- IMPORT_C void CLmkLmItemListProvider::GetAllItemIdsL(
+ IMPORT_C void GetAllItemIdsL(
RArray<TPosLmItemId>& aSelectedItems ) const;
/**
--- a/landmarksui/uicontrols/inc/CLmkAppLmItemSelectorImpl.h Tue May 25 12:34:45 2010 +0300
+++ b/landmarksui/uicontrols/inc/CLmkAppLmItemSelectorImpl.h Mon Jun 21 15:33:15 2010 +0300
@@ -67,10 +67,10 @@
*/
void ChangeIconCmdL();
// Added for Bug Fix
- void CLmkAppLmItemSelectorImpl::DiskSpaceBelowCriticalLevelL(
+ void DiskSpaceBelowCriticalLevelL(
TInt aBytesToWrite, TChar aDrive);
- TInt CLmkAppLmItemSelectorImpl::CalculateLandmarkDisksize(
+ TInt CalculateLandmarkDisksize(
const CPosLandmark& aLandmark);
public: // From CLmkAppSelectorImplBase
--- a/landmarksui/uicontrols/inc/CLmkEditorImpl.h Tue May 25 12:34:45 2010 +0300
+++ b/landmarksui/uicontrols/inc/CLmkEditorImpl.h Mon Jun 21 15:33:15 2010 +0300
@@ -302,7 +302,7 @@
TBool IsFieldEmptyL(const TUint16 aFieldType);
- TBool CLmkEditorImpl::IsInvalidUriL();
+ TBool IsInvalidUriL();
void LaunchLmkEditorL();
--- a/landmarksui/uicontrols/inc/CLmkSaveLandmarkUtils.h Tue May 25 12:34:45 2010 +0300
+++ b/landmarksui/uicontrols/inc/CLmkSaveLandmarkUtils.h Mon Jun 21 15:33:15 2010 +0300
@@ -87,7 +87,7 @@
* @param aNewFoundCategory
* @param aNewcategories
*/
- TInt CLmkSaveLandmarkUtils::CheckForNewCategories2L(
+ TInt CheckForNewCategories2L(
TDes& aNewFoundCategory,
RArray<TCategoryName>& aNewcategories);
/*
@@ -97,7 +97,7 @@
/*
* Display confirmation note
*/
- void CLmkSaveLandmarkUtils::LmsSavedConfirmationNoteL(RArray<TUint> & aImportIndexes,
+ void LmsSavedConfirmationNoteL(RArray<TUint> & aImportIndexes,
TInt aEditedItemIndex = 0);
public://New Functions
--- a/loc_pub/landmarks_ui_addedit_api/tsrc/group/bld.inf Tue May 25 12:34:45 2010 +0300
+++ b/loc_pub/landmarks_ui_addedit_api/tsrc/group/bld.inf Mon Jun 21 15:33:15 2010 +0300
@@ -27,38 +27,11 @@
// defaults to WINS MARM so you can ignore this if you just build these
DEFAULT
-PRJ_TESTEXPORTS
-// NOTE: If using ARS requirements all export operations should be done under this.
-// 'abld test export'
-
-PRJ_EXPORTS
-// Specify the source file followed by its destination here
-// copy will be used to copy the source file to its destination
-// If there's no destination then the source file will be copied
-// to the same name in /epoc32/include
-// Example:
-/*
-/agnmodel/inc/AGMCOMON.H
-*/
-
PRJ_TESTMMPFILES
// NOTE: If using ARS requirements .mmp file operation should be done under this.
// 'abld test build'
UTAppLmkAddEdit.mmp
-PRJ_MMPFILES
-// Specify the .mmp files required for building the important component
-// releasables.
-//
-// Specify "tidy" if the component you need to build doesn't need to be
-// released. Specify "ignore" if the MMP file exists but should be
-// ignored.
-// Example:
-/*
-/agnmodel/group/agnmodel.mmp
-#if defined(MARM)
-/agnmodel/group/agsvexe.mmp
-#endif
-*/
+
// End of File
\ No newline at end of file
--- a/locationlandmarksrefappfors60/group/bld.inf Tue May 25 12:34:45 2010 +0300
+++ b/locationlandmarksrefappfors60/group/bld.inf Mon Jun 21 15:33:15 2010 +0300
@@ -19,8 +19,6 @@
DEFAULT ARMV5
PRJ_MMPFILES
-// gnumakefile lmrefapp_icons_scalable_dc.mk
-// gnumakefile lmrefapp_icons_bitmaps_dc.mk
LmRefApp.mmp
PRJ_EXTENSIONS
--- a/locationlandmarksuirefapp/inc/LmUiRefAppView.h Tue May 25 12:34:45 2010 +0300
+++ b/locationlandmarksuirefapp/inc/LmUiRefAppView.h Mon Jun 21 15:33:15 2010 +0300
@@ -93,7 +93,7 @@
TBool IsLmDbEmptyL();
// Single category selector dialog
- TInt CLmUiRefAppView::LaunchSingleCategoeyDialogL();
+ TInt LaunchSingleCategoeyDialogL();
public: // From CAknView
TUid Id() const;
--- a/simpsyconfigurator/group/bld.inf Tue May 25 12:34:45 2010 +0300
+++ b/simpsyconfigurator/group/bld.inf Mon Jun 21 15:33:15 2010 +0300
@@ -26,5 +26,8 @@
// Files to be exported
nmea.nme /epoc32/release/winscw/udeb/z/system/data/nmea.nme
+nmea.nme /epoc32/release/winscw/urel/z/system/data/nmea.nme
simu_move_const.sps /epoc32/release/winscw/udeb/z/system/data/simu_move_const.sps
+simu_move_const.sps /epoc32/release/winscw/urel/z/system/data/simu_move_const.sps
simu_move_speed.sps /epoc32/release/winscw/udeb/z/system/data/simu_move_speed.sps
+simu_move_speed.sps /epoc32/release/winscw/urel/z/system/data/simu_move_speed.sps