Fixes a lot of warnings by cleaning up namespace issues.

8 files changed, 7 insertions, 619 deletions

diff --git a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
index e8e6288f5..9ad5bdd3c 100644
--- a/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
+++ b/gr-qtgui/src/lib/ConstellationDisplayPlot.cc
@@ -24,6 +24,7 @@ public:
   }
 
 protected:
+  using QwtPlotZoomer::trackerText;
   virtual QwtText trackerText( const QwtDoublePoint& p ) const 
   {
     QwtText t(QString("(%1, %2)").arg(p.x(), 0, 'f', 4).
diff --git a/gr-qtgui/src/lib/FrequencyDisplayPlot.cc b/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
index f2cde322e..d150e2e4c 100644
--- a/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
+++ b/gr-qtgui/src/lib/FrequencyDisplayPlot.cc
@@ -79,7 +79,8 @@ public:
   }
 
 protected:
-  virtual QwtText trackerText( const QwtDoublePoint& p ) const 
+  using QwtPlotZoomer::trackerText;
+  virtual QwtText trackerText( const QwtDoublePoint& p ) const
   {
     QwtText t(QString("%1 %2, %3 dB").
 	      arg(p.x(), 0, 'f', GetFrequencyPrecision()).
diff --git a/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc
index c299f83a4..9c98cec5b 100644
--- a/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc
+++ b/gr-qtgui/src/lib/TimeDomainDisplayPlot.cc
@@ -56,6 +56,7 @@ public:
   }
 
 protected:
+  using QwtPlotZoomer::trackerText;
   virtual QwtText trackerText( const QwtDoublePoint& p ) const 
   {
     QwtText t(QString("%1 %2, %3 V").arg(p.x(), 0, 'f', GetTimePrecision()).
diff --git a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc
deleted file mode 100644
index f676cb4af..000000000
--- a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.cc
+++ /dev/null
@@ -1,410 +0,0 @@
-#ifndef WATERFALL_3D_DISPLAY_PLOT_C
-#define WATERFALL_3D_DISPLAY_PLOT_C
-
-#include <Waterfall3DDisplayPlot.h>
-
-#include <qwt3d_helper.h>
-#include <qapplication.h>
-
-Waterfall3DColorMap::Waterfall3DColorMap(): Qwt3D::Color(), QwtLinearColorMap(){
-  _interval.setInterval(0, 1.0);
-
-}
-
-Waterfall3DColorMap::~Waterfall3DColorMap(){
-
-}
-
-Qwt3D::RGBA
-Waterfall3DColorMap::operator()(double, double, double z) const
-{
-  return Qwt3D::RGBA(Qwt3D::Qt2GL(color(_interval, z)));
-}
-
-void
-Waterfall3DColorMap::SetInterval(const double minValue, const double maxValue)
-{
-  _interval.setInterval(minValue, maxValue);
-}
-
-Qwt3D::ColorVector&
-Waterfall3DColorMap::createVector(Qwt3D::ColorVector& vec)
-{
-  // Generate 100 interval values and then return those
-  Qwt3D::ColorVector colorVec;
-  for(unsigned int number = 0; number < 100; number++){
-    double value = (_interval.width() * (static_cast<double>(number) / 100.0)) + _interval.minValue();
-    colorVec.push_back(operator()(0,0,value));
-  }
-  vec = colorVec;
-  return vec; 
-}
-
-
-const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR;
-const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_WHITE_HOT;
-const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_BLACK_HOT;
-const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_INCANDESCENT;
-const int Waterfall3DDisplayPlot::INTENSITY_COLOR_MAP_TYPE_USER_DEFINED;
-
-Waterfall3DDisplayPlot::Waterfall3DDisplayPlot(QWidget* parent):Qwt3D::SurfacePlot(parent)
-{
-  _startFrequency = 0;
-  _stopFrequency = 4000;
-
-  _createCoordinateSystemFlag = true;
-
-  _initialized = false;
-
-  _numPoints = 1024;
-
-  _displayIntervalTime = (1.0/5.0); // 1/5 of a second between updates
-
-  timespec_reset(&_lastReplot);
-
-  _useCenterFrequencyFlag = false;
-  _centerFrequency = 0.0;
-
-  _timePerFFT = 1.0;
-  timespec_reset(&_dataTimestamp);
-
-  coordinates()->setAutoScale(false);
-
-  _waterfallData = new Waterfall3DData(_startFrequency, _stopFrequency, _numPoints, 200);
-  _waterfallData->assign(this);
-  _waterfallData->create();
-
-  _intensityColorMapType = -1;
-  SetIntensityColorMapType(INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR, Qt::white, Qt::black, true, true);
-
-  legend()->setScale(Qwt3D::LINEARSCALE);
-  legend()->setTitleString("Intensity");
-
-  enableMouse(true);  
-}
-
-Waterfall3DDisplayPlot::~Waterfall3DDisplayPlot()
-{
-  delete _waterfallData;
-}
-
-void
-Waterfall3DDisplayPlot::Init()
-{
-  if(!_initialized && initializedGL()){
-    resize(parentWidget()->width(), parentWidget()->height());
-
-    // Attempting to prevent valgrind uninitialized variable errors in QwtPlot3d::Drawable class
-    glDisable(GL_POLYGON_OFFSET_FILL);
-    
-    setPlotStyle(Qwt3D::FILLED);
-    
-    setCoordinateStyle(Qwt3D::FRAME);
-    setFloorStyle(Qwt3D::FLOORDATA);
-    setOrtho(true);  
-
-    _initialized = true;
-  }
-}
-
-void
-Waterfall3DDisplayPlot::Reset()
-{
-  _waterfallData->ResizeData(_startFrequency, _stopFrequency, _numPoints);
-  _waterfallData->Reset();
-
-  if(initializedGL()){
-    setScale(1, static_cast<int>(((_stopFrequency - _startFrequency) / 200) ), 10);
-  }
-
-  _createCoordinateSystemFlag = true;
-
-  timespec_reset(&_dataTimestamp);
-  _timePerFFT = 1.0;
-}
-
-void
-Waterfall3DDisplayPlot::SetFrequencyRange(const double constStartFreq,
-					  const double constStopFreq,
-					  const double constCenterFreq,
-					  const bool useCenterFrequencyFlag,
-					  const double units,
-					  const std::string &strunits)
-{
-  double startFreq = constStartFreq / units;
-  double stopFreq = constStopFreq / units;
-  double centerFreq = constCenterFreq / units;
-
-  if(stopFreq > startFreq) {
-    _startFrequency = startFreq;
-    _stopFrequency = stopFreq;
-
-    _useCenterFrequencyFlag = useCenterFrequencyFlag;
-    _centerFrequency = centerFreq;
-
-    Reset();
-
-    // Only replot if screen is visible
-    if(isVisible()){
-      replot();
-    }
-  }
-}
-
-bool
-Waterfall3DDisplayPlot::loadFromData(double** data, unsigned int columns, unsigned int rows
-				     ,double minx, double maxx, double miny, double maxy)
-{
-
-  Qwt3D::GridData* gridPtr = (Qwt3D::GridData*)actualData_p;
-  
-  gridPtr->setPeriodic(false,false);
-  gridPtr->setSize(columns,rows);
-  readIn(*gridPtr,data,columns,rows,minx,maxx,miny,maxy);
-  calcNormals(*gridPtr);  
-  
-  updateData();
-  updateNormals();
-  
-  if( _createCoordinateSystemFlag ){
-    createCoordinateSystem();
-    
-    for (unsigned i=0; i!=coordinates()->axes.size(); ++i)
-      {
-	coordinates()->axes[i].setMajors(5);
-	coordinates()->axes[i].setMinors(3);
-      }
-    
-    coordinates()->axes[Qwt3D::Y1].setLabelString("Time");
-    coordinates()->axes[Qwt3D::Y2].setLabelString("Time");
-    coordinates()->axes[Qwt3D::Y3].setLabelString("Time");
-    coordinates()->axes[Qwt3D::Y4].setLabelString("Time");
-    coordinates()->axes[Qwt3D::Z1].setLabelString("Intensity (dB)");
-    coordinates()->axes[Qwt3D::Z2].setLabelString("Intensity (dB)");
-    coordinates()->axes[Qwt3D::Z3].setLabelString("Intensity (dB)");
-    coordinates()->axes[Qwt3D::Z4].setLabelString("Intensity (dB)");
-
-    coordinates()->axes[Qwt3D::X1].setLabelString((!_useCenterFrequencyFlag ? "Frequency (Hz)" : "Frequency (kHz)"));
-    coordinates()->axes[Qwt3D::X2].setLabelString((!_useCenterFrequencyFlag ? "Frequency (Hz)" : "Frequency (kHz)"));
-    coordinates()->axes[Qwt3D::X3].setLabelString((!_useCenterFrequencyFlag ? "Frequency (Hz)" : "Frequency (kHz)"));
-    coordinates()->axes[Qwt3D::X4].setLabelString((!_useCenterFrequencyFlag ? "Frequency (Hz)" : "Frequency (kHz)"));
-
-    // The QwtPlot3D Interface takes ownership of these items, so there is no need to delete them...
-    coordinates()->axes[Qwt3D::X1].setScale(new FrequencyScale(_useCenterFrequencyFlag, _centerFrequency));
-    coordinates()->axes[Qwt3D::X2].setScale(new FrequencyScale(_useCenterFrequencyFlag, _centerFrequency));
-    coordinates()->axes[Qwt3D::X3].setScale(new FrequencyScale(_useCenterFrequencyFlag, _centerFrequency));
-    coordinates()->axes[Qwt3D::X4].setScale(new FrequencyScale(_useCenterFrequencyFlag, _centerFrequency));
-
-    coordinates()->axes[Qwt3D::Y1].setScale(new TimeScale(this));
-    coordinates()->axes[Qwt3D::Y2].setScale(new TimeScale(this));
-    coordinates()->axes[Qwt3D::Y3].setScale(new TimeScale(this));
-    coordinates()->axes[Qwt3D::Y4].setScale(new TimeScale(this));
-
-    coordinates()->axes[Qwt3D::Z1].setScale(new IntensityScale(_waterfallData->GetFloorValue()));
-    coordinates()->axes[Qwt3D::Z2].setScale(new IntensityScale(_waterfallData->GetFloorValue()));
-    coordinates()->axes[Qwt3D::Z3].setScale(new IntensityScale(_waterfallData->GetFloorValue()));
-    coordinates()->axes[Qwt3D::Z4].setScale(new IntensityScale(_waterfallData->GetFloorValue()));
-
-    _createCoordinateSystemFlag = false;
-  }
-  
-  return true;
-}
-
-double
-Waterfall3DDisplayPlot::GetStartFrequency() const
-{
-  return _startFrequency;
-}
-
-double
-Waterfall3DDisplayPlot::GetStopFrequency() const
-{
-  return _stopFrequency;
-}
-
-void
-Waterfall3DDisplayPlot::PlotNewData(const double* dataPoints,
-				    const int64_t numDataPoints,
-				    const double timePerFFT,
-				    const timespec timestamp,
-				    const int droppedFrames)
-{
-  if(numDataPoints > 0){
-    if(numDataPoints != _numPoints){
-      _numPoints = numDataPoints;
-
-      Reset();
-
-      if(isVisible()){
-	replot();
-      }
-
-      _createCoordinateSystemFlag = true;
-
-      _lastReplot = get_highres_clock();
-    }
-
-    _dataTimestamp = timestamp;
-    _timePerFFT = timePerFFT;
-
-    _waterfallData->addFFTData(dataPoints, numDataPoints, droppedFrames);
-    _waterfallData->IncrementNumLinesToUpdate();
-  }
-
-  // Allow at least a 50% duty cycle
-  if(diff_timespec(get_highres_clock(), _lastReplot) > _displayIntervalTime){
-    // Only update when window is visible
-    if(isVisible()){
-      replot();
-    }
-
-    _lastReplot = get_highres_clock();
-  }
-}
-
-void
-Waterfall3DDisplayPlot::SetIntensityRange(const double minIntensity,
-					  const double maxIntensity)
-{
-  _waterfallData->SetFloorValue(minIntensity);
-  _waterfallData->setMinZ(0);
-  _waterfallData->setMaxZ(maxIntensity-minIntensity);
-
-  _createCoordinateSystemFlag = true;
-
-  emit UpdatedLowerIntensityLevel(minIntensity);
-  emit UpdatedUpperIntensityLevel(maxIntensity);
-
-  SetIntensityColorMapType(_intensityColorMapType,
-			   _userDefinedLowIntensityColor,
-			   _userDefinedLowIntensityColor, true);
-}
-
-void
-Waterfall3DDisplayPlot::replot()
-{
-  if(!_initialized){
-    Init();
-  }
-  if(initializedGL()){
-    const timespec startTime = get_highres_clock();
-    
-    _waterfallData->create();
-    
-    legend()->setMajors(4);
-    legend()->setMinors(5);
-    double start, stop;
-    coordinates()->axes[Qwt3D::Z1].limits(start,stop);
-    legend()->setLimits( _waterfallData->GetFloorValue(), _waterfallData->GetFloorValue() + stop - start );
-
-    coordinates()->axes[Qwt3D::X1].limits(start,stop);
-
-    showColorLegend(true);
-
-    updateGL();
-
-    double differenceTime = (diff_timespec(get_highres_clock(), startTime));
-  
-    // Require at least a 20% duty cycle
-    differenceTime *= 4.0;
-    if(differenceTime > (1.0/5.0)){
-      _displayIntervalTime = differenceTime;
-    }
-  }
-}
-
-void
-Waterfall3DDisplayPlot::resizeSlot( QSize *s )
-{
-  resize(s->width(), s->height());
-}
-
-int
-Waterfall3DDisplayPlot::GetIntensityColorMapType() const
-{
-  return _intensityColorMapType;
-}
-
-void
-Waterfall3DDisplayPlot::SetIntensityColorMapType(const int newType,
-						 const QColor lowColor,
-						 const QColor highColor,
-						 const bool forceFlag,
-						 const bool noReplotFlag)
-{
-  if(((_intensityColorMapType != newType) || forceFlag) || 
-     ((newType == INTENSITY_COLOR_MAP_TYPE_USER_DEFINED) &&
-      (lowColor.isValid() && highColor.isValid()))){
-
-    Waterfall3DColorMap* colorMap = new Waterfall3DColorMap();
-    colorMap->SetInterval(_waterfallData->minZ(), _waterfallData->maxZ());
-
-    switch(newType){
-    case INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR:{
-      _intensityColorMapType = newType;
-      colorMap->setColorInterval(Qt::darkCyan, Qt::white);
-      colorMap->addColorStop(0.25, Qt::cyan);
-      colorMap->addColorStop(0.5, Qt::yellow);
-      colorMap->addColorStop(0.75, Qt::red);
-      setBackgroundColor(Qwt3D::Qt2GL(Qt::gray));
-      break;
-    }
-    case INTENSITY_COLOR_MAP_TYPE_WHITE_HOT:{
-      _intensityColorMapType = newType;
-      colorMap->setColorInterval(Qt::black, Qt::white);
-      setBackgroundColor(Qwt3D::Qt2GL(Qt::blue));
-      break;
-    }
-    case INTENSITY_COLOR_MAP_TYPE_BLACK_HOT:{
-      _intensityColorMapType = newType;
-      colorMap->setColorInterval(Qt::white, Qt::black);
-      setBackgroundColor(Qwt3D::Qt2GL(Qt::blue));
-      break;
-    }
-    case INTENSITY_COLOR_MAP_TYPE_INCANDESCENT:{
-      _intensityColorMapType = newType;
-      colorMap->setColorInterval(Qt::black, Qt::white);
-      colorMap->addColorStop(0.5, Qt::darkRed);
-      setBackgroundColor(Qwt3D::Qt2GL(Qt::gray));
-      break;
-    }
-    case INTENSITY_COLOR_MAP_TYPE_USER_DEFINED:{
-      _userDefinedLowIntensityColor = lowColor;
-      _userDefinedHighIntensityColor = highColor;
-      _intensityColorMapType = newType;
-      colorMap->setColorInterval(_userDefinedLowIntensityColor, _userDefinedHighIntensityColor);
-      setBackgroundColor(Qwt3D::Qt2GL(Qt::white));
-      break;
-    }
-    default:
-      colorMap->setColorInterval(Qt::black, Qt::white);
-      break;
-    }
-
-    // Qwt3D takes over destruction of this object...
-    setDataColor(colorMap);
-
-    if(!noReplotFlag){
-      // Draw again
-      replot();
-      
-      // Update the last replot timer
-      _lastReplot = get_highres_clock();
-    }
-  }
-}
-
-const QColor
-Waterfall3DDisplayPlot::GetUserDefinedLowIntensityColor() const
-{
-  return _userDefinedLowIntensityColor;
-}
-
-const QColor
-Waterfall3DDisplayPlot::GetUserDefinedHighIntensityColor() const
-{
-  return _userDefinedHighIntensityColor;
-}
-
-#endif /* WATERFALL_3D_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h b/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h
deleted file mode 100644
index 272bdf697..000000000
--- a/gr-qtgui/src/lib/Waterfall3DDisplayPlot.h
+++ /dev/null
@@ -1,206 +0,0 @@
-#ifndef WATERFALL_3D_DISPLAY_PLOT_HPP
-#define WATERFALL_3D_DISPLAY_PLOT_HPP
-
-#include <cstdio>
-#include <highResTimeFunctions.h>
-
-#include <waterfallGlobalData.h>
-#include <qwt3d_surfaceplot.h>
-
-#include <qwt3d_color.h>
-#include <qwt_color_map.h>
-
-class Waterfall3DColorMap: public Qwt3D::Color, public QwtLinearColorMap
-{
-public:
-  Waterfall3DColorMap();
-  virtual ~Waterfall3DColorMap();
-
-  virtual Qwt3D::RGBA operator()(double x, double y, double z)const;
-  virtual Qwt3D::ColorVector& createVector(Qwt3D::ColorVector& vec);
-
-  virtual void SetInterval(const double minValue, const double maxValue);
-
-protected:
-  
-private:
-  QwtDoubleInterval _interval;
-};
-
-class Waterfall3DDisplayPlot:public Qwt3D::SurfacePlot{
-  Q_OBJECT
-
-  protected:
-  class IntensityScale:public Qwt3D::LinearScale{
-
-  friend class Qwt3D::Axis;
-  friend class Qwt3D::qwt3d_ptr<Qwt3D::Scale>;
-
-  private:
-    double _floor;
-
-  public:
-    explicit IntensityScale(const double newFloor):_floor(newFloor){ }
-    virtual ~IntensityScale(){}
-
-    virtual QString ticLabel(unsigned int idx) const{
-      if (idx<majors_p.size())
-	{
-	  return QString("%1").arg( majors_p[idx] + GetFloorValue(), 0, 'f', 0 );
-	}
-      return QString("");
-    }
-
-    virtual double GetFloorValue()const{ return _floor; }
-    virtual void SetFloorValue(const double newFloor){ _floor = newFloor; }
-
-    //! Returns a new heap based object utilized from qwt3d_ptr
-    Scale* clone() const {return new IntensityScale(*this);} 
-  };
-  
-  class TimeScale:public Qwt3D::LinearScale{
-
-    friend class Qwt3D::Axis;
-    friend class Qwt3D::qwt3d_ptr<Qwt3D::Scale>;
-    friend class Waterfall3DDisplayPlot;
-
-  private:
-    Waterfall3DDisplayPlot* _plot;
-
-  public:
-    TimeScale(Waterfall3DDisplayPlot* plot ):_plot(plot){
-    }
-    virtual ~TimeScale(){
-    }
-
-    virtual QString ticLabel(unsigned int idx) const{
-      if (idx<majors_p.size())
-	{
-	  const timespec markerTime = timespec_add(_plot->_dataTimestamp,
-						   -(_plot->_timePerFFT) * majors_p[idx]);
-	  struct tm timeTm;
-	  gmtime_r(&markerTime.tv_sec, &timeTm);
-	  
-	  char* timeBuffer = new char[128];
-	  snprintf(timeBuffer, 128, "%02d:%02d:%02d.%03ld", timeTm.tm_hour,
-		   timeTm.tm_min, timeTm.tm_sec, (markerTime.tv_nsec / 1000000));
-	  QString returnBuffer(timeBuffer);
-	  delete[] timeBuffer;
-	  return returnBuffer;
-	}
-      return QString("");
-    }
-
-    //! Returns a new heap based object utilized from qwt3d_ptr
-    Scale* clone() const {return new TimeScale(*this);}
-  };
-
-  class FrequencyScale: public Qwt3D::LinearScale{
-
-    friend class Qwt3D::Axis;
-    friend class Qwt3D::qwt3d_ptr<Qwt3D::Scale>;
-  private:
-    double _centerFrequency;
-    bool _useCenterFrequencyFlag;
-  public:
-    FrequencyScale(bool useCenterFrequencyFlag, double centerFrequency)
-      : _centerFrequency(centerFrequency),_useCenterFrequencyFlag(useCenterFrequencyFlag)
-      {}
-
-    virtual ~FrequencyScale(){}
-
-    virtual QString ticLabel(unsigned int idx) const
-    {
-      if (idx<majors_p.size())
-	{
-	  if(!_useCenterFrequencyFlag){
-	    return QString("%1").arg(  majors_p[idx], 0, 'f', 0 );
-
-	  }
-	  else{
-	    return QString("%1").arg(  (majors_p[idx] + _centerFrequency)/1000.0, 0, 'f', 3 );
-	  }
-	}
-      return QString("");
-    }
-
-    //! Returns a new heap based object utilized from qwt3d_ptr
-    Scale* clone() const {return new FrequencyScale(*this);}
-  };
-
-public:
-  Waterfall3DDisplayPlot(QWidget*);
-  virtual ~Waterfall3DDisplayPlot();
-						
-  void Init();
-  void Reset();
-
-  bool loadFromData(double** data, unsigned int columns, unsigned int rows
-		    ,double minx, double maxx, double miny, double maxy);
-
-  void SetFrequencyRange(const double, const double,
-			 const double, const bool,
-			 const double units, const std::string &strunits);
-  double GetStartFrequency()const;
-  double GetStopFrequency()const;
-
-  void PlotNewData(const double* dataPoints, const int64_t numDataPoints,
-		   const double timePerFFT, const timespec timestamp,
-		   const int droppedFrames);
-
-  void SetIntensityRange(const double minIntensity, const double maxIntensity);
-
-  virtual void replot(void);
-
-  int GetIntensityColorMapType()const;
-  void SetIntensityColorMapType( const int, const QColor,
-				 const QColor, const bool forceFlag = false,
-				 const bool noReplotFlag = false );
-  const QColor GetUserDefinedLowIntensityColor()const;
-  const QColor GetUserDefinedHighIntensityColor()const;
-
-  static const int INTENSITY_COLOR_MAP_TYPE_MULTI_COLOR = 0;
-  static const int INTENSITY_COLOR_MAP_TYPE_WHITE_HOT = 1;
-  static const int INTENSITY_COLOR_MAP_TYPE_BLACK_HOT = 2;
-  static const int INTENSITY_COLOR_MAP_TYPE_INCANDESCENT = 3;
-  static const int INTENSITY_COLOR_MAP_TYPE_USER_DEFINED = 4;
-
-public slots:
-  void resizeSlot( QSize *s );
-
-
-signals:
-  void UpdatedLowerIntensityLevel(const double);
-  void UpdatedUpperIntensityLevel(const double);
-
-protected:
-
-  double _startFrequency;
-  double _stopFrequency;
-
-  Waterfall3DData* _waterfallData;
-
-  timespec _lastReplot;
-
-  int64_t _numPoints;
-
-  double _displayIntervalTime;
-
-  int _intensityColorMapType;
-  QColor _userDefinedLowIntensityColor;
-  QColor _userDefinedHighIntensityColor;
-
-  bool _useCenterFrequencyFlag;
-  double _centerFrequency;
-
-  timespec _dataTimestamp;
-  double _timePerFFT;
-  bool _initialized;
-
-  bool _createCoordinateSystemFlag;
-
-private:
-
-};
-
-#endif /* WATERFALL_3D_DISPLAY_PLOT_HPP */
diff --git a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
index e0804fa64..680c44756 100644
--- a/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/src/lib/WaterfallDisplayPlot.cc
@@ -186,6 +186,7 @@ public:
   }
 
 protected:
+  using QwtPlotZoomer::trackerText;
   virtual QwtText trackerText( const QwtDoublePoint& p ) const 
   {
     QString yLabel("");
diff --git a/gr-qtgui/src/lib/qtgui_sink_c.h b/gr-qtgui/src/lib/qtgui_sink_c.h
index 2f3cc566e..9aee66503 100644
--- a/gr-qtgui/src/lib/qtgui_sink_c.h
+++ b/gr-qtgui/src/lib/qtgui_sink_c.h
@@ -23,12 +23,12 @@
 #ifndef INCLUDED_QTGUI_SINK_C_H
 #define INCLUDED_QTGUI_SINK_C_H
 
+#include <Python.h>
 #include <gr_block.h>
 #include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
 #include <qtgui.h>
-#include <Python.h>
 #include "SpectrumGUIClass.h"
 
 class qtgui_sink_c;
diff --git a/gr-qtgui/src/lib/qtgui_sink_f.h b/gr-qtgui/src/lib/qtgui_sink_f.h
index 5b96136f0..0cac35d90 100644
--- a/gr-qtgui/src/lib/qtgui_sink_f.h
+++ b/gr-qtgui/src/lib/qtgui_sink_f.h
@@ -23,12 +23,12 @@
 #ifndef INCLUDED_QTGUI_SINK_F_H
 #define INCLUDED_QTGUI_SINK_F_H
 
+#include <Python.h>
 #include <gr_block.h>
 #include <gr_firdes.h>
 #include <gri_fft.h>
 #include <qapplication.h>
 #include <qtgui.h>
-#include <Python.h>
 #include "SpectrumGUIClass.h"
 
 class qtgui_sink_f;