Skip to content

Commit

Permalink
change parent of actions in config context menu (COVESA#522)
Browse files Browse the repository at this point in the history 
MainWindow was set as a parent of the context menu actions
as a result all actions ever created (upon each ctx menu open)
in one program session remained on heap until program is closed.
Assigning local menu variable as a parent deallocates actions
when menu is closed

Signed-off-by: Viktor Kopp <[email protected]>
  • Loading branch information
@vifactor
vifactor authored Sep 9, 2024
1 parent 392bf26 commit d504c42
Showing 1 changed file with 36 additions and 36 deletions.
72 changes: 36 additions & 36 deletions src/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3041,192 +3041,192 @@ void MainWindow::on_configWidget_customContextMenuRequested(QPoint pos)

if(list.count() > 1 && (list.at(0)->type() == context_type))
{
action = new QAction("&Edit All Log Levels...", this);
action = new QAction("&Edit All Log Levels...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Edit_All_Log_Levels_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("DLT &Set Log Levels...", this);
action = new QAction("DLT &Set Log Levels...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Set_Log_Level_triggered()));
menu.addAction(action);
}
else if((list.count() > 1) && (list.at(0)->type() == ecu_type))
{
action = new QAction("&Edit All Log Levels...", this);
action = new QAction("&Edit All Log Levels...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Edit_All_Log_Levels_triggered()));
menu.addAction(action);
}
else if((list.count() == 1) && (list.at(0)->type() == ecu_type))
{
/* ECU is selected */

action = new QAction("ECU Add...", this);
action = new QAction("ECU Add...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_ECU_Add_triggered()));
menu.addAction(action);

action = new QAction("ECU Edit...", this);
action = new QAction("ECU Edit...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_ECU_Edit_triggered()));
menu.addAction(action);

action = new QAction("ECU Delete", this);
action = new QAction("ECU Delete", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_ECU_Delete_triggered()));
menu.addAction(action);

action = new QAction("&ECU Edit All Log Levels...", this);
action = new QAction("&ECU Edit All Log Levels...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Edit_All_Log_Levels_triggered()));
menu.addAction(action);

action = new QAction("ECU Delete All Contexts", this);
action = new QAction("ECU Delete All Contexts", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Delete_All_Contexts_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("Application Add...", this);
action = new QAction("Application Add...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Application_Add_triggered()));
menu.addAction(action);

action = new QAction("Save IDs as csv", this);
action = new QAction("Save IDs as csv", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(onActionMenuConfigSaveAllECUsTriggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("ECU Connect", this);
action = new QAction("ECU Connect", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Connect_triggered()));
menu.addAction(action);

action = new QAction("ECU Disconnect", this);
action = new QAction("ECU Disconnect", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Disconnect_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("Expand All ECUs", this);
action = new QAction("Expand All ECUs", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Expand_All_ECUs_triggered()));
menu.addAction(action);

action = new QAction("Collapse All ECUs", this);
action = new QAction("Collapse All ECUs", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Collapse_All_ECUs_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("DLT Get Log Info", this);
action = new QAction("DLT Get Log Info", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Get_Log_Info_triggered()));
menu.addAction(action);

action = new QAction("DLT Set All Log Levels", this);
action = new QAction("DLT Set All Log Levels", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Set_All_Log_Levels_triggered()));
menu.addAction(action);

action = new QAction("DLT Get Default Log Level", this);
action = new QAction("DLT Get Default Log Level", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Get_Default_Log_Level_triggered()));
menu.addAction(action);

action = new QAction("DLT Set Default Log Level", this);
action = new QAction("DLT Set Default Log Level", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Set_Default_Log_Level_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("Store Config", this);
action = new QAction("Store Config", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Store_Config_triggered()));
menu.addAction(action);

action = new QAction("Reset to Factory Default", this);
action = new QAction("Reset to Factory Default", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Reset_to_Factory_Default_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("Send Injection...", this);
action = new QAction("Send Injection...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Send_Injection_triggered()));
menu.addAction(action);

action = new QAction("Get Software Version", this);
action = new QAction("Get Software Version", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Get_Software_Version_triggered()));
menu.addAction(action);

action = new QAction("Get Local Time", this);
action = new QAction("Get Local Time", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Get_Local_Time_2_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("&Filter Add", this);
action = new QAction("&Filter Add", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(filterAdd()));
menu.addAction(action);
}
else if((list.count() > 1) && (list.at(0)->type() == application_type))
{
action = new QAction("&Edit All Log Levels...", this);
action = new QAction("&Edit All Log Levels...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Edit_All_Log_Levels_triggered()));
menu.addAction(action);
}
else if((list.count() == 1) && (list.at(0)->type() == application_type))
{
/* Application is selected */

action = new QAction("&Application Edit...", this);
action = new QAction("&Application Edit...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Application_Edit_triggered()));
menu.addAction(action);

action = new QAction("A&pplication Delete...", this);
action = new QAction("A&pplication Delete...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Application_Delete_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("&Context Add...", this);
action = new QAction("&Context Add...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Context_Add_triggered()));
menu.addAction(action);

action = new QAction("&Edit All Log Levels...", this);
action = new QAction("&Edit All Log Levels...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Edit_All_Log_Levels_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("&Filter Add", this);
action = new QAction("&Filter Add", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(filterAdd()));
menu.addAction(action);
}
else if((list.count() == 1) && (list.at(0)->type() == context_type))
{
/* Context is selected */

action = new QAction("&Context Edit...", this);
action = new QAction("&Context Edit...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Context_Edit_triggered()));
menu.addAction(action);

action = new QAction("C&ontext Delete...", this);
action = new QAction("C&ontext Delete...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_Context_Delete_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("DLT &Set Log Level...", this);
action = new QAction("DLT &Set Log Level...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Set_Log_Level_triggered()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("&Filter Add", this);
action = new QAction("&Filter Add", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(filterAdd()));
menu.addAction(action);

menu.addSeparator();

action = new QAction("Send Injection...", this);
action = new QAction("Send Injection...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuDLT_Send_Injection_triggered()));
menu.addAction(action);
}
else
{
/* nothing is selected */
action = new QAction("ECU Add...", this);
action = new QAction("ECU Add...", &menu);
connect(action, SIGNAL(triggered()), this, SLOT(on_action_menuConfig_ECU_Add_triggered()));
menu.addAction(action);

Expand Down

0 comments on commit d504c42

Please sign in to comment.