diff options
| author | Tom Rondeau | 2011-10-15 18:23:04 -0400 |
|---|---|---|
| committer | Tom Rondeau | 2011-10-15 18:23:04 -0400 |
| commit | 25fd6e0324dc8296b66a3c9b8e628d6738f15fe7 (patch) | |
| tree | 181953f37acdd502d10cf85fb6566b72bd0a0b8c /gr-qtgui/lib/qtgui_util.h | |
| parent | 32ef4974395913878f252434c21a63a259bb9b97 (diff) | |
| download | gnuradio-25fd6e0324dc8296b66a3c9b8e628d6738f15fe7.tar.gz gnuradio-25fd6e0324dc8296b66a3c9b8e628d6738f15fe7.tar.bz2 gnuradio-25fd6e0324dc8296b66a3c9b8e628d6738f15fe7.zip | |
qtgui: wip: updating qtgui to work with QWT 6 (and trying to maintain backwards compatability to 5.2). This wip works for just the fft plots.
Diffstat (limited to 'gr-qtgui/lib/qtgui_util.h')
| -rw-r--r-- | gr-qtgui/lib/qtgui_util.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/gr-qtgui/lib/qtgui_util.h b/gr-qtgui/lib/qtgui_util.h index 5b129c7b5..7b3692e75 100644 --- a/gr-qtgui/lib/qtgui_util.h +++ b/gr-qtgui/lib/qtgui_util.h @@ -44,7 +44,14 @@ public: QwtPickerDblClickPointMachine(); ~QwtPickerDblClickPointMachine(); - virtual CommandList transition( const QwtEventPattern &eventPattern, const QEvent *e); +#if QWT_VERSION < 0x060000 + virtual CommandList transition( const QwtEventPattern &eventPattern, + const QEvent *e); +#else + virtual QList<QwtPickerMachine::Command> + transition( const QwtEventPattern &eventPattern, + const QEvent *e); +#endif }; #endif /* INCLUDED_QTGUI_UTIL_H */ |