X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Ftrace.cpp;h=0d4a4536171aacd99082465740deabe66f957793;hp=0ca1359138d89317f4c630f6cda71d242c50bc34;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=00f6bae935837b38b0d03a5928ba8175d460413f diff --git a/pv/view/trace.cpp b/pv/view/trace.cpp index 0ca1359..0d4a453 100644 --- a/pv/view/trace.cpp +++ b/pv/view/trace.cpp @@ -35,6 +35,9 @@ #include "pv/widgets/colourbutton.hpp" #include "pv/widgets/popup.hpp" +using std::pair; +using std::shared_ptr; + namespace pv { namespace views { namespace TraceView { @@ -45,7 +48,7 @@ const int Trace::LabelHitPadding = 2; const QColor Trace::BrightGrayBGColour = QColor(0, 0, 0, 10*255/100); const QColor Trace::DarkGrayBGColour = QColor(0, 0, 0, 15*255/100); -Trace::Trace(std::shared_ptr channel) : +Trace::Trace(shared_ptr channel) : base_(channel), popup_(nullptr), popup_form_(nullptr) @@ -166,7 +169,7 @@ void Trace::paint_back(QPainter &p, const ViewItemPaintParams &pp) p.setPen(QPen(Qt::NoPen)); - const std::pair extents = v_extents(); + const pair extents = v_extents(); const int x = 0; const int y = get_visual_y() + extents.first;