Use some qwt6 features also for qwt6.0

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@20406 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · May 6, 2014 · 022365c · 022365c
1 parent f19e3dc
commit 022365c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/OMPlot/OMPlotGUI/Plot.cpp b/OMPlot/OMPlotGUI/Plot.cpp
@@ -34,7 +34,7 @@
 #include "PlotWindow.h"
 #include "ScaleDraw.h"
 #include "qwt_plot_canvas.h"
-#if QWT_VERSION < 0x060100
+#if QWT_VERSION < 0x060000
 #include "qwt_legend_item.h"
 #endif
 
@@ -65,7 +65,7 @@ Plot::Plot(PlotWindow *pParent)
   canvas()->setCursor(Qt::ArrowCursor);
   setCanvasBackground(Qt::white);
   setContentsMargins(10, 10, 10, 10);
-#if QWT_VERSION >= 0x060100
+#if QWT_VERSION >= 0x060000
   /*
     Ticket #2679 point 2.
     Move the canvas little bit from bottom and left to align the axis at starting point.

diff --git a/OMPlot/OMPlotGUI/PlotCurve.cpp b/OMPlot/OMPlotGUI/PlotCurve.cpp
@@ -32,7 +32,7 @@
  */
 
 #include "PlotCurve.h"
-#if QWT_VERSION < 0x060100
+#if QWT_VERSION < 0x060000
 #include "qwt_legend_item.h"
 #endif
 #include "qwt_symbol.h"

diff --git a/OMPlot/OMPlotGUI/ScaleDraw.cpp b/OMPlot/OMPlotGUI/ScaleDraw.cpp
@@ -36,7 +36,7 @@
  */
 
 #include "ScaleDraw.h"
-#if QWT_VERSION >= 0x060100
+#if QWT_VERSION >= 0x060000
 
 #include "qwt_painter.h"
 #include "qwt_scale_map.h"
@@ -193,4 +193,4 @@ void ScaleDraw::drawTick( QPainter *painter, double value, double len ) const
   }
 }
 
-#endif // #if QWT_VERSION >= 0x060100
+#endif // #if QWT_VERSION >= 0x060000
diff --git a/OMPlot/OMPlotGUI/ScaleDraw.h b/OMPlot/OMPlotGUI/ScaleDraw.h
@@ -39,7 +39,7 @@
 #define SCALEDRAW_H
 
 #include "qwt_scale_draw.h"
-#if QWT_VERSION >= 0x060100
+#if QWT_VERSION >= 0x060000
 
 namespace OMPlot
 {
@@ -53,5 +53,5 @@ class ScaleDraw : public QwtScaleDraw
 };
 }
 
-#endif // #if QWT_VERSION >= 0x060100
+#endif // #if QWT_VERSION >= 0x060000
 #endif // SCALEDRAW_H