From f30ba67705f84b0c72ec2c2d276b4528d610f888 Mon Sep 17 00:00:00 2001 From: Murai Takashi Date: Thu, 24 Sep 2020 19:39:07 +0900 Subject: [PATCH] cortex: Remove dead code Pointed out by clang static analyzer. Change-Id: Ic647109e5e7d2e304be6f8c542ea9bfca551c3a3 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3271 Reviewed-by: Adrien Destugues --- src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp | 3 +-- src/apps/cortex/MediaRoutingView/MediaJack.cpp | 5 ++--- src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp | 6 ++---- src/apps/cortex/MediaRoutingView/MediaWire.cpp | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp b/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp index 52f3aed55d..fab7632356 100644 --- a/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp +++ b/src/apps/cortex/DormantNodeView/DormantNodeWindow.cpp @@ -86,8 +86,7 @@ DormantNodeWindow::DormantNodeWindow( r.left = r.right + 1.0; r.right = r.left + B_V_SCROLL_BAR_WIDTH; r.InsetBy(0.0, -1.0); - BScrollBar *scrollBar; - AddChild(scrollBar = new BScrollBar(r, "", m_listView, 0.0, 0.0, B_VERTICAL)); + AddChild(new BScrollBar(r, "", m_listView, 0.0, 0.0, B_VERTICAL)); // Add the ListView AddChild(m_listView); diff --git a/src/apps/cortex/MediaRoutingView/MediaJack.cpp b/src/apps/cortex/MediaRoutingView/MediaJack.cpp index 664f2c7fe7..395e742dae 100644 --- a/src/apps/cortex/MediaRoutingView/MediaJack.cpp +++ b/src/apps/cortex/MediaRoutingView/MediaJack.cpp @@ -739,7 +739,6 @@ void MediaJack::showContextMenu( BPopUpMenu *menu = new BPopUpMenu("MediaJack PopUp", false, false, B_ITEMS_IN_COLUMN); menu->SetFont(be_plain_font); - BMenuItem *item; // add the "Get Info" item if (isInput()) @@ -749,7 +748,7 @@ void MediaJack::showContextMenu( BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); message->AddData("input", B_RAW_TYPE, reinterpret_cast(&input), sizeof(input)); - menu->AddItem(item = new BMenuItem("Get info", message)); + menu->AddItem(new BMenuItem("Get info", message)); } else if (isOutput()) { @@ -758,7 +757,7 @@ void MediaJack::showContextMenu( BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); message->AddData("output", B_RAW_TYPE, reinterpret_cast(&output), sizeof(output)); - menu->AddItem(item = new BMenuItem("Get info", message)); + menu->AddItem(new BMenuItem("Get info", message)); } menu->SetTargetForItems(view()); diff --git a/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp b/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp index 5f419127d7..2c3c082d01 100644 --- a/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp +++ b/src/apps/cortex/MediaRoutingView/MediaNodePanel.cpp @@ -341,8 +341,7 @@ void MediaNodePanel::updateIOJacks() ref->getFreeInputs(freeInputs); for (uint32 i = 0; i < freeInputs.size(); i++) { - MediaJack *jack; - AddItem(jack = new MediaJack(freeInputs[i])); + AddItem(new MediaJack(freeInputs[i])); } } @@ -353,8 +352,7 @@ void MediaNodePanel::updateIOJacks() ref->getFreeOutputs(freeOutputs); for (uint32 i = 0; i < freeOutputs.size(); i++) { - MediaJack *jack; - AddItem(jack = new MediaJack(freeOutputs[i])); + AddItem(new MediaJack(freeOutputs[i])); } } diff --git a/src/apps/cortex/MediaRoutingView/MediaWire.cpp b/src/apps/cortex/MediaRoutingView/MediaWire.cpp index 8f40f362ce..2f3542601a 100644 --- a/src/apps/cortex/MediaRoutingView/MediaWire.cpp +++ b/src/apps/cortex/MediaRoutingView/MediaWire.cpp @@ -322,7 +322,7 @@ void MediaWire::showContextMenu( BMessage *message = new BMessage(InfoWindowManager::M_INFO_WINDOW_REQUESTED); message->AddData("connection", B_RAW_TYPE, reinterpret_cast(&output), sizeof(output)); - menu->AddItem(item = new BMenuItem("Get info", message, 'I')); + menu->AddItem(new BMenuItem("Get info", message, 'I')); // add the "Disconnect" item menu->AddItem(item = new BMenuItem("Disconnect", new BMessage(MediaRoutingView::M_DELETE_SELECTION), 'T'));