X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fruler.cpp;h=712244a9df8cc9a4399d80217ac413467abd0f5d;hp=be715ec104385576b3c66042325e51ddc14d982a;hb=6f925ba9d6faf1077b73c5a5808259576081716a;hpb=00f6bae935837b38b0d03a5928ba8175d460413f diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp index be715ec1..712244a9 100644 --- a/pv/view/ruler.cpp +++ b/pv/view/ruler.cpp @@ -28,6 +28,7 @@ using namespace Qt; +using std::function; using std::shared_ptr; using std::vector; @@ -70,7 +71,7 @@ QSize Ruler::sizeHint() const QSize Ruler::extended_size_hint() const { QRectF max_rect; - std::vector< std::shared_ptr > items(view_.time_items()); + vector< shared_ptr > items(view_.time_items()); for (auto &i : items) max_rect = max_rect.united(i->label_rect(QRect())); return QSize(0, sizeHint().height() - max_rect.top() / 2 + @@ -193,7 +194,7 @@ Ruler::TickPositions Ruler::calculate_tick_positions( const pv::util::Timestamp& offset, const double scale, const int width, - std::function format_function) + function format_function) { TickPositions tp;