Make member variable underscores a suffix instead of a prefix

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

diff --git a/pv/view/viewport.h b/pv/view/viewport.h
index 7d32c4334ff57c24f03474f9b3fe6455039d0eec..1171a70730c8ed9490e5de549c19b46b250de8a0 100644 (file)
--- a/pv/view/viewport.h
+++ b/pv/view/viewport.h
@@ -23,6 +23,7 @@
 
 #include <QTimer>
 #include <QWidget>
+#include <QTouchEvent>
 
 class QPainter;
 class QPaintEvent;
@@ -40,30 +41,31 @@ class Viewport : public QWidget
 public:
        explicit Viewport(View &parent);
 
-       int get_total_height() const;
-
 protected:
        void paintEvent(QPaintEvent *event);
 
 private:
+       bool event(QEvent *event);
        void mousePressEvent(QMouseEvent *event);
-       void mouseMoveEvent(QMouseEvent *event);
        void mouseReleaseEvent(QMouseEvent *event);
+       void mouseMoveEvent(QMouseEvent *event);
+       void mouseDoubleClickEvent(QMouseEvent * event);
        void wheelEvent(QWheelEvent *event);
+       bool touchEvent(QTouchEvent *e);
 
-private:
-       void draw_cursors_background(QPainter &p);
-
-       void draw_cursors_foreground(QPainter &p);
-
-private slots:
+private Q_SLOTS:
        void on_signals_moved();
 
 private:
-       View &_view;
+       View &view_;
+
+       QPoint mouse_down_point_;
+       double mouse_down_offset_;
+       bool mouse_down_valid_;
 
-       QPoint _mouse_down_point;
-       double _mouse_down_offset;
+       double pinch_offset0_;
+       double pinch_offset1_;
+       bool pinch_zoom_active_;
 };
 
 } // namespace view