projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix incorrect #include for glib.
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 7a180359539f7f6f9d03590b4042648804d0c72c..806cc985c3d482877539cc07d6f90ee77c22cea5 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-62,13
+62,11
@@
private:
void contextMenuEvent(QContextMenuEvent *event);
void contextMenuEvent(QContextMenuEvent *event);
+ void keyPressEvent(QKeyEvent *e);
+
private slots:
void on_signals_changed();
private slots:
void on_signals_changed();
- void on_action_set_name_triggered();
-
- void on_action_set_colour_triggered();
-
void on_signals_moved();
signals:
void on_signals_moved();
signals:
@@
-77,13
+75,10
@@
signals:
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
private:
QPoint _mouse_point;
QPoint _mouse_down_point;
+ bool _dragging;
std::list<std::pair<boost::weak_ptr<Trace>, int> >
_drag_traces;
std::list<std::pair<boost::weak_ptr<Trace>, int> >
_drag_traces;
-
- boost::shared_ptr<Trace> _context_trace;
- QAction *_action_set_name;
- QAction *_action_set_colour;
};
} // namespace view
};
} // namespace view