--- a/layouts/aknlayout2/LayoutMetaData/layoutmetadata.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/LayoutMetaData/layoutmetadata.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef LAYOUTMETADATA_CDL_CUSTOM_H
#define LAYOUTMETADATA_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "LayoutMetaData.cdl.common.h"
namespace Layout_Meta_Data
--- a/layouts/aknlayout2/displaylayoutmetrics/displaylayoutmetrics.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/displaylayoutmetrics/displaylayoutmetrics.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
#define DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "displaylayoutmetrics.cdl.common.h"
namespace Display_Layout_Metrics
--- a/layouts/aknlayout2/generated/Nhd_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Nhd_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_apps.cdl.common.h"
namespace AknLayoutScalable_Apps
--- a/layouts/aknlayout2/generated/Nhd_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Nhd_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_avkon.cdl.common.h"
namespace AknLayoutScalable_Avkon
--- a/layouts/aknlayout2/generated/Nhd_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Nhd_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
#define DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "displaylayoutmetrics.cdl.common.h"
namespace Display_Layout_Metrics
--- a/layouts/aknlayout2/generated/Nhd_akn_app/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Nhd_akn_app/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Nhd_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Nhd_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_uiaccel.cdl.common.h"
namespace AknLayoutScalable_UiAccel
--- a/layouts/aknlayout2/generated/Nhd_uiaccel/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Nhd_uiaccel/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Qvga2_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Qvga2_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_apps.cdl.common.h"
namespace AknLayoutScalable_Apps
--- a/layouts/aknlayout2/generated/Qvga2_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Qvga2_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_avkon.cdl.common.h"
namespace AknLayoutScalable_Avkon
--- a/layouts/aknlayout2/generated/Qvga2_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Qvga2_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
#define DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "displaylayoutmetrics.cdl.common.h"
namespace Display_Layout_Metrics
--- a/layouts/aknlayout2/generated/Qvga2_akn_app/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Qvga2_akn_app/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Qvga2_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Qvga2_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_uiaccel.cdl.common.h"
namespace AknLayoutScalable_UiAccel
--- a/layouts/aknlayout2/generated/Qvga2_uiaccel/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Qvga2_uiaccel/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Vga3_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga3_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_apps.cdl.common.h"
namespace AknLayoutScalable_Apps
--- a/layouts/aknlayout2/generated/Vga3_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga3_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_avkon.cdl.common.h"
namespace AknLayoutScalable_Avkon
--- a/layouts/aknlayout2/generated/Vga3_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga3_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
#define DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "displaylayoutmetrics.cdl.common.h"
namespace Display_Layout_Metrics
--- a/layouts/aknlayout2/generated/Vga3_akn_app/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga3_akn_app/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Vga3_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga3_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_uiaccel.cdl.common.h"
namespace AknLayoutScalable_UiAccel
--- a/layouts/aknlayout2/generated/Vga3_uiaccel/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga3_uiaccel/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Vga_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_apps.cdl.common.h"
namespace AknLayoutScalable_Apps
--- a/layouts/aknlayout2/generated/Vga_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_avkon.cdl.common.h"
namespace AknLayoutScalable_Avkon
--- a/layouts/aknlayout2/generated/Vga_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
#define DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "displaylayoutmetrics.cdl.common.h"
namespace Display_Layout_Metrics
--- a/layouts/aknlayout2/generated/Vga_akn_app/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_akn_app/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Vga_touch_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_touch_akn_app/aknlayoutscalable_apps.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_APPS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_apps.cdl.common.h"
namespace AknLayoutScalable_Apps
--- a/layouts/aknlayout2/generated/Vga_touch_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_touch_akn_app/aknlayoutscalable_avkon.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_AVKON_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_avkon.cdl.common.h"
namespace AknLayoutScalable_Avkon
--- a/layouts/aknlayout2/generated/Vga_touch_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_touch_akn_app/displaylayoutmetrics.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
#define DISPLAYLAYOUTMETRICS_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "displaylayoutmetrics.cdl.common.h"
namespace Display_Layout_Metrics
--- a/layouts/aknlayout2/generated/Vga_touch_akn_app/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_touch_akn_app/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated/Vga_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_uiaccel/aknlayoutscalable_uiaccel.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
#define AKNLAYOUTSCALABLE_UIACCEL_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "aknlayoutscalable_uiaccel.cdl.common.h"
namespace AknLayoutScalable_UiAccel
--- a/layouts/aknlayout2/generated/Vga_uiaccel/layoutpack.cdl.custom.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated/Vga_uiaccel/layoutpack.cdl.custom.h Wed Jun 30 12:29:41 2010 +0100
@@ -22,7 +22,7 @@
#ifndef LAYOUTPACK_CDL_CUSTOM_H
#define LAYOUTPACK_CDL_CUSTOM_H
-#include <cdlengdef.h>
+#include <CdlEngDef.h>
#include "layoutpack.cdl.common.h"
namespace LayoutPack
--- a/layouts/aknlayout2/generated_inc/aknapaclayout.cdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated_inc/aknapaclayout.cdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef AKNAPACLAYOUT_CDL
#define AKNAPACLAYOUT_CDL
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <aknapaclayout.cdl.common.h>
namespace AknApacLayout
--- a/layouts/aknlayout2/generated_inc/aknlayout.cdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated_inc/aknlayout.cdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef AKNLAYOUT_CDL
#define AKNLAYOUT_CDL
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <aknlayout.cdl.common.h>
namespace AknLayout
--- a/layouts/aknlayout2/generated_inc/aknlayoutscalable_uiaccel.cdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated_inc/aknlayoutscalable_uiaccel.cdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef AKNLAYOUTSCALABLE_UIACCEL_CDL
#define AKNLAYOUTSCALABLE_UIACCEL_CDL
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <aknlayoutscalable_uiaccel.cdl.common.h>
namespace AknLayoutScalable_UiAccel
--- a/layouts/aknlayout2/generated_inc/cdlfont.cdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated_inc/cdlfont.cdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef CDLFONT_CDL
#define CDLFONT_CDL
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <cdlfont.cdl.common.h>
namespace CDL_Font
--- a/layouts/aknlayout2/generated_inc/layoutmetadata.cdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated_inc/layoutmetadata.cdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef LAYOUTMETADATA_CDL
#define LAYOUTMETADATA_CDL
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <layoutmetadata.cdl.common.h>
namespace Layout_Meta_Data
--- a/layouts/aknlayout2/generated_inc/skinlayout.cdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/aknlayout2/generated_inc/skinlayout.cdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef SKINLAYOUT_CDL
#define SKINLAYOUT_CDL
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <skinlayout.cdl.common.h>
namespace SkinLayout
--- a/layouts/cdl/CdlUtils/CdlExplorer/inc/CdlExplorerAppUi.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/cdl/CdlUtils/CdlExplorer/inc/CdlExplorerAppUi.h Wed Jun 30 12:29:41 2010 +0100
@@ -25,7 +25,7 @@
#include <e32std.h>
#include <coeccntx.h>
#include <aknappui.h>
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <cdlrefs.h>
// FORWARD DECLARATIONS
--- a/layouts/cdl/CdlUtils/CdlExplorer/inc/CdlExplorerContainer.h Wed Jun 02 12:05:03 2010 +0100
+++ b/layouts/cdl/CdlUtils/CdlExplorer/inc/CdlExplorerContainer.h Wed Jun 30 12:29:41 2010 +0100
@@ -23,7 +23,7 @@
#include <coecntrl.h>
#include <eiklbo.h>
#include <eiktxlbx.h>
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <cdlrefs.h>
// FORWARD DECLARATIONS
--- a/locales/loce32/bld.inf Wed Jun 02 12:05:03 2010 +0100
+++ b/locales/loce32/bld.inf Wed Jun 30 12:29:41 2010 +0100
@@ -48,7 +48,7 @@
language/group/elocl_language_sk.mmp
language/group/elocl_language_pl.mmp
language/group/elocl_language_sl.mmp
-language/group/elocl_language_zh_tw.mmp
+language/group/elocl_language_zh_TW.mmp
language/group/elocl_language_zh_hk.mmp
language/group/elocl_language_zh_cn.mmp
language/group/elocl_language_ja.mmp
--- a/locales/loce32/collation/inc/locl_collation.h Wed Jun 02 12:05:03 2010 +0100
+++ b/locales/loce32/collation/inc/locl_collation.h Wed Jun 30 12:29:41 2010 +0100
@@ -20,7 +20,7 @@
#define __LOCL_COLLATION_H_
#if !defined(__E32STD_H__)
-#include <E32std.h>
+#include <e32std.h>
#endif
#ifdef _UNICODE
--- a/locales/loce32/language/group/elocl_language_ko.mmp Wed Jun 02 12:05:03 2010 +0100
+++ b/locales/loce32/language/group/elocl_language_ko.mmp Wed Jun 30 12:29:41 2010 +0100
@@ -29,7 +29,7 @@
SOURCE language.cpp
SOURCE language_ko.cpp
SOURCE unicodeconv.cpp
-SOURCE CP949.cpp
+SOURCE Cp949.cpp
// This is a SYSTEMINCLUDE macro containing the middleware
// layer specific include directories
--- a/locales/loce32/language/inc/complocl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/locales/loce32/language/inc/complocl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#define __COMPLOCL_H__
#if !defined(__E32STD_H__)
-#include <E32std.h>
+#include <e32std.h>
#endif
class LLocaleData
--- a/locales/loce32/language/inc/locl_language.h Wed Jun 02 12:05:03 2010 +0100
+++ b/locales/loce32/language/inc/locl_language.h Wed Jun 30 12:29:41 2010 +0100
@@ -20,7 +20,7 @@
#define __LOCL_LANGUAGE_H__
#if !defined(__E32STD_H__)
-#include <E32std.h>
+#include <e32std.h>
#endif
#ifdef _UNICODE
--- a/locales/loce32/region/inc/locl_region.h Wed Jun 02 12:05:03 2010 +0100
+++ b/locales/loce32/region/inc/locl_region.h Wed Jun 30 12:29:41 2010 +0100
@@ -20,7 +20,7 @@
#define __LOCL_REGION_H__
#if !defined(__E32STD_H__)
-#include <E32std.h>
+#include <e32std.h>
#endif
#ifdef _UNICODE
Binary file skins/AknSkinContent/srcdata/scalableseries60skin/scalableseries60skin.txt has changed
--- a/skins/AknSkins/group/AknSkinDescCompiler.mmp Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/group/AknSkinDescCompiler.mmp Wed Jun 30 12:29:41 2010 +0100
@@ -36,7 +36,7 @@
SOURCE SDCIIDConstants.cpp
SOURCE SDCInlOutput.cpp
SOURCE SDCInput.cpp
-SOURCE SDCMbmOutput.cpp
+SOURCE SDCMBMOutput.cpp
SOURCE SDCPkgOutput.cpp
SOURCE SDCReader.cpp
--- a/skins/AknSkins/group/AknSkinDescCompiler_NR.mmp Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/group/AknSkinDescCompiler_NR.mmp Wed Jun 30 12:29:41 2010 +0100
@@ -36,7 +36,7 @@
SOURCE SDCIIDConstants.cpp
SOURCE SDCInlOutput.cpp
SOURCE SDCInput.cpp
-SOURCE SDCMbmOutput.cpp
+SOURCE SDCMBMOutput.cpp
SOURCE SDCPkgOutput.cpp
SOURCE SDCReader.cpp
--- a/skins/AknSkins/rom/aknskins.iby Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/rom/aknskins.iby Wed Jun 30 12:29:41 2010 +0100
@@ -30,9 +30,9 @@
// Series 60 Default System Skin
-AUTO-BITMAP=DATAZ_\RESOURCE_FILES_DIR\skins\101f84b9\Series60Skin.mbm RESOURCE_FILES_DIR\skins\101f84b9\Series60Skin.mbm
-data=DATAZ_\SKINS_DIR\import\101f84b9\Series60Skin.skn SKINS_DIR\import\101f84b9\Series60Skin.skn
-data=DATAZ_\RESOURCE_FILES_DIR\skins\101f84b9\Series60Skin.mif RESOURCE_FILES_DIR\skins\101f84b9\Series60Skin.mif
+AUTO-BITMAP=DATAZ_\RESOURCE_FILES_DIR\skins\101f84b9\series60skin.mbm RESOURCE_FILES_DIR\skins\101f84b9\series60skin.mbm
+data=DATAZ_\SKINS_DIR\import\101f84b9\series60skin.skn SKINS_DIR\import\101f84b9\series60skin.skn
+data=DATAZ_\RESOURCE_FILES_DIR\skins\101f84b9\series60skin.mif RESOURCE_FILES_DIR\skins\101f84b9\series60skin.mif
// Series 60 Default System Skin MIF CDL header
ECOM_PLUGIN(101f84b9.dll,101f84b9.rsc)
@@ -40,17 +40,17 @@
// "Haze" ROM skin
#if defined(FF_THEME_HAZE)
-AUTO-BITMAP=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12D\Haze.mbm RESOURCE_FILES_DIR\skins\2000B12D\Haze.mbm
-data=DATAZ_\SKINS_DIR\import\2000B12D\Haze.skn SKINS_DIR\import\2000B12D\Haze.skn
-data=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12D\Haze.mif RESOURCE_FILES_DIR\skins\2000B12D\Haze.mif
+AUTO-BITMAP=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12D\haze.mbm RESOURCE_FILES_DIR\skins\2000B12D\haze.mbm
+data=DATAZ_\SKINS_DIR\import\2000B12D\haze.skn SKINS_DIR\import\2000B12D\haze.skn
+data=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12D\haze.mif RESOURCE_FILES_DIR\skins\2000B12D\haze.mif
#endif
// "JingMask" ROM Mask
#if defined(FF_THEME_JINGMASK)
// (zero-length, must be excluded to make bmconv work in ROM image creation)
-//AUTO-BITMAP=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12E\Jing.mbm RESOURCE_FILES_DIR\skins\2000B12E\Jing.mbm
-data=DATAZ_\SKINS_DIR\import\2000B12E\Jing.skn SKINS_DIR\import\2000B12E\Jing.skn
-data=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12E\Jing.mif RESOURCE_FILES_DIR\skins\2000B12E\Jing.mif
+//AUTO-BITMAP=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12E\jing.mbm RESOURCE_FILES_DIR\skins\2000B12E\jing.mbm
+data=DATAZ_\SKINS_DIR\import\2000B12E\jing.skn SKINS_DIR\import\2000B12E\jing.skn
+data=DATAZ_\RESOURCE_FILES_DIR\skins\2000B12E\jing.mif RESOURCE_FILES_DIR\skins\2000B12E\jing.mif
#endif
--- a/skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/sdcinc/AknsConvertedConstants_NR.inl Wed Jun 30 12:29:41 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
{L"KAknsIIDNone", EAknsMajorNone, EAknsMinorNone },
{L"KAknsIIDDefault", EAknsMajorDefault, EAknsMinorDefault },
{L"KAknsIIDQsnBgScreen", EAknsMajorSkin, EAknsMinorQsnBgScreen },
--- a/skins/AknSkins/sdcinc/SDCInput.h Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/sdcinc/SDCInput.h Wed Jun 30 12:29:41 2010 +0100
@@ -47,6 +47,7 @@
public:
static int ConvertToNumber( const wchar_t* aToken );
static void ConvertToAscii( char* aTarget, const wchar_t* aSource );
+ static void ConvertToWchar( wchar_t* aTarget, const char* aSource );
static void ConvertToAsciiWithCPPEscapes( char* aTarget, const wchar_t* aSource );
static TSDCColorDepth ConvertToColorDepth( const wchar_t* aToken );
static int ConvertToLayer( const wchar_t* aToken );
--- a/skins/AknSkins/sdcsrc/SDCInput.cpp Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/sdcsrc/SDCInput.cpp Wed Jun 30 12:29:41 2010 +0100
@@ -241,13 +241,12 @@
void CSDCInput::ConvertToAscii( char* aTarget, const wchar_t* aSource )
{
- int i = 0;
- while( true )
- {
- aTarget[i] = (char)aSource[i];
- if( !aSource[i] ) break;
- i++;
- }
+ while( *aTarget++ = (char)*aSource++);
+ }
+
+void CSDCInput::ConvertToWchar( wchar_t* aTarget, const char* aSource )
+ {
+ while( *aTarget++ = (wchar_t)*aSource++);
}
void CSDCInput::ConvertToAsciiWithCPPEscapes( char* aTarget, const wchar_t* aSource )
@@ -343,7 +342,7 @@
#if (defined(__MSVCRT__) || defined(_MSC_VER))
iNextChar = fgetwc( iFile );
#else
- /* to make it work under linux */
+ /* Workaround for linux */
char c1 = fgetc(iFile);
char c2 = fgetc(iFile);
--- a/skins/AknSkins/sdcsrc/SDCMBMOutput.cpp Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/sdcsrc/SDCMBMOutput.cpp Wed Jun 30 12:29:41 2010 +0100
@@ -44,7 +44,7 @@
if( aData->IsScalable() )
{
- fprintf( file, "/E\n" );
+ fprintf( file, "-E\n" );
}
else
{
@@ -63,16 +63,16 @@
{
switch( entry->iColorDepth )
{
- case ESDCColorDepth1: fprintf( file, "/1" ); break;
- case ESDCColorDepth2: fprintf( file, "/2" ); break;
- case ESDCColorDepth4: fprintf( file, "/4" ); break;
- case ESDCColorDepth8: fprintf( file, "/8" ); break;
- case ESDCColorDepthC4: fprintf( file, "/c4" ); break;
- case ESDCColorDepthC8: fprintf( file, "/c8" ); break;
- case ESDCColorDepthC12: fprintf( file, "/c12" ); break;
- case ESDCColorDepthC16: fprintf( file, "/c16" ); break;
- case ESDCColorDepthC24: fprintf( file, "/c24" ); break;
- case ESDCColorDepthC32: fprintf( file, "/c32" ); break;
+ case ESDCColorDepth1: fprintf( file, "-1" ); break;
+ case ESDCColorDepth2: fprintf( file, "-2" ); break;
+ case ESDCColorDepth4: fprintf( file, "-4" ); break;
+ case ESDCColorDepth8: fprintf( file, "-8" ); break;
+ case ESDCColorDepthC4: fprintf( file, "-c4" ); break;
+ case ESDCColorDepthC8: fprintf( file, "-c8" ); break;
+ case ESDCColorDepthC12: fprintf( file, "-c12" ); break;
+ case ESDCColorDepthC16: fprintf( file, "-c16" ); break;
+ case ESDCColorDepthC24: fprintf( file, "-c24" ); break;
+ case ESDCColorDepthC32: fprintf( file, "-c32" ); break;
default:
throw CSDCException( ESDCUnknownError, "Unknown color depth value used internally" );
}
@@ -89,7 +89,7 @@
fprintf( file, " " );
if ( entry->iSvgAnim )
{
- fprintf( file, "/A " );
+ fprintf( file, "-A " );
}
char pathBuf[512];
gInput.ConvertToAscii( pathBuf, entry->iSourcePath );
@@ -101,16 +101,16 @@
{
switch( entry->iColorDepth )
{
- case ESDCColorDepth1: fprintf( file, "/1" ); break;
- case ESDCColorDepth2: fprintf( file, "/2" ); break;
- case ESDCColorDepth4: fprintf( file, "/4" ); break;
- case ESDCColorDepth8: fprintf( file, "/8" ); break;
- case ESDCColorDepthC4: fprintf( file, "/c4" ); break;
- case ESDCColorDepthC8: fprintf( file, "/c8" ); break;
- case ESDCColorDepthC12: fprintf( file, "/c12" ); break;
- case ESDCColorDepthC16: fprintf( file, "/c16" ); break;
- case ESDCColorDepthC24: fprintf( file, "/c24" ); break;
- case ESDCColorDepthC32: fprintf( file, "/c32" ); break;
+ case ESDCColorDepth1: fprintf( file, "-1" ); break;
+ case ESDCColorDepth2: fprintf( file, "-2" ); break;
+ case ESDCColorDepth4: fprintf( file, "-4" ); break;
+ case ESDCColorDepth8: fprintf( file, "-8" ); break;
+ case ESDCColorDepthC4: fprintf( file, "-c4" ); break;
+ case ESDCColorDepthC8: fprintf( file, "-c8" ); break;
+ case ESDCColorDepthC12: fprintf( file, "-c12" ); break;
+ case ESDCColorDepthC16: fprintf( file, "-c16" ); break;
+ case ESDCColorDepthC24: fprintf( file, "-c24" ); break;
+ case ESDCColorDepthC32: fprintf( file, "-c32" ); break;
default:
throw CSDCException( ESDCUnknownError, "Unknown color depth value used internally" );
}
@@ -123,10 +123,10 @@
switch( entry->iMaskColorDepth )
{
case ESDCColorDepthNone: continue;
- case ESDCColorDepth1: fprintf( file, "/1" ); break;
- case ESDCColorDepth2: fprintf( file, "/2" ); break;
- case ESDCColorDepth4: fprintf( file, "/4" ); break;
- case ESDCColorDepth8: fprintf( file, "/8" ); break;
+ case ESDCColorDepth1: fprintf( file, "-1" ); break;
+ case ESDCColorDepth2: fprintf( file, "-2" ); break;
+ case ESDCColorDepth4: fprintf( file, "-4" ); break;
+ case ESDCColorDepth8: fprintf( file, "-8" ); break;
default:
throw CSDCException( ESDCUnknownError, "Unknown color depth value used internally" );
}
--- a/skins/AknSkins/sdcsrc/SDCReader.cpp Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/sdcsrc/SDCReader.cpp Wed Jun 30 12:29:41 2010 +0100
@@ -988,9 +988,30 @@
{
bool changed( true );
if( sd_wcscasecmp( gInput.iToken, iData->iBmpPath ) == 0 ) changed = false;
- iData->SetBmpPath( gInput.iToken );
char buf[512];
CSDCInput::ConvertToAscii( buf, gInput.iToken );
+
+ /* prepend EPOCROOT on linux */
+ if(buf[0] == '/')
+ {
+#if (defined(__MSVCRT__) || defined(_MSC_VER))
+ /* FIXME: We have to use \\ for referencing root path on Windows? */
+ buf[0] = '\\';
+
+ CSDCInput::ConvertToWchar(gInput.iToken, buf);
+#else
+ char b[512];
+
+ sprintf(b, "%s%s", getenv("EPOCROOT"), buf);
+
+ strcpy(buf, b);
+
+ CSDCInput::ConvertToWchar(gInput.iToken, b);
+#endif
+ }
+
+ iData->SetBmpPath( gInput.iToken );
+
if( changed )
printf("NOTE: Bitmap source path set to %s\n", buf );
}
--- a/skins/AknSkins/srvinc/AknsSrvFileBuffer.h Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/srvinc/AknsSrvFileBuffer.h Wed Jun 30 12:29:41 2010 +0100
@@ -24,6 +24,7 @@
#include <e32std.h>
#include <f32file.h>
#include <caf/caf.h>
+#include <caf/cafplatform.h>
// CLASS DECLARATION
/**
--- a/skins/AknSkins/srvsrc/AknsSrvUtils.cpp Wed Jun 02 12:05:03 2010 +0100
+++ b/skins/AknSkins/srvsrc/AknsSrvUtils.cpp Wed Jun 30 12:29:41 2010 +0100
@@ -24,7 +24,7 @@
#include <DRMRights.h>
#include <DRMHelper.h>
-#include <caf/caf.h>
+#include <caf/cafplatform.h>
#include <caf/rightsinfo.h>
#include "AknsSrvUtils.h"
--- a/uigraphics/AknIcon/group/AknIconInterfaces.mk Wed Jun 02 12:05:03 2010 +0100
+++ b/uigraphics/AknIcon/group/AknIconInterfaces.mk Wed Jun 30 12:29:41 2010 +0100
@@ -33,9 +33,9 @@
BLD : do_nothing
CLEAN :
- -$(call remove,$(EPOCROOT)epoc32/include/platform/mw/MifHeader.cdl.h)
- -$(call remove,$(EPOCROOT)epoc32/include/platform/mw/MifHeader.cdl.common.h)
- -$(call remove,$(EPOCROOT)epoc32/include/platform/mw/MifHeader.cdl.common.hrh)
+ -$(call remove,$(EPOCROOT)epoc32/include/platform/mw/mifheader.cdl.h)
+ -$(call remove,$(EPOCROOT)epoc32/include/platform/mw/mifheader.cdl.common.h)
+ -$(call remove,$(EPOCROOT)epoc32/include/platform/mw/mifheader.cdl.common.hrh)
LIB : do_nothing
@@ -48,8 +48,8 @@
SAVESPACE : do_nothing
RELEASABLES :
- @echo $(EPOCROOT)epoc32/include/platform/mw/MifHeader.cdl.h
- @echo $(EPOCROOT)epoc32/include/platform/mw/MifHeader.cdl.common.h
- @echo $(EPOCROOT)epoc32/include/platform/mw/MifHeader.cdl.common.hrh
+ @echo $(EPOCROOT)epoc32/include/platform/mw/mifheader.cdl.h
+ @echo $(EPOCROOT)epoc32/include/platform/mw/mifheader.cdl.common.h
+ @echo $(EPOCROOT)epoc32/include/platform/mw/mifheader.cdl.common.hrh
FINAL : do_nothing
--- a/uigraphics/AknIcon/group/akniconinterfaces.flm Wed Jun 02 12:05:03 2010 +0100
+++ b/uigraphics/AknIcon/group/akniconinterfaces.flm Wed Jun 30 12:29:41 2010 +0100
@@ -31,7 +31,7 @@
$(TARGETS) : $(CDLCOMPILER) $(TARGETDIR)/$(FILENAME).cdl
$(call startrule,generatecdlheaders,FORCESUCCESS) \
- $(CDLCOMPILER) client -p$(subst /,\\\\,$(TARGETDIR)) $(subst /,\\\\,$(TARGETDIR)/)$(FILENAME).cdl \
+ $(CDLCOMPILER) client -p$(TARGETDIR) $(TARGETDIR)/$(FILENAME).cdl \
$(call endrule,generatecdlheaders)
CLEANTARGETS:=$(TARGETS)
--- a/uigraphics/AknIcon/srvsrc/AknIconSrvCache.cpp Wed Jun 02 12:05:03 2010 +0100
+++ b/uigraphics/AknIcon/srvsrc/AknIconSrvCache.cpp Wed Jun 30 12:29:41 2010 +0100
@@ -24,7 +24,7 @@
#include <barsc.h>
// Skin server client
#include <AknsSrvClient.h>
-#include <AknIconSrv.rsg>
+#include <akniconsrv.rsg>
#include <mifconvdefs.h>
#include <mifconvdefs.h>
--- a/uigraphics/AknIcon/srvsrc/AknIconSrvPrecacher.cpp Wed Jun 02 12:05:03 2010 +0100
+++ b/uigraphics/AknIcon/srvsrc/AknIconSrvPrecacher.cpp Wed Jun 30 12:29:41 2010 +0100
@@ -23,7 +23,7 @@
#include <barsc.h>
#include "AknIconSrvPrecacher.h"
#include "AknIconSrv.h"
-#include <AknIconSrv.rsg>
+#include <akniconsrv.rsg>
#include "AknIconTraces.h"
#include "AknIconSrv.h"
--- a/uiresources_plat/cdl_api/tsrc/inc/testdomcdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/uiresources_plat/cdl_api/tsrc/inc/testdomcdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -25,7 +25,7 @@
#include <testscripterinternal.h>
#include <stiftestmodule.h>
#include <testclassassert.h>
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <e32des8.h>
#include <coemain.h>
#include <e32cmn.h>
--- a/uiresources_plat/cdl_api/tsrc/inc/testdomcdlengineobserver.h Wed Jun 02 12:05:03 2010 +0100
+++ b/uiresources_plat/cdl_api/tsrc/inc/testdomcdlengineobserver.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
class MCdlChangeObserver;
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <cdlexplorer.h>
#include <cdluserpackageexplorer.h>
--- a/uiresources_plat/layout_data_api/inc/aknlayoutscalable_uiaccel.cdl.h Wed Jun 02 12:05:03 2010 +0100
+++ b/uiresources_plat/layout_data_api/inc/aknlayoutscalable_uiaccel.cdl.h Wed Jun 30 12:29:41 2010 +0100
@@ -21,7 +21,7 @@
#ifndef AKNLAYOUTSCALABLE_UIACCEL_CDL
#define AKNLAYOUTSCALABLE_UIACCEL_CDL
-#include <cdlengine.h>
+#include <CdlEngine.h>
#include <aknlayoutscalable_uiaccel.cdl.common.h>
namespace AknLayoutScalable_UiAccel