Make member variable underscores a suffix instead of a prefix

[pulseview.git] / pv / view / view.h

diff --git a/pv/view/view.h b/pv/view/view.h
index eb60ab1a7735d9f3e51e2f96f00928fa5445b4da..dec317ccf9a4f2000cd2ec2406f42998965dd936 100644 (file)
--- a/pv/view/view.h
+++ b/pv/view/view.h
@@ -25,6 +25,7 @@
 
 #include <memory>
 #include <set>
+#include <unordered_map>
 #include <vector>
 
 #include <QAbstractScrollArea>
@@ -195,6 +196,17 @@ private:
         */
        QRectF label_rect(int right);
 
+       static bool add_channels_to_owner(
+               const std::vector< std::shared_ptr<sigrok::Channel> > &channels,
+               RowItemOwner *owner, int &offset,
+               std::unordered_map<std::shared_ptr<sigrok::Channel>,
+                       std::shared_ptr<Signal> > &signal_map,
+               std::function<bool (std::shared_ptr<RowItem>)> filter_func =
+                       std::function<bool (std::shared_ptr<RowItem>)>());
+
+       static void apply_offset(
+               std::shared_ptr<RowItem> row_item, int &offset);
+
 private:
        bool eventFilter(QObject *object, QEvent *event);
 
@@ -224,29 +236,29 @@ private Q_SLOTS:
        void on_hover_point_changed();
 
 private:
-       SigSession &_session;
+       SigSession &session_;
 
-       Viewport *_viewport;
-       Ruler *_ruler;
-       CursorHeader *_cursorheader;
-       Header *_header;
+       Viewport *viewport_;
+       Ruler *ruler_;
+       CursorHeader *cursorheader_;
+       Header *header_;
 
        /// The view time scale in seconds per pixel.
-       double _scale;
+       double scale_;
 
        /// The view time offset in seconds.
-       double _offset;
+       double offset_;
 
-       int _v_offset;
-       bool _updating_scroll;
+       int v_offset_;
+       bool updating_scroll_;
 
-       bool _show_cursors;
-       CursorPair _cursors;
+       bool show_cursors_;
+       CursorPair cursors_;
 
-       QPoint _hover_point;
+       QPoint hover_point_;
 
-       unsigned int _sticky_events;
-       QTimer _lazy_event_handler;
+       unsigned int sticky_events_;
+       QTimer lazy_event_handler_;
 };
 
 } // namespace view