projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use Qt-defined keywords, they can cause problems with other headers.
[pulseview.git]
/
pv
/
view
/
view.h
diff --git
a/pv/view/view.h
b/pv/view/view.h
index 83a6fe2d2a4d318288f084920e07f5c3c963e25a..021767dba6a197ea551effd1f6068da2c3c0e20c 100644
(file)
--- a/
pv/view/view.h
+++ b/
pv/view/view.h
@@
-40,6
+40,7
@@
class SigSession;
namespace view {
namespace view {
+class CursorHeader;
class Header;
class Ruler;
class Trace;
class Header;
class Ruler;
class Trace;
@@
-135,7
+136,7
@@
public:
void update_viewport();
void update_viewport();
-
signals
:
+
Q_SIGNALS
:
void hover_point_changed();
void signals_moved();
void hover_point_changed();
void signals_moved();
@@
-170,7
+171,7
@@
private:
void resizeEvent(QResizeEvent *e);
void resizeEvent(QResizeEvent *e);
-private
slots
:
+private
Q_SLOTS
:
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
void h_scroll_value_changed(int value);
void v_scroll_value_changed(int value);
@@
-189,6
+190,7
@@
private:
Viewport *_viewport;
Ruler *_ruler;
Viewport *_viewport;
Ruler *_ruler;
+ CursorHeader *_cursorheader;
Header *_header;
/// The view time scale in seconds per pixel.
Header *_header;
/// The view time scale in seconds per pixel.