--- a/camerauis/cameraxui/cxui/src/cxuiscenemodeview.cpp	Tue Jul 06 14:04:02 2010 +0300
+++ b/camerauis/cameraxui/cxui/src/cxuiscenemodeview.cpp	Wed Aug 18 09:37:18 2010 +0300
@@ -105,18 +105,18 @@
 
     QGraphicsWidget *widget = NULL;
 
-    widget = mDocumentLoader->findWidget(SCENE_VIEW_CONTAINER);
+    widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_CONTAINER);
     mScenesContainer = qobject_cast<HbWidget *> (widget);
 
     mScenesHeading = qobject_cast<HbLabel *>(
-        mDocumentLoader->findWidget(SCENE_VIEW_HEADING_WIDGET));
+        mDocumentLoader->findWidget(SCENE_MODE_VIEW_HEADING_WIDGET));
     CX_ASSERT_ALWAYS(mScenesHeading);
 
     //Now let's retreive the pointer to icon widget
-    widget = mDocumentLoader->findWidget(SCENE_VIEW_BG_IMAGE);
+    widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_BG_IMAGE);
     mScenesBackground = qobject_cast<HbLabel *> (widget);
 
-    widget = mDocumentLoader->findWidget(SCENE_VIEW_BG_IMAGE2);
+    widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_BG_IMAGE2);
     mScenesBackground2 = qobject_cast<HbLabel *> (widget);
 
     //Assuming that the automatic scene mode is always the default one
@@ -125,7 +125,7 @@
     background.setMirroringMode(HbIcon::LayoutDirection);
     mScenesBackground->setIcon(background);
 
-    widget = mDocumentLoader->findWidget(SCENE_VIEW_RADIOBUTTONS);
+    widget = mDocumentLoader->findWidget(SCENE_MODE_VIEW_RADIOBUTTONS);
     mScenesList = qobject_cast<CxuiSettingRadioButtonList *> (widget);
 
     mTransitionAnimation = new QPropertyAnimation(mScenesBackground2, "opacity");
@@ -171,8 +171,7 @@
     }
 
     if (mScenesBackground) {
-        QString sceneId;
-        mEngine->settings().get(data.mSettingId, sceneId);
+        QString sceneId = mEngine->settings().get<QString>(data.mSettingId);
         HbIcon background(backgroundForScene(sceneId));
         background.setMirroringMode(HbIcon::LayoutDirection);
         mScenesBackground->setIcon(background);