projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ViewWidget as a common ancestor of all view widgets
[pulseview.git]
/
pv
/
view
/
viewport.hpp
diff --git
a/pv/view/viewport.hpp
b/pv/view/viewport.hpp
index 07bfcad9c5263a49b2fa5d22e9992dbf0541add5..94ebe8ee4f0a4655ad3af4084bb5b2211854e0e8 100644
(file)
--- a/
pv/view/viewport.hpp
+++ b/
pv/view/viewport.hpp
@@
-22,9
+22,10
@@
#define PULSEVIEW_PV_VIEW_VIEWPORT_H
#include <QTimer>
#define PULSEVIEW_PV_VIEW_VIEWPORT_H
#include <QTimer>
-#include <QWidget>
#include <QTouchEvent>
#include <QTouchEvent>
+#include "viewwidget.hpp"
+
class QPainter;
class QPaintEvent;
class Session;
class QPainter;
class QPaintEvent;
class Session;
@@
-34,7
+35,7
@@
namespace view {
class View;
class View;
-class Viewport : public
Q
Widget
+class Viewport : public
View
Widget
{
Q_OBJECT
{
Q_OBJECT
@@
-57,8
+58,6
@@
private Q_SLOTS:
void on_signals_moved();
private:
void on_signals_moved();
private:
- View &view_;
-
QPoint mouse_down_point_;
double mouse_down_offset_;
bool mouse_down_valid_;
QPoint mouse_down_point_;
double mouse_down_offset_;
bool mouse_down_valid_;