Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/view/cursor.cpp b/pv/view/cursor.cpp
index 98b7289f11f0babd8c1bf73b33959d89ba0f1031..0cc63142054c4598def0c8cad58d5a4d32a5d21c 100644 (file)
--- a/pv/view/cursor.cpp
+++ b/pv/view/cursor.cpp
@@ -58,16 +58,16 @@ QRectF Cursor::get_label_rect(const QRect &rect) const
        const shared_ptr<Cursor> other(get_other_cursor());
        assert(other);
 
-       const float x = (_time - _view.offset()) / _view.scale();
+       const float x = (time_ - view_.offset()) / view_.scale();
 
        const QSizeF label_size(
-               _text_size.width() + View::LabelPadding.width() * 2,
-               _text_size.height() + View::LabelPadding.height() * 2);
+               text_size_.width() + View::LabelPadding.width() * 2,
+               text_size_.height() + View::LabelPadding.height() * 2);
        const float top = rect.height() - label_size.height() -
                Cursor::Offset - Cursor::ArrowSize - 0.5f;
        const float height = label_size.height();
 
-       if (_time > other->time())
+       if (time_ > other->time())
                return QRectF(x, top, label_size.width(), height);
        else
                return QRectF(x - label_size.width(), top,
@@ -115,9 +115,9 @@ void Cursor::paint_label(QPainter &p, const QRect &rect,
                QPointF(r.right() - 1, rect.bottom() - 1),
        };
 
-       const QPointF *const points = (_time > other->time()) ?
+       const QPointF *const points = (time_ > other->time()) ?
                left_points : right_points;
-       const QPointF *const highlight_points = (_time > other->time()) ?
+       const QPointF *const highlight_points = (time_ > other->time()) ?
                left_highlight_points : right_highlight_points;
 
        if (selected()) {
@@ -140,18 +140,18 @@ void Cursor::paint_label(QPainter &p, const QRect &rect,
 
        p.setPen(TextColour);
        p.drawText(r, Qt::AlignCenter | Qt::AlignVCenter,
-               pv::util::format_time(_time, prefix, 2));
+               pv::util::format_time(time_, prefix, 2));
 }
 
 void Cursor::compute_text_size(QPainter &p, unsigned int prefix)
 {
-       _text_size = p.boundingRect(QRectF(), 0,
-               pv::util::format_time(_time, prefix, 2)).size();
+       text_size_ = p.boundingRect(QRectF(), 0,
+               pv::util::format_time(time_, prefix, 2)).size();
 }
 
 shared_ptr<Cursor> Cursor::get_other_cursor() const
 {
-       const CursorPair &cursors = _view.cursors();
+       const CursorPair &cursors = view_.cursors();
        return (cursors.first().get() == this) ?
                cursors.second() : cursors.first();
 }