--- a/camerauis/cameraxui/cxui/src/cxuidocumentloader.cpp	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuidocumentloader.cpp	Wed Aug 18 09:37:18 2010 +0300
@@ -33,10 +33,12 @@
 #include "cxeengine.h"
 #include "cxuienums.h"
 
+#ifdef Q_OS_SYMBIAN
 #include "OstTraceDefinitions.h"
 #ifdef OST_TRACE_COMPILER_IN_USE
 #include "cxuidocumentloaderTraces.h"
-#endif
+#endif // OST_TRACE_COMPILER_IN_USE
+#endif // Q_OS_SYMBIAN
 
 
 CxuiDocumentLoader::CxuiDocumentLoader(CxeEngine *engine) : HbDocumentLoader(), mEngine(engine)
@@ -45,7 +47,7 @@
 
 QObject *CxuiDocumentLoader::createObject(const QString& type, const QString &name)
 {
-    OstTrace0( camerax_performance, CXUIDOCUMENTLOADER_CREATEOBJECT, "msg: e_CX_DOCLOADER_CREATEOBJECT 1" );
+    OstTrace0(camerax_performance, CXUIDOCUMENTLOADER_1, "msg: e_CX_DOCUMENTLOADER_CREATEOBJECT 1");
     QObject *object = NULL;
 
     if (type == "HbView") {
@@ -55,7 +57,7 @@
             object = new CxuiVideoPrecaptureView();
         } else if (name == CxUiLayout::POSTCAPTURE_VIEW) {
             object = new CxuiPostcaptureView();
-        } else if (name == CxUiLayout::STILL_SCENES_VIEW) {
+        } else if (name == CxUiLayout::SCENE_MODE_VIEW) {
             object = new CxuiSceneModeView(NULL);
         }
     } else if (type == "HbDialog") {
@@ -72,7 +74,7 @@
         }
     } else if (type == "HbRadioButtonList") {
         if (name == CxUiLayout::SETTINGS_DIALOG_CONTENT_WIDGET
-         || name == CxUiLayout::SCENE_VIEW_RADIOBUTTONS) {
+         || name == CxUiLayout::SCENE_MODE_VIEW_RADIOBUTTONS) {
             object = new CxuiSettingRadioButtonList(NULL, mEngine);
         }
     }
@@ -83,7 +85,7 @@
         object = HbDocumentLoader::createObject(type, name);
     }
 
-    OstTrace0( camerax_performance, DUP1_CXUIDOCUMENTLOADER_CREATEOBJECT, "msg: e_CX_DOCLOADER_CREATEOBJECT 0" );
+    OstTrace0(camerax_performance, CXUIDOCUMENTLOADER_2, "msg: e_CX_DOCUMENTLOADER_CREATEOBJECT 0");
     return object;
 }