qtgui: Fixing slot names that can't be #if'd out for compatibility between Qwt 5.2 and 6.0.

8 files changed, 29 insertions, 36 deletions

diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.cc b/gr-qtgui/lib/ConstellationDisplayPlot.cc
index ca7eede36..fb549b697 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.cc
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.cc
@@ -141,7 +141,7 @@ ConstellationDisplayPlot::ConstellationDisplayPlot(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
 
   connect(this, SIGNAL(legendChecked(QwtPlotItem *, bool ) ), 
@@ -236,7 +236,6 @@ ConstellationDisplayPlot::LegendEntryChecked(QwtPlotItem* plotItem, bool on)
   plotItem->setVisible(!on);
 }
 
-#if QWT_VERSION < 0x060000
 void
 ConstellationDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
 {
@@ -244,14 +243,13 @@ ConstellationDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   emit plotPointSelected(point);
 }
-#else
+
 void
-ConstellationDisplayPlot::OnPickerPointSelected(const QPointF & p)
+ConstellationDisplayPlot::OnPickerPointSelected6(const QPointF & p)
 {
   QPointF point = p;
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   emit plotPointSelected(point);
 }
-#endif
 
 #endif /* CONSTELLATION_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/ConstellationDisplayPlot.h b/gr-qtgui/lib/ConstellationDisplayPlot.h
index d252a8c87..80ac3a63a 100644
--- a/gr-qtgui/lib/ConstellationDisplayPlot.h
+++ b/gr-qtgui/lib/ConstellationDisplayPlot.h
@@ -67,11 +67,11 @@ public:
 public slots:
   void resizeSlot( QSize *s );
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
 
 signals:
   void plotPointSelected(const QPointF p);
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.cc b/gr-qtgui/lib/FrequencyDisplayPlot.cc
index 2e62f2b96..b48cd7233 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.cc
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.cc
@@ -256,7 +256,7 @@ FrequencyDisplayPlot::FrequencyDisplayPlot(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
@@ -538,7 +538,7 @@ FrequencyDisplayPlot::ShowCFMarker (const bool show)
     _markerCF->hide();
 }
 
-#if QWT_VERSION < 0x060000
+
 void
 FrequencyDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
 {
@@ -547,15 +547,14 @@ FrequencyDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#else
+
 void
-FrequencyDisplayPlot::OnPickerPointSelected(const QPointF & p)
+FrequencyDisplayPlot::OnPickerPointSelected6(const QPointF & p)
 {
   QPointF point = p;
   //fprintf(stderr,"OnPickerPointSelected %f %f %d\n", point.x(), point.y(), _xAxisMultiplier);
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#endif
 
 #endif /* FREQUENCY_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/FrequencyDisplayPlot.h b/gr-qtgui/lib/FrequencyDisplayPlot.h
index 961f30168..e79000789 100644
--- a/gr-qtgui/lib/FrequencyDisplayPlot.h
+++ b/gr-qtgui/lib/FrequencyDisplayPlot.h
@@ -80,11 +80,11 @@ public slots:
   void SetLowerIntensityLevel(const double);
   void SetUpperIntensityLevel(const double);
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
 
 signals:
   void plotPointSelected(const QPointF p);
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.cc b/gr-qtgui/lib/TimeDomainDisplayPlot.cc
index eca6076b6..192ec82ee 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 */
diff --git a/gr-qtgui/lib/TimeDomainDisplayPlot.h b/gr-qtgui/lib/TimeDomainDisplayPlot.h
index 6c7fc4330..1f3f2c574 100644
--- a/gr-qtgui/lib/TimeDomainDisplayPlot.h
+++ b/gr-qtgui/lib/TimeDomainDisplayPlot.h
@@ -65,11 +65,11 @@ public slots:
   void SetSampleRate(double sr, double units, 
 		     const std::string &strunits);
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
 
 signals:
   void plotPointSelected(const QPointF p);
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.cc b/gr-qtgui/lib/WaterfallDisplayPlot.cc
index 94a8e6210..ffb27f2aa 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.cc
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.cc
@@ -349,7 +349,7 @@ WaterfallDisplayPlot::WaterfallDisplayPlot(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
 
   // Avoid jumping when labels with more/less digits
@@ -674,7 +674,6 @@ WaterfallDisplayPlot::_UpdateIntensityRangeDisplay()
   _lastReplot = gruel::high_res_timer_now();
 }
 
-#if QWT_VERSION < 0x060000
 void
 WaterfallDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
 {
@@ -683,15 +682,14 @@ WaterfallDisplayPlot::OnPickerPointSelected(const QwtDoublePoint & p)
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#else
+
 void
-WaterfallDisplayPlot::OnPickerPointSelected(const QPointF & p)
+WaterfallDisplayPlot::OnPickerPointSelected6(const QPointF & p)
 {
   QPointF point = p;
   //fprintf(stderr,"OnPickerPointSelected %f %f\n", point.x(), point.y());
   point.setX(point.x() * _xAxisMultiplier);
   emit plotPointSelected(point);
 }
-#endif
 
 #endif /* WATERFALL_DISPLAY_PLOT_C */
diff --git a/gr-qtgui/lib/WaterfallDisplayPlot.h b/gr-qtgui/lib/WaterfallDisplayPlot.h
index 0458597b0..b78c750ff 100644
--- a/gr-qtgui/lib/WaterfallDisplayPlot.h
+++ b/gr-qtgui/lib/WaterfallDisplayPlot.h
@@ -80,11 +80,11 @@ public:
 public slots:
   void resizeSlot( QSize *s );
 
-#if QWT_VERSION < 0x060000
+  // Because of the preprocessing of slots in QT, these are no
+  // easily separated by the version check. Make one for each
+  // version until it's worked out.
   void OnPickerPointSelected(const QwtDoublePoint & p);
-#else
-  void OnPickerPointSelected(const QPointF & p);
-#endif
+  void OnPickerPointSelected6(const QPointF & p);
  
 signals:
   void UpdatedLowerIntensityLevel(const double);