2.2 Code Sync
authorravi.n2 <ravi.n2@samsung.com>
Wed, 5 Jun 2013 08:45:38 +0000 (14:15 +0530)
committerravi.n2 <ravi.n2@samsung.com>
Wed, 5 Jun 2013 08:45:38 +0000 (14:15 +0530)
Change-Id: I9890a57bf0d67b3ca78e9abbeed462ed0a681985

inc/CmBaseForm.h
inc/CmCamcorderForm.h
inc/CmCameraForm.h
inc/CmTypes.h
src/CmBaseForm.cpp
src/CmCamcorderForm.cpp
src/CmCameraForm.cpp
src/CmCameraPresentationModel.cpp
src/CmTypes.cpp

index 7e52c70..e999fc4 100644 (file)
@@ -37,6 +37,7 @@
 
 #include "CmTypes.h"
 #include "CmCameraApp.h"
+#include "CmCameraPresentationModel.h"
 
 class BaseForm :
 public Tizen::Ui::Controls::Form
@@ -123,6 +124,41 @@ protected:
        result ReturnValues(RequestId requestId, Tizen::App::AppCtrlResult appCtrlResult, const Tizen::Base::Collection::IMap* pReturnValue);
        Tizen::Telephony::CallStatus GetCurrentCallStatus(void);
        Tizen::Telephony::CallType GetCurrentCallType(void);
+       void BaseFormOnActionPerformed(const Tizen::Ui::Control& source, int actionId);
+       result SendAppControlResult(RequestId requestId);
+       result LaunchAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* extraData);
+       virtual void OnAppControlCompleted(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::Collection::IList* pResultList);
+       void SetStorageType(int storageType);
+       void ShowCameraFailPopup(void);
+       void ShowUnlaunchPopup(void);
+       void ShowLowBatteryPopup(void);
+       result TerminateApp(void);
+       void RemoveAllEventListener(void);
+       void DeleteTimer(void);
+
+protected:
+       CameraPresentationModel* _pCameraPresentationModel;
+       SourceForm _pCurrentSourceForm;
+       int _timeCount;
+       bool _isRecording;
+       bool _isRecordingPause;
+       int _chargingCount;
+       int _blinkCount;
+       bool _appControlActionCompleted;
+       bool _isUsedTimerCaptured;
+       int _closeTimerValue;
+
+       Tizen::Base::Runtime::Timer* _pAppTimer;
+       Tizen::Base::Runtime::Timer* _pIntervalValueTimer;
+       Tizen::Base::Runtime::Timer* _pCaptureStartTimer;
+       Tizen::Base::Runtime::Timer* _pPopupTimer;
+       Tizen::Base::Runtime::Timer* _pExposureCloseTimer;
+       Tizen::Base::Runtime::Timer* _pTouchAutoFocusTimer;
+       Tizen::Base::Runtime::Timer* _pHelpCloseTimer;
+       Tizen::Base::Runtime::Timer* _pChargingTimer;
+       Tizen::Base::Runtime::Timer* _pChargingCompletedTimer;
+       Tizen::Base::Runtime::Timer* _pPreviewFailPopupTimer;
+       Tizen::Base::Runtime::Timer* _pMakerFocusTimer;
 };
 
 #endif
index dd616e3..953d966 100644 (file)
@@ -80,10 +80,6 @@ public:
        virtual bool DeleteItem(int index, Tizen::Ui::Controls::ListItemBase* pItem, int itemWidth);
        virtual int GetItemCount(void);
 
-       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-
        virtual result OnInitializing(void);
        virtual result OnTerminating(void);
 
@@ -108,8 +104,6 @@ public:
 
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
 
-       virtual void OnAppControlCompleted(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::Collection::IList* pResultList);
-
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
        virtual void OnFileEventOccured(const unsigned long events, const Tizen::Base::String& path, const unsigned int eventId);
@@ -186,7 +180,6 @@ private:
        int GetTimerIntervalValue(void) const;
        void SetGuideLine(int guideLineEnable);
        void SetStartRecording(void);
-       void SetStorageType(int storageType);
 
        result RestoreDefaultSetting(void);
        result SetRecordStartTimer(int timerInterval);
@@ -250,7 +243,6 @@ private:
        void HideUiModeChangedButton(void);
        void CheckStorageInfo(void);
 
-       result LaunchAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* extraData);
        void SetCamcorderMode(void);
        result CreateOverlayRegion(Tizen::Graphics::Rectangle rect);
        result SetOverlayPanel(Tizen::Graphics::Rectangle rect, Tizen::Graphics::Rectangle evaluateBoundsRect, Tizen::Graphics::Rectangle clientRect, bool destroyOverlay, bool isWideMode);
@@ -295,7 +287,6 @@ private:
        void GetCameraToForeground(void);
        void SendCameraToBackground(void);
        void DrawThumbnail(void);
-       void ShowUnlaunchPopup(void);
        void ShowCameraFailPopup(void);
        void ShowSavingPopup(void);
        
@@ -303,16 +294,13 @@ private:
        void StartChargingTimer(void);
        result DrawBatteryLevelFull(void);
        result CheckBatteryStatus(void);
-       void ShowLowBatteryPopup(void);
        result MakeMenuString(void);
        result MakeGenMenuString(void);
 
-       result SendAppControlResult(RequestId requestId);
        result RunStartPreviewThread(void);
        void MakeRecordingResolutionList(bool remakeList);
 
        void CancelTimer(void);
-       void DeleteTimer(void);
        void OnAppTimerExpired(void);
        void OnSettingTimerExpired(void);
        void OnPopupTimerExpired(void);
@@ -332,8 +320,6 @@ private:
        result SetScreenOverlayHelpTimer(void);
        void HideScreenOverlayHelp(void);
        result DrawScreenOverlayHelp(void);
-       result TerminateApp(void);
-       void RemoveAllEventListener(void);
 
        void ReInitialise(void);
        void UpdatePopUp(void);
@@ -343,19 +329,9 @@ private:
        static const int IDA_BTN_YES = 603;
        static const int IDA_BTN_NO = 604;
 
-       CameraPresentationModel* __pCamcorderPresentationModel;
        ScreenMode __screenMode;
        Tizen::Ui::Controls::OverlayPanel* __pOverlayPanel;
-       Tizen::Base::Runtime::Timer* __pAppTimer;
-       Tizen::Base::Runtime::Timer* __pIntervalValueTimer;
        Tizen::Base::Runtime::Timer* __pRecordTimer;
-       Tizen::Base::Runtime::Timer* __pPopupTimer;
-       Tizen::Base::Runtime::Timer* __pExposureCloseTimer;
-       Tizen::Base::Runtime::Timer* __pMakerFocusTimer;
-       Tizen::Base::Runtime::Timer* __pChargingTimer;
-       Tizen::Base::Runtime::Timer* __pChargingCompletedTimer;
-       Tizen::Base::Runtime::Timer* __pHelpCloseTimer;
-       Tizen::Base::Runtime::Timer* __pPreviewFailPopupTimer;
        Tizen::Ui::Controls::ListView* __pListViewCamcoderTabMainMenu;
        Tizen::Ui::Controls::ListView* __pListViewCamcoderTabSubMenu;
        Tizen::Ui::Controls::ListView* __pListViewGeneralTabMainMenu;
@@ -372,12 +348,9 @@ private:
        int __settingWhiteBalance;
        int __settingTimeInterval;
        int __settingExposure;
-       int __timeCount;
        long __recordTimeCount;
        long __recordingMaxTime;
-       int __closeTimerValue;
-       bool __isRecording;
-       bool __isRecordingPause;
+       int _closeTimerValue;
        int __previewResolutionWidth;
        int __previewResolutionHeight;
        int __pRecordingResolutionWidth;
@@ -387,8 +360,6 @@ private:
        bool __isMemoryFull;
        bool __isLockScreenMode;
        bool __isOrientationChanged;
-       int __chargingCount;
-       int __blinkCount;
        bool __doRecording;
        BatteryState __batteryStatus;
        Tizen::Ui::Controls::Panel* __pSettingPanel;
@@ -445,7 +416,6 @@ private:
        Tizen::Base::String __uri;
        Tizen::Base::String __mime;
        bool __isCapacityBelow;
-       bool __appControlActionCompleted; 
        Tizen::Ui::Controls::Popup* __pCancelPopup;
        bool __setTimerInterval;
        Tizen::Graphics::Bitmap* __pRecordPauseBitmap;
index 8040fac..7303f03 100644 (file)
@@ -84,17 +84,7 @@ public:
        virtual bool DeleteItem(int index, Tizen::Ui::Controls::ListItemBase* pItem, int itemWidth);
        virtual int GetItemCount(void);
 
-       virtual void OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-       virtual void OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-       virtual void OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode);
-
-       virtual void OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value);
-       virtual void OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment);
-
        virtual void OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::OrientationStatus orientationStatus);
-
-       virtual void OnAppControlCompleted(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::Collection::IList* pResultList);
-
        virtual void OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs);
 
        virtual void OnFileEventOccured(const unsigned long events, const Tizen::Base::String& path, const unsigned int eventId);
@@ -160,7 +150,6 @@ private:
        result SetMenuTitle(Tizen::Graphics::Canvas* pCanvas, const Tizen::Base::String& str, const int fntSize);
        int GetTimerIntervalValue(void) const;
        void SetGuideLine(int guideLineEnable);
-       void SetStorageType(int storageType);
 
        result RestoreDefaultSetting(void);
        result RestorePrimaryResolution(void);
@@ -207,8 +196,6 @@ private:
        Tizen::Ui::Controls::CustomItem* CreateItem4(int index, int itemWidth);
 
        void SetCameraSettingsDevice(void);
-       result LaunchAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* extraData);
-
        void SetCameraMode(bool isWideMode);
        void SetOverlayRendererRotation(void);
        result CreateOverlayRegion(Tizen::Graphics::Rectangle rect);
@@ -240,18 +227,13 @@ private:
        void SendCameraToBackground(void);
        void DrawThumbnail(void);
        void SetCameraErrorOccurred(void);
-       void ShowCameraFailPopup(void);
-       void ShowUnlaunchPopup(void);
 
        result DrawBatteryLevelFull(void);
-       void ShowLowBatteryPopup(void);
        int GetCurrentBatteryImage(void);
        result CheckBatteryStatus(void);
        result MakeCameraTabMenuString(void);
        result MakeGeneralTabMenuString(void);
-       void DeleteTimer(void);
        void CancelTimer(void);
-       result SendAppControlResult(RequestId requestId);
        result RunStartPreviewThread(void);
 
        result SubListPopupTimerMode(int index);
@@ -281,8 +263,6 @@ private:
        void HideScreenOverlayHelp();
        result DrawScreenOverlayHelp(void);
        void OnTimerCapturePause(void);
-       result TerminateApp(void);
-       void RemoveAllEventListener(void);
        void UpdatePopUp(void);
        bool CheckCallStatus(void);
 
@@ -290,19 +270,8 @@ private:
        static const int IDA_BTN_YES = 103;
        static const int IDA_BTN_NO = 104;
 
-       CameraPresentationModel* __pCameraPresentationModel;
        Tizen::Ui::Controls::OverlayPanel* __pOverlayPanel;
        ScreenMode __screenMode;
-       Tizen::Base::Runtime::Timer* __pAppTimer;
-       Tizen::Base::Runtime::Timer* __pIntervalValueTimer;
-       Tizen::Base::Runtime::Timer* __pCaptureStartTimer;
-       Tizen::Base::Runtime::Timer* __pPopupTimer;
-       Tizen::Base::Runtime::Timer* __pExposureCloseTimer;
-       Tizen::Base::Runtime::Timer* __pTouchAutoFocusTimer;
-       Tizen::Base::Runtime::Timer* __pHelpCloseTimer;
-       Tizen::Base::Runtime::Timer* __pChargingTimer;
-       Tizen::Base::Runtime::Timer* __pChargingCompletedTimer;
-       Tizen::Base::Runtime::Timer* __pPreviewFailPopupTimer;
        Tizen::Ui::Controls::ListView* __pListViewCameraTabMainMenu;
        Tizen::Ui::Controls::ListView* __pListViewCameraTabSubMenu;
        Tizen::Ui::Controls::ListView* __pListViewGeneralTabMainMenu;
@@ -321,12 +290,7 @@ private:
        int __settingExposure;
        int __primaryCurrentResolutionIndex;
        int __secondaryCurrentResolutionIndex;
-       int __timeCount;
-       int __chargingCount;
-       int __blinkCount;
        bool __isTimerRunning;
-       int __closeTimerValue;
-       bool __isUsedTimerCaptured;
        int __previewResolutionWidth;
        int __previewResolutionHeight;
        int __captureResolutionWidth;
@@ -388,7 +352,6 @@ private:
        Tizen::Io::FileEventManager* __pFileEventManager;
        Tizen::Base::String __uri;
        Tizen::Base::String __mime;
-       bool __appControlActionCompleted; 
        bool __formStatusFrameDeattivated;
        Tizen::Graphics::BufferInfo __bufferInfo;
        Tizen::Base::String __pFileEventPath;
index 7c36350..51e33c1 100644 (file)
@@ -106,6 +106,12 @@ enum BatteryState
        BATTERY_STATE_20,
 };
 
+enum SourceForm
+{
+       SOURCE_FORM_CAMERA,
+       SOURCE_FORM_CAMCORDER
+};
+
 extern const unsigned int COLOR_SETTING_MENU_TITLE;
 extern const unsigned int COLOR_SETTING_MENU_VAULE;
 extern const unsigned int COLOR_SETTING_MENU_VALUE_DISABLE;
@@ -150,6 +156,9 @@ extern const int MAX_DIRECTORY_PATH_LENGTH;
 extern const int APP_CONTROL_TYPE_STANDARD;
 extern const int APP_CONTROL_TYPE_REQUESET;
 
+extern const int MESSAGEBOX_DISPLAY_TIME_2_SEC;
+extern const int MESSAGEBOX_DISPLAY_TIME_3_SEC;
+
 extern const int FLASH_TYPE_OFF;
 extern const int FLASH_TYPE_ON;
 
index e7d0fa4..fb9a8f6 100644 (file)
@@ -37,6 +37,27 @@ using namespace Tizen::Ui::Scenes;
 
 
 BaseForm::BaseForm(void)
+:_pCameraPresentationModel(null)
+,_pCurrentSourceForm(SOURCE_FORM_CAMERA)
+, _timeCount(0)
+, _isRecording(false)
+, _isRecordingPause(false)
+, _chargingCount(0)
+, _blinkCount(0)
+, _appControlActionCompleted(false)
+, _isUsedTimerCaptured(false)
+, _closeTimerValue(0)
+,_pAppTimer(null)
+,_pIntervalValueTimer(null)
+,_pCaptureStartTimer(null)
+,_pPopupTimer(null)
+,_pExposureCloseTimer(null)
+,_pTouchAutoFocusTimer(null)
+,_pHelpCloseTimer(null)
+,_pChargingTimer(null)
+,_pChargingCompletedTimer(null)
+,_pPreviewFailPopupTimer(null)
+,_pMakerFocusTimer(null)
 {
        //empty Implementation
 }
@@ -167,25 +188,29 @@ BaseForm::OnTimerExpired (Timer &timer)
 void
 BaseForm::OnSliderBarMoved (Tizen::Ui::Controls::Slider &source, int value)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnFileEventOccured (const unsigned long events, const Tizen::Base::String &path, const unsigned int eventId)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnAdjustmentValueChanged (const Tizen::Ui::Control &source, int adjustment)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnTouchCanceled (const Tizen::Ui::Control &source, const Tizen::Graphics::Point &currentPosition, const Tizen::Ui::TouchEventInfo &touchInfo)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
@@ -205,36 +230,42 @@ BaseForm::OnTouchFocusOut (const Tizen::Ui::Control &source, const Tizen::Graphi
 void
 BaseForm::OnTouchMoved (const Tizen::Ui::Control &source, const Tizen::Graphics::Point &currentPosition, const Tizen::Ui::TouchEventInfo &touchInfo)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnTouchPressed (const Tizen::Ui::Control &source, const Tizen::Graphics::Point &currentPosition, const Tizen::Ui::TouchEventInfo &touchInfo)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 void
 BaseForm::OnTouchReleased (const Tizen::Ui::Control &source, const Tizen::Graphics::Point &currentPosition, const Tizen::Ui::TouchEventInfo &touchInfo)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnKeyLongPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnKeyPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 AppLaunchType
@@ -433,3 +464,442 @@ CATCH:
        AppLogDebug("EXIT - CATCH");
        return TYPE_UNDEFINED_CALL;
 }
+
+void
+BaseForm::BaseFormOnActionPerformed(const Tizen::Ui::Control& source, int actionId)
+{
+       //empty Implementation
+}
+
+result
+BaseForm::SendAppControlResult(RequestId requestId)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       String fullFileName = L"";
+       int storageType = STORAGE_TYPE_PHONE;
+       int mode = CameraPresentationModel::CAMERA_MODE_SNAPSHOT;
+       String filePath = L"";
+       int requestType = 0;
+
+       HashMap* pExtraData = new (std::nothrow) HashMap(SingleObjectDeleter);
+       r = pExtraData->Construct();
+       AppLogDebug("HashMap::Construct() fail[%s]", GetErrorMessage(r));
+
+       if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET)
+       {
+               requestType = _pCameraPresentationModel->GetAppControlRequestType();
+
+               switch (requestType)
+               {
+               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED:
+               {
+                       r = ReturnValues(requestId, APP_CTRL_RESULT_CANCELED, null);
+                       TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
+               }
+               break;
+
+               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED:
+               {
+                       r = _pCameraPresentationModel->GetValue(CURRENT_MODE, mode);
+                       TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
+
+                       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
+                       TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
+
+                       if (storageType == STORAGE_TYPE_PHONE)
+                       {
+                               r = filePath.Format(MAX_DIRECTORY_PATH_LENGTH, L"%ls%ls", Environment::GetMediaPath().GetPointer(), STRING_CAMERA_FOLDER);
+                               TryCatch(r == E_SUCCESS, , "String::Format() fail[%s]", GetErrorMessage(r));
+                       }
+                       else
+                       {
+                               r = filePath.Format(MAX_DIRECTORY_PATH_LENGTH, L"%ls%ls", Environment::GetExternalStoragePath().GetPointer(), STRING_CAMERA_FOLDER);
+                               TryCatch(r == E_SUCCESS, , "String::Format() fail[%s]", GetErrorMessage(r));
+                       }
+                       AppLogDebug("FilePath %ls", filePath.GetPointer());
+
+                       if (mode == CameraPresentationModel::CAMERA_MODE_SNAPSHOT)
+                       {
+                               r = _pCameraPresentationModel->GetLatestContentName(CameraPresentationModel::CAMERA_MODE_SNAPSHOT, fullFileName);
+                               TryCatch(r == E_SUCCESS, , "pCameraPresentationModel->GetLatestContentName fail[%s]", GetErrorMessage(r));
+                       }
+                       else
+                       {
+                               r = _pCameraPresentationModel->GetLatestContentName(CameraPresentationModel::CAMERA_MODE_RECORD, fullFileName);
+                               TryCatch(r == E_SUCCESS, , "pCameraPresentationModel->GetLatestContentName fail[%s]", GetErrorMessage(r));
+                       }
+
+                       AppLogDebug("fullFileName:%ls", fullFileName.GetPointer());
+
+                       ArrayList* pPaths = new (std::nothrow) ArrayList();
+                       pPaths->Construct();
+                       pPaths->Add(new (std::nothrow) String(filePath + fullFileName));
+
+                       pExtraData->Add(new (std::nothrow) String(OUTPUT_KEY_RESULT), pPaths);
+
+                       r = ReturnValues(requestId, APP_CTRL_RESULT_SUCCEEDED, pExtraData);
+                       TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
+               }
+               break;
+
+               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED:
+               {
+                       r = ReturnValues(requestId, APP_CTRL_RESULT_FAILED, null);
+                       TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
+               }
+               break;
+
+               default:
+                       break;
+               }
+       }
+       else
+       {
+               AppLogDebug("Not AppControl");
+               r = ReturnValues(requestId, APP_CTRL_RESULT_FAILED, null);
+               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
+       }
+
+       delete pExtraData;
+       pExtraData = null;
+
+       AppLogDebug("EXIT");
+       return r;
+
+       CATCH:
+       delete pExtraData;
+       pExtraData = null;
+
+       AppLogDebug("EXIT - CATCH");
+       return r;
+}
+
+result
+BaseForm::LaunchAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* extraData)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       CameraApp* pCameraApp = null;
+       AppControl* pAc = null;
+
+       AppLogDebug("pUriData %ls", pUriData->GetPointer());
+       AppLogDebug("pDataType %ls", pDataType->GetPointer());
+
+#if true
+       pAc = AppManager::FindAppControlN(providerId, operationId);
+       TryCatch(pAc != null, r = E_OBJ_NOT_FOUND, "Failed to find the appcontrol");
+
+       r = pAc->Start(null, pDataType, extraData, null);
+       TryCatch(r == E_SUCCESS, , "[%s] Failed to start the appcontrol", GetErrorMessage(r));
+
+       pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
+       pCameraApp->SetFrameEnabled(false);
+       Invalidate(true);
+
+       delete pAc;
+#else
+       r = AppControl::FindAndStart(operationId, null, pDataType, null, extraData, null);
+       TryCatch(r == E_SUCCESS, , "[%s] Failed to start the appcontrol", GetErrorMessage(r));
+#endif
+       AppLogDebug("EXIT");
+       return r;
+
+       CATCH:
+       if (pAc != null)
+       {
+               delete pAc;
+       }
+       return E_FAILURE;
+}
+
+void
+BaseForm::OnAppControlCompleted(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::Collection::IList* pResultList)
+{
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
+}
+
+void
+BaseForm::SetStorageType(int storageType)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+
+       if (storageType == STORAGE_TYPE_PHONE)
+       {
+               r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, storageType);
+               TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+               _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+       }
+       else if (storageType == STORAGE_TYPE_MEMORYCARD)
+       {
+               if (_pCameraPresentationModel->IsStorageCardMounted() == true)
+               {
+                       AppLogDebug("StorageCard mount");
+                       r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, storageType);
+                       TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+                       _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_MOUNT);
+               }
+               else
+               {
+                       AppLogDebug("StorageCard unmount");
+                       _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+               }
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+BaseForm::ShowCameraFailPopup(void)
+{
+       AppLogDebug("ENTER");
+       int modalResult = 0;
+       MessageBox msgBox;
+       String tmpString = L"";
+       result r = E_SUCCESS;
+       AppResource* pAppResource = null;
+
+       pAppResource = Application::GetInstance()->GetAppResource();
+       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
+
+       pAppResource->GetString(L"IDS_CAM_POP_CAMERA_FAILED", tmpString);
+
+       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
+       msgBox.ShowAndWait(modalResult);
+
+       switch (modalResult)
+       {
+       case MSGBOX_RESULT_CLOSE:
+               {
+                       _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+
+                       r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
+                       AppLogDebug("SetValue fail [%s]", GetErrorMessage(r));
+
+                       r = TerminateApp();
+                       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
+               }
+               break;
+
+       default:
+               break;
+       }
+       AppLogDebug("EXIT");
+}
+
+void
+BaseForm::ShowUnlaunchPopup(void)
+{
+       AppLogDebug("ENTER");
+       int modalResult = 0;
+       MessageBox msgBox;
+       String tmpString;
+       AppResource* pAppResource = null;
+       result r = E_SUCCESS;
+
+       pAppResource = Application::GetInstance()->GetAppResource();
+       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
+
+       pAppResource->GetString(L"IDS_CAM_POP_UNABLE_TO_START_CAMERA_DURING_CALL", tmpString);
+
+       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
+       msgBox.ShowAndWait(modalResult);
+
+       _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+       r = TerminateApp();
+       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
+
+       AppLogDebug("EXIT");
+}
+
+void
+BaseForm::ShowLowBatteryPopup(void)
+{
+       AppLogDebug("ENTER");
+       int modalResult = 0;
+       MessageBox msgBox;
+       String tmpString;
+       AppResource* pAppResource = null;
+       result r = E_SUCCESS;
+
+       pAppResource = Application::GetInstance()->GetAppResource();
+       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
+
+       pAppResource->GetString(L"IDS_COM_BODY_LOW_BATTERY", tmpString);
+
+       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
+       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
+       msgBox.ShowAndWait(modalResult);
+
+       switch (modalResult)
+       {
+       case MSGBOX_RESULT_CLOSE:
+               {
+                       AppLogDebug("MSGBOX_RESULT_CLOSE");
+                       _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+
+                       r = TerminateApp();
+                       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
+               }
+               break;
+
+       default:
+               break;
+       }
+       AppLogDebug("EXIT");
+}
+
+result
+BaseForm::TerminateApp(void)
+{
+
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
+
+       RemoveAllEventListener();
+       _appControlActionCompleted = true;
+       DeleteTimer();
+       _blinkCount = 0;
+
+       if (_pCurrentSourceForm == SOURCE_FORM_CAMERA)
+       {
+               _timeCount = 0;
+               _chargingCount = 0;
+               _isUsedTimerCaptured = false;
+               _closeTimerValue = 0;
+       }
+
+       if (_pCurrentSourceForm == SOURCE_FORM_CAMCORDER)
+       {
+               _isRecording = false;
+               _isRecordingPause = false;
+       }
+
+       _pCameraPresentationModel->StopCamera();
+
+       r = SendAppControlResult(pCameraApp->GetRequestId());
+       TryCatch(r == E_SUCCESS, , "SendAppControlResult fail[%s]", GetErrorMessage(r));
+
+       AppLogDebug("EXIT");
+       return r;
+
+CATCH:
+       AppLogDebug("EXIT - CATCH");
+       return r;
+}
+
+void
+BaseForm::RemoveAllEventListener(void)
+{
+       AppLogDebug("ENTER");
+       RemoveOrientationEventListener(*this);
+       RemoveTouchEventListener(*this);
+       RemoveKeyEventListener(*this);
+       AppLogDebug("EXIT");
+}
+
+void
+BaseForm::DeleteTimer(void)
+{
+       AppLogDebug("ENTER");
+
+       if (_pAppTimer)
+       {
+               _pAppTimer->Cancel();
+               delete _pAppTimer;
+               _pAppTimer = null;
+       }
+
+       if (_pIntervalValueTimer)
+       {
+               _pIntervalValueTimer->Cancel();
+               delete _pIntervalValueTimer;
+               _pIntervalValueTimer = null;
+       }
+
+       if (_pCurrentSourceForm == SOURCE_FORM_CAMERA)
+       {
+               if (_pCaptureStartTimer != null)
+               {
+                       _pCaptureStartTimer->Cancel();
+                       delete _pCaptureStartTimer;
+                       _pCaptureStartTimer = null;
+               }
+
+               if (_pTouchAutoFocusTimer != null)
+               {
+                       _pTouchAutoFocusTimer->Cancel();
+                       delete _pTouchAutoFocusTimer;
+                       _pTouchAutoFocusTimer = null;
+               }
+       }
+
+       if (_pPopupTimer)
+       {
+               _pPopupTimer->Cancel();
+               delete _pPopupTimer;
+               _pPopupTimer = null;
+       }
+
+       if (_pExposureCloseTimer)
+       {
+               _pExposureCloseTimer->Cancel();
+               delete _pExposureCloseTimer;
+               _pExposureCloseTimer = null;
+       }
+
+       if (_pCurrentSourceForm == SOURCE_FORM_CAMCORDER)
+       {
+               if (_pMakerFocusTimer)
+               {
+                       _pMakerFocusTimer->Cancel();
+                       delete _pMakerFocusTimer;
+                       _pMakerFocusTimer = null;
+               }
+       }
+
+       if (_pHelpCloseTimer)
+       {
+               _pHelpCloseTimer->Cancel();
+               delete _pHelpCloseTimer;
+               _pHelpCloseTimer = null;
+       }
+
+       if (_pChargingTimer)
+       {
+               _pChargingTimer->Cancel();
+               delete _pChargingTimer;
+               _pChargingTimer = null;
+       }
+
+       if (_pChargingCompletedTimer != null)
+       {
+               if (_pCurrentSourceForm == SOURCE_FORM_CAMERA)
+               {
+                       _pChargingCompletedTimer->Cancel();
+                       delete _pChargingCompletedTimer;
+                       _pChargingCompletedTimer = null;
+               }
+
+               if (_pCurrentSourceForm == SOURCE_FORM_CAMCORDER)
+               {
+                       _chargingCount = 0;
+                       _blinkCount = 0;
+                       _pChargingCompletedTimer->Cancel();
+                       delete _pChargingTimer;
+                       _pChargingTimer = null;
+               }
+       }
+
+       if (_pPreviewFailPopupTimer != null)
+       {
+               _pPreviewFailPopupTimer->Cancel();
+               delete _pPreviewFailPopupTimer;
+               _pPreviewFailPopupTimer = null;
+       }
+       AppLogDebug("EXIT");
+}
index ad51018..a927fbb 100644 (file)
@@ -229,8 +229,6 @@ static const int MENU_MODE_DISABLE = -1;
 static const int MENU_TWO_ELEMENT = 2;
 static const int MENU_THREE_ELEMENT = 3;
 static const int EXPOSURE_TIMER_IS_ALIVE = 1;
-static const int MESSAGEBOX_DISPLAY_TIME_2_SEC = 2000;
-static const int MESSAGEBOX_DISPLAY_TIME_3_SEC = 3000;
 static const int MODE_AUTO = 0;
 static const int MODE_WHITEBALANCE_INCANDESCENT = 1;
 static const int MODE_FLUORESCENT = 2;
@@ -372,19 +370,9 @@ static const CamcorderBatteryStateTable batteryTable[] =
 };
 
 CamcorderForm::CamcorderForm(void)
-       : __pCamcorderPresentationModel(null)
-       , __screenMode(SCREEN_MODE_NORMAL)
+       : __screenMode(SCREEN_MODE_NORMAL)
        , __pOverlayPanel(null)
-       , __pAppTimer(null)
-       , __pIntervalValueTimer(null)
        , __pRecordTimer(null)
-       , __pPopupTimer(null)
-       , __pExposureCloseTimer(null)
-       , __pMakerFocusTimer(null)
-       , __pChargingTimer(null)
-       , __pChargingCompletedTimer(null)
-       , __pHelpCloseTimer(null)
-       , __pPreviewFailPopupTimer(null)
        , __pListViewCamcoderTabMainMenu(null)
        , __pListViewCamcoderTabSubMenu(null)
        , __pListViewGeneralTabMainMenu(null)
@@ -401,12 +389,11 @@ CamcorderForm::CamcorderForm(void)
        , __settingWhiteBalance(0)
        , __settingTimeInterval(0)
        , __settingExposure(0)
-       , __timeCount(0)
+
        , __recordTimeCount(0)
        , __recordingMaxTime(0)
-       , __closeTimerValue(0)
-       , __isRecording(false)
-       , __isRecordingPause(false)
+       , _closeTimerValue(0)
+
        , __previewResolutionWidth(0)
        , __previewResolutionHeight(0)
        , __pRecordingResolutionWidth(0)
@@ -416,8 +403,6 @@ CamcorderForm::CamcorderForm(void)
        , __isMemoryFull(false)
        , __isLockScreenMode(false)
        , __isOrientationChanged(false)
-       , __chargingCount(0)
-       , __blinkCount(0)
        , __doRecording(false)
        , __batteryStatus(BATTERY_STATE_0)
        , __pSettingPanel(null)
@@ -474,7 +459,7 @@ CamcorderForm::CamcorderForm(void)
        , __uri(L"")
        , __mime(L"")
        , __isCapacityBelow(false)
-       , __appControlActionCompleted(false)
+       
        , __pCancelPopup(null)
        , __setTimerInterval(false)
        , __pRecordPauseBitmap(null)
@@ -504,7 +489,7 @@ CamcorderForm::OnInitializing(void)
        Point currentPosition;
        String filePath = L"";
 
-       __appControlActionCompleted = false;
+       _appControlActionCompleted = false;
 
        AddKeyEventListener(*this);
 
@@ -512,13 +497,14 @@ CamcorderForm::OnInitializing(void)
        SetOrientation(ORIENTATION_AUTOMATIC_FOUR_DIRECTION);
        __dir = GetOrientationStatus();
 
-       __pCamcorderPresentationModel->SetOrientation(__dir);
+       _pCameraPresentationModel->SetOrientation(__dir);
 
        InitAppTimer();
        InitPreviewFailPopupTimer();
        InitSettingTimer();
        InitChargingTimer();
        InitChargingCompletedTimer();
+       _pCurrentSourceForm = SOURCE_FORM_CAMCORDER;
 
        __pCameraInfoPanel = new (std::nothrow) CameraInfoPanel();
        TryCatch(__pCameraInfoPanel != null, r = E_FAILURE, "__pCameraInfoPanel is null");
@@ -547,23 +533,23 @@ CamcorderForm::OnInitializing(void)
                rectPanel = Rectangle(0, 0, W_FULL_PREVIEW_OVERLAY_LANDSCAPE, X_PREVIEW_OVERLAY_LANDSCAPE);
        }
 
-       r = __pCamcorderPresentationModel->GetValue(STORAGE_TYPE, storageType);
+       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
        if (r != E_SUCCESS)
        {
                storageType = STORAGE_TYPE_PHONE;
        }
 
-       if (storageType == STORAGE_TYPE_MEMORYCARD && __pCamcorderPresentationModel->IsStorageCardMounted() == false)
+       if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
        {
-               r = __pCamcorderPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+               r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-               __pCamcorderPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+               _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
        }
 
-       r = __pCamcorderPresentationModel->GetValue(STORAGE_TYPE, storageType);
+       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
-       r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
+       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        r = __pCameraInfoPanel->Initialize(rect);
@@ -613,7 +599,7 @@ CamcorderForm::OnInitializing(void)
        r = __pFileEventManager->Construct(*this);
        TryCatch(r == E_SUCCESS, , "Construct() fail[%s]", GetErrorMessage(r));
 
-       filePath = __pCamcorderPresentationModel->GetfilePath(storageType);
+       filePath = _pCameraPresentationModel->GetfilePath(storageType);
        AppLogDebug("filePath %ls", filePath.GetPointer());
 
        if (File::IsFileExist(filePath))
@@ -641,9 +627,9 @@ CamcorderForm::OnTerminating(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       __pCamcorderPresentationModel->KeepScreenOnState(false, true);
+       _pCameraPresentationModel->KeepScreenOnState(false, true);
 
-       __pCamcorderPresentationModel->RemovePresentationChangedEventListener(null);
+       _pCameraPresentationModel->RemovePresentationChangedEventListener(null);
 
        __pCameraInfoPanel->SetDrawIndicatorStroageInfo(false);
 
@@ -653,15 +639,15 @@ CamcorderForm::OnTerminating(void)
 
        __setTimerInterval = false;
 
-       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
        __isCapacityBelow = false;
 
        RemoveAllEventListener();
 
-       __pCamcorderPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
-       r = __pCamcorderPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_DISABLE);
+       r = _pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_DISABLE);
        AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (__isLockScreenMode)
@@ -674,9 +660,10 @@ CamcorderForm::OnTerminating(void)
 
        __screenMode = SCREEN_MODE_NORMAL;
  
-       __pCamcorderPresentationModel = null;
+       _pCameraPresentationModel = null;
        __pCameraStarterThread = null;
 
+       EndRecordTimer();
        DeleteTimer();
 
        if (__pRecordPauseBitmap)
@@ -739,17 +726,17 @@ CamcorderForm::SetStartRecording(void)
        {
        case SETTING_TIMER_RECORD_0_SEC:
                {
-                       if (__pIntervalValueTimer)
+                       if (_pIntervalValueTimer)
                        {
-                               __pIntervalValueTimer->Cancel();
+                               _pIntervalValueTimer->Cancel();
                        }
-                       __isRecording = true;
+                       _isRecording = true;
 
                        __setTimerInterval = false;
 
-                       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
+                       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
-                       __pCamcorderPresentationModel->StartRecord();
+                       _pCameraPresentationModel->StartRecord();
                        r = StartRecordTimer();
                        TryReturnVoid(r == E_SUCCESS, "StartRecordTimer() fail[%s]", GetErrorMessage(r));
 
@@ -781,9 +768,9 @@ CamcorderForm::SetStartRecording(void)
                        TryReturnVoid(r == E_SUCCESS, "SetRecordStartTimer() fail[%s]", GetErrorMessage(r));
 
                        __setTimerInterval = true;
-                       __pCamcorderPresentationModel->SetIntervalTimerRun(true);
+                       _pCameraPresentationModel->SetIntervalTimerRun(true);
 
-                       __timeCount = 0;
+                       _timeCount = 0;
 
                        r = DrawTimerPopup();
                        TryReturnVoid(r == E_SUCCESS, "DrawTimerPopup() fail[%s]", GetErrorMessage(r));
@@ -815,10 +802,10 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        bool isCharging = false;
                        BatteryLevel batteryLevel;
 
-                       batteryLevel = __pCamcorderPresentationModel->GetBatteryLevel();
-                       isCharging = __pCamcorderPresentationModel->IsCharging();
+                       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                       isCharging = _pCameraPresentationModel->IsCharging();
 
-                       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
 
                        if (r != E_SUCCESS)
                        {
@@ -831,7 +818,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                                if (value == true && r == E_SUCCESS)
                                {
@@ -868,11 +855,11 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        ShowUiQuickMenu();
                }
@@ -882,11 +869,11 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        HideUiQuickMenu();
                }
@@ -896,11 +883,11 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        MakeCamcoderTabSettingPopup();
                }
@@ -910,11 +897,11 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        if (__pListViewGeneralTabMainMenu)
                        {
@@ -934,11 +921,11 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        AppLogDebug("IDA_BUTTON_SETTING_GENERAL");
 
@@ -960,13 +947,13 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        result r = E_SUCCESS;
                        int cameraCount = 0;
 
-                       if (__pCamcorderPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
+                       if (_pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
                        {
                                AppLogDebug("Camera Preview is not");
                                return;
                        }
 
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
                        AppLogDebug("GetMediaCapability [%s]", GetErrorMessage(r));
                        if (cameraCount < SUPPORTED_CAMERA_NUM)
                        {
@@ -974,7 +961,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                return;
                        }
 
-                       onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
+                       onVideoRecorderStopped = _pCameraPresentationModel->GetOnVideoRecorderStopped();
 
                        MakeSettingPopupTab(false);
 
@@ -1009,22 +996,22 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        result r = E_SUCCESS;
                        int selfPortraitEnable = 0;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                        if (__pCameraInfoPanel->GetDrawExposure() == true)
                        {
-                               __closeTimerValue = 0;
+                               _closeTimerValue = 0;
 
-                               if (__pExposureCloseTimer)
+                               if (_pExposureCloseTimer)
                                {
-                                       __pExposureCloseTimer->Cancel();
+                                       _pExposureCloseTimer->Cancel();
                                }
 
                                __pCameraInfoPanel->SetDrawExposure(false);
@@ -1033,11 +1020,11 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
                        }
 
                        if (r == E_SUCCESS)
@@ -1067,10 +1054,10 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        result r = E_SUCCESS;
                        AppLogDebug("IDA_BUTTON_RECORDING_POPUP_OK");
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
                        TryReturnVoid(r == E_SUCCESS, "Timer::Start() fail[%s]", GetErrorMessage(r));
 
                        if (__pCancelPopup)
@@ -1098,9 +1085,9 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                __pCancelPopup->Invalidate(true);
                        }
 
-                       __isRecording = true;
+                       _isRecording = true;
 
-                       __pCamcorderPresentationModel->SetCancelRecord(false);
+                       _pCameraPresentationModel->SetCancelRecord(false);
 
                        r = SetRecordPauseBitmap(false);
                        //TryCatch(r == E_SUCCESS, , "SetRecordPauseBitmap start fail[%s]", GetErrorMessage(r));
@@ -1109,7 +1096,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        r = SetRecordPauseButton(false);
                        TryReturnVoid(r == E_SUCCESS, "SetRecordPauseButton fail[%s]", GetErrorMessage(r));
 
-                       __pCamcorderPresentationModel->StartRecord();
+                       _pCameraPresentationModel->StartRecord();
 
                        __pRecordTimer->StartAsRepeatable(CAMCORDER_TIMER_ONE_SEC);
                }
@@ -1132,7 +1119,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        __pResetPopUp->SetShowState(false);
                }
-               r = __pCamcorderPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
+               r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
                TryReturnVoid(r == E_SUCCESS, "GetValue() fail(%s)", GetErrorMessage(r));
 
                if (guideLineEnable == CAMERA_GUIDELINE_ENABLE)
@@ -1143,7 +1130,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        SetGuideLine(REG_DEFAULT_VALUE_ZERO);
                }
 
-               r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "GetValue() fail(%s)", GetErrorMessage(r));
 
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
@@ -1152,7 +1139,7 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                        AppLogDebug("SUBMENU_RESET_MODE : CAMERA_FORM_SECONDARY_MODE");
 
-                       r = __pCamcorderPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
+                       r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
                        TryReturnVoid(r == E_SUCCESS, "SetValue() fail(%s)", GetErrorMessage(r));
 
                        r  = ToggleCameraDirection(CAMCORDER_FORM_PRIMARY_MODE);
@@ -1161,14 +1148,14 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                        TryReturnVoid(r == E_SUCCESS, "__pOverlayPanel->GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
 
-                       __pCamcorderPresentationModel->StartPreview(&bufferinfo);
+                       _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-                       __pCamcorderPresentationModel->SetContinuousAutoFocus();
+                       _pCameraPresentationModel->SetContinuousAutoFocus();
                }
 
                RestoreDefaultSetting();
 
-               r = __pCamcorderPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
+               r = _pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
                TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
 
                MakeRecordingResolutionList(true);
@@ -1210,142 +1197,6 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        AppLogDebug("EXIT");
 }
 
-result
-CamcorderForm::SendAppControlResult(RequestId requestId)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       String fullFileName = L"";
-       int storageType = STORAGE_TYPE_PHONE;
-       int mode = CameraPresentationModel::CAMERA_MODE_SNAPSHOT;
-       String filePath = L"";
-       int requestType = 0;
-
-       HashMap* pExtraData = new (std::nothrow) HashMap(SingleObjectDeleter);
-       r = pExtraData->Construct();
-       AppLogDebug("HashMap::Construct() fail[%s]", GetErrorMessage(r));
-
-       if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET)
-       {
-               requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
-
-               switch (requestType)
-               {
-               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED:
-                       {
-                               r = ReturnValues(requestId, APP_CTRL_RESULT_CANCELED, null);
-                               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-                       }
-                       break;
-
-               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED:
-                       {
-                               r = __pCamcorderPresentationModel->GetValue(CURRENT_MODE, mode);
-                               TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
-                               r = __pCamcorderPresentationModel->GetValue(STORAGE_TYPE, storageType);
-                               TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
-                               if (storageType == STORAGE_TYPE_PHONE)
-                               {
-                                       r = filePath.Format(MAX_DIRECTORY_PATH_LENGTH, L"%ls%ls", Environment::GetMediaPath().GetPointer(), STRING_CAMERA_FOLDER);
-                                       TryCatch(r == E_SUCCESS, , "String::Format() fail[%s]", GetErrorMessage(r));
-                               }
-                               else
-                               {
-                                       r = filePath.Format(MAX_DIRECTORY_PATH_LENGTH, L"%ls%ls", Environment::GetExternalStoragePath().GetPointer(), STRING_CAMERA_FOLDER);
-                                       TryCatch(r == E_SUCCESS, , "String::Format() fail[%s]", GetErrorMessage(r));
-                               }
-                               AppLogDebug("FilePath %ls", filePath.GetPointer());
-
-                               if (mode == CameraPresentationModel::CAMERA_MODE_SNAPSHOT)
-                               {
-                                       r = __pCamcorderPresentationModel->GetLatestContentName(CameraPresentationModel::CAMERA_MODE_SNAPSHOT, fullFileName);
-                                       TryCatch(r == E_SUCCESS, , "pCameraPresentationModel->GetLatestContentName fail[%s]", GetErrorMessage(r));
-                               }
-                               else
-                               {
-                                       r = __pCamcorderPresentationModel->GetLatestContentName(CameraPresentationModel::CAMERA_MODE_RECORD, fullFileName);
-                                       TryCatch(r == E_SUCCESS, , "pCameraPresentationModel->GetLatestContentName fail[%s]", GetErrorMessage(r));
-                               }
-
-                               AppLogDebug("fullFileName:%ls", fullFileName.GetPointer());
-
-                               ArrayList* pPaths = new (std::nothrow) ArrayList();
-                               pPaths->Construct();
-                               pPaths->Add(new (std::nothrow) String(filePath + fullFileName));
-
-                               pExtraData->Add(new (std::nothrow) String(OUTPUT_KEY_RESULT), pPaths);
-
-                               r = ReturnValues(requestId, APP_CTRL_RESULT_SUCCEEDED, pExtraData);
-                               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-                       }
-                       break;
-
-               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED:
-                       {
-                               r = ReturnValues(requestId, APP_CTRL_RESULT_FAILED, null);
-                               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-                       }
-                       break;
-
-               default:
-                       break;
-               }
-       }
-       else
-       {
-               AppLogDebug("Not AppControl");
-               r = ReturnValues(requestId, APP_CTRL_RESULT_FAILED, null);
-               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-       }
-
-       delete pExtraData;
-       pExtraData = null;
-
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       delete pExtraData;
-       pExtraData = null;
-
-       AppLogDebug("EXIT - CATCH");
-       return r;
-}
-
-result
-CamcorderForm::TerminateApp(void)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
-
-       __appControlActionCompleted = true;
-
-       RemoveAllEventListener();
-
-       DeleteTimer();
-
-       __blinkCount = 0;
-
-       __isRecording = false;
-
-       __isRecordingPause = false;
-
-       __pCamcorderPresentationModel->StopCamera();
-
-       r = SendAppControlResult(pCameraApp->GetRequestId());
-       TryCatch(r == E_SUCCESS, , "SendAppControlResult fail[%s]", GetErrorMessage(r));
-
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       AppLogDebug("EXIT - CATCH");
-       return r;       
-}
-
 void
 CamcorderForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
@@ -1353,13 +1204,14 @@ CamcorderForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
        result r = E_SUCCESS;
        CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
 
+       EndRecordTimer();
        DeleteTimer();
 
-       __blinkCount = 0;
+       _blinkCount = 0;
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __pCamcorderPresentationModel->StopCamera();
+       _pCameraPresentationModel->StopCamera();
 
        r = SendAppControlResult(pCameraApp->GetRequestId());
        TryReturnVoid(r == E_SUCCESS, "SendAppControlResult [%s]", GetErrorMessage(r));
@@ -1400,56 +1252,11 @@ CamcorderForm::GetMime(void) const
        return __mime;
 }
 
-result
-CamcorderForm::LaunchAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* extraData)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CameraApp* pCameraApp = null;
-       AppControl* pAc = null;
-
-       AppLogDebug("pUriData %ls", pUriData->GetPointer());
-       AppLogDebug("pDataType %ls", pDataType->GetPointer());
-
-#if true
-       pAc = AppManager::FindAppControlN(providerId, operationId);
-       TryCatch(pAc != null, r = E_OBJ_NOT_FOUND, "Failed to find the appcontrol");
-
-       r = pAc->Start(null, pDataType, extraData, null);
-       TryCatch(r == E_SUCCESS, , "[%s] Failed to start the appcontrol", GetErrorMessage(r));
-
-       pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
-       pCameraApp->SetFrameEnabled(false);
-       Invalidate(true);
-
-       delete pAc;
-#else
-       r = AppControl::FindAndStart(operationId, null, pDataType, null, extraData, null);
-       TryCatch(r == E_SUCCESS, , "[%s] Failed to start the appcontrol", GetErrorMessage(r));
-#endif
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       if (pAc != null)
-       {
-               delete pAc;
-       }
-       return E_FAILURE;
-}
-
-void
-CamcorderForm::OnAppControlCompleted(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::Collection::IList* pResultList)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
 void
 CamcorderForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("EXIT - App Terminate");
                return;
@@ -1466,7 +1273,7 @@ CamcorderForm::OnFileEventOccured(const unsigned long events, const Tizen::Base:
        Bitmap* pBitmap = null;
        Point ptThumbnailImg = Point(X_THUMBNAIL_BUTTON_IMG, Y_THUMBNAIL_BUTTON_IMG);
 
-       isExistThumbnail = __pCamcorderPresentationModel->IsExistThumbnail(CameraPresentationModel::CAMERA_MODE_RECORD);
+       isExistThumbnail = _pCameraPresentationModel->IsExistThumbnail(CameraPresentationModel::CAMERA_MODE_RECORD);
 
        if (isExistThumbnail == false)
        {
@@ -1528,13 +1335,13 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
        bool isCharging = false;
        BatteryLevel batteryLevel;
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __isRecordingPause = false;
+       _isRecordingPause = false;
 
-       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-       __pAppTimer->Cancel();
-       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+       _pAppTimer->Cancel();
+       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
        TryReturnVoid(r == E_SUCCESS, "Timer::Start() fail[%s]", GetErrorMessage(r));
 
        __batteryStatus = GetCurrentBatteryState();
@@ -1544,22 +1351,22 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
 
        StartInitChargingTimer();
 
-       __pCamcorderPresentationModel->AddPresentationChangedEventListener(*this);
+       _pCameraPresentationModel->AddPresentationChangedEventListener(*this);
 
-       __pCamcorderPresentationModel->KeepScreenOnState(true, false);
+       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-       r = __pCamcorderPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
+       r = _pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
        TryReturnVoid(r == E_SUCCESS, "SetMode() failed:%s", GetErrorMessage(r));
 
        Update(false);
 
-       dim = __pCamcorderPresentationModel->GetPreviewResolution();
+       dim = _pCameraPresentationModel->GetPreviewResolution();
        AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
 
        __previewResolutionWidth = dim.width;
        __previewResolutionHeight = dim.height;
 
-       dim = __pCamcorderPresentationModel->GetRecordingResolution();
+       dim = _pCameraPresentationModel->GetRecordingResolution();
        AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
 
        __pRecordingResolutionWidth = dim.width;
@@ -1599,9 +1406,9 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
        r = SetRecordButton(false);
        AppLogDebug("SetRecordButton fail[%s]", GetErrorMessage(r));
 
-       __pCamcorderPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
+       _pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
 
-       r = __pCamcorderPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
+       r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
        TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
 
        if (regVal == DISABLE_GUIDELINE)
@@ -1638,7 +1445,7 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
                __pRecLabelText->Invalidate(true);
        }
 
-       isInitCameraStaus = __pCamcorderPresentationModel->GetInitCameraStatus();
+       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
        AppLogDebug("isInitCameraStaus [%d]", isInitCameraStaus);
 
        if (isInitCameraStaus)
@@ -1658,10 +1465,10 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
                        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-                       __pCamcorderPresentationModel->StartPreview(&bufferinfo);
+                       _pCameraPresentationModel->StartPreview(&bufferinfo);
                }
 
-               __pCamcorderPresentationModel->SetContinuousAutoFocus();
+               _pCameraPresentationModel->SetContinuousAutoFocus();
 
                previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight;
 
@@ -1672,8 +1479,8 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
                AppLogDebug("OnSceneActivatedN");
        }
 
-       batteryLevel = __pCamcorderPresentationModel->GetBatteryLevel();
-       isCharging = __pCamcorderPresentationModel->IsCharging();
+       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+       isCharging = _pCameraPresentationModel->IsCharging();
 
        AppLogDebug("batteryLevel = %d", batteryLevel);
        if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
@@ -1688,12 +1495,12 @@ CamcorderForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousScene
        CheckCallStatus();
 
 
-       __pCamcorderPresentationModel->GetValue(STORAGE_TYPE, storageType);
+       _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
 
-       if (storageType == STORAGE_TYPE_MEMORYCARD && __pCamcorderPresentationModel->IsStorageCardMounted() == false)
+       if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
        {
-               r = __pCamcorderPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
-               __pCamcorderPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+               r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+               _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
        }
        AppLogDebug("EXIT");
 }
@@ -1702,39 +1509,39 @@ void
 CamcorderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId, const Tizen::Ui::Scenes::SceneId& nextSceneId)
 {
        AppLogDebug("ENTER");
-       __pCamcorderPresentationModel->KeepScreenOnState(false, true);
+       _pCameraPresentationModel->KeepScreenOnState(false, true);
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __isRecordingPause = false;
+       _isRecordingPause = false;
 
        __isOrientationChanged = false;
 
-       __timeCount = 0;
+       _timeCount = 0;
 
        __setTimerInterval = false;
-       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
-       __chargingCount = 0;
+       _chargingCount = 0;
 
-       if (__pAppTimer)
+       if (_pAppTimer)
        {
-               __pAppTimer->Cancel();
+               _pAppTimer->Cancel();
        }
 
-       if (__pIntervalValueTimer)
+       if (_pIntervalValueTimer)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
-       if (__pChargingTimer)
+       if (_pChargingTimer)
        {
-               __pChargingTimer->Cancel();
+               _pChargingTimer->Cancel();
        }
 
-       if (__pHelpCloseTimer)
+       if (_pHelpCloseTimer)
        {
-               __pHelpCloseTimer->Cancel();
+               _pHelpCloseTimer->Cancel();
        }
 
        EndRecordTimer();
@@ -1776,7 +1583,7 @@ CamcorderForm::Update(bool isInvalidated)
 
        if (GetAppLaunchType() != APP_LAUNCH_TYPE_REQUESET)
        {
-               if (__doRecording || __isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+               if (__doRecording || _isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
                {
                        if (__pSwButton)
                        {
@@ -1808,13 +1615,13 @@ CamcorderForm::Update(bool isInvalidated)
 
                TryCatch(__pThumbnailPanel != null, , "__pThumbnailPanel is null");
 
-               pThumbnailBitmap = __pCamcorderPresentationModel->GetLatestThumbnail();
+               pThumbnailBitmap = _pCameraPresentationModel->GetLatestThumbnail();
 
                if (pThumbnailBitmap == null)
                {
                        AppLogDebug("CameraForm::Update :: pThumbnailBitmap = null");
 
-                       if (__isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+                       if (_isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
                        {
                                __pThumbnailButton->SetShowState(false);
                                __pThumbnailPanel->SetShowState(false);
@@ -1839,7 +1646,7 @@ CamcorderForm::Update(bool isInvalidated)
                        AppLogDebug("CameraForm::Update :: pThumbnailBitmap is not null");
                        ImageRotationType rotationType = IMAGE_ROTATION_0;
 
-                       if (__setTimerInterval || __isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+                       if (__setTimerInterval || _isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
                        {
                                __pThumbnailButton->SetShowState(false);
                                __pThumbnailPanel->SetShowState(false);
@@ -1952,7 +1759,7 @@ CamcorderForm::OnCameraActionRecorderClosed(void)
        Bitmap* pRotateBitmap = null;
        ImageRotationType rotationType = IMAGE_ROTATION_0;
 
-       pThumbnailBitmap = __pCamcorderPresentationModel->GetLatestThumbnail();
+       pThumbnailBitmap = _pCameraPresentationModel->GetLatestThumbnail();
        TryCatch(pThumbnailBitmap != null, , "pThumbnailBitmap is null");
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT_REVERSE
@@ -1994,17 +1801,17 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
 {
        AppLogDebug("ENTER");
 
-       __timeCount = 0;
+       _timeCount = 0;
        __doRecording = false;
 
-       if (__pIntervalValueTimer)
+       if (_pIntervalValueTimer)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
@@ -2028,7 +1835,7 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
        case CAMERA_ACTION_EVENT_AUTO_FOCUSED:
                {
                        AppLogDebug("CAMERA_ACTION_EVENT_AUTO_FOCUSED");
-                       if (__pCamcorderPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING)
+                       if (_pCameraPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING)
                        {
                                AppLogDebug("CAMERA_ACTION_EVENT_AUTO_FOCUSED : NOT STATE_RECORDING");
                                DrawFocus(CAMERA_FOCUS_READY);
@@ -2039,8 +1846,8 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                DrawFocus(CAMERA_FOCUS_READY);
                                InitMakerFocusTimer();
 
-                               __pMakerFocusTimer->Cancel();
-                               __pMakerFocusTimer->Start(CAMCORDER_TIMER_ONE_SEC);
+                               _pMakerFocusTimer->Cancel();
+                               _pMakerFocusTimer->Start(CAMCORDER_TIMER_ONE_SEC);
                        }
                }
                break;
@@ -2057,7 +1864,7 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        AppLogDebug("VIDEO_RECORDER_CANCELED_LISTENER.");
                        StartInitAppTimer();
 
-                       __isRecording = false;
+                       _isRecording = false;
                        __doRecording = false;
                }
                break;
@@ -2083,15 +1890,15 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        bool isCharging = false;
                        BatteryLevel batteryLevel;
 
-                       requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
+                       requestType = _pCameraPresentationModel->GetAppControlRequestType();
 
                        HideRecLabe();
 
                        HideUiPanel(false);
 
-                       __pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
+                       _pCameraPresentationModel->SetOnVideoRecorderStopped(false);
 
-                       __pCamcorderPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_RECORD);
+                       _pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_RECORD);
 
                        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED)
                        {
@@ -2112,8 +1919,8 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                Update(false);
                        }
 
-                       batteryLevel = __pCamcorderPresentationModel->GetBatteryLevel();
-                       isCharging = __pCamcorderPresentationModel->IsCharging();
+                       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                       isCharging = _pCameraPresentationModel->IsCharging();
 
                        AppLogDebug("batteryLevel = %d", batteryLevel);
                        AppLogDebug("isCharging = %d", isCharging);
@@ -2127,14 +1934,14 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                }
                        }
 
-                       AppLogDebug("GetCameraState : %ld", __pCamcorderPresentationModel->GetCameraState());
+                       AppLogDebug("GetCameraState : %ld", _pCameraPresentationModel->GetCameraState());
 
-                       if (__pCamcorderPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
+                       if (_pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
                        {
                                ReInitialise();
                                if (UiApp::GetInstance()->GetAppUiState()== APP_UI_STATE_FOREGROUND)
                                {
-                                       __pCamcorderPresentationModel->SetStartPreviewException(false);
+                                       _pCameraPresentationModel->SetStartPreviewException(false);
                                }
                        }
 
@@ -2147,13 +1954,13 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        int requestType = 0;
                        result r = E_SUCCESS;   
 
-                       requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
+                       requestType = _pCameraPresentationModel->GetAppControlRequestType();
 
                        HideRecLabe();
 
                        HideUiPanel(false);
 
-                       __pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
+                       _pCameraPresentationModel->SetOnVideoRecorderStopped(false);
 
                        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED)
                        {
@@ -2192,12 +1999,12 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                __pBatteryState->Show();
                        }
 
-                       AppLogDebug("Camcorder State = %d ", __pCamcorderPresentationModel->GetRecorderState());
-                       AppLogDebug("Camera State = %d ", __pCamcorderPresentationModel->GetCameraState());
+                       AppLogDebug("Camcorder State = %d ", _pCameraPresentationModel->GetRecorderState());
+                       AppLogDebug("Camera State = %d ", _pCameraPresentationModel->GetCameraState());
 
-                       if (__pCamcorderPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
+                       if (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
                        {
-                               if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_INITIALIZED)
+                               if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_INITIALIZED)
                                {
                                        ReInitialise();
                                }
@@ -2246,7 +2053,7 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                pCameraApp->SetFrameEnabled(true);
                        }
 
-                       isInitCameraStaus = __pCamcorderPresentationModel->GetInitCameraStatus();
+                       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
                        AppLogDebug("isInitCameraStaus = %d", isInitCameraStaus);
 
                        if (isInitCameraStaus == false)
@@ -2261,9 +2068,9 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                __pCancelPopup = null;
                        }
 
-                       __pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
+                       _pCameraPresentationModel->SetOnVideoRecorderStopped(false);
 
-                       if (__pCamcorderPresentationModel->IsCameraPoweredOn())
+                       if (_pCameraPresentationModel->IsCameraPoweredOn())
                        {
                                AppLogDebug("CAMERA_ACTION_EVENT_FRAME_ACTIVATED && CameraPoweredOn");
 
@@ -2275,23 +2082,23 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                }
 
 
-                               if (__pCamcorderPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
+                               if (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
                                {
-                                       if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_INITIALIZED)
+                                       if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_INITIALIZED)
                                        {
                                                ReInitialise();
                                        }
                                }
 
-                               if (__pCamcorderPresentationModel->GetStartPreviewException() &&
-                                               __pCamcorderPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW )
+                               if (_pCameraPresentationModel->GetStartPreviewException() &&
+                                               _pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW )
                                {
                                        ReInitialise();
-                                       __pCamcorderPresentationModel->SetStartPreviewException(false);
+                                       _pCameraPresentationModel->SetStartPreviewException(false);
                                }
 
-                               batteryLevel = __pCamcorderPresentationModel->GetBatteryLevel();
-                               isCharging = __pCamcorderPresentationModel->IsCharging();
+                               batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                               isCharging = _pCameraPresentationModel->IsCharging();
 
                                AppLogDebug("batteryLevel = %d", batteryLevel);
                                if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
@@ -2310,8 +2117,8 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                        GetCameraToForeground();
                                }
 
-                               batteryLevel = __pCamcorderPresentationModel->GetBatteryLevel();
-                               isCharging = __pCamcorderPresentationModel->IsCharging();
+                               batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                               isCharging = _pCameraPresentationModel->IsCharging();
 
                                AppLogDebug("batteryLevel = %d", batteryLevel);
                                if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
@@ -2342,7 +2149,7 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        AppLogDebug("CAMERA_ACTION_EVENT_FRAME_DEACTIVATED");
                        bool isInitCameraStaus = false;
 
-                       isInitCameraStaus = __pCamcorderPresentationModel->GetInitCameraStatus();
+                       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
                        AppLogDebug("isInitCameraStaus = %d", isInitCameraStaus);
 
                        if (isInitCameraStaus == false)
@@ -2351,7 +2158,7 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                return;
                        }
 
-                       __pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
+                       _pCameraPresentationModel->SetOnVideoRecorderStopped(false);
 
                        if (__pCancelPopup != null)
                        {
@@ -2395,7 +2202,7 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                                return;
                        }
 
-                       if (__pCamcorderPresentationModel->GetStartPreviewException())
+                       if (_pCameraPresentationModel->GetStartPreviewException())
                        {
                                ShowCameraFailPopup();
                        }
@@ -2409,8 +2216,8 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        BatteryLevel batteryLevel;
                        result r = E_SUCCESS;           
 
-                       batteryLevel = __pCamcorderPresentationModel->GetBatteryLevel();
-                       isCharging = __pCamcorderPresentationModel->IsCharging();
+                       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                       isCharging = _pCameraPresentationModel->IsCharging();
 
                        AppLogDebug("batteryLevel = %d", batteryLevel);
                        AppLogDebug("isCharging = %d", isCharging);
@@ -2420,18 +2227,18 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        {
                                if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
                                {
-                                       __pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+                                       _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
 
-                                       __pCamcorderPresentationModel->SetOnVideoRecorderStopped(false);
+                                       _pCameraPresentationModel->SetOnVideoRecorderStopped(false);
 
-                                       if (__pCamcorderPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
-                                               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
+                                       if (_pCameraPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
+                                               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
                                        )
                                        {
-                                               AppLogDebug("StopRecord::GetRecorderState() = %d", __pCamcorderPresentationModel->GetRecorderState());
+                                               AppLogDebug("StopRecord::GetRecorderState() = %d", _pCameraPresentationModel->GetRecorderState());
 
-                                               __pCamcorderPresentationModel->StopRecord();
-                                               __pCamcorderPresentationModel->UpdateContentFile();
+                                               _pCameraPresentationModel->StopRecord();
+                                               _pCameraPresentationModel->UpdateContentFile();
                                                r = TerminateApp();
                                        }
                                        else
@@ -2471,8 +2278,24 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        int requestType = 0;
                        result r = E_SUCCESS;
 
-                       requestType = __pCamcorderPresentationModel->GetAppControlRequestType();
+                       requestType = _pCameraPresentationModel->GetAppControlRequestType();
+                       if (__pCancelPopup != null)
+                       {
+                               delete  __pCancelPopup;
+                               __pCancelPopup = null;
+                               _pCameraPresentationModel->SetCancelRecord(true);
 
+                               if (_pAppTimer)
+                               {
+                               _pAppTimer->Cancel();
+                               r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                               }
+                               
+                               HideRecLabe();
+                               HideUiPanel(false);
+                               CancelRecord();                         
+                       }
+                       
                        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
                        {
                                AppLogDebug("Camera Captured after TerminateApp");
@@ -2482,19 +2305,22 @@ CamcorderForm::OnCameraActionPerformed(CameraActionEvent event)
                        }
                        else
                        {
-                               if (__isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+                               AppLogDebug("recorderstate is %d",_pCameraPresentationModel->GetRecorderState());
+                               AppLogDebug("_isRecording is %d",_isRecording);
+                               if (_isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING
+                                               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_STOPPING)
                                {
                                        HideUiAction();
 
-                                       AppLogDebug("__isRecording");
+                                       AppLogDebug("_isRecording");
 
                                        __doRecording = false;
 
-                                       __isRecordingPause = false;
+                                       _isRecordingPause = false;
 
                                        __setTimerInterval = false;
 
-                                       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
+                                       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
                                        StopRecord();
 
@@ -2677,7 +2503,7 @@ CamcorderForm::InitSettingMenuPanel(void)
        r = UpdateUiPanelIcon();
        //TryCatch(r == E_SUCCESS, r = E_SYSTEM, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
 
-       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
+       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
        AppLogDebug("GetMediaCapability [%s]", GetErrorMessage(r));
        if (cameraCount > SUPPORTED_CAMERA_NUM)
        {
@@ -2717,12 +2543,12 @@ CamcorderForm::UpdateUiPanelIcon(void)
        bool value = false;
        ImageRotationType rotationType = IMAGE_ROTATION_0;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
-               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
+               r = _pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
 
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -2755,11 +2581,11 @@ CamcorderForm::UpdateUiPanelIcon(void)
        }
        else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                if (value == true && r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
+                       r = _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
 
                        switch (flashMode)
@@ -2866,7 +2692,7 @@ CamcorderForm::UpdateUiPanelIcon(void)
                }
                else
                {
-                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
+                       r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -3041,11 +2867,11 @@ CamcorderForm::UpdateUiPanelIcon(void)
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
        }
 
        if (r == E_SUCCESS)
@@ -3137,7 +2963,7 @@ CamcorderForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Gra
        result r = E_SUCCESS;
        String controlName = "L";
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnTouchPressed >> TerminateApp Execution");
                return;
@@ -3149,11 +2975,11 @@ CamcorderForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Gra
 
        if (__pCameraInfoPanel->GetDrawExposure() == true)
        {
-               TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-               __pExposureCloseTimer->Cancel();
+               TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+               _pExposureCloseTimer->Cancel();
 
-               r = __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
-               TryReturnVoid(r == E_SUCCESS, "__pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
+               r = _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+               TryReturnVoid(r == E_SUCCESS, "_pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
        }
        AppLogDebug("EXIT");
 }
@@ -3165,16 +2991,16 @@ CamcorderForm::OnTouchModeSwitch(void)
        bool onVideoRecorderStopped = false;
        result r = E_SUCCESS;
 
-       if (__pCamcorderPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW)
+       if (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW)
        {
-               if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+               if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
                {
                        AppLogDebug("Return Camera transform");
                        return;
                }
                else
                {
-                       onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
+                       onVideoRecorderStopped = _pCameraPresentationModel->GetOnVideoRecorderStopped();
                        AppLogDebug("pSceneManager->GoForward : onVideoRecorderStopped = %d", onVideoRecorderStopped);
 
                        if (onVideoRecorderStopped == false)
@@ -3184,7 +3010,7 @@ CamcorderForm::OnTouchModeSwitch(void)
 
                                AppLogDebug("IDA_BUTTON_CAMCORDER_MODE");
 
-                               r = __pCamcorderPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+                               r = _pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
                                TryReturnVoid(r == E_SUCCESS, "Reg setvalue fail[%s]", GetErrorMessage(r));
 
                                EndRecordTimer();
@@ -3216,24 +3042,24 @@ CamcorderForm::OnTouchDrawExposure(const Tizen::Graphics::Point& currentPosition
                || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
        {
                r = DrawExposureSlider(currentPosition, DRAW_RELEASED);
-               __closeTimerValue = 0;
+               _closeTimerValue = 0;
 
-               TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-               __pExposureCloseTimer->Cancel();
+               TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+               _pExposureCloseTimer->Cancel();
 
-               r = __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
-               TryReturnVoid(r == E_SUCCESS, "__pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
+               r = _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+               TryReturnVoid(r == E_SUCCESS, "_pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
        }
        else
        {
                r = DrawExposureSlider(currentPosition, DRAW_RELEASED);
-               __closeTimerValue = 0;
+               _closeTimerValue = 0;
 
-               TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-               __pExposureCloseTimer->Cancel();
+               TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+               _pExposureCloseTimer->Cancel();
 
-               r = __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
-               TryReturnVoid(r == E_SUCCESS, "__pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
+               r = _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+               TryReturnVoid(r == E_SUCCESS, "_pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
        }
        AppLogDebug("EXIT");
 }
@@ -3309,27 +3135,27 @@ CamcorderForm::DoRecording(void)
 
        HideUiAction();
 
-       __pCamcorderPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
-       AppLogDebug("Camcorder State = %d ", __pCamcorderPresentationModel->GetRecorderState());
+       AppLogDebug("Camcorder State = %d ", _pCameraPresentationModel->GetRecorderState());
 
-       if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_INITIALIZED
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_OPENED
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_CLOSED
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_STOPPED
+       if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_INITIALIZED
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_OPENED
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_CLOSED
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_STOPPED
        )
        {
-               __pCamcorderPresentationModel->SetFocusMode(CAMERA_FOCUS_MODE_NONE);
+               _pCameraPresentationModel->SetFocusMode(CAMERA_FOCUS_MODE_NONE);
 
-               if (__pChargingTimer)
+               if (_pChargingTimer)
                {
-                       __pChargingTimer->Cancel();
+                       _pChargingTimer->Cancel();
                }
 
                __doRecording = true;
 
-               __isRecordingPause = false;
+               _isRecordingPause = false;
 
                __pBatteryState->SetShowState(false);
                __pBatteryState->Draw();
@@ -3343,7 +3169,7 @@ CamcorderForm::DoRecording(void)
 
                HidePopup();
 
-               onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
+               onVideoRecorderStopped = _pCameraPresentationModel->GetOnVideoRecorderStopped();
 
                if (onVideoRecorderStopped == false)
                {
@@ -3356,7 +3182,7 @@ CamcorderForm::DoRecording(void)
        }
        else
        {
-               onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
+               onVideoRecorderStopped = _pCameraPresentationModel->GetOnVideoRecorderStopped();
 
                if (onVideoRecorderStopped == true)
                {
@@ -3372,15 +3198,15 @@ CamcorderForm::DoStopRecording(void)
        AppLogDebug("ENTER");
        HideUiAction();
 
-       __pCamcorderPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
        __doRecording = false;
 
-       __isRecordingPause = false;
+       _isRecordingPause = false;
 
        __setTimerInterval = false;
 
-       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
        HideRecLabe();
 
@@ -3390,7 +3216,7 @@ CamcorderForm::DoStopRecording(void)
 
        StartInitChargingTimer();
 
-       __pCamcorderPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
        AppLogDebug("EXIT");
 }
 
@@ -3402,19 +3228,19 @@ CamcorderForm::OnTouchLaunchImageview(void)
        int storageCardChageState = CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN;
        String fullFileName = L"";
 
-       if (__pCamcorderPresentationModel->GetLatestThumbnail() != null)
+       if (_pCameraPresentationModel->GetLatestThumbnail() != null)
        {
-               onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
+               onVideoRecorderStopped = _pCameraPresentationModel->GetOnVideoRecorderStopped();
 
-               storageCardChageState = __pCamcorderPresentationModel->GetStorageCardChageState();
+               storageCardChageState = _pCameraPresentationModel->GetStorageCardChageState();
                if (storageCardChageState == CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_MOUNT_TO_UNMOUNT)
                {
                        AppLogDebug("MOUNT_TO_UNMOUNT : Don't LaunchImageview");
-                       __pCamcorderPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+                       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
                        if (onVideoRecorderStopped == false)
                        {
-                               fullFileName = __pCamcorderPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_RECORD);
+                               fullFileName = _pCameraPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_RECORD);
 
                                if (fullFileName == L"")
                                {
@@ -3431,11 +3257,11 @@ CamcorderForm::OnTouchLaunchImageview(void)
                else
                {
                        AppLogDebug("LaunchImageview");
-                       __pCamcorderPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+                       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
                        if (onVideoRecorderStopped == false)
                        {
-                               fullFileName = __pCamcorderPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_RECORD);
+                               fullFileName = _pCameraPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_RECORD);
 
                                if (fullFileName == L"")
                                {
@@ -3463,7 +3289,7 @@ CamcorderForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Gr
        int checkActivePanel = -1;
        bool doHidePopup = false;
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnTouchReleased >> TerminateApp Execution");
                return;
@@ -3475,11 +3301,11 @@ CamcorderForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Gr
        {
                if (source.Equals(*__pRecordButton) == true)
                {
-                       __closeTimerValue = 0;
+                       _closeTimerValue = 0;
 
-                       if (__pExposureCloseTimer)
+                       if (_pExposureCloseTimer)
                        {
-                               __pExposureCloseTimer->Cancel();
+                               _pExposureCloseTimer->Cancel();
                        }
 
                        __pCameraInfoPanel->SetDrawExposure(false);
@@ -3499,7 +3325,7 @@ CamcorderForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Gr
 
        if ((doHidePopup == false) && (__pCameraInfoPanel->GetDrawExposure() == false))
        {
-               if ((controlName.Equals(String(IDS_CAMERA_INFO_PANEL_NAME))) && (__pCamcorderPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
+               if ((controlName.Equals(String(IDS_CAMERA_INFO_PANEL_NAME))) && (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
                {
                        DrawTouchAutoFocus(currentPosition);
                }
@@ -3544,12 +3370,12 @@ CamcorderForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Gr
 
        if ((controlName.Equals(String(IDS_RECORDE_BUTTON_NAME)))&&(source.Equals(*__pRecordButton) == true))
        {
-               AppLogDebug("Camera State = %d ", __pCamcorderPresentationModel->GetCameraState());
+               AppLogDebug("Camera State = %d ", _pCameraPresentationModel->GetCameraState());
 
-               if (__isRecording == false)
+               if (_isRecording == false)
                {
-                       if (__pCamcorderPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW
-                               && __pCamcorderPresentationModel->GetCameraState() != CAMERA_STATE_AUTO_FOCUSING
+                       if (_pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW
+                               && _pCameraPresentationModel->GetCameraState() != CAMERA_STATE_AUTO_FOCUSING
                        )               
                        {
                                AppLogDebug("It is trying to start the recording ");
@@ -3579,7 +3405,7 @@ CamcorderForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Gr
        if (controlName.Equals(String(IDS_THUMBNAIL_PANLE_NAME))
                && __pThumbnailPanel->GetShowState() == true
                && (GetAppLaunchType() != APP_LAUNCH_TYPE_REQUESET)
-               && __pCamcorderPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING
+               && _pCameraPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING
        )
        {
                if (source.Equals(*__pThumbnailPanel) == true)
@@ -3598,7 +3424,7 @@ CamcorderForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graph
        String controlName = L"";
        result r = E_SUCCESS;
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnTouchMoved >> TerminateApp Execution");
                return;
@@ -3620,10 +3446,10 @@ CamcorderForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graph
                {
                r = DrawExposureSlider(currentPosition, DRAW_MOVED);
                TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
-               __closeTimerValue = 0;
+               _closeTimerValue = 0;
 
-               TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-               __pExposureCloseTimer->Cancel();
+               TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+               _pExposureCloseTimer->Cancel();
                }
        }
        AppLogDebug("EXIT");
@@ -3636,13 +3462,14 @@ CamcorderForm::OnAppTimerExpired(void)
        CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
        result r = E_SUCCESS;
 
-       AppLogDebug("__pAppTimer expire");
+       AppLogDebug("_pAppTimer expire");
 
+       EndRecordTimer();
        DeleteTimer();
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __pCamcorderPresentationModel->StopCamera();
+       _pCameraPresentationModel->StopCamera();
 
        r = SendAppControlResult(pCameraApp->GetRequestId());
        TryReturnVoid(r == E_SUCCESS, "SendAppControlResult [%s]", GetErrorMessage(r));
@@ -3655,7 +3482,7 @@ CamcorderForm::OnSettingTimerExpired(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       __pIntervalValueTimer->Cancel();
+       _pIntervalValueTimer->Cancel();
 
        __pCameraInfoPanel->SetDrawPopupTimerUpdate(false);
 
@@ -3667,12 +3494,12 @@ CamcorderForm::OnSettingTimerExpired(void)
 
        __pCameraInfoPanel->Invalidate(true);
 
-       __isRecording = true;
+       _isRecording = true;
 
        __setTimerInterval = false;
-       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
-       __pCamcorderPresentationModel->StartRecord();
+       _pCameraPresentationModel->StartRecord();
 
        r = StartRecordTimer();
        TryReturnVoid(r == E_SUCCESS, "StartRecordTimer() fail[%s]", GetErrorMessage(r));
@@ -3688,12 +3515,12 @@ void
 CamcorderForm::OnHelpCloseTimerExpired(void)
 {
        AppLogDebug("ENTER");
-       if (__pHelpCloseTimer)
+       if (_pHelpCloseTimer)
        {
-               __pHelpCloseTimer->Cancel();
+               _pHelpCloseTimer->Cancel();
 
-               delete __pHelpCloseTimer;
-               __pHelpCloseTimer = null;
+               delete _pHelpCloseTimer;
+               _pHelpCloseTimer = null;
        }
 
        __pHelpGoToGallery->SetShowState(false);
@@ -3717,19 +3544,19 @@ void
 CamcorderForm::OnPopupTimerExpired(void)
 {
        AppLogDebug("ENTER");
-       if (__isRecording != true)
+       if (_isRecording != true)
        {
-               __timeCount--;
+               _timeCount--;
 
                __pCameraInfoPanel->SetDrawPopupTimerUpdate(true);
 
-               __pCameraInfoPanel->SetDrawPopupTimerCount(__timeCount);
+               __pCameraInfoPanel->SetDrawPopupTimerCount(_timeCount);
 
                __pCameraInfoPanel->Invalidate(true);
 
-               AppLogDebug("__timeCount=%d", __timeCount);
+               AppLogDebug("_timeCount=%d", _timeCount);
 
-               if (__timeCount == INDEX_UNIT_ZERO || __timeCount == INDEX_UNIT_ONE)
+               if (_timeCount == INDEX_UNIT_ZERO || _timeCount == INDEX_UNIT_ONE)
                {
                        StopPopupTimer();
                }
@@ -3743,13 +3570,13 @@ CamcorderForm::OnRecordTimerExpired(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       if (__isRecording == true)
+       if (_isRecording == true)
        {
                __recordTimeCount++;
 
                AppLogDebug("__pRecordTimer expire");
 
-               __recordingMaxTime = __pCamcorderPresentationModel->GetMaxRecordingTime();
+               __recordingMaxTime = _pCameraPresentationModel->GetMaxRecordingTime();
 
                r = DrawRecord(true);
                TryReturnVoid(r == E_SUCCESS, "DrawRecord() fail[%s]", GetErrorMessage(r));
@@ -3764,11 +3591,11 @@ void
 CamcorderForm::OnExposureCloseTimerExpired(void)
 {
        AppLogDebug("ENTER");
-       __closeTimerValue++;
+       _closeTimerValue++;
 
-       AppLogDebug("__closeTimerValue expire %d", __closeTimerValue);
+       AppLogDebug("_closeTimerValue expire %d", _closeTimerValue);
 
-       if (__closeTimerValue == EXPOSURE_TIMER_IS_ALIVE)
+       if (_closeTimerValue == EXPOSURE_TIMER_IS_ALIVE)
        {
                if (__pCameraInfoPanel->GetDrawExposure() == true)
                {
@@ -3778,9 +3605,9 @@ CamcorderForm::OnExposureCloseTimerExpired(void)
                        Invalidate(true);
                }
 
-               __closeTimerValue = 0;
+               _closeTimerValue = 0;
 
-               __pExposureCloseTimer->Cancel();
+               _pExposureCloseTimer->Cancel();
        }
        AppLogDebug("EXIT");
 }
@@ -3817,9 +3644,9 @@ CamcorderForm::OnChargingCompletedTimerExpired(void)
                __pBatteryState->SetPosition(X_INDICATOR_BATTERY_LANDSCAPE, Y_INDICATOR_BATTERY_LANDSCAPE);
        }
 
-       __chargingCount++;
+       _chargingCount++;
 
-       if (__chargingCount % DIVIDE_BY_TWO)
+       if (_chargingCount % DIVIDE_BY_TWO)
        {
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_20);
        }
@@ -3829,18 +3656,18 @@ CamcorderForm::OnChargingCompletedTimerExpired(void)
        }
        TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
 
-       if (__chargingCount >= BATTERY_STATE_20)
+       if (_chargingCount >= BATTERY_STATE_20)
        {
-               __chargingCount = INDEX_UNIT_ZERO;
+               _chargingCount = INDEX_UNIT_ZERO;
        }
 
-       __blinkCount++;
+       _blinkCount++;
        __pBatteryState->SetBackgroundBitmap(*pBitmap);
        __pBatteryState->Invalidate(true);
 
        AppLogDebug("__batteryStatus = %d", __batteryStatus);
-       AppLogDebug("__chargingCount = %d", __chargingCount);
-       AppLogDebug("__blinkCount = %d", __blinkCount);
+       AppLogDebug("_chargingCount = %d", _chargingCount);
+       AppLogDebug("_blinkCount = %d", _blinkCount);
 
        delete pBitmap;
        pBitmap = null;
@@ -3876,28 +3703,28 @@ CamcorderForm::OnChargingTimerExpired(void)
 
        AppLogDebug("batteryLevel = %d", batteryLevel);
 
-       __chargingCount++;
+       _chargingCount++;
 
        AppLogDebug("__batteryStatus = %d", __batteryStatus);
-       AppLogDebug("__chargingCount = %d", __chargingCount);
+       AppLogDebug("_chargingCount = %d", _chargingCount);
 
-       if ((__batteryStatus == BATTERY_STATE_0 || __batteryStatus == BATTERY_STATE_1) && __chargingCount == INDEX_UNIT_ONE)
+       if ((__batteryStatus == BATTERY_STATE_0 || __batteryStatus == BATTERY_STATE_1) && _chargingCount == INDEX_UNIT_ONE)
        {
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_LOW);
        }
        else
        {
-               pBitmap = ResourceManager::GetBitmapN(__batteryStatus + __chargingCount);
+               pBitmap = ResourceManager::GetBitmapN(__batteryStatus + _chargingCount);
        }
        TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
 
-       maxChargingCnt = (static_cast<int>(__batteryStatus)) + __chargingCount;
+       maxChargingCnt = (static_cast<int>(__batteryStatus)) + _chargingCount;
 
        AppLogDebug("maxCount = %d", maxChargingCnt);
 
        if (maxChargingCnt >= BATTERY_STATE_20)
        {
-               __chargingCount = INDEX_UNIT_ZERO;
+               _chargingCount = INDEX_UNIT_ZERO;
        }
 
        __pBatteryState->SetBackgroundBitmap(*pBitmap);
@@ -3924,10 +3751,10 @@ CamcorderForm::OnMakerFocusTimerExpired(void)
 
        __pCameraInfoPanel->Invalidate(true);
 
-       r = __pMakerFocusTimer->Cancel();
+       r = _pMakerFocusTimer->Cancel();
 
-       delete __pMakerFocusTimer;
-       __pMakerFocusTimer = null;
+       delete _pMakerFocusTimer;
+       _pMakerFocusTimer = null;
        AppLogDebug("EXIT");
 }
 
@@ -3935,21 +3762,21 @@ void
 CamcorderForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
 {
        AppLogDebug("ENTER");
-       if (timer.Equals(*__pAppTimer))
+       if (timer.Equals(*_pAppTimer))
        {
-               AppLogDebug("__pAppTimer");
+               AppLogDebug("_pAppTimer");
                OnAppTimerExpired();
        }
-       else if (timer.Equals(*__pIntervalValueTimer))
+       else if (timer.Equals(*_pIntervalValueTimer))
        {
-               AppLogDebug("__pIntervalValueTimer");
+               AppLogDebug("_pIntervalValueTimer");
 
                OnSettingTimerExpired();
                StartInitChargingTimer();
        }
-       else if (timer.Equals(*__pPopupTimer))
+       else if (timer.Equals(*_pPopupTimer))
        {
-               AppLogDebug("__pPopupTimer");
+               AppLogDebug("_pPopupTimer");
                OnPopupTimerExpired();
        }
        else if (timer.Equals(*__pRecordTimer))
@@ -3963,41 +3790,41 @@ CamcorderForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                __pRecordButton->SetShowState(true);
                __pRecordButton->Invalidate(true);
        }
-       else if (timer.Equals(*__pExposureCloseTimer))
+       else if (timer.Equals(*_pExposureCloseTimer))
        {
-               AppLogDebug("__pExposureCloseTimer");
+               AppLogDebug("_pExposureCloseTimer");
                OnExposureCloseTimerExpired();
        }
-       else if (timer.Equals(*__pMakerFocusTimer))
+       else if (timer.Equals(*_pMakerFocusTimer))
        {
-               AppLogDebug("__pMakerFocusTimer");
+               AppLogDebug("_pMakerFocusTimer");
                OnMakerFocusTimerExpired();
        }
-       else if (timer.Equals(*__pHelpCloseTimer))
+       else if (timer.Equals(*_pHelpCloseTimer))
        {
                AppLogDebug("__pHelpCloseTimer");
                OnHelpCloseTimerExpired();
        }
-       else if (timer.Equals(*__pChargingTimer))
+       else if (timer.Equals(*_pChargingTimer))
        {
                result r = E_SUCCESS;
-               AppLogDebug("__pChargingTimer");
+               AppLogDebug("_pChargingTimer");
                bool isCharging = false;
 
                __batteryStatus = GetCurrentBatteryState();
                AppLogDebug("__batteryStatus = %d", __batteryStatus);
 
-               isCharging = __pCamcorderPresentationModel->IsCharging();
+               isCharging = _pCameraPresentationModel->IsCharging();
 
                if (isCharging)
                {
                        if (__batteryStatus == BATTERY_STATE_20)
                        {
-                               __chargingCount = INDEX_UNIT_ZERO;
+                               _chargingCount = INDEX_UNIT_ZERO;
 
-                               __blinkCount = INDEX_UNIT_ZERO;
+                               _blinkCount = INDEX_UNIT_ZERO;
 
-                               __pChargingTimer->Cancel();
+                               _pChargingTimer->Cancel();
 
                                StartInitChargingCompletedTimer();
                        }
@@ -4008,42 +3835,42 @@ CamcorderForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                }
                else
                {
-                       __chargingCount = 0;
+                       _chargingCount = 0;
 
-                       __blinkCount = INDEX_UNIT_ZERO;
+                       _blinkCount = INDEX_UNIT_ZERO;
 
-                       __pChargingTimer->Cancel();
+                       _pChargingTimer->Cancel();
 
                        if (__batteryStatus == BATTERY_STATE_20)
                        {
-                               AppLogDebug("__pChargingTimer -> __pChargingCompletedTimer");
+                               AppLogDebug("_pChargingTimer -> __pChargingCompletedTimer");
 
                                StartInitChargingCompletedTimer();
                        }
                }
        }
-       else if (timer.Equals(*__pChargingCompletedTimer))
+       else if (timer.Equals(*_pChargingCompletedTimer))
        {
                result r = E_SUCCESS;
                AppLogDebug("__pChargingCompletedTimer");
                bool isCharging = false;
 
-               isCharging = __pCamcorderPresentationModel->IsCharging();
+               isCharging = _pCameraPresentationModel->IsCharging();
 
                __batteryStatus = GetCurrentBatteryState();
                AppLogDebug("__batteryStatus = %d", __batteryStatus);
 
                if (isCharging == false && __batteryStatus == BATTERY_STATE_20)
                {
-                       if (__blinkCount == INDEX_UNIT_TWENTY)
+                       if (_blinkCount == INDEX_UNIT_TWENTY)
                        {
                                AppLogDebug("__pChargingCompletedTimer cancel");
 
-                               __chargingCount = INDEX_UNIT_ZERO;
+                               _chargingCount = INDEX_UNIT_ZERO;
 
-                               __blinkCount = INDEX_UNIT_ZERO;
+                               _blinkCount = INDEX_UNIT_ZERO;
 
-                               __pChargingCompletedTimer->Cancel();
+                               _pChargingCompletedTimer->Cancel();
 
                                CheckBatteryStatus();
                        }
@@ -4058,21 +3885,21 @@ CamcorderForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                {
                        AppLogDebug("isCharging = true >> __pChargingCompletedTimer cancel");
 
-                       __chargingCount = INDEX_UNIT_ZERO;
+                       _chargingCount = INDEX_UNIT_ZERO;
 
-                       __blinkCount = INDEX_UNIT_ZERO;
+                       _blinkCount = INDEX_UNIT_ZERO;
 
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
 
                        CheckBatteryStatus();
                }
        }
-       else if (timer.Equals(*__pPreviewFailPopupTimer))
+       else if (timer.Equals(*_pPreviewFailPopupTimer))
        {
                AppLogDebug("__pPreviewFailPopupTimer");
-               __pPreviewFailPopupTimer->Cancel();
+               _pPreviewFailPopupTimer->Cancel();
 
-               if (__pCamcorderPresentationModel->GetStartPreviewException())
+               if (_pCameraPresentationModel->GetStartPreviewException())
                {
                        OnPreviewFailPopupTimerExpired();
                }
@@ -4189,22 +4016,22 @@ CamcorderForm::InitActionMenuPanel(void)
        {
                if (clientArea.height == DISPLAY_WVGA)
                {
-                       __pCamcorderPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
                }
                else
                {
-                       __pCamcorderPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
                }
        }
        else
        {
                if (clientArea.width == DISPLAY_WVGA)
                {
-                       __pCamcorderPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
                }
                else
                {
-                       __pCamcorderPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
                }
        }
        __pActionPanel->AddTouchEventListener(*this);
@@ -4281,7 +4108,7 @@ CamcorderForm::InitActionMenuPanel(void)
        __pRecordButton->SetName(IDS_RECORDE_BUTTON_NAME);
        __pRecordButton->AddTouchEventListener(*this);
 
-       AppLogDebug("GetDisplayResolutionType = %d", __pCamcorderPresentationModel->GetDisplayResolutionType());
+       AppLogDebug("GetDisplayResolutionType = %d", _pCameraPresentationModel->GetDisplayResolutionType());
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT_REVERSE
                || __dir == ORIENTATION_STATUS_PORTRAIT)
@@ -4361,7 +4188,7 @@ CamcorderForm::UpdateUiActionPanelIcon(void)
                ptModeChangeButton = Point(X_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_LANDSCAPE, Y_ACTION_PANEL_CAMERA_CAMCODER_BUTTON_LANDSCAPE);
        }
 
-       AppLogDebug("GetDisplayResolutionType = %d", __pCamcorderPresentationModel->GetDisplayResolutionType());
+       AppLogDebug("GetDisplayResolutionType = %d", _pCameraPresentationModel->GetDisplayResolutionType());
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT
                || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
@@ -4560,8 +4387,8 @@ CamcorderForm::Initialize(void)
 
        Construct(L"IDL_CAMCORDER_FORM");
 
-       __pCamcorderPresentationModel = CameraPresentationModel::GetInstance();
-       TryCatch(__pCamcorderPresentationModel != null, r = E_SYSTEM, "__pCamcorderPresentationModel is null");
+       _pCameraPresentationModel = CameraPresentationModel::GetInstance();
+       TryCatch(_pCameraPresentationModel != null, r = E_SYSTEM, "_pCameraPresentationModel is null");
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -4574,8 +4401,8 @@ void
 CamcorderForm::InitAppTimer(void)
 {
        AppLogDebug("ENTER");
-       __pAppTimer = new (std::nothrow) Timer();
-       __pAppTimer->Construct(*this);
+       _pAppTimer = new (std::nothrow) Timer();
+       _pAppTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4583,8 +4410,8 @@ void
 CamcorderForm::InitChargingTimer(void)
 {
        AppLogDebug("ENTER");
-       __pChargingTimer = new (std::nothrow) Timer();
-       __pChargingTimer->Construct(*this);
+       _pChargingTimer = new (std::nothrow) Timer();
+       _pChargingTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4592,8 +4419,8 @@ void
 CamcorderForm::InitChargingCompletedTimer(void)
 {
        AppLogDebug("ENTER");
-       __pChargingCompletedTimer = new (std::nothrow) Timer();
-       __pChargingCompletedTimer->Construct(*this);
+       _pChargingCompletedTimer = new (std::nothrow) Timer();
+       _pChargingCompletedTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4601,8 +4428,8 @@ void
 CamcorderForm::InitPreviewFailPopupTimer(void)
 {
        AppLogDebug("ENTER");
-       __pPreviewFailPopupTimer = new (std::nothrow) Timer();
-       __pPreviewFailPopupTimer->Construct(*this);
+       _pPreviewFailPopupTimer = new (std::nothrow) Timer();
+       _pPreviewFailPopupTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4610,8 +4437,8 @@ void
 CamcorderForm::InitMakerFocusTimer(void)
 {
        AppLogDebug("ENTER");
-       __pMakerFocusTimer = new (std::nothrow) Timer();
-       __pMakerFocusTimer->Construct(*this);
+       _pMakerFocusTimer = new (std::nothrow) Timer();
+       _pMakerFocusTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4619,8 +4446,8 @@ void
 CamcorderForm::InitSettingTimer(void)
 {
        AppLogDebug("ENTER");
-       __pIntervalValueTimer = new (std::nothrow) Timer();
-       __pIntervalValueTimer->Construct(*this);
+       _pIntervalValueTimer = new (std::nothrow) Timer();
+       _pIntervalValueTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4631,25 +4458,25 @@ CamcorderForm::StartInitChargingTimer(void)
        result r = E_SUCCESS;
        bool isCharging = false;
 
-       isCharging = __pCamcorderPresentationModel->IsCharging();
+       isCharging = _pCameraPresentationModel->IsCharging();
 
-       __chargingCount = 0;
+       _chargingCount = 0;
 
        if (isCharging)
        {
-               if (__pChargingTimer)
+               if (_pChargingTimer)
                {
-                       __pChargingTimer->Cancel();
+                       _pChargingTimer->Cancel();
 
-                       r = __pChargingTimer->StartAsRepeatable(CAMCORDER_CHARGING_TIMER);
-                       TryReturnVoid(r == E_SUCCESS, "__pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
+                       r = _pChargingTimer->StartAsRepeatable(CAMCORDER_CHARGING_TIMER);
+                       TryReturnVoid(r == E_SUCCESS, "_pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               if (__pChargingTimer)
+               if (_pChargingTimer)
                {
-                       __pChargingTimer->Cancel();
+                       _pChargingTimer->Cancel();
                }
        }
        AppLogDebug("EXIT");
@@ -4661,15 +4488,15 @@ CamcorderForm::StartInitAppTimer(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       TryReturnVoid(__pCamcorderPresentationModel != null, "__pCamcorderPresentationModel is null");
-       if (__pCamcorderPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING)
+       TryReturnVoid(_pCameraPresentationModel != null, "_pCameraPresentationModel is null");
+       if (_pCameraPresentationModel->GetRecorderState() != RECORDER_STATE_RECORDING)
        {
-               AppLogDebug("StartInitAppTimer : RecorderState() = %d", __pCamcorderPresentationModel->GetRecorderState());
+               AppLogDebug("StartInitAppTimer : RecorderState() = %d", _pCameraPresentationModel->GetRecorderState());
 
-               TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-               __pAppTimer->Cancel();
+               TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+               r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
                TryReturnVoid(r == E_SUCCESS, "Timer::Start() fail[%s]", GetErrorMessage(r));
        }
        AppLogDebug("EXIT");
@@ -4681,11 +4508,11 @@ CamcorderForm::StartPreviewFailPopupTimer(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       TryReturnVoid(__pPreviewFailPopupTimer != null, "__pPreviewFailPopupTimer is null");
+       TryReturnVoid(_pPreviewFailPopupTimer != null, "__pPreviewFailPopupTimer is null");
 
-       __pPreviewFailPopupTimer->Cancel();
+       _pPreviewFailPopupTimer->Cancel();
 
-       r = __pPreviewFailPopupTimer->Start(PREVIEW_FAIL_TIMER);
+       r = _pPreviewFailPopupTimer->Start(PREVIEW_FAIL_TIMER);
        TryReturnVoid(r == E_SUCCESS, "__pPreviewFailPopupTimer::Start() fail[%s]", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
@@ -4697,51 +4524,51 @@ CamcorderForm::StartInitChargingCompletedTimer(void)
        result r = E_SUCCESS;
        bool isCharging = false;
 
-       TryReturnVoid(__pChargingCompletedTimer != null, "__pChargingCompletedTimer is null");
+       TryReturnVoid(_pChargingCompletedTimer != null, "__pChargingCompletedTimer is null");
 
-       isCharging = __pCamcorderPresentationModel->IsCharging();
+       isCharging = _pCameraPresentationModel->IsCharging();
 
        __batteryStatus = GetCurrentBatteryState();
        AppLogDebug("__batteryStatus = %d" , __batteryStatus);
 
        if (isCharging && __batteryStatus == BATTERY_STATE_20)
        {
-               if (__pChargingCompletedTimer)
+               if (_pChargingCompletedTimer)
                {
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
                }
 
-               __chargingCount = 0;
+               _chargingCount = 0;
 
-               __blinkCount = 0;
+               _blinkCount = 0;
 
                r = DrawBatteryLevelFull();
-               TryReturnVoid(r == E_SUCCESS, "__pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
+               TryReturnVoid(r == E_SUCCESS, "_pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
 
                AppLogDebug("EXIT");
                return;
        }
-       __chargingCount = INDEX_UNIT_ZERO;
+       _chargingCount = INDEX_UNIT_ZERO;
 
        if (__batteryStatus == BATTERY_STATE_20)
        {
-               if (__pChargingCompletedTimer)
+               if (_pChargingCompletedTimer)
                {
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
 
-                       r = __pChargingCompletedTimer->StartAsRepeatable(CAMCORDER_TIMER_ONE_SEC);
-                       TryReturnVoid(r == E_SUCCESS, "__pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
+                       r = _pChargingCompletedTimer->StartAsRepeatable(CAMCORDER_TIMER_ONE_SEC);
+                       TryReturnVoid(r == E_SUCCESS, "_pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               if (__pChargingCompletedTimer)
+               if (_pChargingCompletedTimer)
                {
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
                }
 
-               __chargingCount = 0;
-               __blinkCount = 0;
+               _chargingCount = 0;
+               _blinkCount = 0;
 
                CheckBatteryStatus();
        }
@@ -4752,9 +4579,9 @@ void
 CamcorderForm::StopInitAppTimer(void)
 {
        AppLogDebug("ENTER");
-       if (__pAppTimer)
+       if (_pAppTimer)
        {
-               __pAppTimer->Cancel();
+               _pAppTimer->Cancel();
        }
        AppLogDebug("EXIT");
 }
@@ -4763,11 +4590,11 @@ void
 CamcorderForm::StopInitChargingTimer(void)
 {
        AppLogDebug("ENTER");
-       __chargingCount = 0;
+       _chargingCount = 0;
 
-       if (__pChargingTimer)
+       if (_pChargingTimer)
        {
-               __pChargingTimer->Cancel();
+               _pChargingTimer->Cancel();
        }
        AppLogDebug("EXIT");
 }
@@ -4856,28 +4683,28 @@ CamcorderForm::SetRecordStartTimer(int timeInterval)
 
        case SET_RECORD_START_TIMER_2_SEC:
                {
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
 
-                       r = __pIntervalValueTimer->Start(CAMCORDER_TIMER_2_SEC);
-                       TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pIntervalValueTimer->Start(CAMCORDER_TIMER_2_SEC);
+                       TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
                }
                break;
 
        case SET_RECORD_START_TIMER_5_SEC:
                {
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
 
-                       r = __pIntervalValueTimer->Start(CAMCORDER_TIMER_5_SEC);
-                       TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pIntervalValueTimer->Start(CAMCORDER_TIMER_5_SEC);
+                       TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
                }
                break;
 
        case SET_RECORD_START_TIMER_10_SEC:
                {
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
 
-                       r = __pIntervalValueTimer->Start(CAMCORDER_TIMER_10_SEC);
-                       TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pIntervalValueTimer->Start(CAMCORDER_TIMER_10_SEC);
+                       TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
                }
                break;
 
@@ -4899,123 +4726,41 @@ void
 CamcorderForm::CancelTimer(void)
 {
        AppLogDebug("ENTER");
-       if (__pAppTimer != null)
+       if (_pAppTimer != null)
        {
-               __pAppTimer->Cancel();
+               _pAppTimer->Cancel();
        }
 
-       if (__pIntervalValueTimer != null)
+       if (_pIntervalValueTimer != null)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
-       if (__pExposureCloseTimer)
+       if (_pExposureCloseTimer)
        {
-               __pExposureCloseTimer->Cancel();
+               _pExposureCloseTimer->Cancel();
        }
 
-       if (__pHelpCloseTimer)
+       if (_pHelpCloseTimer)
        {
-               __pHelpCloseTimer->Cancel();
+               _pHelpCloseTimer->Cancel();
        }
 
-       if (__pChargingCompletedTimer != null)
+       if (_pChargingCompletedTimer != null)
        {
-               __chargingCount = 0;
-               __blinkCount = 0;
-               __pChargingCompletedTimer->Cancel();
+               _chargingCount = 0;
+               _blinkCount = 0;
+               _pChargingCompletedTimer->Cancel();
        }
 
-       if (__pPreviewFailPopupTimer != null)
+       if (_pPreviewFailPopupTimer != null)
        {
-               __pPreviewFailPopupTimer->Cancel();
-       }
-       AppLogDebug("EXIT");
-}
-
-void
-CamcorderForm::DeleteTimer(void)
-{
-       AppLogDebug("ENTER");
-       EndRecordTimer();
-
-       if (__pAppTimer)
-       {
-               __pAppTimer->Cancel();
-
-               delete __pAppTimer;
-               __pAppTimer = null;
-       }
-
-       if (__pIntervalValueTimer)
-       {
-               __pIntervalValueTimer->Cancel();
-
-               delete __pIntervalValueTimer;
-               __pIntervalValueTimer = null;
-       }
-
-       if (__pPopupTimer)
-       {
-               __pPopupTimer->Cancel();
-
-               delete __pPopupTimer;
-               __pPopupTimer = null;
-       }
-
-       if (__pExposureCloseTimer)
-       {
-               __pExposureCloseTimer->Cancel();
-
-               delete __pExposureCloseTimer;
-               __pExposureCloseTimer = null;
-       }
-
-       if (__pMakerFocusTimer)
-       {
-               __pMakerFocusTimer->Cancel();
-
-               delete __pMakerFocusTimer;
-               __pMakerFocusTimer = null;
-       }
-
-       if (__pHelpCloseTimer)
-       {
-               __pHelpCloseTimer->Cancel();
-
-               delete __pHelpCloseTimer;
-               __pHelpCloseTimer = null;
-       }
-
-       if (__pChargingTimer)
-       {
-               __pChargingTimer->Cancel();
-
-               delete __pChargingTimer;
-               __pChargingTimer = null;
-       }
-
-       if (__pChargingCompletedTimer != null)
-       {
-               __chargingCount = 0;
-               __blinkCount = 0;
-               __pChargingCompletedTimer->Cancel();
-
-               delete __pChargingTimer;
-               __pChargingTimer = null;
-       }
-
-       if (__pPreviewFailPopupTimer != null)
-       {
-               __pPreviewFailPopupTimer->Cancel();
-
-               delete __pPreviewFailPopupTimer;
-               __pPreviewFailPopupTimer = null;
+               _pPreviewFailPopupTimer->Cancel();
        }
        AppLogDebug("EXIT");
 }
@@ -5052,7 +4797,7 @@ CamcorderForm::MakeRecordingResolutionList(bool remakeList = false)
                r = __pRecordingResolutionList->Construct();
                TryCatch(r == E_SUCCESS, , "__pRecordingResolutionList construct fail[%s]", GetErrorMessage(r));
 
-               pTempList = __pCamcorderPresentationModel->GetRecordingResolutionList();
+               pTempList = _pCameraPresentationModel->GetRecordingResolutionList();
                TryCatch(pTempList != null, , "GetRecordingResolutionList() return null");
 
                tot = pTempList->GetCount();
@@ -5368,27 +5113,6 @@ CamcorderForm::GetItemCount(void)
        return 0;
 }
 
-void
-CamcorderForm::OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
-{
-       AppLogDebug("ENTER OnKeyPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-       AppLogDebug("EXIT");
-}
-
-void
-CamcorderForm::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
-{
-       AppLogDebug("ENTER OnKeyReleased Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-       AppLogDebug("EXIT");
-}
-
-void
-CamcorderForm::OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
-{
-       AppLogDebug("ENTER OnKeyLongPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-       AppLogDebug("EXIT");
-}
-
 int
 CamcorderForm::GetTimerIntervalValue(void) const
 {
@@ -5396,7 +5120,7 @@ CamcorderForm::GetTimerIntervalValue(void) const
        result r = E_SUCCESS;
        int timerInterval = 0;
 
-       r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
+       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
        TryCatch(r == E_SUCCESS, , "Faled to get value to registry");
 
        AppLogDebug("EXIT");
@@ -5412,43 +5136,11 @@ CamcorderForm::SetGuideLine(int guideLineEnable)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       r = __pCamcorderPresentationModel->SetValue(GUIDELINE_ENABLE, guideLineEnable);
+       r = _pCameraPresentationModel->SetValue(GUIDELINE_ENABLE, guideLineEnable);
        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
 
-void
-CamcorderForm::SetStorageType(int storageType)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       if (storageType == STORAGE_TYPE_PHONE)
-       {
-               r = __pCamcorderPresentationModel->SetValue(STORAGE_TYPE, storageType);
-               TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
-
-               __pCamcorderPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
-       }
-       else if (storageType == STORAGE_TYPE_MEMORYCARD)
-       {
-               if (__pCamcorderPresentationModel->IsStorageCardMounted() == true)
-               {
-                       AppLogDebug("StorageCard mount");
-
-                       r = __pCamcorderPresentationModel->SetValue(STORAGE_TYPE, storageType);
-                       TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
-
-                       __pCamcorderPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_MOUNT);
-               }
-               else
-               {
-                       AppLogDebug("StorageCard unmount");
-                       __pCamcorderPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
-               }
-       }
-       AppLogDebug("EXIT");
-}
-
 result
 CamcorderForm::RestoreDefaultSetting(void)
 {
@@ -5459,67 +5151,67 @@ CamcorderForm::RestoreDefaultSetting(void)
        bool brighnesstValue = false;
        int adjustValue = 0;
 
-       r = __pCamcorderPresentationModel->ResetCameraSettingsRegistry( );
+       r = _pCameraPresentationModel->ResetCameraSettingsRegistry( );
        TryCatch(r == E_SUCCESS, , "ResetCameraSettingsRegistry() fail[%s]", GetErrorMessage(r));
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
        }
 
        if (exposureValue == true && r == E_SUCCESS)
        {
-               r = __pCamcorderPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
+               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                AppLogDebug("adjustValue = %d", adjustValue);
 
-               __pCamcorderPresentationModel->SetExposure(adjustValue);
+               _pCameraPresentationModel->SetExposure(adjustValue);
        }
        else
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
                else
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
 
                if (brighnesstValue == true && r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
+                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        AppLogDebug("adjustValue = %d", adjustValue);
 
-                       __pCamcorderPresentationModel->SetBrightness(adjustValue);
+                       _pCameraPresentationModel->SetBrightness(adjustValue);
                }
        }
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
                if (r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, adjustValue);
+                       r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, adjustValue);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
                if (r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, adjustValue);
+                       r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, adjustValue);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                }
        }
@@ -5528,7 +5220,7 @@ CamcorderForm::RestoreDefaultSetting(void)
        {
                AppLogDebug("adjustValue = %d", adjustValue);
 
-               __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
+               _pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
        }
 
        AppLogDebug("EXIT");
@@ -5580,7 +5272,7 @@ CamcorderForm::DrawFocus(int focusMode)
        int selfPortraitEnable = 0;
        bool focusSupport = false;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT
@@ -5595,11 +5287,11 @@ CamcorderForm::DrawFocus(int focusMode)
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
        }
 
        if (focusSupport == true && r == E_SUCCESS)
@@ -5635,25 +5327,25 @@ CamcorderForm::ToggleCameraDirection(int direction)
        BufferInfo bufferinfo;
        bool isInitCameraStaus = false;
 
-       if (__pAppTimer != null)
+       if (_pAppTimer != null)
        {
-               __pAppTimer->Cancel();
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-               TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+               r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+               TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
        }
 
        if (direction == CAMCORDER_FORM_SECONDARY_MODE)
        {
-               r = __pCamcorderPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_RECORD, CameraPresentationModel::CAMERA_DIRECTION_FRONT);
+               r = _pCameraPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_RECORD, CameraPresentationModel::CAMERA_DIRECTION_FRONT);
        }
        else if (direction == CAMCORDER_FORM_PRIMARY_MODE)
        {
-               r = __pCamcorderPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_RECORD, CameraPresentationModel::CAMERA_DIRECTION_BACK);
+               r = _pCameraPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_RECORD, CameraPresentationModel::CAMERA_DIRECTION_BACK);
        }
-       TryCatch(r == E_SUCCESS, , "__pCamcorderPresentationModel->ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
+       TryCatch(r == E_SUCCESS, , "_pCameraPresentationModel->ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
 
-       dim = __pCamcorderPresentationModel->GetPreviewResolution();
+       dim = _pCameraPresentationModel->GetPreviewResolution();
        AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
 
        AppLogDebug("SelfPortraitMode __screenMode [%d]", __screenMode);
@@ -5681,19 +5373,24 @@ CamcorderForm::ToggleCameraDirection(int direction)
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
        TryCatch(r == E_SUCCESS, , "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-       isInitCameraStaus = __pCamcorderPresentationModel->GetInitCameraStatus();
+       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
        AppLogDebug("isInitCameraStaus [%d]", isInitCameraStaus);
 
        if (isInitCameraStaus)
        {
-               __pCamcorderPresentationModel->StartPreview(&bufferinfo);
+               AppLogDebug("Ravi: calling camcordersettings");
+               _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-               __pCamcorderPresentationModel->SetContinuousAutoFocus();
+               _pCameraPresentationModel->SetContinuousAutoFocus();
 
                InDrawFocus();
 
                SetCamcorderSettingsDevice();
        }
+       else
+       {
+               AppLogDebug("Ravi: not calling camcordersettings");
+       }
 
        AppLogDebug("EXIT");
        return r;
@@ -6073,7 +5770,7 @@ CamcorderForm::ProcessGeneraTabMainListPopup(int index)
                        {
                                result r = E_SUCCESS;
 
-                               r = __pCamcorderPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_ENABLE);
+                               r = _pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_ENABLE);
                                TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
                                AppLogDebug("Setting - OVERLAY_HELP_ENABLE = %d", OVERLAY_HELP_ENABLE);
@@ -6192,7 +5889,7 @@ CamcorderForm::ProcessFlashListPopup(int index)
        ResourceId resIdNormal = RESOURCE_ID_CAMERA_MODE_FLASH_AUTO_NOR;
        ResourceId resIdPress = RESOURCE_ID_CAMERA_MODE_FLASH_AUTO_PRESS;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
@@ -6205,7 +5902,7 @@ CamcorderForm::ProcessFlashListPopup(int index)
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                if (value == true && r == E_SUCCESS)
                {
@@ -6255,7 +5952,7 @@ CamcorderForm::ProcessFlashListPopup(int index)
                }
        }
 
-       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
+       r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        TryCatch(__pSettingPanel != null, r = E_SYSTEM, "__pSettingPanel is null");
@@ -6284,7 +5981,7 @@ CamcorderForm::ProcessFlashListPopup(int index)
        SetCamcorderTabSettingMainMenuCount(MENU_COUNT_CLEAR);
        SetCamcorderTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMCORDER_SUB_MENU_CONTENT_MAX);
 
-       __pCamcorderPresentationModel->SetFlashMode(cameraFlashMode);
+       _pCameraPresentationModel->SetFlashMode(cameraFlashMode);
 
        AppLogDebug("EXIT");
        return r;
@@ -6301,22 +5998,22 @@ CamcorderForm::SubListPopupWbMode(int index)
        int regVal = 0;
        int selfPortraitEnable = 0;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
                AppLogDebug("result is %s",GetErrorMessage(r));
        }
 
        if (r == E_SUCCESS)
        {
-               __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)index);
+               _pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)index);
        }
        else
        {
@@ -6329,12 +6026,12 @@ CamcorderForm::SubListPopupWbMode(int index)
        AppLogDebug("regVal = %d", regVal);
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
+               r = _pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
                TryCatch(r == E_SUCCESS, , "Faled to set value to registry");
        }
        else
        {
-               r = __pCamcorderPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
+               r = _pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
                TryCatch(r == E_SUCCESS, , "Faled to set value to registry");
        }
 
@@ -6387,7 +6084,7 @@ CamcorderForm::SubListPopupGuidelineMode(int index)
 
        AppLogDebug("Set vaule");
 
-       r = __pCamcorderPresentationModel->SetValue(GUIDELINE_ENABLE, regVal);
+       r = _pCameraPresentationModel->SetValue(GUIDELINE_ENABLE, regVal);
        TryCatch(r == E_SUCCESS, , "Faled to set value to registry");
 
        AppLogDebug("EXIT");
@@ -6421,7 +6118,7 @@ CamcorderForm::SubListPopupStorageTypeMode(int index)
                        AppLogDebug("Setting - Storage type = card");
                        storage = STORAGE_TYPE_MEMORYCARD;
 
-                       if (__pCamcorderPresentationModel->IsStorageCardMounted() == true)
+                       if (_pCameraPresentationModel->IsStorageCardMounted() == true)
                        {
                                SetStorageType(storage);
                        }
@@ -6439,7 +6136,7 @@ CamcorderForm::SubListPopupStorageTypeMode(int index)
                break;
        }
 
-       __pCamcorderPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_RECORD);
+       _pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_RECORD);
 
        Update(false);
 
@@ -6453,7 +6150,7 @@ CamcorderForm::SubListPopupStorageTypeMode(int index)
                AppLogDebug("FileEventManager()::Construct() fail[%s]", GetErrorMessage(r));
        }
 
-       filePath = __pCamcorderPresentationModel->GetfilePath(storage);
+       filePath = _pCameraPresentationModel->GetfilePath(storage);
        AppLogDebug("filePath %ls", filePath.GetPointer());
 
        if (File::IsFileExist(__pFileEventPath))
@@ -6481,7 +6178,7 @@ CamcorderForm::SubListPopupTimerMode(int index)
        __settingTimeInterval = index;
        regVal = index;
 
-       r = __pCamcorderPresentationModel->SetValue(TIMER_INTERVAL, regVal);
+       r = _pCameraPresentationModel->SetValue(TIMER_INTERVAL, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("EXIT");
@@ -6496,19 +6193,19 @@ result
 CamcorderForm::SubListPopupResolutionMode(int index)
 {
        AppLogDebug("ENTER");
-       IList* pList = __pCamcorderPresentationModel->GetRecordingResolutionList();
+       IList* pList = _pCameraPresentationModel->GetRecordingResolutionList();
        int resolutionCnt = 0;
        result r = E_SUCCESS;
        int selfPortraitEnable = 0;
        
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (pList)
        {
                resolutionCnt = pList->GetCount() - INDEX_UNIT_ONE;
                //Dimension dimResolution = *(static_cast<Dimension*>(pList->GetAt(resolutionCnt - index)));
-               Dimension dimResolution = __pCamcorderPresentationModel->GetRecordingResolution();
+               Dimension dimResolution = _pCameraPresentationModel->GetRecordingResolution();
                AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dimResolution.width, dimResolution.height);
 
                if ((__pRecordingResolutionWidth == dimResolution.width )&& (__pRecordingResolutionHeight == dimResolution.height))
@@ -6517,9 +6214,9 @@ CamcorderForm::SubListPopupResolutionMode(int index)
                }
                else
                {
-                       __pCamcorderPresentationModel->StopPreview();
+                       _pCameraPresentationModel->StopPreview();
 
-                       __pCamcorderPresentationModel->SetRecordingResolution(dimResolution);
+                       _pCameraPresentationModel->SetRecordingResolution(dimResolution);
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
                        {
@@ -6576,7 +6273,7 @@ CamcorderForm::SubListPopupOverlayHelpMode(int index)
 
        regVal = value;
 
-       r = __pCamcorderPresentationModel->SetValue(OVERLAY_HELP_ENABLE, regVal);
+       r = _pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("Setting - OVERLAY_HELP_ENABLE = %d", OVERLAY_HELP_ENABLE);
@@ -6644,7 +6341,7 @@ CamcorderForm::ProcessGeneraTabSubListPopup(int index)
        int selfPortraitEnable = 0;
        CamcorderGeneralTabSubMenuContent idx = CAMCORDER_GENERAL_TAB_SUB_MENU_CONTENT_MAX;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "Reg GetValue() fail[%s]", GetErrorMessage(r));
 
        idx = GetGeneralTabSettingSubMenuMode();
@@ -6749,33 +6446,33 @@ CamcorderForm::StartPopupTimer(void)
        result r = E_SUCCESS;
        int settingTimer = 0;
 
-       __timeCount = 0;
+       _timeCount = 0;
 
-       __pPopupTimer = new (std::nothrow) Timer();
-       __pPopupTimer->Construct(*this);
+       _pPopupTimer = new (std::nothrow) Timer();
+       _pPopupTimer->Construct(*this);
 
-       r = __pPopupTimer->StartAsRepeatable(CAMCORDER_TIMER_1_SEC);
-       TryCatch(r == E_SUCCESS, , "__pPopupTimer start fail[%s]", GetErrorMessage(r));
+       r = _pPopupTimer->StartAsRepeatable(CAMCORDER_TIMER_1_SEC);
+       TryCatch(r == E_SUCCESS, , "_pPopupTimer start fail[%s]", GetErrorMessage(r));
 
-       r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, settingTimer);
+       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, settingTimer);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (settingTimer == SETTING_TIMER_RECORD_2_SEC)
        {
-               __timeCount = SETTING_TIMER_2_SEC_COUNT;
+               _timeCount = SETTING_TIMER_2_SEC_COUNT;
        }
        else if (settingTimer == SETTING_TIMER_RECORD_5_SEC)
        {
-               __timeCount = SETTING_TIMER_5_SEC_COUNT;
+               _timeCount = SETTING_TIMER_5_SEC_COUNT;
        }
        else if (settingTimer == SETTING_TIMER_RECORD_10_SEC)
        {
-               __timeCount = SETTING_TIMER_10_SEC_COUNT;
+               _timeCount = SETTING_TIMER_10_SEC_COUNT;
        }
 
        __pCameraInfoPanel->SetDrawPopupTimerUpdate(true);
 
-       __pCameraInfoPanel->SetDrawPopupTimerCount(__timeCount);
+       __pCameraInfoPanel->SetDrawPopupTimerCount(_timeCount);
 
        __pCameraInfoPanel->Invalidate(true);
 
@@ -6783,8 +6480,8 @@ CamcorderForm::StartPopupTimer(void)
        return E_SUCCESS;
 
 CATCH:
-       delete __pPopupTimer;
-       __pPopupTimer = null;
+       delete _pPopupTimer;
+       _pPopupTimer = null;
 
        return r;
 }
@@ -6794,12 +6491,12 @@ CamcorderForm::StopPopupTimer(void)
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
-       TryCatch(__pPopupTimer != null, r = E_SYSTEM, "__pPopupTimer is null");
+       TryCatch(_pPopupTimer != null, r = E_SYSTEM, "_pPopupTimer is null");
 
-       r = __pPopupTimer->Cancel();
+       r = _pPopupTimer->Cancel();
 
-       delete __pPopupTimer;
-       __pPopupTimer = null;
+       delete _pPopupTimer;
+       _pPopupTimer = null;
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -6926,37 +6623,37 @@ CamcorderForm::ExposureValuePerformed(void)
        int selfPortraitEnable = 0;
        int adjustValue = 0;
 
-       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-       __pAppTimer->Cancel();
+       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+       _pAppTimer->Cancel();
 
-       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
        }
 
        if (exposureValue == true && r == E_SUCCESS)
        {
                AppLogDebug("CAMERA_SUB_MENU_CONTENT_EXPOSURE_MODE");
 
-               r = __pCamcorderPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
+               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                AppLogDebug("adjustValue = %d", adjustValue);
 
-               __pCamcorderPresentationModel->SetExposure(adjustValue);
+               _pCameraPresentationModel->SetExposure(adjustValue);
 
                MakeSettingPopupTab(false);
 
@@ -6972,23 +6669,23 @@ CamcorderForm::ExposureValuePerformed(void)
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
                else
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
 
                if (brighnesstValue == true && r == E_SUCCESS)
                {
                        AppLogDebug("CAMERA_SUB_MENU_CONTENT_EXPOSURE_MODE");
 
-                       r = __pCamcorderPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
+                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                        AppLogDebug("adjustValue = %d", adjustValue);
 
-                       __pCamcorderPresentationModel->SetBrightness(adjustValue);
+                       _pCameraPresentationModel->SetBrightness(adjustValue);
 
                        MakeSettingPopupTab(false);
 
@@ -7019,7 +6716,7 @@ CamcorderForm::AutoFocusPerformed(void)
 
        Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE, W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
 
-       if (__isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+       if (_isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
        {
                if (__dir == ORIENTATION_STATUS_PORTRAIT
                        || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
@@ -7035,18 +6732,18 @@ CamcorderForm::AutoFocusPerformed(void)
                        currentPosition.y = (H_PREVIEW_OVERLAY_LANDSCAPE / DIVIDE_BY_TWO);
                }
 
-               //if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || __isRecording == true)
+               //if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || _isRecording == true)
                {
-                       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
                        }
 
                        if (focusSupport == true && r == E_SUCCESS)
@@ -7066,7 +6763,7 @@ CamcorderForm::AutoFocusPerformed(void)
                                __pCameraInfoPanel->Invalidate(true);
                        }
 
-                       __pCamcorderPresentationModel->SetContinuousAutoFocus();
+                       _pCameraPresentationModel->SetContinuousAutoFocus();
                }
        }
        AppLogDebug("EXIT");
@@ -7081,16 +6778,16 @@ CamcorderForm::SetContinuousAutoFocusButton(void)
        bool focusSupport = false;
        Bitmap* pBitmap = null;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
        }
 
         pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMCODER_AUTOFOCUS);
@@ -7135,17 +6832,17 @@ CamcorderForm::BackButtonPerformed(void)
                return E_SUCCESS;
        }
 
-       if (__pCamcorderPresentationModel->GetPreviewState() == false)
+       if (_pCameraPresentationModel->GetPreviewState() == false)
        {
                AppLogDebug("StartPreview do not call");
                __pBackButton->SetEnabled(false);
                return E_SUCCESS;
        }
 
-       AppLogDebug("RecorderState = %d", __pCamcorderPresentationModel->GetRecorderState());
-       if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || __isRecording == true)
+       AppLogDebug("RecorderState = %d", _pCameraPresentationModel->GetRecorderState());
+       if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || _isRecording == true)
        {
-               if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_STARTING)
+               if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_STARTING)
                {
                        AppLogDebug("No RECORDER_STATE_RECORDING AND PAUSE");
                        return E_SUCCESS;
@@ -7170,19 +6867,19 @@ CamcorderForm::BackButtonPerformed(void)
        }
        else
        {
-               if (__isRecording == true)
+               if (_isRecording == true)
                {
-                       AppLogDebug("No RECORDER_STATE_RECORDING and __isRecording = true >> DO NOT APP TERMINATE");
+                       AppLogDebug("No RECORDER_STATE_RECORDING and _isRecording = true >> DO NOT APP TERMINATE");
                        return E_SUCCESS;
                }
 
                if (__pCameraInfoPanel->GetDrawExposure() == true)
                {
-                       __closeTimerValue = 0;
+                       _closeTimerValue = 0;
 
-                       if (__pExposureCloseTimer)
+                       if (_pExposureCloseTimer)
                        {
-                               __pExposureCloseTimer->Cancel();
+                               _pExposureCloseTimer->Cancel();
                        }
 
                        __pCameraInfoPanel->SetDrawExposure(false);
@@ -7197,7 +6894,7 @@ CamcorderForm::BackButtonPerformed(void)
                        }
                        else
                        {
-                               onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
+                               onVideoRecorderStopped = _pCameraPresentationModel->GetOnVideoRecorderStopped();
                                AppLogDebug("onVideoRecorderStopped = %d", onVideoRecorderStopped);
 
                                if (onVideoRecorderStopped == false)
@@ -7236,16 +6933,16 @@ CamcorderForm::PressBackButton(void)
        bool onVideoRecorderStopped = false;
        result r = E_SUCCESS;   
 
-       onVideoRecorderStopped = __pCamcorderPresentationModel->GetOnVideoRecorderStopped();
+       onVideoRecorderStopped = _pCameraPresentationModel->GetOnVideoRecorderStopped();
 
        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET)
        {
                AppLogDebug("PressBackButton >> Back to the App");
                if (onVideoRecorderStopped == false)
                {
-                       if (__isRecording == false)
+                       if (_isRecording == false)
                        {
-                               __pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED);
+                               _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED);
                        }
 
                        r = TerminateApp();
@@ -7370,28 +7067,28 @@ CamcorderForm::SetSelfModeButton(void)
        result r = E_SUCCESS;
        bool value = false;
 
-       if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+       if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
        {
                AppLogDebug("Return Camera transform");
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "Reg getvalue fail[%s]", GetErrorMessage(r));
 
                if (selfPortraitEnable == CAMCORDER_FORM_PRIMARY_MODE)
                {
                        AppLogDebug("PRIMARY -> SECONDARY");
 
-                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
-                       TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
-
-                       r = __pCamcorderPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
+                       r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
                        TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
 
                        r = ToggleCameraDirection(CAMCORDER_FORM_SECONDARY_MODE);
                        TryReturnVoid(r == E_SUCCESS, "ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
 
+                       r = _pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
+                       TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
+
                        r = UpdateUiPanelIcon();
                        //TryReturnVoid(r == E_SUCCESS, "UpdateUiPanelIcon() fail[%s]", GetErrorMessage(r));
                }
@@ -7399,15 +7096,19 @@ CamcorderForm::SetSelfModeButton(void)
                {
                        AppLogDebug("SECONDARY -> PRIMARY");
                        int primaryFlashValue = FLASH_MODE_OFF;
+
+                       r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
+                       TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
+
                        r = ToggleCameraDirection(CAMCORDER_FORM_PRIMARY_MODE);
                        TryReturnVoid(r == E_SUCCESS, "ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
 
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
-                       __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+                       _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
 
                        if (value == true && r == E_SUCCESS)
                        {
-                               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
+                               r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
                                TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
                        }
                        else
@@ -7415,8 +7116,6 @@ CamcorderForm::SetSelfModeButton(void)
                                AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
                        }
 
-                       r = __pCamcorderPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
-                       TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
 
 
                        r = UpdateUiPanelIcon();
@@ -7444,82 +7143,85 @@ CamcorderForm::SetCamcorderSettingsDevice(void)
        bool brighnesstValue = false;
        int selfPortraitEnable = 0;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Faled to Get value to registry[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
        }
 
        if (exposureValue == true && r == E_SUCCESS)
        {
-               r = __pCamcorderPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
+               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
                TryReturnVoid(r == E_SUCCESS, "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
 
-               __pCamcorderPresentationModel->SetExposure(exposure);
+               _pCameraPresentationModel->SetExposure(exposure);
        }
        else
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
                else
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
 
                if (brighnesstValue == true && r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(BRIGHTNESS_VALUE, brightness);
+                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, brightness);
                        TryReturnVoid(r == E_SUCCESS, "brightness Faled to Get value to registry[%s]", GetErrorMessage(r));
 
-                       __pCamcorderPresentationModel->SetBrightness(brightness);
+                       _pCameraPresentationModel->SetBrightness(brightness);
                }
        }
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
        }
 
        if (r == E_SUCCESS)
        {
-               r = __pCamcorderPresentationModel->GetValue(ISO_VALUE, isoIndex);
+               r = _pCameraPresentationModel->GetValue(ISO_VALUE, isoIndex);
                TryReturnVoid(r == E_SUCCESS, "isoIndex Faled to Get value to registry[%s]", GetErrorMessage(r));
 
-               __pCamcorderPresentationModel->SetIsoLevel((CameraIsoLevel)isoIndex);
+               _pCameraPresentationModel->SetIsoLevel((CameraIsoLevel)isoIndex);
        }
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
                if (r == E_SUCCESS)
                {
-                       r =__pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, wbIndex);
+                       AppLogDebug("Ravi: primary mode wb is set");
+                       r =_pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, wbIndex);
                        TryReturnVoid(r == E_SUCCESS, "WB Faled to Get value to registry[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
                if (r == E_SUCCESS)
                {
-                       r =__pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, wbIndex);
+                       AppLogDebug("Ravi: secondary mode wb is set");
+                       r =_pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, wbIndex);
                        TryReturnVoid(r == E_SUCCESS, "WB Faled to Get value to registry[%s]", GetErrorMessage(r));
                }
        }
 
-       __pCamcorderPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
+       _pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
        AppLogDebug("EXIT");
 }
 
@@ -7675,39 +7377,39 @@ CamcorderForm::SetSliderAdjustValue(const Tizen::Graphics::Point& currentPositio
                }
        }
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (entryName.Equals(String(EXPOSURE_VALUE)))
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                }
                else
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                }
 
                if (exposureValue == true && r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(EXPOSURE_VALUE, currentEntryValue);
+                       r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, currentEntryValue);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                }
                else
                {
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                        }
 
                        if (brighnesstValue == true && r == E_SUCCESS)
                        {
-                               r = __pCamcorderPresentationModel->GetValue(BRIGHTNESS_VALUE, currentEntryValue);
+                               r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, currentEntryValue);
                                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                        }
                }
@@ -7716,63 +7418,63 @@ CamcorderForm::SetSliderAdjustValue(const Tizen::Graphics::Point& currentPositio
                {
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                        }
 
                        if (exposureValue == true && r == E_SUCCESS)
                        {
-                               r = __pCamcorderPresentationModel->SetValue(EXPOSURE_VALUE, adjustEntryValue);
+                               r = _pCameraPresentationModel->SetValue(EXPOSURE_VALUE, adjustEntryValue);
                                TryCatch(r == E_SUCCESS, , "etValue() fail[%s]", GetErrorMessage(r));
                        }
                        else
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
                                else
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
 
                                if (brighnesstValue == true && r == E_SUCCESS)
                                {
-                                       r = __pCamcorderPresentationModel->SetValue(BRIGHTNESS_VALUE, adjustEntryValue);
+                                       r = _pCameraPresentationModel->SetValue(BRIGHTNESS_VALUE, adjustEntryValue);
                                        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
                                }
                        }
        
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                        }
 
                        if (exposureValue == true && r == E_SUCCESS)
                        {
-                               __pCamcorderPresentationModel->SetExposure(adjustEntryValue);
+                               _pCameraPresentationModel->SetExposure(adjustEntryValue);
                        }
                        else
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
                                else
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
 
                                if (brighnesstValue == true && r == E_SUCCESS)
                                {
-                                       __pCamcorderPresentationModel->SetBrightness(adjustEntryValue);
+                                       _pCameraPresentationModel->SetBrightness(adjustEntryValue);
                                }
                                else
                                {
@@ -7797,11 +7499,11 @@ CamcorderForm::CreateExposureSlider(void)
 
        TryCatch(__pCameraInfoPanel != null, r = E_FAILURE, "__pCameraInfoPanel is null");
 
-       __closeTimerValue = 0;
-       __pExposureCloseTimer = new (std::nothrow) Timer();
-       __pExposureCloseTimer->Construct(*this);
+       _closeTimerValue = 0;
+       _pExposureCloseTimer = new (std::nothrow) Timer();
+       _pExposureCloseTimer->Construct(*this);
 
-       r = __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+       r = _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
        TryCatch(r == E_SUCCESS, , "Timer::start fail[%s]", GetErrorMessage(r));
 
        __pCameraInfoPanel->SetDrawExposure(true);
@@ -7811,8 +7513,8 @@ CamcorderForm::CreateExposureSlider(void)
        return r;
 
 CATCH:
-       delete __pExposureCloseTimer;
-       __pExposureCloseTimer = null;
+       delete _pExposureCloseTimer;
+       _pExposureCloseTimer = null;
 
        return r;
 }
@@ -7829,21 +7531,21 @@ CamcorderForm::DrawExposureSlider(void)
        bool exposureValue = false;
        bool brighnesstValue = false;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
        }
 
        if (exposureValue == true && r == E_SUCCESS)
        {
-               r = __pCamcorderPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
+               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
                TryCatch(r == E_SUCCESS, , "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
                AppLogDebug("Exposure value %d", exposure);
        }
@@ -7851,16 +7553,16 @@ CamcorderForm::DrawExposureSlider(void)
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
                else
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
 
                if (brighnesstValue == true && r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(BRIGHTNESS_VALUE, exposure);
+                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, exposure);
                        TryCatch(r == E_SUCCESS, , "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
                        AppLogDebug("Exposure value %d",exposure);
                }
@@ -8077,22 +7779,22 @@ CamcorderForm::ShowExposureSlider(void)
        bool exposureValue = false;
        bool brighnesstValue = false;
 
-       if (__pExposureCloseTimer)
+       if (_pExposureCloseTimer)
        {
-               r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "GetValue() fail(%s)", GetErrorMessage(r));
 
-               if (__pExposureCloseTimer->Cancel() == E_SUCCESS)
+               if (_pExposureCloseTimer->Cancel() == E_SUCCESS)
                {
                        HidePopup();
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                        }
 
                        if (exposureValue == true && r == E_SUCCESS)
@@ -8107,11 +7809,11 @@ CamcorderForm::ShowExposureSlider(void)
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
                                else
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
 
                                if (brighnesstValue == true && r == E_SUCCESS)
@@ -8330,7 +8032,7 @@ CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui:
        int guideLineEnable = DISABLE_GUIDELINE;
        String listName = L"";
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnOrientationChanged >> TerminateApp Execution");
 
@@ -8345,14 +8047,14 @@ CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui:
        {
                __isOrientationChanged = true;
 
-               if (__pAppTimer != null)
+               if (_pAppTimer != null)
                {
-                       __pAppTimer->Cancel();
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
                }
 
-               r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                SetOverlayPanelOrientationChanged(orientationStatus);
@@ -8396,11 +8098,11 @@ CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui:
 
                __dir = orientationStatus;
 
-               __pCamcorderPresentationModel->SetOrientation(__dir);
+               _pCameraPresentationModel->SetOrientation(__dir);
 
                if (__screenMode == SCREEN_MODE_FULL)
                {
-                       if (__pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || __isRecording == true)
+                       if (_pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING || _isRecording == true)
                        {
                                HidePanel(true, true);
                        }
@@ -8410,7 +8112,7 @@ CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui:
                        }
                }
 
-               r = __pCamcorderPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
+               r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
                TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
 
                if (guideLineEnable == DISABLE_GUIDELINE)
@@ -8428,14 +8130,14 @@ CamcorderForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui:
                OnHelpCloseTimerExpired();
 //             Update(true);
 
-               if (__isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+               if (_isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
                {
-                       if (__pHelpCloseTimer)
+                       if (_pHelpCloseTimer)
                        {
-                               __pHelpCloseTimer->Cancel();
+                               _pHelpCloseTimer->Cancel();
 
-                               delete __pHelpCloseTimer;
-                               __pHelpCloseTimer = null;
+                               delete _pHelpCloseTimer;
+                               _pHelpCloseTimer = null;
                        }
 
                        HideScreenOverlayHelp();
@@ -8653,7 +8355,7 @@ CamcorderForm::CheckStorageInfo(void)
        }
        else
        {
-               if (__isRecording == false)
+               if (_isRecording == false)
                {
                        if (remainedNum > STORAGE_VALUE_ZERO && remainedNum <= STORAGE_DISPLAY_PLACE)
                        {
@@ -8667,7 +8369,7 @@ CamcorderForm::CheckStorageInfo(void)
                }
                else
                {
-                       AppLogDebug("__isRecording = true");
+                       AppLogDebug("_isRecording = true");
                }
        }
 
@@ -8988,10 +8690,10 @@ CamcorderForm::SetCamcorderMode(void)
        Dimension dim;
        BufferInfo bufferinfo;
 
-       r = __pCamcorderPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
+       r = _pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
        TryReturnVoid(r == E_SUCCESS, "SetMode() failed:%s", GetErrorMessage(r));
 
-       dim = __pCamcorderPresentationModel->GetPreviewResolution();
+       dim = _pCameraPresentationModel->GetPreviewResolution();
        AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
 
        __previewResolutionWidth = dim.width;
@@ -9000,9 +8702,9 @@ CamcorderForm::SetCamcorderMode(void)
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
 
-       __pCamcorderPresentationModel->StartPreview(&bufferinfo);
+       _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-       __pCamcorderPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
 
        previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight;
 
@@ -9027,15 +8729,15 @@ CamcorderForm::SetScreenMode(const ScreenMode mode, bool destory)
                        {
                                if (__screenMode != mode)
                                {
-                                       TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
-                                       __pAppTimer->Cancel();
+                                       TryCatch(_pAppTimer != null, r = E_SYSTEM, "_pAppTimer is null");
+                                       _pAppTimer->Cancel();
 
-                                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                                       TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                                       TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                                       __pCamcorderPresentationModel->KeepScreenOnState(true, false);
+                                       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-                                       __pCamcorderPresentationModel->StopCamera();
+                                       _pCameraPresentationModel->StopCamera();
                                }
 
                                SetOverlayPanelNormalMode(true);
@@ -9075,15 +8777,15 @@ CamcorderForm::SetScreenMode(const ScreenMode mode, bool destory)
                        {
                                if (__screenMode != mode)
                                {
-                                       TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
-                                       __pAppTimer->Cancel();
+                                       TryCatch(_pAppTimer != null, r = E_SYSTEM, "_pAppTimer is null");
+                                       _pAppTimer->Cancel();
 
-                                       r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-                                       TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                                       r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+                                       TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                                       __pCamcorderPresentationModel->KeepScreenOnState(true, false);
+                                       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-                                       __pCamcorderPresentationModel->StopCamera();
+                                       _pCameraPresentationModel->StopCamera();
                                }
 
                                SetOverlayPanelWideMode(true);
@@ -9155,16 +8857,16 @@ CamcorderForm::InDrawFocus(void)
                currentPosition.y = (H_PREVIEW_OVERLAY_LANDSCAPE / DIVIDE_BY_TWO);
        }
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
        }
 
        if (focusSupport == true && r == E_SUCCESS)
@@ -9189,7 +8891,7 @@ CamcorderForm::StartRecord(void)
        result r = E_SUCCESS;
        int timerIntervalVale = 0;
 
-       r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, timerIntervalVale);
+       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerIntervalVale);
        TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
        InitMakerFocusTimer();
@@ -9200,9 +8902,9 @@ CamcorderForm::StartRecord(void)
 
        __pCameraInfoPanel->Invalidate(true);
 
-       __pMakerFocusTimer->Cancel();
+       _pMakerFocusTimer->Cancel();
 
-       __pMakerFocusTimer->Start(CAMCORDER_TIMER_ONE_SEC);
+       _pMakerFocusTimer->Start(CAMCORDER_TIMER_ONE_SEC);
 
        __pCameraInfoPanel->CheckAvailableStorageSpace();
 
@@ -9246,23 +8948,23 @@ CamcorderForm::StopRecord(void)
        __pCameraInfoPanel->SetDrawIndicator(true);
        __pCameraInfoPanel->Invalidate(true);
 
-       if (__pMakerFocusTimer)
+       if (_pMakerFocusTimer)
        {
-               __pMakerFocusTimer->Cancel();
+               _pMakerFocusTimer->Cancel();
        }
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __isRecordingPause = false;
+       _isRecordingPause = false;
 
-       AppLogDebug("StopRecord::GetRecorderState() = %d", __pCamcorderPresentationModel->GetRecorderState());
-       if (__pCamcorderPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_STARTING
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSING
+       AppLogDebug("StopRecord::GetRecorderState() = %d", _pCameraPresentationModel->GetRecorderState());
+       if (_pCameraPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_STARTING
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSING
        )
        {
-               r = __pCamcorderPresentationModel->StopRecord();
+               r = _pCameraPresentationModel->StopRecord();
                TryCatch(r == E_SUCCESS, , "Stop record failed [%s]",GetErrorMessage(r));
        }
 
@@ -9276,16 +8978,16 @@ CamcorderForm::StopRecord(void)
        r = SetRecordButton(false);
        TryReturnVoid(r == E_SUCCESS, "SetRecordButton() fail[%s]", GetErrorMessage(r));
 
-       __timeCount = 0;
+       _timeCount = 0;
 
-       if (__pIntervalValueTimer)
+       if (_pIntervalValueTimer)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
@@ -9298,8 +9000,8 @@ CamcorderForm::StopRecord(void)
        return;
 CATCH:
 AppLogDebug("Caught record stop exception. Terminating app");
-__pCamcorderPresentationModel->SetRecordStopException(true);
-__pCamcorderPresentationModel->CancelRecord();
+_pCameraPresentationModel->SetRecordStopException(true);
+_pCameraPresentationModel->CancelRecord();
 TerminateApp();
 }
 
@@ -9377,15 +9079,15 @@ CamcorderForm::PauseRecord(void)
        r = SetRecordPauseButton(true);
        TryCatch(r == E_SUCCESS, , "SetRecordPauseButton start fail[%s]", GetErrorMessage(r));
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __isRecordingPause = true;
+       _isRecordingPause = true;
 
-       __pCamcorderPresentationModel->PauseRecord();
+       _pCameraPresentationModel->PauseRecord();
 
        __pRecordTimer->Cancel();
 
-       __timeCount = 0;
+       _timeCount = 0;
 
        r = DrawPauseRecord();
        TryCatch(r == E_SUCCESS, , "DrawPauseRecord start fail[%s]", GetErrorMessage(r));
@@ -9409,23 +9111,23 @@ CamcorderForm::CancelRecord(void)
        __pCameraInfoPanel->SetDrawIndicator(true);
        __pCameraInfoPanel->Invalidate(true);
 
-       if (__pMakerFocusTimer)
+       if (_pMakerFocusTimer)
        {
-               __pMakerFocusTimer->Cancel();
+               _pMakerFocusTimer->Cancel();
        }
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __pCamcorderPresentationModel->SetCancelRecord(true);
+       _pCameraPresentationModel->SetCancelRecord(true);
 
-       AppLogDebug("StopRecord::GetRecorderState() = %d", __pCamcorderPresentationModel->GetRecorderState());
-       if (__pCamcorderPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_STARTING
-               || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSING
+       AppLogDebug("StopRecord::GetRecorderState() = %d", _pCameraPresentationModel->GetRecorderState());
+       if (_pCameraPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_STARTING
+               || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSING
        )
        {
-           __pCamcorderPresentationModel->StopRecord();
+           _pCameraPresentationModel->StopRecord();
        }
 
        r = DrawRecord(false);
@@ -9438,13 +9140,13 @@ CamcorderForm::CancelRecord(void)
        r = SetRecordButton(false);
        TryReturnVoid(r == E_SUCCESS, "SetRecordButton() fail[%s]", GetErrorMessage(r));
 
-       __timeCount = 0;
+       _timeCount = 0;
 
-       __pIntervalValueTimer->Cancel();
+       _pIntervalValueTimer->Cancel();
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
@@ -9460,9 +9162,9 @@ void
 CamcorderForm::CancelTimerIntervalRecord(void)
 {
        AppLogDebug("ENTER");
-       if (__pIntervalValueTimer)
+       if (_pIntervalValueTimer)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
        __doRecording = false;
@@ -9485,7 +9187,7 @@ CamcorderForm::CancelTimerIntervalRecord(void)
        __pCameraInfoPanel->Show();
        __setTimerInterval = false;
 
-       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
        HideUiPanel(false);
        AppLogDebug("EXIT");
@@ -9499,25 +9201,25 @@ CamcorderForm::SetRecordEndReached(void)
 
        HideUiPanel(false);
 
-       __isRecording = false;
+       _isRecording = false;
 
        __doRecording = false;
 
-       __isRecordingPause = false;
+       _isRecordingPause = false;
 
        DrawThumbnail();
 
        __pCameraInfoPanel->SetDrawIndicator(true);
        __pCameraInfoPanel->Invalidate(true);
 
-       if (__pMakerFocusTimer)
+       if (_pMakerFocusTimer)
        {
-               __pMakerFocusTimer->Cancel();
+               _pMakerFocusTimer->Cancel();
        }
 
-       __isRecording = false;
+       _isRecording = false;
 
-       __isRecordingPause = false;
+       _isRecordingPause = false;
 
        r = DrawRecord(false);
        TryReturnVoid(r == E_SUCCESS, "DrawRecord() fail[%s]", GetErrorMessage(r));
@@ -9529,16 +9231,16 @@ CamcorderForm::SetRecordEndReached(void)
        r = SetRecordButton(false);
        TryReturnVoid(r == E_SUCCESS, "SetRecordButton() fail[%s]", GetErrorMessage(r));
 
-       __timeCount = 0;
+       _timeCount = 0;
 
-       if (__pIntervalValueTimer)
+       if (_pIntervalValueTimer)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
@@ -9550,7 +9252,7 @@ CamcorderForm::SetRecordEndReached(void)
 
        HideRecLabe();
 
-       __pCamcorderPresentationModel->CloseRecord();
+       _pCameraPresentationModel->CloseRecord();
        AppLogDebug("EXIT");
 }
 
@@ -9570,28 +9272,28 @@ CamcorderForm::SetRecordErrorOccurred(void)
        __pCameraInfoPanel->SetDrawIndicator(true);
        __pCameraInfoPanel->Invalidate(true);
 
-       if (__pMakerFocusTimer)
+       if (_pMakerFocusTimer)
        {
-               __pMakerFocusTimer->Cancel();
+               _pMakerFocusTimer->Cancel();
        }
 
-       __isRecording = false;
+       _isRecording = false;
 
        EndRecordTimer();
 
        r = SetRecordButton(false);
        TryReturnVoid(r == E_SUCCESS, "SetRecordButton() fail[%s]", GetErrorMessage(r));
 
-       __timeCount = 0;
+       _timeCount = 0;
 
-       if (__pIntervalValueTimer)
+       if (_pIntervalValueTimer)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
@@ -9611,9 +9313,9 @@ void
 CamcorderForm::HideUiAction(void)
 {
        AppLogDebug("ENTER");
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
@@ -9623,11 +9325,11 @@ CamcorderForm::HideUiAction(void)
                __pCameraInfoPanel->Invalidate(true);
        }
 
-       if (__pExposureCloseTimer != null)
+       if (_pExposureCloseTimer != null)
        {
-               __closeTimerValue = 0;
+               _closeTimerValue = 0;
 
-               __pExposureCloseTimer->Cancel();
+               _pExposureCloseTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawExposure() == true)
@@ -9637,9 +9339,9 @@ CamcorderForm::HideUiAction(void)
                Invalidate(true);
        }
 
-       if (__pMakerFocusTimer != null)
+       if (_pMakerFocusTimer != null)
        {
-               __pMakerFocusTimer->Cancel();
+               _pMakerFocusTimer->Cancel();
        }
        AppLogDebug("EXIT");
 }
@@ -9857,7 +9559,7 @@ CamcorderForm::AppControlRequestHideButton(void)
        {
                AppLogDebug("pArguments is null");
 
-               if (__doRecording || __isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+               if (__doRecording || _isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
                {
                        AppLogDebug("Recording");
                        if (__pCameraIconLabel)
@@ -9899,7 +9601,7 @@ CamcorderForm::AppControlRequestHideButton(void)
                if (pAllowSwitch->Equals(ALLOW_SWITCH_TRUE, false) == true)
                {
                        AppLogDebug("ALLOW_SWITCH_TRUE");
-                       if (__doRecording || __isRecording || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
+                       if (__doRecording || _isRecording || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_RECORDING)
                        {
                                AppLogDebug("Recording");
 
@@ -9965,7 +9667,7 @@ CamcorderForm::DoRecordHideUiPanel(void)
        result r = E_SUCCESS;
        int timerIntervalVale = 0;
 
-       r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, timerIntervalVale);
+       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerIntervalVale);
        TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
        __pFlashButton->SetShowState(false);
@@ -10553,16 +10255,16 @@ CamcorderForm::DrawTouchAutoFocus(const Tizen::Graphics::Point& currentPosition)
        int selfPortraitEnable = 0;
        bool focusSupport = false;
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable); 
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
        }
 
        if (focusSupport == true && r == E_SUCCESS)
@@ -10577,7 +10279,7 @@ CamcorderForm::DrawTouchAutoFocus(const Tizen::Graphics::Point& currentPosition)
                __pCameraInfoPanel->SetDrawMarkerFocus(false);
                __pCameraInfoPanel->Invalidate(true);
        }
-       __pCamcorderPresentationModel->SetAutoFocusPoint(currentPosition);
+       _pCameraPresentationModel->SetAutoFocusPoint(currentPosition);
        AppLogDebug("EXIT");
 }
 
@@ -10592,15 +10294,15 @@ CamcorderForm::LaunchImageview(void)
        int loopCount = 0;
        result r = E_SUCCESS;
 
-       if (__pExposureCloseTimer)
+       if (_pExposureCloseTimer)
        {
-               __pExposureCloseTimer->Cancel();
+               _pExposureCloseTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __timeCount = 0;
-               __pPopupTimer->Cancel();
+               _timeCount = 0;
+               _pPopupTimer->Cancel();
        }
 
        HidePopup();
@@ -10614,7 +10316,7 @@ CamcorderForm::LaunchImageview(void)
        ArrayList* pContentPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
        pContentPathList->Construct();
 
-       pContentPathList = __pCamcorderPresentationModel->GetContentPathListN(CameraPresentationModel::CAMERA_MODE_RECORD);
+       pContentPathList = _pCameraPresentationModel->GetContentPathListN(CameraPresentationModel::CAMERA_MODE_RECORD);
        if (pContentPathList == null)
        {
                delete pExtraData;
@@ -10623,7 +10325,7 @@ CamcorderForm::LaunchImageview(void)
                return;
        }
 
-       loopCount = __pCamcorderPresentationModel->GetContentCount();
+       loopCount = _pCameraPresentationModel->GetContentCount();
        for (index = 0; index < loopCount; ++index)
        {
                filePath = static_cast<const String*>(pContentPathList->GetAt(index));
@@ -10668,7 +10370,7 @@ CamcorderForm::GetCameraToForeground(void)
 
        __isLockScreenMode = false;
 
-       __pCamcorderPresentationModel->KeepScreenOnState(true, false);
+       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
        StartInitAppTimer();
 
@@ -10677,18 +10379,18 @@ CamcorderForm::GetCameraToForeground(void)
 
        StartInitChargingTimer();
 
-       r = __pCamcorderPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
+       r = _pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_RECORD);
        TryReturnVoid(r == E_SUCCESS, "SetMode() failed:%s", GetErrorMessage(r));
 
        Update(false);
 
-       dim = __pCamcorderPresentationModel->GetPreviewResolution();
+       dim = _pCameraPresentationModel->GetPreviewResolution();
        AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
 
        __previewResolutionWidth = dim.width;
        __previewResolutionHeight = dim.height;
 
-       dim = __pCamcorderPresentationModel->GetRecordingResolution();
+       dim = _pCameraPresentationModel->GetRecordingResolution();
        AppLogDebug("CamcorderForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
 
        __pRecordingResolutionWidth = dim.width;
@@ -10714,9 +10416,9 @@ CamcorderForm::GetCameraToForeground(void)
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-       __pCamcorderPresentationModel->StartPreview(&bufferinfo);
+       _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-       __pCamcorderPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
 
        previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight; 
 
@@ -10741,22 +10443,22 @@ CamcorderForm::SendCameraToBackground(void)
        __pCameraInfoPanel->SetDrawIndicator(true);
        __pCameraInfoPanel->Invalidate(true);
 
-       if (__pMakerFocusTimer)
+       if (_pMakerFocusTimer)
        {
-               __pMakerFocusTimer->Cancel();
+               _pMakerFocusTimer->Cancel();
        }
 
-       if (__pCamcorderPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
-                       || __pCamcorderPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED)
+       if (_pCameraPresentationModel->GetRecorderState()== RECORDER_STATE_RECORDING
+                       || _pCameraPresentationModel->GetRecorderState() == RECORDER_STATE_PAUSED)
        {
-               __pCamcorderPresentationModel->StopRecord();
+               _pCameraPresentationModel->StopRecord();
 
-               r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
+               r = _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
                if (flashMode == FLASH_MODE_ON)
                {
-                       __pCamcorderPresentationModel->SetFlashMode(CAMERA_FLASH_MODE_ON);
+                       _pCameraPresentationModel->SetFlashMode(CAMERA_FLASH_MODE_ON);
                }
        }
 
@@ -10770,22 +10472,22 @@ CamcorderForm::SendCameraToBackground(void)
                __pCameraInfoPanel->Invalidate(true);
        }
 
-       __timeCount = 0;
-       __isRecording = false;
+       _timeCount = 0;
+       _isRecording = false;
        __setTimerInterval = false;
-       __pCamcorderPresentationModel->SetIntervalTimerRun(false);
-       __isRecordingPause = false;
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
+       _isRecordingPause = false;
        r = SetRecordButton(false);
        AppLogDebug("SetRecordButton() fail[%s]", GetErrorMessage(r));
 
-       if (__pIntervalValueTimer)
+       if (_pIntervalValueTimer)
        {
-               __pIntervalValueTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __pPopupTimer->Cancel();
+               _pPopupTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
@@ -10794,25 +10496,25 @@ CamcorderForm::SendCameraToBackground(void)
                __pCameraInfoPanel->Invalidate(true);
        }
 
-       if (__pChargingCompletedTimer != null)
+       if (_pChargingCompletedTimer != null)
        {
-               __chargingCount = 0;
-               __blinkCount  = 0;
-               __pChargingCompletedTimer->Cancel();
+               _chargingCount = 0;
+               _blinkCount  = 0;
+               _pChargingCompletedTimer->Cancel();
        }
 
-       if (__pPreviewFailPopupTimer != null)
+       if (_pPreviewFailPopupTimer != null)
        {
-               __pPreviewFailPopupTimer->Cancel();
+               _pPreviewFailPopupTimer->Cancel();
        }
 
        __pCameraInfoPanel->SetDrawMarkerFocus(false);
        __pCameraInfoPanel->Invalidate(true);
        HidePopup();    
 
-       __pCamcorderPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
-       __pCamcorderPresentationModel->StopCamera();
-       __pCamcorderPresentationModel->KeepScreenOnState(false, true);
+       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+       _pCameraPresentationModel->StopCamera();
+       _pCameraPresentationModel->KeepScreenOnState(false, true);
 
        AppLogDebug("EXIT");
 }
@@ -10879,9 +10581,9 @@ CamcorderForm::ShowCameraFailPopup(void)
        {
        case MSGBOX_RESULT_CLOSE:
                {
-                       __pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+                       _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
 
-                       r = __pCamcorderPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
+                       r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
                        AppLogDebug("SetValue fail [%s]", GetErrorMessage(r));
 
                        r = TerminateApp();
@@ -10917,69 +10619,6 @@ CamcorderForm::ShowSavingPopup(void)
        AppLogDebug("EXIT");
 }
 
-void
-CamcorderForm::ShowUnlaunchPopup(void)
-{
-       AppLogDebug("ENTER");
-       int modalResult = 0;
-       MessageBox msgBox;
-       String tmpString;
-       AppResource* pAppResource = null;
-       result r = E_SUCCESS;
-
-       pAppResource = Application::GetInstance()->GetAppResource();
-       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
-
-       pAppResource->GetString(L"IDS_CAM_POP_UNABLE_TO_START_CAMERA_DURING_CALL", tmpString);
-
-       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
-       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%d]", GetErrorMessage(r));
-       msgBox.ShowAndWait(modalResult);
-
-       __pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
-
-       r = TerminateApp();
-       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-       AppLogDebug("EXIT");
-}
-
-void
-CamcorderForm::ShowLowBatteryPopup(void)
-{
-       AppLogDebug("ENTER");
-       int modalResult = 0;
-       MessageBox msgBox;
-       String tmpString;
-       AppResource* pAppResource = null;
-       result r = E_SUCCESS;
-
-       pAppResource = Application::GetInstance()->GetAppResource();
-       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
-
-       pAppResource->GetString(L"IDS_COM_BODY_LOW_BATTERY", tmpString);
-
-       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
-       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
-       msgBox.ShowAndWait(modalResult);
-
-       switch (modalResult)
-       {
-       case MSGBOX_RESULT_CLOSE:
-               {
-                       AppLogDebug("MSGBOX_RESULT_CLOSE");
-                       __pCamcorderPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
-
-                       r = TerminateApp();
-                       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-               }
-               break;
-       
-       default:
-               break;
-       }
-       AppLogDebug("EXIT");
-}
-
 result
 CamcorderForm::SetScreenOverlayHelpTimer(void)
 {
@@ -10987,17 +10626,17 @@ CamcorderForm::SetScreenOverlayHelpTimer(void)
        result r = E_SUCCESS;
        int overlayHelpEnable = 0;
 
-       r = __pCamcorderPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
+       r = _pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("SetScreenOverlayHelpTimer : overlayHelpEnable = %d", overlayHelpEnable);
 
        if (overlayHelpEnable == SCREEN_OVERLAY_HELP_ENABLE)
        {
-               __pHelpCloseTimer = new (std::nothrow) Timer();
-               __pHelpCloseTimer->Construct(*this);
+               _pHelpCloseTimer = new (std::nothrow) Timer();
+               _pHelpCloseTimer->Construct(*this);
 
-               r = __pHelpCloseTimer->Start(MESSAGEBOX_DISPLAY_TIME_3_SEC);
+               r = _pHelpCloseTimer->Start(MESSAGEBOX_DISPLAY_TIME_3_SEC);
                TryCatch(r == E_SUCCESS, , "Timer::start fail[%s]", GetErrorMessage(r));
        }
 
@@ -11005,8 +10644,8 @@ CamcorderForm::SetScreenOverlayHelpTimer(void)
        return r;
 
 CATCH:
-       delete __pHelpCloseTimer;
-       __pHelpCloseTimer = null;
+       delete _pHelpCloseTimer;
+       _pHelpCloseTimer = null;
 
        AppLogDebug("EXIT - CATCH");
        return r;
@@ -11101,7 +10740,7 @@ CamcorderForm::DrawScreenOverlayHelp(void)
        TryCatch(__pHelpGoToPreviousScreen != null, r = E_FAILURE, "__pHelpGoToPreviousScreen is null");
        TryCatch(__pHelpGoToPreviousScreenText != null, r = E_FAILURE, "__pHelpGoToPreviousScreenText is null");
 
-       r = __pCamcorderPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
+       r = _pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("DrawScreenOverlayHelp : overlayHelpEnable = %d", overlayHelpEnable);
@@ -11322,11 +10961,11 @@ CamcorderForm::CheckCamcorderSettingLabel(void)
        {
                result r = E_SUCCESS;
 
-               TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-               __pAppTimer->Cancel();
+               TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-               TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+               r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+               TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                if (__pListViewGeneralTabMainMenu)
                {
@@ -11351,11 +10990,11 @@ CamcorderForm::CheckGeneralSettingLabel(void)
        {
                result r = E_SUCCESS;
 
-               TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-               __pAppTimer->Cancel();
+               TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
-               TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+               r = _pAppTimer->Start(CAMCORDER_TIMER_LIMIT);
+               TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                if (__pListViewCamcoderTabMainMenu)
                {
@@ -11416,7 +11055,7 @@ CamcorderForm::DrawRecord(bool isRecord)
        {
                timeCnt = __recordTimeCount;
 
-               if (__isRecording == true)
+               if (_isRecording == true)
                {
                        if (IsControlAlwaysOnTop(__pRecLabelRed) == false)
                        {
@@ -11485,7 +11124,7 @@ CamcorderForm::InitElapsedTimeLable(void)
        String maxTime = L"";
        String recSize = L"";
 
-       if (__isRecording == true || __isRecordingPause == true)
+       if (_isRecording == true || _isRecordingPause == true)
        {
                TryCatch(__pElapsedTimeLable != null, r = E_FAILURE, "__pElapsedTimeLable is null");
                TryCatch(__pElapsedTimeMaxLable != null, r = E_FAILURE, "__pElapsedTimeMaxLable is null");
@@ -11557,7 +11196,7 @@ CamcorderForm::DrawRecordTimer(void)
        TryCatch(__pElapsedRecordSizeLable != null, r = E_SYSTEM, "__pElapsedRecordSizeLable is null");
 
        timeCnt = __recordTimeCount;
-       recordedSize =  __pCamcorderPresentationModel->GetRecordingSize();
+       recordedSize =  _pCameraPresentationModel->GetRecordingSize();
        recSizeMB = recordedSize / DIVIDE_THOUSAND;
 
        recMin = (timeCnt % SECONDS_PER_HOUR) / SECONDS_PER_MINUTE;
@@ -11655,7 +11294,7 @@ CamcorderForm::DrawRecordTimer(void)
        __pElapsedRecordSizeLable->SetText(recSize);
        __pElapsedRecordSizeLable->SetTextColor(Color::GetColor(COLOR_ID_WHITE));
 
-       if (__isRecording == true)
+       if (_isRecording == true)
        {
                if (IsControlAlwaysOnTop(__pElapsedTimeLable) == false)
                {
@@ -12073,7 +11712,7 @@ CamcorderForm::CreateCamcorderTabSubMenuItem(int index, int itemWidth)
                {
                        int selfPortraitEnable = 0;
 
-                       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (__pRecordingResolutionList)
@@ -12170,7 +11809,7 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
        r = pItem->Construct(Dimension(itemWidth, H_SETTING_MENU_ITEM), LIST_ANNEX_STYLE_NORMAL);
        TryCatch(r == E_SUCCESS,,"Failed to construct CustomItem");
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        elementId = (index * MENU_TWO_ELEMENT);
@@ -12183,7 +11822,7 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
                {
                    if (index == CAMCORDER_SUB_MENU_CONTENT_RECORDING_RESOLUTION_MODE)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_RECORDING_RESOLUTION);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_RECORDING_RESOLUTION);
                                if (r == E_SUCCESS)
                                {
                                        if (__pRecordingResolutionList != null)
@@ -12225,7 +11864,7 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
                {
                        if (index == CAMCORDER_SUB_MENU_CONTENT_RECORDING_RESOLUTION_MODE)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_RECORDING_RESOLUTION);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_RECORDING_RESOLUTION);
                                if (r == E_SUCCESS)
                                {
                                        if (__pRecordingResolutionList != null)
@@ -12269,14 +11908,14 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
        {
                int storageType = STORAGE_TYPE_PHONE;
 
-               r = __pCamcorderPresentationModel->GetValue(STORAGE_TYPE, storageType);
+               r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
-               if (storageType == STORAGE_TYPE_MEMORYCARD && __pCamcorderPresentationModel->IsStorageCardMounted() == false)
+               if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
                {
-                       r = __pCamcorderPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+                       r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
                        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
-                       __pCamcorderPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+                       _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
                }
 
                if (index == CAMCORDER_SUB_MENU_CONTENT_RECORDING_RESOLUTION_MODE)
@@ -12285,7 +11924,7 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
                }
                else
                {
-                       r = __pCamcorderPresentationModel->GetValue(arrRegStringSupport[index], regVal);
+                       r = _pCameraPresentationModel->GetValue(arrRegStringSupport[index], regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                }
 
@@ -12331,7 +11970,7 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
                        {
                                if (index == CAMCORDER_SUB_MENU_CONTENT_RECORDING_RESOLUTION_MODE)
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_RECORDING_RESOLUTION);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_RECORDING_RESOLUTION);
                                        if (r == E_SUCCESS)
                                        {
 
@@ -12366,7 +12005,7 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
                        {
                                if (index == CAMCORDER_SUB_MENU_CONTENT_RECORDING_RESOLUTION_MODE)
                                {
-                                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_RECORDING_RESOLUTION);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_RECORDING_RESOLUTION);
                                        if (r == E_SUCCESS)
                                        {
                                                if (__pRecordingResolutionList != null)
@@ -12407,7 +12046,7 @@ CamcorderForm::CreateCamcorderTabMainMenuItem(int index, int itemWidth)
                {
                        int regVal = 0;
 
-                       r = __pCamcorderPresentationModel->GetValue(RECORDING_MODE, regVal);
+                       r = _pCameraPresentationModel->GetValue(RECORDING_MODE, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        strTmp = __pSettingMenuString[index][regVal + INDEX_UNIT_ONE];
@@ -12474,7 +12113,7 @@ CamcorderForm::CreateGeneralTabMainMenuItem(int index, int itemWidth)
        pItem->Construct(Dimension(itemWidth, H_SETTING_MENU_ITEM), LIST_ANNEX_STYLE_NORMAL);
        TryCatch(r == E_SUCCESS, , "Failed to construct CustomItem");
  
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        elementId = (index * MENU_TWO_ELEMENT);
@@ -12492,41 +12131,41 @@ CamcorderForm::CreateGeneralTabMainMenuItem(int index, int itemWidth)
                bool value = false;
                int storageType = STORAGE_TYPE_PHONE;
 
-               __pCamcorderPresentationModel->GetValue(STORAGE_TYPE, storageType);
+               _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
 
-               if (storageType == STORAGE_TYPE_MEMORYCARD && __pCamcorderPresentationModel->IsStorageCardMounted() == false)
+               if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
                {
-                       r = __pCamcorderPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+                       r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
                        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
-                       __pCamcorderPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+                       _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
                }
 
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, value);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, value);
                }
                else
                {
-                       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, value);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, value);
                }
 
                if (value == true && r == E_SUCCESS)
                {
-                       r = __pCamcorderPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
+                       r = _pCameraPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                }
                else
                {
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, value);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, value);
                        }
                        else
                        {
-                               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, value);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, value);
                        }
 
-                       r = __pCamcorderPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
+                       r = _pCameraPresentationModel->GetValue(arrRegStringSupporExposure[index], regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                }
 
@@ -12607,25 +12246,25 @@ CamcorderForm::CreateFlashMainMenuItem(int index, int itemWidth)
        pAppResource = Application::GetInstance()->GetAppResource();
        TryCatch(pAppResource != null, , "pAppResource is null");
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
                AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-               r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_SECONDARY, flashMode);
+               r = _pCameraPresentationModel->GetValue(FLASH_MODE_SECONDARY, flashMode);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                if (flashMode != FLASH_MODE_OFF)
                {
-                       r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
+                       r = _pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                if (value == true && r == E_SUCCESS)
                {
@@ -12635,18 +12274,18 @@ CamcorderForm::CreateFlashMainMenuItem(int index, int itemWidth)
                {
                        AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-                       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
+                       r = _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (flashMode != FLASH_MODE_OFF)
                        {
-                               r = __pCamcorderPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
+                               r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                        }
                }
        }
 
-       r = __pCamcorderPresentationModel->GetValue(FLASH_MODE_PRIMARY, regVal);
+       r = _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, regVal);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        switch (index)
@@ -12706,7 +12345,7 @@ CamcorderForm::CreateFlashMainMenuItem(int index, int itemWidth)
 
        elementId++;
 
-       r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
        if (value == true && r == E_SUCCESS)
        {
@@ -12781,12 +12420,12 @@ CamcorderForm::CreateWhiteBalanceItem(int index, int itemWidth)
        pAppResource = Application::GetInstance()->GetAppResource();
        TryCatch(pAppResource != null,,"pAppResource is null");
 
-       r = __pCamcorderPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
 
                if (r == E_SUCCESS)
                {
@@ -12796,15 +12435,15 @@ CamcorderForm::CreateWhiteBalanceItem(int index, int itemWidth)
                {
                        AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-                       r =__pCamcorderPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, 0);
+                       r =_pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, 0);
                        TryCatch(r == E_SUCCESS, , "Reg SetValue() fail[%s]", GetErrorMessage(r));
                }
-               r = __pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
+               r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
        }
        else
        {
-               r = __pCamcorderPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
 
                if (r == E_SUCCESS)
                {
@@ -12814,10 +12453,10 @@ CamcorderForm::CreateWhiteBalanceItem(int index, int itemWidth)
                {
                        AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-                       r =__pCamcorderPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, 0);
+                       r =_pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, 0);
                        TryCatch(r == E_SUCCESS, , "Reg SetValue() fail[%s]", GetErrorMessage(r));
                }
-               r = __pCamcorderPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
+               r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
        }
 
@@ -13344,7 +12983,7 @@ CamcorderForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
 
                        pAppResource->GetString(arrString[index], tmpString);
 
-                       r = __pCamcorderPresentationModel->GetValue(TIMER_INTERVAL, regVal);
+                       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (index == regVal)
@@ -13401,7 +13040,7 @@ CamcorderForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
                        String str = L"";
                        elementId = (index * MENU_TWO_ELEMENT);
 
-                       r = __pCamcorderPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
+                       r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (index == regVal)
@@ -13473,7 +13112,7 @@ CamcorderForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
                        String str = L"";
                        elementId = (index * MENU_TWO_ELEMENT);
 
-                       r = __pCamcorderPresentationModel->GetValue(STORAGE_TYPE, regVal);
+                       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (index == regVal)
@@ -13517,7 +13156,7 @@ CamcorderForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
 
                        if (str.Equals(String(IDS_CAM_OPT_MEMORY_CARD)))
                        {
-                               if (__pCamcorderPresentationModel->IsStorageCardMounted() == false)
+                               if (_pCameraPresentationModel->IsStorageCardMounted() == false)
                                {
                                        r = pItem->AddElement(rectThreeTextItem, elementId, tmpString, FONT_SIZE_SETTING_SUB_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, true);
                                }
@@ -13676,34 +13315,24 @@ CATCH:
 }
 
 void
-CamcorderForm::RemoveAllEventListener(void)
-{
-       AppLogDebug("ENTER");           
-       RemoveOrientationEventListener(*this);
-       RemoveTouchEventListener(*this);
-       RemoveKeyEventListener(*this);
-       AppLogDebug("EXIT");
-}
-
-void
 CamcorderForm::ReInitialise(void)
 {
        result r = E_SUCCESS;
        BufferInfo bufferinfo;
-       AppLogDebug("Camera State is %d",__pCamcorderPresentationModel->GetCameraState());
-       AppLogDebug("Video State is %d",__pCamcorderPresentationModel->GetRecorderState());
-       __pCamcorderPresentationModel->StopCamera();
+       AppLogDebug("Camera State is %d",_pCameraPresentationModel->GetCameraState());
+       AppLogDebug("Video State is %d",_pCameraPresentationModel->GetRecorderState());
+       _pCameraPresentationModel->StopCamera();
        CameraApp* pApp = static_cast<CameraApp*>(UiApp::GetInstance());
 
        if (pApp->GetAppUiState() == APP_UI_STATE_FOREGROUND)
        {
-               r = __pCamcorderPresentationModel->InitializeCamcorder();
+               r = _pCameraPresentationModel->InitializeCamcorder();
                TryReturnVoid(r == E_SUCCESS, "InitializeCamcorder [%s]", GetErrorMessage(r));
                r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                TryReturnVoid(r == E_SUCCESS, "__pOverlayPanel->GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
 
-               __pCamcorderPresentationModel->StartPreview(&bufferinfo);
-               __pCamcorderPresentationModel->SetContinuousAutoFocus();
+               _pCameraPresentationModel->StartPreview(&bufferinfo);
+               _pCameraPresentationModel->SetContinuousAutoFocus();
        }
 }
 
index 705f680..c5b46e4 100644 (file)
@@ -249,8 +249,7 @@ static const int MENU_COUNT_CLEAR = 0;
 static const int MENU_MODE_DISABLE = -1;
 static const int MENU_TWO_ELEMENT = 2;
 static const int MENU_THREE_ELEMENT = 3;
-static const int MESSAGEBOX_DISPLAY_TIME_2_SEC = 2000;
-static const int MESSAGEBOX_DISPLAY_TIME_3_SEC = 3000;
+
 static const int UI_INDICATOR_STORAGE_FREE_SPACE_BUFFER_LEN = 2048;
 static const int MULTIPLY_BY_TEN = 10;
 static const int NORMAL_MODE_RATIO = 13;
@@ -351,19 +350,8 @@ static const CameraBatteryStateTable batteryTable[] =
 };
 
 CameraForm::CameraForm(void)
-       : __pCameraPresentationModel(null)
-       , __pOverlayPanel(null)
+       : __pOverlayPanel(null)
        , __screenMode(SCREEN_MODE_NORMAL)
-       , __pAppTimer(null)
-       , __pIntervalValueTimer(null)
-       , __pCaptureStartTimer(null)
-       , __pPopupTimer(null)
-       , __pExposureCloseTimer(null)
-       , __pTouchAutoFocusTimer(null)
-       , __pHelpCloseTimer(null)
-       , __pChargingTimer(null)
-       , __pChargingCompletedTimer(null)
-       , __pPreviewFailPopupTimer(null)
        , __pListViewCameraTabMainMenu(null)
        , __pListViewCameraTabSubMenu(null)
        , __pListViewGeneralTabMainMenu(null)
@@ -382,12 +370,7 @@ CameraForm::CameraForm(void)
        , __settingExposure(0)
        , __primaryCurrentResolutionIndex(0)
        , __secondaryCurrentResolutionIndex(0)
-       , __timeCount(0)
-       , __chargingCount(0)
-       , __blinkCount(0)
        , __isTimerRunning(false)
-       , __closeTimerValue(0)
-       , __isUsedTimerCaptured(false)
        , __previewResolutionWidth(0)
        , __previewResolutionHeight(0)
        , __captureResolutionWidth(0)
@@ -449,7 +432,6 @@ CameraForm::CameraForm(void)
        , __pFileEventManager(null)
        , __uri(L"")
        , __mime(L"")
-       , __appControlActionCompleted(false)
        , __formStatusFrameDeattivated(false)
        , __pResetPopUp(null)
        , __pYes(null)
@@ -478,7 +460,7 @@ CameraForm::OnInitializing(void)
        int timerInterval = 0;
        String filePath = L"";
 
-       __appControlActionCompleted = false;
+       _appControlActionCompleted = false;
        __formStatusFrameDeattivated = false;
 
        AddKeyEventListener(*this);
@@ -488,7 +470,8 @@ CameraForm::OnInitializing(void)
        __deviceOrientation = __dir;
        AppLogDebug("__dir = %d && __deviceOrientation = %d", __dir, __deviceOrientation);
 
-       __pCameraPresentationModel->SetOrientation(__dir);
+       _pCameraPresentationModel->SetOrientation(__dir);
+       _pCurrentSourceForm = SOURCE_FORM_CAMERA;
 
        InitAppTimer();
        InitPreviewFailPopupTimer();
@@ -498,23 +481,23 @@ CameraForm::OnInitializing(void)
        InitChargingTimer();
        InitChargingCompletedTimer();
 
-       r = __pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
+       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
        if (r != E_SUCCESS)
        {
                storageType = STORAGE_TYPE_PHONE;
        }
 
-       if (storageType == STORAGE_TYPE_MEMORYCARD && __pCameraPresentationModel->IsStorageCardMounted() == false)
+       if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
        {
-               r = __pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+               r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-               __pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+               _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
        }
 
-       r = __pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
+       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
-       r = __pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
+       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        __pCameraInfoPanel = new (std::nothrow) CameraInfoPanel();
@@ -576,7 +559,7 @@ CameraForm::OnInitializing(void)
        r = __pFileEventManager->Construct(*this);
        TryCatch(r == E_SUCCESS, , "__pFileEventManager Construct fail[%s]", GetErrorMessage(r));
 
-       filePath = __pCameraPresentationModel->GetfilePath(storageType);
+       filePath = _pCameraPresentationModel->GetfilePath(storageType);
        AppLogDebug("filePath %ls", filePath.GetPointer());
 
        if (File::IsFileExist(filePath))
@@ -587,8 +570,8 @@ CameraForm::OnInitializing(void)
        AppLogDebug("FileEventManager()::AddPath() fail[%s]", GetErrorMessage(r));
 
 
-       r = __pCameraPresentationModel->GetValue(PRIMARY_RESOLUTION_INDEX, __primaryCurrentResolutionIndex);
-       r = __pCameraPresentationModel->GetValue(SECONDARY_RESOLUTION_INDEX, __secondaryCurrentResolutionIndex);
+       r = _pCameraPresentationModel->GetValue(PRIMARY_RESOLUTION_INDEX, __primaryCurrentResolutionIndex);
+       r = _pCameraPresentationModel->GetValue(SECONDARY_RESOLUTION_INDEX, __secondaryCurrentResolutionIndex);
 
        AppLogDebug("EXIT");
        return r;
@@ -608,17 +591,17 @@ CameraForm::OnTerminating(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       __pCameraPresentationModel->KeepScreenOnState(false, true);
+       _pCameraPresentationModel->KeepScreenOnState(false, true);
 
-       __pCameraPresentationModel->RemovePresentationChangedEventListener(null);
+       _pCameraPresentationModel->RemovePresentationChangedEventListener(null);
 
        __pCameraInfoPanel->SetDrawIndicatorStroageInfo(false);
 
        RemoveAllEventListener();
 
-       __pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
-       r = __pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_DISABLE);
+       r = _pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_DISABLE);
        AppLogDebug("SetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (__isLockScreenMode)
@@ -632,7 +615,7 @@ CameraForm::OnTerminating(void)
 
        __isTimerRunning = false;
 
-       __pCameraPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
        __resolutionChange = false;
 
@@ -642,7 +625,7 @@ CameraForm::OnTerminating(void)
 
        __isProhibitionTouchEvent = false;
 
-       __pCameraPresentationModel = null;
+       _pCameraPresentationModel = null;
        __pCameraStarterThread = null;
 
        __formStatusFrameDeattivated = false;
@@ -719,7 +702,7 @@ CameraForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
 
        __isTimerRunning = false;
 
-       __pCameraPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
        StartInitAppTimer();
 
@@ -730,23 +713,23 @@ CameraForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
 
        StartInitChargingTimer();
 
-       __pCameraPresentationModel->AddPresentationChangedEventListener(*this);
+       _pCameraPresentationModel->AddPresentationChangedEventListener(*this);
 
-       __pCameraPresentationModel->KeepScreenOnState(true, false);
+       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-       r = __pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       r = _pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
        TryReturnVoid(r == E_SUCCESS, "SetMode() failed:%s", GetErrorMessage(r));
 
        Update();
 
-       previewResolutionDim = __pCameraPresentationModel->GetPreviewResolution();
+       previewResolutionDim = _pCameraPresentationModel->GetPreviewResolution();
 
        AppLogDebug("CameraForm::GetPreviewResolution(W:%d, H:%d)", previewResolutionDim.width, previewResolutionDim.height);
 
        __previewResolutionWidth = previewResolutionDim.width;
        __previewResolutionHeight = previewResolutionDim.height;
 
-       captureResolutionDim = __pCameraPresentationModel->GetCaptureResolution();
+       captureResolutionDim = _pCameraPresentationModel->GetCaptureResolution();
 
        __captureResolutionWidth = captureResolutionDim.width;
        __captureResolutionHeight = captureResolutionDim.height;
@@ -783,7 +766,7 @@ CameraForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                __pCameraInfoPanel->Invalidate(true);
        }
 
-       r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
+       r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
        TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
 
        if (regVal == DISABLE_GUIDELINE)
@@ -797,14 +780,14 @@ CameraForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
 
        InDrawFocus();
 
-       r = __pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       r = _pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
        TryReturnVoid(r == E_SUCCESS, "Write Reg fail[%s]", GetErrorMessage(r));
 
        MakeSettingPopupTab(false);
 
        HidePopup();
 
-       isInitCameraStaus = __pCameraPresentationModel->GetInitCameraStatus();
+       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
        AppLogDebug("isInitCameraStaus [%d]", isInitCameraStaus);
 
        if (isInitCameraStaus)
@@ -824,10 +807,10 @@ CameraForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-                       __pCameraPresentationModel->StartPreview(&bufferinfo);
+                       _pCameraPresentationModel->StartPreview(&bufferinfo);
                }
 
-               __pCameraPresentationModel->SetContinuousAutoFocus();
+               _pCameraPresentationModel->SetContinuousAutoFocus();
 
                previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight; 
 
@@ -836,16 +819,16 @@ CameraForm::OnSceneActivatedN(const Tizen::Ui::Scenes::SceneId& previousSceneId,
                SetCameraSettingsDevice();
        }
 
-       __pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
+       _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
 
-       if (storageType == STORAGE_TYPE_MEMORYCARD && __pCameraPresentationModel->IsStorageCardMounted() == false)
+       if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
        {
-               r = __pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
-               __pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+               r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+               _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
        }
 
-       batteryLevel = __pCameraPresentationModel->GetBatteryLevel();
-       isCharging = __pCameraPresentationModel->IsCharging();
+       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+       isCharging = _pCameraPresentationModel->IsCharging();
 
        AppLogDebug("batteryLevel = %d", batteryLevel);
        if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
@@ -867,7 +850,7 @@ CameraForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
        AppLogDebug("ENTER");
        __isTimerRunning = false;
 
-       __pCameraPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
        __resolutionChange = false;
 
@@ -887,11 +870,11 @@ CameraForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
 
        HideUiSettingMenu();
 
-       if (__isUsedTimerCaptured == true)
+       if (_isUsedTimerCaptured == true)
        {
-               __timeCount = 0;
+               _timeCount = 0;
 
-               __isUsedTimerCaptured = false;
+               _isUsedTimerCaptured = false;
 
                if (__pCameraInfoPanel->GetDrawPopupTimer() == true)
                {
@@ -936,7 +919,7 @@ CameraForm::Update(void)
        {
                TryCatch(__pThumbnailPanel != null, , "__pThumbnailPanel is null");
 
-               pThumbnailBitmap = __pCameraPresentationModel->GetLatestThumbnail();
+               pThumbnailBitmap = _pCameraPresentationModel->GetLatestThumbnail();
 
                if (pThumbnailBitmap == null)
                {
@@ -1021,7 +1004,7 @@ CameraForm::OnCapuredPerform(void)
        Bitmap* pThumbnailBitmap = null;
        Bitmap* pRotateBitmap = null;
 
-       pThumbnailBitmap = __pCameraPresentationModel->GetLatestThumbnail();
+       pThumbnailBitmap = _pCameraPresentationModel->GetLatestThumbnail();
 //     TryCatch(pThumbnailBitmap != null, , "pThumbnailBitmap is null");
        if (pThumbnailBitmap == null)
        {
@@ -1063,21 +1046,21 @@ CameraForm::OnCapuredPerform(void)
        }
        else
        {
-               TryCatch(__pAppTimer != null, , "__pAppTimer is null");
-               __pAppTimer->Cancel();
+               TryCatch(_pAppTimer != null, , "_pAppTimer is null");
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-               TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+               r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+               TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                TryCatch(r == E_SUCCESS, , "GetBackgroundBufferInfo start fail[%s]", GetErrorMessage(r));
 
-               __pCameraPresentationModel->StartPreview(&bufferinfo);
+               _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-               __pCameraPresentationModel->SetContinuousAutoFocus();
+               _pCameraPresentationModel->SetContinuousAutoFocus();
        }
 
-       r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
+       r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (guideLineEnable == DISABLE_GUIDELINE)
@@ -1094,7 +1077,7 @@ CameraForm::OnCapuredPerform(void)
 
        StopPopupTimer();
 
-       __isUsedTimerCaptured = false;
+       _isUsedTimerCaptured = false;
 
        Update();
 
@@ -1132,10 +1115,10 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                        AppLogDebug("CAMERA_ACTION_EVENT_TOUCH_AUTO_FOCUSED");
                        DrawFocus(CAMERA_FOCUS_READY);
 
-                       TryReturnVoid(__pTouchAutoFocusTimer != null, "__pTouchAutoFocusTimer is null");
-                       __pTouchAutoFocusTimer->Cancel();
+                       TryReturnVoid(_pTouchAutoFocusTimer != null, "_pTouchAutoFocusTimer is null");
+                       _pTouchAutoFocusTimer->Cancel();
 
-                       r = __pTouchAutoFocusTimer->Start(CAMERA_TIMER_2_SEC);
+                       r = _pTouchAutoFocusTimer->Start(CAMERA_TIMER_2_SEC);
                        TryReturnVoid(r == E_SUCCESS, "Faled Start Timer[%s]", GetErrorMessage(r));
                }
                break;
@@ -1168,9 +1151,9 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                        bool isCharging = false;
                        BatteryLevel batteryLevel;
 
-                       __pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+                       _pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
 
-                       requestType = __pCameraPresentationModel->GetAppControlRequestType();
+                       requestType = _pCameraPresentationModel->GetAppControlRequestType();
 
                        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED)
                        {
@@ -1181,7 +1164,7 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                                TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-                               __pCameraPresentationModel->StartPreview(&bufferinfo);
+                               _pCameraPresentationModel->StartPreview(&bufferinfo);
 
                                __isProhibitionTouchEvent = true;
 
@@ -1193,8 +1176,8 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                OnCapuredPerform();
                        }
 
-                       batteryLevel = __pCameraPresentationModel->GetBatteryLevel();
-                       isCharging = __pCameraPresentationModel->IsCharging();
+                       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                       isCharging = _pCameraPresentationModel->IsCharging();
 
                        AppLogDebug("batteryLevel = %d", batteryLevel);
                        AppLogDebug("isCharging = %d", isCharging);
@@ -1224,19 +1207,19 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                __pBatteryState->Show();
                        }
 
-                       if (__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
+                       if (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
                        {
                                AppLogDebug("Camera State is CAMERA_STATE_ERROR");
-                               __pCameraPresentationModel->StopCamera();
+                               _pCameraPresentationModel->StopCamera();
 
-                               r = __pCameraPresentationModel->InitializeCamera();
+                               r = _pCameraPresentationModel->InitializeCamera();
                                TryReturnVoid(r == E_SUCCESS, "InitializeCamera [%s]", GetErrorMessage(r));
 
                                r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                                TryReturnVoid(r == E_SUCCESS, "__pOverlayPanel->GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
 
-                               __pCameraPresentationModel->StartPreview(&bufferinfo);
-                               __pCameraPresentationModel->SetContinuousAutoFocus();
+                               _pCameraPresentationModel->StartPreview(&bufferinfo);
+                               _pCameraPresentationModel->SetContinuousAutoFocus();
                        }
                }
                break;
@@ -1259,7 +1242,7 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                pCameraApp->SetFrameEnabled(true);
                        }
 
-                       isInitCameraStaus = __pCameraPresentationModel->GetInitCameraStatus();
+                       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
                        AppLogDebug("isInitCameraStaus = %d", isInitCameraStaus);
 
                        if (isInitCameraStaus == false)
@@ -1268,28 +1251,28 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                return;
                        }
 
-                       if (__pCameraPresentationModel->IsCameraPoweredOn())
+                       if (_pCameraPresentationModel->IsCameraPoweredOn())
                        {
                                result r = E_SUCCESS;
                                BufferInfo bufferinfo;
                                AppLogDebug("CAMERA_ACTION_EVENT_FRAME_ACTIVATED:CameraPoweredOn");
 
-                               if (__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
+                               if (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_ERROR)
                                {
                                        AppLogDebug("Camera State is CAMERA_STATE_ERROR");
-                                       __pCameraPresentationModel->StopCamera();
+                                       _pCameraPresentationModel->StopCamera();
 
-                                       r = __pCameraPresentationModel->InitializeCamera();
+                                       r = _pCameraPresentationModel->InitializeCamera();
                                        TryReturnVoid(r == E_SUCCESS, "InitializeCamcorder [%s]", GetErrorMessage(r));
 
                                        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                                        TryReturnVoid(r == E_SUCCESS, "__pOverlayPanel->GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
 
-                                       __pCameraPresentationModel->StartPreview(&bufferinfo);
-                                       __pCameraPresentationModel->SetContinuousAutoFocus();
+                                       _pCameraPresentationModel->StartPreview(&bufferinfo);
+                                       _pCameraPresentationModel->SetContinuousAutoFocus();
                                }
-                               batteryLevel = __pCameraPresentationModel->GetBatteryLevel();
-                               isCharging = __pCameraPresentationModel->IsCharging();
+                               batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                               isCharging = _pCameraPresentationModel->IsCharging();
 
                                AppLogDebug("batteryLevel = %d", batteryLevel);
 
@@ -1316,8 +1299,8 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                        GetCameraToForeground();
                                }
 
-                               batteryLevel = __pCameraPresentationModel->GetBatteryLevel();
-                               isCharging = __pCameraPresentationModel->IsCharging();
+                               batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                               isCharging = _pCameraPresentationModel->IsCharging();
 
                                AppLogDebug("batteryLevel = %d", batteryLevel);
                                if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
@@ -1351,7 +1334,7 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
 
                        __formStatusFrameDeattivated = true;
 
-                       isInitCameraStaus = __pCameraPresentationModel->GetInitCameraStatus();
+                       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
                        AppLogDebug("isInitCameraStaus = %d", isInitCameraStaus);
 
                        if (isInitCameraStaus == false)
@@ -1398,7 +1381,7 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                                return;
                        }
 
-                       if (__pCameraPresentationModel->GetStartPreviewException())
+                       if (_pCameraPresentationModel->GetStartPreviewException())
                        {
                                AppLogDebug("CAMERA_ACTION_EVENT_PREVIEW_START_FAILED");
 
@@ -1413,8 +1396,8 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                        bool isCharging = false;
                        BatteryLevel batteryLevel;
 
-                       batteryLevel = __pCameraPresentationModel->GetBatteryLevel();
-                       isCharging = __pCameraPresentationModel->IsCharging();
+                       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                       isCharging = _pCameraPresentationModel->IsCharging();
 
                        AppLogDebug("batteryLevel = %d", batteryLevel);
                        AppLogDebug("isCharging = %d", isCharging);
@@ -1423,10 +1406,10 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                {
                        if (batteryLevel == BATTERY_CRITICAL || batteryLevel == BATTERY_EMPTY)
                        {
-                               __pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
+                               _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
 
-                               if ((__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_CAPTURING
-                                               || __pCameraPresentationModel->GetCameraState() == CAMERA_STATE_CAPTURED)
+                               if ((_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_CAPTURING
+                                               || _pCameraPresentationModel->GetCameraState() == CAMERA_STATE_CAPTURED)
                                                && __isTimerRunning == false)
                                {
                                        AppLogDebug("CAPTURING or CAPTURED");
@@ -1469,7 +1452,7 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
 
                        int requestType = 0;
 
-                       requestType = __pCameraPresentationModel->GetAppControlRequestType();
+                       requestType = _pCameraPresentationModel->GetAppControlRequestType();
 
                        if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET && requestType == CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED)
                        {
@@ -1480,7 +1463,7 @@ CameraForm::OnCameraActionPerformed(CameraActionEvent event)
                        }
                        else
                        {
-                               __pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+                               _pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
 
                                Update();
 
@@ -1577,7 +1560,7 @@ CameraForm::InitSettingMenuPanel(void)
        r = UpdateUiPanelIcon();
        //TryCatch(r == E_SUCCESS, r = E_SYSTEM, "UpdateSetUiPanelIcon() - fail[%s]", GetErrorMessage(r));
 
-       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
+       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
        AppLogDebug("GetMediaCapability [%s]", GetErrorMessage(r));
        if (cameraCount > SUPPORTED_CAMERA_NUM)
        {
@@ -1609,14 +1592,14 @@ CameraForm::OnTouchModeSwitch(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       if (__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW)
+       if (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW)
        {
                SceneManager* pSceneManager = SceneManager::GetInstance();
                AppAssert(pSceneManager);
 
                AppLogDebug("GoForward to IDSCN_CAMCORDER!!!");
 
-               r = __pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
+               r = _pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_RECORD);
                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                r = pSceneManager->GoForward(ForwardSceneTransition(IDSCN_CAMCORDER));
@@ -1640,24 +1623,24 @@ CameraForm::OnTouchDrawExposure(const Tizen::Graphics::Point& currentPosition)
                || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
        {
                r = DrawExposureSlider(currentPosition, DRAW_RELEASED);
-               __closeTimerValue = UNIT_VALUE_ZERO;
+               _closeTimerValue = UNIT_VALUE_ZERO;
 
-               TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-               __pExposureCloseTimer->Cancel();
+               TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+               _pExposureCloseTimer->Cancel();
 
-               r = __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
-               TryReturnVoid(r == E_SUCCESS, "__pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
+               r = _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+               TryReturnVoid(r == E_SUCCESS, "_pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
        }
        else
        {
                r = DrawExposureSlider(currentPosition, DRAW_RELEASED);
-               __closeTimerValue = UNIT_VALUE_ZERO;
+               _closeTimerValue = UNIT_VALUE_ZERO;
 
-               TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-               __pExposureCloseTimer->Cancel();
+               TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+               _pExposureCloseTimer->Cancel();
 
-               r = __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
-               TryReturnVoid(r == E_SUCCESS, "__pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
+               r = _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+               TryReturnVoid(r == E_SUCCESS, "_pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
        }
        AppLogDebug("EXIT");
 }
@@ -1669,17 +1652,17 @@ CameraForm::OnTouchLaunchImageview(void)
        int storageCardChageState = CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN;
        String fullFileName = L"";
 
-       if (__pCameraPresentationModel->GetLatestThumbnail() != null)
+       if (_pCameraPresentationModel->GetLatestThumbnail() != null)
        {
-               storageCardChageState = __pCameraPresentationModel->GetStorageCardChageState();
+               storageCardChageState = _pCameraPresentationModel->GetStorageCardChageState();
 
                if (storageCardChageState == CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_MOUNT_TO_UNMOUNT)
                {
                        AppLogDebug("MOUNT_TO_UNMOUNT : Don't LaunchImageview");
 
-                       __pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+                       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
-                       fullFileName = __pCameraPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+                       fullFileName = _pCameraPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
 
                        if (fullFileName == L"")
                        {
@@ -1695,9 +1678,9 @@ CameraForm::OnTouchLaunchImageview(void)
                else
                {
                        AppLogDebug("LaunchImageview");
-                       __pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+                       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
-                       fullFileName = __pCameraPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+                       fullFileName = _pCameraPresentationModel->GetContentFilePath(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
 
                        if (fullFileName == L"")
                        {
@@ -1718,27 +1701,27 @@ CameraForm::OnTimerCapturePause(void)
        AppLogDebug("ENTER");
        if (__isTimerRunning == true)
        {
-               if (__pPopupTimer != null)
+               if (_pPopupTimer != null)
                {
-                       __pPopupTimer->Cancel();
+                       _pPopupTimer->Cancel();
 
-                       delete __pPopupTimer;
-                       __pPopupTimer = null;
+                       delete _pPopupTimer;
+                       _pPopupTimer = null;
                }
 
-               __timeCount = INDEX_UNIT_ZERO;
+               _timeCount = INDEX_UNIT_ZERO;
 
-               if (__isUsedTimerCaptured == true)
+               if (_isUsedTimerCaptured == true)
                {
                        __isTimerRunning = false;
 
-                       __pCameraPresentationModel->SetIntervalTimerRun(false);
+                       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
-                       __isUsedTimerCaptured = false;
+                       _isUsedTimerCaptured = false;
 
-                       if (__pIntervalValueTimer != null)
+                       if (_pIntervalValueTimer != null)
                        {
-                               __pIntervalValueTimer->Cancel();
+                               _pIntervalValueTimer->Cancel();
                        }
                        __pCameraInfoPanel->SetDrawPopupTimerUpdate(false);
 
@@ -1826,7 +1809,7 @@ CameraForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphi
        result r = E_SUCCESS;
        String controlName = L"";
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnTouchPressed >> TerminateApp Execution");
                return;
@@ -1840,19 +1823,19 @@ CameraForm::OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphi
                return;
        }
 
-       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-       __pAppTimer->Cancel();
+       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+       _pAppTimer->Cancel();
 
-       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
        if (__pCameraInfoPanel->GetDrawExposure() == true)
        {
-               TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-               __pExposureCloseTimer->Cancel();
+               TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+               _pExposureCloseTimer->Cancel();
 
-               r = __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
-               TryReturnVoid(r == E_SUCCESS, "__pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
+               r = _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+               TryReturnVoid(r == E_SUCCESS, "_pExposureCloseTimer start fail[%s]", GetErrorMessage(r));
        }
        AppLogDebug("EXIT");
 }
@@ -1869,12 +1852,12 @@ CameraForm::OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Gr
                return;
        }
 
-       if ((controlName.Equals(String(IDS_ACTION_UI_PANEL_CAPTURE_NAME))) && (__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
+       if ((controlName.Equals(String(IDS_ACTION_UI_PANEL_CAPTURE_NAME))) && (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
        {
                AppLogDebug("OnTouchLongPressed Action");
                if (source.Equals(*__pShutterButton) == true)
                {
-                       __pCameraPresentationModel->SetContinuousAutoFocus();
+                       _pCameraPresentationModel->SetContinuousAutoFocus();
                }
        }
        AppLogDebug("EXIT");
@@ -1888,7 +1871,7 @@ CameraForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
        int checkActivePanel = -1;
        bool doHidePopup = false;
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnTouchPressed >> TerminateApp Execution");
                return;
@@ -1906,11 +1889,11 @@ CameraForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
        {
                if (source.Equals(*__pShutterButton) == true)
                {
-                       __closeTimerValue = 0;
+                       _closeTimerValue = 0;
 
-                       if (__pExposureCloseTimer)
+                       if (_pExposureCloseTimer)
                        {
-                               __pExposureCloseTimer->Cancel();
+                               _pExposureCloseTimer->Cancel();
                        }
 
                        __pCameraInfoPanel->SetDrawExposure(false);
@@ -1931,7 +1914,7 @@ CameraForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
 
        if ((doHidePopup == false) && (__pCameraInfoPanel->GetDrawExposure() == false))
        {
-               if ((controlName.Equals(String(IDS_CAMERA_INFO_PANEL_NAME))) && (__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
+               if ((controlName.Equals(String(IDS_CAMERA_INFO_PANEL_NAME))) && (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
                {
                        DrawTouchAutoFocus(currentPosition);
                }
@@ -1984,7 +1967,7 @@ CameraForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
                CheckGeneralSettingLabel();
        }
 
-       if ((controlName.Equals(String(IDS_ACTION_UI_PANEL_CAPTURE_NAME))) && (__pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
+       if ((controlName.Equals(String(IDS_ACTION_UI_PANEL_CAPTURE_NAME))) && (_pCameraPresentationModel->GetCameraState() == CAMERA_STATE_PREVIEW))
        {
                if (source.Equals(*__pShutterButton) == true)
                {
@@ -1995,7 +1978,7 @@ CameraForm::OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graph
        if (controlName.Equals(String(IDS_THUMBNAIL_PANLE_NAME))
                && __pThumbnailPanel->GetShowState() == true
                && (GetAppLaunchType() != APP_LAUNCH_TYPE_REQUESET)
-               && __pCameraPresentationModel->GetCameraState()!= CAMERA_STATE_CAPTURED
+               && _pCameraPresentationModel->GetCameraState()!= CAMERA_STATE_CAPTURED
        )
        {
                if (source.Equals(*__pThumbnailPanel) == true)
@@ -2014,7 +1997,7 @@ CameraForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics
        String controlName = L"";
        result r = E_SUCCESS;
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnTouchPressed >> TerminateApp Execution");
                return;
@@ -2034,10 +2017,10 @@ CameraForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics
                {
                        r = DrawExposureSlider(currentPosition, DRAW_MOVED);
                        TryReturnVoid(r == E_SUCCESS, "DrawExposureSlider() fail[%s]", GetErrorMessage(r));
-                       __closeTimerValue = 0;
+                       _closeTimerValue = 0;
 
-                       TryReturnVoid(__pExposureCloseTimer != null, "__pExposureCloseTimer is null");
-                       __pExposureCloseTimer->Cancel();
+                       TryReturnVoid(_pExposureCloseTimer != null, "_pExposureCloseTimer is null");
+                       _pExposureCloseTimer->Cancel();
                }
        }
        AppLogDebug("EXIT");
@@ -2052,7 +2035,7 @@ CameraForm::OnAppTimerExpired(void)
 
        DeleteTimer();
 
-       __pCameraPresentationModel->StopCamera();
+       _pCameraPresentationModel->StopCamera();
 
        r = SendAppControlResult(pCameraApp->GetRequestId());
        TryReturnVoid(r == E_SUCCESS, "SendAppControlResult [%s]", GetErrorMessage(r));
@@ -2080,21 +2063,21 @@ CameraForm::OnCaptureStartTimerExpired(void)
        result r = E_SUCCESS;
        int timerInterval = 0;
 
-       if (__pCaptureStartTimer)
+       if (_pCaptureStartTimer)
        {
-               __pCaptureStartTimer->Cancel();
+               _pCaptureStartTimer->Cancel();
        }
 
        timerInterval = GetTimerIntervalValue();
 
        Invalidate(true);
 
-       __isUsedTimerCaptured = true;
+       _isUsedTimerCaptured = true;
 
        r = SetTimerIntervalValue(timerInterval);
        TryReturnVoid(r == E_SUCCESS, "SetTimerIntervalValue() fail[%s]", GetErrorMessage(r));
 
-       __timeCount = 0;
+       _timeCount = 0;
 
        r = DrawTimerPopup();
        TryReturnVoid(r == E_SUCCESS, "DrawTimerPopup() fail[%s]", GetErrorMessage(r));
@@ -2105,9 +2088,9 @@ void
 CameraForm::OnTouchAutoFocusTimerExpired(void)
 {
        AppLogDebug("ENTER");
-       __pCameraPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
 
-       __pTouchAutoFocusTimer->Cancel();
+       _pTouchAutoFocusTimer->Cancel();
        AppLogDebug("EXIT");
 }
 
@@ -2115,19 +2098,19 @@ void
 CameraForm::OnPopupTimerExpired(void)
 {
        AppLogDebug("ENTER");
-       if (__pCameraPresentationModel->IsPreviewState() == true)
+       if (_pCameraPresentationModel->IsPreviewState() == true)
        {
-               __timeCount--;
+               _timeCount--;
 
                __pCameraInfoPanel->SetDrawPopupTimerUpdate(true);
 
-               __pCameraInfoPanel->SetDrawPopupTimerCount(__timeCount);
+               __pCameraInfoPanel->SetDrawPopupTimerCount(_timeCount);
 
                __pCameraInfoPanel->Invalidate(true);
 
-               AppLogDebug("__timeCount=%d", __timeCount); 
+               AppLogDebug("_timeCount=%d", _timeCount); 
 
-               if (__timeCount == INDEX_UNIT_ZERO || __timeCount == INDEX_UNIT_ONE)
+               if (_timeCount == INDEX_UNIT_ZERO || _timeCount == INDEX_UNIT_ONE)
                {
                        StopPopupTimer();
                }
@@ -2143,7 +2126,7 @@ CameraForm::OnIntervalValueTimerExpired(void)
        bool focusSupport = false;
        int selfPortraitEnable = 0;
 
-       if (__isUsedTimerCaptured == true)
+       if (_isUsedTimerCaptured == true)
        {
                __pCameraInfoPanel->SetDrawPopupTimerUpdate(false);
 
@@ -2163,16 +2146,16 @@ CameraForm::OnIntervalValueTimerExpired(void)
                        __pBackButton->Invalidate(true);
                }
 
-               r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
                }
 
                if (focusSupport == true && r == E_SUCCESS)
@@ -2189,11 +2172,11 @@ CameraForm::OnIntervalValueTimerExpired(void)
                }
        }
 
-       __pCameraPresentationModel->Capture();
+       _pCameraPresentationModel->Capture();
 
        __isTimerRunning = false;
 
-       __pCameraPresentationModel->SetIntervalTimerRun(false);
+       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
        if (__pBatteryState)
        {
@@ -2212,12 +2195,12 @@ void
 CameraForm::OnHelpCloseTimerExpired(void)
 {
        AppLogDebug("ENTER");
-       if (__pHelpCloseTimer)
+       if (_pHelpCloseTimer)
        {
-               __pHelpCloseTimer->Cancel();
+               _pHelpCloseTimer->Cancel();
 
-               delete __pHelpCloseTimer;
-               __pHelpCloseTimer = null;
+               delete _pHelpCloseTimer;
+               _pHelpCloseTimer = null;
        }
 
        HideScreenOverlayHelp();
@@ -2229,11 +2212,11 @@ void
 CameraForm::OnExposureCloseTimerExpired(void)
 {
        AppLogDebug("ENTER");
-       __closeTimerValue++;
+       _closeTimerValue++;
 
-       AppLogDebug("__closeTimerValue expire %d", __closeTimerValue);
+       AppLogDebug("_closeTimerValue expire %d", _closeTimerValue);
 
-       if (__closeTimerValue == EXPOSURE_TIMER_IS_ALIVE)
+       if (_closeTimerValue == EXPOSURE_TIMER_IS_ALIVE)
        {
                if (__pCameraInfoPanel->GetDrawExposure() == true)
                {
@@ -2243,9 +2226,9 @@ CameraForm::OnExposureCloseTimerExpired(void)
                        Invalidate(true);
                }
 
-               __closeTimerValue = 0;
+               _closeTimerValue = 0;
 
-               __pExposureCloseTimer->Cancel();
+               _pExposureCloseTimer->Cancel();
        }
        AppLogDebug("EXIT");
 }
@@ -2268,9 +2251,9 @@ CameraForm::OnChargingCompletedTimerExpired(void)
                __pBatteryState->SetPosition(X_INDICATOR_BATTERY_LANDSCAPE, Y_INDICATOR_BATTERY_LANDSCAPE);
        }
 
-       __chargingCount++;
+       _chargingCount++;
 
-       if (__chargingCount % DIVIDE_BY_TWO)
+       if (_chargingCount % DIVIDE_BY_TWO)
        {
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_20);
        }
@@ -2280,18 +2263,18 @@ CameraForm::OnChargingCompletedTimerExpired(void)
        }
        TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
 
-       if (__chargingCount >= BATTERY_STATE_20)
+       if (_chargingCount >= BATTERY_STATE_20)
        {
-               __chargingCount = INDEX_UNIT_ZERO;
+               _chargingCount = INDEX_UNIT_ZERO;
        }
 
-       __blinkCount++;
+       _blinkCount++;
        __pBatteryState->SetBackgroundBitmap(*pBitmap);
        __pBatteryState->Invalidate(true);
 
        AppLogDebug("__batteryStatus = %d", __batteryStatus);
-       AppLogDebug("__chargingCount = %d", __chargingCount);
-       AppLogDebug("__blinkCount = %d", __blinkCount);
+       AppLogDebug("_chargingCount = %d", _chargingCount);
+       AppLogDebug("_blinkCount = %d", _blinkCount);
 
        delete pBitmap;
        pBitmap = null;
@@ -2327,28 +2310,28 @@ CameraForm::OnChargingTimerExpired(void)
 
        AppLogDebug("batteryLevel = %d", batteryLevel);
 
-       __chargingCount++;
+       _chargingCount++;
 
        AppLogDebug("__batteryStatus = %d", __batteryStatus);
-       AppLogDebug("__chargingCount = %d", __chargingCount);
+       AppLogDebug("_chargingCount = %d", _chargingCount);
 
-       if ((__batteryStatus == BATTERY_STATE_0 || __batteryStatus == BATTERY_STATE_1) && __chargingCount == INDEX_UNIT_ONE)
+       if ((__batteryStatus == BATTERY_STATE_0 || __batteryStatus == BATTERY_STATE_1) && _chargingCount == INDEX_UNIT_ONE)
        {
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_IC_CAMERA_BATTERY_LOW);
        }
        else
        {
-               pBitmap = ResourceManager::GetBitmapN(__batteryStatus + __chargingCount);
+               pBitmap = ResourceManager::GetBitmapN(__batteryStatus + _chargingCount);
        }
        TryCatch(pBitmap != null, r = E_SYSTEM, "FlashButton::pBitmap is null");
 
-       maxChargingCnt = (static_cast<int>(__batteryStatus)) + __chargingCount;
+       maxChargingCnt = (static_cast<int>(__batteryStatus)) + _chargingCount;
 
        AppLogDebug("maxCount = %d", maxChargingCnt);
 
        if (maxChargingCnt >= BATTERY_STATE_20)
        {
-               __chargingCount = INDEX_UNIT_ZERO;
+               _chargingCount = INDEX_UNIT_ZERO;
        }
 
        __pBatteryState->SetBackgroundBitmap(*pBitmap);
@@ -2369,62 +2352,62 @@ void
 CameraForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
 {
        AppLogDebug("ENTER");
-       if (timer.Equals(*__pAppTimer))
+       if (timer.Equals(*_pAppTimer))
        {
-               AppLogDebug("__pAppTimer");
+               AppLogDebug("_pAppTimer");
                OnAppTimerExpired();
        }
-       else if (timer.Equals(*__pCaptureStartTimer))
+       else if (timer.Equals(*_pCaptureStartTimer))
        {
-               AppLogDebug("__pCaptureStartTimer");
+               AppLogDebug("_pCaptureStartTimer");
                OnCaptureStartTimerExpired();
        }
-       else if (timer.Equals(*__pTouchAutoFocusTimer))
+       else if (timer.Equals(*_pTouchAutoFocusTimer))
        {
-               AppLogDebug("__pTouchAutoFocusTimer");
+               AppLogDebug("_pTouchAutoFocusTimer");
                OnTouchAutoFocusTimerExpired();
        }
-       else if (timer.Equals(*__pPopupTimer))
+       else if (timer.Equals(*_pPopupTimer))
        {
-               AppLogDebug("__pPopupTimer");
+               AppLogDebug("_pPopupTimer");
                OnPopupTimerExpired();
        }
-       else if (timer.Equals(*__pIntervalValueTimer))
+       else if (timer.Equals(*_pIntervalValueTimer))
        {
-               AppLogDebug("__pIntervalValueTimer");
+               AppLogDebug("_pIntervalValueTimer");
                OnIntervalValueTimerExpired();
                StartInitChargingTimer();
        }
-       else if (timer.Equals(*__pHelpCloseTimer))
+       else if (timer.Equals(*_pHelpCloseTimer))
        {
                AppLogDebug("__pHelpCloseTimer");
                OnHelpCloseTimerExpired();
        }
-       else if (timer.Equals(*__pExposureCloseTimer))
+       else if (timer.Equals(*_pExposureCloseTimer))
        {
-               AppLogDebug("__pExposureCloseTimer");
+               AppLogDebug("_pExposureCloseTimer");
                OnExposureCloseTimerExpired();
        }
-       else if (timer.Equals(*__pChargingTimer))
+       else if (timer.Equals(*_pChargingTimer))
        {
                result r = E_SUCCESS;
-               AppLogDebug("__pChargingTimer");
+               AppLogDebug("_pChargingTimer");
                bool isCharging = false;
 
                __batteryStatus = GetCurrentBatteryState();
                AppLogDebug("__batteryStatus = %d", __batteryStatus);
 
-               isCharging = __pCameraPresentationModel->IsCharging();
+               isCharging = _pCameraPresentationModel->IsCharging();
 
                if (isCharging)
                {
                        if (__batteryStatus == BATTERY_STATE_20)
                        {
-                               __chargingCount = INDEX_UNIT_ZERO;
+                               _chargingCount = INDEX_UNIT_ZERO;
 
-                               __blinkCount = INDEX_UNIT_ZERO;
+                               _blinkCount = INDEX_UNIT_ZERO;
 
-                               __pChargingTimer->Cancel();
+                               _pChargingTimer->Cancel();
 
                                StartInitChargingCompletedTimer();
                        }
@@ -2435,42 +2418,42 @@ CameraForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                }
                else
                {
-                       __chargingCount = INDEX_UNIT_ZERO;
+                       _chargingCount = INDEX_UNIT_ZERO;
 
-                       __blinkCount = INDEX_UNIT_ZERO;
+                       _blinkCount = INDEX_UNIT_ZERO;
 
-                       __pChargingTimer->Cancel();
+                       _pChargingTimer->Cancel();
 
                        if (__batteryStatus == BATTERY_STATE_20)
                        {
-                               AppLogDebug("__pChargingTimer -> __pChargingCompletedTimer");
+                               AppLogDebug("_pChargingTimer -> __pChargingCompletedTimer");
 
                                StartInitChargingCompletedTimer();
                        }
                }
        }
-       else if (timer.Equals(*__pChargingCompletedTimer))
+       else if (timer.Equals(*_pChargingCompletedTimer))
        {
                result r = E_SUCCESS;
                AppLogDebug("__pChargingCompletedTimer");
                bool isCharging = false;
 
-               isCharging = __pCameraPresentationModel->IsCharging();
+               isCharging = _pCameraPresentationModel->IsCharging();
 
                __batteryStatus = GetCurrentBatteryState();
                AppLogDebug("__batteryStatus = %d", __batteryStatus);
 
                if (isCharging == false && __batteryStatus == BATTERY_STATE_20)
                {
-                       if (__blinkCount == INDEX_UNIT_TWENTY)
+                       if (_blinkCount == INDEX_UNIT_TWENTY)
                        {
                                AppLogDebug("__pChargingCompletedTimer cancel");
 
-                               __chargingCount = INDEX_UNIT_ZERO;
+                               _chargingCount = INDEX_UNIT_ZERO;
 
-                               __blinkCount = INDEX_UNIT_ZERO;
+                               _blinkCount = INDEX_UNIT_ZERO;
 
-                               __pChargingCompletedTimer->Cancel();
+                               _pChargingCompletedTimer->Cancel();
 
                                CheckBatteryStatus();
                        }
@@ -2485,21 +2468,21 @@ CameraForm::OnTimerExpired(Tizen::Base::Runtime::Timer& timer)
                {
                        AppLogDebug("isCharging = true >> __pChargingCompletedTimer cancel");
 
-                       __chargingCount = INDEX_UNIT_ZERO;
+                       _chargingCount = INDEX_UNIT_ZERO;
 
-                       __blinkCount = INDEX_UNIT_ZERO;
+                       _blinkCount = INDEX_UNIT_ZERO;
 
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
 
                        CheckBatteryStatus();
                }
        }
-       else if (timer.Equals(*__pPreviewFailPopupTimer))
+       else if (timer.Equals(*_pPreviewFailPopupTimer))
        {
                AppLogDebug("__pPreviewFailPopupTimer");
-               __pPreviewFailPopupTimer->Cancel();
+               _pPreviewFailPopupTimer->Cancel();
 
-               if (__pCameraPresentationModel->GetStartPreviewException())
+               if (_pCameraPresentationModel->GetStartPreviewException())
                {
                        OnPreviewFailPopupTimerExpired();
                }
@@ -2612,29 +2595,29 @@ CameraForm::InitActionMenuPanel(void)
        __pActionPanel->AddTouchEventListener(*this);
        __pActionPanel->SetName(IDS_ACTION_UI_PANEL_NAME);
 
-       AppLogDebug("GetDisplayResolutionType = %d", __pCameraPresentationModel->GetDisplayResolutionType());
+       AppLogDebug("GetDisplayResolutionType = %d", _pCameraPresentationModel->GetDisplayResolutionType());
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT_REVERSE
                || __dir == ORIENTATION_STATUS_PORTRAIT)
        {
                if (clientArea.height == DISPLAY_WVGA)
                {
-                       __pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
                }
                else
                {
-                       __pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
                }
        }
        else
        {
                if (clientArea.width == DISPLAY_WVGA)
                {
-                       __pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_WVGA);
                }
                else
                {
-                       __pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
+                       _pCameraPresentationModel->SetDisplayResolutionType(CameraPresentationModel::DISPLAY_RESOLUTION_HD);
                }
        }
 
@@ -2692,7 +2675,7 @@ CameraForm::InitActionMenuPanel(void)
        __pShutterButton->SetName(IDS_ACTION_UI_PANEL_CAPTURE_NAME);
        __pShutterButton->AddTouchEventListener(*this);
 
-       AppLogDebug("GetDisplayResolutionType = %d", __pCameraPresentationModel->GetDisplayResolutionType());
+       AppLogDebug("GetDisplayResolutionType = %d", _pCameraPresentationModel->GetDisplayResolutionType());
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT_REVERSE
                || __dir == ORIENTATION_STATUS_PORTRAIT)
@@ -2761,12 +2744,12 @@ CameraForm::UpdateUiPanelIcon(void)
 
        TryCatch(__pFlashButton != null, r = E_SYSTEM, "__pFlashButton is null");
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
-               r = __pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
+               r = _pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
 
                pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -2799,11 +2782,11 @@ CameraForm::UpdateUiPanelIcon(void)
        }
        else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                if (value == true && r == E_SUCCESS)
                {
-                       r = __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
+                       r = _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
 
                        switch (flashMode)
@@ -2910,7 +2893,7 @@ CameraForm::UpdateUiPanelIcon(void)
                }
                else
                {
-                       r = __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
+                       r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "Read Reg Fail[%s]", GetErrorMessage(r));
 
                        pBitmap = ResourceManager::GetBitmapN(RESOURCE_ID_CAMERA_MODE_FLASH_OFF_PRESS_DIM);
@@ -3084,11 +3067,11 @@ CameraForm::UpdateUiPanelIcon(void)
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
        }
 
        if (r == E_SUCCESS)
@@ -3185,7 +3168,7 @@ CameraForm::UpdateUiActionPanelIcon(void)
        Point ptModeChangeButton;
        Rectangle rectThumbnailButton;
 
-       AppLogDebug("GetDisplayResolutionType = %d", __pCameraPresentationModel->GetDisplayResolutionType());
+       AppLogDebug("GetDisplayResolutionType = %d", _pCameraPresentationModel->GetDisplayResolutionType());
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT
                || __dir == ORIENTATION_STATUS_PORTRAIT_REVERSE)
@@ -3413,28 +3396,28 @@ CameraForm::SetTimerIntervalValue(int timerIntervalValue)
 
        case SETTING_TIMER_CAPTURE_2_SEC:
                {
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
 
-                       r = __pIntervalValueTimer->Start(CAMERA_TIMER_2_SEC);
-                       TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pIntervalValueTimer->Start(CAMERA_TIMER_2_SEC);
+                       TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
                }
                break;
 
        case SETTING_TIMER_CAPTURE_5_SEC:
                {
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
 
-                       r = __pIntervalValueTimer->Start(CAMERA_TIMER_5_SEC);
-                       TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pIntervalValueTimer->Start(CAMERA_TIMER_5_SEC);
+                       TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
                }
                break;
 
        case SETTING_TIMER_CAPTURE_10_SEC:
                {
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
 
-                       r = __pIntervalValueTimer->Start(CAMERA_TIMER_10_SEC);
-                       TryCatch(r == E_SUCCESS, , "__pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pIntervalValueTimer->Start(CAMERA_TIMER_10_SEC);
+                       TryCatch(r == E_SUCCESS, , "_pIntervalValueTimer start fail[%s]", GetErrorMessage(r));
                }
                break;
 
@@ -3458,7 +3441,7 @@ CameraForm::SetExifOrientation(int deviceOrientation)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       r = __pCameraPresentationModel->SetExifOrientation(deviceOrientation);
+       r = _pCameraPresentationModel->SetExifOrientation(deviceOrientation);
        AppLogDebug("SetExifOrientation : deviceOrientation = %d, fail[%s]", deviceOrientation, GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
@@ -3476,15 +3459,15 @@ CameraForm::StartCaptured(void)
        {
        case SETTING_TIMER_CAPTURE_0_SEC:
                {
-                       __isUsedTimerCaptured = false;
+                       _isUsedTimerCaptured = false;
 
                        __isTimerRunning = false;
 
-                       __pCameraPresentationModel->SetIntervalTimerRun(false);
+                       _pCameraPresentationModel->SetIntervalTimerRun(false);
 
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
                        
-                       __pCameraPresentationModel->Capture();
+                       _pCameraPresentationModel->Capture();
 
                        StartInitChargingTimer();
                }
@@ -3505,7 +3488,7 @@ CameraForm::StartCaptured(void)
                                __pBatteryState->Show();
                        }
 
-                       __pCameraPresentationModel->SetIntervalTimerRun(true);
+                       _pCameraPresentationModel->SetIntervalTimerRun(true);
 
                        HideUiPanel(true);
 
@@ -3515,16 +3498,16 @@ CameraForm::StartCaptured(void)
                                __pCameraInfoPanel->Invalidate(true);
                        }
 
-                       if (__isUsedTimerCaptured == false)
+                       if (_isUsedTimerCaptured == false)
                        {
-                               __pCaptureStartTimer->Cancel();
+                               _pCaptureStartTimer->Cancel();
 
                                __pCameraInfoPanel->SetDrawMarkerFocus(false);
 
                                __pCameraInfoPanel->Invalidate(true);
 
-                               r = __pCaptureStartTimer->Start(CAMERA_TIMER_1_SEC);
-                               TryReturnVoid(r == E_SUCCESS, "__pCaptureStartTimer start fail[%s]", GetErrorMessage(r));
+                               r = _pCaptureStartTimer->Start(CAMERA_TIMER_1_SEC);
+                               TryReturnVoid(r == E_SUCCESS, "_pCaptureStartTimer start fail[%s]", GetErrorMessage(r));
                        }
                }
                break;
@@ -3552,10 +3535,10 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        bool isCharging = false;
                        BatteryLevel batteryLevel;
 
-                       batteryLevel = __pCameraPresentationModel->GetBatteryLevel();
-                       isCharging = __pCameraPresentationModel->IsCharging();
+                       batteryLevel = _pCameraPresentationModel->GetBatteryLevel();
+                       isCharging = _pCameraPresentationModel->IsCharging();
 
-                       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
@@ -3564,7 +3547,7 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                                if (value == true && r == E_SUCCESS)
                                {
@@ -3604,13 +3587,13 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        bool value = false;
                        int cameraCount = 0;
 
-                       if (__pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
+                       if (_pCameraPresentationModel->GetCameraState() != CAMERA_STATE_PREVIEW)
                        {
                                AppLogDebug("Camera Preview is not");
                                return;
                        }
 
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_COUNT, cameraCount);
                        AppLogDebug("GetMediaCapability [%s]", GetErrorMessage(r));
 
                        if (cameraCount < SUPPORTED_CAMERA_NUM)
@@ -3619,7 +3602,7 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                return;
                        }
 
-                       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryReturnVoid(r == E_SUCCESS, "Faled to get value to registry[%s]", GetErrorMessage(r));
                        MakeSettingPopupTab(false);
 
@@ -3631,15 +3614,15 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                                __isToggleCameraDirection = true;
 
+                               r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
+                               TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+
                                r = ToggleCameraDirection(CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
                                TryReturnVoid(r == E_SUCCESS, "ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
-                               r = __pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY);
-                               TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-                               r = __pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
+                               r = _pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-
                        }
                        else if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
                        {
@@ -3647,18 +3630,18 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                int primaryFlashValue = FLASH_MODE_OFF;
                                __isToggleCameraDirection = true;
 
+                               r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
+                               TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
+
                                r = ToggleCameraDirection(CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
                                TryReturnVoid(r == E_SUCCESS, "ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
 
-                               r = __pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
-                               TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
-
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
-                               __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+                               _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
 
                                if (value == true && r == E_SUCCESS)
                                {
-                                       r = __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
+                                       r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, primaryFlashValue);
                                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
                                }
                        }
@@ -3682,11 +3665,11 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        UpdateUiPanelIcon();
                
@@ -3698,11 +3681,11 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        HideUiQuickMenu();
                }
@@ -3712,11 +3695,11 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        MakeCameraTabSettingPopup();
                }
@@ -3726,11 +3709,11 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        if (__pListViewGeneralTabMainMenu)
                        {
@@ -3750,11 +3733,11 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                {
                        result r = E_SUCCESS;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        AppLogDebug("IDA_BUTTON_SETTING_GENERAL");
 
@@ -3786,37 +3769,37 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                                return;
                        }
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-                       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                        }
 
                        if (exposureValue == true && r == E_SUCCESS)
                        {
                                AppLogDebug("CAMERA_SUB_MENU_CONTENT_EXPOSURE_MODE");
 
-                               r = __pCameraPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
+                               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
                                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                                AppLogDebug("adjustValue = %d", adjustValue);
 
-                               __pCameraPresentationModel->SetExposure(adjustValue);
+                               _pCameraPresentationModel->SetExposure(adjustValue);
 
                                MakeSettingPopupTab(false);
 
@@ -3832,23 +3815,23 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
                                else
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
 
                                if (brighnesstValue == true && r == E_SUCCESS)
                                {
                                        AppLogDebug("CAMERA_SUB_MENU_CONTENT_EXPOSURE_MODE");
 
-                                       r = __pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
+                                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
                                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
                                        AppLogDebug("adjustValue = %d", adjustValue);
 
-                                       __pCameraPresentationModel->SetBrightness(adjustValue);
+                                       _pCameraPresentationModel->SetBrightness(adjustValue);
 
                                        MakeSettingPopupTab(false);
 
@@ -3873,35 +3856,35 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        result r = E_SUCCESS;
                        int selfPortraitEnable = 0;
 
-                       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-                       __pAppTimer->Cancel();
+                       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                        if (__pCameraInfoPanel->GetDrawExposure() == true)
                        {
-                               __closeTimerValue = 0;
+                               _closeTimerValue = 0;
 
-                               if (__pExposureCloseTimer)
+                               if (_pExposureCloseTimer)
                                {
-                                       __pExposureCloseTimer->Cancel();
+                                       _pExposureCloseTimer->Cancel();
                                }
 
                                __pCameraInfoPanel->SetDrawExposure(false);
                                Invalidate(true);
                        }
 
-                       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
                        
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
                        }
 
                        if (r == E_SUCCESS)
@@ -3935,7 +3918,7 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        __pResetPopUp->SetShowState(false);
                }
 
-               r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
+               r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
                TryReturnVoid(r == E_SUCCESS, "GetValue() fail(%s)", GetErrorMessage(r));
 
                if (guideLineEnable == CAMERA_GUIDELINE_ENABLE)
@@ -3946,7 +3929,7 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        SetGuideLine(SUBMENU_MODE_OFF);
                }
 
-               r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "GetValue() fail(%s)", GetErrorMessage(r));
 
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
@@ -3962,7 +3945,7 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 
                        AppLogDebug("SUBMENU_RESET_MODE : CAMERA_FORM_SECONDARY_MODE");
 
-                       r = __pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
+                       r = _pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
                        TryReturnVoid(r == E_SUCCESS, "SetValue() fail(%s)", GetErrorMessage(r));
 
                        r = ToggleCameraDirection(CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
@@ -3971,9 +3954,9 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
                        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo() fail(%s)", GetErrorMessage(r));
 
-                       __pCameraPresentationModel->StartPreview(&bufferinfo);
+                       _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-                       __pCameraPresentationModel->SetContinuousAutoFocus();
+                       _pCameraPresentationModel->SetContinuousAutoFocus();
 
                        MakePreviewResolutionList(true);
 
@@ -3987,7 +3970,7 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
                        RestoreDefaultSetting();
                }
 
-               r = __pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+               r = _pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
                TryReturnVoid(r == E_SUCCESS, "Reg setValue fail[%s]", GetErrorMessage(r));
 
                MakeSettingPopupTab(false);
@@ -4027,147 +4010,6 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
        AppLogDebug("EXIT");
 }
 
-result
-CameraForm::SendAppControlResult(RequestId requestId)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       String fullFileName = L"";
-       int storageType = STORAGE_TYPE_PHONE;
-       int mode = CameraPresentationModel::CAMERA_MODE_SNAPSHOT;
-       String filePath = L"";
-       int requestType = 0;
-
-       HashMap* pExtraData = new (std::nothrow) HashMap(SingleObjectDeleter);
-       r = pExtraData->Construct();
-       AppLogDebug("HashMap::Construct() fail[%s]", GetErrorMessage(r));
-
-       if (GetAppLaunchType() == APP_LAUNCH_TYPE_REQUESET)
-       {
-               requestType = __pCameraPresentationModel->GetAppControlRequestType();
-
-               switch (requestType)
-               {
-               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED:
-                       {
-                               r = ReturnValues(requestId, APP_CTRL_RESULT_CANCELED, null);
-                               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-                       }
-                       break;
-
-               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_SUCCEEDED:
-                       {
-                               r = __pCameraPresentationModel->GetValue(CURRENT_MODE, mode);
-                               TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-       
-                               r = __pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
-                               TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
-
-                               if (storageType == STORAGE_TYPE_PHONE)
-                               {
-                                       r = filePath.Format(MAX_DIRECTORY_PATH_LENGTH, L"%ls%ls", Environment::GetMediaPath().GetPointer(), STRING_CAMERA_FOLDER);
-                                       TryCatch(r == E_SUCCESS, , "String::Format() fail[%s]", GetErrorMessage(r));
-                               }
-                               else
-                               {
-                                       r = filePath.Format(MAX_DIRECTORY_PATH_LENGTH, L"%ls%ls", Environment::GetExternalStoragePath().GetPointer(), STRING_CAMERA_FOLDER);
-                                       TryCatch(r == E_SUCCESS, , "String::Format() fail[%s]", GetErrorMessage(r));
-                               }
-                               AppLogDebug("FilePath %ls", filePath.GetPointer());
-
-                               if (mode == CameraPresentationModel::CAMERA_MODE_SNAPSHOT)
-                               {
-                                       r = __pCameraPresentationModel->GetLatestContentName(CameraPresentationModel::CAMERA_MODE_SNAPSHOT, fullFileName);
-                                       TryCatch(r == E_SUCCESS, , "pCameraPresentationModel->GetLatestContentName fail[%s]", GetErrorMessage(r));
-                               }
-                               else
-                               {
-                                       r = __pCameraPresentationModel->GetLatestContentName(CameraPresentationModel::CAMERA_MODE_RECORD, fullFileName);
-                                       TryCatch(r == E_SUCCESS, , "pCameraPresentationModel->GetLatestContentName fail[%s]", GetErrorMessage(r));
-                               }
-                               AppLogDebug("fullFileName:%ls", fullFileName.GetPointer());
-
-                               ArrayList* pPaths = new (std::nothrow) ArrayList();
-                               pPaths->Construct();
-                               pPaths->Add(new (std::nothrow) String(filePath + fullFileName));
-
-                               pExtraData->Add(new (std::nothrow) String(OUTPUT_KEY_RESULT), pPaths);
-
-                               r = ReturnValues(requestId, APP_CTRL_RESULT_SUCCEEDED, pExtraData);
-                               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-                       }
-                       break;
-
-               case CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED:
-                       {
-                               r = ReturnValues(requestId, APP_CTRL_RESULT_FAILED, null);
-                               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-                       }
-                       break;
-
-               default:
-                       break;
-               }
-       }
-       else
-       {
-               AppLogDebug("Not AppControl");
-               r = ReturnValues(requestId, APP_CTRL_RESULT_FAILED, null);
-               TryCatch(r == E_SUCCESS, , "ReturnValues fail[%s]", GetErrorMessage(r));
-       }
-
-       delete pExtraData;
-       pExtraData = null;
-
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       delete pExtraData;
-       pExtraData = null;
-
-       AppLogDebug("EXIT - CATCH");
-       return r;
-}
-
-result 
-CameraForm::TerminateApp(void)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CameraApp* pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
-
-       RemoveAllEventListener();
-
-       __appControlActionCompleted = true;
-
-       DeleteTimer();
-
-       __chargingCount = 0;
-
-       __blinkCount = 0;
-
-       __timeCount = 0;
-
-       __isUsedTimerCaptured = false;
-
-       __closeTimerValue = 0;
-
-       __closeTimerValue = 0;
-
-       __pCameraPresentationModel->StopCamera();
-
-       r = SendAppControlResult(pCameraApp->GetRequestId());
-       TryCatch(r == E_SUCCESS, , "SendAppControlResult fail[%s]", GetErrorMessage(r));
-
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       AppLogDebug("EXIT - CATCH");
-       return r;
-}
-
 void
 CameraForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 {
@@ -4177,75 +4019,30 @@ CameraForm::OnFormBackRequested(Tizen::Ui::Controls::Form& source)
 
        DeleteTimer();
 
-       __chargingCount = 0;
+       _chargingCount = 0;
 
-       __blinkCount = 0;
+       _blinkCount = 0;
 
-       __timeCount = 0;
+       _timeCount = 0;
 
-       __isUsedTimerCaptured = false;
+       _isUsedTimerCaptured = false;
 
-       __closeTimerValue = 0;
+       _closeTimerValue = 0;
 
-       __closeTimerValue = 0;
+       _closeTimerValue = 0;
 
-       __pCameraPresentationModel->StopCamera();
+       _pCameraPresentationModel->StopCamera();
 
        r = SendAppControlResult(pCameraApp->GetRequestId());
        TryReturnVoid(r == E_SUCCESS, "SendAppControlResult [%s]", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
 
-result
-CameraForm::LaunchAppControl(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::String* pUriData, const Tizen::Base::String* pDataType, const Tizen::Base::Collection::IMap* extraData)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CameraApp* pCameraApp = null;
-       AppControl* pAc = null;
-
-       AppLogDebug("pUriData %ls", pUriData->GetPointer());
-       AppLogDebug("pDataType %ls", pDataType->GetPointer());
-
-#if true
-       pAc = AppManager::FindAppControlN(providerId, operationId);
-       TryCatch(pAc != null, r = E_OBJ_NOT_FOUND, "Failed to find the appcontrol");
-
-       r = pAc->Start(null, pDataType, extraData, null);
-       TryCatch(r == E_SUCCESS, , "[%s] Failed to start the appcontrol", GetErrorMessage(r));
-
-       pCameraApp = static_cast<CameraApp*>(CameraApp::GetInstance());
-       pCameraApp->SetFrameEnabled(false);
-       Invalidate(true);
-
-       delete pAc;
-#else
-       r = AppControl::FindAndStart(operationId, null, pDataType, null, extraData, null);
-       TryCatch(r == E_SUCCESS, , "[%s] Failed to start the appcontrol", GetErrorMessage(r));
-#endif
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       if (pAc != null)
-       {
-               delete pAc;
-       }
-       return E_FAILURE;
-}
-
-void
-CameraForm::OnAppControlCompleted(const Tizen::Base::String& providerId, const Tizen::Base::String& operationId, const Tizen::Base::Collection::IList* pResultList)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
 void
 CameraForm::OnUserEventReceivedN(RequestId requestId, Tizen::Base::Collection::IList* pArgs)
 {
        AppLogDebug("ENTER");
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("EXIT - App Terminate");
                return;
@@ -4262,7 +4059,7 @@ CameraForm::OnFileEventOccured(const unsigned long events, const Tizen::Base::St
        Bitmap* pBitmap = null;
        Point ptThumbnailImg = Point(X_THUMBNAIL_BUTTON_IMG, Y_THUMBNAIL_BUTTON_IMG);
 
-       isExistThumbnail = __pCameraPresentationModel->IsExistThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       isExistThumbnail = _pCameraPresentationModel->IsExistThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
 
        if (isExistThumbnail == false)
        {
@@ -4313,8 +4110,8 @@ CameraForm::Initialize(void)
 
        Construct(L"IDL_CAMERA_FORM");
 
-       __pCameraPresentationModel = CameraPresentationModel::GetInstance();
-       TryCatch(__pCameraPresentationModel != null, r = E_SYSTEM, "__pCameraPresentationModel is null");
+       _pCameraPresentationModel = CameraPresentationModel::GetInstance();
+       TryCatch(_pCameraPresentationModel != null, r = E_SYSTEM, "_pCameraPresentationModel is null");
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -4327,8 +4124,8 @@ void
 CameraForm::InitAppTimer(void)
 {
        AppLogDebug("ENTER");
-       __pAppTimer = new (std::nothrow) Timer();
-       __pAppTimer->Construct(*this);
+       _pAppTimer = new (std::nothrow) Timer();
+       _pAppTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4336,8 +4133,8 @@ void
 CameraForm::InitChargingTimer(void)
 {
        AppLogDebug("ENTER");
-       __pChargingTimer = new (std::nothrow) Timer();
-       __pChargingTimer->Construct(*this);
+       _pChargingTimer = new (std::nothrow) Timer();
+       _pChargingTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4345,8 +4142,8 @@ void
 CameraForm::InitChargingCompletedTimer(void)
 {
        AppLogDebug("ENTER");
-       __pChargingCompletedTimer = new (std::nothrow) Timer();
-       __pChargingCompletedTimer->Construct(*this);
+       _pChargingCompletedTimer = new (std::nothrow) Timer();
+       _pChargingCompletedTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4354,8 +4151,8 @@ void
 CameraForm::InitPreviewFailPopupTimer(void)
 {
        AppLogDebug("ENTER");
-       __pPreviewFailPopupTimer = new (std::nothrow) Timer();
-       __pPreviewFailPopupTimer->Construct(*this);
+       _pPreviewFailPopupTimer = new (std::nothrow) Timer();
+       _pPreviewFailPopupTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4363,8 +4160,8 @@ void
 CameraForm::InitIntervalValueTimer(void)
 {
        AppLogDebug("ENTER");
-       __pIntervalValueTimer = new (std::nothrow) Timer();
-       __pIntervalValueTimer->Construct(*this);
+       _pIntervalValueTimer = new (std::nothrow) Timer();
+       _pIntervalValueTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4372,8 +4169,8 @@ void
 CameraForm::InitCaptureStartTimer(void)
 {
        AppLogDebug("ENTER");
-       __pCaptureStartTimer = new (std::nothrow) Timer();
-       __pCaptureStartTimer->Construct(*this);
+       _pCaptureStartTimer = new (std::nothrow) Timer();
+       _pCaptureStartTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4381,8 +4178,8 @@ void
 CameraForm::InitTouchAutoFocusStartTimer(void)
 {
        AppLogDebug("ENTER");
-       __pTouchAutoFocusTimer = new (std::nothrow) Timer();
-       __pTouchAutoFocusTimer->Construct(*this);
+       _pTouchAutoFocusTimer = new (std::nothrow) Timer();
+       _pTouchAutoFocusTimer->Construct(*this);
        AppLogDebug("EXIT");
 }
 
@@ -4392,11 +4189,11 @@ CameraForm::StartInitAppTimer(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
+       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
 
-       __pAppTimer->Cancel();
+       _pAppTimer->Cancel();
 
-       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
+       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
        TryReturnVoid(r == E_SUCCESS, "Timer::Start() fail[%s]", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
@@ -4407,11 +4204,11 @@ CameraForm::StartPreviewFailPopupTimer(void)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       TryReturnVoid(__pPreviewFailPopupTimer != null, "__pPreviewFailPopupTimer is null");
+       TryReturnVoid(_pPreviewFailPopupTimer != null, "__pPreviewFailPopupTimer is null");
 
-       __pPreviewFailPopupTimer->Cancel();
+       _pPreviewFailPopupTimer->Cancel();
 
-       r = __pPreviewFailPopupTimer->Start(PREVIEW_FAIL_TIMER);
+       r = _pPreviewFailPopupTimer->Start(PREVIEW_FAIL_TIMER);
        TryReturnVoid(r == E_SUCCESS, "__pPreviewFailPopupTimer::Start() fail[%s]", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
@@ -4423,51 +4220,51 @@ CameraForm::StartInitChargingCompletedTimer(void)
        result r = E_SUCCESS;
        bool isCharging = false;
 
-       TryReturnVoid(__pChargingCompletedTimer != null, "__pChargingCompletedTimer is null");
+       TryReturnVoid(_pChargingCompletedTimer != null, "__pChargingCompletedTimer is null");
 
-       isCharging = __pCameraPresentationModel->IsCharging();
+       isCharging = _pCameraPresentationModel->IsCharging();
 
        __batteryStatus = GetCurrentBatteryState();
        AppLogDebug("__batteryStatus = %d" , __batteryStatus);
 
        if (isCharging && __batteryStatus == BATTERY_STATE_20)  
        {
-               if (__pChargingCompletedTimer)
+               if (_pChargingCompletedTimer)
                {
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
                }
 
-               __chargingCount = 0;
+               _chargingCount = 0;
 
-               __blinkCount = 0;
+               _blinkCount = 0;
 
                r = DrawBatteryLevelFull();
-               TryReturnVoid(r == E_SUCCESS, "__pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
+               TryReturnVoid(r == E_SUCCESS, "_pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
 
                AppLogDebug("EXIT");
                return;
        }
-       __chargingCount = INDEX_UNIT_ZERO;
+       _chargingCount = INDEX_UNIT_ZERO;
 
        if (__batteryStatus == BATTERY_STATE_20)
        {
-               if (__pChargingCompletedTimer)
+               if (_pChargingCompletedTimer)
                {
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
 
-                       r = __pChargingCompletedTimer->StartAsRepeatable(CAMERA_CHARGING_TIMER);
-                       TryReturnVoid(r == E_SUCCESS, "__pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
+                       r = _pChargingCompletedTimer->StartAsRepeatable(CAMERA_CHARGING_TIMER);
+                       TryReturnVoid(r == E_SUCCESS, "_pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               if (__pChargingCompletedTimer)
+               if (_pChargingCompletedTimer)
                {
-                       __pChargingCompletedTimer->Cancel();
+                       _pChargingCompletedTimer->Cancel();
                }
 
-               __chargingCount = 0;
-               __blinkCount = 0;
+               _chargingCount = 0;
+               _blinkCount = 0;
 
                CheckBatteryStatus();
        }
@@ -4481,27 +4278,27 @@ CameraForm::StartInitChargingTimer(void)
        result r = E_SUCCESS;
        bool isCharging = false;
 
-       TryReturnVoid(__pChargingTimer != null, "__pChargingTimer is null");
+       TryReturnVoid(_pChargingTimer != null, "_pChargingTimer is null");
 
-       isCharging = __pCameraPresentationModel->IsCharging();
+       isCharging = _pCameraPresentationModel->IsCharging();
 
-       __chargingCount = INDEX_UNIT_ZERO;
+       _chargingCount = INDEX_UNIT_ZERO;
 
        if (isCharging)
        {
-               if (__pChargingTimer)
+               if (_pChargingTimer)
                {
-                       __pChargingTimer->Cancel();
+                       _pChargingTimer->Cancel();
 
-                       r = __pChargingTimer->StartAsRepeatable(CAMERA_CHARGING_TIMER);
-                       TryReturnVoid(r == E_SUCCESS, "__pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
+                       r = _pChargingTimer->StartAsRepeatable(CAMERA_CHARGING_TIMER);
+                       TryReturnVoid(r == E_SUCCESS, "_pChargingTimer::Start() fail[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               if (__pChargingTimer)
+               if (_pChargingTimer)
                {
-                       __pChargingTimer->Cancel();
+                       _pChargingTimer->Cancel();
                }
        }
        AppLogDebug("EXIT");
@@ -4519,27 +4316,27 @@ CameraForm::ToggleCameraDirection(int direction)
        BufferInfo bufferinfo;
        bool isInitCameraStaus = false;
 
-       if (__pAppTimer != null)
+       if (_pAppTimer != null)
        {
-               __pAppTimer->Cancel();
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-               TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+               r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+               TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
        }
 
        if (direction == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
                AppLogDebug("FRONT");
-               r = __pCameraPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_SNAPSHOT, CameraPresentationModel::CAMERA_DIRECTION_FRONT);
+               r = _pCameraPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_SNAPSHOT, CameraPresentationModel::CAMERA_DIRECTION_FRONT);
        }
        else if (direction == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
                AppLogDebug("BACK");
-               r = __pCameraPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_SNAPSHOT, CameraPresentationModel::CAMERA_DIRECTION_BACK);
+               r = _pCameraPresentationModel->ToggleCameraDirection(CameraPresentationModel::CAMERA_MODE_SNAPSHOT, CameraPresentationModel::CAMERA_DIRECTION_BACK);
        }
        TryCatch(r == E_SUCCESS, , "__pCamcorderPresentationModel->ToggleCameraDirection() fail[%s]", GetErrorMessage(r));
 
-       dim = __pCameraPresentationModel->GetPreviewResolution();
+       dim = _pCameraPresentationModel->GetPreviewResolution();
        AppLogDebug("CameraForm::GetPreviewResolution(W:%d, H:%d)", dim.width, dim.height);
 
        AppLogDebug("__screenMode [%d]", __screenMode);
@@ -4568,7 +4365,7 @@ CameraForm::ToggleCameraDirection(int direction)
 
        InDrawFocus();
 
-       isInitCameraStaus = __pCameraPresentationModel->GetInitCameraStatus();
+       isInitCameraStaus = _pCameraPresentationModel->GetInitCameraStatus();
        AppLogDebug("isInitCameraStaus [%d]", isInitCameraStaus);
 
        if (isInitCameraStaus)
@@ -4615,7 +4412,7 @@ CameraForm::MakePreviewResolutionList(bool remakeList = false)
                r = __pPreviewResolutionList->Construct();
                TryCatch(r == E_SUCCESS, , "__pPreviewResolutionList construct fail[%s]", GetErrorMessage(r));
 
-               pTempList = __pCameraPresentationModel->GetPreviewResolutionList();
+               pTempList = _pCameraPresentationModel->GetPreviewResolutionList();
                TryCatch(pTempList != null, , "GetPreviewResolutionList() return null");
                tot = pTempList->GetCount();
                if (tot > 0)
@@ -4696,7 +4493,7 @@ CameraForm::MakeCaptrueResolutionList(bool remakeList = false)
                r = __pCaptureResolutionList->Construct();
                TryCatch(r == E_SUCCESS, , "__pCaptureResolutionList construct fail[%s]", GetErrorMessage(r));
 
-               pTempList = __pCameraPresentationModel->GetCaptureResolutionList();
+               pTempList = _pCameraPresentationModel->GetCaptureResolutionList();
                TryCatch(pTempList != null, , "GetCaptureResolutionList() return null");
                tot = pTempList->GetCount();
                if (tot > 0)
@@ -4788,7 +4585,7 @@ CameraForm::MakeIsoList(bool remakeList = false)
                r = __pIsoList->Construct();
                TryCatch(r == E_SUCCESS, , "__pIsoList construct fail[%s]", GetErrorMessage(r));
 
-               pTempList = __pCameraPresentationModel->GetIsoList();
+               pTempList = _pCameraPresentationModel->GetIsoList();
                TryCatch(pTempList != null, , "GetIsoList() return null");
                tot = pTempList->GetCount();
                if (tot > 0)
@@ -5265,41 +5062,6 @@ CameraForm::GetItemCount(void)
        return 0;
 }
 
-void
-CameraForm::OnKeyPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
-{
-       AppLogDebug("ENTER OnKeyPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::OnKeyReleased(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
-{
-       AppLogDebug("ENTER OnKeyReleased Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::OnKeyLongPressed(const Tizen::Ui::Control& source, Tizen::Ui::KeyCode keyCode)
-{
-       AppLogDebug("ENTER OnKeyLongPressed Control : %ls, KeyCode : %d", source.GetName().GetPointer(), keyCode);
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::OnAdjustmentValueChanged(const Tizen::Ui::Control& source, int adjustment)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::OnSliderBarMoved(Tizen::Ui::Controls::Slider& source, int value)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
 inline int
 CameraForm::GetGeneralTabSettingMainMenuCount(void) const
 {
@@ -5517,7 +5279,7 @@ CameraForm::GetTimerIntervalValue(void) const
        result r = E_SUCCESS;
        int timerInterval = 0;
 
-       r = __pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
+       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, timerInterval);
        TryCatch(r == E_SUCCESS, , "Faled to get value to registry");
 
        AppLogDebug("EXIT");
@@ -5533,41 +5295,11 @@ CameraForm::SetGuideLine(int guideLineEnable)
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
 
-       r = __pCameraPresentationModel->SetValue(GUIDELINE_ENABLE, guideLineEnable);
+       r = _pCameraPresentationModel->SetValue(GUIDELINE_ENABLE, guideLineEnable);
        TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
        AppLogDebug("EXIT");
 }
 
-void
-CameraForm::SetStorageType(int storageType)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-
-       if (storageType == STORAGE_TYPE_PHONE)
-       {
-               r = __pCameraPresentationModel->SetValue(STORAGE_TYPE, storageType);
-               TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
-               __pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
-       }
-       else if (storageType == STORAGE_TYPE_MEMORYCARD)
-       {
-               if (__pCameraPresentationModel->IsStorageCardMounted() == true)
-               {
-                       AppLogDebug("StorageCard mount");
-                       r = __pCameraPresentationModel->SetValue(STORAGE_TYPE, storageType);
-                       TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
-                       __pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_MOUNT);
-               }
-               else
-               {
-                       AppLogDebug("StorageCard unmount");
-                       __pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
-               }
-       }
-       AppLogDebug("EXIT");
-}
-
 result
 CameraForm::RestoreDefaultSetting(void)
 {
@@ -5578,76 +5310,76 @@ CameraForm::RestoreDefaultSetting(void)
        bool brighnesstValue = false;
        int adjustValue = 0;
 
-       r = __pCameraPresentationModel->ResetCameraSettingsRegistry();
+       r = _pCameraPresentationModel->ResetCameraSettingsRegistry();
        TryCatch(r == E_SUCCESS, ,"ResetCameraSettingsRegistry() fail[%s]", GetErrorMessage(r));
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
        }
 
        if (exposureValue == true && r == E_SUCCESS)
        {
-               r = __pCameraPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
+               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, adjustValue);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                AppLogDebug("adjustValue = %d", adjustValue);
 
-               __pCameraPresentationModel->SetExposure(adjustValue);
+               _pCameraPresentationModel->SetExposure(adjustValue);
        }
        else
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
 
                if (brighnesstValue == true && r == E_SUCCESS)
                {
-                       r = __pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
+                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, adjustValue);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        AppLogDebug("adjustValue = %d", adjustValue);
 
-                       __pCameraPresentationModel->SetBrightness(adjustValue);
+                       _pCameraPresentationModel->SetBrightness(adjustValue);
                }
        }
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
        }
 
        if (r == E_SUCCESS)
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, adjustValue);
+                       r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, adjustValue);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, adjustValue);
+                       r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, adjustValue);
                }
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                AppLogDebug("adjustValue = %d", adjustValue);
 
-               __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
+               _pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)adjustValue);
        }
 
        AppLogDebug("EXIT");
@@ -5673,13 +5405,13 @@ CameraForm::RestorePrimaryResolution(void)
        Dimension captureResolutionDim;
        BufferInfo bufferinfo;
 
-       TryCatch(__pAppTimer != null, , "__pAppTimer is null");
-       __pAppTimer->Cancel();
+       TryCatch(_pAppTimer != null, , "_pAppTimer is null");
+       _pAppTimer->Cancel();
 
-       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-       TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+       TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-       pCaptureResolutionList = __pCameraPresentationModel->GetCaptureResolutionList();
+       pCaptureResolutionList = _pCameraPresentationModel->GetCaptureResolutionList();
 
        resolutionIndex = pCaptureResolutionList->GetCount() - INDEX_UNIT_ONE;
 
@@ -5704,14 +5436,14 @@ CameraForm::RestorePrimaryResolution(void)
                SetOverlayRendererRotation();
        }
 
-       __pCameraPresentationModel->KeepScreenOnState(true, false);
+       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-       __pCameraPresentationModel->StopCamera();
+       _pCameraPresentationModel->StopCamera();
 
-       r = __pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       r = _pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
        TryCatch(r == E_SUCCESS, , "SetMode fail[%s]", GetErrorMessage(r));
 
-       pList = __pCameraPresentationModel->GetCaptureResolutionList();
+       pList = _pCameraPresentationModel->GetCaptureResolutionList();
 
        resolutionCnt = pList->GetCount();
 
@@ -5723,16 +5455,16 @@ CameraForm::RestorePrimaryResolution(void)
 
        __captureResolutionHeight = captureResolutionDim.height;
 
-       __pCameraPresentationModel->SetCaptureResolution(captureResolutionDim);
+       _pCameraPresentationModel->SetCaptureResolution(captureResolutionDim);
 
        __primaryCurrentResolutionIndex = INDEX_UNIT_ZERO;
 
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
        TryCatch(r == E_SUCCESS, , "GetBackgroundBufferInfo start fail[%s]", GetErrorMessage(r));
 
-       __pCameraPresentationModel->StartPreview(&bufferinfo);
+       _pCameraPresentationModel->StartPreview(&bufferinfo);
  
-       __pCameraPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
 
        if (wideMode == true)
        {
@@ -5774,13 +5506,13 @@ CameraForm::RestoreSecondaryResolution(void)
        Dimension resolutionDim;
        Dimension captureResolutionDim;
 
-       TryCatch(__pAppTimer != null, , "__pAppTimer is null");
-       __pAppTimer->Cancel();
+       TryCatch(_pAppTimer != null, , "_pAppTimer is null");
+       _pAppTimer->Cancel();
 
-       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-       TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+       TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-       pCaptureResolutionList = __pCameraPresentationModel->GetCaptureResolutionList();
+       pCaptureResolutionList = _pCameraPresentationModel->GetCaptureResolutionList();
 
        resolutionIndex = pCaptureResolutionList->GetCount() - INDEX_UNIT_ONE;
 
@@ -5797,7 +5529,7 @@ CameraForm::RestoreSecondaryResolution(void)
                wideMode = false;
        }
 
-       pList = __pCameraPresentationModel->GetCaptureResolutionList();
+       pList = _pCameraPresentationModel->GetCaptureResolutionList();
 
        resolutionCnt = pList->GetCount();
 
@@ -5809,7 +5541,7 @@ CameraForm::RestoreSecondaryResolution(void)
 
        __captureResolutionHeight = captureResolutionDim.height;
 
-       __pCameraPresentationModel->SetCaptureResolution(captureResolutionDim);
+       _pCameraPresentationModel->SetCaptureResolution(captureResolutionDim);
 
        __primaryCurrentResolutionIndex = INDEX_UNIT_ZERO;
 
@@ -5883,7 +5615,7 @@ CameraForm::DrawFocus(int focusMode)
        Rectangle rect = Rectangle(X_PREVIEW_OVERLAY_LANDSCAPE, Y_PREVIEW_OVERLAY_LANDSCAPE,
                                                        W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (__dir == ORIENTATION_STATUS_PORTRAIT
@@ -5900,11 +5632,11 @@ CameraForm::DrawFocus(int focusMode)
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
        }
 
        if (focusSupport == true && r == E_SUCCESS)
@@ -6067,7 +5799,7 @@ CameraForm::ProcessFlashListPopup(int index)
        ResourceId resIdNormal = RESOURCE_ID_CAMERA_MODE_FLASH_AUTO_NOR;
        ResourceId resIdPress = RESOURCE_ID_CAMERA_MODE_FLASH_AUTO_NOR;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
@@ -6081,7 +5813,7 @@ CameraForm::ProcessFlashListPopup(int index)
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                if (value == true && r == E_SUCCESS)
                {
@@ -6131,7 +5863,7 @@ CameraForm::ProcessFlashListPopup(int index)
                }
        }       
        
-               __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
+               _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, regVal);
        
 
        TryCatch(__pSettingPanel != null, r = E_SYSTEM, "__pSettingPanel is null");
@@ -6161,7 +5893,7 @@ CameraForm::ProcessFlashListPopup(int index)
        SetCameraTabSettingMainMenuCount(MENU_COUNT_CLEAR);
        SetCameraTabSubMenuListviewState(MENU_COUNT_CLEAR, CAMERA_TAB_SUB_MENU_CONTENT_MAX);
 
-       __pCameraPresentationModel->SetFlashMode(cameraFlashMode);
+       _pCameraPresentationModel->SetFlashMode(cameraFlashMode);
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -6239,16 +5971,16 @@ CameraForm::ProcessCameraTabMainListPopup(int index)
                                        }
                                }
 
-                               r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                                TryCatch(r == E_SUCCESS, , "Reg GetValue() fail[%s]", GetErrorMessage(r));
 
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
                                }
                                else
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
                                }
 
                                if (r == E_SUCCESS)
@@ -6257,7 +5989,7 @@ CameraForm::ProcessCameraTabMainListPopup(int index)
                                }
                                else
                                {
-                                       r = __pCameraPresentationModel->SetValue(ISO_VALUE, REG_DEFAULT_VAULE_ZERO);
+                                       r = _pCameraPresentationModel->SetValue(ISO_VALUE, REG_DEFAULT_VAULE_ZERO);
                                        TryCatch(r == E_SUCCESS, , "Reg SetValue() fail[%s]", GetErrorMessage(r));
 
                                        drawPopup = false;
@@ -6400,7 +6132,7 @@ CameraForm::ProcessCameraTabSubListPopup(int index)
        int selfPortraitEnable = 0;
        CameraTabSubMenuContent idx = CAMERA_TAB_SUB_MENU_CONTENT_MAX;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "Reg GetValue() fail[%s]", GetErrorMessage(r));
 
        idx = GetCameraTabSettingSubMenuMode();
@@ -6549,7 +6281,7 @@ CameraForm::ProcessGeneraTabMainListPopup(int index)
                        {
                                result r = E_SUCCESS;
 
-                               r = __pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_ENABLE);
+                               r = _pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, SCREEN_OVERLAY_HELP_ENABLE);
                                TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
                                r = SetScreenOverlayHelpTimer();
@@ -6654,7 +6386,7 @@ CameraForm::ProcessGeneraTabSubListPopup(int index)
        int selfPortraitEnable = 0;
        GeneralTabSubMenuContent idx = GENERAL_TAB_SUB_MENU_CONTENT_MAX;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "Reg GetValue() fail[%s]", GetErrorMessage(r));
 
        idx = GetGeneralTabSettingSubMenuMode();
@@ -6716,14 +6448,14 @@ CameraForm::StartPopupTimer(void)
        result r = E_SUCCESS;
        int timerInterval = 0;
 
-       __timeCount = 0;
+       _timeCount = 0;
 
-       __pPopupTimer = new (std::nothrow) Timer();
+       _pPopupTimer = new (std::nothrow) Timer();
 
-       __pPopupTimer->Construct(*this);
+       _pPopupTimer->Construct(*this);
 
-       r = __pPopupTimer->StartAsRepeatable(CAMERA_TIMER_1_SEC);
-       TryCatch(r == E_SUCCESS, , "__pPopupTimer start fail[%s]", GetErrorMessage(r));
+       r = _pPopupTimer->StartAsRepeatable(CAMERA_TIMER_1_SEC);
+       TryCatch(r == E_SUCCESS, , "_pPopupTimer start fail[%s]", GetErrorMessage(r));
 
        timerInterval = GetTimerIntervalValue();
 
@@ -6731,19 +6463,19 @@ CameraForm::StartPopupTimer(void)
        {
        case SETTING_TIMER_CAPTURE_2_SEC:
                {
-                       __timeCount = SETTING_TIMER_2_SEC_COUNT;
+                       _timeCount = SETTING_TIMER_2_SEC_COUNT;
                }
                break;
 
        case SETTING_TIMER_CAPTURE_5_SEC:
                {
-                       __timeCount = SETTING_TIMER_5_SEC_COUNT;
+                       _timeCount = SETTING_TIMER_5_SEC_COUNT;
                }
                break;
 
        case SETTING_TIMER_CAPTURE_10_SEC:
                {
-                       __timeCount = SETTING_TIMER_10_SEC_COUNT;
+                       _timeCount = SETTING_TIMER_10_SEC_COUNT;
                }
                break;
 
@@ -6752,15 +6484,15 @@ CameraForm::StartPopupTimer(void)
        }
 
        __pCameraInfoPanel->SetDrawPopupTimerUpdate(true);
-       __pCameraInfoPanel->SetDrawPopupTimerCount(__timeCount);
+       __pCameraInfoPanel->SetDrawPopupTimerCount(_timeCount);
        __pCameraInfoPanel->Invalidate(true);
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
 
 CATCH:
-       delete __pPopupTimer;
-       __pPopupTimer = null;
+       delete _pPopupTimer;
+       _pPopupTimer = null;
 
        return r;
 }
@@ -6770,12 +6502,12 @@ CameraForm::StopPopupTimer(void)
 {
        AppLogDebug("ENTER");
        result r = E_SUCCESS;
-       TryCatch(__pPopupTimer != null, r = E_SYSTEM, "__pPopupTimer is null");
+       TryCatch(_pPopupTimer != null, r = E_SYSTEM, "_pPopupTimer is null");
 
-       r = __pPopupTimer->Cancel();
+       r = _pPopupTimer->Cancel();
 
-       delete __pPopupTimer;
-       __pPopupTimer = null;
+       delete _pPopupTimer;
+       _pPopupTimer = null;
 
        AppLogDebug("EXIT");
        return E_SUCCESS;
@@ -6797,85 +6529,85 @@ CameraForm::SetCameraSettingsDevice(void)
        bool exposureValue = false;
        bool brighnesstValue = false;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Faled to Get value to registry[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
        }
 
        if (exposureValue == true && r == E_SUCCESS)
        {
-               r = __pCameraPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
+               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
                TryReturnVoid(r == E_SUCCESS, "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
 
-               __pCameraPresentationModel->SetExposure(exposure);
+               _pCameraPresentationModel->SetExposure(exposure);
        }
        else
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
 
                if (brighnesstValue == true && r == E_SUCCESS)
                {
-                       r = __pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, brightness);
+                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, brightness);
                        TryReturnVoid(r == E_SUCCESS, "brightness Faled to Get value to registry[%s]", GetErrorMessage(r));
 
-                       __pCameraPresentationModel->SetBrightness(brightness);
+                       _pCameraPresentationModel->SetBrightness(brightness);
                }
        }
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
        }
 
        if (r == E_SUCCESS)
        {
-               r = __pCameraPresentationModel->GetValue(ISO_VALUE, isoIndex);
+               r = _pCameraPresentationModel->GetValue(ISO_VALUE, isoIndex);
                TryReturnVoid(r == E_SUCCESS, "isoIndex Faled to Get value to registry[%s]", GetErrorMessage(r));
 
-               __pCameraPresentationModel->SetIsoLevel((CameraIsoLevel)isoIndex);
+               _pCameraPresentationModel->SetIsoLevel((CameraIsoLevel)isoIndex);
        }
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
        }
 
        if (r == E_SUCCESS)
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, wbIndex);
+                       r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, wbIndex);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, wbIndex);
+                       r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, wbIndex);
                }
 
                TryReturnVoid(r == E_SUCCESS, "WB Faled to Get value to registry[%s]", GetErrorMessage(r));
 
-               __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
+               _pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)wbIndex);
        }
        AppLogDebug("EXIT");
 }
@@ -6971,10 +6703,10 @@ CATCH:
                pSrcByteBuff = null;
        }
 
-       if (pBitmap != null)                    //Prevent issue fix.\r
-       {\r
-               delete pBitmap;\r
-       }\r
+       if (pBitmap != null)                    //Prevent issue fix.
+       {
+               delete pBitmap;
+       }
        return null;
 }
 
@@ -7032,39 +6764,39 @@ CameraForm::SetSliderAdjustValue(const Tizen::Graphics::Point& currentPosition,
                }
        }
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (entryName.Equals(String(EXPOSURE_VALUE)))
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                }
 
                if (exposureValue == true && r == E_SUCCESS)
                {
-                       r = __pCameraPresentationModel->GetValue(EXPOSURE_VALUE, currentEntryValue);
+                       r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, currentEntryValue);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                }
                else
                {
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                        }
 
                        if (brighnesstValue == true && r == E_SUCCESS)
                        {
-                               r = __pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, currentEntryValue);
+                               r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, currentEntryValue);
                                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                        }
                }
@@ -7074,63 +6806,63 @@ CameraForm::SetSliderAdjustValue(const Tizen::Graphics::Point& currentPosition,
                {
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                        }
 
                        if (exposureValue == true && r == E_SUCCESS)
                        {
-                               r = __pCameraPresentationModel->SetValue(EXPOSURE_VALUE, adjustEntryValue);
+                               r = _pCameraPresentationModel->SetValue(EXPOSURE_VALUE, adjustEntryValue);
                                TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
                        }
                        else
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
                                else
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
 
                                if (brighnesstValue == true && r == E_SUCCESS)
                                {
-                                       r = __pCameraPresentationModel->SetValue(BRIGHTNESS_VALUE, adjustEntryValue);
+                                       r = _pCameraPresentationModel->SetValue(BRIGHTNESS_VALUE, adjustEntryValue);
                                        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
                                }
                        }
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                        }
 
                        if (exposureValue == true && r == E_SUCCESS)
                        {
-                               __pCameraPresentationModel->SetExposure(adjustEntryValue);
+                               _pCameraPresentationModel->SetExposure(adjustEntryValue);
                        }
                        else
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
                                else
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
 
                                if (brighnesstValue == true && r == E_SUCCESS)
                                {
-                                       __pCameraPresentationModel->SetBrightness(adjustEntryValue);
+                                       _pCameraPresentationModel->SetBrightness(adjustEntryValue);
                                }
                                else
                                {
@@ -7155,11 +6887,11 @@ CameraForm::CreateExposureSlider(void)
 
        TryCatch(__pCameraInfoPanel != null, r = E_FAILURE, "__pCameraInfoPanel is null");
 
-       __closeTimerValue = 0;
-       __pExposureCloseTimer = new (std::nothrow) Timer();
-       __pExposureCloseTimer->Construct(*this);
+       _closeTimerValue = 0;
+       _pExposureCloseTimer = new (std::nothrow) Timer();
+       _pExposureCloseTimer->Construct(*this);
 
-       __pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
+       _pExposureCloseTimer->StartAsRepeatable(CAMERA_EXPOSURE_TIMER_VALUE);
        TryCatch(r == E_SUCCESS, , "Timer::start fail[%s]", GetErrorMessage(r));
 
        __pCameraInfoPanel->SetDrawExposure(true);
@@ -7169,8 +6901,8 @@ CameraForm::CreateExposureSlider(void)
        return r;
 
 CATCH:
-       delete __pExposureCloseTimer;
-       __pExposureCloseTimer = null;
+       delete _pExposureCloseTimer;
+       _pExposureCloseTimer = null;
 
        return r;
 }
@@ -7188,21 +6920,21 @@ CameraForm::DrawExposureSlider(void)
        bool exposureValue = false;
        bool brighnesstValue = false;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
        }
 
        if (exposureValue == true && r == E_SUCCESS)
        {
-               r = __pCameraPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
+               r = _pCameraPresentationModel->GetValue(EXPOSURE_VALUE, exposure);
                TryCatch(r == E_SUCCESS, , "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
                AppLogDebug("Exposure value %d", exposure);
        }
@@ -7210,16 +6942,16 @@ CameraForm::DrawExposureSlider(void)
        {
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                }
 
                if (brighnesstValue == true && r == E_SUCCESS)
                {
-                       r = __pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, exposure);
+                       r = _pCameraPresentationModel->GetValue(BRIGHTNESS_VALUE, exposure);
                        TryCatch(r == E_SUCCESS, , "exposure Faled to Get value to registry[%s]", GetErrorMessage(r));
                        AppLogDebug("Exposure value %d", exposure);
                }
@@ -7438,22 +7170,22 @@ CameraForm::ShowExposureSlider(void)
        bool brighnesstValue = false;
        result r = E_SUCCESS;
 
-       if (__pExposureCloseTimer)
+       if (_pExposureCloseTimer)
        {
-               r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-               if (__pExposureCloseTimer->Cancel() == E_SUCCESS)
+               if (_pExposureCloseTimer->Cancel() == E_SUCCESS)
                {
                        HidePopup();
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_EXPOSURE, exposureValue);
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_EXPOSURE, exposureValue);
                        }
 
                        if (exposureValue == true && r == E_SUCCESS)
@@ -7468,11 +7200,11 @@ CameraForm::ShowExposureSlider(void)
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
                                else
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_BRIGHTNESS, brighnesstValue);
                                }
 
                                if (brighnesstValue == true && r == E_SUCCESS)
@@ -7694,7 +7426,7 @@ CameraForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Or
        int selfPortraitEnable = CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY;
        int guideLineEnable = DISABLE_GUIDELINE;
 
-       if (__appControlActionCompleted)
+       if (_appControlActionCompleted)
        {
                AppLogDebug("OnOrientationChanged >> TerminateApp Execution");
 
@@ -7710,13 +7442,13 @@ CameraForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Or
        {
                __isOrientationChanged = true;
 
-               if (__pAppTimer != null)
+               if (_pAppTimer != null)
                {
-                       __pAppTimer->Cancel();
+                       _pAppTimer->Cancel();
 
-                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
                }
-               r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
 
                SetOverlayPanelOrientationChanged(orientationStatus);
@@ -7767,9 +7499,9 @@ CameraForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Or
                __deviceOrientation = orientationStatus;
 
                AppLogDebug("__dir = %d", __dir);
-               __pCameraPresentationModel->SetOrientation(__dir);
+               _pCameraPresentationModel->SetOrientation(__dir);
 
-               r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
+               r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
                TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
 
                if (guideLineEnable == DISABLE_GUIDELINE)
@@ -7787,12 +7519,12 @@ CameraForm::OnOrientationChanged(const Tizen::Ui::Control& source, Tizen::Ui::Or
 
                if (__isTimerRunning)
                {
-                       if (__pHelpCloseTimer)
+                       if (_pHelpCloseTimer)
                        {
-                               __pHelpCloseTimer->Cancel();
+                               _pHelpCloseTimer->Cancel();
 
-                               delete __pHelpCloseTimer;
-                               __pHelpCloseTimer = null;
+                               delete _pHelpCloseTimer;
+                               _pHelpCloseTimer = null;
                        }
 
                        HideScreenOverlayHelp();
@@ -8528,12 +8260,12 @@ CameraForm::SetCameraMode(bool isWideMode)
        int selfPortraitEnable = 0;
        BufferInfo bufferinfo;
 
-       r = __pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       r = _pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
        TryReturnVoid(r == E_SUCCESS, "SetMode() failed:%s", GetErrorMessage(r));
 
        if (isWideMode == true)
        {
-               pList = __pCameraPresentationModel->GetPreviewResolutionList();
+               pList = _pCameraPresentationModel->GetPreviewResolutionList();
 
                if (pList)
                {
@@ -8566,14 +8298,14 @@ CameraForm::SetCameraMode(bool isWideMode)
 
                AppLogDebug("Wide Mode W[%d] x H[%d]", resolutionDim.width, resolutionDim.height);
 
-               __pCameraPresentationModel->SetPreviewResolution(resolutionDim);
+               _pCameraPresentationModel->SetPreviewResolution(resolutionDim);
        }
        else
        {
-               r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "Faled to set value to registry[%s]", GetErrorMessage(r));
 
-               __pCameraPresentationModel->SetPreviewResolution(normalMode);
+               _pCameraPresentationModel->SetPreviewResolution(normalMode);
 
                __previewResolutionWidth = normalMode.width;
                __previewResolutionHeight = normalMode.height;
@@ -8582,7 +8314,7 @@ CameraForm::SetCameraMode(bool isWideMode)
 
                if (__isToggleCameraDirection)
                {
-                       pList = __pCameraPresentationModel->GetPreviewResolutionList();
+                       pList = _pCameraPresentationModel->GetPreviewResolutionList();
 
                        resolutionCnt = pList->GetCount();
 
@@ -8615,7 +8347,7 @@ CameraForm::SetCameraMode(bool isWideMode)
                        }
                        else
                        {
-                               captureResolutionDim = __pCameraPresentationModel->GetCaptureResolution();
+                               captureResolutionDim = _pCameraPresentationModel->GetCaptureResolution();
                                __captureResolutionWidth = captureResolutionDim.width;
                                __captureResolutionHeight = captureResolutionDim.height;
 
@@ -8627,9 +8359,9 @@ CameraForm::SetCameraMode(bool isWideMode)
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-       __pCameraPresentationModel->StartPreview(&bufferinfo);
+       _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-       __pCameraPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
 
        previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight;
 
@@ -9341,29 +9073,29 @@ CameraForm::SetScreenMode(const ScreenMode mode, bool destory)
                        {
                                if (__screenMode != mode)
                                {
-                                       TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
-                                       __pAppTimer->Cancel();
+                                       TryCatch(_pAppTimer != null, r = E_SYSTEM, "_pAppTimer is null");
+                                       _pAppTimer->Cancel();
 
-                                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                                       TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                                       TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                                       __pCameraPresentationModel->KeepScreenOnState(true, false);
+                                       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-                                       __pCameraPresentationModel->StopCamera();
+                                       _pCameraPresentationModel->StopCamera();
                                }
                                else
                                {
                                        if (__isToggleCameraDirection || __resolutionChange)
                                        {
-                                               TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
-                                               __pAppTimer->Cancel();
+                                               TryCatch(_pAppTimer != null, r = E_SYSTEM, "_pAppTimer is null");
+                                               _pAppTimer->Cancel();
 
-                                               r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                                               TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                                               r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                                               TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                                               __pCameraPresentationModel->KeepScreenOnState(true, false);
+                                               _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-                                               __pCameraPresentationModel->StopCamera();
+                                               _pCameraPresentationModel->StopCamera();
                                        }
                                }
 
@@ -9410,29 +9142,29 @@ CameraForm::SetScreenMode(const ScreenMode mode, bool destory)
                        {
                                if (__screenMode != mode)
                                {
-                                       TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
-                                       __pAppTimer->Cancel();
+                                       TryCatch(_pAppTimer != null, r = E_SYSTEM, "_pAppTimer is null");
+                                       _pAppTimer->Cancel();
 
-                                       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                                       TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                                       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                                       TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                                       __pCameraPresentationModel->KeepScreenOnState(true, false);
+                                       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-                                       __pCameraPresentationModel->StopCamera();
+                                       _pCameraPresentationModel->StopCamera();
                                }
                                else
                                {
                                        if (__isToggleCameraDirection || __resolutionChange)
                                        {
-                                               TryCatch(__pAppTimer != null, r = E_SYSTEM, "__pAppTimer is null");
-                                               __pAppTimer->Cancel();
+                                               TryCatch(_pAppTimer != null, r = E_SYSTEM, "_pAppTimer is null");
+                                               _pAppTimer->Cancel();
 
-                                               r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-                                               TryCatch(r == E_SUCCESS, , "__pAppTimer start fail[%s]", GetErrorMessage(r));
+                                               r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+                                               TryCatch(r == E_SUCCESS, , "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
-                                               __pCameraPresentationModel->KeepScreenOnState(true, false);
+                                               _pCameraPresentationModel->KeepScreenOnState(true, false);
 
-                                               __pCameraPresentationModel->StopCamera();
+                                               _pCameraPresentationModel->StopCamera();
                                        }
                                }
 
@@ -9500,7 +9232,7 @@ CameraForm::BackButtonPerformed(void)
                return E_SUCCESS;
        }
 
-       if (__pCameraPresentationModel->GetPreviewState() == false)
+       if (_pCameraPresentationModel->GetPreviewState() == false)
        {
                AppLogDebug("EXIT - StartPreview do not call");
                __pBackButton->SetEnabled(false);
@@ -9509,11 +9241,11 @@ CameraForm::BackButtonPerformed(void)
 
        if (__pCameraInfoPanel->GetDrawExposure() == true)
        {
-               __closeTimerValue = 0;
+               _closeTimerValue = 0;
 
-               if (__pExposureCloseTimer)
+               if (_pExposureCloseTimer)
                {
-                       __pExposureCloseTimer->Cancel();
+                       _pExposureCloseTimer->Cancel();
                }
 
                __pCameraInfoPanel->SetDrawExposure(false);
@@ -9559,9 +9291,9 @@ CameraForm::PressBackButton(void)
        {
                AppLogDebug("PressBackButton >> Back to the App");
 
-               if (__pCameraPresentationModel->GetCameraState()!= CAMERA_STATE_CAPTURED)
+               if (_pCameraPresentationModel->GetCameraState()!= CAMERA_STATE_CAPTURED)
                {
-                       __pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED);
+                       _pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_CANCELED);
                }
 
                r = TerminateApp();
@@ -9683,16 +9415,16 @@ CameraForm::DrawTouchAutoFocus(const Tizen::Graphics::Point& currentPosition)
        {
                AppLogDebug("__isTimerRunning:false");
 
-               r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+               r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                TryReturnVoid(r == E_SUCCESS, "Reg getValue fail[%s]", GetErrorMessage(r));
 
                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
                }
                else
                {
-                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
                }
 
                if (focusSupport == true && r == E_SUCCESS)
@@ -9707,7 +9439,7 @@ CameraForm::DrawTouchAutoFocus(const Tizen::Graphics::Point& currentPosition)
                        __pCameraInfoPanel->SetDrawMarkerFocus(false);
                        __pCameraInfoPanel->Invalidate(true);
                }
-               __pCameraPresentationModel->SetAutoFocusPoint(currentPosition);
+               _pCameraPresentationModel->SetAutoFocusPoint(currentPosition);
        }
        else
        {
@@ -9720,20 +9452,20 @@ void
 CameraForm::DoCapture(void)
 {
        AppLogDebug("ENTER");
-       __pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
 
-       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-       __pAppTimer->Cancel();
+       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+       _pAppTimer->Cancel();
 
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __timeCount = INDEX_UNIT_ZERO;
-               __pPopupTimer->Cancel();
+               _timeCount = INDEX_UNIT_ZERO;
+               _pPopupTimer->Cancel();
        }
 
-       if (__pExposureCloseTimer)
+       if (_pExposureCloseTimer)
        {
-               __pExposureCloseTimer->Cancel();
+               _pExposureCloseTimer->Cancel();
        }
 
        if (__pCameraInfoPanel->GetDrawExposure() == true)
@@ -9742,14 +9474,14 @@ CameraForm::DoCapture(void)
                Invalidate(true);
        }
 
-       if (__pTouchAutoFocusTimer)
+       if (_pTouchAutoFocusTimer)
        {
-               __pTouchAutoFocusTimer->Cancel();
+               _pTouchAutoFocusTimer->Cancel();
        }
 
-       if (__pChargingTimer)
+       if (_pChargingTimer)
        {
-               __pChargingTimer->Cancel();
+               _pChargingTimer->Cancel();
        }
 
        HidePopup();
@@ -9804,15 +9536,15 @@ CameraForm::LaunchImageview(void)
        int index = 0;
        int loopCount = 0;
  
-       if (__pPopupTimer)
+       if (_pPopupTimer)
        {
-               __timeCount = INDEX_UNIT_ZERO;
-               __pPopupTimer->Cancel();
+               _timeCount = INDEX_UNIT_ZERO;
+               _pPopupTimer->Cancel();
        }
 
-       if (__pExposureCloseTimer)
+       if (_pExposureCloseTimer)
        {
-               __pExposureCloseTimer->Cancel();
+               _pExposureCloseTimer->Cancel();
        }
 
        HidePopup();
@@ -9826,7 +9558,7 @@ CameraForm::LaunchImageview(void)
        ArrayList* pContentPathList = new (std::nothrow) ArrayList(SingleObjectDeleter);
        pContentPathList->Construct();
 
-       pContentPathList = __pCameraPresentationModel->GetContentPathListN(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       pContentPathList = _pCameraPresentationModel->GetContentPathListN(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
        if (pContentPathList == null)
        {
                delete pExtraData;
@@ -9835,7 +9567,7 @@ CameraForm::LaunchImageview(void)
                return;
        }
 
-       loopCount = __pCameraPresentationModel->GetContentCount();
+       loopCount = _pCameraPresentationModel->GetContentCount();
        for (index = 0; index < loopCount; ++index)
        {
                filePath = static_cast<const String*>(pContentPathList->GetAt(index));
@@ -9892,16 +9624,16 @@ CameraForm::InDrawFocus(void)
                currentPosition.y = (rect.height / DIVIDE_BY_TWO);
        }
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FOCUS, focusSupport);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_SUPPORT_FOCUS, focusSupport);
        }
 
        if (focusSupport == true && r == E_SUCCESS)
@@ -9934,7 +9666,7 @@ CameraForm::GetCameraToForeground(void)
 
        __isLockScreenMode = false;
 
-       __pCameraPresentationModel->KeepScreenOnState(true, false);
+       _pCameraPresentationModel->KeepScreenOnState(true, false);
 
        StartInitAppTimer();
 
@@ -9945,18 +9677,18 @@ CameraForm::GetCameraToForeground(void)
 
        StartInitChargingTimer();
 
-       r = __pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       r = _pCameraPresentationModel->SetMode(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
        TryReturnVoid(r == E_SUCCESS, "SetMode() failed:%s", GetErrorMessage(r));
 
        Update();
 
-       previewResolutionDim = __pCameraPresentationModel->GetPreviewResolution();
+       previewResolutionDim = _pCameraPresentationModel->GetPreviewResolution();
        AppLogDebug("CameraForm::GetPreviewResolution(W:%d, H:%d)", previewResolutionDim.width, previewResolutionDim.height);
 
        __previewResolutionWidth = previewResolutionDim.width;
        __previewResolutionHeight = previewResolutionDim.height;
 
-       captureResolutionDim = __pCameraPresentationModel->GetCaptureResolution();
+       captureResolutionDim = _pCameraPresentationModel->GetCaptureResolution();
        AppLogDebug("CameraForm::captureResolutionDim(W:%d, H:%d)", previewResolutionDim.width, previewResolutionDim.height);
 
        AppLogDebug("__screenMode [%d]", __screenMode);
@@ -9976,15 +9708,15 @@ CameraForm::GetCameraToForeground(void)
 
        InDrawFocus();
 
-       r = __pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       r = _pCameraPresentationModel->SetValue(CURRENT_MODE, CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
        TryReturnVoid(r == E_SUCCESS, "Write Reg fail[%s]", GetErrorMessage(r));
 
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-       __pCameraPresentationModel->StartPreview(&bufferinfo);
+       _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-       __pCameraPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
 
        previewResolutionSize = __previewResolutionWidth * __previewResolutionHeight;
 
@@ -10001,14 +9733,14 @@ CameraForm::SendCameraToBackground(void)
        if (__isTimerRunning == true)
        {
                StopPopupTimer();
-               __timeCount = INDEX_UNIT_ZERO;
+               _timeCount = INDEX_UNIT_ZERO;
                __isTimerRunning = false;
-               __pCameraPresentationModel->SetIntervalTimerRun(false);
-               __isUsedTimerCaptured = false;
+               _pCameraPresentationModel->SetIntervalTimerRun(false);
+               _isUsedTimerCaptured = false;
 
-               if (__pIntervalValueTimer != null)
+               if (_pIntervalValueTimer != null)
                {
-                       __pIntervalValueTimer->Cancel();
+                       _pIntervalValueTimer->Cancel();
                }
 
                __pCameraInfoPanel->SetDrawPopupTimerUpdate(false);
@@ -10018,27 +9750,27 @@ CameraForm::SendCameraToBackground(void)
                HideUiPanel(false);
        }
 
-       if (__pAppTimer != null)
+       if (_pAppTimer != null)
        {
-               __pAppTimer->Cancel();
+               _pAppTimer->Cancel();
        }
 
-       if (__pChargingTimer != null)
+       if (_pChargingTimer != null)
        {
-               __chargingCount = 0;    
-               __pChargingTimer->Cancel();
+               _chargingCount = 0;     
+               _pChargingTimer->Cancel();
        }
 
-       if (__pChargingCompletedTimer != null)
+       if (_pChargingCompletedTimer != null)
        {
-               __chargingCount = 0;
-               __blinkCount  = 0;
-               __pChargingCompletedTimer->Cancel();
+               _chargingCount = 0;
+               _blinkCount  = 0;
+               _pChargingCompletedTimer->Cancel();
        }
 
-       if (__pPreviewFailPopupTimer != null)
+       if (_pPreviewFailPopupTimer != null)
        {
-               __pPreviewFailPopupTimer->Cancel();
+               _pPreviewFailPopupTimer->Cancel();
        }
 
        __pCameraInfoPanel->SetDrawMarkerFocus(false);
@@ -10046,9 +9778,9 @@ CameraForm::SendCameraToBackground(void)
 
        HidePopup();
 
-       __pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
-       __pCameraPresentationModel->StopCamera();
-       __pCameraPresentationModel->KeepScreenOnState(false, true);
+       _pCameraPresentationModel->SetStorageCardChageState(CameraPresentationModel::STORAGE_CARD_CHAGE_STATE_UNKNOWN);
+       _pCameraPresentationModel->StopCamera();
+       _pCameraPresentationModel->KeepScreenOnState(false, true);
 
        AppLogDebug("EXIT");
 }
@@ -10115,20 +9847,20 @@ CameraForm::SetCameraErrorOccurred(void)
                                                W_PREVIEW_OVERLAY_LANDSCAPE, H_PREVIEW_OVERLAY_LANDSCAPE);
        }
 
-       TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-       __pAppTimer->Cancel();
+       TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+       _pAppTimer->Cancel();
 
-       r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-       TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+       r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+       TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
        r = __pOverlayPanel->GetBackgroundBufferInfo(bufferinfo);
        TryReturnVoid(r == E_SUCCESS, "GetBackgroundBufferInfo fail[%s]", GetErrorMessage(r));
 
-       __pCameraPresentationModel->StartPreview(&bufferinfo);
+       _pCameraPresentationModel->StartPreview(&bufferinfo);
 
-       __pCameraPresentationModel->SetContinuousAutoFocus();
+       _pCameraPresentationModel->SetContinuousAutoFocus();
 
-       r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
+       r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, guideLineEnable);
        TryReturnVoid(r == E_SUCCESS, "Read Reg fail[%s]", GetErrorMessage(r));
 
        if (guideLineEnable == DISABLE_GUIDELINE)
@@ -10144,110 +9876,7 @@ CameraForm::SetCameraErrorOccurred(void)
 
        StopPopupTimer();
 
-       __isUsedTimerCaptured = false;
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::ShowCameraFailPopup(void)
-{
-       AppLogDebug("ENTER");
-       int modalResult = 0;
-       MessageBox msgBox;
-       String tmpString = L"";
-       result r = E_SUCCESS;
-       AppResource* pAppResource = null;
-
-       pAppResource = Application::GetInstance()->GetAppResource();
-       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
-
-       pAppResource->GetString(L"IDS_CAM_POP_CAMERA_FAILED", tmpString);
-
-       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_2_SEC);
-       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
-       msgBox.ShowAndWait(modalResult);
-
-       switch (modalResult)
-       {
-       case MSGBOX_RESULT_CLOSE:
-               {
-                       __pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
-
-                       r = __pCameraPresentationModel->SetValue(SELF_PORTRAIT_ENABLE, CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY);
-                       AppLogDebug("SetValue fail [%s]", GetErrorMessage(r));
-
-                       r = TerminateApp();
-                       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-               }
-               break;
-
-       default:
-               break;
-       }
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::ShowUnlaunchPopup(void)
-{
-       AppLogDebug("ENTER");
-       int modalResult = 0;
-       MessageBox msgBox;
-       String tmpString;
-       AppResource* pAppResource = null; 
-       result r = E_SUCCESS;           
-
-       pAppResource = Application::GetInstance()->GetAppResource();
-       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
-
-       pAppResource->GetString(L"IDS_CAM_POP_UNABLE_TO_START_CAMERA_DURING_CALL", tmpString);
-
-       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
-       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
-       msgBox.ShowAndWait(modalResult);
-
-       __pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
-       r = TerminateApp();
-       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::ShowLowBatteryPopup(void)
-{
-       AppLogDebug("ENTER");
-       int modalResult = 0;
-       MessageBox msgBox;
-       String tmpString;
-       AppResource* pAppResource = null;
-       result r = E_SUCCESS;
-
-       pAppResource = Application::GetInstance()->GetAppResource();
-       TryReturnVoid(pAppResource != null, "Failed to allocate memory for pAppResource");
-
-       pAppResource->GetString(L"IDS_COM_BODY_LOW_BATTERY", tmpString);
-
-       r = msgBox.Construct(L"", tmpString, MSGBOX_STYLE_NONE, MESSAGEBOX_DISPLAY_TIME_3_SEC);
-       TryReturnVoid(r == E_SUCCESS, "msgBox::Construct() failed by [%s]", GetErrorMessage(r));
-       msgBox.ShowAndWait(modalResult);
-
-       switch (modalResult)
-       {
-       case MSGBOX_RESULT_CLOSE:
-               {
-                       AppLogDebug("MSGBOX_RESULT_CLOSE");
-
-                       __pCameraPresentationModel->SetAppControlRequestType(CameraPresentationModel::APP_CONTROL_REQUEST_TYPE_FAILED);
-
-                       r = TerminateApp();
-                       AppLogDebug("TerminateApp fail [%s]", GetErrorMessage(r));
-               }
-               break;
-
-       default:
-               break;
-       }
+       _isUsedTimerCaptured = false;
        AppLogDebug("EXIT");
 }
 
@@ -10258,17 +9887,17 @@ CameraForm::SetScreenOverlayHelpTimer(void)
        result r = E_SUCCESS;
        int overlayHelpEnable = 0;
 
-       r = __pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
+       r = _pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("SetScreenOverlayHelpTimer : overlayHelpEnable = %d", overlayHelpEnable);
 
        if (overlayHelpEnable == SCREEN_OVERLAY_HELP_ENABLE)
        {
-               __pHelpCloseTimer = new (std::nothrow) Timer();
-               __pHelpCloseTimer->Construct(*this);
+               _pHelpCloseTimer = new (std::nothrow) Timer();
+               _pHelpCloseTimer->Construct(*this);
 
-               r = __pHelpCloseTimer->Start(CAMERA_SCREEN_OVERLAY_HELP_TIMER_VALUE);
+               r = _pHelpCloseTimer->Start(CAMERA_SCREEN_OVERLAY_HELP_TIMER_VALUE);
                TryCatch(r == E_SUCCESS, , "Timer::start fail[%s]", GetErrorMessage(r));
        }
 
@@ -10276,8 +9905,8 @@ CameraForm::SetScreenOverlayHelpTimer(void)
        return r;
 
 CATCH:
-       delete __pHelpCloseTimer;
-       __pHelpCloseTimer = null;
+       delete _pHelpCloseTimer;
+       _pHelpCloseTimer = null;
 
        AppLogDebug("EXIT - CATCH");
        return r;
@@ -10372,7 +10001,7 @@ CameraForm::DrawScreenOverlayHelp(void)
        TryCatch(__pHelpGoToPreviousScreen != null, r = E_FAILURE, "__pHelpGoToPreviousScreen is null");
        TryCatch(__pHelpGoToPreviousScreenText != null, r = E_FAILURE, "__pHelpGoToPreviousScreenText is null");
 
-       r = __pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
+       r = _pCameraPresentationModel->GetValue(OVERLAY_HELP_ENABLE, overlayHelpEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("DrawScreenOverlayHelp : overlayHelpEnable = %d", overlayHelpEnable);
@@ -10582,11 +10211,11 @@ CameraForm::CheckCameraSettingLabel(void)
        {
                result r = E_SUCCESS;
 
-               TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-               __pAppTimer->Cancel();
+               TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-               TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+               r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+               TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                if (__pListViewGeneralTabMainMenu)
                {
@@ -10611,11 +10240,11 @@ CameraForm::CheckGeneralSettingLabel(void)
        {
                result r = E_SUCCESS;
 
-               TryReturnVoid(__pAppTimer != null, "__pAppTimer is null");
-               __pAppTimer->Cancel();
+               TryReturnVoid(_pAppTimer != null, "_pAppTimer is null");
+               _pAppTimer->Cancel();
 
-               r = __pAppTimer->Start(CAMERA_TIMER_LIMIT);
-               TryReturnVoid(r == E_SUCCESS, "__pAppTimer start fail[%s]", GetErrorMessage(r));
+               r = _pAppTimer->Start(CAMERA_TIMER_LIMIT);
+               TryReturnVoid(r == E_SUCCESS, "_pAppTimer start fail[%s]", GetErrorMessage(r));
 
                if (__pListViewCameraTabMainMenu)
                {
@@ -10881,134 +10510,58 @@ void
 CameraForm::CancelTimer(void)
 {
        AppLogDebug("ENTER");
-       if (__pAppTimer != null)
-       {
-               __pAppTimer->Cancel();
-       }
-
-       if (__pIntervalValueTimer != null)
-       {
-               __pIntervalValueTimer->Cancel();
-       }
-
-       if (__pCaptureStartTimer != null)
-       {
-               __pCaptureStartTimer->Cancel();
-       }
-
-       if (__pTouchAutoFocusTimer != null)
-       {
-               __pTouchAutoFocusTimer->Cancel();
-       }
-
-       if (__pPopupTimer)
-       {
-               __pPopupTimer->Cancel();
-       }
-
-       if (__pExposureCloseTimer)
-       {
-               __pExposureCloseTimer->Cancel();
-       }
-
-       if (__pHelpCloseTimer)
-       {
-               __pHelpCloseTimer->Cancel();
-       }
-
-       if (__pChargingTimer)
-       {
-               __chargingCount = INDEX_UNIT_ZERO;
-
-               __pChargingTimer->Cancel();
-       }
-
-       if (__pChargingCompletedTimer != null)
+       if (_pAppTimer != null)
        {
-               __chargingCount = 0;
-               __blinkCount = 0;
-               __pChargingCompletedTimer->Cancel();
+               _pAppTimer->Cancel();
        }
 
-       if (__pPreviewFailPopupTimer != null)
+       if (_pIntervalValueTimer != null)
        {
-               __pPreviewFailPopupTimer->Cancel();
+               _pIntervalValueTimer->Cancel();
        }
-       AppLogDebug("EXIT");
-}
 
-void
-CameraForm::DeleteTimer(void)
-{
-       AppLogDebug("ENTER");
-       if (__pAppTimer != null)
+       if (_pCaptureStartTimer != null)
        {
-               __pAppTimer->Cancel();
-               delete __pAppTimer;
-               __pAppTimer = null;
+               _pCaptureStartTimer->Cancel();
        }
 
-       if (__pIntervalValueTimer != null)
+       if (_pTouchAutoFocusTimer != null)
        {
-               __pIntervalValueTimer->Cancel();
-               delete __pIntervalValueTimer;
-               __pIntervalValueTimer = null;
+               _pTouchAutoFocusTimer->Cancel();
        }
 
-       if (__pCaptureStartTimer != null)
+       if (_pPopupTimer)
        {
-               __pCaptureStartTimer->Cancel();
-               delete __pCaptureStartTimer;
-               __pCaptureStartTimer = null;
+               _pPopupTimer->Cancel();
        }
 
-       if (__pTouchAutoFocusTimer != null)
+       if (_pExposureCloseTimer)
        {
-               __pTouchAutoFocusTimer->Cancel();
-               delete __pTouchAutoFocusTimer;
-               __pTouchAutoFocusTimer = null;
+               _pExposureCloseTimer->Cancel();
        }
 
-       if (__pPopupTimer)
+       if (_pHelpCloseTimer)
        {
-               __pPopupTimer->Cancel();
-               delete __pPopupTimer;
-               __pPopupTimer = null;
+               _pHelpCloseTimer->Cancel();
        }
 
-       if (__pExposureCloseTimer)
+       if (_pChargingTimer)
        {
-               __pExposureCloseTimer->Cancel();
-               delete __pExposureCloseTimer;
-               __pExposureCloseTimer = null;
-       }
+               _chargingCount = INDEX_UNIT_ZERO;
 
-       if (__pHelpCloseTimer)
-       {
-               __pHelpCloseTimer->Cancel();
-               delete __pHelpCloseTimer;
-               __pHelpCloseTimer = null;
+               _pChargingTimer->Cancel();
        }
 
-       if (__pChargingTimer)
+       if (_pChargingCompletedTimer != null)
        {
-               __pChargingTimer->Cancel();
-               delete __pChargingTimer;
-               __pChargingTimer = null;
+               _chargingCount = 0;
+               _blinkCount = 0;
+               _pChargingCompletedTimer->Cancel();
        }
 
-       if (__pChargingCompletedTimer)
+       if (_pPreviewFailPopupTimer != null)
        {
-               __pChargingCompletedTimer->Cancel();
-               delete __pChargingCompletedTimer;
-               __pChargingCompletedTimer = null;
-       }
-
-       if (__pPreviewFailPopupTimer)
-       {
-               __pPreviewFailPopupTimer->Cancel();
-               delete __pPreviewFailPopupTimer;
-               __pPreviewFailPopupTimer = null;
+               _pPreviewFailPopupTimer->Cancel();
        }
        AppLogDebug("EXIT");
 }
@@ -11197,7 +10750,7 @@ CameraForm::SubListPopupTimerMode(int index)
        __settingTimeInterval = index;
        regVal = index;
 
-       r = __pCameraPresentationModel->SetValue(TIMER_INTERVAL, regVal);
+       r = _pCameraPresentationModel->SetValue(TIMER_INTERVAL, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        __pCameraInfoPanel->SetTimerType(regVal);
@@ -11219,27 +10772,27 @@ CameraForm::SubListPopupIsoMode(int index)
        int regVal = 0;
        int selfPortraitEnable = 0;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
        }
 
        if (r == E_SUCCESS)
        {
-               __pCameraPresentationModel->SetIsoLevel((CameraIsoLevel)index);
+               _pCameraPresentationModel->SetIsoLevel((CameraIsoLevel)index);
        }
 
        __settingIsoIndex = index;
        regVal = __settingIsoIndex;
 
-       r = __pCameraPresentationModel->SetValue(ISO_VALUE, regVal);
+       r = _pCameraPresentationModel->SetValue(ISO_VALUE, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("EXIT");
@@ -11259,21 +10812,21 @@ CameraForm::SubListPopupWhiteBalanceMode(int index)
        String strRegKey = IDS_INIT_REG_KEY;
        int selfPortraitEnable = 0;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
        }
 
        if (r == E_SUCCESS)
        {
-               __pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)index);
+               _pCameraPresentationModel->SetWhiteBalance((CameraWhiteBalance)index);
        }
 
        __settingWhiteBalance = index;
@@ -11281,12 +10834,12 @@ CameraForm::SubListPopupWhiteBalanceMode(int index)
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
        {
-               r = __pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
+               r = _pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
                TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
        }
        else
        {
-               r = __pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
+               r = _pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
                TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
        }
 
@@ -11338,7 +10891,7 @@ CameraForm::SubListPopupGuidelineMode(int index)
        SetGuideLine(value);
        regVal = value;
 
-       r = __pCameraPresentationModel->SetValue(GUIDELINE_ENABLE, regVal);
+       r = _pCameraPresentationModel->SetValue(GUIDELINE_ENABLE, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("EXIT");
@@ -11378,7 +10931,7 @@ CameraForm::SubListPopupOverlayHelpMode(int index)
 
        regVal = value;
 
-       r = __pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, regVal);
+       r = _pCameraPresentationModel->SetValue(OVERLAY_HELP_ENABLE, regVal);
        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
 
        AppLogDebug("Setting - OVERLAY_HELP_ENABLE = %d", OVERLAY_HELP_ENABLE);
@@ -11401,7 +10954,7 @@ result
 CameraForm::SubListPopupResolutionMode(int index)
 {
        AppLogDebug("ENTER");
-       IList* pList = __pCameraPresentationModel->GetCaptureResolutionList();
+       IList* pList = _pCameraPresentationModel->GetCaptureResolutionList();
        int resolutionCnt = 0;
        BufferInfo bufferinfo;
        int resolutionRatio = 0;
@@ -11409,7 +10962,7 @@ CameraForm::SubListPopupResolutionMode(int index)
        int regVal = 0;
        int selfPortraitEnable = 0;
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
 
        if (pList)
        {
@@ -11425,18 +10978,18 @@ CameraForm::SubListPopupResolutionMode(int index)
                }
                else
                {
-                       __pCameraPresentationModel->StopPreview();
+                       _pCameraPresentationModel->StopPreview();
 
-                       __pCameraPresentationModel->SetCaptureResolution(dimCaptureResolution);
+                       _pCameraPresentationModel->SetCaptureResolution(dimCaptureResolution);
 
                        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                        {
-                               r = __pCameraPresentationModel->SetValue(PRIMARY_RESOLUTION_INDEX,index);
+                               r = _pCameraPresentationModel->SetValue(PRIMARY_RESOLUTION_INDEX,index);
                                AppLogDebug("result is %s",GetErrorMessage(r));
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->SetValue(SECONDARY_RESOLUTION_INDEX,index);
+                               r = _pCameraPresentationModel->SetValue(SECONDARY_RESOLUTION_INDEX,index);
                        }
 
                        AppLogDebug("dimCaptureResolution(W:%d, H:%d)", dimCaptureResolution.width, dimCaptureResolution.height);
@@ -11508,7 +11061,7 @@ CameraForm::SubListPopupStorageTypeMode(int index)
                        AppLogDebug("Setting - Storage type = card");
                        storage = STORAGE_TYPE_MEMORYCARD;
 
-                       if (__pCameraPresentationModel->IsStorageCardMounted() == true)
+                       if (_pCameraPresentationModel->IsStorageCardMounted() == true)
                        {
                                SetStorageType(storage);
                        }
@@ -11527,7 +11080,7 @@ CameraForm::SubListPopupStorageTypeMode(int index)
                break;
        }
 
-       __pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
+       _pCameraPresentationModel->UpdateThumbnail(CameraPresentationModel::CAMERA_MODE_SNAPSHOT);
 
        Update();
 
@@ -11541,7 +11094,7 @@ CameraForm::SubListPopupStorageTypeMode(int index)
                AppLogDebug("FileEventManager()::Construct() fail[%s]", GetErrorMessage(r));
        }
 
-       filePath = __pCameraPresentationModel->GetfilePath(storage);
+       filePath = _pCameraPresentationModel->GetfilePath(storage);
        AppLogDebug("filePath %ls", filePath.GetPointer());
 
 
@@ -11595,7 +11148,7 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
 
        elementId = (index * MENU_TWO_ELEMENT);
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        strTmp = __pSettingMenuString[index][0];
@@ -11606,7 +11159,7 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                {
                        if (index == CAMERA_TAB_SUB_MENU_CONTENT_ISO_MODE)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
 
                                if (r == E_SUCCESS)
                                {
@@ -11621,7 +11174,7 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                        }
                        else if (index == CAMERA_TAB_SUB_MENU_CONTENT_CAPTURE_RESOLUTION_MODE)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_CAPTURE_RESOLUTION);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_CAPTURE_RESOLUTION);
 
                                if (r == E_SUCCESS)
                                {
@@ -11656,7 +11209,7 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                {
                        if (index == CAMERA_TAB_SUB_MENU_CONTENT_ISO_MODE)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
 
                                if (r == E_SUCCESS && __pIsoList->GetCount()>1)
                                {
@@ -11671,7 +11224,7 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                        }
                        else if (index == CAMERA_TAB_SUB_MENU_CONTENT_CAPTURE_RESOLUTION_MODE)
                        {
-                               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_CAPTURE_RESOLUTION);
+                               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_CAPTURE_RESOLUTION);
 
                                if (r == E_SUCCESS)
                                {
@@ -11705,14 +11258,14 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                }
        }
 
-       r = __pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
+       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
-       if (storageType == STORAGE_TYPE_MEMORYCARD && __pCameraPresentationModel->IsStorageCardMounted() == false)
+       if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
        {
-               r = __pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+               r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
                TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
-               __pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+               _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
        }
 
        if (index == CAMERA_TAB_SUB_MENU_CONTENT_CAPTURE_RESOLUTION_MODE)
@@ -11725,6 +11278,7 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
                                        AppLogDebug("CAM_SELF_PORTRAIT_MODE_PRIMARY");
+                                       r = _pCameraPresentationModel->GetValue(PRIMARY_RESOLUTION_INDEX, __primaryCurrentResolutionIndex);
                                        if (idx == 0)
                                        {
                                                if (__primaryCurrentResolutionIndex == INDEX_UNIT_ONE)
@@ -11743,6 +11297,8 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                                        if (idx == 0)
                                        {
                                                AppLogDebug("CAM_SELF_PORTRAIT_MODE_SECONDARY");
+                                               r = _pCameraPresentationModel->GetValue(SECONDARY_RESOLUTION_INDEX, __secondaryCurrentResolutionIndex);
+
                                                if (__secondaryCurrentResolutionIndex == INDEX_UNIT_ONE)
                                                {
                                                        __secondaryCurrentResolutionIndex = __secondaryCurrentResolutionIndex - INDEX_UNIT_ONE;
@@ -11764,7 +11320,7 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                        int idx = __pIsoList->GetCount() - INDEX_UNIT_ONE;
                        if (idx >= INDEX_UNIT_ZERO)
                        {
-                               r = __pCameraPresentationModel->GetValue(ISO_VALUE, regVal);
+                               r = _pCameraPresentationModel->GetValue(ISO_VALUE, regVal);
 
                                if (regVal == INDEX_UNIT_ZERO)
                                {
@@ -11825,11 +11381,11 @@ CameraForm::CreateCameraTabMainMenuItem(int index, int itemWidth)
                        {
                                if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY)
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_ISO_LEVEL);
                                }
                                else
                                {
-                                       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
+                                       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_ISO_LEVEL);
                                }
        
                                if (r == E_SUCCESS)
@@ -11967,7 +11523,7 @@ CameraForm::CreateCameraTabSubMenuItem(int index, int itemWidth)
                                IDS_MENU_ISO_800,
                        };
 
-                       r = __pCameraPresentationModel->GetValue(ISO_VALUE, regVal);
+                       r = _pCameraPresentationModel->GetValue(ISO_VALUE, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (__pIsoList)
@@ -12023,19 +11579,19 @@ CameraForm::CreateCameraTabSubMenuItem(int index, int itemWidth)
                {
                        int selfPortraitEnable = 0;
 
-                       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+                       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
 
                        if (selfPortraitEnable  == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_PRIMARY )
                        {
-                               r = __pCameraPresentationModel->GetValue(PRIMARY_RESOLUTION_INDEX, __primaryCurrentResolutionIndex);
+                               r = _pCameraPresentationModel->GetValue(PRIMARY_RESOLUTION_INDEX, __primaryCurrentResolutionIndex);
                                AppLogDebug("resolution index is %d",__primaryCurrentResolutionIndex);
                                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                        }
                        else
                        {
-                               r = __pCameraPresentationModel->GetValue(SECONDARY_RESOLUTION_INDEX, __secondaryCurrentResolutionIndex);
+                               r = _pCameraPresentationModel->GetValue(SECONDARY_RESOLUTION_INDEX, __secondaryCurrentResolutionIndex);
                                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
                        }
 
@@ -12188,7 +11744,7 @@ CameraForm::CreateGeneralTabMainMenuItem(int index, int itemWidth)
 
        elementId = (index * MENU_TWO_ELEMENT);
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        strTmp = __pSettingGeneralMenuString[index][0];
@@ -12204,17 +11760,17 @@ CameraForm::CreateGeneralTabMainMenuItem(int index, int itemWidth)
        {
                int storageType = STORAGE_TYPE_PHONE;
 
-               r = __pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
+               r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, storageType);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
-               if (storageType == STORAGE_TYPE_MEMORYCARD && __pCameraPresentationModel->IsStorageCardMounted() == false)
+               if (storageType == STORAGE_TYPE_MEMORYCARD && _pCameraPresentationModel->IsStorageCardMounted() == false)
                {
-                       r = __pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
+                       r = _pCameraPresentationModel->SetValue(STORAGE_TYPE, STORAGE_TYPE_PHONE);
                        TryCatch(r == E_SUCCESS, , "SetValue() fail[%s]", GetErrorMessage(r));
-                       __pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
+                       _pCameraPresentationModel->SetStorageCardState(CameraPresentationModel::STORAGE_CARD_STATE_UNMOUNT);
                }
 
-               r = __pCameraPresentationModel->GetValue(arrRegStringSuppor[index], regVal);
+               r = _pCameraPresentationModel->GetValue(arrRegStringSuppor[index], regVal);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                AppLogDebug("Setting Main Menu");
@@ -12324,7 +11880,7 @@ CameraForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
 
                        pAppResource->GetString(arrString[index], tmpString);
 
-                       r = __pCameraPresentationModel->GetValue(TIMER_INTERVAL, regVal);
+                       r = _pCameraPresentationModel->GetValue(TIMER_INTERVAL, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (index == regVal)
@@ -12381,7 +11937,7 @@ CameraForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
                        String str = L"";
                        elementId = (index * MENU_TWO_ELEMENT);
 
-                       r = __pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
+                       r = _pCameraPresentationModel->GetValue(GUIDELINE_ENABLE, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (index == regVal)
@@ -12452,7 +12008,7 @@ CameraForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
                        String str = L"";
                        elementId = (index * MENU_TWO_ELEMENT);
 
-                       r = __pCameraPresentationModel->GetValue(STORAGE_TYPE, regVal);
+                       r = _pCameraPresentationModel->GetValue(STORAGE_TYPE, regVal);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (index == regVal)
@@ -12496,7 +12052,7 @@ CameraForm::CreateGeneralTabSubMenuItem(int index, int itemWidth)
 
                        if (str.Equals(String(IDS_CAM_OPT_MEMORY_CARD)))
                        {
-                               if (__pCameraPresentationModel->IsStorageCardMounted() == false)
+                               if (_pCameraPresentationModel->IsStorageCardMounted() == false)
                                {
                                        r = pItem->AddElement(rectThreeTextItem, elementId, tmpString, FONT_SIZE_SETTING_SUB_MENU_ITEM, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, COLOR_SETTING_MENU_VALUE_DISABLE, true);
                                }
@@ -12575,25 +12131,25 @@ CameraForm::CreateFlashMainMenuItem(int index, int itemWidth)
        pAppResource = Application::GetInstance()->GetAppResource();
        TryCatch(pAppResource != null, , "Failed to allocate memory for pAppResource");
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
                AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-               r = __pCameraPresentationModel->GetValue(FLASH_MODE_SECONDARY, flashMode);
+               r = _pCameraPresentationModel->GetValue(FLASH_MODE_SECONDARY, flashMode);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                if (flashMode != FLASH_MODE_OFF)
                {
-                       r = __pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
+                       r = _pCameraPresentationModel->SetValue(FLASH_MODE_SECONDARY, FLASH_MODE_OFF);
                        TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                }
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
                if (value == true && r == E_SUCCESS)
                {
@@ -12603,18 +12159,18 @@ CameraForm::CreateFlashMainMenuItem(int index, int itemWidth)
                {
                        AppLogDebug("CAMERA_PRIMARY_SUPPORT_FLASH is not support");
 
-                       r = __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
+                       r = _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, flashMode);
                        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
                        if (flashMode != FLASH_MODE_OFF)
                        {
-                               r = __pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
+                               r = _pCameraPresentationModel->SetValue(FLASH_MODE_PRIMARY, FLASH_MODE_OFF);
                                TryCatch(r == E_SUCCESS, , "SetValue Reg Fail[%s]", GetErrorMessage(r));
                        }
                }
        }
 
-       r = __pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, regVal);
+       r = _pCameraPresentationModel->GetValue(FLASH_MODE_PRIMARY, regVal);
        TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
 
        switch (index)
@@ -12673,7 +12229,7 @@ CameraForm::CreateFlashMainMenuItem(int index, int itemWidth)
 
        elementId++;
 
-       r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
+       r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_SUPPORT_FLASH, value);
 
        if (value == true && r == E_SUCCESS)
        {
@@ -12747,27 +12303,27 @@ CameraForm::CreateWhiteBalanceItem(int index, int itemWidth)
        pAppResource = Application::GetInstance()->GetAppResource();
        TryCatch(pAppResource != null, , "Failed to allocate memory for pAppResource");
 
-       r = __pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
+       r = _pCameraPresentationModel->GetValue(SELF_PORTRAIT_ENABLE, selfPortraitEnable);
        TryCatch(r == E_SUCCESS, , "GetValue Reg Fail[%s]", GetErrorMessage(r));
 
        if (selfPortraitEnable == CameraPresentationModel::CAM_SELF_PORTRAIT_MODE_SECONDARY)
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_SECONDARY_WHITE_BALANCE);
                if (r != E_SUCCESS)
                {
-                       r =__pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, REG_DEFAULT_VAULE_ZERO);
+                       r =_pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_SECONDARY, REG_DEFAULT_VAULE_ZERO);
                }
-               r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
+               r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_SECONDARY, regVal);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
        }
        else
        {
-               r = __pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
+               r = _pCameraPresentationModel->GetMediaCapability(CAMERA_PRIMARY_WHITE_BALANCE);
                if (r != E_SUCCESS)
                {
-                       r =__pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, REG_DEFAULT_VAULE_ZERO);
+                       r =_pCameraPresentationModel->SetValue(WHITE_BALANCE_TYPE_PRIMARY, REG_DEFAULT_VAULE_ZERO);
                }
-               r = __pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
+               r = _pCameraPresentationModel->GetValue(WHITE_BALANCE_TYPE_PRIMARY, regVal);
                TryCatch(r == E_SUCCESS, , "GetValue() fail[%s]", GetErrorMessage(r));
        }
 
@@ -12858,16 +12414,6 @@ CATCH:
 }
 
 void
-CameraForm::RemoveAllEventListener(void)
-{
-       AppLogDebug("ENTER");
-       RemoveOrientationEventListener(*this);
-       RemoveTouchEventListener(*this);
-       RemoveKeyEventListener(*this);
-       AppLogDebug("EXIT");
-}
-
-void
 CameraForm::UpdatePopUp(void)
 {
        bool doHidePopup = false;
index 9daeb27..c2297d9 100644 (file)
@@ -1634,6 +1634,7 @@ CameraPresentationModel::SetMode(int mode)
 
                        r = ToggleCameraCamcorder(CAMERA_MODE_RECORD);                  
                        TryCatch(r == E_SUCCESS, , "ToggleCameraCamcorder [%s]", GetErrorMessage(r));
+                       InitializeFlashMode();
                }
        }
        __cameraMode = mode;
@@ -3687,6 +3688,7 @@ CameraPresentationModel::OnVideoRecorderClosed(result r)
                ret = pContentManager->Construct();
                TryCatch(ret == E_SUCCESS, , "ContentManager->Construct() failed(%s)", GetErrorMessage(r));
 
+               AppLogDebug("latest content name is %ls",__lastestContentName.GetPointer());
                r = ContentManager::ScanFile(__lastestContentName);
                __CurrentVideoFileName = __lastestContentName;
 
@@ -4121,6 +4123,7 @@ CameraPresentationModel::RemoveVideoFile(void)
                removeFileName = Environment::GetExternalStoragePath() + STRING_CAMCORDER_TEMPORARY_FILE_EXT;
        }
 
+       AppLogDebug("removeFileName is %ls",removeFileName.GetPointer());
        AppLogDebug("RemoveVideoFile::GetRecorderState() = %d", __pVideoRecorder->GetState());
        if (__pVideoRecorder->GetState()== RECORDER_STATE_RECORDING
                || __pVideoRecorder->GetState() == RECORDER_STATE_PAUSED
index 36f18a5..5c33f94 100644 (file)
@@ -70,6 +70,9 @@ const int FLASH_TYPE_ON = 1;
 const int EXPOSURE_DEFAULT_VALUE = 4;
 const int BRIGHTNESS_DEFAULT_VALUE = 4;
 
+const int MESSAGEBOX_DISPLAY_TIME_2_SEC = 2000;
+const int MESSAGEBOX_DISPLAY_TIME_3_SEC = 3000;
+
 const wchar_t* SECTION_CAMERA = L"CAMERA_SETTING";
 const wchar_t* SECTION_CAMCORDER = L"CAMCORDER_SETTING";