QTableWidget -> QLabel + HTML

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

diff --git a/src/gui/widgets/BasicBlockWidget.hxx b/src/gui/widgets/BasicBlockWidget.hxx
index dd2fa30208d8a347c1672aed7e94a85a80d421f2..e40ed840a759bf838d6a1cb5f14765dd0b9217a5 100644 (file)
--- a/src/gui/widgets/BasicBlockWidget.hxx
+++ b/src/gui/widgets/BasicBlockWidget.hxx
@@ -6,6 +6,7 @@
 #include <vector>
 #include <cassert>
 #include <tuple>
+#include <array>
 
 class BasicBlockWidget : public QGraphicsItem
 {
@@ -30,10 +31,10 @@ public:
                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,
@@ -42,7 +43,7 @@ public:
         painter->setPen(QColor(0x00, 0x00, 0xff, 0xff));
         painter->drawRect(0, 0, width, height);
         painter->drawText(5, 15, name);
-               if (_widget.rowCount() != 0)
+               if (_widget.text() != "")
                        _widget.render(painter, QPoint(5, 20));
     }
 
@@ -61,7 +62,7 @@ public:
 
 private:
     uint32_t width, height;
-    QTableWidget _widget;
+    QLabel _widget;
        QString name;
        BasicBlock * block;
        std::vector<BasicBlockWidget*> previous;