KDE Libs: headers diff between 4.10.0 and 4.10.1 versions

	kdeversion.h	kdeversion.h

	skipping to change at line 47	skipping to change at line 47
	* This macro contains the KDE version in string form. As it is a macro,	* This macro contains the KDE version in string form. As it is a macro,
	* it contains the version at compile time. See versionString() if you need	* it contains the version at compile time. See versionString() if you need
	* the KDE version used at runtime.	* the KDE version used at runtime.
	*	*
	* @note The version string might contain a section in parentheses,	* @note The version string might contain a section in parentheses,
	* especially for development versions of KDE.	* especially for development versions of KDE.
	* If you use that macro directly for a file format (e.g. OASIS Open Docume nt)	* If you use that macro directly for a file format (e.g. OASIS Open Docume nt)
	* or for a protocol (e.g. http) be careful that it is appropriate.	* or for a protocol (e.g. http) be careful that it is appropriate.
	* (Fictional) example: "4.0.90 (>=20070101)"	* (Fictional) example: "4.0.90 (>=20070101)"
	*/	*/

	#define KDE_VERSION_STRING "4.10.00"	#define KDE_VERSION_STRING "4.10.1"

	/**	/**
	* @def KDE_VERSION_MAJOR	* @def KDE_VERSION_MAJOR
	* @ingroup KDEMacros	* @ingroup KDEMacros
	* @brief Major version of KDE, at compile time	* @brief Major version of KDE, at compile time
	*/	*/
	#define KDE_VERSION_MAJOR 4	#define KDE_VERSION_MAJOR 4
	/**	/**
	* @def KDE_VERSION_MINOR	* @def KDE_VERSION_MINOR
	* @ingroup KDEMacros	* @ingroup KDEMacros
	* @brief Minor version of KDE, at compile time	* @brief Minor version of KDE, at compile time
	*/	*/
	#define KDE_VERSION_MINOR 10	#define KDE_VERSION_MINOR 10
	/**	/**
	* @def KDE_VERSION_RELEASE	* @def KDE_VERSION_RELEASE
	* @ingroup KDEMacros	* @ingroup KDEMacros
	* @brief Release version of KDE, at compile time	* @brief Release version of KDE, at compile time
	*/	*/

	#define KDE_VERSION_RELEASE 00	#define KDE_VERSION_RELEASE 1

	/**	/**
	* @ingroup KDEMacros	* @ingroup KDEMacros
	* @brief Make a number from the major, minor and release number of a KDE v ersion	* @brief Make a number from the major, minor and release number of a KDE v ersion
	*	*
	* This function can be used for preprocessing when KDE_IS_VERSION is not	* This function can be used for preprocessing when KDE_IS_VERSION is not
	* appropriate.	* appropriate.
	*/	*/
	#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) \| ((b) << 8) \| (c))	#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) \| ((b) << 8) \| (c))


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

	klinkitemselectionmodel.h	klinkitemselectionmodel.h

	skipping to change at line 42	skipping to change at line 42
	/**	/**
	@brief Makes it possible to share a selection in multiple views which do not have the same source model	@brief Makes it possible to share a selection in multiple views which do not have the same source model

	Although <a href="http://doc.trolltech.com/4.6/model-view-view.html#shari ng-selections-between-views">multiple views can share the same QItemSelecti onModel</a>, the views then need to have the same source model.	Although <a href="http://doc.trolltech.com/4.6/model-view-view.html#shari ng-selections-between-views">multiple views can share the same QItemSelecti onModel</a>, the views then need to have the same source model.

	If there is a proxy model between the model and one of the views, or diff erent proxy models in each, this class makes	If there is a proxy model between the model and one of the views, or diff erent proxy models in each, this class makes
	it possible to share the selection between the views.	it possible to share the selection between the views.

	@image html kproxyitemselectionmodel-simple.png "Sharing a QItemSelection Model between views on the same model is trivial"	@image html kproxyitemselectionmodel-simple.png "Sharing a QItemSelection Model between views on the same model is trivial"
	@image html kproxyitemselectionmodel-error.png "If a proxy model is used, it is no longer possible to share the QItemSelectionModel directly"	@image html kproxyitemselectionmodel-error.png "If a proxy model is used, it is no longer possible to share the QItemSelectionModel directly"

	@image html kproxyitemselectionmodel-solution.png "A KProxyItemSelectionM odel can be used to map the selection through the proxy model"	@image html kproxyitemselectionmodel-solution.png "A KLinkItemSelectionMo del can be used to map the selection through the proxy model"

	@code	@code
	QAbstractItemModel *model = getModel();	QAbstractItemModel *model = getModel();

	QSortFilterProxyModel *proxy = new QSortFilterProxyModel();	QSortFilterProxyModel *proxy = new QSortFilterProxyModel();
	proxy->setSourceModel(model);	proxy->setSourceModel(model);

	QTreeView *view1 = new QTreeView(splitter);	QTreeView *view1 = new QTreeView(splitter);
	view1->setModel(model);	view1->setModel(model);


	KProxyItemSelectionModel *view2SelectionModel = new KProxyItemSelection Model( proxy, view1->selectionModel());	KLinkItemSelectionModel *view2SelectionModel = new KLinkItemSelectionMo del( proxy, view1->selectionModel());

	QTreeView *view2 = new QTreeView(splitter);	QTreeView *view2 = new QTreeView(splitter);

	// Note that the QAbstractItemModel passed to KProxyItemSelectionModel must be the same as what is used in the view	// Note that the QAbstractItemModel passed to KLinkItemSelectionModel m ust be the same as what is used in the view
	view2->setModel(proxy);	view2->setModel(proxy);
	view2->setSelectionModel( view2SelectionModel );	view2->setSelectionModel( view2SelectionModel );
	@endcode	@endcode

	@image html kproxyitemselectionmodel-complex.png "Arbitrarily complex pro xy configurations on the same root model can be used"	@image html kproxyitemselectionmodel-complex.png "Arbitrarily complex pro xy configurations on the same root model can be used"

	@code	@code
	QAbstractItemModel *model = getModel();	QAbstractItemModel *model = getModel();

	QSortFilterProxyModel *proxy1 = new QSortFilterProxyModel();	QSortFilterProxyModel *proxy1 = new QSortFilterProxyModel();

	skipping to change at line 81	skipping to change at line 81
	proxy3->setSourceModel(proxy2);	proxy3->setSourceModel(proxy2);

	QTreeView *view1 = new QTreeView(splitter);	QTreeView *view1 = new QTreeView(splitter);
	view1->setModel(proxy3);	view1->setModel(proxy3);

	QSortFilterProxyModel *proxy4 = new QSortFilterProxyModel();	QSortFilterProxyModel *proxy4 = new QSortFilterProxyModel();
	proxy4->setSourceModel(model);	proxy4->setSourceModel(model);
	QSortFilterProxyModel *proxy5 = new QSortFilterProxyModel();	QSortFilterProxyModel *proxy5 = new QSortFilterProxyModel();
	proxy5->setSourceModel(proxy4);	proxy5->setSourceModel(proxy4);


	KProxyItemSelectionModel *view2SelectionModel = new KProxyItemSelection Model( proxy5, view1->selectionModel());	KLinkItemSelectionModel *view2SelectionModel = new KLinkItemSelectionMo del( proxy5, view1->selectionModel());

	QTreeView *view2 = new QTreeView(splitter);	QTreeView *view2 = new QTreeView(splitter);

	// Note that the QAbstractItemModel passed to KProxyItemSelectionModel must be the same as what is used in the view	// Note that the QAbstractItemModel passed to KLinkItemSelectionModel m ust be the same as what is used in the view
	view2->setModel(proxy5);	view2->setModel(proxy5);
	view2->setSelectionModel( view2SelectionModel );	view2->setSelectionModel( view2SelectionModel );
	@endcode	@endcode

	See also <a href="http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/tests/pro xymodeltestapp/proxyitemselectionwidget.cpp?view=markup">kdelibs/kdeui/test s/proxymodeltestapp/proxyitemselectionwidget.cpp</a>.	See also <a href="http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/tests/pro xymodeltestapp/proxyitemselectionwidget.cpp?view=markup">kdelibs/kdeui/test s/proxymodeltestapp/proxyitemselectionwidget.cpp</a>.

	@since 4.5	@since 4.5
	@author Stephen Kelly <steveire@gmail.com>	@author Stephen Kelly <steveire@gmail.com>

	*/	*/

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

	knewstuff_export.h	knewstuff_export.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 David Faure <faure@kde.org>	Copyright (C) 2007 David Faure <faure@kde.org>

		Copyright (C) 2009 Jeremy Whiting <jpwhiting@kde.org>

	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 GNU Lesser General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either
	version 2.1 of the License, or (at your option) any later version.	version 2.1 of the License, or (at your option) any later version.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Lesser General Public License for more details.	Lesser General Public License for more details.

	You should have received a copy of the GNU Lesser General Public	You should have received a copy of the GNU Lesser General Public
	License along with this library. If not, see <http://www.gnu.org/licen ses/>.	License along with this library. If not, see <http://www.gnu.org/licen ses/>.
	*/	*/


	#ifndef KNEWSTUFF2_EXPORT_H	#ifndef KNEWSTUFF3_EXPORT_H
	#define KNEWSTUFF2_EXPORT_H	#define KNEWSTUFF3_EXPORT_H

	/* needed for KDE_EXPORT and KDE_IMPORT macros */	/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>	#include <kdemacros.h>

	#ifndef KNEWSTUFF_EXPORT	#ifndef KNEWSTUFF_EXPORT
	# if defined(KDELIBS_STATIC_LIBS)	# if defined(KDELIBS_STATIC_LIBS)
	/* No export/import for static libraries */	/* No export/import for static libraries */
	# define KNEWSTUFF_EXPORT	# define KNEWSTUFF_EXPORT

	# elif defined(MAKE_KNEWSTUFF2_LIB)	# elif defined(MAKE_KNEWSTUFF3_LIB)
	/* We are building this library */	/* We are building this library */
	# define KNEWSTUFF_EXPORT KDE_EXPORT	# define KNEWSTUFF_EXPORT KDE_EXPORT
	# else	# else
	/* We are using this library */	/* We are using this library */
	# define KNEWSTUFF_EXPORT KDE_IMPORT	# define KNEWSTUFF_EXPORT KDE_IMPORT
	# endif	# endif
	#endif	#endif

	# ifndef KNEWSTUFF_EXPORT_DEPRECATED	# ifndef KNEWSTUFF_EXPORT_DEPRECATED
	# define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT	# define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT

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