Qwt: headers diff between 6.0.0 and 6.0.1 versions

	qwt_abstract_scale_draw.h	qwt_abstract_scale_draw.h

	skipping to change at line 137	skipping to change at line 137
	const QwtText &tickLabel( const QFont &, double value ) const;	const QwtText &tickLabel( const QFont &, double value ) const;

	private:	private:
	QwtAbstractScaleDraw( const QwtAbstractScaleDraw & );	QwtAbstractScaleDraw( const QwtAbstractScaleDraw & );
	QwtAbstractScaleDraw &operator=( const QwtAbstractScaleDraw & );	QwtAbstractScaleDraw &operator=( const QwtAbstractScaleDraw & );

	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtAbstractScaleDraw::ScaleComponents );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtAbstractScaleDraw::ScaleComponents )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_global.h	qwt_global.h

	skipping to change at line 17	skipping to change at line 17
	* 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_GLOBAL_H	#ifndef QWT_GLOBAL_H
	#define QWT_GLOBAL_H	#define QWT_GLOBAL_H

	#include <qglobal.h>	#include <qglobal.h>

	// QWT_VERSION is (major << 16) + (minor << 8) + patch.	// QWT_VERSION is (major << 16) + (minor << 8) + patch.


	#define QWT_VERSION 0x060000	#define QWT_VERSION 0x060001
	#define QWT_VERSION_STR "6.0.0-svn"	#define QWT_VERSION_STR "6.0.1"

	#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_interval.h	qwt_interval.h

	skipping to change at line 290	skipping to change at line 290

	The limits are set to interval [0.0, -1.0]	The limits are set to interval [0.0, -1.0]
	\sa isValid()	\sa isValid()
	*/	*/
	inline void QwtInterval::invalidate()	inline void QwtInterval::invalidate()
	{	{
	d_minValue = 0.0;	d_minValue = 0.0;
	d_maxValue = -1.0;	d_maxValue = -1.0;
	}	}


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtInterval::BorderFlags );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtInterval::BorderFlags )

	#ifndef QT_NO_DEBUG_STREAM	#ifndef QT_NO_DEBUG_STREAM
	QWT_EXPORT QDebug operator<<( QDebug, const QwtInterval & );	QWT_EXPORT QDebug operator<<( QDebug, const QwtInterval & );
	#endif	#endif

	#endif	#endif

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 166	skipping to change at line 166

	void updateStyleSheetInfo();	void updateStyleSheetInfo();

	private:	private:
	void drawCanvas( QPainter *, bool withBackground );	void drawCanvas( QPainter *, bool withBackground );

	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCanvas::PaintAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCanvas::PaintAttributes )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_plot_curve.h	qwt_plot_curve.h

	skipping to change at line 315	skipping to change at line 315
	{	{
	return boundingRect().top();	return boundingRect().top();
	}	}

	//! boundingRect().bottom()	//! boundingRect().bottom()
	inline double QwtPlotCurve::maxYValue() const	inline double QwtPlotCurve::maxYValue() const
	{	{
	return boundingRect().bottom();	return boundingRect().bottom();
	}	}


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCurve::PaintAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCurve::PaintAttributes )
	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCurve::LegendAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCurve::LegendAttributes )
	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCurve::CurveAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotCurve::CurveAttributes )

	#endif	#endif

End of changes. 1 change blocks.
	3 lines changed or deleted	3 lines changed or added

	qwt_plot_directpainter.h	qwt_plot_directpainter.h

	skipping to change at line 98	skipping to change at line 98
	void drawSeries( QwtPlotAbstractSeriesItem *, int from, int to );	void drawSeries( QwtPlotAbstractSeriesItem *, int from, int to );
	void reset();	void reset();

	virtual bool eventFilter( QObject , QEvent );	virtual bool eventFilter( QObject , QEvent );

	private:	private:
	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotDirectPainter::Attributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotDirectPainter::Attributes )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_plot_intervalcurve.h	qwt_plot_intervalcurve.h

	skipping to change at line 128	skipping to change at line 128

	virtual void drawSymbols( QPainter *, const QwtIntervalSymbol &,	virtual void drawSymbols( QPainter *, const QwtIntervalSymbol &,
	const QwtScaleMap &xMap, const QwtScaleMap &yMap,	const QwtScaleMap &xMap, const QwtScaleMap &yMap,
	const QRectF &canvasRect, int from, int to ) const;	const QRectF &canvasRect, int from, int to ) const;

	private:	private:
	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotIntervalCurve::PaintAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotIntervalCurve::PaintAttributes )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_plot_item.h	qwt_plot_item.h

	skipping to change at line 189	skipping to change at line 189

	private:	private:
	// Disabled copy constructor and operator=	// Disabled copy constructor and operator=
	QwtPlotItem( const QwtPlotItem & );	QwtPlotItem( const QwtPlotItem & );
	QwtPlotItem &operator=( const QwtPlotItem & );	QwtPlotItem &operator=( const QwtPlotItem & );

	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotItem::ItemAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotItem::ItemAttributes )
	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotItem::RenderHints );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotItem::RenderHints )

	#endif	#endif

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	qwt_plot_layout.h	qwt_plot_layout.h

	skipping to change at line 103	skipping to change at line 103

	void alignScales( int options, QRectF &canvasRect,	void alignScales( int options, QRectF &canvasRect,
	QRectF scaleRect[QwtPlot::axisCnt] ) const;	QRectF scaleRect[QwtPlot::axisCnt] ) const;

	private:	private:
	class PrivateData;	class PrivateData;

	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotLayout::Options );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotLayout::Options )

	#endif	#endif

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 143	skipping to change at line 143
	void init();	void init();

	QImage compose( const QwtScaleMap &, const QwtScaleMap &,	QImage compose( const QwtScaleMap &, const QwtScaleMap &,
	const QRectF &imageArea, const QRectF &paintRect,	const QRectF &imageArea, const QRectF &paintRect,
	const QSize &imageSize, bool doCache) const;	const QSize &imageSize, bool doCache) const;

	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotRasterItem::PaintAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotRasterItem::PaintAttributes )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_plot_renderer.h	qwt_plot_renderer.h

	skipping to change at line 151	skipping to change at line 151

	protected:	protected:
	void buildCanvasMaps( const QwtPlot *,	void buildCanvasMaps( const QwtPlot *,
	const QRectF &, QwtScaleMap maps[] ) const;	const QRectF &, QwtScaleMap maps[] ) const;

	private:	private:
	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotRenderer::DiscardFlags );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotRenderer::DiscardFlags )
	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotRenderer::LayoutFlags );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotRenderer::LayoutFlags )

	#endif	#endif

End of changes. 1 change blocks.
	2 lines changed or deleted	2 lines changed or added

	qwt_plot_spectrocurve.h	qwt_plot_spectrocurve.h

	skipping to change at line 74	skipping to change at line 74
	const QwtScaleMap &xMap, const QwtScaleMap &yMap,	const QwtScaleMap &xMap, const QwtScaleMap &yMap,
	const QRectF &canvasRect, int from, int to ) const;	const QRectF &canvasRect, int from, int to ) const;

	private:	private:
	void init();	void init();

	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotSpectroCurve::PaintAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotSpectroCurve::PaintAttributes )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_plot_spectrogram.h	qwt_plot_spectrogram.h

	skipping to change at line 113	skipping to change at line 113
	const QwtRasterData::ContourLines& lines ) const;	const QwtRasterData::ContourLines& lines ) const;

	void renderTile( const QwtScaleMap &xMap, const QwtScaleMap &yMap,	void renderTile( const QwtScaleMap &xMap, const QwtScaleMap &yMap,
	const QRect &imageRect, QImage *image ) const;	const QRect &imageRect, QImage *image ) const;

	private:	private:
	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotSpectrogram::DisplayModes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtPlotSpectrogram::DisplayModes )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_point_polar.h	qwt_point_polar.h

	skipping to change at line 178	skipping to change at line 178

	inline QPointF qwtDegree2Pos( const QPointF &pole,	inline QPointF qwtDegree2Pos( const QPointF &pole,
	double radius, double angle )	double radius, double angle )
	{	{
	return qwtPolar2Pos( pole, radius, angle / 180.0 * M_PI );	return qwtPolar2Pos( pole, radius, angle / 180.0 * M_PI );
	}	}

	inline QPointF qwtFastPolar2Pos( const QPointF &pole,	inline QPointF qwtFastPolar2Pos( const QPointF &pole,
	double radius, double angle )	double radius, double angle )
	{	{

		#if QT_VERSION < 0x040601
		const double x = pole.x() + radius * ::cos( angle );
		const double y = pole.y() - radius * ::sin( angle );
		#else
	const double x = pole.x() + radius * qFastCos( angle );	const double x = pole.x() + radius * qFastCos( angle );
	const double y = pole.y() - radius * qFastSin( angle );	const double y = pole.y() - radius * qFastSin( angle );

		#endif

	return QPointF( x, y);	return QPointF( x, y);
	}	}

	inline QPointF qwtFastDegree2Pos( const QPointF &pole,	inline QPointF qwtFastDegree2Pos( const QPointF &pole,
	double radius, double angle )	double radius, double angle )
	{	{
	return qwtFastPolar2Pos( pole, radius, angle / 180.0 * M_PI );	return qwtFastPolar2Pos( pole, radius, angle / 180.0 * M_PI );
	}	}


End of changes. 2 change blocks.
	0 lines changed or deleted	5 lines changed or added

	qwt_raster_data.h	qwt_raster_data.h

	skipping to change at line 93	skipping to change at line 93

	/*!	/*!
	\return Bounding interval for a axis	\return Bounding interval for a axis
	\sa setInterval	\sa setInterval
	*/	*/
	inline const QwtInterval &QwtRasterData::interval( Qt::Axis axis) const	inline const QwtInterval &QwtRasterData::interval( Qt::Axis axis) const
	{	{
	return d_intervals[axis];	return d_intervals[axis];
	}	}


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtRasterData::ConrecFlags );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtRasterData::ConrecFlags )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_scale_map.h	qwt_scale_map.h

	skipping to change at line 22	skipping to change at line 22

	#include "qwt_global.h"	#include "qwt_global.h"
	#include "qwt_math.h"	#include "qwt_math.h"
	#ifndef QT_NO_DEBUG_STREAM	#ifndef QT_NO_DEBUG_STREAM
	#include <qdebug.h>	#include <qdebug.h>
	#endif	#endif

	class QRectF;	class QRectF;

	/*!	/*!

	\brief Operations for linear or logarithmic (base 10) transformations	\brief A transformation between coordinate systems

		QwtScaleTransformation offers transformations from the coordinate system
		of a scale into the linear coordinate system of a paint device
		and vice versa.
	*/	*/
	class QWT_EXPORT QwtScaleTransformation	class QWT_EXPORT QwtScaleTransformation
	{	{
	public:	public:
	//! Transformation type	//! Transformation type
	enum Type	enum Type
	{	{
	//! Transformation between 2 linear scales	//! Transformation between 2 linear scales
	Linear,	Linear,


	skipping to change at line 45	skipping to change at line 49

	//! Any other type of transformation	//! Any other type of transformation
	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;

	skipping to change at line 68	skipping to change at line 72

	//! \return Transformation type	//! \return Transformation type
	inline QwtScaleTransformation::Type QwtScaleTransformation::type() const	inline QwtScaleTransformation::Type QwtScaleTransformation::type() const
	{	{
	return d_type;	return d_type;
	}	}

	/*!	/*!
	\brief A scale map	\brief A scale map


	QwtScaleMap offers transformations from a scale	QwtScaleMap offers transformations from the coordinate system
	into a paint interval and vice versa.	of a scale into the linear coordinate system of a paint device
		and vice versa.
	*/	*/
	class QWT_EXPORT QwtScaleMap	class QWT_EXPORT QwtScaleMap
	{	{
	public:	public:
	QwtScaleMap();	QwtScaleMap();
	QwtScaleMap( const QwtScaleMap& );	QwtScaleMap( const QwtScaleMap& );

	~QwtScaleMap();	~QwtScaleMap();

	QwtScaleMap &operator=( const QwtScaleMap & );	QwtScaleMap &operator=( const QwtScaleMap & );

End of changes. 3 change blocks.
	5 lines changed or deleted	10 lines changed or added

	qwt_scale_widget.h	qwt_scale_widget.h

	skipping to change at line 133	skipping to change at line 133
	void scaleChange();	void scaleChange();
	void layoutScale( bool update = true );	void layoutScale( bool update = true );

	private:	private:
	void initScale( QwtScaleDraw::Alignment );	void initScale( QwtScaleDraw::Alignment );

	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtScaleWidget::LayoutFlags );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtScaleWidget::LayoutFlags )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_slider.h	qwt_slider.h

	skipping to change at line 148	skipping to change at line 148
	QwtScaleDraw *scaleDraw();	QwtScaleDraw *scaleDraw();

	private:	private:
	void layoutSlider( bool );	void layoutSlider( bool );
	void initSlider( Qt::Orientation, ScalePos, BackgroundStyles );	void initSlider( Qt::Orientation, ScalePos, BackgroundStyles );

	class PrivateData;	class PrivateData;
	PrivateData *d_data;	PrivateData *d_data;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtSlider::BackgroundStyles );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtSlider::BackgroundStyles )

	#endif	#endif

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	qwt_text.h	qwt_text.h

	skipping to change at line 213	skipping to change at line 213
	{	{
	return text().isNull();	return text().isNull();
	}	}

	//! \return text().isEmpty()	//! \return text().isEmpty()
	inline bool QwtText::isEmpty() const	inline bool QwtText::isEmpty() const
	{	{
	return text().isEmpty();	return text().isEmpty();
	}	}


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtText::PaintAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtText::PaintAttributes )
	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtText::LayoutAttributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtText::LayoutAttributes )

	#endif	#endif

End of changes. 1 change blocks.
	2 lines changed or deleted	2 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/

	qwt_scale_engine.h	qwt_scale_engine.h

	skipping to change at line 37	skipping to change at line 37

	static double divideEps( double interval, double steps );	static double divideEps( double interval, double steps );

	static double ceil125( double x );	static double ceil125( double x );
	static double floor125( double x );	static double floor125( double x );
	};	};

	/*!	/*!
	\brief Base class for scale engines.	\brief Base class for scale engines.


	A scale engine trys to find "reasonable" ranges and step sizes	A scale engine tries to find "reasonable" ranges and step sizes
	for scales.	for scales.

	The layout of the scale can be varied with setAttribute().	The layout of the scale can be varied with setAttribute().

	Qwt offers implementations for logarithmic (log10)	Qwt offers implementations for logarithmic (log10)
	and linear scales. Contributions for other types of scale engines	and linear scales. Contributions for other types of scale engines
	(date/time, log2 ... ) are welcome.	(date/time, log2 ... ) are welcome.
	*/	*/

	class QWT_EXPORT QwtScaleEngine	class QWT_EXPORT QwtScaleEngine

	skipping to change at line 215	skipping to change at line 215
	QList<double> ticks[QwtScaleDiv::NTickTypes] ) const;	QList<double> ticks[QwtScaleDiv::NTickTypes] ) const;

	QList<double> buildMajorTicks(	QList<double> buildMajorTicks(
	const QwtInterval &interval, double stepSize ) const;	const QwtInterval &interval, double stepSize ) const;

	QList<double> buildMinorTicks(	QList<double> buildMinorTicks(
	const QList<double>& majorTicks,	const QList<double>& majorTicks,
	int maxMinMark, double step ) const;	int maxMinMark, double step ) const;
	};	};


	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtScaleEngine::Attributes );	Q_DECLARE_OPERATORS_FOR_FLAGS( QwtScaleEngine::Attributes )

	#endif	#endif

End of changes. 2 change blocks.
	2 lines changed or deleted	2 lines changed or added