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 0x050100 #define QWT_VERSION 0x050101
#define QWT_VERSION_STR "5.1.0" #define QWT_VERSION_STR "5.1.1"
#if defined(Q_WS_WIN) #if defined(Q_WS_WIN)
#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_math.h   qwt_math.h 
skipping to change at line 13 skipping to change at line 13
* Copyright (C) 1997 Josef Wilgen * Copyright (C) 1997 Josef Wilgen
* Copyright (C) 2002 Uwe Rathmann * Copyright (C) 2002 Uwe Rathmann
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the Qwt License, Version 1.0 * modify it under the terms of the Qwt License, Version 1.0
************************************************************************** ***/ ************************************************************************** ***/
#ifndef QWT_MATH_H #ifndef QWT_MATH_H
#define QWT_MATH_H #define QWT_MATH_H
#include <cmath> #include <math.h>
#include <qpoint.h> #include <qpoint.h>
#include "qwt_global.h" #include "qwt_global.h"
#include "qwt_double_rect.h" #include "qwt_double_rect.h"
#if QT_VERSION < 0x040000 #if QT_VERSION < 0x040000
#define qwtMax QMAX #define qwtMax QMAX
#define qwtMin QMIN #define qwtMin QMIN
#define qwtAbs QABS #define qwtAbs QABS
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_rect.h   qwt_rect.h 
skipping to change at line 28 skipping to change at line 28
Some extensions for QRect Some extensions for QRect
\deprecated Use QwtClipper instead. \deprecated Use QwtClipper instead.
*/ */
class QWT_EXPORT QwtRect : public QRect class QWT_EXPORT QwtRect : public QRect
{ {
public: public:
QwtRect(); QwtRect();
QwtRect(const QRect &r); QwtRect(const QRect &r);
private:
QwtPolygon clip(const QwtPolygon &) const; QwtPolygon clip(const QwtPolygon &) const;
}; };
#endif #endif
 End of changes. 1 change blocks. 
1 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/