Switch again BasicBlockWidget base -- to QGraphicsTextItem

[frida/frida.git] / src / gui / widgets / BasicBlockWidget.hxx

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index dd2fa30208d8a347c1672aed7e94a85a80d421f2..8ee33a56f21a43e6bcccfb26bbde48b6e395f58f 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -6,45 +6,47 @@
 #include <vector>
 #include <cassert>
 #include <tuple>
+#include <array>
 
-class BasicBlockWidget : public QGraphicsItem
+class Mainwindow;
+
+class BasicBlockWidget : public QObject, public QGraphicsItem
 {
+       Q_OBJECT
 public:
-    BasicBlockWidget(const QString& name, BasicBlock * block);
+       BasicBlockWidget(const QString& name, BasicBlock * block, Mainwindow * mainwindow);
 
-       void addItem(uint8_t* bytes, size_t num_bytes, const QString& line);
+       void addItem(uint8_t* bytes, size_t num_bytes, QString line, const QString& href);
 
-    QRectF boundingRect() const  {
-        qreal penWidth = 1;
+       QRectF boundingRect() const  {
+               qreal penWidth = 1;
                QRectF result(- penWidth / 2, - penWidth / 2,
-                      width + penWidth, height + penWidth);
-        return result;
-    }
+                             width + penWidth, height + penWidth);
+               return result;
+       }
 
        void mouseMoveEvent(QGraphicsSceneMouseEvent * event) {
                QGraphicsItem::mouseMoveEvent(event);
-        scene()->update();
+               scene()->update();
        }
 
        QPointF getEntry() const {
                return mapToScene(QPointF(width/2, 0));
        }
 
-    std::tuple<QPointF, QPointF, QPointF> getExits() const {
-        return std::make_tuple(mapToScene(QPointF(  width/3, height)),
-                               mapToScene(QPointF(  width/2, height)),
-                               mapToScene(QPointF(2*width/3, height)));
-    }
+       std::array<QPointF, 3> getExits() const {
+               return { { mapToScene(QPointF(  width/3, height)),
+                          mapToScene(QPointF(  width/2, height)),
+                          mapToScene(QPointF(2*width/3, height)) } };
+       }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
-               QWidget *widget) {
-        painter->fillRect(0, 0, width, height, QColor(0xcc, 0xcc, 0xff, 0xff));
-        painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
-        painter->drawRect(0, 0, width, height);
-        painter->drawText(5, 15, name);
-               if (_widget.rowCount() != 0)
-                       _widget.render(painter, QPoint(5, 20));
-    }
+       void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
+                  QWidget *widget) {
+               painter->fillRect(0, 0, width, height, QColor(0xcc, 0xcc, 0xff, 0xff));
+               painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
+               painter->drawRect(0, 0, width, height);
+               painter->drawText(5, 15, name);
+       }
 
        void addPrevious(BasicBlockWidget * widget) {
                previous.push_back(widget);
@@ -55,15 +57,20 @@ public:
                next[1] = right;
        }
 
-    BasicBlockWidget ** getNext() {
-        return next;
-    }
+       BasicBlockWidget ** getNext() {
+               return next;
+       }
 
+       QString getName() const {
+               return name;
+       }
 private:
-    uint32_t width, height;
-    QTableWidget _widget;
+       uint32_t width, height;
+       QGraphicsTextItem _widget;
+       QTextTable* _table;
        QString name;
        BasicBlock * block;
+       Mainwindow * mainwindow;
        std::vector<BasicBlockWidget*> previous;
        BasicBlockWidget* next[2];
 };