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
/
trace.h
diff --git
a/pv/view/trace.h
b/pv/view/trace.h
index b82aaa6f792871c451be5a706478e499486e82bb..71ad4953d84dc8f37f6f3c2418ef7a554ee0eda4 100644
(file)
--- a/
pv/view/trace.h
+++ b/
pv/view/trace.h
@@
-175,14
+175,14
@@
protected:
void close_popup();
void close_popup();
-private
slots
:
+private
Q_SLOTS
:
void on_text_changed(const QString &text);
void on_colour_changed(const QColor &colour);
void on_popup_closed();
void on_text_changed(const QString &text);
void on_colour_changed(const QColor &colour);
void on_popup_closed();
-
signals
:
+
Q_SIGNALS
:
void visibility_changed();
void text_changed();
void colour_changed();
void visibility_changed();
void text_changed();
void colour_changed();