# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1282200516 -10800
# Node ID 8173571d354e9a8425ea6da701addb17d7edafb8
# Parent  5a3ac8687c850d54010f7508a4e7c4c1bb847b0f
Revision: 201030
Kit: 201033

diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/engine/src/CBlidSettings.cpp
--- a/basiclocationinfodisplay/blid/engine/src/CBlidSettings.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/engine/src/CBlidSettings.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 // INCLUDE FILES
 #include <f32file.h> // RFs
 #include <centralrepository.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <eikenv.h>
 
 #include "CBlidSettings.h"
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/data/Blid.rss
--- a/basiclocationinfodisplay/blid/ui/data/Blid.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/data/Blid.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -32,7 +32,7 @@
 #include <avkon.loc>
 #include <avkon.mbg>
 #include <uikon.hrh>
-#include <EIKCTL.rsg>
+#include <eikctl.rsg>
 
 
 //  CONSTANTS  
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/data/blid_reg.rss
--- a/basiclocationinfodisplay/blid/ui/data/blid_reg.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/data/blid_reg.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 #include <appinfo.rh>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include "BlidUID.h"
 #include <data_caging_paths_strings.hrh>
 
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/BlidNotes.cpp
--- a/basiclocationinfodisplay/blid/ui/src/BlidNotes.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/BlidNotes.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <StringLoader.h>
 #include <aknnotewrappers.h> 
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <aknstaticnotedialog.h> 
 #include "BlidNotes.h"
 #include "blidcommonconsts.h"
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidAppUi.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidAppUi.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidAppUi.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 
 // INCLUDE FILES
 #include <AknsUtils.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <akncontext.h> 
 #include <hlplch.h>
 #include <StringLoader.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidBaseView.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidBaseView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidBaseView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -20,7 +20,7 @@
 #include <AknQueryDialog.h> 
 #include <StringLoader.h>
 #include <eikmenub.h> // CEikMenuBar
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <EPos_CPosLandmarkDatabase.h>
 #include <EPos_CPosLmItemIterator.h>
 #include <e32std.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidCurrentPositionDlg.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidCurrentPositionDlg.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidCurrentPositionDlg.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 
 //  SYSTEM INCLUDE FILES
 #include <aknlists.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <avkon.hrh>
 #include <aknborders.h>
 
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidMainControl.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidMainControl.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidMainControl.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 #include <aknmessagequerydialog.h> //CAknMessageQueryDialog
 #include <StringLoader.h>
 #include <aknconsts.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <akntitle.h> 
 #include <aknnavide.h>
 #include <eikspane.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidMainView.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidMainView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidMainView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 
 // SYSTEM INCLUDE FILES
 #include <aknViewAppUi.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <alf/alfenv.h>
 #include <alf/alfcontrolgroup.h>
 #include <alf/alfdisplay.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidNavigationView.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidNavigationView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidNavigationView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -17,7 +17,7 @@
 
 
 // SYSTEM INCLUDE FILES
-#include <Blid.rsg>
+#include <blid.rsg>
 //Added for HTK toolkit support
 #include <alf/alfenv.h>
 #include <alf/alfcontrolgroup.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidOwnPosLBModel.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidOwnPosLBModel.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidOwnPosLBModel.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <StringLoader.h> 
 #include <AknUtils.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <aknlocationed.h>
 
 #include "CBlidOwnPosLBModel.h"
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSatelliteControl.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSatelliteControl.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSatelliteControl.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 
 // SYSTEM INCLUDES
 #include <StringLoader.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <blid.mbg>
 #include <akntitle.h> 
 #include <aknnavide.h> 
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSatelliteView.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSatelliteView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSatelliteView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 
 // SYSTEM INCLUDE FILES
 #include <aknViewAppUi.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <alf/alfenv.h>
 #include <alf/alfcontrolgroup.h>
 #include <alf/alfdisplay.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsContainer.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -22,7 +22,7 @@
 #include <eikmenub.h>
 #include <aknViewAppUi.h> 
 #include <aknlists.h>   // CAknSingleLargeStyleListBox
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <AknsConstants.h>
 #include <AknIconArray.h>
 #include <aknnavide.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsLBModel.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsLBModel.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsLBModel.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <StringLoader.h> 
 #include <AknUtils.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include "CBlidSavedWayptsLBModel.h"
 #include "MBlidLocation.h"
 #include "MBlidSettings.h"
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsView.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSavedWayptsView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -17,7 +17,7 @@
 
 
 // INCLUDE FILES
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <EPos_CPosLandmarkDatabase.h>
 #include <eikmenub.h> // CEikMenuBar
 #include <avkon.hrh>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSettingsContainer.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSettingsContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSettingsContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -20,7 +20,7 @@
 // INCLUDE FILES
 #include <aknnavide.h>
 #include <aknlists.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <AknDef.h>
 #include <csxhelp/blid.hlp.hrh>
 
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSettingsLBModel.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSettingsLBModel.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSettingsLBModel.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <StringLoader.h> 
 #include <AknUtils.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include "CBlidSettingsLBModel.h"
 #include "MBlidSettings.h"
 #include "bliduiconsts.h" 
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidSettingsView.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidSettingsView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidSettingsView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -20,7 +20,7 @@
 #include <aknlists.h>
 #include <aknViewAppUi.h>
 #include <akntextsettingpage.h> 
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <aknradiobuttonsettingpage.h>
 #include <sysutil.h>
 #include <driveinfo.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CBlidTripMeterView.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CBlidTripMeterView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CBlidTripMeterView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -16,7 +16,7 @@
 */
 
 // SYSTEM INCLUDES
-#include <Blid.rsg>
+#include <blid.rsg>
 //Added for HTK toolkit support
 #include <alf/alfenv.h>
 #include <alf/alfcontrolgroup.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CHtkNavigationControl.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CHtkNavigationControl.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CHtkNavigationControl.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -30,7 +30,7 @@
 #include <AknsUtils.h>
 #include <akntabgrp.h>
 #include <blid.mbg>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <avkon.hrh>
 #include <eikenv.h>
 #include <aknsoundsystem.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/CHtkTripMeterControl.cpp
--- a/basiclocationinfodisplay/blid/ui/src/CHtkTripMeterControl.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/CHtkTripMeterControl.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -25,7 +25,7 @@
 #include <akntitle.h> 
 #include <akntabgrp.h>
 #include <blid.mbg>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include <aknlayoutscalable_avkon.cdl.h>
 #include <centralrepository.h>
 #include <aknnotedialog.h>
diff -r 5a3ac8687c85 -r 8173571d354e basiclocationinfodisplay/blid/ui/src/cblidnotedialog.cpp
--- a/basiclocationinfodisplay/blid/ui/src/cblidnotedialog.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/basiclocationinfodisplay/blid/ui/src/cblidnotedialog.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 
 // INCLUDE FILES
 #include <aknnotedialog.h>
-#include <Blid.rsg>
+#include <blid.rsg>
 #include "cblidnotedialog.h"
 
 // ============================ MEMBER FUNCTIONS ==============================
diff -r 5a3ac8687c85 -r 8173571d354e eventsui/eventshandlerui/eventsnotifier/evtinfonote/data/evtinfonote.rss
--- a/eventsui/eventshandlerui/eventsnotifier/evtinfonote/data/evtinfonote.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/eventsui/eventshandlerui/eventsnotifier/evtinfonote/data/evtinfonote.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -22,7 +22,7 @@
 #include <avkon.rh>
 #include <avkon.rsg>
 #include <avkon.mbg>
-#include <EIKCORE.rsg>
+#include <eikcore.rsg>
 #include <eikon.rh>
 #include <eikon.rsg>
 #include <avkon.loc>
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/data/Landmarks_reg.rss
--- a/landmarksui/app/data/Landmarks_reg.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/data/Landmarks_reg.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -23,7 +23,7 @@
 
 
 #include <appinfo.rh>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include "LmkUID.h"
 #include <data_caging_paths_strings.hrh>
 
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkAppUi.cpp
--- a/landmarksui/app/src/CLmkAppUi.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkAppUi.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -37,7 +37,7 @@
 #include <StringLoader.h>
 #include <aknnotewrappers.h>
 #include <AknQueryDialog.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <lmkerrors.h>
 
 #if defined(_DEBUG)
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkBaseView.cpp
--- a/landmarksui/app/src/CLmkBaseView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkBaseView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -31,7 +31,7 @@
 #include <featmgr.h>
 #include <StringLoader.h>
 #include <eikmenub.h> // CEikMenuBar
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include "clmkmapnavigationinterface.h"
 #include <locationvariationdomaincrkeys.h>
 #include <centralrepository.h>
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkByCategoryContainer.cpp
--- a/landmarksui/app/src/CLmkByCategoryContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkByCategoryContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 // INCLUDE FILES
 #include <aknlists.h>
 #include <aknsfld.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 // For RD_AVKON_UNBRANCH
 #include <bldvariant.hrh>
 #include <AknDef.h>
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkByCategoryView.cpp
--- a/landmarksui/app/src/CLmkByCategoryView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkByCategoryView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -19,7 +19,7 @@
 
 #include <EPos_CPosLandmarkDatabase.h>
 #include <aknViewAppUi.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <eikmenup.h>
 #include <featmgr.h>
 #include <StringLoader.h>
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkByLmContainer.cpp
--- a/landmarksui/app/src/CLmkByLmContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkByLmContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -24,7 +24,7 @@
 // For RD_AVKON_UNBRANCH
 #include <bldvariant.hrh>
 #include <AknDef.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include "CLmkAppUi.h"
 #include "CLmkUiUtils.h"
 #include "CLmkSender.h"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkByLmView.cpp
--- a/landmarksui/app/src/CLmkByLmView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkByLmView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 // INCLUDE FILES
 #include <EPos_CPosLandmarkDatabase.h>
 #include <aknViewAppUi.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <sendnorm.rsg> // R_SENDUI_MENU
 #include <eiktxlbx.h>
 #include <eikmenup.h>
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkCategoryContentsContainer.cpp
--- a/landmarksui/app/src/CLmkCategoryContentsContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkCategoryContentsContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 // INCLUDE FILES
 #include <aknsfld.h>
 #include <aknlists.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <eikmenub.h>
 #include <layoutmetadata.cdl.h> // To Check TOUCH Support
 #include <bldvariant.hrh>
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkCategoryContentsView.cpp
--- a/landmarksui/app/src/CLmkCategoryContentsView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkCategoryContentsView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -23,7 +23,7 @@
 #include <aknViewAppUi.h>
 #include <featmgr.h>
 #include <sendnorm.rsg> // R_SENDUI_MENU
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <EPos_CPosLandmark.h>
 #include <lbsposition.h>
 #include "CLmkCategoryContentsView.h"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkCategorySettingsContainer.cpp
--- a/landmarksui/app/src/CLmkCategorySettingsContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkCategorySettingsContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -22,7 +22,7 @@
 // For RD_AVKON_UNBRANCH
 #include <bldvariant.hrh>
 #include <AknDef.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <lmkui.rsg>
 #include "landmarks.hrh"
 //#include "Landmarks.hlp.hrh"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/app/src/CLmkCategorySettingsView.cpp
--- a/landmarksui/app/src/CLmkCategorySettingsView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/app/src/CLmkCategorySettingsView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 // INCLUDE FILES
 #include <eikmenup.h>
 #include <eiktxlbx.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include "landmarks.hrh"
 #include "CLmkAppUi.h"
 #include "CLmkAppCategorySettingsImpl.h"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/commonui/src/CLmkCategorySelectorDlg.cpp
--- a/landmarksui/commonui/src/CLmkCategorySelectorDlg.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/commonui/src/CLmkCategorySelectorDlg.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -28,7 +28,7 @@
 #include "CLmkCategorySelectorDlg.h"
 #include "CLmkDlgCategorySelectorImpl.h"
 #include <lmkui.rsg>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <lmkerrors.h>
 
 
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/commonui/src/CLmkLandmarkSelectorDlg.cpp
--- a/landmarksui/commonui/src/CLmkLandmarkSelectorDlg.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/commonui/src/CLmkLandmarkSelectorDlg.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -22,7 +22,7 @@
 #include "CLmkLandmarkSelectorDlg.h"
 #include "CLmkDlgCombiSelectorImpl.h"
 #include <lmkui.rsg>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <lmkerrors.h>
 
 
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/msgviewer/data/LmkMsgViewer_reg.rss
--- a/landmarksui/msgviewer/data/LmkMsgViewer_reg.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/msgviewer/data/LmkMsgViewer_reg.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -25,7 +25,7 @@
 #include <data_caging_paths_strings.hrh>
 
 #include <appinfo.rh>
-#include <LmkMsgViewer.rsg>
+#include <lmkmsgviewer.rsg>
 #include "LmkUID.h"
 
 UID2 KUidAppRegistrationResourceFile
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/msgviewer/src/CLmkMsgViewerAppUi.cpp
--- a/landmarksui/msgviewer/src/CLmkMsgViewerAppUi.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/msgviewer/src/CLmkMsgViewerAppUi.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -35,7 +35,7 @@
 #include <AknsUtils.h>
 #include <AknWaitDialog.h>
 #include <EPos_CPosLandmarkDatabase.h>
-#include <LmkMsgViewer.rsg>
+#include <lmkmsgviewer.rsg>
 #include <aknnotewrappers.h>
 #include <StringLoader.h>
 #include "LmkNotes.h"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/uicontrols/data/LmkEditor.rss
--- a/landmarksui/uicontrols/data/LmkEditor.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/uicontrols/data/LmkEditor.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -25,7 +25,7 @@
 #include <AiwCommon.hrh>
 #include <AiwCommon.rh>
 #include <AknFep.rsg>
-#include <EIKCTL.rsg>
+#include <eikctl.rsg>
 
 //----------------------------------------------------
 //   
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/uicontrols/src/CLmkAppLmSelectorImpl.cpp
--- a/landmarksui/uicontrols/src/CLmkAppLmSelectorImpl.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/uicontrols/src/CLmkAppLmSelectorImpl.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -33,7 +33,7 @@
 #include <EPos_CPosLmCategoryManager.h>
 #include <AknWaitDialog.h>
 #include <lmkui.rsg>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <CLmkEditorDlg.h> // from system include!
 #include "clmkdbsearchutils.h"
 #include "LmkConsts.h"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/uicontrols/src/CLmkAppSelectorImplBase.cpp
--- a/landmarksui/uicontrols/src/CLmkAppSelectorImplBase.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/uicontrols/src/CLmkAppSelectorImplBase.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -24,7 +24,7 @@
 #include <eikclbd.h>
 #include <AknIconArray.h>
 #include <StringLoader.h>
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <aknsfld.h>
 #include <aknlayout.cdl.h>
 #include "LmkConsts.h"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/uicontrols/src/CLmkEditorImpl.cpp
--- a/landmarksui/uicontrols/src/CLmkEditorImpl.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/uicontrols/src/CLmkEditorImpl.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -66,7 +66,7 @@
 #include "lmkicondialog.h"
 #include "CLmkEditorListField.h"
 #include "CLmkEditorCoordinateField.h"
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <uriutils.h>
 #include "LmkListProviderFactory.h"
 #include "CLmkListProviderBase.h"
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/uicontrols/src/CLmkSelectorDialog.cpp
--- a/landmarksui/uicontrols/src/CLmkSelectorDialog.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/uicontrols/src/CLmkSelectorDialog.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -24,7 +24,7 @@
 #include "CLmkLmItemListMemento.h"
 #include "LmkConsts.h"
 #include "CLmkListProviderBase.h"
-#include <Landmarks.rsg>
+#include <landmarks.rsg>
 #include <eikclbd.h>
 
 _LIT(KWildCard, "*");
diff -r 5a3ac8687c85 -r 8173571d354e landmarksui/uicontrols/src/CLmkUiUtils.cpp
--- a/landmarksui/uicontrols/src/CLmkUiUtils.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/landmarksui/uicontrols/src/CLmkUiUtils.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -318,7 +318,7 @@
 //
 void CLmkUiUtils::SetOldContextIcon()
     {
-    if ( iContextPane && iOldImage )
+    if ( iContextPane && iOldImage && iOldImage->Bitmap())
         {
         iContextPane->SetPicture( iOldImage );
         iOldImage = NULL;
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Data/LmRefApp.rss
--- a/locationlandmarksrefappfors60/Data/LmRefApp.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Data/LmRefApp.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -22,7 +22,7 @@
 #include <avkon.rh>
 #include <avkon.rsg>
 #include <avkon.mbg>
-#include <EIKCTL.rsg>
+#include <eikctl.rsg>
 
 #include <appinfo.rh>
 
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Data/LmRefApp_reg.rss
--- a/locationlandmarksrefappfors60/Data/LmRefApp_reg.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Data/LmRefApp_reg.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -18,7 +18,7 @@
 
 
 #include <appinfo.rh>
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 
 UID2 KUidAppRegistrationResourceFile
 UID3 0xA0000187
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksAppUi.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksAppUi.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksAppUi.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -25,7 +25,7 @@
 #include <aknnavide.h>
 
 #include "LmRefApp.hrh"
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LandmarksAppUi.h"
 #include "LandmarksView.h"
 #include "LandmarksCategoriesView.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksCategoriesContainer.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksCategoriesContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksCategoriesContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -24,7 +24,7 @@
 
 #include <EPos_CPosLandmarkCategory.h>
 
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LandmarksCategoriesContainer.h"
 #include "LandmarksCommonData.h"
 #include "LandmarksListbox.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksCategoriesDialog.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksCategoriesDialog.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksCategoriesDialog.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -24,7 +24,7 @@
 #include <eikmenup.h>
 
 #include "LmRefApp.hrh"
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LandmarksLmCategoriesModel.h"
 #include "LandmarksApplicationEngine.h"
 #include "LandmarksCategoriesDialog.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksCategoriesView.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksCategoriesView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksCategoriesView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -25,7 +25,7 @@
 #include <EPos_CPosLandmarkCategory.h>
 
 #include "LmRefApp.hrh"
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LandmarksCategoriesView.h"
 #include "LandmarksCategoriesContainer.h"
 #include "LandmarksApplicationEngine.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksContainer.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -24,7 +24,7 @@
 #include <AknQueryDialog.h>
 
 #include "LmRefApp.hrh"
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LandmarksContainer.h"
 #include "LandmarksCommonData.h"
 #include "LandmarksListBoxModel.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksEditDialog.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksEditDialog.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksEditDialog.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -34,7 +34,7 @@
 #include <EPos_CPosLandmarkCategory.h>
 
 #include "LmRefApp.hrh"
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 
 #include "LandmarksUtils.h"
 #include "LandmarksCommonData.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksInfoContainer.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksInfoContainer.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksInfoContainer.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -27,7 +27,7 @@
 
 #include <lbspositioninfo.h>
 
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LmRefApp.hrh"
 #include "LandmarksCommonData.h"
 #include "LandmarksInfoContainer.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksInfoModel.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksInfoModel.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksInfoModel.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -27,7 +27,7 @@
 #include <EPos_CPosLandmark.h>
 #include <EPos_CPosLandmarkCategory.h>
 
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LmRefApp.hrh"
 #include "LandmarksInfoModel.h"
 #include "LandmarksUtils.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksInfoView.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksInfoView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksInfoView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -24,7 +24,7 @@
 #include <lbspositioninfo.h>
 #include <EPos_Landmarks.h>
 
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LmRefApp.hrh"
 
 #include "LandmarksAppUi.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksPositionRequest.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksPositionRequest.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksPositionRequest.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -23,7 +23,7 @@
 
 #include <lbspositioninfo.h>
 
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LandmarksUtils.h"
 #include "LandmarksPositionRequest.h"
 #include "LandmarksOperationObserver.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationlandmarksrefappfors60/Src/LandmarksView.cpp
--- a/locationlandmarksrefappfors60/Src/LandmarksView.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationlandmarksrefappfors60/Src/LandmarksView.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -25,7 +25,7 @@
 #include <lbspositioninfo.h>
 #include <epos_poslandmarkserialization.h>
 
-#include <LmRefApp.rsg>
+#include <lmrefapp.rsg>
 #include "LmRefApp.hrh"
 #include "LandmarksView.h"
 #include "LandmarksAppUi.h"
diff -r 5a3ac8687c85 -r 8173571d354e locationsatviewrefapp/data/SatelliteReference_reg.rss
--- a/locationsatviewrefapp/data/SatelliteReference_reg.rss	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationsatviewrefapp/data/SatelliteReference_reg.rss	Thu Aug 19 09:48:36 2010 +0300
@@ -17,7 +17,7 @@
 
 
 #include <appinfo.rh>
-#include <SatelliteReference.rsg>
+#include <satellitereference.rsg>
 
 UID2 KUidAppRegistrationResourceFile
 UID3 0xA000018A
diff -r 5a3ac8687c85 -r 8173571d354e locationsatviewrefapp/src/SatelliteReferenceAppUi.cpp
--- a/locationsatviewrefapp/src/SatelliteReferenceAppUi.cpp	Mon Jun 21 15:33:15 2010 +0300
+++ b/locationsatviewrefapp/src/SatelliteReferenceAppUi.cpp	Thu Aug 19 09:48:36 2010 +0300
@@ -25,7 +25,7 @@
 // INCLUDE FILES
 #include "SatelliteReferenceAppUi.h"
 #include "SatelliteReferenceContainer.h" 
-#include <SatelliteReference.rsg>
+#include <satellitereference.rsg>
 #include "SatelliteReference.hrh"
 #include <StringLoader.h>