TraceTreeItem: Separated from RowItem

[pulseview.git] / pv / view / viewport.cpp

diff --git a/pv/view/viewport.cpp b/pv/view/viewport.cpp
index a4b6680a7fe57bd02ed6b5b2e59888266a4d2552..007a8c218878fa14cf0477322b7557296a990a14 100644 (file)
--- a/pv/view/viewport.cpp
+++ b/pv/view/viewport.cpp
@@ -148,12 +148,12 @@ bool Viewport::touch_event(QTouchEvent *event)
 
 void Viewport::paintEvent(QPaintEvent*)
 {
-       vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+       vector< shared_ptr<TraceTreeItem> > row_items(view_.begin(), view_.end());
        assert(none_of(row_items.begin(), row_items.end(),
-               [](const shared_ptr<RowItem> &r) { return !r; }));
+               [](const shared_ptr<TraceTreeItem> &r) { return !r; }));
 
        stable_sort(row_items.begin(), row_items.end(),
-               [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+               [](const shared_ptr<TraceTreeItem> &a, const shared_ptr<TraceTreeItem> &b) {
                        return a->visual_v_offset() < b->visual_v_offset(); });
 
        const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
@@ -167,17 +167,17 @@ void Viewport::paintEvent(QPaintEvent*)
 
        for (const shared_ptr<TimeItem> t : time_items)
                t->paint_back(p, pp);
-       for (const shared_ptr<RowItem> r : row_items)
+       for (const shared_ptr<TraceTreeItem> r : row_items)
                r->paint_back(p, pp);
 
        for (const shared_ptr<TimeItem> t : time_items)
                t->paint_mid(p, pp);
-       for (const shared_ptr<RowItem> r : row_items)
+       for (const shared_ptr<TraceTreeItem> r : row_items)
                r->paint_mid(p, pp);
 
        p.setRenderHint(QPainter::Antialiasing, false);
 
-       for (const shared_ptr<RowItem> r : row_items)
+       for (const shared_ptr<TraceTreeItem> r : row_items)
                r->paint_fore(p, pp);
        for (const shared_ptr<TimeItem> t : time_items)
                t->paint_fore(p, pp);