Merge branch 'master' into next

Conflicts:
	gr-qtgui/lib/Makefile.am

1 files changed, 24 insertions, 8 deletions

diff --git a/gr-qtgui/lib/plot_waterfall.h b/gr-qtgui/lib/plot_waterfall.h
index a11461611..d4cb8d6da 100644
--- a/gr-qtgui/lib/plot_waterfall.h
+++ b/gr-qtgui/lib/plot_waterfall.h
@@ -3,9 +3,12 @@
 
 #include <qglobal.h>
 #include <waterfallGlobalData.h>
+#include <qwt_plot_rasteritem.h>
 
-#include "qwt_valuelist.h" 
-#include "qwt_plot_rasteritem.h" 
+#if QWT_VERSION >= 0x060000
+#include <qwt_point_3d.h>  // doesn't seem necessary, but is...
+#include <qwt_compat.h>
+#endif
 
 class QwtColorMap;
 
@@ -22,27 +25,40 @@ class QwtColorMap;
 class PlotWaterfall: public QwtPlotRasterItem
 {
 public:
-    explicit PlotWaterfall(WaterfallData* data, const QString &title = QString::null);
+    explicit PlotWaterfall(WaterfallData* data,
+			   const QString &title = QString::null);
     virtual ~PlotWaterfall();
 
     const WaterfallData* data()const;
 
     void setColorMap(const QwtColorMap &);
+
     const QwtColorMap &colorMap() const;
 
+#if QWT_VERSION < 0x060000
     virtual QwtDoubleRect boundingRect() const;
+#endif
+
     virtual QSize rasterHint(const QwtDoubleRect &) const;
 
     virtual int rtti() const;
 
     virtual void draw(QPainter *p,
-        const QwtScaleMap &xMap, const QwtScaleMap &yMap,
-        const QRect &rect) const;
+		      const QwtScaleMap &xMap,
+		      const QwtScaleMap &yMap,
+		      const QRect &rect) const;
 
 protected:
-    virtual QImage renderImage(
-        const QwtScaleMap &xMap, const QwtScaleMap &yMap, 
-        const QwtDoubleRect &rect) const;
+#if QWT_VERSION < 0x060000
+    QImage renderImage(const QwtScaleMap &xMap,
+		       const QwtScaleMap &yMap, 
+		       const QwtDoubleRect &rect) const;
+#else
+    QImage renderImage(const QwtScaleMap &xMap,
+		       const QwtScaleMap &yMap, 
+		       const QRectF &rect,
+		       const QSize &size=QSize(0,0)) const;
+#endif
 
 private:
     class PrivateData;