Browse Source

Fix compatibility with qt5

Samuel Thibault 7 years ago
parent
commit
511a365b0c
2 changed files with 4 additions and 4 deletions
  1. 2 2
      starpu-top/qwt/qwt_scale_map.cpp
  2. 2 2
      starpu-top/qwt/qwt_scale_map.h

+ 2 - 2
starpu-top/qwt/qwt_scale_map.cpp

@@ -17,8 +17,8 @@
 #define qExp(x) ::exp(x)
 #endif
 
-QT_STATIC_CONST_IMPL double QwtScaleMap::LogMin = 1.0e-150;
-QT_STATIC_CONST_IMPL double QwtScaleMap::LogMax = 1.0e150;
+const double QwtScaleMap::LogMin = 1.0e-150;
+const double QwtScaleMap::LogMax = 1.0e150;
 
 //! Constructor for a linear transformation
 QwtScaleTransformation::QwtScaleTransformation( Type type ):

+ 2 - 2
starpu-top/qwt/qwt_scale_map.h

@@ -101,8 +101,8 @@ public:
     double pDist() const;
     double sDist() const;
 
-    QT_STATIC_CONST double LogMin;
-    QT_STATIC_CONST double LogMax;
+    static const double LogMin;
+    static const double LogMax;
 
     static QRectF transform( const QwtScaleMap &,
         const QwtScaleMap &, const QRectF & );