qwt_global.h   qwt_global.h 
skipping to change at line 20 skipping to change at line 20
// vim: expandtab // vim: expandtab
#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
#define QWT_VERSION 0x050000 // QWT_VERSION is (major << 16) + (minor << 8) + patch.
#define QWT_VERSION_STR "5.0.0cvs"
// #define QWT_VERSION 0x050001
// Create Qwt DLL if QWT_DLL is defined (Windows only) #define QWT_VERSION_STR "5.0.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 #endif // _MSC_VER
#if defined(QWT_NODLL)
#undef QWT_MAKEDLL
#undef QWT_DLL
#undef QWT_TEMPLATEDLL
#endif
#ifdef QWT_DLL #ifdef QWT_DLL
#if defined(QWT_MAKEDLL) /* create a Qwt DLL library */
#undef QWT_DLL #if defined(QWT_MAKEDLL) // create a Qwt DLL library
#define QWT_EXPORT __declspec(dllexport) #define QWT_EXPORT __declspec(dllexport)
#define QWT_TEMPLATEDLL #define QWT_TEMPLATEDLL
#endif #else // use a Qwt DLL library
#endif
#if defined(QWT_DLL) /* use a Qwt DLL library */
#define QWT_EXPORT __declspec(dllimport) #define QWT_EXPORT __declspec(dllimport)
#define QWT_TEMPLATEDLL
#endif #endif
#else // ! Q_WS_WIN #endif // QWT_DLL
#undef QWT_MAKEDLL /* ignore these for other platforms */
#undef QWT_DLL #endif // Q_WS_WIN
#undef QWT_TEMPLATEDLL
#endif
#ifndef QWT_EXPORT #ifndef QWT_EXPORT
#define QWT_EXPORT #define QWT_EXPORT
#endif #endif
// #define QWT_NO_COMPAT 1 // disable withdrawn functionality // #define QWT_NO_COMPAT 1 // disable withdrawn functionality
#endif // QWT_GLOBAL_H #endif // QWT_GLOBAL_H
 End of changes. 7 change blocks. 
24 lines changed or deleted 10 lines changed or added


 qwt_plot.h   qwt_plot.h 
skipping to change at line 101 skipping to change at line 101
xBottom, xBottom,
xTop, xTop,
axisCnt axisCnt
}; };
/*! /*!
\brief Position of the legend, relative to the canvas. \brief Position of the legend, relative to the canvas.
ExternalLegend means that only the content of the legend ExternalLegend means that only the content of the legend
will be handled by QwtPlot, but not itยดs geometry. will be handled by QwtPlot, but not its geometry.
This might be interesting if an application wants to This might be interesting if an application wants to
have a legend in an external window. have a legend in an external window.
*/ */
enum LegendPosition enum LegendPosition
{ {
LeftLegend, LeftLegend,
RightLegend, RightLegend,
BottomLegend, BottomLegend,
TopLegend, TopLegend,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_plot_canvas.h   qwt_plot_canvas.h 
skipping to change at line 66 skipping to change at line 66
enum PaintAttribute enum PaintAttribute
{ {
PaintCached = 1, PaintCached = 1,
PaintPacked = 2 PaintPacked = 2
}; };
/*! /*!
\brief Focus indicator \brief Focus indicator
- NoFocusIndicator\n - NoFocusIndicator\n
Don Don't paint a focus indicator
- CanvasFocusIndicator\n - CanvasFocusIndicator\n
The focus is related to the complete canvas. The focus is related to the complete canvas.
Paint the focus indicator using paintFocus() Paint the focus indicator using paintFocus()
- ItemFocusIndicator\n - ItemFocusIndicator\n
The focus is related to an item (curve, point, ...) on The focus is related to an item (curve, point, ...) on
the canvas. It is up to the application to display a the canvas. It is up to the application to display a
focus indication using f.e. highlighting. focus indication using f.e. highlighting.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 qwt_plot_rasteritem.h   qwt_plot_rasteritem.h 
skipping to change at line 98 skipping to change at line 98
\param xMap Maps x-values into pixel coordinates. \param xMap Maps x-values into pixel coordinates.
\param yMap Maps y-values into pixel coordinates. \param yMap Maps y-values into pixel coordinates.
\param area Requested area for the image in scale coordinates \param area Requested area for the image in scale coordinates
*/ */
virtual QImage renderImage(const QwtScaleMap &xMap, virtual QImage renderImage(const QwtScaleMap &xMap,
const QwtScaleMap &yMap, const QwtDoubleRect &area const QwtScaleMap &yMap, const QwtDoubleRect &area
) const = 0; ) const = 0;
private: private:
QwtPlotRasterItem( const QwtPlotRasterItem & );
QwtPlotRasterItem &operator=( const QwtPlotRasterItem & );
void init(); void init();
class PrivateData; class PrivateData;
PrivateData *d_data; PrivateData *d_data;
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 qwt_scale_map.h   qwt_scale_map.h 
skipping to change at line 43 skipping to change at line 43
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 s1, double s2,
double p1, double p2) const; double p1, double p2) const;
inline Type type() const { return d_type; } inline Type type() const { return d_type; }
virtual QwtScaleTransformation *copy() const; virtual QwtScaleTransformation *copy() const;
private: private:
QwtScaleTransformation();
QwtScaleTransformation &operator=( const QwtScaleTransformation);
const Type d_type; const Type d_type;
}; };
/*! /*!
\brief A scale map \brief A scale map
QwtScaleMap offers transformations from a scale QwtScaleMap offers transformations from a scale
into a paint interval and vice versa. into a paint interval and vice versa.
*/ */
class QWT_EXPORT QwtScaleMap class QWT_EXPORT QwtScaleMap
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 qwt_valuelist.h   qwt_valuelist.h 
skipping to change at line 39 skipping to change at line 39
#endif #endif
typedef QValueList<double> QwtValueList; typedef QValueList<double> QwtValueList;
#else // QT_VERSION >= 0x040000 #else // QT_VERSION >= 0x040000
#include <qlist.h> #include <qlist.h>
#if defined(QWT_TEMPLATEDLL) #if defined(QWT_TEMPLATEDLL)
#if defined Q_CC_MSVC // Q_CC_MSVC_NET #if QT_VERSION < 0x040300
// Some definitions, needed to avoid a MSVC crash // Some compilers have problems,
// without a qHash(double) implementation
#include <qset.h> #include <qset.h>
#include <qvector.h> #include <qvector.h>
inline uint qHash(double key) { return uint(key); } inline uint qHash(double key) { return uint(key); }
#endif #endif
// MOC_SKIP_BEGIN // MOC_SKIP_BEGIN
template class QWT_EXPORT QList<double>; template class QWT_EXPORT QList<double>;
// MOC_SKIP_END // MOC_SKIP_END
#endif
#endif // QWT_TEMPLATEDLL
typedef QList<double> QwtValueList; typedef QList<double> QwtValueList;
#endif #endif
#endif #endif
 End of changes. 2 change blocks. 
3 lines changed or deleted 5 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/