Correctly handle function rename
authorChristoph Egger <Christoph.Egger@fau.de>
Tue, 10 Mar 2015 15:34:32 +0000 (16:34 +0100)
committerChristoph Egger <Christoph.Egger@fau.de>
Tue, 10 Mar 2015 15:36:47 +0000 (16:36 +0100)
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

index ce16476dd9f00cc04a1c207c4dcc9af7ab2cf897..dfcdc76fdae6d22a6d93599c83c2f7b3f3e73ab4 100644 (file)
@@ -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");
        }