projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix two errors with clang 3.6.
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 9f60c1a82ad123897d93b4a6b3360045ffa074ea..b141c38ae35ab29b2b44233bff6e8d13be16de3d 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-28,6
+28,7
@@
#include <QMouseEvent>
#include <QMouseEvent>
+using std::abs;
using std::max;
using std::min;
using std::shared_ptr;
using std::max;
using std::min;
using std::shared_ptr;
@@
-38,7
+39,7
@@
namespace view {
Viewport::Viewport(View &parent) :
QWidget(&parent),
Viewport::Viewport(View &parent) :
QWidget(&parent),
-
_view(parent),
+ _view(parent),
_mouse_down_valid(false),
_pinch_zoom_active(false)
{
_mouse_down_valid(false),
_pinch_zoom_active(false)
{
@@
-102,7
+103,7
@@
void Viewport::paintEvent(QPaintEvent*)
bool Viewport::event(QEvent *event)
{
bool Viewport::event(QEvent *event)
{
- switch(event->type()) {
+ switch
(event->type()) {
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
case QEvent::TouchBegin:
case QEvent::TouchUpdate:
case QEvent::TouchEnd:
@@
-121,8
+122,7
@@
void Viewport::mousePressEvent(QMouseEvent *event)
{
assert(event);
{
assert(event);
- if (event->button() == Qt::LeftButton)
- {
+ if (event->button() == Qt::LeftButton) {
_mouse_down_point = event->pos();
_mouse_down_offset = _view.offset();
_mouse_down_valid = true;
_mouse_down_point = event->pos();
_mouse_down_offset = _view.offset();
_mouse_down_valid = true;
@@
-134,18
+134,15
@@
void Viewport::mouseReleaseEvent(QMouseEvent *event)
assert(event);
if (event->button() == Qt::LeftButton)
assert(event);
if (event->button() == Qt::LeftButton)
- {
_mouse_down_valid = false;
_mouse_down_valid = false;
- }
}
void Viewport::mouseMoveEvent(QMouseEvent *event)
{
assert(event);
}
void Viewport::mouseMoveEvent(QMouseEvent *event)
{
assert(event);
- if (event->buttons() & Qt::LeftButton)
- {
- if (! _mouse_down_valid) {
+ if (event->buttons() & Qt::LeftButton) {
+ if (!_mouse_down_valid) {
_mouse_down_point = event->pos();
_mouse_down_offset = _view.offset();
_mouse_down_valid = true;
_mouse_down_point = event->pos();
_mouse_down_offset = _view.offset();
_mouse_down_valid = true;