Code Refactoring

Change-Id: Ic48edbc82eb4693a51f0f109ed8220cb22f5cb54

diff --git a/inc/CmBaseForm.h b/inc/CmBaseForm.h
index a9e8408..7e52c70 100644 (file)
--- a/inc/CmBaseForm.h
+++ b/inc/CmBaseForm.h
@@ -35,6 +35,9 @@
 #include <FUi.h>
 #include <FUiWindow.h>
 
+#include "CmTypes.h"
+#include "CmCameraApp.h"
+
 class BaseForm :
 public Tizen::Ui::Controls::Form
 , public Tizen::System::IDeviceEventListener
@@ -113,6 +116,13 @@ public:
        virtual void OnKeyLongPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode);
        virtual void OnKeyPressed (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode);
        virtual void OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode keyCode);
+
+protected:
+       AppLaunchType GetAppLaunchType(void) const;
+       BatteryState GetCurrentBatteryState(void);
+       result ReturnValues(RequestId requestId, Tizen::App::AppCtrlResult appCtrlResult, const Tizen::Base::Collection::IMap* pReturnValue);
+       Tizen::Telephony::CallStatus GetCurrentCallStatus(void);
+       Tizen::Telephony::CallType GetCurrentCallType(void);
 };
 
 #endif

diff --git a/inc/CmCamcorderForm.h b/inc/CmCamcorderForm.h
index ade5b6f..974c325 100644 (file)
--- a/inc/CmCamcorderForm.h
+++ b/inc/CmCamcorderForm.h
@@ -96,9 +96,7 @@ public:
        virtual void OnTouchPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
        virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
        virtual void OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-
+       
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 
        virtual void OnListViewContextItemStateChanged(Tizen::Ui::Controls::ListView& listView, int index, int elementId, Tizen::Ui::Controls::ListContextItemStatus state);
@@ -124,7 +122,6 @@ private:
        };
 
        void Update(bool isInvalidated);
-       AppLaunchType GetAppLaunchType(void) const;
        void InitAppTimer(void);
        void InitSettingTimer(void);
        void InitMakerFocusTimer(void);
@@ -302,10 +299,6 @@ private:
        void ShowCameraFailPopup(void);
        void ShowSavingPopup(void);
        
-       Tizen::Telephony::CallStatus GetCurrentCallStatus(void);
-       Tizen::Telephony::CallType GetCurrentCallType(void);
-
-       BatteryState GetCurrentBatteryState(void);
        int GetCurrentBatteryImage(void);
        void StartChargingTimer(void);
        result DrawBatteryLevelFull(void);
@@ -314,7 +307,6 @@ private:
        result MakeMenuString(void);
        result MakeGenMenuString(void);
 
-       result ReturnValues(RequestId requestId, Tizen::App::AppCtrlResult appCtrlResult, const Tizen::Base::Collection::IMap* pReturnValue);
        result SendAppControlResult(RequestId requestId);
        result RunStartPreviewThread(void);
        void MakeRecordingResolutionList(bool remakeList);

diff --git a/inc/CmCameraForm.h b/inc/CmCameraForm.h
index 06fd9da..a346e32 100644 (file)
--- a/inc/CmCameraForm.h
+++ b/inc/CmCameraForm.h
@@ -73,8 +73,6 @@ public:
        virtual void OnTouchLongPressed(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
        virtual void OnTouchReleased(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
        virtual void OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
-       virtual void OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo);
 
        virtual void OnTimerExpired(Tizen::Base::Runtime::Timer& timer);
 
@@ -244,10 +242,7 @@ private:
        void SetCameraErrorOccurred(void);
        void ShowCameraFailPopup(void);
        void ShowUnlaunchPopup(void);
-       Tizen::Telephony::CallStatus GetCurrentCallStatus(void);
-       Tizen::Telephony::CallType GetCurrentCallType(void);
 
-       BatteryState GetCurrentBatteryState(void);
        result DrawBatteryLevelFull(void);
        void ShowLowBatteryPopup(void);
        int GetCurrentBatteryImage(void);
@@ -256,7 +251,6 @@ private:
        result MakeGeneralTabMenuString(void);
        void DeleteTimer(void);
        void CancelTimer(void);
-       result ReturnValues(RequestId requestId, Tizen::App::AppCtrlResult appCtrlResult, const Tizen::Base::Collection::IMap* pReturnValue);
        result SendAppControlResult(RequestId requestId);
        result RunStartPreviewThread(void);
 
@@ -286,7 +280,6 @@ private:
        result SetScreenOverlayHelpTimer(void);
        void HideScreenOverlayHelp();
        result DrawScreenOverlayHelp(void);
-       AppLaunchType GetAppLaunchType(void) const;
        void OnTimerCapturePause(void);
        result TerminateApp(void);
        void RemoveAllEventListener(void);

diff --git a/src/CmBaseForm.cpp b/src/CmBaseForm.cpp
index 927865c..e7d0fa4 100644 (file)
--- a/src/CmBaseForm.cpp
+++ b/src/CmBaseForm.cpp
@@ -191,13 +191,15 @@ BaseForm::OnTouchCanceled (const Tizen::Ui::Control &source, const Tizen::Graphi
 void
 BaseForm::OnTouchFocusIn (const Tizen::Ui::Control &source, const Tizen::Graphics::Point &currentPosition, const Tizen::Ui::TouchEventInfo &touchInfo)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
 BaseForm::OnTouchFocusOut (const Tizen::Ui::Control &source, const Tizen::Graphics::Point &currentPosition, const Tizen::Ui::TouchEventInfo &touchInfo)
 {
-       //empty Implementation
+       AppLogDebug("ENTER");
+       AppLogDebug("EXIT");
 }
 
 void
@@ -234,3 +236,200 @@ BaseForm::OnKeyReleased (const Tizen::Ui::Control &source, Tizen::Ui::KeyCode ke
 {
        //empty Implementation
 }
+
+AppLaunchType
+BaseForm::GetAppLaunchType(void) const
+{
+       AppLogDebug("ENTER");
+       AppLaunchType appLaunchType = APP_LAUNCH_TYPE_MAIN;
+
+       appLaunchType = (static_cast<CameraApp*>(UiApp::GetInstance()))->GetAppControlType();
+       AppLogDebug("appLaunchType = %d", appLaunchType);
+
+       AppLogDebug("EXIT");
+       return appLaunchType;
+}
+
+BatteryState
+BaseForm::GetCurrentBatteryState(void)
+{
+       AppLogDebug("ENTER");
+       int batteryLevel = 0;
+       BatteryState batteryStatus = BATTERY_STATE_0;
+
+       Battery::GetCurrentLevelInPercentage(batteryLevel);
+
+       AppLogDebug("batteryLevel = %d", batteryLevel);
+
+       if (batteryLevel > BATT_LEVEL_VALUE_95 && batteryLevel <= BATT_LEVEL_VALUE_100)
+       {
+               batteryStatus = BATTERY_STATE_20;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_90 && batteryLevel <= BATT_LEVEL_VALUE_95)
+       {
+               batteryStatus = BATTERY_STATE_19;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_85 && batteryLevel <= BATT_LEVEL_VALUE_90)
+       {
+               batteryStatus = BATTERY_STATE_18;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_80 && batteryLevel <= BATT_LEVEL_VALUE_85)
+       {
+               batteryStatus = BATTERY_STATE_17;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_75 && batteryLevel <= BATT_LEVEL_VALUE_80)
+       {
+               batteryStatus = BATTERY_STATE_16;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_70 && batteryLevel <= BATT_LEVEL_VALUE_75)
+       {
+               batteryStatus = BATTERY_STATE_15;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_65 && batteryLevel <= BATT_LEVEL_VALUE_70)
+       {
+               batteryStatus = BATTERY_STATE_14;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_60 && batteryLevel <= BATT_LEVEL_VALUE_65)
+       {
+               batteryStatus = BATTERY_STATE_13;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_55 && batteryLevel <= BATT_LEVEL_VALUE_60)
+       {
+               batteryStatus = BATTERY_STATE_12;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_50 && batteryLevel <= BATT_LEVEL_VALUE_55)
+       {
+               batteryStatus = BATTERY_STATE_11;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_45 && batteryLevel <= BATT_LEVEL_VALUE_50)
+       {
+               batteryStatus = BATTERY_STATE_10;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_40 && batteryLevel <= BATT_LEVEL_VALUE_45)
+       {
+               batteryStatus = BATTERY_STATE_9;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_35 && batteryLevel <= BATT_LEVEL_VALUE_40)
+       {
+               batteryStatus = BATTERY_STATE_8;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_30 && batteryLevel <= BATT_LEVEL_VALUE_35)
+       {
+               batteryStatus = BATTERY_STATE_7;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_25 && batteryLevel <= BATT_LEVEL_VALUE_30)
+       {
+               batteryStatus = BATTERY_STATE_6;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_20 && batteryLevel <= BATT_LEVEL_VALUE_25)
+       {
+               batteryStatus = BATTERY_STATE_5;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_15 && batteryLevel <= BATT_LEVEL_VALUE_20)
+       {
+               batteryStatus = BATTERY_STATE_4;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_10 && batteryLevel <= BATT_LEVEL_VALUE_15)
+       {
+               batteryStatus = BATTERY_STATE_3;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_05 && batteryLevel <= BATT_LEVEL_VALUE_10)
+       {
+               batteryStatus = BATTERY_STATE_2;
+       }
+       else if (batteryLevel > BATT_LEVEL_VALUE_00 && batteryLevel <= BATT_LEVEL_VALUE_05)
+       {
+               batteryStatus = BATTERY_STATE_1;
+       }
+       else if (batteryLevel == BATT_LEVEL_VALUE_00)
+       {
+               batteryStatus = BATTERY_STATE_0;
+       }
+
+       AppLogDebug("EXIT");
+       return batteryStatus;
+}
+
+
+result
+BaseForm::ReturnValues(RequestId requestId, Tizen::App::AppCtrlResult appCtrlResult, const Tizen::Base::Collection::IMap* pReturnValue)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       UiApp* pApp = null;
+       AppControlProviderManager* pAppManager = null;
+
+       pAppManager = AppControlProviderManager::GetInstance();
+       TryCatch(pAppManager != null, r = E_OBJ_NOT_FOUND, "pAppManager is null");
+
+       r = pAppManager->SendAppControlResult(requestId, appCtrlResult, pReturnValue);
+       TryCatch(r == E_SUCCESS, , "pAppManager->SendAppControlResult fail[%s]", GetErrorMessage(r));
+
+       pApp = UiApp::GetInstance();
+       TryCatch(pApp != null, r = E_OBJ_NOT_FOUND, "pApp is null");
+
+       r = pApp->Terminate();
+       TryCatch(r == E_SUCCESS, , "pApp->Terminate fail[%s]", GetErrorMessage(r));
+
+       AppLogDebug("EXIT");
+       return r;
+
+CATCH:
+       AppLogDebug("EXIT - CATCH");
+       return r;
+}
+
+Tizen::Telephony::CallStatus
+BaseForm::GetCurrentCallStatus(void)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       CallStatus callStatus = CALL_STATUS_UNDEFINED;
+
+       CallManager* pCallManager = new (std::nothrow) CallManager();
+
+       r = pCallManager->Construct();
+       TryCatch(r == E_SUCCESS, , "pCallManager::Construct() failed by [%s]", GetErrorMessage(r));
+
+       callStatus = pCallManager->GetCurrentCallStatus();
+
+       AppLogDebug("callStatus = %d", callStatus);
+
+       delete pCallManager;
+
+       AppLogDebug("EXIT");
+       return callStatus;
+
+CATCH:
+       delete pCallManager;
+
+       AppLogDebug("EXIT - CATCH");
+       return CALL_STATUS_UNDEFINED;
+}
+
+Tizen::Telephony::CallType
+BaseForm::GetCurrentCallType(void)
+{
+       AppLogDebug("ENTER");
+       result r = E_SUCCESS;
+       CallType callType = TYPE_UNDEFINED_CALL;
+
+       CallManager* pCallManager = new (std::nothrow) CallManager();
+
+       r = pCallManager->Construct();
+       TryCatch(r == E_SUCCESS, , "pCallManager::Construct() failed by [%s]", GetErrorMessage(r));
+
+       callType = pCallManager->GetCurrentCallType();
+       AppLogDebug("callType = %d", callType);
+
+       delete pCallManager;
+
+       AppLogDebug("EXIT");
+       return callType;
+
+CATCH:
+       delete pCallManager;
+
+       AppLogDebug("EXIT - CATCH");
+       return TYPE_UNDEFINED_CALL;
+}

diff --git a/src/CmCamcorderForm.cpp b/src/CmCamcorderForm.cpp
index 7ce539b..ac3e820 100644 (file)
--- a/src/CmCamcorderForm.cpp
+++ b/src/CmCamcorderForm.cpp
@@ -1209,34 +1209,6 @@ CamcorderForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 }
 
 result
-CamcorderForm::ReturnValues(RequestId requestId, Tizen::App::AppCtrlResult appCtrlResult, const Tizen::Base::Collection::IMap* pReturnValue)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       App* pApp = null;
-       AppControlProviderManager* pAppManager = null;
-
-       pAppManager = AppControlProviderManager::GetInstance();
-       TryCatch(pAppManager != null, r = E_OBJ_NOT_FOUND, "pAppManager is null");
-
-       r = pAppManager->SendAppControlResult(requestId, appCtrlResult, pReturnValue);
-       TryCatch(r == E_SUCCESS, , "pAppManager->SendAppControlResult fail[%s]", GetErrorMessage(r));
-
-       pApp = UiApp::GetInstance();
-       TryCatch(pApp != null, r = E_OBJ_NOT_FOUND, "pApp is null");
-
-       r = pApp->Terminate();
-       TryCatch(r == E_SUCCESS, , "pApp->Terminate fail[%s]", GetErrorMessage(r));
-
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       AppLogDebug("EXIT - CATCH");
-       return r;
-}
-
-result
 CamcorderForm::SendAppControlResult(RequestId requestId)
 {
        AppLogDebug("ENTER");
@@ -1798,19 +1770,6 @@ CamcorderForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentScene
        AppLogDebug("EXIT");
 }
 
-AppLaunchType
-CamcorderForm::GetAppLaunchType(void) const
-{
-       AppLogDebug("ENTER");
-       AppLaunchType appLaunchType = APP_LAUNCH_TYPE_MAIN;
-
-       appLaunchType = (static_cast<CameraApp*>(UiApp::GetInstance()))->GetAppControlType();
-       AppLogDebug("appLaunchType = %d", appLaunchType);
-
-       AppLogDebug("EXIT");
-       return appLaunchType;
-}
-
 void
 CamcorderForm::Update(bool isInvalidated)
 {
@@ -1989,105 +1948,6 @@ CATCH:
        return;
 }
 
-BatteryState
-CamcorderForm::GetCurrentBatteryState(void)
-{
-       AppLogDebug("ENTER");
-       int batteryLevel = 0;
-       BatteryState batteryStatus = BATTERY_STATE_0;
-
-       Battery::GetCurrentLevelInPercentage(batteryLevel);
-
-       AppLogDebug("batteryLevel = %d", batteryLevel);
-
-       if (batteryLevel > BATT_LEVEL_VALUE_95 && batteryLevel <= BATT_LEVEL_VALUE_100)
-       {
-               batteryStatus = BATTERY_STATE_20;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_90 && batteryLevel <= BATT_LEVEL_VALUE_95)
-       {
-               batteryStatus = BATTERY_STATE_19;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_85 && batteryLevel <= BATT_LEVEL_VALUE_90)
-       {
-               batteryStatus = BATTERY_STATE_18;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_80 && batteryLevel <= BATT_LEVEL_VALUE_85)
-       {
-               batteryStatus = BATTERY_STATE_17;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_75 && batteryLevel <= BATT_LEVEL_VALUE_80)
-       {
-               batteryStatus = BATTERY_STATE_16;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_70 && batteryLevel <= BATT_LEVEL_VALUE_75)
-       {
-               batteryStatus = BATTERY_STATE_15;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_65 && batteryLevel <= BATT_LEVEL_VALUE_70)
-       {
-               batteryStatus = BATTERY_STATE_14;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_60 && batteryLevel <= BATT_LEVEL_VALUE_65)
-       {
-               batteryStatus = BATTERY_STATE_13;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_55 && batteryLevel <= BATT_LEVEL_VALUE_60)
-       {
-               batteryStatus = BATTERY_STATE_12;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_50 && batteryLevel <= BATT_LEVEL_VALUE_55)
-       {
-               batteryStatus = BATTERY_STATE_11;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_45 && batteryLevel <= BATT_LEVEL_VALUE_50)
-       {
-               batteryStatus = BATTERY_STATE_10;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_40 && batteryLevel <= BATT_LEVEL_VALUE_45)
-       {
-               batteryStatus = BATTERY_STATE_9;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_35 && batteryLevel <= BATT_LEVEL_VALUE_40)
-       {
-               batteryStatus = BATTERY_STATE_8;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_30 && batteryLevel <= BATT_LEVEL_VALUE_35)
-       {
-               batteryStatus = BATTERY_STATE_7;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_25 && batteryLevel <= BATT_LEVEL_VALUE_30)
-       {
-               batteryStatus = BATTERY_STATE_6;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_20 && batteryLevel <= BATT_LEVEL_VALUE_25)
-       {
-               batteryStatus = BATTERY_STATE_5;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_15 && batteryLevel <= BATT_LEVEL_VALUE_20)
-       {
-               batteryStatus = BATTERY_STATE_4;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_10 && batteryLevel <= BATT_LEVEL_VALUE_15)
-       {
-               batteryStatus = BATTERY_STATE_3;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_05 && batteryLevel <= BATT_LEVEL_VALUE_10)
-       {
-               batteryStatus = BATTERY_STATE_2;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_00 && batteryLevel <= BATT_LEVEL_VALUE_05)
-       {
-               batteryStatus = BATTERY_STATE_1;
-       }
-       else if (batteryLevel == BATT_LEVEL_VALUE_00)
-       {
-               batteryStatus = BATTERY_STATE_0;
-       }
-
-       return batteryStatus;
-}
-
 result 
 CamcorderForm::OnCameraActionRecorderClosed(void)
 {
@@ -3759,20 +3619,6 @@ CamcorderForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graph
 }
 
 void
-CamcorderForm::OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void 
-CamcorderForm::OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
 CamcorderForm::OnAppTimerExpired(void)
 {
        AppLogDebug("ENTER");
@@ -11055,61 +10901,6 @@ CamcorderForm::ShowUnlaunchPopup(void)
        AppLogDebug("EXIT");
 }
 
-Tizen::Telephony::CallStatus
-CamcorderForm::GetCurrentCallStatus(void)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CallStatus callStatus = CALL_STATUS_UNDEFINED;
-
-       CallManager* pCallManager = new (std::nothrow) CallManager();
-
-       r = pCallManager->Construct();
-       TryCatch(r == E_SUCCESS, , "pCallManager::Construct() failed by [%s]", GetErrorMessage(r));
-
-       callStatus = pCallManager->GetCurrentCallStatus();
-
-       AppLogDebug("callStatus = %d", callStatus);
-
-       delete pCallManager;
-
-       AppLogDebug("EXIT");
-       return callStatus;
-
-CATCH:
-       delete pCallManager;
-
-       AppLogDebug("EXIT - CATCH");
-       return CALL_STATUS_UNDEFINED;
-}
-
-Tizen::Telephony::CallType
-CamcorderForm::GetCurrentCallType(void)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CallType callType = TYPE_UNDEFINED_CALL;
-
-       CallManager* pCallManager = new (std::nothrow) CallManager();
-
-       r = pCallManager->Construct();
-       TryCatch(r == E_SUCCESS, , "pCallManager::Construct() failed by [%s]", GetErrorMessage(r));
-
-       callType = pCallManager->GetCurrentCallType();
-       AppLogDebug("callType = %d", callType);
-
-       delete pCallManager;
-
-       AppLogDebug("EXIT");
-       return callType;
-
-CATCH:
-       delete pCallManager;
-
-       AppLogDebug("EXIT - CATCH");
-       return TYPE_UNDEFINED_CALL;
-}
-
 void
 CamcorderForm::ShowLowBatteryPopup(void)
 {

diff --git a/src/CmCameraForm.cpp b/src/CmCameraForm.cpp
index 9661577..10fd7e1 100644 (file)
--- a/src/CmCameraForm.cpp
+++ b/src/CmCameraForm.cpp
@@ -925,19 +925,6 @@ CameraForm::OnSceneDeactivated(const Tizen::Ui::Scenes::SceneId& currentSceneId,
        AppLogDebug("EXIT");
 }
 
-AppLaunchType
-CameraForm::GetAppLaunchType(void) const
-{
-       AppLogDebug("ENTER");
-       AppLaunchType appLaunchType = APP_LAUNCH_TYPE_MAIN;
-
-       appLaunchType = (static_cast<CameraApp*>(UiApp::GetInstance()))->GetAppControlType();
-       AppLogDebug("appLaunchType = %d", appLaunchType);
-
-       AppLogDebug("EXIT");
-       return appLaunchType;
-}
-
 void
 CameraForm::Update(void)
 {
@@ -1130,106 +1117,6 @@ CATCH:
        return r;
 }
 
-BatteryState
-CameraForm::GetCurrentBatteryState(void)
-{
-       AppLogDebug("ENTER");
-       int batteryLevel = 0;
-       BatteryState batteryStatus = BATTERY_STATE_0;
-
-       Battery::GetCurrentLevelInPercentage(batteryLevel);
-
-       AppLogDebug("batteryLevel = %d", batteryLevel);
-
-       if (batteryLevel > BATT_LEVEL_VALUE_95 && batteryLevel <= BATT_LEVEL_VALUE_100)
-       {
-               batteryStatus = BATTERY_STATE_20;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_90 && batteryLevel <= BATT_LEVEL_VALUE_95)
-       {
-               batteryStatus = BATTERY_STATE_19;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_85 && batteryLevel <= BATT_LEVEL_VALUE_90)
-       {
-               batteryStatus = BATTERY_STATE_18;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_80 && batteryLevel <= BATT_LEVEL_VALUE_85)
-       {
-               batteryStatus = BATTERY_STATE_17;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_75 && batteryLevel <= BATT_LEVEL_VALUE_80)
-       {
-               batteryStatus = BATTERY_STATE_16;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_70 && batteryLevel <= BATT_LEVEL_VALUE_75)
-       {
-               batteryStatus = BATTERY_STATE_15;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_65 && batteryLevel <= BATT_LEVEL_VALUE_70)
-       {
-               batteryStatus = BATTERY_STATE_14;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_60 && batteryLevel <= BATT_LEVEL_VALUE_65)
-       {
-               batteryStatus = BATTERY_STATE_13;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_55 && batteryLevel <= BATT_LEVEL_VALUE_60)
-       {
-               batteryStatus = BATTERY_STATE_12;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_50 && batteryLevel <= BATT_LEVEL_VALUE_55)
-       {
-               batteryStatus = BATTERY_STATE_11;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_45 && batteryLevel <= BATT_LEVEL_VALUE_50)
-       {
-               batteryStatus = BATTERY_STATE_10;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_40 && batteryLevel <= BATT_LEVEL_VALUE_45)
-       {
-               batteryStatus = BATTERY_STATE_9;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_35 && batteryLevel <= BATT_LEVEL_VALUE_40)
-       {
-               batteryStatus = BATTERY_STATE_8;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_30 && batteryLevel <= BATT_LEVEL_VALUE_35)
-       {
-               batteryStatus = BATTERY_STATE_7;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_25 && batteryLevel <= BATT_LEVEL_VALUE_30)
-       {
-               batteryStatus = BATTERY_STATE_6;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_20 && batteryLevel <= BATT_LEVEL_VALUE_25)
-       {
-               batteryStatus = BATTERY_STATE_5;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_15 && batteryLevel <= BATT_LEVEL_VALUE_20)
-       {
-               batteryStatus = BATTERY_STATE_4;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_10 && batteryLevel <= BATT_LEVEL_VALUE_15)
-       {
-               batteryStatus = BATTERY_STATE_3;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_05 && batteryLevel <= BATT_LEVEL_VALUE_10)
-       {
-               batteryStatus = BATTERY_STATE_2;
-       }
-       else if (batteryLevel > BATT_LEVEL_VALUE_00 && batteryLevel <= BATT_LEVEL_VALUE_05)
-       {
-               batteryStatus = BATTERY_STATE_1;
-       }
-       else if (batteryLevel == BATT_LEVEL_VALUE_00)
-       {
-               batteryStatus = BATTERY_STATE_0;
-       }
-
-       AppLogDebug("EXIT");
-       return batteryStatus;
-}
-
 void
 CameraForm::OnCameraActionPerformed(CameraActionEvent event)
 {
@@ -2151,20 +2038,6 @@ CameraForm::OnTouchMoved(const Tizen::Ui::Control& source, const Tizen::Graphics
 }
 
 void
-CameraForm::OnTouchFocusIn(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
-CameraForm::OnTouchFocusOut(const Tizen::Ui::Control& source, const Tizen::Graphics::Point& currentPosition, const Tizen::Ui::TouchEventInfo& touchInfo)
-{
-       AppLogDebug("ENTER");
-       AppLogDebug("EXIT");
-}
-
-void
 CameraForm::OnAppTimerExpired(void)
 {
        AppLogDebug("ENTER");
@@ -4152,34 +4025,6 @@ CameraForm::OnActionPerformed(const Tizen::Ui::Control& source, int actionId)
 }
 
 result
-CameraForm::ReturnValues(RequestId requestId, Tizen::App::AppCtrlResult appCtrlResult, const Tizen::Base::Collection::IMap* pReturnValue)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       UiApp* pApp = null;
-       AppControlProviderManager* pAppManager = null;
-
-       pAppManager = AppControlProviderManager::GetInstance();
-       TryCatch(pAppManager != null, r = E_OBJ_NOT_FOUND, "pAppManager is null");
-
-       r = pAppManager->SendAppControlResult(requestId, appCtrlResult, pReturnValue);
-       TryCatch(r == E_SUCCESS, , "pAppManager->SendAppControlResult fail[%s]", GetErrorMessage(r));
-
-       pApp = UiApp::GetInstance();
-       TryCatch(pApp != null, r = E_OBJ_NOT_FOUND, "pApp is null");
-
-       r = pApp->Terminate();
-       TryCatch(r == E_SUCCESS, , "pApp->Terminate fail[%s]", GetErrorMessage(r));
-
-       AppLogDebug("EXIT");
-       return r;
-
-CATCH:
-       AppLogDebug("EXIT - CATCH");
-       return r;
-}
-
-result
 CameraForm::SendAppControlResult(RequestId requestId)
 {
        AppLogDebug("ENTER");
@@ -10319,61 +10164,6 @@ CameraForm::ShowUnlaunchPopup(void)
        AppLogDebug("EXIT");
 }
 
-Tizen::Telephony::CallStatus
-CameraForm::GetCurrentCallStatus(void)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CallStatus callStatus = CALL_STATUS_UNDEFINED;
-
-       CallManager* pCallManager = new (std::nothrow) CallManager();
-
-       r = pCallManager->Construct();
-       TryCatch(r == E_SUCCESS, , "pCallManager::Construct() failed by [%s]", GetErrorMessage(r));
-
-       callStatus = pCallManager->GetCurrentCallStatus();
-
-       AppLogDebug("callStatus = %d", callStatus);
-
-       delete pCallManager;
-
-       AppLogDebug("EXIT");
-       return callStatus;
-
-CATCH:
-       delete pCallManager;
-
-       AppLogDebug("EXIT - CATCH");
-       return CALL_STATUS_UNDEFINED;
-}
-
-Tizen::Telephony::CallType
-CameraForm::GetCurrentCallType(void)
-{
-       AppLogDebug("ENTER");
-       result r = E_SUCCESS;
-       CallType callType = TYPE_UNDEFINED_CALL;
-
-       CallManager* pCallManager = new (std::nothrow) CallManager();
-
-       r = pCallManager->Construct();
-       TryCatch(r == E_SUCCESS, , "pCallManager::Construct() failed by [%s]", GetErrorMessage(r));
-
-       callType = pCallManager->GetCurrentCallType();
-       AppLogDebug("callType = %d", callType);
-
-       delete pCallManager;
-
-       AppLogDebug("EXIT");
-       return callType;
-
-CATCH:
-       delete pCallManager;
-
-       AppLogDebug("EXIT - CATCH");
-       return TYPE_UNDEFINED_CALL;
-}
-
 void
 CameraForm::ShowLowBatteryPopup(void)
 {