HwKey removal of removed and deprecated api's

Change-Id: I9d0d99586e567930a493593d4a5e9f2ea4a7bf7d
Signed-off-by: chitta ranjan <chitta.rs@samsung.com>

diff --git a/src/MsgBaseForm.cpp b/src/MsgBaseForm.cpp
index fa8c7bc..0b30d24 100644 (file)
--- a/src/MsgBaseForm.cpp
+++ b/src/MsgBaseForm.cpp
@@ -45,7 +45,7 @@ BaseForm::OnIntializeFooter(Footer& footer)
 \r
        // Default implementation.\r
        footer.SetStyle(FOOTER_STYLE_SEGMENTED_TEXT);\r
-       footer.SetBackButton();\r
+//     footer.SetBackButton();\r
 \r
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));\r
 }\r

diff --git a/src/MsgConversationForm.cpp b/src/MsgConversationForm.cpp
index 76792d7..017b86c 100644 (file)
--- a/src/MsgConversationForm.cpp
+++ b/src/MsgConversationForm.cpp
@@ -239,7 +239,7 @@ ConversationForm::SetEditModeFooter(Footer& footer)
        footer.AddItem(deleteBtn);
 
 
-       footer.SetBackButton();
+//     footer.SetBackButton();
 
 
        if (__pSelectedIds && __pSelectedIds->GetCount() > 0)

diff --git a/src/MsgMmsDetailForm.cpp b/src/MsgMmsDetailForm.cpp
index 3140bc3..2660bac 100644 (file)
--- a/src/MsgMmsDetailForm.cpp
+++ b/src/MsgMmsDetailForm.cpp
@@ -192,7 +192,7 @@ MmsDetailForm::SetFooter(void)
                        btnLeft.SetIcon(BUTTON_ITEM_STATUS_PRESSED, pBitMap);
                        pFooter->SetButton(BUTTON_POSITION_LEFT, btnLeft);
                }
-               pFooter->SetBackButton();
+//             pFooter->SetBackButton();
        }
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
 }

diff --git a/src/MsgSettingsForm.cpp b/src/MsgSettingsForm.cpp
index 4986c69..933d127 100644 (file)
--- a/src/MsgSettingsForm.cpp
+++ b/src/MsgSettingsForm.cpp
@@ -324,7 +324,7 @@ SettingsForm::OnIntializeFooter(Footer& footer)
        // Set event listener
        footer.AddActionEventListener(*this);
        footer.SetStyle(FOOTER_STYLE_BUTTON_ICON_TEXT);
-       footer.SetBackButton();
+//     footer.SetBackButton();
 
        AppLogDebug("EXIT: %s", GetErrorMessage(GetLastResult()));
        return;

diff --git a/src/MsgSpamSettingsForm.cpp b/src/MsgSpamSettingsForm.cpp
index edd5c0a..e980336 100644 (file)
--- a/src/MsgSpamSettingsForm.cpp
+++ b/src/MsgSpamSettingsForm.cpp
@@ -298,7 +298,7 @@ SpamSettingsForm::OnIntializeFooter(Footer& footer)
        {
        case SPAM_SETTING_FORM_MAIN:
        {
-               footer.SetBackButton();
+//             footer.SetBackButton();
        }
                break;
 
@@ -322,7 +322,7 @@ SpamSettingsForm::OnIntializeFooter(Footer& footer)
                saveBtn.SetText(strText);
                footer.AddItem(saveBtn);
 
-               footer.SetBackButton();
+//             footer.SetBackButton();
 
                footer.SetItemEnabled(0, false);
                footer.Invalidate(true);
@@ -348,7 +348,7 @@ SpamSettingsForm::OnIntializeFooter(Footer& footer)
                footer.AddItem(leftItem);
                footer.AddItem(centerItem);
 
-               footer.SetBackButton();
+//             footer.SetBackButton();
        }
        break;
 
@@ -364,7 +364,7 @@ SpamSettingsForm::OnIntializeFooter(Footer& footer)
                deleteItem.SetText(strText);
                footer.AddItem(deleteItem);
 
-               footer.SetBackButton();
+//             footer.SetBackButton();
        }
        break;
 

diff --git a/src/MsgThreadListForm.cpp b/src/MsgThreadListForm.cpp
index 4d901fa..8e57a83 100644 (file)
--- a/src/MsgThreadListForm.cpp
+++ b/src/MsgThreadListForm.cpp
@@ -71,7 +71,7 @@ ThreadListForm::~ThreadListForm(void)
        ThreadPresentationModel* pThreadPrModel = ThreadPresentationModel::GetInstance();
        if (pThreadPrModel)
        {
-               pThreadPrModel->RemoveThreadListEventListener(*this);
+//             pThreadPrModel->RemoveThreadListEventListener(*this);
                pThreadPrModel->CancelDelete();
                pThreadPrModel->CancelRestore();
        }
@@ -465,6 +465,11 @@ ThreadListForm::OnTerminating(void)
        AppLogDebug("ENTER");
 
        result r = E_SUCCESS;
+       ThreadPresentationModel* pThreadPrModel = ThreadPresentationModel::GetInstance();
+       if (pThreadPrModel)
+       {
+               pThreadPrModel->RemoveThreadListEventListener(*this);
+       }
 
        SetFormBackEventListener(null);
        SetFormMenuEventListener(null);
@@ -537,21 +542,7 @@ ThreadListForm::SetThreadListViewModeFooter(Footer& footer)
        composeBtn.SetText(strText);
        footer.AddItem(composeBtn); // adding compose button to footer as item
 
-       footer.SetBackButton();
-       footer.SetMenuButton();
-
-
-
-       // Enable disable footer item
-//     ThreadPresentationModel* pThreadPrModel = ThreadPresentationModel::GetInstance();
-//     if (pThreadPrModel && pThreadPrModel->GetCount() > 0)
-//     {
-//             footer.SetItemEnabled(1, true);
-//     }
-//     else
-//     {
-//             footer.SetItemEnabled(1, false);
-//     }
+//     footer.SetBackButton();
 
        OnIntializeFooter(footer);