diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2011-10-25 11:57:02 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2011-10-25 11:57:02 -0400 |
| commit | 3710dd6d3fb30966dfc0f32876a52703a9a85a60 (patch) | |
| tree | 71f58500da6642f91aa30dd109666cd7f8d1ba6c /gr-qtgui/lib/TimeDomainDisplayPlot.cc | |
| parent | f4e0201b20a2dfd1c79775a225331363af9b3420 (diff) | |
qtgui: Fixing slot names that can't be #if'd out for compatibility between Qwt 5.2 and 6.0.
Diffstat (limited to 'gr-qtgui/lib/TimeDomainDisplayPlot.cc')
| -rw-r--r-- | gr-qtgui/lib/TimeDomainDisplayPlot.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc index eca6076b62..192ec82eea 100644 --- a/gr-qtgui/lib/TimeDomainDisplayPlot.cc +++ b/gr-qtgui/lib/TimeDomainDisplayPlot.cc @@ -176,7 +176,7 @@ TimeDomainDisplayPlot::TimeDomainDisplayPlot(int nplots, QWidget* parent) this, SLOT(OnPickerPointSelected(const QwtDoublePoint &))); #else connect(_picker, SIGNAL(selected(const QPointF &)), - this, SLOT(OnPickerPointSelected(const QPointF &))); + this, SLOT(OnPickerPointSelected6(const QPointF &))); #endif // Configure magnify on mouse wheel @@ -326,7 +326,6 @@ TimeDomainDisplayPlot::SetSampleRate(double sr, double units, } -#if QWT_VERSION < 0x060000 void TimeDomainDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p) { @@ -334,14 +333,13 @@ TimeDomainDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p) //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y()); emit plotPointSelected(point); } -#else + void -TimeDomainDisplayPlot::OnPickerPointSelected(const QPointF & p) +TimeDomainDisplayPlot::OnPickerPointSelected6(const QPointF & p) { QPointF point = p; //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y()); emit plotPointSelected(point); } -#endif #endif /* TIME_DOMAIN_DISPLAY_PLOT_C */ |