X-Git-Url: https://git.siccegge.de//index.cgi?a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=128b9fb5401d0e4b3977057af4d5ffe5212e8315;hb=5afba5f952385321480f53091363a5fba2e16f62;hp=f66a575167b83fb25d1cc12b4fd06d5975b583a0;hpb=440c4598343d9e46d8963f7753c122b121826334;p=frida%2Ffrida.git

diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index f66a575..128b9fb 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -65,10 +65,10 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
 	: width(270), height(45), name(name)
 	, _table(NULL)
 	, block(block), mainwindow(mainwindow)
-	, logger(log4cxx::Logger::getLogger(name.toStdString() + " BasicBlockWidget")) {
+	, logger(log4cxx::Logger::getLogger("gui.BasicBlockWidget." + name.toStdString())) {
 	next[0] = NULL;	next[1] = NULL;
 
-	block->getManager()->connect_rename_function_signal([=](RenameFunctionEvent* event) {updateFunctionName(event);});
+	block->getManager()->registerRenameFunctionEvent([=](RenameFunctionEvent* event) {updateFunctionName(event);});
 
 	_widget.reset(new CustomQGraphicsTextItem("", this));
 	_widget->setPos(5, 20);
@@ -144,7 +144,7 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 			Function* fun = block->getManager()->getFunction(address);
 
 			if (fun) {
-				line = line.split(" ")[0] + " " + fun->getName().c_str();
+				line = line.split(" ")[0] + " " + QString(fun->getName().c_str()).toHtmlEscaped();
 				LOG4CXX_DEBUG(logger, "Naming function at " << address << " " << fun->getName());
 			}
 		}
@@ -154,8 +154,9 @@ void BasicBlockWidget::addItem(uint8_t* bytes, size_t num_bytes,
 	_table->cellAt(row, 1).firstCursorPosition().insertHtml(line);
 }
 
-void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-	           QWidget *widget) {
+void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem*,
+	           QWidget*) {
+	_widget->adjustSize();
 	width = 10 + _widget->boundingRect().width();
 	height = 25 + _widget->boundingRect().height();
 	if (width < 250) width = 250;