From 30bd2ac7409f9d7496708b77a404fd69be291387 Mon Sep 17 00:00:00 2001 From: Christoph Egger Date: Tue, 10 Mar 2015 16:34:32 +0100 Subject: [PATCH] Correctly handle function rename The GUI now handles function rename events also for the list of functions. One can now rename a function via scripting or in the loader or in any other way and it will be properly renamed. Fixes: T1 --- src/gui/Mainwindow.cxx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gui/Mainwindow.cxx b/src/gui/Mainwindow.cxx index ce16476..dfcdc76 100644 --- a/src/gui/Mainwindow.cxx +++ b/src/gui/Mainwindow.cxx @@ -4,6 +4,7 @@ #include "core/Function.hxx" #include "core/BasicBlock.hxx" #include "core/InformationManager.hxx" +#include "core/events/RenameFunctionEvent.hxx" #include "widgets/ScriptingDock.hxx" #include "widgets/CFGScene.hxx" #include "widgets/FunctionWidget.hxx" @@ -78,6 +79,12 @@ Mainwindow::Mainwindow(InformationManager* mgr) auto item = new QTreeWidgetItem(external, QStringList(name.c_str())); item->setBackground(0, QBrush(QColor(0xff, 0xdd, 0xdd))); }); + mgr->connect_rename_function_signal([&](RenameFunctionEvent* event) { + if (objects_list_by_address.find(event->address) == objects_list_by_address.end()) + return; + auto item = objects_list_by_address[event->address]; + if (item) item->setText(0, event->new_name.c_str()); + }); setGlobalHotkeys(); } @@ -208,7 +215,6 @@ void Mainwindow::renameFunction(Function* function) { LOG4CXX_DEBUG(logger, "renaming Function " << function->getName() << " to " << dialog.result().toStdString()); function->setName(dialog.result().toStdString()); - objects_list_by_address[function->getStartAddress()]->setText(0, dialog.result()); } else { LOG4CXX_DEBUG(logger, "renameFunction aborted"); } -- 2.39.5