--- a/locationdataharvester/inc/mylocationsdefines.h	Thu Sep 02 20:20:42 2010 +0300
+++ b/locationdataharvester/inc/mylocationsdefines.h	Mon Oct 04 00:10:56 2010 +0300
@@ -19,29 +19,7 @@
 #ifndef __MYLOCATIONSDEFINES_H__
 #define __MYLOCATIONSDEFINES_H__
 
-/**
- * TLookupItem struct.
- * This structure defines a single lookup item.
- */
-
-class TLookupItem
-{
-public:
-    // Uid of the source entry
-    TUint32 iUid;
-
-    // Source type
-    TUint32 iSource;
-
-    // Landmark uid in the landmarks database
-    TUint32 iLmId;
-   
-    // File Path
-    TFileName iFilePath;
-    
-    //MK  map tile fetching status
-    TUint32 iFetchingStatus;
-};
+#include <QString>
 
 /** Defines map tile fetching states.
  */
@@ -49,7 +27,7 @@
 enum TMapTileFetchingState
     {
     /** Map tile fetching completed */
-    EMapTileFectchingCompleted,
+    EMapTileFectchingCompleted=0,
     /** Map tile fetching in progress */
     EMapTileFetchingInProgress,
     /** Map  tile fetching n/w error */
@@ -68,56 +46,11 @@
 // lookup database folder path
 _LIT( KLookupDbPath, "c:\\mylocations\\" );
 
-//Mylocations resource file
-_LIT(KMyLocationsResourceFile, "z:\\resource\\apps\\mylocations.rsc");
-
-// My locations landmarks database uri.
-_LIT( KMylocationsDatabaseUri, "file://c:MyLocationsLandmarks.ldb" );
-
-// maptile database uri.
-_LIT( KMaptileDatabaseUri, "file://c:MyLocationsMaptile.ldb" );
-
-// History landmarks database uri.
-_LIT( KMapsHistoryUri, "file://c:MapsHistoryLandmarks.ldb" );
-
-// mylocations lookup database name
-_LIT( KMylocationsLookupDatabaseName, "mylocationslookup.db" );
-
-// maptile lookup database name
-_LIT( KMapTileLookupDatabaseName, "mylocationsmaptilelookup.db" );
-
-// landmarks lookup database name
-_LIT( KLandmarksLookupDatabaseName, "landmarkslookup.db" );
-
-// database column names
-_LIT( NColUid, "uid" );
-_LIT( NColSource, "source" );
-_LIT( NColLmUid, "lmuid" );
-
-// maptile database column names
-_LIT( NCntColUid, "cntuid" );
-_LIT( NCntColFilePath, "filepath" );
-_LIT( MapTileFetchingStatus, "fetchingstatus" );
-
-// database table name
-_LIT( KLookupTable, "lookuptable" );
-
-// maptile database table name
-_LIT( KMapTileLookupTable, "cntmaptilelookuptable" );
-
-// uid column number
-const TInt KColumnUid = 1;
-// source type column number
-const TInt KColumnSource = 2;
-// landmark uid column number
-const TInt KColumnLmkUid = 3;
-
-// uid column number
-const TInt KColumncntUid = 1;
-// source type column number
-const TInt KColumnFilePath = 3;
-// fetching state  column number
-const TInt KColumnMapTileFetchingStatus = 4;
+#ifdef LOCPICKER_UNIT_TEST
+const QString KLocationDataLookupDbName = "c:\\locationdatalookuptestdb.db"; 
+#else    
+const QString KLocationDataLookupDbName = "c:\\locationdatalookupdb.db"; 
+#endif
 
 const TInt KBufSize=256;
 
@@ -126,8 +59,8 @@
 const int MapTileHeight = 250;
 const int MaptilePortraitWidth = 334;
 const int MaptilePortraitHeight = 250;
-const int MaptileContactLandscapeWidth =  409;
-const int MaptileContactLandscapeHeight = 128;
+const int MaptileContactLandscapeWidth =  382;
+const int MaptileContactLandscapeHeight = 168;
 const int MaptileCalendarLandscapeWidth = 614;
 const int MaptileCalendarLandscapeHeight = 202;    
 const int MaptileHurriganesWidth = 228;