projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for clang build on OS X
[pulseview.git]
/
pv
/
view
/
header.h
diff --git
a/pv/view/header.h
b/pv/view/header.h
index 22e8e4dbd2c3dbba58908d6a7a7a1208339bdfb0..806cc985c3d482877539cc07d6f90ee77c22cea5 100644
(file)
--- a/
pv/view/header.h
+++ b/
pv/view/header.h
@@
-32,7
+32,7
@@
namespace pv {
namespace view {
namespace pv {
namespace view {
-class
Signal
;
+class
Trace
;
class View;
class Header : public MarginWidget
class View;
class Header : public MarginWidget
@@
-43,7
+43,7
@@
public:
Header(View &parent);
private:
Header(View &parent);
private:
- boost::shared_ptr<pv::view::
Signal> get_mouse_over_signal
(
+ boost::shared_ptr<pv::view::
Trace> get_mouse_over_trace
(
const QPoint &pt);
void clear_selection();
const QPoint &pt);
void clear_selection();
@@
-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<Signal>, int> >
- _drag_sigs;
-
- boost::shared_ptr<Signal> _context_signal;
- QAction *_action_set_name;
- QAction *_action_set_colour;
+ std::list<std::pair<boost::weak_ptr<Trace>, int> >
+ _drag_traces;
};
} // namespace view
};
} // namespace view