Qwt: headers diff between 6.1.1 and 6.1.2 versions

	qwt_color_map.h	qwt_color_map.h

	skipping to change at line 181	skipping to change at line 181

	\warning This method is slow for Indexed color maps. If it is	\warning This method is slow for Indexed color maps. If it is
	necessary to map many values, its better to get the	necessary to map many values, its better to get the
	color table once and find the color using colorIndex().	color table once and find the color using colorIndex().
	*/	*/
	inline QColor QwtColorMap::color(	inline QColor QwtColorMap::color(
	const QwtInterval &interval, double value ) const	const QwtInterval &interval, double value ) const
	{	{
	if ( d_format == RGB )	if ( d_format == RGB )
	{	{

	return QColor( rgb( interval, value ) );	return QColor::fromRgba( rgb( interval, value ) );
	}	}
	else	else
	{	{
	const unsigned int index = colorIndex( interval, value );	const unsigned int index = colorIndex( interval, value );
	return colorTable( interval )[index]; // slow	return colorTable( interval )[index]; // slow
	}	}
	}	}

	/*!	/*!
	\return Intended format of the color map	\return Intended format of the color map

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

	qwt_date_scale_draw.h	qwt_date_scale_draw.h

		/* -- mode: C++ ; c-file-style: "stroustrup" -- *************************
		****
		* Qwt Widget Library
		* Copyright (C) 1997 Josef Wilgen
		* Copyright (C) 2002 Uwe Rathmann
		*
		* This library is free software; you can redistribute it and/or
		* modify it under the terms of the Qwt License, Version 1.0
		**************************************************************************
		***/

	#ifndef _QWT_DATE_SCALE_DRAW_H_	#ifndef _QWT_DATE_SCALE_DRAW_H_
	#define _QWT_DATE_SCALE_DRAW_H_ 1	#define _QWT_DATE_SCALE_DRAW_H_ 1

	#include "qwt_global.h"	#include "qwt_global.h"
	#include "qwt_scale_draw.h"	#include "qwt_scale_draw.h"
	#include "qwt_date.h"	#include "qwt_date.h"

	/*!	/*!
	\brief A class for drawing datetime scales	\brief A class for drawing datetime scales


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

	qwt_date_scale_engine.h	qwt_date_scale_engine.h

		/* -- mode: C++ ; c-file-style: "stroustrup" -- *************************
		****
		* Qwt Widget Library
		* Copyright (C) 1997 Josef Wilgen
		* Copyright (C) 2002 Uwe Rathmann
		*
		* This library is free software; you can redistribute it and/or
		* modify it under the terms of the Qwt License, Version 1.0
		**************************************************************************
		***/

	#ifndef _QWT_DATE_SCALE_ENGINE_H_	#ifndef _QWT_DATE_SCALE_ENGINE_H_
	#define _QWT_DATE_SCALE_ENGINE_H_ 1	#define _QWT_DATE_SCALE_ENGINE_H_ 1

	#include "qwt_date.h"	#include "qwt_date.h"
	#include "qwt_scale_engine.h"	#include "qwt_scale_engine.h"

	/*!	/*!
	\brief A scale engine for date/time values	\brief A scale engine for date/time values

	QwtDateScaleEngine builds scales from a time intervals.	QwtDateScaleEngine builds scales from a time intervals.

End of changes. 1 change blocks.
	0 lines changed or deleted	11 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 0x060101	#define QWT_VERSION 0x060102
	#define QWT_VERSION_STR "6.1.1"	#define QWT_VERSION_STR "6.1.2"

	#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)
	/* inherits via dominance */	/* inherits via dominance */
	#pragma warning(disable: 4250)	#pragma warning(disable: 4250)
	#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 136	skipping to change at line 136

	if ( y < 0.0 )	if ( y < 0.0 )
	return -M_PI_2;	return -M_PI_2;

	if ( y > 0.0 )	if ( y > 0.0 )
	return M_PI_2;	return M_PI_2;

	return 0.0;	return 0.0;
	}	}


	// Translate degrees into radians	//! Translate degrees into radians
	inline double qwtRadians( double degrees )	inline double qwtRadians( double degrees )
	{	{
	return degrees * M_PI / 180.0;	return degrees * M_PI / 180.0;
	}	}


	// Translate radians into degrees	//! Translate radians into degrees
	inline double qwtDegrees( double degrees )	inline double qwtDegrees( double degrees )
	{	{
	return degrees * 180.0 / M_PI;	return degrees * 180.0 / M_PI;
	}	}

	#endif	#endif

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

	qwt_pixel_matrix.h	qwt_pixel_matrix.h
	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **
	* Qwt Widget Library	* Qwt Widget Library
	* Copyright (C) 1997 Josef Wilgen	* Copyright (C) 1997 Josef Wilgen

	* Copyright (C) 2003 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_PIXEL_MATRIX_H	#ifndef QWT_PIXEL_MATRIX_H
	#define QWT_PIXEL_MATRIX_H	#define QWT_PIXEL_MATRIX_H

	#include "qwt_global.h"	#include "qwt_global.h"
	#include <qbitarray.h>	#include <qbitarray.h>

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

	qwt_point_mapper.h	qwt_point_mapper.h
	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **
	* Qwt Widget Library	* Qwt Widget Library
	* Copyright (C) 1997 Josef Wilgen	* Copyright (C) 1997 Josef Wilgen

	* Copyright (C) 2003 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_POINT_MAPPER_H	#ifndef QWT_POINT_MAPPER_H
	#define QWT_POINT_MAPPER_H	#define QWT_POINT_MAPPER_H

	#include "qwt_global.h"	#include "qwt_global.h"
	#include "qwt_series_data.h"	#include "qwt_series_data.h"

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

	qwt_text.h	qwt_text.h
	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **
	* Qwt Widget Library	* Qwt Widget Library
	* Copyright (C) 1997 Josef Wilgen	* Copyright (C) 1997 Josef Wilgen

	* Copyright (C) 2003 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_TEXT_H	#ifndef QWT_TEXT_H
	#define QWT_TEXT_H	#define QWT_TEXT_H

	#include "qwt_global.h"	#include "qwt_global.h"
	#include <qstring.h>	#include <qstring.h>

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

	qwt_text_engine.h	qwt_text_engine.h
	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **	/* -- mode: C++ ; c-file-style: "stroustrup" -- *********************** **
	* Qwt Widget Library	* Qwt Widget Library
	* Copyright (C) 1997 Josef Wilgen	* Copyright (C) 1997 Josef Wilgen

	* Copyright (C) 2003 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_TEXT_ENGINE_H	#ifndef QWT_TEXT_ENGINE_H
	#define QWT_TEXT_ENGINE_H 1	#define QWT_TEXT_ENGINE_H 1

	#include "qwt_global.h"	#include "qwt_global.h"
	#include <qsize.h>	#include <qsize.h>

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

	qwt_transform.h	qwt_transform.h

	skipping to change at line 110	skipping to change at line 110
	QwtLogTransform();	QwtLogTransform();
	virtual ~QwtLogTransform();	virtual ~QwtLogTransform();

	virtual double transform( double value ) const;	virtual double transform( double value ) const;
	virtual double invTransform( double value ) const;	virtual double invTransform( double value ) const;

	virtual double bounded( double value ) const;	virtual double bounded( double value ) const;

	virtual QwtTransform *copy() const;	virtual QwtTransform *copy() const;


		#if QT_VERSION >= 0x050400
		static const double LogMin;
		static const double LogMax;
		#else
	QT_STATIC_CONST double LogMin;	QT_STATIC_CONST double LogMin;
	QT_STATIC_CONST double LogMax;	QT_STATIC_CONST double LogMax;

		#endif
	};	};

	/*!	/*!
	\brief A transformation using pow()	\brief A transformation using pow()

	QwtPowerTransform preserves the sign of a value.	QwtPowerTransform preserves the sign of a value.
	F.e. a transformation with a factor of 2	F.e. a transformation with a factor of 2
	transforms a value of -3 to -9 and v.v. Thus QwtPowerTransform	transforms a value of -3 to -9 and v.v. Thus QwtPowerTransform
	can be used for scales including negative values.	can be used for scales including negative values.
	*/	*/

End of changes. 2 change blocks.
	0 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/