X-Git-Url: https://git.siccegge.de//index.cgi?p=frida%2Ffrida.git;a=blobdiff_plain;f=src%2Fgui%2Fwidgets%2FBasicBlockWidget.cxx;h=77a14932999adeedfddc1c77517773909c029bb7;hp=1cdc33f3dc7eb2ce4cf67f84ba8b1e77a0f24d0d;hb=1b43b26ba9b23cb5f3004db7b9b00f6b08227563;hpb=42617ae5ed5b400a66df8b59a705f6523eec71b8
diff --git a/src/gui/widgets/BasicBlockWidget.cxx b/src/gui/widgets/BasicBlockWidget.cxx
index 1cdc33f..77a1493 100644
--- a/src/gui/widgets/BasicBlockWidget.cxx
+++ b/src/gui/widgets/BasicBlockWidget.cxx
@@ -117,7 +117,8 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
, logger(log4cxx::Logger::getLogger("gui.BasicBlockWidget." + name.toStdString())) {
next[0] = NULL; next[1] = NULL;
- block->getManager()->registerRenameFunctionEvent([=](RenameFunctionEvent* event) {updateFunctionName(event);});
+ QObject::connect(block->getManager(), &InformationManager::renameFunctionEvent,
+ [=](RenameFunctionEvent* event) {updateFunctionName(event);});
_widget.reset(new CustomQGraphicsTextItem("", this));
_widget->setPos(5, 20);
@@ -150,7 +151,8 @@ BasicBlockWidget::BasicBlockWidget(const QString& name, BasicBlock * block,
});
instructions = block->getInstructions();
populateWidget();
- block->getManager()->registerChangeCommentEvent([=](ChangeCommentEvent* e) {changeCommentHandler(e);});
+ QObject::connect(block->getManager(), &InformationManager::changeCommentEvent,
+ [=](ChangeCommentEvent* e) {changeCommentHandler(e);});
}
void BasicBlockWidget::updateFunctionName(RenameFunctionEvent *event) {
@@ -261,12 +263,11 @@ void BasicBlockWidget::populateWidget() {
}
QString BasicBlockWidget::formatComments(Instruction* inst) {
- QString comments;
+ QStringList comments;
for (Comment* c: inst->comments()) {
- comments += "
";
- comments += QString(c->getText().c_str()).toHtmlEscaped();
+ comments << QString(c->getText().c_str()).toHtmlEscaped();
}
- return (comments == "" ? "" : ";; ") + comments.trimmed();
+ return (comments.empty() ? "" : ";; ") + comments.join("
").trimmed();
}
void BasicBlockWidget::paint(QPainter *painter, const QStyleOptionGraphicsItem*,