tizen2.1 code merge

[apps/osp/Call.git] / src / CallConfCallerListForm.cpp

diff --git a/src/CallConfCallerListForm.cpp b/src/CallConfCallerListForm.cpp
index ad5e8f8..d047ea8 100644 (file)
--- a/src/CallConfCallerListForm.cpp
+++ b/src/CallConfCallerListForm.cpp
@@ -1,7 +1,7 @@
 //
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
-// Licensed under the Flora License, Version 1.0 (the License);
+// Licensed under the Flora License, Version 1.1 (the License);
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
@@ -148,7 +148,7 @@ ConfCallerListForm::CreateTableView(void)
 {
        __pList = static_cast <TableView*> (GetControl(IDC_CONF_CALL_LIST_TABLEVIEW));
        __pList->SetItemProvider(this);
-       AddControl(*__pList);
+       AddControl(__pList);
 }
 
 void
@@ -258,12 +258,14 @@ ConfCallerListForm::OnActionPerformed(const Control& source, int actionId)
                if (noOfCalls == 1)
                {
                        //single active call - goto active call form
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_CONFCALL), pCallInfoList);
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_CONFCALL,
+                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
                }
                else
                {
                        //goto multiple active call form
-                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_MULTIPLEACTIVECALL), pCallInfoList);
+                       pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_MULTIPLEACTIVECALL,
+                                       SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
                }
                pCallList->RemoveAll();
                delete pCallList;
@@ -637,12 +639,14 @@ ConfCallerListForm::OnFormBackRequested(Form& source)
        if (noOfCalls == 1)
        {
                //single active call - goto active call form
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_CONFCALL), pCallInfoList);
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_CONFCALL,
+                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
        }
        else
        {
                //goto multiple active call form
-               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_MULTIPLEACTIVECALL), pCallInfoList);
+               pSceneManager->GoForward(ForwardSceneTransition(IDSCN_SCENE_MULTIPLEACTIVECALL,
+                               SCENE_TRANSITION_ANIMATION_TYPE_NONE, SCENE_HISTORY_OPTION_NO_HISTORY,SCENE_DESTROY_OPTION_DESTROY), pCallInfoList);
        }
        pCallList->RemoveAll();
        delete pCallList;
@@ -803,9 +807,9 @@ ConfCallerListForm::CreateItem(int itemIndex, int itemWidth)
                                break;
                }
        }
-       pItem->AddControl(*pSplitCallButton);
-       pItem->AddControl(*pCallLabel);
-       pItem->AddControl(*pEndCallButton);
+       pItem->AddControl(pSplitCallButton);
+       pItem->AddControl(pCallLabel);
+       pItem->AddControl(pEndCallButton);
        if(pDisplayName != null)
        {
                delete pDisplayName;