Add package signature files generation code in spec file

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

diff --git a/src/CallOptionPopup.cpp b/src/CallOptionPopup.cpp
index 05333a2..36accc1 100644 (file)
--- a/src/CallOptionPopup.cpp
+++ b/src/CallOptionPopup.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
 //
@@ -89,14 +89,14 @@ CallOptionPopup::Initialize(void)
        r = pCancelButton->Construct(Rectangle(VERTICAL_PADDING, listHeight + CANCEL_BUTTON_PADDING , W_CANCEL_BUTTON, H_CANCEL_BUTTON), strText);
        pCancelButton->SetActionId(IDA_BUTTON_CANCEL_OPTIONS_POPUP);
        pCancelButton->AddActionEventListener(*this);
-       r = AddControl(*pCancelButton);
+       r = AddControl(pCancelButton);
        TryReturn(r == E_SUCCESS, r, "CallOptionPopup::AddControl() failed");
 
        ListView* pListView = new (std::nothrow) ListView();
-       pListView->Construct(Rectangle(0, 0, W_POPUP, listHeight), true, SCROLL_STYLE_FADE_OUT);
+       pListView->Construct(Rectangle(0, 0, W_POPUP + HORIZONTAL_PADDING, listHeight), true, SCROLL_STYLE_FADE_OUT);
        pListView->AddListViewItemEventListener(*this);
        pListView->SetItemProvider(*this);
-       r = AddControl(*pListView);
+       r = AddControl(pListView);
 
 
 
@@ -109,7 +109,7 @@ CallOptionPopup::ConstructListData(void)
        result r = E_FAILURE;
 
        //fetch active call list
-       ArrayListT<CallInfo>* pCallList  = static_cast<ArrayListT<CallInfo>*>(__callPresenter.GetCallListN());
+       ArrayListT<AppCallInfo>* pCallList  = static_cast<ArrayListT<AppCallInfo>*>(__callPresenter.GetCallListN());
        if (pCallList != null && pCallList->GetCount() > 0)
        {
                String optionStr(L"");
@@ -121,7 +121,7 @@ CallOptionPopup::ConstructListData(void)
                        //2 calls(Active+Held) present - 3 options are shown
                        for (int index = 0;index < pCallList->GetCount(); index++)
                        {
-                               CallInfo callInfo;
+                               AppCallInfo callInfo;
                                pCallList->GetAt(index,callInfo);
 
                                optionStr.Clear();
@@ -172,7 +172,7 @@ CallOptionPopup::ConstructListData(void)
                else
                {
                        //only one call - 2 options are shown.
-                       CallInfo firstCallInfo;
+                       AppCallInfo firstCallInfo;
                        pCallList->GetAt(0,firstCallInfo);
                        if (firstCallInfo.IsConferenceCall() == false)
                        {