| qwt_global.h | qwt_global.h | |||
|---|---|---|---|---|
| skipping to change at line 22 | skipping to change at line 22 | |||
| #ifndef QWT_GLOBAL_H | #ifndef QWT_GLOBAL_H | |||
| #define QWT_GLOBAL_H | #define QWT_GLOBAL_H | |||
| #include <qglobal.h> | #include <qglobal.h> | |||
| #if QT_VERSION < 0x040000 | #if QT_VERSION < 0x040000 | |||
| #include <qmodules.h> | #include <qmodules.h> | |||
| #endif | #endif | |||
| // QWT_VERSION is (major << 16) + (minor << 8) + patch. | // QWT_VERSION is (major << 16) + (minor << 8) + patch. | |||
| #define QWT_VERSION 0x050201 | #define QWT_VERSION 0x050202 | |||
| #define QWT_VERSION_STR "5.2.1" | #define QWT_VERSION_STR "5.2.2" | |||
| #if defined(Q_WS_WIN) || defined(Q_WS_S60) | #if defined(Q_WS_WIN) || defined(Q_WS_S60) | |||
| #if defined(_MSC_VER) /* MSVC Compiler */ | #if defined(_MSC_VER) /* MSVC Compiler */ | |||
| /* template-class specialization 'identifier' is already instantiated */ | /* template-class specialization 'identifier' is already instantiated */ | |||
| #pragma warning(disable: 4660) | #pragma warning(disable: 4660) | |||
| #endif // _MSC_VER | #endif // _MSC_VER | |||
| #ifdef QWT_DLL | #ifdef QWT_DLL | |||
| End of changes. 1 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||
| qwt_scale_map.h | qwt_scale_map.h | |||
|---|---|---|---|---|
| skipping to change at line 35 | skipping to change at line 35 | |||
| Log10, | Log10, | |||
| Other | Other | |||
| }; | }; | |||
| QwtScaleTransformation(Type type); | QwtScaleTransformation(Type type); | |||
| virtual ~QwtScaleTransformation(); | virtual ~QwtScaleTransformation(); | |||
| virtual double xForm(double x, double s1, double s2, | virtual double xForm(double x, double s1, double s2, | |||
| double p1, double p2) const; | double p1, double p2) const; | |||
| virtual double invXForm(double x, double s1, double s2, | virtual double invXForm(double x, double p1, double p2, | |||
| double p1, double p2) const; | double s1, double s2) const; | |||
| Type type() const; | Type type() const; | |||
| virtual QwtScaleTransformation *copy() const; | virtual QwtScaleTransformation *copy() const; | |||
| private: | private: | |||
| QwtScaleTransformation(); | QwtScaleTransformation(); | |||
| QwtScaleTransformation &operator=( const QwtScaleTransformation); | QwtScaleTransformation &operator=( const QwtScaleTransformation); | |||
| const Type d_type; | const Type d_type; | |||
| End of changes. 1 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||