projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed OpenGL from pv::view::Viewport
[pulseview.git]
/
pv
/
view
/
viewport.h
diff --git
a/pv/view/viewport.h
b/pv/view/viewport.h
index b79526ac2c8d783685aa100b6df8d424dde821fd..e32ab09cfd10749bc90f2b4d5e7eaf2474bfbb3e 100644
(file)
--- a/
pv/view/viewport.h
+++ b/
pv/view/viewport.h
@@
-21,8
+21,8
@@
#ifndef PV_VIEW_VIEWPORT_H
#define PV_VIEW_VIEWPORT_H
#ifndef PV_VIEW_VIEWPORT_H
#define PV_VIEW_VIEWPORT_H
-#include <QtOpenGL/QGLWidget>
#include <QTimer>
#include <QTimer>
+#include <QWidget>
class QPainter;
class QPaintEvent;
class QPainter;
class QPaintEvent;
@@
-33,7
+33,7
@@
namespace view {
class View;
class View;
-class Viewport : public Q
GL
Widget
+class Viewport : public QWidget
{
Q_OBJECT
{
Q_OBJECT
@@
-43,10
+43,6
@@
public:
int get_total_height() const;
protected:
int get_total_height() const;
protected:
- void initializeGL();
-
- void resizeGL(int width, int height);
-
void paintEvent(QPaintEvent *event);
private:
void paintEvent(QPaintEvent *event);
private:
@@
-55,9
+51,6
@@
private:
void mouseReleaseEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event);
void mouseReleaseEvent(QMouseEvent *event);
void wheelEvent(QWheelEvent *event);
-private:
- void setup_viewport(int width, int height);
-
private:
View &_view;
private:
View &_view;