From 6023f2a6ce6bae6e134851b77608f22f027db8d3 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Wed, 23 Sep 2020 06:04:48 +0900 Subject: [PATCH] mail: Remove dead code Pointed out by clang static analyzer. Change-Id: I911c6e664ca043ee49f9343b034b0c6ed78b0178 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3270 Reviewed-by: Adrien Destugues --- src/apps/mail/MailWindow.cpp | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/apps/mail/MailWindow.cpp b/src/apps/mail/MailWindow.cpp index d1b40f477c..8d9094a4a9 100644 --- a/src/apps/mail/MailWindow.cpp +++ b/src/apps/mail/MailWindow.cpp @@ -268,7 +268,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, read_read_attr(file, flag); if (flag == B_UNREAD) { - subMenu->AddItem(item = new BMenuItem( + subMenu->AddItem(new BMenuItem( B_TRANSLATE_COMMENT("Leave as 'New'", "Do not translate New - this is non-localizable e-mail status"), new BMessage(kMsgQuitAndKeepAllStatus), 'W', B_SHIFT_KEY)); @@ -283,7 +283,7 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, else label = B_TRANSLATE("Leave same"); - subMenu->AddItem(item = new BMenuItem(label.String(), + subMenu->AddItem(new BMenuItem(label.String(), new BMessage(B_QUIT_REQUESTED), 'W')); AddShortcut('W', B_COMMAND_KEY | B_SHIFT_KEY, new BMessage(kMsgQuitAndKeepAllStatus)); @@ -407,7 +407,6 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, menu = new BMenu(B_TRANSLATE("Message")); if (!resending && fIncoming) { - BMenuItem* menuItem; menu->AddItem(new BMenuItem(B_TRANSLATE("Reply"), new BMessage(M_REPLY),'R')); menu->AddItem(new BMenuItem(B_TRANSLATE("Reply to sender"), @@ -421,9 +420,9 @@ TMailWindow::TMailWindow(BRect rect, const char* title, TMailApp* app, new BMessage(M_FORWARD), 'J')); menu->AddItem(new BMenuItem(B_TRANSLATE("Forward without attachments"), new BMessage(M_FORWARD_WITHOUT_ATTACHMENTS))); - menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Resend"), + menu->AddItem(new BMenuItem(B_TRANSLATE("Resend"), new BMessage(M_RESEND))); - menu->AddItem(menuItem = new BMenuItem(B_TRANSLATE("Copy to new"), + menu->AddItem(new BMenuItem(B_TRANSLATE("Copy to new"), new BMessage(M_COPY_TO_NEW), 'D')); menu->AddSeparatorItem(); @@ -3087,8 +3086,6 @@ TMailWindow::_RebuildQueryMenu(bool firstTime) fQueryMenu->AddItem(new BMenuItem(kSameSubjectItem, new BMessage(M_QUERY_SUBJECT))); - bool queryItemsAdded = false; - BPath queryPath; if (_GetQueryPath(&queryPath) < B_OK) return; @@ -3110,8 +3107,6 @@ TMailWindow::_RebuildQueryMenu(bool firstTime) if (queryString == NULL) continue; - queryItemsAdded = true; - QueryMenu* queryMenu = new QueryMenu(name, false); queryMenu->SetTargetForItems(be_app); queryMenu->SetPredicate(queryString);