Fix build error when using Qwt 6.1, followup to f283040

dakcarto · dakcarto · commit 530a36d0c2ab · 2014-05-19T21:27:09.000-06:00
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -589,7 +589,6 @@ void QgsIdentifyResultsDialog::mapLayerActionDestroyed()
   }
 }
 
-#if defined(QWT_VERSION) && QWT_VERSION<0x060000
 QgsIdentifyPlotCurve::QgsIdentifyPlotCurve( const QMap<QString, QString> &attributes,
     QwtPlot* plot, const QString &title, QColor color )
 {
@@ -651,7 +650,6 @@ QgsIdentifyPlotCurve::~QgsIdentifyPlotCurve()
     delete mPlotCurve;
   }
 }
-#endif
 
 void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,
     QString label,

Original file line number	Diff line number	Diff line change
`@@ -589,7 +589,6 @@ void QgsIdentifyResultsDialog::mapLayerActionDestroyed()`
`589`	`589`	`}`
`590`	`590`	`}`
`591`	`591`
`592`		`-#if defined(QWT_VERSION) && QWT_VERSION<0x060000`
`593`	`592`	`QgsIdentifyPlotCurve::QgsIdentifyPlotCurve( const QMap<QString, QString> &attributes,`
`594`	`593`	`QwtPlot* plot, const QString &title, QColor color )`
`595`	`594`	`{`
`@@ -651,7 +650,6 @@ QgsIdentifyPlotCurve::~QgsIdentifyPlotCurve()`
`651`	`650`	`delete mPlotCurve;`
`652`	`651`	`}`
`653`	`652`	`}`
`654`		`-#endif`
`655`	`653`
`656`	`654`	`void QgsIdentifyResultsDialog::addFeature( QgsRasterLayer *layer,`
`657`	`655`	`QString label,`