diff -r fd30d51f876b -r b6db4fd4947b clock/inc/clockcommon.h
--- a/clock/inc/clockcommon.h	Mon May 03 12:30:32 2010 +0300
+++ b/clock/inc/clockcommon.h	Mon Jun 28 15:22:02 2010 +0530
@@ -25,10 +25,7 @@
 const QString CITY_INFO_DB ("cityInfo.dat");
 const QString CLOCK_DEBUG_FILE("debug.txt");
 const QString PATH_TEXT("C:/");
-
-const long int KCRUidNitz =  { 0x101F8876 };
-
-const long int KPreviousAlarmTime = 0x00000002;
+const int KMaximumCityListCount(50);
 
 // Common definitions for docml.
 #define CLOCK_MAIN_VIEW_DOCML						":/xml/clockmainview.docml"
@@ -38,9 +35,14 @@
 #define CLOCK_WIDGET								"clockWidget"
 #define CLOCK_ALARMLIST								"alarmListView"
 #define CLOCK_NOALARMLABEL							"noAlarmLabel"
-#define WORLD_CLOCK_VIEW_DOCML						":/xml/worldclockview.docml"
-#define WORLD_CLOCK_VIEW							"worldClockView"
-#define CLOCK_VIEWS_STYLE_PATH						":/style"
+#define CLOCK_WORLD_VIEW_DOCML						":/xml/clockworldview.docml"
+#define CLOCK_WORLD_VIEW							"worldClockView"
+#define CLOCK_WORLD_CITYLIST						"worldClockCityListView"
+#define CLOCK_WORLD_HOMECITY						"homeCityWidget"
+#define CLOCK_WORLD_VIEW_PORTRAIT_NOHOMECITY_SECTION	"portrait-nohomecity"
+#define CLOCK_WORLD_VIEW_PORTRAIT_HOMECITY_SECTION		"portrait-homecity"
+#define CLOCK_WORLD_VIEW_LANDSCAPE_NOHOMECITY_SECTION	"landscape-nohomecity"
+#define CLOCK_WORLD_VIEW_LANDSCAPE_HOMECITY_SECTION		"landscape-homecity"
 
 #endif		// CLOCKCOMMON_H