The CustomQGraphicsTextItem is just an implementation detail of
BasicBlockWidget and can use its private members (mostly the logger and
mainwindow members)
class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
public:
class CustomQGraphicsTextItem : public QObject, public QGraphicsTextItem {
public:
- CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent, Mainwindow* mainwindow)
- : QGraphicsTextItem(text, parent), parent(parent), mainwindow(mainwindow) {}
+ CustomQGraphicsTextItem(const QString& text, BasicBlockWidget* parent)
+ : QGraphicsTextItem(text, parent), parent(parent) {}
void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
private:
void contextMenuEvent(QGraphicsSceneContextMenuEvent*);
private:
+ void addComment(QTextTableCell cell, const QString& title);
+
BasicBlockWidget* parent;
BasicBlockWidget* parent;
- Mainwindow* mainwindow;
-namespace {
- void addComment(QTextTableCell cell, const QString& title) {
- SimpleStringDialog dialog(title);
- int result = dialog.exec();
- if (QDialog::Accepted == result) {
- // LOG4CXX_DEBUG(logger, "adding comment " << dialog.result().toStdString()
- // << " at row " << cell.row());
- cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
- } else {
- // LOG4CXX_DEBUG(logger, "addComment aborted");
- }
+void CustomQGraphicsTextItem::addComment(QTextTableCell cell, const QString& title) {
+ SimpleStringDialog dialog(title);
+ int result = dialog.exec();
+ if (QDialog::Accepted == result) {
+ LOG4CXX_DEBUG(parent->logger, "adding comment " << dialog.result().toStdString()
+ << " at row " << cell.row());
+ cell.firstCursorPosition().insertHtml(QString(";; ") + dialog.result());
+ } else {
+ LOG4CXX_DEBUG(parent->logger, "addComment aborted");
if (ok) {
QAction* act = menu.addAction(c.selectedText() + " is a Function");
QObject::connect(act, &QAction::triggered,
if (ok) {
QAction* act = menu.addAction(c.selectedText() + " is a Function");
QObject::connect(act, &QAction::triggered,
- [=]() {mainwindow->requestNewFunctionByAddress(address);});
+ [=]() {parent->mainwindow->requestNewFunctionByAddress(address);});
}
QTextTable* table = c.currentTable();
}
QTextTable* table = c.currentTable();
, block(block), mainwindow(mainwindow)
, logger(log4cxx::Logger::getLogger(name.toStdString() + "BasicBlock")) {
next[0] = NULL; next[1] = NULL;
, block(block), mainwindow(mainwindow)
, logger(log4cxx::Logger::getLogger(name.toStdString() + "BasicBlock")) {
next[0] = NULL; next[1] = NULL;
- _widget.reset(new CustomQGraphicsTextItem("", this, mainwindow));
+ _widget.reset(new CustomQGraphicsTextItem("", this));
_widget->setPos(5, 20);
_widget->setTextInteractionFlags(Qt::TextSelectableByMouse|
Qt::LinksAccessibleByMouse);
_widget->setPos(5, 20);
_widget->setTextInteractionFlags(Qt::TextSelectableByMouse|
Qt::LinksAccessibleByMouse);
#include <log4cxx/logger.h>
class Mainwindow;
#include <log4cxx/logger.h>
class Mainwindow;
+class CustomQGraphicsTextItem;
+
class BasicBlock;
class BasicBlockWidget : public QObject, public QGraphicsItem
{
Q_OBJECT
class BasicBlock;
class BasicBlockWidget : public QObject, public QGraphicsItem
{
Q_OBJECT
+ friend class CustomQGraphicsTextItem;
public:
BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);
public:
BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);