projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix inconsistent declaration parameter names.
[pulseview.git]
/
pv
/
view
/
viewport.hpp
diff --git
a/pv/view/viewport.hpp
b/pv/view/viewport.hpp
index c2c42d155d79bf9ecbe28ed54b2741f37271b554..cde9f3f57673dc9df71aded63ccfe8617c98245e 100644
(file)
--- a/
pv/view/viewport.hpp
+++ b/
pv/view/viewport.hpp
@@
-87,16
+87,17
@@
private:
* Handles touch begin update and end events.
* @param e the event that triggered this handler.
*/
* Handles touch begin update and end events.
* @param e the event that triggered this handler.
*/
- bool touch_event(QTouchEvent *e);
+ bool touch_event(QTouchEvent *e
vent
);
private:
void paintEvent(QPaintEvent *event);
void mouseDoubleClickEvent(QMouseEvent * event);
private:
void paintEvent(QPaintEvent *event);
void mouseDoubleClickEvent(QMouseEvent * event);
- void wheelEvent(QWheelEvent *e
vent
);
+ void wheelEvent(QWheelEvent *e);
private:
boost::optional<pv::util::Timestamp> drag_offset_;
private:
boost::optional<pv::util::Timestamp> drag_offset_;
+ int drag_v_offset_;
double pinch_offset0_;
double pinch_offset1_;
double pinch_offset0_;
double pinch_offset1_;