abstractrunner.h		abstractrunner.h
	skipping to change at line 104		skipping to change at line 104
	* If the runner can run precisely the requested term (RunnerContex t::query()),		* If the runner can run precisely the requested term (RunnerContex t::query()),
	* it should create an exact match by setting the type to RunnerCon text::ExactMatch.		* it should create an exact match by setting the type to RunnerCon text::ExactMatch.
	* The first runner that creates a QueryMatch will be the		* The first runner that creates a QueryMatch will be the
	* default runner. Other runner's matches will be suggested in the		* default runner. Other runner's matches will be suggested in the
	* interface. Non-exact matches should be offered via RunnerContext ::PossibleMatch.		* interface. Non-exact matches should be offered via RunnerContext ::PossibleMatch.
	*		*
	* The match will be activated via run() if the user selects it.		* The match will be activated via run() if the user selects it.
	*		*
	* Each runner is executed in its own thread. Whenever the user inp ut changes this		* Each runner is executed in its own thread. Whenever the user inp ut changes this
	* method is called again. Thus, it needs to be thread-safe. Also, all matches need		* method is called again. Thus, it needs to be thread-safe. Also, all matches need
	* to be reported once this method returns. Asyncroneous runners th erefore need		* to be reported once this method returns. Asynchronous runners th erefore need
	* to make use of a local event loop to wait for all matches.		* to make use of a local event loop to wait for all matches.
	*		*
	* It is recommended to use local status data in async runners. The simplest way is		* It is recommended to use local status data in async runners. The simplest way is
	* to have a separate class doing all the work like so:		* to have a separate class doing all the work like so:
	*		*
	* \code		* \code
	* void MyFancyAsyncRunner::match( RunnerContext& context )		* void MyFancyAsyncRunner::match( RunnerContext& context )
	* {		* {
	* QEventLoop loop;		* QEventLoop loop;
	* MyAsyncWorker worker( context );		* MyAsyncWorker worker( context );
	skipping to change at line 144		skipping to change at line 144
	*		*
	* @warning Returning from this method means to end execution of th e runner.		* @warning Returning from this method means to end execution of th e runner.
	*		*
	* @sa run(), RunnerContext::addMatch, RunnerContext::addMatches, Q ueryMatch		* @sa run(), RunnerContext::addMatch, RunnerContext::addMatches, Q ueryMatch
	*/		*/
	virtual void match(Plasma::RunnerContext &context);		virtual void match(Plasma::RunnerContext &context);
	/**		/**
	* Triggers a call to match. This will call match() internally.		* Triggers a call to match. This will call match() internally.
	*		*
	* @arg context the search context used in executing this match.		* @param context the search context used in executing this match.
	*/		*/
	void performMatch(Plasma::RunnerContext &context);		void performMatch(Plasma::RunnerContext &context);
	/**		/**
	* If the runner has options that the user can interact with to mod ify		* If the runner has options that the user can interact with to mod ify
	* what happens when run or one of the actions created in match		* what happens when run or one of the actions created in match
	* is called, the runner should return true		* is called, the runner should return true
	*/		*/
	bool hasRunOptions();		bool hasRunOptions();
	skipping to change at line 340		skipping to change at line 340
	* only after higher priority runners.		* only after higher priority runners.
	*/		*/
	void setPriority(Priority newPriority);		void setPriority(Priority newPriority);
	/**		/**
	* @deprecated		* @deprecated
	* A blocking method to do queries of installed Services which can provide		* A blocking method to do queries of installed Services which can provide
	* a measure of safety for runners running their own threads. This should		* a measure of safety for runners running their own threads. This should
	* be used instead of calling KServiceTypeTrader::query(..) directl y.		* be used instead of calling KServiceTypeTrader::query(..) directl y.
	*		*
	* @arg serviceType a service type like "Plasma/Applet" or "KFilePl		* @param serviceType a service type like "Plasma/Applet" or "KFile
	ugin"		Plugin"
	* @arg constraint a constraint to limit the choices returned.		* @param constraint a constraint to limit the choices returned.
	* @see KServiceTypeTrader::query(const QString&, const QString&)		* @see KServiceTypeTrader::query(const QString&, const QString&)
	*		*
	* @return a list of services that satisfy the query.		* @return a list of services that satisfy the query.
	*/		*/
	KService::List serviceQuery(const QString &serviceType,		KService::List serviceQuery(const QString &serviceType,
	const QString &constraint = QString()) const;		const QString &constraint = QString()) const;
	/**		/**
	* A given match can have more than action that can be performed on it.		* A given match can have more than action that can be performed on it.
	* For example, a song match returned by a music player runner can be queued,		* For example, a song match returned by a music player runner can be queued,
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	accessappletjob.h		accessappletjob.h
	skipping to change at line 55		skipping to change at line 55
	public:		public:
	~AccessAppletJob();		~AccessAppletJob();
	Applet *applet() const;		Applet *applet() const;
	protected:		protected:
	/**		/**
	* Default constructor		* Default constructor
	*		*
	* @arg location the location of the service		* @param location the location of the service
	* @arg parent the parent object for this service		* @param parent the parent object for this service
	*/		*/
	AccessAppletJob(const KUrl &location, QObject *parent = 0);		AccessAppletJob(const KUrl &location, QObject *parent = 0);
	void start();		void start();
	private:		private:
	AccessAppletJob();		AccessAppletJob();
	Q_PRIVATE_SLOT(d, void slotPackageDownloaded(Plasma::ServiceJob*))		Q_PRIVATE_SLOT(d, void slotPackageDownloaded(Plasma::ServiceJob*))
	Q_PRIVATE_SLOT(d, void slotStart())		Q_PRIVATE_SLOT(d, void slotStart())
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	accessmanager.h		accessmanager.h
	skipping to change at line 32		skipping to change at line 32
	#ifndef KIO_ACCESSMANAGER_H		#ifndef KIO_ACCESSMANAGER_H
	#define KIO_ACCESSMANAGER_H		#define KIO_ACCESSMANAGER_H
	#include <kio/global.h>		#include <kio/global.h>
	#include <QtNetwork/QNetworkAccessManager>		#include <QtNetwork/QNetworkAccessManager>
	#include <QtNetwork/QNetworkRequest>		#include <QtNetwork/QNetworkRequest>
	#include <QtNetwork/QNetworkCookieJar>		#include <QtNetwork/QNetworkCookieJar>
			class QWidget;
	namespace KIO {		namespace KIO {
	/**		/**
	* @short A KDE implementation of QNetworkAccessManager.		* @short A KDE implementation of QNetworkAccessManager.
	*		*
	* Use this class instead of QNetworkAccessManager if you want to integrate		* Use this class instead of QNetworkAccessManager if you want to integrate
	* with KDE's KIO and KCookieJar modules for network operations and cookie		* with KDE's KIO and KCookieJar modules for network operations and cookie
	* handling respectively.		* handling respectively.
	*		*
	* Here is a simple example that shows how to set the QtWebKit module to us e KDE's		* Here is a simple example that shows how to set the QtWebKit module to us e KDE's
	skipping to change at line 61		skipping to change at line 63
	* as follows:		* as follows:
	* @code		* @code
	* KIO::Integration::AccessManager *manager = qobject_cast<KIO::Integrati on::AccessManager*>(view->page()->accessManager());		* KIO::Integration::AccessManager *manager = qobject_cast<KIO::Integrati on::AccessManager*>(view->page()->accessManager());
	* @endcode		* @endcode
	*		*
	* Please note that this class is in the KIO namespace for backward compata blity.		* Please note that this class is in the KIO namespace for backward compata blity.
	* You should use KIO::Integration::AccessManager to access this class in y our		* You should use KIO::Integration::AccessManager to access this class in y our
	* code.		* code.
	*		*
	* <b>IMPORTANT</b>This class is not a replacement for the standard KDE API .		* <b>IMPORTANT</b>This class is not a replacement for the standard KDE API .
	* It should ONLY be used to to provide KDE integration in applications tha t		* It should ONLY be used to provide KDE integration in applications that
	* cannot use the standard KDE API directly.		* cannot use the standard KDE API directly.
	*		*
	* @author Urs Wolfer \<uwolfer @ kde.org\>		* @author Urs Wolfer \<uwolfer @ kde.org\>
			* @author Dawit Alemayehu \<adawit @ kde.org\>
	*		*
	* @deprecated Use the KIO::Integration::AccessManager typedef to access th is class instead.		* @deprecated Use the KIO::Integration::AccessManager typedef to access th is class instead.
	* @since 4.3		* @since 4.3
	*/		*/
	class KIO_EXPORT AccessManager : public QNetworkAccessManager		class KIO_EXPORT AccessManager : public QNetworkAccessManager
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Extensions to QNetworkRequest::Attribute enums.		* Extensions to QNetworkRequest::Attribute enums.
	skipping to change at line 119		skipping to change at line 122
	* window id. Note that this function does nothing unless the cookiejar in		* window id. Note that this function does nothing unless the cookiejar in
	* use is of type KIO::Integration::CookieJar.		* use is of type KIO::Integration::CookieJar.
	*		*
	* By default the cookiejar's window id is set to false. Make sure you call		* By default the cookiejar's window id is set to false. Make sure you call
	* this function and set the window id to its proper value when create an		* this function and set the window id to its proper value when create an
	* instance of this object. Otherwise, the KDE cookiejar will not be ab le		* instance of this object. Otherwise, the KDE cookiejar will not be ab le
	* to properly manage session based cookies.		* to properly manage session based cookies.
	*		*
	* @see KIO::Integration::CookieJar::setWindowId.		* @see KIO::Integration::CookieJar::setWindowId.
	* @since 4.4		* @since 4.4
			* @deprecated Use setWindow
	*/		*/
	void setCookieJarWindowId(WId id);		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED void setCookieJarWindowId(WId id);
			#endif
			/**
			* Sets the window associated with this network access manager.
			*
			* Note that @p widget will be used as a parent for dialogs in KIO as w
			ell
			* as the cookie jar. If @p widget is not a window, this function will
			* invoke @ref QWidget::window() to obtain the window for the given wid
			get.
			*
			* @see KIO::Integration::CookieJar::setWindow.
			* @since 4.7
			*/
			void setWindow(QWidget* widget);
	/**		/**
	* Returns the cookiejar's window id.		* Returns the cookiejar's window id.
	*		*
	* This is a convenience function that returns the window id associated		* This is a convenience function that returns the window id associated
	* with the cookiejar. Note that this function will return a 0 if the		* with the cookiejar. Note that this function will return a 0 if the
	* cookiejar is not of type KIO::Integration::CookieJar or a window id		* cookiejar is not of type KIO::Integration::CookieJar or a window id
	* has not yet been set.		* has not yet been set.
	*		*
	* @see KIO::Integration::CookieJar::windowId.		* @see KIO::Integration::CookieJar::windowId.
	* @since 4.4		* @since 4.4
			* @deprecated Use KIO::Integration::CookieJar::windowId
	*/		*/
	WId cookieJarWindowid() const;		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED WId cookieJarWindowid() const;
			#endif
			/**
			* Returns the window associated with this network access manager.
			*
			* @see setWindow
			* @since 4.7
			*/
			QWidget* window() const;
	/**		/**
	* Returns a reference to the temporary meta data container.		* Returns a reference to the temporary meta data container.
	*		*
	* See kdelibs/kio/DESIGN.metadata for list of supported KIO meta data.		* See kdelibs/kio/DESIGN.metadata for list of supported KIO meta data.
	*		*
	* Use this function when you want to set per request KIO meta data tha t		* Use this function when you want to set per request KIO meta data tha t
	* will be removed after it has been sent once.		* will be removed after it has been sent once.
	*		*
	* @since 4.4		* @since 4.4
	skipping to change at line 175		skipping to change at line 204
	*		*
	* This function is intended to make possible the implementation of		* This function is intended to make possible the implementation of
	* the special case mentioned in KIO::get's documentation within the		* the special case mentioned in KIO::get's documentation within the
	* KIO-QNAM integration.		* KIO-QNAM integration.
	*		*
	* @see KIO::get.		* @see KIO::get.
	* @since 4.6		* @since 4.6
	*/		*/
	static void putReplyOnHold(QNetworkReply* reply);		static void putReplyOnHold(QNetworkReply* reply);
			/**
			* Sets the network reply object to emit readyRead when it receives met
			a data.
			*
			* Meta data is any information that is not the actual content itself,
			e.g.
			* HTTP response headers of the HTTP protocol. You should only call thi
			s
			* function, when an application does not connect to a reply object's
			* metaDataChanged signal.
			*
			* @see QNetworkReply::metaDataChanged
			* @since 4.7
			*/
			void setEmitReadyReadOnMetaDataChange(bool);
	protected:		protected:
	/**		/**
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QNetworkAccessManager::createRequest		* @see QNetworkAccessManager::createRequest
	* @internal		* @internal
	*/		*/
	virtual QNetworkReply *createRequest(Operation op, const QNetworkReques t &req, QIODevice *outgoingData = 0);		virtual QNetworkReply *createRequest(Operation op, const QNetworkReques t &req, QIODevice *outgoingData = 0);
	private:		private:
End of changes. 8 change blocks.
	3 lines changed or deleted		50 lines changed or added

	animation.h		animation.h
	skipping to change at line 105		skipping to change at line 105
	*/		*/
	explicit Animation(QObject* parent = 0);		explicit Animation(QObject* parent = 0);
	/**		/**
	* Destructor.		* Destructor.
	*/		*/
	~Animation() = 0;		~Animation() = 0;
	/**		/**
	* Set the widget on which the animation is to be performed.		* Set the widget on which the animation is to be performed.
	* @arg widget The QGraphicsWidget to be animated.		* @param widget The QGraphicsWidget to be animated.
	*/		*/
	void setTargetWidget(QGraphicsWidget* widget);		void setTargetWidget(QGraphicsWidget* widget);
	/**		/**
	* @return The widget that the animation will be performed upon		* @return The widget that the animation will be performed upon
	*/		*/
	QGraphicsWidget *targetWidget() const;		QGraphicsWidget *targetWidget() const;
	/**		/**
	* Set the animation easing curve type		* Set the animation easing curve type
	skipping to change at line 127		skipping to change at line 127
	void setEasingCurve(const QEasingCurve &curve);		void setEasingCurve(const QEasingCurve &curve);
	/**		/**
	* Get the animation easing curve type		* Get the animation easing curve type
	*/		*/
	QEasingCurve easingCurve() const;		QEasingCurve easingCurve() const;
	protected:		protected:
	/**		/**
	* Change the animation duration. Default is 250ms.		* Change the animation duration. Default is 250ms.
	* @arg duration The new duration of the animation.		* @param duration The new duration of the animation.
	*/		*/
	virtual void setDuration(int duration = 250);		virtual void setDuration(int duration = 250);
	/**		/**
	* QAbstractAnimation will call this method while the animation		* QAbstractAnimation will call this method while the animation
	* is running. Each specialized animation class should implement		* is running. Each specialized animation class should implement
	* the correct behavior for it.		* the correct behavior for it.
	* @param currentTime Slapsed time using the \ref duration as reference		* @param currentTime Slapsed time using the \ref duration as reference
	* (it will be from duration up to zero if the animation is running		* (it will be from duration up to zero if the animation is running
	* backwards).		* backwards).
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	animator.h		animator.h
	skipping to change at line 118		skipping to change at line 118
	/**		/**
	* Factory to build new custom easing curves.		* Factory to build new custom easing curves.
	* @since 4.5		* @since 4.5
	*/		*/
	static QEasingCurve create(Animator::CurveShape type);		static QEasingCurve create(Animator::CurveShape type);
	/**		/**
	* Starts a standard animation on a QGraphicsItem.		* Starts a standard animation on a QGraphicsItem.
	*		*
	* @arg item the item to animate in some fashion		* @param item the item to animate in some fashion
	* @arg anim the type of animation to perform		* @param anim the type of animation to perform
	* @return the id of the animation		* @return the id of the animation
	* @deprecated use new Animator API with Qt Kinetic		* @deprecated use new Animator API with Qt Kinetic
	**/		**/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animatio n anim);		KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animatio n anim);
	#endif		#endif
	/**		/**
	* Stops an item animation before the animation is complete.		* Stops an item animation before the animation is complete.
	* Note that it is not necessary to call		* Note that it is not necessary to call
	* this on normal completion of the animation.		* this on normal completion of the animation.
	*		*
	* @arg id the id of the animation as returned by animateItem		* @param id the id of the animation as returned by animateItem
	* @deprecated use new Animator API with Qt Kinetic		* @deprecated use new Animator API with Qt Kinetic
	*/		*/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE void stopItemAnimation(int id);		KDE_DEPRECATED Q_INVOKABLE void stopItemAnimation(int id);
	#endif		#endif
	/**		/**
	* Starts a standard animation on a QGraphicsItem.		* Starts a standard animation on a QGraphicsItem.
	*		*
	* @arg item the item to animate in some fashion		* @param item the item to animate in some fashion
	* @arg anim the type of animation to perform		* @param anim the type of animation to perform
	* @return the id of the animation		* @return the id of the animation
	* @deprecated use new Animator API with Qt Kinetic		* @deprecated use new Animator API with Qt Kinetic
	**/		**/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE int moveItem(QGraphicsItem *item, Movement m ovement, const QPoint &destination);		KDE_DEPRECATED Q_INVOKABLE int moveItem(QGraphicsItem *item, Movement m ovement, const QPoint &destination);
	#endif		#endif
	/**		/**
	* Stops an item movement before the animation is complete.		* Stops an item movement before the animation is complete.
	* Note that it is not necessary to call		* Note that it is not necessary to call
	* this on normal completion of the animation.		* this on normal completion of the animation.
	*		*
	* @arg id the id of the animation as returned by moveItem		* @param id the id of the animation as returned by moveItem
	* @deprecated use new Animator API with Qt Kinetic		* @deprecated use new Animator API with Qt Kinetic
	*/		*/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE void stopItemMovement(int id);		KDE_DEPRECATED Q_INVOKABLE void stopItemMovement(int id);
	#endif		#endif
	/**		/**
	* Starts a custom animation, preventing the need to create a timeline		* Starts a custom animation, preventing the need to create a timeline
	* with its own timer tick.		* with its own timer tick.
	*		*
	* @arg frames the number of frames this animation should persist for		* @param frames the number of frames this animation should persist for
	* @arg duration the length, in milliseconds, the animation will take		* @param duration the length, in milliseconds, the animation will take
	* @arg curve the curve applied to the frame rate		* @param curve the curve applied to the frame rate
	* @arg receive the object that will handle the actual animation		* @param receive the object that will handle the actual animation
	* @arg method the method name of slot to be invoked on each update.		* @param method the method name of slot to be invoked on each update.
	* It must take a qreal. So if the slot is animate(qreal),		* It must take a qreal. So if the slot is animate(qreal),
	* pass in "animate" as the method parameter.		* pass in "animate" as the method parameter.
	* It has an optional integer paramenter that takes an		* It has an optional integer paramenter that takes an
	* integer that reapresents the animation id, useful if		* integer that reapresents the animation id, useful if
	* you want to manage multiple animations with a sigle slot		* you want to manage multiple animations with a sigle slot
	*		*
	* @return an id that can be used to identify this animation.		* @return an id that can be used to identify this animation.
	* @deprecated use new Animator API with Qt Kinetic		* @deprecated use new Animator API with Qt Kinetic
	*/		*/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE int customAnimation(int frames, int duration ,		KDE_DEPRECATED Q_INVOKABLE int customAnimation(int frames, int duration ,
	Animator::CurveShape curve, QObject *receiver, const char *method);		Animator::CurveShape curve, QObject *receiver, const char *method);
	#endif		#endif
	/**		/**
	* Stops a custom animation. Note that it is not necessary to call		* Stops a custom animation. Note that it is not necessary to call
	* this on object destruction, as custom animations associated with		* this on object destruction, as custom animations associated with
	* a given QObject are cleaned up automatically on QObject destruction.		* a given QObject are cleaned up automatically on QObject destruction.
	*		*
	* @arg id the id of the animation as returned by customAnimation		* @param id the id of the animation as returned by customAnimation
	* @deprecated use new Animator API with Qt Kinetic		* @deprecated use new Animator API with Qt Kinetic
	*/		*/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE void stopCustomAnimation(int id);		KDE_DEPRECATED Q_INVOKABLE void stopCustomAnimation(int id);
	#endif		#endif
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE int animateElement(QGraphicsItem *obj, Anima tion);		KDE_DEPRECATED Q_INVOKABLE int animateElement(QGraphicsItem *obj, Anima tion);
	#endif		#endif
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
End of changes. 6 change blocks.
	12 lines changed or deleted		12 lines changed or added

	applet.h		applet.h
	skipping to change at line 81		skipping to change at line 81
	* of scripting support for each applet, providing access to the associated		* of scripting support for each applet, providing access to the associated
	* plasmoid package (if any) and access to configuration data.		* plasmoid package (if any) and access to configuration data.
	*		*
	* See techbase.kde.org for tutorials on writing Applets using this class.		* See techbase.kde.org for tutorials on writing Applets using this class.
	*/		*/
	class PLASMA_EXPORT Applet : public QGraphicsWidget		class PLASMA_EXPORT Applet : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(bool hasConfigurationInterface READ hasConfigurationInterfac e)		Q_PROPERTY(bool hasConfigurationInterface READ hasConfigurationInterfac e)
	Q_PROPERTY(QString name READ name)		Q_PROPERTY(QString name READ name)
			Q_PROPERTY(QString pluginName READ pluginName)
	Q_PROPERTY(QString category READ category)		Q_PROPERTY(QString category READ category)
	Q_PROPERTY(ImmutabilityType immutability READ immutability WRITE setImm utability)		Q_PROPERTY(ImmutabilityType immutability READ immutability WRITE setImm utability)
	Q_PROPERTY(bool hasFailedToLaunch READ hasFailedToLaunch WRITE setFaile dToLaunch)		Q_PROPERTY(bool hasFailedToLaunch READ hasFailedToLaunch WRITE setFaile dToLaunch)
	Q_PROPERTY(bool isBusy READ isBusy WRITE setBusy) //KDE5: remove		Q_PROPERTY(bool isBusy READ isBusy WRITE setBusy) //KDE5: remove
	Q_PROPERTY(bool busy READ isBusy WRITE setBusy)		Q_PROPERTY(bool busy READ isBusy WRITE setBusy)
	Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired)		Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired)
	Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry)		Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry)
	Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)		Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)
	Q_PROPERTY(uint id READ id)		Q_PROPERTY(uint id READ id)
	Q_PROPERTY(bool userConfiguring READ isUserConfiguring)		Q_PROPERTY(bool userConfiguring READ isUserConfiguring)
			Q_PROPERTY(BackgroundHints backgroundHints READ backgroundHints WRITE s
			etBackgroundHints)
			Q_ENUMS(BackgroundHints)
	public:		public:
	typedef QList<Applet*> List;		typedef QList<Applet*> List;
	typedef QHash<QString, Applet*> Dict;		typedef QHash<QString, Applet*> Dict;
	/**		/**
	* Description on how draw a background for the applet		* Description on how draw a background for the applet
	*/		*/
	enum BackgroundHint {		enum BackgroundHint {
	NoBackground = 0, /**< Not drawing a background under t he		NoBackground = 0, /**< Not drawing a background under t he
	skipping to change at line 336		skipping to change at line 339
	* registered to an application.		* registered to an application.
	* @return list of categories		* @return list of categories
	* @param visibleOnly true if it should only return applets that ar e marked as visible		* @param visibleOnly true if it should only return applets that ar e marked as visible
	*/		*/
	static QStringList listCategories(const QString &parentApp = QStrin g(),		static QStringList listCategories(const QString &parentApp = QStrin g(),
	bool visibleOnly = true);		bool visibleOnly = true);
	/**		/**
	* Sets the list of custom categories that are used in addition to the default		* Sets the list of custom categories that are used in addition to the default
	* set of categories known to libplasma for Applets.		* set of categories known to libplasma for Applets.
	* @arg categories a list of categories		* @param categories a list of categories
	* @since 4.3		* @since 4.3
	*/		*/
	void setCustomCategories(const QStringList &categories);		void setCustomCategories(const QStringList &categories);
	/**		/**
	* @return the list of custom categories known to libplasma		* @return the list of custom categories known to libplasma
	* @since 4.3		* @since 4.3
	*/		*/
	QStringList customCategories();		QStringList customCategories();
	skipping to change at line 504		skipping to change at line 507
	* contextmenu.		* contextmenu.
	*		*
	* @return A list of actions. The default implementation returns an		* @return A list of actions. The default implementation returns an
	* empty list.		* empty list.
	**/		**/
	virtual QList<QAction*> contextualActions();		virtual QList<QAction*> contextualActions();
	/**		/**
	* Returns the QAction with the given name from our collection		* Returns the QAction with the given name from our collection
	*/		*/
	QAction *action(QString name) const;		Q_INVOKABLE QAction *action(QString name) const;
	/**		/**
	* Adds the action to our collection under the given name		* Adds the action to our collection under the given name
	*/		*/
	void addAction(QString name, QAction *action);		void addAction(QString name, QAction *action);
	/**		/**
	* Sets the BackgroundHints for this applet @see BackgroundHint		* Sets the BackgroundHints for this applet @see BackgroundHint
	*		*
	* @param hints the BackgroundHint combination for this applet		* @param hints the BackgroundHint combination for this applet
	skipping to change at line 802		skipping to change at line 805
	/**		/**
	* Emitted when the immutability changes		* Emitted when the immutability changes
	* @since 4.4		* @since 4.4
	*/		*/
	void immutabilityChanged(Plasma::ImmutabilityType immutable);		void immutabilityChanged(Plasma::ImmutabilityType immutable);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the immutability type for this applet (not immutable,		* Sets the immutability type for this applet (not immutable,
	* user immutable or system immutable)		* user immutable or system immutable)
	* @arg immutable the new immutability type of this applet		* @param immutable the new immutability type of this applet
	*/		*/
	void setImmutability(const ImmutabilityType immutable);		void setImmutability(const ImmutabilityType immutable);
	/**		/**
	* Destroys the applet; it will be removed nicely and deleted.		* Destroys the applet; it will be removed nicely and deleted.
	* Its configuration will also be deleted.		* Its configuration will also be deleted.
	*/		*/
	virtual void destroy();		virtual void destroy();
	/**		/**
	skipping to change at line 831		skipping to change at line 834
	* as KPropertiesDialog from libkfile.		* as KPropertiesDialog from libkfile.
	* You probably want to call showConfigurationInterface(QWidget*)		* You probably want to call showConfigurationInterface(QWidget*)
	* with the custom widget you created to actually show your interfa ce		* with the custom widget you created to actually show your interfa ce
	*/		*/
	virtual void showConfigurationInterface();		virtual void showConfigurationInterface();
	/**		/**
	* Actually show your custom configuration interface		* Actually show your custom configuration interface
	* Use this only if you reimplemented showConfigurationInterface()		* Use this only if you reimplemented showConfigurationInterface()
	*		*
	* @arg widget the widget representing your configuration interface		* @param widget the widget representing your configuration interfa ce
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	void showConfigurationInterface(QWidget *widget);		void showConfigurationInterface(QWidget *widget);
	/**		/**
	* @return true when the configuration interface is being shown		* @return true when the configuration interface is being shown
	* @since 4.5		* @since 4.5
	*/		*/
	bool isUserConfiguring() const;		bool isUserConfiguring() const;
	skipping to change at line 1120		skipping to change at line 1123
	Q_PRIVATE_SLOT(d, void themeChanged())		Q_PRIVATE_SLOT(d, void themeChanged())
	Q_PRIVATE_SLOT(d, void cleanUpAndDelete())		Q_PRIVATE_SLOT(d, void cleanUpAndDelete())
	Q_PRIVATE_SLOT(d, void selectItemToDestroy())		Q_PRIVATE_SLOT(d, void selectItemToDestroy())
	Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect))		Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect))
	Q_PRIVATE_SLOT(d, void destroyMessageOverlay())		Q_PRIVATE_SLOT(d, void destroyMessageOverlay())
	Q_PRIVATE_SLOT(d, void clearShortcutEditorPtr())		Q_PRIVATE_SLOT(d, void clearShortcutEditorPtr())
	Q_PRIVATE_SLOT(d, void configDialogFinished())		Q_PRIVATE_SLOT(d, void configDialogFinished())
	Q_PRIVATE_SLOT(d, void updateShortcuts())		Q_PRIVATE_SLOT(d, void updateShortcuts())
	Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))		Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))
	Q_PRIVATE_SLOT(d, void globalShortcutChanged())		Q_PRIVATE_SLOT(d, void globalShortcutChanged())
			Q_PRIVATE_SLOT(d, void propagateConfigChanged())
			Q_PRIVATE_SLOT(d, void handleDisappeared(AppletHandle *handle))
	/**		/**
	* Reimplemented from QGraphicsItem		* Reimplemented from QGraphicsItem
	**/		**/
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget = 0);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget = 0);
	AppletPrivate *const d;		AppletPrivate *const d;
	//Corona needs to access setFailedToLaunch and init		//Corona needs to access setFailedToLaunch and init
	friend class Corona;		friend class Corona;
End of changes. 7 change blocks.
	4 lines changed or deleted		10 lines changed or added

	appletscript.h		appletscript.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef PLASMA_APPLETSCRIPT_H		#ifndef PLASMA_APPLETSCRIPT_H
	#define PLASMA_APPLETSCRIPT_H		#define PLASMA_APPLETSCRIPT_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QRect>		#include <QtCore/QRect>
	#include <QtCore/QSizeF>		#include <QtCore/QSizeF>
	#include <kgenericfactory.h>		#include <kgenericfactory.h>
	#include <kplugininfo.h>		#include <kplugininfo.h>
			#include <plasma/containment.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	#include <plasma/scripting/scriptengine.h>		#include <plasma/scripting/scriptengine.h>
	class QAction;		class QAction;
	class QPainter;		class QPainter;
	class QStyleOptionGraphicsItem;		class QStyleOptionGraphicsItem;
	class KConfigDialog;		class KConfigDialog;
	namespace Plasma		namespace Plasma
	{		{
	skipping to change at line 122		skipping to change at line 123
	virtual QList<QAction*> contextualActions();		virtual QList<QAction*> contextualActions();
	/**		/**
	* Returns the shape of the widget, defaults to the bounding rect		* Returns the shape of the widget, defaults to the bounding rect
	*/		*/
	virtual QPainterPath shape() const;		virtual QPainterPath shape() const;
	/**		/**
	* Sets whether or not this script has a configuration interface or not		* Sets whether or not this script has a configuration interface or not
	*		*
	* @arg hasInterface true if the applet is user configurable		* @param hasInterface true if the applet is user configurable
	*/		*/
	void setHasConfigurationInterface(bool hasInterface);		void setHasConfigurationInterface(bool hasInterface);
	/**		/**
	* @see Applet		* @see Applet
	*/		*/
	void setConfigurationRequired(bool req, const QString &reason = QString ());		void setConfigurationRequired(bool req, const QString &reason = QString ());
	/**		/**
	* @see Applet		* @see Applet
	skipping to change at line 146		skipping to change at line 147
	/**		/**
	* @see Applet		* @see Applet
	*/		*/
	void configNeedsSaving() const;		void configNeedsSaving() const;
	/**		/**
	* @see Applet		* @see Applet
	*/		*/
	Extender *extender() const;		Extender *extender() const;
			//FIXME plasma2: setWallpaperEnabled and setContainmentType should beco
			me public?
			/**
			* @return true if the applet is a containment AND if the wallpaper is
			enabled
			* @see Containment
			* @since 4.7
			*/
			bool drawWallpaper() const;
			/**
			* set if the containment draws its own wallpaper: it has no effect if
			the applet is not a containment
			* @see Containment
			* @since 4.7
			*/
			void setDrawWallpaper(bool drawWallpaper);
			/**
			* @see Containment
			* @since 4.7
			*/
			Containment::Type containmentType() const;
			/**
			* @see Containment
			* @since 4.7
			*/
			void setContainmentType(Containment::Type type);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* @see Applet		* @see Applet
	*/		*/
	void saveState(KConfigGroup &group) const;		void saveState(KConfigGroup &group) const;
	/**		/**
	* @see PopupApplet		* @see PopupApplet
	*/		*/
	void popupEvent(bool popped) const;		void popupEvent(bool popped) const;
	skipping to change at line 171		skipping to change at line 198
	*/		*/
	virtual void showConfigurationInterface();		virtual void showConfigurationInterface();
	/**		/**
	* Configure was changed.		* Configure was changed.
	*/		*/
	virtual void configChanged();		virtual void configChanged();
	protected:		protected:
	/**		/**
	* @arg engine name of the engine		* @param engine name of the engine
	* @return a data engine associated with this plasmoid		* @return a data engine associated with this plasmoid
	*/		*/
	Q_INVOKABLE DataEngine *dataEngine(const QString &engine) const;		Q_INVOKABLE DataEngine *dataEngine(const QString &engine) const;
	/**		/**
	* @return absolute path to the main script file for this plasmoid		* @return absolute path to the main script file for this plasmoid
	*/		*/
	QString mainScript() const;		QString mainScript() const;
	/**		/**
	skipping to change at line 231		skipping to change at line 258
	*/		*/
	void unregisterAsDragHandle(QGraphicsItem *item);		void unregisterAsDragHandle(QGraphicsItem *item);
	/**		/**
	* @see Applet		* @see Applet
	*/		*/
	bool isRegisteredAsDragHandle(QGraphicsItem *item);		bool isRegisteredAsDragHandle(QGraphicsItem *item);
	/**		/**
	* Loads an animation from the applet package		* Loads an animation from the applet package
	* @arg animation the animation to load		* @param animation the animation to load
	* @return an Animation object on success, a NULL pointer on failure		* @return an Animation object on success, a NULL pointer on failure
	* @since 4.5		* @since 4.5
	*/		*/
	Animation *loadAnimationFromPackage(const QString &name, QObject *paren t);		Animation *loadAnimationFromPackage(const QString &name, QObject *paren t);
	private:		private:
	friend class Applet;		friend class Applet;
	friend class PopupApplet;		friend class PopupApplet;
	AppletScriptPrivate *const d;		AppletScriptPrivate *const d;
End of changes. 5 change blocks.
	3 lines changed or deleted		33 lines changed or added

	browserextension.h		browserextension.h
	skipping to change at line 290		skipping to change at line 290
	* to implement the virtual methods [and the standard-actions slots, see b elow].		* to implement the virtual methods [and the standard-actions slots, see b elow].
	*		*
	* The way to associate the BrowserExtension with the part is to simply		* The way to associate the BrowserExtension with the part is to simply
	* create the BrowserExtension as a child of the part (in QObject's terms) .		* create the BrowserExtension as a child of the part (in QObject's terms) .
	* The hosting application will look for it automatically.		* The hosting application will look for it automatically.
	*		*
	* Another aspect of the browser integration is that a set of standard		* Another aspect of the browser integration is that a set of standard
	* actions are provided by the browser, but implemented by the part		* actions are provided by the browser, but implemented by the part
	* (for the actions it supports).		* (for the actions it supports).
	*		*
	* The following standard actions are defined by the host of the view :		* The following standard actions are defined by the host of the view:
	*		*
	* [selection-dependent actions]		* [selection-dependent actions]
	* @li @p cut : Copy selected items to clipboard and store 'not cut' in cl ipboard.		* @li @p cut : Copy selected items to clipboard and store 'not cut' in cl ipboard.
	* @li @p copy : Copy selected items to clipboard and store 'cut' in clipb oard.		* @li @p copy : Copy selected items to clipboard and store 'cut' in clipb oard.
	* @li @p paste : Paste clipboard into view URL.		* @li @p paste : Paste clipboard into view URL.
	* @li @p pasteTo(const KUrl &) : Paste clipboard into given URL.		* @li @p pasteTo(const KUrl &) : Paste clipboard into given URL.
	* @li @p searchProvider : Lookup selected text at default search provider		* @li @p searchProvider : Lookup selected text at default search provider
	*		*
	* [normal actions]		* [normal actions]
	* @li None anymore.		* @li None anymore.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	busywidget.h		busywidget.h
	skipping to change at line 51		skipping to change at line 51
	class PLASMA_EXPORT BusyWidget : public QGraphicsWidget		class PLASMA_EXPORT BusyWidget : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(bool running READ isRunning WRITE setRunning)		Q_PROPERTY(bool running READ isRunning WRITE setRunning)
	Q_PROPERTY(QString label READ label WRITE setLabel)		Q_PROPERTY(QString label READ label WRITE setLabel)
	public:		public:
	/**		/**
	* Constructs a new BusyWidget		* Constructs a new BusyWidget
	*		*
	* @arg parent the parent of this widget		* @param parent the parent of this widget
	*/		*/
	explicit BusyWidget(QGraphicsWidget *parent = 0);		explicit BusyWidget(QGraphicsWidget *parent = 0);
	~BusyWidget();		~BusyWidget();
	/**		/**
	* @param running whether or not the spinner has to be animated. defaul ts to true.		* @param running whether or not the spinner has to be animated. defaul ts to true.
	*/		*/
	void setRunning(bool running);		void setRunning(bool running);
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	checkbox.h		checkbox.h
	skipping to change at line 57		skipping to change at line 57
	Q_PROPERTY(QCheckBox *nativeWidget READ nativeWidget)		Q_PROPERTY(QCheckBox *nativeWidget READ nativeWidget)
	Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)		Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)
	public:		public:
	explicit CheckBox(QGraphicsWidget *parent = 0);		explicit CheckBox(QGraphicsWidget *parent = 0);
	~CheckBox();		~CheckBox();
	/**		/**
	* Sets the display text for this CheckBox		* Sets the display text for this CheckBox
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @param path the path to the image; if a relative path, then a themed image will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Check Box		* Sets the stylesheet used to control the visual display of this Check Box
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this CheckBox		* @return the native widget wrapped by this CheckBox
	*/		*/
	QCheckBox *nativeWidget() const;		QCheckBox *nativeWidget() const;
	/**		/**
	* Sets the checked state.		* Sets the checked state.
	*		*
	* @arg checked true if checked, false if not		* @param checked true if checked, false if not
	*/		*/
	void setChecked(bool checked);		void setChecked(bool checked);
	/**		/**
	* @return the checked state		* @return the checked state
	*/		*/
	bool isChecked() const;		bool isChecked() const;
	Q_SIGNALS:		Q_SIGNALS:
	void toggled(bool);		void toggled(bool);
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	combobox.h		combobox.h
	skipping to change at line 62		skipping to change at line 62
	~ComboBox();		~ComboBox();
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Combo Box		* Sets the stylesheet used to control the visual display of this Combo Box
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* Sets the combo box wrapped by this ComboBox (widget must inherit KCo mboBox), ownership is transferred to the ComboBox		* Sets the combo box wrapped by this ComboBox (widget must inherit KCo mboBox), ownership is transferred to the ComboBox
	*		*
	* @arg combo box that will be wrapped by this ComboBox		* @param nativeWidget combo box that will be wrapped by this ComboBox
	* @since KDE4.4		* @since KDE4.4
	*/		*/
	void setNativeWidget(KComboBox *nativeWidget);		void setNativeWidget(KComboBox *nativeWidget);
	/**		/**
	* @return the native widget wrapped by this ComboBox		* @return the native widget wrapped by this ComboBox
	*/		*/
	KComboBox *nativeWidget() const;		KComboBox *nativeWidget() const;
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	config-nepomuk.h		config-nepomuk.h
	#define HAVE_NEPOMUK		/* #undef HAVE_NEPOMUK */
End of changes. 1 change blocks.
	lines changed or deleted		lines changed or added

	configloader.h		configloader.h
	skipping to change at line 112		skipping to change at line 112
	* @param config the group to use as the root for configuration items		* @param config the group to use as the root for configuration items
	* @param xml the xml data; must be valid KConfigXT data		* @param xml the xml data; must be valid KConfigXT data
	* @param parent optional QObject parent		* @param parent optional QObject parent
	**/		**/
	ConfigLoader(const KConfigGroup *config, QIODevice *xml, QObject *paren t = 0);		ConfigLoader(const KConfigGroup *config, QIODevice *xml, QObject *paren t = 0);
	~ConfigLoader();		~ConfigLoader();
	/**		/**
	* Finds the item for the given group and key.		* Finds the item for the given group and key.
	*		*
	* @arg group the group in the config file to look in		* @param group the group in the config file to look in
	* @arg key the configuration key to find		* @param key the configuration key to find
	* @return the associated KConfigSkeletonItem, or 0 if none		* @return the associated KConfigSkeletonItem, or 0 if none
	*/		*/
	KConfigSkeletonItem *findItem(const QString &group, const QString &key) ;		KConfigSkeletonItem *findItem(const QString &group, const QString &key) ;
	/**		/**
	* Finds an item by its name		* Finds an item by its name
	*/		*/
	KConfigSkeletonItem *findItemByName(const QString &name);		KConfigSkeletonItem *findItemByName(const QString &name);
	/**		/**
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	containment.h		containment.h
	skipping to change at line 305		skipping to change at line 305
	void addToolBoxAction(QAction *action);		void addToolBoxAction(QAction *action);
	/**		/**
	* Remove an action from the toolbox		* Remove an action from the toolbox
	*/		*/
	void removeToolBoxAction(QAction *action);		void removeToolBoxAction(QAction *action);
	/**		/**
	* Sets the open or closed state of the Containment's toolbox		* Sets the open or closed state of the Containment's toolbox
	*		*
	* @arg open true to open the ToolBox, false to close it		* @param open true to open the ToolBox, false to close it
	*/		*/
	void setToolBoxOpen(bool open);		void setToolBoxOpen(bool open);
	/**		/**
	* @return true if the toolbox is open		* @return true if the toolbox is open
	* @since 4.5		* @since 4.5
	*/		*/
	bool isToolBoxOpen() const;		bool isToolBoxOpen() const;
	/**		/**
	skipping to change at line 525		skipping to change at line 525
	* it will be removed nicely and deleted.		* it will be removed nicely and deleted.
	* Its configuration will also be deleted.		* Its configuration will also be deleted.
	*/		*/
	void destroy();		void destroy();
	/**		/**
	* Destroys this containment and all its applets (after a confirmat ion dialog);		* Destroys this containment and all its applets (after a confirmat ion dialog);
	* it will be removed nicely and deleted.		* it will be removed nicely and deleted.
	* Its configuration will also be deleted.		* Its configuration will also be deleted.
	*		*
	* @arg confirm whether or not confirmation from the user should be requested		* @param confirm whether or not confirmation from the user should be requested
	*/		*/
	void destroy(bool confirm);		void destroy(bool confirm);
	/**		/**
	* @reimp		* @reimp
	* @sa Applet::showConfigurationInterface()		* @sa Applet::showConfigurationInterface()
	*/		*/
	void showConfigurationInterface();		void showConfigurationInterface();
	/**		/**
	* Called when applet configuration values have changed.		* Called when applet configuration values have changed.
	* @reimp		* @reimp
	* @sa Applet::configChanged()		* @sa Applet::configChanged()
	*/		*/
	void configChanged();		void configChanged();
	protected:		protected:
			//FIXME plasma2: those should be public to allow scripted containme nts access them
	/**		/**
	* Sets the type of this containment.		* Sets the type of this containment.
	*/		*/
	void setContainmentType(Containment::Type type);		void setContainmentType(Containment::Type type);
	/**		/**
	* Sets whether wallpaper is painted or not.		* Sets whether wallpaper is painted or not.
	*/		*/
	void setDrawWallpaper(bool drawWallpaper);		void setDrawWallpaper(bool drawWallpaper);
	skipping to change at line 645		skipping to change at line 646
	* @param parent a QObject parent; you probably want to pass in 0		* @param parent a QObject parent; you probably want to pass in 0
	* @param args a list of strings containing two entries: the servic e id		* @param args a list of strings containing two entries: the servic e id
	* and the applet id		* and the applet id
	* @since 4.3		* @since 4.3
	*/		*/
	Containment(const QString &packagePath, uint appletId, const QVaria ntList &args);		Containment(const QString &packagePath, uint appletId, const QVaria ntList &args);
	Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))		Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))
	Q_PRIVATE_SLOT(d, void appletAppearAnimationComplete())		Q_PRIVATE_SLOT(d, void appletAppearAnimationComplete())
	Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())		Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())
	Q_PRIVATE_SLOT(d, void handleDisappeared(AppletHandle *handle))
	Q_PRIVATE_SLOT(d, void positionToolBox())		Q_PRIVATE_SLOT(d, void positionToolBox())
	Q_PRIVATE_SLOT(d, void requestConfiguration())		Q_PRIVATE_SLOT(d, void requestConfiguration())
	Q_PRIVATE_SLOT(d, void updateToolBoxVisibility())		Q_PRIVATE_SLOT(d, void updateToolBoxVisibility())
	Q_PRIVATE_SLOT(d, void showDropZoneDelayed())		Q_PRIVATE_SLOT(d, void showDropZoneDelayed())
	Q_PRIVATE_SLOT(d, void checkStatus(Plasma::ItemStatus))		Q_PRIVATE_SLOT(d, void checkStatus(Plasma::ItemStatus))
	Q_PRIVATE_SLOT(d, void remoteAppletReady(Plasma::AccessAppletJob *) )		Q_PRIVATE_SLOT(d, void remoteAppletReady(Plasma::AccessAppletJob *) )
	Q_PRIVATE_SLOT(d, void onContextChanged(Plasma::Context *con))		Q_PRIVATE_SLOT(d, void onContextChanged(Plasma::Context *con))
	/**		/**
	* This slot is called when the 'stat' after a job event has finishe d.		* This slot is called when the 'stat' after a job event has finishe d.
	*/		*/
	Q_PRIVATE_SLOT(d, void mimeTypeRetrieved(KIO::Job *, const QString &))		Q_PRIVATE_SLOT(d, void mimeTypeRetrieved(KIO::Job *, const QString &))
	Q_PRIVATE_SLOT(d, void dropJobResult(KJob *))		Q_PRIVATE_SLOT(d, void dropJobResult(KJob *))
	friend class Applet;		friend class Applet;
	friend class AppletPrivate;		friend class AppletPrivate;
			friend class AppletScript;
	friend class CoronaPrivate;		friend class CoronaPrivate;
	friend class ContainmentPrivate;		friend class ContainmentPrivate;
	friend class ContainmentActions;		friend class ContainmentActions;
	friend class PopupApplet;		friend class PopupApplet;
	ContainmentPrivate *const d;		ContainmentPrivate *const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 5 change blocks.
	3 lines changed or deleted		4 lines changed or added

	containmentactions.h		containmentactions.h
	skipping to change at line 207		skipping to change at line 207
	/**		/**
	* Turns a mouse or wheel event into a string suitable for a Contai nmentActions		* Turns a mouse or wheel event into a string suitable for a Contai nmentActions
	* @return the string representation of the event		* @return the string representation of the event
	*/		*/
	static QString eventToString(QEvent *event);		static QString eventToString(QEvent *event);
	/**		/**
	* Returns a popup position appropriate to the event and the size.		* Returns a popup position appropriate to the event and the size.
	*		*
	* @arg s size of the popup		* @param s size of the popup
	* @arg event a pointer to the event that triggered the popup		* @param event a pointer to the event that triggered the popup
	* @return the preferred top-left position for the popup		* @return the preferred top-left position for the popup
	* @since 4.6		* @since 4.6
	*/		*/
	QPoint popupPosition(const QSize &s, QEvent *event);		QPoint popupPosition(const QSize &s, QEvent *event);
	/**		/**
	* @reimplemented		* @reimplemented
	*/		*/
	bool event(QEvent *e);		bool event(QEvent *e);
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	conversion_check.h		conversion_check.h
	skipping to change at line 52		skipping to change at line 52
	struct QVconvertible		struct QVconvertible
	{		{
	typedef unsupported toQString;		typedef unsupported toQString;
	typedef unsupported toQVariant;		typedef unsupported toQVariant;
	};		};
	// constraint classes		// constraint classes
	template <typename T>		template <typename T>
	struct type_toQString		struct type_toQString
	{		{
	void constraint() { supported x = y; }		void constraint() { supported x = y; Q_UNUSED(x); }
	typename QVconvertible<T>::toQString y;		typename QVconvertible<T>::toQString y;
	};		};
	template <typename T>		template <typename T>
	struct type_toQVariant		struct type_toQVariant
	{		{
	void constraint() { supported x = y; }		void constraint() { supported x = y; Q_UNUSED(x); }
	typename QVconvertible<T>::toQVariant y;		typename QVconvertible<T>::toQVariant y;
	};		};
	// check if T is convertible to QString thru QVariant		// check if T is convertible to QString thru QVariant
	// if not supported can't be used in QList<T> functions		// if not supported can't be used in QList<T> functions
	template <typename T>		template <typename T>
	inline void to_QString()		inline void to_QString()
	{		{
	void (type_toQString<T>::*x)() = &type_toQString<T>::constraint;		void (type_toQString<T>::*x)() = &type_toQString<T>::constraint;
	Q_UNUSED(x);		Q_UNUSED(x);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	converter.h		converter.h
	skipping to change at line 48		skipping to change at line 48
	SquareYottameter = 1000, SquareZettameter, SquareExameter, SquarePetame ter, SquareTerameter,		SquareYottameter = 1000, SquareZettameter, SquareExameter, SquarePetame ter, SquareTerameter,
	SquareGigameter, SquareMegameter, SquareKilometer, SquareHectometer, Sq uareDecameter,		SquareGigameter, SquareMegameter, SquareKilometer, SquareHectometer, Sq uareDecameter,
	SquareMeter, SquareDecimeter, SquareCentimeter, SquareMillimeter, Squar eMicrometer,		SquareMeter, SquareDecimeter, SquareCentimeter, SquareMillimeter, Squar eMicrometer,
	SquareNanometer, SquarePicometer, SquareFemtometer, SquareAttometer, Sq uareZeptometer,		SquareNanometer, SquarePicometer, SquareFemtometer, SquareAttometer, Sq uareZeptometer,
	SquareYoctometer, Acre, SquareFoot, SquareInch, SquareMile,		SquareYoctometer, Acre, SquareFoot, SquareInch, SquareMile,
	// Length		// Length
	Yottameter = 2000, Zettameter, Exameter, Petameter, Terameter, Gigamete r, Megameter,		Yottameter = 2000, Zettameter, Exameter, Petameter, Terameter, Gigamete r, Megameter,
	Kilometer, Hectometer, Decameter, Meter, Decimeter, Centimeter, Millime ter, Micrometer,		Kilometer, Hectometer, Decameter, Meter, Decimeter, Centimeter, Millime ter, Micrometer,
	Nanometer, Picometer, Femtometer, Attometer, Zeptometer, Yoctometer, In ch, Foot, Yard,		Nanometer, Picometer, Femtometer, Attometer, Zeptometer, Yoctometer, In ch, Foot, Yard,
	Mile, NauticalMile, LightYear, Parsec, AstronomicalUnit, Thou,		Mile, NauticalMile, LightYear, Parsec, AstronomicalUnit, Thou, Angstrom ,
	// Volume		// Volume
	CubicYottameter = 3000, CubicZettameter, CubicExameter, CubicPetameter, CubicTerameter,		CubicYottameter = 3000, CubicZettameter, CubicExameter, CubicPetameter, CubicTerameter,
	CubicGigameter, CubicMegameter, CubicKilometer, CubicHectometer, CubicD ecameter, CubicMeter,		CubicGigameter, CubicMegameter, CubicKilometer, CubicHectometer, CubicD ecameter, CubicMeter,
	CubicDecimeter, CubicCentimeter, CubicMillimeter, CubicMicrometer, Cubi cNanometer,		CubicDecimeter, CubicCentimeter, CubicMillimeter, CubicMicrometer, Cubi cNanometer,
	CubicPicometer, CubicFemtometer, CubicAttometer, CubicZeptometer, Cubic Yoctometer,		CubicPicometer, CubicFemtometer, CubicAttometer, CubicZeptometer, Cubic Yoctometer,
	Yottaliter, Zettaliter, Exaliter, Petaliter, Teraliter, Gigaliter, Mega liter, Kiloliter,		Yottaliter, Zettaliter, Exaliter, Petaliter, Teraliter, Gigaliter, Mega liter, Kiloliter,
	Hectoliter, Decaliter, Liter, Deciliter, Centiliter, Milliliter, Microl iter, Nanoliter,		Hectoliter, Decaliter, Liter, Deciliter, Centiliter, Milliliter, Microl iter, Nanoliter,
	Picoliter, Femtoliter, Attoliter, Zeptoliter, Yoctoliter, CubicFoot, Cu bicInch, CubicMile,		Picoliter, Femtoliter, Attoliter, Zeptoliter, Yoctoliter, CubicFoot, Cu bicInch, CubicMile,
	FluidOunce, Cup, GallonUS, PintImperial,		FluidOunce, Cup, GallonUS, PintImperial,
	skipping to change at line 80		skipping to change at line 80
	Bar, Millibar, Decibar, Torr, TechnicalAtmosphere, Atmosphere, PoundFor cePerSquareInch,		Bar, Millibar, Decibar, Torr, TechnicalAtmosphere, Atmosphere, PoundFor cePerSquareInch,
	InchesOfMercury, MillimetersOfMercury,		InchesOfMercury, MillimetersOfMercury,
	// Temperature		// Temperature
	Kelvin = 6000, Celsius, Fahrenheit, Rankine, Delisle, TemperatureNewton , Reaumur, Romer,		Kelvin = 6000, Celsius, Fahrenheit, Rankine, Delisle, TemperatureNewton , Reaumur, Romer,
	// Energy		// Energy
	Yottajoule = 7000, Zettajoule, Exajoule, Petajoule, Terajoule, Gigajoul e, Megajoule,		Yottajoule = 7000, Zettajoule, Exajoule, Petajoule, Terajoule, Gigajoul e, Megajoule,
	Kilojoule, Hectojoule, Decajoule, Joule, Decijoule, Centijoule, Millijo ule, Microjoule,		Kilojoule, Hectojoule, Decajoule, Joule, Decijoule, Centijoule, Millijo ule, Microjoule,
	Nanojoule, Picojoule, Femtojoule, Attojoule, Zeptojoule, Yoctojoule, Gu idelineDailyAmount,		Nanojoule, Picojoule, Femtojoule, Attojoule, Zeptojoule, Yoctojoule, Gu idelineDailyAmount,
	Electronvolt, Rydberg, Kilocalorie, PhotonWavelength,		Electronvolt, Rydberg, Kilocalorie, PhotonWavelength, KiloJoulePerMole, JoulePerMole,
	// Currency		// Currency
	Eur = 8000, Ats, Bef, Nlg, Fim, Frf, Dem, Iep, Itl, Luf, Pte, Esp, Grd, Sit, Cyp, Mtl, Skk,		Eur = 8000, Ats, Bef, Nlg, Fim, Frf, Dem, Iep, Itl, Luf, Pte, Esp, Grd, Sit, Cyp, Mtl, Skk,
	Usd, Jpy, Bgn, Czk, Dkk, Eek, Gbp, Huf, Ltl, Lvl, Pln, Ron, Sek, Chf, N ok, Hrk, Rub, Try,		Usd, Jpy, Bgn, Czk, Dkk, Eek, Gbp, Huf, Ltl, Lvl, Pln, Ron, Sek, Chf, N ok, Hrk, Rub, Try,
	Aud, Brl, Cad, Cny, Hkd, Idr, Inr, Krw, Mxn, Myr, Nzd, Php, Sgd, Thb, Z ar,		Aud, Brl, Cad, Cny, Hkd, Idr, Inr, Krw, Mxn, Myr, Nzd, Php, Sgd, Thb, Z ar,
	// Velocity		// Velocity
	MeterPerSecond = 9000, KilometerPerHour, MilePerHour, FootPerSecond, In chPerSecond, Knot,		MeterPerSecond = 9000, KilometerPerHour, MilePerHour, FootPerSecond, In chPerSecond, Knot,
	Mach, SpeedOfLight, Beaufort,		Mach, SpeedOfLight, Beaufort,
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	copyjob.h		copyjob.h
	skipping to change at line 114		skipping to change at line 114
	/**		/**
	* Skip copying or moving any file when the destination already exi sts,		* Skip copying or moving any file when the destination already exi sts,
	* instead of the default behavior (interactive mode: showing a dia log to the user,		* instead of the default behavior (interactive mode: showing a dia log to the user,
	* non-interactive mode: aborting with an error).		* non-interactive mode: aborting with an error).
	* Initially added for a unit test.		* Initially added for a unit test.
	* \since 4.2		* \since 4.2
	*/		*/
	void setAutoSkip(bool autoSkip);		void setAutoSkip(bool autoSkip);
	/**		/**
			* Rename files automatically when the destination already exists,
			* instead of the default behavior (interactive mode: showing a dia
			log to the user,
			* non-interactive mode: aborting with an error).
			* Initially added for a unit test.
			* \since 4.7
			*/
			void setAutoRename(bool autoRename);
			/**
	* Reuse any directory that already exists, instead of the default behavior		* Reuse any directory that already exists, instead of the default behavior
	* (interactive mode: showing a dialog to the user,		* (interactive mode: showing a dialog to the user,
	* non-interactive mode: aborting with an error).		* non-interactive mode: aborting with an error).
	* \since 4.2		* \since 4.2
	*/		*/
	void setWriteIntoExistingDirectories(bool overwriteAllDirs);		void setWriteIntoExistingDirectories(bool overwriteAllDirs);
	/**		/**
	* Reimplemented for internal reasons		* Reimplemented for internal reasons
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		10 lines changed or added

	corona.h		corona.h
	skipping to change at line 70		skipping to change at line 70
	* text/x-plasmoidservicename		* text/x-plasmoidservicename
	*/		*/
	void setAppletMimeType(const QString &mimetype);		void setAppletMimeType(const QString &mimetype);
	/**		/**
	* The current mime type of Drag/Drop items.		* The current mime type of Drag/Drop items.
	*/		*/
	QString appletMimeType();		QString appletMimeType();
	/**		/**
			* @return the default containment plugin type
			* @since 4.7
			*/
			QString defaultContainmentPlugin() const;
			/**
	* @return all containments on this Corona		* @return all containments on this Corona
	*/		*/
	QList<Containment*> containments() const;		QList<Containment*> containments() const;
	/**		/**
	* Clear the Corona from all applets.		* Clear the Corona from all applets.
	*/		*/
	void clearContainments();		void clearContainments();
	/**		/**
	* Returns the config file used to store the configuration for this Cor ona		* Returns the config file used to store the configuration for this Cor ona
	*/		*/
	KSharedConfig::Ptr config() const;		KSharedConfig::Ptr config() const;
	/**		/**
	* Adds a Containment to the Corona		* Adds a Containment to the Corona
	*		*
	* @param name the plugin name for the containment, as given by		* @param name the plugin name for the containment, as given by
	* KPluginInfo::pluginName(). If an empty string is passed in, t he defalt		* KPluginInfo::pluginName(). If an empty string is passed in, t he default
	* containment plugin will be used (usually DesktopContainment). If the		* containment plugin will be used (usually DesktopContainment). If the
	* string literal "null" is passed in, then no plugin will be lo aded and		* string literal "null" is passed in, then no plugin will be lo aded and
	* a simple Containment object will be created instead.		* a simple Containment object will be created instead.
	* @param args argument list to pass to the containment		* @param args argument list to pass to the containment
	*		*
	* @return a pointer to the containment on success, or 0 on failure		* @return a pointer to the containment on success, or 0 on failure. Fa
			ilure can be
			* caused by too restrictive of an Immutability type, as containments c
			annot be added
			* when widgets are locked, or if the requested containment plugin can
			not be located
			* or successfully loaded.
	*/		*/
	Containment *addContainment(const QString &name, const QVariantList &ar gs = QVariantList());		Containment *addContainment(const QString &name, const QVariantList &ar gs = QVariantList());
	/**		/**
	* Returns the Containment, if any, for a given physical screen and des ktop		* Returns the Containment, if any, for a given physical screen and des ktop
	*		*
	* @param screen number of the physical screen to locate		* @param screen number of the physical screen to locate
	* @param desktop the virtual desktop) to locate; if < 0 then it will		* @param desktop the virtual desktop) to locate; if < 0 then it will
	* simply return the first Containment associated with screen		* simply return the first Containment associated with screen
	*/		*/
	skipping to change at line 334		skipping to change at line 343
	* Load applet layout from a config file. The results will be added to the		* Load applet layout from a config file. The results will be added to the
	* current set of Containments.		* current set of Containments.
	*		*
	* @param config the name of the config file to load from,		* @param config the name of the config file to load from,
	* or the default config file if QString()		* or the default config file if QString()
	*/		*/
	void loadLayout(const QString &config = QString());		void loadLayout(const QString &config = QString());
	/**		/**
	* Save applets layout to file		* Save applets layout to file
	* @arg config the file to save to, or the default config file if QStri ng()		* @param config the file to save to, or the default config file if QSt ring()
	*/		*/
	void saveLayout(const QString &config = QString()) const;		void saveLayout(const QString &config = QString()) const;
	/**		/**
	* @return The type of immutability of this Corona		* @return The type of immutability of this Corona
	*/		*/
	ImmutabilityType immutability() const;		ImmutabilityType immutability() const;
	/**		/**
	* Sets the immutability type for this Corona (not immutable,		* Sets the immutability type for this Corona (not immutable,
	* user immutable or system immutable)		* user immutable or system immutable)
	* @arg immutable the new immutability type of this applet		* @param immutable the new immutability type of this applet
	*/		*/
	void setImmutability(const ImmutabilityType immutable);		void setImmutability(const ImmutabilityType immutable);
	/**		/**
	* Schedules a flush-to-disk synchronization of the configuration state		* Schedules a flush-to-disk synchronization of the configuration state
	* at the next convenient moment.		* at the next convenient moment.
	*/		*/
	void requestConfigSync();		void requestConfigSync();
	/**		/**
	skipping to change at line 444		skipping to change at line 453
	* for implementations of loadDefaultLayout. The caller is responsible		* for implementations of loadDefaultLayout. The caller is responsible
	* for all initializating, saving and notification of a new containment .		* for all initializating, saving and notification of a new containment .
	*		*
	* @param name the plugin name for the containment, as given by		* @param name the plugin name for the containment, as given by
	* KPluginInfo::pluginName(). If an empty string is passed in, t he defalt		* KPluginInfo::pluginName(). If an empty string is passed in, t he defalt
	* containment plugin will be used (usually DesktopContainment). If the		* containment plugin will be used (usually DesktopContainment). If the
	* string literal "null" is passed in, then no plugin will be lo aded and		* string literal "null" is passed in, then no plugin will be lo aded and
	* a simple Containment object will be created instead.		* a simple Containment object will be created instead.
	* @param args argument list to pass to the containment		* @param args argument list to pass to the containment
	*		*
	* @return a pointer to the containment on success, or 0 on failure		* @return a pointer to the containment on success, or 0 on failure. Fa
			ilure can
			* be caused by the Immutability type being too restrictive, as contain
			ments can't be added
			* when widgets are locked, or if the requested containment plugin can
			not be located
			* or successfully loaded.
			* @see addContainment
	**/		**/
	Containment *addContainmentDelayed(const QString &name,		Containment *addContainmentDelayed(const QString &name,
	const QVariantList &args = QVariantL ist());		const QVariantList &args = QVariantL ist());
	/**		/**
	* Maps a stock animation to one of the semantic animations. Used to co ntrol things such		* Maps a stock animation to one of the semantic animations. Used to co ntrol things such
	* as what animation is used to make a Plasma::Appear appear in a conta inment.		* as what animation is used to make a Plasma::Appear appear in a conta inment.
	* @arg from the animation to map a new value to		* @param from the animation to map a new value to
	* @arg to the animation value to map to from		* @param to the animation value to map to from
	* @since 4.5		* @since 4.5
	*/		*/
	void mapAnimation(Animator::Animation from, Animator::Animation to);		void mapAnimation(Animator::Animation from, Animator::Animation to);
	/**		/**
	* Maps a loadable animation to one of the semantic animations. Used to control things such		* Maps a loadable animation to one of the semantic animations. Used to control things such
	* as what animation is used to make a Plasma::Appear appear in a conta inment.		* as what animation is used to make a Plasma::Appear appear in a conta inment.
	* @arg from the animation to map a new value to		* @param from the animation to map a new value to
	* @arg to the animation value to map to from; this must map to a Javas		* @param to the animation value to map to from; this must map to a Jav
	cript animation		ascript animation
	* @since 4.5		* @since 4.5
	*/		*/
	void mapAnimation(Animator::Animation from, const QString &to);		void mapAnimation(Animator::Animation from, const QString &to);
	/**		/**
	* @return The preferred toolbox plugin name for a given containment ty pe.		* @return The preferred toolbox plugin name for a given containment ty pe.
	* @param type the containment type of which we want to know the prefer red toolbox plugin.		* @param type the containment type of which we want to know the prefer red toolbox plugin.
	* @param plugin the toolbox plugin name		* @param plugin the toolbox plugin name
	* @since 4.6		* @since 4.6
	*/		*/
	void setPreferredToolBoxPlugin(const Containment::Type type, const QStr ing &plugin);		void setPreferredToolBoxPlugin(const Containment::Type type, const QStr ing &plugin);
			/**
			* Sets the default containment plugin to try and load
			* @since 4.7
			*/
			void setDefaultContainmentPlugin(const QString &name);
	//Reimplemented from QGraphicsScene		//Reimplemented from QGraphicsScene
	void dragEnterEvent(QGraphicsSceneDragDropEvent *event);		void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
	void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);		void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
	void dragMoveEvent(QGraphicsSceneDragDropEvent *event);		void dragMoveEvent(QGraphicsSceneDragDropEvent *event);
	private:		private:
	CoronaPrivate *const d;		CoronaPrivate *const d;
	Q_PRIVATE_SLOT(d, void containmentDestroyed(QObject*))		Q_PRIVATE_SLOT(d, void containmentDestroyed(QObject*))
	Q_PRIVATE_SLOT(d, void offscreenWidgetDestroyed(QObject *))		Q_PRIVATE_SLOT(d, void offscreenWidgetDestroyed(QObject *))
End of changes. 9 change blocks.
	10 lines changed or deleted		35 lines changed or added

	dataengine.h		dataengine.h
	skipping to change at line 86		skipping to change at line 86
	* @param service pointer to the service that describes the engine		* @param service pointer to the service that describes the engine
	**/		**/
	explicit DataEngine(QObject *parent = 0, KService::Ptr service = KS ervice::Ptr(0));		explicit DataEngine(QObject *parent = 0, KService::Ptr service = KS ervice::Ptr(0));
	DataEngine(QObject *parent, const QVariantList &args);		DataEngine(QObject *parent, const QVariantList &args);
	~DataEngine();		~DataEngine();
	/**		/**
	* This method is called when the DataEngine is started. When this		* This method is called when the DataEngine is started. When this
	* method is called the DataEngine is fully constructed and ready t o be		* method is called the DataEngine is fully constructed and ready t o be
	* used. This method should be reimplemented by DataEngine subclass es		* used. This method should be reimplemented by DataEngine subclass es
	* which have the need to perform a startup routine.		* which need to perform a startup routine.
			*
			* The default implementation does nothing. Reimplementations in
			* subclasses don't need to call this one.
	**/		**/
	virtual void init();		virtual void init();
	/**		/**
	* @return a list of all the data sources available via this DataEn gine		* @return a list of all the data sources available via this DataEn gine
	* Whether these sources are currently available (which is what		* Whether these sources are currently available (which is what
	* the default implementation provides) or not is up to the		* the default implementation provides) or not is up to the
	* DataEngine to decide.		* DataEngine to decide.
	**/		**/
	virtual QStringList sources() const;		virtual QStringList sources() const;
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	declarativewidget.h		declarativewidget.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef PLASMA_DECLARATIVEWIDGET_H		#ifndef PLASMA_DECLARATIVEWIDGET_H
	#define PLASMA_DECLARATIVEWIDGET_H		#define PLASMA_DECLARATIVEWIDGET_H
	#include <QtGui/QGraphicsWidget>		#include <QtGui/QGraphicsWidget>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	class QDeclarativeEngine;		class QDeclarativeEngine;
	class QDeclarativeComponent;		class QDeclarativeComponent;
			class QScriptEngine;
	namespace Plasma		namespace Plasma
	{		{
	class DeclarativeWidgetPrivate;		class DeclarativeWidgetPrivate;
	/**		/**
	* @class DeclarativeWidget plasma/declarativewidget.h <Plasma/DeclarativeW idget>		* @class DeclarativeWidget plasma/declarativewidget.h <Plasma/DeclarativeW idget>
	*		*
	* @author Marco Martin <mart@kde.org>		* @author Marco Martin <mart@kde.org>
	skipping to change at line 101		skipping to change at line 102
	* at the end of the event loop		* at the end of the event loop
	*/		*/
	bool isInitializationDelayed() const;		bool isInitializationDelayed() const;
	/**		/**
	* @return the declarative engine that runs the qml file assigned to th is widget.		* @return the declarative engine that runs the qml file assigned to th is widget.
	*/		*/
	QDeclarativeEngine* engine();		QDeclarativeEngine* engine();
	/**		/**
			* @return the script engine used by the declarative engine
			* @since 4.7
			*/
			QScriptEngine *scriptEngine() const;
			/**
	* @return the root object of the declarative object tree		* @return the root object of the declarative object tree
	*/		*/
	QObject *rootObject() const;		QObject *rootObject() const;
	/**		/**
	* @return the main QDeclarativeComponent of the engine		* @return the main QDeclarativeComponent of the engine
	*/		*/
	QDeclarativeComponent *mainComponent() const;		QDeclarativeComponent *mainComponent() const;
	protected:		protected:
End of changes. 2 change blocks.
	0 lines changed or deleted		7 lines changed or added

	device.h		device.h
	skipping to change at line 43		skipping to change at line 43
	namespace Solid		namespace Solid
	{		{
	class DevicePrivate;		class DevicePrivate;
	/**		/**
	* This class allows applications to deal with devices available in the		* This class allows applications to deal with devices available in the
	* underlying system.		* underlying system.
	*		*
	* Device stores a reference to device data provided by the backend.		* Device stores a reference to device data provided by the backend.
	* Device objects are designed to be used by value. Copying these obje cts		* Device objects are designed to be used by value. Copying these objec ts
	* is quite cheap, so using pointers to the me is generally not needed.		* is quite cheap, so using pointers to the me is generally not needed.
	*		*
	* @author Kevin Ottens <ervin@kde.org>		* @author Kevin Ottens <ervin@kde.org>
	*/		*/
	class SOLID_EXPORT Device		class SOLID_EXPORT Device
	{		{
	public:		public:
	/**		/**
	* Retrieves all the devices available in the underlying system.		* Retrieves all the devices available in the underlying system.
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	deviceinterface.h		deviceinterface.h
	skipping to change at line 65		skipping to change at line 65
	* - StorageAccess : A mechanism to access data on a storage device		* - StorageAccess : A mechanism to access data on a storage device
	* - StorageDrive : A storage drive		* - StorageDrive : A storage drive
	* - OpticalDrive : An optical drive (CD-ROM, DVD, ...)		* - OpticalDrive : An optical drive (CD-ROM, DVD, ...)
	* - StorageVolume : A volume		* - StorageVolume : A volume
	* - OpticalDisc : An optical disc		* - OpticalDisc : An optical disc
	* - Camera : A digital camera		* - Camera : A digital camera
	* - PortableMediaPlayer: A portable media player		* - PortableMediaPlayer: A portable media player
	* - NetworkInterface: A network interface		* - NetworkInterface: A network interface
	* - SerialInterface: A serial interface		* - SerialInterface: A serial interface
	* - SmartCardReader: A smart card reader interface		* - SmartCardReader: A smart card reader interface
			* - NetworkShare: A network share interface
	*/		*/
	enum Type { Unknown = 0, GenericInterface = 1, Processor = 2,		enum Type { Unknown = 0, GenericInterface = 1, Processor = 2,
	Block = 3, StorageAccess = 4, StorageDrive = 5,		Block = 3, StorageAccess = 4, StorageDrive = 5,
	OpticalDrive = 6, StorageVolume = 7, OpticalDisc = 8,		OpticalDrive = 6, StorageVolume = 7, OpticalDisc = 8,
	Camera = 9, PortableMediaPlayer = 10,		Camera = 9, PortableMediaPlayer = 10,
	NetworkInterface = 11, AcAdapter = 12, Battery = 13,		NetworkInterface = 11, AcAdapter = 12, Battery = 13,
	Button = 14, AudioInterface = 15, DvbInterface = 16, Vi deo = 17,		Button = 14, AudioInterface = 15, DvbInterface = 16, Vi deo = 17,
	SerialInterface = 18, SmartCardReader = 19, InternetGat eway = 20,		SerialInterface = 18, SmartCardReader = 19, InternetGat eway = 20,
	Last = 0xffff };		NetworkShare = 21, Last = 0xffff };
	/**		/**
	* Destroys a DeviceInterface object.		* Destroys a DeviceInterface object.
	*/		*/
	virtual ~DeviceInterface();		virtual ~DeviceInterface();
	/**		/**
	* Indicates if this device interface is valid.		* Indicates if this device interface is valid.
	* A device interface is considered valid if the device it is refer ring is available in the system.		* A device interface is considered valid if the device it is refer ring is available in the system.
	*		*
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	dom_string.h		dom_string.h
	skipping to change at line 133		skipping to change at line 133
	bool endsWith(const DOMString& str) const;		bool endsWith(const DOMString& str) const;
	bool startsWith(const DOMString& str) const;		bool startsWith(const DOMString& str) const;
	/**		/**
	* @internal get a handle to the imlementation of the DOMString		* @internal get a handle to the imlementation of the DOMString
	* Use at own risk!!!		* Use at own risk!!!
	*/		*/
	DOMStringImpl *implementation() const { return impl; }		DOMStringImpl *implementation() const { return impl; }
	static DOMString format(const char* format, ...);		static DOMString format(const char* format, ...)
			#if defined(__GNUC__)
			__attribute__ ((format (printf, 1, 2)))
			#endif
			;
	protected:		protected:
	DOMStringImpl *impl;		DOMStringImpl *impl;
	};		};
	inline QDebug operator<<(QDebug stream, const DOMString &string) {		inline QDebug operator<<(QDebug stream, const DOMString &string) {
	return (stream << (string.implementation() ? string.string() : QStri ng::fromLatin1("null")));		return (stream << (string.implementation() ? string.string() : QStri ng::fromLatin1("null")));
	}		}
	KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );		KHTML_EXPORT bool operator==( const DOMString &a, const DOMString &b );
End of changes. 1 change blocks.
	1 lines changed or deleted		5 lines changed or added

	downloadmanager.h		downloadmanager.h
	skipping to change at line 86		skipping to change at line 86
	*/		*/
	void checkForUpdates();		void checkForUpdates();
	/**		/**
	Installs or updates an entry		Installs or updates an entry
	@param entry		@param entry
	*/		*/
	void installEntry(const KNS3::Entry& entry);		void installEntry(const KNS3::Entry& entry);
	/**		/**
			* Uninstalls the given entry.
			* @param entry The entry which will be uninstalled.
			* @since 4.7
			*/
			void uninstallEntry(const KNS3::Entry& entry);
			/**
	Sets the search term to filter the results on the server.		Sets the search term to filter the results on the server.
	Note that this function does not trigger a search. Use search after s etting this.		Note that this function does not trigger a search. Use search after s etting this.
	@param searchTerm		@param searchTerm
	*/		*/
	void setSearchTerm(const QString& searchTerm);		void setSearchTerm(const QString& searchTerm);
	/**		/**
	Set the sort order of the results. This depends on the server.		Set the sort order of the results. This depends on the server.
	Note that this function does not trigger a search. Use search after s etting this.		Note that this function does not trigger a search. Use search after s etting this.
	@see SortOrder		@see SortOrder
End of changes. 1 change blocks.
	0 lines changed or deleted		7 lines changed or added

	fileundomanager.h		fileundomanager.h
	skipping to change at line 129		skipping to change at line 129
	* @param ui the UiInterface instance, which becomes owned by the undo manager.		* @param ui the UiInterface instance, which becomes owned by the undo manager.
	*/		*/
	void setUiInterface(UiInterface* ui);		void setUiInterface(UiInterface* ui);
	/**		/**
	* @return the UiInterface instance passed to setUiInterface.		* @return the UiInterface instance passed to setUiInterface.
	* This is useful for calling setParentWidget on it. Never delete it!		* This is useful for calling setParentWidget on it. Never delete it!
	*/		*/
	UiInterface* uiInterface() const;		UiInterface* uiInterface() const;
	enum CommandType { Copy, Move, Rename, Link, Mkdir, Trash };		/**
			* The type of job.
			*
			* Put: @since 4.7, represents the creation of a file from data in memo
			ry.
			* Used when pasting data from clipboard or drag-n-drop.
			*/
			enum CommandType { Copy, Move, Rename, Link, Mkdir, Trash, Put };
	/**		/**
	* Record this job while it's happening and add a command for it so tha t the user can undo it.		* Record this job while it's happening and add a command for it so tha t the user can undo it.
	* The signal jobRecordingStarted() is emitted.		* The signal jobRecordingStarted() is emitted.
	* @param op the type of job - which is also the type of command that w ill be created for it		* @param op the type of job - which is also the type of command that w ill be created for it
	* @param src list of source urls		* @param src list of source urls
	* @param dst destination url		* @param dst destination url
	* @param job the job to record		* @param job the job to record
	*/		*/
	void recordJob(CommandType op, const KUrl::List &src, const KUrl &dst, KIO::Job *job);		void recordJob(CommandType op, const KUrl::List &src, const KUrl &dst, KIO::Job *job);
End of changes. 1 change blocks.
	1 lines changed or deleted		8 lines changed or added

	frame.h		frame.h
	skipping to change at line 62		skipping to change at line 62
	public:		public:
	enum Shadow {		enum Shadow {
	Plain = 1,		Plain = 1,
	Raised = 2,		Raised = 2,
	Sunken = 3		Sunken = 3
	};		};
	/**		/**
	* Constructs a new Frame		* Constructs a new Frame
	*		*
	* @arg parent the parent of this widget		* @param parent the parent of this widget
	*/		*/
	explicit Frame(QGraphicsWidget *parent = 0);		explicit Frame(QGraphicsWidget *parent = 0);
	~Frame();		~Frame();
	/**		/**
	* Sets the Frame's shadow style		* Sets the Frame's shadow style
	*		*
	* @arg shadow plain, raised or sunken		* @param shadow plain, raised or sunken
	*/		*/
	void setFrameShadow(Shadow shadow);		void setFrameShadow(Shadow shadow);
	/**		/**
	* @return the Frame's shadow style		* @return the Frame's shadow style
	*/		*/
	Shadow frameShadow() const;		Shadow frameShadow() const;
	/**		/**
	* Sets what borders should be painted		* Sets what borders should be painted
	* @arg flags borders we want to paint		* @param flags borders we want to paint
	*/		*/
	void setEnabledBorders(const FrameSvg::EnabledBorders borders);		void setEnabledBorders(const FrameSvg::EnabledBorders borders);
	/**		/**
	* Convenience method to get the enabled borders		* Convenience method to get the enabled borders
	* @return what borders are painted		* @return what borders are painted
	* @since 4.4		* @since 4.4
	*/		*/
	FrameSvg::EnabledBorders enabledBorders() const;		FrameSvg::EnabledBorders enabledBorders() const;
	/**		/**
	* Set the text to display by this Frame		* Set the text to display by this Frame
	*		*
	* @arg text the text		* @param text the text
	* @since 4.4		* @since 4.4
	*/		*/
	void setText(QString text);		void setText(QString text);
	/**		/**
	* @return text displayed from this Frame		* @return text displayed from this Frame
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @param path the path to the image; if a relative path, then a themed image will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Frame		* Sets the stylesheet used to control the visual display of this Frame
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet() const;		QString styleSheet() const;
	/**		/**
	* @return the native widget wrapped by this Frame		* @return the native widget wrapped by this Frame
End of changes. 6 change blocks.
	6 lines changed or deleted		6 lines changed or added

	framesvg.h		framesvg.h
	skipping to change at line 102		skipping to change at line 102
	RightBorder = 8,		RightBorder = 8,
	AllBorders = TopBorder | BottomBorder | LeftBorder | RightBorde r		AllBorders = TopBorder | BottomBorder | LeftBorder | RightBorde r
	};		};
	Q_DECLARE_FLAGS(EnabledBorders, EnabledBorder)		Q_DECLARE_FLAGS(EnabledBorders, EnabledBorder)
	/**		/**
	* Constructs a new FrameSvg that paints the proper named subelemen ts		* Constructs a new FrameSvg that paints the proper named subelemen ts
	* as borders. It may also be used as a regular Plasma::Svg object		* as borders. It may also be used as a regular Plasma::Svg object
	* for direct access to elements in the Svg.		* for direct access to elements in the Svg.
	*		*
	* @arg parent options QObject to parent this to		* @param parent options QObject to parent this to
	*		*
	* @related Plasma::Theme		* @related Plasma::Theme
	*/		*/
	explicit FrameSvg(QObject *parent = 0);		explicit FrameSvg(QObject *parent = 0);
	~FrameSvg();		~FrameSvg();
	/**		/**
	* Loads a new Svg		* Loads a new Svg
	* @arg imagePath the new file		* @param imagePath the new file
	*/		*/
	Q_INVOKABLE void setImagePath(const QString &path);		Q_INVOKABLE void setImagePath(const QString &path);
	/**		/**
	* Sets what borders should be painted		* Sets what borders should be painted
	* @arg flags borders we want to paint		* @param flags borders we want to paint
	*/		*/
	void setEnabledBorders(const EnabledBorders borders);		void setEnabledBorders(const EnabledBorders borders);
	/**		/**
	* Convenience method to get the enabled borders		* Convenience method to get the enabled borders
	* @return what borders are painted		* @return what borders are painted
	*/		*/
	EnabledBorders enabledBorders() const;		EnabledBorders enabledBorders() const;
	/**		/**
	* Resize the frame maintaining the same border size		* Resize the frame maintaining the same border size
	* @arg size the new size of the frame		* @param size the new size of the frame
	*/		*/
	Q_INVOKABLE void resizeFrame(const QSizeF &size);		Q_INVOKABLE void resizeFrame(const QSizeF &size);
	/**		/**
	* @returns the size of the frame		* @returns the size of the frame
	*/		*/
	Q_INVOKABLE QSizeF frameSize() const;		Q_INVOKABLE QSizeF frameSize() const;
	/**		/**
	* Returns the margin size given the margin edge we want		* Returns the margin size given the margin edge we want
	* @arg edge the margin edge we want, top, bottom, left or right		* @param edge the margin edge we want, top, bottom, left or right
	* @return the margin size		* @return the margin size
	*/		*/
	Q_INVOKABLE qreal marginSize(const Plasma::MarginEdge edge) const;		Q_INVOKABLE qreal marginSize(const Plasma::MarginEdge edge) const;
	/**		/**
	* Convenience method that extracts the size of the four margins		* Convenience method that extracts the size of the four margins
	* in the four output parameters		* in the four output parameters
	* @arg left left margin size		* @param left left margin size
	* @arg top top margin size		* @param top top margin size
	* @arg right right margin size		* @param right right margin size
	* @arg bottom bottom margin size		* @param bottom bottom margin size
	*/		*/
	Q_INVOKABLE void getMargins(qreal &left, qreal &top, qreal &right, qreal &bottom) const;		Q_INVOKABLE void getMargins(qreal &left, qreal &top, qreal &right, qreal &bottom) const;
	/**		/**
	* @return the rectangle of the center element, taking the margins into account.		* @return the rectangle of the center element, taking the margins into account.
	*/		*/
	Q_INVOKABLE QRectF contentsRect() const;		Q_INVOKABLE QRectF contentsRect() const;
	/**		/**
	* Sets the prefix (@see setElementPrefix) to 'north', 'south', 'we st' and 'east'		* Sets the prefix (@see setElementPrefix) to 'north', 'south', 'we st' and 'east'
	* when the location is TopEdge, BottomEdge, LeftEdge and RightEdge ,		* when the location is TopEdge, BottomEdge, LeftEdge and RightEdge ,
	* respectively. Clears the prefix in other cases.		* respectively. Clears the prefix in other cases.
	*		*
	* The prefix must exist in the SVG document, which means that this can only be		* The prefix must exist in the SVG document, which means that this can only be
	* called successfully after setImagePath is called.		* called successfully after setImagePath is called.
	* @arg location location in the UI this frame will be drawn		* @param location location in the UI this frame will be drawn
	*/		*/
	Q_INVOKABLE void setElementPrefix(Plasma::Location location);		Q_INVOKABLE void setElementPrefix(Plasma::Location location);
	/**		/**
	* Sets the prefix for the SVG elements to be used for painting. Fo r example,		* Sets the prefix for the SVG elements to be used for painting. Fo r example,
	* if prefix is 'active', then instead of using the 'top' element o f the SVG		* if prefix is 'active', then instead of using the 'top' element o f the SVG
	* file to paint the top border, 'active-top' element will be used. The same		* file to paint the top border, 'active-top' element will be used. The same
	* goes for other SVG elements.		* goes for other SVG elements.
	*		*
	* If the elements with prefixes are not present, the default ones are used.		* If the elements with prefixes are not present, the default ones are used.
	* (for the sake of speed, the test is present only for the 'center ' element)		* (for the sake of speed, the test is present only for the 'center ' element)
	*		*
	* Setting the prefix manually resets the location to Floating.		* Setting the prefix manually resets the location to Floating.
	*		*
	* The prefix must exist in the SVG document, which means that this can only be		* The prefix must exist in the SVG document, which means that this can only be
	* called successfully after setImagePath is called.		* called successfully after setImagePath is called.
	*		*
	* @arg prefix prefix for the SVG elements that make up the frame		* @param prefix prefix for the SVG elements that make up the frame
	*/		*/
	Q_INVOKABLE void setElementPrefix(const QString & prefix);		Q_INVOKABLE void setElementPrefix(const QString & prefix);
	/**		/**
	* @return true if the svg has the necessary elements with the give n prefix		* @return true if the svg has the necessary elements with the give n prefix
	* to draw a frame		* to draw a frame
	* @arg prefix the given prefix we want to check if drawable		* @param prefix the given prefix we want to check if drawable
	*/		*/
	Q_INVOKABLE bool hasElementPrefix(const QString & prefix) const;		Q_INVOKABLE bool hasElementPrefix(const QString & prefix) const;
	/**		/**
	* This is an overloaded method provided for convenience equivalent to		* This is an overloaded method provided for convenience equivalent to
	* hasElementPrefix("north"), hasElementPrefix("south")		* hasElementPrefix("north"), hasElementPrefix("south")
	* hasElementPrefix("west") and hasElementPrefix("east")		* hasElementPrefix("west") and hasElementPrefix("east")
	* @return true if the svg has the necessary elements with the give n prefix		* @return true if the svg has the necessary elements with the give n prefix
	* to draw a frame.		* to draw a frame.
	* @arg location the given prefix we want to check if drawable		* @param location the given prefix we want to check if drawable
	*/		*/
	Q_INVOKABLE bool hasElementPrefix(Plasma::Location location) const;		Q_INVOKABLE bool hasElementPrefix(Plasma::Location location) const;
	/**		/**
	* Returns the prefix for SVG elements of the FrameSvg		* Returns the prefix for SVG elements of the FrameSvg
	* @return the prefix		* @return the prefix
	*/		*/
	Q_INVOKABLE QString prefix();		Q_INVOKABLE QString prefix();
	/**		/**
	skipping to change at line 225		skipping to change at line 225
	*/		*/
	Q_INVOKABLE QRegion mask() const;		Q_INVOKABLE QRegion mask() const;
	/**		/**
	* @return a pixmap whose alpha channel is the opacity of the frame . It may be the frame itself or a special frame with the mask- prefix		* @return a pixmap whose alpha channel is the opacity of the frame . It may be the frame itself or a special frame with the mask- prefix
	*/		*/
	QPixmap alphaMask() const;		QPixmap alphaMask() const;
	/**		/**
	* Sets whether saving all the rendered prefixes in a cache or not		* Sets whether saving all the rendered prefixes in a cache or not
	* @arg cache if use the cache or not		* @param cache if use the cache or not
	*/		*/
	Q_INVOKABLE void setCacheAllRenderedFrames(bool cache);		Q_INVOKABLE void setCacheAllRenderedFrames(bool cache);
	/**		/**
	* @return if all the different prefixes should be kept in a cache w hen rendered		* @return if all the different prefixes should be kept in a cache w hen rendered
	*/		*/
	Q_INVOKABLE bool cacheAllRenderedFrames() const;		Q_INVOKABLE bool cacheAllRenderedFrames() const;
	/**		/**
	* Deletes the internal cache freeing memory: use this if you want t o switch the rendered		* Deletes the internal cache freeing memory: use this if you want t o switch the rendered
	* element and you don't plan to switch back to the previous one for a long time and you		* element and you don't plan to switch back to the previous one for a long time and you
	* used setUseCache(true)		* used setUsingRenderingCache(true)
	*/		*/
	Q_INVOKABLE void clearCache();		Q_INVOKABLE void clearCache();
	/**		/**
	* Returns a pixmap of the SVG represented by this object.		* Returns a pixmap of the SVG represented by this object.
	*		*
	* @arg elelementId the ID string of the element to render, or an e mpty		* @param elelementId the ID string of the element to render, or an empty
	* string for the whole SVG (the default)		* string for the whole SVG (the default)
	* @return a QPixmap of the rendered SVG		* @return a QPixmap of the rendered SVG
	*/		*/
	Q_INVOKABLE QPixmap framePixmap();		Q_INVOKABLE QPixmap framePixmap();
	/**		/**
	* Paints the loaded SVG with the elements that represents the bord er		* Paints the loaded SVG with the elements that represents the bord er
	* @arg painter the QPainter to use		* @param painter the QPainter to use
	* @arg target the target rectangle on the paint device		* @param target the target rectangle on the paint device
	* @arg source the portion rectangle of the source image		* @param source the portion rectangle of the source image
	*/		*/
	Q_INVOKABLE void paintFrame(QPainter *painter, const QRectF &target ,		Q_INVOKABLE void paintFrame(QPainter *painter, const QRectF &target ,
	const QRectF &source = QRectF());		const QRectF &source = QRectF());
	/**		/**
	* Paints the loaded SVG with the elements that represents the bord er		* Paints the loaded SVG with the elements that represents the bord er
	* This is an overloaded member provided for convenience		* This is an overloaded member provided for convenience
	* @arg painter the QPainter to use		* @param painter the QPainter to use
	* @arg pos where to paint the svg		* @param pos where to paint the svg
	*/		*/
	Q_INVOKABLE void paintFrame(QPainter *painter, const QPointF &pos = QPointF(0, 0));		Q_INVOKABLE void paintFrame(QPainter *painter, const QPointF &pos = QPointF(0, 0));
	private:		private:
	FrameSvgPrivate *const d;		FrameSvgPrivate *const d;
	friend class Applet;		friend class Applet;
	Q_PRIVATE_SLOT(d, void updateSizes())		Q_PRIVATE_SLOT(d, void updateSizes())
	Q_PRIVATE_SLOT(d, void updateNeeded())		Q_PRIVATE_SLOT(d, void updateNeeded())
	};		};
End of changes. 15 change blocks.
	21 lines changed or deleted		21 lines changed or added

	genericinterface.h		genericinterface.h
	skipping to change at line 37		skipping to change at line 37
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
	{		{
	class GenericInterfacePrivate;		class GenericInterfacePrivate;
	class Device;		class Device;
	/**		/**
	* Generic interface to deal with a device. It exposes a set of propert ies		* Generic interface to deal with a device. It exposes a set of propert ies
	* and is organized a a key/value set.		* and is organized as a key/value set.
	*		*
	* Warning: Using this class could expose some backend specific details		* Warning: Using this class could expose some backend specific details
	* and lead to non portable code. Use it at your own risk, or during		* and lead to non portable code. Use it at your own risk, or during
	* transitional phases when the provided device interfaces don't		* transitional phases when the provided device interfaces don't
	* provide the necessary methods.		* provide the necessary methods.
	*/		*/
	class SOLID_EXPORT GenericInterface : public DeviceInterface		class SOLID_EXPORT GenericInterface : public DeviceInterface
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(PropertyChange)		Q_ENUMS(PropertyChange)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	glapplet.h		glapplet.h
	skipping to change at line 37		skipping to change at line 37
	namespace Plasma		namespace Plasma
	{		{
	class GLAppletPrivate;		class GLAppletPrivate;
	/**		/**
	* @class GLApplet plasma/glapplet.h <Plasma/GLApplet>		* @class GLApplet plasma/glapplet.h <Plasma/GLApplet>
	*		*
	* @short Plasma Applet that is fully rendered using OpengGL		* @short Plasma Applet that is fully rendered using OpengGL
	*/		*/
	class PLASMA_EXPORT GLApplet : public Applet		class PLASMA_EXPORT_DEPRECATED GLApplet : public Applet
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* @arg parent the QGraphicsItem this applet is parented to		* @param parent the QGraphicsItem this applet is parented to
	* @arg serviceId the name of the .desktop file containing the		* @param serviceId the name of the .desktop file containing the
	* information about the widget		* information about the widget
	* @arg appletId a unique id used to differentiate between multiple		* @param appletId a unique id used to differentiate between multip le
	* instances of the same Applet type		* instances of the same Applet type
	*/		*/
	GLApplet(QGraphicsItem *parent,		GLApplet(QGraphicsItem *parent,
	const QString &serviceId,		const QString &serviceId,
	int appletId);		int appletId);
	/**		/**
	* This constructor is to be used with the plugin loading systems		* This constructor is to be used with the plugin loading systems
	* found in KPluginInfo and KService. The argument list is expected		* found in KPluginInfo and KService. The argument list is expected
	* to have two elements: the KService service ID for the desktop en try		* to have two elements: the KService service ID for the desktop en try
	* and an applet ID which must be a base 10 number.		* and an applet ID which must be a base 10 number.
	*		*
	* @arg parent a QObject parent; you probably want to pass in 0		* @param parent a QObject parent; you probably want to pass in 0
	* @arg args a list of strings containing two entries: the service		* @param args a list of strings containing two entries: the servic
	id		e id
	* and the applet id		* and the applet id
	*/		*/
	GLApplet(QObject *parent, const QVariantList &args);		GLApplet(QObject *parent, const QVariantList &args);
	~GLApplet();		~GLApplet();
	GLuint bindTexture(const QImage &image, GLenum target = GL_TEXTURE_ 2D);		GLuint bindTexture(const QImage &image, GLenum target = GL_TEXTURE_ 2D);
	void deleteTexture(GLuint texture_id);		void deleteTexture(GLuint texture_id);
	/**		/**
End of changes. 4 change blocks.
	7 lines changed or deleted		7 lines changed or added

	global.h		global.h
	skipping to change at line 128		skipping to change at line 128
	* @param files the number of files		* @param files the number of files
	* @param dirs the number of dirs		* @param dirs the number of dirs
	* @param size the sum of the size of the @p files		* @param size the sum of the size of the @p files
	* @param showSize whether to show the size in the result		* @param showSize whether to show the size in the result
	* @return the summary string		* @return the summary string
	*/		*/
	KIO_EXPORT QString itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize);		KIO_EXPORT QString itemsSummaryString(uint items, uint files, uint dirs, KIO::filesize_t size, bool showSize);
	/**		/**
	* Encodes (from the text displayed to the real filename)		* Encodes (from the text displayed to the real filename)
	* This translates % into %% and / into %2f		* This translates '/' into a "unicode fraction slash", QChar(0x2044).
	* Used by KIO::link, for instance.		* Used by KIO::link, for instance.
	* @param str the file name to encode		* @param str the file name to encode
	* @return the encoded file name		* @return the encoded file name
	*/		*/
	KIO_EXPORT QString encodeFileName( const QString & str );		KIO_EXPORT QString encodeFileName( const QString & str );
	/**		/**
	* Decodes (from the filename to the text displayed)		* Decodes (from the filename to the text displayed)
	* This translates %2[fF] into / and %% into %		* This doesn't do anything anymore, it used to do the opposite of encode
			FileName
			* when encodeFileName was using %2F for '/'.
	* @param str the file name to decode		* @param str the file name to decode
	* @return the decoded file name		* @return the decoded file name
	*/		*/
	KIO_EXPORT QString decodeFileName( const QString & str );		KIO_EXPORT QString decodeFileName( const QString & str );
	/**		/**
	* @internal		* @internal
	* Commands that can be invoked by a job.		* Commands that can be invoked by a job.
	*		*
	* (Move this to a non-public header)		* (Move this to a non-public header)
	skipping to change at line 269		skipping to change at line 270
	// will be handled by the standard browser.		// will be handled by the standard browser.
	// <a href="exec:/khel pcenter ?" will be		// <a href="exec:/khel pcenter ?" will be
	// forked.		// forked.
	ERR_UPGRADE_REQUIRED = KJob::UserDefinedError + 64, // A transport upgr ade is required to access this		ERR_UPGRADE_REQUIRED = KJob::UserDefinedError + 64, // A transport upgr ade is required to access this
	// object. For ins tance, TLS is demanded by		// object. For ins tance, TLS is demanded by
	// the server in or der to continue.		// the server in or der to continue.
	ERR_POST_DENIED = KJob::UserDefinedError + 65, // Issued when trying to POST data to a certain Ports		ERR_POST_DENIED = KJob::UserDefinedError + 65, // Issued when trying to POST data to a certain Ports
	// see job.cpp		// see job.cpp
	ERR_COULD_NOT_SEEK = KJob::UserDefinedError + 66,		ERR_COULD_NOT_SEEK = KJob::UserDefinedError + 66,
	ERR_CANNOT_SETTIME = KJob::UserDefinedError + 67, // Emitted by setModi ficationTime		ERR_CANNOT_SETTIME = KJob::UserDefinedError + 67, // Emitted by setModi ficationTime
	ERR_CANNOT_CHOWN = KJob::UserDefinedError + 68		ERR_CANNOT_CHOWN = KJob::UserDefinedError + 68,
			ERR_POST_NO_SIZE = KJob::UserDefinedError + 69
	};		};
	/**		/**
	* Returns a translated error message for @p errorCode using the		* Returns a translated error message for @p errorCode using the
	* additional error information provided by @p errorText.		* additional error information provided by @p errorText.
	* @param errorCode the error code		* @param errorCode the error code
	* @param errorText the additional error text		* @param errorText the additional error text
	* @return the created error string		* @return the created error string
	*/		*/
	KIO_EXPORT QString buildErrorString(int errorCode, const QString &errorTe xt);		KIO_EXPORT QString buildErrorString(int errorCode, const QString &errorTe xt);
End of changes. 3 change blocks.
	3 lines changed or deleted		6 lines changed or added

	groupbox.h		groupbox.h
	skipping to change at line 55		skipping to change at line 55
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QGroupBox *nativeWidget READ nativeWidget)		Q_PROPERTY(QGroupBox *nativeWidget READ nativeWidget)
	public:		public:
	explicit GroupBox(QGraphicsWidget *parent = 0);		explicit GroupBox(QGraphicsWidget *parent = 0);
	~GroupBox();		~GroupBox();
	/**		/**
	* Sets the display text for this GroupBox		* Sets the display text for this GroupBox
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Group Box		* Sets the stylesheet used to control the visual display of this Group Box
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this GroupBox		* @return the native widget wrapped by this GroupBox
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	http_slave_defaults.h		http_slave_defaults.h
	skipping to change at line 34		skipping to change at line 34
	// CACHE SETTINGS		// CACHE SETTINGS
	#define DEFAULT_MAX_CACHE_SIZE 50*1024 // 50 MB		#define DEFAULT_MAX_CACHE_SIZE 50*1024 // 50 MB
	#define DEFAULT_MAX_CACHE_AGE 60*60*24*14 // 14 DAYS		#define DEFAULT_MAX_CACHE_AGE 60*60*24*14 // 14 DAYS
	#define DEFAULT_CACHE_EXPIRE 3*60 // 3 MINS		#define DEFAULT_CACHE_EXPIRE 3*60 // 3 MINS
	#define DEFAULT_CLEAN_CACHE_INTERVAL 30*60 // 30 MINS		#define DEFAULT_CLEAN_CACHE_INTERVAL 30*60 // 30 MINS
	#define DEFAULT_CACHE_CONTROL KIO::CC_Refresh // Verify with remo te		#define DEFAULT_CACHE_CONTROL KIO::CC_Refresh // Verify with remo te
	#define CACHE_REVISION "9\n" // Cache version		#define CACHE_REVISION "9\n" // Cache version
	// DEFAULT USER AGENT KEY - ENABLES OS NAME		// DEFAULT USER AGENT KEY - ENABLES OS NAME
	#define DEFAULT_USER_AGENT_KEYS "o" // Show OS		#define DEFAULT_USER_AGENT_KEYS "om" // Show OS, Machine
	// MAXIMUM AMOUNT OF DATA THAT CAN BE SAFELY SENT OVER IPC		// MAXIMUM AMOUNT OF DATA THAT CAN BE SAFELY SENT OVER IPC
	#define MAX_IPC_SIZE 1024*8		#define MAX_IPC_SIZE 1024*8
	// AMOUNT OF DATA TO OBTAIN FROM THE SERVER BY DEFAULT		// AMOUNT OF DATA TO OBTAIN FROM THE SERVER BY DEFAULT
	#define DEFAULT_BUF_SIZE 1024*4		#define DEFAULT_BUF_SIZE 1024*4
	// SOME DEFAULT HEADER VALUES		// SOME DEFAULT HEADER VALUES
	#define DEFAULT_LANGUAGE_HEADER "en"		#define DEFAULT_LANGUAGE_HEADER "en"
	#define DEFAULT_MIME_TYPE "text/html"		#define DEFAULT_MIME_TYPE "text/html"
	#define DEFAULT_PARTIAL_CHARSET_HEADER ", utf-8;q=0.5, *;q=0.5"		#define DEFAULT_PARTIAL_CHARSET_HEADER "utf-8, *;q=0.5"
			#define DEFAULT_ACCEPT_HEADER "text/html, text/*;q=0.9, image/jpe
	#define DEFAULT_ACCEPT_HEADER "text/html, image/jpeg;q=0.9, image		g;q=0.9, image/png;q=0.9, image/*;q=0.9, */*;q=0.8"
	/png;q=0.9, text/*;q=0.9, image/*;q=0.9, */*;q=0.8"
	#endif		#endif //KIO_HTTP_SLAVE_DEFAULTS_H
End of changes. 3 change blocks.
	5 lines changed or deleted		4 lines changed or added

	iconwidget.h		iconwidget.h
	skipping to change at line 300		skipping to change at line 300
	int numDisplayLines();		int numDisplayLines();
	/**		/**
	* @param numLines the number of lines to show in the display.		* @param numLines the number of lines to show in the display.
	*/		*/
	void setNumDisplayLines(int numLines);		void setNumDisplayLines(int numLines);
	/**		/**
	* Sets whether or not to draw a background area for the icon		* Sets whether or not to draw a background area for the icon
	*		*
	* @arg draw true if a background should be drawn or not		* @param draw true if a background should be drawn or not
	*/		*/
	void setDrawBackground(bool draw);		void setDrawBackground(bool draw);
	/**		/**
	* @return true if a background area is to be drawn for the icon		* @return true if a background area is to be drawn for the icon
	*/		*/
	bool drawBackground() const;		bool drawBackground() const;
	/**		/**
	* reimplemented from QGraphicsItem		* reimplemented from QGraphicsItem
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	itembackground.h		itembackground.h
	skipping to change at line 55		skipping to change at line 55
	Q_PROPERTY(qreal animationUpdate READ animationUpdate WRITE setAnimatio nUpdate)		Q_PROPERTY(qreal animationUpdate READ animationUpdate WRITE setAnimatio nUpdate)
	public:		public:
	ItemBackground(QGraphicsWidget *parent = 0);		ItemBackground(QGraphicsWidget *parent = 0);
	~ItemBackground();		~ItemBackground();
	/**		/**
	* Sets a new target geometry we want at the end of animation		* Sets a new target geometry we want at the end of animation
	*		*
	* @arg newGeometry the final geometry target		* @param newGeometry the final geometry target
	*/		*/
	void setTarget(const QRectF &newGeometry);		void setTarget(const QRectF &newGeometry);
	/**		/**
	* @return the current target rect; may be empty if there is no target currently set		* @return the current target rect; may be empty if there is no target currently set
	*/		*/
	QRectF target() const;		QRectF target() const;
	/**		/**
	* set the ItemBackground geometry to be the target geometry, plus the ItemBackground margins		* set the ItemBackground geometry to be the target geometry, plus the ItemBackground margins
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	job.h		job.h
	skipping to change at line 313		skipping to change at line 313
	*		*
	* @param url Where to write the data.		* @param url Where to write the data.
	* @param postData Encoded data to post.		* @param postData Encoded data to post.
	* @param flags Can be HideProgressInfo here		* @param flags Can be HideProgressInfo here
	* @return the job handling the operation.		* @return the job handling the operation.
	*/		*/
	KIO_EXPORT TransferJob *http_post( const KUrl& url, const QByteArray &p ostData,		KIO_EXPORT TransferJob *http_post( const KUrl& url, const QByteArray &p ostData,
	JobFlags flags = DefaultFlags );		JobFlags flags = DefaultFlags );
	/**		/**
			* HTTP POST.
			*
			* This function, unlike the one that accepts a QByteArray, accepts an
			IO device
			* from which to read the encoded data to be posted to the server in or
			der to
			* to avoid holding the content of very large post requests, e.g. multi
			media file
			* uploads, in memory.
			*
			* @param url Where to write the data.
			* @param postData Encoded data to post.
			* @param size Size of the encoded post data.
			* @param flags Can be HideProgressInfo here
			* @return the job handling the operation.
			*
			* @since 4.7
			*/
			KIO_EXPORT TransferJob *http_post( const KUrl& url, QIODevice* device,
			qint64 size = -1, JobFlags flags = D
			efaultFlags );
			/**
	* Get (a.k.a. read), into a single QByteArray.		* Get (a.k.a. read), into a single QByteArray.
	* @see StoredTransferJob		* @see StoredTransferJob
	*		*
	* @param url the URL of the file		* @param url the URL of the file
	* @param reload: Reload to reload the file, NoReload if it can be take n from the cache		* @param reload: Reload to reload the file, NoReload if it can be take n from the cache
	* @param flags Can be HideProgressInfo here		* @param flags Can be HideProgressInfo here
	* @return the job handling the operation.		* @return the job handling the operation.
	*/		*/
	KIO_EXPORT StoredTransferJob *storedGet( const KUrl& url, LoadType relo ad = NoReload, JobFlags flags = DefaultFlags );		KIO_EXPORT StoredTransferJob *storedGet( const KUrl& url, LoadType relo ad = NoReload, JobFlags flags = DefaultFlags );
	skipping to change at line 349		skipping to change at line 368
	* @see StoredTransferJob		* @see StoredTransferJob
	*		*
	* @param arr The data to write		* @param arr The data to write
	* @param url Where to write data.		* @param url Where to write data.
	* @param flags Can be HideProgressInfo here.		* @param flags Can be HideProgressInfo here.
	* @return the job handling the operation.		* @return the job handling the operation.
	* @since 4.2		* @since 4.2
	*/		*/
	KIO_EXPORT StoredTransferJob *storedHttpPost( const QByteArray& arr, co nst KUrl& url,		KIO_EXPORT StoredTransferJob *storedHttpPost( const QByteArray& arr, co nst KUrl& url,
	JobFlags flags = DefaultF lags );		JobFlags flags = DefaultF lags );
			/**
			* HTTP POST (a.k.a. write) data from the given IO device.
			* @see StoredTransferJob
			*
			* @param device Device from which the encoded data to be posted is rea
			d.
			* @param url Where to write data.
			* @param size Size of the encoded data to be posted.
			* @param flags Can be HideProgressInfo here.
			* @return the job handling the operation.
			*
			* @since 4.7
			*/
			KIO_EXPORT StoredTransferJob *storedHttpPost( QIODevice* device, const
			KUrl& url,
			qint64 size = -1, JobFlag
			s flags = DefaultFlags );
	/**		/**
	* Creates a new multiple get job.		* Creates a new multiple get job.
	*		*
	* @param id the id of the get operation		* @param id the id of the get operation
	* @param url the URL of the file		* @param url the URL of the file
	* @param metaData the MetaData associated with the file		* @param metaData the MetaData associated with the file
	*		*
	* @return the job handling the operation.		* @return the job handling the operation.
	* @see get()		* @see get()
End of changes. 2 change blocks.
	0 lines changed or deleted		40 lines changed or added

	jobclasses.h		jobclasses.h
	skipping to change at line 26		skipping to change at line 26
	You should have received a copy of the GNU Library General Public Licen se		You should have received a copy of the GNU Library General Public Licen se
	along with this library; see the file COPYING.LIB. If not, write to		along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KIO_JOBCLASSES_H		#ifndef KIO_JOBCLASSES_H
	#define KIO_JOBCLASSES_H		#define KIO_JOBCLASSES_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QLinkedList>		#include <QtCore/QLinkedList> // KDE5: remove
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <kurl.h>		#include <kurl.h>
	#include <kio/global.h>		#include <kio/global.h>
	#include <kio/udsentry.h>		#include <kio/udsentry.h>
	#include <kcompositejob.h>		#include <kcompositejob.h>
	namespace KIO {		namespace KIO {
	skipping to change at line 715		skipping to change at line 715
	virtual void slotMetaData( const KIO::MetaData &_metaData);		virtual void slotMetaData( const KIO::MetaData &_metaData);
	protected:		protected:
	TransferJob(TransferJobPrivate &dd);		TransferJob(TransferJobPrivate &dd);
	private:		private:
	Q_PRIVATE_SLOT(d_func(), void slotErrorPage())		Q_PRIVATE_SLOT(d_func(), void slotErrorPage())
	Q_PRIVATE_SLOT(d_func(), void slotCanResume( KIO::filesize_t offset ))		Q_PRIVATE_SLOT(d_func(), void slotCanResume( KIO::filesize_t offset ))
	Q_PRIVATE_SLOT(d_func(), void slotPostRedirection())		Q_PRIVATE_SLOT(d_func(), void slotPostRedirection())
	Q_PRIVATE_SLOT(d_func(), void slotNeedSubUrlData())		Q_PRIVATE_SLOT(d_func(), void slotNeedSubUrlData())
	Q_PRIVATE_SLOT(d_func(), void slotSubUrlData(KIO::Job*, const QByte Array &))		Q_PRIVATE_SLOT(d_func(), void slotSubUrlData(KIO::Job*, const QByte Array &))
			Q_PRIVATE_SLOT(d_func(), void slotDataReqFromDevice())
	Q_DECLARE_PRIVATE(TransferJob)		Q_DECLARE_PRIVATE(TransferJob)
	// A FileCopyJob may control one or more TransferJobs		// A FileCopyJob may control one or more TransferJobs
	friend class FileCopyJob;		friend class FileCopyJob;
	friend class FileCopyJobPrivate;		friend class FileCopyJobPrivate;
	};		};
	class StoredTransferJobPrivate;		class StoredTransferJobPrivate;
	/**		/**
	* StoredTransferJob is a TransferJob (for downloading or uploading dat a) that		* StoredTransferJob is a TransferJob (for downloading or uploading dat a) that
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	k3bufferedsocket.h		k3bufferedsocket.h
	skipping to change at line 58		skipping to change at line 58
	*		*
	* @note Buffered sockets only make sense if you're using them from		* @note Buffered sockets only make sense if you're using them from
	* the main (event-loop) thread. This is actually a restriction		* the main (event-loop) thread. This is actually a restriction
	* imposed by Qt's QSocketNotifier. If you want to use a socket		* imposed by Qt's QSocketNotifier. If you want to use a socket
	* in an auxiliary thread, please use KStreamSocket.		* in an auxiliary thread, please use KStreamSocket.
	*		*
	* @see KNetwork::KStreamSocket, KNetwork::KServerSocket		* @see KNetwork::KStreamSocket, KNetwork::KServerSocket
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KBufferedSocket: public KStreamSocket		class KDECORE_EXPORT_DEPRECATED KBufferedSocket: public KStreamSocket
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*		*
	* @param node destination host		* @param node destination host
	* @param service destination service to connect to		* @param service destination service to connect to
	* @param parent the parent object for this object		* @param parent the parent object for this object
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3clientsocketbase.h		k3clientsocketbase.h
	skipping to change at line 50		skipping to change at line 50
	*		*
	* This class provides the base functionality for client sockets,		* This class provides the base functionality for client sockets,
	* such as, and especially, name resolution and signals.		* such as, and especially, name resolution and signals.
	*		*
	* @note This class is abstract. If you're looking for a normal,		* @note This class is abstract. If you're looking for a normal,
	* client socket class, see KStreamSocket and KBufferedSocket		* client socket class, see KStreamSocket and KBufferedSocket
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KClientSocketBase : public KActiveSocketBase		class KDECORE_EXPORT_DEPRECATED KClientSocketBase : public KActiveSocketBas e
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Socket states.		* Socket states.
	*		*
	* These are the possible states for a KClientSocketBase:		* These are the possible states for a KClientSocketBase:
	* - Idle: socket is not connected		* - Idle: socket is not connected
	* - HostLookup: socket is doing host lookup prior to connecting		* - HostLookup: socket is doing host lookup prior to connecting
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3datagramsocket.h		k3datagramsocket.h
	skipping to change at line 52		skipping to change at line 52
	* a datagram socket (as KDatagramSocket or derived classes). A datagram		* a datagram socket (as KDatagramSocket or derived classes). A datagram
	* consists of data as well as a network address associated (whither to sen d		* consists of data as well as a network address associated (whither to sen d
	* the data or whence it came).		* the data or whence it came).
	*		*
	* This is a lightweight class. Data is stored in a QByteArray, which means		* This is a lightweight class. Data is stored in a QByteArray, which means
	* that it is explicitly shared.		* that it is explicitly shared.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KDatagramPacket //krazy:exclude=dpointer,inline (light weight; kde3)		class KDECORE_EXPORT_DEPRECATED KDatagramPacket //krazy:exclude=dpointer,in line (lightweight; kde3)
	{		{
	QByteArray m_data;		QByteArray m_data;
	KSocketAddress m_address;		KSocketAddress m_address;
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*/		*/
	KDatagramPacket()		KDatagramPacket()
	{ }		{ }
	skipping to change at line 182		skipping to change at line 182
	* Unlike KStreamSocket, which operates on a connection-based stream		* Unlike KStreamSocket, which operates on a connection-based stream
	* socket (generally TCP), this class and its descendants operates on datag rams,		* socket (generally TCP), this class and its descendants operates on datag rams,
	* which are normally connectionless.		* which are normally connectionless.
	*		*
	* This class in specific provides easy access to the system's connectionle ss		* This class in specific provides easy access to the system's connectionle ss
	* SOCK_DGRAM sockets.		* SOCK_DGRAM sockets.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KDatagramSocket: public KClientSocketBase		class KDECORE_EXPORT_DEPRECATED KDatagramSocket: public KClientSocketBase
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*/		*/
	KDatagramSocket(QObject* parent = 0L);		KDatagramSocket(QObject* parent = 0L);
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	k3httpproxysocketdevice.h		k3httpproxysocketdevice.h
	skipping to change at line 44		skipping to change at line 44
	/**		/**
	* @class KHttpProxySocketDevice k3httpproxysocketdevice.h k3httproxysocket device.h		* @class KHttpProxySocketDevice k3httpproxysocketdevice.h k3httproxysocket device.h
	* @brief The low-level backend for HTTP proxying.		* @brief The low-level backend for HTTP proxying.
	*		*
	* This class derives from KSocketDevice and implements the necessary		* This class derives from KSocketDevice and implements the necessary
	* calls to make a connection through an HTTP proxy.		* calls to make a connection through an HTTP proxy.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KHttpProxySocketDevice: public KSocketDevice		class KDECORE_EXPORT_DEPRECATED KHttpProxySocketDevice: public KSocketDevic e
	{		{
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
	*/		*/
	KHttpProxySocketDevice(const KSocketBase* = 0L);		KHttpProxySocketDevice(const KSocketBase* = 0L);
	/**		/**
	* Constructor with proxy server's address.		* Constructor with proxy server's address.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3resolver.h		k3resolver.h
	skipping to change at line 67		skipping to change at line 67
	*		*
	* This class contains all the information required for creating,		* This class contains all the information required for creating,
	* binding and connecting a socket.		* binding and connecting a socket.
	*		*
	* KResolverEntry objects implicitly share data, so copying them		* KResolverEntry objects implicitly share data, so copying them
	* is quite efficient.		* is quite efficient.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KResolverEntry		class KDECORE_EXPORT_DEPRECATED KResolverEntry
	{		{
	public:		public:
	/**		/**
	* Default constructor		* Default constructor
	*		*
	*/		*/
	KResolverEntry();		KResolverEntry();
	/**		/**
	* Constructs a new KResolverEntry from a KSocketAddress		* Constructs a new KResolverEntry from a KSocketAddress
	skipping to change at line 211		skipping to change at line 211
	* to the resolved elements, you can also retrieve information about the		* to the resolved elements, you can also retrieve information about the
	* resolution process itself, like the nodename that was resolved or an err or		* resolution process itself, like the nodename that was resolved or an err or
	* code.		* code.
	*		*
	* Note Resolver also uses KResolverResults objects to indicate failure, so		* Note Resolver also uses KResolverResults objects to indicate failure, so
	* you should test for failure.		* you should test for failure.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KResolverResults: public QList<KResolverEntry>		class KDECORE_EXPORT_DEPRECATED KResolverResults: public QList<KResolverEnt ry>
	{		{
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*		*
	* Constructs an empty list.		* Constructs an empty list.
	*/		*/
	KResolverResults();		KResolverResults();
	/**		/**
	skipping to change at line 311		skipping to change at line 311
	*		*
	* A Resolver object defaults to the following:		* A Resolver object defaults to the following:
	* @li address family: any address family		* @li address family: any address family
	* @li socket type: streaming socket		* @li socket type: streaming socket
	* @li protocol: implementation-defined. Generally, TCP		* @li protocol: implementation-defined. Generally, TCP
	* @li host and service: unset		* @li host and service: unset
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KResolver: public QObject		class KDECORE_EXPORT_DEPRECATED KResolver: public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Address family selection types		* Address family selection types
	*		*
	* These values can be OR-ed together to form a composite family selectio n.		* These values can be OR-ed together to form a composite family selectio n.
	*		*
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	k3reverseresolver.h		k3reverseresolver.h
	skipping to change at line 51		skipping to change at line 51
	* This class is provided as a counterpart to KResolver in such a way		* This class is provided as a counterpart to KResolver in such a way
	* as it produces a reverse resolution: it resolves a socket address		* as it produces a reverse resolution: it resolves a socket address
	* from its binary representations into a textual representation.		* from its binary representations into a textual representation.
	*		*
	* Most users will use the static functions resolve(), which work		* Most users will use the static functions resolve(), which work
	* both synchronously (blocking) and asynchronously (non-blocking).		* both synchronously (blocking) and asynchronously (non-blocking).
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KReverseResolver: public QObject		class KDECORE_EXPORT_DEPRECATED KReverseResolver: public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Flags for the reverse resolution.		* Flags for the reverse resolution.
	*		*
	* These flags are used by the reverse resolution functions for		* These flags are used by the reverse resolution functions for
	* setting resolution parameters. The possible values are:		* setting resolution parameters. The possible values are:
	* @li NumericHost: don't try to resolve the host address to a text form.		* @li NumericHost: don't try to resolve the host address to a text form.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3serversocket.h		k3serversocket.h
	skipping to change at line 108		skipping to change at line 108
	* KNetwork::KBufferedSocket (default). If you want to accept a		* KNetwork::KBufferedSocket (default). If you want to accept a
	* non-buffered socket, you must first call setAcceptBuffered.		* non-buffered socket, you must first call setAcceptBuffered.
	*		*
	* @warning If you use KServerSocket in an auxiliary (non-GUI) thread,		* @warning If you use KServerSocket in an auxiliary (non-GUI) thread,
	* you need to accept only KNetwork::KStreamSocket objects.		* you need to accept only KNetwork::KStreamSocket objects.
	*		*
	* @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket		* @see KNetwork::KStreamSocket, KNetwork::KBufferedSocket
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KServerSocket: public QObject, public KPassiveSocketBa se		class KDECORE_EXPORT_DEPRECATED KServerSocket: public QObject, public KPass iveSocketBase
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*		*
	* If the binding address isn't changed by setAddress, this socket will		* If the binding address isn't changed by setAddress, this socket will
	* bind to all interfaces on this node and the port will be selected by t he		* bind to all interfaces on this node and the port will be selected by t he
	* operating system.		* operating system.
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3socketaddress.h		k3socketaddress.h
	skipping to change at line 62		skipping to change at line 62
	* KResolver::resolve(), which also handle extra information like scope		* KResolver::resolve(), which also handle extra information like scope
	* ids.		* ids.
	*		*
	* This is a light-weight class. Most of the member functions are inlined a nd		* This is a light-weight class. Most of the member functions are inlined a nd
	* there are no virtual functions. This object's size should be less than 2 0		* there are no virtual functions. This object's size should be less than 2 0
	* bytes. Also note that there is no sharing of data.		* bytes. Also note that there is no sharing of data.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KIpAddress		class KDECORE_EXPORT_DEPRECATED KIpAddress
	{		{
	public:		public:
	/**		/**
	* Default constructor. Creates an empty address.		* Default constructor. Creates an empty address.
	* It defaults to IP version 4.		* It defaults to IP version 4.
	*/		*/
	inline KIpAddress() : m_version(0)		inline KIpAddress() : m_version(0)
	{ }		{ }
	/**		/**
	skipping to change at line 413		skipping to change at line 413
	class KSocketAddressData;		class KSocketAddressData;
	/** @class KSocketAddress k3socketaddress.h k3socketaddress.h		/** @class KSocketAddress k3socketaddress.h k3socketaddress.h
	* @brief A generic socket address.		* @brief A generic socket address.
	*		*
	* This class holds one generic socket address.		* This class holds one generic socket address.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KSocketAddress //krazy:exclude=dpointer (we got one, j ust not called Private)		class KDECORE_EXPORT_DEPRECATED KSocketAddress //krazy:exclude=dpointer (we got one, just not called Private)
	{		{
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*		*
	* Creates an empty object		* Creates an empty object
	*/		*/
	KSocketAddress();		KSocketAddress();
	/**		/**
	skipping to change at line 641		skipping to change at line 641
	/** @class KInetSocketAddress k3socketaddress.h k3socketaddress.h		/** @class KInetSocketAddress k3socketaddress.h k3socketaddress.h
	* @brief an Internet socket address		* @brief an Internet socket address
	*		*
	* An Inet (IPv4 or IPv6) socket address		* An Inet (IPv4 or IPv6) socket address
	*		*
	* This is an IPv4 or IPv6 address of the Internet.		* This is an IPv4 or IPv6 address of the Internet.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KInetSocketAddress: public KSocketAddress		class KDECORE_EXPORT_DEPRECATED KInetSocketAddress: public KSocketAddress
	{		{
	friend class KSocketAddress;		friend class KSocketAddress;
	public:		public:
	/**		/**
	* Public constructor. Creates an empty object.		* Public constructor. Creates an empty object.
	*/		*/
	KInetSocketAddress();		KInetSocketAddress();
	/**		/**
	* Creates an object from raw data.		* Creates an object from raw data.
	skipping to change at line 831		skipping to change at line 831
	* @brief A Unix (local) socket address.		* @brief A Unix (local) socket address.
	*		*
	* This is a Unix socket address.		* This is a Unix socket address.
	*		*
	* Note that this class uses QStrings to represent filenames, which means		* Note that this class uses QStrings to represent filenames, which means
	* the proper encoding is used to translate into valid filesystem file name s.		* the proper encoding is used to translate into valid filesystem file name s.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KUnixSocketAddress: public KSocketAddress		class KDECORE_EXPORT_DEPRECATED KUnixSocketAddress: public KSocketAddress
	{		{
	friend class KSocketAddress;		friend class KSocketAddress;
	public:		public:
	/**		/**
	* Default constructor. Creates an empty object.		* Default constructor. Creates an empty object.
	*/		*/
	KUnixSocketAddress();		KUnixSocketAddress();
	/**		/**
	* Creates this object with the given raw data. If		* Creates this object with the given raw data. If
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	k3socketbase.h		k3socketbase.h
	skipping to change at line 85		skipping to change at line 85
	*		*
	* This class provides the basic socket functionlity for descended classes.		* This class provides the basic socket functionlity for descended classes.
	* Socket classes are thread-safe and provide a recursive mutex should it b e		* Socket classes are thread-safe and provide a recursive mutex should it b e
	* needed.		* needed.
	*		*
	* @note This class is abstract.		* @note This class is abstract.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KSocketBase		class KDECORE_EXPORT_DEPRECATED KSocketBase
	{		{
	public:		public:
	/**		/**
	* Possible socket options.		* Possible socket options.
	*		*
	* These are the options that may be set on a socket:		* These are the options that may be set on a socket:
	* - Blocking: whether the socket shall operate in blocking		* - Blocking: whether the socket shall operate in blocking
	* or non-blocking mode. This flag defaults to on.		* or non-blocking mode. This flag defaults to on.
	* See setBlocking().		* See setBlocking().
	* - AddressReusable: whether the address used by this socket will		* - AddressReusable: whether the address used by this socket will
	skipping to change at line 461		skipping to change at line 461
	/**		/**
	* @class KActiveSocketBase k3socketbase.h k3socketbase.h		* @class KActiveSocketBase k3socketbase.h k3socketbase.h
	* @brief Abstract class for active sockets		* @brief Abstract class for active sockets
	*		*
	* This class provides the standard interfaces for active sockets, i.e.,		* This class provides the standard interfaces for active sockets, i.e.,
	* sockets that are used to connect to external addresses.		* sockets that are used to connect to external addresses.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KActiveSocketBase: public QIODevice, virtual public KS ocketBase		class KDECORE_EXPORT_DEPRECATED KActiveSocketBase: public QIODevice, virtua l public KSocketBase
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
	*/		*/
	KActiveSocketBase(QObject* parent);		KActiveSocketBase(QObject* parent);
	/**		/**
	* Destructor.		* Destructor.
	skipping to change at line 774		skipping to change at line 774
	/**		/**
	* @class KPassiveSocketBase k3socketbase.h k3socketbase.h		* @class KPassiveSocketBase k3socketbase.h k3socketbase.h
	* @brief Abstract base class for passive sockets.		* @brief Abstract base class for passive sockets.
	*		*
	* This socket provides the initial functionality for passive sockets,		* This socket provides the initial functionality for passive sockets,
	* i.e., sockets that accept incoming connections.		* i.e., sockets that accept incoming connections.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KPassiveSocketBase: virtual public KSocketBase		class KDECORE_EXPORT_DEPRECATED KPassiveSocketBase: virtual public KSocketB ase
	{		{
	public:		public:
	/**		/**
	* Constructor		* Constructor
	*/		*/
	KPassiveSocketBase();		KPassiveSocketBase();
	/**		/**
	* Destructor		* Destructor
	*/		*/
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	k3socketdevice.h		k3socketdevice.h
	skipping to change at line 51		skipping to change at line 51
	*		*
	* Most users will prefer "cooked" interfaces like those of KStreamSocket o r		* Most users will prefer "cooked" interfaces like those of KStreamSocket o r
	* KServerSocket.		* KServerSocket.
	*		*
	* Descended classes from this one provide some other kinds of socket funct ionality,		* Descended classes from this one provide some other kinds of socket funct ionality,
	* like proxying or specific socket types.		* like proxying or specific socket types.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KSocketDevice: public KActiveSocketBase, public KPassi veSocketBase		class KDECORE_EXPORT_DEPRECATED KSocketDevice: public KActiveSocketBase, pu blic KPassiveSocketBase
	{		{
	public:		public:
	/**		/**
	* Capabilities for the socket implementation.		* Capabilities for the socket implementation.
	*		*
	* KSocketDevice-derived classes can implement certain capabilities that are not		* KSocketDevice-derived classes can implement certain capabilities that are not
	* available in the default class. These capabilities are described by th ese flags.		* available in the default class. These capabilities are described by th ese flags.
	* The default KSocketDevice class has none of these capabilities.		* The default KSocketDevice class has none of these capabilities.
	*		*
	* For the negative capabilities (inabilities, the CanNot* forms), when a capability		* For the negative capabilities (inabilities, the CanNot* forms), when a capability
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3socks.h		k3socks.h
	skipping to change at line 48		skipping to change at line 48
	* This class provides you with an interface to a		* This class provides you with an interface to a
	* <a href="http://www.socks.nec.com/">SOCKS</a> Proxy server. A SOCKS serv er		* <a href="http://www.socks.nec.com/">SOCKS</a> Proxy server. A SOCKS serv er
	* is able to provide full internet access behind a firewall.		* is able to provide full internet access behind a firewall.
	* KSocks is a singleton; there can only be one instance at any		* KSocks is a singleton; there can only be one instance at any
	* given time. To obtain a reference to that instance, use		* given time. To obtain a reference to that instance, use
	* self().		* self().
	*		*
	* @short Access to a SOCKS Proxy.		* @short Access to a SOCKS Proxy.
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KSocks {		class KDECORE_EXPORT_DEPRECATED KSocks {
	public:		public:
	/**		/**
	* Return an instance of class KSocks *.		* Return an instance of class KSocks *.
	* You cannot delete this object. It is a singleton class.		* You cannot delete this object. It is a singleton class.
	* @return the KSock instance		* @return the KSock instance
	*/		*/
	static KSocks *self();		static KSocks *self();
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3sockssocketdevice.h		k3sockssocketdevice.h
	skipping to change at line 42		skipping to change at line 42
	* This class reimplements several functions from KSocketDevice in order		* This class reimplements several functions from KSocketDevice in order
	* to implement SOCKS support.		* to implement SOCKS support.
	*		*
	* This works by using KSocks.		* This works by using KSocks.
	*		*
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	*		*
	* @warning This code is untested!		* @warning This code is untested!
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KSocksSocketDevice: public KSocketDevice		class KDECORE_EXPORT_DEPRECATED KSocksSocketDevice: public KSocketDevice
	{		{
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
	*/		*/
	KSocksSocketDevice(const KSocketBase* = 0L);		KSocksSocketDevice(const KSocketBase* = 0L);
	/**		/**
	* Construct from a file descriptor.		* Construct from a file descriptor.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3streamsocket.h		k3streamsocket.h
	skipping to change at line 98		skipping to change at line 98
	* // start connecting		* // start connecting
	* socket.connect();		* socket.connect();
	* }		* }
	* \endcode		* \endcode
	*		*
	* @see KNetwork::KBufferedSocket, KNetwork::KServerSocket		* @see KNetwork::KBufferedSocket, KNetwork::KServerSocket
	* @author Thiago Macieira <thiago@kde.org>		* @author Thiago Macieira <thiago@kde.org>
	* @version 0.9		* @version 0.9
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
	*/		*/
	class KDECORE_EXPORT KStreamSocket: public KClientSocketBase		class KDECORE_EXPORT_DEPRECATED KStreamSocket: public KClientSocketBase
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*		*
	* @param node destination host		* @param node destination host
	* @param service destination service to connect to		* @param service destination service to connect to
	* @param parent the parent QObject object		* @param parent the parent QObject object
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kactioncollection.h		kactioncollection.h
	skipping to change at line 339		skipping to change at line 339
	/**		/**
	* Creates a new standard action, adds it to the collection and connects the		* Creates a new standard action, adds it to the collection and connects the
	* action's triggered(bool) signal to the specified receiver/member. The		* action's triggered(bool) signal to the specified receiver/member. The
	* newly created action is also returned.		* newly created action is also returned.
	*		*
	* Note: Using KStandardAction::OpenRecent will cause a different signal than		* Note: Using KStandardAction::OpenRecent will cause a different signal than
	* triggered(bool) to be used, see KStandardAction for more information.		* triggered(bool) to be used, see KStandardAction for more information.
	*		*
	* The action can be retrieved later from the collection by its standard name as per		* The action can be retrieved later from the collection by its standard name as per
	* KStandardAction::stdName.		* KStandardAction::stdName.
			*
			* @param actionType The standard action type of the action to create.
			* @param receiver The QObject to connect the triggered(bool) signal to.
			Leave 0 if no
			* connection is desired.
			* @param member The SLOT to connect the triggered(bool) signal to. Leav
			e 0 if no
			* connection is desired.
			* @return new action of the given type ActionType.
	*/		*/
	KAction *addAction(KStandardAction::StandardAction actionType, const QObj ect *receiver = 0, const char *member = 0);		KAction *addAction(KStandardAction::StandardAction actionType, const QObj ect *receiver = 0, const char *member = 0);
	/**		/**
	* Creates a new standard action, adds to the collection under the given name		* Creates a new standard action, adds to the collection under the given name
	* and connects the action's triggered(bool) signal to the specified		* and connects the action's triggered(bool) signal to the specified
	* receiver/member. The newly created action is also returned.		* receiver/member. The newly created action is also returned.
	*		*
	* Note: Using KStandardAction::OpenRecent will cause a different signal than		* Note: Using KStandardAction::OpenRecent will cause a different signal than
	* triggered(bool) to be used, see KStandardAction for more information.		* triggered(bool) to be used, see KStandardAction for more information.
	*		*
	* The action can be retrieved later from the collection by the specified name.		* The action can be retrieved later from the collection by the specified name.
			*
			* @param actionType The standard action type of the action to create.
			* @param name The name by which the action be retrieved again from the c
			ollection.
			* @param receiver The QObject to connect the triggered(bool) signal to.
			Leave 0 if no
			* connection is desired.
			* @param member The SLOT to connect the triggered(bool) signal to. Leav
			e 0 if no
			* connection is desired.
			* @return new action of the given type ActionType.
	*/		*/
	KAction *addAction(KStandardAction::StandardAction actionType, const QStr ing &name,		KAction *addAction(KStandardAction::StandardAction actionType, const QStr ing &name,
	const QObject *receiver = 0, const char *member = 0);		const QObject *receiver = 0, const char *member = 0);
	/**		/**
	* Creates a new action under the given name to the collection and connec ts		* Creates a new action under the given name to the collection and connec ts
	* the action's triggered(bool) signal to the specified receiver/member. The		* the action's triggered(bool) signal to the specified receiver/member. The
	* newly created action is returned.		* newly created action is returned.
	*		*
	* NOTE: KDE prior to 4.2 used the triggered() signal instead of the trig gered(bool)		* NOTE: KDE prior to 4.2 used the triggered() signal instead of the trig gered(bool)
	* signal.		* signal.
	*		*
	* Inserting an action that was previously inserted under a different nam e will replace the		* Inserting an action that was previously inserted under a different nam e will replace the
	* old entry, i.e. the action will not be available under the old name an ymore but only under		* old entry, i.e. the action will not be available under the old name an ymore but only under
	* the new one.		* the new one.
	*		*
	* Inserting an action under a name that is already used for another acti on will replace		* Inserting an action under a name that is already used for another acti on will replace
	* the other action in the collection.		* the other action in the collection.
	*		*
	* @param name The name by which the action be retrieved again from the c ollection.		* @param name The name by which the action be retrieved again from the c ollection.
	* @param action The action to add.		* @param receiver The QObject to connect the triggered(bool) signal to.
			Leave 0 if no
			* connection is desired.
			* @param member The SLOT to connect the triggered(bool) signal to. Leav
			e 0 if no
			* connection is desired.
			* @return new action of the given type ActionType.
	*/		*/
	KAction *addAction(const QString &name, const QObject *receiver = 0, cons t char *member = 0);		KAction *addAction(const QString &name, const QObject *receiver = 0, cons t char *member = 0);
	/**		/**
	* Creates a new action under the given name, adds it to the collection a nd connects the action's triggered(bool)		* Creates a new action under the given name, adds it to the collection a nd connects the action's triggered(bool)
	* signal to the specified receiver/member. The receiver slot may accept either a bool or no		* signal to the specified receiver/member. The receiver slot may accept either a bool or no
	* parameters at all (i.e. slotTriggered(bool) or slotTriggered() ).		* parameters at all (i.e. slotTriggered(bool) or slotTriggered() ).
	* The type of the action is specified by the template parameter ActionTy pe.		* The type of the action is specified by the template parameter ActionTy pe.
	*		*
	* NOTE: KDE prior to 4.2 connected the triggered() signal instead of the triggered(bool)		* NOTE: KDE prior to 4.2 connected the triggered() signal instead of the triggered(bool)
End of changes. 3 change blocks.
	1 lines changed or deleted		27 lines changed or added

	kauthaction.h		kauthaction.h
	skipping to change at line 328		skipping to change at line 328
	* @see earlyAuthorize		* @see earlyAuthorize
	*/		*/
	AuthStatus authorize() const;		AuthStatus authorize() const;
	/**		/**
	* @brief Tries to resolve authorization status in the best possible wa y without executing the action		* @brief Tries to resolve authorization status in the best possible wa y without executing the action
	*		*
	* This method checks for the status of the action, and tries to acquir e authorization		* This method checks for the status of the action, and tries to acquir e authorization
	* (if needed) if the backend being used supports client-side authoriza tion.		* (if needed) if the backend being used supports client-side authoriza tion.
	*		*
	* This means this method is not reliable - its purpose it's to provide		* This means this method is not reliable - its purpose is to provide u
	user interfaces		ser interfaces with
	* an efficient mean to acquire authorization as early as possible, wit		* an efficient means to acquire authorization as early as possible, wi
	hout interrupting		thout interrupting
	* the user's workflow. If the backend's authentication phase happens i n the helper and the		* the user's workflow. If the backend's authentication phase happens i n the helper and the
	* action requires authentication, \c Authorized will be returned.		* action requires authentication, \c Authorized will be returned.
	*		*
	* The main difference with authorize is that this method does not try to acquire authorization		* The main difference with authorize is that this method does not try to acquire authorization
	* if the backend's authentication phase happens in the helper: using a uthorize in such a case		* if the backend's authentication phase happens in the helper: using a uthorize in such a case
	* might lead to ask the user its password twice, as the helper might t ime out, or in the case		* might lead to ask the user its password twice, as the helper might t ime out, or in the case
	* of a one shot authorization, the scope of the authorization would en d with the authorization		* of a one shot authorization, the scope of the authorization would en d with the authorization
	* check itself. For this reason, you should @b always use this method instead of authorize, which		* check itself. For this reason, you should @b always use this method instead of authorize, which
	* is meant only for very advanced usages.		* is meant only for very advanced usages.
	*		*
	skipping to change at line 481		skipping to change at line 481
	* default one.		* default one.
	*		*
	* To stop an action you need to send the stop request to the helper th at is executing that action. This of course means you have to		* To stop an action you need to send the stop request to the helper th at is executing that action. This of course means you have to
	* use the same helperID used for the execution call (either passed as a parameter or set as default with setHelperID() )		* use the same helperID used for the execution call (either passed as a parameter or set as default with setHelperID() )
	*/		*/
	void stop(const QString &helperID);		void stop(const QString &helperID);
	/**		/**
	* @brief Sets a parent widget for the authentication dialog		* @brief Sets a parent widget for the authentication dialog
	*		*
	* This function is used for explicitely setting a parent window for an		* This function is used for explicitly setting a parent window for an
	eventual authentication dialog required when		eventual authentication dialog required when
	* authorization is triggered. Some backends, in fact, (like polkit-1)		* authorization is triggered. Some backends, in fact, (like polkit-1)
	need to have a parent explicitely set for displaying		need to have a parent explicitly set for displaying
	* the dialog correctly.		* the dialog correctly.
	*		*
	* @note If you are using KAuth through one of KDE's GUI components (KP ushButton, KCModule...) you do not need and should not		* @note If you are using KAuth through one of KDE's GUI components (KP ushButton, KCModule...) you do not need and should not
	* call this function, as it is already done by the component its elf.		* call this function, as it is already done by the component its elf.
	*		*
	* @since 4.6		* @since 4.6
	*		*
	* @param parent A QWidget which will be used as the dialog's parent		* @param parent A QWidget which will be used as the dialog's parent
	*/		*/
	void setParentWidget(QWidget *parent);		void setParentWidget(QWidget *parent);
End of changes. 2 change blocks.
	8 lines changed or deleted		8 lines changed or added

	kauthactionreply.h		kauthactionreply.h
	skipping to change at line 34		skipping to change at line 34
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <QtCore/QMap>		#include <QtCore/QMap>
	#include <QtCore/QDataStream>		#include <QtCore/QDataStream>
	#include <kdecore_export.h>		#include <kdecore_export.h>
	/**		/**
	@namespace KAuth		@namespace KAuth
	@section kauth_intro Introduction		@section kauth_intro Introduction
	The KDE Authorization API allows developers to write desktop applications that runs high-privileged tasks in an easy, secure and cross-platform way. Previously, if an application had to do administrative tasks,		The KDE Authorization API allows developers to write desktop applications that run high-privileged tasks in an easy, secure and cross-platform way. P reviously, if an application had to do administrative tasks,
	it had to be run as root, using mechanisms such as sudo or graphical equiv alents, or by setting the executable's setuid bit. This approach has some d rawbacks. For example, the whole application code,		it had to be run as root, using mechanisms such as sudo or graphical equiv alents, or by setting the executable's setuid bit. This approach has some d rawbacks. For example, the whole application code,
	including GUI handling and network communication, had to be done as root. More code that runs as root means more possible security holes.		including GUI handling and network communication, had to be done as root. More code that runs as root means more possible security holes.
	The solution is the caller/helper pattern. With this pattern, the privileg ed code is isolated in a small helper tool that runs as root. This tool inc ludes only the few lines of code that actually		The solution is the caller/helper pattern. With this pattern, the privileg ed code is isolated in a small helper tool that runs as root. This tool inc ludes only the few lines of code that actually
	need to be run with privileges, not the whole application logic. All the o ther parts of the application are run as a normal user, and the helper tool is called when needed, using a secure mechanism that		need to be run with privileges, not the whole application logic. All the o ther parts of the application are run as a normal user, and the helper tool is called when needed, using a secure mechanism that
	ensures that the user is authorized to do so. This pattern is not very eas y to implement, because the developer has to deal with a lot of details abo ut how to authorize the user, how to call the helper		ensures that the user is authorized to do so. This pattern is not very eas y to implement, because the developer has to deal with a lot of details abo ut how to authorize the user, how to call the helper
	with the right privileges, how to exchange data with the helper, etc.. Thi s is where the new KDE Authorization API becomes useful. Thanks to this new library, every developer can implement the		with the right privileges, how to exchange data with the helper, etc.. Thi s is where the new KDE Authorization API becomes useful. Thanks to this new library, every developer can implement the
	caller/helper pattern to write application that require high privileges, w ith a few lines of code in an easy, secure and cross-platform way.		caller/helper pattern to write application that require high privileges, w ith a few lines of code in an easy, secure and cross-platform way.
	Not only: the library can also be used to lock down some actions in your a pplication without using an helper but just checking for authorization and verifying if the user is allowed to perform it.		Not only: the library can also be used to lock down some actions in your a pplication without using a helper but just checking for authorization and v erifying if the user is allowed to perform it.
	The KDE Authorization library uses different backends depending on the sys tem where it's built. As far as the user authorization is concerned, it cur rently uses PolicyKit on linux and Authorization Services		The KDE Authorization library uses different backends depending on the sys tem where it's built. As far as the user authorization is concerned, it cur rently uses PolicyKit on linux and Authorization Services
	on Mac OSX, and a Windows backend will eventually be written, too. At the communication layer, the library uses D-Bus on every supported platform.		on Mac OSX, and a Windows backend will eventually be written, too. At the communication layer, the library uses D-Bus on every supported platform.
	@section kauth_concepts Concepts		@section kauth_concepts Concepts
	There are a few concepts to understand when using the library. Much of tho se are carried from underlying APIs such as PolicyKit, so if you know somet hing about them there shouldn't be problems.		There are a few concepts to understand when using the library. Much of tho se are carried from underlying APIs such as PolicyKit, so if you know somet hing about them there shouldn't be problems.
	An <i>action</i> is a single task that needs to be done by the application . You refer to an action using an action identifier, which is a string in r everse domain name syntax (to avoid duplicates). For		An <i>action</i> is a single task that needs to be done by the application . You refer to an action using an action identifier, which is a string in r everse domain name syntax (to avoid duplicates). For
	example, if the date/time control center module needs to change the date, it would need an action like "org.kde.datatime.change". If your application has to perform more than one privileged task, you		example, if the date/time control center module needs to change the date, it would need an action like "org.kde.datatime.change". If your application has to perform more than one privileged task, you
	should configure more than one action. This allows system administrators t o fine tune the policies that allow users to perform your actions.		should configure more than one action. This allows system administrators t o fine tune the policies that allow users to perform your actions.
	skipping to change at line 78		skipping to change at line 78
	"dbus activation" that doesn't require the setuid bit and is much more f lexible.		"dbus activation" that doesn't require the setuid bit and is much more f lexible.
	- The helper code, immediately after starting, checks if the caller is aut horized to do what it asks. If not the helper immediately exits!		- The helper code, immediately after starting, checks if the caller is aut horized to do what it asks. If not the helper immediately exits!
	- If the caller is authorized, the helper executes the task and exits.		- If the caller is authorized, the helper executes the task and exits.
	- The application receives data back from the helper.		- The application receives data back from the helper.
	All these steps are managed by the library. Following sections will focus on how to write the helper to implement your actions and how to call the he lper from the application.		All these steps are managed by the library. Following sections will focus on how to write the helper to implement your actions and how to call the he lper from the application.
	@section kauth_helper Writing the helper tool		@section kauth_helper Writing the helper tool
	The first thing you need to do before writing anything is to decide what a ctions you need to implement. Every action needs to be identified by a stri ng in the reverse domain name syntax. This helps to		The first thing you need to do before writing anything is to decide what a ctions you need to implement. Every action needs to be identified by a stri ng in the reverse domain name syntax. This helps to
	avoid duplicates. An example of action id is "org.kde.datetime.change" or "org.kde.ksysguard.killprocess". Actions name can only contain lowercase le tters and dots (not as the first or last char).		avoid duplicates. An example of action id is "org.kde.datetime.change" or "org.kde.ksysguard.killprocess". Action names can only contain lowercase le tters and dots (not as the first or last char).
	You also need an identifier for your helper. An application using the KDE auth api can implement and use more than one helper, implementing different actions. An helper is uniquely identified in the		You also need an identifier for your helper. An application using the KDE auth api can implement and use more than one helper, implementing different actions. An helper is uniquely identified in the
	system context with a string. It, again, is in reverse domain name syntax to avoid duplicates. A common approach is to call the helper like the commo n prefix of your action names.		system context with a string. It, again, is in reverse domain name syntax to avoid duplicates. A common approach is to call the helper like the commo n prefix of your action names.
	For example, the Date/Time kcm module could use an helper called "org.kde. datetime", to perform actions like "org.kde.datetime.changedate" and "org.k de.datetime.changetime". This naming convention		For example, the Date/Time kcm module could use a helper called "org.kde.d atetime", to perform actions like "org.kde.datetime.changedate" and "org.kd e.datetime.changetime". This naming convention
	simplifies the implementation of the helper.		simplifies the implementation of the helper.
	From the code point of view, the helper is implemented as a QObject subcla ss. Every action is implemented by a public slot. In the example/ directory in the source code tree you find a complete example.		From the code point of view, the helper is implemented as a QObject subcla ss. Every action is implemented by a public slot. In the example/ directory in the source code tree you find a complete example.
	Let's look at that.		Let's look at that.
	The helper.h file declares the class that implements the helper. It looks like:		The helper.h file declares the class that implements the helper. It looks like:
	@code		@code
	#include <kauth.h>		#include <kauth.h>
			using namespace KAuth;
	class MyHelper : public QObject		class MyHelper : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public slots:		public slots:
	ActionReply read(QVariantMap args);		ActionReply read(const QVariantMap& args);
	ActionReply write(QVariantMap args);		ActionReply write(const QVariantMap& args);
	ActionReply longaction(QVariantMap args);		ActionReply longaction(const QVariantMap& args);
	};		};
	@endcode		@endcode
	The slot names are the last part of the action name, without the helper's ID if its a prefix, with all the dots replaced by underscores. In this case , the helper ID is "org.kde.auth.example", so those		The slot names are the last part of the action name, without the helper's ID if it's a prefix, with all the dots replaced by underscores. In this cas e, the helper ID is "org.kde.auth.example", so those
	three slots implement the actions "org.kde.auth.example.read", "org.kde.au th.example.write" and "org.kde.auth.example.longaction". The helper ID does n't have to appear at the beginning of the action		three slots implement the actions "org.kde.auth.example.read", "org.kde.au th.example.write" and "org.kde.auth.example.longaction". The helper ID does n't have to appear at the beginning of the action
	name, but it's good practice. If you want to extend MyHelper to implement also a different action like "org.kde.datetime.changetime", since the helpe r ID doesn't match you'll have to implement a		name, but it's good practice. If you want to extend MyHelper to implement also a different action like "org.kde.datetime.changetime", since the helpe r ID doesn't match you'll have to implement a
	slot called org_kde_datetime_changetime().		slot called org_kde_datetime_changetime().
	The slots signature is fixed: the return type is ActionReply, a class that allows you to return results, error codes and custom data to the applicati on when your action has finished to run.		The slot's signature is fixed: the return type is ActionReply, a class tha t allows you to return results, error codes and custom data to the applicat ion when your action has finished to run.
	Please note that due to QMetaObject being picky about namespaces, you NEED to declare the return type as ActionReply and not KAuth::ActionReply. So t he using declaration is compulsory		Please note that due to QMetaObject being picky about namespaces, you NEED to declare the return type as ActionReply and not KAuth::ActionReply. So t he using declaration is compulsory
	The QVariantMap object that comes as argument contains custom data coming from the application.		The QVariantMap object that comes as argument contains custom data coming from the application.
	Let's look at the read action implementation. Its purpose is to read files :		Let's look at the read action implementation. Its purpose is to read files :
	@code		@code
	ActionReply MyHelper::read(QVariantMap args)		ActionReply MyHelper::read(QVariantMap args)
	{		{
	ActionReply reply;		ActionReply reply;
	QString filename = args["filename"].toString();		QString filename = args["filename"].toString();
	skipping to change at line 210		skipping to change at line 212
	- A synchronous call, using the Action::execute() method, will start the h elper, execute the action and return the reply.		- A synchronous call, using the Action::execute() method, will start the h elper, execute the action and return the reply.
	- An asynchronous call, by setting Action::setExecutesAsync(true) and call ing ::execute(), will start the helper and return immediately.		- An asynchronous call, by setting Action::setExecutesAsync(true) and call ing ::execute(), will start the helper and return immediately.
	The asynchronous call is the most flexible alternative, but you need a way to obtain the reply. This is done by connecting to a signal, but the Actio n class is not a QObject subclass. Instead, you connect		The asynchronous call is the most flexible alternative, but you need a way to obtain the reply. This is done by connecting to a signal, but the Actio n class is not a QObject subclass. Instead, you connect
	to signals exposed by the ActionWatcher class. For every action id you use , there is one ActionWatcher object. You can retrieve it using the Action:: watcher() method. If you execute an action using		to signals exposed by the ActionWatcher class. For every action id you use , there is one ActionWatcher object. You can retrieve it using the Action:: watcher() method. If you execute an action using
	Action::executeAsync(), you can connect to the actionPerformed(ActionReply ) signal to be notified when the action has been completed (or failed). As a parameter, you'll get a reply object containing		Action::executeAsync(), you can connect to the actionPerformed(ActionReply ) signal to be notified when the action has been completed (or failed). As a parameter, you'll get a reply object containing
	all the data you need. As a convenience, you can also pass an object and a slot to the executeAsync() method to directly connect them to the signal, if you don't want to mess with watchers.		all the data you need. As a convenience, you can also pass an object and a slot to the executeAsync() method to directly connect them to the signal, if you don't want to mess with watchers.
	The piece of code that calls the action of the previous example is located in example/mainwindow.cpp in the on_readAction_triggered() slot. It looks like this:		The piece of code that calls the action of the previous example is located in example/mainwindow.cpp in the on_readAction_triggered() slot. It looks like this:
	@code		@code
			QVariantMap args;
			args["filename"] = filename;
	Action readAction = "org.kde.auth.example.read";		Action readAction = "org.kde.auth.example.read";
	readAction.setHelperID("org.kde.auth.example");		readAction.setHelperID("org.kde.auth.example");
	readAction.arguments()["filename"] = filename;		readAction.setArguments(args);
	ActionReply reply = readAction.execute();		ActionReply reply = readAction.execute();
	if (reply.failed())		if (reply.failed())
	QMessageBox::information(this, "Error", QString("KAuth returned an erro r code: %1").arg(reply.errorCode()));		QMessageBox::information(this, "Error", QString("KAuth returned an erro r code: %1").arg(reply.errorCode()));
	else		else
	contents = reply.data()["contents"].toString();		contents = reply.data()["contents"].toString();
	@endcode		@endcode
	First of all, it creates the action object specifying the action id. Then it loads the filename (we want to read a forbidden file) into the arguments () QVariantMap, which will be directly passed to the		First of all, it creates the action object specifying the action id. Then it loads the filename (we want to read a forbidden file) into the arguments () QVariantMap, which will be directly passed to the
	helper in the read() slot's parameter. This example code uses a synchronou s call to execute the action and retrieve the reply. If the reply succeeded , the reply data is retrieved from the returned QVariantMap		helper in the read() slot's parameter. This example code uses a synchronou s call to execute the action and retrieve the reply. If the reply succeeded , the reply data is retrieved from the returned QVariantMap
	object. Please note that, although the execute() method will return only w hen the action is completed, the GUI will remain responsive because an inte rnal event loop is entered. This means you should be		object. Please note that, although the execute() method will return only w hen the action is completed, the GUI will remain responsive because an inte rnal event loop is entered. This means you should be
	prepared to receive other events in the meanwhile. Also, notice that you h		prepared to receive other events in the meanwhile. Also, notice that you h
	ave to set explicitely the helper ID to the action: this is done for an add		ave to explicitly set the helper ID to the action: this is done for added s
	ed safety, to prevent the caller from accidentally invoking		afety, to prevent the caller from accidentally invoking
	an helper, and also because KAuth actions may be used without an helper at		a helper, and also because KAuth actions may be used without a helper atta
	tached (the default). In this case, action.execute() will return ActionSucc		ched (the default). In this case, action.execute() will return ActionSucces
	ess if the authentication went well. This is quite useful		s if the authentication went well. This is quite useful
	if you want your user to authenticate before doing something, which howeve r needs no privileged permissions implementation-wise.		if you want your user to authenticate before doing something, which howeve r needs no privileged permissions implementation-wise.
	@section kauth_async Asynchronous calls, data reporting, and action termin ation		@section kauth_async Asynchronous calls, data reporting, and action termin ation
	For a more advanced example, we look at the action "org.kde.auth.example.l ongaction" in the example helper. This is an action that takes a long time to execute, so we need some features:		For a more advanced example, we look at the action "org.kde.auth.example.l ongaction" in the example helper. This is an action that takes a long time to execute, so we need some features:
	- The helper needs to regularly send data to the application, to inform ab out the execution status.		- The helper needs to regularly send data to the application, to inform ab out the execution status.
	- The application needs to be able to stop the action execution if the use r stops it or close the application.		- The application needs to be able to stop the action execution if the use r stops it or close the application.
	The example code follows:		The example code follows:
	@code		@code
	ActionReply MyHelper::longaction(QVariantMap args)		ActionReply MyHelper::longaction(QVariantMap args)
	skipping to change at line 252		skipping to change at line 256
	}		}
	return ActionReply::SuccessReply;		return ActionReply::SuccessReply;
	}		}
	@endcode		@endcode
	In this example, the action is only waiting a "long" time using a loop, bu t we can see some interesting line. The progress status is sent to the appl ication using the HelperSupport::progressStep() method.		In this example, the action is only waiting a "long" time using a loop, bu t we can see some interesting line. The progress status is sent to the appl ication using the HelperSupport::progressStep() method.
	When this method is called, the ActionWatcher associated with this action will emit the progressStep() signal, reporting back the data to the applica tion. There are two overloads of these methods and		When this method is called, the ActionWatcher associated with this action will emit the progressStep() signal, reporting back the data to the applica tion. There are two overloads of these methods and
	corresponding signals. The one used here takes an integer. Its meaning is application dependent, so you can use it as a sort of percentage. The other overload takes a QVariantMap object that is directly		corresponding signals. The one used here takes an integer. Its meaning is application dependent, so you can use it as a sort of percentage. The other overload takes a QVariantMap object that is directly
	passed to the app. In this way, you can report to the application all the custom data you want.		passed to the app. In this way, you can report to the application all the custom data you want.
	In this example code, the loop exits when the HelperSupport::isStopped() r eturns true. This happens when the application call the stop() method on th e correponding action object. The stop() method, this		In this example code, the loop exits when the HelperSupport::isStopped() r eturns true. This happens when the application calls the stop() method on t he correponding action object. The stop() method, this
	way, asks the helper to stop the action execution. It's up to the helper t o obbey to this request, and if it does so, it should return from the slot, _not_ exit.		way, asks the helper to stop the action execution. It's up to the helper t o obbey to this request, and if it does so, it should return from the slot, _not_ exit.
	The code that calls the action in the application connects a slot to the a ctionPerformed() signal and then call executeAsync(). The progressStep() si gnal is directly connected to a QProgressBar, and		The code that calls the action in the application connects a slot to the a ctionPerformed() signal and then call executeAsync(). The progressStep() si gnal is directly connected to a QProgressBar, and
	the Stop button in the UI is connected to a slot that calls the Action::st op() method.		the Stop button in the UI is connected to a slot that calls the Action::st op() method.
	@code		@code
	void MainWindow::on_longAction_triggered()		void MainWindow::on_longAction_triggered()
	{		{
	Action longAction = "org.kde.auth.example.longaction";		Action longAction = "org.kde.auth.example.longaction";
	connect(longAction.watcher(), SIGNAL(progressStep(int)),		connect(longAction.watcher(), SIGNAL(progressStep(int)),
	skipping to change at line 283		skipping to change at line 287
	void MainWindow::stopLongAction()		void MainWindow::stopLongAction()
	{		{
	Action("org.kde.auth.example.longaction").stop();		Action("org.kde.auth.example.longaction").stop();
	}		}
	void MainWindow::longActionPerformed(ActionReply reply)		void MainWindow::longActionPerformed(ActionReply reply)
	{		{
	//...		//...
	if (reply.succeded())		if (reply.succeeded())
	this->statusBar()->showMessage("Action succeded", 10000);		this->statusBar()->showMessage("Action succeeded", 10000);
	else		else
	this->statusBar()->showMessage(QString("Could not execute the long action: %1").arg(reply.errorCode()), 10000);		this->statusBar()->showMessage(QString("Could not execute the long action: %1").arg(reply.errorCode()), 10000);
	}		}
	@endcode		@endcode
	Please pay attention that when you call an action, the helper will be busy executing that action. Therefore, you can't call two execute() methods in sequence like that:		Please pay attention that when you call an action, the helper will be busy executing that action. Therefore, you can't call two execute() methods in sequence like that:
	@code		@code
	action1.execute();		action1.execute();
	action2.execute();		action2.execute();
	@endcode		@endcode
	If you do, you'll get an HelperBusy reply from the second action.		If you do, you'll get a HelperBusy reply from the second action.
	A solution would be to launch the second action from the slot connected to the first's actionPerformed signal, but this would be very ugly. Read furt her to know how to solve this problem.		A solution would be to launch the second action from the slot connected to the first's actionPerformed signal, but this would be very ugly. Read furt her to know how to solve this problem.
	@section kauth_other Other features		@section kauth_other Other features
	To allow to easily execute several actions in sequence, you can execute th em in group. This means using the Action::executeActions() static method, w hich takes a list of actions and asks the helper		To allow to easily execute several actions in sequence, you can execute th em in a group. This means using the Action::executeActions() static method, which takes a list of actions and asks the helper
	to execute them with a single request. The helper will execute the actions in the specified order. All the signals will be emitted from the watchers associated with each action.		to execute them with a single request. The helper will execute the actions in the specified order. All the signals will be emitted from the watchers associated with each action.
	Sometimes the application needs to know when a particular action has start ed to execute. For this purpose, you can connect to the actionStarted() sig nal. It is emitted immediately before the helper's		Sometimes the application needs to know when a particular action has start ed to execute. For this purpose, you can connect to the actionStarted() sig nal. It is emitted immediately before the helper's
	slot is called. This isn't very useful if you call execute(), but if you u se executeActions() it lets you know when individual actions in the group a re started.		slot is called. This isn't very useful if you call execute(), but if you u se executeActions() it lets you know when individual actions in the group a re started.
	It doesn't happen very frequently to code something that doesn't require s ome debugging, and you'll need some tool, even a basic one, to debug your h elper code as well. For this reason, the		It doesn't happen very frequently that you code something that doesn't req uire some debugging, and you'll need some tool, even a basic one, to debug your helper code as well. For this reason, the
	KDE Authorization library provides a message handler for the Qt debugging system. This means that every call to qDebug() & co. will be reported to th e application, and printed using the same qt debugging		KDE Authorization library provides a message handler for the Qt debugging system. This means that every call to qDebug() & co. will be reported to th e application, and printed using the same qt debugging
	system, with the same debug level.		system, with the same debug level.
	If, in the helper code, you write something like:		If, in the helper code, you write something like:
	@code		@code
	qDebug() << "I'm in the helper";		qDebug() << "I'm in the helper";
	@endcode		@endcode
	You'll see something like this in the <i>application</i>'s output:		You'll see something like this in the <i>application</i>'s output:
	@verbatim		@verbatim
	Debug message from the helper: I'm in the helper		Debug message from the helper: I'm in the helper
	skipping to change at line 351		skipping to change at line 355
	* An error reply of KAuthError type always contains an empty data() object. For some kind of errors		* An error reply of KAuthError type always contains an empty data() object. For some kind of errors
	* you could get a human-readable description with errorDescription().		* you could get a human-readable description with errorDescription().
	*		*
	* If, instead, the helper itself has to report some errors occurred during the action execution,		* If, instead, the helper itself has to report some errors occurred during the action execution,
	* the type() will be (and has to be) ActionReply::HelperError. In this case the data() object can		* the type() will be (and has to be) ActionReply::HelperError. In this case the data() object can
	* contain custom data from the helper, and the errorCode() and errorDescrip tion() values are		* contain custom data from the helper, and the errorCode() and errorDescrip tion() values are
	* application-dependent.		* application-dependent.
	*		*
	* In the helper, to create an action reply object you have two choices: usi ng the constructor, or		* In the helper, to create an action reply object you have two choices: usi ng the constructor, or
	* the predefined replies. For example, to create a successful reply you can use the default constructor		* the predefined replies. For example, to create a successful reply you can use the default constructor
	* but to create an helper error reply, instead of writing <i>ActionReply(Ac tionReply::HelperError)</i>		* but to create a helper error reply, instead of writing <i>ActionReply(Act ionReply::HelperError)</i>
	* you could use the more convenient <i>ActionReply::HelperErrorReply</i> co nstant.		* you could use the more convenient <i>ActionReply::HelperErrorReply</i> co nstant.
	*		*
	* You should not use the predefined error replies to create and return new errors. Replies with the		* You should not use the predefined error replies to create and return new errors. Replies with the
	* KAuthError type are intended to be returned by the library only. However, you can use them for		* KAuthError type are intended to be returned by the library only. However, you can use them for
	* comparisons.		* comparisons.
	*		*
	* To quickly check for success or failure of an action, you can use succeed ed() or failed().		* To quickly check for success or failure of an action, you can use succeed ed() or failed().
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
End of changes. 17 change blocks.
	23 lines changed or deleted		27 lines changed or added

	kbuttongroup.h		kbuttongroup.h
	skipping to change at line 32		skipping to change at line 32
	#ifndef KBUTTONGROUP_H		#ifndef KBUTTONGROUP_H
	#define KBUTTONGROUP_H		#define KBUTTONGROUP_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QGroupBox>		#include <QtGui/QGroupBox>
	class QAbstractButton;		class QAbstractButton;
	/**		/**
	* @short Group box with index of the selected button		* @short Group box with index of the selected button
	* KGroupBox is a simple group box that can keep track of the current selec ted		* KButtonGroup is a simple group box that can keep track of the current se lected
	* button of the ones added to it.		* button of the ones added to it.
	*		*
	* Use normally as you would with a QGroupBox.		* Use normally as you would with a QGroupBox.
	*		*
	* \image html kbuttongroup.png "KDE Button Group containing 3 KPushButtons "		* \image html kbuttongroup.png "KDE Button Group containing 3 KPushButtons "
	*		*
	* @author Pino Toscano <toscano.pino@tiscali.it>		* @author Pino Toscano <toscano.pino@tiscali.it>
	*/		*/
	class KDEUI_EXPORT KButtonGroup		class KDEUI_EXPORT KButtonGroup
	: public QGroupBox		: public QGroupBox
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kcalendarsystem.h		kcalendarsystem.h
	skipping to change at line 48		skipping to change at line 48
	* Derived classes must be created through the create() static method		* Derived classes must be created through the create() static method
	*/		*/
	class KDECORE_EXPORT KCalendarSystem		class KDECORE_EXPORT KCalendarSystem
	{		{
	public:		public:
	/**		/**
	* Format for returned year number / month number / day number as strin g.		* Format for returned year number / month number / day number as strin g.
	*/		*/
	enum StringFormat {		enum StringFormat {
	ShortFormat, /**< Short string format, e.g. 2000 = "00" or 6		ShortFormat, /**< Short string format, e.g. 2000 = "00" or 6 =
	= "6" */		"6" */
	LongFormat /**< Long string format, e.g. 2000 = "2000" or 6		LongFormat /**< Long string format, e.g. 2000 = "2000" or 6
	= "06" */		= "06" */
	};		};
	/**		/**
	* Format for returned month / day name.		* Format for returned month / day name.
	*/		*/
	enum MonthNameFormat {		enum MonthNameFormat {
	ShortName, /**< Short name format, e.g. "Dec" */		ShortName, /**< Short name format, e.g. "Dec" */
	LongName, /**< Long name format, e.g. "December" *		LongName, /**< Long name format, e.g. "December" */
	/		ShortNamePossessive, /**< Short name possessive format, e.g. "
	ShortNamePossessive, /**< Short name possessive format, e.g.		of Dec" */
	"of Dec" */		LongNamePossessive, /**< Long name possessive format, e.g. "o
	LongNamePossessive /**< Long name possessive format, e.g. "		f December" */
	of December" */		NarrowName /**< Narrow name format, e.g. "D". @since
			4.7 */
	};		};
	/**		/**
	* Format for returned month / day name.		* Format for returned month / day name.
	*/		*/
	enum WeekDayNameFormat {		enum WeekDayNameFormat {
	ShortDayName, /**< Short name format, e.g. "Fri" */		ShortDayName, /**< Short name format, e.g. "Fri" */
	LongDayName /**< Long name format, e.g. "Friday"		LongDayName, /**< Long name format, e.g. "Friday" *
	*/		/
			NarrowDayName /**< Narrow name format, e.g. "F". @si
			nce 4.7 */
	};		};
	//KDE5 remove		//KDE5 remove
	/**		/**
	* @deprecated use create(KLocale::CalendarSystem, KLocale) instead		* @deprecated use create(KLocale::CalendarSystem, KLocale) instead
	*		*
	* Creates specific calendar type		* Creates specific calendar type
	*		*
	* @param calType string identification of the specific calendar type		* @param calType string identification of the specific calendar type
	* to be constructed		* to be constructed
	* @param locale locale to use for translations. The global locale is u sed if null.		* @param locale locale to use for translations. The global locale is u sed if null.
	* @return a KCalendarSystem object		* @return a KCalendarSystem object
	*/		*/
	static KCalendarSystem *create( const QString & calType = QLatin1String		KDE_DEPRECATED static KCalendarSystem *create(const QString & calType =
	( "gregorian" ),		QLatin1String("gregorian"),
	const KLocale * locale = 0 );		const KLocale * locale =
			0);
	//KDE5 remove		//KDE5 remove
	/**		/**
	* @deprecated use create(KLocale::CalendarSystem, KSharedConfig, KLoca le) instead		* @deprecated use create(KLocale::CalendarSystem, KSharedConfig, KLoca le) instead
	*		*
	* @since 4.5		* @since 4.5
	*		*
	* Creates specific calendar type		* Creates specific calendar type
	*		*
	* @param calType string identification of the specific calendar type t o be constructed		* @param calType string identification of the specific calendar type t o be constructed
	* @param config a configuration file with a 'KCalendarSystem %calendar Type' group detailing		* @param config a configuration file with a 'KCalendarSystem %calendar Type' group detailing
	* locale-related preferences (such as era options). The global config is used		* locale-related preferences (such as era options). The global config is used
	if null.		if null.
	* @param locale locale to use for translations. The global locale is u sed if null.		* @param locale locale to use for translations. The global locale is u sed if null.
	* @return a KCalendarSystem object		* @return a KCalendarSystem object
	*/		*/
	static KCalendarSystem *create( const QString & calType, KSharedConfig:		KDE_DEPRECATED static KCalendarSystem *create(const QString & calType,
	:Ptr config,		KSharedConfig::Ptr config,
	const KLocale * locale = 0 );		const KLocale * locale =
			0);
	//KDE5 add default value to calendarSystem		//KDE5 add default value to calendarSystem
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Creates a KCalendarSystem object for the required Calendar System		* Creates a KCalendarSystem object for the required Calendar System
	*		*
	* @param calendarSystem the Calendar System to create, defaults to QDa te compatible		* @param calendarSystem the Calendar System to create, defaults to QDa te compatible
	* @param locale locale to use for translations. The global locale is u sed if null.		* @param locale locale to use for translations. The global locale is u sed if null.
	* @return a KCalendarSystem object		* @return a KCalendarSystem object
	*/		*/
	static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem,		static KCalendarSystem *create(KLocale::CalendarSystem calendarSystem,
	const KLocale *locale = 0 );		const KLocale *locale = 0);
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Creates a KCalendarSystem object for the required Calendar System		* Creates a KCalendarSystem object for the required Calendar System
	*		*
	* @param calendarSystem the Calendar System to create		* @param calendarSystem the Calendar System to create
	* @param config a configuration file with a 'KCalendarSystem %calendar Type' group detailing		* @param config a configuration file with a 'KCalendarSystem %calendar Type' group detailing
	* locale-related preferences (such as era options). The global config is used		* locale-related preferences (such as era options). The global config is used
	if null.		if null.
	* @param locale locale to use for translations. The global locale is u sed if null.		* @param locale locale to use for translations. The global locale is u sed if null.
	* @return a KCalendarSystem object		* @return a KCalendarSystem object
	*/		*/
	static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem,		static KCalendarSystem *create(KLocale::CalendarSystem calendarSystem,
	KSharedConfig::Ptr config,		KSharedConfig::Ptr config,
	const KLocale *locale = 0 );		const KLocale *locale = 0);
	//KDE5 remove		//KDE5 remove
	/**		/**
	* @deprecated use calendarSystemsList() instead		* @deprecated use calendarSystemsList() instead
	*		*
	* Gets a list of names of supported calendar systems.		* Gets a list of names of supported calendar systems.
	*		*
	* @return list of names		* @return list of names
	*/		*/
	static QStringList calendarSystems();		KDE_DEPRECATED static QStringList calendarSystems();
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns the list of currently supported Calendar Systems		* Returns the list of currently supported Calendar Systems
	*		*
	* @return list of Calendar Systems		* @return list of Calendar Systems
	*/		*/
	static QList<KLocale::CalendarSystem> calendarSystemsList();		static QList<KLocale::CalendarSystem> calendarSystemsList();
	skipping to change at line 161		skipping to change at line 163
	* @deprecated use calendarLabel( KLocale::CalendarSystem ) instead		* @deprecated use calendarLabel( KLocale::CalendarSystem ) instead
	*		*
	* Returns a typographically correct and translated label to display fo r		* Returns a typographically correct and translated label to display fo r
	* the calendar system type. Use with calendarSystems() to neatly		* the calendar system type. Use with calendarSystems() to neatly
	* format labels to display on combo widget of available calendar syste ms.		* format labels to display on combo widget of available calendar syste ms.
	*		*
	* @param calendarType the specific calendar type to return the label f or		* @param calendarType the specific calendar type to return the label f or
	*		*
	* @return label for calendar		* @return label for calendar
	*/		*/
	static QString calendarLabel( const QString &calendarType );		KDE_DEPRECATED static QString calendarLabel(const QString &calendarType );
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a localized label to display for the required Calendar Syste m type.		* Returns a localized label to display for the required Calendar Syste m type.
	*		*
	* Use with calendarSystemsList() to populate selction lists of availab le		* Use with calendarSystemsList() to populate selection lists of availa ble
	* calendar systems.		* calendar systems.
	*		*
	* @param calendarType the specific calendar type to return the label f or		* @param calendarSystem the specific calendar type to return the label for
	* @param locale the locale to use for the label, defaults to global		* @param locale the locale to use for the label, defaults to global
	* @return label for calendar		* @return label for calendar
	*/		*/
	static QString calendarLabel( KLocale::CalendarSystem calendarSystem, c onst KLocale *locale = KGlobal::locale() );		static QString calendarLabel(KLocale::CalendarSystem calendarSystem, co nst KLocale *locale = KGlobal::locale());
			//KDE5 Remove
	/**		/**
			* @deprecated use calendarSystem(const QString &calendarType) instead
	* @since 4.6		* @since 4.6
	*		*
	* Returns the Calendar System enum value for a given Calendar Type,		* Returns the Calendar System enum value for a given Calendar Type,
	* e.g. KLocale::QDateCalendar for "gregorian"		* e.g. KLocale::QDateCalendar for "gregorian"
	*		*
	* @param calendarType the calendar type to convert		* @param calendarType the calendar type to convert
	* @return calendar system for calendar type		* @return calendar system for calendar type
	*/		*/
	static KLocale::CalendarSystem calendarSystemForCalendarType( const QSt		KDE_DEPRECATED static KLocale::CalendarSystem calendarSystemForCalendar
	ring &calendarType );		Type(const QString &calendarType);
			//KDE5 Remove
			/**
			* @since 4.7
			*
			* Returns the Calendar System enum value for a given Calendar Type,
			* e.g. KLocale::QDateCalendar for "gregorian"
			*
			* @param calendarType the calendar type to convert
			* @return calendar system for calendar type
			*/
			static KLocale::CalendarSystem calendarSystem(const QString &calendarTy
			pe);
			//KDE5 remove
			/**
			* @since 4.7
			*
			* Returns the deprecated Calendar Type for a given Calendar System enu
			m value,
			* e.g. "gregorian" for KLocale::QDateCalendar
			*
			* @param calendarSystem the calendar system to convert
			* @return calendar type for calendar system
			*/
			static QString calendarType(KLocale::CalendarSystem calendarSystem);
	/**		/**
	* Constructor of abstract calendar class. This will be called by deriv ed classes.		* Constructor of abstract calendar class. This will be called by deriv ed classes.
	*		*
	* @param locale locale to use for translations. The global locale is u sed if null.		* @param locale locale to use for translations. The global locale is u sed if null.
	*/		*/
	explicit KCalendarSystem( const KLocale *locale = 0 );		explicit KCalendarSystem(const KLocale *locale = 0);
	/**		/**
	* Constructor of abstract calendar class. This will be called by deriv ed classes.		* Constructor of abstract calendar class. This will be called by deriv ed classes.
	*		*
	* @param config a configuration file with a 'KCalendarSystem %calendar Name' group detailing		* @param config a configuration file with a 'KCalendarSystem %calendar Name' group detailing
	* locale-related preferences (such as era options). The global config is used		* locale-related preferences (such as era options). The global config is used
	if null.		if null.
	* @param locale locale to use for translations. The global locale is u sed if null.		* @param locale locale to use for translations. The global locale is u sed if null.
	*/		*/
	explicit KCalendarSystem( const KSharedConfig::Ptr config, const KLocal e *locale = 0 );		explicit KCalendarSystem(const KSharedConfig::Ptr config, const KLocale *locale = 0);
	/**		/**
	* Destructor.		* Destructor.
	*/		*/
	virtual ~KCalendarSystem();		virtual ~KCalendarSystem();
	/**		/**
	* @deprecated use calendarSystem() instead		* @deprecated use calendarSystem() instead
	*		*
	* Returns the calendar system type.		* Returns the calendar system type.
	*		*
	* @return type of calendar system		* @return type of calendar system
	*/		*/
	virtual QString calendarType() const = 0;		KDE_DEPRECATED virtual QString calendarType() const = 0;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns the Calendar System type of the KCalendarSystem object		* Returns the Calendar System type of the KCalendarSystem object
	*		*
	* @return type of calendar system		* @return type of calendar system
	*/		*/
	KLocale::CalendarSystem calendarSystem() const;		KLocale::CalendarSystem calendarSystem() const;
	skipping to change at line 286		skipping to change at line 314
	virtual QDate latestValidDate() const;		virtual QDate latestValidDate() const;
	/**		/**
	* Returns whether a given date is valid in this calendar system.		* Returns whether a given date is valid in this calendar system.
	*		*
	* @param year the year portion of the date to check		* @param year the year portion of the date to check
	* @param month the month portion of the date to check		* @param month the month portion of the date to check
	* @param day the day portion of the date to check		* @param day the day portion of the date to check
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool isValid( int year, int month, int day ) const = 0;		virtual bool isValid(int year, int month, int day) const = 0;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Returns whether a given date is valid in this calendar system.		* Returns whether a given date is valid in this calendar system.
	*		*
	* @param year the year portion of the date to check		* @param year the year portion of the date to check
	* @param dayOfYear the day of year portion of the date to check		* @param dayOfYear the day of year portion of the date to check
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool isValid( int year, int dayOfYear ) const;		bool isValid(int year, int dayOfYear) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns whether a given date is valid in this calendar system.		* Returns whether a given date is valid in this calendar system.
	*		*
	* @param era the Era Name portion of the date to check		* @param eraName the Era Name portion of the date to check
	* @param yearInEra the Year In Era portion of the date to check		* @param yearInEra the Year In Era portion of the date to check
	* @param month the Month portion of the date to check		* @param month the Month portion of the date to check
	* @param day the Day portion of the date to check		* @param day the Day portion of the date to check
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool isValid( const QString &eraName, int yearInEra, int month, int day ) const;		bool isValid(const QString &eraName, int yearInEra, int month, int day) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Returns whether a given date is valid in this calendar system.		* Returns whether a given date is valid in this calendar system.
	*		*
	* @param year the year portion of the date to check		* @param year the year portion of the date to check
	* @param isoWeekNumber the ISO week portion of the date to check		* @param isoWeekNumber the ISO week portion of the date to check
	* @param dayOfIsoWeek the day of week portion of the date to check		* @param dayOfIsoWeek the day of week portion of the date to check
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek ) const;		bool isValidIsoWeekDate(int year, int isoWeekNumber, int dayOfIsoWeek) const;
	/**		/**
	* Returns whether a given date is valid in this calendar system.		* Returns whether a given date is valid in this calendar system.
	*		*
	* @param date the date to check		* @param date the date to check
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool isValid( const QDate &date ) const;		virtual bool isValid(const QDate &date) const;
	/**		/**
	* Changes the date's year, month and day. The range of the year, month		* Changes the date's year, month and day. The range of the year, month
	* and day depends on which calendar is being used. All years entered		* and day depends on which calendar is being used. All years entered
	* are treated literally, i.e. no Y2K translation is applied to years		* are treated literally, i.e. no Y2K translation is applied to years
	* entered in the range 00 to 99. Replaces setYMD.		* entered in the range 00 to 99. Replaces setYMD.
	*		*
	* @param date date to change		* @param date date to change
	* @param year year		* @param year year
	* @param month month number		* @param month month number
	* @param day day of month		* @param day day of month
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool setDate( QDate &date, int year, int month, int day ) const ;		virtual bool setDate(QDate &date, int year, int month, int day) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Set a date using the year number and day of year number only.		* Set a date using the year number and day of year number only.
	*		*
	* @param date date to change		* @param date date to change
	* @param year year		* @param year year
	* @param dayOfYear day of year		* @param dayOfYear day of year
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool setDate( QDate &date, int year, int dayOfYear ) const;		bool setDate(QDate &date, int year, int dayOfYear) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Set a date using the era, year in era number, month and day		* Set a date using the era, year in era number, month and day
	*		*
	* @param date date to change		* @param date date to change
	* @param eraName Era string		* @param eraName Era string
	* @param year Year In Era number		* @param yearInEra Year In Era number
	* @param month Month number		* @param month Month number
	* @param day Day Of Month number		* @param day Day Of Month number
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool setDate( QDate &date, QString eraName, int yearInEra, int month, i nt day ) const;		bool setDate(QDate &date, QString eraName, int yearInEra, int month, in t day) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Set a date using the year number, ISO week number and day of week nu mber.		* Set a date using the year number, ISO week number and day of week nu mber.
	*		*
	* @param date date to change		* @param date date to change
	* @param year year		* @param year year
	* @param isoWeekNumber ISO week of year		* @param isoWeekNumber ISO week of year
	* @param dayOfIsoWeek day of week Mon..Sun (1..7)		* @param dayOfIsoWeek day of week Mon..Sun (1..7)
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool setDateIsoWeek( QDate &date, int year, int isoWeekNumber, int dayO fIsoWeek ) const;		bool setDateIsoWeek(QDate &date, int year, int isoWeekNumber, int dayOf IsoWeek) const;
	/**		/**
	* @deprecated		* @deprecated Use setDate() instead
	*
	* Use setDate instead
	*
	* @see KCalendarSystem::setDate
	*		*
	* Some implementations reject year range 00 to 99, but extended date		* Some implementations reject year range 00 to 99, but extended date
	* ranges now require these to be accepted. Equivalent in QDate is		* ranges now require these to be accepted. Equivalent in QDate is
	* obsoleted.		* obsoleted.
	*		*
	* Changes the date's year, month and day. The range of the year, month		* Changes the date's year, month and day. The range of the year, month
	* and day depends on which calendar is being used.		* and day depends on which calendar is being used.
	*		*
	* @param date Date to change		* @param date Date to change
	* @param y Year		* @param y Year
	* @param m Month number		* @param m Month number
	* @param d Day of month		* @param d Day of month
	* @return true if the date is valid; otherwise returns false.		* @return true if the date is valid; otherwise returns false.
	*/		*/
	virtual bool setYMD( QDate &date, int y, int m, int d ) const;		KDE_DEPRECATED virtual bool setYMD(QDate &date, int y, int m, int d) co nst;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns the year, month and day portion of a given date in the curre nt calendar system		* Returns the year, month and day portion of a given date in the curre nt calendar system
	*		*
	* @param date date to get year, month and day for		* @param date date to get year, month and day for
	* @param year year number returned in this variable		* @param year year number returned in this variable
	* @param month month number returned in this variable		* @param month month number returned in this variable
	* @param day day of month returned in this variable		* @param day day of month returned in this variable
	*/		*/
	void getDate( const QDate date, int *year, int *month, int *day ) const ;		void getDate(const QDate date, int *year, int *month, int *day) const;
	/**		/**
	* Returns the year portion of a given date in the current calendar sys tem		* Returns the year portion of a given date in the current calendar sys tem
	*		*
	* @param date date to return year for		* @param date date to return year for
	* @return year, 0 if input date is invalid		* @return year, 0 if input date is invalid
	*/		*/
	virtual int year( const QDate &date ) const;		virtual int year(const QDate &date) const;
	/**		/**
	* Returns the month portion of a given date in the current calendar sy stem		* Returns the month portion of a given date in the current calendar sy stem
	*		*
	* @param date date to return month for		* @param date date to return month for
	* @return month of year, 0 if input date is invalid		* @return month of year, 0 if input date is invalid
	*/		*/
	virtual int month( const QDate &date ) const;		virtual int month(const QDate &date) const;
	/**		/**
	* Returns the day portion of a given date in the current calendar syst em		* Returns the day portion of a given date in the current calendar syst em
	*		*
	* @param date date to return day for		* @param date date to return day for
	* @return day of the month, 0 if input date is invalid		* @return day of the month, 0 if input date is invalid
	*/		*/
	virtual int day( const QDate &date ) const;		virtual int day(const QDate &date) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns the Era Name portion of a given date in the current calendar system,		* Returns the Era Name portion of a given date in the current calendar system,
	* for example "AD" or "Anno Domini" for the Gregorian calendar and Chr istian Era.		* for example "AD" or "Anno Domini" for the Gregorian calendar and Chr istian Era.
	*		*
	* @param date date to return Era Name for		* @param date date to return Era Name for
	* @param format format to return, either short or long		* @param format format to return, either short or long
	* @return era name, empty string if input date is invalid		* @return era name, empty string if input date is invalid
	*/		*/
	QString eraName( const QDate &date, StringFormat format = ShortFormat ) const;		QString eraName(const QDate &date, StringFormat format = ShortFormat) c onst;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns the Era Year portion of a given date in the current		* Returns the Era Year portion of a given date in the current
	* calendar system, for example "2000 AD" or "Heisei 22".		* calendar system, for example "2000 AD" or "Heisei 22".
	*		*
	* @param date date to return Era Year for		* @param date date to return Era Year for
	* @param format format to return, either short or long		* @param format format to return, either short or long
	* @return era name, empty string if input date is invalid		* @return era name, empty string if input date is invalid
	*/		*/
	QString eraYear( const QDate &date, StringFormat format = ShortFormat ) const;		QString eraYear(const QDate &date, StringFormat format = ShortFormat) c onst;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns the Year In Era portion of a given date in the current calen dar		* Returns the Year In Era portion of a given date in the current calen dar
	* system, for example 1 for "1 BC".		* system, for example 1 for "1 BC".
	*		*
	* @param date date to return Year In Era for		* @param date date to return Year In Era for
	* @return Year In Era, -1 if input date is invalid		* @return Year In Era, -1 if input date is invalid
	*/		*/
	int yearInEra( const QDate &date ) const;		int yearInEra(const QDate &date) const;
	/**		/**
	* Returns a QDate containing a date @p nyears years later.		* Returns a QDate containing a date @p nyears years later.
	*		*
	* @param date The old date		* @param date The old date
	* @param nyears The number of years to add		* @param nyears The number of years to add
	* @return The new date, null date if any errors		* @return The new date, null date if any errors
	*/		*/
	virtual QDate addYears( const QDate &date, int nyears ) const;		virtual QDate addYears(const QDate &date, int nyears) const;
	/**		/**
	* Returns a QDate containing a date @p nmonths months later.		* Returns a QDate containing a date @p nmonths months later.
	*		*
	* @param date The old date		* @param date The old date
	* @param nmonths number of months to add		* @param nmonths number of months to add
	* @return The new date, null date if any errors		* @return The new date, null date if any errors
	*/		*/
	virtual QDate addMonths( const QDate &date, int nmonths ) const;		virtual QDate addMonths(const QDate &date, int nmonths) const;
	/**		/**
	* Returns a QDate containing a date @p ndays days later.		* Returns a QDate containing a date @p ndays days later.
	*		*
	* @param date The old date		* @param date The old date
	* @param ndays number of days to add		* @param ndays number of days to add
	* @return The new date, null date if any errors		* @return The new date, null date if any errors
	*/		*/
	virtual QDate addDays( const QDate &date, int ndays ) const;		virtual QDate addDays(const QDate &date, int ndays) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* Returns the difference between two dates in years, months and days.		* Returns the difference between two dates in years, months and days.
	* The difference is always caculated from the earlier date to the late r		* The difference is always caculated from the earlier date to the late r
	* date in year, month and day order, with the @p direction parameter		* date in year, month and day order, with the @p direction parameter
	* indicating which direction the difference is applied from the @p toD ate.		* indicating which direction the difference is applied from the @p toD ate.
	*		*
	* For example, the difference between 2010-06-10 and 2012-09-5 is 2 ye ars,		* For example, the difference between 2010-06-10 and 2012-09-5 is 2 ye ars,
	* 2 months and 26 days. Note that the difference between two last day s of		* 2 months and 26 days. Note that the difference between two last day s of
	* the month is always 1 month, e.g. 2010-01-31 to 2010-02-28 is 1 mont h		* the month is always 1 month, e.g. 2010-01-31 to 2010-02-28 is 1 mont h
	* not 28 days.		* not 28 days.
	*		*
	* @param fromDate The date to start from		* @param fromDate The date to start from
	* @param toDate The date to end at		* @param toDate The date to end at
	* @param yearsDiff Returns number of years difference		* @param yearsDiff Returns number of years difference
	* @param monthsDiff Returns number of months difference		* @param monthsDiff Returns number of months difference
	* @param daysDiff Returns number of days difference		* @param daysDiff Returns number of days difference
	* @param direction Returns direction of difference, 1 if fromDate <= t oDate, -1 otherwise		* @param direction Returns direction of difference, 1 if fromDate <= t oDate, -1 otherwise
	*/		*/
	void dateDifference( const QDate &fromDate, const QDate &toDate,		void dateDifference(const QDate &fromDate, const QDate &toDate,
	int *yearsDiff, int *monthsDiff, int *daysDiff, in		int *yearsDiff, int *monthsDiff, int *daysDiff, int
	t *direction ) const;		*direction) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* Returns the difference between two dates in completed calendar years.		* Returns the difference between two dates in completed calendar years.
	* The returned value will be negative if @p fromDate > @p toDate.		* The returned value will be negative if @p fromDate > @p toDate.
	*		*
	* For example, the difference between 2010-06-10 and 2012-09-5 is 2 yea rs.		* For example, the difference between 2010-06-10 and 2012-09-5 is 2 yea rs.
	*		*
	* @param fromDate The date to start from		* @param fromDate The date to start from
	* @param toDate The date to end at		* @param toDate The date to end at
	* @return The number of years difference		* @return The number of years difference
	*/		*/
	int yearsDifference( const QDate &fromDate, const QDate &toDate ) const ;		int yearsDifference(const QDate &fromDate, const QDate &toDate) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* Returns the difference between two dates in completed calendar month s		* Returns the difference between two dates in completed calendar month s
	* The returned value will be negative if @p fromDate > @p toDate.		* The returned value will be negative if @p fromDate > @p toDate.
	*		*
	* For example, the difference between 2010-06-10 and 2012-09-5 is 26 m onths.		* For example, the difference between 2010-06-10 and 2012-09-5 is 26 m onths.
	* Note that the difference between two last days of the month is alway s 1		* Note that the difference between two last days of the month is alway s 1
	* month, e.g. 2010-01-31 to 2010-02-28 is 1 month not 28 days.		* month, e.g. 2010-01-31 to 2010-02-28 is 1 month not 28 days.
	*		*
	* @param fromDate The date to start from		* @param fromDate The date to start from
	* @param toDate The date to end at		* @param toDate The date to end at
	* @return The number of months difference		* @return The number of months difference
	*/		*/
	int monthsDifference( const QDate &fromDate, const QDate &toDate ) cons t;		int monthsDifference(const QDate &fromDate, const QDate &toDate) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* Returns the difference between two dates in days		* Returns the difference between two dates in days
	* The returned value will be negative if @p fromDate > @p toDate.		* The returned value will be negative if @p fromDate > @p toDate.
	*		*
	* @param fromDate The date to start from		* @param fromDate The date to start from
	* @param toDate The date to end at		* @param toDate The date to end at
	* @return The number of days difference		* @return The number of days difference
	*/		*/
	int daysDifference( const QDate &fromDate, const QDate &toDate ) const;		int daysDifference(const QDate &fromDate, const QDate &toDate) const;
	/**		/**
	* Returns number of months in the given year		* Returns number of months in the given year
	*		*
	* @param date the date to obtain year from		* @param date the date to obtain year from
	* @return number of months in the year, -1 if input date invalid		* @return number of months in the year, -1 if input date invalid
	*/		*/
	virtual int monthsInYear( const QDate &date ) const;		virtual int monthsInYear(const QDate &date) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns number of months in the given year		* Returns number of months in the given year
	*		*
	* @param year the required year		* @param year the required year
	* @return number of months in the year, -1 if input date invalid		* @return number of months in the year, -1 if input date invalid
	*/		*/
	int monthsInYear( int year ) const;		int monthsInYear(int year) const;
	/**		/**
	* Returns the number of ISO weeks in the given year.		* Returns the number of localized weeks in the given year.
	*		*
	* @param date the date to obtain year from		* @param date the date to obtain year from
	* @return number of weeks in the year, -1 if input date invalid		* @return number of weeks in the year, -1 if input date invalid
	*/		*/
	virtual int weeksInYear( const QDate &date ) const;		virtual int weeksInYear(const QDate &date) const;
			//KDE5 Merge with virtual weeksInYear with default
	/**		/**
	* Returns the number of ISO weeks in the given year.		* @since 4.7
	*		*
	* ISO 8601 defines the first week of the year as the week containing t		* Returns the number of Weeks in a year using the required Week Number
	he first Thursday.		System.
	* See http://en.wikipedia.org/wiki/ISO_8601 and http://en.wikipedia.or		*
	g/wiki/ISO_week_date		* Unless you specifically want a particular Week Number System (e.g. I
			SO Weeks)
			* you should use the localized number of weeks provided by weeksInYear
			().
			*
			* @see week()
			* @see formatDate()
			* @param date the date to obtain year from
			* @param weekNumberSystem the week number system to use
			* @return number of weeks in the year, -1 if date invalid
			*/
			int weeksInYear(const QDate &date, KLocale::WeekNumberSystem weekNumber
			System) const;
			/**
			* Returns the number of localized weeks in the given year.
	*		*
	* @param year the year		* @param year the year
	* @return number of weeks in the year, -1 if input date invalid		* @return number of weeks in the year, -1 if input date invalid
	*/		*/
	virtual int weeksInYear( int year ) const;		virtual int weeksInYear(int year) const;
			//KDE5 Merge with virtual weeksInYear with default
			/**
			* @since 4.7
			*
			* Returns the number of Weeks in a year using the required Week Number
			System.
			*
			* Unless you specifically want a particular Week Number System (e.g. I
			SO Weeks)
			* you should use the localized number of weeks provided by weeksInYear
			().
			*
			* @see week()
			* @see formatDate()
			* @param year the year
			* @param weekNumberSystem the week number system to use
			* @return number of weeks in the year, -1 if date invalid
			*/
			int weeksInYear(int year, KLocale::WeekNumberSystem weekNumberSystem) c
			onst;
	/**		/**
	* Returns the number of days in the given year.		* Returns the number of days in the given year.
	*		*
	* @param date the date to obtain year from		* @param date the date to obtain year from
	* @return number of days in year, -1 if input date invalid		* @return number of days in year, -1 if input date invalid
	*/		*/
	virtual int daysInYear( const QDate &date ) const;		virtual int daysInYear(const QDate &date) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns the number of days in the given year.		* Returns the number of days in the given year.
	*		*
	* @param year the year		* @param year the year
	* @return number of days in year, -1 if input date invalid		* @return number of days in year, -1 if input date invalid
	*/		*/
	int daysInYear( int year ) const;		int daysInYear(int year) const;
	/**		/**
	* Returns the number of days in the given month.		* Returns the number of days in the given month.
	*		*
	* @param date the date to obtain month from		* @param date the date to obtain month from
	* @return number of days in month, -1 if input date invalid		* @return number of days in month, -1 if input date invalid
	*/		*/
	virtual int daysInMonth( const QDate &date ) const;		virtual int daysInMonth(const QDate &date) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
	* @since 4.5		* @since 4.5
	*		*
	* Returns the number of days in the given month.		* Returns the number of days in the given month.
	*		*
	* @param year the year the month is in		* @param year the year the month is in
	* @param month the month		* @param month the month
	* @return number of days in month, -1 if input date invalid		* @return number of days in month, -1 if input date invalid
	*/		*/
	int daysInMonth( int year, int month ) const;		int daysInMonth(int year, int month) const;
	/**		/**
	* Returns the number of days in the given week.		* Returns the number of days in the given week.
	*		*
	* @param date the date to obtain week from		* @param date the date to obtain week from
	* @return number of days in week, -1 if input date invalid		* @return number of days in week, -1 if input date invalid
	*/		*/
	virtual int daysInWeek( const QDate &date ) const;		virtual int daysInWeek(const QDate &date) const;
	/**		/**
	* Returns the day number of year for the given date		* Returns the day number of year for the given date
	*		*
	* The days are numbered 1..daysInYear()		* The days are numbered 1..daysInYear()
	*		*
	* @param date the date to obtain day from		* @param date the date to obtain day from
	* @return day of year number, -1 if input date not valid		* @return day of year number, -1 if input date not valid
	*/		*/
	virtual int dayOfYear( const QDate &date ) const;		virtual int dayOfYear(const QDate &date) const;
	/**		/**
	* Returns the weekday number for the given date		* Returns the weekday number for the given date
	*		*
	* The weekdays are numbered 1..7 for Monday..Sunday.		* The weekdays are numbered 1..7 for Monday..Sunday.
	*		*
	* This value is @em not affected by the value of weekStartDay()		* This value is @em not affected by the value of weekStartDay()
	*		*
	* @param date the date to obtain day from		* @param date the date to obtain day from
	* @return day of week number, -1 if input date not valid		* @return day of week number, -1 if input date not valid
	*/		*/
	virtual int dayOfWeek( const QDate &date ) const;		virtual int dayOfWeek(const QDate &date) const;
	/**		/**
			* @deprecated use week() instead
			*
	* Returns the ISO week number for the given date.		* Returns the ISO week number for the given date.
	*		*
	* ISO 8601 defines the first week of the year as the week containing t he first Thursday.		* ISO 8601 defines the first week of the year as the week containing t he first Thursday.
	* See http://en.wikipedia.org/wiki/ISO_8601 and http://en.wikipedia.or g/wiki/ISO_week_date		* See http://en.wikipedia.org/wiki/ISO_8601 and http://en.wikipedia.or g/wiki/ISO_week_date
	*		*
	* If the date falls in the last week of the previous year or the first week of the following		* If the date falls in the last week of the previous year or the first week of the following
	* year, then the yearNum returned will be set to the appropriate year.		* year, then the yearNum returned will be set to the appropriate year.
	*		*
	* @param date the date to obtain week from		* @param date the date to obtain week from
	* @param yearNum returns the year the date belongs to		* @param yearNum returns the year the date belongs to
	* @return ISO week number, -1 if input date invalid		* @return ISO week number, -1 if input date invalid
	*/		*/
	virtual int weekNumber( const QDate &date, int *yearNum = 0 ) const;		KDE_DEPRECATED virtual int weekNumber(const QDate &date, int *yearNum =
			0) const;
			//KDE5 Make virtual?
			/**
			* Returns the localized Week Number for the date.
			*
			* This may be ISO, US, or any other supported week numbering scheme.
			If
			* you specifically require the ISO Week or any other scheme, you shoul
			d use
			* the week(KLocale::WeekNumberSystem) form.
			*
			* If the date falls in the last week of the previous year or the first
			* week of the following year, then the yearNum returned will be set to
			the
			* appropriate year.
			*
			* @see weeksInYear()
			* @see formatDate()
			* @param date the date to obtain week from
			* @param yearNum returns the year the date belongs to
			* @return localized week number, -1 if input date invalid
			*/
			int week(const QDate &date, int *yearNum = 0) const;
			//KDE5 Make virtual?
			/**
			* Returns the Week Number for the date in the required Week Number Sys
			tem.
			*
			* Unless you want a specific Week Number System (e.g. ISO Week), you s
			hould
			* use the localized Week Number form of week().
			*
			* If the date falls in the last week of the previous year or the first
			* week of the following year, then the yearNum returned will be set to
			the
			* appropriate year.
			*
			* Technically, the ISO Week Number only applies to the ISO/Gregorian C
			alendar
			* System, but the same rules will be applied to the current Calendar S
			ystem.
			*
			* @see weeksInYear()
			* @see formatDate()
			* @param date the date to obtain week from
			* @param weekNumberSystem the Week Number System to use
			* @param yearNum returns the year the date belongs to
			* @return week number, -1 if input date invalid
			*/
			int week(const QDate &date, KLocale::WeekNumberSystem weekNumberSystem,
			int *yearNum = 0) const;
	/**		/**
	* Returns whether a given year is a leap year.		* Returns whether a given year is a leap year.
	*		*
	* Input year must be checked for validity in current Calendar System p rior to calling, no		* Input year must be checked for validity in current Calendar System p rior to calling, no
	* validity checking performed in this routine, behaviour is undefined in invalid case.		* validity checking performed in this routine, behaviour is undefined in invalid case.
	*		*
	* @param year the year to check		* @param year the year to check
	* @return @c true if the year is a leap year, @c false otherwise		* @return @c true if the year is a leap year, @c false otherwise
	*/		*/
	virtual bool isLeapYear( int year ) const = 0;		virtual bool isLeapYear(int year) const = 0;
	/**		/**
	* Returns whether a given date falls in a leap year.		* Returns whether a given date falls in a leap year.
	*		*
	* Input date must be checked for validity in current Calendar System p rior to calling, no		* Input date must be checked for validity in current Calendar System p rior to calling, no
	* validity checking performed in this routine, behaviour is undefined in invalid case.		* validity checking performed in this routine, behaviour is undefined in invalid case.
	*		*
	* @param date the date to check		* @param date the date to check
	* @return @c true if the date falls in a leap year, @c false otherwise		* @return @c true if the date falls in a leap year, @c false otherwise
	*/		*/
	virtual bool isLeapYear( const QDate &date ) const;		virtual bool isLeapYear(const QDate &date) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the first day of the year		* Returns a QDate containing the first day of the year
	*		*
	* @param date The year to return the date for		* @param year The year to return the date for
	* @return The first day of the year		* @return The first day of the year
	*/		*/
	QDate firstDayOfYear( int year ) const;		QDate firstDayOfYear(int year) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the last day of the year		* Returns a QDate containing the last day of the year
	*		*
	* @param date The year to return the date for		* @param year The year to return the date for
	* @return The last day of the year		* @return The last day of the year
	*/		*/
	QDate lastDayOfYear( int year ) const;		QDate lastDayOfYear(int year) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the first day of the year		* Returns a QDate containing the first day of the year
	*		*
	* @param date The year to return the date for, defaults to today		* @param date The year to return the date for, defaults to today
	* @return The first day of the year		* @return The first day of the year
	*/		*/
	QDate firstDayOfYear( const QDate &date = QDate::currentDate() ) const;		QDate firstDayOfYear(const QDate &date = QDate::currentDate()) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the last day of the year		* Returns a QDate containing the last day of the year
	*		*
	* @param date The year to return the date for, defaults to today		* @param date The year to return the date for, defaults to today
	* @return The last day of the year		* @return The last day of the year
	*/		*/
	QDate lastDayOfYear( const QDate &date = QDate::currentDate() ) const;		QDate lastDayOfYear(const QDate &date = QDate::currentDate()) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the first day of the month		* Returns a QDate containing the first day of the month
	*		*
	* @param date The month to return the date for, defaults to today		* @param year The year to return the date for
			* @param month The month to return the date for
	* @return The first day of the month		* @return The first day of the month
	*/		*/
	QDate firstDayOfMonth( int year, int month ) const;		QDate firstDayOfMonth(int year, int month) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the last day of the month		* Returns a QDate containing the last day of the month
	*		*
	* @param date The month to return the date for, defaults to today		* @param year The year to return the date for
			* @param month The month to return the date for
	* @return The last day of the month		* @return The last day of the month
	*/		*/
	QDate lastDayOfMonth( int year, int month ) const;		QDate lastDayOfMonth(int year, int month) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the first day of the month		* Returns a QDate containing the first day of the month
	*		*
	* @param date The month to return the date for, defaults to today		* @param date The month to return the date for, defaults to today
	* @return The first day of the month		* @return The first day of the month
	*/		*/
	QDate firstDayOfMonth( const QDate &date = QDate::currentDate() ) const ;		QDate firstDayOfMonth(const QDate &date = QDate::currentDate()) const;
	//KDE5 Make virtual?		//KDE5 Make virtual?
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a QDate containing the last day of the month		* Returns a QDate containing the last day of the month
	*		*
	* @param date The month to return the date for, defaults to today		* @param date The month to return the date for, defaults to today
	* @return The last day of the month		* @return The last day of the month
	*/		*/
	QDate lastDayOfMonth( const QDate &date = QDate::currentDate() ) const;		QDate lastDayOfMonth(const QDate &date = QDate::currentDate()) const;
	/**		/**
	* Gets specific calendar type month name for a given month number		* Gets specific calendar type month name for a given month number
	* If an invalid month is specified, QString() is returned.		* If an invalid month is specified, QString() is returned.
	*		*
	* @param month the month number		* @param month the month number
	* @param year the year the month belongs to		* @param year the year the month belongs to
	* @param format specifies whether the short month name or long month n ame should be used		* @param format specifies whether the short month name or long month n ame should be used
	* @return name of the month, empty string if any error		* @return name of the month, empty string if any error
	*/		*/
	virtual QString monthName( int month, int year, MonthNameFormat format = LongName ) const = 0;		virtual QString monthName(int month, int year, MonthNameFormat format = LongName) const = 0;
	/**		/**
	* Gets specific calendar type month name for a given date		* Gets specific calendar type month name for a given date
	*		*
	* @param date date to obtain month from		* @param date date to obtain month from
	* @param format specifies whether the short month name or long month n ame should be used		* @param format specifies whether the short month name or long month n ame should be used
	* @return name of the month, empty string if any error		* @return name of the month, empty string if any error
	*/		*/
	virtual QString monthName( const QDate &date, MonthNameFormat format = LongName ) const;		virtual QString monthName(const QDate &date, MonthNameFormat format = L ongName) const;
	/**		/**
	* Gets specific calendar type week day name.		* Gets specific calendar type week day name.
	* If an invalid week day is specified, QString() is returned.		* If an invalid week day is specified, QString() is returned.
	*		*
	* @param weekDay number of day in week (Monday = 1, ..., Sunday = 7)		* @param weekDay number of day in week (Monday = 1, ..., Sunday = 7)
	* @param format specifies whether the short month name or long month n ame should be used		* @param format specifies whether the short month name or long month n ame should be used
	* @return day name, empty string if any error		* @return day name, empty string if any error
	*/		*/
	virtual QString weekDayName( int weekDay, WeekDayNameFormat format = Lo ngDayName ) const = 0;		virtual QString weekDayName(int weekDay, WeekDayNameFormat format = Lon gDayName) const = 0;
	/**		/**
	* Gets specific calendar type week day name.		* Gets specific calendar type week day name.
	*		*
	* @param date the date		* @param date the date
	* @param format specifies whether the short month name or long month n ame should be used		* @param format specifies whether the short month name or long month n ame should be used
	* @return day name, empty string if any error		* @return day name, empty string if any error
	*/		*/
	virtual QString weekDayName( const QDate &date, WeekDayNameFormat forma t = LongDayName ) const;		virtual QString weekDayName(const QDate &date, WeekDayNameFormat format = LongDayName) const;
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* Converts a date into a year literal		* Converts a date into a year literal
	*		*
	* @param date date to convert		* @param date date to convert
	* @param format format to return, either short or long		* @param format format to return, either short or long
	* @return year literal of the date, empty string if any error		* @return year literal of the date, empty string if any error
	* @see year()		* @see year()
	*/		*/
	virtual QString yearString( const QDate &date, StringFormat format = Lo ngFormat ) const;		KDE_DEPRECATED virtual QString yearString(const QDate &date, StringForm at format = LongFormat) const;
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* Converts a date into a month literal		* Converts a date into a month literal
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The month literal of the date, empty string if any error		* @return The month literal of the date, empty string if any error
	* @see month()		* @see month()
	*/		*/
	virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const;		KDE_DEPRECATED virtual QString monthString(const QDate &pDate, StringFo rmat format = LongFormat) const;
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* Converts a date into a day literal		* Converts a date into a day literal
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The day literal of the date, empty string if any error		* @return The day literal of the date, empty string if any error
	* @see day()		* @see day()
	*/		*/
	virtual QString dayString( const QDate &pDate, StringFormat format = Lo ngFormat ) const;		KDE_DEPRECATED virtual QString dayString(const QDate &pDate, StringForm at format = LongFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.5		* @since 4.5
	*		*
	* Converts a date into a Year In Era literal		* Converts a date into a Year In Era literal
	*		*
	* @param date date to return Year In Era for		* @param date date to return Year In Era for
	* @param format format to return, either short or long		* @param format format to return, either short or long
	* @return Year In Era literal of the date, empty string if any error		* @return Year In Era literal of the date, empty string if any error
	*/		*/
	QString yearInEraString( const QDate &date, StringFormat format = Short Format ) const;		KDE_DEPRECATED QString yearInEraString(const QDate &date, StringFormat format = ShortFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Converts a date into a day of year literal		* Converts a date into a day of year literal
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The day of year literal of the date, empty string if any err or		* @return The day of year literal of the date, empty string if any err or
	* @see dayOfYear()		* @see dayOfYear()
	*/		*/
	QString dayOfYearString( const QDate &pDate, StringFormat format = Long Format ) const;		KDE_DEPRECATED QString dayOfYearString(const QDate &pDate, StringFormat format = LongFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Converts a date into a day of week literal		* Converts a date into a day of week literal
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @return The day of week literal of the date, empty string if any err or		* @return The day of week literal of the date, empty string if any err or
	* @see dayOfWeek()		* @see dayOfWeek()
	*/		*/
	QString dayOfWeekString( const QDate &pDate ) const;		KDE_DEPRECATED QString dayOfWeekString(const QDate &pDate) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Converts a date into a week number literal		* Converts a date into a week number literal
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The day literal of the date, empty string if any error		* @return The day literal of the date, empty string if any error
	* @see weekNumber()		* @see weekNumber()
	*/		*/
	QString weekNumberString( const QDate &pDate, StringFormat format = Lon gFormat ) const;		KDE_DEPRECATED QString weekNumberString(const QDate &pDate, StringForma t format = LongFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Returns the months in year for a date as a numeric string		* Returns the months in year for a date as a numeric string
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The months in year literal of the date, empty string if any error		* @return The months in year literal of the date, empty string if any error
	* @see monthsInYear()		* @see monthsInYear()
	*/		*/
	QString monthsInYearString( const QDate &pDate, StringFormat format = L ongFormat ) const;		KDE_DEPRECATED QString monthsInYearString(const QDate &pDate, StringFor mat format = LongFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Returns the weeks in year for a date as a numeric string		* Returns the weeks in year for a date as a numeric string
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The weeks in year literal of the date, empty string if any e rror		* @return The weeks in year literal of the date, empty string if any e rror
	* @see weeksInYear()		* @see weeksInYear()
	*/		*/
	QString weeksInYearString( const QDate &pDate, StringFormat format = Lo ngFormat ) const;		KDE_DEPRECATED QString weeksInYearString(const QDate &pDate, StringForm at format = LongFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Returns the days in year for a date as a numeric string		* Returns the days in year for a date as a numeric string
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The days in year literal of the date, empty string if any er ror		* @return The days in year literal of the date, empty string if any er ror
	* @see daysInYear()		* @see daysInYear()
	*/		*/
	QString daysInYearString( const QDate &pDate, StringFormat format = Lon gFormat ) const;		KDE_DEPRECATED QString daysInYearString(const QDate &pDate, StringForma t format = LongFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Returns the days in month for a date as a numeric string		* Returns the days in month for a date as a numeric string
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The days in month literal of the date, empty string if any e rror		* @return The days in month literal of the date, empty string if any e rror
	* @see daysInMonth()		* @see daysInMonth()
	*/		*/
	QString daysInMonthString( const QDate &pDate, StringFormat format = Lo ngFormat ) const;		KDE_DEPRECATED QString daysInMonthString(const QDate &pDate, StringForm at format = LongFormat) const;
	//KDE5 make virtual?		//KDE5 make virtual?
	/**		/**
			* @deprecated use formatDate(QDate, KLocale::DateTimeComponent, KLocal
			e::DateTimeComponentFormat)
			*
	* @since 4.4		* @since 4.4
	*		*
	* Returns the days in week for a date as a numeric string		* Returns the days in week for a date as a numeric string
	*		*
	* @param date The date to convert		* @param date The date to convert
	* @return The days in week literal of the date, empty string if any er ror		* @return The days in week literal of the date, empty string if any er ror
	* @see daysInWeek()		* @see daysInWeek()
	*/		*/
	QString daysInWeekString( const QDate &date ) const;		KDE_DEPRECATED QString daysInWeekString(const QDate &date) const;
	//KDE5 make protected or remove?		//KDE5 make protected or remove?
	/**		/**
	* @deprecated		* @deprecated for internal use only
	*		*
	* Converts a year literal of a part of a string into a integer startin g at the beginning of the string		* Converts a year literal of a part of a string into a integer startin g at the beginning of the string
	*		*
	* @param sNum The string to parse		* @param sNum The string to parse
	* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string		* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string
	* @return An integer corresponding to the year		* @return An integer corresponding to the year
	*/		*/
	virtual int yearStringToInteger( const QString &sNum, int &iLength ) co nst;		virtual int yearStringToInteger(const QString &sNum, int &iLength) cons t;
	//KDE5 make protected or remove?		//KDE5 make protected or remove?
	/**		/**
	* @deprecated		* @deprecated for internal use only
	*		*
	* Converts a month literal of a part of a string into a integer starti ng at the beginning of the string		* Converts a month literal of a part of a string into a integer starti ng at the beginning of the string
	*		*
	* @param sNum The string to parse		* @param sNum The string to parse
	* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string		* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string
	* @return An integer corresponding to the month		* @return An integer corresponding to the month
	*/		*/
	virtual int monthStringToInteger( const QString &sNum, int &iLength ) c onst;		virtual int monthStringToInteger(const QString &sNum, int &iLength) con st;
	//KDE5 make protected or remove?		//KDE5 make protected or remove?
	/**		/**
	* @deprecated		* @deprecated for internal use only
	*		*
	* Converts a day literal of a part of a string into a integer starting at the beginning of the string		* Converts a day literal of a part of a string into a integer starting at the beginning of the string
	*		*
	* @param sNum The string to parse		* @param sNum The string to parse
	* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string		* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string
	* @return An integer corresponding to the day		* @return An integer corresponding to the day
	*/		*/
	virtual int dayStringToInteger( const QString &sNum, int &iLength ) con st;		virtual int dayStringToInteger(const QString &sNum, int &iLength) const ;
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Returns a string formatted to the current locale's conventions
	* regarding dates.		* regarding dates.
	*		*
	* Uses the calendar system's internal locale set when the instance was		* Uses the calendar system's internal locale set when the instance was
	* created, which ensures that the correct calendar system and locale		* created, which ensures that the correct calendar system and locale
	* settings are respected, which would not occur in some cases if using		* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.		* the global locale. Defaults to global locale.
	*		*
	* @see KLocale::formatDate		* @see KLocale::formatDate
	*		*
	* @param fromDate the date to be formatted		* @param fromDate the date to be formatted
	* @param toFormat category of date format to use		* @param toFormat category of date format to use
	*		*
	* @return The date as a string		* @return The date as a string
	*/		*/
	virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const;		virtual QString formatDate(const QDate &fromDate, KLocale::DateFormat t oFormat = KLocale::LongDate) const;
	//KDE5 Make virtual		//KDE5 Make virtual
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Returns a string formatted to the given format and localised to the		* Returns a string formatted to the given format and localised to the
	* correct language and digit set using the requested format standard.		* correct language and digit set using the requested format standard.
	*		*
	* *** WITH GREAT POWER COMES GREAT RESPONSIBILITY ***		* *** WITH GREAT POWER COMES GREAT RESPONSIBILITY ***
	* Please use with care and only in situations where the DateFormat enu m		* Please use with care and only in situations where the DateFormat enu m
	skipping to change at line 1162		skipping to change at line 1288
	* %0 is not supported as the returned result is always in the locale's chosen numeric symbol digit set.		* %0 is not supported as the returned result is always in the locale's chosen numeric symbol digit set.
	*		*
	* @see KLocale::formatDate		* @see KLocale::formatDate
	*		*
	* @param fromDate the date to be formatted		* @param fromDate the date to be formatted
	* @param toFormat the date format to use		* @param toFormat the date format to use
	* @param formatStandard the standard the date format uses, defaults to KDE Standard		* @param formatStandard the standard the date format uses, defaults to KDE Standard
	*		*
	* @return The date as a string		* @return The date as a string
	*/		*/
	QString formatDate( const QDate &fromDate, const QString &toFormat,		QString formatDate(const QDate &fromDate, const QString &toFormat,
	KLocale::DateTimeFormatStandard formatStandard = KL		KLocale::DateTimeFormatStandard formatStandard = KLo
	ocale::KdeFormat ) const;		cale::KdeFormat) const;
	//KDE5 Make virtual		//KDE5 Make virtual
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Returns a string formatted to the given format string and Digit Set.		* Returns a string formatted to the given format string and Digit Set.
	* Only use this version if you need control over the Digit Set and do		* Only use this version if you need control over the Digit Set and do
	* not want to use the locale Digit Set.		* not want to use the locale Digit Set.
	*		*
	* @see formatDate		* @see formatDate
	*		*
	* @param fromDate the date to be formatted		* @param fromDate the date to be formatted
	* @param toFormat the date format to use		* @param toFormat the date format to use
	* @param digitSet the Digit Set to format the date in		* @param digitSet the Digit Set to format the date in
	* @param formatStandard the standard the date format uses, defaults to KDE Standard		* @param formatStandard the standard the date format uses, defaults to KDE Standard
	*		*
	* @return The date as a string		* @return The date as a string
	*/		*/
	QString formatDate( const QDate &fromDate, const QString &toFormat, KLo		QString formatDate(const QDate &fromDate, const QString &toFormat, KLoc
	cale::DigitSet digitSet,		ale::DigitSet digitSet,
	KLocale::DateTimeFormatStandard formatStandard = KL		KLocale::DateTimeFormatStandard formatStandard = KLo
	ocale::KdeFormat ) const;		cale::KdeFormat) const;
	//KDE5 Make virtual		//KDE5 Make virtual
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns a Date Component as a localized string in the requested form at.		* Returns a Date Component as a localized string in the requested form at.
	*		*
	* For example for 2010-01-01 the KLocale::Month with en_US Locale and Gregorian calendar may return:		* For example for 2010-01-01 the KLocale::Month with en_US Locale and Gregorian calendar may return:
	* KLocale::ShortNumber = "1"		* KLocale::ShortNumber = "1"
	* KLocale::LongNumber = "01"		* KLocale::LongNumber = "01"
	skipping to change at line 1224		skipping to change at line 1350
	* settings are respected, which would not occur in some cases if using		* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.		* the global locale. Defaults to global locale.
	*		*
	* @see KLocale::readDate		* @see KLocale::readDate
	*		*
	* @param str the string to convert		* @param str the string to convert
	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid		* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid
	*		*
	* @return the string converted to a QDate		* @return the string converted to a QDate
	*/		*/
	virtual QDate readDate( const QString &str, bool *ok = 0 ) const;		virtual QDate readDate(const QString &str, bool *ok = 0) const;
	/**		/**
	* Converts a localized date string to a QDate.		* Converts a localized date string to a QDate.
	* This method is stricter than readDate(str,&ok): it will either accep t		* This method is stricter than readDate(str,&ok): it will either accep t
	* a date in full format or a date in short format, depending on @p fla gs.		* a date in full format or a date in short format, depending on @p fla gs.
	*		*
	* Uses the calendar system's internal locale set when the instance was		* Uses the calendar system's internal locale set when the instance was
	* created, which ensures that the correct calendar system and locale		* created, which ensures that the correct calendar system and locale
	* settings are respected, which would not occur in some cases if using		* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.		* the global locale. Defaults to global locale.
	*		*
	* @see KLocale::readDate		* @see KLocale::readDate
	*		*
	* @param str the string to convert		* @param str the string to convert
	* @param flags whether the date string is to be in full format or in s hort format		* @param flags whether the date string is to be in full format or in s hort format
	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid		* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid
	*		*
	* @return the string converted to a QDate		* @return the string converted to a QDate
	*/		*/
	virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flag s, bool *ok = 0 ) const;		virtual QDate readDate(const QString &str, KLocale::ReadDateFlags flags , bool *ok = 0) const;
	/**		/**
	* Converts a localized date string to a QDate, using the specified @p format.		* Converts a localized date string to a QDate, using the specified @p format.
	* You will usually not want to use this method. Uses teh KDE format s tandard.		* You will usually not want to use this method. Uses teh KDE format s tandard.
	*		*
	* @param dateString the string to convert		* @param dateString the string to convert
	* @param dateFormat the date format to use, in KDE format standard		* @param dateFormat the date format to use, in KDE format standard
	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid		* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid
	*		*
	* @return the string converted to a QDate		* @return the string converted to a QDate
	*		*
	* @see formatDate		* @see formatDate
	* @see KLocale::readDate		* @see KLocale::readDate
	*/		*/
	virtual QDate readDate( const QString &dateString, const QString &dateF ormat, bool *ok = 0 ) const;		virtual QDate readDate(const QString &dateString, const QString &dateFo rmat, bool *ok = 0) const;
	//KDE5 Make virtual		//KDE5 Make virtual
	/**		/**
	* Converts a localized date string to a QDate, using the specified @p format.		* Converts a localized date string to a QDate, using the specified @p format.
	* You will usually not want to use this method.		* You will usually not want to use this method.
	*		*
	* You must supply a format and string containing at least one of the f ollowing combinations to		* You must supply a format and string containing at least one of the f ollowing combinations to
	* create a valid date:		* create a valid date:
	* @li a month and day of month		* @li a month and day of month
	* @li a day of year		* @li a day of year
	skipping to change at line 1321		skipping to change at line 1447
	* @param dateString the string to convert		* @param dateString the string to convert
	* @param dateFormat the date format to use		* @param dateFormat the date format to use
	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid		* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid
	* @param formatStandard the standard the date format uses		* @param formatStandard the standard the date format uses
	*		*
	* @return the string converted to a QDate		* @return the string converted to a QDate
	*		*
	* @see formatDate		* @see formatDate
	* @see KLocale::readDate		* @see KLocale::readDate
	*/		*/
	QDate readDate( const QString &dateString, const QString &dateFormat, b		QDate readDate(const QString &dateString, const QString &dateFormat, bo
	ool *ok,		ol *ok,
	KLocale::DateTimeFormatStandard formatStandard ) const;		KLocale::DateTimeFormatStandard formatStandard) const;
	//KDE5 Make virtual		//KDE5 Make virtual
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns the Short Year Window Start Year for the current Calendar Sy stem.		* Returns the Short Year Window Start Year for the current Calendar Sy stem.
	*		*
	* Use this function to get the Start Year for the Short Year Window to be		* Use this function to get the Start Year for the Short Year Window to be
	* applied when 2 digit years are entered for a Short Year input format ,		* applied when 2 digit years are entered for a Short Year input format ,
	* e.g. if the Short Year Window Start Year is 1930, then the input Sho rt		* e.g. if the Short Year Window Start Year is 1930, then the input Sho rt
	skipping to change at line 1373		skipping to change at line 1499
	* return the calculated Year Number.		* return the calculated Year Number.
	*		*
	* If the @p inputYear is not between 0 and 99, then the original Year Number		* If the @p inputYear is not between 0 and 99, then the original Year Number
	* is returned.		* is returned.
	*		*
	* @see KLocale::setYearWindowOffset		* @see KLocale::setYearWindowOffset
	* @see KLocale::yearWindowOffset		* @see KLocale::yearWindowOffset
	* @param inputYear the year number to apply the year window to		* @param inputYear the year number to apply the year window to
	* @return the year number after applying the year window		* @return the year number after applying the year window
	*/		*/
	int applyShortYearWindow( int inputYear ) const;		int applyShortYearWindow(int inputYear) const;
	/**		/**
	* Use this to determine which day is the first day of the week.		* Use this to determine which day is the first day of the week.
	*		*
	* Uses the calendar system's internal locale set when the instance was		* Uses the calendar system's internal locale set when the instance was
	* created, which ensures that the correct calendar system and locale		* created, which ensures that the correct calendar system and locale
	* settings are respected, which would not occur in some cases if using		* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.		* the global locale. Defaults to global locale.
	*		*
	* @see KLocale::weekStartDay		* @see KLocale::weekStartDay
	*		*
	* @return an integer (Monday = 1, ..., Sunday = 7)		* @return an integer (Monday = 1, ..., Sunday = 7)
	*/		*/
	virtual int weekStartDay() const;		virtual int weekStartDay() const;
	/**		/**
			* @deprecated use KLocale::weekDayOfPray() instead
			*
	* Returns the day of the week traditionally associated with religious		* Returns the day of the week traditionally associated with religious
	* observance for this calendar system. Note this may not be accurate		* observance for this calendar system. Note this may not be accurate
	* for the users locale, e.g. Gregorian calendar used in non-Christian		* for the users locale, e.g. Gregorian calendar used in non-Christian
	* countries, in use cases where this could be an issue it is recommend ed		* countries, in use cases where this could be an issue it is recommend ed
	* to use KLocale::weekDayOfPray() instead.		* to use KLocale::weekDayOfPray() instead.
	*		*
	* @return day number (None = 0, Monday = 1, ..., Sunday = 7)		* @return day number (None = 0, Monday = 1, ..., Sunday = 7)
	*/		*/
	virtual int weekDayOfPray() const = 0;		KDE_DEPRECATED virtual int weekDayOfPray() const = 0;
	/**		/**
	* Returns whether the calendar is lunar based.		* Returns whether the calendar is lunar based.
	*		*
	* @return @c true if the calendar is lunar based, @c false if not		* @return @c true if the calendar is lunar based, @c false if not
	*/		*/
	virtual bool isLunar() const = 0;		virtual bool isLunar() const = 0;
	/**		/**
	* Returns whether the calendar is lunisolar based.		* Returns whether the calendar is lunisolar based.
	skipping to change at line 1449		skipping to change at line 1577
	* functions of these. Does no internal validity checking.		* functions of these. Does no internal validity checking.
	*		*
	* @see KCalendarSystem::dateToJulianDay		* @see KCalendarSystem::dateToJulianDay
	*		*
	* @param jd Julian day number to convert to date		* @param jd Julian day number to convert to date
	* @param year year number returned in this variable		* @param year year number returned in this variable
	* @param month month number returned in this variable		* @param month month number returned in this variable
	* @param day day of month returned in this variable		* @param day day of month returned in this variable
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool julianDayToDate( int jd, int &year, int &month, int &day ) const = 0;		virtual bool julianDayToDate(int jd, int &year, int &month, int &day) c onst = 0;
	/**		/**
	* Internal method to convert YMD values for this calendar system into a		* Internal method to convert YMD values for this calendar system into a
	* Julian Day number.		* Julian Day number.
	*		*
	* All calendar system implementations MUST implement julianDayToDate a nd		* All calendar system implementations MUST implement julianDayToDate a nd
	* dateToJulianDay methods as all other methods can be expressed as		* dateToJulianDay methods as all other methods can be expressed as
	* functions of these. Does no internal validity checking.		* functions of these. Does no internal validity checking.
	*		*
	* @see KCalendarSystem::julianDayToDate		* @see KCalendarSystem::julianDayToDate
	*		*
	* @param year year number		* @param year year number
	* @param month month number		* @param month month number
	* @param day day of month		* @param day day of month
	* @param jd Julian day number returned in this variable		* @param jd Julian day number returned in this variable
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool dateToJulianDay( int year, int month, int day, int &jd ) c onst = 0;		virtual bool dateToJulianDay(int year, int month, int day, int &jd) con st = 0;
	/**		/**
	* Returns the locale used for translations and formats for this		* Returns the locale used for translations and formats for this
	* calendar system instance. This allows a calendar system instance to be		* calendar system instance. This allows a calendar system instance to be
	* independent of the global translations and formats if required. All		* independent of the global translations and formats if required. All
	* implementations must refer to this locale.		* implementations must refer to this locale.
	*		*
	* Only for internal calendar system use; if public access is required then		* Only for internal calendar system use; if public access is required then
	* provide public methods only for those methods actually required. An y		* provide public methods only for those methods actually required. An y
	* app that creates an instance with its own locale overriding global w ill		* app that creates an instance with its own locale overriding global w ill
	skipping to change at line 1494		skipping to change at line 1622
	* @see KCalendarSystem::weekStartDay		* @see KCalendarSystem::weekStartDay
	* @see KLocale::weekStartDay		* @see KLocale::weekStartDay
	* @see KCalendarSystem::readDate		* @see KCalendarSystem::readDate
	* @see KLocale::readDate		* @see KLocale::readDate
	*		*
	* @return locale to use		* @return locale to use
	*/		*/
	const KLocale *locale() const;		const KLocale *locale() const;
	/**		/**
	* @deprecated		* @deprecated for internal use only
	*		*
	* Sets the maximum number of months in a year		* Sets the maximum number of months in a year
	*		*
	* Only for internal calendar system use		* Only for internal calendar system use
	*/		*/
	void setMaxMonthsInYear( int maxMonths );		KDE_DEPRECATED void setMaxMonthsInYear(int maxMonths);
	/**		/**
	* @deprecated		* @deprecated for internal use only
	*		*
	* Sets the maximum number of days in a week		* Sets the maximum number of days in a week
	*		*
	* Only for internal calendar system use		* Only for internal calendar system use
	*/		*/
	void setMaxDaysInWeek( int maxDays );		KDE_DEPRECATED void setMaxDaysInWeek(int maxDays);
	/**		/**
	* @deprecated		* @deprecated for internal use only
	*		*
	* @since 4.4		* @since 4.4
	*		*
	* Sets if Calendar System has Year 0 or not		* Sets if Calendar System has Year 0 or not
	*		*
	* Only for internal calendar system use		* Only for internal calendar system use
	*/		*/
	void setHasYear0( bool hasYear0 );		KDE_DEPRECATED void setHasYear0(bool hasYear0);
	/**		/**
	* Constructor of abstract calendar class. This will be called by deriv ed classes.		* Constructor of abstract calendar class. This will be called by deriv ed classes.
	*		*
	* @param dd derived private d-pointer.		* @param dd derived private d-pointer.
	* @param config a configuration file with a 'KCalendarSystem %calendar Name' group detailing		* @param config a configuration file with a 'KCalendarSystem %calendar Name' group detailing
	* locale-related preferences (such as era options). The global config is used		* locale-related preferences (such as era options). The global config is used
	if null.		if null.
	* @param locale locale to use for translations. The global locale is u sed if null.		* @param locale locale to use for translations. The global locale is u sed if null.
	*/		*/
	KCalendarSystem( KCalendarSystemPrivate &dd,		KCalendarSystem(KCalendarSystemPrivate &dd,
	const KSharedConfig::Ptr config = KSharedConfig::Ptr()		const KSharedConfig::Ptr config = KSharedConfig::Ptr(),
	,		const KLocale *locale = 0);
	const KLocale *locale = 0 );
	private:		private:
	//Required for shared d-pointer as already private, remove in KDE5		//Required for shared d-pointer as already private, remove in KDE5
	friend class KCalendarSystemCoptic;		friend class KCalendarSystemCoptic;
	friend class KCalendarSystemEthiopian;		friend class KCalendarSystemEthiopian;
	friend class KCalendarSystemGregorian;		friend class KCalendarSystemGregorian;
	friend class KCalendarSystemGregorianProleptic;
	friend class KCalendarSystemHebrew;		friend class KCalendarSystemHebrew;
	friend class KCalendarSystemHijri;
	friend class KCalendarSystemIndianNational;		friend class KCalendarSystemIndianNational;
			friend class KCalendarSystemIslamicCivil;
	friend class KCalendarSystemJalali;		friend class KCalendarSystemJalali;
	friend class KCalendarSystemJapanese;		friend class KCalendarSystemJapanese;
	friend class KCalendarSystemJulian;		friend class KCalendarSystemJulian;
	friend class KCalendarSystemMinguo;		friend class KCalendarSystemMinguo;
			friend class KCalendarSystemQDate;
	friend class KCalendarSystemThai;		friend class KCalendarSystemThai;
			//Other friends that need access to protected/private functions
	friend class KLocalizedDate;		friend class KLocalizedDate;
	friend class KLocalizedDatePrivate;		friend class KLocalizedDatePrivate;
	friend class KDateTimeParser;		friend class KDateTimeParser;
			friend class KDateTable;
	// Era functions needed by friends, may be made public later if needed in KCM		// Era functions needed by friends, may be made public later if needed in KCM
	QList<KCalendarEra> *eraList() const;		QList<KCalendarEra> *eraList() const;
	KCalendarEra era( const QDate &eraDate ) const;		KCalendarEra era(const QDate &eraDate) const;
	KCalendarEra era( const QString &eraName, int yearInEra ) const;		KCalendarEra era(const QString &eraName, int yearInEra) const;
	Q_DISABLE_COPY( KCalendarSystem )		Q_DISABLE_COPY(KCalendarSystem)
	KCalendarSystemPrivate * const d_ptr; // KDE5 make protected		KCalendarSystemPrivate * const d_ptr; // KDE5 make protected
	Q_DECLARE_PRIVATE( KCalendarSystem )		Q_DECLARE_PRIVATE(KCalendarSystem)
	};		};
	#endif		#endif
End of changes. 138 change blocks.
	156 lines changed or deleted		318 lines changed or added

	kcombobox.h		kcombobox.h
	skipping to change at line 280		skipping to change at line 280
	* to automatic. See its more comprehensive replacement		* to automatic. See its more comprehensive replacement
	* completionMode().		* completionMode().
	*		*
	* @return @p true when completion mode is automatic.		* @return @p true when completion mode is automatic.
	*/		*/
	bool autoCompletion() const;		bool autoCompletion() const;
	/**		/**
	* Enables or disable the popup (context) menu.		* Enables or disable the popup (context) menu.
	*		*
	* This method only works if this widget is editable, i.e.		* This method only works if this widget is editable, i.e. read-write an
	* read-write and allows you to enable/disable the context		d
	* menu. It does nothing if invoked for a none-editable		* allows you to enable/disable the context menu. It does nothing if inv
	* combo-box. Note that by default the mode changer item		oked
	* is made visiable whenever the context menu is enabled.		* for a none-editable combo-box.
	* Use hideModechanger() if you want to hide this		*
	* item. Also by default, the context menu is created if		* By default, the context menu is created if this widget is editable.
	* this widget is editable. Call this function with the		* Call this function with the argument set to false to disable the popu
	* argument set to false to disable the popup menu.		p
			* menu.
	*		*
	* @param showMenu If @p true, show the context menu.		* @param showMenu If @p true, show the context menu.
	* @deprecated use setContextMenuPolicy		* @deprecated use setContextMenuPolicy
	*/		*/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );		virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );
	#endif		#endif
	/**		/**
	* Enables/Disables handling of URL drops. If enabled and the user		* Enables/Disables handling of URL drops. If enabled and the user
End of changes. 1 change blocks.
	9 lines changed or deleted		10 lines changed or added

	kconfig.h		kconfig.h
	skipping to change at line 87		skipping to change at line 87
	* If CascadeConfig is selected, system-wide configuration sources are used		* If CascadeConfig is selected, system-wide configuration sources are used
	* to provide defaults for the settings accessed through this object, o r		* to provide defaults for the settings accessed through this object, o r
	* possibly to override those settings in certain cases.		* possibly to override those settings in certain cases.
	*		*
	* IncludeGlobals does the same, but with the global settings sources.		* IncludeGlobals does the same, but with the global settings sources.
	*		*
	* Note that the main configuration source overrides the cascaded sourc es,		* Note that the main configuration source overrides the cascaded sourc es,
	* which override those provided to addConfigSources(), which override the		* which override those provided to addConfigSources(), which override the
	* global sources. The exception is that if a key or group is marked a s		* global sources. The exception is that if a key or group is marked a s
	* being immutable, it will not be overridden.		* being immutable, it will not be overridden.
			*
			* Note that all values other than IncludeGlobals and CascadeConfig are
			* convenience definitions for the basic mode.
			* Do @em not combine them with anything.
	*/		*/
	enum OpenFlag {		enum OpenFlag {
	IncludeGlobals = 0x01, ///< Blend kdeglobals into the config objec t.		IncludeGlobals = 0x01, ///< Blend kdeglobals into the config objec t.
	CascadeConfig = 0x02, ///< Cascade to system-wide config files.		CascadeConfig = 0x02, ///< Cascade to system-wide config files.
	/// The following are convenience definitions for the basic mode.
	/// Do @em not combine them with anything.
	SimpleConfig = 0x00, ///< Just a single config file.		SimpleConfig = 0x00, ///< Just a single config file.
	NoCascade = IncludeGlobals, ///< Include user's globals, but omit system settings.		NoCascade = IncludeGlobals, ///< Include user's globals, but omit system settings.
	NoGlobals = CascadeConfig, ///< Cascade to system settings, b ut omit user's globals.		NoGlobals = CascadeConfig, ///< Cascade to system settings, b ut omit user's globals.
	FullConfig = IncludeGlobals|CascadeConfig ///< Fully-fledged c onfig, including globals and cascading to system settings		FullConfig = IncludeGlobals|CascadeConfig ///< Fully-fledged c onfig, including globals and cascading to system settings
	};		};
	Q_DECLARE_FLAGS(OpenFlags, OpenFlag)		Q_DECLARE_FLAGS(OpenFlags, OpenFlag)
	/**		/**
	* Creates a KConfig object to manipulate a configuration file for the		* Creates a KConfig object to manipulate a configuration file for the
	* current application.		* current application.
	skipping to change at line 171		skipping to change at line 173
	*/		*/
	explicit KConfig(const KComponentData& componentData, const QString& fi le = QString(),		explicit KConfig(const KComponentData& componentData, const QString& fi le = QString(),
	OpenFlags mode = FullConfig, const char* resourceType = "config");		OpenFlags mode = FullConfig, const char* resourceType = "config");
	/**		/**
	* @internal		* @internal
	*		*
	* Creates a KConfig object using the specified backend. If the backend can not		* Creates a KConfig object using the specified backend. If the backend can not
	* be found or loaded, then the standard configuration parser is used a s a fallback.		* be found or loaded, then the standard configuration parser is used a s a fallback.
	*		*
	* @arg file the file to be parsed		* @param file the file to be parsed
	* @arg backend the backend to load		* @param backend the backend to load
	* @arg resourceType where to look for the file if an absolute path is		* @param resourceType where to look for the file if an absolute path i
	not provided		s not provided
	*		*
	* @since 4.1		* @since 4.1
	*/		*/
	KConfig(const QString& file, const QString& backend, const char* resour ceType = "config");		KConfig(const QString& file, const QString& backend, const char* resour ceType = "config");
	virtual ~KConfig();		virtual ~KConfig();
	/**		/**
	* Returns the component data this configuration is for.		* Returns the component data this configuration is for.
	*/		*/
End of changes. 3 change blocks.
	6 lines changed or deleted		8 lines changed or added

	kconfigdialog.h		kconfigdialog.h
	skipping to change at line 118		skipping to change at line 118
	*/		*/
	~KConfigDialog();		~KConfigDialog();
	/**		/**
	* Adds page to the dialog and to KConfigDialogManager. When an		* Adds page to the dialog and to KConfigDialogManager. When an
	* application is done adding pages show() should be called to		* application is done adding pages show() should be called to
	* display the dialog.		* display the dialog.
	* @param page - Pointer to the page that is to be added to the dialog.		* @param page - Pointer to the page that is to be added to the dialog.
	* This object is reparented.		* This object is reparented.
	* @param itemName - Name of the page.		* @param itemName - Name of the page.
	* @param pixmapName - Name of the pixmap that should be used if needed.		* @param pixmapName - Name of the icon that should be used, if needed, w
			hen
			* displaying the page. The string may either be the name of a the
			med
			* icon (e.g. "document-save"), which the internal icon loader wil
			l be
			* used to retrieve, or an absolute path to the pixmap on disk.
	* @param header - Header text use in the list modes. Ignored in Tabbed		* @param header - Header text use in the list modes. Ignored in Tabbed
	* mode. If empty, the itemName text is used when needed.		* mode. If empty, the itemName text is used when needed.
	* @param manage - Whether KConfigDialogManager should manage the page or not.		* @param manage - Whether KConfigDialogManager should manage the page or not.
	* @returns The KPageWidgetItem associated with the page.		* @returns The KPageWidgetItem associated with the page.
	*/		*/
	KPageWidgetItem* addPage( QWidget *page, const QString &itemName,		KPageWidgetItem* addPage( QWidget *page, const QString &itemName,
	const QString &pixmapName=QString(),		const QString &pixmapName=QString(),
	const QString &header=QString(),		const QString &header=QString(),
	bool manage=true );		bool manage=true );
	/**		/**
	* Adds page to the dialog that is managed by a custom KConfigDialogManag er.		* Adds page to the dialog that is managed by a custom KConfigDialogManag er.
	* This is useful for dialogs that contain settings spread over more than		* This is useful for dialogs that contain settings spread over more than
	* one configuration file and thus have/need more than one KConfigSkeleto n.		* one configuration file and thus have/need more than one KConfigSkeleto n.
	* When an application is done adding pages show() should be called to		* When an application is done adding pages show() should be called to
	* display the dialog.		* display the dialog.
	* @param page - Pointer to the page that is to be added to the dialog.		* @param page - Pointer to the page that is to be added to the dialog.
	* This object is reparented.		* This object is reparented.
	* @param config - Config object containing corresponding settings.		* @param config - Config object containing corresponding settings.
	* @param itemName - Name of the page.		* @param itemName - Name of the page.
	* @param pixmapName - Name of the pixmap that should be used if needed.		* @param pixmapName - Name of the icon that should be used, if needed, w
			hen
			* displaying the page. The string may either be the name of a the
			med
			* icon (e.g. "document-save"), which the internal icon loader wil
			l be
			* used to retrieve, or an absolute path to the pixmap on disk.
	* @param header - Header text use in the list modes. Ignored in Tabbed		* @param header - Header text use in the list modes. Ignored in Tabbed
	* mode. If empty, the itemName text is used when needed.		* mode. If empty, the itemName text is used when needed.
	* @returns The KPageWidgetItem associated with the page.		* @returns The KPageWidgetItem associated with the page.
	*/		*/
	KPageWidgetItem* addPage( QWidget *page, KConfigSkeleton *config,		KPageWidgetItem* addPage( QWidget *page, KConfigSkeleton *config,
	const QString &itemName,		const QString &itemName,
	const QString &pixmapName=QString(),		const QString &pixmapName=QString(),
	const QString &header=QString() );		const QString &header=QString() );
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		14 lines changed or added

	kdescendantsproxymodel.h		kdescendantsproxymodel.h
	skipping to change at line 53		skipping to change at line 53
	descProxy->setSourceModel(entityTree);		descProxy->setSourceModel(entityTree);
	view->setModel(descProxy);		view->setModel(descProxy);
	@endcode		@endcode
	\image html descendantentitiesproxymodel.png "A KDescendantsProxyModel."		\image html descendantentitiesproxymodel.png "A KDescendantsProxyModel."
	KDescendantEntitiesProxyModel can also display the ancestors of the index i n the source model as part of its display.		KDescendantEntitiesProxyModel can also display the ancestors of the index i n the source model as part of its display.
	@code		@code
	// ... Create an entityTreeModel		// ... Create an entityTreeModel
	KDescendantsProxyModel *descProxy = new KDescendantesProxyModel(this);		KDescendantsProxyModel *descProxy = new KDescendantsProxyModel(this);
	descProxy->setSourceModel(entityTree);		descProxy->setSourceModel(entityTree);
	// #### This is new		// #### This is new
	descProxy->setDisplayAncestorData(true, QString( " / " ));		descProxy->setDisplayAncestorData(true);
			descProxy->setDisplayAncestorSeparator(QString(" / "));
	view->setModel(descProxy);		view->setModel(descProxy);
	@endcode		@endcode
	\image html descendantentitiesproxymodel-withansecnames.png "A KDescendants ProxyModel with ancestor names."		\image html descendantentitiesproxymodel-withansecnames.png "A KDescendants ProxyModel with ancestor names."
	@since 4.6		@since 4.6
	@author Stephen Kelly <steveire@gmail.com>		@author Stephen Kelly <steveire@gmail.com>
	*/		*/
End of changes. 2 change blocks.
	2 lines changed or deleted		3 lines changed or added

	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.6.5 (4.6.5)"		#define KDE_VERSION_STRING "4.7.00 (4.7.0)"
	/**		/**
	* @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 6		#define KDE_VERSION_MINOR 7
	/**		/**
	* @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 5		#define KDE_VERSION_RELEASE 00
	/**		/**
	* @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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	kdirwatch.h		kdirwatch.h
	skipping to change at line 215		skipping to change at line 215
	*/		*/
	bool isStopped();		bool isStopped();
	/**		/**
	* Check if a directory is being watched by this KDirWatch instance		* Check if a directory is being watched by this KDirWatch instance
	* @param path the directory to check		* @param path the directory to check
	* @return true if the directory is being watched		* @return true if the directory is being watched
	*/		*/
	bool contains( const QString& path ) const;		bool contains( const QString& path ) const;
			void deleteQFSWatcher();
	/**		/**
	* Dump statistic information about the KDirWatch::self() instance.		* Dump statistic information about the KDirWatch::self() instance.
	* This checks for consistency, too.		* This checks for consistency, too.
	*/		*/
	static void statistics(); // TODO implement a QDebug operator for KDirWa tch instead.		static void statistics(); // TODO implement a QDebug operator for KDirWa tch instead.
	enum Method { FAM, INotify, DNotify /*now unused*/, Stat, QFSWatch };		enum Method { FAM, INotify, DNotify /*now unused*/, Stat, QFSWatch };
	/**		/**
	* Returns the preferred internal method to		* Returns the preferred internal method to
	* watch for changes.		* watch for changes.
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kdiskfreespace.h		kdiskfreespace.h
	skipping to change at line 33		skipping to change at line 33
	#define KDISKFREESP_H		#define KDISKFREESP_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
	/**		/**
	* \deprecated Use KDiskFreeSpaceInfo		* \deprecated Use KDiskFreeSpaceInfo
	*/		*/
	class KIO_EXPORT KDiskFreeSpace : public QObject		class KIO_EXPORT_DEPRECATED KDiskFreeSpace : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructor		* Constructor
	*/		*/
	KDE_DEPRECATED explicit KDiskFreeSpace( QObject *parent = 0 );		explicit KDiskFreeSpace( QObject *parent = 0 );
	/**		/**
	* Destructor - this object autodeletes itself when it's done		* Destructor - this object autodeletes itself when it's done
	*/		*/
	~KDiskFreeSpace();		~KDiskFreeSpace();
	/**		/**
	* Call this to fire a search on the disk usage information		* Call this to fire a search on the disk usage information
	* for @p mountPoint.		* for @p mountPoint.
	* The foundMountPoint() signal will be emitted		* The foundMountPoint() signal will be emitted
	* if this mount point is found, with the info requested.		* if this mount point is found, with the info requested.
	* The done() signal is emitted in any case.		* The done() signal is emitted in any case.
	*		*
	* @return true if the request could be handled, false if another		* @return true if the request could be handled, false if another
	* request is happening already. readDF() can only be called once		* request is happening already. readDF() can only be called once
	* on a given instance of KDiskFreeSpace, given that it handles only		* on a given instance of KDiskFreeSpace, given that it handles only
	* the request for one mount point and then auto-deletes itself.		* the request for one mount point and then auto-deletes itself.
	* Suicidal objects are not reusable...		* Suicidal objects are not reusable...
	*/		*/
	KDE_DEPRECATED bool readDF( const QString & mountPoint );		bool readDF( const QString & mountPoint );
	/**		/**
	* Call this to fire a search on the disk usage information		* Call this to fire a search on the disk usage information
	* for the mount point containing @p path.		* for the mount point containing @p path.
	* The foundMountPoint() signal will be emitted		* The foundMountPoint() signal will be emitted
	* if this mount point is found, with the info requested.		* if this mount point is found, with the info requested.
	* The done() signal is emitted in any case.		* The done() signal is emitted in any case.
	*/		*/
	KDE_DEPRECATED static KDiskFreeSpace * findUsageInfo( const QString & path );		static KDiskFreeSpace * findUsageInfo( const QString & path );
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the information about the requested mount point was fou nd.		* Emitted when the information about the requested mount point was fou nd.
	* @param mountPoint the requested mount point		* @param mountPoint the requested mount point
	* @param kibSize the total size of the partition in KiB		* @param kibSize the total size of the partition in KiB
	* @param kibUsed the amount of KiB being used on the partition		* @param kibUsed the amount of KiB being used on the partition
	* @param kibAvail the available space on the partition in KiB		* @param kibAvail the available space on the partition in KiB
	*/		*/
	void foundMountPoint( const QString & mountPoint, quint64 kibSize, quin t64 kibUsed, quint64 kibAvail );		void foundMountPoint( const QString & mountPoint, quint64 kibSize, quin t64 kibUsed, quint64 kibAvail );
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	kfiledialog.h		kfiledialog.h
	skipping to change at line 106		skipping to change at line 106
	/**		/**
	* Constructs a file dialog.		* Constructs a file dialog.
	*		*
	* @param startDir Specifies the starting directory and/or initially s elected		* @param startDir Specifies the starting directory and/or initially s elected
	* file name, or a last used directory and optional fi le name		* file name, or a last used directory and optional fi le name
	* using the @c kfiledialog:/// syntax.		* using the @c kfiledialog:/// syntax.
	* Refer to the KFileWidget documentation for more inf ormation		* Refer to the KFileWidget documentation for more inf ormation
	* on this parameter.		* on this parameter.
	*		*
	* @param filter A shell glob or a mime-type-filter that specifies		* @param filter A shell glob or a mimetype filter that specifies
	* which files to display.		* which files to display. For better consistency across
			applications,
			* it is recommended to use a mimetype filter.
	* See setFilter() and setMimeFilter() for details on how to use this argument.		* See setFilter() and setMimeFilter() for details on how to use this argument.
	*		*
	* @param parent The parent widget of this dialog		* @param parent The parent widget of this dialog
	*		*
	* @param widget A widget, or a widget of widgets, for displaying cust om		* @param widget A widget, or a widget of widgets, for displaying cust om
	* data in the dialog. This can be used, for example, to		* data in the dialog. This can be used, for example, to
	* display a check box with the caption "Open as read-on ly".		* display a check box with the caption "Open as read-on ly".
	* When creating this widget, you don't need to specify a parent,		* When creating this widget, you don't need to specify a parent,
	* since the widget's parent will be set automatically b y KFileDialog.		* since the widget's parent will be set automatically b y KFileDialog.
	*		*
	skipping to change at line 220		skipping to change at line 221
	/**		/**
	* @returns whether the contents of the location edit are kept when		* @returns whether the contents of the location edit are kept when
	* changing directories.		* changing directories.
	*/		*/
	bool keepsLocation() const;		bool keepsLocation() const;
	/**		/**
	* Sets the filter to be used to @p filter.		* Sets the filter to be used to @p filter.
	*		*
	* You can set more		* The filter can be either set as a space-separated list of
	* filters for the user to select separated by @c '\\n'. Every		* mimetypes, which is recommended, or as a list of shell globs
			* separated by @c '\\n'.
			*
			* If the filter contains an unescaped @c '/', a mimetype filter is ass
			umed.
			* If you would like a @c '/' visible in your filter it can be escaped
			with
			* a @c '\'. You can specify multiple mimetypes like this (separated wi
			th
			* space):
			*
			* \code
			* kfile->setFilter( "image/png text/html text/plain" );
			* \endcode
			*
			* When showing the filter to the user, the mimetypes will be automatic
			ally
			* translated into their description like `PNG image'. Multiple mimetyp
			es
			* will be automatically summarized to a filter item `All supported fil
			es'.
			* To add a filter item for all files matching @c '*', add @c all/allfi
			les
			* as mimetype.
			*
			* If the filter contains no unescaped @c '/', it is assumed that
			* the filter contains conventional shell globs. Several filter items
			* to select from can be separated by @c '\\n'. Every
	* filter entry is defined through @c namefilter|text to display.		* filter entry is defined through @c namefilter|text to display.
	* If no @c '|' is found in the expression, just the namefilter is		* If no @c '|' is found in the expression, just the namefilter is
	* shown. Examples:		* shown. Examples:
	*		*
	* \code		* \code
	* kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");		* kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
	* kfile->setFilter("*.cpp");		* kfile->setFilter("*.cpp");
	* kfile->setFilter("*.cpp|Sources (*.cpp)");		* kfile->setFilter("*.cpp|Sources (*.cpp)");
	* kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));		* kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
	* kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header fi les");		* kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header fi les");
	* \endcode		* \endcode
	*		*
	* Note: The text to display is not parsed in any way. So, if you		* Note: The text to display is not parsed in any way. So, if you
	* want to show the suffix to select by a specific filter, you must		* want to show the suffix to select by a specific filter, you must
	* repeat it.		* repeat it.
	*		*
	* If the filter contains an unescaped @c '/', a mimetype-filter is ass		* For better consistency across applications, it is recommended to use
	umed.		a
	* If you would like a '/' visible in your filter it can be escaped wit		* mimetype filter.
	h
	* a @c '\'. You can specify multiple mimetypes like this (separated wi
	th
	* space):
	*
	* \code
	* kfile->setFilter( "image/png text/html text/plain" );
	* kfile->setFilter( "*.cue|CUE\\/BIN Files (*.cue)" );
	* \endcode
	*		*
	* @see filterChanged		* @see filterChanged
	* @see setMimeFilter		* @see setMimeFilter
	*/		*/
	void setFilter(const QString& filter);		void setFilter(const QString& filter);
	/**		/**
	* Returns the current filter as entered by the user or one of the		* Returns the current filter as entered by the user or one of the
	* predefined set via setFilter().		* predefined set via setFilter().
	*		*
	skipping to change at line 346		skipping to change at line 360
	/**		/**
	* Creates a modal file dialog and return the selected		* Creates a modal file dialog and return the selected
	* filename or an empty string if none was chosen.		* filename or an empty string if none was chosen.
	*		*
	* Note that with		* Note that with
	* this method the user must select an existing filename.		* this method the user must select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static QString getOpenFileName( const KUrl& startDir= KUrl(),		static QString getOpenFileName( const KUrl& startDir= KUrl(),
	const QString& filter= QString(),		const QString& filter= QString(),
	skipping to change at line 380		skipping to change at line 394
	/**		/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* filenames or an empty list if none was chosen.		* filenames or an empty list if none was chosen.
	*		*
	* Note that with		* Note that with
	* this method the user must select an existing filename.		* this method the user must select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static QStringList getOpenFileNames( const KUrl& startDir= KUrl(),		static QStringList getOpenFileNames( const KUrl& startDir= KUrl(),
	const QString& filter = QString(),		const QString& filter = QString(),
	skipping to change at line 404		skipping to change at line 418
	/**		/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* URL or an empty string if none was chosen.		* URL or an empty string if none was chosen.
	*		*
	* Note that with		* Note that with
	* this method the user must select an existing URL.		* this method the user must select an existing URL.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static KUrl getOpenUrl( const KUrl& startDir = KUrl(),		static KUrl getOpenUrl( const KUrl& startDir = KUrl(),
	const QString& filter = QString(),		const QString& filter = QString(),
	skipping to change at line 428		skipping to change at line 442
	/**		/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* URLs or an empty list if none was chosen.		* URLs or an empty list if none was chosen.
	*		*
	* Note that with		* Note that with
	* this method the user must select an existing filename.		* this method the user must select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static KUrl::List getOpenUrls( const KUrl& startDir = KUrl(),		static KUrl::List getOpenUrls( const KUrl& startDir = KUrl(),
	const QString& filter = QString(),		const QString& filter = QString(),
	skipping to change at line 452		skipping to change at line 466
	/**		/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* filename or an empty string if none was chosen.		* filename or an empty string if none was chosen.
	*		*
	* Note that with this		* Note that with this
	* method the user need not select an existing filename.		* method the user need not select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static QString getSaveFileName( const KUrl& startDir = KUrl(),		static QString getSaveFileName( const KUrl& startDir = KUrl(),
	const QString& filter = QString(),		const QString& filter = QString(),
	skipping to change at line 476		skipping to change at line 490
	/**		/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* filename or an empty string if none was chosen.		* filename or an empty string if none was chosen.
	*		*
	* Note that with this		* Note that with this
	* method the user need not select an existing filename.		* method the user need not select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	* @param options Dialog options.		* @param options Dialog options.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*		*
	* @since 4.4		* @since 4.4
	skipping to change at line 523		skipping to change at line 537
	/**		/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* filename or an empty string if none was chosen.		* filename or an empty string if none was chosen.
	*		*
	* Note that with this		* Note that with this
	* method the user need not select an existing filename.		* method the user need not select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static KUrl getSaveUrl( const KUrl& startDir = KUrl(),		static KUrl getSaveUrl( const KUrl& startDir = KUrl(),
	const QString& filter = QString(),		const QString& filter = QString(),
	skipping to change at line 547		skipping to change at line 561
	/**		/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* filename or an empty string if none was chosen.		* filename or an empty string if none was chosen.
	*		*
	* Note that with this		* Note that with this
	* method the user need not select an existing filename.		* method the user need not select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mimetype filter that specifies which files to display.
	* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.		* The preferred option is to set a list of mimetype names, see setM imeFilter() for details.
	* Otherwise you can set the text to be displayed for the each glob, and		* Otherwise you can set the text to be displayed for the each glob, and
	* provide multiple globs, see setFilter() for details.		* provide multiple globs, see setFilter() for details.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	* @param options Dialog options.		* @param options Dialog options.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*		*
	* @since 4.4		* @since 4.4
End of changes. 11 change blocks.
	24 lines changed or deleted		44 lines changed or added

	kfileitem.h		kfileitem.h
	skipping to change at line 427		skipping to change at line 427
	*/		*/
	QString getStatusBarInfo() const;		QString getStatusBarInfo() const;
	/**		/**
	* Returns the string to be displayed in the tool tip when the mouse		* Returns the string to be displayed in the tool tip when the mouse
	* is over this item. This may load a plugin to determine additional		* is over this item. This may load a plugin to determine additional
	* information specific to the mimetype of the file.		* information specific to the mimetype of the file.
	*		*
	* @param maxcount the maximum number of entries shown		* @param maxcount the maximum number of entries shown
	* @return the tool tip string		* @return the tool tip string
			*
			* @deprecated File Managers implement more complete tooltips.
	*/		*/
	QString getToolTipText(int maxcount = 6) const;		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED QString getToolTipText(int maxcount = 6) const;
			#endif
	/**		/**
	* Returns true if files can be dropped over this item.		* Returns true if files can be dropped over this item.
	* Contrary to popular belief, not only dirs will return true :)		* Contrary to popular belief, not only dirs will return true :)
	* Executables, .desktop files, will do so as well.		* Executables, .desktop files, will do so as well.
	* @return true if you can drop files over the item		* @return true if you can drop files over the item
	*		*
	* @deprecated This logic is application-dependent, the behavior descri bed above		* @deprecated This logic is application-dependent, the behavior descri bed above
	* mostly makes sense for file managers only.		* mostly makes sense for file managers only.
	* KDirModel has setDropsAllowed for similar (but configurable) logic.		* KDirModel has setDropsAllowed for similar (but configurable) logic.
End of changes. 2 change blocks.
	1 lines changed or deleted		5 lines changed or added

	kfilepreviewgenerator.h		kfilepreviewgenerator.h
	skipping to change at line 99		skipping to change at line 99
	* cut items must be updated when the icon size has changed.		* cut items must be updated when the icon size has changed.
	* @since 4.3		* @since 4.3
	*/		*/
	void updateIcons();		void updateIcons();
	/** Cancels all pending previews. */		/** Cancels all pending previews. */
	void cancelPreviews();		void cancelPreviews();
	/**		/**
	* Sets the list of enabled thumbnail plugins.		* Sets the list of enabled thumbnail plugins.
	* If the list is empty, all plugins will be enabled.		* Per default all plugins enabled in the KConfigGroup "PreviewSettings
	* All plugins are enabled by default.		"
			* are used.
	*		*
	* Note that this method doesn't cause already generated previews		* Note that this method doesn't cause already generated previews
	* to be regenerated.		* to be regenerated.
	*		*
	* For a list of available plugins, call KServiceTypeTrader::self()->qu ery("ThumbCreator").		* For a list of available plugins, call KServiceTypeTrader::self()->qu ery("ThumbCreator").
	*		*
	* @see enabledPlugins		* @see enabledPlugins
	*/		*/
	void setEnabledPlugins(const QStringList& list);		void setEnabledPlugins(const QStringList& list);
	/**		/**
	* Returns the list of enabled thumbnail plugins,		* Returns the list of enabled thumbnail plugins.
	* or an empty list if all plugins are enabled.
	*
	* @see setEnabledPlugins		* @see setEnabledPlugins
	*/		*/
	QStringList enabledPlugins() const;		QStringList enabledPlugins() const;
	private:		private:
	class Private;		class Private;
	Private* const d; /// @internal		Private* const d; /// @internal
	class LayoutBlocker;		class LayoutBlocker;
	class TileSet;		class TileSet;
End of changes. 2 change blocks.
	5 lines changed or deleted		4 lines changed or added

	kfiletreeview.h		kfiletreeview.h
	skipping to change at line 34		skipping to change at line 34
	#include <QtGui/QTreeView>		#include <QtGui/QTreeView>
	#include <kurl.h>		#include <kurl.h>
	#include <kfile_export.h>		#include <kfile_export.h>
	/**		/**
	* The file treeview offers a treeview on the filesystem.		* The file treeview offers a treeview on the filesystem.
	*/		*/
	class KFILE_EXPORT KFileTreeView : public QTreeView		class KFILE_EXPORT KFileTreeView : public QTreeView // KDE5: remove KFILE_ EXPORT? Seems internal only.
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Creates a new file tree view.		* Creates a new file tree view.
	*/		*/
	KFileTreeView(QWidget *parent = 0);		KFileTreeView(QWidget *parent = 0);
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kfilewidget.h		kfilewidget.h
	skipping to change at line 497		skipping to change at line 497
	public:		public:
	/**		/**
	* @returns the KDirOperator used to navigate the filesystem		* @returns the KDirOperator used to navigate the filesystem
	* @since 4.3		* @since 4.3
	*/		*/
	KDirOperator* dirOperator();		KDirOperator* dirOperator();
	/**		/**
	* reads the configuration for this widget from the given config group		* reads the configuration for this widget from the given config group
	* @param group the KConfiGroup to read from		* @param group the KConfigGroup to read from
	* @since 4.4		* @since 4.4
	*/		*/
	void readConfig( KConfigGroup& group );		void readConfig( KConfigGroup& group );
	private:		private:
	friend class KFileWidgetPrivate;		friend class KFileWidgetPrivate;
	KFileWidgetPrivate* const d;		KFileWidgetPrivate* const d;
	Q_PRIVATE_SLOT(d, void _k_slotLocationChanged(const QString&))		Q_PRIVATE_SLOT(d, void _k_slotLocationChanged(const QString&))
	Q_PRIVATE_SLOT(d, void _k_urlEntered(const KUrl&))		Q_PRIVATE_SLOT(d, void _k_urlEntered(const KUrl&))
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kfilterbase.h		kfilterbase.h
	skipping to change at line 23		skipping to change at line 23
	You should have received a copy of the GNU Library General Public Licens e		You should have received a copy of the GNU Library General Public Licens e
	along with this library; see the file COPYING.LIB. If not, write to		along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef __kfilterbase__h		#ifndef __kfilterbase__h
	#define __kfilterbase__h		#define __kfilterbase__h
	#include <kdecore_export.h>		#include <karchive_export.h>
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QString>		#include <QtCore/QString>
	class QIODevice;		class QIODevice;
	/**		/**
	* This is the base class for compression filters		* This is the base class for compression filters
	* such as gzip and bzip2. It's pretty much internal.		* such as gzip and bzip2. It's pretty much internal.
	* Don't use directly, use KFilterDev instead.		* Don't use directly, use KFilterDev instead.
	* @internal		* @internal
	*/		*/
	class KDECORE_EXPORT KFilterBase		class KARCHIVE_EXPORT KFilterBase
	{		{
	public:		public:
	KFilterBase();		KFilterBase();
	virtual ~KFilterBase();		virtual ~KFilterBase();
	/**		/**
	* Sets the device on which the filter will work		* Sets the device on which the filter will work
	* @param dev the device on which the filter will work		* @param dev the device on which the filter will work
	* @param autodelete if true, @p dev is deleted when the filter is dele ted		* @param autodelete if true, @p dev is deleted when the filter is dele ted
	*/		*/
	void setDevice( QIODevice * dev, bool autodelete = false );		void setDevice( QIODevice * dev, bool autodelete = false );
	// Note that this isn't in the constructor, because of KLibFactory::cre ate,		// Note that this isn't in the constructor, because of KLibFactory::cre ate,
	// but it should be called before using the filterbase !		// but it should be called before using the filterbase !
	/**		/**
	* Returns the device on which the filter will work.		* Returns the device on which the filter will work.
	* @returns the device on which the filter will work		* @returns the device on which the filter will work
	*/		*/
	QIODevice * device();		QIODevice * device();
	/** \internal */		/** \internal */
	virtual void init( int mode ) = 0;		virtual void init( int mode ) = 0; // KDE5 TODO: return a bool
	/** \internal */		/** \internal */
	virtual int mode() const = 0;		virtual int mode() const = 0;
	/** \internal */		/** \internal */
	virtual void terminate();		virtual void terminate();
	/** \internal */		/** \internal */
	virtual void reset();		virtual void reset();
	/** \internal */		/** \internal */
	virtual bool readHeader() = 0;		virtual bool readHeader() = 0;
	/** \internal */		/** \internal */
	virtual bool writeHeader( const QByteArray & filename ) = 0;		virtual bool writeHeader( const QByteArray & filename ) = 0;
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	kfilterdev.h		kfilterdev.h
	skipping to change at line 21		skipping to change at line 21
	Library General Public License for more details.		Library General Public License for more details.
	You should have received a copy of the GNU Library General Public Licens e		You should have received a copy of the GNU Library General Public Licens e
	along with this library; see the file COPYING.LIB. If not, write to		along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef __kfilterdev_h		#ifndef __kfilterdev_h
	#define __kfilterdev_h		#define __kfilterdev_h
	#include <kdecore_export.h>		#include <karchive_export.h>
	#include <QtCore/QIODevice>		#include <QtCore/QIODevice>
	#include <QtCore/QString>		#include <QtCore/QString>
	class QFile;		class QFile;
	class KFilterBase;		class KFilterBase;
	/**		/**
	* A class for reading and writing compressed data onto a device		* A class for reading and writing compressed data onto a device
	* (e.g. file, but other usages are possible, like a buffer or a socket).		* (e.g. file, but other usages are possible, like a buffer or a socket).
	*		*
	* To simply read/write compressed files, see deviceForFile.		* To simply read/write compressed files, see deviceForFile.
	*		*
	* @author David Faure <faure@kde.org>		* @author David Faure <faure@kde.org>
	*/		*/
	class KDECORE_EXPORT KFilterDev : public QIODevice		class KARCHIVE_EXPORT KFilterDev : public QIODevice
	{		{
	public:		public:
	/**		/**
	* Destructs the KFilterDev.		* Destructs the KFilterDev.
	* Calls close() if the filter device is still open.		* Calls close() if the filter device is still open.
	*/		*/
	virtual ~KFilterDev();		virtual ~KFilterDev();
	/**		/**
	* Open for reading or writing.		* Open for reading or writing.
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	khtml_part.h		khtml_part.h
	skipping to change at line 1751		skipping to change at line 1751
	/**		/**
	* @internal returns a name for a frame without a name.		* @internal returns a name for a frame without a name.
	* This function returns a sequence of names.		* This function returns a sequence of names.
	* All names in a sequence are different but the sequence is		* All names in a sequence are different but the sequence is
	* always the same.		* always the same.
	* The sequence is reset in clear().		* The sequence is reset in clear().
	*/		*/
	QString requestFrameName();		QString requestFrameName();
	// Requests loading of a frame or iframe element		// Requests loading of a frame or iframe element
	bool loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QS tring &url, const QString &frameName,		void loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QS tring &url, const QString &frameName,
	const QStringList &args = QStringList(), bool isIF rame = false );		const QStringList &args = QStringList(), bool isIF rame = false );
	// Requests loading of an object or embed element. Returns true if		// Requests loading of an object or embed element. Returns true if
	// loading succeeded.		// loading succeeded.
	bool loadObjectElement( DOM::HTMLPartContainerElementImpl *frame, const Q String &url, const QString &serviceType,		bool loadObjectElement( DOM::HTMLPartContainerElementImpl *frame, const Q String &url, const QString &serviceType,
	const QStringList &args = QStringList() );		const QStringList &args = QStringList() );
	// Tries an open a URL in given ChildFrame with all known navigation info rmation		// Tries an open a URL in given ChildFrame with all known navigation info rmation
	// like mimetype and the like in the KParts arguments.		// like mimetype and the like in the KParts arguments.
	//		//
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kiconloader.h		kiconloader.h
	skipping to change at line 448		skipping to change at line 448
	* the list of icon themes.		* the list of icon themes.
	*/		*/
	void addExtraDesktopThemes();		void addExtraDesktopThemes();
	/**		/**
	* Returns if the default icon themes of other desktops have been added		* Returns if the default icon themes of other desktops have been added
	* to the list of icon themes where icons are searched.		* to the list of icon themes where icons are searched.
	*/		*/
	bool extraDesktopThemesAdded() const;		bool extraDesktopThemesAdded() const;
			/**
			* Draws overlays on the specified pixmap, it takes the width and heigh
			t
			* of the pixmap into consideration
			* @param overlays to draw
			* @param pixmap to draw on
			* @since 4.7
			*/
			void drawOverlays(const QStringList &overlays, QPixmap &pixmap, KIconLo
			ader::Group group, int state = KIconLoader::DefaultState) const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Re-initialize the global icon loader		* Re-initialize the global icon loader
	*/		*/
	void newIconLoader();		void newIconLoader();
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted by newIconLoader once the new settings have been loaded		* Emitted by newIconLoader once the new settings have been loaded
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		11 lines changed or added

	kjob.h		kjob.h
	skipping to change at line 231		skipping to change at line 231
	* @see capabilities()		* @see capabilities()
	*/		*/
	void setCapabilities( Capabilities capabilities );		void setCapabilities( Capabilities capabilities );
	public:		public:
	/**		/**
	* Executes the job synchronously.		* Executes the job synchronously.
	*		*
	* This will start a nested QEventLoop internally. Nested event loop ca n be dangerous and		* This will start a nested QEventLoop internally. Nested event loop ca n be dangerous and
	* can have unintended side effects, you should avoid calling exec() wh enever you can and use the		* can have unintended side effects, you should avoid calling exec() wh enever you can and use the
	* asyncronous interface of KJob instead.		* asynchronous interface of KJob instead.
	*		*
	* Should you indeed call this method, you need to make sure that all c allers are reentrant,		* Should you indeed call this method, you need to make sure that all c allers are reentrant,
	* so that events delivered by the inner event loop don't cause non-ree ntrant functions to be		* so that events delivered by the inner event loop don't cause non-ree ntrant functions to be
	* called, which usually wreaks havoc.		* called, which usually wreaks havoc.
	*		*
	* Note that the event loop started by this method does not process use r input events, which means		* Note that the event loop started by this method does not process use r input events, which means
	* your user interface will effectivly be blocked. Other events like pa int or network events are		* your user interface will effectivly be blocked. Other events like pa int or network events are
	* still being processed. The advantage of not processing user input ev ents is that the chance of		* still being processed. The advantage of not processing user input ev ents is that the chance of
	* accidental reentrancy is greatly reduced. Still you should avoid cal ling this function.		* accidental reentrancy is greatly reduced. Still you should avoid cal ling this function.
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	klauncher_iface.h		klauncher_iface.h
	skipping to change at line 180		skipping to change at line 180
	return reply;		return reply;
	}		}
	inline QDBusReply<void> waitForSlave(int pid)		inline QDBusReply<void> waitForSlave(int pid)
	{		{
	QList<QVariant> argumentList;		QList<QVariant> argumentList;
	argumentList << qVariantFromValue(pid);		argumentList << qVariantFromValue(pid);
	return callWithArgumentList(QDBus::Block, QLatin1String("waitForSla ve"), argumentList);		return callWithArgumentList(QDBus::Block, QLatin1String("waitForSla ve"), argumentList);
	}		}
			inline QDBusReply<bool> checkForHeldSlave(const QString &url)
			{
			QList<QVariant> argumentList;
			argumentList << qVariantFromValue(url);
			return callWithArgumentList(QDBus::Block, QLatin1String("checkForHe
			ldSlave"), argumentList);
			}
	Q_SIGNALS: // SIGNALS		Q_SIGNALS: // SIGNALS
	void autoStart0Done();		void autoStart0Done();
	void autoStart1Done();		void autoStart1Done();
	void autoStart2Done();		void autoStart2Done();
	};		};
	namespace org {		namespace org {
	namespace kde {		namespace kde {
	typedef ::OrgKdeKLauncherInterface KLauncher;		typedef ::OrgKdeKLauncherInterface KLauncher;
	}		}
End of changes. 1 change blocks.
	0 lines changed or deleted		8 lines changed or added

	klibloader.h		klibloader.h
	skipping to change at line 198		skipping to change at line 198
	*		*
	* @param keyword the keyword for the plugin - see KPluginFactory::regi sterPlugin()		* @param keyword the keyword for the plugin - see KPluginFactory::regi sterPlugin()
	* @param libname the library to open		* @param libname the library to open
	* @param parent the parent object (see QObject constructor)		* @param parent the parent object (see QObject constructor)
	* @param args a list of string arguments, passed to the factory and po ssibly		* @param args a list of string arguments, passed to the factory and po ssibly
	* to the component (see KPluginFactory)		* to the component (see KPluginFactory)
	* @param error if not null, the int will be set to 0 on success or one of the		* @param error if not null, the int will be set to 0 on success or one of the
	* error codes defined by ComponentLoadingError if there w as an error		* error codes defined by ComponentLoadingError if there w as an error
	* @return a pointer to the newly created object or a null pointer if t he		* @return a pointer to the newly created object or a null pointer if t he
	* factory was unable to create an object of the given type		* factory was unable to create an object of the given type
	* @deprecated Use KService::createInstance() or KPluginFactory instead		* @deprecated Use KService::createInstance() or KPluginLoader instead
	*/		*/
	template <typename T>		template <typename T>
	static KDE_DEPRECATED T *createInstance(const QString &keyword, const Q String &libname, QObject *parent = 0,		static KDE_DEPRECATED T *createInstance(const QString &keyword, const Q String &libname, QObject *parent = 0,
	const QVariantList &args = QVariantList(),		const QVariantList &args = QVariantList(),
	int *error = 0 )		int *error = 0 )
	{		{
	KLibrary *library = KLibLoader::self()->library( libname );		KLibrary *library = KLibLoader::self()->library( libname );
	if ( !library )		if ( !library )
	{		{
	if ( error )		if ( error )
	skipping to change at line 244		skipping to change at line 244
	* factory to create an instance of the given template type.		* factory to create an instance of the given template type.
	*		*
	* @param libname the library to open		* @param libname the library to open
	* @param parent the parent object (see QObject constructor)		* @param parent the parent object (see QObject constructor)
	* @param args a list of string arguments, passed to the factory and po ssibly		* @param args a list of string arguments, passed to the factory and po ssibly
	* to the component (see KPluginFactory)		* to the component (see KPluginFactory)
	* @param error if not null, the int will be set to 0 on success or one of the		* @param error if not null, the int will be set to 0 on success or one of the
	* error codes defined by ComponentLoadingError if there w as an error		* error codes defined by ComponentLoadingError if there w as an error
	* @return a pointer to the newly created object or a null pointer if t he		* @return a pointer to the newly created object or a null pointer if t he
	* factory was unable to create an object of the given type		* factory was unable to create an object of the given type
	* @deprecated Use KService::createInstance() or KPluginFactory instead		* @deprecated Use KService::createInstance() or KPluginLoader instead
	*/		*/
	template <typename T>		template <typename T>
	static KDE_DEPRECATED T *createInstance( const QString &libname, QObjec t *parent = 0,		static KDE_DEPRECATED T *createInstance( const QString &libname, QObjec t *parent = 0,
	const QVariantList &args = QVariantList(),		const QVariantList &args = QVariantList(),
	int *error = 0 )		int *error = 0 )
	{		{
	return createInstance<T>(QString(), libname, parent, args, error);		return createInstance<T>(QString(), libname, parent, args, error);
	}		}
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	klineedit.h		klineedit.h
	skipping to change at line 214		skipping to change at line 214
	* Disables completion modes by makeing them non-checkable.		* Disables completion modes by makeing them non-checkable.
	*		*
	* The context menu allows to change the completion mode.		* The context menu allows to change the completion mode.
	* This method allows to disable some modes.		* This method allows to disable some modes.
	*/		*/
	void setCompletionModeDisabled( KGlobalSettings::Completion mode, bool disable = true );		void setCompletionModeDisabled( KGlobalSettings::Completion mode, bool disable = true );
	/**		/**
	* Enables/disables the popup (context) menu.		* Enables/disables the popup (context) menu.
	*		*
	* Note that when this function is invoked with its argument		* This method only works if this widget is editable, i.e. read-write an
	* set to @p true, then both the context menu and the completion		d
	* menu item are enabled. If you do not want to the completion		* allows you to enable/disable the context menu. It does nothing if inv
	* item to be visible simply invoke hideModechanger() right		oked
	* after calling this method. Also by default, the context		* for a none-editable combo-box.
	* menu is automatically created if this widget is editable. Thus		*
	* you need to call this function with the argument set to false		* By default, the context menu is created if this widget is editable.
	* if you do not want this behavior.		* Call this function with the argument set to false to disable the popu
			p
			* menu.
	*		*
	* @param showMenu If @p true, show the context menu.		* @param showMenu If @p true, show the context menu.
	* @deprecated use setContextMenuPolicy		* @deprecated use setContextMenuPolicy
	*/		*/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );		virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );
	#endif		#endif
	/**		/**
	* Returns @p true when the context menu is enabled.		* Returns @p true when the context menu is enabled.
End of changes. 1 change blocks.
	8 lines changed or deleted		10 lines changed or added

	klocale.h		klocale.h
	skipping to change at line 86		skipping to change at line 86
	* configuration file.		* configuration file.
	*		*
	* If no configuration file is specified, it will also look for languag es		* If no configuration file is specified, it will also look for languag es
	* using the environment variables (KDE_LANG, LC_MESSAGES, LC_ALL, LANG ),		* using the environment variables (KDE_LANG, LC_MESSAGES, LC_ALL, LANG ),
	* as well as the global configuration file. If KLocale is not able to use		* as well as the global configuration file. If KLocale is not able to use
	* any of the specified languages, the default language (en_US) will be		* any of the specified languages, the default language (en_US) will be
	* used.		* used.
	*		*
	* If you specify a configuration file, it has to be valid until the KL ocale		* If you specify a configuration file, it has to be valid until the KL ocale
	* object is destroyed. Note that a setLocale() will be performed on t he		* object is destroyed. Note that a setLocale() will be performed on t he
	* config using the current locale langauge, which may cause a sync()		* config using the current locale language, which may cause a sync()
	* and reparseConfiguration() which will save any changes you have made and		* and reparseConfiguration() which will save any changes you have made and
	* load any changes other shared copies have made.		* load any changes other shared copies have made.
	*		*
	* @param catalog the name of the main language file		* @param catalog the name of the main language file
	* @param config a configuration file with a Locale group detailing		* @param config a configuration file with a Locale group detailing
	* locale-related preferences (such as language and		* locale-related preferences (such as language and
	* formatting options).		* formatting options).
	*/		*/
	explicit KLocale(const QString& catalog, KSharedConfig::Ptr config = KS haredConfig::Ptr());		explicit KLocale(const QString& catalog, KSharedConfig::Ptr config = KS haredConfig::Ptr());
	/**		/**
	* Constructs a KLocale with the given catalog name		* Constructs a KLocale with the given catalog name
	*		*
	* Allows you to override the language and, optionally, the		* Allows you to override the language and, optionally, the
	* country of this locale.		* country of this locale.
	*		*
	* If you specify a configuration file, a setLocale() will be performed on		* If you specify a configuration file, a setLocale() will be performed on
	* the config using the current locale langauge, which may cause a sync ()		* the config using the current locale language, which may cause a sync ()
	* and reparseConfiguration() which will save any changes you have made .		* and reparseConfiguration() which will save any changes you have made .
	*		*
	* @param catalog the name of the main language file		* @param catalog the name of the main language file
	* @param language the ISO Language Code for the locale, e.g. "en" for English		* @param language the ISO Language Code for the locale, e.g. "en" for English
	* @param country the ISO Country Code for the locale, e.g. "us" for U SA		* @param country the ISO Country Code for the locale, e.g. "us" for U SA
	* @param config a configuration file with a Locale group detailing		* @param config a configuration file with a Locale group detailing
	* locale-related preferences (such as language and		* locale-related preferences (such as language and
	* formatting options).		* formatting options).
	*/		*/
	KLocale(const QString& catalog, const QString &language, const QString &country = QString(),		KLocale(const QString& catalog, const QString &language, const QString &country = QString(),
	skipping to change at line 471		skipping to change at line 471
	*/		*/
	QString negativeSign() const;		QString negativeSign() const;
	/**		/**
	* @deprecated use decimalPlaces() or monetaryDecimalPlaces()		* @deprecated use decimalPlaces() or monetaryDecimalPlaces()
	*		*
	* The number of fractional digits to include in monetary values (usual ly 2).		* The number of fractional digits to include in monetary values (usual ly 2).
	*		*
	* @return Default number of fractional digits used by locale.		* @return Default number of fractional digits used by locale.
	*/		*/
	int fracDigits() const;		KDE_DEPRECATED int fracDigits() const;
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* The number of decimal places to include in numeric values (usually 2 ).		* The number of decimal places to include in numeric values (usually 2 ).
	*		*
	* @return Default number of numeric decimal places used by locale.		* @return Default number of numeric decimal places used by locale.
	*/		*/
	int decimalPlaces() const;		int decimalPlaces() const;
	skipping to change at line 763		skipping to change at line 763
	/**		/**
	* @deprecated		* @deprecated
	*		*
	* Use this to determine whether nouns are declined in		* Use this to determine whether nouns are declined in
	* locale's language. This property should remain		* locale's language. This property should remain
	* read-only (no setter function)		* read-only (no setter function)
	*		*
	* @return If nouns are declined		* @return If nouns are declined
	*/		*/
	bool nounDeclension() const;		KDE_DEPRECATED bool nounDeclension() const;
	//KDE5 move to KDateTime namespace		//KDE5 move to KDateTime namespace
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Available Calendar Systems		* Available Calendar Systems
	*		*
	* @see setCalendarSystem()		* @see setCalendarSystem()
	* @see calendarSystem()		* @see calendarSystem()
	*/		*/
	skipping to change at line 790		skipping to change at line 790
	EthiopianCalendar = 6, /**< Ethiopian Calendar, aka Ethiopic Calend ar */		EthiopianCalendar = 6, /**< Ethiopian Calendar, aka Ethiopic Calend ar */
	//EthiopianAmeteAlemCalendar = 7, /**< Ethiopian Amete Alem version , aka Ethiopic Amete Alem */		//EthiopianAmeteAlemCalendar = 7, /**< Ethiopian Amete Alem version , aka Ethiopic Amete Alem */
	GregorianCalendar = 8, /**< Gregorian Calendar, pure proleptic impl ementation */		GregorianCalendar = 8, /**< Gregorian Calendar, pure proleptic impl ementation */
	HebrewCalendar = 9, /**< Hebrew Calendar, aka Jewish Calendar */		HebrewCalendar = 9, /**< Hebrew Calendar, aka Jewish Calendar */
	//HinduCalendar = 10, /**< Hindu Lunar Calendar */		//HinduCalendar = 10, /**< Hindu Lunar Calendar */
	//IslamicLunarCalendar = 11, /**< Islamic Lunar Calendar */		//IslamicLunarCalendar = 11, /**< Islamic Lunar Calendar */
	IslamicCivilCalendar = 12, /**< Islamic Civil Calendar, aka Hijri, not the Lunar Calendar */		IslamicCivilCalendar = 12, /**< Islamic Civil Calendar, aka Hijri, not the Lunar Calendar */
	//IslamicUmAlQuraCalendar = 13, /**< Islamic Lunar Calendar, Um Al Qura varient used in Saudi Arabia */		//IslamicUmAlQuraCalendar = 13, /**< Islamic Lunar Calendar, Um Al Qura varient used in Saudi Arabia */
	IndianNationalCalendar = 14, /**< Indian National Calendar, not the Lunar Calendar */		IndianNationalCalendar = 14, /**< Indian National Calendar, not the Lunar Calendar */
	//Iso8601Calendar = 15, /**< ISO 8601 Standard Calendar */		//Iso8601Calendar = 15, /**< ISO 8601 Standard Calendar */
	JalaliCalendar = 16, /**< Jalali Calendar, aka Persian or Iranian, also used in Afganistan */		JalaliCalendar = 16, /**< Jalali Calendar, aka Persian or Iranian, also used in Afghanistan */
	//JalaliBirashkCalendar = 17, /**< Jalali Calendar, Birashk Algoryt hm variant */		//JalaliBirashkCalendar = 17, /**< Jalali Calendar, Birashk Algoryt hm variant */
	//Jalali33YearCalendar = 18, /**< Jalali Calendar, 33 Year cycle va riant */		//Jalali33YearCalendar = 18, /**< Jalali Calendar, 33 Year cycle va riant */
	JapaneseCalendar= 19, /**< Japanese Calendar, Gregorian calculation using Japanese Era (Nengô) */		JapaneseCalendar= 19, /**< Japanese Calendar, Gregorian calculation using Japanese Era (Nengô) */
	//JucheCalendar = 20, /**< Juche Calendar, used in North Korea */		//JucheCalendar = 20, /**< Juche Calendar, used in North Korea */
	JulianCalendar = 21, /**< Julian Calendar, as used in Orthodox Chur ches */		JulianCalendar = 21, /**< Julian Calendar, as used in Orthodox Chur ches */
	MinguoCalendar= 22, /**< Minguo Calendar, aka ROC, Republic of Chin a or Taiwanese */		MinguoCalendar= 22, /**< Minguo Calendar, aka ROC, Republic of Chin a or Taiwanese */
	ThaiCalendar = 23 /**< Thai Calendar, aka Buddhist or Thai Buddhist */		ThaiCalendar = 23 /**< Thai Calendar, aka Buddhist or Thai Buddhist */
	};		};
	//KDE5 move to KDateTime namespace		//KDE5 move to KDateTime namespace
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* System used for Week Numbers		* System used for Week Numbers
	*		*
	* @see setWeekNumberSystem()		* @see setWeekNumberSystem()
	* @see weekNumberSystem()		* @see weekNumberSystem()
	*/		*/
	enum WeekNumberSystem {		enum WeekNumberSystem {
	DefaultWeekNumber = -1, /**< The system locale default */		DefaultWeekNumber = -1, /**< The system locale default */
	IsoWeekNumber = 0 /**< ISO Week Number */		IsoWeekNumber = 0, /**< ISO Week Number */
	//UsaWeekNumber = 1 /**< USA Week Number */		FirstFullWeek = 1, /**< Week 1 starts on the first Week Start
			Day in year ends after 7 days */
			FirstPartialWeek = 2, /**< Week 1 starts Jan 1st ends day before
			first Week Start Day in year */
			SimpleWeek = 3 /**< Week 1 starts Jan 1st ends after 7 day
			s */
	};		};
	//KDE5 move to KDateTime namespace		//KDE5 move to KDateTime namespace
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Standard used for Date Time Format String		* Standard used for Date Time Format String
	*/		*/
	enum DateTimeFormatStandard {		enum DateTimeFormatStandard {
	KdeFormat, /**< KDE Standard */		KdeFormat, /**< KDE Standard */
	skipping to change at line 905		skipping to change at line 907
	* Format used for individual Date/Time Components when converted to/fr om a string		* Format used for individual Date/Time Components when converted to/fr om a string
	* Largely equivalent to the UNICODE CLDR format width definitions 1..5		* Largely equivalent to the UNICODE CLDR format width definitions 1..5
	*		*
	* @see DateTimeComponentFormat		* @see DateTimeComponentFormat
	*/		*/
	enum DateTimeComponentFormat {		enum DateTimeComponentFormat {
	DefaultComponentFormat = -1, /**< The system locale default for the componant */		DefaultComponentFormat = -1, /**< The system locale default for the componant */
	ShortNumber = 0, /**< Number at its natural width, e.g. 2 for the 2nd*/		ShortNumber = 0, /**< Number at its natural width, e.g. 2 for the 2nd*/
	LongNumber, /**< Number padded to a required width , e.g. 02 for the 2nd*/		LongNumber, /**< Number padded to a required width , e.g. 02 for the 2nd*/
	//OrdinalNumber /**< Ordinal number format, e.g. "2n d" for the 2nd */		//OrdinalNumber /**< Ordinal number format, e.g. "2n d" for the 2nd */
	NarrowName = 3, /**< Narrow text format, e.g. M for Mo nday */		NarrowName = 3, /**< Narrow text format, may not be un ique, e.g. M for Monday */
	ShortName, /**< Short text format, e.g. Mon for M onday */		ShortName, /**< Short text format, e.g. Mon for M onday */
	LongName /**< Long text format, e.g. Monday for Monday */		LongName /**< Long text format, e.g. Monday for Monday */
	};		};
	//KDE5 move to KDateTime namespace		//KDE5 move to KDateTime namespace
	/**		/**
	* Format for date string.		* Format for date string.
	*/		*/
	enum DateFormat {		enum DateFormat {
	ShortDate, /**< Locale Short date format, e.g. 08-04-2007 */		ShortDate, /**< Locale Short date format, e.g. 08-04-2007 */
	skipping to change at line 1068		skipping to change at line 1070
	* @return If the user wants 12h clock		* @return If the user wants 12h clock
	*/		*/
	bool use12Clock() const;		bool use12Clock() const;
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns the Day Period matching the time given		* Returns the Day Period matching the time given
	*		*
	* @param time the time to return the day period for		* @param time the time to return the day period for
			* @param format the format to return teh day period in
	* @return the Day Period for the given time		* @return the Day Period for the given time
	*/		*/
	QString dayPeriodText(const QTime &time, DateTimeComponentFormat format = DefaultComponentFormat) const;		QString dayPeriodText(const QTime &time, DateTimeComponentFormat format = DefaultComponentFormat) const;
	/**		/**
	* Use this to determine which day is the first day of the week.		* Use this to determine which day is the first day of the week.
	*		*
	* @return an integer (Monday=1..Sunday=7)		* @return an integer (Monday=1..Sunday=7)
	*/		*/
	int weekStartDay() const;		int weekStartDay() const;
	skipping to change at line 1120		skipping to change at line 1123
	//KDE5 remove		//KDE5 remove
	/**		/**
	* @deprecated use calendarSystem() instead		* @deprecated use calendarSystem() instead
	*		*
	* Returns the name of the calendar system that is currently being		* Returns the name of the calendar system that is currently being
	* used by the system.		* used by the system.
	*		*
	* @see calendarSystem()		* @see calendarSystem()
	* @return the name of the calendar system		* @return the name of the calendar system
	*/		*/
	QString calendarType() const;		KDE_DEPRECATED QString calendarType() const;
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns the type of Calendar System used in this Locale		* Returns the type of Calendar System used in this Locale
	*		*
	* @see KLocale::CalendarSystem		* @see KLocale::CalendarSystem
	* @see KCalendarSystem		* @see KCalendarSystem
	* @return the type of Calendar System		* @return the type of Calendar System
	*/		*/
	skipping to change at line 1143		skipping to change at line 1146
	//KDE5 remove		//KDE5 remove
	/**		/**
	* @deprecated use setCalendarSystem() instead		* @deprecated use setCalendarSystem() instead
	*		*
	* Changes the current calendar system to the calendar specified.		* Changes the current calendar system to the calendar specified.
	* If the calendar system specified is not found, gregorian will be use d.		* If the calendar system specified is not found, gregorian will be use d.
	*		*
	* @see setCalendarSystem()		* @see setCalendarSystem()
	* @param calendarType the name of the calendar type		* @param calendarType the name of the calendar type
	*/		*/
	void setCalendar(const QString & calendarType);		KDE_DEPRECATED void setCalendar(const QString & calendarType);
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Sets the type of Calendar System to use in this Locale		* Sets the type of Calendar System to use in this Locale
	*		*
	* @see KLocale::CalendarSystem		* @see KLocale::CalendarSystem
	* @see KCalendarSystem		* @see KCalendarSystem
	* @param calendarSystem the Calendar System to use		* @param calendarSystem the Calendar System to use
	*/		*/
	void setCalendarSystem(KLocale::CalendarSystem calendarSystem);		void setCalendarSystem(KLocale::CalendarSystem calendarSystem);
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Sets the type of Week Number System to use in this Locale		* Sets the type of Week Number System to use in this Locale
	*		*
	* Currently only ISO Weeks are supported.
	*
	* @see Klocale::WeekNumberSystem		* @see Klocale::WeekNumberSystem
	* @see weekNumberSystem()		* @see weekNumberSystem()
	* @param weekNumberSystem the Week Number System to use		* @param weekNumberSystem the Week Number System to use
	*/		*/
	void setWeekNumberSystem(KLocale::WeekNumberSystem weekNumberSystem);		void setWeekNumberSystem(KLocale::WeekNumberSystem weekNumberSystem);
			//KDE5 remove in favour of const version
	/**		/**
	* @since 4.6		* @since 4.6
	*		*
	* Returns the type of Week Number System used in this Locale		* Returns the type of Week Number System used in this Locale
	*		*
	* Currently only ISO Weeks are supported.
	*
	* @see Klocale::WeekNumberSystem		* @see Klocale::WeekNumberSystem
	* @see setWeekNumberSystem()		* @see setWeekNumberSystem()
	* @returns the Week Number System used		* @returns the Week Number System used
	*/		*/
	KLocale::WeekNumberSystem weekNumberSystem();		KLocale::WeekNumberSystem weekNumberSystem();
	/**		/**
			* @since 4.7
			*
			* Returns the type of Week Number System used in this Locale
			*
			* @see Klocale::WeekNumberSystem
			* @see setWeekNumberSystem()
			* @returns the Week Number System used
			*/
			KLocale::WeekNumberSystem weekNumberSystem() const;
			/**
	* Converts a localized monetary string to a double.		* Converts a localized monetary string to a double.
	*		*
	* @param numStr the string we want to convert.		* @param numStr the string we want to convert.
	* @param ok the boolean that is set to false if it's not a number.		* @param ok the boolean that is set to false if it's not a number.
	* If @p ok is 0, it will be ignored		* If @p ok is 0, it will be ignored
	*		*
	* @return The string converted to a double		* @return The string converted to a double
	*/		*/
	double readMoney(const QString &numStr, bool * ok = 0) const;		double readMoney(const QString &numStr, bool * ok = 0) const;
	skipping to change at line 1681		skipping to change at line 1692
	*/		*/
	void setNegativePrefixCurrencySymbol(bool prefix);		void setNegativePrefixCurrencySymbol(bool prefix);
	/**		/**
	* @deprecated use setDecimalPlaces() or setMonetaryDecimalPlaces()		* @deprecated use setDecimalPlaces() or setMonetaryDecimalPlaces()
	*		*
	* Changes the number of digits used when formating numbers.		* Changes the number of digits used when formating numbers.
	*		*
	* @param digits The default number of digits to use.		* @param digits The default number of digits to use.
	*/		*/
	void setFracDigits(int digits);		KDE_DEPRECATED void setFracDigits(int digits);
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Changes the number of decimal places used when formating numbers.		* Changes the number of decimal places used when formating numbers.
	*		*
	* @param digits The default number of digits to use.		* @param digits The default number of digits to use.
	*/		*/
	void setDecimalPlaces(int digits);		void setDecimalPlaces(int digits);
	skipping to change at line 1985		skipping to change at line 1996
	void copyCatalogsTo(KLocale *locale);		void copyCatalogsTo(KLocale *locale);
	/**		/**
	* Changes the current country. The current country will be left		* Changes the current country. The current country will be left
	* unchanged if failed. It will force a reload of the country specific		* unchanged if failed. It will force a reload of the country specific
	* configuration.		* configuration.
	*		*
	* An empty country value will set the country to the system default.		* An empty country value will set the country to the system default.
	*		*
	* If you specify a configuration file, a setLocale() will be performed on		* If you specify a configuration file, a setLocale() will be performed on
	* the config using the current locale langauge, which may cause a sync ()		* the config using the current locale language, which may cause a sync ()
	* and reparseConfiguration() which will save any changes you have made .		* and reparseConfiguration() which will save any changes you have made .
	*		*
	* @param country the ISO 3166 country code		* @param country the ISO 3166 country code
	* @param config a configuration file with a Locale group detailing		* @param config a configuration file with a Locale group detailing
	* locale-related preferences (such as language and		* locale-related preferences (such as language and
	* formatting options).		* formatting options).
	*		*
	* @return @c true on success, @c false on failure		* @return @c true on success, @c false on failure
	*/		*/
	bool setCountry(const QString & country, KConfig *config);		bool setCountry(const QString & country, KConfig *config);
	skipping to change at line 2020		skipping to change at line 2031
	* @see countryDivisionCode		* @see countryDivisionCode
	*/		*/
	bool setCountryDivisionCode(const QString & countryDivision);		bool setCountryDivisionCode(const QString & countryDivision);
	/**		/**
	* Changes the current language. The current language will be left		* Changes the current language. The current language will be left
	* unchanged if failed. It will force a reload of the country specific		* unchanged if failed. It will force a reload of the country specific
	* configuration as well.		* configuration as well.
	*		*
	* If you specify a configuration file, a setLocale() will be performed on		* If you specify a configuration file, a setLocale() will be performed on
	* the config using the current locale langauge, which may cause a sync ()		* the config using the current locale language, which may cause a sync ()
	* and reparseConfiguration() which will save any changes you have made .		* and reparseConfiguration() which will save any changes you have made .
	*		*
	* @param language the language code		* @param language the language code
	* @param config a configuration file with a Locale group detailing		* @param config a configuration file with a Locale group detailing
	* locale-related preferences (such as language and		* locale-related preferences (such as language and
	* formatting options).		* formatting options).
	*		*
	* @return true on success		* @return true on success
	*/		*/
	bool setLanguage(const QString &language, KConfig *config);		bool setLanguage(const QString &language, KConfig *config);
End of changes. 17 change blocks.
	17 lines changed or deleted		31 lines changed or added

	klocalizeddate.h		klocalizeddate.h
	skipping to change at line 20		skipping to change at line 20
	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
	Library General Public License for more details.		Library General Public License for more details.
	You should have received a copy of the GNU Library General Public Licen se		You should have received a copy of the GNU Library General Public Licen se
	along with this library; see the file COPYING.LIB. If not, write to		along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KDATE_H		#ifndef KLOCALIZEDDATE_H
	#define KDATE_H		#define KLOCALIZEDDATE_H
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <QtCore/QDate>		#include <QtCore/QDate>
	#include <kdecore_export.h>		#include <kdecore_export.h>
	#include "kcalendarsystem.h"		#include "kcalendarsystem.h"
	#include "klocale.h"		#include "klocale.h"
	class KLocalizedDatePrivate;		class KLocalizedDatePrivate;
	/**		/**
	skipping to change at line 154		skipping to change at line 154
	*		*
	* By default, uses the global Calendar System and Locale.		* By default, uses the global Calendar System and Locale.
	*		*
	* If you pass in a custom Calendar System then you retain ownership of it		* If you pass in a custom Calendar System then you retain ownership of it
	* and are responsible for deleting it. This allows you to reuse the s ame		* and are responsible for deleting it. This allows you to reuse the s ame
	* custom Calendar System for many localized date instances.		* custom Calendar System for many localized date instances.
	*		*
	* See @ref custom for more details on using custom Calendar Systems.		* See @ref custom for more details on using custom Calendar Systems.
	*		*
	* @param date the QDate to set the KLocalizedDate to, defaults to inva lid date		* @param date the QDate to set the KLocalizedDate to, defaults to inva lid date
	* @param locale the locale to use for date formats, defaults to the gl obal		* @param calendar the calendar system to use, defaults to the global
	*/		*/
	explicit KLocalizedDate(const QDate &date = QDate(), const KCalendarSys tem *calendar = 0);		explicit KLocalizedDate(const QDate &date = QDate(), const KCalendarSys tem *calendar = 0);
	/**		/**
	* Constructs a localized date with the given year, month and day.		* Constructs a localized date with the given year, month and day.
	*		*
	* By default, uses the global Calendar System and Locale.		* By default, uses the global Calendar System and Locale.
	*		*
	* If you pass in a custom Calendar System then you retain ownership of it		* If you pass in a custom Calendar System then you retain ownership of it
	* and are responsible for deleting it. This allows you to reuse the s ame		* and are responsible for deleting it. This allows you to reuse the s ame
	* custom Calendar System for many localized date instances.		* custom Calendar System for many localized date instances.
	*		*
	* See @ref custom for more details on using custom Calendar Systems.		* See @ref custom for more details on using custom Calendar Systems.
	*		*
	* @param year the year to set the KLocalizedDate to		* @param year the year to set the KLocalizedDate to
	* @param month the month to set the KLocalizedDate to		* @param month the month to set the KLocalizedDate to
	* @param day the day to set the KLocalizedDate to		* @param day the day to set the KLocalizedDate to
			* @param calendar the calendar system to use, defaults to the global
	*/		*/
	KLocalizedDate(int year, int month, int day, const KCalendarSystem *cal endar = 0);		KLocalizedDate(int year, int month, int day, const KCalendarSystem *cal endar = 0);
	/**		/**
	* Copy constructor		* Copy constructor
	*		*
	* @param rhs the date to copy		* @param rhs the date to copy
	*/		*/
	KLocalizedDate(const KLocalizedDate &rhs);		KLocalizedDate(const KLocalizedDate &rhs);
	skipping to change at line 300		skipping to change at line 301
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool setDate(int year, int dayOfYear);		bool setDate(int year, int dayOfYear);
	/**		/**
	* Set the date using the era, year in era number, month and day		* Set the date using the era, year in era number, month and day
	*		*
	* @see eraName()		* @see eraName()
	* @see yearInEra()		* @see yearInEra()
	* @param eraName Era string		* @param eraName Era string
	* @param year Year In Era number		* @param yearInEra Year In Era number
	* @param month Month number		* @param month Month number
	* @param day Day Of Month number		* @param day Day Of Month number
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	bool setDate(QString eraName, int yearInEra, int month, int day);		bool setDate(QString eraName, int yearInEra, int month, int day);
	/**		/**
	* Set the date using the year, week and day of week.		* Set the date using the year, week and day of week.
	*		*
	* Currently only the ISO Week Number System is supported.		* Currently only the ISO Week Number System is supported.
	skipping to change at line 424		skipping to change at line 425
	*/		*/
	int day() const;		int day() const;
	/**		/**
	* Returns the Era Name portion of the date in the current calendar sys tem,		* Returns the Era Name portion of the date in the current calendar sys tem,
	* for example "AD" or "Anno Domini" for the Gregorian calendar and Chr istian Era.		* for example "AD" or "Anno Domini" for the Gregorian calendar and Chr istian Era.
	*		*
	* See @ref formatting for more details on Date Formatting.		* See @ref formatting for more details on Date Formatting.
	*		*
	* @see formatDate()		* @see formatDate()
	* @param format format to return, either short or long
	* @return the localized era name, empty string if date is invalid		* @return the localized era name, empty string if date is invalid
	*/		*/
	QString eraName() const;		QString eraName() const;
	/**		/**
	* Returns the Era Year portion of the date in the current		* Returns the Era Year portion of the date in the current
	* calendar system, for example "2000 AD" or "Heisei 22".		* calendar system, for example "2000 AD" or "Heisei 22".
	*		*
	* See @ref formatting for more details on Date Formatting.		* See @ref formatting for more details on Date Formatting.
	*		*
	* @see formatDate()		* @see formatDate()
	* @param format format to return, either short or long
	* @return the localized era year string, empty string if date is inval id		* @return the localized era year string, empty string if date is inval id
	*/		*/
	QString eraYear() const;		QString eraYear() const;
	/**		/**
	* Returns the Year In Era portion of the date in the current calendar		* Returns the Year In Era portion of the date in the current calendar
	* system, for example 1 for "1 BC".		* system, for example 1 for "1 BC".
	*		*
	* See @ref formatting for why you should never display this value.		* See @ref formatting for why you should never display this value.
	*		*
	skipping to change at line 484		skipping to change at line 483
	* @see formatDate()		* @see formatDate()
	* @return day of week number, -1 if date not valid		* @return day of week number, -1 if date not valid
	*/		*/
	int dayOfWeek() const;		int dayOfWeek() const;
	/**		/**
	* Returns the localized Week Number for the date.		* Returns the localized Week Number for the date.
	*		*
	* See @ref formatting for why you should never display this value.		* See @ref formatting for why you should never display this value.
	*		*
	* Currently only the ISO Week Number is supported, but in future the U		* This may be ISO, US, or any other supported week numbering scheme.
	S		If
	* and other week number systems will be added.		* you specifically require the ISO Week or any other scheme, you shoul
	*		d use
	* If you specifically require the ISO Week, you should use		* the week(KLocale::WeekNumberSystem) form.
	* week(KLocale::IsoWeekNumber)
	*
	* ISO 8601 defines the first week of the year as the week containing t
	he first Thursday.
	* See http://en.wikipedia.org/wiki/ISO_8601 and http://en.wikipedia.or
	g/wiki/ISO_week_date
	*		*
	* If the date falls in the last week of the previous year or the first		* If the date falls in the last week of the previous year or the first
	* week of the following year, then the yearNum returned will be set to the		* week of the following year, then the yearNum returned will be set to the
	* appropriate year.		* appropriate year.
	*		*
	* @see weeksInYear()		* @see weeksInYear()
	* @see formatDate()		* @see formatDate()
	* @param yearNum returns the year the date belongs to		* @param yearNum returns the year the date belongs to
	* @return localized week number, -1 if input date invalid		* @return localized week number, -1 if input date invalid
	*/		*/
	skipping to change at line 542		skipping to change at line 536
	* @see formatDate()		* @see formatDate()
	* @return number of months in the year, -1 if date invalid		* @return number of months in the year, -1 if date invalid
	*/		*/
	int monthsInYear() const;		int monthsInYear() const;
	/**		/**
	* Returns the number of localized weeks in the currently set year.		* Returns the number of localized weeks in the currently set year.
	*		*
	* See @ref formatting for why you should never display this value.		* See @ref formatting for why you should never display this value.
	*		*
	* Currently only the ISO Week Number is supported, but in future the U
	S
	* and other week number systems will be added.
	*
	* If you specifically require the number of ISO Weeks, you should use		* If you specifically require the number of ISO Weeks, you should use
	* weeksInYear(KLocale::IsoWeekNumber)		* weeksInYear(KLocale::IsoWeekNumber)
	*		*
	* @see week()		* @see week()
	* @see formatDate()		* @see formatDate()
	* @return number of weeks in the year, -1 if date invalid		* @return number of weeks in the year, -1 if date invalid
	*/		*/
	int weeksInYear() const;		int weeksInYear() const;
	/**		/**
	skipping to change at line 1177		skipping to change at line 1168
	friend QDebug KDECORE_EXPORT operator<<(QDebug, const KLocalizedDate &) ;		friend QDebug KDECORE_EXPORT operator<<(QDebug, const KLocalizedDate &) ;
	QSharedDataPointer<KLocalizedDatePrivate> d;		QSharedDataPointer<KLocalizedDatePrivate> d;
	};		};
	Q_DECLARE_METATYPE(KLocalizedDate)		Q_DECLARE_METATYPE(KLocalizedDate)
	/**		/**
	* Data stream output operator		* Data stream output operator
	*		*
	* @param other the date to compare		* @param out the datastream to write to
			* @param date the date to write to the stream
	*/		*/
	QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KLocalizedDa te &date);		QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KLocalizedDa te &date);
	/**		/**
	* Data stream input operator		* Data stream input operator
	*		*
	* @param other the date to compare		* @param in the datastream to read from
			* @param date the date to read from the stream
	*/		*/
	QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KLocalizedDate &dat e);		QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KLocalizedDate &dat e);
	/**		/**
	* Debug stream output operator		* Debug stream output operator
	*		*
	* @param other the date to print		* @param debug the debug datastream to write to
			* @param date the date to write to the stream
	*/		*/
	QDebug KDECORE_EXPORT operator<<(QDebug, const KLocalizedDate &);		QDebug KDECORE_EXPORT operator<<(QDebug debug, const KLocalizedDate &date);
	#endif // KDATE_H		#endif // KLOCALIZEDDATE_H
End of changes. 13 change blocks.
	25 lines changed or deleted		17 lines changed or added

	kmessage.h		kmessage.h
	skipping to change at line 92		skipping to change at line 92
	* A long message span on multiple lines and can have a caption.		* A long message span on multiple lines and can have a caption.
	*		*
	* @param messageType Currrent type of message. See MessageType enum.		* @param messageType Currrent type of message. See MessageType enum.
	* @param text Long message to be displayed.		* @param text Long message to be displayed.
	* @param caption Caption to be used. This is optional.		* @param caption Caption to be used. This is optional.
	*/		*/
	KDECORE_EXPORT void message(KMessage::MessageType messageType, const QS tring &text, const QString &caption = QString());		KDECORE_EXPORT void message(KMessage::MessageType messageType, const QS tring &text, const QString &caption = QString());
	/**		/**
	* @brief Set the current KMessageHandler		* @brief Set the current KMessageHandler
	* Note that this method take ownership of the KMessageHandler.		* Note that this method takes ownership of the KMessageHandler.
	* @param handler Instance of a real KMessageHandler.		* @param handler Instance of a real KMessageHandler.
	*		*
	* @warning This function isn't thread-safe. You don't want to		* @warning This function isn't thread-safe. You don't want to
	* change the message handler during the program's		* change the message handler during the program's
	* execution anyways. Do so <b>only</b> at start-up.		* execution anyways. Do so <b>only</b> at start-up.
	*/		*/
	KDECORE_EXPORT void setMessageHandler(KMessageHandler *handler);		KDECORE_EXPORT void setMessageHandler(KMessageHandler *handler);
	}		}
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kmessagebox.h		kmessagebox.h
	skipping to change at line 94		skipping to change at line 94
	// Reserved for: SSLMessageBox = 6		// Reserved for: SSLMessageBox = 6
	Sorry = 7,		Sorry = 7,
	Error = 8,		Error = 8,
	QuestionYesNoCancel = 9		QuestionYesNoCancel = 9
	};		};
	enum Option		enum Option
	{		{
	Notify = 1, ///< Emit a KNotify event		Notify = 1, ///< Emit a KNotify event
	AllowLink = 2, ///< The message may contain links.		AllowLink = 2, ///< The message may contain links.
	Dangerous = 4, ///< The action to be confirmed by the dialog is a po tentially destructive one		Dangerous = 4, ///< The action to be confirmed by the dialog is a po tentially destructive one. The default button will be set to Cancel or No, depending on which is available.
	PlainCaption = 8, ///< Do not use KApplication::makeStdCaption()		PlainCaption = 8, ///< Do not use KApplication::makeStdCaption()
	NoExec = 16 ///< Do not call exec() in createKMessageBox()		NoExec = 16 ///< Do not call exec() in createKMessageBox()
	};		};
	Q_DECLARE_FLAGS(Options,Option)		Q_DECLARE_FLAGS(Options,Option)
	/**		/**
	* Display a simple "question" dialog.		* Display a simple "question" dialog.
	*		*
	* @param parent If @p parent is 0, then the message box becomes an		* @param parent If @p parent is 0, then the message box becomes an
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	knameandurlinputdialog.h		knameandurlinputdialog.h
	skipping to change at line 74		skipping to change at line 74
	* Empty if the dialog was cancelled.		* Empty if the dialog was cancelled.
	*/		*/
	QString name() const;		QString name() const;
	/**		/**
	* @return the URL the user entered		* @return the URL the user entered
	* Empty if the dialog was cancelled.		* Empty if the dialog was cancelled.
	*/		*/
	KUrl url() const;		KUrl url() const;
	private:		private:
	Q_PRIVATE_SLOT(d, void _k_slotClear())
	Q_PRIVATE_SLOT(d, void _k_slotNameTextChanged(const QString&))		Q_PRIVATE_SLOT(d, void _k_slotNameTextChanged(const QString&))
	Q_PRIVATE_SLOT(d, void _k_slotURLTextChanged(const QString&))		Q_PRIVATE_SLOT(d, void _k_slotURLTextChanged(const QString&))
	KNameAndUrlInputDialogPrivate* const d;		KNameAndUrlInputDialogPrivate* const d;
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		0 lines changed or added

	knewfilemenu.h		knewfilemenu.h
	skipping to change at line 60		skipping to change at line 60
	* Ideas and code for the new template handling mechanism ('link' desktop f iles)		* Ideas and code for the new template handling mechanism ('link' desktop f iles)
	* from Christoph Pickart <pickart@iam.uni-bonn.de>		* from Christoph Pickart <pickart@iam.uni-bonn.de>
	* @since 4.5		* @since 4.5
	*/		*/
	class KFILE_EXPORT KNewFileMenu : public KActionMenu		class KFILE_EXPORT KNewFileMenu : public KActionMenu
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
	* @param parent the KActionCollection this KAction should be added to.		* @param collection the KActionCollection this KAction should be added to.
	* @param name action name, when adding the action to the collection		* @param name action name, when adding the action to the collection
	* @param parent the parent object, for ownership.		* @param parent the parent object, for ownership.
	* If the parent object is a widget, it will also used as parent widget		* If the parent object is a widget, it will also used as parent widget
	* for any dialogs that this class might show. Otherwise, call setParen tWidget.		* for any dialogs that this class might show. Otherwise, call setParen tWidget.
	*/		*/
	KNewFileMenu(KActionCollection* collection, const QString& name, QObjec t* parent);		KNewFileMenu(KActionCollection* collection, const QString& name, QObjec t* parent);
	/**		/**
	* Destructor.		* Destructor.
	* KNewMenu uses internally a globally shared cache, so that multiple i nstances		* KNewMenu uses internally a globally shared cache, so that multiple i nstances
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kntlm.h		kntlm.h
	skipping to change at line 23		skipping to change at line 23
	You should have received a copy of the GNU Library General Public Licens e		You should have received a copy of the GNU Library General Public Licens e
	along with this library; see the file COPYING.LIB. If not, write to		along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KNTLM_H		#ifndef KNTLM_H
	#define KNTLM_H		#define KNTLM_H
	#include <QtCore/QBool>
	#include <QtCore/QByteRef>
	#include <QtCore/QString>		#include <QtCore/QString>
			#include <QtCore/QByteArray>
	#include "kntlm_export.h"		#include "kntlm_export.h"
	/**		/**
	* @short KNTLM class implements the NTLM authentication protocol.		* @short KNTLM class implements the NTLM authentication protocol.
	*		*
	* The KNTLM class is useful for creating the authentication structures whi ch		* The KNTLM class is useful for creating the authentication structures whi ch
	* can be used for various servers which implements NTLM type authenticatio n.		* can be used for various servers which implements NTLM type authenticatio n.
	* A comprehensive description of the NTLM authentication protocol can be f ound		* A comprehensive description of the NTLM authentication protocol can be f ound
	* at http://davenport.sourceforge.net/ntlm.html		* at http://davenport.sourceforge.net/ntlm.html
	* The class also contains methods to create the LanManager and NT (MD4) ha shes		* The class also contains methods to create the LanManager and NT (MD4) ha shes
	* of a password.		* of a password.
	* This class doesn't maintain any state information, so all methods are st atic.		* This class doesn't maintain any state information, so all methods are st atic.
	*/		*/
	class KNTLM_EXPORT KNTLM {		class KNTLM_EXPORT KNTLM
			{
	public:		public:
	enum Flags {		enum Flags {
	Negotiate_Unicode = 0x00000001,		Negotiate_Unicode = 0x00000001,
	Negotiate_OEM = 0x00000002,		Negotiate_OEM = 0x00000002,
	Request_Target = 0x00000004,		Request_Target = 0x00000004,
	Negotiate_Sign = 0x00000010,		Negotiate_Sign = 0x00000010,
	Negotiate_Seal = 0x00000020,		Negotiate_Seal = 0x00000020,
	Negotiate_Datagram_Style = 0x00000040,		Negotiate_Datagram_Style = 0x00000040,
	Negotiate_LM_Key = 0x00000080,		Negotiate_LM_Key = 0x00000080,
	Negotiate_Netware = 0x00000100,		Negotiate_Netware = 0x00000100,
	Negotiate_NTLM = 0x00000200,		Negotiate_NTLM = 0x00000200,
	Negotiate_Domain_Supplied = 0x00001000,		Negotiate_Domain_Supplied = 0x00001000,
	Negotiate_WS_Supplied = 0x00002000,		Negotiate_WS_Supplied = 0x00002000,
	Negotiate_Local_Call = 0x00004000,		Negotiate_Local_Call = 0x00004000,
	Negotiate_Always_Sign = 0x00008000,		Negotiate_Always_Sign = 0x00008000,
	Target_Type_Domain = 0x00010000,		Target_Type_Domain = 0x00010000,
	Target_Type_Server = 0x00020000,		Target_Type_Server = 0x00020000,
	Target_Type_Share = 0x00040000,		Target_Type_Share = 0x00040000,
	Negotiate_NTLM2_Key = 0x00080000,		Negotiate_NTLM2_Key = 0x00080000,
	Request_Init_Response = 0x00100000,		Request_Init_Response = 0x00100000,
	Request_Accept_Response = 0x00200000,		Request_Accept_Response = 0x00200000,
	Request_NonNT_Key = 0x00400000,		Request_NonNT_Key = 0x00400000,
	Negotiate_Target_Info = 0x00800000,		Negotiate_Target_Info = 0x00800000,
	Negotiate_128 = 0x20000000,		Negotiate_128 = 0x20000000,
	Negotiate_Key_Exchange = 0x40000000,		Negotiate_Key_Exchange = 0x40000000,
	Negotiate_56 = 0x80000000		Negotiate_56 = 0x80000000
	};		};
	enum AuthFlag {		enum AuthFlag {
	Force_V1 = 0x1,		Force_V1 = 0x1,
	Force_V2 = 0x2,		Force_V2 = 0x2,
	Add_LM = 0x4		Add_LM = 0x4
	};		};
	Q_DECLARE_FLAGS( AuthFlags, AuthFlag )		Q_DECLARE_FLAGS( AuthFlags, AuthFlag )
	typedef struct		typedef struct {
	{		quint16 len;
	quint16 len;		quint16 maxlen;
	quint16 maxlen;		quint32 offset;
	quint32 offset;		} SecBuf;
	} SecBuf;
	/**		/**
	* The NTLM Type 1 structure		* The NTLM Type 1 structure
	*/		*/
	typedef struct		typedef struct {
	{		char signature[8]; /* "NTLMSSP\0" */
	char signature[8]; /* "NTLMSSP\0" */		quint32 msgType; /* 1 */
	quint32 msgType; /* 1 */		quint32 flags;
	quint32 flags;		SecBuf domain;
	SecBuf domain;		SecBuf workstation;
	SecBuf workstation;		} Negotiate;
	} Negotiate;
	/**		/**
	* The NTLM Type 2 structure		* The NTLM Type 2 structure
	*/		*/
	typedef struct		typedef struct {
	{		char signature[8];
	char signature[8];		quint32 msgType; /* 2 */
	quint32 msgType; /* 2 */		SecBuf targetName;
	SecBuf targetName;		quint32 flags;
	quint32 flags;		quint8 challengeData[8];
	quint8 challengeData[8];		quint32 context[2];
	quint32 context[2];		SecBuf targetInfo;
	SecBuf targetInfo;		} Challenge;
	} Challenge;
	/**		/**
	* The NTLM Type 3 structure		* The NTLM Type 3 structure
	*/		*/
	typedef struct		typedef struct {
	{		char signature[8];
	char signature[8];		quint32 msgType; /* 3 */
	quint32 msgType; /* 3 */		SecBuf lmResponse;
	SecBuf lmResponse;		SecBuf ntResponse;
	SecBuf ntResponse;		SecBuf domain;
	SecBuf domain;		SecBuf user;
	SecBuf user;		SecBuf workstation;
	SecBuf workstation;		SecBuf sessionKey;
	SecBuf sessionKey;		quint32 flags;
	quint32 flags;		} Auth;
	} Auth;
	typedef struct		typedef struct {
	{		quint32 signature;
	quint32 signature;		quint32 reserved;
	quint32 reserved;		quint64 timestamp;
	quint64 timestamp;		quint8 challenge[8];
	quint8 challenge[8];		quint8 unknown[4];
	quint8 unknown[4];		//Target info block - variable length
	//Target info block - variable length		} Blob;
	} Blob;
	/**		/**
	* Creates the initial message (type 1) which should be sent to the serve		* Creates the initial message (type 1) which should be sent to the ser
	r.		ver.
	*		*
	* @param negotiate - a buffer where the Type 1 message will returned.		* @param negotiate - a buffer where the Type 1 message will returned.
	* @param domain - the domain name which should be send with the message.		* @param domain - the domain name which should be send with the messag
	* @param workstation - the workstation name which should be send with th		e.
	e message.		* @param workstation - the workstation name which should be send with
	* @param flags - various flags, in most cases the defaults will good.		the message.
	*		* @param flags - various flags, in most cases the defaults will good.
	* @return true if creating the structure succeeds, false otherwise.		*
	*/		* @return true if creating the structure succeeds, false otherwise.
	static bool getNegotiate( QByteArray &negotiate, const QString &domain =		*/
	QString(),		static bool getNegotiate( QByteArray &negotiate, const QString &domain
	const QString &workstation = QString(),		= QString(),
	quint32 flags = Negotiate_Unicode | Request_Target | Negotiate_NTLM );		const QString &workstation = QString(),
	/**		quint32 flags = Negotiate_Unicode | Request_T
	* Creates the type 3 message which should be sent to the server after		arget | Negotiate_NTLM );
	* the challenge (type 2) received.		/**
	*		* Creates the type 3 message which should be sent to the server after
	* @param auth - a buffer where the Type 3 message will returned.		* the challenge (type 2) received.
	* @param challenge - the Type 2 message returned by the server.		*
	* @param user - user's name.		* @param auth - a buffer where the Type 3 message will returned.
	* @param password - user's password.		* @param challenge - the Type 2 message returned by the server.
	* @param domain - the target domain. If left empty, it will be extracted		* @param user - user's name.
	* from the challenge.		* @param password - user's password.
	* @param workstation - the user's workstation.		* @param domain - the target domain. If left empty, it will be extract
	* @param authflags - AuthFlags flags that changes the response generatio		ed
	n behavior.		* from the challenge.
	* Force_V1 or Force_V2 forces (NT)LMv1 or (NT)LMv2 responses generation,		* @param workstation - the user's workstation.
	otherwise it's		* @param authflags - AuthFlags flags that changes the response generat
	* autodetected from the challenge. Add_LM adds LMv1 or LMv2 responses ad		ion behavior.
	ditional to the		* Force_V1 or Force_V2 forces (NT)LMv1 or (NT)LMv2 responses generatio
	* NTLM response.		n, otherwise it's
	*		* autodetected from the challenge. Add_LM adds LMv1 or LMv2 responses
	* @return true if auth filled with the Type 3 message, false if an error		additional to the
	occurred		* NTLM response.
	* (challenge data invalid, NTLMv2 authentication forced, but the challen		*
	ge data says		* @return true if auth filled with the Type 3 message, false if an err
	* no NTLMv2 supported, or no NTLM supported at all, and Add_LM not speci		or occurred
	fied).		* (challenge data invalid, NTLMv2 authentication forced, but the chall
	*/		enge data says
	static bool getAuth( QByteArray &auth, const QByteArray &challenge, const		* no NTLMv2 supported, or no NTLM supported at all, and Add_LM not spe
	QString &user,		cified).
	const QString &password, const QString &domain = QString(),		*/
	const QString &workstation = QString(), AuthFlags authflags = Add_LM );		static bool getAuth( QByteArray &auth, const QByteArray &challenge, con
			st QString &user,
			const QString &password, const QString &domain = Q
			String(),
			const QString &workstation = QString(), AuthFlags
			authflags = Add_LM );
	/**		/**
	* Returns the LanManager response from the password and the server chall		* Returns the LanManager response from the password and the server cha
	enge.		llenge.
	*/		*/
	static QByteArray getLMResponse( const QString &password, const unsigned		static QByteArray getLMResponse( const QString &password, const unsigne
	char *challenge );		d char *challenge );
	/**
	* Calculates the LanManager hash of the specified password.
	*/
	static QByteArray lmHash( const QString &password );
	/**
	* Calculates the LanManager response from the LanManager hash and the se
	rver challenge.
	*/
	static QByteArray lmResponse( const QByteArray &hash, const unsigned char
	*challenge );
	/**		/**
	* Returns the NTLM response from the password and the server challenge.		* Calculates the LanManager hash of the specified password.
	*/		*/
	static QByteArray getNTLMResponse( const QString &password, const unsigne		static QByteArray lmHash( const QString &password );
	d char *challenge );
	/**
	* Returns the NTLM hash (MD4) from the password.
	*/
	static QByteArray ntlmHash( const QString &password );
	/**		/**
	* Calculates the NTLMv2 response.		* Calculates the LanManager response from the LanManager hash and the
	*/		server challenge.
	static QByteArray getNTLMv2Response( const QString &target, const QString		*/
	&user,		static QByteArray lmResponse( const QByteArray &hash, const unsigned ch
	const QString &password, const QByteArray &targetInformation,		ar *challenge );
	const unsigned char *challenge );
	/**		/**
	* Calculates the LMv2 response.		* Returns the NTLM response from the password and the server challenge
	*/		.
	static QByteArray getLMv2Response( const QString &target, const QString &		*/
	user,		static QByteArray getNTLMResponse( const QString &password, const unsig
	const QString &password, const unsigned char *challenge );		ned char *challenge );
	/**		/**
	* Returns the NTLMv2 hash.		* Returns the NTLM hash (MD4) from the password.
	*/		*/
	static QByteArray ntlmv2Hash( const QString &target, const QString &user,		static QByteArray ntlmHash( const QString &password );
	const QString &password );
	/**		/**
	* Calculates the LMv2 response.		* Calculates the NTLMv2 response.
	*/		*/
	static QByteArray lmv2Response( const QByteArray &hash,		static QByteArray getNTLMv2Response( const QString &target, const QStri
	const QByteArray &clientData, const unsigned char *challenge );		ng &user,
			const QString &password, const QBy
			teArray &targetInformation,
			const unsigned char *challenge );
			/**
			* Calculates the LMv2 response.
			*/
			static QByteArray getLMv2Response( const QString &target, const QString
			&user,
			const QString &password, const unsig
			ned char *challenge );
			/**
			* Returns the NTLMv2 hash.
			*/
			static QByteArray ntlmv2Hash( const QString &target, const QString &use
			r, const QString &password );
			/**
			* Calculates the LMv2 response.
			*/
			static QByteArray lmv2Response( const QByteArray &hash,
			const QByteArray &clientData, const uns
			igned char *challenge );
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS( KNTLM::AuthFlags )		Q_DECLARE_OPERATORS_FOR_FLAGS( KNTLM::AuthFlags )
	#endif /* KNTLM_H */		#endif /* KNTLM_H */
End of changes. 18 change blocks.
	183 lines changed or deleted		190 lines changed or added

	knumvalidator.h		knumvalidator.h
	skipping to change at line 104		skipping to change at line 104
	@obsolete Use KDoubleValidator		@obsolete Use KDoubleValidator
	Extends the QValidator class to properly validate double numeric data.		Extends the QValidator class to properly validate double numeric data.
	This can be used by QLineEdit or subclass to provide validated		This can be used by QLineEdit or subclass to provide validated
	text entry.		text entry.
	@author Glen Parker <glenebob@nwlink.com>		@author Glen Parker <glenebob@nwlink.com>
	@version 0.0.1		@version 0.0.1
	*/		*/
	class KDEUI_EXPORT KFloatValidator : public QValidator {		class KDEUI_EXPORT_DEPRECATED KFloatValidator : public QValidator {
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
	*/		*/
	explicit KFloatValidator ( QWidget * parent );		explicit KFloatValidator ( QWidget * parent );
	/**		/**
	* Constructor. Also sets the minimum and maximum values.		* Constructor. Also sets the minimum and maximum values.
	*/		*/
	KFloatValidator ( double bottom, double top, QWidget * parent );		KFloatValidator ( double bottom, double top, QWidget * parent );
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kpluginfactory.h		kpluginfactory.h
	skipping to change at line 285		skipping to change at line 285
	* if it was initialized.		* if it was initialized.
	*/		*/
	virtual ~KPluginFactory();		virtual ~KPluginFactory();
	/**		/**
	* You can use this method to get the component data of the plugin. It is filled with the		* You can use this method to get the component data of the plugin. It is filled with the
	* information given to the constructor of KPluginFactory.		* information given to the constructor of KPluginFactory.
	* The K_PLUGIN_FACTORY macros provide a static version of this method, this can be used from		* The K_PLUGIN_FACTORY macros provide a static version of this method, this can be used from
	* any place within the plugin.		* any place within the plugin.
	*		*
			* Only use this method if you specified a componentData name or instan
			ce to the factory
			* constructor or to setComponentData.
			* Otherwise you get an invalid KComponentData, which will crash if use
			d.
			*
	* \returns The KComponentData for the plugin		* \returns The KComponentData for the plugin
	*/		*/
	KComponentData componentData() const;		KComponentData componentData() const;
	/**		/**
	* Use this method to create an object. It will try to create an object which inherits		* Use this method to create an object. It will try to create an object which inherits
	* \p T. If it has multiple choices, you will get a fatal error (kFatal ()), so be careful		* \p T. If it has multiple choices, you will get a fatal error (kFatal ()), so be careful
	* to request a unique interface or use keywords.		* to request a unique interface or use keywords.
	*		*
	* \tparam T The interface for which an object should be created. The o bject will inherit \p T.		* \tparam T The interface for which an object should be created. The o bject will inherit \p T.
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	kpluginloader.h		kpluginloader.h
	skipping to change at line 81		skipping to change at line 81
	* }		* }
	* \endcode		* \endcode
	*		*
	* \see KPluginFactory		* \see KPluginFactory
	*		*
	* \author Bernhard Loos <nhuh.put@web.de>		* \author Bernhard Loos <nhuh.put@web.de>
	*/		*/
	class KDECORE_EXPORT KPluginLoader : public QPluginLoader		class KDECORE_EXPORT KPluginLoader : public QPluginLoader
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QString fileName READ fileName)		Q_PROPERTY(QString fileName READ fileName) // KDE5: REMOVE?
	Q_PROPERTY(QString pluginName READ fileName)		Q_PROPERTY(QString pluginName READ pluginName) // KDE5: REMOVE?
	public:		public:
	/**		/**
	* Used this constructor to load a plugin with a given library name. Pl ugin libraries shouldn't have a 'lib' prefix.		* Used this constructor to load a plugin with a given library name. Pl ugin libraries shouldn't have a 'lib' prefix.
	*		*
	* errorString() will be set if problems are encountered.		* errorString() will be set if problems are encountered.
	*		*
	* \param plugin The name of the plugin library.		* \param plugin The name of the plugin library.
	* \param componentdata The KStandardDirs object from componentdata is used to search the library.		* \param componentdata The KStandardDirs object from componentdata is used to search the library.
	* \param parent A parent object.		* \param parent A parent object.
	*/		*/
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	kprotocolmanager.h		kprotocolmanager.h
	skipping to change at line 243		skipping to change at line 243
	* Returns the proxy server address for a given		* Returns the proxy server address for a given
	* protocol.		* protocol.
	*		*
	* @param protocol the protocol whose proxy info is needed		* @param protocol the protocol whose proxy info is needed
	* @returns the proxy server address if one is available,		* @returns the proxy server address if one is available,
	* or QString() if not available		* or QString() if not available
	*/		*/
	static QString proxyFor( const QString& protocol );		static QString proxyFor( const QString& protocol );
	/**		/**
	* Returns the Proxy server address for a given URL		* Returns the Proxy server address for a given URL.
	* If automatic proxy configuration is configured, KPAC		*
	* is used to determine the proxy server, otherwise the return		* If the selected proxy type is @ref PACProxy or @ref WPADProxy, then a
	* value of proxyFor for the URL's protocol is used.		* helper kded module, proxyscout, is used to determine the proxy informa
	* If an empty string is returned, the request is to be aborted,		tion.
	* a return value of "DIRECT" requests a direct connection.		* Otherwise, @ref proxyFor is used to find the proxy to use for the give
			n url.
			*
			* If this function returns an empty string, then the request to a proxy
			server
			* must be denied. For a direct connection, without the use of a proxy, t
			his
			* function will return "DIRECT".
	*		*
	* @param url the URL whose proxy info is needed		* @param url the URL whose proxy info is needed
	* @returns the proxy server address if one is available		* @returns the proxy server address if one is available, otherwise a QSt
	* or QString() otherwise		ring().
	*/		*/
	static QString proxyForUrl( const KUrl& url );		static QString proxyForUrl( const KUrl& url );
	/**		/**
			* Returns all the possible proxy server addresses for @p url.
			*
			* If the selected proxy type is @ref PACProxy or @ref WPADProxy, then a
			* helper kded module, proxyscout, is used to determine the proxy informa
			tion.
			* Otherwise, @ref proxyFor is used to find the proxy to use for the give
			n url.
			*
			* If this function returns empty list, then the request is to a proxy se
			rver
			* must be denied. For a direct connection, this function will return a s
			ingle
			* entry of "DIRECT".
			*
			* @since 4.7
			*
			* @param url the URL whose proxy info is needed
			* @returns the proxy server address if one is available, otherwise an em
			pty list .
			*/
			static QStringList proxiesForUrl( const KUrl& url );
			/**
	* Marks this proxy as bad (down). It will not be used for the		* Marks this proxy as bad (down). It will not be used for the
	* next 30 minutes. (The script may supply an alternate proxy)		* next 30 minutes. (The script may supply an alternate proxy)
	* @param proxy the proxy to mark as bad (as URL)		* @param proxy the proxy to mark as bad (as URL)
	*/		*/
	static void badProxy( const QString & proxy );		static void badProxy( const QString & proxy );
	/**		/**
	* Returns the URL of the script for automatic proxy configuration.		* Returns the URL of the script for automatic proxy configuration.
	* @return the proxy configuration script		* @return the proxy configuration script
	*/		*/
	skipping to change at line 632		skipping to change at line 652
	* needs an HTTP ioslave.		* needs an HTTP ioslave.
	*		*
	* When a proxy is to be used, proxy contains the URL for the proxy.		* When a proxy is to be used, proxy contains the URL for the proxy.
	* @param url the url to check		* @param url the url to check
	* @param proxy the URL of the proxy to use		* @param proxy the URL of the proxy to use
	* @return the slave protocol (e.g. 'http'), can be null if unknown		* @return the slave protocol (e.g. 'http'), can be null if unknown
	*/		*/
	static QString slaveProtocol(const KUrl &url, QString &proxy);		static QString slaveProtocol(const KUrl &url, QString &proxy);
	/**		/**
			* Overloaded function that returns a list of all available proxy servers
			.
			*
			* @since 4.7
			*/
			static QString slaveProtocol(const KUrl &url, QStringList &proxy);
			/**
	* Return Accept-Languages header built up according to user's desktop		* Return Accept-Languages header built up according to user's desktop
	* language settings.		* language settings.
	* @return Accept-Languages header string		* @return Accept-Languages header string
	*/		*/
	static QString acceptLanguagesHeader();		static QString acceptLanguagesHeader();
	private:		private:
	friend class KIO::SlaveConfigPrivate;		friend class KIO::SlaveConfigPrivate;
	/**		/**
End of changes. 4 change blocks.
	8 lines changed or deleted		46 lines changed or added

	krecentdirs.h		krecentdirs.h
	skipping to change at line 75		skipping to change at line 75
	* @since 4.6		* @since 4.6
	*/		*/
	KIO_EXPORT QString dir(const QString &fileClass);		KIO_EXPORT QString dir(const QString &fileClass);
	/**		/**
	* Associates @p directory with @p fileClass		* Associates @p directory with @p fileClass
	*		*
	* @since 4.6		* @since 4.6
	*/		*/
	KIO_EXPORT void add(const QString &fileClass, const QString &directory) ;		KIO_EXPORT void add(const QString &fileClass, const QString &directory) ;
	};		}
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ksambashare.h		ksambashare.h
	/* This file is part of the KDE project		/* This file is part of the KDE project
	Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>		Copyright (c) 2004 Jan Schaefer <j_schaef@informatik.uni-kl.de>
			Copyright 2010 Rodrigo Belem <rclbelem@gmail.com>
	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 Library General Public		modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.		License version 2 as published by the Free Software Foundation.
	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
	Library General Public License for more details.		Library General Public License for more details.
	skipping to change at line 23		skipping to change at line 24
	You should have received a copy of the GNU Library General Public Licens e		You should have received a copy of the GNU Library General Public Licens e
	along with this library; see the file COPYING.LIB. If not, write to		along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef ksambashare_h		#ifndef ksambashare_h
	#define ksambashare_h		#define ksambashare_h
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
			class KSambaShareData;
			class KSambaSharePrivate;
	/**		/**
	* Similar functionality like KFileShare,		* This class lists Samba user shares and monitors them for addition, updat
	* but works only for Samba and do not need		e and removal.
	* any suid script.
	* Singleton class, call instance() to get an instance.		* Singleton class, call instance() to get an instance.
	*/		*/
	class KIO_EXPORT KSambaShare : public QObject		class KIO_EXPORT KSambaShare : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Returns the one and only instance of KSambaShare		* @return the one and only instance of KSambaShare.
	*/		*/
	static KSambaShare* instance();		static KSambaShare *instance();
	/**		/**
	* Whether or not the given path is shared by Samba.		* Whether or not the given path is shared by Samba.
	* @param path the path to check if it is shared by Samba.		*
	* @return whether the given path is shared by Samba.		* @param path the path to check if it is shared by Samba.
	*/		*
	bool isDirectoryShared( const QString & path ) const;		* @return whether the given path is shared by Samba.
			*/
			bool isDirectoryShared(const QString &path) const;
	/**		/**
	* Returns a list of all directories shared by Samba.		* Returns a list of all directories shared by local users in Samba.
	* The resulting list is not sorted.		* The resulting list is not sorted.
	* @return a list of all directories shared by Samba.		*
	*/		* @return a list of all directories shared by Samba.
	QStringList sharedDirectories() const;		*/
			QStringList sharedDirectories() const;
	/**		/**
	* KSambaShare destructor.		* Tests that a share name is valid and does not conflict with system u
	* Do not call!		sers names or shares.
	* The instance is destroyed automatically!		*
	*/		* @param name the share name.
	virtual ~KSambaShare();		*
			* @return whether the given name is already being used or not.
			*
			* @since 4.7
			*/
			bool isShareNameAvailable(const QString &name) const;
	/**		/**
	* Returns the path to the used smb.conf file		* Returns the list of available shares.
	* or null if no file was found		*
	*/		* @return @c a QStringList containing the user shares names.
	QString smbConfPath() const;		* @return @c an empty list if there aren't user shared directories.
			*
			* @since 4.7
			*/
			QStringList shareNames() const;
			/**
			* Returns the KSambaShareData object of the share name.
			*
			* @param name the share name.
			*
			* @return @c the KSambaShareData object that matches the name.
			* @return @c an empty KSambaShareData object if there isn't match for
			the name.
			*
			* @since 4.7
			*/
			KSambaShareData getShareByName(const QString &name) const;
			/**
			* Returns a list of KSambaShareData matching the path.
			*
			* @param path the path that wants to get KSambaShareData object.
			*
			* @return @c the QList of KSambaShareData objects that matches the pat
			h.
			* @return @c an empty QList if there aren't matches for the given path
			.
			*
			* @since 4.7
			*/
			QList<KSambaShareData> getSharesByPath(const QString &path) const;
			virtual ~KSambaShare();
			/**
			* Returns the path to the used smb.conf file
			* or empty string if no file was found
			*
			* @return @c the path to the smb.conf file
			*
			* @deprecated
			*/
			KDE_DEPRECATED QString smbConfPath() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the smb.conf file has changed		* Emitted when a share is updated, added or removed
	*/		*/
	void changed();		void changed();
	private:		private:
	KSambaShare();		KSambaShare();
	class KSambaSharePrivate;
	KSambaSharePrivate * const d;
	Q_PRIVATE_SLOT( d, void _k_slotFileChange(const QString&) )		KSambaSharePrivate * const d_ptr;
			Q_DECLARE_PRIVATE(KSambaShare)
			friend class KSambaShareData;
			Q_PRIVATE_SLOT(d_func(), void _k_slotFileChange(const QString &))
	};		};
	#endif		#endif
End of changes. 13 change blocks.
	40 lines changed or deleted		96 lines changed or added

	ksavefile.h		ksavefile.h
	skipping to change at line 108		skipping to change at line 108
	public:		public:
	/**		/**
	* Default constructor.		* Default constructor.
	*/		*/
	KSaveFile();		KSaveFile();
	/**		/**
	* Creates a new KSaveFile and sets the target file to @p filename.		* Creates a new KSaveFile and sets the target file to @p filename.
	*		*
	* @param filename the path of the file		* @param filename the path of the file
	* @param componentData The KComponentData to use for the temporary fil e.		* @param componentData unused
	*/		*/
	explicit KSaveFile(const QString &filename, const KComponentData &compo nentData = KGlobal::mainComponent());		explicit KSaveFile(const QString &filename, const KComponentData &compo nentData = KGlobal::mainComponent()); // KDE5 TODO: remove KComponentData
	/**		/**
	* Destructor.		* Destructor.
	* @note If the file has been opened but not yet finalized, the		* @note If the file has been opened but not yet finalized, the
	* destructor will call finalize(). If you do not want the target file		* destructor will call finalize(). If you do not want the target file
	* to be affected you need to call abort() before destroying the object .		* to be affected you need to call abort() before destroying the object .
	**/		**/
	virtual ~KSaveFile();		virtual ~KSaveFile();
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	kservice.h		kservice.h
	skipping to change at line 357		skipping to change at line 357
	* Such services still appear in trader queries, i.e. in		* Such services still appear in trader queries, i.e. in
	* "Open With" popup menus for instance.		* "Open With" popup menus for instance.
	*/		*/
	bool noDisplay() const;		bool noDisplay() const;
	/**		/**
	* Whether the service should be shown in KDE at all		* Whether the service should be shown in KDE at all
	* (including in context menus).		* (including in context menus).
	* @return true if the service should be shown.		* @return true if the service should be shown.
	*		*
	* KMimeTypeTrader honours this and removes such services		* KMimeTypeTrader honors this and removes such services
	* from its results.		* from its results.
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	bool showInKDE() const;		bool showInKDE() const;
	/**		/**
	* Name of the application this service belongs to.		* Name of the application this service belongs to.
	* (Useful for e.g. plugins)		* (Useful for e.g. plugins)
	* @return the parent application, or QString() if not set		* @return the parent application, or QString() if not set
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kshell.h		kshell.h
	skipping to change at line 53		skipping to change at line 53
	* Perform tilde expansion.		* Perform tilde expansion.
	* On Windows, this flag is ignored, as the Windows shell has no		* On Windows, this flag is ignored, as the Windows shell has no
	* equivalent functionality.		* equivalent functionality.
	*/		*/
	TildeExpand = 1,		TildeExpand = 1,
	/**		/**
	* Put the parser into full shell mode and bail out if a too comple x		* Put the parser into full shell mode and bail out if a too comple x
	* construct is encoutered.		* construct is encoutered.
	* A particular purpose of this flag is finding out whether the		* A particular purpose of this flag is finding out whether the
	* command line being splitted would be executable directly (via		* command line being split would be executable directly (via
	* KProcess::setProgram()) or whether it needs to be run through		* KProcess::setProgram()) or whether it needs to be run through
	* a real shell (via KProcess::setShellCommand()). Note, however,		* a real shell (via KProcess::setShellCommand()). Note, however,
	* that shell builtins are @em not recognized - you need to do that		* that shell builtins are @em not recognized - you need to do that
	* yourself (compare with a list of known commands or verify that a n		* yourself (compare with a list of known commands or verify that a n
	* executable exists for the named command).		* executable exists for the named command).
	*		*
	* Meta characters that cause a bail-out are the command separators		* Meta characters that cause a bail-out are the command separators
	* @c semicolon and @c ampersand, the redirection symbols @c less-t han,		* @c semicolon and @c ampersand, the redirection symbols @c less-t han,
	* @c greater-than and the @c pipe @c symbol and the grouping symbo ls		* @c greater-than and the @c pipe @c symbol and the grouping symbo ls
	* opening and closing @c parentheses.		* opening and closing @c parentheses.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kstringvalidator.h		kstringvalidator.h
	skipping to change at line 151		skipping to change at line 151
	* syntactically. It will e.g. not reject "foo/bar", although that		* syntactically. It will e.g. not reject "foo/bar", although that
	* particular mime type isn't yet registered. It suffices for the name		* particular mime type isn't yet registered. It suffices for the name
	* to adhere to the production		* to adhere to the production
	*		*
	* \code		* \code
	* mime-type := token "/" token ; 'token' is defined in rfc2045		* mime-type := token "/" token ; 'token' is defined in rfc2045
	* \endcode		* \endcode
	*		*
	* The fixup will simply remove all non-token characters.		* The fixup will simply remove all non-token characters.
	*		*
			* @deprecated
	* @author Marc Mutz <mutz@kde.org>		* @author Marc Mutz <mutz@kde.org>
	**/		**/
	class KDEUI_EXPORT KMimeTypeValidator : public QValidator		class KDEUI_EXPORT_DEPRECATED KMimeTypeValidator : public QValidator
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Creates a new mime type validator.		* Creates a new mime type validator.
	*/		*/
	explicit KMimeTypeValidator( QObject* parent = 0 );		explicit KMimeTypeValidator( QObject* parent = 0 );
	/**		/**
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ksvgrenderer.h		ksvgrenderer.h
	skipping to change at line 34		skipping to change at line 34
	#include <QtSvg/QSvgRenderer>		#include <QtSvg/QSvgRenderer>
	/**		/**
	* Thin wrapper around QSvgRenderer with SVGZ support.		* Thin wrapper around QSvgRenderer with SVGZ support.
	*		*
	* @deprecated At least since Qt 4.6, QSvgRenderer has built-in SVGZ suppor t,		* @deprecated At least since Qt 4.6, QSvgRenderer has built-in SVGZ suppor t,
	* so you can use QSvgRenderer instead of KSvgRenderer in new code, and		* so you can use QSvgRenderer instead of KSvgRenderer in new code, and
	* replace KSvgRenderer by QSvgRenderer in old code without any regressions .		* replace KSvgRenderer by QSvgRenderer in old code without any regressions .
	*/		*/
	class KDEUI_EXPORT KSvgRenderer : public QSvgRenderer		class KDEUI_EXPORT_DEPRECATED KSvgRenderer : public QSvgRenderer
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	KSvgRenderer(QObject *parent = 0);		KSvgRenderer(QObject *parent = 0);
	explicit KSvgRenderer(const QString &filename, QObject *parent = 0);		explicit KSvgRenderer(const QString &filename, QObject *parent = 0);
	explicit KSvgRenderer(const QByteArray &contents, QObject *parent = 0);		explicit KSvgRenderer(const QByteArray &contents, QObject *parent = 0);
	public Q_SLOTS:		public Q_SLOTS:
	bool load(const QString &filename);		bool load(const QString &filename);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ksycocatype.h		ksycocatype.h
	skipping to change at line 47		skipping to change at line 47
	/**		/**
	* \relates KSycocaFactory		* \relates KSycocaFactory
	* A KSycocaFactoryId is a code (out of the KSycocaFactoryId enum)		* A KSycocaFactoryId is a code (out of the KSycocaFactoryId enum)
	* assigned to each class type derived from KSycocaFactory.		* assigned to each class type derived from KSycocaFactory.
	* To use it, call the macro K_SYCOCAFACTORY( your_factory_id )		* To use it, call the macro K_SYCOCAFACTORY( your_factory_id )
	* at the top of your class definition.		* at the top of your class definition.
	*/		*/
	enum KSycocaFactoryId { KST_KServiceFactory = 1,		enum KSycocaFactoryId { KST_KServiceFactory = 1,
	KST_KServiceTypeFactory = 2,		KST_KServiceTypeFactory = 2,
	KST_KServiceGroupFactory = 3,		KST_KServiceGroupFactory = 3,
	KST_KImageIO = 4,		KST_KImageIO = 4, // unused, KDE5: remove
	KST_KProtocolInfoFactory = 5,		KST_KProtocolInfoFactory = 5,
	KST_KMimeTypeFactory = 6,		KST_KMimeTypeFactory = 6,
	KST_CTimeInfo = 100 };		KST_CTimeInfo = 100 };
	#define K_SYCOCAFACTORY( factory_id ) \		#define K_SYCOCAFACTORY( factory_id ) \
	public: \		public: \
	virtual KSycocaFactoryId factoryId() const { return factory_id; } \		virtual KSycocaFactoryId factoryId() const { return factory_id; } \
	private:		private:
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ktcpsocket.h		ktcpsocket.h
	skipping to change at line 260		skipping to change at line 260
	Error error() const; //### QAbstractSocket's model is strange. error() should be related to the		Error error() const; //### QAbstractSocket's model is strange. error() should be related to the
	//current state and *NOT* just report the last err or if there was one.		//current state and *NOT* just report the last err or if there was one.
	QList<KSslError> sslErrors() const; //### the errors returned can only have a subset of all		QList<KSslError> sslErrors() const; //### the errors returned can only have a subset of all
	//possible QSslError::SslError enum values depending on backend		//possible QSslError::SslError enum values depending on backend
	bool flush();		bool flush();
	bool isValid() const;		bool isValid() const;
	QHostAddress localAddress() const;		QHostAddress localAddress() const;
	QHostAddress peerAddress() const;		QHostAddress peerAddress() const;
	QString peerName() const;		QString peerName() const;
	quint16 peerPort() const;		quint16 peerPort() const;
			void setVerificationPeerName(const QString& hostName);
	#ifndef QT_NO_NETWORKPROXY		#ifndef QT_NO_NETWORKPROXY
	/**		/**
	* @see: connectToHost()		* @see: connectToHost()
	*/		*/
	QNetworkProxy proxy() const;		QNetworkProxy proxy() const;
	#endif		#endif
	qint64 readBufferSize() const; //probably hard to implement correctly		qint64 readBufferSize() const; //probably hard to implement correctly
	#ifndef QT_NO_NETWORKPROXY		#ifndef QT_NO_NETWORKPROXY
	skipping to change at line 383		skipping to change at line 384
	/**		/**
	* Default construct an instance with no useful data.		* Default construct an instance with no useful data.
	*/		*/
	KSslErrorUiData();		KSslErrorUiData();
	/**		/**
	* Create an instance and initialize it with SSL error data from @p soc ket.		* Create an instance and initialize it with SSL error data from @p soc ket.
	*/		*/
	KSslErrorUiData(const KTcpSocket *socket);		KSslErrorUiData(const KTcpSocket *socket);
	KSslErrorUiData(const KSslErrorUiData &other);		KSslErrorUiData(const KSslErrorUiData &other);
	KSslErrorUiData &operator=(const KSslErrorUiData &);		KSslErrorUiData &operator=(const KSslErrorUiData &);
			/**
			* Destructor
			* @since 4.7
			*/
			~KSslErrorUiData();
	class Private;		class Private;
	private:		private:
	friend class Private;		friend class Private;
	Private *const d;		Private *const d;
	};		};
	#endif // KTCPSOCKET_H		#endif // KTCPSOCKET_H
End of changes. 2 change blocks.
	0 lines changed or deleted		6 lines changed or added

	ktimezone.h		ktimezone.h
	skipping to change at line 322		skipping to change at line 322
	~KTimeZones();		~KTimeZones();
	/**		/**
	* Returns the time zone with the given name.		* Returns the time zone with the given name.
	*		*
	* @param name name of time zone		* @param name name of time zone
	* @return time zone, or 0 if not found		* @return time zone, or 0 if not found
	*/		*/
	KTimeZone zone(const QString &name) const;		KTimeZone zone(const QString &name) const;
			/** Map of KTimeZone instances, indexed by time zone name. */
	typedef QMap<QString, KTimeZone> ZoneMap;		typedef QMap<QString, KTimeZone> ZoneMap;
	/**		/**
	* Returns all the time zones defined in this collection.		* Returns all the time zones defined in this collection.
	*		*
	* @return time zone collection		* @return time zone collection, indexed by time zone name
	*/		*/
	const ZoneMap zones() const;		const ZoneMap zones() const;
	/**		/**
	* Adds a time zone to the collection.		* Adds a time zone to the collection.
	* The time zone's name must be unique within the collection.		* The time zone's name must be unique within the collection.
	*		*
	* @param zone time zone to add		* @param zone time zone to add
	* @return @c true if successful, @c false if zone's name duplicates on e already in the collection		* @return @c true if successful, @c false if zone's name duplicates on e already in the collection
	* @see remove()		* @see remove()
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	ktoolbar.h		ktoolbar.h
	skipping to change at line 237		skipping to change at line 237
	private:		private:
	class Private;		class Private;
	Private* const d;		Private* const d;
	Q_PRIVATE_SLOT( d, void slotAppearanceChanged() )		Q_PRIVATE_SLOT( d, void slotAppearanceChanged() )
	Q_PRIVATE_SLOT( d, void slotContextAboutToShow() )		Q_PRIVATE_SLOT( d, void slotContextAboutToShow() )
	Q_PRIVATE_SLOT( d, void slotContextAboutToHide() )		Q_PRIVATE_SLOT( d, void slotContextAboutToHide() )
	Q_PRIVATE_SLOT( d, void slotContextLeft() )		Q_PRIVATE_SLOT( d, void slotContextLeft() )
	Q_PRIVATE_SLOT( d, void slotContextRight() )		Q_PRIVATE_SLOT( d, void slotContextRight() )
			Q_PRIVATE_SLOT( d, void slotContextShowText() )
	Q_PRIVATE_SLOT( d, void slotContextTop() )		Q_PRIVATE_SLOT( d, void slotContextTop() )
	Q_PRIVATE_SLOT( d, void slotContextBottom() )		Q_PRIVATE_SLOT( d, void slotContextBottom() )
	Q_PRIVATE_SLOT( d, void slotContextIcons() )		Q_PRIVATE_SLOT( d, void slotContextIcons() )
	Q_PRIVATE_SLOT( d, void slotContextText() )		Q_PRIVATE_SLOT( d, void slotContextText() )
	Q_PRIVATE_SLOT( d, void slotContextTextRight() )		Q_PRIVATE_SLOT( d, void slotContextTextRight() )
	Q_PRIVATE_SLOT( d, void slotContextTextUnder() )		Q_PRIVATE_SLOT( d, void slotContextTextUnder() )
	Q_PRIVATE_SLOT( d, void slotContextIconSize() )		Q_PRIVATE_SLOT( d, void slotContextIconSize() )
	Q_PRIVATE_SLOT( d, void slotLockToolBars( bool ) )		Q_PRIVATE_SLOT( d, void slotLockToolBars( bool ) )
	};		};
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	kuniqueapplication.h		kuniqueapplication.h
	skipping to change at line 218		skipping to change at line 218
	/**		/**
	* Returns whether newInstance() is being called while session		* Returns whether newInstance() is being called while session
	* restoration is in progress.		* restoration is in progress.
	*/		*/
	bool restoringSession();		bool restoringSession();
	/**		/**
	* @internal		* @internal
	*/		*/
	static void setHandleAutoStarted();		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED static void setHandleAutoStarted();
			#endif
	private:		private:
	friend class KUniqueApplicationAdaptor;		friend class KUniqueApplicationAdaptor;
	class Private;		class Private;
	Private * const d;		Private * const d;
	Q_PRIVATE_SLOT(d, void _k_newInstanceNoFork())		Q_PRIVATE_SLOT(d, void _k_newInstanceNoFork())
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS(KUniqueApplication::StartFlags)		Q_DECLARE_OPERATORS_FOR_FLAGS(KUniqueApplication::StartFlags)
End of changes. 1 change blocks.
	1 lines changed or deleted		3 lines changed or added

	kurifilter.h		kurifilter.h
	skipping to change at line 43		skipping to change at line 43
	#include <QtCore/QPair>		#include <QtCore/QPair>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#ifdef Q_OS_WIN		#ifdef Q_OS_WIN
	#undef ERROR		#undef ERROR
	#endif		#endif
	class KUriFilterPrivate;		class KUriFilterPrivate;
	class KUriFilterDataPrivate;		class KUriFilterDataPrivate;
	class KCModule;		class KCModule;
			class QHostInfo;
	/**		/**
	* Class that holds information about a search provider.		* Class that holds information about a search provider.
	*		*
	* @since 4.6		* @since 4.6
	*/		*/
	class KIO_EXPORT KUriFilterSearchProvider		class KIO_EXPORT KUriFilterSearchProvider
	{		{
	public:		public:
	/**		/**
	skipping to change at line 747		skipping to change at line 748
	*/		*/
	void setSearchProviders(KUriFilterData& data, const QList<KUriFilterSea rchProvider*>& providers) const;		void setSearchProviders(KUriFilterData& data, const QList<KUriFilterSea rchProvider*>& providers) const;
	/**		/**
	* Returns the icon name for the given @p url and URI @p type.		* Returns the icon name for the given @p url and URI @p type.
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	QString iconNameFor(const KUrl& url, KUriFilterData::UriTypes type) con st;		QString iconNameFor(const KUrl& url, KUriFilterData::UriTypes type) con st;
			/**
			* Performs a DNS lookup for @p hostname and returns the result.
			*
			* This function uses the KIO/KHTML DNS cache to speed up the
			* lookup. It also avoids doing a reverse lookup if the given
			* host name is already an ip address.
			*
			* \note All uri filter plugins that need to perform a hostname
			* lookup should use this function.
			*
			* @param hostname the hostname to lookup.
			* @param timeout the amount of time in msecs to wait for the lookup
			.
			* @return the result of the host name lookup.
			*
			* @since 4.7
			*/
			QHostInfo resolveName (const QString& hostname, unsigned long timeout)
			const;
	private:		private:
	class KUriFilterPluginPrivate * const d;		class KUriFilterPluginPrivate * const d;
	};		};
	/**		/**
	* KUriFilter applies a number of filters to a URI and returns a filtered v ersion if any		* KUriFilter applies a number of filters to a URI and returns a filtered v ersion if any
	* filter matches.		* filter matches.
	* A simple example is "kde.org" to "http://www.kde.org", which is commonpl ace in web browsers.		* A simple example is "kde.org" to "http://www.kde.org", which is commonpl ace in web browsers.
	*		*
	* The filters are implemented as plugins in @ref KUriFilterPlugin subclass es.		* The filters are implemented as plugins in @ref KUriFilterPlugin subclass es.
	skipping to change at line 816		skipping to change at line 835
	*		*
	* kurisearchfilter:		* kurisearchfilter:
	* This is used for filtering KDE webshortcuts. For example "gg:KDE" will b e		* This is used for filtering KDE webshortcuts. For example "gg:KDE" will b e
	* converted to a url for searching the work "KDE" using the Google search		* converted to a url for searching the work "KDE" using the Google search
	* engine.		* engine.
	*		*
	* localdomainfilter:		* localdomainfilter:
	* This is used for doing a DNS lookup to determine whether the input is a valid		* This is used for doing a DNS lookup to determine whether the input is a valid
	* local address.		* local address.
	*		*
			* fixuphosturifilter:
			* This is used to append "www." to the host name of a pre filtered http ur
			l
			* if the original url cannot be resolved.
			*
	* \code		* \code
	* QString text ("kde.org");		* QString text ("kde.org");
	* bool filtered = KUriFilter::self()->filterUri(text, QLatin1String("kshor turifilter"));		* bool filtered = KUriFilter::self()->filterUri(text, QLatin1String("kshor turifilter"));
	* \endcode		* \endcode
	*		*
	* The above code should result in "kde.org" being filtered into "http://kd e.org".		* The above code should result in "kde.org" being filtered into "http://kd e.org".
	*		*
	* \code		* \code
	* QStringList list;		* QStringList list;
	* list << QLatin1String("kshorturifilter") << QLatin1String("localdomainfi lter");		* list << QLatin1String("kshorturifilter") << QLatin1String("localdomainfi lter");
End of changes. 3 change blocks.
	0 lines changed or deleted		26 lines changed or added

	kurlcompletion.h		kurlcompletion.h
	skipping to change at line 43		skipping to change at line 43
	/**		/**
	* This class does completion of URLs including user directories (~user)		* This class does completion of URLs including user directories (~user)
	* and environment variables. Remote URLs are passed to KIO.		* and environment variables. Remote URLs are passed to KIO.
	*		*
	* @short Completion of a single URL		* @short Completion of a single URL
	* @author David Smith <dsmith@algonet.se>		* @author David Smith <dsmith@algonet.se>
	*/		*/
	class KIO_EXPORT KUrlCompletion : public KCompletion		class KIO_EXPORT KUrlCompletion : public KCompletion
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Determines how completion is done.		* Determines how completion is done.
	* @li ExeCompletion - executables in $PATH or with full path.		* @li ExeCompletion - executables in $PATH or with full path.
	* @li FileCompletion - all files with full path or in dir(), URLs		* @li FileCompletion - all files with full path or in dir(), URLs
	* are listed using KIO.		* are listed using KIO.
	* @li DirCompletion - Same as FileCompletion but only returns direc		* @li DirCompletion - Same as FileCompletion but only returns director
	tories.		ies.
	*/		*/
	enum Mode { ExeCompletion=1, FileCompletion, DirCompletion };		enum Mode { ExeCompletion = 1, FileCompletion, DirCompletion };
	/**		/**
	* Constructs a KUrlCompletion object in FileCompletion mode.		* Constructs a KUrlCompletion object in FileCompletion mode.
	*/		*/
	KUrlCompletion();		KUrlCompletion();
	/**		/**
	* This overloaded constructor allows you to set the Mode to ExeComp		* This overloaded constructor allows you to set the Mode to ExeComplet
	letion		ion
	* or FileCompletion without using setMode. Default is FileCompletio		* or FileCompletion without using setMode. Default is FileCompletion.
	n.		*/
	*/		KUrlCompletion(Mode);
	KUrlCompletion(Mode);		/**
	/**		* Destructs the KUrlCompletion object.
	* Destructs the KUrlCompletion object.		*/
	*/		virtual ~KUrlCompletion();
	virtual ~KUrlCompletion();
	/**		/**
	* Finds completions to the given text.		* Finds completions to the given text.
	*		*
	* Remote URLs are listed with KIO. For performance reasons, local f		* Remote URLs are listed with KIO. For performance reasons, local file
	iles		s
	* are listed with KIO only if KURLCOMPLETION_LOCAL_KIO is set.		* are listed with KIO only if KURLCOMPLETION_LOCAL_KIO is set.
	* The completion is done asyncronously if KIO is used.		* The completion is done asyncronously if KIO is used.
	*		*
	* Returns the first match for user, environment, and local dir comp		* Returns the first match for user, environment, and local dir complet
	letion		ion
	* and QString() for asynchronous completion (KIO or threaded).		* and QString() for asynchronous completion (KIO or threaded).
	*		*
	* @param text the text to complete		* @param text the text to complete
	* @return the first match, or QString() if not found		* @return the first match, or QString() if not found
	*/		*/
	virtual QString makeCompletion(const QString &text); // KDE4: remove		virtual QString makeCompletion(const QString& text);
	return value, it's often null due to threading
	/**		/**
	* Sets the current directory (used as base for completion).		* Sets the current directory (used as base for completion).
	* Default = $HOME.		* Default = $HOME.
	* @param dir the current directory, either as a path or URL		* @param dir the current directory, either as a path or URL
	*/		*/
	virtual void setDir(const QString &dir);		virtual void setDir(const QString& dir);
	/**		/**
	* Returns the current directory, as it was given in setDir		* Returns the current directory, as it was given in setDir
	* @return the current directory (path or URL)		* @return the current directory (path or URL)
	*/		*/
	virtual QString dir() const;		virtual QString dir() const;
	/**		/**
	* Check whether asynchronous completion is in progress.		* Check whether asynchronous completion is in progress.
	* @return true if asynchronous completion is in progress		* @return true if asynchronous completion is in progress
	*/		*/
	virtual bool isRunning() const;		virtual bool isRunning() const;
	/**		/**
	* Stops asynchronous completion.		* Stops asynchronous completion.
	*/		*/
	virtual void stop();		virtual void stop();
	/**		/**
	* Returns the completion mode: exe or file completion (default File		* Returns the completion mode: exe or file completion (default FileCom
	Completion).		pletion).
	* @return the completion mode		* @return the completion mode
	*/		*/
	virtual Mode mode() const;		virtual Mode mode() const;
	/**		/**
	* Changes the completion mode: exe or file completion		* Changes the completion mode: exe or file completion
	* @param mode the new completion mode		* @param mode the new completion mode
	*/		*/
	virtual void setMode( Mode mode );		virtual void setMode(Mode mode);
	/**		/**
	* Checks whether environment variables are completed and		* Checks whether environment variables are completed and
	* whether they are replaced internally while finding completions.		* whether they are replaced internally while finding completions.
	* Default is enabled.		* Default is enabled.
	* @return true if environment vvariables will be replaced		* @return true if environment vvariables will be replaced
	*/		*/
	virtual bool replaceEnv() const;		virtual bool replaceEnv() const;
	/**		/**
	* Enables/disables completion and replacement (internally) of		* Enables/disables completion and replacement (internally) of
	* environment variables in URLs. Default is enabled.		* environment variables in URLs. Default is enabled.
	* @param replace true to replace environment variables		* @param replace true to replace environment variables
	*/		*/
	virtual void setReplaceEnv( bool replace );		virtual void setReplaceEnv(bool replace);
	/**		/**
	* Returns whether ~username is completed and whether ~username		* Returns whether ~username is completed and whether ~username
	* is replaced internally with the user's home directory while		* is replaced internally with the user's home directory while
	* finding completions. Default is enabled.		* finding completions. Default is enabled.
	* @return true to replace tilde with the home directory		* @return true to replace tilde with the home directory
	*/		*/
	virtual bool replaceHome() const;		virtual bool replaceHome() const;
	/**		/**
	* Enables/disables completion of ~username and replacement		* Enables/disables completion of ~username and replacement
	* (internally) of ~username with the user's home directory.		* (internally) of ~username with the user's home directory.
	* Default is enabled.		* Default is enabled.
	* @param replace true to replace tilde with the home directory		* @param replace true to replace tilde with the home directory
	*/		*/
	virtual void setReplaceHome( bool replace );		virtual void setReplaceHome(bool replace);
	/**		/**
	* Replaces username and/or environment variables, depending on the		* Replaces username and/or environment variables, depending on the
	* current settings and returns the filtered url. Only works with		* current settings and returns the filtered url. Only works with
	* local files, i.e. returns back the original string for non-local		* local files, i.e. returns back the original string for non-local
	* urls.		* urls.
	* @param text the text to process		* @param text the text to process
	* @return the path or URL resulting from this operation. If you		* @return the path or URL resulting from this operation. If you
	* want to convert it to a KUrl, use KUrl::fromPathOrUrl.		* want to convert it to a KUrl, use KUrl::fromPathOrUrl.
	*/		*/
	QString replacedPath( const QString& text ) const;		QString replacedPath(const QString& text) const;
	/**		/**
	* @internal I'll let ossi add a real one to KShell :)		* @internal I'll let ossi add a real one to KShell :)
	*/		*/
	static QString replacedPath( const QString& text,		static QString replacedPath(const QString& text,
	bool replaceHome, bool replaceEnv = tr		bool replaceHome, bool replaceEnv = true);
	ue );
	protected:		protected:
	// Called by KCompletion, adds '/' to directories		// Called by KCompletion, adds '/' to directories
	void postProcessMatch( QString *match ) const;		void postProcessMatch(QString* match) const;
	void postProcessMatches( QStringList *matches ) const;		void postProcessMatches(QStringList* matches) const;
	void postProcessMatches( KCompletionMatches* matches ) const;		void postProcessMatches(KCompletionMatches* matches) const;
	virtual void customEvent( QEvent *e );		virtual void customEvent(QEvent* e);
	private:		private:
	KUrlCompletionPrivate* const d;		KUrlCompletionPrivate* const d;
	Q_PRIVATE_SLOT( d, void _k_slotEntries( KIO::Job*, const KIO::UDSEntryL		Q_PRIVATE_SLOT(d, void _k_slotEntries (KIO::Job*, const KIO::UDSEntryLi
	ist& ) )		st&))
	Q_PRIVATE_SLOT( d, void _k_slotIOFinished( KJob* ) )		Q_PRIVATE_SLOT(d, void _k_slotIOFinished (KJob*))
	};		};
	#endif // KURLCOMPLETION_H		#endif // KURLCOMPLETION_H
End of changes. 21 change blocks.
	124 lines changed or deleted		121 lines changed or added

	kurlnavigator.h		kurlnavigator.h
	skipping to change at line 40		skipping to change at line 40
	#include <QtCore/QByteArray>		#include <QtCore/QByteArray>
	class KFilePlacesModel;		class KFilePlacesModel;
	class KUrlComboBox;		class KUrlComboBox;
	class QMouseEvent;		class QMouseEvent;
	/**		/**
	* @brief Widget that allows to navigate through the paths of an URL.		* @brief Widget that allows to navigate through the paths of an URL.
	*		*
	* The URL navigator offers two modes:		* The URL navigator offers two modes:
	* - Editable: Represents the 'classic' mode, where the URL of the loca		* - Editable: The URL of the location is editable inside an editor.
	tion		* By pressing RETURN the URL will get activated.
	* is editable inside a line editor. By pressing RETURN
	* the URL will get activated.
	* - Non editable ("breadcrumb view"): The URL of the location is represent ed by		* - Non editable ("breadcrumb view"): The URL of the location is represent ed by
	* a number of buttons, where each button represents a path		* a number of buttons, where each button represents a path
	* of the URL. By clicking on a button the path will get		* of the URL. By clicking on a button the path will get
	* activated. This mode also supports drag and drop of item s.		* activated. This mode also supports drag and drop of item s.
	*		*
	* The mode can be changed by clicking on the empty area of the URL navigat or.		* The mode can be changed by clicking on the empty area of the URL navigat or.
	* It is recommended that the application remembers the setting		* It is recommended that the application remembers the setting
	* or allows to configure the default mode (see KUrlNavigator::setUrlEditab le()).		* or allows to configure the default mode (see KUrlNavigator::setUrlEditab le()).
	*		*
	* The URL navigator remembers the URL history during navigation and allows to go		* The URL navigator remembers the URL history during navigation and allows to go
	skipping to change at line 116		skipping to change at line 115
	* KUrlNavigator::locationState()) should be done when the signal KUrlN avigator::urlChanged()		* KUrlNavigator::locationState()) should be done when the signal KUrlN avigator::urlChanged()
	* has been emitted.		* has been emitted.
	*		*
	* Example:		* Example:
	* \code		* \code
	* QByteArray state;		* QByteArray state;
	* QDataStream data(&state, QIODevice::WriteOnly);		* QDataStream data(&state, QIODevice::WriteOnly);
	* data << QPoint(x, y);		* data << QPoint(x, y);
	* data << ...;		* data << ...;
	* ...		* ...
	* urlNavigator::saveLocationState(state);		* urlNavigator->saveLocationState(state);
	* \endcode		* \endcode
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	void saveLocationState(const QByteArray& state);		void saveLocationState(const QByteArray& state);
	/**		/**
	* @return Location state given by \a historyIndex. If \a historyIndex		* @return Location state given by \a historyIndex. If \a historyIndex
	* is smaller than 0, the state of the current location is retu rned.		* is smaller than 0, the state of the current location is retu rned.
	* @see KUrlNavigator::saveLocationState()		* @see KUrlNavigator::saveLocationState()
	skipping to change at line 167		skipping to change at line 166
	*/		*/
	bool goUp();		bool goUp();
	/**		/**
	* Goes to the home URL and remembers the old URL in the history.		* Goes to the home URL and remembers the old URL in the history.
	* The signals KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::url Changed()		* The signals KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::url Changed()
	* and KUrlNavigator::historyChanged() are emitted.		* and KUrlNavigator::historyChanged() are emitted.
	*		*
	* @see KUrlNavigator::setHomeUrl()		* @see KUrlNavigator::setHomeUrl()
	*/		*/
			// KDE5: Remove the home-property. It is sufficient to invoke
			// KUrlNavigator::setLocationUrl(homeUrl) on application-side.
	void goHome();		void goHome();
	/**		/**
	* Sets the home URL used by KUrlNavigator::goHome(). If no		* Sets the home URL used by KUrlNavigator::goHome(). If no
	* home URL is set, the default home path of the user is used.		* home URL is set, the default home path of the user is used.
	* @since 4.5		* @since 4.5
	*/		*/
			// KDE5: Remove the home-property. It is sufficient to invoke
			// KUrlNavigator::setLocationUrl(homeUrl) on application-side.
	void setHomeUrl(const KUrl& url);		void setHomeUrl(const KUrl& url);
	KUrl homeUrl() const;		KUrl homeUrl() const;
	/**		/**
	* Allows to edit the URL of the navigation bar if \a editable		* Allows to edit the URL of the navigation bar if \a editable
	* is true, and sets the focus accordingly.		* is true, and sets the focus accordingly.
	* If \a editable is false, each part of		* If \a editable is false, each part of
	* the URL is presented by a button for a fast navigation ("breadcrumb view").		* the URL is presented by a button for a fast navigation ("breadcrumb view").
	*/		*/
	skipping to change at line 268		skipping to change at line 271
	/**		/**
	* @return The used editor when the navigator is in the edit mode		* @return The used editor when the navigator is in the edit mode
	* @see KUrlNavigator::setUrlEditable()		* @see KUrlNavigator::setUrlEditable()
	*/		*/
	KUrlComboBox* editor() const;		KUrlComboBox* editor() const;
	/**		/**
	* If an application supports only some special protocols, they can be set		* If an application supports only some special protocols, they can be set
	* with \a protocols .		* with \a protocols .
	*/		*/
			// KDE5: Think about removing the custom-protocols-property. It had bee
			n used
			// only by one application currently which uses a different approach no
			w.
	void setCustomProtocols(const QStringList& protocols);		void setCustomProtocols(const QStringList& protocols);
	/**		/**
	* @return The custom protocols if they are set, QStringList() otherwis e.		* @return The custom protocols if they are set, QStringList() otherwis e.
	*/		*/
	QStringList customProtocols() const;		QStringList customProtocols() const;
			#if !defined(KDE_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
	/**		/**
	* @return The current URL of the location.		* @return The current URL of the location.
	* @deprecated Use KUrlNavigator::locationUrl() instead.		* @deprecated Use KUrlNavigator::locationUrl() instead.
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED const KUrl& url() const;		KDE_DEPRECATED const KUrl& url() const;
	#endif
	/**		/**
	* @return The portion of the current URL up to the path part given		* @return The portion of the current URL up to the path part given
	* by \a index. Assuming that the current URL is /home/peter/Documents/ Music,		* by \a index. Assuming that the current URL is /home/peter/Documents/ Music,
	* then the following URLs are returned for an index:		* then the following URLs are returned for an index:
	* - index <= 0: /home		* - index <= 0: /home
	* - index is 1: /home/peter		* - index is 1: /home/peter
	* - index is 2: /home/peter/Documents		* - index is 2: /home/peter/Documents
	* - index >= 3: /home/peter/Documents/Music		* - index >= 3: /home/peter/Documents/Music
	* @deprecated It should not be necessary for a client of KUrlNavigator to query this information.		* @deprecated It should not be necessary for a client of KUrlNavigator to query this information.
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED KUrl url(int index) const;		KDE_DEPRECATED KUrl url(int index) const;
	#endif
	/**		/**
	* @return URL for the history element with the index \a historyIndex.		* @return URL for the history element with the index \a historyIndex.
	* The history index 0 represents the most recent URL.		* The history index 0 represents the most recent URL.
	* @since 4.3		* @since 4.3
	* @deprecated Use KUrlNavigator::locationUrl(historyIndex) instead.		* @deprecated Use KUrlNavigator::locationUrl(historyIndex) instead.
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED KUrl historyUrl(int historyIndex) const;		KDE_DEPRECATED KUrl historyUrl(int historyIndex) const;
	#endif
	/**		/**
	* @return The saved root URL for the current URL (see KUrlNavigator::s aveRootUrl()).		* @return The saved root URL for the current URL (see KUrlNavigator::s aveRootUrl()).
	* @deprecated Use KUrlNavigator::locationState() instead.		* @deprecated Use KUrlNavigator::locationState() instead.
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED const KUrl& savedRootUrl() const;		KDE_DEPRECATED const KUrl& savedRootUrl() const;
	#endif
	/**		/**
	* @return The saved contents position of the upper left corner		* @return The saved contents position of the upper left corner
	* for the current URL.		* for the current URL.
	* @deprecated Use KUrlNavigator::locationState() instead.		* @deprecated Use KUrlNavigator::locationState() instead.
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QPoint savedPosition() const;		KDE_DEPRECATED QPoint savedPosition() const;
	#endif
	/** @deprecated Use setHomeUrl(const KUrl& url) instead. */		/** @deprecated Use setHomeUrl(const KUrl& url) instead. */
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setHomeUrl(const QString& homeUrl);		KDE_DEPRECATED void setHomeUrl(const QString& homeUrl);
	#endif		#endif
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the location to \a url. The old URL is added to the history.		* Sets the location to \a url. The old URL is added to the history.
	* The signals KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::url Changed()		* The signals KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::url Changed()
	* and KUrlNavigator::historyChanged() are emitted. Use		* and KUrlNavigator::historyChanged() are emitted. Use
	* KUrlNavigator::locationUrl() to read the location.		* KUrlNavigator::locationUrl() to read the location.
	* @since 4.5		* @since 4.5
	*/		*/
	void setLocationUrl(const KUrl& url);		void setLocationUrl(const KUrl& url);
	/**		/**
	* Activates the URL navigator (KUrlNavigator::isActive() will return t rue)		* Activates the URL navigator (KUrlNavigator::isActive() will return t rue)
	* and emits the signal KUrlNavigator::activated().		* and emits the signal KUrlNavigator::activated().
	* @see KUrlNavigator::setActive()		* @see KUrlNavigator::setActive()
	*/		*/
	void requestActivation();		void requestActivation();
	/* @see QWidget::setFocus() */		#if !defined(DOXYGEN_SHOULD_SKIP_THIS)
			// KDE5: Remove and listen for focus-signal instead
	void setFocus();		void setFocus();
			#endif
			#if !defined(KDE_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
	/**		/**
	* Sets the location to \a url.		* Sets the location to \a url.
	* @deprecated Use KUrlNavigator::setLocationUrl(url).		* @deprecated Use KUrlNavigator::setLocationUrl(url).
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setUrl(const KUrl& url);		KDE_DEPRECATED void setUrl(const KUrl& url);
	#endif
	/**		/**
	* Saves the used root URL of the content for the current history eleme nt.		* Saves the used root URL of the content for the current history eleme nt.
	* @deprecated Use KUrlNavigator::saveLocationState() instead.		* @deprecated Use KUrlNavigator::saveLocationState() instead.
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void saveRootUrl(const KUrl& url);		KDE_DEPRECATED void saveRootUrl(const KUrl& url);
	#endif
	/**		/**
	* Saves the coordinates of the contents for the current history elemen t.		* Saves the coordinates of the contents for the current history elemen t.
	* @deprecated Use KUrlNavigator::saveLocationState() instead.		* @deprecated Use KUrlNavigator::saveLocationState() instead.
	*/		*/
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void savePosition(int x, int y);		KDE_DEPRECATED void savePosition(int x, int y);
	#endif		#endif
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Is emitted, if the URL navigator has been activated by		* Is emitted, if the URL navigator has been activated by
	* an user interaction		* an user interaction
	* @see KUrlNavigator::setActive()		* @see KUrlNavigator::setActive()
	*/		*/
	void activated();		void activated();
	skipping to change at line 429		skipping to change at line 422
	*/		*/
	void returnPressed();		void returnPressed();
	/**		/**
	* Is emitted if the URL \a url should be opened in a new tab because		* Is emitted if the URL \a url should be opened in a new tab because
	* the user clicked on a breadcrumb with the middle mouse button.		* the user clicked on a breadcrumb with the middle mouse button.
	* @since 4.5		* @since 4.5
	*/		*/
	void tabRequested(const KUrl& url);		void tabRequested(const KUrl& url);
			#if !defined(KDE_NO_DEPRECATED) && !defined(DOXYGEN_SHOULD_SKIP_THIS)
	/**		/**
	* Is emitted if the URLs \a urls have been dropped		* Is emitted if the URLs \a urls have been dropped
	* to the destination \a destination.		* to the destination \a destination.
	* @deprecated Use		* @deprecated Use
	* KUrlNavigator::urlsDropped(const KUrl& destination, QDropEvent* even t)		* KUrlNavigator::urlsDropped(const KUrl& destination, QDropEvent* even t)
	* instead.		* instead.
	*/		*/
	// KDE5: remove, as the signal has been replaced by		// KDE5: remove, as the signal has been replaced by
	// urlsDropped(const KUrl& destination, QDropEvent* event)		// urlsDropped(const KUrl& destination, QDropEvent* event)
	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void urlsDropped(const KUrl::List& urls,		KDE_DEPRECATED void urlsDropped(const KUrl::List& urls,
	const KUrl& destination);		const KUrl& destination);
	#endif		#endif
	protected:		protected:
	/*		#if !defined(DOXYGEN_SHOULD_SKIP_THIS)
			/**
	* If the Escape key is pressed, the navigation bar should switch		* If the Escape key is pressed, the navigation bar should switch
	* to the breadcrumb view.		* to the breadcrumb view.
	* @see QWidget::keyPressEvent()		* @see QWidget::keyPressEvent()
	*/		*/
	virtual void keyPressEvent(QKeyEvent* event);		virtual void keyPressEvent(QKeyEvent* event);
	/**		/**
	* Reimplemented for internal purposes		* Reimplemented for internal purposes.
	*/		*/
	virtual void keyReleaseEvent(QKeyEvent* event);		virtual void keyReleaseEvent(QKeyEvent* event);
	/*		/**
	* Paste the clipboard content as URL, if the middle mouse		* Paste the clipboard content as URL, if the middle mouse
	* button has been clicked.		* button has been clicked.
	* @see QWidget::mouseReleaseEvent()		* @see QWidget::mouseReleaseEvent()
	*/		*/
	virtual void mouseReleaseEvent(QMouseEvent* event);		virtual void mouseReleaseEvent(QMouseEvent* event);
	/* @see QWidget::resizeEvent() */
	virtual void resizeEvent(QResizeEvent* event);		virtual void resizeEvent(QResizeEvent* event);
			virtual void wheelEvent(QWheelEvent* event);
	virtual bool eventFilter(QObject* watched, QEvent* event);		virtual bool eventFilter(QObject* watched, QEvent* event);
			#endif
	private:		private:
	Q_PRIVATE_SLOT(d, void slotReturnPressed())		Q_PRIVATE_SLOT(d, void slotReturnPressed())
	Q_PRIVATE_SLOT(d, void slotProtocolChanged(const QString& protocol))		Q_PRIVATE_SLOT(d, void slotProtocolChanged(const QString& protocol))
	Q_PRIVATE_SLOT(d, void switchView())		Q_PRIVATE_SLOT(d, void switchView())
	Q_PRIVATE_SLOT(d, void dropUrls(const KUrl& destination, QDropEvent*))		Q_PRIVATE_SLOT(d, void dropUrls(const KUrl& destination, QDropEvent*))
	Q_PRIVATE_SLOT(d, void slotNavigatorButtonClicked(const KUrl& url, Qt:: MouseButton button))		Q_PRIVATE_SLOT(d, void slotNavigatorButtonClicked(const KUrl& url, Qt:: MouseButton button))
	Q_PRIVATE_SLOT(d, void openContextMenu())		Q_PRIVATE_SLOT(d, void openContextMenu())
	Q_PRIVATE_SLOT(d, void openPathSelectorMenu())		Q_PRIVATE_SLOT(d, void openPathSelectorMenu())
	Q_PRIVATE_SLOT(d, void updateButtonVisibility())		Q_PRIVATE_SLOT(d, void updateButtonVisibility())
End of changes. 33 change blocks.
	27 lines changed or deleted		24 lines changed or added

	kurlpixmapprovider.h		kurlpixmapprovider.h
	skipping to change at line 26		skipping to change at line 26
	along with this library; see the file COPYING.LIB. If not, write to		along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KURLPIXMAPPROVIDER_H		#ifndef KURLPIXMAPPROVIDER_H
	#define KURLPIXMAPPROVIDER_H		#define KURLPIXMAPPROVIDER_H
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
	#include <kpixmapprovider.h>		#include <kpixmapprovider.h>
	#include <kmimetype.h>
	/**		/**
	* Implementation of KPixmapProvider.		* Implementation of KPixmapProvider.
	*		*
	* Uses KMimeType::pixmapForURL() to resolve icons.		* Uses KMimeType::pixmapForURL() to resolve icons.
	*		*
	* Instatiate this class and supply it to the desired class, e.g.		* Instatiate this class and supply it to the desired class, e.g.
	* \code		* \code
	* KHistoryCombo *combo = new KHistoryCombo( this );		* KHistoryCombo *combo = new KHistoryCombo( this );
	* combo->setPixmapProvider( new KUrlPixmapProvider );		* combo->setPixmapProvider( new KUrlPixmapProvider );
End of changes. 1 change blocks.
	1 lines changed or deleted		0 lines changed or added

	kurlrequester.h		kurlrequester.h
	skipping to change at line 181		skipping to change at line 181
	* specify an own pixmap or a text, if you really need to.		* specify an own pixmap or a text, if you really need to.
	*/		*/
	KPushButton * button() const;		KPushButton * button() const;
	/**		/**
	* @returns the KUrlCompletion object used in the lineedit/combobox.		* @returns the KUrlCompletion object used in the lineedit/combobox.
	*/		*/
	KUrlCompletion *completionObject() const;		KUrlCompletion *completionObject() const;
	/**		/**
	* @returns an object, suitable for use with KEditListBox. It allows yo		* @returns an object, suitable for use with KEditListWidget. It allows
	u		you
	* to put this KUrlRequester into a KEditListBox.		* to put this KUrlRequester into a KEditListWidget.
	* Basically, do it like this:		* Basically, do it like this:
	* \code		* \code
	* KUrlRequester *req = new KUrlRequester( someWidget );		* KUrlRequester *req = new KUrlRequester( someWidget );
	* [...]		* [...]
	* KEditListBox *editListBox = new KEditListBox( i18n("Some Title"), re q->customEditor(), someWidget );		* KEditListWidget *editListWidget = new KEditListWidget( req->customEd itor(), someWidget );
	* \endcode		* \endcode
	*/		*/
	#ifndef KDE_NO_DEPRECATED		#ifndef KDE_NO_DEPRECATED
	const KEditListBox::CustomEditor &customEditor();		const KEditListBox::CustomEditor &customEditor();
	#else		#else
	const KEditListWidget::CustomEditor &customEditor();		const KEditListWidget::CustomEditor &customEditor();
	#endif		#endif
	/**		/**
	* @returns the message set with setClickMessage		* @returns the message set with setClickMessage
End of changes. 2 change blocks.
	4 lines changed or deleted		4 lines changed or added

	kwallet.h		kwallet.h
	skipping to change at line 498		skipping to change at line 498
	* @param handle the wallet's handle		* @param handle the wallet's handle
	*/		*/
	void walletAsyncOpened(int tId, int handle);		void walletAsyncOpened(int tId, int handle);
	/**		/**
	* @internal		* @internal
	* DBUS error slot.		* DBUS error slot.
	*/		*/
	void emitWalletAsyncOpenError();		void emitWalletAsyncOpenError();
			/**
			* @internal
			* Emits wallet opening success.
			*/
			void emitWalletOpened();
	private:		private:
	class WalletPrivate;		class WalletPrivate;
	WalletPrivate* const d;		WalletPrivate* const d;
	Q_PRIVATE_SLOT(d, void walletServiceUnregistered())		Q_PRIVATE_SLOT(d, void walletServiceUnregistered())
	protected:		protected:
	/**		/**
	* @internal		* @internal
	*/		*/
	virtual void virtual_hook(int id, void *data);		virtual void virtual_hook(int id, void *data);
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	kwebpage.h		kwebpage.h
	skipping to change at line 36		skipping to change at line 36
	#define KWEBPAGE_H		#define KWEBPAGE_H
	#include <kdewebkit_export.h>		#include <kdewebkit_export.h>
	#include <QtWebKit/QWebPage>		#include <QtWebKit/QWebPage>
	class KWebWallet;		class KWebWallet;
	class KUrl;		class KUrl;
	class KJob;		class KJob;
			namespace KIO {
			class MetaData;
			}
	/**		/**
	* @short An enhanced QWebPage that provides integration into the KDE envir onment.		* @short An enhanced QWebPage that provides integration into the KDE envir onment.
	*		*
	* This is a convenience class that provides full integration with KDE		* This is a convenience class that provides full integration with KDE
	* technologies such as KIO for network request handling, KCookiejar for co okie		* technologies such as KIO for network request handling, KCookiejar for co okie
	* handling, KParts for embedding non-html content and KWallet for storing		* handling, KParts for embedding non-html content and KWallet for storing
	* form data. It also sets standard icons for many of the actions provided by		* form data. It also sets standard icons for many of the actions provided by
	* QWebPage.		* QWebPage.
	*		*
	* Most of this integration happens behind the scenes. If you want KWallet		* Most of this integration happens behind the scenes. If you want KWallet
	* integration, however, you will have to provide a mechanism for deciding		* integration, however, you will have to provide a mechanism for deciding
	* whether to allow form data to be stored. To do this, you will need to		* whether to allow form data to be stored. To do this, you will need to
	* connect to the KWebWallet::saveFormDataRequested signal and call either		* connect to the KWebWallet::saveFormDataRequested signal and call either
	* KWebWallet::acceptSaveFormDataRequest or		* KWebWallet::acceptSaveFormDataRequest or
	* KWebWallet::rejectSaveFormDataRequest, typically after asking the user		* KWebWallet::rejectSaveFormDataRequest, typically after asking the user
	* whether they want to save the form data. If you do not do this, no form		* whether they want to save the form data. If you do not do this, no form
	* data will be saved.		* data will be saved.
	*		*
	* KWebPage will also not automatically load form data for you. You should		* KWebPage will also not automatically load form data for you. You should
	* connect to QWebPage::loadFinished and, if the page was loaded sucessfull y,		* connect to QWebPage::loadFinished and, if the page was loaded successful ly,
	* call		* call
	* @code		* @code
	* page->wallet()->fillFormData(page->mainFrame());		* page->wallet()->fillFormData(page->mainFrame());
	* @endcode		* @endcode
	*		*
	* @see KIO::Integration		* @see KIO::Integration
	* @see KWebWallet		* @see KWebWallet
	*		*
	* @author Urs Wolfer <uwolfer @ kde.org>		* @author Urs Wolfer <uwolfer @ kde.org>
	* @author Dawit Alemayehu <adawit @ kde.org>		* @author Dawit Alemayehu <adawit @ kde.org>
	skipping to change at line 328		skipping to change at line 332
	*		*
	* If you do override acceptNavigationRequest and call this method,		* If you do override acceptNavigationRequest and call this method,
	* however, be aware of the effect of the page's		* however, be aware of the effect of the page's
	* linkDelegationPolicy on how * QWebPage::acceptNavigationRequest		* linkDelegationPolicy on how * QWebPage::acceptNavigationRequest
	* behaves.		* behaves.
	*		*
	* @see QWebPage::acceptNavigationRequest		* @see QWebPage::acceptNavigationRequest
	*/		*/
	virtual bool acceptNavigationRequest(QWebFrame * frame, const QNetworkR equest & request, NavigationType type);		virtual bool acceptNavigationRequest(QWebFrame * frame, const QNetworkR equest & request, NavigationType type);
			/**
			* Attempts to handle @ref reply and returns true on success, false oth
			erwise.
			*
			* @param reply the QNetworkReply object to be handled.
			* @param contentType if not null, it will be set to the content-type
			specified in @p reply, if any.
			* @param metaData if not null, it will be set to the KIO meta-data
			specified in @p reply, if any.
			* @since 4.6.3
			*/
			bool handleReply (QNetworkReply* reply, QString* contentType = 0, KIO::
			MetaData* metaData = 0);
	private:		private:
	class KWebPagePrivate;		class KWebPagePrivate;
	KWebPagePrivate* const d;		KWebPagePrivate* const d;
	Q_PRIVATE_SLOT(d, void _k_copyResultToTempFile(KJob *))		Q_PRIVATE_SLOT(d, void _k_copyResultToTempFile(KJob *))
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS(KWebPage::Integration)		Q_DECLARE_OPERATORS_FOR_FLAGS(KWebPage::Integration)
	#endif // KWEBPAGE_H		#endif // KWEBPAGE_H
End of changes. 3 change blocks.
	1 lines changed or deleted		19 lines changed or added

	kwebpluginfactory.h		kwebpluginfactory.h
	skipping to change at line 81		skipping to change at line 81
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWebPluginFactory::plugins		* @see QWebPluginFactory::plugins
	* @internal		* @internal
	*/		*/
	virtual QList<Plugin> plugins() const;		virtual QList<Plugin> plugins() const;
	private:		private:
	class KWebPluginFactoryPrivate;		class KWebPluginFactoryPrivate;
	KWebPluginFactoryPrivate* const d;		KWebPluginFactoryPrivate* const d;
	Q_PRIVATE_SLOT(d, void _k_slotMimeType(KIO::Job *, const QString &))
	};		};
	#endif // KWEBPLUGINFACTORY_H		#endif // KWEBPLUGINFACTORY_H
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	kwebwallet.h		kwebwallet.h
	skipping to change at line 49		skipping to change at line 49
	/**		/**
	* @short A class that provides KDE wallet integration for QWebFrame.		* @short A class that provides KDE wallet integration for QWebFrame.
	*		*
	* Normally, you will use this class via KWebPage. In this case, you need to		* Normally, you will use this class via KWebPage. In this case, you need to
	* connect to the saveFormDataRequested signal and call either		* connect to the saveFormDataRequested signal and call either
	* acceptSaveFormDataRequest or rejectSaveFormDataRequest, typically after		* acceptSaveFormDataRequest or rejectSaveFormDataRequest, typically after
	* asking the user whether they want to save the form data.		* asking the user whether they want to save the form data.
	*		*
	* You will also need to call fillFormData when a QWebFrame has finished		* You will also need to call fillFormData when a QWebFrame has finished
	* loading. To do this, connect to QWebPage::loadFinished and, if the page was		* loading. To do this, connect to QWebPage::loadFinished and, if the page was
	* loaded sucessfully, call		* loaded successfully, call
	* @code		* @code
	* page->wallet()->fillFormData(page->mainFrame());		* page->wallet()->fillFormData(page->mainFrame());
	* @endcode		* @endcode
	*		*
	* If you wish to use this directly with a subclass of QWebPage, you should call		* If you wish to use this directly with a subclass of QWebPage, you should call
	* saveFormData from QWebPage::acceptNavigationRequest when a user submits a		* saveFormData from QWebPage::acceptNavigationRequest when a user submits a
	* form.		* form.
	*		*
	* @see KWebPage		* @see KWebPage
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kwidgetitemdelegate.h		kwidgetitemdelegate.h
	skipping to change at line 90		skipping to change at line 90
	protected:		protected:
	/**		/**
	* Creates the list of widgets needed for an item.		* Creates the list of widgets needed for an item.
	*		*
	* @note No initialization of the widgets is supposed to happen here.		* @note No initialization of the widgets is supposed to happen here.
	* The widgets will be initialized based on needs for a given ite m.		* The widgets will be initialized based on needs for a given ite m.
	*		*
	* @note If you want to connect some widget signals to any slot, you sh ould		* @note If you want to connect some widget signals to any slot, you sh ould
	* do it here.		* do it here.
	*		*
			* @note If you want to know the index for which you are creating widge
			ts, it is
			* available as a QModelIndex Q_PROPERTY called "goya:creatingWid
			getsForIndex".
			* Ensure to add Q_DECLARE_METATYPE(QModelIndex) before your meth
			od definition
			* to tell QVariant about QModelIndex.
			*
	* @return the list of newly created widgets which will be used to inte ract with an item.		* @return the list of newly created widgets which will be used to inte ract with an item.
	* @see updateItemWidgets()		* @see updateItemWidgets()
	*/		*/
	virtual QList<QWidget*> createItemWidgets() const = 0;		virtual QList<QWidget*> createItemWidgets() const = 0;
	/**		/**
	* Updates a list of widgets for its use inside of the delegate (painti ng or		* Updates a list of widgets for its use inside of the delegate (painti ng or
	* event handling).		* event handling).
	*		*
	* @note All the positioning and sizing should be done in item coordina tes.		* @note All the positioning and sizing should be done in item coordina tes.
	skipping to change at line 157		skipping to change at line 162
	*/		*/
	QList<QEvent::Type> blockedEventTypes(QWidget *widget) const;		QList<QEvent::Type> blockedEventTypes(QWidget *widget) const;
	private:		private:
	//@cond PRIVATE		//@cond PRIVATE
	friend class KWidgetItemDelegatePool;		friend class KWidgetItemDelegatePool;
	friend class KWidgetItemDelegateEventListener;		friend class KWidgetItemDelegateEventListener;
	KWidgetItemDelegatePrivate *const d;		KWidgetItemDelegatePrivate *const d;
	Q_PRIVATE_SLOT(d, void _k_slotRowsInserted(const QModelIndex&,int,int))		Q_PRIVATE_SLOT(d, void _k_slotRowsInserted(const QModelIndex&,int,int))
	Q_PRIVATE_SLOT(d, void _k_slotRowsAboutToBeRemoved(const QModelIndex&,i nt,int))		Q_PRIVATE_SLOT(d, void _k_slotRowsAboutToBeRemoved(const QModelIndex&,i nt,int))
			Q_PRIVATE_SLOT(d, void _k_slotRowsRemoved(const QModelIndex&,int,int))
	Q_PRIVATE_SLOT(d, void _k_slotDataChanged(const QModelIndex&,const QMod elIndex&))		Q_PRIVATE_SLOT(d, void _k_slotDataChanged(const QModelIndex&,const QMod elIndex&))
	Q_PRIVATE_SLOT(d, void _k_slotLayoutChanged())		Q_PRIVATE_SLOT(d, void _k_slotLayoutChanged())
	Q_PRIVATE_SLOT(d, void _k_slotModelReset())		Q_PRIVATE_SLOT(d, void _k_slotModelReset())
	//@endcond		//@endcond
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		9 lines changed or added

	kwindowsystem.h		kwindowsystem.h
	skipping to change at line 498		skipping to change at line 498
	*		*
	* This is mostly used on Windows, where windows are not allowed to be raised		* This is mostly used on Windows, where windows are not allowed to be raised
	* and activated if their process is not the foreground one, but it may also		* and activated if their process is not the foreground one, but it may also
	* apply to other window managers.		* apply to other window managers.
	*		*
	* @param pid if specified, the grant only applies to windows belonging to the		* @param pid if specified, the grant only applies to windows belonging to the
	* specific process. By default, a value of -1 means all pro cesses.		* specific process. By default, a value of -1 means all pro cesses.
	*/		*/
	static void allowExternalProcessWindowActivation( int pid = -1 );		static void allowExternalProcessWindowActivation( int pid = -1 );
			/**
			* Sets whether the client wishes to block compositing (for better perf
			ormance)
			* @since 4.7
			*/
			static void setBlockingCompositing( WId window, bool active );
	#ifdef Q_WS_X11		#ifdef Q_WS_X11
	/**		/**
	* @internal		* @internal
	* Returns true if viewports are mapped to virtual desktops.		* Returns true if viewports are mapped to virtual desktops.
	*/		*/
	static bool mapViewport();		static bool mapViewport();
	/**		/**
	* @internal		* @internal
	* Returns mapped virtual desktop for the given position in the viewpor t.		* Returns mapped virtual desktop for the given position in the viewpor t.
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		7 lines changed or added

	label.h		label.h
	skipping to change at line 58		skipping to change at line 58
	Q_PROPERTY(bool hasScaledContents READ hasScaledContents WRITE setScale dContents)		Q_PROPERTY(bool hasScaledContents READ hasScaledContents WRITE setScale dContents)
	Q_PROPERTY(bool textSelectable READ textSelectable WRITE setTextSelecta ble)		Q_PROPERTY(bool textSelectable READ textSelectable WRITE setTextSelecta ble)
	Q_PROPERTY(bool wordWrap READ wordWrap WRITE setWordWrap)		Q_PROPERTY(bool wordWrap READ wordWrap WRITE setWordWrap)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QLabel *nativeWidget READ nativeWidget)		Q_PROPERTY(QLabel *nativeWidget READ nativeWidget)
	public:		public:
	/**		/**
	* Constructs a label with word wrap on by default		* Constructs a label with word wrap on by default
	*		*
	* @arg parent the parent of this widget		* @param parent the parent of this widget
	*/		*/
	explicit Label(QGraphicsWidget *parent = 0);		explicit Label(QGraphicsWidget *parent = 0);
	~Label();		~Label();
	/**		/**
	* Sets the display text for this Label		* Sets the display text for this Label
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @param path the path to the image; if a relative path, then a themed image will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
	* Sets the alignment for the text		* Sets the alignment for the text
	*		*
	* @arg the desired alignment		* @param the desired alignment
	*/		*/
	void setAlignment(Qt::Alignment alignment);		void setAlignment(Qt::Alignment alignment);
	/**		/**
	* @return the alignment for the text used in the labels		* @return the alignment for the text used in the labels
	*/		*/
	Qt::Alignment alignment() const;		Qt::Alignment alignment() const;
	/**		/**
	* Scale or not the contents of the label to the label size		* Scale or not the contents of the label to the label size
	*		*
	* @arg scale		* @param scale
	*/		*/
	void setScaledContents(bool scaled);		void setScaledContents(bool scaled);
	/**		/**
	* @return true if the contents are scaled to the label size		* @return true if the contents are scaled to the label size
	*/		*/
	bool hasScaledContents() const;		bool hasScaledContents() const;
	/**		/**
	* Set if the text on the label can be selected with the mouse		* Set if the text on the label can be selected with the mouse
	*		*
	* @arg enable true if we want to manage text selection with the mouse		* @param enable true if we want to manage text selection with the mous e
	* @since 4.4		* @since 4.4
	*/		*/
	void setTextSelectable(bool enable);		void setTextSelectable(bool enable);
	/**		/**
	* @return true if the text is selectable with the mouse		* @return true if the text is selectable with the mouse
	* @since 4.4		* @since 4.4
	*/		*/
	bool textSelectable() const;		bool textSelectable() const;
	/**		/**
	* Sets if the text of the label can wrap in multiple lines		* Sets if the text of the label can wrap in multiple lines
	*		*
	* @arg wrap multiple lines or not		* @param wrap multiple lines or not
	* @since 4.5		* @since 4.5
	*/		*/
	void setWordWrap(bool wrap);		void setWordWrap(bool wrap);
	/**		/**
	* @return true if the label text can wrap in multiple lines if too lon g		* @return true if the label text can wrap in multiple lines if too lon g
	* @since 4.5		* @since 4.5
	*/		*/
	bool wordWrap() const;		bool wordWrap() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Label		* Sets the stylesheet used to control the visual display of this Label
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this Label		* @return the native widget wrapped by this Label
End of changes. 8 change blocks.
	8 lines changed or deleted		8 lines changed or added

	lineedit.h		lineedit.h
	skipping to change at line 44		skipping to change at line 44
	/**		/**
	* @class LineEdit plasma/widgets/lineedit.h <Plasma/Widgets/LineEdit>		* @class LineEdit plasma/widgets/lineedit.h <Plasma/Widgets/LineEdit>
	*		*
	* @short Provides a plasma-themed KLineEdit.		* @short Provides a plasma-themed KLineEdit.
	*/		*/
	class PLASMA_EXPORT LineEdit : public QGraphicsProxyWidget		class PLASMA_EXPORT LineEdit : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText NOTIFY textEdited)		Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
	Q_PROPERTY(bool clearButtonShown READ isClearButtonShown WRITE setClear ButtonShown)		Q_PROPERTY(bool clearButtonShown READ isClearButtonShown WRITE setClear ButtonShown)
	Q_PROPERTY(QString clickMessage READ clickMessage WRITE setClickMessage )		Q_PROPERTY(QString clickMessage READ clickMessage WRITE setClickMessage )
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KLineEdit *nativeWidget READ nativeWidget WRITE setNativeWid get)		Q_PROPERTY(KLineEdit *nativeWidget READ nativeWidget WRITE setNativeWid get)
	public:		public:
	explicit LineEdit(QGraphicsWidget *parent = 0);		explicit LineEdit(QGraphicsWidget *parent = 0);
	~LineEdit();		~LineEdit();
	/**		/**
	* Sets the display text for this LineEdit		* Sets the display text for this LineEdit
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Shows a button to clear the text		* Shows a button to clear the text
	skipping to change at line 95		skipping to change at line 95
	/**		/**
	* @return the text of a greyed out message that will go away when clic ked		* @return the text of a greyed out message that will go away when clic ked
	* @since 4.5		* @since 4.5
	*/		*/
	QString clickMessage() const;		QString clickMessage() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this LineE dit		* Sets the stylesheet used to control the visual display of this LineE dit
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* Sets the line edit wrapped by this LineEdit (widget must inherit KLi neEdit), ownership is transferred to the LineEdit		* Sets the line edit wrapped by this LineEdit (widget must inherit KLi neEdit), ownership is transferred to the LineEdit
	*		*
	* @arg text edit that will be wrapped by this LineEdit		* @param nativeWidget line edit that will be wrapped by this LineEdit
	* @since KDE4.4		* @since KDE4.4
	*/		*/
	void setNativeWidget(KLineEdit *nativeWidget);		void setNativeWidget(KLineEdit *nativeWidget);
	/**		/**
	* @return the native widget wrapped by this LineEdit		* @return the native widget wrapped by this LineEdit
	*/		*/
	KLineEdit *nativeWidget() const;		KLineEdit *nativeWidget() const;
	protected:		protected:
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	metainfojob.h		metainfojob.h
	skipping to change at line 113		skipping to change at line 113
	private:		private:
	Q_DECLARE_PRIVATE(MetaInfoJob)		Q_DECLARE_PRIVATE(MetaInfoJob)
	};		};
	/**		/**
	* Retrieves meta information for the given items.		* Retrieves meta information for the given items.
	*		*
	* @param items files to get metainfo for		* @param items files to get metainfo for
	* @return the MetaInfoJob to retrieve the items		* @return the MetaInfoJob to retrieve the items
			* @deprecated use strigi or KFileMetaInfo
	*/		*/
	KIO_EXPORT MetaInfoJob* fileMetaInfo(const KFileItemList& items);		KIO_EXPORT_DEPRECATED MetaInfoJob* fileMetaInfo(const KFileItemList& it ems);
	/**		/**
	* Retrieves meta information for the given items.		* Retrieves meta information for the given items.
	*		*
	* @param items files to get metainfo for		* @param items files to get metainfo for
	* @return the MetaInfoJob to retrieve the items		* @return the MetaInfoJob to retrieve the items
			* @deprecated use strigi or KFileMetaInfo
	*/		*/
	KIO_EXPORT MetaInfoJob* fileMetaInfo(const KUrl::List& items);		KIO_EXPORT_DEPRECATED MetaInfoJob* fileMetaInfo(const KUrl::List& items );
	}		}
	#endif		#endif
End of changes. 4 change blocks.
	2 lines changed or deleted		4 lines changed or added

	meter.h		meter.h
	skipping to change at line 60		skipping to change at line 60
	*		*
	* @author Petri Damstén		* @author Petri Damstén
	*/		*/
	class PLASMA_EXPORT Meter : public QGraphicsWidget		class PLASMA_EXPORT Meter : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(MeterType)		Q_ENUMS(MeterType)
	Q_PROPERTY(int minimum READ minimum WRITE setMinimum)		Q_PROPERTY(int minimum READ minimum WRITE setMinimum)
	Q_PROPERTY(int maximum READ maximum WRITE setMaximum)		Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
	Q_PROPERTY(int value READ value WRITE setValue)		Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
	Q_PROPERTY(QString svg READ svg WRITE setSvg)		Q_PROPERTY(QString svg READ svg WRITE setSvg)
	Q_PROPERTY(MeterType meterType READ meterType WRITE setMeterType)		Q_PROPERTY(MeterType meterType READ meterType WRITE setMeterType)
	public:		public:
	/**		/**
	* Meter types enum		* Meter types enum
	*/		*/
	enum MeterType {		enum MeterType {
	/** Horizontal bar meter (like thermometer). */		/** Horizontal bar meter (like thermometer). */
	BarMeterHorizontal,		BarMeterHorizontal,
	skipping to change at line 204		skipping to change at line 204
	/**		/**
	* Set minimum value for the meter		* Set minimum value for the meter
	*/		*/
	void setMinimum(int minimum);		void setMinimum(int minimum);
	/**		/**
	* Set value for the meter		* Set value for the meter
	*/		*/
	void setValue(int value);		void setValue(int value);
			Q_SIGNALS:
			/**
			* This signal is sent when the value of the meter changes programmatic
			ally.
			* The meter's value is passed.
			*/
			void valueChanged(const int &value);
	protected:		protected:
	/**		/**
	* Reimplemented from Plasma::Widget		* Reimplemented from Plasma::Widget
	*/		*/
	virtual void paint(QPainter *p,		virtual void paint(QPainter *p,
	const QStyleOptionGraphicsItem *option,		const QStyleOptionGraphicsItem *option,
	QWidget *widget = 0);		QWidget *widget = 0);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF() ) const;		QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF() ) const;
	private:		private:
End of changes. 2 change blocks.
	1 lines changed or deleted		9 lines changed or added

	netwm.h		netwm.h
	skipping to change at line 1275		skipping to change at line 1275
	const char* clientMachine() const;		const char* clientMachine() const;
	/**		/**
	* returns a comma-separated list of the activities the window is assoc iated with.		* returns a comma-separated list of the activities the window is assoc iated with.
	* FIXME this might be better as a NETRArray ?		* FIXME this might be better as a NETRArray ?
	* @since 4.6		* @since 4.6
	*/		*/
	const char* activities() const;		const char* activities() const;
	/**		/**
			* Sets whether the client wishes to block compositing (for better perf
			ormance)
			* @since 4.7
			*/
			void setBlockingCompositing(bool active);
			/**
			* Returns whether the client wishes to block compositing (for better p
			erformance)
			* @since 4.7
			*/
			bool isBlockingCompositing() const;
			/**
	Places the window frame geometry in frame, and the application windo w		Places the window frame geometry in frame, and the application windo w
	geometry in window. Both geometries are relative to the root window .		geometry in window. Both geometries are relative to the root window .
	@param frame the geometry for the frame		@param frame the geometry for the frame
	@param window the geometry for the window		@param window the geometry for the window
	**/		**/
	void kdeGeometry(NETRect &frame, NETRect &window);		void kdeGeometry(NETRect &frame, NETRect &window);
	/**		/**
End of changes. 1 change blocks.
	0 lines changed or deleted		14 lines changed or added

	netwm_def.h		netwm_def.h
	skipping to change at line 689		skipping to change at line 689
	WM2KDETemporaryRules = 1<<9, // NOT STANDARD		WM2KDETemporaryRules = 1<<9, // NOT STANDARD
	WM2WindowClass = 1<<10,		WM2WindowClass = 1<<10,
	WM2WindowRole = 1<<11,		WM2WindowRole = 1<<11,
	WM2ClientMachine = 1<<12,		WM2ClientMachine = 1<<12,
	WM2ShowingDesktop = 1<<13,		WM2ShowingDesktop = 1<<13,
	WM2Opacity = 1<<14,		WM2Opacity = 1<<14,
	WM2DesktopLayout = 1<<15,		WM2DesktopLayout = 1<<15,
	WM2FullPlacement = 1<<16,		WM2FullPlacement = 1<<16,
	WM2FullscreenMonitors = 1<<17,		WM2FullscreenMonitors = 1<<17,
	WM2FrameOverlap = 1<<18, // NOT STANDARD		WM2FrameOverlap = 1<<18, // NOT STANDARD
	WM2Activities = 1<<19 // NOT STANDARD @since 4.6		WM2Activities = 1<<19, // NOT STANDARD @since 4.6
			WM2BlockCompositing = 1<<20, // NOT STANDARD @since 4.7
			WM2KDEShadow = 1<<21 // NOT Standard @since 4.7
	};		};
	/**		/**
	Sentinel value to indicate that the client wishes to be visible on		Sentinel value to indicate that the client wishes to be visible on
	all desktops.		all desktops.
	**/		**/
	enum { OnAllDesktops = -1 };		enum { OnAllDesktops = -1 };
	/**		/**
	Source of the request.		Source of the request.
End of changes. 1 change blocks.
	1 lines changed or deleted		3 lines changed or added

	package.h		package.h
	skipping to change at line 54		skipping to change at line 54
	public:		public:
	/**		/**
	* Default constructor that creates an invalid Package		* Default constructor that creates an invalid Package
	* @since 4.6		* @since 4.6
	*/		*/
	explicit Package();		explicit Package();
	/**		/**
	* Construct a Package object		* Construct a Package object
	*		*
	* @arg packageRoot path to the package installation root		* @param packageRoot path to the package installation root
	* @arg package the name of the package		* @param package the name of the package
	* @arg structure the package structure describing this package		* @param structure the package structure describing this package
	**/		**/
	Package(const QString &packageRoot, const QString &package,		Package(const QString &packageRoot, const QString &package,
	PackageStructure::Ptr structure);		PackageStructure::Ptr structure);
	/**		/**
	* Construct a Package object.		* Construct a Package object.
	*		*
	* @arg packagePath full path to the package directory		* @param packagePath full path to the package directory
	* @arg structure the package structure describing this package		* @param structure the package structure describing this package
	*/		*/
	Package(const QString &packagePath, PackageStructure::Ptr structure );		Package(const QString &packagePath, PackageStructure::Ptr structure );
	/**		/**
	* Copy constructore		* Copy constructore
	* @since 4.6		* @since 4.6
	*/		*/
	Package(const Package &other);		Package(const Package &other);
	~Package();		~Package();
	skipping to change at line 92		skipping to change at line 92
	/**		/**
	* @return true if all the required components as defined in		* @return true if all the required components as defined in
	* the PackageStructure exist		* the PackageStructure exist
	**/		**/
	bool isValid() const;		bool isValid() const;
	/**		/**
	* Get the path to a given file.		* Get the path to a given file.
	*		*
	* @arg fileType the type of file to look for, as defined in the		* @param fileType the type of file to look for, as defined in the
	* package structure		* package structure
	* @arg filename the name of the file		* @param filename the name of the file
	* @return path to the file on disk. QString() if not found.		* @return path to the file on disk. QString() if not found.
	**/		**/
	QString filePath(const char *fileType, const QString &filename) con st;		QString filePath(const char *fileType, const QString &filename) con st;
	/**		/**
	* Get the path to a given file.		* Get the path to a given file.
	*		*
	* @arg fileType the type of file to look for, as defined in the		* @param fileType the type of file to look for, as defined in the
	* package structure. The type must refer to a file		* package structure. The type must refer to a file
	* in the package structure and not a directory.		* in the package structure and not a directory.
	* @return path to the file on disk. QString() if not found		* @return path to the file on disk. QString() if not found
	**/		**/
	QString filePath(const char *fileType) const;		QString filePath(const char *fileType) const;
	/**		/**
	* Get the list of files of a given type.		* Get the list of files of a given type.
	*		*
	* @arg fileType the type of file to look for, as defined in the		* @param fileType the type of file to look for, as defined in the
	* package structure.		* package structure.
	* @return list of files by name, suitable for passing to filePath		* @return list of files by name, suitable for passing to filePath
	**/		**/
	QStringList entryList(const char *fileType) const;		QStringList entryList(const char *fileType) const;
	/**		/**
	* @return the package metadata object.		* @return the package metadata object.
	*/		*/
	PackageMetadata metadata() const;		PackageMetadata metadata() const;
	/**		/**
	* Sets the path to the root of this package		* Sets the path to the root of this package
	* @arg path and absolute path		* @param path and absolute path
	* @since 4.3		* @since 4.3
	*/		*/
	void setPath(const QString &path);		void setPath(const QString &path);
	/**		/**
	* Publish this package on the network.		* Publish this package on the network.
	* @param methods the ways to announce this package on the network.		* @param methods the ways to announce this package on the network.
	*/		*/
	void publish(AnnouncementMethods methods, const QString &name);		void publish(AnnouncementMethods methods, const QString &name);
	skipping to change at line 213		skipping to change at line 213
	* with unrelated services (eg: "plasma-applet -")		* with unrelated services (eg: "plasma-applet -")
	* @return true on successful uninstallation, false otherwise		* @return true on successful uninstallation, false otherwise
	**/		**/
	static bool uninstallPackage(const QString &package,		static bool uninstallPackage(const QString &package,
	const QString &packageRoot,		const QString &packageRoot,
	const QString &servicePrefix);		const QString &servicePrefix);
	/**		/**
	* Registers a package described by the given desktop file		* Registers a package described by the given desktop file
	*		*
	* @arg the full path to the desktop file (must be KPluginInfo comp atible)		* @param the full path to the desktop file (must be KPluginInfo co mpatible)
	* @return true on success, false on failure		* @return true on success, false on failure
	*/		*/
	static bool registerPackage(const PackageMetadata &data, const QStr ing &iconPath);		static bool registerPackage(const PackageMetadata &data, const QStr ing &iconPath);
	/**		/**
	* Creates a package based on the metadata from the files contained		* Creates a package based on the metadata from the files contained
	* in the source directory		* in the source directory
	*		*
	* @arg metadata description of the package to create		* @param metadata description of the package to create
	* @arg source path to local directory containing the individual		* @param source path to local directory containing the individual
	* files to be added to the package		* files to be added to the package
	* @arg destination path to the package that should be created		* @param destination path to the package that should be created
	* @arg icon path to the package icon		* @param icon path to the package icon
	**/		**/
	static bool createPackage(const PackageMetadata &metadata,		static bool createPackage(const PackageMetadata &metadata,
	const QString &source,		const QString &source,
	const QString &destination,		const QString &destination,
	const QString &icon = QString());		const QString &icon = QString());
	private:		private:
	PackagePrivate * const d;		PackagePrivate * const d;
	friend class Applet;		friend class Applet;
End of changes. 10 change blocks.
	15 lines changed or deleted		15 lines changed or added

	packagemetadata.h		packagemetadata.h
	skipping to change at line 66		skipping to change at line 66
	PackageMetadata &operator=(const PackageMetadata &other);		PackageMetadata &operator=(const PackageMetadata &other);
	bool isValid() const;		bool isValid() const;
	/**		/**
	* Writes out the metadata to filename, which should be a .desktop		* Writes out the metadata to filename, which should be a .desktop
	* file. It writes out the information in a format that is compatible		* file. It writes out the information in a format that is compatible
	* with KPluginInfo		* with KPluginInfo
	* @see KPluginInfo		* @see KPluginInfo
	*		*
	* @arg filename path to the file to write to		* @param filename path to the file to write to
	**/		**/
	void write(const QString &filename) const;		void write(const QString &filename) const;
	/**		/**
	* Reads in metadata from a file, which should be a .desktop		* Reads in metadata from a file, which should be a .desktop
	* file. It writes out the information in a format that is compatible		* file. It writes out the information in a format that is compatible
	* with KPluginInfo		* with KPluginInfo
	* @see KPluginInfo		* @see KPluginInfo
	*		*
	* @arg filename path to the file to write to		* @param filename path to the file to write to
	**/		**/
	void read(const QString &filename);		void read(const QString &filename);
	QString name() const;		QString name() const;
	QString description() const;		QString description() const;
	QStringList keywords() const;		QStringList keywords() const;
	QString serviceType() const;		QString serviceType() const;
	QString author() const;		QString author() const;
	QString email() const;		QString email() const;
	QString version() const;		QString version() const;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	packagestructure.h		packagestructure.h
	skipping to change at line 82		skipping to change at line 82
	class PLASMA_EXPORT PackageStructure : public QObject, public QSharedData		class PLASMA_EXPORT PackageStructure : public QObject, public QSharedData
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	typedef KSharedPtr<PackageStructure> Ptr;		typedef KSharedPtr<PackageStructure> Ptr;
	/**		/**
	* Default constructor for a package structure definition		* Default constructor for a package structure definition
	*		*
	* @arg type the type of package. This is often application specific.		* @param type the type of package. This is often application specific.
	**/		**/
	explicit PackageStructure(QObject *parent = 0,		explicit PackageStructure(QObject *parent = 0,
	const QString &type = i18nc("A non-functional package", "Invalid"));		const QString &type = i18nc("A non-functional package", "Invalid"));
	/**		/**
	* Destructor		* Destructor
	**/		**/
	virtual ~PackageStructure();		virtual ~PackageStructure();
	/**		/**
	* Assignment operator		* Assignment operator
	**/		**/
	PackageStructure &operator=(const PackageStructure &rhs);		PackageStructure &operator=(const PackageStructure &rhs);
	/**		/**
	* Loads a package format by name.		* Loads a package format by name.
	*		*
	* @arg format If not empty, attempts to locate the given format, eithe r		* @param format If not empty, attempts to locate the given format, eit her
	* from built-ins or via plugins.		* from built-ins or via plugins.
	* @return a package that matches the format, if available. The caller		* @return a package that matches the format, if available. The caller
	* is responsible for deleting the object.		* is responsible for deleting the object.
	*/		*/
	static PackageStructure::Ptr load(const QString &packageFormat);		static PackageStructure::Ptr load(const QString &packageFormat);
	/**		/**
	* Type of package this structure describes		* Type of package this structure describes
	**/		**/
	QString type() const;		QString type() const;
	skipping to change at line 182		skipping to change at line 182
	* @return a list of paths relative to the package root for the given e ntry.		* @return a list of paths relative to the package root for the given e ntry.
	* They are orted by importance: when searching for a file the paths		* They are orted by importance: when searching for a file the paths
	* will be searched in order		* will be searched in order
	* @since 4.6		* @since 4.6
	**/		**/
	QStringList searchPath(const char *key) const;		QStringList searchPath(const char *key) const;
	/**		/**
	* Get the list of files of a given type.		* Get the list of files of a given type.
	*		*
	* @arg key the type of file to look for		* @param key the type of file to look for
	* @return list of files by name		* @return list of files by name
	* @since 4.3		* @since 4.3
	*/		*/
	QStringList entryList(const char *key);		QStringList entryList(const char *key);
	/**		/**
	* @return user visible name for the given entry		* @return user visible name for the given entry
	**/		**/
	QString name(const char *key) const;		QString name(const char *key) const;
	skipping to change at line 267		skipping to change at line 267
	* @param archivePath path to the package archive file		* @param archivePath path to the package archive file
	* @param packageRoot path to the directory where the package should be		* @param packageRoot path to the directory where the package should be
	* installed to		* installed to
	* @return true on successful installation, false otherwise		* @return true on successful installation, false otherwise
	**/		**/
	virtual bool installPackage(const QString &archivePath, const QString & packageRoot);		virtual bool installPackage(const QString &archivePath, const QString & packageRoot);
	/**		/**
	* Uninstalls a package matching this package structure.		* Uninstalls a package matching this package structure.
	*		*
	* @arg packageName the name of the package to remove		* @param packageName the name of the package to remove
	* @arg packageRoot path to the directory where the package should be i		* @param packageRoot path to the directory where the package should be
	nstalled to		installed to
	* @return true on successful removal of the package, false otherwise		* @return true on successful removal of the package, false otherwise
	*/		*/
	virtual bool uninstallPackage(const QString &packageName, const QString &packageRoot);		virtual bool uninstallPackage(const QString &packageName, const QString &packageRoot);
	/**		/**
	* When called, the package plugin should display a window to the user		* When called, the package plugin should display a window to the user
	* that they can use to browser, select and then install widgets suppor ted by		* that they can use to browser, select and then install widgets suppor ted by
	* this package plugin with.		* this package plugin with.
	*		*
	* The user interface may be an in-process dialog or an out-of-process application.		* The user interface may be an in-process dialog or an out-of-process application.
	skipping to change at line 335		skipping to change at line 335
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the new widget browser process completes.		* Emitted when the new widget browser process completes.
	*/		*/
	void newWidgetBrowserFinished();		void newWidgetBrowserFinished();
	protected:		protected:
	/**		/**
	* Sets whether or not external paths/symlinks can be followed by a pac kage		* Sets whether or not external paths/symlinks can be followed by a pac kage
	* @arg allow true if paths/symlinks outside of the package should be f ollowed,		* @param allow true if paths/symlinks outside of the package should be followed,
	* false if they should be rejected.		* false if they should be rejected.
	*/		*/
	void setAllowExternalPaths(bool allow);		void setAllowExternalPaths(bool allow);
	/**		/**
	* Sets the prefix that all the contents in this package should		* Sets the prefix that all the contents in this package should
	* appear under. This defaults to "contents/" and is added automaticall y		* appear under. This defaults to "contents/" and is added automaticall y
	* between the base path and the entries as defined by the package		* between the base path and the entries as defined by the package
	* structure		* structure
	*		*
	* @arg prefix the directory prefix to use		* @param prefix the directory prefix to use
	* @deprecated use setContentsPrefixPaths() instead.		* @deprecated use setContentsPrefixPaths() instead.
	*/		*/
	KDE_DEPRECATED void setContentsPrefix(const QString &prefix);		KDE_DEPRECATED void setContentsPrefix(const QString &prefix);
	/**		/**
	* Sets the prefixes that all the contents in this package should		* Sets the prefixes that all the contents in this package should
	* appear under. This defaults to "contents/" and is added automaticall y		* appear under. This defaults to "contents/" and is added automaticall y
	* between the base path and the entries as defined by the package		* between the base path and the entries as defined by the package
	* structure. Multiple entries can be added.		* structure. Multiple entries can be added.
	* In this case each file request will be searched in all prefixes in o rder,		* In this case each file request will be searched in all prefixes in o rder,
	* and the first found will be returned.		* and the first found will be returned.
	*		*
	* @arg prefix paths the directory prefix to use		* @param prefix paths the directory prefix to use
	* @since 4.6		* @since 4.6
	*/		*/
	void setContentsPrefixPaths(const QStringList &prefixPaths);		void setContentsPrefixPaths(const QStringList &prefixPaths);
	/**		/**
	* Sets preferred package root.		* Sets preferred package root.
	*/		*/
	void setDefaultPackageRoot(const QString &packageRoot);		void setDefaultPackageRoot(const QString &packageRoot);
	/**		/**
End of changes. 7 change blocks.
	9 lines changed or deleted		9 lines changed or added

	paintutils.h		paintutils.h
	skipping to change at line 36		skipping to change at line 36
	#include <QtGui/QPainterPath>		#include <QtGui/QPainterPath>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	#include "theme.h"		#include "theme.h"
	/** @headerfile plasma/paintutils.h <Plasma/PaintUtils> */		/** @headerfile plasma/paintutils.h <Plasma/PaintUtils> */
	namespace Plasma		namespace Plasma
	{		{
			class Svg;
	/**		/**
	* Namespace for all Image Effects specific to Plasma		* Namespace for all Image Effects specific to Plasma
	**/		**/
	namespace PaintUtils		namespace PaintUtils
	{		{
	/**		/**
	* Creates a blurred shadow of the supplied image.		* Creates a blurred shadow of the supplied image.
	*/		*/
	PLASMA_EXPORT void shadowBlur(QImage &image, int radius, const QColor &colo r);		PLASMA_EXPORT void shadowBlur(QImage &image, int radius, const QColor &colo r);
	skipping to change at line 64		skipping to change at line 66
	QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),		QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),
	QPoint offset = QPoint(1,1),		QPoint offset = QPoint(1,1),
	int radius = 2);		int radius = 2);
	PLASMA_EXPORT QPixmap shadowText(QString text,		PLASMA_EXPORT QPixmap shadowText(QString text,
	QColor textColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme:: TextColor),		QColor textColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme:: TextColor),
	QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),		QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),
	QPoint offset = QPoint(1,1),		QPoint offset = QPoint(1,1),
	int radius = 2);		int radius = 2);
			PLASMA_EXPORT QPixmap texturedText(const QString &text, const QFont &font,
			Plasma::Svg *texture);
	PLASMA_EXPORT void drawHalo(QPainter *painter, const QRectF &rect);		PLASMA_EXPORT void drawHalo(QPainter *painter, const QRectF &rect);
	/**		/**
	* Returns a nicely rounded rectanglular path for painting.		* Returns a nicely rounded rectanglular path for painting.
	*/		*/
	PLASMA_EXPORT QPainterPath roundedRectangle(const QRectF &rect, qreal radiu s);		PLASMA_EXPORT QPainterPath roundedRectangle(const QRectF &rect, qreal radiu s);
	/**		/**
	* center two pixmap together in the biggest rectangle		* center two pixmap together in the biggest rectangle
	* @since 4.5		* @since 4.5
End of changes. 2 change blocks.
	0 lines changed or deleted		5 lines changed or added

	paste.h		paste.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef KIO_PASTE_H		#ifndef KIO_PASTE_H
	#define KIO_PASTE_H		#define KIO_PASTE_H
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <kurl.h>		#include <kurl.h>
	class QWidget;		class QWidget;
	class QMimeSource;		class QMimeSource;
	namespace KIO {		namespace KIO {
	class Job;		class Job;
	class CopyJob;		class CopyJob;
	// KDE5 TODO: move all this to libkonq? It seems only libkonq uses this.
	// If you use this in a 3rd-party KDE app, please email me (faure at kde.
	org)
	/**		/**
	* Pastes the content of the clipboard to the given destination URL.		* Pastes the content of the clipboard to the given destination URL.
	* URLs are treated separately (performing a file copy)		* URLs are treated separately (performing a file copy)
	* from other data (which is saved into a file after asking the user		* from other data (which is saved into a file after asking the user
	* to choose a filename and the preferred data format)		* to choose a filename and the preferred data format)
	*		*
	* @param destURL the URL to receive the data		* @param destURL the URL to receive the data
	* @param widget parent widget to use for dialogs		* @param widget parent widget to use for dialogs
	* @param move true to move the data, false to copy		* @param move true to move the data, false to copy -- now ignored and ha ndled automatically
	* @return the job that handles the operation		* @return the job that handles the operation
	* @see pasteData()		* @see pasteData()
	*/		*/
	KIO_EXPORT Job *pasteClipboard( const KUrl& destURL, QWidget* widget, boo l move = false );		KIO_EXPORT Job *pasteClipboard( const KUrl& destURL, QWidget* widget, boo l move = false );
	/**		/**
	* Pastes the given @p data to the given destination URL.		* Pastes the given @p data to the given destination URL.
	* NOTE: This method is blocking (uses NetAccess for saving the data).		* NOTE: This method is blocking (uses NetAccess for saving the data).
	* Please consider using pasteDataAsync instead.		* Please consider using pasteDataAsync instead.
	*		*
	* @param destURL the URL of the directory where the data will be pasted.		* @param destURL the URL of the directory where the data will be pasted.
	* The filename to use in that directory is prompted by this method.		* The filename to use in that directory is prompted by this method.
	* @param data the data to copy		* @param data the data to copy
	* @param widget parent widget to use for dialogs		* @param widget parent widget to use for dialogs
	* @see pasteClipboard()		* @see pasteClipboard()
			*
			* This method is a candidate for disappearing in KDE5, email faure at kd
			e.org if you
			* are using it in your application, then I'll reconsider.
	*/		*/
	KIO_EXPORT void pasteData( const KUrl& destURL, const QByteArray& data, Q Widget* widget );		KIO_EXPORT void pasteData( const KUrl& destURL, const QByteArray& data, Q Widget* widget );
	/**		/**
	* Pastes the given @p data to the given destination URL.		* Pastes the given @p data to the given destination URL.
	* Note that this method requires the caller to have chosen the QByteArra y		* Note that this method requires the caller to have chosen the QByteArra y
	* to paste before hand, unlike pasteClipboard and pasteMimeSource.		* to paste before hand, unlike pasteClipboard and pasteMimeSource.
	*		*
	* @param destURL the URL of the directory where the data will be pasted.		* @param destURL the URL of the directory where the data will be pasted.
	* The filename to use in that directory is prompted by this method.		* The filename to use in that directory is prompted by this method.
	* @param data the data to copy		* @param data the data to copy
	* @param dialogText the text to show in the dialog		* @param dialogText the text to show in the dialog
	* @see pasteClipboard()		* @see pasteClipboard()
			*
			* This method is a candidate for disappearing in KDE5, email faure at kd
			e.org if you
			* are using it in your application, then I'll reconsider.
	*/		*/
	KIO_EXPORT CopyJob *pasteDataAsync( const KUrl& destURL, const QByteArray & data, QWidget *widget, const QString& dialogText = QString() );		KIO_EXPORT CopyJob *pasteDataAsync( const KUrl& destURL, const QByteArray & data, QWidget *widget, const QString& dialogText = QString() );
	/**		/**
	* Save the given mimesource @p data to the given destination URL		* Save the given mime @p data to the given destination URL
	* after offering the user to choose a data format.		* after offering the user to choose a data format.
	* This is the method used when handling drops (of anything else than URL s)		* This is the method used when handling drops (of anything else than URL s)
	* onto dolphin and konqueror; it is also called when pasting data.		* onto dolphin and konqueror.
	*		*
	* @param data the QMimeData (from a QDropEvent or from the clipboard whe		* @param data the QMimeData, usually from a QDropEvent
	n pasting)		* @param destUrl the URL of the directory where the data will be pasted.
	* @param destURL the URL of the directory where the data will be pasted.
	* The filename to use in that directory is prompted by this method.		* The filename to use in that directory is prompted by this method.
	* @param dialogText the text to show in the dialog		* @param dialogText the text to show in the dialog
	* @param widget parent widget to use for dialogs		* @param widget parent widget to use for dialogs
	* @param clipboard whether the QMimeSource comes from QClipboard. If you		* @param clipboard whether the QMimeData comes from QClipboard. If you
	* use pasteClipboard for that case, you never have to worry about this p arameter.		* use pasteClipboard for that case, you never have to worry about this p arameter.
	*		*
	* @see pasteClipboard()		* @see pasteClipboard()
	*/		*/
	KIO_EXPORT CopyJob* pasteMimeSource( const QMimeData* data, const KUrl& d		KIO_EXPORT Job* pasteMimeData(const QMimeData* data, const KUrl& destUrl,
	estURL,		const QString& dialogText, QWidget* widget)
			;
			/**
			* @deprecated because it returns a CopyJob*, and this is better implemen
			ted
			* without a copy job. Use pasteMimeData instead.
			* Note that you'll have to tell the user in case of an error (no data to
			paste),
			* while pasteMimeSource did that.
			*/
			KIO_EXPORT_DEPRECATED CopyJob* pasteMimeSource( const QMimeData* data, co
			nst KUrl& destURL,
	const QString& dialogText, QWidget* widget,		const QString& dialogText, QWidget* widget,
	bool clipboard = false );		bool clipboard = false );
	/**		/**
	* Returns true if pasteMimeSource finds any interesting format in @p dat a.		* Returns true if pasteMimeSource finds any interesting format in @p dat a.
	* You can use this method to enable/disable the paste action appropriate ly.		* You can use this method to enable/disable the paste action appropriate ly.
	* @since 4.3		* @since 4.3
	*/		*/
	KIO_EXPORT bool canPasteMimeSource(const QMimeData* data);		KIO_EXPORT bool canPasteMimeSource(const QMimeData* data);
End of changes. 9 change blocks.
	15 lines changed or deleted		30 lines changed or added

	plasma.h		plasma.h
	skipping to change at line 311		skipping to change at line 311
	* a popup or to point arrows at the item itself.		* a popup or to point arrows at the item itself.
	*		*
	* @param location the location of the container the element will appear in		* @param location the location of the container the element will appear in
	* @return the visual direction the element should be oriented in		* @return the visual direction the element should be oriented in
	**/		**/
	PLASMA_EXPORT Direction locationToInverseDirection(Location location);		PLASMA_EXPORT Direction locationToInverseDirection(Location location);
	/**		/**
	* Returns the most appropriate QGraphicsView for the item.		* Returns the most appropriate QGraphicsView for the item.
	*		*
	* @arg item the QGraphicsItem to locate a view for		* @param item the QGraphicsItem to locate a view for
	* @return pointer to a view, or 0 if none was found		* @return pointer to a view, or 0 if none was found
	*/		*/
	PLASMA_EXPORT QGraphicsView *viewFor(const QGraphicsItem *item);		PLASMA_EXPORT QGraphicsView *viewFor(const QGraphicsItem *item);
	/**		/**
	* Returns a list of all actions in the given QMenu		* Returns a list of all actions in the given QMenu
	* This method flattens the hierarchy of the menu by prefixing the		* This method flattens the hierarchy of the menu by prefixing the
	* text of all actions in a submenu with the submenu title.		* text of all actions in a submenu with the submenu title.
	*		*
	* @param menu the QMenu storing the actions		* @param menu the QMenu storing the actions
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	plugin.h		plugin.h
	skipping to change at line 155		skipping to change at line 155
	* factory()->addClient( plugin );		* factory()->addClient( plugin );
	* }		* }
	* \endcode		* \endcode
	*/		*/
	static void loadPlugins(QObject *parent, KXMLGUIClient* parentGUIClient ,		static void loadPlugins(QObject *parent, KXMLGUIClient* parentGUIClient ,
	const KComponentData &instance, bool enableNewPluginsByDefault = true,		const KComponentData &instance, bool enableNewPluginsByDefault = true,
	int interfaceVersionRequired = 0);		int interfaceVersionRequired = 0);
	/**		/**
	* Returns a list of plugin objects loaded for @p parent. This		* Returns a list of plugin objects loaded for @p parent. This
	* functions basically calls the queryList method of		* functions basically iterates over the children of the given object
	* QObject to retrieve the list of child objects inheriting		* and returns those that inherit from KParts::Plugin.
	* KParts::Plugin .
	**/		**/
	static QList<Plugin *> pluginObjects( QObject *parent );		static QList<Plugin *> pluginObjects( QObject *parent );
	protected:		protected:
	/**		/**
	* Look for plugins in the @p instance's "data" directory (+"/kpartplug ins")		* Look for plugins in the @p instance's "data" directory (+"/kpartplug ins")
	*		*
	* @return A list of QDomDocument s, containing the parsed xml document s returned by plugins.		* @return A list of QDomDocument s, containing the parsed xml document s returned by plugins.
	*/		*/
	static QList<Plugin::PluginInfo> pluginInfos(const KComponentData &inst ance);		static QList<Plugin::PluginInfo> pluginInfos(const KComponentData &inst ance);
End of changes. 1 change blocks.
	3 lines changed or deleted		2 lines changed or added

	pluginloader.h		pluginloader.h
	skipping to change at line 43		skipping to change at line 43
	class PluginLoaderPrivate;		class PluginLoaderPrivate;
	//TODO:		//TODO:
	// * add support for ContainmentActions plugins		// * add support for ContainmentActions plugins
	// * add KPluginInfo listing support for Containments (already loaded via t he applet loading code)		// * add KPluginInfo listing support for Containments (already loaded via t he applet loading code)
	/**		/**
	* This is an abstract base class which defines an interface to which Plasm a's		* This is an abstract base class which defines an interface to which Plasm a's
	* Applet Loading logic can communicate with a parent application. The plug in loader		* Applet Loading logic can communicate with a parent application. The plug in loader
	* must be set before any plugins are loaded, otherwise (for safety reasons ), the		* must be set before any plugins are loaded, otherwise (for safety reasons ), the
	* default PluginLoader implementation will be used.		* default PluginLoader implementation will be used. The reimplemented vers
			ion should
			* not do more than simply returning a loaded plugin. It should not init()
			it, and it should not
			* hang on to it. The associated methods will be called only when a compone
			nt of Plasma
			* needs to load a _new_ plugin. (e.g. DataEngine does it's own caching).
	*		*
	* @author Ryan Rix <ry@n.rix.si>		* @author Ryan Rix <ry@n.rix.si>
	* @since 4.6		* @since 4.6
	**/		**/
	class PLASMA_EXPORT PluginLoader		class PLASMA_EXPORT PluginLoader
	{		{
	public:		public:
	PluginLoader();		PluginLoader();
	virtual ~PluginLoader();		virtual ~PluginLoader();
End of changes. 1 change blocks.
	1 lines changed or deleted		7 lines changed or added

	popupapplet.h		popupapplet.h
	skipping to change at line 62		skipping to change at line 62
	class PLASMA_EXPORT PopupApplet : public Plasma::Applet		class PLASMA_EXPORT PopupApplet : public Plasma::Applet
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(Qt::AlignmentFlag popupAlignment READ popupAlignment WRITE s etPopupAlignment)		Q_PROPERTY(Qt::AlignmentFlag popupAlignment READ popupAlignment WRITE s etPopupAlignment)
	public:		public:
	PopupApplet(QObject *parent, const QVariantList &args);		PopupApplet(QObject *parent, const QVariantList &args);
	~PopupApplet();		~PopupApplet();
	/**		/**
	* @arg icon the icon that has to be displayed when the applet is in a panel.		* @param icon the icon that has to be displayed when the applet is in a panel.
	* Passing in a null icon means that the popup applet itself		* Passing in a null icon means that the popup applet itself
	* will provide an interface for when the PopupApplet is not showing		* will provide an interface for when the PopupApplet is not showing
	* the widget() or graphicsWidget() directly.		* the widget() or graphicsWidget() directly.
	*/		*/
	void setPopupIcon(const QIcon &icon);		void setPopupIcon(const QIcon &icon);
	/**		/**
	* @arg icon the icon that has to be displayed when the applet is in a panel.		* @param icon the icon that has to be displayed when the applet is in a panel.
	* Passing in an empty QString() means that the popup applet itself		* Passing in an empty QString() means that the popup applet itself
	* will provide an interface for when the PopupApplet is not showing		* will provide an interface for when the PopupApplet is not showing
	* the widget() or graphicsWidget() directly.		* the widget() or graphicsWidget() directly.
	* If you set a popup icon you must also set a minimum size of the appl et. When the applet		* If you set a popup icon you must also set a minimum size of the appl et. When the applet
	* is smaller than this minimum size, it will be displayed as that icon .		* is smaller than this minimum size, it will be displayed as that icon .
	*/		*/
	void setPopupIcon(const QString &iconName);		void setPopupIcon(const QString &iconName);
	/**		/**
	skipping to change at line 110		skipping to change at line 110
	virtual QGraphicsWidget *graphicsWidget();		virtual QGraphicsWidget *graphicsWidget();
	void setGraphicsWidget(QGraphicsWidget * widget);		void setGraphicsWidget(QGraphicsWidget * widget);
	/**		/**
	* @return the placement of the popup relating to the applet		* @return the placement of the popup relating to the applet
	*/		*/
	Plasma::PopupPlacement popupPlacement() const;		Plasma::PopupPlacement popupPlacement() const;
	/**		/**
	* Sets the default alignment of the popup relative to the applet		* Sets the default alignment of the popup relative to the applet
	* @arg alignment the alignment to use; Qt::AlignLeft or Qt::AlignRight		* @param alignment the alignment to use; Qt::AlignLeft or Qt::AlignRig ht
	* @since 4.6		* @since 4.6
	*/		*/
	void setPopupAlignment(Qt::AlignmentFlag alignment);		void setPopupAlignment(Qt::AlignmentFlag alignment);
	/**		/**
	* @return the default alignment of the popup relative to the applet		* @return the default alignment of the popup relative to the applet
	* @since 4.6		* @since 4.6
	*/		*/
	Qt::AlignmentFlag popupAlignment() const;		Qt::AlignmentFlag popupAlignment() const;
	/**		/**
	* Sets whether or not the dialog popup that gets created should be a " passive" popup		* Sets whether or not the dialog popup that gets created should be a " passive" popup
	* that does not steal focus from other windows or not.		* that does not steal focus from other windows or not.
	*		*
	* @arg passive true if the dialog should be treated as a passive popup		* @param passive true if the dialog should be treated as a passive pop up
	*/		*/
	void setPassivePopup(bool passive);		void setPassivePopup(bool passive);
	/**		/**
	* @return true if the dialog will be treated as a passive poup		* @return true if the dialog will be treated as a passive poup
	*/		*/
	bool isPassivePopup() const;		bool isPassivePopup() const;
	/**		/**
	* @return true if the applet is popped up		* @return true if the applet is popped up
	skipping to change at line 153		skipping to change at line 153
	bool isIconified() const;		bool isIconified() const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Hides the popup.		* Hides the popup.
	*/		*/
	void hidePopup();		void hidePopup();
	/**		/**
	* Shows the dialog showing the widget if the applet is in a panel.		* Shows the dialog showing the widget if the applet is in a panel.
	* @arg displayTime the time in ms that the popup should be displayed, defaults to 0 which means		* @param displayTime the time in ms that the popup should be displayed , defaults to 0 which means
	* always (until the user closes it again, that is).		* always (until the user closes it again, that is).
	*/		*/
	void showPopup(uint displayTime = 0);		void showPopup(uint displayTime = 0);
	/**		/**
	* Toggles the popup.		* Toggles the popup.
	*/		*/
	void togglePopup();		void togglePopup();
	protected:		protected:
	/**		/**
	* This event handler can be reimplemented in a subclass to receive an		* This event handler can be reimplemented in a subclass to receive an
	* event before the popup is shown or hidden.		* event before the popup is shown or hidden.
	* @arg show true if the popup is going to be shown, false if the popup		* @param show true if the popup is going to be shown, false if the pop up
	* is going to be hidden.		* is going to be hidden.
	* Note that showing and hiding the popup on click is already done in P opupApplet.		* Note that showing and hiding the popup on click is already done in P opupApplet.
	*/		*/
	virtual void popupEvent(bool show);		virtual void popupEvent(bool show);
	/**		/**
	* Reimplemented from QGraphicsLayoutItem		* Reimplemented from QGraphicsLayoutItem
	*/		*/
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF( )) const;		QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF( )) const;
End of changes. 6 change blocks.
	6 lines changed or deleted		6 lines changed or added

	powermanagement.h		powermanagement.h
	skipping to change at line 136		skipping to change at line 136
	Q_OBJECT		Q_OBJECT
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is emitted when the AC adapter is plugged or unp lugged.		* This signal is emitted when the AC adapter is plugged or unp lugged.
	*		*
	* @param newState the new state of the AC adapter, it's one of the		* @param newState the new state of the AC adapter, it's one of the
	* type @see Solid::PowerManager::AcAdapterState		* type @see Solid::PowerManager::AcAdapterState
	*/		*/
	void appShouldConserveResourcesChanged(bool newState);		void appShouldConserveResourcesChanged(bool newState);
			/**
			* This signal is emitted whenever the system is resuming from
			suspend. Applications should connect
			* to this signal to perform actions due after a wake up (such
			as updating clocks, etc.).
			*
			* @since 4.7
			*/
			void resumingFromSuspend();
	protected:		protected:
	Notifier();		Notifier();
	};		};
	SOLID_EXPORT Notifier *notifier();		SOLID_EXPORT Notifier *notifier();
	}		}
	}		}
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		10 lines changed or added

	previewjob.h		previewjob.h
	skipping to change at line 43		skipping to change at line 43
	class PreviewJobPrivate;		class PreviewJobPrivate;
	/*!		/*!
	* This class catches a preview (thumbnail) for files.		* This class catches a preview (thumbnail) for files.
	* @short KIO Job to get a thumbnail picture		* @short KIO Job to get a thumbnail picture
	*/		*/
	class KIO_EXPORT PreviewJob : public KIO::Job		class KIO_EXPORT PreviewJob : public KIO::Job
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
			* Specifies the type of scaling that is applied to the generated p
			review.
			* @since 4.7
			*/
			enum ScaleType {
			/**
			* The original size of the preview will be returned. Most prev
			iews
			* will return a size of 256 x 256 pixels.
			*/
			Unscaled,
			/**
			* The preview will be scaled to the size specified when constr
			ucting
			* the PreviewJob. The aspect ratio will be kept.
			*/
			Scaled,
			/**
			* The preview will be scaled to the size specified when constr
			ucting
			* the PreviewJob. The result will be cached for later use. Per
			default
			* ScaledAndCached is set.
			*/
			ScaledAndCached
			};
			#ifndef KDE_NO_DEPRECATED
			/**
	* Creates a new PreviewJob.		* Creates a new PreviewJob.
	* @param items a list of files to create previews for		* @param items a list of files to create previews for
	* @param width the desired width		* @param width the desired width
	* @param height the desired height, 0 to use the @p width		* @param height the desired height, 0 to use the @p width
	* @param iconSize the size of the mimetype icon to overlay over th e		* @param iconSize the size of the mimetype icon to overlay over th e
	* preview or zero to not overlay an icon. This has no effect if th e		* preview or zero to not overlay an icon. This has no effect if th e
	* preview plugin that will be used doesn't use icon overlays.		* preview plugin that will be used doesn't use icon overlays.
	* @param iconAlpha transparency to use for the icon overlay		* @param iconAlpha transparency to use for the icon overlay
	* @param scale if the image is to be scaled to the requested size or		* @param scale if the image is to be scaled to the requested size or
	* returned in its original size		* returned in its original size
	* @param save if the image should be cached for later use		* @param save if the image should be cached for later use
	* @param enabledPlugins if non-zero, this points to a list contain		* @param enabledPlugins If non-zero, this points to a list contain
	ing		ing
	* the names of the plugins that may be used.		* the names of the plugins that may be used. If enabledPlugins is
			zero
			* all available plugins are used.
			*
			* @deprecated Use PreviewJob(KFileItemList, QSize, QStringList) in
			combination
			* with the setter-methods instead. Note that the seman
			tics of
			* \p enabledPlugins has been slightly changed.
	*/		*/
	PreviewJob( const KFileItemList& items, int width, int height,		KDE_DEPRECATED PreviewJob(const KFileItemList& items, int width, in
	int iconSize, int iconAlpha, bool scale, bool save,		t height,
	const QStringList *enabledPlugins );		int iconSize, int iconAlpha, bool scale,
			bool save,
			const QStringList *enabledPlugins);
			#endif
			/**
			* @param items List of files to create previews for.
			* @param size Desired size of the preview.
			* @param enabledPlugins If non-zero it defines the list of plugins
			that
			* are considered for generating the preview.
			If
			* enabledPlugins is zero the plugins specifi
			ed in the
			* KConfigGroup "PreviewSettings" are used.
			* @since 4.7
			*/
			PreviewJob(const KFileItemList &items,
			const QSize &size,
			const QStringList *enabledPlugins = 0);
	virtual ~PreviewJob();		virtual ~PreviewJob();
	/**		/**
			* Sets the size of the MIME-type icon which overlays the preview.
			If zero
			* is passed no overlay will be shown at all. The setting has no ef
			fect if
			* the preview plugin that will be used does not use icon overlays.
			Per
			* default the size is set to 0.
			* @since 4.7
			*/
			void setOverlayIconSize(int size);
			/**
			* @return The size of the MIME-type icon which overlays the previe
			w.
			* @see PreviewJob::setOverlayIconSize()
			* @since 4.7
			*/
			int overlayIconSize() const;
			/**
			* Sets the alpha-value for the MIME-type icon which overlays the p
			review.
			* The alpha-value may range from 0 (= fully transparent) to 255 (=
			opaque).
			* Per default the value is set to 70.
			* @see PreviewJob::setOverlayIconSize()
			* @since 4.7
			*/
			void setOverlayIconAlpha(int alpha);
			/**
			* @return The alpha-value for the MIME-type icon which overlays th
			e preview.
			* Per default 70 is returned.
			* @see PreviewJob::setOverlayIconAlpha()
			* @since 4.7
			*/
			int overlayIconAlpha() const;
			/**
			* Sets the scale type for the generated preview. Per default
			* PreviewJob::ScaledAndCached is set.
			* @see PreviewJob::ScaleType
			* @since 4.7
			*/
			void setScaleType(ScaleType type);
			/**
			* @return The scale type for the generated preview.
			* @see PreviewJob::ScaleType
			* @since 4.7
			*/
			ScaleType scaleType() const;
			/**
	* Removes an item from preview processing. Use this if you passed		* Removes an item from preview processing. Use this if you passed
	* an item to filePreview and want to delete it now.		* an item to filePreview and want to delete it now.
	*		*
	* @param url the url of the item that should be removed from the p review queue		* @param url the url of the item that should be removed from the p review queue
	*/		*/
	void removeItem( const KUrl& url );		void removeItem( const KUrl& url );
	/**		/**
	* If @p ignoreSize is true, then the preview is always		* If @p ignoreSize is true, then the preview is always
	* generated regardless of the settings		* generated regardless of the settings
	skipping to change at line 144		skipping to change at line 236
	protected Q_SLOTS:		protected Q_SLOTS:
	virtual void slotResult( KJob *job );		virtual void slotResult( KJob *job );
	private:		private:
	Q_PRIVATE_SLOT(d_func(), void startPreview())		Q_PRIVATE_SLOT(d_func(), void startPreview())
	Q_PRIVATE_SLOT(d_func(), void slotThumbData(KIO::Job *, const QByte Array &))		Q_PRIVATE_SLOT(d_func(), void slotThumbData(KIO::Job *, const QByte Array &))
	Q_DECLARE_PRIVATE(PreviewJob)		Q_DECLARE_PRIVATE(PreviewJob)
	};		};
			#ifndef KDE_NO_DEPRECATED
	/**		/**
	* Creates a PreviewJob to generate or retrieve a preview image		* Creates a PreviewJob to generate or retrieve a preview image
	* for the given URL.		* for the given URL.
	*		*
	* @param items files to get previews for		* @param items files to get previews for
	* @param width the maximum width to use		* @param width the maximum width to use
	* @param height the maximum height to use, if this is 0, the same		* @param height the maximum height to use, if this is 0, the same
	* value as width is used.		* value as width is used.
	* @param iconSize the size of the mimetype icon to overlay over the		* @param iconSize the size of the mimetype icon to overlay over the
	* preview or zero to not overlay an icon. This has no effect if the		* preview or zero to not overlay an icon. This has no effect if the
	* preview plugin that will be used doesn't use icon overlays.		* preview plugin that will be used doesn't use icon overlays.
	* @param iconAlpha transparency to use for the icon overlay		* @param iconAlpha transparency to use for the icon overlay
	* @param scale if the image is to be scaled to the requested size or		* @param scale if the image is to be scaled to the requested size or
	* returned in its original size		* returned in its original size
	* @param save if the image should be cached for later use		* @param save if the image should be cached for later use
	* @param enabledPlugins if non-zero, this points to a list containing		* @param enabledPlugins if non-zero, this points to a list containing
	* the names of the plugins that may be used.		* the names of the plugins that may be used.
	* @return the new PreviewJob		* @return the new PreviewJob
	* @see PreviewJob::availablePlugins()		* @see PreviewJob::availablePlugins()
			* @deprecated Use KIO::filePreview(KFileItemList, QSize, QStringList)
			in combination
			* with the setter-methods instead. Note that the semantics
			of
			* \p enabledPlugins has been slightly changed.
	*/		*/
	KIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, bo ol save = true, const QStringList *enabledPlugins = 0 ); // KDE5: use enums instead of bool scale + bool save		KIO_EXPORT_DEPRECATED PreviewJob *filePreview( const KFileItemList &ite ms, int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool s cale = true, bool save = true, const QStringList *enabledPlugins = 0 ); // KDE5: use enums instead of bool scale + bool save
	/**		/**
	* Creates a PreviewJob to generate or retrieve a preview image		* Creates a PreviewJob to generate or retrieve a preview image
	* for the given URL.		* for the given URL.
	*		*
	* @param items files to get previews for		* @param items files to get previews for
	* @param width the maximum width to use		* @param width the maximum width to use
	* @param height the maximum height to use, if this is 0, the same		* @param height the maximum height to use, if this is 0, the same
	* value as width is used.		* value as width is used.
	* @param iconSize the size of the mimetype icon to overlay over the		* @param iconSize the size of the mimetype icon to overlay over the
	* preview or zero to not overlay an icon. This has no effect if the		* preview or zero to not overlay an icon. This has no effect if the
	* preview plugin that will be used doesn't use icon overlays.		* preview plugin that will be used doesn't use icon overlays.
	* @param iconAlpha transparency to use for the icon overlay		* @param iconAlpha transparency to use for the icon overlay
	* @param scale if the image is to be scaled to the requested size or		* @param scale if the image is to be scaled to the requested size or
	* returned in its original size		* returned in its original size
	* @param save if the image should be cached for later use		* @param save if the image should be cached for later use
	* @param enabledPlugins if non-zero, this points to a list containing		* @param enabledPlugins if non-zero, this points to a list containing
	* the names of the plugins that may be used.		* the names of the plugins that may be used.
	* @return the new PreviewJob		* @return the new PreviewJob
	* @see PreviewJob::availablePlugins()		* @see PreviewJob::availablePlugins()
			* @deprecated Use KIO::filePreview(KFileItemList, QSize, QStringList)
			in combination
			* with the setter-methods instead. Note that the semantics
			of
			* \p enabledPlugins has been slightly changed.
	*/		*/
	KIO_EXPORT PreviewJob *filePreview( const KUrl::List &items, int width,		KIO_EXPORT_DEPRECATED PreviewJob *filePreview( const KUrl::List &items,
	int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true, b		int width, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scal
	ool save = true, const QStringList *enabledPlugins = 0 );		e = true, bool save = true, const QStringList *enabledPlugins = 0 );
			#endif
			/**
			* Creates a PreviewJob to generate a preview image for the given items
			.
			* @param items List of files to create previews for.
			* @param size Desired size of the preview.
			* @param enabledPlugins If non-zero it defines the list of plugins tha
			t
			* are considered for generating the preview. If
			* enabledPlugins is zero the plugins specified i
			n the
			* KConfigGroup "PreviewSettings" are used.
			* @since 4.7
			*/
			KIO_EXPORT PreviewJob *filePreview(const KFileItemList &items, const QS
			ize &size, const QStringList *enabledPlugins = 0);
	}		}
	#endif		#endif
End of changes. 9 change blocks.
	10 lines changed or deleted		150 lines changed or added

	pushbutton.h		pushbutton.h
	skipping to change at line 63		skipping to change at line 63
	Q_PROPERTY(bool checked READ isChecked WRITE setChecked)		Q_PROPERTY(bool checked READ isChecked WRITE setChecked)
	Q_PROPERTY(bool down READ isDown)		Q_PROPERTY(bool down READ isDown)
	public:		public:
	explicit PushButton(QGraphicsWidget *parent = 0);		explicit PushButton(QGraphicsWidget *parent = 0);
	~PushButton();		~PushButton();
	/**		/**
	* Sets the display text for this PushButton		* Sets the display text for this PushButton
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @param path the path to the image; if a relative path, then a themed image will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
	* Sets the path to an svg image to display and the id of the used svg element, if necessary.		* Sets the path to an svg image to display and the id of the used svg element, if necessary.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i		* @param path the path to the image; if a relative path, then a themed
	mage will be loaded.		image will be loaded.
	* @arg elementid the id of a svg element.		* @param elementid the id of a svg element.
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	void setImage(const QString &path, const QString &elementid);		void setImage(const QString &path, const QString &elementid);
	/**		/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this PushB utton		* Sets the stylesheet used to control the visual display of this PushB utton
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* Associate an action with this IconWidget		* Associate an action with this IconWidget
	skipping to change at line 125		skipping to change at line 125
	/**		/**
	* @return the currently associated action, if any.		* @return the currently associated action, if any.
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	QAction *action() const;		QAction *action() const;
	/**		/**
	* sets the icon for this push button		* sets the icon for this push button
	*		*
	* @arg icon the icon to use		* @param icon the icon to use
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setIcon(const QIcon &icon);		void setIcon(const QIcon &icon);
	/**		/**
	* sets the icon for this push button using a KIcon		* sets the icon for this push button using a KIcon
	*		*
	* @arg icon the icon to use		* @param icon the icon to use
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	void setIcon(const KIcon &icon);		void setIcon(const KIcon &icon);
	/**		/**
	* @return the icon of this button		* @return the icon of this button
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
End of changes. 6 change blocks.
	8 lines changed or deleted		8 lines changed or added

	qtest_kde.h		qtest_kde.h
	skipping to change at line 73		skipping to change at line 73
	* \param componentName the name that will be given to the main component d ata.		* \param componentName the name that will be given to the main component d ata.
	*		*
	* \see KDEMainFlag		* \see KDEMainFlag
	* \see QTestLib		* \see QTestLib
	*/		*/
	#define QTEST_KDEMAIN_WITH_COMPONENTNAME(TestObject, flags, componentName) \		#define QTEST_KDEMAIN_WITH_COMPONENTNAME(TestObject, flags, componentName) \
	int main(int argc, char *argv[]) \		int main(int argc, char *argv[]) \
	{ \		{ \
	setenv("LC_ALL", "C", 1); \		setenv("LC_ALL", "C", 1); \
	assert( !QDir::homePath().isEmpty() ); \		assert( !QDir::homePath().isEmpty() ); \
	setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QLatin1String("		setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QString::fromLa
	/.kde-unit-test") ), 1); \		tin1("/.kde-unit-test") ), 1); \
	setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QLatin1St		setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QString::
	ring("/.kde-unit-test/xdg/local") ), 1); \		fromLatin1("/.kde-unit-test/xdg/local") ), 1); \
	setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QLatin1		setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QString
	String("/.kde-unit-test/xdg/config") ), 1); \		::fromLatin1("/.kde-unit-test/xdg/config") ), 1); \
	setenv("KDE_SKIP_KDERC", "1", 1); \		setenv("KDE_SKIP_KDERC", "1", 1); \
	unsetenv("KDE_COLOR_DEBUG"); \		unsetenv("KDE_COLOR_DEBUG"); \
	QFile::remove(QDir::homePath() + QLatin1String("/.kde-unit-test/share/c onfig/qttestrc")); \		QFile::remove(QDir::homePath() + QString::fromLatin1("/.kde-unit-test/s hare/config/qttestrc")); \
	KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("K DE Test Program"), QByteArray("version") ); \		KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("K DE Test Program"), QByteArray("version") ); \
	KDEMainFlags mainFlags = flags; \		KDEMainFlags mainFlags = flags; \
	KComponentData cData(&aboutData); \		KComponentData cData(&aboutData); \
	QApplication app( argc, argv, (mainFlags & GUI) != 0 ); \		QApplication app( argc, argv, (mainFlags & GUI) != 0 ); \
	app.setApplicationName( QLatin1String("qttest") ); \		app.setApplicationName( QLatin1String("qttest") ); \
	qRegisterMetaType<KUrl>(); /*as done by kapplication*/ \		qRegisterMetaType<KUrl>(); /*as done by kapplication*/ \
	qRegisterMetaType<KUrl::List>(); \		qRegisterMetaType<KUrl::List>(); \
	TestObject tc; \		TestObject tc; \
	KGlobal::ref(); /* don't quit qeventloop after closing a mainwindow */ \		KGlobal::ref(); /* don't quit qeventloop after closing a mainwindow */ \
	return QTest::qExec( &tc, argc, argv ); \		return QTest::qExec( &tc, argc, argv ); \
	skipping to change at line 124		skipping to change at line 124
	*		*
	* \see KDEMainFlag		* \see KDEMainFlag
	* \see QTestLib		* \see QTestLib
	* \since 4.3		* \since 4.3
	*/		*/
	#define QTEST_KDEMAIN_CORE_WITH_COMPONENTNAME(TestObject, componentName) \		#define QTEST_KDEMAIN_CORE_WITH_COMPONENTNAME(TestObject, componentName) \
	int main(int argc, char *argv[]) \		int main(int argc, char *argv[]) \
	{ \		{ \
	setenv("LC_ALL", "C", 1); \		setenv("LC_ALL", "C", 1); \
	assert( !QDir::homePath().isEmpty() ); \		assert( !QDir::homePath().isEmpty() ); \
	setenv("KDEHOME", QFile::encodeName( QDir::homePath() + "/.kde-unit-tes		setenv("KDEHOME", QFile::encodeName( QDir::homePath() + QString::fromLa
	t" ), 1); \		tin1("/.kde-unit-test" )), 1); \
	setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + "/.kde-un		setenv("XDG_DATA_HOME", QFile::encodeName( QDir::homePath() + QString::
	it-test/xdg/local" ), 1); \		fromLatin1("/.kde-unit-test/xdg/local") ), 1); \
	setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + "/.kde-		setenv("XDG_CONFIG_HOME", QFile::encodeName( QDir::homePath() + QString
	unit-test/xdg/config" ), 1); \		::fromLatin1("/.kde-unit-test/xdg/config") ), 1); \
	setenv("KDE_SKIP_KDERC", "1", 1); \		setenv("KDE_SKIP_KDERC", "1", 1); \
	unsetenv("KDE_COLOR_DEBUG"); \		unsetenv("KDE_COLOR_DEBUG"); \
	QFile::remove(QDir::homePath() + "/.kde-unit-test/share/config/qttestrc "); \		QFile::remove(QDir::homePath() + QString::fromLatin1("/.kde-unit-test/s hare/config/qttestrc")); \
	KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("K DE Test Program"), QByteArray("version") ); \		KAboutData aboutData( QByteArray(componentName), QByteArray(), ki18n("K DE Test Program"), QByteArray("version") ); \
	KComponentData cData(&aboutData); \		KComponentData cData(&aboutData); \
	QCoreApplication app( argc, argv ); \		QCoreApplication app( argc, argv ); \
	app.setApplicationName( "qttest" ); \		app.setApplicationName( QLatin1String("qttest") ); \
	qRegisterMetaType<KUrl>(); /*as done by kapplication*/ \		qRegisterMetaType<KUrl>(); /*as done by kapplication*/ \
	qRegisterMetaType<KUrl::List>(); \		qRegisterMetaType<KUrl::List>(); \
	TestObject tc; \		TestObject tc; \
	KGlobal::ref(); /* don't quit qeventloop after closing a mainwindow */ \		KGlobal::ref(); /* don't quit qeventloop after closing a mainwindow */ \
	return QTest::qExec( &tc, argc, argv ); \		return QTest::qExec( &tc, argc, argv ); \
	}		}
	/**		/**
	* \short KDE Replacement for QTEST_MAIN from QTestLib, for non-gui code.		* \short KDE Replacement for QTEST_MAIN from QTestLib, for non-gui code.
	*		*
End of changes. 5 change blocks.
	15 lines changed or deleted		15 lines changed or added

	radiobutton.h		radiobutton.h
	skipping to change at line 57		skipping to change at line 57
	Q_PROPERTY(QRadioButton *nativeWidget READ nativeWidget)		Q_PROPERTY(QRadioButton *nativeWidget READ nativeWidget)
	Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)		Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)
	public:		public:
	explicit RadioButton(QGraphicsWidget *parent = 0);		explicit RadioButton(QGraphicsWidget *parent = 0);
	~RadioButton();		~RadioButton();
	/**		/**
	* Sets the display text for this RadioButton		* Sets the display text for this RadioButton
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @param path the path to the image; if a relative path, then a themed image will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Radio Button		* Sets the stylesheet used to control the visual display of this Radio Button
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this RadioButton		* @return the native widget wrapped by this RadioButton
	*/		*/
	QRadioButton *nativeWidget() const;		QRadioButton *nativeWidget() const;
	/**		/**
	* Sets the checked state.		* Sets the checked state.
	*		*
	* @arg checked true if checked, false if not		* @param checked true if checked, false if not
	*/		*/
	void setChecked(bool checked);		void setChecked(bool checked);
	/**		/**
	* @return the checked state		* @return the checked state
	*/		*/
	bool isChecked() const;		bool isChecked() const;
	Q_SIGNALS:		Q_SIGNALS:
	void toggled(bool);		void toggled(bool);
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	renamedialog.h		renamedialog.h
	skipping to change at line 117		skipping to change at line 117
	* @return an automatically renamed destination		* @return an automatically renamed destination
	* @since 4.5		* @since 4.5
	* valid always		* valid always
	*/		*/
	KUrl autoDestUrl() const;		KUrl autoDestUrl() const;
	/**		/**
	* Given a directory path and a filename (which usually exists already) ,		* Given a directory path and a filename (which usually exists already) ,
	* this function returns a suggested name for a file that doesn't exist		* this function returns a suggested name for a file that doesn't exist
	* in that directory. The existence is only checked for local urls thou gh.		* in that directory. The existence is only checked for local urls thou gh.
	* The suggested file name is of the form foo_1 foo_2 etc.		* The suggested file name is of the form "foo 1", "foo 2" etc.
	*/		*/
	static QString suggestName(const KUrl& baseURL, const QString& oldName) ;		static QString suggestName(const KUrl& baseURL, const QString& oldName) ;
	public Q_SLOTS:		public Q_SLOTS:
	void cancelPressed();		void cancelPressed();
	void renamePressed();		void renamePressed();
	void skipPressed();		void skipPressed();
	void autoSkipPressed();		void autoSkipPressed();
	void overwritePressed();		void overwritePressed();
	void overwriteAllPressed();		void overwriteAllPressed();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	runnercontext.h		runnercontext.h
	skipping to change at line 149		skipping to change at line 149
	*/		*/
	// trueg: what do we need the term for? It is stored in the context anyway! Plus: matches() does not have a term parameter!		// trueg: what do we need the term for? It is stored in the context anyway! Plus: matches() does not have a term parameter!
	// plus: it is Q_UNUSED		// plus: it is Q_UNUSED
	bool addMatches(const QString &term, const QList<QueryMatch> &match es);		bool addMatches(const QString &term, const QList<QueryMatch> &match es);
	/**		/**
	* Appends a match to the existing list of matches.		* Appends a match to the existing list of matches.
	*		*
	* If you are going to be adding multiple matches, use addMatches i nstead.		* If you are going to be adding multiple matches, use addMatches i nstead.
	*		*
	* @arg term the search term that this match was generated for.		* @param term the search term that this match was generated for.
	* @arg match the match to add		* @param match the match to add
	*		*
	* @return true if the match was added, false otherwise.		* @return true if the match was added, false otherwise.
	*/		*/
	// trueg: what do we need the term for? It is stored in the context anyway! Plus: matches() does not have a term parameter!		// trueg: what do we need the term for? It is stored in the context anyway! Plus: matches() does not have a term parameter!
	// plus: it is Q_UNUSED		// plus: it is Q_UNUSED
	bool addMatch(const QString &term, const QueryMatch &match);		bool addMatch(const QString &term, const QueryMatch &match);
	/**		/**
	* Removes a match from the existing list of matches.		* Removes a match from the existing list of matches.
	*		*
	* If you are going to be removing multiple matches, use removeMatc hes instead.		* If you are going to be removing multiple matches, use removeMatc hes instead.
	*		*
	* @arg matchId the id of match to remove		* @param matchId the id of match to remove
	*		*
	* @return true if the match was removed, false otherwise.		* @return true if the match was removed, false otherwise.
	* @since 4.4		* @since 4.4
	*/		*/
	bool removeMatch(const QString matchId);		bool removeMatch(const QString matchId);
	/**		/**
	* Removes lists of matches from the existing list of matches.		* Removes lists of matches from the existing list of matches.
	*		*
	* This method is thread safe and causes the matchesChanged() signa l to be emitted.		* This method is thread safe and causes the matchesChanged() signa l to be emitted.
	*		*
	* @arg matchIdList the list of matches id to remove		* @param matchIdList the list of matches id to remove
	*		*
	* @return true if at least one match was removed, false otherwise.		* @return true if at least one match was removed, false otherwise.
	* @since 4.4		* @since 4.4
	*/		*/
	bool removeMatches(const QStringList matchIdList);		bool removeMatches(const QStringList matchIdList);
	/**		/**
	* Retrieves all available matches for the current search term.		* Retrieves all available matches for the current search term.
	*		*
	* @return a list of matches		* @return a list of matches
End of changes. 3 change blocks.
	4 lines changed or deleted		4 lines changed or added

	runnermanager.h		runnermanager.h
	skipping to change at line 60		skipping to change at line 60
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	explicit RunnerManager(QObject *parent=0);		explicit RunnerManager(QObject *parent=0);
	explicit RunnerManager(KConfigGroup &config, QObject *parent=0);		explicit RunnerManager(KConfigGroup &config, QObject *parent=0);
	~RunnerManager();		~RunnerManager();
	/**		/**
	* Finds and returns a loaded runner or NULL		* Finds and returns a loaded runner or NULL
	* @arg name the name of the runner		* @param name the name of the runner
	* @return Pointer to the runner		* @return Pointer to the runner
	*/		*/
	AbstractRunner *runner(const QString &name) const;		AbstractRunner *runner(const QString &name) const;
	/**		/**
	* @return the currently active "single mode" runner, or null if no ne		* @return the currently active "single mode" runner, or null if no ne
	* @since 4.4		* @since 4.4
	*/		*/
	AbstractRunner *singleModeRunner() const;		AbstractRunner *singleModeRunner() const;
	/**		/**
	* Puts the manager into "single runner" mode using the given		* Puts the manager into "single runner" mode using the given
	* runner; if the runner does not exist or can not be loaded then		* runner; if the runner does not exist or can not be loaded then
	* the single runner mode will not be started and singleModeRunner( )		* the single runner mode will not be started and singleModeRunner( )
	* will return NULL		* will return NULL
	* @arg id the id of the runner to use		* @param id the id of the runner to use
	* @since 4.4		* @since 4.4
	*/		*/
	void setSingleModeRunnerId(const QString &id);		void setSingleModeRunnerId(const QString &id);
	/**		/**
	* @return the id of the runner to use in single mode		* @return the id of the runner to use in single mode
	* @since 4.4		* @since 4.4
	*/		*/
	QString singleModeRunnerId() const;		QString singleModeRunnerId() const;
	/**		/**
	* @return true if the manager is set to run in single runner mode		* @return true if the manager is set to run in single runner mode
	* @since 4.4		* @since 4.4
	*/		*/
	bool singleMode() const;		bool singleMode() const;
	/**		/**
	* Sets whether or not the manager is in single mode.		* Sets whether or not the manager is in single mode.
	*		*
	* @arg singleMode true if the manager should be in single mode, fa lse otherwise		* @param singleMode true if the manager should be in single mode, false otherwise
	* @since 4.4		* @since 4.4
	*/		*/
	void setSingleMode(bool singleMode);		void setSingleMode(bool singleMode);
	/**		/**
	* Returns the translated name of a runner		* Returns the translated name of a runner
	* @arg id the id of the runner		* @param id the id of the runner
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	QString runnerName(const QString &id) const;		QString runnerName(const QString &id) const;
	/**		/**
	* @return the list of all currently loaded runners		* @return the list of all currently loaded runners
	*/		*/
	QList<AbstractRunner *> runners() const;		QList<AbstractRunner *> runners() const;
	skipping to change at line 134		skipping to change at line 134
	RunnerContext *searchContext() const;		RunnerContext *searchContext() const;
	/**		/**
	* Retrieves all available matches found so far for the previously launched query		* Retrieves all available matches found so far for the previously launched query
	* @return List of matches		* @return List of matches
	*/		*/
	QList<QueryMatch> matches() const;		QList<QueryMatch> matches() const;
	/**		/**
	* Runs a given match		* Runs a given match
	* @arg match the match to be executed		* @param match the match to be executed
	*/		*/
	void run(const QueryMatch &match);		void run(const QueryMatch &match);
	/**		/**
	* Runs a given match		* Runs a given match
	* @arg id the id of the match to run		* @param id the id of the match to run
	*/		*/
	void run(const QString &id);		void run(const QString &id);
	/**		/**
	* Retrieves the list of actions, if any, for a match		* Retrieves the list of actions, if any, for a match
	*/		*/
	QList<QAction*> actionsForMatch(const QueryMatch &match);		QList<QAction*> actionsForMatch(const QueryMatch &match);
	/**		/**
	* @return the current query term		* @return the current query term
	skipping to change at line 162		skipping to change at line 162
	QString query() const;		QString query() const;
	/**		/**
	* Causes a reload of the current configuration		* Causes a reload of the current configuration
	*/		*/
	void reloadConfiguration();		void reloadConfiguration();
	/**		/**
	* Sets a whitelist for the plugins that can be loaded		* Sets a whitelist for the plugins that can be loaded
	*		*
	* @arg plugins the plugin names of allowed runners		* @param plugins the plugin names of allowed runners
	* @since 4.4		* @since 4.4
	*/		*/
	void setAllowedRunners(const QStringList &runners);		void setAllowedRunners(const QStringList &runners);
	/**		/**
	* Attempts to add the AbstractRunner plugin represented		* Attempts to add the AbstractRunner plugin represented
	* by the KService passed in. Usually one can simply let		* by the KService passed in. Usually one can simply let
	* the configuration of plugins handle loading Runner plugins,		* the configuration of plugins handle loading Runner plugins,
	* but in cases where specific runners should be loaded this		* but in cases where specific runners should be loaded this
	* allows for that to take place		* allows for that to take place
	*		*
	* @arg service the service to use to load the plugin		* @param service the service to use to load the plugin
	* @since 4.5		* @since 4.5
	*/		*/
	void loadRunner(const KService::Ptr service);		void loadRunner(const KService::Ptr service);
	/**		/**
	* Attempts to add the AbstractRunner from a Plasma::Package on dis k.		* Attempts to add the AbstractRunner from a Plasma::Package on dis k.
	* Usually one can simply let the configuration of plugins		* Usually one can simply let the configuration of plugins
	* handle loading Runner plugins, but in cases where specific		* handle loading Runner plugins, but in cases where specific
	* runners should be loaded this allows for that to take place		* runners should be loaded this allows for that to take place
	*		*
	* @arg path the path to a Runner package to load		* @param path the path to a Runner package to load
	* @since 4.5		* @since 4.5
	*/		*/
	void loadRunner(const QString &path);		void loadRunner(const QString &path);
	/**		/**
	* @return the list of allowed plugins		* @return the list of allowed plugins
	* @since 4.4		* @since 4.4
	*/		*/
	QStringList allowedRunners() const;		QStringList allowedRunners() const;
	skipping to change at line 244		skipping to change at line 244
	* @since 4.4		* @since 4.4
	* @see prepareForMatchSession		* @see prepareForMatchSession
	*/		*/
	void matchSessionComplete();		void matchSessionComplete();
	/**		/**
	* Launch a query, this will create threads and return inmediately.		* Launch a query, this will create threads and return inmediately.
	* When the information will be available can be known using the		* When the information will be available can be known using the
	* matchesChanged signal.		* matchesChanged signal.
	*		*
	* @arg term the term we want to find matches for		* @param term the term we want to find matches for
	* @arg runnerId optional, if only one specific runner is to be use		* @param runnerId optional, if only one specific runner is to be u
	d;		sed;
	* providing an id will put the manager into single r unner mode		* providing an id will put the manager into single r unner mode
	*/		*/
	void launchQuery(const QString &term, const QString &runnerId);		void launchQuery(const QString &term, const QString &runnerId);
	/**		/**
	* Convenience version of above		* Convenience version of above
	*/		*/
	void launchQuery(const QString &term);		void launchQuery(const QString &term);
	/**		/**
	* Execute a query, this method will only return when the query is executed		* Execute a query, this method will only return when the query is executed
	* This means that the method may be dangerous as it wait a variabl e amount		* This means that the method may be dangerous as it wait a variabl e amount
	* of time for the runner to finish.		* of time for the runner to finish.
	* The runner parameter is mandatory, to avoid launching unwanted r unners.		* The runner parameter is mandatory, to avoid launching unwanted r unners.
	* @arg term the term we want to find matches for		* @param term the term we want to find matches for
	* @arg runner the runner we will use, it is mandatory		* @param runner the runner we will use, it is mandatory
	* @return 0 if nothing was launched, 1 if launched.		* @return 0 if nothing was launched, 1 if launched.
	*/		*/
	bool execQuery(const QString &term, const QString &runnerName);		bool execQuery(const QString &term, const QString &runnerName);
	/**		/**
	* Convenience version of above		* Convenience version of above
	*/		*/
	bool execQuery(const QString &term);		bool execQuery(const QString &term);
	/**		/**
End of changes. 11 change blocks.
	14 lines changed or deleted		14 lines changed or added

	runnersyntax.h		runnersyntax.h
	skipping to change at line 46		skipping to change at line 46
	* created and registered with AbstractRunner::addSyntax(Syntax &) to		* created and registered with AbstractRunner::addSyntax(Syntax &) to
	* allow applications to show to the user what the runner is currently		* allow applications to show to the user what the runner is currently
	* capable of doing		* capable of doing
	*/		*/
	class PLASMA_EXPORT RunnerSyntax		class PLASMA_EXPORT RunnerSyntax
	{		{
	public:		public:
	/**		/**
	* Constructs a simple syntax object		* Constructs a simple syntax object
	*		*
	* @arg exampleQuery an example of the query, with :q: placed where ver		* @param exampleQuery an example of the query, with :q: placed whe rever
	* search term text might appear. e.g. if the run ner		* search term text might appear. e.g. if the run ner
	* accepts "keyword some random text" then the va lue		* accepts "keyword some random text" then the va lue
	* of this parameter should be "keyword :q:"		* of this parameter should be "keyword :q:"
	* @arg descrition A description of what the described syntax does from		* @param descrition A description of what the described syntax doe s from
	* the user's point of view.		* the user's point of view.
	*/		*/
	RunnerSyntax(const QString &exampleQuery, const QString &descriptio n);		RunnerSyntax(const QString &exampleQuery, const QString &descriptio n);
	/**		/**
	* Copy constructor		* Copy constructor
	*/		*/
	RunnerSyntax(const RunnerSyntax &other);		RunnerSyntax(const RunnerSyntax &other);
	~RunnerSyntax();		~RunnerSyntax();
	skipping to change at line 73		skipping to change at line 73
	* Assignment operator		* Assignment operator
	*/		*/
	RunnerSyntax &operator=(const RunnerSyntax &rhs);		RunnerSyntax &operator=(const RunnerSyntax &rhs);
	/**		/**
	* Adds a synonymous example query to this Syntax. Some runners may		* Adds a synonymous example query to this Syntax. Some runners may
	* accept multiple formulations of keywords to trigger the same beh aviour.		* accept multiple formulations of keywords to trigger the same beh aviour.
	* This allows the runner to show these relationships by grouping t he		* This allows the runner to show these relationships by grouping t he
	* example queries into one Syntax object		* example queries into one Syntax object
	*		*
	* @arg exampleQuery an example of the query, with :q: placed where ver		* @param exampleQuery an example of the query, with :q: placed whe rever
	* search term text might appear. e.g. if the run ner		* search term text might appear. e.g. if the run ner
	* accepts "keyword some random text" then the va lue		* accepts "keyword some random text" then the va lue
	* of this parameter should be "keyword :q:"		* of this parameter should be "keyword :q:"
	*/		*/
	void addExampleQuery(const QString &exampleQuery);		void addExampleQuery(const QString &exampleQuery);
	/**		/**
	* @return the example queries associated with this Syntax object		* @return the example queries associated with this Syntax object
	*/		*/
	QStringList exampleQueries() const;		QStringList exampleQueries() const;
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	scheduler.h		scheduler.h
	skipping to change at line 36		skipping to change at line 36
	#include "kio/jobclasses.h"		#include "kio/jobclasses.h"
	#include <QtCore/QTimer>		#include <QtCore/QTimer>
	#include <QtCore/QMap>		#include <QtCore/QMap>
	#include <QtGui/QWidgetList>		#include <QtGui/QWidgetList>
	#include <sys/types.h> // pid_t		#include <sys/types.h> // pid_t
	namespace KIO {		namespace KIO {
	class Slave;		class Slave;
	class SlaveConfig;		class SlaveConfig;
	class SessionData;
	class SchedulerPrivate;		class SchedulerPrivate;
	/**		/**
	* The KIO::Scheduler manages io-slaves for the application.		* The KIO::Scheduler manages io-slaves for the application.
	* It also queues jobs and assigns the job to a slave when one		* It also queues jobs and assigns the job to a slave when one
	* becomes available.		* becomes available.
	*		*
	* There are 3 possible ways for a job to get a slave:		* There are 3 possible ways for a job to get a slave:
	*		*
	* <h3>1. Direct</h3>		* <h3>1. Direct</h3>
	skipping to change at line 270		skipping to change at line 269
	/**		/**
	* When true, the next job will check whether KLauncher has a slave		* When true, the next job will check whether KLauncher has a slave
	* on hold that is suitable for the job.		* on hold that is suitable for the job.
	* @param b true when KLauncher has a job on hold		* @param b true when KLauncher has a job on hold
	*/		*/
	static void checkSlaveOnHold(bool b);		static void checkSlaveOnHold(bool b);
	static void emitReparseSlaveConfiguration();		static void emitReparseSlaveConfiguration();
	/**		/**
			* Returns true if there is a slave on hold for @p url.
			*
			* @since 4.7
			*/
			static bool isSlaveOnHoldFor(const KUrl& url);
			/**
	* Updates the internal metadata from job.		* Updates the internal metadata from job.
	*		*
	* @since 4.6.5		* @since 4.6.5
	*/		*/
	static void updateInternalMetaData(SimpleJob* job);		static void updateInternalMetaData(SimpleJob* job);
	Q_SIGNALS:		Q_SIGNALS:
	void slaveConnected(KIO::Slave *slave);		void slaveConnected(KIO::Slave *slave);
	void slaveError(KIO::Slave *slave, int error, const QString &errorM sg);		void slaveError(KIO::Slave *slave, int error, const QString &errorM sg);
	// DBUS		// DBUS
	Q_SCRIPTABLE void reparseSlaveConfiguration(const QString &);		Q_SCRIPTABLE void reparseSlaveConfiguration(const QString &);
			Q_SCRIPTABLE void slaveOnHoldListChanged();
	private:		private:
	Q_DISABLE_COPY(Scheduler)		Q_DISABLE_COPY(Scheduler)
	Scheduler();		Scheduler();
	~Scheduler();		~Scheduler();
	static Scheduler *self();		static Scheduler *self();
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveDied(KIO::Slave *sla		Q_PRIVATE_SLOT(d_func(), void slotSlaveDied(KIO::Slave *slave))
	ve))		Q_PRIVATE_SLOT(d_func(), void slotSlaveStatus(pid_t pid, const QByt
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveStatus(pid_t pid, co		eArray &protocol,
	nst QByteArray &protocol,
	const QString &host, bool co nnected))		const QString &host, bool co nnected))
	// connected to D-Bus signal:		// connected to D-Bus signal:
	Q_PRIVATE_SLOT(schedulerPrivate, void slotReparseSlaveConfiguration		Q_PRIVATE_SLOT(d_func(), void slotReparseSlaveConfiguration(const Q
	(const QString &, const QDBusMessage&))		String &, const QDBusMessage&))
			Q_PRIVATE_SLOT(d_func(), void slotSlaveOnHoldListChanged())
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveConnected())		Q_PRIVATE_SLOT(d_func(), void slotSlaveConnected())
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveError(int error, con		Q_PRIVATE_SLOT(d_func(), void slotSlaveError(int error, const QStri
	st QString &errorMsg))		ng &errorMsg))
	Q_PRIVATE_SLOT(schedulerPrivate, void slotUnregisterWindow(QObject		Q_PRIVATE_SLOT(d_func(), void slotUnregisterWindow(QObject *))
	*))
	private:		private:
	friend class SchedulerPrivate;		friend class SchedulerPrivate;
	SchedulerPrivate *const d;		SchedulerPrivate *const removeMe; // for BC only, KDE5: remove
			SchedulerPrivate *d_func();
	};		};
	}		}
	#endif		#endif
End of changes. 7 change blocks.
	13 lines changed or deleted		20 lines changed or added

	scriptengine.h		scriptengine.h
	skipping to change at line 97		skipping to change at line 97
	* be used to request resources, such as images and		* be used to request resources, such as images and
	* interface files.		* interface files.
	*/		*/
	virtual const Package *package() const;		virtual const Package *package() const;
	private:		private:
	ScriptEnginePrivate *const d;		ScriptEnginePrivate *const d;
	};		};
	/**		/**
	* @arg types a set of ComponentTypes flags for which to look up the		* @param types a set of ComponentTypes flags for which to look up the
	* language support for		* language support for
	* @return a list of all supported languages for the given type(s).		* @return a list of all supported languages for the given type(s).
	**/		**/
	PLASMA_EXPORT QStringList knownLanguages(ComponentTypes types);		PLASMA_EXPORT QStringList knownLanguages(ComponentTypes types);
	/**		/**
	* Loads an Applet script engine for the given language.		* Loads an Applet script engine for the given language.
	*		*
	* @param language the language to load for		* @param language the language to load for
	* @param applet the Plasma::Applet for this script		* @param applet the Plasma::Applet for this script
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	scrollbar.h		scrollbar.h
	skipping to change at line 62		skipping to change at line 62
	public:		public:
	/**		/**
	* Creates a scrollbar; the default orientation is vertical		* Creates a scrollbar; the default orientation is vertical
	*/		*/
	explicit ScrollBar(QGraphicsWidget *parent=0);		explicit ScrollBar(QGraphicsWidget *parent=0);
	~ScrollBar();		~ScrollBar();
	/**		/**
	* Sets the scrollbar minimum and maximum values		* Sets the scrollbar minimum and maximum values
	* @arg min minimum value		* @param min minimum value
	* @arg max maximum value		* @param max maximum value
	*/		*/
	void setRange(int min, int max);		void setRange(int min, int max);
	/**		/**
	* Sets the amount of the single step		* Sets the amount of the single step
	* i.e how much the slider will move when the user press an arrow butto n		* i.e how much the slider will move when the user press an arrow butto n
	* @arg val		* @param val
	*/		*/
	void setSingleStep(int val);		void setSingleStep(int val);
	/**		/**
	* @return the amount of the single step		* @return the amount of the single step
	*/		*/
	int singleStep();		int singleStep();
	/**		/**
	* Sets the amount the slider will scroll when the user press page up o r page down		* Sets the amount the slider will scroll when the user press page up o r page down
	* @arg val		* @param val
	*/		*/
	void setPageStep(int val);		void setPageStep(int val);
	/**		/**
	* @return the amount of the page step		* @return the amount of the page step
	*/		*/
	int pageStep();		int pageStep();
	/**		/**
	* @return the current scrollbar value		* @return the current scrollbar value
	skipping to change at line 106		skipping to change at line 106
	* @return the minimum value bound of this ScrollBar		* @return the minimum value bound of this ScrollBar
	*/		*/
	int minimum() const;		int minimum() const;
	/**		/**
	* @return the maximum value bound of this ScrollBar		* @return the maximum value bound of this ScrollBar
	*/		*/
	int maximum() const;		int maximum() const;
	/**		/**
	* @arg the minimum value bound of this ScrollBar		* @param the minimum value bound of this ScrollBar
	* @since 4.6		* @since 4.6
	*/		*/
	void setMinimum(const int min) const;		void setMinimum(const int min) const;
	/**		/**
	* @arg the maximum value bound of this ScrollBar		* @param the maximum value bound of this ScrollBar
	* @since 4.6		* @since 4.6
	*/		*/
	void setMaximum(const int max) const;		void setMaximum(const int max) const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Scrol lBar		* Sets the stylesheet used to control the visual display of this Scrol lBar
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this ScrollBar		* @return the native widget wrapped by this ScrollBar
	skipping to change at line 146		skipping to change at line 146
	* @since 4.4		* @since 4.4
	*/		*/
	Qt::Orientation orientation() const;		Qt::Orientation orientation() const;
	protected:		protected:
	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);		void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the current value for the ScrollBar		* Sets the current value for the ScrollBar
	* @arg value must be minimum() <= value <= maximum()		* @param value must be minimum() <= value <= maximum()
	*/		*/
	void setValue(int val);		void setValue(int val);
	/**		/**
	* Sets the orientation of the ScrollBar.		* Sets the orientation of the ScrollBar.
	*/		*/
	void setOrientation(Qt::Orientation orientation);		void setOrientation(Qt::Orientation orientation);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
End of changes. 7 change blocks.
	8 lines changed or deleted		8 lines changed or added

	scrollwidget.h		scrollwidget.h
	skipping to change at line 62		skipping to change at line 62
	Q_PROPERTY(QSizeF snapSize READ snapSize WRITE setSnapSize)		Q_PROPERTY(QSizeF snapSize READ snapSize WRITE setSnapSize)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)		Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
	Q_PROPERTY(bool overShoot READ hasOverShoot WRITE setOverShoot)		Q_PROPERTY(bool overShoot READ hasOverShoot WRITE setOverShoot)
	public:		public:
	/**		/**
	* Constructs a new ScrollWidget		* Constructs a new ScrollWidget
	*		*
	* @arg parent the parent of this widget		* @param parent the parent of this widget
	*/		*/
	explicit ScrollWidget(QGraphicsWidget *parent = 0);		explicit ScrollWidget(QGraphicsWidget *parent = 0);
	explicit ScrollWidget(QGraphicsItem *parent);		explicit ScrollWidget(QGraphicsItem *parent);
	~ScrollWidget();		~ScrollWidget();
	/**		/**
	* Sets the widget this ScrollWidget will contain		* Sets the widget this ScrollWidget will contain
	* ownership is transferred to this scrollwidget,		* ownership is transferred to this scrollwidget,
	* if an old one was already in, it will be deleted.		* if an old one was already in, it will be deleted.
	* If the widget size policy allows for horizontal and/or vertical expa nsion,		* If the widget size policy allows for horizontal and/or vertical expa nsion,
	* it will be resized when possible, otherwise it will be kept to which ever		* it will be resized when possible, otherwise it will be kept to which ever
	* width the widget resizes itself.		* width the widget resizes itself.
	*		*
	* @arg widget the new main sub widget		* @param widget the new main sub widget
	*/		*/
	void setWidget(QGraphicsWidget *widget);		void setWidget(QGraphicsWidget *widget);
	/**		/**
	* @return the main widget		* @return the main widget
	*/		*/
	QGraphicsWidget *widget() const;		QGraphicsWidget *widget() const;
	/**		/**
	* Sets the alignment for the inner widget.		* Sets the alignment for the inner widget.
	skipping to change at line 116		skipping to change at line 116
	/**		/**
	* @return true if overshoot is enabled		* @return true if overshoot is enabled
	* @since 4.5		* @since 4.5
	*/		*/
	bool hasOverShoot() const;		bool hasOverShoot() const;
	/**		/**
	* Sets the horizontal scrollbar policy		* Sets the horizontal scrollbar policy
	*		*
	* @arg policy desired policy		* @param policy desired policy
	*/		*/
	void setHorizontalScrollBarPolicy(const Qt::ScrollBarPolicy policy);		void setHorizontalScrollBarPolicy(const Qt::ScrollBarPolicy policy);
	/**		/**
	* @return the horizontal scrollbar policy		* @return the horizontal scrollbar policy
	*/		*/
	Qt::ScrollBarPolicy horizontalScrollBarPolicy() const;		Qt::ScrollBarPolicy horizontalScrollBarPolicy() const;
	/**		/**
	* Sets the vertical scrollbar policy		* Sets the vertical scrollbar policy
	*		*
	* @arg policy desired policy		* @param policy desired policy
	*/		*/
	void setVerticalScrollBarPolicy(const Qt::ScrollBarPolicy policy);		void setVerticalScrollBarPolicy(const Qt::ScrollBarPolicy policy);
	/**		/**
	* @return the vertical scrollbar policy		* @return the vertical scrollbar policy
	*/		*/
	Qt::ScrollBarPolicy verticalScrollBarPolicy() const;		Qt::ScrollBarPolicy verticalScrollBarPolicy() const;
	/**		/**
	* @return true if the widget shows borders when the inner widget		* @return true if the widget shows borders when the inner widget
	skipping to change at line 227		skipping to change at line 227
	/**		/**
	* @return the position of the internal widget relative to this widget		* @return the position of the internal widget relative to this widget
	* @since 4.4		* @since 4.4
	*/		*/
	QPointF scrollPosition() const;		QPointF scrollPosition() const;
	/**		/**
	* Set the nap size of the kinetic scrolling:		* Set the nap size of the kinetic scrolling:
	* the scrolling will always stop at multiples of that size.		* the scrolling will always stop at multiples of that size.
	*		*
	* @arg the desired snap size		* @param the desired snap size
	* @since 4.5		* @since 4.5
	*/		*/
	void setSnapSize(const QSizeF &size);		void setSnapSize(const QSizeF &size);
	/**		/**
	* @return the snap size of the kinetic scrolling		* @return the snap size of the kinetic scrolling
	* @since 4.5		* @since 4.5
	*/		*/
	QSizeF snapSize() const;		QSizeF snapSize() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Scrol lWidget		* Sets the stylesheet used to control the visual display of this Scrol lWidget
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet() const;		QString styleSheet() const;
	/**		/**
	* @return the native widget wrapped by this ScrollWidget		* @return the native widget wrapped by this ScrollWidget
End of changes. 6 change blocks.
	6 lines changed or deleted		6 lines changed or added

	service.h		service.h
	skipping to change at line 136		skipping to change at line 136
	/**		/**
	* Used to access a service from an url. Always check for the signal se rviceReady() that fires		* Used to access a service from an url. Always check for the signal se rviceReady() that fires
	* when this service is actually ready for use.		* when this service is actually ready for use.
	*/		*/
	static Service *access(const KUrl &url, QObject *parent = 0);		static Service *access(const KUrl &url, QObject *parent = 0);
	/**		/**
	* Sets the destination for this Service to operate on		* Sets the destination for this Service to operate on
	*		*
	* @arg destination specific to each Service, this sets which		* @param destination specific to each Service, this sets which
	* target or address for ServiceJobs to operate on		* target or address for ServiceJobs to operate on
	*/		*/
	Q_INVOKABLE void setDestination(const QString &destination);		Q_INVOKABLE void setDestination(const QString &destination);
	/**		/**
	* @return the target destination, if any, that this service is associa ted with		* @return the target destination, if any, that this service is associa ted with
	*/		*/
	Q_INVOKABLE QString destination() const;		Q_INVOKABLE QString destination() const;
	/**		/**
	skipping to change at line 227		skipping to change at line 227
	* on this service.		* on this service.
	*		*
	* This will not change the enabled state of the widget.		* This will not change the enabled state of the widget.
	*		*
	* @param widget the QGraphicsWidget to disassociate.		* @param widget the QGraphicsWidget to disassociate.
	*/		*/
	Q_INVOKABLE void disassociateWidget(QGraphicsWidget *widget);		Q_INVOKABLE void disassociateWidget(QGraphicsWidget *widget);
	/**		/**
	* @return a parameter map for the given description		* @return a parameter map for the given description
	* @arg description the configuration values to turn into the parameter map		* @param description the configuration values to turn into the paramet er map
	* @since 4.4		* @since 4.4
	*/		*/
	Q_INVOKABLE QMap<QString, QVariant> parametersFromDescription(const KCo nfigGroup &description);		Q_INVOKABLE QMap<QString, QVariant> parametersFromDescription(const KCo nfigGroup &description);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when a job associated with this Service completes its task		* Emitted when a job associated with this Service completes its task
	*/		*/
	void finished(Plasma::ServiceJob *job);		void finished(Plasma::ServiceJob *job);
	skipping to change at line 254		skipping to change at line 254
	/**		/**
	* Emitted when this service is ready for use		* Emitted when this service is ready for use
	*/		*/
	void serviceReady(Plasma::Service *service);		void serviceReady(Plasma::Service *service);
	protected:		protected:
	/**		/**
	* Default constructor		* Default constructor
	*		*
	* @arg parent the parent object for this service		* @param parent the parent object for this service
	*/		*/
	explicit Service(QObject *parent = 0);		explicit Service(QObject *parent = 0);
	/**		/**
	* Constructor for plugin loading		* Constructor for plugin loading
	*/		*/
	Service(QObject *parent, const QVariantList &args);		Service(QObject *parent, const QVariantList &args);
	/**		/**
	* Called when a job should be created by the Service.		* Called when a job should be created by the Service.
	skipping to change at line 291		skipping to change at line 291
	/**		/**
	* Sets the XML used to define the operation schema for		* Sets the XML used to define the operation schema for
	* this Service.		* this Service.
	*/		*/
	void setOperationsScheme(QIODevice *xml);		void setOperationsScheme(QIODevice *xml);
	/**		/**
	* Sets the name of the Service; useful for Services not loaded from pl ugins,		* Sets the name of the Service; useful for Services not loaded from pl ugins,
	* which use the plugin name for this.		* which use the plugin name for this.
	*		*
	* @arg name the name to use for this service		* @param name the name to use for this service
	*/		*/
	void setName(const QString &name);		void setName(const QString &name);
	/**		/**
	* Enables a given service by name		* Enables a given service by name
	*		*
	* @param operation the name of the operation to enable or disable		* @param operation the name of the operation to enable or disable
	* @param enable true if the operation should be enabld, false if disab led		* @param enable true if the operation should be enabld, false if disab led
	*/		*/
	void setOperationEnabled(const QString &operation, bool enable);		void setOperationEnabled(const QString &operation, bool enable);
	skipping to change at line 321		skipping to change at line 321
	friend class DataEnginePrivate;		friend class DataEnginePrivate;
	friend class GetSource;		friend class GetSource;
	friend class PackagePrivate;		friend class PackagePrivate;
	friend class ServiceProvider;		friend class ServiceProvider;
	friend class RemoveService;		friend class RemoveService;
	friend class PluginLoader;		friend class PluginLoader;
	};		};
	} // namespace Plasma		} // namespace Plasma
			Q_DECLARE_METATYPE(Plasma::Service *)
	/**		/**
	* Register a service when it is contained in a loadable module		* Register a service when it is contained in a loadable module
	*/		*/
	#define K_EXPORT_PLASMA_SERVICE(libname, classname) \		#define K_EXPORT_PLASMA_SERVICE(libname, classname) \
	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \		K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
	K_EXPORT_PLUGIN(factory("plasma_service_" #libname)) \		K_EXPORT_PLUGIN(factory("plasma_service_" #libname)) \
	K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)		K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 5 change blocks.
	4 lines changed or deleted		6 lines changed or added

	serviceaccessjob.h		serviceaccessjob.h
	skipping to change at line 55		skipping to change at line 55
	public:		public:
	~ServiceAccessJob();		~ServiceAccessJob();
	Service *service() const;		Service *service() const;
	protected:		protected:
	/**		/**
	* Default constructor		* Default constructor
	*		*
	* @arg location the location of the service		* @param location the location of the service
	* @arg parent the parent object for this service		* @param parent the parent object for this service
	*/		*/
	ServiceAccessJob(KUrl location, QObject *parent = 0);		ServiceAccessJob(KUrl location, QObject *parent = 0);
	void start();		void start();
	private:		private:
	Q_PRIVATE_SLOT(d, void slotStart())		Q_PRIVATE_SLOT(d, void slotStart())
	Q_PRIVATE_SLOT(d, void slotServiceReady())		Q_PRIVATE_SLOT(d, void slotServiceReady())
	ServiceAccessJobPrivate * const d;		ServiceAccessJobPrivate * const d;
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	servicejob.h		servicejob.h
	skipping to change at line 65		skipping to change at line 65
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QString destination READ destination)		Q_PROPERTY(QString destination READ destination)
	Q_PROPERTY(QString operationName READ operationName)		Q_PROPERTY(QString operationName READ operationName)
	Q_PROPERTY(QVariant result READ result)		Q_PROPERTY(QVariant result READ result)
	public:		public:
	/**		/**
	* Default constructor		* Default constructor
	*		*
	* @arg destination the subject that the job is acting on		* @param destination the subject that the job is acting on
	* @arg operation the action that the job is performing on the @p des		* @param operation the action that the job is performing on the @p d
	tination		estination
	* @arg parameters the parameters of the @p action		* @param parameters the parameters of the @p action
	* @arg parent the parent object for this service		* @param parent the parent object for this service
	*/		*/
	ServiceJob(const QString &destination, const QString &operation,		ServiceJob(const QString &destination, const QString &operation,
	const QMap<QString, QVariant> &parameters, QObject *parent = 0);		const QMap<QString, QVariant> &parameters, QObject *parent = 0);
	/**		/**
	* Destructor		* Destructor
	*/		*/
	~ServiceJob();		~ServiceJob();
	/**		/**
	skipping to change at line 124		skipping to change at line 124
	*/		*/
	Q_INVOKABLE virtual void start();		Q_INVOKABLE virtual void start();
	protected:		protected:
	/**		/**
	* Sets the result for an operation.		* Sets the result for an operation.
	*/		*/
	void setResult(const QVariant &result);		void setResult(const QVariant &result);
	private:		private:
	Q_PRIVATE_SLOT(d, void slotStart())		Q_PRIVATE_SLOT(d, void autoStart())
			Q_PRIVATE_SLOT(d, void preventAutoStart())
	ServiceJobPrivate * const d;		ServiceJobPrivate * const d;
	friend class ServiceProvider;		friend class ServiceProvider;
	friend class RemoteServiceJob;		friend class RemoteServiceJob;
	};		};
	} // namespace Plasma		} // namespace Plasma
			Q_DECLARE_METATYPE(Plasma::ServiceJob *)
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 3 change blocks.
	6 lines changed or deleted		9 lines changed or added

	sessiondata.h		sessiondata.h
	skipping to change at line 29		skipping to change at line 29
	*/		*/
	#ifndef KIO_SESSIONDATA_H		#ifndef KIO_SESSIONDATA_H
	#define KIO_SESSIONDATA_H		#define KIO_SESSIONDATA_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <kio/global.h>		#include <kio/global.h>
	namespace KIO {		namespace KIO {
			// KDE5 TODO: remove the KIO_EXPORT and rename to _p.h, this is really inte
			rnal only
	/**		/**
	* @internal		* @internal
	*/		*/
	class KIO_EXPORT SessionData : public QObject		class KIO_EXPORT SessionData : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	SessionData();		SessionData();
	~SessionData();		~SessionData();
	virtual void configDataFor( KIO::MetaData &configData, const QString &p roto,		virtual void configDataFor( KIO::MetaData &configData, const QString &p roto,
	const QString &host );		const QString &host );
	virtual void reset();		virtual void reset();
	struct AuthData;		// struct AuthData;
	private:		private:
	class AuthDataList;		class AuthDataList;
	friend class AuthDataList;		friend class AuthDataList;
	// AuthDataList* authData;		// AuthDataList* authData;
	private:		private:
	class SessionDataPrivate;		class SessionDataPrivate;
	SessionDataPrivate* const d;		SessionDataPrivate* const d;
	};		};
End of changes. 2 change blocks.
	1 lines changed or deleted		4 lines changed or added

	slave.h		slave.h
	skipping to change at line 50		skipping to change at line 50
	// Attention developers: If you change the implementation of KIO::Slave,		// Attention developers: If you change the implementation of KIO::Slave,
	// do *not* use connection() or slaveconn but the respective KIO::Slave		// do *not* use connection() or slaveconn but the respective KIO::Slave
	// accessor methods. Otherwise classes derived from Slave might break. (LS)		// accessor methods. Otherwise classes derived from Slave might break. (LS)
	//		//
	// Do not use this class directly, outside of KIO. Only use the Slave point er		// Do not use this class directly, outside of KIO. Only use the Slave point er
	// that is returned by the scheduler for passing it around.		// that is returned by the scheduler for passing it around.
	//		//
	// TODO: KDE5: Separate public API and private stuff for this better		// TODO: KDE5: Separate public API and private stuff for this better
	class KIO_SLAVE_EXPORT Slave : public KIO::SlaveInterface		class KIO_SLAVE_EXPORT Slave : public KIO::SlaveInterface
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	explicit Slave(const QString &protocol, QObject *parent = 0);		explicit Slave(const QString &protocol, QObject *parent = 0);
	virtual ~Slave();		virtual ~Slave();
	void setPID(pid_t);		void setPID(pid_t);
	int slave_pid();		int slave_pid();
	void setJob(KIO::SimpleJob *job);		void setJob(KIO::SimpleJob *job);
	KIO::SimpleJob *job() const;		KIO::SimpleJob *job() const;
	/**		/**
	* Force termination		* Force termination
	*/		*/
	void kill();		void kill();
	skipping to change at line 94		skipping to change at line 93
	* Clear host info.		* Clear host info.
	*/		*/
	void resetHost();		void resetHost();
	/**		/**
	* Configure slave		* Configure slave
	*/		*/
	virtual void setConfig(const MetaData &config);		virtual void setConfig(const MetaData &config);
	/**		/**
	* The protocol this slave handles.		* The protocol this slave handles.
	*		*
	* @return name of protocol handled by this slave, as seen by the user		* @return name of protocol handled by this slave, as seen by the user
	*/		*/
	QString protocol();		QString protocol();
	void setProtocol(const QString & protocol);		void setProtocol(const QString & protocol);
	/**		/**
	* The actual protocol used to handle the request.		* The actual protocol used to handle the request.
	*		*
	* This method will return a different protocol than		* This method will return a different protocol than
	* the one obtained by using protocol() if a		* the one obtained by using protocol() if a
	* proxy-server is used for the given protocol. This		* proxy-server is used for the given protocol. This
	* usually means that this method will return "http"		* usually means that this method will return "http"
	* when the actuall request was to retrieve a resource		* when the actuall request was to retrieve a resource
	* from an "ftp" server by going through a proxy server.		* from an "ftp" server by going through a proxy server.
	*		*
	* @return the actual protocol (io-slave) that handled the request		* @return the actual protocol (io-slave) that handled the request
	*/		*/
	QString slaveProtocol();		QString slaveProtocol();
	/**		/**
	* @return Host this slave is (was?) connected to		* @return Host this slave is (was?) connected to
	*/		*/
	QString host();		QString host();
	/**		/**
	skipping to change at line 135		skipping to change at line 135
	/**		/**
	* @return User this slave is (was?) logged in as		* @return User this slave is (was?) logged in as
	*/		*/
	QString user();		QString user();
	/**		/**
	* @return Passwd used to log in		* @return Passwd used to log in
	*/		*/
	QString passwd();		QString passwd();
	/**		/**
	* Creates a new slave.		* Creates a new slave.
	*		*
	* @param protocol the protocol		* @param protocol the protocol
	* @param url is the url		* @param url is the url
	* @param error is the error code on failure and undefined else.		* @param error is the error code on failure and undefined else.
	* @param error_text is the error text on failure and undefined else		* @param error_text is the error text on failure and undefined else.
	.		*
	*		* @return 0 on failure, or a pointer to a slave otherwise.
	* @return 0 on failure, or a pointer to a slave otherwise.		*/
	*/		static Slave* createSlave( const QString &protocol, const KUrl& url, int&
	static Slave* createSlave( const QString &protocol, const KUrl& url,		error, QString& error_text );
	int& error, QString& error_text );
	/**		/**
	* Requests a slave on hold for ths url, from klauncher, if there is		* Requests a slave on hold for ths url, from klauncher, if there is such
	such a job.		a job.
	* See hold()		* See hold()
	*/		*/
	static Slave* holdSlave( const QString &protocol, const KUrl& url );		static Slave* holdSlave( const QString &protocol, const KUrl& url );
	// == communication with connected kioslave ==		/**
	// whenever possible prefer these methods over the respective		* Returns true if klauncher is holding a slave for @p url.
	// methods in connection()		*
	/**		* @since 4.7
	* Suspends the operation of the attached kioslave.		*/
	*/		static bool checkForHeldSlave(const KUrl& url);
	virtual void suspend();
	/**
	* Resumes the operation of the attached kioslave.
	*/
	virtual void resume();
	/**
	* Tells whether the kioslave is suspended.
	* @return true if the kioslave is suspended.
	*/
	virtual bool suspended();
	/**
	* Sends the given command to the kioslave.
	* @param cmd command id
	* @param arr byte array containing data
	*/
	virtual void send(int cmd, const QByteArray &arr = QByteArray());
	// == end communication with connected kioslave ==		// == communication with connected kioslave ==
	/**		// whenever possible prefer these methods over the respective
	* Puts the kioslave associated with @p url at halt, and return it t		// methods in connection()
	o klauncher, in order		/**
	* to let another application connect to it and finish the job.		* Suspends the operation of the attached kioslave.
	* This is for the krunner case: type a URL in krunner, it will star		*/
	t downloading		virtual void suspend();
	* to find the mimetype (KRun), and then hold the slave, publish the
	held slave using,
	* this method, and the final application can continue the same down
	load by requesting
	* the same URL.
	*/
	virtual void hold(const KUrl &url); // TODO KDE5: no reason to be vi
	rtual
	/**		/**
	* @return The time this slave has been idle.		* Resumes the operation of the attached kioslave.
	*/		*/
	time_t idleTime();		virtual void resume();
	/**		/**
	* Marks this slave as idle.		* Tells whether the kioslave is suspended.
	*/		* @return true if the kioslave is suspended.
	void setIdle();		*/
			virtual bool suspended();
			/**
			* Sends the given command to the kioslave.
			* @param cmd command id
			* @param arr byte array containing data
			*/
			virtual void send(int cmd, const QByteArray &arr = QByteArray());
			// == end communication with connected kioslave ==
			/**
			* Puts the kioslave associated with @p url at halt, and return it to kla
			uncher, in order
			* to let another application connect to it and finish the job.
			* This is for the krunner case: type a URL in krunner, it will start dow
			nloading
			* to find the mimetype (KRun), and then hold the slave, publish the held
			slave using,
			* this method, and the final application can continue the same download
			by requesting
			* the same URL.
			*/
			virtual void hold(const KUrl &url); // TODO KDE5: no reason to be virtual
			/**
			* @return The time this slave has been idle.
			*/
			time_t idleTime();
			/**
			* Marks this slave as idle.
			*/
			void setIdle();
	/*		/*
	* @returns Whether the slave is connected		* @returns Whether the slave is connected
	* (Connection oriented slaves only)		* (Connection oriented slaves only)
	*/		*/
	bool isConnected();		bool isConnected();
	void setConnected(bool c);		void setConnected(bool c);
	void ref();		void ref();
	void deref();		void deref();
	public Q_SLOTS:		public Q_SLOTS:
	void accept();		void accept();
	void gotInput();		void gotInput();
	void timeout();		void timeout();
	Q_SIGNALS:		Q_SIGNALS:
	void slaveDied(KIO::Slave *slave);		void slaveDied(KIO::Slave *slave);
	private:		private:
	Q_DECLARE_PRIVATE(Slave)		Q_DECLARE_PRIVATE(Slave)
	};		};
	}		}
End of changes. 13 change blocks.
	81 lines changed or deleted		89 lines changed or added

	slavebase.h		slavebase.h
	skipping to change at line 730		skipping to change at line 730
	* }		* }
	* \endcode		* \endcode
	*		*
	* \note You should consider using checkCachedAuthentication() to		* \note You should consider using checkCachedAuthentication() to
	* see if the password is available in kpasswdserver before calling		* see if the password is available in kpasswdserver before calling
	* this function.		* this function.
	*		*
	* \note A call to this function can fail and return @p false,		* \note A call to this function can fail and return @p false,
	* if the UIServer could not be started for whatever reason.		* if the UIServer could not be started for whatever reason.
	*		*
			* \note Starting with KDE 4.7, this function will no longer store the
			password
			* information automatically. If you want to store the password informa
			tion in
			* a persistent storage like KWallet, then you MUST call @ref cacheAuth
			entication.
			*
	* @see checkCachedAuthentication		* @see checkCachedAuthentication
	* @param info See AuthInfo.		* @param info See AuthInfo.
	* @param errorMsg Error message to show		* @param errorMsg Error message to show
	* @return @p true if user clicks on "OK", @p false otherwsie.		* @return @p true if user clicks on "OK", @p false otherwsie.
	*/		*/
	bool openPasswordDialog( KIO::AuthInfo& info, const QString &errorMsg = QString() );		bool openPasswordDialog( KIO::AuthInfo& info, const QString &errorMsg = QString() );
	/**		/**
	* Checks for cached authentication based on parameters		* Checks for cached authentication based on parameters
	* given by @p info.		* given by @p info.
	skipping to change at line 767		skipping to change at line 771
	* ....		* ....
	* }		* }
	* \endcode		* \endcode
	*		*
	* @param info See AuthInfo.		* @param info See AuthInfo.
	* @return @p true if cached Authorization is found, false otherwi se.		* @return @p true if cached Authorization is found, false otherwi se.
	*/		*/
	bool checkCachedAuthentication( AuthInfo& info );		bool checkCachedAuthentication( AuthInfo& info );
	/**		/**
	* Explicitly store authentication information. openPasswordDialog alre		* Caches @p info in a persistent storage like KWallet.
	ady		*
	* stores password information automatically, you only need to call		* Starting with KDE 4.7, calling openPasswordDialog will no longer sto
	* this function if you want to store authentication information that		re
	* is different from the information returned by openPasswordDialog.		* passwords automatically for you. This was done to avoid accidental s
			torage
			* of incorrect or invalid password information.
			*
			* Here is a simple example of how to use cacheAuthentication:
			*
			* \code
			* AuthInfo info;
			* info.url = KUrl("http://www.foobar.org/foo/bar");
			* info.username = "somename";
			* info.verifyPath = true;
			* if ( !checkCachedAuthentication( info ) ) {
			* if ( openPasswordDialog(info) ) {
			* if (info.keepPassword) { // user asked password be save/rem
			embered
			* cacheAuthentication(info);
			* }
			* }
			* }
			* \endcode
			*
			* @param info See AuthInfo.
			* @return @p true if @p info was successfully cached.
	*/		*/
	bool cacheAuthentication( const AuthInfo& info );		bool cacheAuthentication( const AuthInfo& info );
	/**		/**
	* Used by the slave to check if it can connect		* Used by the slave to check if it can connect
	* to a given host. This should be called where the slave is ready		* to a given host. This should be called where the slave is ready
	* to do a ::connect() on a socket. For each call to		* to do a ::connect() on a socket. For each call to
	* requestNetwork must exist a matching call to		* requestNetwork must exist a matching call to
	* dropNetwork, or the system will stay online until		* dropNetwork, or the system will stay online until
	* KNetMgr gets closed (or the SlaveBase gets destructed)!		* KNetMgr gets closed (or the SlaveBase gets destructed)!
End of changes. 2 change blocks.
	5 lines changed or deleted		34 lines changed or added

	slider.h		slider.h
	skipping to change at line 44		skipping to change at line 44
	/**		/**
	* @class Slider plasma/widgets/slider.h <Plasma/Widgets/Slider>		* @class Slider plasma/widgets/slider.h <Plasma/Widgets/Slider>
	*		*
	* @short Provides a plasma-themed QSlider.		* @short Provides a plasma-themed QSlider.
	*/		*/
	class PLASMA_EXPORT Slider : public QGraphicsProxyWidget		class PLASMA_EXPORT Slider : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(int maximum READ maximum WRITE setMinimum)		Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
	Q_PROPERTY(int minimum READ minimum WRITE setMinimum)		Q_PROPERTY(int minimum READ minimum WRITE setMinimum)
	Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)		Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
	Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)		Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QSlider *nativeWidget READ nativeWidget)		Q_PROPERTY(QSlider *nativeWidget READ nativeWidget)
	public:		public:
	explicit Slider(QGraphicsWidget *parent = 0);		explicit Slider(QGraphicsWidget *parent = 0);
	~Slider();		~Slider();
	skipping to change at line 78		skipping to change at line 78
	int value() const;		int value() const;
	/**		/**
	* @return the orientation of the slider		* @return the orientation of the slider
	*/		*/
	Qt::Orientation orientation() const;		Qt::Orientation orientation() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Slide r		* Sets the stylesheet used to control the visual display of this Slide r
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this Slider		* @return the native widget wrapped by this Slider
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	solidnamespace.h		solidnamespace.h
	/*		/*
	Copyright 2007 Kevin Ottens <ervin@kde.org>		Copyright 2007 Kevin Ottens <ervin@kde.org>
			Copyright 2011 Lukas Tinkl <ltinkl@redhat.com>
	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) version 3, or any		version 2.1 of the License, or (at your option) version 3, or any
	later version accepted by the membership of KDE e.V. (or its		later version accepted by the membership of KDE e.V. (or its
	successor approved by the membership of KDE e.V.), which shall		successor approved by the membership of KDE e.V.), which shall
	act as a proxy defined in Section 6 of version 3 of the license.		act as a proxy defined in Section 6 of version 3 of the license.
	This library is distributed in the hope that it will be useful,		This library is distributed in the hope that it will be useful,
	skipping to change at line 26		skipping to change at line 27
	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/licens es/>.		License along with this library. If not, see <http://www.gnu.org/licens es/>.
	*/		*/
	#ifndef SOLID_SOLIDNAMESPACE_H		#ifndef SOLID_SOLIDNAMESPACE_H
	#define SOLID_SOLIDNAMESPACE_H		#define SOLID_SOLIDNAMESPACE_H
	namespace Solid		namespace Solid
	{		{
	enum ErrorType { NoError = 0, UnauthorizedOperation };		enum ErrorType {
			NoError = 0,
			UnauthorizedOperation,
			DeviceBusy,
			OperationFailed,
			UserCanceled,
			InvalidOption,
			MissingDriver
			};
	}		}
	#include <QtCore/QMetaType>		#include <QtCore/QMetaType>
	Q_DECLARE_METATYPE(Solid::ErrorType)		Q_DECLARE_METATYPE(Solid::ErrorType)
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		10 lines changed or added

	speller.h		speller.h
	skipping to change at line 48		skipping to change at line 48
	class KDECORE_EXPORT Speller		class KDECORE_EXPORT Speller
	{		{
	public:		public:
	Speller(const QString &lang=QString());		Speller(const QString &lang=QString());
	~Speller();		~Speller();
	Speller(const Speller &speller);		Speller(const Speller &speller);
	Speller &operator=(const Speller &speller);		Speller &operator=(const Speller &speller);
	/**		/**
	* Returns true is the speller supports currently selected		* Returns true if the speller supports currently selected
	* language.		* language.
	*/		*/
	bool isValid() const;		bool isValid() const;
	/**		/**
	* Sets the language supported by this speller.		* Sets the language supported by this speller.
	*/		*/
	void setLanguage(const QString &lang);		void setLanguage(const QString &lang);
	/**		/**
	* Returns language supported by this speller.		* Returns language supported by this speller.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	spinbox.h		spinbox.h
	skipping to change at line 73		skipping to change at line 73
	int minimum() const;		int minimum() const;
	/**		/**
	* @return the current value		* @return the current value
	*/		*/
	int value() const;		int value() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this SpinB ox		* Sets the stylesheet used to control the visual display of this SpinB ox
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this SpinBox		* @return the native widget wrapped by this SpinBox
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	svg.h		svg.h
	skipping to change at line 67		skipping to change at line 67
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(ContentType)		Q_ENUMS(ContentType)
	Q_PROPERTY(QSize size READ size WRITE resize NOTIFY sizeChanged)		Q_PROPERTY(QSize size READ size WRITE resize NOTIFY sizeChanged)
	Q_PROPERTY(bool multipleImages READ containsMultipleImages WRITE setCon tainsMultipleImages)		Q_PROPERTY(bool multipleImages READ containsMultipleImages WRITE setCon tainsMultipleImages)
	Q_PROPERTY(QString imagePath READ imagePath WRITE setImagePath)		Q_PROPERTY(QString imagePath READ imagePath WRITE setImagePath)
	Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE se tUsingRenderingCache)		Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE se tUsingRenderingCache)
	public:		public:
	/**		/**
	* Constructs an SVG object that implicitly shares and caches rende		* Constructs an SVG object that implicitly shares and caches rende
	ring		ring.
	* As opposed to QSvgRenderer, which this class uses internally,		*
			* Unlike QSvgRenderer, which this class uses internally,
	* Plasma::Svg represents an image generated from an SVG. As such, it		* Plasma::Svg represents an image generated from an SVG. As such, it
	* has a related size and transform matrix (the latter being provid ed		* has a related size and transform matrix (the latter being provid ed
	* by the painter used to paint the image).		* by the painter used to paint the image).
	*		*
	* The size is initialized to be the SVG's native size.		* The size is initialized to be the SVG's native size.
	*		*
	* @arg parent options QObject to parent this to		* @param parent options QObject to parent this to
	*		*
	* @related Plasma::Theme		* @related Plasma::Theme
	*/		*/
	explicit Svg(QObject *parent = 0);		explicit Svg(QObject *parent = 0);
	~Svg();		~Svg();
	/**		/**
	* Returns a pixmap of the SVG represented by this object.		* Returns a pixmap of the SVG represented by this object.
	*		*
	* @arg elelementId the ID string of the element to render, or an e		* The size of the pixmap will be the size of this Svg object (size
	mpty		())
	* string for the whole SVG (the default)		* if containsMultipleImages is @c true; otherwise, it will be the
			* size of the requested element after the whole SVG has been scale
			d
			* to size().
			*
			* @param elementId the ID string of the element to render, or an
			empty
			* string for the whole SVG (the default)
	* @return a QPixmap of the rendered SVG		* @return a QPixmap of the rendered SVG
	*/		*/
	Q_INVOKABLE QPixmap pixmap(const QString &elementID = QString());		Q_INVOKABLE QPixmap pixmap(const QString &elementID = QString());
	/**		/**
	* Paints the SVG represented by this object		* Paints all or part of the SVG represented by this object
	* @arg painter the QPainter to use		*
	* @arg point the position to start drawing; the entire svg will be		* The size of the painted area will be the size of this Svg object
	* drawn starting at this point.		* (size()) if containsMultipleImages is @c true; otherwise, it wil
	* @arg elelementId the ID string of the element to render, or an e		l
	mpty		* be the size of the requested element after the whole SVG has bee
	* string for the whole SVG (the default)		n
			* scaled to size().
			*
			* @param painter the QPainter to use
			* @param point the position to start drawing; the entire svg
			will be
			* drawn starting at this point.
			* @param elementId the ID string of the element to render, or an
			empty
			* string for the whole SVG (the default)
	*/		*/
	Q_INVOKABLE void paint(QPainter *painter, const QPointF &point,		Q_INVOKABLE void paint(QPainter *painter, const QPointF &point,
	const QString &elementID = QString());		const QString &elementID = QString());
	/**		/**
	* Paints the SVG represented by this object		* Paints all or part of the SVG represented by this object
	* @arg painter the QPainter to use		*
	* @arg x the horizontal coordinate to start painting from		* The size of the painted area will be the size of this Svg object
	* @arg y the vertical coordinate to start painting from		* (size()) if containsMultipleImages is @c true; otherwise, it wil
	* @arg elelementId the ID string of the element to render, or an e		l
	mpty		* be the size of the requested element after the whole SVG has bee
	* string for the whole SVG (the default)		n
			* scaled to size().
			*
			* @param painter the QPainter to use
			* @param x the horizontal coordinate to start painting fr
			om
			* @param y the vertical coordinate to start painting from
			* @param elementId the ID string of the element to render, or an
			empty
			* string for the whole SVG (the default)
	*/		*/
	Q_INVOKABLE void paint(QPainter *painter, int x, int y,		Q_INVOKABLE void paint(QPainter *painter, int x, int y,
	const QString &elementID = QString());		const QString &elementID = QString());
	/**		/**
	* Paints the SVG represented by this object		* Paints all or part of the SVG represented by this object
	* @arg painter the QPainter to use		*
	* @arg rect the rect to draw into; if smaller than the current siz		* @param painter the QPainter to use
	e		* @param rect the rect to draw into; if smaller than the cur
	* the drawing is starting at this point.		rent size
	* @arg elelementId the ID string of the element to render, or an e		* the drawing is starting at this point.
	mpty		* @param elementId the ID string of the element to render, or an
	* string for the whole SVG (the default)		empty
			* string for the whole SVG (the default)
	*/		*/
	Q_INVOKABLE void paint(QPainter *painter, const QRectF &rect,		Q_INVOKABLE void paint(QPainter *painter, const QRectF &rect,
	const QString &elementID = QString());		const QString &elementID = QString());
	/**		/**
	* Paints the SVG represented by this object		* Paints all or part of the SVG represented by this object
	* @arg painter the QPainter to use		*
	* @arg x the horizontal coordinate to start painting from		* @param painter the QPainter to use
	* @arg y the vertical coordinate to start painting from		* @param x the horizontal coordinate to start painting fr
	* @arg width the width of the element to draw		om
	* @arg height the height of the element do draw		* @param y the vertical coordinate to start painting from
	* @arg elelementId the ID string of the element to render, or an e		* @param width the width of the element to draw
	mpty		* @param height the height of the element do draw
	* string for the whole SVG (the default)		* @param elementId the ID string of the element to render, or an
			empty
			* string for the whole SVG (the default)
	*/		*/
	Q_INVOKABLE void paint(QPainter *painter, int x, int y, int width,		Q_INVOKABLE void paint(QPainter *painter, int x, int y, int width,
	int height, const QString &elementID = QStri ng());		int height, const QString &elementID = QStri ng());
	/**		/**
	* Currently set size of the SVG		* The size of the SVG.
			*
			* If the SVG has been resized with resize(), that size will be
			* returned; otherwise, the natural size of the SVG will be returne
			d.
			*
			* If containsMultipleImages is @c true, each element of the SVG
			* will be rendered at this size by default.
			*
	* @return the current size of the SVG		* @return the current size of the SVG
	**/		**/
	QSize size() const;		QSize size() const;
	/**		/**
	* Resizes the rendered image. Rendering will actually take place o		* Resizes the rendered image.
	n		*
	* the next call to paint.		* Rendering will actually take place on the next call to paint.
	* @arg width the new width		*
	* @arg height the new height		* If containsMultipleImages is @c true, each element of the SVG
			* will be rendered at this size by default; otherwise, the entire
			* image will be scaled to this size and each element will be
			* scaled appropriately.
			*
			* @param width the new width
			* @param height the new height
	**/		**/
	Q_INVOKABLE void resize(qreal width, qreal height);		Q_INVOKABLE void resize(qreal width, qreal height);
	/**		/**
	* Resizes the rendered image. Rendering will actually take place o		* Resizes the rendered image.
	n		*
	* the next call to paint.		* Rendering will actually take place on the next call to paint.
	* @arg size the new size of the image		*
			* If containsMultipleImages is @c true, each element of the SVG
			* will be rendered at this size by default; otherwise, the entire
			* image will be scaled to this size and each element will be
			* scaled appropriately.
			*
			* @param size the new size of the image
	**/		**/
	Q_INVOKABLE void resize(const QSizeF &size);		Q_INVOKABLE void resize(const QSizeF &size);
	/**		/**
	* Resizes the rendered image to the natural size of the SVG.		* Resizes the rendered image to the natural size of the SVG.
			*
	* Rendering will actually take place on the next call to paint.		* Rendering will actually take place on the next call to paint.
	**/		**/
	Q_INVOKABLE void resize();		Q_INVOKABLE void resize();
	/**		/**
	* Size of a given element		* Find the size of a given element.
	* @arg elementId the id of the element to check		*
	* @return the current size of a given element, given the current s		* This is the size of the element with ID @p elementId after the S
	ize of the Svg		VG
			* has been scaled (see resize()). Note that this is unaffected by
			* the containsMultipleImages property.
			*
			* @param elementId the id of the element to check
			* @return the size of a given element, given the current size of t
			he SVG
	**/		**/
	Q_INVOKABLE QSize elementSize(const QString &elementId) const;		Q_INVOKABLE QSize elementSize(const QString &elementId) const;
	/**		/**
	* The bounding rect of a given element		* The bounding rect of a given element.
	* @arg elementId the id of the element to check		*
	* @return the current rect of a given element, given the current s		* This is the bounding rect of the element with ID @p elementId af
	ize of the Svg		ter
			* the SVG has been scaled (see resize()). Note that this is
			* unaffected by the containsMultipleImages property.
			*
			* @param elementId the id of the element to check
			* @return the current rect of a given element, given the current
			size of the SVG
	**/		**/
	Q_INVOKABLE QRectF elementRect(const QString &elementId) const;		Q_INVOKABLE QRectF elementRect(const QString &elementId) const;
	/**		/**
	* Check when an element exists in the loaded Svg		* Check whether an element exists in the loaded SVG.
	* @arg elementId the id of the element to check		*
	* @return true if the element is defined in the Svg, otherwise fal		* @param elementId the id of the element to check for
	se		* @return @c true if the element is defined in the SVG, otherwise
			@c false
	**/		**/
	Q_INVOKABLE bool hasElement(const QString &elementId) const;		Q_INVOKABLE bool hasElement(const QString &elementId) const;
	/**		/**
	* Returns the element (by id) at the given point. An empty string		* Returns the element (by id) at the given point.
	is		*
	* returned if no element is at that point.		* An empty string is returned if there no element is at @p point.
			*
			* NOTE: not implemented! This will currently return an empty stri
			ng!
			*
			* @param point a point in SVG co-ordinates
			* @return an empty string
	*/		*/
	Q_INVOKABLE QString elementAtPoint(const QPoint &point) const;		Q_INVOKABLE QString elementAtPoint(const QPoint &point) const;
	/**		/**
	* @return true if the SVG file exists and the document is valid,		* Check whether this object is backed by a valid SVG file.
	* otherwise false. This method can be expensive as it		*
	* causes disk access.		* This method can be expensive as it causes disk access.
			*
			* @return @c true if the SVG file exists and the document is valid
			,
			* otherwise @c false.
	**/		**/
	Q_INVOKABLE bool isValid() const;		Q_INVOKABLE bool isValid() const;
	/**		/**
	* Set if the svg contains a single image or multiple ones.		* Set whether the SVG contains a single image or multiple ones.
	* @arg multiple true if the svg contains multiple images		*
			* If this is set to @c true, the SVG will be treated as a
			* collection of related images, rather than a consistent
			* drawing.
			*
			* In particular, when individual elements are rendered, this
			* affects whether the elements are resized to size() by default.
			* See paint() and pixmap().
			*
			* @param multiple true if the svg contains multiple images
	*/		*/
	void setContainsMultipleImages(bool multiple);		void setContainsMultipleImages(bool multiple);
	/**		/**
	* @return whether or not the svg contains multiple images or not		* Whether the SVG contains multiple images.
			*
			* If this is @c true, the SVG will be treated as a
			* collection of related images, rather than a consistent
			* drawing.
			*
			* @return @c true if the SVG will be treated as containing
			* multiple images, @c false if it will be treated
			* as a coherent image.
	*/		*/
	bool containsMultipleImages() const;		bool containsMultipleImages() const;
	/**		/**
	* Convenience method for setting the svg file to use for the Svg.		* Set the SVG file to render.
	* @arg svgFilePath the filepath including name of the svg.		*
			* Relative paths are looked for in the current Plasma theme,
			* and should not include the file extension (.svg and .svgz
			* files will be searched for). See Theme::imagePath().
			*
			* If the parent object of this Svg is a Plasma::Applet,
			* relative paths will be searched for in the applet's package
			* first.
			*
			* @param svgFilePath either an absolute path to an SVG file, or
			* an image name
	*/		*/
	void setImagePath(const QString &svgFilePath);		void setImagePath(const QString &svgFilePath);
	/**		/**
	* Convenience method to get the svg filepath and name of svg.		* The SVG file to render.
	* @return the svg's filepath including name of the svg.		*
			* If this SVG is themed, this will be a relative path, and will no
			t
			* include a file extension.
			*
			* @return either an absolute path to an SVG file, or an image nam
			e
			* @see Theme::imagePath()
	*/		*/
	QString imagePath() const;		QString imagePath() const;
	/**		/**
	* Sets whether or not to cache the results of rendering to pixmaps .		* Sets whether or not to cache the results of rendering to pixmaps .
	* If the Svg is resized and re-rendered often without pattern to t		*
	he resulting		* If the SVG is resized and re-rendered often (and does not keep u
	* pixmap dimensions, then it may be less efficient to do disk cach		sing the
	ing. A good		* same small set of pixmap dimensions), then it may be less effici
	* example might be a progress meter that uses an Svg object to pai		ent to do
	nt itself:		* disk caching. A good example might be a progress meter that use
	* the meter will be changing often enoughi, with enough unpredicta		s an Svg
	bility and		* object to paint itself: the meter will be changing often enough,
	* without re-use of the previous pixmaps to not get a gain from ca		with
	ching.		* enough unpredictability and without re-use of the previous pixma
			ps to
			* not get a gain from caching.
	*		*
	* Most Svg objects should use the caching feature, however.		* Most Svg objects should use the caching feature, however.
	* Therefore, the default is to use the render cache.		* Therefore, the default is to use the render cache.
	*		*
	* @param useCache true to cache rendered pixmaps		* @param useCache true to cache rendered pixmaps
	* @since 4.3		* @since 4.3
	*/		*/
	void setUsingRenderingCache(bool useCache);		void setUsingRenderingCache(bool useCache);
	/**		/**
	* @return true if the Svg is using caching for rendering results		* Whether the rendering cache is being used.
			*
			* @return @c true if the Svg object is using caching for rendering
			results
	* @since 4.3		* @since 4.3
	*/		*/
	bool isUsingRenderingCache() const;		bool isUsingRenderingCache() const;
	/**		/**
	* Sets the Plasma::Theme to use with this Svg object. By default,		* Sets the Plasma::Theme to use with this Svg object.
	Svg		*
	* objects use Plasma::Theme::default()		* By default, Svg objects use Plasma::Theme::default().
	* @arg theme the theme object to use		*
			* This determines how relative image paths are interpreted.
			*
			* @param theme the theme object to use
	* @since 4.3		* @since 4.3
	*/		*/
	void setTheme(Plasma::Theme *theme);		void setTheme(Plasma::Theme *theme);
	/**		/**
	* @return the theme used by this Svg		* The Plasma::Theme used by this Svg object.
			*
			* This determines how relative image paths are interpreted.
			*
			* @return the theme used by this Svg
	*/		*/
	Theme *theme() const;		Theme *theme() const;
	Q_SIGNALS:		Q_SIGNALS:
	void repaintNeeded();		void repaintNeeded();
	void sizeChanged();		void sizeChanged();
	private:		private:
	SvgPrivate *const d;		SvgPrivate *const d;
End of changes. 24 change blocks.
	89 lines changed or deleted		208 lines changed or added

	tabbar.h		tabbar.h
	skipping to change at line 62		skipping to change at line 62
	Q_PROPERTY(int count READ count)		Q_PROPERTY(int count READ count)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(bool tabBarShown READ isTabBarShown WRITE setTabBarShown)		Q_PROPERTY(bool tabBarShown READ isTabBarShown WRITE setTabBarShown)
	Q_PROPERTY(QGraphicsWidget *firstPositionWidget READ firstPositionWidge t WRITE setFirstPositionWidget)		Q_PROPERTY(QGraphicsWidget *firstPositionWidget READ firstPositionWidge t WRITE setFirstPositionWidget)
	Q_PROPERTY(QGraphicsWidget *lastPositionWidget READ lastPositionWidget WRITE setLastPositionWidget)		Q_PROPERTY(QGraphicsWidget *lastPositionWidget READ lastPositionWidget WRITE setLastPositionWidget)
	public:		public:
	/**		/**
	* Constructs a new TabBar		* Constructs a new TabBar
	*		*
	* @arg parent the parent of this widget		* @param parent the parent of this widget
	*/		*/
	explicit TabBar(QGraphicsWidget *parent = 0);		explicit TabBar(QGraphicsWidget *parent = 0);
	~TabBar();		~TabBar();
	/**		/**
	* Adds a new tab in the desired position		* Adds a new tab in the desired position
	*		*
	* @arg index the position where to insert the new tab,		* @param index the position where to insert the new tab,
	* if index <=0 will be the first position,		* if index <=0 will be the first position,
	* if index >= count() will be the last		* if index >= count() will be the last
	* @arg icon the icon for this tab		* @param icon the icon for this tab
	* @arg label the text label of the tab		* @param label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @param content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	Q_INVOKABLE int insertTab(int index, const QIcon &icon, const QString & label,		Q_INVOKABLE int insertTab(int index, const QIcon &icon, const QString & label,
	QGraphicsLayoutItem *content = 0);		QGraphicsLayoutItem *content = 0);
	/**		/**
	* Adds a new tab in the desired position		* Adds a new tab in the desired position
	* This is an overloaded member provided for convenience		* This is an overloaded member provided for convenience
	* equivalent to insertTab(index, QIcon(), label);		* equivalent to insertTab(index, QIcon(), label);
	*		*
	* @arg index the position where to insert the new tab,		* @param index the position where to insert the new tab,
	* if index <=0 will be the first position,		* if index <=0 will be the first position,
	* if index >= count() will be the last		* if index >= count() will be the last
	* @arg label the text label of the tab		* @param label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @param content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	Q_INVOKABLE int insertTab(int index, const QString &label, QGraphicsLay outItem *content = 0);		Q_INVOKABLE int insertTab(int index, const QString &label, QGraphicsLay outItem *content = 0);
	/**		/**
	* Adds a new tab in the last position		* Adds a new tab in the last position
	*		*
	* @arg icon the icon for this tab		* @param icon the icon for this tab
	* @arg label the text label of the tab		* @param label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @param content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	Q_INVOKABLE int addTab(const QIcon &icon, const QString &label, QGraphi csLayoutItem *content = 0);		Q_INVOKABLE int addTab(const QIcon &icon, const QString &label, QGraphi csLayoutItem *content = 0);
	/**		/**
	* Adds a new tab in the last position		* Adds a new tab in the last position
	* This is an overloaded member provided for convenience		* This is an overloaded member provided for convenience
	* equivalent to addTab(QIcon(), label, page)		* equivalent to addTab(QIcon(), label, page)
	*		*
	* @arg label the text label of the tab		* @param label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @param content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	Q_INVOKABLE int addTab(const QString &label, QGraphicsLayoutItem *conte nt = 0);		Q_INVOKABLE int addTab(const QString &label, QGraphicsLayoutItem *conte nt = 0);
	/**		/**
	* Removes a tab, contents are deleted		* Removes a tab, contents are deleted
	*		*
	* @arg index the index of the tab to remove		* @param index the index of the tab to remove
	*/		*/
	Q_INVOKABLE void removeTab(int index);		Q_INVOKABLE void removeTab(int index);
	/**		/**
	* Removes a tab, the page is reparented to 0 and is returned		* Removes a tab, the page is reparented to 0 and is returned
	*		*
	* @arg index the index of the tab to remove		* @param index the index of the tab to remove
	* @since 4.4		* @since 4.4
	*/		*/
	Q_INVOKABLE QGraphicsLayoutItem *takeTab(int index);		Q_INVOKABLE QGraphicsLayoutItem *takeTab(int index);
	/**		/**
	* Returns the contents of a page		* Returns the contents of a page
	*		*
	* @arg index the index of the tab to retrieve		* @param index the index of the tab to retrieve
	* @since 4.4		* @since 4.4
	*/		*/
	Q_INVOKABLE QGraphicsLayoutItem *tabAt(int index);		Q_INVOKABLE QGraphicsLayoutItem *tabAt(int index);
	/**		/**
	* @return the index of the tab currently active		* @return the index of the tab currently active
	*/		*/
	int currentIndex() const;		int currentIndex() const;
	/**		/**
	* @return the number of tabs in this tabbar		* @return the number of tabs in this tabbar
	*/		*/
	int count() const;		int count() const;
	/**		/**
	* Sets the text label of the given tab		* Sets the text label of the given tab
	*		*
	* @arg index the index of the tab to modify		* @param index the index of the tab to modify
	* @arg label the new text label of the given tab		* @param label the new text label of the given tab
	*/		*/
	Q_INVOKABLE void setTabText(int index, const QString &label);		Q_INVOKABLE void setTabText(int index, const QString &label);
	/**		/**
	* @return the text label of the given tab		* @return the text label of the given tab
	*		*
	* @arg index the index of the tab we want to know its label		* @param index the index of the tab we want to know its label
	*/		*/
	Q_INVOKABLE QString tabText(int index) const;		Q_INVOKABLE QString tabText(int index) const;
	/**		/**
	* Sets an icon for a given tab		* Sets an icon for a given tab
	*		*
	* @arg index the index of the tab to modify		* @param index the index of the tab to modify
	* @arg icon the new icon for the given tab		* @param icon the new icon for the given tab
	*/		*/
	Q_INVOKABLE void setTabIcon(int index, const QIcon &icon);		Q_INVOKABLE void setTabIcon(int index, const QIcon &icon);
	/**		/**
	* @return the current icon for a given tab		* @return the current icon for a given tab
	*		*
	* @arg index the index of the tab we want to know its icon		* @param index the index of the tab we want to know its icon
	*/		*/
	Q_INVOKABLE QIcon tabIcon(int index) const;		Q_INVOKABLE QIcon tabIcon(int index) const;
	/**		/**
	* shows or hides the tabbar, used if you just want to display the		* shows or hides the tabbar, used if you just want to display the
	* pages, when the tabbar doesn't have content pages at all this		* pages, when the tabbar doesn't have content pages at all this
	* function has no effect		* function has no effect
	*		*
	* @arg show true if we want to show the tabbar		* @param show true if we want to show the tabbar
	* @since 4.3		* @since 4.3
	*/		*/
	void setTabBarShown(bool show);		void setTabBarShown(bool show);
	/**		/**
	* @return true if the tabbar is shown		* @return true if the tabbar is shown
	* @since 4.3		* @since 4.3
	*/		*/
	bool isTabBarShown() const;		bool isTabBarShown() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this TabBa r		* Sets the stylesheet used to control the visual display of this TabBa r
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet() const;		QString styleSheet() const;
	/**		/**
			* Highlight the specified tab
			* @param index of the tab to highlight
			* @param highlight true if it should be highlighted, wrong if not
			* @since 4.7
			*/
			Q_INVOKABLE void setTabHighlighted(int index, bool highlight);
			/**
			* @return if the tab at index is highlighted
			* @since 4.7
			*/
			Q_INVOKABLE bool isTabHighlighted(int index) const;
			/**
	* @return the native widget wrapped by this TabBar		* @return the native widget wrapped by this TabBar
	*/		*/
	KTabBar *nativeWidget() const;		KTabBar *nativeWidget() const;
	/**		/**
	* Set a widget to be displayed on one side of the TabBar, depending on the		* Set a widget to be displayed on one side of the TabBar, depending on the
	* LayoutDirection and the Shape.		* LayoutDirection and the Shape.
	* @param widget the widget to be displayed. Passing 0 will show nothin g.		* @param widget the widget to be displayed. Passing 0 will show nothin g.
	* Any previous widget will be deleted.		* Any previous widget will be deleted.
	* @since 4.6		* @since 4.6
	skipping to change at line 246		skipping to change at line 260
	/**		/**
	* @return the widget in the last position		* @return the widget in the last position
	* @since 4.6		* @since 4.6
	*/		*/
	QGraphicsWidget *lastPositionWidget() const;		QGraphicsWidget *lastPositionWidget() const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Activate a given tab		* Activate a given tab
	*		*
	* @arg index the index of the tab to activate		* @param index the index of the tab to activate
	*/		*/
	void setCurrentIndex(int index);		void setCurrentIndex(int index);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the active tab changes		* Emitted when the active tab changes
	*		*
	* @arg index the newly activated tab		* @param index the newly activated tab
	*/		*/
	void currentChanged(int index);		void currentChanged(int index);
	protected:		protected:
	void wheelEvent(QGraphicsSceneWheelEvent *event);		void wheelEvent(QGraphicsSceneWheelEvent *event);
	void resizeEvent(QGraphicsSceneResizeEvent * event);		void resizeEvent(QGraphicsSceneResizeEvent * event);
	void changeEvent(QEvent *event);		void changeEvent(QEvent *event);
	private:		private:
	TabBarPrivate * const d;		TabBarPrivate * const d;
End of changes. 19 change blocks.
	26 lines changed or deleted		40 lines changed or added

	textbrowser.h		textbrowser.h
	skipping to change at line 58		skipping to change at line 58
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KTextBrowser *nativeWidget READ nativeWidget)		Q_PROPERTY(KTextBrowser *nativeWidget READ nativeWidget)
	public:		public:
	explicit TextBrowser(QGraphicsWidget *parent = 0);		explicit TextBrowser(QGraphicsWidget *parent = 0);
	~TextBrowser();		~TextBrowser();
	/**		/**
	* Sets the display text for this TextBrowser		* Sets the display text for this TextBrowser
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the policy used to show/hide the horizontal scrollbar		* Sets the policy used to show/hide the horizontal scrollbar
	skipping to change at line 80		skipping to change at line 80
	void setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy policy);		void setHorizontalScrollBarPolicy(Qt::ScrollBarPolicy policy);
	/**		/**
	* Sets the policy used to show/hide the vertical scrollbar		* Sets the policy used to show/hide the vertical scrollbar
	*/		*/
	void setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy);		void setVerticalScrollBarPolicy(Qt::ScrollBarPolicy policy);
	/**		/**
	* Sets the stylesheet used to control the visual display of this TextB rowser		* Sets the stylesheet used to control the visual display of this TextB rowser
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this TextBrowser		* @return the native widget wrapped by this TextBrowser
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	textedit.h		textedit.h
	skipping to change at line 57		skipping to change at line 57
	Q_PROPERTY(KTextEdit *nativeWidget READ nativeWidget WRITE setNativeWid get)		Q_PROPERTY(KTextEdit *nativeWidget READ nativeWidget WRITE setNativeWid get)
	Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)		Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
	public:		public:
	explicit TextEdit(QGraphicsWidget *parent = 0);		explicit TextEdit(QGraphicsWidget *parent = 0);
	~TextEdit();		~TextEdit();
	/**		/**
	* Sets the display text for this TextEdit		* Sets the display text for this TextEdit
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the text area to be read only or interactive		* Sets the text area to be read only or interactive
	* @arg true to make it read only, false for interactive		* @param true to make it read only, false for interactive
	* @since 4.4		* @since 4.4
	*/		*/
	void setReadOnly(bool readOnly);		void setReadOnly(bool readOnly);
	/**		/**
	* @return true if the text area is non-interacive		* @return true if the text area is non-interacive
	*/		*/
	bool isReadOnly() const;		bool isReadOnly() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this TextE dit		* Sets the stylesheet used to control the visual display of this TextE dit
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* Sets the text edit wrapped by this TextEdit (widget must inherit KTe xtEdit), ownership is transferred to the TextEdit		* Sets the text edit wrapped by this TextEdit (widget must inherit KTe xtEdit), ownership is transferred to the TextEdit
	*		*
	* @arg text edit that will be wrapped by this TextEdit		* @param nativeWidget text edit that will be wrapped by this TextEdit
	* @since KDE4.4		* @since KDE4.4
	*/		*/
	void setNativeWidget(KTextEdit *nativeWidget);		void setNativeWidget(KTextEdit *nativeWidget);
	/**		/**
	* @return the native widget wrapped by this TextEdit		* @return the native widget wrapped by this TextEdit
	*/		*/
	KTextEdit *nativeWidget() const;		KTextEdit *nativeWidget() const;
	public Q_SLOTS:		public Q_SLOTS:
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	theme.h		theme.h
	skipping to change at line 92		skipping to change at line 92
	};		};
	/**		/**
	* Singleton pattern accessor		* Singleton pattern accessor
	**/		**/
	static Theme *defaultTheme();		static Theme *defaultTheme();
	/**		/**
	* Default constructor. Usually you want to use the singleton inste ad.		* Default constructor. Usually you want to use the singleton inste ad.
	* @see defaultTheme		* @see defaultTheme
	* @arg parent the parent object		* @param parent the parent object
	*/		*/
	explicit Theme(QObject *parent = 0);		explicit Theme(QObject *parent = 0);
	/**		/**
	* Construct a theme. Usually you want to use the singleton instead .		* Construct a theme. Usually you want to use the singleton instead .
	* @see defaultTheme		* @see defaultTheme
	* @arg themeName the name of the theme to create		* @param themeName the name of the theme to create
	* @arg parent the parent object		* @param parent the parent object
	* @since 4.3		* @since 4.3
	*/		*/
	explicit Theme(const QString &themeName, QObject *parent = 0);		explicit Theme(const QString &themeName, QObject *parent = 0);
	~Theme();		~Theme();
	/**		/**
	* @return a package structure representing a Theme		* @return a package structure representing a Theme
	*/		*/
	static PackageStructure::Ptr packageStructure();		static PackageStructure::Ptr packageStructure();
	skipping to change at line 131		skipping to change at line 131
	void setThemeName(const QString &themeName);		void setThemeName(const QString &themeName);
	/**		/**
	* @return the name of the theme.		* @return the name of the theme.
	*/		*/
	QString themeName() const;		QString themeName() const;
	/**		/**
	* Retrieve the path for an SVG image in the current theme.		* Retrieve the path for an SVG image in the current theme.
	*		*
	* @arg name the name of the file in the theme directory (without t he		* @param name the name of the file in the theme directory (without the
	* ".svg" part or a leading slash)		* ".svg" part or a leading slash)
	* @return the full path to the requested file for the current them e		* @return the full path to the requested file for the current them e
	*/		*/
	Q_INVOKABLE QString imagePath(const QString &name) const;		Q_INVOKABLE QString imagePath(const QString &name) const;
	/**		/**
	* Retrieves the path for the script file that contains a given		* Retrieves the path for the script file that contains a given
	* Javascript animation.		* Javascript animation.
	* @arg the name of the animation		* @param the name of the animation
	* @return the full path to the script file, or an emptry string on failure		* @return the full path to the script file, or an emptry string on failure
	* @since 4.5		* @since 4.5
	*/		*/
	Q_INVOKABLE QString animationPath(const QString &name) const;		Q_INVOKABLE QString animationPath(const QString &name) const;
	/**		/**
	* Retrieves the default wallpaper associated with this theme.		* Retrieves the default wallpaper associated with this theme.
	*		*
	* @arg size the target height and width of the wallpaper; if an in valid size		* @param size the target height and width of the wallpaper; if an invalid size
	* is passed in, then a default size will be provided ins tead.		* is passed in, then a default size will be provided ins tead.
	* @return the full path to the wallpaper image		* @return the full path to the wallpaper image
	*/		*/
	Q_INVOKABLE QString wallpaperPath(const QSize &size = QSize()) cons t;		Q_INVOKABLE QString wallpaperPath(const QSize &size = QSize()) cons t;
	/**		/**
	* Checks if this theme has an image named in a certain way		* Checks if this theme has an image named in a certain way
	*		*
	* @arg name the name of the file in the theme directory (without t he		* @param name the name of the file in the theme directory (without the
	* ".svg" part or a leading slash)		* ".svg" part or a leading slash)
	* @return true if the image exists for this theme		* @return true if the image exists for this theme
	*/		*/
	Q_INVOKABLE bool currentThemeHasImage(const QString &name) const;		Q_INVOKABLE bool currentThemeHasImage(const QString &name) const;
	/**		/**
	* Returns the color scheme configurationthat goes along this theme .		* Returns the color scheme configurationthat goes along this theme .
	* This can be used with KStatefulBrush and KColorScheme to determi ne		* This can be used with KStatefulBrush and KColorScheme to determi ne
	* the proper colours to use along with the visual elements in this theme.		* the proper colours to use along with the visual elements in this theme.
	*/		*/
	Q_INVOKABLE KSharedConfigPtr colorScheme() const;		Q_INVOKABLE KSharedConfigPtr colorScheme() const;
	/**		/**
	* Returns the text color to be used by items resting on the backgr ound		* Returns the text color to be used by items resting on the backgr ound
	*		*
	* @arg role which role (usage pattern) to get the color for		* @param role which role (usage pattern) to get the color for
	*/		*/
	Q_INVOKABLE QColor color(ColorRole role) const;		Q_INVOKABLE QColor color(ColorRole role) const;
	/**		/**
	* Sets the default font to be used with themed items. Defaults to		* Sets the default font to be used with themed items. Defaults to
	* the application wide default font.		* the application wide default font.
	*		*
	* @arg font the new font		* @param font the new font
	* @arg role which role (usage pattern) to set the font for		* @param role which role (usage pattern) to set the font for
	*/		*/
	Q_INVOKABLE void setFont(const QFont &font, FontRole role = Default Font);		Q_INVOKABLE void setFont(const QFont &font, FontRole role = Default Font);
	/**		/**
	* Returns the font to be used by themed items		* Returns the font to be used by themed items
	*		*
	* @arg role which role (usage pattern) to get the font for		* @param role which role (usage pattern) to get the font for
	*/		*/
	Q_INVOKABLE QFont font(FontRole role) const;		Q_INVOKABLE QFont font(FontRole role) const;
	/**		/**
	* Returns the font metrics for the font to be used by themed items		* Returns the font metrics for the font to be used by themed items
	*/		*/
	Q_INVOKABLE QFontMetrics fontMetrics() const;		Q_INVOKABLE QFontMetrics fontMetrics() const;
	/**		/**
	* Returns if the window manager effects (e.g. translucency, compos iting) is active or not		* Returns if the window manager effects (e.g. translucency, compos iting) is active or not
	*/		*/
	Q_INVOKABLE bool windowTranslucencyEnabled() const;		Q_INVOKABLE bool windowTranslucencyEnabled() const;
	/**		/**
	* Tells the theme whether to follow the global settings or use app lication		* Tells the theme whether to follow the global settings or use app lication
	* specific settings		* specific settings
	*		*
	* @arg useGlobal pass in true to follow the global settings		* @param useGlobal pass in true to follow the global settings
	*/		*/
	void setUseGlobalSettings(bool useGlobal);		void setUseGlobalSettings(bool useGlobal);
	/**		/**
	* @return true if the global settings are followed, false if appli cation		* @return true if the global settings are followed, false if appli cation
	* specific settings are used.		* specific settings are used.
	*/		*/
	bool useGlobalSettings() const;		bool useGlobalSettings() const;
	/**		/**
	skipping to change at line 330		skipping to change at line 330
	* Setting cache limit to 0 disables automatic cache size limiting.		* Setting cache limit to 0 disables automatic cache size limiting.
	*		*
	* Note that the cleanup might not be done immediately, so the cach e might		* Note that the cleanup might not be done immediately, so the cach e might
	* temporarily (for a few seconds) grow bigger than the limit.		* temporarily (for a few seconds) grow bigger than the limit.
	**/		**/
	void setCacheLimit(int kbytes);		void setCacheLimit(int kbytes);
	/**		/**
	* Tries to load the rect of a sub element from a disk cache		* Tries to load the rect of a sub element from a disk cache
	*		*
	* @arg image path of the image we want to check		* @param image path of the image we want to check
	* @arg element sub element we want to retrieve		* @param element sub element we want to retrieve
	* @arg rect output parameter of the element rect found in cache		* @param rect output parameter of the element rect found in cache
	* if not found or if we are sure it doesn't exist it wil l be QRect()		* if not found or if we are sure it doesn't exist it wil l be QRect()
	* @return true if the element was found in cache or if we are sure the element doesn't exist		* @return true if the element was found in cache or if we are sure the element doesn't exist
	**/		**/
	bool findInRectsCache(const QString &image, const QString &element, QRectF &rect) const;		bool findInRectsCache(const QString &image, const QString &element, QRectF &rect) const;
	/**		/**
	* Returns a list of all keys of cached rects for the given image.		* Returns a list of all keys of cached rects for the given image.
	*		*
	* @arg image path of the image for which the keys should be return ed		* @param image path of the image for which the keys should be retu rned
	*		*
	* @return a QStringList whose elements are the entry keys in the r ects cache		* @return a QStringList whose elements are the entry keys in the r ects cache
	*		*
	* @since 4.6		* @since 4.6
	*/		*/
	QStringList listCachedRectKeys(const QString &image) const;		QStringList listCachedRectKeys(const QString &image) const;
	/**		/**
	* Inserts a rectangle of a sub element of an image into a disk cac he		* Inserts a rectangle of a sub element of an image into a disk cac he
	*		*
	* @arg image path of the image we want to insert information		* @param image path of the image we want to insert information
	* @arg element sub element we want insert the rect		* @param element sub element we want insert the rect
	* @arg rect element rectangle		* @param rect element rectangle
	**/		**/
	void insertIntoRectsCache(const QString& image, const QString &elem ent, const QRectF &rect);		void insertIntoRectsCache(const QString& image, const QString &elem ent, const QRectF &rect);
	/**		/**
	* Discards all the information about a given image from the rectan gle disk cache		* Discards all the information about a given image from the rectan gle disk cache
	*		*
	* @arg image the path to the image the cache is assoiated with		* @param image the path to the image the cache is assoiated with
	**/		**/
	void invalidateRectsCache(const QString &image);		void invalidateRectsCache(const QString &image);
	/**		/**
	* Frees up memory used by cached information for a given image wit hout removing		* Frees up memory used by cached information for a given image wit hout removing
	* the permenant record of it on disk.		* the permenant record of it on disk.
	* @see invalidateRectsCache		* @see invalidateRectsCache
	*		*
	* @arg image the path to the image the cache is assoiated with		* @param image the path to the image the cache is assoiated with
	*/		*/
	void releaseRectsCache(const QString &image);		void releaseRectsCache(const QString &image);
			/**
			* @return the default homepage to use in conjunction with the bran
			ding svg content
			* @since 4.7
			*/
			KUrl homepage() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the user changes the theme. SVGs should be reloaded at		* Emitted when the user changes the theme. SVGs should be reloaded at
	* that point		* that point
	*/		*/
	void themeChanged();		void themeChanged();
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Notifies the Theme object that the theme settings have changed		* Notifies the Theme object that the theme settings have changed
	skipping to change at line 395		skipping to change at line 401
	**/		**/
	void settingsChanged();		void settingsChanged();
	private:		private:
	friend class ThemeSingleton;		friend class ThemeSingleton;
	friend class ThemePrivate;		friend class ThemePrivate;
	ThemePrivate *const d;		ThemePrivate *const d;
	Q_PRIVATE_SLOT(d, void compositingChanged())		Q_PRIVATE_SLOT(d, void compositingChanged())
	Q_PRIVATE_SLOT(d, void colorsChanged())		Q_PRIVATE_SLOT(d, void colorsChanged())
			Q_PRIVATE_SLOT(d, void blurBehindChanged(bool blur))
	Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &))		Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &))
	Q_PRIVATE_SLOT(d, void scheduledCacheUpdate())		Q_PRIVATE_SLOT(d, void scheduledCacheUpdate())
	Q_PRIVATE_SLOT(d, void onAppExitCleanup())		Q_PRIVATE_SLOT(d, void onAppExitCleanup())
	};		};
	} // Plasma namespace		} // Plasma namespace
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 17 change blocks.
	21 lines changed or deleted		29 lines changed or added

	thumbcreator.h		thumbcreator.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef _THUMBCREATOR_H_		#ifndef _THUMBCREATOR_H_
	#define _THUMBCREATOR_H_		#define _THUMBCREATOR_H_
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
	class QString;		class QString;
	class QImage;		class QImage;
			class QWidget;
	/**		/**
	* This is the baseclass for "thumbnail-plugins" in KDE. Using the class		* This is the baseclass for "thumbnail-plugins" in KDE. Using the class
	* KIO::PreviewJob allows you to generate small images (thumbnails)		* KIO::PreviewJob allows you to generate small images (thumbnails)
	* for any kind of file, where a "ThumbCreator" is available. Have a look		* for any kind of file, where a "ThumbCreator" is available. Have a look
	* at kdebase/kioslave/thumbnail/ for existing ThumbCreators.		* at kdebase/kioslave/thumbnail/ for existing ThumbCreators. Use ThumbCrea
			torV2
			* if the thumbnail-plugin should be configurable by the user.
	*		*
	* What you need to do to create and register a ThumbCreator:		* What you need to do to create and register a ThumbCreator:
	* @li Inherit from this class and reimplement the create() method to		* @li Inherit from this class and reimplement the create() method to
	* generate a thumbnail for the given file-path.		* generate a thumbnail for the given file-path.
	* @li Provide a factory method in your implementation file to instantiate		* @li Provide a factory method in your implementation file to instantiate
	* your plugin, e.g.:		* your plugin, e.g.:
	* \code		* \code
	* extern "C"		* extern "C"
	* {		* {
	* KDE_EXPORT ThumbCreator *new_creator()		* KDE_EXPORT ThumbCreator *new_creator()
	skipping to change at line 141		skipping to change at line 144
	virtual bool create(const QString &path, int width, int height, QImage &img) = 0;		virtual bool create(const QString &path, int width, int height, QImage &img) = 0;
	/**		/**
	* The flags of this plugin:		* The flags of this plugin:
	* @li None nothing special		* @li None nothing special
	* @li DrawFrame a frame should be painted around the preview		* @li DrawFrame a frame should be painted around the preview
	* @li BlendIcon the mimetype icon should be blended over the preview		* @li BlendIcon the mimetype icon should be blended over the preview
	*		*
	* @return flags for this plugin		* @return flags for this plugin
	*/		*/
	virtual Flags flags() const { return None; } //krazy:exclude=inline		virtual Flags flags() const;
			};
			/**
			* @since 4.7
			*/
			class KIO_EXPORT ThumbCreatorV2 : public ThumbCreator
			{
			public:
			virtual ~ThumbCreatorV2();
			/**
			* Creates a widget that allows to configure the
			* thumbcreator by the user. The caller of this method is defined
			* as owner of the returned instance and must take care to delete it.
			* The default implementation returns 0.
			*
			* The following key in the thumbcreator .desktop file must be set to
			* mark the plugin as configurable:
			* \code
			* Configurable=true
			* \endcode
			*/
			virtual QWidget *createConfigurationWidget();
			/**
			* Writes the configuration that is specified by \p configurationWidget
			.
			* The passed configuration widget is the instance created by
			* ThumbCreatorV2::createConfigurationWidget().
			*/
			virtual void writeConfiguration(const QWidget* configurationWidget);
	};		};
	typedef ThumbCreator *(*newCreator)();		typedef ThumbCreator *(*newCreator)();
	#endif		#endif
End of changes. 3 change blocks.
	2 lines changed or deleted		37 lines changed or added

	toolbutton.h		toolbutton.h
	skipping to change at line 61		skipping to change at line 61
	Q_PROPERTY(qreal animationUpdate READ animationUpdate WRITE setAnimatio nUpdate)		Q_PROPERTY(qreal animationUpdate READ animationUpdate WRITE setAnimatio nUpdate)
	public:		public:
	explicit ToolButton(QGraphicsWidget *parent = 0);		explicit ToolButton(QGraphicsWidget *parent = 0);
	~ToolButton();		~ToolButton();
	/**		/**
	* Sets if the toolbutton has an autoraise behaviour		* Sets if the toolbutton has an autoraise behaviour
	*		*
	* @arg raise		* @param raise
	*/		*/
	void setAutoRaise(bool raise);		void setAutoRaise(bool raise);
	/**		/**
	* @return true if the toolbutton has an autoraise behaviour		* @return true if the toolbutton has an autoraise behaviour
	*/		*/
	bool autoRaise() const;		bool autoRaise() const;
	/**		/**
	* Sets the display text for this ToolButton		* Sets the display text for this ToolButton
	*		*
	* @arg text the text to display; should be translated.		* @param text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @param path the path to the image; if a relative path, then a themed image will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
	* Sets the path to an svg image to display and the id of the used svg element, if necessary.		* Sets the path to an svg image to display and the id of the used svg element, if necessary.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i		* @param path the path to the image; if a relative path, then a themed
	mage will be loaded.		image will be loaded.
	* @arg elementid the id of a svg element.		* @param elementid the id of a svg element.
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	void setImage(const QString &path, const QString &elementid);		void setImage(const QString &path, const QString &elementid);
	/**		/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
	* Sets the status of the button to pressed		* Sets the status of the button to pressed
	*		*
	* @arg down		* @param down
	* @since 4.5		* @since 4.5
	*/		*/
	void setDown(bool down);		void setDown(bool down);
	/**		/**
	* @return true if the button is pressed down		* @return true if the button is pressed down
	* @since 4.4		* @since 4.4
	*/		*/
	bool isDown() const;		bool isDown() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this ToolB utton		* Sets the stylesheet used to control the visual display of this ToolB utton
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* Associate an action with this IconWidget		* Associate an action with this IconWidget
	skipping to change at line 149		skipping to change at line 149
	/**		/**
	* @return the currently associated action, if any.		* @return the currently associated action, if any.
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	QAction *action() const;		QAction *action() const;
	/**		/**
	* sets the icon for this toolbutton		* sets the icon for this toolbutton
	*		*
	* @arg icon the icon we want to use		* @param icon the icon we want to use
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setIcon(const QIcon &icon);		void setIcon(const QIcon &icon);
	/**		/**
	* @return the icon of this button		* @return the icon of this button
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
End of changes. 7 change blocks.
	9 lines changed or deleted		9 lines changed or added

	tooltipcontent.h		tooltipcontent.h
	skipping to change at line 170		skipping to change at line 170
	/** Sets whether or not to autohide the tooltip, defaults to true		/** Sets whether or not to autohide the tooltip, defaults to true
	*/		*/
	void setAutohide(bool autohide);		void setAutohide(bool autohide);
	/**		/**
	* Whether or not to autohide the tooltip, defaults to true		* Whether or not to autohide the tooltip, defaults to true
	*/		*/
	bool autohide() const;		bool autohide() const;
	/**		/**
			* Sets whether or not the tooltip should popup instantly when
			* the widget is hovered, defaults to false.
			*
			* @since 4.7
			*/
			void setInstantPopup(bool enabled);
			/**
			* Whether or not the tooltip should popup instantly when
			* the widget is hovered, defaults to false.
			*
			* @since 4.7
			*/
			bool isInstantPopup() const;
			/**
	* Adds a resource that can then be referenced from the text elements		* Adds a resource that can then be referenced from the text elements
	* using rich text		* using rich text
	*/		*/
	void addResource(ResourceType type, const QUrl &path, const QVariant &r esource);		void addResource(ResourceType type, const QUrl &path, const QVariant &r esource);
	/**		/**
	* Registers all resources with a given document		* Registers all resources with a given document
	*/		*/
	void registerResources(QTextDocument *document) const;		void registerResources(QTextDocument *document) const;
End of changes. 1 change blocks.
	0 lines changed or deleted		16 lines changed or added

	tooltipmanager.h		tooltipmanager.h
	skipping to change at line 159		skipping to change at line 159
	/**		/**
	* Clears the tooltip data associated with this widget, but keeps		* Clears the tooltip data associated with this widget, but keeps
	* the widget registered.		* the widget registered.
	*/		*/
	void clearContent(QGraphicsWidget *widget);		void clearContent(QGraphicsWidget *widget);
	/**		/**
	* Sets the current state of the manager.		* Sets the current state of the manager.
	* @see State		* @see State
	* @arg state the state to put the manager in		* @param state the state to put the manager in
	*/		*/
	void setState(ToolTipManager::State state);		void setState(ToolTipManager::State state);
	/**		/**
	* @return the current state of the manager; @see State		* @return the current state of the manager; @see State
	*/		*/
	ToolTipManager::State state() const;		ToolTipManager::State state() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is emitted when a window preview in the tooltip is click ed.		* This signal is emitted when a window preview in the tooltip is click ed.
	* @arg window the id of the window that was clicked		* @param window the id of the window that was clicked
	* @arg buttons the mouse buttons involved in the activation		* @param buttons the mouse buttons involved in the activation
	* @arg modifiers the keyboard modifiers involved in the activation, if		* @param modifiers the keyboard modifiers involved in the activation,
	any		if any
	* @since 4.4		* @since 4.4
	*/		*/
	void windowPreviewActivated(WId window, Qt::MouseButtons buttons, Qt::K eyboardModifiers modifiers,		void windowPreviewActivated(WId window, Qt::MouseButtons buttons, Qt::K eyboardModifiers modifiers,
	const QPoint &screenPos);		const QPoint &screenPos);
	/**		/**
	* This signal is emitted when a link in the tooltip is clicked.		* This signal is emitted when a link in the tooltip is clicked.
	* @arg anchor the achor text (e.g. url) that was clicked on		* @param anchor the achor text (e.g. url) that was clicked on
	* @arg buttons the mouse buttons involved in the activation		* @param buttons the mouse buttons involved in the activation
	* @arg modifiers the keyboard modifiers involved in the activation, if		* @param modifiers the keyboard modifiers involved in the activation,
	any		if any
	* @since 4.4		* @since 4.4
	*/		*/
	void linkActivated(const QString &anchor, Qt::MouseButtons buttons, Qt: :KeyboardModifiers modifiers,		void linkActivated(const QString &anchor, Qt::MouseButtons buttons, Qt: :KeyboardModifiers modifiers,
	const QPoint &screenPos);		const QPoint &screenPos);
	private:		private:
	/**		/**
	* Default constructor.		* Default constructor.
	*		*
	* You should normall use self() instead.		* You should normall use self() instead.
End of changes. 3 change blocks.
	9 lines changed or deleted		9 lines changed or added

	treeview.h		treeview.h
	skipping to change at line 56		skipping to change at line 56
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QTreeView *nativeWidget READ nativeWidget)		Q_PROPERTY(QTreeView *nativeWidget READ nativeWidget)
	public:		public:
	explicit TreeView(QGraphicsWidget *parent = 0);		explicit TreeView(QGraphicsWidget *parent = 0);
	~TreeView();		~TreeView();
	/**		/**
	* Sets a model for this weather view		* Sets a model for this weather view
	*		*
	* @arg model the model to display		* @param model the model to display
	*/		*/
	void setModel(QAbstractItemModel *model);		void setModel(QAbstractItemModel *model);
	/**		/**
	* @return the model shown by this view		* @return the model shown by this view
	*/		*/
	QAbstractItemModel *model();		QAbstractItemModel *model();
	/**		/**
	* Sets the stylesheet used to control the visual display of this TreeV iew		* Sets the stylesheet used to control the visual display of this TreeV iew
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this TreeView		* @return the native widget wrapped by this TreeView
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	videowidget.h		videowidget.h
	skipping to change at line 82		skipping to change at line 82
	OpenFile = 128,		OpenFile = 128,
	DefaultControls = PlayPause|Progress|Volume|OpenFile		DefaultControls = PlayPause|Progress|Volume|OpenFile
	};		};
	Q_DECLARE_FLAGS(Controls, Control)		Q_DECLARE_FLAGS(Controls, Control)
	explicit VideoWidget(QGraphicsWidget *parent = 0);		explicit VideoWidget(QGraphicsWidget *parent = 0);
	~VideoWidget();		~VideoWidget();
	/**		/**
	* Load a certain url that can be a local file or a remote one		* Load a certain url that can be a local file or a remote one
	* @arg path resource to play		* @param path resource to play
	*/		*/
	void setUrl(const QString &url);		void setUrl(const QString &url);
	/**		/**
	* @return the url (local or remote) we are playing		* @return the url (local or remote) we are playing
	*/		*/
	QString url() const;		QString url() const;
	/**		/**
	* @return the Phonon::MediaObject being used		* @return the Phonon::MediaObject being used
	skipping to change at line 121		skipping to change at line 121
	qint64 totalTime() const;		qint64 totalTime() const;
	/**		/**
	* @return the time remaining to the current media file		* @return the time remaining to the current media file
	*/		*/
	qint64 remainingTime() const;		qint64 remainingTime() const;
	/**		/**
	* Set what control widgets to use		* Set what control widgets to use
	*		*
	* @arg controls bitwise OR combination of Controls flags		* @param controls bitwise OR combination of Controls flags
	* @see Controls		* @see Controls
	*/		*/
	void setUsedControls(const Controls controls);		void setUsedControls(const Controls controls);
	/**		/**
	* @return the video controls that are used and shown		* @return the video controls that are used and shown
	* @see Controls		* @see Controls
	*/		*/
	Controls usedControls() const;		Controls usedControls() const;
	/**		/**
	* Show/hide the main controls widget, if any of them is used		* Show/hide the main controls widget, if any of them is used
	*		*
	* @arg visible if we want to show or hide the main controls		* @param visible if we want to show or hide the main controls
	* @see setUsedControls()		* @see setUsedControls()
	*/		*/
	void setControlsVisible(bool visible);		void setControlsVisible(bool visible);
	/**		/**
	* @return true if the controls widget is being shown right now		* @return true if the controls widget is being shown right now
	*/		*/
	bool controlsVisible() const;		bool controlsVisible() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this Video Widget		* Sets the stylesheet used to control the visual display of this Video Widget
	*		*
	* @arg stylesheet a CSS string		* @param stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this VideoWidget		* @return the native widget wrapped by this VideoWidget
	skipping to change at line 181		skipping to change at line 181
	*/		*/
	void pause();		void pause();
	/**		/**
	* Stop the current file		* Stop the current file
	*/		*/
	void stop();		void stop();
	/**		/**
	* Jump at a given millisecond in the current file		* Jump at a given millisecond in the current file
	* @arg time where we want to jump		* @param time where we want to jump
	*/		*/
	void seek(qint64 time);		void seek(qint64 time);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted regularly when the playing is progressing		* Emitted regularly when the playing is progressing
	* @arg time where we are		* @param time where we are
	*/		*/
	void tick(qint64 time);		void tick(qint64 time);
	/**		/**
	* Emitted an instant before the playback is finished		* Emitted an instant before the playback is finished
	*/		*/
	void aboutToFinish();		void aboutToFinish();
	/**		/**
	* The user pressed the "next" button		* The user pressed the "next" button
End of changes. 6 change blocks.
	6 lines changed or deleted		6 lines changed or added

	wallpaper.h		wallpaper.h
	skipping to change at line 24		skipping to change at line 24
	*		*
	* You should have received a copy of the GNU Library General Public		* You should have received a copy of the GNU Library General Public
	* License along with this program; if not, write to the		* License along with this program; if not, write to the
	* Free Software Foundation, Inc.,		* Free Software Foundation, Inc.,
	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef PLASMA_WALLPAPER_H		#ifndef PLASMA_WALLPAPER_H
	#define PLASMA_WALLPAPER_H		#define PLASMA_WALLPAPER_H
			#include <kmimetype.h>
	#include <kplugininfo.h>		#include <kplugininfo.h>
	#include <plasma/plasma.h>		#include <plasma/plasma.h>
	#include <plasma/packagestructure.h>		#include <plasma/packagestructure.h>
	#include <plasma/version.h>		#include <plasma/version.h>
	namespace Plasma		namespace Plasma
	{		{
	class DataEngine;		class DataEngine;
	skipping to change at line 89		skipping to change at line 90
	Q_ENUMS(ResizeMethod)		Q_ENUMS(ResizeMethod)
	/**		/**
	* Default constructor for an empty or null wallpaper		* Default constructor for an empty or null wallpaper
	*/		*/
	explicit Wallpaper(QObject * parent = 0);		explicit Wallpaper(QObject * parent = 0);
	~Wallpaper();		~Wallpaper();
	/**		/**
			* Sets the urls for the wallpaper
			* @param urls Urls of the selected images
			* @since 4.7
			*/
			void setUrls(const KUrl::List &urls);
			/**
	* Returns a list of all known wallpapers.		* Returns a list of all known wallpapers.
	*		*
	* @arg formFactor the format of the wallpaper being search for (e. g. desktop)		* @param formFactor the format of the wallpaper being search for ( e.g. desktop)
	* @return list of wallpapers		* @return list of wallpapers
	**/		**/
	static KPluginInfo::List listWallpaperInfo(const QString &formFacto r = QString());		static KPluginInfo::List listWallpaperInfo(const QString &formFacto r = QString());
	/**		/**
	* Returns a list of all known wallpapers that can accept the given mimetype		* Returns a list of all known wallpapers that can accept the given mimetype
	* @arg mimetype the mimetype to search for		* @param mimetype the mimetype to search for
	* @arg formFactor the format of the wallpaper being search for (e.		* @param formFactor the format of the wallpaper being search for (
	g. desktop)		e.g. desktop)
	* @return list of wallpapers		* @return list of wallpapers
	*/		*/
	static KPluginInfo::List listWallpaperInfoForMimetype(const QString &mimetype,		static KPluginInfo::List listWallpaperInfoForMimetype(const QString &mimetype,
	const QString &formFactor = QString());		const QString &formFactor = QString());
	/**		/**
	* Attempts to load a wallpaper		* Attempts to load a wallpaper
	*		*
	* Returns a pointer to the wallpaper if successful.		* Returns a pointer to the wallpaper if successful.
	* The caller takes responsibility for the wallpaper, including		* The caller takes responsibility for the wallpaper, including
	skipping to change at line 173		skipping to change at line 181
	* Returns the icon related to this wallpaper		* Returns the icon related to this wallpaper
	**/		**/
	QString icon() const;		QString icon() const;
	/**		/**
	* @return the currently active rendering mode		* @return the currently active rendering mode
	*/		*/
	KServiceAction renderingMode() const;		KServiceAction renderingMode() const;
	/**		/**
			* @return true if the mimetype is supported by this wallpaper and
			* can be used in renderering. Uses the MimeType= entry fro
			m
			* the .desktop file, and can include mimetypes that may no
			t be
			* suitable for drag-and-drop purposes.
			* @since 4.7
			*/
			bool supportsMimetype(const QString &mimetype) const;
			/**
	* Sets the rendering mode for this wallpaper.		* Sets the rendering mode for this wallpaper.
	* @param mode One of the modes supported by the plugin,		* @param mode One of the modes supported by the plugin,
	* or an empty string for the default mode.		* or an empty string for the default mode.
	*/		*/
	void setRenderingMode(const QString &mode);		void setRenderingMode(const QString &mode);
	/**		/**
	* Returns modes the wallpaper has, as specified in the		* Returns modes the wallpaper has, as specified in the
	* .desktop file.		* .desktop file.
	*/		*/
	skipping to change at line 310		skipping to change at line 327
	* @return true if disk caching is turned on.		* @return true if disk caching is turned on.
	* @since 4.3		* @since 4.3
	*/		*/
	bool isUsingRenderingCache() const;		bool isUsingRenderingCache() const;
	/**		/**
	* Allows one to set rendering hints that may differ from the actua lities of the		* Allows one to set rendering hints that may differ from the actua lities of the
	* Wallpaper's current state, allowing for better selection of pape rs from packages,		* Wallpaper's current state, allowing for better selection of pape rs from packages,
	* for instance.		* for instance.
	*		*
	* @arg resizeMethod The resize method to assume will be used for f uture wallpaper		* @param resizeMethod The resize method to assume will be used for future wallpaper
	* scaling; may later be changed by calls to rend er()		* scaling; may later be changed by calls to rend er()
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod);		void setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod);
	/**		/**
	* Allows one to set rendering hints that may differ from the actua lities of the		* Allows one to set rendering hints that may differ from the actua lities of the
	* Wallpaper's current state, allowing for better selection of pape rs from packages,		* Wallpaper's current state, allowing for better selection of pape rs from packages,
	* for instance.		* for instance.
	*		*
	* @arg targetSize The size to assume will be used for future wallp aper scaling		* @param targetSize The size to assume will be used for future wal lpaper scaling
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setTargetSizeHint(const QSizeF &targetSize);		void setTargetSizeHint(const QSizeF &targetSize);
	/**		/**
	* Returns a list of wallpaper contextual actions (nothing by defau lt)		* Returns a list of wallpaper contextual actions (nothing by defau lt)
	*/		*/
	QList<QAction*> contextualActions() const;		QList<QAction*> contextualActions() const;
	skipping to change at line 386		skipping to change at line 403
	/**		/**
	* Emitted when a wallpaper image render is completed.		* Emitted when a wallpaper image render is completed.
	* @since 4.3		* @since 4.3
	*/		*/
	void renderCompleted(const QImage &image);		void renderCompleted(const QImage &image);
	/**		/**
	* Emitted when a URL matching X-Plasma-DropMimeTypes is dropped on the wallpaper		* Emitted when a URL matching X-Plasma-DropMimeTypes is dropped on the wallpaper
	*		*
	* @arg url the URL of the dropped file		* @param url the URL of the dropped file
	* @since 4.4		* @since 4.4
	*/		*/
	void urlDropped(const KUrl &url);		KDE_DEPRECATED void urlDropped(const KUrl &url);
	/**		/**
	* @internal		* @internal
	*/		*/
	void renderHintsChanged();		void renderHintsChanged();
			protected Q_SLOTS:
			/**
			* This method is invoked by setUrls(KUrl::List)
			* Can be Overriden by Plugins which want to support setting Image
			URLs
			* Will be changed to virtual method in libplasma2/KDE5
			* @since 4.7
			*/
			void addUrls(const KUrl::List &urls);
	protected:		protected:
	/**		/**
	* This constructor is to be used with the plugin loading systems		* This constructor is to be used with the plugin loading systems
	* found in KPluginInfo and KService. The argument list is expected		* found in KPluginInfo and KService. The argument list is expected
	* to have one element: the KService service ID for the desktop ent ry.		* to have one element: the KService service ID for the desktop ent ry.
	*		*
	* @param parent a QObject parent; you probably want to pass in 0		* @param parent a QObject parent; you probably want to pass in 0
	* @param args a list of strings containing one entry: the service id		* @param args a list of strings containing one entry: the service id
	*/		*/
	Wallpaper(QObject *parent, const QVariantList &args);		Wallpaper(QObject *parent, const QVariantList &args);
	skipping to change at line 509		skipping to change at line 535
	* Sets whether the configuration user interface of the wallpaper s hould have		* Sets whether the configuration user interface of the wallpaper s hould have
	* a live preview rendered by a Wallpaper instance. note: this is j ust an		* a live preview rendered by a Wallpaper instance. note: this is j ust an
	* hint, the configuration user interface can choose to ignore it		* hint, the configuration user interface can choose to ignore it
	*		*
	* @param preview true if a preview should be shown		* @param preview true if a preview should be shown
	* @since 4.6		* @since 4.6
	*/		*/
	void setPreviewDuringConfiguration(const bool preview);		void setPreviewDuringConfiguration(const bool preview);
	private:		private:
	Q_PRIVATE_SLOT(d, void newRenderCompleted(WallpaperRenderThread *re		Q_PRIVATE_SLOT(d, void newRenderCompleted(const WallpaperRenderRequ
	nderer, int token, const QImage &image,		est &request,
	const QString &sourceImag		const QImage &image))
	ePath, const QSize &size,
	int resizeMethod, const Q
	Color &color))
	Q_PRIVATE_SLOT(d, void initScript())		Q_PRIVATE_SLOT(d, void initScript())
	friend class WallpaperPackage;		friend class WallpaperPackage;
	friend class WallpaperPrivate;		friend class WallpaperPrivate;
	friend class WallpaperScript;		friend class WallpaperScript;
	friend class WallpaperWithPaint;		friend class WallpaperWithPaint;
	friend class ContainmentPrivate;		friend class ContainmentPrivate;
	WallpaperPrivate *const d;		WallpaperPrivate *const d;
	};		};
End of changes. 11 change blocks.
	14 lines changed or deleted		40 lines changed or added

	wallpaperscript.h		wallpaperscript.h
	skipping to change at line 140		skipping to change at line 140
	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	/**		/**
	* Mouse wheel event. To prevent further propagation of the event,		* Mouse wheel event. To prevent further propagation of the event,
	* the event must be accepted.		* the event must be accepted.
	*		*
	* @param event the wheel event object		* @param event the wheel event object
	*/		*/
	virtual void wheelEvent(QGraphicsSceneWheelEvent *event);		virtual void wheelEvent(QGraphicsSceneWheelEvent *event);
			/**
			* Adds urls (e.g. from a drop)
			* @since 4.7
			*/
			void setUrls(const KUrl::List urls);
	protected:		protected:
	/**		/**
	* @return absolute path to the main script file for this wallpaper		* @return absolute path to the main script file for this wallpaper
	*/		*/
	QString mainScript() const;		QString mainScript() const;
	/**		/**
	* @return the Package associated with this wallpaper which can		* @return the Package associated with this wallpaper which can
	* be used to request resources, such as images and		* be used to request resources, such as images and
	* interface files.		* interface files.
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	windoweffects.h		windoweffects.h
	skipping to change at line 60		skipping to change at line 60
	* @return if an atom property is available		* @return if an atom property is available
	*		*
	* @param effect the effect we want to check		* @param effect the effect we want to check
	* @since 4.4		* @since 4.4
	*/		*/
	PLASMA_EXPORT bool isEffectAvailable(Effect effect);		PLASMA_EXPORT bool isEffectAvailable(Effect effect);
	/**		/**
	* Mark a window as sliding from screen edge		* Mark a window as sliding from screen edge
	*		*
	* @arg id of the window on which we want to apply the effect		* @param id of the window on which we want to apply the effect
	* @arg location edge of the screen from which we want the sliding effe		* @param location edge of the screen from which we want the sliding ef
	ct.		fect.
	* Desktop and Floating won't have effect.		* Desktop and Floating won't have effect.
	* @arg offset distance in pixels from the screen edge defined by locat ion		* @param offset distance in pixels from the screen edge defined by loc ation
	* @since 4.4		* @since 4.4
	*/		*/
	PLASMA_EXPORT void slideWindow(WId id, Plasma::Location location, int o ffset);		PLASMA_EXPORT void slideWindow(WId id, Plasma::Location location, int o ffset);
	/**		/**
	* Mark a window as sliding from screen edge		* Mark a window as sliding from screen edge
	* This is an overloaded member function provided for convenience		* This is an overloaded member function provided for convenience
	*		*
	* @arg widget QWidget corresponding to the top level window we want to		* @param widget QWidget corresponding to the top level window we want
	animate		to animate
	* @arg location edge of the screen from which we want the sliding effe		* @param location edge of the screen from which we want the sliding ef
	ct.		fect.
	* Desktop and Floating won't have effect.		* Desktop and Floating won't have effect.
	* @since 4.4		* @since 4.4
	*/		*/
	PLASMA_EXPORT void slideWindow(QWidget *widget, Plasma::Location locati on);		PLASMA_EXPORT void slideWindow(QWidget *widget, Plasma::Location locati on);
	/**		/**
	* @return dimension of all the windows passed as parameter		* @return dimension of all the windows passed as parameter
	*		*
	* @param ids all the windows we want the size		* @param ids all the windows we want the size
	* @since 4.4		* @since 4.4
End of changes. 3 change blocks.
	8 lines changed or deleted		8 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/