abstractrunner.h		abstractrunner.h
	skipping to change at line 66		skipping to change at line 66
	* each runner is executed in its own thread for each new term. Thus, a run ner		* each runner is executed in its own thread for each new term. Thus, a run ner
	* may be executed more than once at the same time. See match() for details .		* may be executed more than once at the same time. See match() for details .
	* To let krunner expose a global shortcut for the single runner query mode , the runner		* To let krunner expose a global shortcut for the single runner query mode , the runner
	* must set the "X-Plasma-AdvertiseSingleRunnerMode" key to true in the .de sktop file		* must set the "X-Plasma-AdvertiseSingleRunnerMode" key to true in the .de sktop file
	* and set a default syntax. See setDefaultSyntax() for details.		* and set a default syntax. See setDefaultSyntax() for details.
	*		*
	*/		*/
	class PLASMA_EXPORT AbstractRunner : public QObject		class PLASMA_EXPORT AbstractRunner : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(bool matchingSuspended READ isMatchingSuspended WRITE suspen dMatching NOTIFY matchingSuspended)
	public:		public:
	/** Specifies a nominal speed for the runner */		/** Specifies a nominal speed for the runner */
	enum Speed {		enum Speed {
	SlowSpeed,		SlowSpeed,
	NormalSpeed		NormalSpeed
	};		};
	/** Specifies a priority for the runner */		/** Specifies a priority for the runner */
	enum Priority {		enum Priority {
	skipping to change at line 260		skipping to change at line 261
	*/		*/
	static QMutex *bigLock();		static QMutex *bigLock();
	/**		/**
	* @return the default syntax for the runner or 0 if no default syn tax has been defined		* @return the default syntax for the runner or 0 if no default syn tax has been defined
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	RunnerSyntax *defaultSyntax() const;		RunnerSyntax *defaultSyntax() const;
			/**
			* @return true if the runner is currently busy with non-interuptab
			le work, signaling that
			* new threads should not be created for it at this time
			* @since 4.6
			*/
			bool isMatchingSuspended() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is emitted when matching is about to commence, givin g runners		* This signal is emitted when matching is about to commence, givin g runners
	* an opportunity to prepare themselves, e.g. loading data sets or preparing		* an opportunity to prepare themselves, e.g. loading data sets or preparing
	* IPC or network connections. This method should be fast so as not to cause		* IPC or network connections. This method should be fast so as not to cause
	* slow downs. Things that take longer or which should be loaded on ce and		* slow downs. Things that take longer or which should be loaded on ce and
	* remain extant for the lifespan of the AbstractRunner should be d one in init().		* remain extant for the lifespan of the AbstractRunner should be d one in init().
	* @see init()		* @see init()
	* @since 4.4		* @since 4.4
	*/		*/
	void prepare();		void prepare();
	/**		/**
	* This signal is emitted when a session of matches is complete, gi ving runners		* This signal is emitted when a session of matches is complete, gi ving runners
	* the opportunity to tear down anything set up as a result of the prepare()		* the opportunity to tear down anything set up as a result of the prepare()
	* method.		* method.
	* @since 4.4		* @since 4.4
	*/		*/
	void teardown();		void teardown();
			/**
			* Emitted when the runner enters or exits match suspension
			* @see matchingSuspended
			* @since 4.6
			*/
			void matchingSuspended(bool suspended);
	protected:		protected:
	friend class RunnerManager;		friend class RunnerManager;
	friend class RunnerManagerPrivate;		friend class RunnerManagerPrivate;
	explicit AbstractRunner(QObject *parent = 0, const QString &path = QString());		explicit AbstractRunner(QObject *parent = 0, const QString &path = QString());
	explicit AbstractRunner(const KService::Ptr service, QObject *paren t = 0);		explicit AbstractRunner(const KService::Ptr service, QObject *paren t = 0);
	AbstractRunner(QObject *parent, const QVariantList &args);		AbstractRunner(QObject *parent, const QVariantList &args);
	/**		/**
			* Sets whether or not the runner is available for match requests.
			Useful to
			* prevent more thread spawning when the thread is in a busy state.
			*/
			void suspendMatching(bool suspend);
			/**
	* Provides access to the runner's configuration object.		* Provides access to the runner's configuration object.
	*/		*/
	KConfigGroup config() const;		KConfigGroup config() const;
	/**		/**
	* Sets whether or not the runner has options for matches		* Sets whether or not the runner has options for matches
	*/		*/
	void setHasRunOptions(bool hasRunOptions);		void setHasRunOptions(bool hasRunOptions);
	/**		/**
	skipping to change at line 442		skipping to change at line 463
	* @param name Name of the data engine to load		* @param name Name of the data engine to load
	* @return pointer to the data engine if it was loaded,		* @return pointer to the data engine if it was loaded,
	* or an invalid data engine if the requested engine		* or an invalid data engine if the requested engine
	* could not be loaded		* could not be loaded
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	Q_INVOKABLE DataEngine *dataEngine(const QString &name) const;		Q_INVOKABLE DataEngine *dataEngine(const QString &name) const;
	protected Q_SLOTS:		protected Q_SLOTS:
			/**
			* Reimplement this slot to run any initialization routines on firs
			t load.
			* By default, it calls reloadConfiguration(); for scripted Runners
			this
			* method also sets up the ScriptEngine.
			*/
	void init();		void init();
	/**		/**
	* Reimplement this slot if you want your runner		* Reimplement this slot if you want your runner
	* to support serialization and drag and drop		* to support serialization and drag and drop
	* @since 4.5		* @since 4.5
	*/		*/
	QMimeData * mimeDataForMatch(const Plasma::QueryMatch *match);		QMimeData * mimeDataForMatch(const Plasma::QueryMatch *match);
	private:		private:
End of changes. 5 change blocks.
	0 lines changed or deleted		30 lines changed or added

	abstracttoolbox.h		abstracttoolbox.h
	skipping to change at line 26		skipping to change at line 26
	* 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_ABSTRACTTOOLBOX_H		#ifndef PLASMA_ABSTRACTTOOLBOX_H
	#define PLASMA_ABSTRACTTOOLBOX_H		#define PLASMA_ABSTRACTTOOLBOX_H
	#include <QGraphicsWidget>		#include <QGraphicsWidget>
	#include <QGraphicsItem>		#include <QGraphicsItem>
			#include <kplugininfo.h>
	#include "plasma/plasma_export.h"		#include "plasma/plasma_export.h"
	class QAction;		class QAction;
			class KConfigGroup;
	namespace Plasma		namespace Plasma
	{		{
	class AbstractToolBoxPrivate;		class AbstractToolBoxPrivate;
	class Containment;		class Containment;
	class PLASMA_EXPORT AbstractToolBox : public QGraphicsWidget		class PLASMA_EXPORT AbstractToolBox : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_INTERFACES(QGraphicsItem)		Q_INTERFACES(QGraphicsItem)
	skipping to change at line 54		skipping to change at line 58
	AddTool = 0,		AddTool = 0,
	ConfigureTool = 100,		ConfigureTool = 100,
	ControlTool = 200,		ControlTool = 200,
	MiscTool = 300,		MiscTool = 300,
	DestructiveTool = 400,		DestructiveTool = 400,
	UserToolType = DestructiveTool + 1000		UserToolType = DestructiveTool + 1000
	};		};
	Q_ENUMS(ToolType)		Q_ENUMS(ToolType)
	explicit AbstractToolBox(Containment *parent);		explicit AbstractToolBox(Containment *parent);
			explicit AbstractToolBox(QObject *parent = 0,
			const QVariantList &args = QVariantList());
	~AbstractToolBox();		~AbstractToolBox();
	/**		/**
			* Create a new AbstractToolBox, loading the proper plugin
			* @param name the plugin name
			* @param args the plugin arguments
			* @param containment the containment parent of the toolbox
			* @since 4.6
			*/
			static AbstractToolBox *load(const QString &name, const QVariantList &a
			rgs=QVariantList(), Plasma::Containment *containment=0);
			/**
			* Returns a list of all installed ToolBox plugins
			*
			* @param parentApp the application to filter applets on. Uses the
			* X-KDE-ParentApp entry (if any) in the plugin info.
			* The default value of QString() will result in a
			* list containing only applets not specifically
			* registered to an application.
			*
			* @since 4.6
			*/
			static KPluginInfo::List listToolBoxInfo(const QString
			&parentApp = QString());
			/**
	* create a toolbox tool from the given action		* create a toolbox tool from the given action
	* @p action the action to associate the tool with		* @p action the action to associate the tool with
	*/		*/
	virtual void addTool(QAction *action) = 0;		virtual void addTool(QAction *action) = 0;
	/**		/**
	* remove the tool associated with this action		* remove the tool associated with this action
	*/		*/
	virtual void removeTool(QAction *action) = 0;		virtual void removeTool(QAction *action) = 0;
			/**
			* @return true if the ToolBox is open and shown the actions list
			*/
	virtual bool isShowing() const = 0;		virtual bool isShowing() const = 0;
			/**
			* Opens or closes the ToolBox
			*/
	virtual void setShowing(const bool show) = 0;		virtual void setShowing(const bool show) = 0;
			public Q_SLOTS:
			//FIXME for KDE5: those should become virtuals
			/**
			* Restore the ToolBox settings
			* It has to be reimplemented in toolboxes that need it
			* @since 4.6
			*/
			void restore(const KConfigGroup &group);
			/**
			* Save the ToolBox settings
			* It has to be reimplemented in toolboxes that need it
			* @since 4.6
			*/
			void save(const KConfigGroup &group);
			/**
			* Inform the ToolBox it has to reposition itlself
			* It has to be reimplemented in toolboxes that need it
			* @since 4.6
			*/
			void reposition();
	Q_SIGNALS:		Q_SIGNALS:
			/**
			* Toolbox opened or closed
			*/
	void toggled();		void toggled();
	void visibilityChanged(bool);
			/**
			* Toolbox opened or closed
			* @param open tells if the toolbox opened or closed
			*/
			void visibilityChanged(bool open);
	protected:		protected:
	Containment *containment() const;		Containment *containment() const;
	private:		private:
	AbstractToolBoxPrivate * const d;		AbstractToolBoxPrivate * const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
			/**
			* Register an applet when it is contained in a loadable module
			*/
			#define K_EXPORT_PLASMA_TOOLBOX(libname, classname) \
			K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
			K_EXPORT_PLUGIN(factory("plasma_toolbox_" #libname)) \
			K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 10 change blocks.
	1 lines changed or deleted		79 lines changed or added

	acadapter.h		acadapter.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_ACADAPTER_H		#ifndef SOLID_ACADAPTER_H
	#define SOLID_ACADAPTER_H		#define SOLID_ACADAPTER_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	accessmanager.h		accessmanager.h
	skipping to change at line 74		skipping to change at line 74
	* @author Urs Wolfer \<uwolfer @ kde.org\>		* @author Urs Wolfer \<uwolfer @ 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.
	@since 4.3.2		* @since 4.3.2
	*/		*/
	enum Attribute {		enum Attribute {
	MetaData = QNetworkRequest::User, /** < Used to send KIO MetaData b ack and forth. type: QVariant::Map. */		MetaData = QNetworkRequest::User, /** < Used to send KIO MetaData b ack and forth. type: QVariant::Map. */
	KioError /**< Used to send KIO error codes that cannot be mapped in to QNetworkReply::NetworkError. type: QVariant::Int */		KioError /**< Used to send KIO error codes that cannot be mapped in to QNetworkReply::NetworkError. type: QVariant::Int */
	};		};
			/**
			* Constructor
			*/
	AccessManager(QObject *parent);		AccessManager(QObject *parent);
			/**
			* Destructor
			*/
	virtual ~AccessManager();		virtual ~AccessManager();
	/**		/**
	* Set @p allowed to false if you don't want any external content to be fetched.		* Set @p allowed to false if you don't want any external content to be fetched.
	* By default external content is fetched.		* By default external content is fetched.
	*/		*/
	void setExternalContentAllowed(bool allowed);		void setExternalContentAllowed(bool allowed);
	/**		/**
	* Returns true if external content is going to be fetched.		* Returns true if external content is going to be fetched.
	skipping to change at line 157		skipping to change at line 163
	* will be sent with every request.		* will be sent with every request.
	*		*
	* Unlike @p requestMetaData, the meta data values set using the refere nce		* Unlike @p requestMetaData, the meta data values set using the refere nce
	* returned by this function will not be deleted and will be sent with every		* returned by this function will not be deleted and will be sent with every
	* request.		* request.
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	KIO::MetaData& sessionMetaData();		KIO::MetaData& sessionMetaData();
			/**
			* Puts the ioslave associated with the given @p reply on hold.
			*
			* This function is intended to make possible the implementation of
			* the special case mentioned in KIO::get's documentation within the
			* KIO-QNAM integration.
			*
			* @see KIO::get.
			* @since 4.6
			*/
			static void putReplyOnHold(QNetworkReply* reply);
	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:
	skipping to change at line 268		skipping to change at line 286
	QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;		QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
	/**		/**
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QNetworkCookieJar::setCookiesFromUrl		* @see QNetworkCookieJar::setCookiesFromUrl
	* @internal		* @internal
	*/		*/
	bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const Q Url &url);		bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const Q Url &url);
			/**
			* Returns true if persistent caching of cookies is disabled.
			*
			* @see setDisableCookieStorage
			* @since 4.6
			*/
			bool isCookieStorageDisabled() const;
			/**
			* Prevent persistent storage of cookies.
			*
			* Call this function if you do not want cookies to be stored locally f
			or
			* later access without disabling the cookiejar. All cookies will be di
			scarded
			* once the sessions that are using the cookie are done.
			*
			* @since 4.6
			*/
			void setDisableCookieStorage (bool disable);
	private:		private:
	class CookieJarPrivate;		class CookieJarPrivate;
	CookieJarPrivate* const d;		CookieJarPrivate* const d;
	};		};
	}		}
	}		}
	#endif // KIO_ACCESSMANAGER_H		#endif // KIO_ACCESSMANAGER_H
End of changes. 5 change blocks.
	3 lines changed or deleted		42 lines changed or added

	animator.h		animator.h
	skipping to change at line 91		skipping to change at line 91
	enum Movement {		enum Movement {
	SlideInMovement = 0,		SlideInMovement = 0,
	SlideOutMovement,		SlideOutMovement,
	FastSlideInMovement,		FastSlideInMovement,
	FastSlideOutMovement		FastSlideOutMovement
	};		};
	/**		/**
	* Singleton accessor		* Singleton accessor
	**/		**/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED Animator *self();		static KDE_DEPRECATED Animator *self();
			#endif
	/**		/**
	* Factory to build new animation objects. To control their behavior,		* Factory to build new animation objects. To control their behavior,
	* check \ref AbstractAnimation properties.		* check \ref AbstractAnimation properties.
	* @since 4.4		* @since 4.4
	**/		**/
	static Plasma::Animation *create(Animator::Animation type, QObject *par ent = 0);		static Plasma::Animation *create(Animator::Animation type, QObject *par ent = 0);
	/**		/**
	* Factory to build new animation objects from Javascript files. To con trol their behavior,		* Factory to build new animation objects from Javascript files. To con trol their behavior,
	skipping to change at line 121		skipping to change at line 123
	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		* @arg item the item to animate in some fashion
	* @arg anim the type of animation to perform		* @arg 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
	KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animatio n anim);		KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animatio n anim);
			#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		* @arg 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
	KDE_DEPRECATED Q_INVOKABLE void stopItemAnimation(int id);		KDE_DEPRECATED Q_INVOKABLE void stopItemAnimation(int id);
			#endif
	/**		/**
	* Starts a standard animation on a QGraphicsItem.		* Starts a standard animation on a QGraphicsItem.
	*		*
	* @arg item the item to animate in some fashion		* @arg item the item to animate in some fashion
	* @arg anim the type of animation to perform		* @arg 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
	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
	/**		/**
	* 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		* @arg 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
	KDE_DEPRECATED Q_INVOKABLE void stopItemMovement(int id);		KDE_DEPRECATED Q_INVOKABLE void stopItemMovement(int id);
			#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		* @arg frames the number of frames this animation should persist for
	* @arg duration the length, in milliseconds, the animation will take		* @arg duration the length, in milliseconds, the animation will take
	* @arg curve the curve applied to the frame rate		* @arg curve the curve applied to the frame rate
	* @arg receive the object that will handle the actual animation		* @arg receive the object that will handle the actual animation
	* @arg method the method name of slot to be invoked on each update.		* @arg 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
	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
	/**		/**
	* 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		* @arg 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
	KDE_DEPRECATED Q_INVOKABLE void stopCustomAnimation(int id);		KDE_DEPRECATED Q_INVOKABLE void stopCustomAnimation(int id);
			#endif
			#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
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE void stopElementAnimation(int id);		KDE_DEPRECATED Q_INVOKABLE void stopElementAnimation(int id);
			#endif
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE void setInitialPixmap(int id, const QPixmap &pixmap);		KDE_DEPRECATED Q_INVOKABLE void setInitialPixmap(int id, const QPixmap &pixmap);
			#endif
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE QPixmap currentPixmap(int id);		KDE_DEPRECATED Q_INVOKABLE QPixmap currentPixmap(int id);
			#endif
	/**		/**
	* Can be used to query if there are other animations happening. This w ay		* Can be used to query if there are other animations happening. This w ay
	* heavy operations can be delayed until all animations are finished.		* heavy operations can be delayed until all animations are finished.
	* @return true if there are animations going on.		* @return true if there are animations going on.
	* @since 4.1		* @since 4.1
	* @deprecated use new Animator API with Qt Kinetic		* @deprecated use new Animator API with Qt Kinetic
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE bool isAnimating() const;		KDE_DEPRECATED Q_INVOKABLE bool isAnimating() const;
			#endif
	/**		/**
	* Register a widget as a scrolling widget.		* Register a widget as a scrolling widget.
	* This function is deprecated:		* This function is deprecated:
	* use a ScrollWidget, with setWidget() as your widget instead.		* use a ScrollWidget, with setWidget() as your widget instead.
	*		*
	* @param widget the widget that offers a scrolling behaviour		* @param widget the widget that offers a scrolling behaviour
	* @since 4.4		* @since 4.4
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void registerScrollingManager(QGraphicsWidget *widget);		KDE_DEPRECATED void registerScrollingManager(QGraphicsWidget *widget);
			#endif
	/**		/**
	* unregister the scrolling manager of a certain widget		* unregister the scrolling manager of a certain widget
	* This function is deprecated: use ScrollWidget instead.		* This function is deprecated: use ScrollWidget instead.
	*		*
	* @param widget the widget we don't want no longer animated		* @param widget the widget we don't want no longer animated
	* @since 4.4		* @since 4.4
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void unregisterScrollingManager(QGraphicsWidget *widget) ;		KDE_DEPRECATED void unregisterScrollingManager(QGraphicsWidget *widget) ;
			#endif
	Q_SIGNALS:		Q_SIGNALS:
	void animationFinished(QGraphicsItem *item, Plasma::Animator::Animation anim);		void animationFinished(QGraphicsItem *item, Plasma::Animator::Animation anim);
	void movementFinished(QGraphicsItem *item);		void movementFinished(QGraphicsItem *item);
	void elementAnimationFinished(int id);		void elementAnimationFinished(int id);
	void customAnimationFinished(int id);		void customAnimationFinished(int id);
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void scrollStateChanged(QGraphicsWidget *widget, QAbstra ctAnimation::State newState,		KDE_DEPRECATED void scrollStateChanged(QGraphicsWidget *widget, QAbstra ctAnimation::State newState,
	QAbstractAnimation::State oldState);		QAbstractAnimation::State oldState);
			#endif
			#ifndef KDE_NO_DEPRECATED
	protected:		protected:
	void timerEvent(QTimerEvent *event);		void timerEvent(QTimerEvent *event);
			#endif
	private:		private:
			#ifndef KDE_NO_DEPRECATED
	friend class AnimatorSingleton;		friend class AnimatorSingleton;
	explicit Animator(QObject * parent = 0);		explicit Animator(QObject * parent = 0);
	~Animator();		~Animator();
	Q_PRIVATE_SLOT(d, void animatedItemDestroyed(QObject*))		Q_PRIVATE_SLOT(d, void animatedItemDestroyed(QObject*))
	Q_PRIVATE_SLOT(d, void movingItemDestroyed(QObject*))		Q_PRIVATE_SLOT(d, void movingItemDestroyed(QObject*))
	Q_PRIVATE_SLOT(d, void animatedElementDestroyed(QObject*))		Q_PRIVATE_SLOT(d, void animatedElementDestroyed(QObject*))
	Q_PRIVATE_SLOT(d, void customAnimReceiverDestroyed(QObject*))		Q_PRIVATE_SLOT(d, void customAnimReceiverDestroyed(QObject*))
	Q_PRIVATE_SLOT(d, void scrollStateChanged(QAbstractAnimation::State,		Q_PRIVATE_SLOT(d, void scrollStateChanged(QAbstractAnimation::State,
	QAbstractAnimation::State))		QAbstractAnimation::State))
			#else
			Animator();
			#endif
	friend class AnimatorPrivate;		friend class AnimatorPrivate;
	AnimatorPrivate * const d;		AnimatorPrivate * const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif		#endif
End of changes. 31 change blocks.
	0 lines changed or deleted		36 lines changed or added

	annotationinterface.h		annotationinterface.h
	skipping to change at line 240		skipping to change at line 240
	/**		/**
	* This signal is emitted before a context menu is shown on the annotat ion		* This signal is emitted before a context menu is shown on the annotat ion
	* border for the given line and view.		* border for the given line and view.
	*		*
	* \note Kate Part implementation detail: In Kate Part, the menu has an		* \note Kate Part implementation detail: In Kate Part, the menu has an
	* entry to hide the annotation border.		* entry to hide the annotation border.
	*		*
	* \param view the view that the annotation border belongs to		* \param view the view that the annotation border belongs to
	* \param menu the context menu that will be shown		* \param menu the context menu that will be shown
	* \param line the annotated line for which the context menu is shown		* \param line the annotated line for which the context menu is shown
	*
	* \see setAnnotationContextMenu()
	*/		*/
	virtual void annotationContextMenuAboutToShow( KTextEditor::View* view, QMenu* menu, int line ) = 0;		virtual void annotationContextMenuAboutToShow( KTextEditor::View* view, QMenu* menu, int line ) = 0;
	/**		/**
	* This signal is emitted when an entry on the annotation border was ac tivated,		* This signal is emitted when an entry on the annotation border was ac tivated,
	* for example by clicking or double-clicking it. This follows the KDE wide		* for example by clicking or double-clicking it. This follows the KDE wide
	* setting for activation via click or double-clcik		* setting for activation via click or double-clcik
	*		*
	* \param view the view to which the activated border belongs to		* \param view the view to which the activated border belongs to
	* \param line the document line that the activated posistion belongs t o		* \param line the document line that the activated posistion belongs t o
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	applet.h		applet.h
	skipping to change at line 302		skipping to change at line 302
	* If an empty string is passed in, all applets are		* If an empty string is passed in, all applets are
	* returned.		* returned.
	* @param parentApp the application to filter applets on. Uses the		* @param parentApp the application to filter applets on. Uses the
	* X-KDE-ParentApp entry (if any) in the plugin in fo.		* X-KDE-ParentApp entry (if any) in the plugin in fo.
	* The default value of QString() will result in a		* The default value of QString() will result in a
	* list containing only applets not specifically		* list containing only applets not specifically
	* registered to an application.		* registered to an application.
	* @return list of applets		* @return list of applets
	**/		**/
	static KPluginInfo::List listAppletInfo(const QString &category = Q String(),		static KPluginInfo::List listAppletInfo(const QString &category = Q String(),
	const QString &parentApp = QS tring());		const QString &parentApp = QString());
	/**		/**
	* Returns a list of all known applets associated with a certain mi metype.		* Returns a list of all known applets associated with a certain mi metype.
	*		*
	* @return list of applets		* @return list of applets
	**/		**/
	static KPluginInfo::List listAppletInfoForMimetype(const QString &m imetype);		static KPluginInfo::List listAppletInfoForMimetype(const QString &m imetype);
	/**		/**
	* Returns a list of all known applets associated with a certain UR L.		* Returns a list of all known applets associated with a certain UR L.
	skipping to change at line 615		skipping to change at line 615
	* information about the widget		* information about the widget
	* @param appletId a unique id used to differentiate between multip le		* @param appletId a unique id used to differentiate between multip le
	* instances of the same Applet type		* instances of the same Applet type
	*/		*/
	explicit Applet(QGraphicsItem *parent = 0,		explicit Applet(QGraphicsItem *parent = 0,
	const QString &serviceId = QString(),		const QString &serviceId = QString(),
	uint appletId = 0);		uint appletId = 0);
	/**		/**
	* @param parent the QGraphicsItem this applet is parented to		* @param parent the QGraphicsItem this applet is parented to
			* @param info the plugin information object for this Applet
			* @param appletId a unique id used to differentiate between multip
			le
			* instances of the same Applet type
			* @since 4.6
			*/
			explicit Applet(const KPluginInfo &info, QGraphicsItem *parent = 0,
			uint appletId = 0);
			/**
			* @param parent the QGraphicsItem this applet is parented to
	* @param 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
	* @param appletId a unique id used to differentiate between multip le		* @param appletId a unique id used to differentiate between multip le
	* instances of the same Applet type		* instances of the same Applet type
	* @param args a list of strings containing two entries: the servi ce id		* @param args a list of strings containing two entries: the servi ce id
	* and the applet id		* and the applet id
	* @since 4.3		* @since 4.3
	*/		*/
	explicit Applet(QGraphicsItem *parent,		explicit Applet(QGraphicsItem *parent,
	const QString &serviceId,		const QString &serviceId,
	skipping to change at line 715		skipping to change at line 724
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal indicates that an application launch, window		* This signal indicates that an application launch, window
	* creation or window focus event was triggered. This is used, for instance,		* creation or window focus event was triggered. This is used, for instance,
	* to ensure that the Dashboard view in Plasma Desktop hides when s uch an event is		* to ensure that the Dashboard view in Plasma Desktop hides when s uch an event is
	* triggered by an item it is displaying.		* triggered by an item it is displaying.
	*/		*/
	void releaseVisualFocus();		void releaseVisualFocus();
			#if QT_VERSION >= 0x040700
			protected:
			void geometryChanged(); // in QGraphicsWidget now; preserve BC
			#else
	/**		/**
	* Emitted whenever the applet makes a geometry change, so that vie ws		* Emitted whenever the applet makes a geometry change, so that vie ws
	* can coordinate themselves with these changes if they desire.		* can coordinate themselves with these changes if they desire.
	*/		*/
	void geometryChanged();		void geometryChanged();
			#endif
			Q_SIGNALS:
	/**		/**
	* Emitted when the user completes a transformation of the applet.		* Emitted when the user completes a transformation of the applet.
	*/		*/
	void appletTransformedByUser();		void appletTransformedByUser();
	/**		/**
	* Emitted when the applet changes its own geometry or transform.		* Emitted when the applet changes its own geometry or transform.
	*/		*/
	void appletTransformedItself();		void appletTransformedItself();
	skipping to change at line 755		skipping to change at line 770
	/**		/**
	* Emitted when activation is requested due to, for example, a glob al		* Emitted when activation is requested due to, for example, a glob al
	* keyboard shortcut. By default the wiget is given focus.		* keyboard shortcut. By default the wiget is given focus.
	*/		*/
	void activate();		void activate();
	/**		/**
	* Emitted when the user clicked on a button of the message overlay		* Emitted when the user clicked on a button of the message overlay
	*		*
	* Since the signal passes the type MessageButton without specifyin
	g
	* the Plasma namespace and since automoc is pedantic if you want t
	o
	* use this signal outside the Plasma namespace you have to declare
	* "typedef Plasma::MessageButton MessageButton" and use the typede
	f
	* in your slot and in the connect.
	* @see showMessage		* @see showMessage
	* @see Plasma::MessageButton		* @see Plasma::MessageButton
	* @since 4.3		* @since 4.3
	*/		*/
	void messageButtonPressed(const MessageButton button);		void messageButtonPressed(const Plasma::MessageButton button);
	/**		/**
	* Emitted when the applet is deleted		* Emitted when the applet is deleted
	*/		*/
	void appletDestroyed(Plasma::Applet *applet);		void appletDestroyed(Plasma::Applet *applet);
	/**		/**
	* Emitted when the applet status changes		* Emitted when the applet status changes
	* @since 4.4		* @since 4.4
	*/		*/
	skipping to change at line 988		skipping to change at line 998
	* @param icon the icon that will be shown		* @param icon the icon that will be shown
	* @param message the message string that will be shown.		* @param message the message string that will be shown.
	* If the message is empty nothng will be shown		* If the message is empty nothng will be shown
	* and if there was a message already it will be hid den		* and if there was a message already it will be hid den
	* @param buttons an OR combination of all the buttons needed		* @param buttons an OR combination of all the buttons needed
	*		*
	* @see Plasma::MessageButtons		* @see Plasma::MessageButtons
	* @see messageButtonPressed		* @see messageButtonPressed
	* @since 4.3		* @since 4.3
	*/		*/
	void showMessage(const QIcon &icon, const QString &message, const M essageButtons buttons);		void showMessage(const QIcon &icon, const QString &message, const P lasma::MessageButtons buttons);
	/**		/**
	* Called when any of the geometry constraints have been updated.		* Called when any of the geometry constraints have been updated.
	*		*
	* This is always called prior to painting and should be used as an		* This is always called prior to painting and should be used as an
	* opportunity to layout the widget, calculate sizings, etc.		* opportunity to layout the widget, calculate sizings, etc.
	*		*
	* Do not call update() from this method; an update() will be trigg ered		* Do not call update() from this method; an update() will be trigg ered
	* at the appropriate time for the applet.		* at the appropriate time for the applet.
	*		*
	skipping to change at line 1100		skipping to change at line 1110
	* @internal This constructor is to be used with the Package loadin g system.		* @internal This constructor is to be used with the Package loadin g system.
	*		*
	* @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
	*/		*/
	Applet(const QString &packagePath, uint appletId, const QVariantLis t &args);		Applet(const QString &packagePath, uint appletId, const QVariantLis t &args);
	Q_PRIVATE_SLOT(d, void setFocus())		Q_PRIVATE_SLOT(d, void setFocus())
	Q_PRIVATE_SLOT(d, void checkImmutability())
	Q_PRIVATE_SLOT(d, void themeChanged())		Q_PRIVATE_SLOT(d, void themeChanged())
	Q_PRIVATE_SLOT(d, void appletAnimationComplete())		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())
	/**		/**
	skipping to change at line 1128		skipping to change at line 1137
	//Corona needs to access setFailedToLaunch and init		//Corona needs to access setFailedToLaunch and init
	friend class Corona;		friend class Corona;
	friend class CoronaPrivate;		friend class CoronaPrivate;
	friend class Containment;		friend class Containment;
	friend class ContainmentPrivate;		friend class ContainmentPrivate;
	friend class AppletScript;		friend class AppletScript;
	friend class AppletHandle;		friend class AppletHandle;
	friend class AppletPrivate;		friend class AppletPrivate;
	friend class AccessAppletJobPrivate;		friend class AccessAppletJobPrivate;
			friend class PluginLoader;
	friend class PopupApplet;		friend class PopupApplet;
	friend class PopupAppletPrivate;		friend class PopupAppletPrivate;
	friend class AssociatedApplicationManager;		friend class AssociatedApplicationManager;
	friend class Extender;		friend class Extender;
	friend class ExtenderGroup;		friend class ExtenderGroup;
	friend class ExtenderGroupPrivate;		friend class ExtenderGroupPrivate;
	friend class ExtenderPrivate;		friend class ExtenderPrivate;
	friend class ExtenderItem;		friend class ExtenderItem;
	};		};
End of changes. 11 change blocks.
	13 lines changed or deleted		22 lines changed or added

	audiointerface.h		audiointerface.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_AUDIOINTERFACE_H		#ifndef SOLID_AUDIOINTERFACE_H
	#define SOLID_AUDIOINTERFACE_H		#define SOLID_AUDIOINTERFACE_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	class QVariant;		class QVariant;
	skipping to change at line 198		skipping to change at line 199
	* differentiate between the devices.		* differentiate between the devices.
	*		*
	* @return the name of the audio interface if available, QString() otherwise		* @return the name of the audio interface if available, QString() otherwise
	*/		*/
	QString name() const;		QString name() const;
	/**		/**
	* Retrieves the type of this audio interface (in/out/control).		* Retrieves the type of this audio interface (in/out/control).
	*		*
	* @return the type of this audio interface		* @return the type of this audio interface
	* @see Solid::AudioInterface::AudioInterfaceTypes		* @see Solid::AudioInterface::AudioInterfaceType
	*/		*/
	AudioInterfaceTypes deviceType() const;		AudioInterfaceTypes deviceType() const;
	/**		/**
	* Retrieves the type of soundcard (internal/headset/...).		* Retrieves the type of soundcard (internal/headset/...).
	*		*
	* @return the type of soundcard		* @return the type of soundcard
	* @see Solid::AudioInterface::SoundcardType		* @see Solid::AudioInterface::SoundcardType
	*/		*/
	SoundcardType soundcardType() const;		SoundcardType soundcardType() const;
End of changes. 5 change blocks.
	12 lines changed or deleted		13 lines changed or added

	authinfo.h		authinfo.h
	skipping to change at line 84		skipping to change at line 84
	*/		*/
	AuthInfo( const AuthInfo& info );		AuthInfo( const AuthInfo& info );
	/**		/**
	* Destructor		* Destructor
	* @since 4.1		* @since 4.1
	*/		*/
	~AuthInfo();		~AuthInfo();
	/**		/**
	* Overloaded equal to operator.		* Custom assignment operator.
	*/		*/
	AuthInfo& operator=( const AuthInfo& info );		AuthInfo& operator=( const AuthInfo& info );
	/**		/**
	* Use this method to check if the object was modified.		* Use this method to check if the object was modified.
	* @return true if the object has been modified		* @return true if the object has been modified
	*/		*/
	bool isModified() const;		bool isModified() const;
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	battery.h		battery.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_BATTERY_H		#ifndef SOLID_BATTERY_H
	#define SOLID_BATTERY_H		#define SOLID_BATTERY_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	block.h		block.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_BLOCK_H		#ifndef SOLID_BLOCK_H
	#define SOLID_BLOCK_H		#define SOLID_BLOCK_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	browserextension.h		browserextension.h
	skipping to change at line 494		skipping to change at line 494
	/**		/**
	* Associates a list of actions with a predefined name known by the hos t's popupmenu:		* Associates a list of actions with a predefined name known by the hos t's popupmenu:
	* "editactions" for actions related text editing,		* "editactions" for actions related text editing,
	* "linkactions" for actions related to hyperlinks,		* "linkactions" for actions related to hyperlinks,
	* "partactions" for any other actions provided by the part		* "partactions" for any other actions provided by the part
	*/		*/
	typedef QMap<QString, QList<QAction *> > ActionGroupMap;		typedef QMap<QString, QList<QAction *> > ActionGroupMap;
	Q_SIGNALS:		Q_SIGNALS:
	#ifndef Q_MOC_RUN		#if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(I
	#ifndef DOXYGEN_SHOULD_SKIP_THIS		N_IDE_PARSER)
	public: // yes, those signals are public; don't tell moc or doxygen :)		public: // yes, those signals are public; don't tell moc, doxygen or kdeve
	#endif		lop :)
	#endif		#endif
	/**		/**
	* Enables or disable a standard action held by the browser.		* Enables or disable a standard action held by the browser.
	*		*
	* See class documentation for the list of standard actions.		* See class documentation for the list of standard actions.
	*/		*/
	void enableAction( const char * name, bool enabled );		void enableAction( const char * name, bool enabled );
	/**		/**
	* Change the text of a standard action held by the browser.		* Change the text of a standard action held by the browser.
	skipping to change at line 796		skipping to change at line 794
	* calls a function of objid, return true on success		* calls a function of objid, return true on success
	*/		*/
	virtual bool call( const unsigned long objid, const QString & func, const QStringList & args, Type & type, unsigned long & retobjid, QString & value );		virtual bool call( const unsigned long objid, const QString & func, const QStringList & args, Type & type, unsigned long & retobjid, QString & value );
	/**		/**
	* notifies the part that there is no reference anymore to objid		* notifies the part that there is no reference anymore to objid
	*/		*/
	virtual void unregister( const unsigned long objid );		virtual void unregister( const unsigned long objid );
	static LiveConnectExtension *childObject( QObject *obj );		static LiveConnectExtension *childObject( QObject *obj );
	Q_SIGNALS:		Q_SIGNALS:
	#ifndef Q_MOC_RUN		#if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(I
	#ifndef DOXYGEN_SHOULD_SKIP_THIS		N_IDE_PARSER)
	public: // yes, those signals are public; don't tell moc or doxygen :)		public: // yes, those signals are public; don't tell moc, doxygen or kdeve
	#endif		lop :)
	#endif		#endif
	/**		/**
	* notify a event from the part of object objid		* notify a event from the part of object objid
	*/		*/
	void partEvent( const unsigned long objid, const QString & event, const K Parts::LiveConnectExtension::ArgList & args );		void partEvent( const unsigned long objid, const QString & event, const K Parts::LiveConnectExtension::ArgList & args );
	private:		private:
	class LiveConnectExtensionPrivate;		class LiveConnectExtensionPrivate;
	LiveConnectExtensionPrivate * const d;		LiveConnectExtensionPrivate * const d;
	};		};
End of changes. 2 change blocks.
	8 lines changed or deleted		8 lines changed or added

	browserrun.h		browserrun.h
	skipping to change at line 94		skipping to change at line 94
	* @param offer the application that will be used to open the URL		* @param offer the application that will be used to open the URL
	* @param mimeType the mimetype of the URL		* @param mimeType the mimetype of the URL
	* @param suggestedFileName optional file name suggested by the ser ver		* @param suggestedFileName optional file name suggested by the ser ver
	* @return Save, Open or Cancel.		* @return Save, Open or Cancel.
	* @deprecated use BrowserOpenOrSaveQuestion		* @deprecated use BrowserOpenOrSaveQuestion
	* @code		* @code
	* BrowserOpenOrSaveQuestion dlg(parent, url, mimeType, suggestedF ileName);		* BrowserOpenOrSaveQuestion dlg(parent, url, mimeType, suggestedF ileName);
	* const BrowserOpenOrSaveQuestion::Result res = dlg.askOpenOrSave ();		* const BrowserOpenOrSaveQuestion::Result res = dlg.askOpenOrSave ();
	* @endcode		* @endcode
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED AskSaveResult askSave( const KUrl & url, KSer vice::Ptr offer, const QString& mimeType, const QString & suggestedFileName = QString() );		static KDE_DEPRECATED AskSaveResult askSave( const KUrl & url, KSer vice::Ptr offer, const QString& mimeType, const QString & suggestedFileName = QString() );
			#endif
	enum AskEmbedOrSaveFlags { InlineDisposition = 0, AttachmentDisposi tion = 1 };		enum AskEmbedOrSaveFlags { InlineDisposition = 0, AttachmentDisposi tion = 1 };
	/**		/**
	* Similar to askSave but for the case where the current applicatio n is		* Similar to askSave but for the case where the current applicatio n is
	* able to embed the url itself (instead of passing it to another a pp).		* able to embed the url itself (instead of passing it to another a pp).
	* @param url the URL in question		* @param url the URL in question
	* @param mimeType the mimetype of the URL		* @param mimeType the mimetype of the URL
	* @param suggestedFileName optional filename suggested by the serv er		* @param suggestedFileName optional filename suggested by the serv er
	* @param flags set to AttachmentDisposition if suggested by the se rver		* @param flags set to AttachmentDisposition if suggested by the se rver
	* @return Save, Open or Cancel.		* @return Save, Open or Cancel.
	* @deprecated use BrowserOpenOrSaveQuestion		* @deprecated use BrowserOpenOrSaveQuestion
	* @code		* @code
	* BrowserOpenOrSaveQuestion dlg(parent, url, mimeType, suggestedF ileName);		* BrowserOpenOrSaveQuestion dlg(parent, url, mimeType, suggestedF ileName);
	* const BrowserOpenOrSaveQuestion::Result res = dlg.askEmbedOrSav e(flags);		* const BrowserOpenOrSaveQuestion::Result res = dlg.askEmbedOrSav e(flags);
	* // Important: returns Embed now, not Open!		* // Important: returns Embed now, not Open!
	* @endcode		* @endcode
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED AskSaveResult askEmbedOrSave( const KUrl & ur l, const QString& mimeType, const QString & suggestedFileName = QString(), int flags = 0 );		static KDE_DEPRECATED AskSaveResult askEmbedOrSave( const KUrl & ur l, const QString& mimeType, const QString & suggestedFileName = QString(), int flags = 0 );
			#endif
	// virtual so that KHTML can implement differently (HTML cache)		// virtual so that KHTML can implement differently (HTML cache)
	virtual void save( const KUrl & url, const QString & suggestedFileN ame );		virtual void save( const KUrl & url, const QString & suggestedFileN ame );
	// static so that it can be called from other classes		// static so that it can be called from other classes
	static void simpleSave( const KUrl & url, const QString & suggested FileName,		static void simpleSave( const KUrl & url, const QString & suggested FileName,
	QWidget* window =0 ); // KDE5: remove		QWidget* window =0 ); // KDE5: remove
	/**		/**
	* If kget integration is enabled, passes the url to kget.		* If kget integration is enabled, passes the url to kget.
	* Otherwise, asks the user for a destination url, and calls saveUr lUsingKIO.		* Otherwise, asks the user for a destination url, and calls saveUr lUsingKIO.
	skipping to change at line 139		skipping to change at line 143
	* Starts the KIO file copy job to download @p srcUrl into @p destU rl.		* Starts the KIO file copy job to download @p srcUrl into @p destU rl.
	* @since 4.4		* @since 4.4
	*/		*/
	static void saveUrlUsingKIO(const KUrl & srcUrl, const KUrl& destUr l,		static void saveUrlUsingKIO(const KUrl & srcUrl, const KUrl& destUr l,
	QWidget* window, const QMap<QString, QS tring> &metaData);		QWidget* window, const QMap<QString, QS tring> &metaData);
	static bool allowExecution( const QString &mimeType, const KUrl &ur l );		static bool allowExecution( const QString &mimeType, const KUrl &ur l );
	static bool isTextExecutable( const QString &mimeType );		static bool isTextExecutable( const QString &mimeType );
			/**
			* KDE webbrowsing kparts support error urls to display errors in-l
			ine in the browser component.
			* This helper method creates the error URL from its parameters.
			* @param error the KIO error code (or KIO::ERR_SLAVE_DEFINED if no
			t from KIO)
			* @param errorText the text of the error message
			* @param initialUrl the URL that we were trying to open (as a stri
			ng, so that this can
			* support invalid URLs as well)
			* @since 4.6
			*/
			static KUrl makeErrorUrl(int error, const QString& errorText, const
			QString& initialUrl);
	protected:		protected:
	/**		/**
	* Reimplemented from KRun		* Reimplemented from KRun
	*/		*/
	virtual void scanFile();		virtual void scanFile();
	/**		/**
	* Reimplemented from KRun		* Reimplemented from KRun
	*/		*/
	virtual void init();		virtual void init();
	/**		/**
End of changes. 5 change blocks.
	0 lines changed or deleted		19 lines changed or added

	busywidget.h		busywidget.h
	skipping to change at line 88		skipping to change at line 88
	protected:		protected:
	void paint(QPainter *painter,		void paint(QPainter *painter,
	const QStyleOptionGraphicsItem *option,		const QStyleOptionGraphicsItem *option,
	QWidget *widget = 0);		QWidget *widget = 0);
	void showEvent(QShowEvent *event);		void showEvent(QShowEvent *event);
	void hideEvent(QHideEvent *event);		void hideEvent(QHideEvent *event);
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
			void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	protected Q_SLOTS:		protected Q_SLOTS:
	void timerEvent(QTimerEvent *event);		void timerEvent(QTimerEvent *event);
	private:		private:
	BusyWidgetPrivate * const d;		BusyWidgetPrivate * const d;
	Q_PRIVATE_SLOT(d, void themeChanged())		Q_PRIVATE_SLOT(d, void themeChanged())
	};		};
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	button.h		button.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006 Davide Bettio <davbet@aliceposta.it>		Copyright 2006 Davide Bettio <davbet@aliceposta.it>
	Copyright (C) 2007 Kevin Ottens <ervin@kde.org>		Copyright 2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_BUTTON_H		#ifndef SOLID_BUTTON_H
	#define SOLID_BUTTON_H		#define SOLID_BUTTON_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	12 lines changed or deleted		13 lines changed or added

	camera.h		camera.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_CAMERA_H		#ifndef SOLID_CAMERA_H
	#define SOLID_CAMERA_H		#define SOLID_CAMERA_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	combobox.h		combobox.h
	skipping to change at line 47		skipping to change at line 47
	* @short Provides a Plasma-themed combo box.		* @short Provides a Plasma-themed combo box.
	*/		*/
	class PLASMA_EXPORT ComboBox : public QGraphicsProxyWidget		class PLASMA_EXPORT ComboBox : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text NOTIFY textChanged)		Q_PROPERTY(QString text READ text NOTIFY textChanged)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KComboBox *nativeWidget READ nativeWidget WRITE setNativeWid get)		Q_PROPERTY(KComboBox *nativeWidget READ nativeWidget WRITE setNativeWid get)
			Q_PROPERTY(int count READ count)
			Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOT
			IFY currentIndexChanged)
	public:		public:
	explicit ComboBox(QGraphicsWidget *parent = 0);		explicit ComboBox(QGraphicsWidget *parent = 0);
	~ComboBox();		~ComboBox();
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	skipping to change at line 88		skipping to change at line 90
	* @return the native widget wrapped by this ComboBox		* @return the native widget wrapped by this ComboBox
	*/		*/
	KComboBox *nativeWidget() const;		KComboBox *nativeWidget() const;
	/**		/**
	* Adds an item to the combo box with the given text. The		* Adds an item to the combo box with the given text. The
	* item is appended to the list of existing items.		* item is appended to the list of existing items.
	*/		*/
	Q_INVOKABLE void addItem(const QString &text);		Q_INVOKABLE void addItem(const QString &text);
			/**
			* Returns the number of items in the combo box
			* @since 4.6
			*/
			int count() const;
			/**
			* Returns the current index of the combobox
			* @since 4.6
			*/
			int currentIndex() const;
			/**
			* Sets the current index of the combobox
			* @since 4.6
			*/
			void setCurrentIndex(int index);
	public Q_SLOTS:		public Q_SLOTS:
	void clear();		void clear();
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is sent when the user chooses an item in the combobox.		* This signal is sent when the user chooses an item in the combobox.
	* The item's text is passed.		* The item's text is passed.
	*/		*/
	void activated(const QString &text);		void activated(const QString &text);
	/**		/**
	* This signal is sent whenever the currentIndex in the combobox change s		* This signal is sent whenever the currentIndex in the combobox change s
	* either through user interaction or programmatically.		* either through user interaction or programmatically.
	* The item's text is passed.		* The item's text is passed.
	*/		*/
	void textChanged(const QString &text);		void textChanged(const QString &text);
			/**
			* This signal is sent whenever the currentIndex in the combobox change
			s
			* either through user interaction or programmatically.
			*/
			void currentIndexChanged(int index);
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	void paint(QPainter *painter,		void paint(QPainter *painter,
	const QStyleOptionGraphicsItem *option,		const QStyleOptionGraphicsItem *option,
	QWidget *widget);		QWidget *widget);
	void focusInEvent(QFocusEvent *event);		void focusInEvent(QFocusEvent *event);
	void focusOutEvent(QFocusEvent *event);		void focusOutEvent(QFocusEvent *event);
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);		void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	void changeEvent(QEvent *event);		void changeEvent(QEvent *event);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
	private:		private:
	ComboBoxPrivate * const d;		ComboBoxPrivate * const d;
	friend class ComboBoxPrivate;		friend class ComboBoxPrivate;
	Q_PRIVATE_SLOT(d, void syncBorders())		Q_PRIVATE_SLOT(d, void syncBorders())
			Q_PRIVATE_SLOT(d, void setPalette())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 4 change blocks.
	0 lines changed or deleted		29 lines changed or added

	componentfactory.h		componentfactory.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 the		along with this library; see the file COPYING.LIB. If not, write to the
	Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,		Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KPARTS_COMPONENTFACTORY_H		#ifndef KPARTS_COMPONENTFACTORY_H
	#define KPARTS_COMPONENTFACTORY_H		#define KPARTS_COMPONENTFACTORY_H
	#include <kparts/factory.h>		#include <kparts/factory.h>
	#include <kparts/part.h>		#include <kparts/part.h>
	#include <kservicetypetrader.h>		#include <kservicetypetrader.h>
			#ifndef KDE_NO_DEPRECATED
	#include <klibloader.h>		#include <klibloader.h>
			#endif
	#include <kmimetypetrader.h>		#include <kmimetypetrader.h>
	namespace KParts		namespace KParts
	{		{
	namespace ComponentFactory		namespace ComponentFactory
	{		{
	/**		/**
	* This template function allows to ask the given kparts factory to		* This template function allows to ask the given kparts factory to
	* create an instance of the given template type.		* create an instance of the given template type.
	*		*
	skipping to change at line 52		skipping to change at line 54
	* @deprecated use KPluginFactory::create instead		* @deprecated use KPluginFactory::create instead
	*		*
	* @param factory The factory to ask for the creation of the compon ent		* @param factory The factory to ask for the creation of the compon ent
	* @param parentWidget the parent widget for the part		* @param parentWidget the parent widget for the part
	* @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 an d possibly		* @param args A list of string arguments, passed to the factory an d possibly
	* to the component (see KLibFactory)		* to the component (see KLibFactory)
	* @return A pointer to the newly created object or a null pointer if the		* @return A pointer to the newly created object or a null pointer if the
	* factory was unable to create an object of the given type .		* factory was unable to create an object of the given type .
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T>		template <class T>
	KDE_DEPRECATED T *createPartInstanceFromFactory( KParts::Factory *f actory,		KDE_DEPRECATED T *createPartInstanceFromFactory( KParts::Factory *f actory,
	QWidget *parentWidget = 0,		QWidget *parentWidget = 0,
	QObject *parent = 0,		QObject *parent = 0,
	const QStringList &args = QString List() )		const QStringList &args = QString List() )
	{		{
	KParts::Part *object = factory->createPart( parentWidget,		KParts::Part *object = factory->createPart( parentWidget,
	parent,		parent,
	T::staticMetaObject .className(),		T::staticMetaObject .className(),
	args );		args );
	T *result = dynamic_cast<T *>( object );		T *result = dynamic_cast<T *>( object );
	if ( !result )		if ( !result )
	delete object;		delete object;
	return result;		return result;
	}		}
			#endif
	/*		/*
	* @deprecated use KPluginFactory::create instead		* @deprecated use KPluginFactory::create instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T>		template <class T>
	KDE_DEPRECATED T *createPartInstanceFromLibrary( const char *librar yName,		KDE_DEPRECATED T *createPartInstanceFromLibrary( const char *librar yName,
	QWidget *parentWidget = 0,		QWidget *parentWidget = 0,
	QObject *parent = 0,		QObject *parent = 0,
	const QStringList &args = QString List(),		const QStringList &args = QString List(),
	int *error = 0 )		int *error = 0 )
	{		{
	KLibrary *library = KLibLoader::self()->library( QString( libra ryName ) ); // compatibility hack		KLibrary *library = KLibLoader::self()->library( QString( libra ryName ) ); // compatibility hack
	if ( !library )		if ( !library )
	{		{
	skipping to change at line 111		skipping to change at line 117
	T *res = createPartInstanceFromFactory<T>( partFactory, parentW idget,		T *res = createPartInstanceFromFactory<T>( partFactory, parentW idget,
	parent, args );		parent, args );
	if ( !res )		if ( !res )
	{		{
	library->unload();		library->unload();
	if ( error )		if ( error )
	*error = KLibLoader::ErrNoComponent;		*error = KLibLoader::ErrNoComponent;
	}		}
	return res;		return res;
	}		}
			#endif
	/**		/**
	* @deprecated use KService::createInstance instead		* @deprecated use KService::createInstance instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T>		template <class T>
	KDE_DEPRECATED T *createPartInstanceFromService( const KService::Pt r &service,		KDE_DEPRECATED T *createPartInstanceFromService( const KService::Pt r &service,
	QWidget *parentWidget = 0,		QWidget *parentWidget = 0,
	QObject *parent = 0,		QObject *parent = 0,
	const QStringList &args = QString List(),		const QStringList &args = QString List(),
	int *error = 0 )		int *error = 0 )
	{		{
	QString library = service->library();		QString library = service->library();
	if ( library.isEmpty() )		if ( library.isEmpty() )
	{		{
	if ( error )		if ( error )
	*error = KLibLoader::ErrServiceProvidesNoLibrary;		*error = KLibLoader::ErrServiceProvidesNoLibrary;
	return 0;		return 0;
	}		}
	return createPartInstanceFromLibrary<T>( library.toLocal8Bit(). data(), parentWidget,		return createPartInstanceFromLibrary<T>( library.toLocal8Bit(). data(), parentWidget,
	parent, args, error );		parent, args, error );
	}		}
			#endif
			#ifndef KDE_NO_DEPRECATED
	template <class T, class ServiceIterator>		template <class T, class ServiceIterator>
	KDE_DEPRECATED T *createPartInstanceFromServices( ServiceIterator b egin,		KDE_DEPRECATED T *createPartInstanceFromServices( ServiceIterator b egin,
	ServiceIterator end,		ServiceIterator end,
	QWidget *parentWidget = 0,		QWidget *parentWidget = 0,
	QObject *parent = 0,		QObject *parent = 0,
	const QStringList &args = QStrin gList(),		const QStringList &args = QStrin gList(),
	int *error = 0 )		int *error = 0 )
	{		{
	for (; begin != end; ++begin )		for (; begin != end; ++begin )
	{		{
	skipping to change at line 161		skipping to change at line 171
	if ( component )		if ( component )
	return component;		return component;
	}		}
	if ( error )		if ( error )
	*error = KLibLoader::ErrNoServiceFound;		*error = KLibLoader::ErrNoServiceFound;
	return 0;		return 0;
	}		}
			#endif
	/**		/**
	* This method creates and returns a KParts part from a serviceType (e.g. a mimetype).		* This method creates and returns a KParts part from a serviceType (e.g. a mimetype).
	*		*
	* You can use this method to create a generic viewer - that can di splay any		* You can use this method to create a generic viewer - that can di splay any
	* kind of file, provided that there is a ReadOnlyPart installed fo r it - in 5 lines:		* kind of file, provided that there is a ReadOnlyPart installed fo r it - in 5 lines:
	* \code		* \code
	* // Given the following: KUrl url, QWidget* parentWidget and QObj ect* parentObject.		* // Given the following: KUrl url, QWidget* parentWidget and QObj ect* parentObject.
	* QString mimetype = KMimeType::findByURL( url )->name();		* QString mimetype = KMimeType::findByURL( url )->name();
	* KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPar tInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, QString(), parentWidget , parentObject );		* KParts::ReadOnlyPart* part = KParts::ComponentFactory::createPar tInstanceFromQuery<KParts::ReadOnlyPart>( mimetype, QString(), parentWidget , parentObject );
	skipping to change at line 190		skipping to change at line 201
	* @param constraint an optional constraint to pass to the trader ( see KTrader)		* @param constraint an optional constraint to pass to the trader ( see KTrader)
	* @param parentWidget the parent widget, will be set as the parent of the part's widget		* @param parentWidget the parent widget, will be set as the parent of the part's widget
	* @param parent the parent object for the part itself		* @param parent the parent object for the part itself
	* @param args A list of string arguments, passed to the factory an d possibly		* @param args A list of string arguments, passed to the factory an d possibly
	* to the component (see KLibFactory)		* to the component (see KLibFactory)
	* @param error The int passed here will receive an error code in c ase of errors.		* @param error The int passed here will receive an error code in c ase of errors.
	* (See enum KLibLoader::ComponentLoadingError)		* (See enum KLibLoader::ComponentLoadingError)
	* @return A pointer to the newly created object or a null pointer if the		* @return A pointer to the newly created object or a null pointer if the
	* factory was unable to create an object of the given type .		* factory was unable to create an object of the given type .
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T>		template <class T>
	T *createPartInstanceFromQuery( const QString &mimeType,		KDE_DEPRECATED T *createPartInstanceFromQuery( const QString &mimeT ype,
	const QString &constraint,		const QString &constraint,
	QWidget *parentWidget = 0,		QWidget *parentWidget = 0,
	QObject *parent = 0,		QObject *parent = 0,
	const QStringList &args = QStringLi st(),		const QStringList &args = QStringLi st(),
	int *error = 0 )		int *error = 0 )
	{		{
	const KService::List offers = KMimeTypeTrader::self()->query( m imeType, QLatin1String("KParts/ReadOnlyPart"), constraint );		const KService::List offers = KMimeTypeTrader::self()->query( m imeType, QLatin1String("KParts/ReadOnlyPart"), constraint );
	if ( offers.isEmpty() )		if ( offers.isEmpty() )
	{		{
	if ( error )		if ( error )
	*error = KLibLoader::ErrNoServiceFound;		*error = KLibLoader::ErrNoServiceFound;
	return 0;		return 0;
	}		}
	return createPartInstanceFromServices<T>( offers.begin(), offer s.end(),		return createPartInstanceFromServices<T>( offers.begin(), offer s.end(),
	parentWidget,		parentWidget,
	parent, args, error ) ;		parent, args, error ) ;
	}		}
			#endif // KDE_NO_DEPRECATED
	}		}
	}		}
	/*		/*
	* vim: et sw=4		* vim: et sw=4
	*/		*/
	#endif		#endif
End of changes. 13 change blocks.
	2 lines changed or deleted		14 lines changed or added

	config-nepomuk.h		config-nepomuk.h
	#define HAVE_NEPOMUK		#define HAVE_NEPOMUK
	#define HAVE_NEPOMUK_WITH_SDO_0_5
End of changes. 1 change blocks.
	0 lines changed or deleted		0 lines changed or added

	configinterface.h		configinterface.h
	skipping to change at line 72		skipping to change at line 72
	* A list of available config variables (or keys) can be optained by callin g		* A list of available config variables (or keys) can be optained by callin g
	* configKeys(). For all available keys configValue() returns the correspon ding		* configKeys(). For all available keys configValue() returns the correspon ding
	* value as QVariant. A value for a given key can be set by calling		* value as QVariant. A value for a given key can be set by calling
	* setConfigValue(). Right now, when using KatePart as editor component,		* setConfigValue(). Right now, when using KatePart as editor component,
	* KTextEditor::View has support for the following tuples:		* KTextEditor::View has support for the following tuples:
	* - line-numbers [bool], show/hide line numbers		* - line-numbers [bool], show/hide line numbers
	* - icon-bar [bool], show/hide icon bar		* - icon-bar [bool], show/hide icon bar
	* - dynamic-word-wrap [bool], enable/disable dynamic word wrap		* - dynamic-word-wrap [bool], enable/disable dynamic word wrap
	* - background-color [QColor], read/set the default background color		* - background-color [QColor], read/set the default background color
	* - selection-color [QColor], read/set the default color for selections		* - selection-color [QColor], read/set the default color for selections
			* - default-mark-type [uint], read/set the default mark type
			* - allow-mark-menu [bool], enable/disable the menu shown when right clic
			king
			* on the left gutter. When disabled, click on the gutter will always se
			t
			* or clear the mark of default type.
	*		*
	* KTextEditor::Document has support for the following:		* KTextEditor::Document has support for the following:
	* - auto-brackets [bool], enable/disable automatic bracket completion		* - auto-brackets [bool], enable/disable automatic bracket completion
	* - backup-on-save-local [bool], enable/disable backup when saving local files		* - backup-on-save-local [bool], enable/disable backup when saving local files
	* - backup-on-save-remote [bool], enable/disable backup when saving remot e files		* - backup-on-save-remote [bool], enable/disable backup when saving remot e files
	* - backup-on-save-suffix [string], set the suffix for file backups, e.g. "~"		* - backup-on-save-suffix [string], set the suffix for file backups, e.g. "~"
	* - backup-on-save-prefix [string], set the prefix for file backups, e.g. "."		* - backup-on-save-prefix [string], set the prefix for file backups, e.g. "."
	*		*
	* Either interface should emit the \p configChanged signal when appropriat e.		* Either interface should emit the \p configChanged signal when appropriat e.
	* TODO: Add to interface in KDE 5.		* TODO: Add to interface in KDE 5.
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	containment.h		containment.h
	skipping to change at line 36		skipping to change at line 36
	#include <QtGui/QWidget>		#include <QtGui/QWidget>
	#include <QtGui/QStyleOptionGraphicsItem>		#include <QtGui/QStyleOptionGraphicsItem>
	#include <kplugininfo.h>		#include <kplugininfo.h>
	#include <ksharedconfig.h>		#include <ksharedconfig.h>
	#include <kgenericfactory.h>		#include <kgenericfactory.h>
	#include <plasma/applet.h>		#include <plasma/applet.h>
	#include <plasma/animator.h>		#include <plasma/animator.h>
	namespace KIO
	{
	class Job;
	}
	namespace Plasma		namespace Plasma
	{		{
	class AccessAppletJob;		class AccessAppletJob;
	class AppletHandle;		class AppletHandle;
	class DataEngine;		class DataEngine;
	class Package;		class Package;
	class Corona;		class Corona;
	class View;		class View;
	class Wallpaper;		class Wallpaper;
	skipping to change at line 417		skipping to change at line 412
	* @since 4.4		* @since 4.4
	*/		*/
	QStringList containmentActionsTriggers();		QStringList containmentActionsTriggers();
	/**		/**
	* @return the plugin name for the given trigger		* @return the plugin name for the given trigger
	* @since 4.4		* @since 4.4
	*/		*/
	QString containmentActions(const QString &trigger);		QString containmentActions(const QString &trigger);
	Q_SIGNALS:		/**
			* @return the config group that containmentactions plugins go in
			* @since 4.6
			*/
			KConfigGroup containmentActionsConfig();
			Q_SIGNALS:
	/**		/**
	* This signal is emitted when a new applet is created by the conta inment		* This signal is emitted when a new applet is created by the conta inment
	*/		*/
	void appletAdded(Plasma::Applet *applet, const QPointF &pos);		void appletAdded(Plasma::Applet *applet, const QPointF &pos);
	/**		/**
	* This signal is emitted when an applet is destroyed		* This signal is emitted when an applet is destroyed
	*/		*/
	void appletRemoved(Plasma::Applet *applet);		void appletRemoved(Plasma::Applet *applet);
	skipping to change at line 534		skipping to change at line 535
	* @arg confirm whether or not confirmation from the user should be requested		* @arg 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.
			* @reimp
			* @sa Applet::configChanged()
			*/
			void configChanged();
	protected:		protected:
	/**		/**
	* 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 603		skipping to change at line 611
	/**		/**
	* @reimp		* @reimp
	* @sa QGraphicsItem::resizeEvent()		* @sa QGraphicsItem::resizeEvent()
	*/		*/
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	/**		/**
	* @returns the toolbox associated with this containment, or a null pointer if none		* @returns the toolbox associated with this containment, or a null pointer if none
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED const QGraphicsItem *toolBoxItem() const;		KDE_DEPRECATED const QGraphicsItem *toolBoxItem() const;
			#endif
	/**		/**
	* Sets a custom ToolBox		* Sets a custom ToolBox
	* if there was an old one it will be deleted		* if there was an old one it will be deleted
	* and the new one won't have any actions in it		* and the new one won't have any actions in it
	*		*
	* @param item the new toolbox item		* @param item the new toolbox item
	* @since 4.4		* @since 4.4
	*/		*/
	void setToolBox(AbstractToolBox *toolBox);		void setToolBox(AbstractToolBox *toolBox);
End of changes. 5 change blocks.
	6 lines changed or deleted		16 lines changed or added

	containmentactions.h		containmentactions.h
	skipping to change at line 84		skipping to change at line 84
	**/		**/
	static KPluginInfo::List listContainmentActionsInfo();		static KPluginInfo::List listContainmentActionsInfo();
	/**		/**
	* Attempts to load a containmentactions		* Attempts to load a containmentactions
	*		*
	* Returns a pointer to the containmentactions if successful.		* Returns a pointer to the containmentactions if successful.
	* The caller takes responsibility for the containmentactions, incl uding		* The caller takes responsibility for the containmentactions, incl uding
	* deleting it when no longer needed.		* deleting it when no longer needed.
	*		*
	* @param parent the parent containment. Required; if you send null you'll get back null.		* @param parent the parent containment. @since 4.6 null is allowed .
	* @param name the plugin name, as returned by KPluginInfo::pluginN ame()		* @param name the plugin name, as returned by KPluginInfo::pluginN ame()
	* @param args to send the containmentactions extra arguments		* @param args to send the containmentactions extra arguments
	* @return a pointer to the loaded containmentactions, or 0 on load failure		* @return a pointer to the loaded containmentactions, or 0 on load failure
	**/		**/
	static ContainmentActions *load(Containment *parent, const QString &name, const QVariantList &args = QVariantList());		static ContainmentActions *load(Containment *parent, const QString &name, const QVariantList &args = QVariantList());
	/**		/**
	* Attempts to load a containmentactions		* Attempts to load a containmentactions
	*		*
	* Returns a pointer to the containmentactions if successful.		* Returns a pointer to the containmentactions if successful.
	* The caller takes responsibility for the containmentactions, incl uding		* The caller takes responsibility for the containmentactions, incl uding
	* deleting it when no longer needed.		* deleting it when no longer needed.
	*		*
	* @param parent the parent containment. Required; if you send null you'll get back null.		* @param parent the parent containment. @since 4.6 null is allowed .
	* @param info KPluginInfo object for the desired containmentaction s		* @param info KPluginInfo object for the desired containmentaction s
	* @param args to send the containmentactions extra arguments		* @param args to send the containmentactions extra arguments
	* @return a pointer to the loaded containmentactions, or 0 on load failure		* @return a pointer to the loaded containmentactions, or 0 on load failure
	**/		**/
	static ContainmentActions *load(Containment *parent, const KPluginI nfo &info, const QVariantList &args = QVariantList());		static ContainmentActions *load(Containment *parent, const KPluginI nfo &info, const QVariantList &args = QVariantList());
	/**		/**
	* Returns the Package specialization for containmentactions.		* Returns the Package specialization for containmentactions.
	*/		*/
	static PackageStructure::Ptr packageStructure();		static PackageStructure::Ptr packageStructure();
	skipping to change at line 161		skipping to change at line 161
	/**		/**
	* This method is called when the user's configuration changes are accepted		* This method is called when the user's configuration changes are accepted
	*/		*/
	virtual void configurationAccepted();		virtual void configurationAccepted();
	/**		/**
	* Implement this to respond to events.		* Implement this to respond to events.
	* The user can configure whatever button and modifier they like, s o please don't look at		* The user can configure whatever button and modifier they like, s o please don't look at
	* those parameters.		* those parameters.
	* So far the event could be a QGraphicsSceneMouseEvent or a QGraph icsSceneWheelEvent.		* The event may be a QGraphicsSceneMouseEvent or a QGraphicsSceneW heelEvent.
	*/		*/
	virtual void contextEvent(QEvent *event);		virtual void contextEvent(QEvent *event);
	/**		/**
	* Implement this to provide a list of actions that can be added to another menu		* Implement this to provide a list of actions that can be added to another menu
	* for example, when right-clicking an applet, the "Activity Option s" submenu is populated		* for example, when right-clicking an applet, the "Activity Option s" submenu is populated
	* with this.		* with this.
	*/		*/
	virtual QList<QAction*> contextualActions();		virtual QList<QAction*> contextualActions();
	skipping to change at line 204		skipping to change at line 204
	* otherwise, false		* otherwise, false
	*/		*/
	bool configurationRequired() const;		bool configurationRequired() const;
	/**		/**
	* 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.
			*
			* @arg s size of the popup
			* @arg event a pointer to the event that triggered the popup
			* @return the preferred top-left position for the popup
			* @since 4.6
			*/
			QPoint popupPosition(const QSize &s, QEvent *event);
			/**
			* @reimplemented
			*/
	bool event(QEvent *e);		bool event(QEvent *e);
			/**
			* @p newContainment the containment the plugin should be associate
			d with.
			* @since 4.6
			*/
			void setContainment(Containment *newContainment);
	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
	*/		*/
	ContainmentActions(QObject *parent, const QVariantList &args);		ContainmentActions(QObject *parent, const QVariantList &args);
End of changes. 5 change blocks.
	3 lines changed or deleted		23 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,		Mile, NauticalMile, LightYear, Parsec, AstronomicalUnit, Thou,
	// 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,		Electronvolt, Rydberg, Kilocalorie, PhotonWavelength,
	// 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

	corona.h		corona.h
	skipping to change at line 99		skipping to change at line 99
	* 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
	*/		*/
	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		* 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
	*/		*/
	Containment *containmentForScreen(int screen, int desktop = -1) const;		Containment *containmentForScreen(int screen, int desktop = -1) const;
	/**		/**
			* Returns the Containment for a given physical screen and desktop, cre
			ating one
			* if none exists
			*
			* @param screen number of the physical screen to locate
			* @param desktop the virtual desktop) to locate; if < 0 then it will
			* simply return the first Containment associated with screen
			* @param defaultPluginIfNonExistent the plugin to load by default; "nu
			ll" is an empty
			* Containment and "default" creates the default plugin
			* @param defaultArgs optional arguments to pass in when creating a Con
			tainment if needed
			* @since 4.6
			*/
			Containment *containmentForScreen(int screen, int desktop,
			const QString &defaultPluginIfNonExis
			tent,
			const QVariantList &defaultArgs = QVa
			riantList());
			/**
	* Adds a widget in the topleft quadrant in the scene. Widgets in the t opleft quadrant are		* Adds a widget in the topleft quadrant in the scene. Widgets in the t opleft quadrant are
	* normally never shown unless you specifically aim a view at it, which makes it ideal for		* normally never shown unless you specifically aim a view at it, which makes it ideal for
	* toplevel views etc.		* toplevel views etc.
	* @param widget the widget to add.		* @param widget the widget to add.
	*/		*/
	void addOffscreenWidget(QGraphicsWidget *widget);		void addOffscreenWidget(QGraphicsWidget *widget);
	/**		/**
	* Removes a widget from the topleft quadrant in the scene.		* Removes a widget from the topleft quadrant in the scene.
	* @param widget the widget to remove.		* @param widget the widget to remove.
	skipping to change at line 257		skipping to change at line 272
	/**		/**
	* @return the AbstractDialogManager that will show dialogs used by app lets, like configuration dialogs		* @return the AbstractDialogManager that will show dialogs used by app lets, like configuration dialogs
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	AbstractDialogManager *dialogManager();		AbstractDialogManager *dialogManager();
	/**		/**
	* Imports an applet layout from a config file. The results will be add ed to the		* Imports an applet layout from a config file. The results will be add ed to the
	* current set of Containments.		* current set of Containments.
			* @deprecated Use the 4.6 version that takes a KConfigGroup
	*		*
	* @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()
	* @return the list of containments that were loaded		* @return the list of containments that were loaded
	* @since 4.5		* @since 4.5
	*/		*/
	QList<Plasma::Containment *> importLayout(const KConfigBase &config);		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED QList<Plasma::Containment *> importLayout(const KConfigB
			ase &config);
			#endif
			/**
			* Returns the name of the preferred plugin to be used as containment t
			oolboxes.
			* CustomContainments and CustomPanelContainments can still override it
			as their liking. It's also not guaranteed that the plugin will actually ex
			ist.
			*
			* @param type the containment type of which we want to know the associ
			ated toolbox plugin
			* @since 4.6
			*/
			QString preferredToolBoxPlugin(const Containment::Type type) const;
			/**
			* Imports an applet layout from a config file. The results will be add
			ed to the
			* current set of Containments.
			*
			* @param config the name of the config file to load from,
			* or the default config file if QString()
			* @return the list of containments that were loaded
			* @since 4.6
			*/
			QList<Plasma::Containment *> importLayout(const KConfigGroup &config);
	/**		/**
	* Exports a set of containments to a config file.		* Exports a set of containments to a config file.
	*		*
	* @param config the config group to save to		* @param config the config group to save to
	* @param containments the list of containments to save		* @param containments the list of containments to save
	* @since 4.5.4		* @since 4.6
	*/		*/
	void exportLayout(KConfigGroup &config, QList<Containment*> containment s);		void exportLayout(KConfigGroup &config, QList<Containment*> containment s);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Initializes the layout from a config file. This will first clear any existing		* Initializes the layout from a config file. This will first clear any existing
	* Containments, load a layout from the requested configuration file, r equest the		* Containments, load a layout from the requested configuration file, r equest the
	* default layout if needed and update immutability.		* default layout if needed and update immutability.
	*		*
	* @param config the name of the config file to load from,		* @param config the name of the config file to load from,
	skipping to change at line 429		skipping to change at line 467
	/**		/**
	* 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		* @arg from the animation to map a new value to
	* @arg to the animation value to map to from; this must map to a Javas cript animation		* @arg to the animation value to map to from; this must map to a Javas cript 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.
			* @param type the containment type of which we want to know the prefer
			red toolbox plugin.
			* @param plugin the toolbox plugin name
			* @since 4.6
			*/
			void setPreferredToolBoxPlugin(const Containment::Type type, const QStr
			ing &plugin);
	//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. 6 change blocks.
	3 lines changed or deleted		63 lines changed or added

	css_rule.h		css_rule.h
	skipping to change at line 75		skipping to change at line 75
	*		*
	*/		*/
	enum RuleType {		enum RuleType {
	UNKNOWN_RULE = 0,		UNKNOWN_RULE = 0,
	STYLE_RULE = 1,		STYLE_RULE = 1,
	CHARSET_RULE = 2,		CHARSET_RULE = 2,
	IMPORT_RULE = 3,		IMPORT_RULE = 3,
	MEDIA_RULE = 4,		MEDIA_RULE = 4,
	FONT_FACE_RULE = 5,		FONT_FACE_RULE = 5,
	PAGE_RULE = 6,		PAGE_RULE = 6,
			NAMESPACE_RULE = 10, ///< CSSOM, @since 4.6.0
	QUIRKS_RULE = 100 // KHTML CSS Extension		QUIRKS_RULE = 100 // KHTML CSS Extension
	};		};
	/**		/**
	* The type of the rule, as defined above. The expectation is that		* The type of the rule, as defined above. The expectation is that
	* binding-specific casting methods can be used to cast down from		* binding-specific casting methods can be used to cast down from
	* an instance of the \c CSSRule interface to the		* an instance of the \c CSSRule interface to the
	* specific derived interface implied by the \c type .		* specific derived interface implied by the \c type .
	*		*
	*/		*/
	skipping to change at line 453		skipping to change at line 454
	void setSelectorText( const DOM::DOMString & );		void setSelectorText( const DOM::DOMString & );
	/**		/**
	* The <a href="http://www.w3.org/TR/REC-CSS2/syndata.html#q8">		* The <a href="http://www.w3.org/TR/REC-CSS2/syndata.html#q8">
	* declaration-block </a> of this rule set.		* declaration-block </a> of this rule set.
	*		*
	*/		*/
	CSSStyleDeclaration style() const;		CSSStyleDeclaration style() const;
	};		};
			class CSSNamespaceRuleImpl;
			/**
			* The \c CSSNamespaceRule interface represents an @namespace rule
			* @since 4.6.0
			*
			*/
			class KHTML_EXPORT CSSNamespaceRule : public CSSRule
			{
			public:
			CSSNamespaceRule();
			CSSNamespaceRule(const CSSNamespaceRule &other);
			CSSNamespaceRule(const CSSRule &other);
			CSSNamespaceRule(CSSNamespaceRuleImpl *impl);
			DOMString namespaceURI() const;
			DOMString prefix() const;
			public:
			CSSNamespaceRule & operator = (const CSSNamespaceRule &other);
			CSSNamespaceRule & operator = (const CSSRule &other);
			~CSSNamespaceRule();
			};
	class CSSUnknownRuleImpl;		class CSSUnknownRuleImpl;
	/**		/**
	* The \c CSSUnkownRule interface represents an at-rule		* The \c CSSUnkownRule interface represents an at-rule
	* not supported by this user agent.		* not supported by this user agent.
	*		*
	*/		*/
	class KHTML_EXPORT CSSUnknownRule : public CSSRule		class KHTML_EXPORT CSSUnknownRule : public CSSRule
	{		{
	public:		public:
	CSSUnknownRule();		CSSUnknownRule();
End of changes. 2 change blocks.
	0 lines changed or deleted		25 lines changed or added

	datacontainer.h		datacontainer.h
	skipping to change at line 25		skipping to change at line 25
	* 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_DATACONTAINER_H		#ifndef PLASMA_DATACONTAINER_H
	#define PLASMA_DATACONTAINER_H		#define PLASMA_DATACONTAINER_H
	#include <QtCore/QHash>		#include <QtCore/QHash>
	#include <QtCore/QObject>		#include <QtCore/QObject>
			#include <QtCore/QTimer>
			#include <kjob.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	#include <plasma/dataengine.h>		#include <plasma/dataengine.h>
	namespace Plasma		namespace Plasma
	{		{
	class DataContainerPrivate;		class DataContainerPrivate;
	/**		/**
	* @class DataContainer plasma/datacontainer.h <Plasma/DataContainer>		* @class DataContainer plasma/datacontainer.h <Plasma/DataContainer>
	skipping to change at line 125		skipping to change at line 127
	* May be called repeatedly for the same visualization without		* May be called repeatedly for the same visualization without
	* side effects		* side effects
	*		*
	* @param visualization the object to connect to this DataContainer		* @param visualization the object to connect to this DataContainer
	* @param pollingInterval the time in milliseconds between updates		* @param pollingInterval the time in milliseconds between updates
	* @param alignment the clock position to align updates to		* @param alignment the clock position to align updates to
	**/		**/
	void connectVisualization(QObject *visualization, uint pollingInter val,		void connectVisualization(QObject *visualization, uint pollingInter val,
	Plasma::IntervalAlignment alignment);		Plasma::IntervalAlignment alignment);
			/**
			* sets this data container to be automatically stored.
			* @param whether this data container should be stored
			* @since 4.6
			*/
			void setStorageEnabled(bool store);
			/**
			* @return true if the data container has been marked for storage
			* @since 4.6
			*/
			bool isStorageEnabled() const;
			/**
			* @return true if the data container has been updated, but not sto
			red
			*/
			bool needsToBeStored() const;
			/**
			* sets that the data container needs to be stored or not.
			* @param whether the data container needs to be stored
			*/
			void setNeedsToBeStored(bool store);
			/**
			* @return the DataEngine that the DataContainer is
			* a child of.
			*/
			DataEngine* getDataEngine();
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Disconnects an object from this DataContainer.		* Disconnects an object from this DataContainer.
	*		*
	* Note that if this source was created by DataEngine::sourceReques tEvent(),		* Note that if this source was created by DataEngine::sourceReques tEvent(),
	* it will be deleted by DataEngine once control returns to the eve nt loop.		* it will be deleted by DataEngine once control returns to the eve nt loop.
	**/		**/
	void disconnectVisualization(QObject *visualization);		void disconnectVisualization(QObject *visualization);
	/**		/**
	skipping to change at line 218		skipping to change at line 250
	*		*
	* If not the signal "becameUnused" will be emitted.		* If not the signal "becameUnused" will be emitted.
	*		*
	* Warning: The DataContainer may be invalid after calling this fun ction, because a listener		* Warning: The DataContainer may be invalid after calling this fun ction, because a listener
	* to becameUnused() may have deleted it.		* to becameUnused() may have deleted it.
	**/		**/
	void checkUsage();		void checkUsage();
	private:		private:
	friend class SignalRelay;		friend class SignalRelay;
			friend class DataContainerPrivate;
			friend class DataEngineManager;
	DataContainerPrivate *const d;		DataContainerPrivate *const d;
			Q_PRIVATE_SLOT(d, void storeJobFinished(KJob *job))
			Q_PRIVATE_SLOT(d, void populateFromStoredData(KJob *job))
			Q_PRIVATE_SLOT(d, void store())
			Q_PRIVATE_SLOT(d, void retrieve())
	};		};
	} // Plasma namespace		} // Plasma namespace
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 5 change blocks.
	0 lines changed or deleted		40 lines changed or added

	dataengine.h		dataengine.h
	skipping to change at line 150		skipping to change at line 150
	*		*
	* SLOT(dataUpdated(QString,Plasma::DataEngine::Data))		* SLOT(dataUpdated(QString,Plasma::DataEngine::Data))
	*		*
	* The data is a QHash of QVariants keyed by QString names, allowin g		* The data is a QHash of QVariants keyed by QString names, allowin g
	* one data source to provide sets of related data.		* one data source to provide sets of related data.
	*		*
	* This method may be called multiple times for the same visualizat ion		* This method may be called multiple times for the same visualizat ion
	* without side-effects. This can be useful to change the pollingIn terval.		* without side-effects. This can be useful to change the pollingIn terval.
	*		*
	* Note that this method does not automatically connect sources tha t		* Note that this method does not automatically connect sources tha t
	* may appear later on. Connecting and responding to the sourceAdde d sigal		* may appear later on. Connecting and responding to the sourceAdde d signal
	* is still required to achieve that.		* is still required to achieve that.
	*		*
	* @param visualization the object to connect the data source to		* @param visualization the object to connect the data source to
	* @param pollingInterval the frequency, in milliseconds, with whic h to check for updates;		* @param pollingInterval the frequency, in milliseconds, with whic h to check for updates;
	* a value of 0 (the default) means to updat e only		* a value of 0 (the default) means to updat e only
	* when there is new data spontaneously gene rated		* when there is new data spontaneously gene rated
	* (e.g. by the engine); any other value res ults in		* (e.g. by the engine); any other value res ults in
	* periodic updates from this source. This v alue is		* periodic updates from this source. This v alue is
	* per-visualization and can be handy for it ems that require		* per-visualization and can be handy for it ems that require
	* constant updates such as scrolling graphs or clocks.		* constant updates such as scrolling graphs or clocks.
	skipping to change at line 381		skipping to change at line 381
	* @param limit the maximum number of sources to keep active		* @param limit the maximum number of sources to keep active
	**/		**/
	void setMaxSourceCount(uint limit);		void setMaxSourceCount(uint limit);
	/**		/**
	* Sets the minimum amount of time, in milliseconds, that must pass between		* Sets the minimum amount of time, in milliseconds, that must pass between
	* successive updates of data. This can help prevent too many updat es happening		* successive updates of data. This can help prevent too many updat es happening
	* due to multiple update requests coming in, which can be useful f or		* due to multiple update requests coming in, which can be useful f or
	* expensive (time- or resource-wise) update mechanisms.		* expensive (time- or resource-wise) update mechanisms.
	*		*
			* The default minimumPollingInterval is -1, or "never perform auto
			matic updates"
			*
	* @param minimumMs the minimum time lapse, in milliseconds, betwee n updates.		* @param minimumMs the minimum time lapse, in milliseconds, betwee n updates.
	* A value less than 0 means to never perform automa tic updates,		* A value less than 0 means to never perform automa tic updates,
	* a value of 0 means update immediately on every up date request,		* a value of 0 means update immediately on every up date request,
	* a value >0 will result in a minimum time lapse be ing enforced.		* a value >0 will result in a minimum time lapse be ing enforced.
	**/		**/
	void setMinimumPollingInterval(int minimumMs);		void setMinimumPollingInterval(int minimumMs);
	/**		/**
	* @return the minimum time between updates. @see setMinimumPolling Interval		* @return the minimum time between updates. @see setMinimumPolling Interval
	**/		**/
	skipping to change at line 453		skipping to change at line 455
	* DataEngine *engine = dataEngine("foo");		* DataEngine *engine = dataEngine("foo");
	* Service *service = engine->createDefaultService(this);		* Service *service = engine->createDefaultService(this);
	* @endcode		* @endcode
	*		*
	* @see createDefaultService		* @see createDefaultService
	* @param serviceName the name of the service to load (plugin name )		* @param serviceName the name of the service to load (plugin name )
	* @since 4.5		* @since 4.5
	*/		*/
	void setDefaultService(const QString &serviceName);		void setDefaultService(const QString &serviceName);
			/**
			* Sets a source to be stored for easy retrieval
			* when the real source of the data (usually a network connection)
			* is unavailable.
			* @param source the name of the source
			* @param store if source should be stored
			* @since 4.6
			*/
			void setStorageEnabled(const QString &source, bool store);
	protected Q_SLOTS:		protected Q_SLOTS:
	/**		/**
	* Call this method when you call setData directly on a DataContain er instead		* Call this method when you call setData directly on a DataContain er instead
	* of using the DataEngine::setData methods.		* of using the DataEngine::setData methods.
	* If this method is not called, no dataUpdated(..) signals will be emitted!		* If this method is not called, no dataUpdated(..) signals will be emitted!
	*/		*/
	void scheduleSourcesUpdated();		void scheduleSourcesUpdated();
	/**		/**
	* Removes a data source.		* Removes a data source.
End of changes. 3 change blocks.
	1 lines changed or deleted		14 lines changed or added

	dataenginemanager.h		dataenginemanager.h
	skipping to change at line 117		skipping to change at line 117
	*		*
	* @param parentApp the application to filter applets on. Uses the		* @param parentApp the application to filter applets on. Uses the
	* X-KDE-ParentApp entry (if any) in the plugin in fo.		* X-KDE-ParentApp entry (if any) in the plugin in fo.
	* The default value of QString() will result in a		* The default value of QString() will result in a
	* list containing only applets not specifically		* list containing only applets not specifically
	* registered to an application.		* registered to an application.
	* @return list of DataEngines		* @return list of DataEngines
	* @since 4.3		* @since 4.3
	**/		**/
	static KPluginInfo::List listEngineInfoByCategory(const QString &ca tegory, const QString &parentApp = QString());		static KPluginInfo::List listEngineInfoByCategory(const QString &ca tegory, const QString &parentApp = QString());
			protected:
			/**
			* Reimplemented from QObject
			**/
			void timerEvent(QTimerEvent *event);
	private:		private:
	/**		/**
	* Default constructor. The singleton method self() is the		* Default constructor. The singleton method self() is the
	* preferred access mechanism.		* preferred access mechanism.
	*/		*/
	DataEngineManager();		DataEngineManager();
	~DataEngineManager();		~DataEngineManager();
	DataEngineManagerPrivate *const d;		DataEngineManagerPrivate *const d;
End of changes. 1 change blocks.
	0 lines changed or deleted		7 lines changed or added

	device.h		device.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2005-2007 Kevin Ottens <ervin@kde.org>		Copyright 2005-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_DEVICE_H		#ifndef SOLID_DEVICE_H
	#define SOLID_DEVICE_H		#define SOLID_DEVICE_H
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <QtCore/QMap>		#include <QtCore/QMap>
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtCore/QSharedData>		#include <QtCore/QSharedData>
	skipping to change at line 186		skipping to change at line 187
	*		*
	* @return the icon name		* @return the icon name
	*/		*/
	QString icon() const;		QString icon() const;
	/**		/**
	* Retrieves the names of the emblems representing the state of thi s device.		* Retrieves the names of the emblems representing the state of thi s device.
	* The naming follows the freedesktop.org specification.		* The naming follows the freedesktop.org specification.
	*		*
	* @return the emblem names		* @return the emblem names
			* @since 4.4
	*/		*/
	QStringList emblems() const;		QStringList emblems() const;
	/**		/**
	* Retrieves the description of device.		* Retrieves the description of device.
	*		*
	* @return the description		* @return the description
	* @since 4.4		* @since 4.4
	*/		*/
	QString description() const;		QString description() const;
End of changes. 5 change blocks.
	11 lines changed or deleted		13 lines changed or added

	deviceinterface.h		deviceinterface.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_DEVICEINTERFACE_H		#ifndef SOLID_DEVICEINTERFACE_H
	#define SOLID_DEVICEINTERFACE_H		#define SOLID_DEVICEINTERFACE_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QBool>		#include <QtCore/QBool>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	skipping to change at line 54		skipping to change at line 55
	Q_ENUMS(Type)		Q_ENUMS(Type)
	Q_DECLARE_PRIVATE(DeviceInterface)		Q_DECLARE_PRIVATE(DeviceInterface)
	public:		public:
	/**		/**
	* This enum type defines the type of device interface that a Devic e can have.		* This enum type defines the type of device interface that a Devic e can have.
	*		*
	* - Unknown : An undetermined device interface		* - Unknown : An undetermined device interface
	* - Processor : A processor		* - Processor : A processor
	* - Block : A block device		* - Block : A block device
			* - StorageAccess : A mechanism to access data on a storage device
	* - StorageDrive : A storage drive		* - StorageDrive : A storage drive
	* - Cdrom : A CD-ROM drive		* - 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
	*/		*/
	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,		SerialInterface = 18, SmartCardReader = 19, InternetGat eway = 20,
	Last = 0xffff };		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. 7 change blocks.
	13 lines changed or deleted		15 lines changed or added

	devicenotifier.h		devicenotifier.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2005-2007 Kevin Ottens <ervin@kde.org>		Copyright 2005-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_DEVICENOTIFIER_H		#ifndef SOLID_DEVICENOTIFIER_H
	#define SOLID_DEVICENOTIFIER_H		#define SOLID_DEVICENOTIFIER_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	dnssd_export.h		dnssd_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef DNSSD_EXPORT_H		#ifndef DNSSD_EXPORT_H
	#define DNSSD_EXPORT_H		#define DNSSD_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KDNSSD_EXPORT		#ifndef KDNSSD_EXPORT
	# if defined(MAKE_KDNSSD_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KDNSSD_EXPORT
			# elif defined(MAKE_KDNSSD_LIB)
	/* We are building this library */		/* We are building this library */
	# define KDNSSD_EXPORT KDE_EXPORT		# define KDNSSD_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KDNSSD_EXPORT KDE_IMPORT		# define KDNSSD_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	document.h		document.h
	skipping to change at line 628		skipping to change at line 628
	* At this point all of the information is still accessible, such as th e text,		* At this point all of the information is still accessible, such as th e text,
	* cursors and ranges.		* cursors and ranges.
	*		*
	* Any modifications made to the document at this point will be lost.		* Any modifications made to the document at this point will be lost.
	*		*
	* \param document the document being reloaded		* \param document the document being reloaded
	*/		*/
	void aboutToReload(KTextEditor::Document *document);		void aboutToReload(KTextEditor::Document *document);
	/**		/**
			* Emitted after the current document was reloaded.
			* At this point, some information might have been invalidated, like
			* for example the editing history.
			*
			* \param document the document that was reloaded.
			*
			* @since 4.6
			*/
			void reloaded(KTextEditor::Document *document);
			/**
	* Upon emission, the document's content may only be changed by the ini tiator		* Upon emission, the document's content may only be changed by the ini tiator
	* of this signal until exclusiveEditEnd() is signalled. It is, however ,		* of this signal until exclusiveEditEnd() is signalled. It is, however ,
	* possible to listen to changes of the content.		* possible to listen to changes of the content.
	*		*
	* Signalled e.g. on undo or redo.		* Signalled e.g. on undo or redo.
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	void exclusiveEditStart(KTextEditor::Document *document);		void exclusiveEditStart(KTextEditor::Document *document);
End of changes. 1 change blocks.
	0 lines changed or deleted		11 lines changed or added

	dom_node.h		dom_node.h
	skipping to change at line 931		skipping to change at line 931
	/**		/**
	* @internal handle to the implementation object		* @internal handle to the implementation object
	*/		*/
	NodeImpl *handle() const { return impl; }		NodeImpl *handle() const { return impl; }
	/**		/**
	* @internal returns the index of a node		* @internal returns the index of a node
	*/		*/
	unsigned long index() const;		unsigned long index() const;
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString toHTML();		KDE_DEPRECATED QString toHTML();
			#endif
	void applyChanges();		void applyChanges();
	/**		/**
	* @deprecated without substitution since 3.2		* @deprecated without substitution since 3.2
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void getCursor(int offset, int &_x, int &_y, int &height );		KDE_DEPRECATED void getCursor(int offset, int &_x, int &_y, int &height );
			#endif
	/**		/**
	* not part of the DOM.		* not part of the DOM.
	* @returns the exact coordinates and size of this element.		* @returns the exact coordinates and size of this element.
	*/		*/
	QRect getRect();		QRect getRect();
	protected:		protected:
	NodeImpl *impl;		NodeImpl *impl;
	};		};
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	dvbinterface.h		dvbinterface.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2007 Kevin Ottens <ervin@kde.org>		Copyright 2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_DVBINTERFACE_H		#ifndef SOLID_DVBINTERFACE_H
	#define SOLID_DVBINTERFACE_H		#define SOLID_DVBINTERFACE_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	entity.h		entity.h
	/* This file is part of the Nepomuk-KDE libraries		/* This file is part of the Nepomuk-KDE libraries
	Copyright (c) 2007-2009 Sebastian Trueg <trueg@kde.org>		Copyright (c) 2007-2010 Sebastian Trueg <trueg@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Library General Public
	License as published by the Free Software Foundation; either		License as published by the Free Software Foundation; either
	version 2 of the License, or (at your option) any later version.		version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,		This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of		but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Library General Public License for more details.		Library General Public License for more details.
	skipping to change at line 203		skipping to change at line 203
	* the internal cache can be reset via this method.		* the internal cache can be reset via this method.
	*		*
	* \param recursive If \p true all related entities will be res et		* \param recursive If \p true all related entities will be res et
	* as well.		* as well.
	*		*
	* \since 4.1		* \since 4.1
	*/		*/
	void reset( bool recursive = false );		void reset( bool recursive = false );
	/**		/**
			* nao:userVisible can be used to hide certain properties and
			* resources of a certain type from the user.
			*
			* \return \p true if this entity should be visible to the user
			.
			*
			* \since 4.6
			*/
			bool userVisible() const;
			/**
	* An Entity can be used as a QUrl automagically.		* An Entity can be used as a QUrl automagically.
	*/		*/
	operator QUrl() const { return uri(); }		operator QUrl() const { return uri(); }
	/**		/**
	* Compares two Entity instances by simply comparing their URI.		* Compares two Entity instances. This is faster than simply
			* comparing the URIs.
	*/		*/
	bool operator==( const Entity& other ) const;		bool operator==( const Entity& other ) const;
	/**		/**
	* Compares the Entity with a URI.		* Compares the Entity with a URI.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	bool operator==( const QUrl& other ) const;		bool operator==( const QUrl& other ) const;
	/**		/**
	* Compares two Entity instances by simply comparing their URI.		* Compares two Entity instances. This is faster than simply
			* comparing the URIs.
	*/		*/
	bool operator!=( const Entity& other ) const;		bool operator!=( const Entity& other ) const;
	/**		/**
	* Compares the Entity with a URI.		* Compares the Entity with a URI.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	bool operator!=( const QUrl& other ) const;		bool operator!=( const QUrl& other ) const;
End of changes. 4 change blocks.
	3 lines changed or deleted		16 lines changed or added

	extender.h		extender.h
	skipping to change at line 306		skipping to change at line 306
	void itemDetached(Plasma::ExtenderItem *);		void itemDetached(Plasma::ExtenderItem *);
	/**		/**
	* Fires when an extender's preferred size changes.		* Fires when an extender's preferred size changes.
	*/		*/
	void geometryChanged();		void geometryChanged();
	private:		private:
	ExtenderPrivate *const d;		ExtenderPrivate *const d;
	Q_PRIVATE_SLOT(d, void extenderItemDestroyed(ExtenderItem *item))		Q_PRIVATE_SLOT(d, void delayItemAddedEvent())
			Q_PRIVATE_SLOT(d, void extenderItemDestroyed(Plasma::ExtenderItem *
			item))
			Q_PRIVATE_SLOT(d, void viewportGeometryChanged(const QRectF &))
	friend class ExtenderPrivate;		friend class ExtenderPrivate;
	friend class ExtenderGroup;		friend class ExtenderGroup;
	friend class ExtenderGroupPrivate;		friend class ExtenderGroupPrivate;
	friend class ExtenderItem;		friend class ExtenderItem;
	friend class ExtenderItemPrivate;		friend class ExtenderItemPrivate;
	//dialog needs access to the extender's applet location.		//dialog needs access to the extender's applet location.
	friend class DialogPrivate;		friend class DialogPrivate;
	//applet should be able to call saveState();		//applet should be able to call saveState();
	friend class Applet;		friend class Applet;
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	extenderitem.h		extenderitem.h
	skipping to change at line 111		skipping to change at line 111
	~ExtenderItem();		~ExtenderItem();
	/**		/**
	* fetch the configuration of this widget.		* fetch the configuration of this widget.
	* @return the configuration of this widget.		* @return the configuration of this widget.
	*/		*/
	KConfigGroup config() const;		KConfigGroup config() const;
	/**		/**
	* @param widget The widget that should be wrapped into the extende r item.		* @param widget The widget that should be wrapped into the extende r item.
			* It has to be a QGraphicsWidget.
	*/		*/
	void setWidget(QGraphicsItem *widget);		void setWidget(QGraphicsItem *widget);
	/**		/**
	* @return The widget that is wrapped into the extender item.		* @return The widget that is wrapped into the extender item.
	*/		*/
	QGraphicsItem *widget() const;		QGraphicsItem *widget() const;
	/**		/**
	* @param title the title that will be shown in the extender item's dragger. Default is		* @param title the title that will be shown in the extender item's dragger. Default is
	skipping to change at line 239		skipping to change at line 240
	*/		*/
	void addAction(const QString &name, QAction *action);		void addAction(const QString &name, QAction *action);
	/**		/**
	* @return the QAction with the given name from our collection. By default the action		* @return the QAction with the given name from our collection. By default the action
	* collection contains a "movebacktosource" action which will be on ly shown when the		* collection contains a "movebacktosource" action which will be on ly shown when the
	* item is detached.		* item is detached.
	*/		*/
	QAction *action(const QString &name) const;		QAction *action(const QString &name) const;
			/**
			* Set the ExtenderItem as transient: won't be saved in the Plasma
			config
			* and won't be restored. This is intended for items that have cont
			ents
			* valid only for this session.
			*
			* @param transient true if the ExtenderItem will be transient
			*
			* @since 4.6
			*/
			void setTransient(const bool transient);
			/**
			* @return true if the ExtenderItem is transient.
			* @since 4.6
			*/
			bool isTransient() const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Destroys the extender item. As opposed to calling delete on this class, destroy also		* Destroys the extender item. As opposed to calling delete on this class, destroy also
	* removes the config group associated with this item.		* removes the config group associated with this item.
	*/		*/
	void destroy();		void destroy();
	/**		/**
	* Collapse or expand the extender item. Defaults to false.		* Collapse or expand the extender item. Defaults to false.
	*/		*/
	skipping to change at line 272		skipping to change at line 290
	/**		/**
	* Hides the close button in this item's drag handle.		* Hides the close button in this item's drag handle.
	*/		*/
	void hideCloseButton();		void hideCloseButton();
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the extender item is destroyed		* Emitted when the extender item is destroyed
	* @since 4.4.1		* @since 4.4.1
	*/		*/
	void destroyed(ExtenderItem *item);		void destroyed(Plasma::ExtenderItem *item);
	protected:		protected:
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget);
	void moveEvent(QGraphicsSceneMoveEvent *event);		void moveEvent(QGraphicsSceneMoveEvent *event);
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);		void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
End of changes. 3 change blocks.
	1 lines changed or deleted		21 lines changed or added

	filequery.h		filequery.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 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 _NEPOMUK_FILE_QUERY_QUERY_H_		#ifndef _NEPOMUK_QUERY_FILE_QUERY_H_
	#define _NEPOMUK_FILE_QUERY_QUERY_H_		#define _NEPOMUK_QUERY_FILE_QUERY_H_
	#include "query.h"		#include "query.h"
	#include "nepomukquery_export.h"		#include "nepomukquery_export.h"
	namespace Nepomuk {		namespace Nepomuk {
	namespace Query {		namespace Query {
	/**		/**
	* \class FileQuery filequery.h Nepomuk/Query/FileQuery		* \class FileQuery filequery.h Nepomuk/Query/FileQuery
	*		*
	* \brief A Nepomuk desktop query specialized for file searches.		* \brief A Nepomuk desktop query specialized for file searches.
	skipping to change at line 78		skipping to change at line 78
	/**		/**
	* Assignment operator		* Assignment operator
	*/		*/
	FileQuery& operator=( const Query& );		FileQuery& operator=( const Query& );
	/**		/**
	* Add a folder to include in the search. If include folders ar e set the query		* Add a folder to include in the search. If include folders ar e set the query
	* will be restricted to files from that folders and their subf olders.		* will be restricted to files from that folders and their subf olders.
	*		*
	* Be aware that setting a folder filter will implicitely restr
	ict the query
	* to files and folders.
	*
	* \param folder The folder to include in the search.		* \param folder The folder to include in the search.
	*		*
	* \sa setIncludeFolders, includeFolders, addExcludeFolder		* \sa setIncludeFolders, includeFolders, addExcludeFolder
	*/		*/
	void addIncludeFolder( const KUrl& folder );		void addIncludeFolder( const KUrl& folder );
	/**		/**
			* Add a folder to include in the search path. If include folde
			rs are set the query
			* will be restricted to files from that folders and optionally
			their subfolders.
			*
			* \param folder The folder to include in the search.
			* \param recursive If \p true subfolders of \p folder will be
			searched, too.
			*
			* \sa setIncludeFolders, includeFolders, addExcludeFolder
			*
			* \since 4.6
			*/
			void addIncludeFolder( const KUrl& folder, bool recursive );
			/**
	* \overload		* \overload
	*		*
	* \param folders The folders to include in the search.		* \param folders The folders to include in the search.
	*		*
	* \sa addIncludeFolder, includeFolders, setExcludeFolders		* \sa addIncludeFolder, includeFolders, setExcludeFolders
	*/		*/
	void setIncludeFolders( const KUrl::List& folders );		void setIncludeFolders( const KUrl::List& folders );
	/**		/**
			* \overload
			*
			* \param folders A hash of the folders to include in the searc
			h and
			* their recursive flag.
			*
			* \since 4.6
			*/
			void setIncludeFolders( const QHash<KUrl, bool>& folders );
			/**
	* The list of include folders set via addIncludeFolder() and		* The list of include folders set via addIncludeFolder() and
	* setIncludeFolders().		* setIncludeFolders().
	*		*
	* \sa addIncludeFolder, setIncludeFolders, excludeFolders		* \sa allIncludeFolders, addIncludeFolder, setIncludeFolders, excludeFolders
	*/		*/
	KUrl::List includeFolders() const;		KUrl::List includeFolders() const;
	/**		/**
			* The hash of include folders set via addIncludeFolder() and
			* setIncludeFolders() including their recursive flag.
			*
			* \sa includeFolders, addIncludeFolder, setIncludeFolders, exc
			ludeFolders
			*
			* \since 4.6
			*/
			QHash<KUrl, bool> allIncludeFolders() const;
			/**
	* Add a folder to exclude from the search. If exclude folders are set the query		* Add a folder to exclude from the search. If exclude folders are set the query
	* will be restricted to files that are not in that folder and its subfolders.		* will be restricted to files that are not in that folder and its subfolders.
	*		*
	* Be aware that setting a folder filter will implicitely restr
	ict the query
	* to files and folders.
	*
	* \param folder The folder to exclude from the search.		* \param folder The folder to exclude from the search.
	*		*
	* \sa setExcludeFolders, excludeFolders, addIncludeFolder		* \sa setExcludeFolders, excludeFolders, addIncludeFolder
	*/		*/
	void addExcludeFolder( const KUrl& folder );		void addExcludeFolder( const KUrl& folder );
	/**		/**
	* \overload		* \overload
	*		*
	* \param folders The folders to exclude from the search.		* \param folders The folders to exclude from the search.
End of changes. 7 change blocks.
	11 lines changed or deleted		41 lines changed or added

	frame.h		frame.h
	skipping to change at line 147		skipping to change at line 147
	QWidget *widget = 0);		QWidget *widget = 0);
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;		QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
	void changeEvent(QEvent *event);		void changeEvent(QEvent *event);
	private:		private:
	FramePrivate * const d;		FramePrivate * const d;
	Q_PRIVATE_SLOT(d, void syncBorders())		Q_PRIVATE_SLOT(d, void syncBorders())
			Q_PRIVATE_SLOT(d, void setPalette())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	framesvg.h		framesvg.h
	skipping to change at line 74		skipping to change at line 74
	* vertically to the same height as @c center		* vertically to the same height as @c center
	* - @c right - the right border; scaled in the same way as @c left		* - @c right - the right border; scaled in the same way as @c left
	* - @c topleft - fixed size; must be the same height as @c top and the sa me		* - @c topleft - fixed size; must be the same height as @c top and the sa me
	* width as @c left		* width as @c left
	* - @c bottomleft, @c topright, @c bottomright - similar to @c topleft		* - @c bottomleft, @c topright, @c bottomright - similar to @c topleft
	*		*
	* @c center must exist, but all the others are optional. @c topleft and		* @c center must exist, but all the others are optional. @c topleft and
	* @c topright will be ignored if @c top does not exist, and similarly for		* @c topright will be ignored if @c top does not exist, and similarly for
	* @c bottomleft and @c bottomright.		* @c bottomleft and @c bottomright.
	*		*
	* @see Plamsa::Svg		* @see Plasma::Svg
	**/		**/
	class PLASMA_EXPORT FrameSvg : public Svg		class PLASMA_EXPORT FrameSvg : public Svg
	{		{
	Q_OBJECT		Q_OBJECT
	Q_FLAGS(EnabledBorders)		Q_FLAGS(EnabledBorders)
	Q_PROPERTY(EnabledBorders enabledBorders READ enabledBorders WRITE setE nabledBorders)		Q_PROPERTY(EnabledBorders enabledBorders READ enabledBorders WRITE setE nabledBorders)
	public:		public:
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	genericinterface.h		genericinterface.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_GENERICINTERFACE_H		#ifndef SOLID_GENERICINTERFACE_H
	#define SOLID_GENERICINTERFACE_H		#define SOLID_GENERICINTERFACE_H
	#include <QtCore/QMap>		#include <QtCore/QMap>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	global.h		global.h
	skipping to change at line 38		skipping to change at line 38
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <kiconloader.h>		#include <kiconloader.h>
	#include <QtGui/QPixmap> // for pixmapForUrl		#include <QtGui/QPixmap> // for pixmapForUrl
	#include <sys/stat.h> // S_ISDIR		#include <sys/stat.h> // S_ISDIR
	#include <sys/types.h> // mode_t		#include <sys/types.h> // mode_t
	#include <kjob.h>		#include <kjob.h>
	#ifdef Q_OS_WIN		#ifdef Q_CC_MSVC
	template class KDE_EXPORT QMap<QString, QString>;		template class KDE_EXPORT QMap<QString, QString>;
	#endif		#endif
	class KUrl;		class KUrl;
	class KJobTrackerInterface;		class KJobTrackerInterface;
	class QTime;		class QTime;
	/**		/**
	* @short A namespace for KIO globals		* @short A namespace for KIO globals
	skipping to change at line 111		skipping to change at line 111
	/**		/**
	* Calculates remaining time from total size, processed size and speed.		* Calculates remaining time from total size, processed size and speed.
	* Warning: As QTime is limited to 23:59:59, use calculateRemainingSecond s() instead		* Warning: As QTime is limited to 23:59:59, use calculateRemainingSecond s() instead
	*		*
	* @param totalSize total size in bytes		* @param totalSize total size in bytes
	* @param processedSize processed size in bytes		* @param processedSize processed size in bytes
	* @param speed speed in bytes per second		* @param speed speed in bytes per second
	* @return calculated remaining time		* @return calculated remaining time
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KIO_EXPORT_DEPRECATED QTime calculateRemaining( KIO::filesize_t totalSize , KIO::filesize_t processedSize, KIO::filesize_t speed );		KIO_EXPORT_DEPRECATED QTime calculateRemaining( KIO::filesize_t totalSize , KIO::filesize_t processedSize, KIO::filesize_t speed );
			#endif
	/**		/**
	* Helper for showing information about a set of files and directories		* Helper for showing information about a set of files and directories
	* @param items the number of items (= @p files + @p dirs + number of sym links :)		* @param items the number of items (= @p files + @p dirs + number of sym links :)
	* @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
	*/		*/
End of changes. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	html_form.h		html_form.h
	skipping to change at line 537		skipping to change at line 537
	// ### remove in 4.0		// ### remove in 4.0
	/**		/**
	* see readOnly		* see readOnly
	*/		*/
	void setReadOnly( bool );		void setReadOnly( bool );
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED DOMString size() const;		KDE_DEPRECATED DOMString size() const;
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setSize( const DOMString & );		KDE_DEPRECATED void setSize( const DOMString & );
			#endif
	/**		/**
	* Size information. The precise meaning is specific to each type		* Size information. The precise meaning is specific to each type
	* of field. See the <a		* of field. See the <a
	* href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-size- INPUT">		* href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-size- INPUT">
	* size attribute definition </a> in HTML 4.0.		* size attribute definition </a> in HTML 4.0.
	*		*
	*/		*/
	long getSize() const;		long getSize() const;
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	html_image.h		html_image.h
	skipping to change at line 258		skipping to change at line 258
	DOMString getBorder() const;		DOMString getBorder() const;
	/**		/**
	* see border		* see border
	*/		*/
	void setBorder( const DOMString& );		void setBorder( const DOMString& );
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED long border() const;		KDE_DEPRECATED long border() const;
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setBorder( long );		KDE_DEPRECATED void setBorder( long );
			#endif
	/**		/**
	* Override height. See the <a		* Override height. See the <a
	* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-heigh t-IMG">		* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-heigh t-IMG">
	* height attribute definition </a> in HTML 4.0.		* height attribute definition </a> in HTML 4.0.
	*		*
	*/		*/
	long height() const;		long height() const;
	/**		/**
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	html_misc.h		html_misc.h
	skipping to change at line 108		skipping to change at line 108
	long getSize() const;		long getSize() const;
	/**		/**
	* see size		* see size
	*/		*/
	void setSize( long );		void setSize( long );
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED DOMString size() const;		KDE_DEPRECATED DOMString size() const;
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setSize( const DOMString & );		KDE_DEPRECATED void setSize( const DOMString & );
			#endif
	};		};
	// ------------------------------------------------------------------------ --		// ------------------------------------------------------------------------ --
	/**		/**
	* An \c HTMLCollection is a list of nodes. An individual		* An \c HTMLCollection is a list of nodes. An individual
	* node may be accessed by either ordinal index or the node's		* node may be accessed by either ordinal index or the node's
	* \c name or \c id attributes. Note: Collections in		* \c name or \c id attributes. Note: Collections in
	* the HTML DOM are assumed to be live meaning that they are		* the HTML DOM are assumed to be live meaning that they are
	* automatically updated when the underlying document is changed.		* automatically updated when the underlying document is changed.
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	html_object.h		html_object.h
	skipping to change at line 170		skipping to change at line 170
	long getHspace() const;		long getHspace() const;
	/**		/**
	* see hspace		* see hspace
	*/		*/
	void setHspace( long );		void setHspace( long );
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED DOMString hspace() const;		KDE_DEPRECATED DOMString hspace() const;
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setHspace( const DOMString &value );		KDE_DEPRECATED void setHspace( const DOMString &value );
			#endif
	/**		/**
	* The name of the applet. See the <a		* The name of the applet. See the <a
	* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-name- APPLET">		* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-name- APPLET">
	* name attribute definition </a> in HTML 4.0. This attribute is		* name attribute definition </a> in HTML 4.0. This attribute is
	* deprecated in HTML 4.0.		* deprecated in HTML 4.0.
	*		*
	*/		*/
	DOMString name() const;		DOMString name() const;
	skipping to change at line 223		skipping to change at line 227
	long getVspace() const;		long getVspace() const;
	/**		/**
	* see vspace		* see vspace
	*/		*/
	void setVspace( long );		void setVspace( long );
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED DOMString vspace() const;		KDE_DEPRECATED DOMString vspace() const;
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setVspace( const DOMString & );		KDE_DEPRECATED void setVspace( const DOMString & );
			#endif
	/**		/**
	* Override width. See the <a		* Override width. See the <a
	* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-width -APPLET">		* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-width -APPLET">
	* width attribute definition </a> in HTML 4.0. This attribute is		* width attribute definition </a> in HTML 4.0. This attribute is
	* deprecated in HTML 4.0.		* deprecated in HTML 4.0.
	*		*
	*/		*/
	DOMString width() const;		DOMString width() const;
	skipping to change at line 422		skipping to change at line 430
	long getHspace() const;		long getHspace() const;
	/**		/**
	* see hspace		* see hspace
	*/		*/
	void setHspace( long );		void setHspace( long );
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED DOMString hspace() const;		KDE_DEPRECATED DOMString hspace() const;
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setHspace( const DOMString & );		KDE_DEPRECATED void setHspace( const DOMString & );
			#endif
	/**		/**
	* Form control or object name when submitted with a form. See the		* Form control or object name when submitted with a form. See the
	* <a		* <a
	* href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-name- INPUT">		* href="http://www.w3.org/TR/REC-html40/interact/forms.html#adef-name- INPUT">
	* name attribute definition </a> in HTML 4.0.		* name attribute definition </a> in HTML 4.0.
	*		*
	*/		*/
	DOMString name() const;		DOMString name() const;
	skipping to change at line 515		skipping to change at line 527
	long getVspace() const;		long getVspace() const;
	/**		/**
	* see vspace		* see vspace
	*/		*/
	void setVspace( long );		void setVspace( long );
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED DOMString vspace() const;		KDE_DEPRECATED DOMString vspace() const;
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setVspace( const DOMString & );		KDE_DEPRECATED void setVspace( const DOMString & );
			#endif
	/**		/**
	* Override width. See the <a		* Override width. See the <a
	* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-width -IMG">		* href="http://www.w3.org/TR/REC-html40/struct/objects.html#adef-width -IMG">
	* width attribute definition </a> in HTML 4.0.		* width attribute definition </a> in HTML 4.0.
	*		*
	*/		*/
	DOMString width() const;		DOMString width() const;
	/**		/**
End of changes. 16 change blocks.
	0 lines changed or deleted		16 lines changed or added

	iconwidget.h		iconwidget.h
	skipping to change at line 386		skipping to change at line 386
	void drawActionButtonBase(QPainter *painter, const QSize &size, int ele ment);		void drawActionButtonBase(QPainter *painter, const QSize &size, int ele ment);
	private:		private:
	Q_PRIVATE_SLOT(d, void syncToAction())		Q_PRIVATE_SLOT(d, void syncToAction())
	Q_PRIVATE_SLOT(d, void clearAction())		Q_PRIVATE_SLOT(d, void clearAction())
	Q_PRIVATE_SLOT(d, void svgChanged())		Q_PRIVATE_SLOT(d, void svgChanged())
	Q_PRIVATE_SLOT(d, void actionDestroyed(QObject *obj))		Q_PRIVATE_SLOT(d, void actionDestroyed(QObject *obj))
	Q_PRIVATE_SLOT(d, void hoverAnimationFinished())		Q_PRIVATE_SLOT(d, void hoverAnimationFinished())
	Q_PRIVATE_SLOT(d, void colorConfigChanged())		Q_PRIVATE_SLOT(d, void colorConfigChanged())
	Q_PRIVATE_SLOT(d, void iconConfigChanged())		Q_PRIVATE_SLOT(d, void iconConfigChanged())
			Q_PRIVATE_SLOT(d, void setPalette())
	IconWidgetPrivate * const d;		IconWidgetPrivate * const d;
	friend class IconWidgetPrivate;		friend class IconWidgetPrivate;
	friend class PopupAppletPrivate;		friend class PopupAppletPrivate;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	job.h		job.h
	skipping to change at line 227		skipping to change at line 227
	*		*
	* @param details selects the level of details we want.		* @param details selects the level of details we want.
	* By default this is 2 (all details wanted, including modification tim e, size, etc.),		* By default this is 2 (all details wanted, including modification tim e, size, etc.),
	* setDetails(1) is used when deleting: we don't need all the informati on if it takes		* setDetails(1) is used when deleting: we don't need all the informati on if it takes
	* too much time, no need to follow symlinks etc.		* too much time, no need to follow symlinks etc.
	* setDetails(0) is used for very simple probing: we'll only get the an swer		* setDetails(0) is used for very simple probing: we'll only get the an swer
	* "it's a file or a directory, or it doesn't exist". This is used by K Run.		* "it's a file or a directory, or it doesn't exist". This is used by K Run.
	* @param flags Can be HideProgressInfo here		* @param flags Can be HideProgressInfo here
	* @return the job handling the operation.		* @return the job handling the operation.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KIO_EXPORT_DEPRECATED StatJob * stat( const KUrl& url, bool sideIsSourc e,		KIO_EXPORT_DEPRECATED StatJob * stat( const KUrl& url, bool sideIsSourc e,
	short int details, JobFlags flags = DefaultFlags );		short int details, JobFlags flags = DefaultFlags );
			#endif
	/**		/**
	* Get (a.k.a. read).		* Get (a.k.a. read).
	* This is the job to use in order to "download" a file into memory.		* This is the job to use in order to "download" a file into memory.
	* The slave emits the data through the data() signal.		* The slave emits the data through the data() signal.
	*		*
	* Special case: if you want to determine the mimetype of the file firs t,		* Special case: if you want to determine the mimetype of the file firs t,
	* and then read it with the appropriate component, you can still use		* and then read it with the appropriate component, you can still use
	* a KIO::get() directly. When that job emits the mimeType signal, (whi ch is		* a KIO::get() directly. When that job emits the mimeType signal, (whi ch is
	* guaranteed to happen before it emits any data), put the job on hold:		* guaranteed to happen before it emits any data), put the job on hold:
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	jobclasses.h		jobclasses.h
	skipping to change at line 177		skipping to change at line 177
	/**		/**
	* Display a dialog box to inform the user of the error given by		* Display a dialog box to inform the user of the error given by
	* this job.		* this job.
	* Only call if error is not 0, and only in the slot connected		* Only call if error is not 0, and only in the slot connected
	* to result.		* to result.
	* @param parent the parent widget for the dialog box, can be 0 for		* @param parent the parent widget for the dialog box, can be 0 for
	* top-level		* top-level
	* @deprecated you should use job->ui()->setWindow(parent)		* @deprecated you should use job->ui()->setWindow(parent)
	* and job->ui()->showErrorMessage() instead		* and job->ui()->showErrorMessage() instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void showErrorDialog( QWidget *parent = 0 );		KDE_DEPRECATED void showErrorDialog( QWidget *parent = 0 );
			#endif
	/**		/**
	* Returns whether the user should be asked about things when the j ob		* Returns whether the user should be asked about things when the j ob
	* is unsure, like whether to overwrite existing files etc.		* is unsure, like whether to overwrite existing files etc.
	* @return true if user interactions are enabled (true by default),		* @return true if user interactions are enabled (true by default),
	* false if setUiDelegate(0) was called.		* false if setUiDelegate(0) was called.
	* @see setUiDelegate()		* @see setUiDelegate()
	*/		*/
	bool isInteractive() const;		bool isInteractive() const;
	skipping to change at line 466		skipping to change at line 468
	*/		*/
	void setSide(StatSide side);		void setSide(StatSide side);
	/**		/**
	* A stat() can have two meanings. Either we want to read from this URL,		* A stat() can have two meanings. Either we want to read from this URL,
	* or to check if we can write to it. First case is "source", secon d is "dest".		* or to check if we can write to it. First case is "source", secon d is "dest".
	* It is necessary to know what the StatJob is for, to tune the kio slave's behavior		* It is necessary to know what the StatJob is for, to tune the kio slave's behavior
	* (e.g. with FTP).		* (e.g. with FTP).
	* @param source true for "source" mode, false for "dest" mode		* @param source true for "source" mode, false for "dest" mode
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setSide( bool source );		KDE_DEPRECATED void setSide( bool source );
			#endif
	/**		/**
	* Selects the level of @p details we want.		* Selects the level of @p details we want.
	* By default this is 2 (all details wanted, including modification time, size, etc.),		* By default this is 2 (all details wanted, including modification time, size, etc.),
	* setDetails(1) is used when deleting: we don't need all the infor mation if it takes		* setDetails(1) is used when deleting: we don't need all the infor mation if it takes
	* too much time, no need to follow symlinks etc.		* too much time, no need to follow symlinks etc.
	* setDetails(0) is used for very simple probing: we'll only get th e answer		* setDetails(0) is used for very simple probing: we'll only get th e answer
	* "it's a file or a directory, or it doesn't exist". This is used by KRun.		* "it's a file or a directory, or it doesn't exist". This is used by KRun.
	* @param details 2 for all details, 1 for simple, 0 for very simpl e		* @param details 2 for all details, 1 for simple, 0 for very simpl e
	*/		*/
	skipping to change at line 595		skipping to change at line 599
	void sendAsyncData(const QByteArray &data);		void sendAsyncData(const QByteArray &data);
	/**		/**
	* When enabled, the job reports the amount of data that has been s ent,		* When enabled, the job reports the amount of data that has been s ent,
	* instead of the amount of data that that has been received.		* instead of the amount of data that that has been received.
	* @see slotProcessedSize		* @see slotProcessedSize
	* @see slotSpeed		* @see slotSpeed
	* @deprecated not needed, this is false for KIO::get and true for KIO::put,		* @deprecated not needed, this is false for KIO::get and true for KIO::put,
	* automatically since KDE-4.2.1		* automatically since KDE-4.2.1
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setReportDataSent(bool enabled);		KDE_DEPRECATED void setReportDataSent(bool enabled);
			#endif
	/**		/**
	* Returns whether the job reports the amount of data that has bee n		* Returns whether the job reports the amount of data that has bee n
	* sent (true), or whether the job reports the amount of data that		* sent (true), or whether the job reports the amount of data that
	* has been received (false)		* has been received (false)
	* @deprecated not needed, this is false for KIO::get and true for KIO::put,		* @deprecated not needed, this is false for KIO::get and true for KIO::put,
	* automatically since KDE-4.2.1 (and not useful as pub lic API)		* automatically since KDE-4.2.1 (and not useful as pub lic API)
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool reportDataSent() const;		KDE_DEPRECATED bool reportDataSent() const;
			#endif
	/**		/**
	* Call this in the slot connected to result,		* Call this in the slot connected to result,
	* and only after making sure no error happened.		* and only after making sure no error happened.
	* @return the mimetype of the URL		* @return the mimetype of the URL
	*/		*/
	QString mimetype() const;		QString mimetype() const;
	/**		/**
	* Set the total size of data that we are going to send		* Set the total size of data that we are going to send
End of changes. 8 change blocks.
	0 lines changed or deleted		8 lines changed or added

	kaboutapplicationdialog.h		kaboutapplicationdialog.h
	skipping to change at line 25		skipping to change at line 25
	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 KABOUT_APPLICATION_DIALOG_H		#ifndef KABOUT_APPLICATION_DIALOG_H
	#define KABOUT_APPLICATION_DIALOG_H		#define KABOUT_APPLICATION_DIALOG_H
	#include <kdialog.h>		#include "kdialog.h"
	#include <QtCore/QFlags>		#include <QtCore/QFlags>
	class KAboutData;		class KAboutData;
	/**		/**
	* @short Standard "About Application" dialog box.		* @short Standard "About Application" dialog box.
	*		*
	* This class provides the standard "About Application" dialog box		* This class provides the standard "About Application" dialog box
	* that is used by KHelpMenu. It uses the information of the global		* that is used by KHelpMenu. It uses the information of the global
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kaboutdata.h		kaboutdata.h
	/*		/*
	* This file is part of the KDE Libraries		* This file is part of the KDE Libraries
	* Copyright (C) 2000 Espen Sand (espen@kde.org)		* Copyright (C) 2000 Espen Sand (espen@kde.org)
	* Copyright (C) 2008 Friedrich W. H. Kossebau <kossebau@kde.org>		* Copyright (C) 2008 Friedrich W. H. Kossebau <kossebau@kde.org>
			* Copyright (C) 2010 Teo Mrnjavac <teo@kde.org>
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public		* modify it under the terms of the GNU Library General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.		* version 2 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.		* Library General Public License for more details.
	skipping to change at line 88		skipping to change at line 89
	* @param emailAddress The email address of the person.		* @param emailAddress The email address of the person.
	*		*
	* @param webAddress Home page of the person.		* @param webAddress Home page of the person.
	*/		*/
	explicit KAboutPerson( const KLocalizedString &name,		explicit KAboutPerson( const KLocalizedString &name,
	const KLocalizedString &task = KLocalizedString( ),		const KLocalizedString &task = KLocalizedString( ),
	const QByteArray &emailAddress = QByteArray(),		const QByteArray &emailAddress = QByteArray(),
	const QByteArray &webAddress = QByteArray() );		const QByteArray &webAddress = QByteArray() );
	/**		/**
			* Convenience constructor with Open Collaboration Services data
			*
			* @param name The name of the person.
			*
			* @param task The task of this person.
			*
			* @param emailAddress The email address of the person.
			*
			* @param webAddress Home page of the person.
			*
			* @param ocsUsername Open Collaboration Services username of the perso
			n.
			*/
			explicit KAboutPerson( const KLocalizedString &name,
			const KLocalizedString &task,
			const QByteArray &emailAddress,
			const QByteArray &webAddress,
			const QByteArray &ocsUsername ); //KDE5: merge i
			nto main ctor
			/**
	* Copy constructor. Performs a deep copy.		* Copy constructor. Performs a deep copy.
	* @param other object to copy		* @param other object to copy
	*/		*/
	KAboutPerson(const KAboutPerson& other);		KAboutPerson(const KAboutPerson& other);
	~KAboutPerson();		~KAboutPerson();
	/**		/**
	* Assignment operator. Performs a deep copy.		* Assignment operator. Performs a deep copy.
	* @param other object to copy		* @param other object to copy
	skipping to change at line 129		skipping to change at line 149
	*/		*/
	QString emailAddress() const;		QString emailAddress() const;
	/**		/**
	* The home page or a relevant link		* The home page or a relevant link
	* @return the persons home page (can be QString(), if it has been		* @return the persons home page (can be QString(), if it has been
	* constructed with an empty home page)		* constructed with an empty home page)
	*/		*/
	QString webAddress() const;		QString webAddress() const;
			/**
			* The person's Open Collaboration Services username
			* @return the persons OCS username (can be QString(), if it has been
			* constructed with an empty username)
			*/
			QString ocsUsername() const;
	private:		private:
	/**		/**
	* @internal Used by KAboutData to construct translator data.		* @internal Used by KAboutData to construct translator data.
	*/		*/
	explicit KAboutPerson( const QString &name, const QString &email );		explicit KAboutPerson( const QString &name, const QString &email );
	class Private;		class Private;
	Private *const d;		Private *const d;
	};		};
	skipping to change at line 292		skipping to change at line 319
	* Start the address with "http://". "http://some.domain" is		* Start the address with "http://". "http://some.domain" is
	* correct, "some.domain" is not. Can be left empty.		* correct, "some.domain" is not. Can be left empty.
	*		*
	*/		*/
	KAboutData &addAuthor( const KLocalizedString &name,		KAboutData &addAuthor( const KLocalizedString &name,
	const KLocalizedString &task = KLocalizedString( ),		const KLocalizedString &task = KLocalizedString( ),
	const QByteArray &emailAddress = QByteArray(),		const QByteArray &emailAddress = QByteArray(),
	const QByteArray &webAddress = QByteArray() );		const QByteArray &webAddress = QByteArray() );
	/**		/**
			* Defines an author.
			*
			* You can call this function as many times as you need. Each entry is
			* appended to a list. The person in the first entry is assumed to be
			* the leader of the project.
			*
			* @param name The developer's name. It should be marked for translatio
			n
			* like this: ki18n("Developer Name")
			*
			* @param task What the person is responsible for. This text can contai
			n
			* newlines. It should be marked for translation like this:
			* ki18n("Task description..."). Can be left empty.
			*
			* @param emailAddress An Email address where the person can be reached
			.
			* Can be left empty.
			*
			* @param webAddress The person's homepage or a relevant link.
			* Start the address with "http://". "http://some.domain" is
			* correct, "some.domain" is not. Can be left empty.
			*
			* @param ocsUsername The person's Open Collaboration Services username
			.
			* The provider can be optionally specified with @see setOcsProv
			ider.
			*
			*/
			KAboutData &addAuthor( const KLocalizedString &name,
			const KLocalizedString &task,
			const QByteArray &emailAddress,
			const QByteArray &webAddress,
			const QByteArray &ocsUsername ); //KDE5: merge w
			ith addAuthor
			/**
	* Defines a person that deserves credit.		* Defines a person that deserves credit.
	*		*
	* You can call this function as many times as you need. Each entry		* You can call this function as many times as you need. Each entry
	* is appended to a list.		* is appended to a list.
	*		*
	* @param name The person's name. It should be marked for translation		* @param name The person's name. It should be marked for translation
	* like this: ki18n("Contributor Name")		* like this: ki18n("Contributor Name")
	*		*
	* @param task What the person has done to deserve the honor. The		* @param task What the person has done to deserve the honor. The
	* text can contain newlines. It should be marked for		* text can contain newlines. It should be marked for
	skipping to change at line 319		skipping to change at line 377
	* Start the address with "http://". "http://some.domain" is		* Start the address with "http://". "http://some.domain" is
	* is correct, "some.domain" is not. Can be left empty.		* is correct, "some.domain" is not. Can be left empty.
	*		*
	*/		*/
	KAboutData &addCredit( const KLocalizedString &name,		KAboutData &addCredit( const KLocalizedString &name,
	const KLocalizedString &task = KLocalizedString( ),		const KLocalizedString &task = KLocalizedString( ),
	const QByteArray &emailAddress = QByteArray(),		const QByteArray &emailAddress = QByteArray(),
	const QByteArray &webAddress = QByteArray() );		const QByteArray &webAddress = QByteArray() );
	/**		/**
			* Defines a person that deserves credit.
			*
			* You can call this function as many times as you need. Each entry
			* is appended to a list.
			*
			* @param name The person's name. It should be marked for translation
			* like this: ki18n("Contributor Name")
			*
			* @param task What the person has done to deserve the honor. The
			* text can contain newlines. It should be marked for
			* translation like this: ki18n("Task description...")
			* Can be left empty.
			*
			* @param emailAddress An email address when the person can be reached.
			* Can be left empty.
			*
			* @param webAddress The person's homepage or a relevant link.
			* Start the address with "http://". "http://some.domain" is
			* is correct, "some.domain" is not. Can be left empty.
			*
			* @param ocsUsername The person's Open Collaboration Services username
			.
			* The provider can be optionally specified with @see setOcsProv
			ider.
			*
			*/
			KAboutData &addCredit( const KLocalizedString &name,
			const KLocalizedString &task,
			const QByteArray &emailAddress,
			const QByteArray &webAddress,
			const QByteArray &ocsUsername ); //KDE5: merge w
			ith addCredit
			/**
	* @brief Sets the name(s) of the translator(s) of the GUI.		* @brief Sets the name(s) of the translator(s) of the GUI.
	*		*
	* Since this depends on the language, just use a dummy text marked for		* Since this depends on the language, just use a dummy text marked for
	* translation.		* translation.
	*		*
	* The canonical use is:		* The canonical use is:
	*		*
	* \code		* \code
	* setTranslator(ki18nc("NAME OF TRANSLATORS", "Your names"),		* setTranslator(ki18nc("NAME OF TRANSLATORS", "Your names"),
	* ki18nc("EMAIL OF TRANSLATORS", "Your emails"));		* ki18nc("EMAIL OF TRANSLATORS", "Your emails"));
	skipping to change at line 436		skipping to change at line 525
	*		*
	* Because KAboutData is in kdecore it cannot use QImage directly,		* Because KAboutData is in kdecore it cannot use QImage directly,
	* so this is a QVariant that should contain a QImage.		* so this is a QVariant that should contain a QImage.
	*		*
	* @param image logo image.		* @param image logo image.
	* @see programLogo()		* @see programLogo()
	*/		*/
	KAboutData &setProgramLogo(const QVariant& image);		KAboutData &setProgramLogo(const QVariant& image);
	/**		/**
			* Specifies an Open Collaboration Services provider by URL.
			* A provider file must be available for the chosen provider.
			*
			* Use this if you need to override the default provider.
			*
			* If this method is not used, all the KAboutPerson OCS usernames
			* will be used with the openDesktop.org entry from the default
			* provider file.
			*
			* @param providerUrl The provider URL as defined in the provider file.
			*/
			KAboutData &setOcsProvider( const QByteArray &providerUrl );
			/**
	* Defines the program version string.		* Defines the program version string.
	*		*
	* @param version The program version.		* @param version The program version.
	*/		*/
	KAboutData &setVersion( const QByteArray &version );		KAboutData &setVersion( const QByteArray &version );
	/**		/**
	* Defines a short description of what the program does.		* Defines a short description of what the program does.
	*		*
	* @param shortDescription The program description. This string should		* @param shortDescription The program description. This string should
	skipping to change at line 607		skipping to change at line 710
	*		*
	* Because KAboutData is in kdecore it cannot use QImage directly,		* Because KAboutData is in kdecore it cannot use QImage directly,
	* so this is a QVariant containing a QImage.		* so this is a QVariant containing a QImage.
	*		*
	* @return the program logo data, or a null image if there is		* @return the program logo data, or a null image if there is
	* no custom application logo defined.		* no custom application logo defined.
	*/		*/
	QVariant programLogo() const;		QVariant programLogo() const;
	/**		/**
			* Returns the chosen Open Collaboration Services provider URL.
			* @return the provider URL.
			*/
			QString ocsProviderUrl() const;
			/**
	* Returns the program's version.		* Returns the program's version.
	* @return the version string.		* @return the version string.
	*/		*/
	QString version() const;		QString version() const;
	/**		/**
	* @internal		* @internal
	* Provided for use by KCrash		* Provided for use by KCrash
	*/		*/
	const char* internalVersion() const;		const char* internalVersion() const;
End of changes. 7 change blocks.
	0 lines changed or deleted		120 lines changed or added

	kaction.h		kaction.h
	skipping to change at line 223		skipping to change at line 223
	*		*
	* @see KStandardAction		* @see KStandardAction
	*/		*/
	class KDEUI_EXPORT KAction : public QWidgetAction		class KDEUI_EXPORT KAction : public QWidgetAction
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( KShortcut shortcut READ shortcut WRITE setShortcut )		Q_PROPERTY( KShortcut shortcut READ shortcut WRITE setShortcut )
	Q_PROPERTY( bool shortcutConfigurable READ isShortcutConfigurable WRITE s etShortcutConfigurable )		Q_PROPERTY( bool shortcutConfigurable READ isShortcutConfigurable WRITE s etShortcutConfigurable )
	Q_PROPERTY( KShortcut globalShortcut READ globalShortcut WRITE setGlobalS hortcut )		Q_PROPERTY( KShortcut globalShortcut READ globalShortcut WRITE setGlobalS hortcut )
			#ifndef KDE_NO_DEPRECATED
	Q_PROPERTY( bool globalShortcutAllowed READ globalShortcutAllowed WRITE s etGlobalShortcutAllowed )		Q_PROPERTY( bool globalShortcutAllowed READ globalShortcutAllowed WRITE s etGlobalShortcutAllowed )
			#endif
	Q_PROPERTY( bool globalShortcutEnabled READ isGlobalShortcutEnabled )		Q_PROPERTY( bool globalShortcutEnabled READ isGlobalShortcutEnabled )
	Q_FLAGS( ShortcutType )		Q_FLAGS( ShortcutType )
	public:		public:
	/**		/**
	* An enumeration about the two types of shortcuts in a KAction		* An enumeration about the two types of shortcuts in a KAction
	*/		*/
	enum ShortcutType {		enum ShortcutType {
	/// The shortcut will immediately become active but may be reset to " default".		/// The shortcut will immediately become active but may be reset to " default".
	ActiveShortcut = 0x1,		ActiveShortcut = 0x1,
	skipping to change at line 428		skipping to change at line 430
	*/		*/
	void setGlobalShortcut(const KShortcut& shortcut, ShortcutTypes type =		void setGlobalShortcut(const KShortcut& shortcut, ShortcutTypes type =
	ShortcutTypes(ActiveShortcut | DefaultShortcut),		ShortcutTypes(ActiveShortcut | DefaultShortcut),
	GlobalShortcutLoading loading = Autoloading);		GlobalShortcutLoading loading = Autoloading);
	/**		/**
	* Returns true if this action is permitted to have a global shortcut.		* Returns true if this action is permitted to have a global shortcut.
	* Defaults to false.		* Defaults to false.
	* Use isGlobalShortcutEnabled() instead.		* Use isGlobalShortcutEnabled() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool globalShortcutAllowed() const;		KDE_DEPRECATED bool globalShortcutAllowed() const;
			#endif
	/**		/**
	* Indicate whether the programmer and/or user may define a global shor tcut for this action.		* Indicate whether the programmer and/or user may define a global shor tcut for this action.
	* Defaults to false. Note that calling setGlobalShortcut() turns this on automatically.		* Defaults to false. Note that calling setGlobalShortcut() turns this on automatically.
	*		*
	* \param allowed set to \e true if this action may have a global short cut, otherwise \e false.		* \param allowed set to \e true if this action may have a global short cut, otherwise \e false.
	* \param loading if Autoloading, assign to this action the global shor tcut it has previously had		* \param loading if Autoloading, assign to this action the global shor tcut it has previously had
	* if any.		* if any.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setGlobalShortcutAllowed(bool allowed, GlobalShortc utLoading loading = Autoloading);		KDE_DEPRECATED void setGlobalShortcutAllowed(bool allowed, GlobalShortc utLoading loading = Autoloading);
			#endif
	/**		/**
	* Returns true if this action is enabled to have a global shortcut.		* Returns true if this action is enabled to have a global shortcut.
	* This will be respected by \class KGlobalShortcutsEditor.		* This will be respected by \class KGlobalShortcutsEditor.
	* Defaults to false.		* Defaults to false.
	*/		*/
	bool isGlobalShortcutEnabled() const;		bool isGlobalShortcutEnabled() const;
	/**		/**
	* Sets the globalShortcutEnabled property to false and sets the global shortcut to an		* Sets the globalShortcutEnabled property to false and sets the global shortcut to an
End of changes. 6 change blocks.
	0 lines changed or deleted		6 lines changed or added

	kactionmenu.h		kactionmenu.h
	skipping to change at line 62		skipping to change at line 62
	public:		public:
	explicit KActionMenu(QObject *parent);		explicit KActionMenu(QObject *parent);
	KActionMenu(const QString& text, QObject *parent);		KActionMenu(const QString& text, QObject *parent);
	KActionMenu(const KIcon& icon, const QString& text, QObject *parent);		KActionMenu(const KIcon& icon, const QString& text, QObject *parent);
	virtual ~KActionMenu();		virtual ~KActionMenu();
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void remove( KAction* );		KDE_DEPRECATED void remove( KAction* );
			#endif
	void addAction(QAction* action);		void addAction(QAction* action);
	QAction* addSeparator();		QAction* addSeparator();
	void insertAction(QAction* before, QAction* action);		void insertAction(QAction* before, QAction* action);
	QAction* insertSeparator(QAction* before);		QAction* insertSeparator(QAction* before);
	void removeAction(QAction* action);		void removeAction(QAction* action);
	/**		/**
	* Returns this action's menu as a KMenu, if it is one.		* Returns this action's menu as a KMenu, if it is one.
	* If none exists, one will be created.		* If none exists, one will be created.
	* @deprecated use menu() instead.		* @deprecated use menu() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	inline KDE_DEPRECATED KMenu* popupMenu() { return menu(); }		inline KDE_DEPRECATED KMenu* popupMenu() { return menu(); }
			#endif
	/**		/**
	* Returns this action's menu as a KMenu, if it is one.		* Returns this action's menu as a KMenu, if it is one.
	* If none exists, one will be created.		* If none exists, one will be created.
	*/		*/
	KMenu* menu();		KMenu* menu();
	/*		/*
	* Overload of QAction::setMenu to make sure a KMenu is passed		* Overload of QAction::setMenu to make sure a KMenu is passed
	**/		**/
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kapplication.h		kapplication.h
	skipping to change at line 25		skipping to change at line 25
	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 KAPP_H		#ifndef KAPP_H
	#define KAPP_H		#define KAPP_H
	// Version macros. Never put this further down.		// Version macros. Never put this further down.
			// TODO: KDE5 -#include "kdeversion.h"
	#include "kdeversion.h"		#include "kdeversion.h"
	#include <kdeui_export.h>		#include <kdeui_export.h>
	class KConfig;		class KConfig;
	#ifdef KDE3_SUPPORT		#ifdef KDE3_SUPPORT
	#include <krandom.h>		#include <krandom.h>
	#include <kcmdlineargs.h>		#include <kcmdlineargs.h>
	#include <kiconloader.h>		#include <kiconloader.h>
	#include <kicontheme.h>		#include <kicontheme.h>
	skipping to change at line 258		skipping to change at line 259
	void setTopWidget( QWidget *topWidget );		void setTopWidget( QWidget *topWidget );
	/**		/**
	* Get a file name in order to make a temporary copy of your document.		* Get a file name in order to make a temporary copy of your document.
	*		*
	* @param pFilename The full path to the current file of your		* @param pFilename The full path to the current file of your
	* document.		* document.
	* @return A new filename for auto-saving.		* @return A new filename for auto-saving.
	* @deprecated use KTemporaryFile, KSaveFile or KAutoSaveFile instead		* @deprecated use KTemporaryFile, KSaveFile or KAutoSaveFile instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED QString tempSaveName( const QString& pFilename );		static KDE_DEPRECATED QString tempSaveName( const QString& pFilename );
			#endif
	/**		/**
	* Check whether an auto-save file exists for the document you want to		* Check whether an auto-save file exists for the document you want to
	* open.		* open.
	*		*
	* @param pFilename The full path to the document you want to open.		* @param pFilename The full path to the document you want to open.
	* @param bRecover This gets set to true if there was a recover		* @param bRecover This gets set to true if there was a recover
	* file.		* file.
	* @return The full path of the file to open.		* @return The full path of the file to open.
	*/		*/
End of changes. 3 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kauthaction.h		kauthaction.h
	skipping to change at line 443		skipping to change at line 443
	* The return value will be false if communication errors occur. It wil l also be false if <b>all</b> the actions		* The return value will be false if communication errors occur. It wil l also be false if <b>all</b> the actions
	* in the list are denied.		* in the list are denied.
	*		*
	* @param actions The list of actions to execute		* @param actions The list of actions to execute
	* @param deniedActions A pointer to a list to fill with the denied act ions. Pass NULL if you don't need them.		* @param deniedActions A pointer to a list to fill with the denied act ions. Pass NULL if you don't need them.
	* @param helperId The helper ID to execute the actions on.		* @param helperId The helper ID to execute the actions on.
	*/		*/
	static bool executeActions(const QList<Action> &actions, QList<Action> *deniedActions, const QString &helperId);		static bool executeActions(const QList<Action> &actions, QList<Action> *deniedActions, const QString &helperId);
	/**		/**
			* Convenience overload. This overload lets you specify, in addition, a
			QWidget which will be used as the
			* authentication dialog's parent.
			*
			* @since 4.6
			*
			* @see executeActions
			* @see setParentWidget
			*/
			static bool executeActions(const QList<Action> &actions, QList<Action>
			*deniedActions, const QString &helperId,
			QWidget *parent);
			/**
	* @brief Ask the helper to stop executing an action		* @brief Ask the helper to stop executing an action
	*		*
	* This method sends a request to the helper asking to stop the executi on of an action. It is only		* This method sends a request to the helper asking to stop the executi on of an action. It is only
	* useful for long-running actions, because short and fast actions won' t obbey to this request most of the times.		* useful for long-running actions, because short and fast actions won' t obbey to this request most of the times.
	* Calling this method will make the HelperSupport::isStopped() method to return true the next time it's called.		* Calling this method will make the HelperSupport::isStopped() method to return true the next time it's called.
	*		*
	* It's the helper's responsibility to regularly call it and exit if re quested		* It's the helper's responsibility to regularly call it and exit if re quested
	* The actionPerformed() signal is emitted normally because, actually, the helper exists regularly. The return data		* The actionPerformed() signal is emitted normally because, actually, the helper exists regularly. The return data
	* in this case is application-dependent.		* in this case is application-dependent.
	*/		*/
	skipping to change at line 465		skipping to change at line 477
	/**		/**
	* @brief Ask the helper to stop executing an action, using a specific helper ID		* @brief Ask the helper to stop executing an action, using a specific helper ID
	*		*
	* This method works exactly as the stop() method, but it lets you spec ify an helper ID different from the		* This method works exactly as the stop() method, but it lets you spec ify an helper ID different from the
	* 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
			*
			* This function is used for explicitely setting a parent window for an
			eventual authentication dialog required when
			* authorization is triggered. Some backends, in fact, (like polkit-1)
			need to have a parent explicitely set for displaying
			* 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
			* call this function, as it is already done by the component its
			elf.
			*
			* @since 4.6
			*
			* @param parent A QWidget which will be used as the dialog's parent
			*/
			void setParentWidget(QWidget *parent);
			/**
			* @brief Returns the parent widget for the authentication dialog for t
			his action
			*
			* @since 4.6
			*
			* @returns A QWidget which will is being used as the dialog's parent
			*/
			QWidget *parentWidget() const;
	};		};
	} // namespace Auth		} // namespace Auth
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		44 lines changed or added

	kbookmark.h		kbookmark.h
	skipping to change at line 79		skipping to change at line 79
	/**		/**
	* Extract a list of bookmarks from the contents of @p mimeData.		* Extract a list of bookmarks from the contents of @p mimeData.
	* Decoding will fail if @p mimeData does not contain any bookmarks .		* Decoding will fail if @p mimeData does not contain any bookmarks .
	* @param mimeData the mime data to extract from; cannot be 0		* @param mimeData the mime data to extract from; cannot be 0
	* @return the list of bookmarks		* @return the list of bookmarks
	* @note those bookmarks are valid QDomElements, but their parent Q DomDocument		* @note those bookmarks are valid QDomElements, but their parent Q DomDocument
	* is already deleted, do not use ownerDocument()		* is already deleted, do not use ownerDocument()
	* @deprecated use fromMimeData(mimeData, doc), to avoid crashes		* @deprecated use fromMimeData(mimeData, doc), to avoid crashes
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED KBookmark::List fromMimeData( const QMimeData *mimeData );		static KDE_DEPRECATED KBookmark::List fromMimeData( const QMimeData *mimeData );
			#endif
	/**		/**
	* Extract a list of bookmarks from the contents of @p mimeData.		* Extract a list of bookmarks from the contents of @p mimeData.
	* Decoding will fail if @p mimeData does not contain any bookmarks .		* Decoding will fail if @p mimeData does not contain any bookmarks .
	* @param mimeData the mime data to extract from; cannot be 0		* @param mimeData the mime data to extract from; cannot be 0
	* @param parentDocument pass an empty QDomDocument here, it will b e used as		* @param parentDocument pass an empty QDomDocument here, it will b e used as
	* container for the bookmarks. You just need to make sure it stays alive longer		* container for the bookmarks. You just need to make sure it stays alive longer
	* (or just as long) as the returned bookmarks.		* (or just as long) as the returned bookmarks.
	* @return the list of bookmarks		* @return the list of bookmarks
	* @since 4.3.2		* @since 4.3.2
	skipping to change at line 420		skipping to change at line 422
	*/		*/
	KBookmark addBookmark( const QString & text, const KUrl & url, const QS tring & icon = QString() );		KBookmark addBookmark( const QString & text, const KUrl & url, const QS tring & icon = QString() );
	/**		/**
	* Moves @p bookmark after @p after (which should be a child of ours).		* Moves @p bookmark after @p after (which should be a child of ours).
	* If after is null, @p bookmark is moved as the first child.		* If after is null, @p bookmark is moved as the first child.
	* Don't forget to use KBookmarkManager::self()->emitChanged( parentBoo kmark );		* Don't forget to use KBookmarkManager::self()->emitChanged( parentBoo kmark );
	*/		*/
	bool moveBookmark( const KBookmark & bookmark, const KBookmark & after) ;		bool moveBookmark( const KBookmark & bookmark, const KBookmark & after) ;
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool moveItem( const KBookmark & item, const KBookmark & after );		KDE_DEPRECATED bool moveItem( const KBookmark & item, const KBookmark & after );
			#endif
	/**		/**
	* Delete a bookmark - it has to be one of our children !		* Delete a bookmark - it has to be one of our children !
	* Don't forget to use KBookmarkManager::self()->emitChanged( parentBoo kmark );		* Don't forget to use KBookmarkManager::self()->emitChanged( parentBoo kmark );
	*/		*/
	void deleteBookmark( const KBookmark &bk );		void deleteBookmark( const KBookmark &bk );
	/**		/**
	* @return true if this is the toolbar group		* @return true if this is the toolbar group
	*/		*/
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kbookmarkdialog.h		kbookmarkdialog.h
	skipping to change at line 111		skipping to change at line 111
	*/		*/
	void setParentBookmark(const KBookmark & bm);		void setParentBookmark(const KBookmark & bm);
	/**		/**
	* returns the selected bookmark in the folder tree, or the root (top-lev el)		* returns the selected bookmark in the folder tree, or the root (top-lev el)
	* bookmark if none was selected		* bookmark if none was selected
	*/		*/
	KBookmarkGroup parentBookmark();		KBookmarkGroup parentBookmark();
	void slotButtonClicked(int);		void slotButtonClicked(int);
			// TODO KDE5: move all these variables to a d pointer; make as many metho ds private as possible.
	BookmarkDialogMode m_mode;		BookmarkDialogMode m_mode;
	void fillGroup( QTreeWidgetItem * parentItem, const KBookmarkGroup &group );		void fillGroup( QTreeWidgetItem * parentItem, const KBookmarkGroup &group );
	QWidget * m_main;		QWidget * m_main;
	KLineEdit * m_url;		KLineEdit * m_url;
	KLineEdit * m_title;		KLineEdit * m_title;
	KLineEdit * m_comment;		KLineEdit * m_comment;
	QLabel * m_titleLabel;		QLabel * m_titleLabel;
	QLabel * m_urlLabel;		QLabel * m_urlLabel;
	QLabel * m_commentLabel;		QLabel * m_commentLabel;
	QTreeWidget * m_folderTree;		QTreeWidget * m_folderTree;
	KBookmarkManager * m_mgr;		KBookmarkManager * m_mgr;
	KBookmark m_bm;		KBookmark m_bm;
	QList<QPair<QString, QString> > m_list;		QList<QPair<QString, QString> > m_list;
	bool m_layout;		bool m_layout;
			// WARNING: do not add new member variables here; replace one of the poin
			ters with a d pointer,
			// assuming that variable isn't used anywhere in apps...
	void initLayoutPrivate();		void initLayoutPrivate();
	protected Q_SLOTS:		protected Q_SLOTS:
	void newFolderButton();		void newFolderButton();
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		5 lines changed or added

	kbookmarkmanager.h		kbookmarkmanager.h
	skipping to change at line 107		skipping to change at line 107
	*/		*/
	KBookmarkManager();		KBookmarkManager();
	public:		public:
	/**		/**
	* Destructor		* Destructor
	*/		*/
	~KBookmarkManager();		~KBookmarkManager();
	/**		/**
			* Check whether auto error handling is enabled.
			* If enabled, it will show an error dialog to the user when an
			* error occurs. It is turned on by default.
			* @return true if auto error handling is enabled, false otherwise
			* @note dialogs will only be displayed if the current thread is the gu
			i thread
			* @since 4.6
			* @see setAutoErrorHandlingEnabled()
			*/
			bool autoErrorHandlingEnabled() const;
			/**
			* Enable or disable auto error handling is enabled.
			* If enabled, it will show an error dialog to the user when an
			* error occurs. It is turned on by default.
			* If disabled, the application should react on the error() signal.
			* @param enable true to enable auto error handling, false to disable
			* @param parent the parent widget for the error dialogs, can be 0 for
			* top-level
			* @since 4.6
			* @see autoErrorHandlingEnabled()
			*/
			void setAutoErrorHandlingEnabled( bool enable, QWidget *parent );
			/**
	* Set the update flag. Defaults to true.		* Set the update flag. Defaults to true.
	* @param update if true then KBookmarkManager will listen to DBUS upda te requests.		* @param update if true then KBookmarkManager will listen to DBUS upda te requests.
	*/		*/
	void setUpdate( bool update );		void setUpdate( bool update );
	/**		/**
	* Save the bookmarks to the given XML file on disk.		* Save the bookmarks to the given XML file on disk.
	* @param filename full path to the desired bookmarks file location		* @param filename full path to the desired bookmarks file location
	* @param toolbarCache iff true save a cache of the toolbar folder, too		* @param toolbarCache iff true save a cache of the toolbar folder, too
	* @return true if saving was successful		* @return true if saving was successful
	skipping to change at line 304		skipping to change at line 328
	* has been modified by the caller @p caller.		* has been modified by the caller @p caller.
	* connect to this		* connect to this
	*/		*/
	void changed( const QString & groupAddress, const QString & caller );		void changed( const QString & groupAddress, const QString & caller );
	/**		/**
	* Signals that the config changed		* Signals that the config changed
	*/		*/
	void configChanged();		void configChanged();
			/**
			* Emitted when an error occurs.
			* Contains the translated error message.
			* @since 4.6
			*/
			void error(const QString &errorMessage);
	private Q_SLOTS:		private Q_SLOTS:
	void slotFileChanged(const QString& path); // external bookmarks		void slotFileChanged(const QString& path); // external bookmarks
	private:		private:
	// consts added to avoid a copy-and-paste of internalDocument		// consts added to avoid a copy-and-paste of internalDocument
	void parse() const;		void parse() const;
	/**		/**
	* You need to pass a dbusObjectName as the second parameter		* You need to pass a dbusObjectName as the second parameter
	* In kde 3 managerForFile had the parameters (const QString &, bool)		* In kde 3 managerForFile had the parameters (const QString &, bool)
End of changes. 2 change blocks.
	0 lines changed or deleted		32 lines changed or added

	kbookmarkmenu.h		kbookmarkmenu.h
	skipping to change at line 91		skipping to change at line 91
	* Fills a bookmark menu		* Fills a bookmark menu
	* (one instance of KBookmarkMenu is created for the toplevel menu,		* (one instance of KBookmarkMenu is created for the toplevel menu,
	* but also one per submenu).		* but also one per submenu).
	*		*
	* @param mgr The bookmark manager to use (i.e. for reading and writing)		* @param mgr The bookmark manager to use (i.e. for reading and writing)
	* @param owner implementation of the KBookmarkOwner callback interface.		* @param owner implementation of the KBookmarkOwner callback interface.
	* Note: If you pass a null KBookmarkOwner to the constructor, the		* Note: If you pass a null KBookmarkOwner to the constructor, the
	* openBookmark signal is not emitted, instead KRun is used to open the b ookmark.		* openBookmark signal is not emitted, instead KRun is used to open the b ookmark.
	* @param parentMenu menu to be filled		* @param parentMenu menu to be filled
	* @param collec parent collection for the KActions.		* @param collec parent collection for the KActions.
			*
			* @todo KDE 5: give ownership of the bookmarkmenu to another qobject, e.
			g. parentMenu.
			* Currently this is a QObject without a parent, use setParent to benefit
			from automatic deletion.
	*/		*/
	KBookmarkMenu( KBookmarkManager* mgr, KBookmarkOwner * owner, KMenu * par entMenu, KActionCollection *collec);		KBookmarkMenu( KBookmarkManager* mgr, KBookmarkOwner * owner, KMenu * par entMenu, KActionCollection *collec);
	/**		/**
	* Creates a bookmark submenu		* Creates a bookmark submenu
			*
			* @todo KDE 5: give ownership of the bookmarkmenu to another qobject, e.
			g. parentMenu.
			* Currently this is a QObject without a parent, use setParent to benefit
			from automatic deletion.
	*/		*/
	KBookmarkMenu( KBookmarkManager* mgr, KBookmarkOwner * owner,		KBookmarkMenu( KBookmarkManager* mgr, KBookmarkOwner * owner,
	KMenu * parentMenu, const QString & parentAddress);		KMenu * parentMenu, const QString & parentAddress);
	~KBookmarkMenu();		~KBookmarkMenu();
	/**		/**
	* Call ensureUpToDate() if you need KBookmarkMenu to adjust to its		* Call ensureUpToDate() if you need KBookmarkMenu to adjust to its
	* final size before it is executed.		* final size before it is executed.
	**/		**/
End of changes. 2 change blocks.
	0 lines changed or deleted		10 lines changed or added

	kbreadcrumbselectionmodel.h		kbreadcrumbselectionmodel.h
	skipping to change at line 158		skipping to change at line 158
	/* reimp */ void select(const QModelIndex &index, QItemSelectionModel::Se lectionFlags command);		/* reimp */ void select(const QModelIndex &index, QItemSelectionModel::Se lectionFlags command);
	/* reimp */ void select(const QItemSelection &selection, QItemSelectionMo del::SelectionFlags command);		/* reimp */ void select(const QItemSelection &selection, QItemSelectionMo del::SelectionFlags command);
	protected:		protected:
	KBreadcrumbSelectionModelPrivate * const d_ptr;		KBreadcrumbSelectionModelPrivate * const d_ptr;
	private:		private:
	//@cond PRIVATE		//@cond PRIVATE
	Q_DECLARE_PRIVATE(KBreadcrumbSelectionModel)		Q_DECLARE_PRIVATE(KBreadcrumbSelectionModel)
	Q_PRIVATE_SLOT( d_func(),void sourceSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected))		Q_PRIVATE_SLOT( d_func(),void sourceSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected))
			Q_PRIVATE_SLOT( d_func(),void syncBreadcrumbs())
	//@cond PRIVATE		//@cond PRIVATE
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	kbuttongroup.h		kbuttongroup.h
	skipping to change at line 46		skipping to change at line 46
	*		*
	* \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
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(int current READ selected WRITE setSelected)		Q_PROPERTY(int current READ selected WRITE setSelected NOTIFY changed USE R true)
	public:		public:
	/**		/**
	* Construct a new empty KGroupBox.		* Construct a new empty KGroupBox.
	*/		*/
	explicit KButtonGroup( QWidget* parent = 0 );		explicit KButtonGroup( QWidget* parent = 0 );
	/**		/**
	* Destroys the widget.		* Destroys the widget.
	*/		*/
	~KButtonGroup();		~KButtonGroup();
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 27		skipping to change at line 27
	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 KCALENDARSYSTEM_H		#ifndef KCALENDARSYSTEM_H
	#define KCALENDARSYSTEM_H		#define KCALENDARSYSTEM_H
	#include <kdecore_export.h>		#include <kdecore_export.h>
	#include "klocale.h" // needed for enums		#include "klocale.h" // needed for enums
			#include "kglobal.h"
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
			#include <QtCore/QDate>
	class KCalendarSystemPrivate;		class KCalendarSystemPrivate;
			class KCalendarEra;
	class QDate;
	/**		/**
	* KCalendarSystem abstract base class, provides support for local Calendar Systems in KDE		* KCalendarSystem abstract base class, provides support for local Calendar Systems in KDE
	*		*
	* 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:
	skipping to change at line 69		skipping to change at line 70
	};		};
	/**		/**
	* 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" */
	};		};
			//KDE5 remove
	/**		/**
			* @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 ( "gregorian" ),		static KCalendarSystem *create( const QString & calType = QLatin1String ( "gregorian" ),
	const KLocale * locale = 0 );		const KLocale * locale = 0 );
			//KDE5 remove
	/**		/**
			* @deprecated use create(KLocale::CalendarSystem, KSharedConfig, KLoca
			le) instead
			*
			* @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: :Ptr config,		static KCalendarSystem *create( const QString & calType, KSharedConfig: :Ptr config,
	const KLocale * locale = 0 );		const KLocale * locale = 0 );
			//KDE5 add default value to calendarSystem
			/**
			* @since 4.6
			*
			* Creates a KCalendarSystem object for the required Calendar System
			*
			* @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.
			* @return a KCalendarSystem object
			*/
			static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem,
			const KLocale *locale = 0 );
	/**		/**
			* @since 4.6
			*
			* Creates a KCalendarSystem object for the required Calendar System
			*
			* @param calendarSystem the Calendar System to create
			* @param config a configuration file with a 'KCalendarSystem %calendar
			Type' group detailing
			* locale-related preferences (such as era options). The
			global config is used
			if null.
			* @param locale locale to use for translations. The global locale is u
			sed if null.
			* @return a KCalendarSystem object
			*/
			static KCalendarSystem *create( KLocale::CalendarSystem calendarSystem,
			KSharedConfig::Ptr config,
			const KLocale *locale = 0 );
			//KDE5 remove
			/**
			* @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();		static QStringList calendarSystems();
	/**		/**
			* @since 4.6
			*
			* Returns the list of currently supported Calendar Systems
			*
			* @return list of Calendar Systems
			*/
			static QList<KLocale::CalendarSystem> calendarSystemsList();
			//KDE5 remove
			/**
			* @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 );		static QString calendarLabel( const QString &calendarType );
	/**		/**
			* @since 4.6
			*
			* Returns a localized label to display for the required Calendar Syste
			m type.
			*
			* Use with calendarSystemsList() to populate selction lists of availab
			le
			* calendar systems.
			*
			* @param calendarType the specific calendar type to return the label f
			or
			* @param locale the locale to use for the label, defaults to global
			* @return label for calendar
			*/
			static QString calendarLabel( KLocale::CalendarSystem calendarSystem, c
			onst KLocale *locale = KGlobal::locale() );
			/**
			* @since 4.6
			*
			* 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 calendarSystemForCalendarType( const QSt
			ring &calendarType );
			/**
	* 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
	skipping to change at line 134		skipping to change at line 211
	* @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 KLocal e *locale = 0 );
	/**		/**
	* Destructor.		* Destructor.
	*/		*/
	virtual ~KCalendarSystem();		virtual ~KCalendarSystem();
	/**		/**
			* @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;		virtual QString calendarType() const = 0;
			//KDE5 make virtual?
			/**
			* @since 4.6
			*
			* Returns the Calendar System type of the KCalendarSystem object
			*
			* @return type of calendar system
			*/
			KLocale::CalendarSystem calendarSystem() const;
			//KDE5 make virtual?
			/**
			* @since 4.6
			*
			* Returns a localized label to display for the current Calendar System
			type.
			*
			* @return localized label for this Calendar System
			*/
			QString calendarLabel() const;
	/**		/**
	* Returns a QDate holding the epoch of the calendar system. Usually Y MD		* Returns a QDate holding the epoch of the calendar system. Usually Y MD
	* of 1/1/1, access the returned QDates method toJulianDay() if you		* of 1/1/1, access the returned QDates method toJulianDay() if you
	* require the actual Julian day number. Note: a particular calendar		* require the actual Julian day number. Note: a particular calendar
	* system implementation may not include the epoch in its supported ran ge,		* system implementation may not include the epoch in its supported ran ge,
	* or the calendar system may be proleptic in which case it supports da tes		* or the calendar system may be proleptic in which case it supports da tes
	* before the epoch.		* before the epoch.
	*		*
	* @see KCalendarSystem::earliestValidDate		* @see KCalendarSystem::earliestValidDate
	* @see KCalendarSystem::latestValidDate		* @see KCalendarSystem::latestValidDate
	skipping to change at line 565		skipping to change at line 664
	* 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()
			*
	* @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.
			*
			* 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;
	/**		/**
	* 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
	skipping to change at line 615		skipping to change at line 720
	* 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?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the first day of the year
			*
			* @param date The year to return the date for
			* @return The first day of the year
			*/
			QDate firstDayOfYear( int year ) const;
			//KDE5 Make virtual?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the last day of the year
			*
			* @param date The year to return the date for
			* @return The last day of the year
			*/
			QDate lastDayOfYear( int year ) const;
			//KDE5 Make virtual?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the first day of the year
			*
			* @param date The year to return the date for, defaults to today
			* @return The first day of the year
			*/
			QDate firstDayOfYear( const QDate &date = QDate::currentDate() ) const;
			//KDE5 Make virtual?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the last day of the year
			*
			* @param date The year to return the date for, defaults to today
			* @return The last day of the year
			*/
			QDate lastDayOfYear( const QDate &date = QDate::currentDate() ) const;
			//KDE5 Make virtual?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the first day of the month
			*
			* @param date The month to return the date for, defaults to today
			* @return The first day of the month
			*/
			QDate firstDayOfMonth( int year, int month ) const;
			//KDE5 Make virtual?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the last day of the month
			*
			* @param date The month to return the date for, defaults to today
			* @return The last day of the month
			*/
			QDate lastDayOfMonth( int year, int month ) const;
			//KDE5 Make virtual?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the first day of the month
			*
			* @param date The month to return the date for, defaults to today
			* @return The first day of the month
			*/
			QDate firstDayOfMonth( const QDate &date = QDate::currentDate() ) const
			;
			//KDE5 Make virtual?
			/**
			* @since 4.6
			*
			* Returns a QDate containing the last day of the month
			*
			* @param date The month to return the date for, defaults to today
			* @return The last day of the month
			*/
			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;
	skipping to change at line 992		skipping to change at line 1185
	* @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 cale::DigitSet digitSet,		QString formatDate( const QDate &fromDate, const QString &toFormat, KLo cale::DigitSet digitSet,
	KLocale::DateTimeFormatStandard formatStandard = KL ocale::KdeFormat ) const;		KLocale::DateTimeFormatStandard formatStandard = KL ocale::KdeFormat ) const;
			//KDE5 Make virtual
			/**
			* @since 4.6
			*
			* 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:
			* KLocale::ShortNumber = "1"
			* KLocale::LongNumber = "01"
			* KLocale::NarrowName = "J"
			* KLocale::ShortName = "Jan"
			* KLocale::LongName = "January"
			*
			* @param date The date to format
			* @param component The date component to return
			* @param format The format to return the @p component in
			* @param weekNumberSystem To override the default Week Number System t
			o use
			* @return The localized string form of the date component
			*/
			QString formatDate(const QDate &date, KLocale::DateTimeComponent compon
			ent,
			KLocale::DateTimeComponentFormat format = KLocale::D
			efaultComponentFormat,
			KLocale::WeekNumberSystem weekNumberSystem = KLocale
			::DefaultWeekNumber) const;
	/**		/**
	* Converts a localized date string to a QDate.		* Converts a localized date string to a QDate.
	* The bool pointed by @p ok will be @c false if the date entered was i nvalid.		* The bool pointed by @p ok will be @c false if the date entered was i nvalid.
	*		*
	* 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
	skipping to change at line 1108		skipping to change at line 1324
	* @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 ool *ok,		QDate readDate( const QString &dateString, const QString &dateFormat, b ool *ok,
	KLocale::DateTimeFormatStandard formatStandard ) const;		KLocale::DateTimeFormatStandard formatStandard ) const;
			//KDE5 Make virtual
			/**
			* @since 4.6
			*
			* 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
			* 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
			* Year value of 40 is interpreted as 1940 and the input Short Year val
			ue
			* of 10 is interpreted as 2010.
			*
			* The Short Year Window is only ever applied when reading the Short Ye
			ar
			* format and not the Long Year format, i.e. KLocale::ShortFormat or '%
			y'
			* only and not KLocale::LongFormat or '%Y'.
			*
			* The Start Year 0 effectively means not to use a Short Year Window
			*
			* Each Calendar System requires a different Short Year Window as they
			have
			* different epochs. The Gregorian Short Year Window usually pivots aro
			und
			* the year 2000, whereas the Hebrew Short Year Window usually pivots a
			round
			* the year 5000.
			*
			* This value must always be used when evaluating user input Short Year
			* strings.
			*
			* @see KLocale::shortYearWindowStartYear
			* @see KLocale::applyShortYearWindow
			* @return the short year window start year
			*/
			int shortYearWindowStartYear() const;
			//KDE5 Make virtual
			/**
			* @since 4.6
			*
			* Returns the Year Number after applying the Year Window.
			*
			* If the @p inputYear is between 0 and 99, then apply the Year Window
			and
			* return the calculated Year Number.
			*
			* If the @p inputYear is not between 0 and 99, then the original Year
			Number
			* is returned.
			*
			* @see KLocale::setYearWindowOffset
			* @see KLocale::yearWindowOffset
			* @param inputYear the year number to apply the year window to
			* @return the year number after applying the year window
			*/
			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
	*		*
	skipping to change at line 1220		skipping to change at line 1487
	* 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
	* have the original handle to the locale and can manipulate it that wa y if		* have the original handle to the locale and can manipulate it that wa y if
	* required, e.g. to change default date format. Only expose those met hods		* required, e.g. to change default date format. Only expose those met hods
	* that library widgets require access to internally.		* that library widgets require access to internally.
	*		*
	* @see KCalendarSystem::formatDate		* @see KCalendarSystem::formatDate
	* @see KLocale::formatDate		* @see KLocale::formatDate
	* @see KCalendarSystem::weekStartDay		* @see KCalendarSystem::weekStartDay
	* @see KLocale::weekStartDay		* @see KLocale::weekStartDay
	* @see KCalendarSystem::readDate		* @see KCalendarSystem::readDate
	* @see KLoacle::readDate		* @see KLocale::readDate
	*		*
	* @return locale to use		* @return locale to use
	*/		*/
	const KLocale *locale() const;		const KLocale *locale() const;
	/**		/**
	* @deprecated		* @deprecated
	*		*
	* Sets the maximum number of months in a year		* Sets the maximum number of months in a year
	*		*
	skipping to change at line 1282		skipping to change at line 1549
	friend class KCalendarSystemGregorian;		friend class KCalendarSystemGregorian;
	friend class KCalendarSystemGregorianProleptic;		friend class KCalendarSystemGregorianProleptic;
	friend class KCalendarSystemHebrew;		friend class KCalendarSystemHebrew;
	friend class KCalendarSystemHijri;		friend class KCalendarSystemHijri;
	friend class KCalendarSystemIndianNational;		friend class KCalendarSystemIndianNational;
	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 KCalendarSystemThai;		friend class KCalendarSystemThai;
			friend class KLocalizedDate;
			friend class KLocalizedDatePrivate;
			friend class KDateTimeParser;
			// Era functions needed by friends, may be made public later if needed
			in KCM
			QList<KCalendarEra> *eraList() const;
			KCalendarEra era( const QDate &eraDate ) 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. 20 change blocks.
	3 lines changed or deleted		311 lines changed or added

	kcategorizedsortfilterproxymodel.h		kcategorizedsortfilterproxymodel.h
	skipping to change at line 113		skipping to change at line 113
	*/		*/
	bool sortCategoriesByNaturalComparison() const;		bool sortCategoriesByNaturalComparison() const;
	/**		/**
	* Does a natural comparing of the strings. A negative value is return ed if \a a		* Does a natural comparing of the strings. A negative value is return ed if \a a
	* is smaller than \a b. A positive value is returned if \a a is great er than \a b. 0		* is smaller than \a b. A positive value is returned if \a a is great er than \a b. 0
	* is returned if both values are equal.		* is returned if both values are equal.
	* @deprecated		* @deprecated
	* Use KStringHandler::naturalCompare() instead.		* Use KStringHandler::naturalCompare() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static int naturalCompare(const QString &a, const QStrin g &b);		KDE_DEPRECATED static int naturalCompare(const QString &a, const QStrin g &b);
			#endif
	protected:		protected:
	/**		/**
	* Overridden from QSortFilterProxyModel. If you are subclassing		* Overridden from QSortFilterProxyModel. If you are subclassing
	* KCategorizedSortFilterProxyModel, you will probably not need to rei mplement this		* KCategorizedSortFilterProxyModel, you will probably not need to rei mplement this
	* method.		* method.
	*		*
	* It calls compareCategories() to sort by category. If the both item s are in the		* It calls compareCategories() to sort by category. If the both item s are in the
	* same category (i.e. compareCategories returns 0), then subSortLessT han is called.		* same category (i.e. compareCategories returns 0), then subSortLessT han is called.
	*		*
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kcategorizedview.h		kcategorizedview.h
	skipping to change at line 83		skipping to change at line 83
	* - Set a category drawer by calling setCategoryDrawer.		* - Set a category drawer by calling setCategoryDrawer.
	*		*
	* @see KCategorizedSortFilterProxyModel, KCategoryDrawer		* @see KCategorizedSortFilterProxyModel, KCategoryDrawer
	*		*
	* @author Rafael Fernández López <ereslibre@kde.org>		* @author Rafael Fernández López <ereslibre@kde.org>
	*/		*/
	class KDEUI_EXPORT KCategorizedView		class KDEUI_EXPORT KCategorizedView
	: public QListView		: public QListView
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(int categorySpacing READ categorySpacing WRITE setCategorySp
			acing)
			Q_PROPERTY(bool alternatingBlockColors READ alternatingBlockColors WRIT
			E setAlternatingBlockColors)
			Q_PROPERTY(bool collapsibleBlocks READ collapsibleBlocks WRITE setColla
			psibleBlocks)
	public:		public:
	KCategorizedView(QWidget *parent = 0);		KCategorizedView(QWidget *parent = 0);
	~KCategorizedView();		~KCategorizedView();
	/**		/**
	* Reimplemented from QAbstractItemView.		* Reimplemented from QAbstractItemView.
	*/		*/
	virtual void setModel(QAbstractItemModel *model);		virtual void setModel(QAbstractItemModel *model);
	skipping to change at line 312		skipping to change at line 315
	*/		*/
	virtual void rowsInserted(const QModelIndex &parent,		virtual void rowsInserted(const QModelIndex &parent,
	int start,		int start,
	int end);		int end);
	protected Q_SLOTS:		protected Q_SLOTS:
	/**		/**
	* @internal		* @internal
	* @warning Deprecated since 4.4.		* @warning Deprecated since 4.4.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	virtual KDE_DEPRECATED void rowsInsertedArtifficial(const QModelIndex & parent,		virtual KDE_DEPRECATED void rowsInsertedArtifficial(const QModelIndex & parent,
	int start,		int start,
	int end);		int end);
			#endif
	/**		/**
	* @internal		* @internal
	* @warning Deprecated since 4.4.		* @warning Deprecated since 4.4.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	virtual KDE_DEPRECATED void rowsRemoved(const QModelIndex &parent,		virtual KDE_DEPRECATED void rowsRemoved(const QModelIndex &parent,
	int start,		int start,
	int end);		int end);
			#endif
	/**		/**
	* @internal		* @internal
	* Reposition items as needed.		* Reposition items as needed.
	*/		*/
	virtual void slotLayoutChanged();		virtual void slotLayoutChanged();
	private:		private:
	class Private;		class Private;
	Private *const d;		Private *const d;
End of changes. 5 change blocks.
	0 lines changed or deleted		10 lines changed or added

	kcategorydrawer.h		kcategorydrawer.h
	skipping to change at line 43		skipping to change at line 43
	class KCategorizedView;		class KCategorizedView;
	/**		/**
	* @deprecated		* @deprecated
	*		*
	* The category drawing is performed by this class. It also gives informat ion about the category		* The category drawing is performed by this class. It also gives informat ion about the category
	* height and margins.		* height and margins.
	*		*
	* @warning Please use KCategoryDrawerV3 instead		* @warning Please use KCategoryDrawerV3 instead
	*/		*/
	class KDEUI_EXPORT_DEPRECATED KCategoryDrawer		class KDEUI_EXPORT KCategoryDrawer
	{		{
	public:		public:
	KCategoryDrawer();		KDE_DEPRECATED KCategoryDrawer();
	virtual ~KCategoryDrawer();		virtual ~KCategoryDrawer();
	/**		/**
	* This method purpose is to draw a category represented by the given		* This method purpose is to draw a category represented by the given
	* @param index with the given @param sortRole sorting role		* @param index with the given @param sortRole sorting role
	*		*
	* @note This method will be called one time per category, always with the		* @note This method will be called one time per category, always with the
	* first element in that category		* first element in that category
	*/		*/
	skipping to change at line 112		skipping to change at line 112
	Private *const d;		Private *const d;
	};		};
	/**		/**
	* @deprecated		* @deprecated
	*		*
	* @since 4.4		* @since 4.4
	*		*
	* @warning Please use KCategoryDrawerV3 instead		* @warning Please use KCategoryDrawerV3 instead
	*/		*/
	class KDEUI_EXPORT_DEPRECATED KCategoryDrawerV2		class KDEUI_EXPORT KCategoryDrawerV2
	: public QObject		: public QObject
	, public KCategoryDrawer		, public KCategoryDrawer
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	KCategoryDrawerV2(QObject *parent = 0);		KDE_DEPRECATED KCategoryDrawerV2(QObject *parent = 0);
	virtual ~KCategoryDrawerV2();		virtual ~KCategoryDrawerV2();
	virtual void mouseButtonPressed(const QModelIndex &index, QMouseEvent * event);		KDE_DEPRECATED virtual void mouseButtonPressed(const QModelIndex &index , QMouseEvent *event);
	virtual void mouseButtonReleased(const QModelIndex &index, QMouseEvent *event);		KDE_DEPRECATED virtual void mouseButtonReleased(const QModelIndex &inde x, QMouseEvent *event);
	virtual void mouseButtonMoved(const QModelIndex &index, QMouseEvent *ev ent);		KDE_DEPRECATED virtual void mouseButtonMoved(const QModelIndex &index, QMouseEvent *event);
	virtual void mouseButtonDoubleClicked(const QModelIndex &index, QMouseE vent *event);		KDE_DEPRECATED virtual void mouseButtonDoubleClicked(const QModelIndex &index, QMouseEvent *event);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal becomes emitted when collapse or expand has been clicke d.		* This signal becomes emitted when collapse or expand has been clicke d.
	*/		*/
	void collapseOrExpandClicked(const QModelIndex &index);		void collapseOrExpandClicked(const QModelIndex &index);
	/**		/**
	* Emit this signal on your subclass implementation to notify that som ething happened. Usually		* Emit this signal on your subclass implementation to notify that som ething happened. Usually
	* this will be triggered when you have received an event, and its pos ition matched some "hot spot".		* this will be triggered when you have received an event, and its pos ition matched some "hot spot".
	skipping to change at line 163		skipping to change at line 163
	public:		public:
	KCategoryDrawerV3(KCategorizedView *view);		KCategoryDrawerV3(KCategorizedView *view);
	virtual ~KCategoryDrawerV3();		virtual ~KCategoryDrawerV3();
	/**		/**
	* @return The view this category drawer is associated with.		* @return The view this category drawer is associated with.
	*/		*/
	KCategorizedView *view() const;		KCategorizedView *view() const;
			using KCategoryDrawerV2::mouseButtonPressed;
			using KCategoryDrawerV2::mouseButtonReleased;
			using KCategoryDrawerV2::mouseButtonDoubleClicked;
	protected:		protected:
	/**		/**
	* Method called when the mouse button has been pressed.		* Method called when the mouse button has been pressed.
	*		*
	* @param index The representative index of the block of items.		* @param index The representative index of the block of items.
	* @param blockRect The rect occupied by the block of items.		* @param blockRect The rect occupied by the block of items.
	* @param event The mouse event.		* @param event The mouse event.
	*		*
	* @warning You explicitly have to determine whether the event has bee n accepted or not. You		* @warning You explicitly have to determine whether the event has bee n accepted or not. You
	* have to call event->accept() or event->ignore() at all pos sible case branches in		* have to call event->accept() or event->ignore() at all pos sible case branches in
End of changes. 9 change blocks.
	8 lines changed or deleted		12 lines changed or added

	kcharselect.h		kcharselect.h
	skipping to change at line 110		skipping to change at line 110
	HistoryButtons = 0x40,		HistoryButtons = 0x40,
	/**		/**
	* Shows everything		* Shows everything
	*/		*/
	AllGuiElements = 65535		AllGuiElements = 65535
	};		};
	Q_DECLARE_FLAGS(Controls,		Q_DECLARE_FLAGS(Controls,
	Control)		Control)
	/** @deprecated */		/** @deprecated */
			#ifndef KDE_NO_DEPRECATED
	KDE_CONSTRUCTOR_DEPRECATED explicit KCharSelect(		KDE_CONSTRUCTOR_DEPRECATED explicit KCharSelect(
	QWidget *parent,		QWidget *parent,
	const Controls controls = AllGuiElements);		const Controls controls = AllGuiElements);
			#endif
	/**		/**
	* Constructor. @p controls can be used to show a custom set of widgets .		* Constructor. @p controls can be used to show a custom set of widgets .
	*		*
	* The widget uses the following actions:		* The widget uses the following actions:
	* - KStandardActions::find() (edit_find)		* - KStandardActions::find() (edit_find)
	* - KStandardActions::back() (go_back)		* - KStandardActions::back() (go_back)
	* - KStandardActions::forward() (go_forward)		* - KStandardActions::forward() (go_forward)
	*		*
	* If you provide a KActionCollection, this will be populated with the above actions,		* If you provide a KActionCollection, this will be populated with the above actions,
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kcharsets.h		kcharsets.h
	skipping to change at line 147		skipping to change at line 147
	*/		*/
	QList<QStringList> encodingsByScript() const;		QList<QStringList> encodingsByScript() const;
	/**		/**
	* Returns the language the encoding is used for.		* Returns the language the encoding is used for.
	* @param encoding the encoding for the language		* @param encoding the encoding for the language
	* @return the language of the encoding		* @return the language of the encoding
	* @deprecated Please use descriptionForEncoding instead.		* @deprecated Please use descriptionForEncoding instead.
	* This function will be removed before KDE4 is released.		* This function will be removed before KDE4 is released.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString languageForEncoding( const QString &encoding ) c onst;		KDE_DEPRECATED QString languageForEncoding( const QString &encoding ) c onst;
			#endif
	/**		/**
	* @brief Returns a long description for an encoding name.		* @brief Returns a long description for an encoding name.
	* @param encoding the encoding for the language		* @param encoding the encoding for the language
	* @return the long description for the encoding		* @return the long description for the encoding
	*/		*/
	QString descriptionForEncoding( const QString& encoding ) const;		QString descriptionForEncoding( const QString& encoding ) const;
	/**		/**
	* Returns the encoding for a string obtained with descriptiveEncodingN ames().		* Returns the encoding for a string obtained with descriptiveEncodingN ames().
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kcmdlineargs.h		kcmdlineargs.h
	skipping to change at line 79		skipping to change at line 79
	/**		/**
	* Destructor.		* Destructor.
	*/		*/
	~KCmdLineOptions ();		~KCmdLineOptions ();
	/**		/**
	* Add command line option, by providing its name, description, and		* Add command line option, by providing its name, description, and
	* possibly a default value. These will print out when <i>myapp --help< /i>		* possibly a default value. These will print out when <i>myapp --help< /i>
	* is called on the command line.		* is called on the command line.
	*		*
	* Note that if the option name begins with "no" that you will need to		* Note that a long option can only have one short (single character) a
	test		lias
			*
			* @since 4.6 Note that the following does not apply to options that be
			gin
			* with "no" and expect a parameter, like "nooption4" in the example be
			llow.
			*
			* Note that if the option name begin with "no" that you will need to t
			est
	* for the name without the "no" and the result will be the inverse of what		* for the name without the "no" and the result will be the inverse of what
	* is specified. i.e. if "nofoo" is the name of the option and		* is specified. i.e. if "nofoo" is the name of the option and
	* <i>myapp --nofoo</i> is called:		* <i>myapp --nofoo</i> is called:
	*		*
	* @code		* @code
	* KCmdLineArgs::parsedArgs()->isSet("foo"); // false		* KCmdLineArgs::parsedArgs()->isSet("foo"); // false
	* @endcode		* @endcode
	*		*
	* Here are some more examples showing various features:		* Here are some more examples showing various features:
	*		*
	* @code		* @code
	* KCmdLineOptions options;		* KCmdLineOptions options;
	* options.add("a", ki18n("A short binary option"));		* options.add("a", ki18n("A short binary option"));
	* options.add("b \<file>", ki18n("A short option which takes an argum ent"));		* options.add("b \<file>", ki18n("A short option which takes an argum ent"));
	* options.add("c \<speed>", ki18n("As above but with a default value" ), "9600");		* options.add("c \<speed>", ki18n("As above but with a default value" ), "9600");
	* options.add("option1", ki18n("A long binary option, off by default" ));		* options.add("option1", ki18n("A long binary option, off by default" ));
	* options.add("nooption2", ki18n("A long binary option, on by default "));		* options.add("nooption2", ki18n("A long binary option, on by default "));
	* options.add(":", ki18n("Extra options:"));		* options.add(":", ki18n("Extra options:"));
	* options.add("option3 \<file>", ki18n("A long option which takes an argument"));		* options.add("option3 \<file>", ki18n("A long option which takes an argument"));
	* options.add("option4 \<speed>", ki18n("A long option which takes an argument, defaulting to 9600"), "9600");		* options.add("nooption4 \<speed>", ki18n("A long option which takes an argument, defaulting to 9600"), "9600");
	* options.add("d").add("option5", ki18n("A long option which has a sh ort option as alias"));		* options.add("d").add("option5", ki18n("A long option which has a sh ort option as alias"));
	* options.add("e").add("nooption6", ki18n("Another long option with a n alias"));		* options.add("e").add("nooption6", ki18n("Another long option with a n alias"));
	* options.add("f").add("option7 \<speed>", ki18n("'--option7 speed' i s the same as '-f speed'"));		* options.add("f").add("option7 \<speed>", ki18n("'--option7 speed' i s the same as '-f speed'"));
	* options.add("!option8 \<cmd>", ki18n("All options following this on e will be treated as arguments"));		* options.add("!option8 \<cmd>", ki18n("All options following this on e will be treated as arguments"));
	* options.add("+file", ki18n("A required argument 'file'"));		* options.add("+file", ki18n("A required argument 'file'"));
	* options.add("+[arg1]", ki18n("An optional argument 'arg1'"));		* options.add("+[arg1]", ki18n("An optional argument 'arg1'"));
	* options.add("!+command", ki18n("A required argument 'command', that can contain multiple words, even starting with '-'"));		* options.add("!+command", ki18n("A required argument 'command', that can contain multiple words, even starting with '-'"));
	* options.add("", ki18n("Additional help text not associated with any particular option"));		* options.add("", ki18n("Additional help text not associated with any particular option"));
	* @endcode		* @endcode
	*		*
	skipping to change at line 634		skipping to change at line 639
	* Returns command line options for consumption by Qt after parsing them in a way that		* Returns command line options for consumption by Qt after parsing them in a way that
	* is consistent with KDE's general command line handling. In particular this ensures		* is consistent with KDE's general command line handling. In particular this ensures
	* that Qt command line options can be specified as either -option or --o ption and that		* that Qt command line options can be specified as either -option or --o ption and that
	* any options specified after '--' will be ignored.		* any options specified after '--' will be ignored.
	*		*
	* @see qt_argc		* @see qt_argc
	*/		*/
	static char **qtArgv();		static char **qtArgv();
	/**		/**
			* Returns the list of command-line arguments.
			* @since 4.6
			*/
			static QStringList allArguments();
			/**
	* Returns the KAboutData for consumption by KComponentData		* Returns the KAboutData for consumption by KComponentData
	*/		*/
	static const KAboutData *aboutData();		static const KAboutData *aboutData();
	protected:		protected:
	/**		/**
	* @internal		* @internal
	* Constructor.		* Constructor.
	*/		*/
	KCmdLineArgs( const KCmdLineOptions &_options, const KLocalizedString &_n ame,		KCmdLineArgs( const KCmdLineOptions &_options, const KLocalizedString &_n ame,
End of changes. 3 change blocks.
	3 lines changed or deleted		17 lines changed or added

	kcmodule.h		kcmodule.h
	skipping to change at line 38		skipping to change at line 38
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <QtGui/QWidget>		#include <QtGui/QWidget>
	#ifdef Q_WS_X11		#ifdef Q_WS_X11
	#include <fixx11h.h>		#include <fixx11h.h>
	#endif		#endif
	class QStringList;		class QStringList;
	class KAboutData;		class KAboutData;
	class KConfigDialogManager;		class KConfigDialogManager;
			class KCoreConfigSkeleton;
	class KConfigSkeleton;		class KConfigSkeleton;
	class KCModulePrivate;		class KCModulePrivate;
	class KComponentData;		class KComponentData;
	namespace KAuth {		namespace KAuth {
	class Action;		class Action;
	}		}
	/**		/**
	* The base class for configuration modules.		* The base class for configuration modules.
	skipping to change at line 210		skipping to change at line 211
	bool useRootOnlyMessage() const;		bool useRootOnlyMessage() const;
	KComponentData componentData() const;		KComponentData componentData() const;
	/**		/**
	* @return a list of @ref KConfigDialogManager's in use, if any.		* @return a list of @ref KConfigDialogManager's in use, if any.
	*/		*/
	QList<KConfigDialogManager*> configs() const;		QList<KConfigDialogManager*> configs() const;
	/**		/**
	* Tell if the module's save() method requires authorization to be execut ed.		* @brief Set if the module's save() method requires authorization to be executed.
	*		*
	* The module can set this property to @c true if it requires authorizati on.		* The module can set this property to @c true if it requires authorizati on.
	* It will still have to execute the action itself using the KAuth librar y, so		* It will still have to execute the action itself using the KAuth librar y, so
	* this method is not technically needed to perform the action, but		* this method is not technically needed to perform the action, but
	* using this and/or the setAuthAction() method will ensure that hosting		* using this and/or the setAuthAction() method will ensure that hosting
	* applications like System Settings or kcmshell behave correctly.		* applications like System Settings or kcmshell behave correctly.
	*		*
	* Called with @c true, if no action has been previously set using setAut		* Called with @c true, this method will set the action to "org.kde.kcon
	hAction(),		trol.name.save" where
	* this method will set the action to a default value of "org.kde.kcontro		* "name" is aboutData()->appName() return value. This default action won
	l.name.save" where		't be set if
	* "name" is the aboutData()->appName() return value. This default action
	won't be set if
	* the aboutData() object is not valid.		* the aboutData() object is not valid.
	*		*
	* Note that called with @c false, this method will reset the action name set with setAuthAction().		* Note that called with @c false, this method will reset the action name set with setAuthAction().
	*		*
	* @param needsAuth Tells if the module's save() method requires authoriz ation to be executed.		* @param needsAuth Tells if the module's save() method requires authoriz ation to be executed.
	*/		*/
	void setNeedsAuthorization(bool needsAuth);		void setNeedsAuthorization(bool needsAuth);
	/**		/**
	* Returns the value previously set with setNeedsAuthorization(). By defa ult it's @c false.		* Returns the value previously set with setNeedsAuthorization(). By defa ult it's @c false.
	skipping to change at line 305		skipping to change at line 305
	*		*
	* If you use KConfigXT, you do not have to reimplement this function sin ce		* If you use KConfigXT, you do not have to reimplement this function sin ce
	* the fetching and settings of default values is done automatically. How ever, if you		* the fetching and settings of default values is done automatically. How ever, if you
	* reimplement and also are using KConfigXT, remember to call the base fu nction at the		* reimplement and also are using KConfigXT, remember to call the base fu nction at the
	* very end of your reimplementation.		* very end of your reimplementation.
	*/		*/
	virtual void defaults();		virtual void defaults();
	protected:		protected:
	/**		/**
			* Adds a KCoreConfigskeleton @p config to watch the widget @p widget
			*
			* This function is useful if you need to handle multiple configuration f
			iles.
			*
			* @return a pointer to the KCoreConfigDialogManager in use
			* @param config the KCoreConfigSkeleton to use
			* @param widget the widget to watch
			*/
			KConfigDialogManager* addConfig( KCoreConfigSkeleton *config, QWidget* wi
			dget );
			/**
	* Adds a KConfigskeleton @p config to watch the widget @p widget		* Adds a KConfigskeleton @p config to watch the widget @p widget
	*		*
	* This function is useful if you need to handle multiple configuration f iles.		* This function is useful if you need to handle multiple configuration f iles.
	*		*
	* @return a pointer to the KConfigDialogManager in use		* @return a pointer to the KConfigDialogManager in use
	* @param config the KConfigSkeleton to use		* @param config the KConfigSkeleton to use
	* @param widget the widget to watch		* @param widget the widget to watch
	*/		*/
	KConfigDialogManager* addConfig( KConfigSkeleton *config, QWidget* widget );		KConfigDialogManager* addConfig( KConfigSkeleton *config, QWidget* widget );
End of changes. 4 change blocks.
	7 lines changed or deleted		19 lines changed or added

	kcmodulecontainer.h		kcmodulecontainer.h
	skipping to change at line 134		skipping to change at line 134
	/**		/**
	* A list of all modules which are encapsulated.		* A list of all modules which are encapsulated.
	*/		*/
	ModuleList allModules; // KDE 4 put in the Private class and abstract with getter		ModuleList allModules; // KDE 4 put in the Private class and abstract with getter
	private Q_SLOTS:		private Q_SLOTS:
	/**		/**
	* Enables/disables the Admin Mode button, as appropriate.		* Enables/disables the Admin Mode button, as appropriate.
	*/		*/
	void tabSwitched( QWidget * module );		void tabSwitched(int);
	void moduleChanged(KCModuleProxy *proxy);		void moduleChanged(KCModuleProxy *proxy);
	private:		private:
	void init();		void init();
	class KCModuleContainerPrivate;		class KCModuleContainerPrivate;
	KCModuleContainerPrivate* const d;		KCModuleContainerPrivate* const d;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kcmoduleloader.h		kcmoduleloader.h
	skipping to change at line 102		skipping to change at line 102
	*/		*/
	KCMUTILS_EXPORT void unloadModule(const KCModuleInfo &mod);		KCMUTILS_EXPORT void unloadModule(const KCModuleInfo &mod);
	/**		/**
	* Display a message box explaining an error occurred and possible		* Display a message box explaining an error occurred and possible
	* reasons to why.		* reasons to why.
	*		*
	* @deprecated Use a constructor with ErrorReporting set to Dialog to s how a		* @deprecated Use a constructor with ErrorReporting set to Dialog to s how a
	* message box like this function did.		* message box like this function did.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KCMUTILS_EXPORT KDE_DEPRECATED void showLastLoaderError(QWidget *parent );		KCMUTILS_EXPORT KDE_DEPRECATED void showLastLoaderError(QWidget *parent );
			#endif
	/**		/**
	* Returns a KCModule containing the messages @p report and @p text.		* Returns a KCModule containing the messages @p report and @p text.
	*		*
	* @param report the type of error reporting, see ErrorReporting		* @param report the type of error reporting, see ErrorReporting
	* @param text the main message		* @param text the main message
	* @param details any additional details		* @param details any additional details
	*		*
	* @internal		* @internal
	*/		*/
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kcmultidialog.h		kcmultidialog.h
	skipping to change at line 94		skipping to change at line 94
	* @param args The arguments that should be given to the KCModule when it is created		* @param args The arguments that should be given to the KCModule when it is created
	**/		**/
	KPageWidgetItem* addModule( const KCModuleInfo& moduleinfo, KPageWidget Item *parent = 0,		KPageWidgetItem* addModule( const KCModuleInfo& moduleinfo, KPageWidget Item *parent = 0,
	const QStringList& args = QStringList() );		const QStringList& args = QStringList() );
	/**		/**
	* Removes all modules from the dialog.		* Removes all modules from the dialog.
	*/		*/
	void clear();		void clear();
			/**
			* Reimplemented for internal reasons.
			*/
			void setButtons(ButtonCodes buttonMask);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted after all KCModules have been told to save their configurati on.		* Emitted after all KCModules have been told to save their configurati on.
	*		*
	* The applyClicked and okClicked signals are emitted before the		* The applyClicked and okClicked signals are emitted before the
	* configuration is saved.		* configuration is saved.
	*/		*/
	void configCommitted();		void configCommitted();
	/**		/**
	skipping to change at line 173		skipping to change at line 178
	* module's .desktop file to find the path to the documentation,		* module's .desktop file to find the path to the documentation,
	* which it then attempts to load.		* which it then attempts to load.
	*		*
	* You can reimplement this slot if needed.		* You can reimplement this slot if needed.
	*		*
	* @note Make sure you call the original implementation.		* @note Make sure you call the original implementation.
	**/		**/
	void slotHelpClicked();		void slotHelpClicked();
	private:		private:
	Q_PRIVATE_SLOT(d_func(), void _k_slotCurrentPageChanged(KPageWidget Item *))		Q_PRIVATE_SLOT(d_func(), void _k_slotCurrentPageChanged(KPageWidget Item *, KPageWidgetItem *))
	Q_PRIVATE_SLOT(d_func(), void _k_clientChanged())		Q_PRIVATE_SLOT(d_func(), void _k_clientChanged())
	Q_PRIVATE_SLOT(d_func(), void _k_dialogClosed())		Q_PRIVATE_SLOT(d_func(), void _k_dialogClosed())
	Q_PRIVATE_SLOT(d_func(), void _k_updateHeader(bool use, const QStri ng &message))		Q_PRIVATE_SLOT(d_func(), void _k_updateHeader(bool use, const QStri ng &message))
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		6 lines changed or added

	kcmutils_export.h		kcmutils_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KCMUTILS_EXPORT_H		#ifndef KCMUTILS_EXPORT_H
	#define KCMUTILS_EXPORT_H		#define KCMUTILS_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KCMUTILS_EXPORT		#ifndef KCMUTILS_EXPORT
	# if defined(MAKE_KCMUTILS_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KCMUTILS_EXPORT
			# elif defined(MAKE_KCMUTILS_LIB)
	/* We are building this library */		/* We are building this library */
	# define KCMUTILS_EXPORT KDE_EXPORT		# define KCMUTILS_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KCMUTILS_EXPORT KDE_IMPORT		# define KCMUTILS_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kcolorbutton.h		kcolorbutton.h
	skipping to change at line 40		skipping to change at line 40
	*		*
	* This widget can be used to display or allow user selection of a color.		* This widget can be used to display or allow user selection of a color.
	*		*
	* @see KColorDialog		* @see KColorDialog
	*		*
	* \image html kcolorbutton.png "KDE Color Button"		* \image html kcolorbutton.png "KDE Color Button"
	*/		*/
	class KDEUI_EXPORT KColorButton : public QPushButton		class KDEUI_EXPORT KColorButton : public QPushButton
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QColor color READ color WRITE setColor USER true )		Q_PROPERTY( QColor color READ color WRITE setColor NOTIFY changed USER true )
	Q_PROPERTY( QColor defaultColor READ defaultColor WRITE setDefaultColor )		Q_PROPERTY( QColor defaultColor READ defaultColor WRITE setDefaultColor )
	Q_PROPERTY( bool alphaChannelEnabled READ isAlphaChannelEnabled WRITE s etAlphaChannelEnabled )		Q_PROPERTY( bool alphaChannelEnabled READ isAlphaChannelEnabled WRITE s etAlphaChannelEnabled )
	public:		public:
	/**		/**
	* Creates a color button.		* Creates a color button.
	*/		*/
	explicit KColorButton( QWidget *parent = 0 );		explicit KColorButton( QWidget *parent = 0 );
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kcolorcombo.h		kcolorcombo.h
	skipping to change at line 47		skipping to change at line 47
	* Combobox for colors.		* Combobox for colors.
	*		*
	* The combobox provides some preset colors to be selected, and an entry to		* The combobox provides some preset colors to be selected, and an entry to
	* select a custom color using a color dialog.		* select a custom color using a color dialog.
	*		*
	* \image html kcolorcombo.png "KDE Color Combo Box"		* \image html kcolorcombo.png "KDE Color Combo Box"
	*/		*/
	class KDEUI_EXPORT KColorCombo : public QComboBox		class KDEUI_EXPORT KColorCombo : public QComboBox
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QColor color READ color WRITE setColor )		Q_PROPERTY( QColor color READ color WRITE setColor NOTIFY activated USE R true )
	Q_PROPERTY( QList<QColor> colors READ colors WRITE setColors )		Q_PROPERTY( QList<QColor> colors READ colors WRITE setColors )
	public:		public:
	/**		/**
	* Constructs a color combo box.		* Constructs a color combo box.
	*/		*/
	explicit KColorCombo(QWidget *parent = 0);		explicit KColorCombo(QWidget *parent = 0);
	~KColorCombo();		~KColorCombo();
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kcolorvalueselector.h		kcolorvalueselector.h
	skipping to change at line 31		skipping to change at line 31
	#ifndef KCOLORVALUESELECTOR_H		#ifndef KCOLORVALUESELECTOR_H
	#define KCOLORVALUESELECTOR_H		#define KCOLORVALUESELECTOR_H
	#include "kselector.h"		#include "kselector.h"
	#include "kcolorchoosermode.h"		#include "kcolorchoosermode.h"
	#include <QtGui/QPixmap>		#include <QtGui/QPixmap>
	class KDEUI_EXPORT KColorValueSelector : public KSelector		class KDEUI_EXPORT KColorValueSelector : public KSelector
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY( int hue READ hue WRITE setHue )
			Q_PROPERTY( int saturation READ saturation WRITE setSaturation )
			Q_PROPERTY( int colorValue READ colorValue WRITE setColorValue )
	public:		public:
	/**		/**
	* Constructs a widget for color selection.		* Constructs a widget for color selection.
	*/		*/
	explicit KColorValueSelector( QWidget *parent=0 );		explicit KColorValueSelector( QWidget *parent=0 );
	/**		/**
	* Constructs a widget for color selection with a given orientation		* Constructs a widget for color selection with a given orientation
	*/		*/
	explicit KColorValueSelector( Qt::Orientation o, QWidget *parent = 0 );		explicit KColorValueSelector( Qt::Orientation o, QWidget *parent = 0 );
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kcombobox.h		kcombobox.h
	skipping to change at line 184		skipping to change at line 184
	/**		/**
	* Destructor.		* Destructor.
	*/		*/
	virtual ~KComboBox();		virtual ~KComboBox();
	/**		/**
	* Deprecated to reflect Qt api changes		* Deprecated to reflect Qt api changes
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void insertURL( const KUrl& url, int index = -1 )		KDE_DEPRECATED void insertURL( const KUrl& url, int index = -1 )
	{ insertUrl( index < 0 ? count() : index, url ); }		{ insertUrl( index < 0 ? count() : index, url ); }
	KDE_DEPRECATED void insertURL( const QPixmap& pixmap, const KUrl& url, int index = -1 )		KDE_DEPRECATED void insertURL( const QPixmap& pixmap, const KUrl& url, int index = -1 )
	{ insertUrl( index < 0 ? count() : index, QIcon(pixmap), url ); }		{ insertUrl( index < 0 ? count() : index, QIcon(pixmap), url ); }
	KDE_DEPRECATED void changeURL( const KUrl& url, int index )		KDE_DEPRECATED void changeURL( const KUrl& url, int index )
	{ changeUrl( index, url ); }		{ changeUrl( index, url ); }
	KDE_DEPRECATED void changeURL( const QPixmap& pixmap, const KUrl& url, int index )		KDE_DEPRECATED void changeURL( const QPixmap& pixmap, const KUrl& url, int index )
	{ changeUrl( index, QIcon(pixmap), url ); }		{ changeUrl( index, QIcon(pixmap), url ); }
			#endif
	/**		/**
	* Sets @p url into the edit field of the combobox. It uses		* Sets @p url into the edit field of the combobox. It uses
	* KUrl::prettyUrl() so that the url is properly decoded for		* KUrl::prettyUrl() so that the url is properly decoded for
	* displaying.		* displaying.
	*/		*/
	void setEditUrl( const KUrl& url );		void setEditUrl( const KUrl& url );
	/**		/**
	* Appends @p url to the combobox.		* Appends @p url to the combobox.
	skipping to change at line 291		skipping to change at line 293
	* combo-box. Note that by default the mode changer item		* combo-box. Note that by default the mode changer item
	* is made visiable whenever the context menu is enabled.		* is made visiable whenever the context menu is enabled.
	* Use hideModechanger() if you want to hide this		* Use hideModechanger() if you want to hide this
	* item. Also by default, the context menu is created if		* item. Also by default, the context menu is created if
	* this widget is editable. Call this function with the		* this widget is editable. Call this function with the
	* argument set to false to disable the popup menu.		* argument set to false to disable the popup 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
	virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );		virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );
			#endif
	/**		/**
	* Enables/Disables handling of URL drops. If enabled and the user		* Enables/Disables handling of URL drops. If enabled and the user
	* drops an URL, the decoded URL will be inserted. Otherwise the defaul t		* drops an URL, the decoded URL will be inserted. Otherwise the defaul t
	* behavior of QComboBox is used, which inserts the encoded URL.		* behavior of QComboBox is used, which inserts the encoded URL.
	*		*
	* @param enable If @p true, insert decoded URLs		* @param enable If @p true, insert decoded URLs
	*/		*/
	void setUrlDropsEnabled( bool enable );		void setUrlDropsEnabled( bool enable );
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kconfig.h		kconfig.h
	skipping to change at line 349		skipping to change at line 349
	/// @{ global		/// @{ global
	/**		/**
	* @deprecated		* @deprecated
	*		*
	* Forces all following write-operations to be performed on @c kdegloba ls,		* Forces all following write-operations to be performed on @c kdegloba ls,
	* independent of the @c Global flag in writeEntry().		* independent of the @c Global flag in writeEntry().
	*		*
	* @param force true to force writing to kdeglobals		* @param force true to force writing to kdeglobals
	* @see forceGlobal		* @see forceGlobal
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setForceGlobal(bool force);		KDE_DEPRECATED void setForceGlobal(bool force);
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*		*
	* Returns whether all entries are being written to @c kdeglobals.		* Returns whether all entries are being written to @c kdeglobals.
	*		*
	* @return @c true if all entries are being written to @c kdeglobals		* @return @c true if all entries are being written to @c kdeglobals
	* @see setForceGlobal		* @see setForceGlobal
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool forceGlobal() const;		KDE_DEPRECATED bool forceGlobal() const;
			#endif
	/// @}		/// @}
	/// @reimp		/// @reimp
	QStringList groupList() const;		QStringList groupList() const;
	/**		/**
	* Returns a map (tree) of entries in a particular group.		* Returns a map (tree) of entries in a particular group.
	*		*
	* The entries are all returned as strings.		* The entries are all returned as strings.
	*		*
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kconfigdialogmanager.h		kconfigdialogmanager.h
	skipping to change at line 29		skipping to change at line 29
	* Boston, MA 02110-1301, USA.		* Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KCONFIGDIALOGMANAGER_H		#ifndef KCONFIGDIALOGMANAGER_H
	#define KCONFIGDIALOGMANAGER_H		#define KCONFIGDIALOGMANAGER_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QHash>		#include <QtCore/QHash>
			class KCoreConfigSkeleton;
	class KConfigSkeleton;		class KConfigSkeleton;
	class KConfigSkeletonItem;		class KConfigSkeletonItem;
	class QWidget;		class QWidget;
	/**		/**
	* @short Provides a means of automatically retrieving,		* @short Provides a means of automatically retrieving,
	* saving and resetting KConfigSkeleton based settings in a dialog.		* saving and resetting KConfigSkeleton based settings in a dialog.
	*		*
	* The KConfigDialogManager class provides a means of automatically		* The KConfigDialogManager class provides a means of automatically
	* retrieving, saving and resetting basic settings.		* retrieving, saving and resetting basic settings.
	skipping to change at line 121		skipping to change at line 122
	*/		*/
	void widgetModified();		void widgetModified();
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
	* @param parent Dialog widget to manage		* @param parent Dialog widget to manage
	* @param conf Object that contains settings		* @param conf Object that contains settings
	*/		*/
			KConfigDialogManager(QWidget *parent, KCoreConfigSkeleton *conf);
			/**
			* Constructor.
			* @param parent Dialog widget to manage
			* @param conf Object that contains settings
			*/
	KConfigDialogManager(QWidget *parent, KConfigSkeleton *conf);		KConfigDialogManager(QWidget *parent, KConfigSkeleton *conf);
	/**		/**
	* Destructor.		* Destructor.
	*/		*/
	~KConfigDialogManager();		~KConfigDialogManager();
	/**		/**
	* Add additional widgets to manage		* Add additional widgets to manage
	* @param widget Additional widget to manage, inlcuding all its children		* @param widget Additional widget to manage, inlcuding all its children
End of changes. 2 change blocks.
	0 lines changed or deleted		8 lines changed or added

	kconfiggroup.h		kconfiggroup.h
	skipping to change at line 152		skipping to change at line 152
	* Return the config object that this group belongs to		* Return the config object that this group belongs to
	*/		*/
	const KConfig* config() const;		const KConfig* config() const;
	/**		/**
	* Changes the group of the object		* Changes the group of the object
	*		*
	* @deprecated		* @deprecated
	* Create another KConfigGroup from the parent of this group instead.		* Create another KConfigGroup from the parent of this group instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void changeGroup(const QString &group);		KDE_DEPRECATED void changeGroup(const QString &group);
			#endif
	/**		/**
	* Overload for changeGroup(const QString&)		* Overload for changeGroup(const QString&)
	*		*
	* @deprecated		* @deprecated
	* Create another KConfigGroup from the parent of this group instead.		* Create another KConfigGroup from the parent of this group instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void changeGroup(const char *group);		KDE_DEPRECATED void changeGroup(const char *group);
			#endif
	/**		/**
	* Copies the entries in this group to another configuration object		* Copies the entries in this group to another configuration object
	*		*
	* @note @p other can be either another group or a different file.		* @note @p other can be either another group or a different file.
	*		*
	* @param other the configuration object to copy this group's entries to		* @param other the configuration object to copy this group's entries to
	* @param pFlags the flags to use when writing the entries to the		* @param pFlags the flags to use when writing the entries to the
	* other configuration object		* other configuration object
	*		*
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kcoreconfigskeleton.h		kcoreconfigskeleton.h
	skipping to change at line 598		skipping to change at line 598
	/** @copydoc ItemInt::setMaxValue(qint32) */		/** @copydoc ItemInt::setMaxValue(qint32) */
	void setMaxValue(qint64);		void setMaxValue(qint64);
	private:		private:
	bool mHasMin : 1;		bool mHasMin : 1;
	bool mHasMax : 1;		bool mHasMax : 1;
	qint64 mMin;		qint64 mMin;
	qint64 mMax;		qint64 mMax;
	};		};
			#ifndef KDE_NO_DEPRECATED
	typedef KDE_DEPRECATED ItemLongLong ItemInt64;		typedef KDE_DEPRECATED ItemLongLong ItemInt64;
			#endif
	/**		/**
	* Class for handling enums.		* Class for handling enums.
	*/		*/
	class KDECORE_EXPORT ItemEnum:public ItemInt		class KDECORE_EXPORT ItemEnum:public ItemInt
	{		{
	public:		public:
	//KDE5: remove the old Choice struct, rename Choice2 to Choice		//KDE5: remove the old Choice struct, rename Choice2 to Choice
	struct Choice		struct Choice
	{		{
	skipping to change at line 728		skipping to change at line 730
	/** @copydoc ItemInt::setMaxValue(qint32) */		/** @copydoc ItemInt::setMaxValue(qint32) */
	void setMaxValue(quint64);		void setMaxValue(quint64);
	private:		private:
	bool mHasMin : 1;		bool mHasMin : 1;
	bool mHasMax : 1;		bool mHasMax : 1;
	quint64 mMin;		quint64 mMin;
	quint64 mMax;		quint64 mMax;
	};		};
			#ifndef KDE_NO_DEPRECATED
	typedef KDE_DEPRECATED ItemULongLong ItemUInt64;		typedef KDE_DEPRECATED ItemULongLong ItemUInt64;
			#endif
	/**		/**
	* Class for handling a floating point preference item.		* Class for handling a floating point preference item.
	*/		*/
	class KDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < doubl e >		class KDECORE_EXPORT ItemDouble:public KConfigSkeletonGenericItem < doubl e >
	{		{
	public:		public:
	/** @copydoc KConfigSkeletonGenericItem::KConfigSkeletonGenericItem */		/** @copydoc KConfigSkeletonGenericItem::KConfigSkeletonGenericItem */
	ItemDouble(const QString & _group, const QString & _key,		ItemDouble(const QString & _group, const QString & _key,
	double &reference, double defaultValue = 0);		double &reference, double defaultValue = 0);
	skipping to change at line 1162		skipping to change at line 1166
	* @return The created item		* @return The created item
	*/		*/
	ItemLongLong *addItemLongLong(const QString & name, qint64 &reference,		ItemLongLong *addItemLongLong(const QString & name, qint64 &reference,
	qint64 defaultValue = 0,		qint64 defaultValue = 0,
	const QString & key = QString());		const QString & key = QString());
	/**		/**
	* @deprecated		* @deprecated
	* Use addItemLongLong().		* Use addItemLongLong().
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED ItemLongLong *addItemInt64( const QString& name, qint64 &r eference,		KDE_DEPRECATED ItemLongLong *addItemInt64( const QString& name, qint64 &r eference,
	qint64 defaultValue = 0,		qint64 defaultValue = 0,
	const QString & key = QString());		const QString & key = QString());
			#endif
	/**		/**
	* Register an item of type quint64		* Register an item of type quint64
	*		*
	* @param name Name used to identify this setting. Names must be unique.		* @param name Name used to identify this setting. Names must be unique.
	* @param reference Pointer to the variable, which is set by readConfig()		* @param reference Pointer to the variable, which is set by readConfig()
	* calls and read by writeConfig() calls.		* calls and read by writeConfig() calls.
	* @param defaultValue Default value, which is used when the config file		* @param defaultValue Default value, which is used when the config file
	* does not yet contain the key of this item.		* does not yet contain the key of this item.
	* @param key Key used in config file. If key is null, name is used as ke y.		* @param key Key used in config file. If key is null, name is used as ke y.
	* @return The created item		* @return The created item
	*/		*/
	ItemULongLong *addItemULongLong(const QString & name, quint64 &reference,		ItemULongLong *addItemULongLong(const QString & name, quint64 &reference,
	quint64 defaultValue = 0,		quint64 defaultValue = 0,
	const QString & key = QString());		const QString & key = QString());
	/**		/**
	* @deprecated		* @deprecated
	* Use addItemULongLong().		* Use addItemULongLong().
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED ItemULongLong *addItemUInt64(const QString & name, quint64 &reference,		KDE_DEPRECATED ItemULongLong *addItemUInt64(const QString & name, quint64 &reference,
	quint64 defaultValue = 0,		quint64 defaultValue = 0,
	const QString & key = QString());		const QString & key = QString());
			#endif
	/**		/**
	* Register an item of type double.		* Register an item of type double.
	*		*
	* @param name Name used to identify this setting. Names must be unique.		* @param name Name used to identify this setting. Names must be unique.
	* @param reference Pointer to the variable, which is set by readConfig()		* @param reference Pointer to the variable, which is set by readConfig()
	* calls and read by writeConfig() calls.		* calls and read by writeConfig() calls.
	* @param defaultValue Default value, which is used when the config file		* @param defaultValue Default value, which is used when the config file
	* does not yet contain the key of this item.		* does not yet contain the key of this item.
	* @param key Key used in config file. If key is null, name is used as ke y.		* @param key Key used in config file. If key is null, name is used as ke y.
End of changes. 8 change blocks.
	0 lines changed or deleted		8 lines changed or added

	kdatatool.h		kdatatool.h
	skipping to change at line 106		skipping to change at line 106
	* Checks whether the DataTool is read-only.		* Checks whether the DataTool is read-only.
	* @return true if the DataTool does not modify the data passed to it b y KDataTool::run.		* @return true if the DataTool does not modify the data passed to it b y KDataTool::run.
	*/		*/
	bool isReadOnly() const;		bool isReadOnly() const;
	/**		/**
	* Returns the icon of this data tool.		* Returns the icon of this data tool.
	* @return a large pixmap for the DataTool.		* @return a large pixmap for the DataTool.
	* @deprecated, use iconName()		* @deprecated, use iconName()
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QPixmap icon() const;		KDE_DEPRECATED QPixmap icon() const;
			#endif
	/**		/**
	* Returns the mini icon of this data tool.		* Returns the mini icon of this data tool.
	* @return a mini pixmap for the DataTool.		* @return a mini pixmap for the DataTool.
	* @deprecated, use iconName()		* @deprecated, use iconName()
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QPixmap miniIcon() const;		KDE_DEPRECATED QPixmap miniIcon() const;
			#endif
	/**		/**
	* Returns the icon name for this DataTool.		* Returns the icon name for this DataTool.
	* @return the name of the icon for the DataTool		* @return the name of the icon for the DataTool
	*/		*/
	QString iconName() const;		QString iconName() const;
	/**		/**
	* Returns a list of strings that you can put in a QPopupMenu item, for example to		* Returns a list of strings that you can put in a QPopupMenu item, for example to
	* offer the DataTools services to the user. The returned value		* offer the DataTools services to the user. The returned value
	* is usually something like "Spell checking", "Shrink Image", "Rotate Image"		* is usually something like "Spell checking", "Shrink Image", "Rotate Image"
	* or something like that.		* or something like that.
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kdatepicker.h		kdatepicker.h
	skipping to change at line 30		skipping to change at line 30
	*/		*/
	#ifndef KDATEPICKER_H		#ifndef KDATEPICKER_H
	#define KDATEPICKER_H		#define KDATEPICKER_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtCore/QDateTime>		#include <QtCore/QDateTime>
	#include <QtGui/QFrame>		#include <QtGui/QFrame>
			#include <klocale.h>
	class QLineEdit;		class QLineEdit;
	class KDateTable;		class KDateTable;
	class KCalendarSystem;		class KCalendarSystem;
	/**		/**
	* @short A date selection widget.		* @short A date selection widget.
	*		*
	* Provides a widget for calendar date input.		* Provides a widget for calendar date input.
	*		*
	* Different from the		* Different from the
	skipping to change at line 56		skipping to change at line 58
	* or 990101.		* or 990101.
	*		*
	* \image html kdatepicker.png "KDE Date Widget"		* \image html kdatepicker.png "KDE Date Widget"
	*		*
	* @author Tim Gilman, Mirko Boehm		* @author Tim Gilman, Mirko Boehm
	*		*
	**/		**/
	class KDEUI_EXPORT KDatePicker: public QFrame		class KDEUI_EXPORT KDatePicker: public QFrame
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QDate date READ date WRITE setDate USER true )		Q_PROPERTY( QDate date READ date WRITE setDate NOTIFY dateChanged USER true )
	//FIXME Q_PROPERTY( KCalendarSystem calendar READ calendar WRITE setCale ndar USER true )		//FIXME Q_PROPERTY( KCalendarSystem calendar READ calendar WRITE setCale ndar USER true )
	Q_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton )		Q_PROPERTY( bool closeButton READ hasCloseButton WRITE setCloseButton )
	Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )		Q_PROPERTY( int fontSize READ fontSize WRITE setFontSize )
	public:		public:
	/**		/**
	* The constructor. The current date will be displayed initially.		* The constructor. The current date will be displayed initially.
	**/		**/
	explicit KDatePicker( QWidget *parent = 0 );		explicit KDatePicker( QWidget *parent = 0 );
	skipping to change at line 123		skipping to change at line 125
	/**		/**
	* Changes the calendar system to use. Will always use global locale.		* Changes the calendar system to use. Will always use global locale.
	*		*
	* @param calendarType the calendar system type to use		* @param calendarType the calendar system type to use
	*		*
	* @return @c true if the calendar system was successfully set, @c fals e otherwise		* @return @c true if the calendar system was successfully set, @c fals e otherwise
	*/		*/
	bool setCalendar( const QString &calendarType );		bool setCalendar( const QString &calendarType );
	/**		/**
			* @since 4.6
			*
			* Changes the calendar system to use. Will always use global locale.
			*
			* @param calendarSystem the calendar system to use
			* @return @c true if the calendar system was successfully set, @c fals
			e otherwise
			*/
			bool setCalendarSystem( KLocale::CalendarSystem calendarSystem );
			/**
	* Enables or disables the widget.		* Enables or disables the widget.
	**/		**/
	void setEnabled( bool enable );		void setEnabled( bool enable );
	/**		/**
	* @returns the KDateTable widget child of this KDatePicker		* @returns the KDateTable widget child of this KDatePicker
	* widget.		* widget.
	*/		*/
	KDateTable *dateTable() const;		KDateTable *dateTable() const;
End of changes. 3 change blocks.
	1 lines changed or deleted		14 lines changed or added

	kdatetable.h		kdatetable.h
	skipping to change at line 31		skipping to change at line 31
	#ifndef KDATETABLE_H		#ifndef KDATETABLE_H
	#define KDATETABLE_H		#define KDATETABLE_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QValidator>		#include <QtGui/QValidator>
	#include <QtGui/QLineEdit>		#include <QtGui/QLineEdit>
	#include <QtCore/QDateTime>		#include <QtCore/QDateTime>
			#include <klocale.h>
	class KMenu;		class KMenu;
	class KCalendarSystem;		class KCalendarSystem;
	class KColorScheme;		class KColorScheme;
	/**		/**
	* Frame with popup menu behavior.		* Frame with popup menu behavior.
	* @author Tim Gilman, Mirko Boehm		* @author Tim Gilman, Mirko Boehm
	*/		*/
	class KDEUI_EXPORT KPopupFrame : public QFrame		class KDEUI_EXPORT KPopupFrame : public QFrame
	{		{
	skipping to change at line 179		skipping to change at line 181
	/**		/**
	* Set the font size of the date table.		* Set the font size of the date table.
	*/		*/
	void setFontSize( int size );		void setFontSize( int size );
	/**		/**
	* Select and display this date.		* Select and display this date.
	*/		*/
	bool setDate( const QDate &date );		bool setDate( const QDate &date );
			// KDE5 remove the const & from the returned QDate
	/**		/**
	* @returns the selected date.		* @returns the selected date.
	*/		*/
	const QDate &date() const;		const QDate &date() const;
	/**		/**
	* Returns the currently selected calendar system.		* Returns the currently selected calendar system.
	*		*
	* @return a KCalendarSystem object		* @return a KCalendarSystem object
	*/		*/
	skipping to change at line 210		skipping to change at line 213
	/**		/**
	* Changes the calendar system to use. Will always use global locale.		* Changes the calendar system to use. Will always use global locale.
	*		*
	* @param calendarType the calendar system type to use		* @param calendarType the calendar system type to use
	*		*
	* @return @c true if the calendar system was successfully set, @c fals e otherwise		* @return @c true if the calendar system was successfully set, @c fals e otherwise
	*/		*/
	bool setCalendar( const QString &calendarType );		bool setCalendar( const QString &calendarType );
	/**		/**
			* @since 4.6
			*
			* Changes the calendar system to use. Will always use global locale.
			*
			* @param calendarSystem the calendar system to use
			* @return @c true if the calendar system was successfully set, @c fals
			e otherwise
			*/
			bool setCalendarSystem( KLocale::CalendarSystem calendarSystem );
			/**
	* Enables a popup menu when right clicking on a date.		* Enables a popup menu when right clicking on a date.
	*		*
	* When it's enabled, this object emits a aboutToShowContextMenu signal		* When it's enabled, this object emits a aboutToShowContextMenu signal
	* where you can fill in the menu items.		* where you can fill in the menu items.
	*/		*/
	void setPopupMenuEnabled( bool enable );		void setPopupMenuEnabled( bool enable );
	/**		/**
	* Returns if the popup menu is enabled or not		* Returns if the popup menu is enabled or not
	*/		*/
	skipping to change at line 304		skipping to change at line 317
	Q_PRIVATE_SLOT( d, void beginningOfMonth() )		Q_PRIVATE_SLOT( d, void beginningOfMonth() )
	Q_PRIVATE_SLOT( d, void endOfMonth() )		Q_PRIVATE_SLOT( d, void endOfMonth() )
	Q_PRIVATE_SLOT( d, void beginningOfWeek() )		Q_PRIVATE_SLOT( d, void beginningOfWeek() )
	Q_PRIVATE_SLOT( d, void endOfWeek() )		Q_PRIVATE_SLOT( d, void endOfWeek() )
	private:		private:
	class KDateTablePrivate;		class KDateTablePrivate;
	friend class KDateTablePrivate;		friend class KDateTablePrivate;
	KDateTablePrivate * const d;		KDateTablePrivate * const d;
			void init( const QDate &date );
	void initAccels();		void initAccels();
	void paintCell( QPainter *painter, int row, int col, const KColorScheme &colorScheme );		void paintCell( QPainter *painter, int row, int col, const KColorScheme &colorScheme );
	Q_DISABLE_COPY( KDateTable )		Q_DISABLE_COPY( KDateTable )
	};		};
	#endif // KDATETABLE_H		#endif // KDATETABLE_H
End of changes. 4 change blocks.
	0 lines changed or deleted		15 lines changed or added

	kdatetime.h		kdatetime.h
	skipping to change at line 32		skipping to change at line 32
	* Date/times with associated time zone		* Date/times with associated time zone
	* @author David Jarvie <djarvie@kde.org>.		* @author David Jarvie <djarvie@kde.org>.
	*/		*/
	#ifndef _KDATETIME_H_		#ifndef _KDATETIME_H_
	#define _KDATETIME_H_		#define _KDATETIME_H_
	#include <kdecore_export.h>		#include <kdecore_export.h>
	#include <ktimezone.h>		#include <ktimezone.h>
	#include <QMetaType>		#include <QtCore/QMetaType>
	#include <QtCore/QSharedDataPointer>		#include <QtCore/QSharedDataPointer>
	class QDataStream;		class QDataStream;
	class KDateTimePrivate;		class KDateTimePrivate;
	class KDateTimeSpecPrivate;		class KDateTimeSpecPrivate;
	/**		/**
	* @short A class representing a date and time with an associated time zone		* @short A class representing a date and time with an associated time zone
	*		*
	* Topics:		* Topics:
	skipping to change at line 1583		skipping to change at line 1583
	* \code		* \code
	* #ifndef NDEBUG		* #ifndef NDEBUG
	* KDateTime::simulateSystemTime(kdt);		* KDateTime::simulateSystemTime(kdt);
	* #endif		* #endif
	* \endcode		* \endcode
	*		*
	* @param newTime the current simulated time, or invalid to cancel simu lation		* @param newTime the current simulated time, or invalid to cancel simu lation
	*		*
	* @see currentDateTime(), currentLocalDateTime(), currentUtcDateTime() ,		* @see currentDateTime(), currentLocalDateTime(), currentUtcDateTime() ,
	* currentLocalDate(), currentLocalTime()		* currentLocalDate(), currentLocalTime()
			* @since 4.3
	*/		*/
	static void setSimulatedSystemTime(const KDateTime& newTime);		static void setSimulatedSystemTime(const KDateTime& newTime);
	/**		/**
	* Return the real (not simulated) system time.		* Return the real (not simulated) system time.
	*		*
	* @warning This method is provided only for testing purposes, and shou ld		* @warning This method is provided only for testing purposes, and shou ld
	* not be used in released code. If the library is compiled wi thout		* not be used in released code. If the library is compiled wi thout
	* debug enabled, currentLocalDateTime() and realCurrentLocalD ateTime()		* debug enabled, currentLocalDateTime() and realCurrentLocalD ateTime()
	* both return the real system time.		* both return the real system time.
	* To avoid confusion, it is recommended that calls to		* To avoid confusion, it is recommended that calls to
	* realCurrentLocalDateTime() should be conditionally compiled , e.g.:		* realCurrentLocalDateTime() should be conditionally compiled , e.g.:
	* \code		* \code
	* #ifndef NDEBUG		* #ifndef NDEBUG
	* dt = KDateTime::realCurrentLocalDateTime();		* dt = KDateTime::realCurrentLocalDateTime();
	* #endif		* #endif
	* \endcode		* \endcode
			*
			* @since 4.3
	*/		*/
	static KDateTime realCurrentLocalDateTime();		static KDateTime realCurrentLocalDateTime();
	friend QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const K DateTime &dateTime);		friend QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const K DateTime &dateTime);
	friend QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTim e &dateTime);		friend QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTim e &dateTime);
	private:		private:
	QSharedDataPointer<KDateTimePrivate> d;		QSharedDataPointer<KDateTimePrivate> d;
	};		};
End of changes. 3 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kdatetimewidget.h		kdatetimewidget.h
	skipping to change at line 42		skipping to change at line 42
	*		*
	* @see KDateWidget		* @see KDateWidget
	*		*
	* \image html kdatetimewidget.png "KDE Date Time Widget"		* \image html kdatetimewidget.png "KDE Date Time Widget"
	*		*
	* @author Hans Petter Bieker <bieker@kde.org>		* @author Hans Petter Bieker <bieker@kde.org>
	*/		*/
	class KDEUI_EXPORT KDateTimeWidget : public QWidget		class KDEUI_EXPORT KDateTimeWidget : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QDateTime dateTime READ dateTime WRITE setDateTime USER true )		Q_PROPERTY( QDateTime dateTime READ dateTime WRITE setDateTime NOTIFY val ueChanged USER true )
	public:		public:
	/**		/**
	* Constructs a date and time selection widget.		* Constructs a date and time selection widget.
	*/		*/
	explicit KDateTimeWidget(QWidget * parent = 0);		explicit KDateTimeWidget(QWidget * parent = 0);
	/**		/**
	* Constructs a date and time selection widget with the initial date and		* Constructs a date and time selection widget with the initial date and
	* time set to @p datetime.		* time set to @p datetime.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kdatewidget.h		kdatewidget.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KDATEWIDGET_H		#ifndef KDATEWIDGET_H
	#define KDATEWIDGET_H		#define KDATEWIDGET_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QWidget>		#include <QtGui/QWidget>
			#include "klocale.h"
	class KCalendarSystem;		class KCalendarSystem;
	class QDate;		class QDate;
	/**		/**
	* @short A date selection widget.		* @short A date selection widget.
	*		*
	* This widget can be used to display or allow user selection of a date.		* This widget can be used to display or allow user selection of a date.
	*		*
	* \image html kdatewidget.png "KDE Date Widget"		* \image html kdatewidget.png "KDE Date Widget"
	*		*
	* @see KDatePicker		* @see KDatePicker
	*		*
	* @author Waldo Bastian <bastian@kde.org>, John Layt <john@layt.net>		* @author Waldo Bastian <bastian@kde.org>, John Layt <john@layt.net>
	*/		*/
	class KDEUI_EXPORT KDateWidget : public QWidget		class KDEUI_EXPORT KDateWidget : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QDate date READ date WRITE setDate USER true )		Q_PROPERTY( QDate date READ date WRITE setDate NOTIFY changed USER true )
	//FIXME Q_PROPERTY( KCalendarSystem calendar READ calendar WRITE setCale ndar USER true )		//FIXME Q_PROPERTY( KCalendarSystem calendar READ calendar WRITE setCale ndar USER true )
	public:		public:
	/**		/**
	* Constructs a date selection widget.		* Constructs a date selection widget.
	*/		*/
	explicit KDateWidget( QWidget *parent = 0 );		explicit KDateWidget( QWidget *parent = 0 );
	/**		/**
	* Constructs a date selection widget with the initial date set to @p d ate.		* Constructs a date selection widget with the initial date set to @p d ate.
	*/		*/
	explicit KDateWidget( const QDate &date, QWidget *parent = 0 );		explicit KDateWidget( const QDate &date, QWidget *parent = 0 );
	/**		/**
	* Destructs the date selection widget.		* Destructs the date selection widget.
	*/		*/
	virtual ~KDateWidget();		virtual ~KDateWidget();
			// KDE5 remove const &
	/**		/**
	* Returns the currently selected date.		* Returns the currently selected date.
	*/		*/
	const QDate& date() const;		const QDate& date() const;
	/**		/**
	* Changes the selected date to @p date.		* Changes the selected date to @p date.
	*		*
	* @return @c true if the date was successfully set, @c false otherwise		* @return @c true if the date was successfully set, @c false otherwise
	*/		*/
	skipping to change at line 101		skipping to change at line 104
	/**		/**
	* Changes the calendar system to use. Will always use global locale.		* Changes the calendar system to use. Will always use global locale.
	*		*
	* @param calendarType the calendar system type to use		* @param calendarType the calendar system type to use
	*		*
	* @return @c true if the calendar system was successfully set, @c fals e otherwise		* @return @c true if the calendar system was successfully set, @c fals e otherwise
	*/		*/
	bool setCalendar( const QString &calendarType );		bool setCalendar( const QString &calendarType );
			/**
			* @since 4.6
			*
			* Changes the calendar system to use. Will always use global locale.
			*
			* @param calendarSystem the calendar system to use
			* @return @c true if the calendar system was successfully set, @c fals
			e otherwise
			*/
			bool setCalendarSystem( KLocale::CalendarSystem calendarSystem );
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted whenever the date of the widget		* Emitted whenever the date of the widget
	* is changed, either with setDate() or via user selection.		* is changed, either with setDate() or via user selection.
	*/		*/
	void changed( const QDate& date );		void changed( const QDate& date );
	protected:		protected:
	void init( const QDate& date );		void init( const QDate& date );
End of changes. 4 change blocks.
	1 lines changed or deleted		15 lines changed or added

	kde3support_export.h		kde3support_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KDE3SUPPORT_EXPORT_H		#ifndef KDE3SUPPORT_EXPORT_H
	#define KDE3SUPPORT_EXPORT_H		#define KDE3SUPPORT_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KDE3SUPPORT_EXPORT		#ifndef KDE3SUPPORT_EXPORT
	# if defined(MAKE_KDE3SUPPORT_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KDE3SUPPORT_EXPORT
			# elif defined(MAKE_KDE3SUPPORT_LIB)
	/* We are building this library */		/* We are building this library */
	# define KDE3SUPPORT_EXPORT KDE_EXPORT		# define KDE3SUPPORT_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KDE3SUPPORT_EXPORT KDE_IMPORT		# define KDE3SUPPORT_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KDE3SUPPORT_EXPORT_DEPRECATED		# ifndef KDE3SUPPORT_EXPORT_DEPRECATED
	# define KDE3SUPPORT_EXPORT_DEPRECATED KDE_DEPRECATED KDE3SUPPORT_EXPORT		# define KDE3SUPPORT_EXPORT_DEPRECATED KDE_DEPRECATED KDE3SUPPORT_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kdebug.h		kdebug.h
	skipping to change at line 28		skipping to change at line 28
	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 _KDEBUG_H_		#ifndef _KDEBUG_H_
	#define _KDEBUG_H_		#define _KDEBUG_H_
	#include <kdecore_export.h>		#include <kdecore_export.h>
	#include <QtCore/QDebug>		#include <QtCore/QDebug>
			#include <QtCore/QElapsedTimer>
	/**		/**
	* \addtogroup kdebug Debug message generators		* \addtogroup kdebug Debug message generators
	* @{		* @{
	* KDE debug message streams let you and the user control just how many deb ug		* KDE debug message streams let you and the user control just how many deb ug
	* messages you see. Debug message printing is controlled by (un)defining		* messages you see. Debug message printing is controlled by (un)defining
	* QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then d ebug		* QT_NO_DEBUG when compiling your source. If QT_NO_DEBUG is defined then d ebug
	* messages are not printed by default but can still be enabled by runtime		* messages are not printed by default but can still be enabled by runtime
	* configuration, e.g. via kdebugdialog or by editing kdebugrc.		* configuration, e.g. via kdebugdialog or by editing kdebugrc.
			*
			* You can also control what you see: process name, area name, method name,
			* file and line number, timestamp, etc. using environment variables.
			* See http://techbase.kde.org/SysAdmin/Environment_Variables#KDE_DEBUG_NOP
			ROCESSINFO
	*/		*/
	#if !defined(KDE_NO_DEBUG_OUTPUT)		#if !defined(KDE_NO_DEBUG_OUTPUT)
	# if defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)		# if defined(QT_NO_DEBUG_OUTPUT) || defined(QT_NO_DEBUG_STREAM)
	# define KDE_NO_DEBUG_OUTPUT		# define KDE_NO_DEBUG_OUTPUT
	# endif		# endif
	#endif		#endif
	#if !defined(KDE_NO_WARNING_OUTPUT)		#if !defined(KDE_NO_WARNING_OUTPUT)
	# if defined(QT_NO_WARNING_OUTPUT)		# if defined(QT_NO_WARNING_OUTPUT)
	skipping to change at line 217		skipping to change at line 222
	KDECORE_EXPORT QDebug perror(QDebug, KDebugTag);		KDECORE_EXPORT QDebug perror(QDebug, KDebugTag);
	// operators for KDE types		// operators for KDE types
	class KUrl;		class KUrl;
	class KDateTime;		class KDateTime;
	class QObject;		class QObject;
	KDECORE_EXPORT QDebug operator<<(QDebug s, const KUrl &url);		KDECORE_EXPORT QDebug operator<<(QDebug s, const KUrl &url);
	KDECORE_EXPORT QDebug operator<<(QDebug s, const KDateTime &time);		KDECORE_EXPORT QDebug operator<<(QDebug s, const KDateTime &time);
	#if 1 || defined(KDE3_SUPPORT)		#if 1 || defined(KDE3_SUPPORT)
			#ifndef KDE_NO_DEPRECATED
	class KDE_DEPRECATED kndbgstream { };		class KDE_DEPRECATED kndbgstream { };
	typedef QDebug kdbgstream;		typedef QDebug kdbgstream;
	static inline KDE_DEPRECATED QDebug kdDebug(int area = KDE_DEFAULT_DEBUG_AR EA) { return kDebug(area); }		static inline KDE_DEPRECATED QDebug kdDebug(int area = KDE_DEFAULT_DEBUG_AR EA) { return kDebug(area); }
	static inline KDE_DEPRECATED QDebug kdWarning(int area = KDE_DEFAULT_DEBUG_ AREA) { return kWarning(area); }		static inline KDE_DEPRECATED QDebug kdWarning(int area = KDE_DEFAULT_DEBUG_ AREA) { return kWarning(area); }
	static inline KDE_DEPRECATED QDebug kdError(int area = KDE_DEFAULT_DEBUG_AR EA) { return kError(area); }		static inline KDE_DEPRECATED QDebug kdError(int area = KDE_DEFAULT_DEBUG_AR EA) { return kError(area); }
	static inline KDE_DEPRECATED QDebug kdFatal(int area = KDE_DEFAULT_DEBUG_AR EA) { return kFatal(area); }		static inline KDE_DEPRECATED QDebug kdFatal(int area = KDE_DEFAULT_DEBUG_AR EA) { return kFatal(area); }
	inline KDE_DEPRECATED QString kdBacktrace(int levels=-1) { return kBacktrac e( levels ); }		inline KDE_DEPRECATED QString kdBacktrace(int levels=-1) { return kBacktrac e( levels ); }
	static inline KDE_DEPRECATED QDebug kndDebug() { return kDebugDevNull(); }		static inline KDE_DEPRECATED QDebug kndDebug() { return kDebugDevNull(); }
	#endif		#endif
			#endif
	class WrongSyntax {};		class WrongSyntax {};
	/**		/**
	* @internal		* @internal
	* A class for using operator()		* A class for using operator()
	*/		*/
	class KDebug //krazy= ?		class KDebug //krazy= ?
	{		{
	const char *file;		const char *file;
	const char *funcinfo;		const char *funcinfo;
	int line;		int line;
	QtMsgType level;		QtMsgType level;
	public:		public:
			class Block;
	explicit inline KDebug(QtMsgType type, const char *f = 0, int l = -1, c onst char *info = 0)		explicit inline KDebug(QtMsgType type, const char *f = 0, int l = -1, c onst char *info = 0)
	: file(f), funcinfo(info), line(l), level(type)		: file(f), funcinfo(info), line(l), level(type)
	{ }		{
			#ifdef KDE4_CMAKE_TOPLEVEL_DIR_LENGTH // set by FindKDE4Internal.cmake
			file = file + KDE4_CMAKE_TOPLEVEL_DIR_LENGTH + 1;
			#endif
			}
	inline QDebug operator()(int area = KDE_DEFAULT_DEBUG_AREA)		inline QDebug operator()(int area = KDE_DEFAULT_DEBUG_AREA)
	{ return kDebugStream(level, area, file, line, funcinfo); }		{ return kDebugStream(level, area, file, line, funcinfo); }
	inline QDebug operator()(bool cond, int area = KDE_DEFAULT_DEBUG_AREA)		inline QDebug operator()(bool cond, int area = KDE_DEFAULT_DEBUG_AREA)
	{ if (cond) return operator()(area); return kDebugDevNull(); }		{ if (cond) return operator()(area); return kDebugDevNull(); }
	/// @internal		/// @internal
	static KDECORE_EXPORT bool hasNullOutput(QtMsgType type,		static KDECORE_EXPORT bool hasNullOutput(QtMsgType type,
	bool condition,		bool condition,
	int area,		int area,
	skipping to change at line 309		skipping to change at line 322
	# endif		# endif
	#else		#else
	# define kDebug while (false) kDebug		# define kDebug while (false) kDebug
	#endif		#endif
	#if !defined(KDE_NO_WARNING_OUTPUT)		#if !defined(KDE_NO_WARNING_OUTPUT)
	# define kWarning KDebug(QtWarningMsg, __FILE__, __LINE__, Q_FUNC_INFO)		# define kWarning KDebug(QtWarningMsg, __FILE__, __LINE__, Q_FUNC_INFO)
	#else		#else
	# define kWarning while (false) kWarning		# define kWarning while (false) kWarning
	#endif		#endif
			#ifndef KDE_NO_DEBUG_OUTPUT
			/**
			* @class KDebug::Block
			* @short Use this to label sections of your code
			* @since 4.6
			*
			* Usage:
			* <code>
			* void function()
			* {
			* KDebug::Block myBlock( "section" );
			*
			* debug() << "output1" << endl;
			* debug() << "output2" << endl;
			* }
			* </code>
			*
			* Will output:
			*
			* app: BEGIN: section
			* app: [prefix] output1
			* app: [prefix] output2
			* app: END: section - Took 0.1s
			*
			* Alternatively, use the KDEBUG_BLOCK macro, for automatic naming.
			*/
			class KDECORE_EXPORT KDebug::Block
			{
			public:
			Block(const char* label, int area = KDE_DEFAULT_DEBUG_AREA);
			~Block();
			private:
			QElapsedTimer m_startTime;
			const char *m_label;
			int m_area;
			int m_color;
			class Private;
			Private* const d;
			};
			/**
			* Convenience macro for making a standard KDebug::Block
			*/
			#define KDEBUG_BLOCK KDebug::Block _kDebugBlock(Q_FUNC_INFO);
			#else
			class KDECORE_EXPORT KDebug::Block
			{
			public:
			Block(const char*, int = KDE_DEFAULT_DEBUG_AREA) {}
			~Block() {}
			};
			#define KDEBUG_BLOCK
			#endif
			/**
			* Convenience macro, use this to remind yourself to finish the implementat
			ion of a function
			* The function name will appear in the output (unless $KDE_DEBUG_NOMETHODN
			AME is set)
			* @since 4.6
			*/
			#define KWARNING_NOTIMPLEMENTED kWarning() << "NOT-IMPLEMENTED";
			/**
			* Convenience macro, use this to alert other developers to stop using a fu
			nction
			* The function name will appear in the output (unless $KDE_DEBUG_NOMETHODN
			AME is set)
			* @since 4.6
			*/
			#define KWARNING_DEPRECATED kWarning() << "DEPRECATED";
	/** @} */		/** @} */
	#endif		#endif
End of changes. 7 change blocks.
	1 lines changed or deleted		92 lines changed or added

	kdecore_export.h		kdecore_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KDECORE_EXPORT_H		#ifndef KDECORE_EXPORT_H
	#define KDECORE_EXPORT_H		#define KDECORE_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KDECORE_EXPORT		#ifndef KDECORE_EXPORT
	# if defined(MAKE_KDECORE_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KDECORE_EXPORT
			# elif defined(MAKE_KDECORE_LIB)
	/* We are building this library */		/* We are building this library */
	# define KDECORE_EXPORT KDE_EXPORT		# define KDECORE_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KDECORE_EXPORT KDE_IMPORT		# define KDECORE_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KDECORE_EXPORT_DEPRECATED		# ifndef KDECORE_EXPORT_DEPRECATED
	# define KDECORE_EXPORT_DEPRECATED KDE_DEPRECATED KDECORE_EXPORT		# define KDECORE_EXPORT_DEPRECATED KDE_DEPRECATED KDECORE_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kdefakes.h		kdefakes.h
	skipping to change at line 151		skipping to change at line 151
	#if !defined(HAVE_MKDTEMP_PROTO)		#if !defined(HAVE_MKDTEMP_PROTO)
	#ifdef __cplusplus		#ifdef __cplusplus
	extern "C" {		extern "C" {
	#endif		#endif
	char *mkdtemp(char *);		char *mkdtemp(char *);
	#ifdef __cplusplus		#ifdef __cplusplus
	}		}
	#endif		#endif
	#endif		#endif
	/* #undef HAVE_MKSTEMPS_PROTO */		#define HAVE_MKSTEMPS_PROTO 1
	#if !defined(HAVE_MKSTEMPS_PROTO)		#if !defined(HAVE_MKSTEMPS_PROTO)
	#ifdef __cplusplus		#ifdef __cplusplus
	extern "C" {		extern "C" {
	#endif		#endif
	int mkstemps(char *, int);		int mkstemps(char *, int);
	#ifdef __cplusplus		#ifdef __cplusplus
	}		}
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kdemacros.h		kdemacros.h
	skipping to change at line 212		skipping to change at line 212
	# define KDE_CONSTRUCTOR_DEPRECATED		# define KDE_CONSTRUCTOR_DEPRECATED
	# else		# else
	# define KDE_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED		# define KDE_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED
	# endif		# endif
	# else		# else
	# define KDE_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED		# define KDE_CONSTRUCTOR_DEPRECATED Q_DECL_CONSTRUCTOR_DEPRECATED
	# endif		# endif
	#endif		#endif
	/**		/**
			* @def KDE_NO_DEPRECATED
			* @ingroup KDEMacros
			*
			* The KDE_NO_DEPRECATED indicates if the deprecated symbols of the platfor
			m
			* have been compiled out.
			*/
			/* #undef KDE_NO_DEPRECATED */
			/**
	* @def KDE_ISLIKELY		* @def KDE_ISLIKELY
	* @ingroup KDEMacros		* @ingroup KDEMacros
	*		*
	* The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate t o		* The KDE_ISLIKELY macro tags a boolean expression as likely to evaluate t o
	* @c true. When used in an <tt>if ( )</tt> statement, it gives a hint to t he compiler		* @c true. When used in an <tt>if ( )</tt> statement, it gives a hint to t he compiler
	* that the following codeblock is likely to get executed. Providing this		* that the following codeblock is likely to get executed. Providing this
	* information helps the compiler to optimize the code for better performan ce.		* information helps the compiler to optimize the code for better performan ce.
	* Using the macro has an insignificant code size or runtime memory footpri nt impact.		* Using the macro has an insignificant code size or runtime memory footpri nt impact.
	* The code semantics is not affected.		* The code semantics is not affected.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		10 lines changed or added

	kdesu_export.h		kdesu_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KDESU_EXPORT_H		#ifndef KDESU_EXPORT_H
	#define KDESU_EXPORT_H		#define KDESU_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KDESU_EXPORT		#ifndef KDESU_EXPORT
	# if defined(MAKE_KDESU_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KDESU_EXPORT
			# elif defined(MAKE_KDESU_LIB)
	/* We are building this library */		/* We are building this library */
	# define KDESU_EXPORT KDE_EXPORT		# define KDESU_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KDESU_EXPORT KDE_IMPORT		# define KDESU_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kdeui_export.h		kdeui_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KDEUI_EXPORT_H		#ifndef KDEUI_EXPORT_H
	#define KDEUI_EXPORT_H		#define KDEUI_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KDEUI_EXPORT		#ifndef KDEUI_EXPORT
	# if defined(MAKE_KDEUI_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KDEUI_EXPORT
			# elif defined(MAKE_KDEUI_LIB)
	/* We are building this library */		/* We are building this library */
	# define KDEUI_EXPORT KDE_EXPORT		# define KDEUI_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KDEUI_EXPORT KDE_IMPORT		# define KDEUI_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KDEUI_EXPORT_DEPRECATED		# ifndef KDEUI_EXPORT_DEPRECATED
	# define KDEUI_EXPORT_DEPRECATED KDE_DEPRECATED KDEUI_EXPORT		# define KDEUI_EXPORT_DEPRECATED KDE_DEPRECATED KDEUI_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 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.5.4 (KDE 4.5.4)"		#define KDE_VERSION_STRING "4.6.00 (4.6.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 5		#define KDE_VERSION_MINOR 6
	/**		/**
	* @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 4		#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))
	/**		/**
	* @ingroup KDEMacros		* @ingroup KDEMacros
	* @brief Version of KDE as number, at compile time		* @brief Version of KDE as number, at compile time
	*		*
	* This macro contains the KDE version in number form. As it is a macro,		* This macro contains the KDE version in number 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 version() if you need
	* the KDE version used at runtime.		* the KDE version used at runtime.
	*/		*/
	#define KDE_VERSION \		#define KDE_VERSION \
	KDE_MAKE_VERSION(KDE_VERSION_MAJOR,KDE_VERSION_MINOR,KDE_VERSION_RELEASE)		KDE_MAKE_VERSION(KDE_VERSION_MAJOR,KDE_VERSION_MINOR,KDE_VERSION_RELEASE)
	/**		/**
	* @ingroup KDEMacros		* @ingroup KDEMacros
	* @brief Check if the KDE version matches a certain version or is higher		* @brief Check if the KDE version matches a certain version or is higher
	*		*
	* This macro is typically used to compile conditionally a part of code:		* This macro is typically used to compile conditionally a part of code:
End of changes. 4 change blocks.
	4 lines changed or deleted		4 lines changed or added

	kdewebkit_export.h		kdewebkit_export.h
	skipping to change at line 30		skipping to change at line 30
	*		*
	*/		*/
	#ifndef KDEWEBKIT_EXPORT_H		#ifndef KDEWEBKIT_EXPORT_H
	#define KDEWEBKIT_EXPORT_H		#define KDEWEBKIT_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KDEWEBKIT_EXPORT		#ifndef KDEWEBKIT_EXPORT
	# if defined(MAKE_KDEWEBKIT_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KDEWEBKIT_EXPORT
			# elif defined(MAKE_KDEWEBKIT_LIB)
	/* We are building this library */		/* We are building this library */
	# define KDEWEBKIT_EXPORT KDE_EXPORT		# define KDEWEBKIT_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KDEWEBKIT_EXPORT KDE_IMPORT		# define KDEWEBKIT_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KDEWEBKIT_EXPORT_DEPRECATED		# ifndef KDEWEBKIT_EXPORT_DEPRECATED
	# define KDEWEBKIT_EXPORT_DEPRECATED KDE_DEPRECATED KDEWEBKIT_EXPORT		# define KDEWEBKIT_EXPORT_DEPRECATED KDE_DEPRECATED KDEWEBKIT_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kdialog.h		kdialog.h
	skipping to change at line 545		skipping to change at line 545
	/**		/**
	* Reimplemented from QDialog.		* Reimplemented from QDialog.
	*/		*/
	virtual QSize sizeHint() const;		virtual QSize sizeHint() const;
	/**		/**
	* Reimplemented from QDialog.		* Reimplemented from QDialog.
	*/		*/
	virtual QSize minimumSizeHint() const;		virtual QSize minimumSizeHint() const;
			/**
			* Allow embedding the dialogs based on KDialog into a graphics view
			. By default embedding is not allowed, dialogs
			* will appear as separate windows.
			* @since 4.6
			*/
			static void setAllowEmbeddingInGraphicsView( bool allowEmbedding );
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Make a KDE compliant caption.		* Make a KDE compliant caption.
	*		*
	* @param caption Your caption. Do @p not include the application name		* @param caption Your caption. Do @p not include the application name
	* in this string. It will be added automatically according to the KDE		* in this string. It will be added automatically according to the KDE
	* standard.		* standard.
	*/		*/
	virtual void setCaption( const QString &caption );		virtual void setCaption( const QString &caption );
End of changes. 1 change blocks.
	0 lines changed or deleted		8 lines changed or added

	kdirmodel.h		kdirmodel.h
	skipping to change at line 79		skipping to change at line 79
	/**		/**
	* Return the fileitem for a given index. This is O(1), i.e. fast.		* Return the fileitem for a given index. This is O(1), i.e. fast.
	*/		*/
	KFileItem itemForIndex( const QModelIndex& index ) const;		KFileItem itemForIndex( const QModelIndex& index ) const;
	/**		/**
	* Return the index for a given kfileitem. This can be slow.		* Return the index for a given kfileitem. This can be slow.
	* @deprecated use the method that takes a KFileItem by value		* @deprecated use the method that takes a KFileItem by value
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QModelIndex indexForItem( const KFileItem* ) const;		KDE_DEPRECATED QModelIndex indexForItem( const KFileItem* ) const;
			#endif
	/**		/**
	* Return the index for a given kfileitem. This can be slow.		* Return the index for a given kfileitem. This can be slow.
	*/		*/
	QModelIndex indexForItem( const KFileItem& ) const;		QModelIndex indexForItem( const KFileItem& ) const;
	/**		/**
	* Return the index for a given url. This can be slow.		* Return the index for a given url. This can be slow.
	*/		*/
	QModelIndex indexForUrl(const KUrl& url) const;		QModelIndex indexForUrl(const KUrl& url) const;
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kdiroperator.h		kdiroperator.h
	skipping to change at line 473		skipping to change at line 473
	* @see readConfig		* @see readConfig
	* @see setViewConfig		* @see setViewConfig
	*/		*/
	virtual void writeConfig(KConfigGroup& configGroup);		virtual void writeConfig(KConfigGroup& configGroup);
	/**		/**
	* This toggles between double/single click file and directory selectio n mode.		* This toggles between double/single click file and directory selectio n mode.
	* When argument is true, files and directories are highlighted with si ngle click and		* When argument is true, files and directories are highlighted with si ngle click and
	* selected (executed) with double click.		* selected (executed) with double click.
	*		*
			* NOTE: this is not implemented in KDE 4 yet
			*
	* The default follows the signle/double click system setting.		* The default follows the signle/double click system setting.
	*/		*/
	void setOnlyDoubleClickSelectsFiles(bool enable);		void setOnlyDoubleClickSelectsFiles(bool enable);
	/**		/**
	* @returns whether files (not directories) should only be select()ed b y		* @returns whether files (not directories) should only be select()ed b y
	* double-clicks.		* double-clicks.
	* @see setOnlyDoubleClickSelectsFiles		* @see setOnlyDoubleClickSelectsFiles
	*/		*/
	bool onlyDoubleClickSelectsFiles() const;		bool onlyDoubleClickSelectsFiles() const;
	skipping to change at line 911		skipping to change at line 913
	Q_PRIVATE_SLOT( d, void _k_slotSortReversed(bool) )		Q_PRIVATE_SLOT( d, void _k_slotSortReversed(bool) )
	Q_PRIVATE_SLOT( d, void _k_slotToggleDirsFirst() )		Q_PRIVATE_SLOT( d, void _k_slotToggleDirsFirst() )
	Q_PRIVATE_SLOT( d, void _k_slotToggleIgnoreCase() )		Q_PRIVATE_SLOT( d, void _k_slotToggleIgnoreCase() )
	Q_PRIVATE_SLOT( d, void _k_slotStarted() )		Q_PRIVATE_SLOT( d, void _k_slotStarted() )
	Q_PRIVATE_SLOT( d, void _k_slotProgress(int) )		Q_PRIVATE_SLOT( d, void _k_slotProgress(int) )
	Q_PRIVATE_SLOT( d, void _k_slotShowProgress() )		Q_PRIVATE_SLOT( d, void _k_slotShowProgress() )
	Q_PRIVATE_SLOT( d, void _k_slotIOFinished() )		Q_PRIVATE_SLOT( d, void _k_slotIOFinished() )
	Q_PRIVATE_SLOT( d, void _k_slotCanceled() )		Q_PRIVATE_SLOT( d, void _k_slotCanceled() )
	Q_PRIVATE_SLOT( d, void _k_slotRedirected(const KUrl&) )		Q_PRIVATE_SLOT( d, void _k_slotRedirected(const KUrl&) )
	Q_PRIVATE_SLOT( d, void _k_slotProperties() )		Q_PRIVATE_SLOT( d, void _k_slotProperties() )
	Q_PRIVATE_SLOT( d, void _k_slotPressed(const QModelIndex&) )
	Q_PRIVATE_SLOT( d, void _k_slotActivated(const QModelIndex&) )		Q_PRIVATE_SLOT( d, void _k_slotActivated(const QModelIndex&) )
	Q_PRIVATE_SLOT( d, void _k_slotDoubleClicked(const QModelIndex&) )
	Q_PRIVATE_SLOT( d, void _k_slotSelectionChanged() )		Q_PRIVATE_SLOT( d, void _k_slotSelectionChanged() )
	Q_PRIVATE_SLOT( d, void _k_openContextMenu(const QPoint&) )		Q_PRIVATE_SLOT( d, void _k_openContextMenu(const QPoint&) )
	Q_PRIVATE_SLOT( d, void _k_triggerPreview(const QModelIndex&) )		Q_PRIVATE_SLOT( d, void _k_triggerPreview(const QModelIndex&) )
	Q_PRIVATE_SLOT( d, void _k_showPreview() )		Q_PRIVATE_SLOT( d, void _k_showPreview() )
	Q_PRIVATE_SLOT( d, void _k_slotSplitterMoved(int, int) )		Q_PRIVATE_SLOT( d, void _k_slotSplitterMoved(int, int) )
	Q_PRIVATE_SLOT( d, void _k_assureVisibleSelection() )		Q_PRIVATE_SLOT( d, void _k_assureVisibleSelection() )
	Q_PRIVATE_SLOT( d, void _k_synchronizeSortingState(int, Qt::SortOrder) )		Q_PRIVATE_SLOT( d, void _k_synchronizeSortingState(int, Qt::SortOrder) )
	Q_PRIVATE_SLOT( d, void _k_slotChangeDecorationPosition() )		Q_PRIVATE_SLOT( d, void _k_slotChangeDecorationPosition() )
	Q_PRIVATE_SLOT( d, void _k_slotExpandToUrl(const QModelIndex&) )		Q_PRIVATE_SLOT( d, void _k_slotExpandToUrl(const QModelIndex&) )
	Q_PRIVATE_SLOT( d, void _k_slotItemsChanged() )		Q_PRIVATE_SLOT( d, void _k_slotItemsChanged() )
End of changes. 3 change blocks.
	2 lines changed or deleted		2 lines changed or added

	kdirwatch.h		kdirwatch.h
	skipping to change at line 52		skipping to change at line 52
	* signal deleted(). The directory is still watched for new		* signal deleted(). The directory is still watched for new
	* creation.		* creation.
	*		*
	* When a watched file is changed, i.e. attributes changed or written		* When a watched file is changed, i.e. attributes changed or written
	* to, KDirWatch will emit the signal dirty().		* to, KDirWatch will emit the signal dirty().
	*		*
	* Scanning of particular directories or files can be stopped temporarily		* Scanning of particular directories or files can be stopped temporarily
	* and restarted. The whole class can be stopped and restarted.		* and restarted. The whole class can be stopped and restarted.
	* Directories and files can be added/removed from the list in any state.		* Directories and files can be added/removed from the list in any state.
	*		*
	* The implementation uses the FAM service when available;		* The implementation uses the INOTIFY functionality on LINUX.
	* if FAM is not available, the INOTIFY functionality is used on LINUX.		* Otherwise the FAM service is used, when available.
	* As a last resort, a regular polling for change of modification times		* As a last resort, a regular polling for change of modification times
	* is done; the polling interval is a global config option:		* is done; the polling interval is a global config option:
	* DirWatch/PollInterval and DirWatch/NFSPollInterval for NFS mounted		* DirWatch/PollInterval and DirWatch/NFSPollInterval for NFS mounted
	* directories.		* directories.
			* The choice of implementation can be adjusted by the user, with the key
			* [DirWatch] PreferredMethod={Fam|Stat|QFSWatch|inotify}
	*		*
	* @see self()		* @see self()
	* @author Sven Radej <sven@lisa.exp.univie.ac.at>		* @author Sven Radej (in 1998)
	*/		*/
	class KDECORE_EXPORT KDirWatch : public QObject		class KDECORE_EXPORT KDirWatch : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Available watch modes for directory monitoring		* Available watch modes for directory monitoring
	**/		**/
	skipping to change at line 85		skipping to change at line 87
	};		};
	Q_DECLARE_FLAGS(WatchModes, WatchMode)		Q_DECLARE_FLAGS(WatchModes, WatchMode)
	/**		/**
	* Constructor.		* Constructor.
	*		*
	* Scanning begins immediately when a dir/file watch		* Scanning begins immediately when a dir/file watch
	* is added.		* is added.
	* @param parent the parent of the QObject (or 0 for parent-less KDataTo ols)		* @param parent the parent of the QObject (or 0 for parent-less KDataTo ols)
	*/		*/
	KDirWatch (QObject* parent = 0);		KDirWatch(QObject* parent = 0);
	/**		/**
	* Destructor.		* Destructor.
	*		*
	* Stops scanning and cleans up.		* Stops scanning and cleans up.
	*/		*/
	~KDirWatch();		~KDirWatch();
	/**		/**
	* Adds a directory to be watched.		* Adds a directory to be watched.
	skipping to change at line 219		skipping to change at line 221
	* @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;
	/**		/**
	* 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, Stat };		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.
	*/		*/
	Method internalMethod();		Method internalMethod(); // TODO KDE5: make const
	/**		/**
	* The KDirWatch instance usually globally used in an application.		* The KDirWatch instance usually globally used in an application.
	* It is automatically deleted when the application exits.		* It is automatically deleted when the application exits.
	*		*
	* However, you can create an arbitrary number of KDirWatch instances		* However, you can create an arbitrary number of KDirWatch instances
	* aside from this one - for those you have to take care of memory manag ement.		* aside from this one - for those you have to take care of memory manag ement.
	*		*
	* This function returns an instance of KDirWatch. If there is none, it		* This function returns an instance of KDirWatch. If there is none, it
	* will be created.		* will be created.
	skipping to change at line 281		skipping to change at line 283
	* therein are created or deleted.		* therein are created or deleted.
	* For a file this signal is emitted when its size or attributes change.		* For a file this signal is emitted when its size or attributes change.
	*		*
	* When you watch a directory, changes in the size or attributes of		* When you watch a directory, changes in the size or attributes of
	* contained files may or may not trigger this signal to be emitted		* contained files may or may not trigger this signal to be emitted
	* depending on which backend is used by KDirWatch.		* depending on which backend is used by KDirWatch.
	*		*
	* The new ctime is set before the signal is emitted.		* The new ctime is set before the signal is emitted.
	* @param path the path of the file or directory		* @param path the path of the file or directory
	*/		*/
	void dirty (const QString &path);		void dirty(const QString &path);
	/**		/**
	* Emitted when a file or directory is created.		* Emitted when a file or directory is created.
	* @param path the path of the file or directory		* @param path the path of the file or directory
	*/		*/
	void created (const QString &path );		void created(const QString &path);
	/**		/**
	* Emitted when a file or directory is deleted.		* Emitted when a file or directory is deleted.
	*		*
	* The object is still watched for new creation.		* The object is still watched for new creation.
	* @param path the path of the file or directory		* @param path the path of the file or directory
	*/		*/
	void deleted (const QString &path );		void deleted(const QString &path);
	private:		private:
	KDirWatchPrivate *const d;		KDirWatchPrivate *const d;
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS(KDirWatch::WatchModes)		Q_DECLARE_OPERATORS_FOR_FLAGS(KDirWatch::WatchModes)
	#endif		#endif
	// vim: sw=3 et		// vim: sw=3 et
End of changes. 9 change blocks.
	9 lines changed or deleted		11 lines changed or added

	keditlistbox.h		keditlistbox.h
	skipping to change at line 35		skipping to change at line 35
	#include <QtGui/QGroupBox>		#include <QtGui/QGroupBox>
	#include <QtGui/QStringListModel>		#include <QtGui/QStringListModel>
	class KLineEdit;		class KLineEdit;
	class KComboBox;		class KComboBox;
	class QListView;		class QListView;
	class QPushButton;		class QPushButton;
	class KEditListBoxPrivate;		class KEditListBoxPrivate;
	/**		/**
	* An editable listbox		* @brief An editable listbox
	*
	* This class provides an editable listbox, this means
	* a listbox which is accompanied by a line edit to enter new
	* items into the listbox and pushbuttons to add and remove
	* items from the listbox and two buttons to move items up and down.
	*
	* \image html keditlistbox.png "KDE Edit List Box Widget"
	*		*
			* @deprecated in favor of KEditListWidget embedded in a QGroupBox.
	*/		*/
	class KDEUI_EXPORT KEditListBox : public QGroupBox		class KDEUI_EXPORT KEditListBox : public QGroupBox
	{		{
	Q_OBJECT		Q_OBJECT
	Q_FLAGS( Buttons )		Q_FLAGS( Buttons )
	Q_PROPERTY( Buttons buttons READ buttons WRITE setButtons )		Q_PROPERTY( Buttons buttons READ buttons WRITE setButtons )
	Q_PROPERTY( QStringList items READ items WRITE setItems USER true )		Q_PROPERTY( QStringList items READ items WRITE setItems NOTIFY changed U SER true )
	public:		public:
	class CustomEditorPrivate;		class CustomEditorPrivate;
	/**		/**
	* Custom editor class		* Custom editor class
	**/		**/
	class KDEUI_EXPORT CustomEditor		class KDEUI_EXPORT CustomEditor
	{		{
	public:		public:
End of changes. 3 change blocks.
	9 lines changed or deleted		3 lines changed or added

	kedittoolbar.h		kedittoolbar.h
	skipping to change at line 79		skipping to change at line 79
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Old constructor for apps that do not use components.		* Old constructor for apps that do not use components.
	* This constructor is somewhat deprecated, since it doesn't work		* This constructor is somewhat deprecated, since it doesn't work
	* with any KXMLGuiClient being added to the mainwindow.		* with any KXMLGuiClient being added to the mainwindow.
	* You really want to use the other constructor.		* You really want to use the other constructor.
	*		*
	* You @em must pass along your collection of actions (some of which appe ar in your toolbars).		* You @em must pass along your collection of actions (some of which appe ar in your toolbars).
	* The other two parameters are optional.
	*		*
	* @param collection The collection of actions to work on.		* @param collection The collection of actions to work on.
	* @param parent The parent of the dialog.		* @param parent The parent of the dialog.
	*/		*/
	explicit KEditToolBar(KActionCollection *collection,		explicit KEditToolBar(KActionCollection *collection,
	QWidget* parent = 0);		QWidget* parent = 0);
	/**		/**
	* Main constructor.		* Main constructor.
	*		*
	* The main parameter, factory(), is a pointer to the		* The main parameter, @p factory, is a pointer to the
	* XML GUI factory object for your application. It contains a list		* XML GUI factory object for your application. It contains a list
	* of all of the GUI clients (along with the action collections and		* of all of the GUI clients (along with the action collections and
	* xml files) and the toolbar editor uses that.		* xml files) and the toolbar editor uses that.
	*		*
	* Use this like so:		* Use this like so:
	* \code		* \code
	* KEditToolBar edit(factory());		* KEditToolBar edit(factory());
	* if (edit.exec())		* if (edit.exec())
	* ...		* ...
	* \endcode		* \endcode
End of changes. 2 change blocks.
	2 lines changed or deleted		1 lines changed or added

	kemoticons_export.h		kemoticons_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KEMOTICONS_EXPORT_H		#ifndef KEMOTICONS_EXPORT_H
	#define KEMOTICONS_EXPORT_H		#define KEMOTICONS_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KEMOTICONS_EXPORT		#ifndef KEMOTICONS_EXPORT
	# if defined(MAKE_KEMOTICONS_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KEMOTICONS_EXPORT
			# elif defined(MAKE_KEMOTICONS_LIB)
	/* We are building this library */		/* We are building this library */
	# define KEMOTICONS_EXPORT KDE_EXPORT		# define KEMOTICONS_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KEMOTICONS_EXPORT KDE_IMPORT		# define KEMOTICONS_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kencodingprober.h		kencodingprober.h
	skipping to change at line 132		skipping to change at line 132
	* @returns the prober's current ProberState		* @returns the prober's current ProberState
	*		*
	*/		*/
	ProberState state() const;		ProberState state() const;
	/**		/**
	* @returns the name of the best encoding it has guessed so far		* @returns the name of the best encoding it has guessed so far
	* @warning The returned string is allocated with strdup, so some memor y is leaked with every call.		* @warning The returned string is allocated with strdup, so some memor y is leaked with every call.
	* @deprecated Use encoding() instead, which returns a QByteArray.		* @deprecated Use encoding() instead, which returns a QByteArray.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED const char* encodingName() const;		KDE_DEPRECATED const char* encodingName() const;
			#endif
	/**		/**
	* @returns a QByteArray with the name of the best encoding it has gues sed so far		* @returns a QByteArray with the name of the best encoding it has gues sed so far
	* @since 4.2.2		* @since 4.2.2
	*/		*/
	QByteArray encoding() const;		QByteArray encoding() const;
	/**		/**
	* @returns the confidence(sureness) of encoding it guessed so far (0.0 ~ 0.99), not very reliable for single byte encodings		* @returns the confidence(sureness) of encoding it guessed so far (0.0 ~ 0.99), not very reliable for single byte encodings
	*/		*/
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kfile_export.h		kfile_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KFILE_EXPORT_H		#ifndef KFILE_EXPORT_H
	#define KFILE_EXPORT_H		#define KFILE_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KFILE_EXPORT		#ifndef KFILE_EXPORT
	# if defined(MAKE_KFILE_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KFILE_EXPORT
			# elif defined(MAKE_KFILE_LIB)
	/* We are building this library */		/* We are building this library */
	# define KFILE_EXPORT KDE_EXPORT		# define KFILE_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KFILE_EXPORT KDE_IMPORT		# define KFILE_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KFILE_EXPORT_DEPRECATED		# ifndef KFILE_EXPORT_DEPRECATED
	# define KFILE_EXPORT_DEPRECATED KDE_DEPRECATED KFILE_EXPORT		# define KFILE_EXPORT_DEPRECATED KDE_DEPRECATED KFILE_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kfileitem.h		kfileitem.h
	skipping to change at line 304		skipping to change at line 304
	*/		*/
	KIO::filesize_t size() const;		KIO::filesize_t size() const;
	/**		/**
	* Requests the modification, access or creation time, depending on @p which.		* Requests the modification, access or creation time, depending on @p which.
	* @param which the timestamp		* @param which the timestamp
	* @return the time asked for, (time_t)0 if not available		* @return the time asked for, (time_t)0 if not available
	* @see timeString()		* @see timeString()
	*/		*/
	KDateTime time( FileTimes which ) const;		KDateTime time( FileTimes which ) const;
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED time_t time( unsigned int which ) const;		KDE_DEPRECATED time_t time( unsigned int which ) const;
			#endif
	/**		/**
	* Requests the modification, access or creation time as a string, depe nding		* Requests the modification, access or creation time as a string, depe nding
	* on @p which.		* on @p which.
	* @param which the timestamp		* @param which the timestamp
	* @returns a formatted string of the requested time.		* @returns a formatted string of the requested time.
	* @see time		* @see time
	*/		*/
	QString timeString( FileTimes which = ModificationTime ) const;		QString timeString( FileTimes which = ModificationTime ) const;
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString timeString( unsigned int which) const;		KDE_DEPRECATED QString timeString( unsigned int which) const;
			#endif
	/**		/**
	* Returns true if the file is a local file.		* Returns true if the file is a local file.
	* @return true if the file is local, false otherwise		* @return true if the file is local, false otherwise
	*/		*/
	bool isLocalFile() const;		bool isLocalFile() const;
	/**		/**
	* Returns the text of the file item.		* Returns the text of the file item.
	* It's not exactly the filename since some decoding happens ('%2F'->'/ ').		* It's not exactly the filename since some decoding happens ('%2F'->'/ ').
	skipping to change at line 402		skipping to change at line 406
	/**		/**
	* Returns the overlays (bitfield of KIconLoader::*Overlay flags) that are used		* Returns the overlays (bitfield of KIconLoader::*Overlay flags) that are used
	* for this item's pixmap. Overlays are used to show for example, wheth er		* for this item's pixmap. Overlays are used to show for example, wheth er
	* a file can be modified.		* a file can be modified.
	* @return the overlays of the pixmap		* @return the overlays of the pixmap
	*/		*/
	QStringList overlays() const;		QStringList overlays() const;
	/**		/**
			* A comment which can contain anything - even rich text. It will
			* simply be displayed to the user as is.
			*
			* @since 4.6
			*/
			QString comment() const;
			/**
	* Returns the string to be displayed in the statusbar,		* Returns the string to be displayed in the statusbar,
	* e.g. when the mouse is over this item		* e.g. when the mouse is over this item
	* @return the status bar information		* @return the status bar information
	*/		*/
	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.
	skipping to change at line 428		skipping to change at line 440
	/**		/**
	* 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.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool acceptsDrops() const;		KDE_DEPRECATED bool acceptsDrops() const;
			#endif
	/**		/**
	* Let's "KRun" this file !		* Let's "KRun" this file !
	* (e.g. when file is clicked or double-clicked or return is pressed)		* (e.g. when file is clicked or double-clicked or return is pressed)
	*/		*/
	void run( QWidget* parentWidget = 0 ) const;		void run( QWidget* parentWidget = 0 ) const;
	/**		/**
	* Returns the UDS entry. Used by the tree view to access all details		* Returns the UDS entry. Used by the tree view to access all details
	* by position.		* by position.
	skipping to change at line 521		skipping to change at line 535
	* Note: you have to remove and destroy the data you associated yoursel f		* Note: you have to remove and destroy the data you associated yoursel f
	* when you don't need it anymore!		* when you don't need it anymore!
	*		*
	* @param key the key of the extra data		* @param key the key of the extra data
	* @param value the value of the extra data		* @param value the value of the extra data
	* @see extraData		* @see extraData
	* @see removeExtraData		* @see removeExtraData
	*		*
	* @deprecated use model/view (KDirModel) and you won't need this anymo re		* @deprecated use model/view (KDirModel) and you won't need this anymo re
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setExtraData( const void *key, void *value );		KDE_DEPRECATED void setExtraData( const void *key, void *value );
			#endif
	/**		/**
	* Retrieves the extra data with the given @p key.		* Retrieves the extra data with the given @p key.
	* @param key the key of the extra data		* @param key the key of the extra data
	* @return the extra data associated to an item with @p key via		* @return the extra data associated to an item with @p key via
	* setExtraData. 0L if nothing was associated with @p key.		* setExtraData. 0L if nothing was associated with @p key.
	* @see extraData		* @see extraData
	*		*
	* @deprecated use model/view (KDirModel) and you won't need this anymo re		* @deprecated use model/view (KDirModel) and you won't need this anymo re
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED const void * extraData( const void *key ) const;		KDE_DEPRECATED const void * extraData( const void *key ) const;
			#endif
	/**		/**
	* Removes the extra data associated with an item via @p key.		* Removes the extra data associated with an item via @p key.
	* @param key the key of the extra data to remove		* @param key the key of the extra data to remove
	*		*
	* @deprecated use model/view (KDirModel) and you won't need this anymo re		* @deprecated use model/view (KDirModel) and you won't need this anymo re
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void removeExtraData( const void *key );		KDE_DEPRECATED void removeExtraData( const void *key );
			#endif
	/**		/**
	* Sets the metainfo of this item to @p info.		* Sets the metainfo of this item to @p info.
	*		*
	* Made const to avoid deep copy.		* Made const to avoid deep copy.
	* @param info the new meta info		* @param info the new meta info
	*/		*/
	void setMetaInfo( const KFileMetaInfo & info ) const;		void setMetaInfo( const KFileMetaInfo & info ) const;
	/**		/**
	skipping to change at line 564		skipping to change at line 584
	* If you need more information, create your own KFileMetaInfo object a nd set it using setMetaInfo()		* If you need more information, create your own KFileMetaInfo object a nd set it using setMetaInfo()
	* @param autoget if true, the metainfo will automatically be created		* @param autoget if true, the metainfo will automatically be created
	* @param what how much metainfo you need to retrieve from the file (KF ileMetaInfo::WhatFlag)		* @param what how much metainfo you need to retrieve from the file (KF ileMetaInfo::WhatFlag)
	*/		*/
	KFileMetaInfo metaInfo(bool autoget = true,		KFileMetaInfo metaInfo(bool autoget = true,
	int what = KFileMetaInfo::ContentInfo | KFileMet aInfo::TechnicalInfo) const;		int what = KFileMetaInfo::ContentInfo | KFileMet aInfo::TechnicalInfo) const;
	/**		/**
	* @deprecated simply use '='		* @deprecated simply use '='
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void assign( const KFileItem & item );		KDE_DEPRECATED void assign( const KFileItem & item );
			#endif
	/**		/**
	* Reinitialize KFileItem with a new UDSEntry.		* Reinitialize KFileItem with a new UDSEntry.
	*		*
	* Note: extra-data set with setExtraData() is not changed or deleted, so		* Note: extra-data set with setExtraData() is not changed or deleted, so
	* be careful what you do!		* be careful what you do!
	*		*
	* KDirListerCache uses it to save new/delete calls by updating existin g		* KDirListerCache uses it to save new/delete calls by updating existin g
	* items that are otherwise not needed anymore.		* items that are otherwise not needed anymore.
	*		*
	* @param entry the UDSEntry to assign to this KFileItem		* @param entry the UDSEntry to assign to this KFileItem
	* @param url the file url		* @param url the file url
	* @param delayedMimeTypes specifies if the mimetype of the given		* @param delayedMimeTypes specifies if the mimetype of the given
	* URL should be determined immediately or on demand		* URL should be determined immediately or on demand
	* @param urlIsDirectory specifies if the url is just the directory of the		* @param urlIsDirectory specifies if the url is just the directory of the
	* fileitem and the filename from the UDSEntry should be used.		* fileitem and the filename from the UDSEntry should be used.
	*		*
	* @deprecated why not just create another KFileItem and use operator=,		* @deprecated why not just create another KFileItem and use operator=,
	* now that it's a value class?		* now that it's a value class?
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setUDSEntry( const KIO::UDSEntry& entry, const KUrl & url,		KDE_DEPRECATED void setUDSEntry( const KIO::UDSEntry& entry, const KUrl & url,
	bool delayedMimeTypes = false,		bool delayedMimeTypes = false,
	bool urlIsDirectory = false );		bool urlIsDirectory = false );
			#endif
	/**		/**
	* Tries to give a local URL for this file item if possible.		* Tries to give a local URL for this file item if possible.
	* The given boolean indicates if the returned url is local or not.		* The given boolean indicates if the returned url is local or not.
	*/		*/
	KUrl mostLocalUrl(bool &local) const; // KDE4 TODO: bool* local = 0		KUrl mostLocalUrl(bool &local) const; // KDE4 TODO: bool* local = 0
	/**		/**
			* Tries to give a local URL for this file item if possible.
			*
			* \since 4.6
			*/
			KUrl mostLocalUrl() const; // KDE5: merge with above version
			/**
	* Return true if default-constructed		* Return true if default-constructed
	*/		*/
	bool isNull() const;		bool isNull() const;
	private:		private:
	QSharedDataPointer<KFileItemPrivate> d;		QSharedDataPointer<KFileItemPrivate> d;
	private:		private:
	KIO_EXPORT friend QDataStream & operator<< ( QDataStream & s, const KFi leItem & a );		KIO_EXPORT friend QDataStream & operator<< ( QDataStream & s, const KFi leItem & a );
	KIO_EXPORT friend QDataStream & operator>> ( QDataStream & s, KFileItem & a );		KIO_EXPORT friend QDataStream & operator>> ( QDataStream & s, KFileItem & a );
End of changes. 18 change blocks.
	0 lines changed or deleted		31 lines changed or added

	kfileitemdelegate.h		kfileitemdelegate.h
	skipping to change at line 172		skipping to change at line 172
	Permissions, ///< A UNIX permissions string, e.g. -rwxr-x r-x.		Permissions, ///< A UNIX permissions string, e.g. -rwxr-x r-x.
	OctalPermissions, ///< The permissions as an octal value, e.g. 0644.		OctalPermissions, ///< The permissions as an octal value, e.g. 0644.
	Owner, ///< The user name of the file owner, e.g. r oot		Owner, ///< The user name of the file owner, e.g. r oot
	OwnerAndGroup, ///< The user and group that owns the file, e.g. root:root		OwnerAndGroup, ///< The user and group that owns the file, e.g. root:root
	CreationTime, ///< The date and time the file/folder was c reated.		CreationTime, ///< The date and time the file/folder was c reated.
	ModificationTime, ///< The date and time the file/folder was l ast modified.		ModificationTime, ///< The date and time the file/folder was l ast modified.
	AccessTime, ///< The date and time the file/folder was l ast accessed.		AccessTime, ///< The date and time the file/folder was l ast accessed.
	MimeType, ///< The mime type for the item, e.g. text/h tml.		MimeType, ///< The mime type for the item, e.g. text/h tml.
	FriendlyMimeType, ///< The descriptive name for the mime type, e.g. HTML Document.		FriendlyMimeType, ///< The descriptive name for the mime type, e.g. HTML Document.
	LinkDest, ///< The destination of a symbolic link. @si nce 4.5		LinkDest, ///< The destination of a symbolic link. @si nce 4.5
	LocalPathOrUrl ///< The local path to the file or the URL i		LocalPathOrUrl, ///< The local path to the file or the URL i
	n case it is not a local file. @since 4.5		n case it is not a local file. @since 4.5
			Comment ///< A simple comment that can be displayed
			to the user as is. @since 4.6
	};		};
	typedef QList<Information> InformationList;		typedef QList<Information> InformationList;
	/**		/**
	* Constructs a new KFileItemDelegate.		* Constructs a new KFileItemDelegate.
	*		*
	* @param parent The parent object for the delegate.		* @param parent The parent object for the delegate.
	*/		*/
	explicit KFileItemDelegate(QObject *parent = 0);		explicit KFileItemDelegate(QObject *parent = 0);
End of changes. 1 change blocks.
	2 lines changed or deleted		4 lines changed or added

	kfilemetadatawidget.h		kfilemetadatawidget.h
	skipping to change at line 47		skipping to change at line 47
	* the meta data value. It is possible for the user		* the meta data value. It is possible for the user
	* to change specific meta data like rating, tags and		* to change specific meta data like rating, tags and
	* comment. The changes are stored automatically by the		* comment. The changes are stored automatically by the
	* meta data widget.		* meta data widget.
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	class KIO_EXPORT KFileMetaDataWidget : public QWidget		class KIO_EXPORT KFileMetaDataWidget : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
	public:		public:
	explicit KFileMetaDataWidget(QWidget* parent = 0);		explicit KFileMetaDataWidget(QWidget* parent = 0);
	virtual ~KFileMetaDataWidget();		virtual ~KFileMetaDataWidget();
	/**		/**
	* Sets the items for which the meta data should be shown.		* Sets the items for which the meta data should be shown.
	* The signal metaDataRequestFinished() will be emitted,		* The signal metaDataRequestFinished() will be emitted,
	* as soon as the meta data for the items has been received.		* as soon as the meta data for the items has been received.
	*/		*/
	skipping to change at line 80		skipping to change at line 81
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Is emitted, if a meta data represents an URL that has		* Is emitted, if a meta data represents an URL that has
	* been clicked by the user.		* been clicked by the user.
	*/		*/
	void urlActivated(const KUrl& url);		void urlActivated(const KUrl& url);
	/**		/**
	* Is emitted after the meta data has been received for the items		* Is emitted after the meta data has been received for the items
	* set by KFileMetaDataWidget::setItems().		* set by KFileMetaDataWidget::setItems().
	* @since 4.5.1		* @since 4.6
	*/		*/
	void metaDataRequestFinished(const KFileItemList& items);		void metaDataRequestFinished(const KFileItemList& items);
	protected:		protected:
	virtual bool event(QEvent* event);		virtual bool event(QEvent* event);
	private:		private:
	class Private;		class Private;
	Private* d;		Private* d;
	Q_PRIVATE_SLOT(d, void slotLoadingFinished())		Q_PRIVATE_SLOT(d, void slotLoadingFinished())
	Q_PRIVATE_SLOT(d, void removeOutdatedRows())
	Q_PRIVATE_SLOT(d, void slotLinkActivated(QString))		Q_PRIVATE_SLOT(d, void slotLinkActivated(QString))
	Q_PRIVATE_SLOT(d, void slotDataChangeStarted())		Q_PRIVATE_SLOT(d, void slotDataChangeStarted())
	Q_PRIVATE_SLOT(d, void slotDataChangeFinished())		Q_PRIVATE_SLOT(d, void slotDataChangeFinished())
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	2 lines changed or deleted		2 lines changed or added

	kfilemetainfo.h		kfilemetainfo.h
	skipping to change at line 146		skipping to change at line 146
	/**		/**
	* Deprecated		* Deprecated
	**/		**/
	QStringList supportedKeys() const;		QStringList supportedKeys() const;
	KIO_EXPORT friend QDataStream& operator >>(QDataStream& s, KFileMetaInf o& )		KIO_EXPORT friend QDataStream& operator >>(QDataStream& s, KFileMetaInf o& )
	;		;
	KIO_EXPORT friend QDataStream& operator <<(QDataStream& s, const KFileM etaInfo&);		KIO_EXPORT friend QDataStream& operator <<(QDataStream& s, const KFileM etaInfo&);
	/**		/**
	* Deprecated		* Deprecated
	**/		**/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;		KDE_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;
			#endif
	/**		/**
	* Deprecated		* Deprecated
	**/		**/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;		KDE_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;
			#endif
	KFileMetaInfoGroupList groups() const;		KFileMetaInfoGroupList groups() const;
	QStringList keys() const;		QStringList keys() const;
	const KUrl& url() const;		const KUrl& url() const;
	private:		private:
	QSharedDataPointer<KFileMetaInfoPrivate> d;		QSharedDataPointer<KFileMetaInfoPrivate> d;
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS(KFileMetaInfo::WhatFlags)		Q_DECLARE_OPERATORS_FOR_FLAGS(KFileMetaInfo::WhatFlags)
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kfilemetainfoitem.h		kfilemetainfoitem.h
	skipping to change at line 92		skipping to change at line 92
	bool addValue(const QVariant&);		bool addValue(const QVariant&);
	/**		/**
	* @brief Is this a valid item.		* @brief Is this a valid item.
	**/		**/
	bool isValid() const;		bool isValid() const;
	/**		/**
	* @brief Retrieve the properties of this field type.		* @brief Retrieve the properties of this field type.
	*		*
	* @deprecated		* @deprecated
	**/		**/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED const PredicateProperties& properties() const;		KDE_DEPRECATED const PredicateProperties& properties() const;
			#endif
	/**		/**
	* Localized name of the predicate.		* Localized name of the predicate.
	**/		**/
	const QString& name() const;		const QString& name() const;
	/**		/**
	* This method returns a translated suffix to be displayed after the		* This method returns a translated suffix to be displayed after the
	* value. Think of the kbps in 128kbps		* value. Think of the kbps in 128kbps
	*		*
	* @return the suffix		* @return the suffix
	*/		*/
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kfilewidget.h		kfilewidget.h
	skipping to change at line 525		skipping to change at line 525
	Q_PRIVATE_SLOT(d, void _k_fileCompletion(const QString&))		Q_PRIVATE_SLOT(d, void _k_fileCompletion(const QString&))
	Q_PRIVATE_SLOT(d, void _k_toggleSpeedbar(bool))		Q_PRIVATE_SLOT(d, void _k_toggleSpeedbar(bool))
	Q_PRIVATE_SLOT(d, void _k_toggleBookmarks(bool))		Q_PRIVATE_SLOT(d, void _k_toggleBookmarks(bool))
	Q_PRIVATE_SLOT(d, void _k_slotAutoSelectExtClicked())		Q_PRIVATE_SLOT(d, void _k_slotAutoSelectExtClicked())
	Q_PRIVATE_SLOT(d, void _k_placesViewSplitterMoved(int, int))		Q_PRIVATE_SLOT(d, void _k_placesViewSplitterMoved(int, int))
	Q_PRIVATE_SLOT(d, void _k_activateUrlNavigator())		Q_PRIVATE_SLOT(d, void _k_activateUrlNavigator())
	Q_PRIVATE_SLOT(d, void _k_zoomOutIconsSize())		Q_PRIVATE_SLOT(d, void _k_zoomOutIconsSize())
	Q_PRIVATE_SLOT(d, void _k_zoomInIconsSize())		Q_PRIVATE_SLOT(d, void _k_zoomInIconsSize())
	Q_PRIVATE_SLOT(d, void _k_slotIconSizeSliderMoved(int))		Q_PRIVATE_SLOT(d, void _k_slotIconSizeSliderMoved(int))
	Q_PRIVATE_SLOT(d, void _k_slotIconSizeChanged(int))		Q_PRIVATE_SLOT(d, void _k_slotIconSizeChanged(int))
	Q_PRIVATE_SLOT(d, void _k_slotViewDoubleClicked(const QModelIndex&))
	};		};
	#endif /* KABSTRACTFILEWIDGET_H */		#endif /* KABSTRACTFILEWIDGET_H */
End of changes. 1 change blocks.
	1 lines changed or deleted		0 lines changed or added

	kfind.h		kfind.h
	skipping to change at line 122		skipping to change at line 122
	FromCursor = 2, ///< Start from current cursor position.		FromCursor = 2, ///< Start from current cursor position.
	SelectedText = 4, ///< Only search selected area.		SelectedText = 4, ///< Only search selected area.
	CaseSensitive = 8, ///< Consider case when matching.		CaseSensitive = 8, ///< Consider case when matching.
	FindBackwards = 16, ///< Go backwards.		FindBackwards = 16, ///< Go backwards.
	RegularExpression = 32, ///< Interpret the pattern as a regular exp ression.		RegularExpression = 32, ///< Interpret the pattern as a regular exp ression.
	FindIncremental = 64, ///< Find incremental.		FindIncremental = 64, ///< Find incremental.
	// Note that KReplaceDialog uses 256 and 512		// Note that KReplaceDialog uses 256 and 512
	// User extensions can use boolean options above this value.		// User extensions can use boolean options above this value.
	MinimumUserOption = 65536 ///< user options start with this bit		MinimumUserOption = 65536 ///< user options start with this bit
	};		};
			Q_DECLARE_FLAGS(SearchOptions, Options)
	/**		/**
	* Only use this constructor if you don't use KFindDialog, or if		* Only use this constructor if you don't use KFindDialog, or if
	* you use it as a modal dialog.		* you use it as a modal dialog.
	*/		*/
	KFind(const QString &pattern, long options, QWidget *parent);		KFind(const QString &pattern, long options, QWidget *parent);
	/**		/**
	* This is the recommended constructor if you also use KFindDialog (non -modal).		* This is the recommended constructor if you also use KFindDialog (non -modal).
	* You should pass the pointer to it here, so that when a message box		* You should pass the pointer to it here, so that when a message box
	skipping to change at line 372		skipping to change at line 373
	friend class KReplace;		friend class KReplace;
	friend class KReplacePrivate;		friend class KReplacePrivate;
	struct Private;		struct Private;
	Private* const d;		Private* const d;
	Q_PRIVATE_SLOT( d, void _k_slotFindNext() )		Q_PRIVATE_SLOT( d, void _k_slotFindNext() )
	Q_PRIVATE_SLOT( d, void _k_slotDialogClosed() )		Q_PRIVATE_SLOT( d, void _k_slotDialogClosed() )
	};		};
			Q_DECLARE_OPERATORS_FOR_FLAGS(KFind::SearchOptions)
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kfontchooser.h		kfontchooser.h
	skipping to change at line 50		skipping to change at line 50
	*		*
	* \image html kfontchooser.png "KDE Font Chooser Widget"		* \image html kfontchooser.png "KDE Font Chooser Widget"
	*		*
	* @see KFontRequester		* @see KFontRequester
	*		*
	* @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>		* @author Preston Brown <pbrown@kde.org>, Bernd Wuebben <wuebben@kde.org>
	*/		*/
	class KDEUI_EXPORT KFontChooser : public QWidget		class KDEUI_EXPORT KFontChooser : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QFont font READ font WRITE setFont USER true )		Q_PROPERTY( QFont font READ font WRITE setFont NOTIFY fontSelected USER t
			rue )
			Q_PROPERTY( QColor color READ color WRITE setColor )
			Q_PROPERTY( QColor backgroundColor READ backgroundColor WRITE setBackgrou
			ndColor )
			Q_PROPERTY( Qt::CheckState sizeIsRelative READ sizeIsRelative WRITE setSi
			zeIsRelative )
			Q_PROPERTY( QString sampleText READ sampleText WRITE setSampleText )
	public:		public:
	/**		/**
	* @li @p FamilyList - Identifies the family (leftmost) list.		* @li @p FamilyList - Identifies the family (leftmost) list.
	* @li @p StyleList - Identifies the style (center) list.		* @li @p StyleList - Identifies the style (center) list.
	* @li @p SizeList - Identifies the size (rightmost) list.		* @li @p SizeList - Identifies the size (rightmost) list.
	*/		*/
	enum FontColumn { FamilyList=0x01, StyleList=0x02, SizeList=0x04};		enum FontColumn { FamilyList=0x01, StyleList=0x02, SizeList=0x04};
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		8 lines changed or added

	kfontcombobox.h		kfontcombobox.h
	skipping to change at line 53		skipping to change at line 53
	*		*
	* @see KFontAction		* @see KFontAction
	* @see KFontChooser		* @see KFontChooser
	*		*
	* @since 4.1		* @since 4.1
	*/		*/
	class KDEUI_EXPORT KFontComboBox : public KComboBox		class KDEUI_EXPORT KFontComboBox : public KComboBox
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont)		Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTI FY currentFontChanged USER true)
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
	*		*
	* @param parent the parent widget		* @param parent the parent widget
	*/		*/
	explicit KFontComboBox (QWidget *parent = 0);		explicit KFontComboBox (QWidget *parent = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kfontrequester.h		kfontrequester.h
	skipping to change at line 50		skipping to change at line 50
	*		*
	* @author Nadeem Hasan <nhasan@kde.org>		* @author Nadeem Hasan <nhasan@kde.org>
	*		*
	*/		*/
	class KDEUI_EXPORT KFontRequester : public QWidget		class KDEUI_EXPORT KFontRequester : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QString title READ title WRITE setTitle )		Q_PROPERTY( QString title READ title WRITE setTitle )
	Q_PROPERTY( QString sampleText READ sampleText WRITE setSampleText )		Q_PROPERTY( QString sampleText READ sampleText WRITE setSampleText )
	Q_PROPERTY( QFont font READ font WRITE setFont USER true)		Q_PROPERTY( QFont font READ font WRITE setFont NOTIFY fontSelected USER t rue)
	public:		public:
	/**		/**
	* Constructs a font requester widget.		* Constructs a font requester widget.
	*		*
	* @param parent The parent widget.		* @param parent The parent widget.
	* @param onlyFixed Only display fonts which have fixed-width character		* @param onlyFixed Only display fonts which have fixed-width character
	* sizes.		* sizes.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kgenericfactory.h		kgenericfactory.h
	skipping to change at line 32		skipping to change at line 32
	#include <klibloader.h>		#include <klibloader.h>
	#include <kpluginfactory.h>		#include <kpluginfactory.h>
	#include <kpluginloader.h>		#include <kpluginloader.h>
	#include <ktypelist.h>		#include <ktypelist.h>
	#include <kcomponentdata.h>		#include <kcomponentdata.h>
	#include <kgenericfactory.tcc>		#include <kgenericfactory.tcc>
	#include <kglobal.h>		#include <kglobal.h>
	#include <klocale.h>		#include <klocale.h>
	#include <kdebug.h>		#include <kdebug.h>
			#ifndef KDE_NO_DEPRECATED
	/* @internal */		/* @internal */
	template <class T>		template <class T>
	class KGenericFactoryBase : public KPluginFactory		class KGenericFactoryBase : public KPluginFactory
	{		{
	public:		public:
	explicit KGenericFactoryBase(const char *componentName, const char *cat alogName)		explicit KGenericFactoryBase(const char *componentName, const char *cat alogName)
	: KPluginFactory(componentName, catalogName)		: KPluginFactory(componentName, catalogName)
	{		{
	s_self = this;		s_self = this;
	s_createComponentDataCalled = false;		s_createComponentDataCalled = false;
	skipping to change at line 353		skipping to change at line 355
	virtual QObject *createObject( QObject *parent,		virtual QObject *createObject( QObject *parent,
	const char *className, const QStringList &args )		const char *className, const QStringList &args )
	{		{
	return KDEPrivate::MultiFactory< KTypeList< Product, ProductListTai l >,		return KDEPrivate::MultiFactory< KTypeList< Product, ProductListTai l >,
	KTypeList< ParentType, ParentTypeL istTail > >		KTypeList< ParentType, ParentTypeL istTail > >
	::create( 0, 0, parent,		::create( 0, 0, parent,
	className, args );		className, args );
	}		}
	};		};
	/*		#endif
	* vim: et sw=4
	*/
	#endif		#endif
End of changes. 2 change blocks.
	4 lines changed or deleted		3 lines changed or added

	kglobal.h		kglobal.h
	skipping to change at line 303		skipping to change at line 303
	static void destroy() \		static void destroy() \
	{ \		{ \
	_k_static_##NAME##_destroyed = true; \		_k_static_##NAME##_destroyed = true; \
	TYPE *x = _k_static_##NAME; \		TYPE *x = _k_static_##NAME; \
	_k_static_##NAME = 0; \		_k_static_##NAME = 0; \
	delete x; \		delete x; \
	} \		} \
	} NAME;		} NAME;
	/**		/**
			* This class is useful in libraries where you want to make sure that
			* anyone that uses your library will get the correct catalog loaded.
			* Just declare a static KCatalogLoader in the global namespace of one of
			* your cpp files and that will load your catalog once
			* the global klocale is created
			*
			* @param catalogName The name of your catalog
			*
			* @since 4.6
			*
			* Example:
			* @code
			* static const KCatalogLoader loader("libkdepim");
			* @endcode
			*/
			class KCatalogLoader
			{
			public:
			KCatalogLoader(const QString &catalogName);
			};
			/**
	* Access to the KDE global objects.		* Access to the KDE global objects.
	* KGlobal provides you with pointers of many central		* KGlobal provides you with pointers of many central
	* objects that exist only once in the process. It is also		* objects that exist only once in the process. It is also
	* responsible for managing instances of KStaticDeleterBase.		* responsible for managing instances of KStaticDeleterBase.
	*		*
	* @see KStaticDeleterBase		* @see KStaticDeleterBase
	* @author Sirtaj Singh Kang (taj@kde.org)		* @author Sirtaj Singh Kang (taj@kde.org)
	*/		*/
	namespace KGlobal		namespace KGlobal
	{		{
	skipping to change at line 341		skipping to change at line 363
	*/		*/
	KDECORE_EXPORT KStandardDirs *dirs();		KDECORE_EXPORT KStandardDirs *dirs();
	/**		/**
	* Returns the general config object.		* Returns the general config object.
	* @return the global configuration object.		* @return the global configuration object.
	*/		*/
	KDECORE_EXPORT KSharedConfigPtr config();		KDECORE_EXPORT KSharedConfigPtr config();
	/**		/**
			* Inserts the catalog in the main locale object if it exists.
			* Otherwise the catalog name is stored and added once the main locale
			gets created
			*
			* @since 4.6
			*/
			KDECORE_EXPORT void insertCatalog(const QString& catalog);
			/**
	* Returns the global locale object.		* Returns the global locale object.
	* @return the global locale object		* @return the global locale object
	*		*
	* Note: in multi-threaded programs, you should call KGlobal::locale()		* Note: in multi-threaded programs, you should call KGlobal::locale()
	* in the main thread (e.g. in main(), after creating the QCoreApplicat ion		* in the main thread (e.g. in main(), after creating the QCoreApplicat ion
	* and setting the main component), to ensure that the initialization i s		* and setting the main component), to ensure that the initialization i s
	* done in the main thread. However KApplication takes care of this, so this		* done in the main thread. However KApplication takes care of this, so this
	* is only needed when not using KApplication.		* is only needed when not using KApplication.
	*/		*/
	KDECORE_EXPORT KLocale *locale();		KDECORE_EXPORT KLocale *locale();
End of changes. 2 change blocks.
	0 lines changed or deleted		31 lines changed or added

	kglobalaccel.h		kglobalaccel.h
	skipping to change at line 168		skipping to change at line 168
	static bool promptStealShortcutSystemwide(		static bool promptStealShortcutSystemwide(
	QWidget *parent,		QWidget *parent,
	const QList<KGlobalShortcutInfo> &shortcuts,		const QList<KGlobalShortcutInfo> &shortcuts,
	const QKeySequence &seq);		const QKeySequence &seq);
	/**		/**
	* No effect.		* No effect.
	*		*
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool isEnabled() const;		KDE_DEPRECATED bool isEnabled() const;
			#endif
	/**		/**
	* No effect.		* No effect.
	*		*
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setEnabled(bool enabled);		KDE_DEPRECATED void setEnabled(bool enabled);
			#endif
	/**		/**
	* Set the KComponentData for which to manipulate shortcuts. This is fo r exceptional		* Set the KComponentData for which to manipulate shortcuts. This is fo r exceptional
	* situations, when you want to modify the shortcuts of another applica tion		* situations, when you want to modify the shortcuts of another applica tion
	* as if they were yours.		* as if they were yours.
	* You cannot have your own working global shortcuts in a module/applic ation using this		* You cannot have your own working global shortcuts in a module/applic ation using this
	* special functionality. All global shortcuts of KActions will essenti ally be proxies.		* special functionality. All global shortcuts of KActions will essenti ally be proxies.
	* Be sure to set the default global shortcuts of the proxy KActions to the same as		* Be sure to set the default global shortcuts of the proxy KActions to the same as
	* those on the receiving end.		* those on the receiving end.
	* An example use case is the KControl Module for the window manager KW in, which has		* An example use case is the KControl Module for the window manager KW in, which has
	* no own facility for users to change its global shortcuts.		* no own facility for users to change its global shortcuts.
	*		*
	* @param componentData a KComponentData about the application for whic h you want to		* @param componentData a KComponentData about the application for whic h you want to
	* manipulate shortcuts.		* manipulate shortcuts.
	*		*
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void overrideMainComponentData(const KComponentData &com ponentData);		KDE_DEPRECATED void overrideMainComponentData(const KComponentData &com ponentData);
			#endif
	/**		/**
	* Return the unique and common names of all main components that have global shortcuts.		* Return the unique and common names of all main components that have global shortcuts.
	* The action strings of the returned actionId stringlists will be empt y.		* The action strings of the returned actionId stringlists will be empt y.
	*		*
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QList<QStringList> allMainComponents();		KDE_DEPRECATED QList<QStringList> allMainComponents();
			#endif
	/**		/**
	* @see getGlobalShortcutsByComponent		* @see getGlobalShortcutsByComponent
	*		*
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QList<QStringList> allActionsForComponent(const QStringL ist &actionId);		KDE_DEPRECATED QList<QStringList> allActionsForComponent(const QStringL ist &actionId);
			#endif
	/**		/**
	* @see getGlobalShortcutsByKey		* @see getGlobalShortcutsByKey
	*		*
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static QStringList findActionNameSystemwide(const QKeySe quence &seq);		KDE_DEPRECATED static QStringList findActionNameSystemwide(const QKeySe quence &seq);
			#endif
	/**		/**
	* @see promptStealShortcutSystemwide below		* @see promptStealShortcutSystemwide below
	*		*
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static bool promptStealShortcutSystemwide(QWidget *paren t, const QStringList &actionIdentifier, const QKeySequence &seq);		KDE_DEPRECATED static bool promptStealShortcutSystemwide(QWidget *paren t, const QStringList &actionIdentifier, const QKeySequence &seq);
			#endif
	private:		private:
	friend class KAction;		friend class KAction;
	/// Creates a new KGlobalAccel object		/// Creates a new KGlobalAccel object
	KGlobalAccel();		KGlobalAccel();
	/// Destructor		/// Destructor
	~KGlobalAccel();		~KGlobalAccel();
End of changes. 14 change blocks.
	0 lines changed or deleted		14 lines changed or added

	kglobalsettings.h		kglobalsettings.h
	skipping to change at line 34		skipping to change at line 34
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <QtGui/QPalette>		#include <QtGui/QPalette>
	#define KDE_DEFAULT_SINGLECLICK true		#define KDE_DEFAULT_SINGLECLICK true
	#define KDE_DEFAULT_SMOOTHSCROLL true		#define KDE_DEFAULT_SMOOTHSCROLL true
	#define KDE_DEFAULT_INSERTTEAROFFHANDLES 0		#define KDE_DEFAULT_INSERTTEAROFFHANDLES 0
	#define KDE_DEFAULT_AUTOSELECTDELAY -1		#define KDE_DEFAULT_AUTOSELECTDELAY -1
	#define KDE_DEFAULT_CHANGECURSOR true		#define KDE_DEFAULT_CHANGECURSOR true
	#define KDE_DEFAULT_LARGE_CURSOR false		#define KDE_DEFAULT_LARGE_CURSOR false
	#define KDE_DEFAULT_WHEEL_ZOOM false		#define KDE_DEFAULT_WHEEL_ZOOM false
			#ifdef Q_WS_MAEMO_5
			#define KDE_DEFAULT_ICON_ON_PUSHBUTTON false
			#else
	#define KDE_DEFAULT_ICON_ON_PUSHBUTTON true		#define KDE_DEFAULT_ICON_ON_PUSHBUTTON true
			#endif
	#define KDE_DEFAULT_OPAQUE_RESIZE true		#define KDE_DEFAULT_OPAQUE_RESIZE true
	#define KDE_DEFAULT_BUTTON_LAYOUT 0		#define KDE_DEFAULT_BUTTON_LAYOUT 0
	#define KDE_DEFAULT_SHADE_SORT_COLUMN true		#define KDE_DEFAULT_SHADE_SORT_COLUMN true
	#define KDE_DEFAULT_ALLOW_DEFAULT_BACKGROUND_IMAGES true		#define KDE_DEFAULT_ALLOW_DEFAULT_BACKGROUND_IMAGES true
	#define KDE_DEFAULT_NATURAL_SORTING true		#define KDE_DEFAULT_NATURAL_SORTING true
	class KUrl;		class KUrl;
	class QColor;		class QColor;
	class QFont;		class QFont;
	skipping to change at line 158		skipping to change at line 162
	*/		*/
	static int autoSelectDelay();		static int autoSelectDelay();
	/**		/**
	* Returns the KDE setting for the shortcut key to open		* Returns the KDE setting for the shortcut key to open
	* context menus.		* context menus.
	*		*
	* @return the key that pops up context menus.		* @return the key that pops up context menus.
	* @deprecated Simply reimplement QWidget::contextMenuEvent() instead.		* @deprecated Simply reimplement QWidget::contextMenuEvent() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED int contextMenuKey ();		static KDE_DEPRECATED int contextMenuKey ();
			#endif
	/**		/**
	* Returns the KDE setting for context menus.		* Returns the KDE setting for context menus.
	*		*
	* @return whether context menus should be shown on button press		* @return whether context menus should be shown on button press
	* or button release (click).		* or button release (click).
	*/		*/
	static bool showContextMenusOnPress ();		static bool showContextMenusOnPress ();
	/**		/**
	skipping to change at line 542		skipping to change at line 548
	*/		*/
	static void emitChange(ChangeType changeType, int arg = 0);		static void emitChange(ChangeType changeType, int arg = 0);
	/**		/**
	* Return the KGlobalSettings singleton.		* Return the KGlobalSettings singleton.
	* This is used to connect to its signals, to be notified of changes.		* This is used to connect to its signals, to be notified of changes.
	*/		*/
	static KGlobalSettings* self();		static KGlobalSettings* self();
	/**		/**
			* Specifies options passed to activate().
			*
			* @since 4.6
			*/
			enum ActivateOption {
			ApplySettings = 0x1, ///< Make all globally applicable settings tak
			e effect.
			ListenForChanges = 0x2 ///< Listen for changes to the settings.
			};
			Q_DECLARE_FLAGS(ActivateOptions, ActivateOption)
			/**
	* Makes all globally applicable settings take effect		* Makes all globally applicable settings take effect
	* and starts listening for changes to these settings.		* and starts listening for changes to these settings.
	*		*
	* This is usually called only by the KApplication constructor.		* This is usually called only by the KApplication constructor.
	*		*
	* @since 4.3.3		* @since 4.3.3
	*/		*/
	void activate();		void activate(); //KDE5: Merge with the overloaded method below
			/**
			* @overload
			*
			* @since 4.6
			*/
			void activate(ActivateOptions options);
	/**		/**
	* Valid values for the settingsChanged signal		* Valid values for the settingsChanged signal
	*/		*/
	enum SettingsCategory { SETTINGS_MOUSE, SETTINGS_COMPLETION, SETTINGS_P ATHS,		enum SettingsCategory { SETTINGS_MOUSE, SETTINGS_COMPLETION, SETTINGS_P ATHS,
	SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORT CUTS };		SETTINGS_POPUPMENU, SETTINGS_QT, SETTINGS_SHORT CUTS };
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the application has changed its palette due to a KContr ol request.		* Emitted when the application has changed its palette due to a KContr ol request.
	skipping to change at line 651		skipping to change at line 675
	KGlobalSettings();		KGlobalSettings();
	class Private;		class Private;
	Private* const d;		Private* const d;
	Q_PRIVATE_SLOT(d, void _k_slotNotifyChange(int, int))		Q_PRIVATE_SLOT(d, void _k_slotNotifyChange(int, int))
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS(KGlobalSettings::GraphicEffects)		Q_DECLARE_OPERATORS_FOR_FLAGS(KGlobalSettings::GraphicEffects)
			Q_DECLARE_OPERATORS_FOR_FLAGS(KGlobalSettings::ActivateOptions)
	#endif		#endif
End of changes. 7 change blocks.
	1 lines changed or deleted		27 lines changed or added

	kgraphicswebview.h		kgraphicswebview.h
	skipping to change at line 41		skipping to change at line 41
	#include <QtWebKit/QGraphicsWebView>		#include <QtWebKit/QGraphicsWebView>
	class KUrl;		class KUrl;
	template<class T> class KWebViewPrivate;		template<class T> class KWebViewPrivate;
	/**		/**
	* @short A re-implementation of QGraphicsWebView that provides KDE integra tion.		* @short A re-implementation of QGraphicsWebView that provides KDE integra tion.
	*		*
	* This is a drop-in replacement for QGraphicsWebView that provides full KD E		* This is a drop-in replacement for QGraphicsWebView that provides full KD E
	* integration through the use of @ref KWebPage. It also provides signals t hat		* integration through the use of @ref KWebPage. It also provides signals t hat
	* capture middle/shift/ctrl mouse clicks on links and url pasting from the		* capture middle, shift and ctrl mouse clicks on links and URL pasting fro m the
	* selection clipboard.		* selection clipboard.
	*		*
			* The specific functionality provided by this class (over and above what
			* would be acheived by using KWebPage with a QGraphicsWebView) is that
			* scrolling * with the mouse wheel while holding down CTRL zooms the page
			(see
			* QGraphicsWebView::setZoomFactor) and several useful signals are emitted
			when
			* the user performs certain actions.
			*
	* @author Urs Wolfer <uwolfer @ kde.org>		* @author Urs Wolfer <uwolfer @ kde.org>
	* @author Dawit Alemayehu <adawit @ kde.org>		* @author Dawit Alemayehu <adawit @ kde.org>
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	class KDEWEBKIT_EXPORT KGraphicsWebView : public QGraphicsWebView		class KDEWEBKIT_EXPORT KGraphicsWebView : public QGraphicsWebView
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructs a KGraphicsWebView object with parent @p parent.		* Constructs a KGraphicsWebView object with parent @p parent.
	*		*
	* The @p createCustomPage flag allows you to prevent the creation of a		* Set @p createCustomPage to false to prevent the creation of a
	* custom KWebPage object that is used to provide KDE integration. If y		* @ref KWebPage object for KDE integration. Doing so allows you to
	ou		* avoid unnecessary object creation and deletion if you are going to
	* are going to use your own implementation of KWebPage, you should set		* use a subclass of KWebPage.
	* this flag to false to avoid unnecessary creation and deletion of obj
	ects.
	*		*
	* @param parent the parent object.		* @param parent the parent object
	* @param createCustomPage if true, the default, creates a custom KWeb		* @param createCustomPage if @c true, the view's page is set to an
	Page object.		* instance of KWebPage
	*/		*/
	explicit KGraphicsWebView(QGraphicsItem *parent = 0, bool createCustomP age = true);		explicit KGraphicsWebView(QGraphicsItem *parent = 0, bool createCustomP age = true);
	/**		/**
	* Destroys the KWebView.		* Destroys the KGraphicsWebView.
	*/		*/
	~KGraphicsWebView();		~KGraphicsWebView();
	/**		/**
	* Returns true if access to remote content is allowed.		* Returns true if access to remote content is allowed.
	*		*
	* By default access to remote content is allowed.		* By default access to remote content is allowed.
	*		*
	* @see setAllowExternalContent()		* @see setAllowExternalContent()
	* @see KWebPage::isExternalContentAllowed()		* @see KWebPage::isExternalContentAllowed()
	skipping to change at line 96		skipping to change at line 103
	* can be accessed through this class. By default fetching external con tent		* can be accessed through this class. By default fetching external con tent
	* is allowed.		* is allowed.
	*		*
	* @see isExternalContentAllowed()		* @see isExternalContentAllowed()
	* @see KWebPage::setAllowExternalContent(bool)		* @see KWebPage::setAllowExternalContent(bool)
	*/		*/
	void setAllowExternalContent(bool allow);		void setAllowExternalContent(bool allow);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is emitted when a url from the selection clipboard is pa		* Emitted when a URL from the selection clipboard is pasted on this vi
	sted		ew.
	* on this view.
	*		*
	* @param url the url of the clicked link.		* This is triggered when the user clicks on the page with the middle
			* mouse button when there is something in the global mouse selection
			* clipboard. This is typically only possible on X11.
			*
			* Uri filters are applied to the selection clipboard to generate @p ur
			l.
			*
			* If the content in the selection clipboard is not a valid url and a
			* default search engine is configured, @p url will be set to a query
			* to the default search engine.
			*
			* @param url url generated from the selection clipboard content
			*
			* @deprecated use selectionClipboardUrlPasted(KUrl, bool) instead
			* @see QClipboard
	*/		*/
	void selectionClipboardUrlPasted(const KUrl &url);		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED void selectionClipboardUrlPasted(const KUrl &url);
			#endif
	/**		/**
	* This signal is emitted when a link is shift clicked with the left mo		* Emitted when a URL from the selection clipboard is pasted on this vi
	use		ew.
	* button.
	*		*
	* @param url the url of the clicked link.		* This is triggered when the user clicks on the page with the middle
			* mouse button when there is something in the global mouse selection
			* clipboard. This is typically only possible on X11.
			*
			* Uri filters are applied to the selection clipboard to generate @p ur
			l.
			*
			* If the content in the selection clipboard is not a valid URL and a
			* default search engine is configured, @p searchText will be set to th
			e
			* content of the clipboard (250 characters maximum) and @p url will be
			* set to a query to the default search engine.
			*
			* @param url the URL generated from the selection clipboard co
			ntent
			* @param searchText content of the selection clipboard if it is not a
			* valid URL
			*
			* @see KUriFilter
			* @see QClipboard
			* @since 4.6
			*/
			void selectionClipboardUrlPasted(const KUrl &url, const QString& search
			Text);
			/**
			* Emitted when a link is clicked with the left mouse button while SHIF
			T is
			* held down.
			*
			* A KDE user would typically expect this to result in the triggering o
			f a
			* "save link as" action.
			*
			* @param url the URL of the clicked link
	*/		*/
	void linkShiftClicked(const KUrl &url);		void linkShiftClicked(const KUrl &url);
	/**		/**
	* This signal is emitted when a link is either clicked with middle mou		* Emitted when a link is clicked with the middle mouse button or click
	se		ed
	* button or ctrl-clicked with the left moust button.		* with the left mouse button while CTRL is held down.
	*		*
	* @param url the url of the clicked link.		* Typically, the user would expect this to result in the URL being ope
			ned
			* in a new tab or window.
			*
			* @param url the URL of the clicked link
	*/		*/
	void linkMiddleOrCtrlClicked(const KUrl &url);		void linkMiddleOrCtrlClicked(const KUrl &url);
	protected:		protected:
	/**		/**
			* @reimp
			*
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWidget::wheelEvent		* @see QWidget::wheelEvent
	* @internal		* @internal
	*/		*/
	void wheelEvent(QGraphicsSceneWheelEvent *event);		void wheelEvent(QGraphicsSceneWheelEvent *event);
	/**		/**
			* @reimp
			*
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWidget::mousePressEvent		* @see QWidget::mousePressEvent
	* @internal		* @internal
	*/		*/
	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);		virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
	/**		/**
			* @reimp
			*
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWidget::mouseReleaseEvent		* @see QWidget::mouseReleaseEvent
	* @internal		* @internal
	*/		*/
	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	private:		private:
	friend class KWebViewPrivate<KGraphicsWebView>;		friend class KWebViewPrivate<KGraphicsWebView>;
	KWebViewPrivate<KGraphicsWebView> * const d;		KWebViewPrivate<KGraphicsWebView> * const d;
End of changes. 15 change blocks.
	24 lines changed or deleted		88 lines changed or added

	kguiitem.h		kguiitem.h
	skipping to change at line 63		skipping to change at line 63
	KGuiItem( const KGuiItem &rhs );		KGuiItem( const KGuiItem &rhs );
	KGuiItem &operator=( const KGuiItem &rhs );		KGuiItem &operator=( const KGuiItem &rhs );
	~KGuiItem();		~KGuiItem();
	QString text() const;		QString text() const;
	QString plainText() const;		QString plainText() const;
	/// @deprecated use icon() instead		/// @deprecated use icon() instead
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QIcon iconSet( KIconLoader::Group=KIconLoader::Small, in t size = 0) const;		KDE_DEPRECATED QIcon iconSet( KIconLoader::Group=KIconLoader::Small, in t size = 0) const;
			#endif
	KIcon icon( ) const;		KIcon icon( ) const;
	QString iconName() const;		QString iconName() const;
	QString toolTip() const;		QString toolTip() const;
	QString whatsThis() const;		QString whatsThis() const;
	bool isEnabled() const;		bool isEnabled() const;
	bool hasIcon() const;		bool hasIcon() const;
	#ifndef KDE_NO_COMPAT		#if !defined(KDE_NO_COMPAT) && !defined(KDE_NO_DEPRECATED)
	KDE_DEPRECATED bool hasIconSet() const { return hasIcon(); }		KDE_DEPRECATED bool hasIconSet() const { return hasIcon(); }
	#endif		#endif
	void setText( const QString &text );		void setText( const QString &text );
	void setIcon( const KIcon &iconset );		void setIcon( const KIcon &iconset );
	void setIconName( const QString &iconName );		void setIconName( const QString &iconName );
	void setToolTip( const QString &tooltip );		void setToolTip( const QString &tooltip );
	void setWhatsThis( const QString &whatsThis );		void setWhatsThis( const QString &whatsThis );
	void setEnabled( bool enable );		void setEnabled( bool enable );
End of changes. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	khtml_export.h		khtml_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KHTML_EXPORT_H		#ifndef KHTML_EXPORT_H
	#define KHTML_EXPORT_H		#define KHTML_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KHTML_EXPORT		#ifndef KHTML_EXPORT
	# if defined(MAKE_KHTML_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KHTML_EXPORT
			# elif defined(MAKE_KHTML_LIB)
	/* We are building this library */		/* We are building this library */
	# define KHTML_EXPORT KDE_EXPORT		# define KHTML_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KHTML_EXPORT KDE_IMPORT		# define KHTML_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KHTML_EXPORT_DEPRECATED		# ifndef KHTML_EXPORT_DEPRECATED
	# define KHTML_EXPORT_DEPRECATED KDE_DEPRECATED KHTML_EXPORT		# define KHTML_EXPORT_DEPRECATED KDE_DEPRECATED KHTML_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	khtml_part.h		khtml_part.h
	skipping to change at line 512		skipping to change at line 512
	*		*
	* Please note that enabling this option currently automatically disables Javascript,		* Please note that enabling this option currently automatically disables Javascript,
	* Java and Plugins support. This might change in the future if the secur ity model		* Java and Plugins support. This might change in the future if the secur ity model
	* is becoming more sophisticated, so don't rely on this behaviour.		* is becoming more sophisticated, so don't rely on this behaviour.
	*		*
	* ( default @p false - everything is loaded unless forbidden by KApplica tion::authorizeURLAction).		* ( default @p false - everything is loaded unless forbidden by KApplica tion::authorizeURLAction).
	*/		*/
	void setOnlyLocalReferences( bool enable );		void setOnlyLocalReferences( bool enable );
	/**		/**
			* Security option. If this is set to true, content loaded from external
			URLs
			* will be permitted to access images on disk regardless of of the Kiosk
			policy.
			* You should be careful in enabling this, as it may make it easier to fa
			ke
			* any HTML-based chrome or to perform other such user-confusion attack.
			* @p false by default.
			*
			* @since 4.6
			*/
			void setForcePermitLocalImages( bool enable );
			/**
	* Sets whether DNS Names found in loaded documents'anchors should be pre -fetched (pre-resolved).		* Sets whether DNS Names found in loaded documents'anchors should be pre -fetched (pre-resolved).
	* Note that calling this function will permanently override the User set tings about		* Note that calling this function will permanently override the User set tings about
	* DNS prefetch support.		* DNS prefetch support.
	* Not calling this function is the only way to let the default settings apply.		* Not calling this function is the only way to let the default settings apply.
	*		*
	* @note This setting has no effect if @ref setOnlyLocalReferences() mode is enabled.		* @note This setting has no effect if @ref setOnlyLocalReferences() mode is enabled.
	*		*
	* @param pmode the mode to set. See @ref DNSPrefetch enum for explanatio n of values.		* @param pmode the mode to set. See @ref DNSPrefetch enum for explanatio n of values.
	*		*
	* @since 4.2		* @since 4.2
	skipping to change at line 541		skipping to change at line 552
	* @since 4.2		* @since 4.2
	*/		*/
	DNSPrefetch dnsPrefetch() const;		DNSPrefetch dnsPrefetch() const;
	/**		/**
	* Returns whether only file:/ or data:/ references are allowed		* Returns whether only file:/ or data:/ references are allowed
	* to be loaded ( default @p false ). See setOnlyLocalReferences.		* to be loaded ( default @p false ). See setOnlyLocalReferences.
	**/		**/
	bool onlyLocalReferences() const;		bool onlyLocalReferences() const;
			/**
			* If true, local image files will be loaded even when forbidden by the
			* Kiosk/KAuthorized policies ( default @p false ). See @ref setForcePerm
			itLocalImages.
			*
			* @since 4.6
			**/
			bool forcePermitLocalImages() const;
	/** Returns whether caret mode is on/off.		/** Returns whether caret mode is on/off.
	*/		*/
	bool isCaretMode() const;		bool isCaretMode() const;
	/**		/**
	* Returns @p true if the document is editable, @p false otherwise.		* Returns @p true if the document is editable, @p false otherwise.
	*/		*/
	bool isEditable() const;		bool isEditable() const;
	/**		/**
	skipping to change at line 1428		skipping to change at line 1447
	*/		*/
	void slotDebugScript();		void slotDebugScript();
	/**		/**
	* @internal		* @internal
	*/		*/
	void slotDebugDOMTree();		void slotDebugDOMTree();
	/**		/**
	* @internal		* @internal
	*/		*/
	void slotDebugRenderTree();		void slotDebugRenderTree();
			void slotDebugFrameTree();
	/**		/**
	* @internal		* @internal
	*/		*/
	void slotStopAnimations();		void slotStopAnimations();
	/**		/**
	* @internal		* @internal
	*/		*/
	virtual void slotViewDocumentSource();		virtual void slotViewDocumentSource();
	/**		/**
	* @internal		* @internal
	skipping to change at line 1907		skipping to change at line 1929
	bool handleMouseMoveEventDrag(khtml::MouseMoveEvent *event);		bool handleMouseMoveEventDrag(khtml::MouseMoveEvent *event);
	bool handleMouseMoveEventOver(khtml::MouseMoveEvent *event);		bool handleMouseMoveEventOver(khtml::MouseMoveEvent *event);
	void handleMouseMoveEventSelection(khtml::MouseMoveEvent *event);		void handleMouseMoveEventSelection(khtml::MouseMoveEvent *event);
	void handleMousePressEventSingleClick(khtml::MousePressEvent *event);		void handleMousePressEventSingleClick(khtml::MousePressEvent *event);
	void handleMousePressEventDoubleClick(khtml::MouseDoubleClickEvent *event );		void handleMousePressEventDoubleClick(khtml::MouseDoubleClickEvent *event );
	void handleMousePressEventTripleClick(khtml::MouseDoubleClickEvent *event );		void handleMousePressEventTripleClick(khtml::MouseDoubleClickEvent *event );
	KHTMLPartPrivate *d;		KHTMLPartPrivate *d;
	friend class KHTMLPartPrivate;		friend class KHTMLPartPrivate;
			public: // So we don't end up having to add 50 more friends
			/** @internal Access to internal APIs. Don't use outside */
			KHTMLPartPrivate* impl() { return d; }
	};		};
	#endif		#endif
End of changes. 4 change blocks.
	0 lines changed or deleted		31 lines changed or added

	khtmlview.h		khtmlview.h
	skipping to change at line 386		skipping to change at line 386
	void doAutoScroll();		void doAutoScroll();
	void timerEvent ( QTimerEvent * );		void timerEvent ( QTimerEvent * );
	void setSmoothScrollingModeDefault( SmoothScrollingMode m );		void setSmoothScrollingModeDefault( SmoothScrollingMode m );
	protected Q_SLOTS:		protected Q_SLOTS:
	void slotPaletteChanged();		void slotPaletteChanged();
	private Q_SLOTS:		private Q_SLOTS:
	void tripleClickTimeout();		void tripleClickTimeout();
	void findTimeout();
	void accessKeysTimeout();		void accessKeysTimeout();
	void scrollTick();		void scrollTick();
	/**		/**
	* @internal		* @internal
	* used for autoscrolling with MMB		* used for autoscrolling with MMB
	*/		*/
	void slotMouseScrollTimer();		void slotMouseScrollTimer();
	private:		private:
	skipping to change at line 493		skipping to change at line 492
	int detail,QMouseEvent *_mouse, bool setUnder,		int detail,QMouseEvent *_mouse, bool setUnder,
	int mouseEventType, int orientation=0);		int mouseEventType, int orientation=0);
	bool dispatchKeyEvent( QKeyEvent *_ke );		bool dispatchKeyEvent( QKeyEvent *_ke );
	bool dispatchKeyEventHelper( QKeyEvent *_ke, bool generate_keypress );		bool dispatchKeyEventHelper( QKeyEvent *_ke, bool generate_keypress );
	void complete( bool pendingAction );		void complete( bool pendingAction );
	void updateScrollBars();		void updateScrollBars();
	void setupSmoothScrolling(int dx, int dy);		void setupSmoothScrolling(int dx, int dy);
	#ifndef KHTML_NO_TYPE_AHEAD_FIND
	void findAhead(bool increase);
	void updateFindAheadTimeout();
	void startFindAhead( bool linksOnly );
	#endif // KHTML_NO_TYPE_AHEAD_FIND
	/**		/**
	* Returns the current caret policy when the view is not focused.		* Returns the current caret policy when the view is not focused.
	* @return a KHTMLPart::CaretDisplay value		* @return a KHTMLPart::CaretDisplay value
	*/		*/
	int caretDisplayPolicyNonFocused() const;		int caretDisplayPolicyNonFocused() const;
	/**		/**
	* Sets the caret display policy when the view is not focused.		* Sets the caret display policy when the view is not focused.
	* @param policy new display policy as		* @param policy new display policy as
	* defined by KHTMLPart::CaretDisplayPolicy		* defined by KHTMLPart::CaretDisplayPolicy
End of changes. 2 change blocks.
	7 lines changed or deleted		0 lines changed or added

	kiconeffect.h		kiconeffect.h
	skipping to change at line 52		skipping to change at line 52
	*		*
	* \image html kiconeffect-apply.png "Various Effects applied to an image"		* \image html kiconeffect-apply.png "Various Effects applied to an image"
	*		*
	* @see KIcon		* @see KIcon
	*/		*/
	class KDEUI_EXPORT KIconEffect		class KDEUI_EXPORT KIconEffect
	{		{
	public:		public:
	/**		/**
	* Create a new KIconEffect.		* Create a new KIconEffect.
			* You will most likely never have to use this to create a new KIconEffec
			t
			* yourself, as you can use the KIconEffect provided by the global KIconL
			oader
			* (which itself is accessible by KIconLoader::global()) through its
			* iconEffect() function.
	*/		*/
	KIconEffect();		KIconEffect();
	~KIconEffect();		~KIconEffect();
	/**		/**
	* This is the enumeration of all possible icon effects.		* This is the enumeration of all possible icon effects.
	* Note that 'LastEffect' is no valid icon effect but only		* Note that 'LastEffect' is no valid icon effect but only
	* used internally to check for invalid icon effects.		* used internally to check for invalid icon effects.
	*		*
	* @li NoEffect: Don't apply any icon effect		* @li NoEffect: Don't apply any icon effect
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	kiconloader.h		kiconloader.h
	skipping to change at line 80		skipping to change at line 80
	*		*
	* The standalone directories contain just one version of an icon. The		* The standalone directories contain just one version of an icon. The
	* directories that are searched are: $appdir/pics and $appdir/toolbar.		* directories that are searched are: $appdir/pics and $appdir/toolbar.
	* Icons in these directories can be loaded by using the special group		* Icons in these directories can be loaded by using the special group
	* "User".		* "User".
	*		*
	*/		*/
	class KDEUI_EXPORT KIconLoader : public QObject		class KDEUI_EXPORT KIconLoader : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
			Q_ENUMS(Context)
			Q_ENUMS(Type)
			Q_ENUMS(MatchType)
			Q_ENUMS(Group)
			Q_ENUMS(StdSizes)
			Q_ENUMS(States)
	public:		public:
	/**		/**
	* Defines the context of the icon.		* Defines the context of the icon.
	*/		*/
	enum Context {		enum Context {
	Any, ///< Some icon with unknown purpose.		Any, ///< Some icon with unknown purpose.
	Action, ///< An action icon (e.g. 'save', 'print').		Action, ///< An action icon (e.g. 'save', 'print').
	Application, ///< An icon that represents an application.		Application, ///< An icon that represents an application.
	Device, ///< An icon that represents a device.		Device, ///< An icon that represents a device.
	skipping to change at line 204		skipping to change at line 210
	*/		*/
	explicit KIconLoader(const KComponentData &componentData, QObject* pare nt = 0);		explicit KIconLoader(const KComponentData &componentData, QObject* pare nt = 0);
	/**		/**
	* Cleanup		* Cleanup
	*/		*/
	~KIconLoader();		~KIconLoader();
	/**		/**
	* Returns the global icon loader initialized with the global KComponen tData.		* Returns the global icon loader initialized with the global KComponen tData.
	* Therefore you must have a KComponentData instantiated before calling this.
	* @return global icon loader		* @return global icon loader
	*/		*/
	static KIconLoader* global();		static KIconLoader* global();
	/**		/**
	* Adds @p appname to the list of application specific directories.		* Adds @p appname to the list of application specific directories.
	* @param appname The application name.		* @param appname The application name.
	*/		*/
	void addAppDir(const QString& appname);		void addAppDir(const QString& appname);
	skipping to change at line 289		skipping to change at line 294
	* @param size If nonzero, this overrides the size specified by @p grou p.		* @param size If nonzero, this overrides the size specified by @p grou p.
	* See KIconLoader::StdSizes.		* See KIconLoader::StdSizes.
	* @param canReturnNull Can return a null iconset? If false, iconset		* @param canReturnNull Can return a null iconset? If false, iconset
	* containing the "unknown" pixmap is returned when no appropriate icon has		* containing the "unknown" pixmap is returned when no appropriate icon has
	* been found.		* been found.
	* @return the icon set. Can be null when not found, depending on		* @return the icon set. Can be null when not found, depending on
	* @p canReturnNull.		* @p canReturnNull.
	*		*
	* @deprecated use KIcon instead, which uses the iconloader internally		* @deprecated use KIcon instead, which uses the iconloader internally
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QIcon loadIconSet(const QString& name, KIconLoader::Grou p group, int size = 0,		KDE_DEPRECATED QIcon loadIconSet(const QString& name, KIconLoader::Grou p group, int size = 0,
	bool canReturnNull = false);		bool canReturnNull = false);
			#endif
	/**		/**
	* Returns the path of an icon.		* Returns the path of an icon.
	* @param name The name of the icon, without extension. If an absolute		* @param name The name of the icon, without extension. If an absolute
	* path is supplied for this parameter, iconPath will return it		* path is supplied for this parameter, iconPath will return it
	* directly.		* directly.
	* @param group_or_size If positive, search icons whose size is		* @param group_or_size If positive, search icons whose size is
	* specified by the icon group @p group_or_size. If negative, search		* specified by the icon group @p group_or_size. If negative, search
	* icons whose size is - @p group_or_size.		* icons whose size is - @p group_or_size.
	* See KIconLoader::Group and KIconLoader::StdSizes		* See KIconLoader::Group and KIconLoader::StdSizes
	skipping to change at line 470		skipping to change at line 477
	* Load a desktop icon.		* Load a desktop icon.
	*/		*/
	KDEUI_EXPORT QPixmap DesktopIcon(const QString& name, int size=0,		KDEUI_EXPORT QPixmap DesktopIcon(const QString& name, int size=0,
	int state=KIconLoader::DefaultState, const QStringList& overlays = QStringList());		int state=KIconLoader::DefaultState, const QStringList& overlays = QStringList());
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a desktop icon, and apply the necessary effects to get an IconSet.		* Load a desktop icon, and apply the necessary effects to get an IconSet.
	* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead		* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDEUI_EXPORT_DEPRECATED QIcon DesktopIconSet(const QString& name, int size= 0);		KDEUI_EXPORT_DEPRECATED QIcon DesktopIconSet(const QString& name, int size= 0);
			#endif
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a toolbar icon.		* Load a toolbar icon.
	*/		*/
	KDEUI_EXPORT QPixmap BarIcon(const QString& name, int size=0, int state=KIc onLoader::DefaultState,		KDEUI_EXPORT QPixmap BarIcon(const QString& name, int size=0, int state=KIc onLoader::DefaultState,
	const QStringList& overlays = QStringList());		const QStringList& overlays = QStringList());
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a toolbar icon, and apply the necessary effects to get an IconSet.		* Load a toolbar icon, and apply the necessary effects to get an IconSet.
	* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead		* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDEUI_EXPORT_DEPRECATED QIcon BarIconSet(const QString& name, int size=0);		KDEUI_EXPORT_DEPRECATED QIcon BarIconSet(const QString& name, int size=0);
			#endif
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a small icon.		* Load a small icon.
	*/		*/
	KDEUI_EXPORT QPixmap SmallIcon(const QString& name, int size=0,		KDEUI_EXPORT QPixmap SmallIcon(const QString& name, int size=0,
	int state=KIconLoader::DefaultState, const QStringList &o verlays = QStringList());		int state=KIconLoader::DefaultState, const QStringList &o verlays = QStringList());
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a small icon, and apply the necessary effects to get an IconSet.		* Load a small icon, and apply the necessary effects to get an IconSet.
	* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead		* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDEUI_EXPORT_DEPRECATED QIcon SmallIconSet(const QString& name, int size=0) ;		KDEUI_EXPORT_DEPRECATED QIcon SmallIconSet(const QString& name, int size=0) ;
			#endif
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a main toolbar icon.		* Load a main toolbar icon.
	*/		*/
	KDEUI_EXPORT QPixmap MainBarIcon(const QString& name, int size=0,		KDEUI_EXPORT QPixmap MainBarIcon(const QString& name, int size=0,
	int state=KIconLoader::DefaultState, const QStringList &overlays = QStringList());		int state=KIconLoader::DefaultState, const QStringList &overlays = QStringList());
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a main toolbar icon, and apply the effects to get an IconSet.		* Load a main toolbar icon, and apply the effects to get an IconSet.
	* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead		* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDEUI_EXPORT_DEPRECATED QIcon MainBarIconSet(const QString& name, int size= 0);		KDEUI_EXPORT_DEPRECATED QIcon MainBarIconSet(const QString& name, int size= 0);
			#endif
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a user icon. User icons are searched in $appdir/pics.		* Load a user icon. User icons are searched in $appdir/pics.
	*/		*/
	KDEUI_EXPORT QPixmap UserIcon(const QString& name, int state=KIconLoader::D efaultState, const QStringList &overlays = QStringList());		KDEUI_EXPORT QPixmap UserIcon(const QString& name, int state=KIconLoader::D efaultState, const QStringList &overlays = QStringList());
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Load a user icon, and apply the effects to get an IconSet.		* Load a user icon, and apply the effects to get an IconSet.
	* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead		* @deprecated use KIcon(name) or KIcon(name,componentData.iconLoader()) in stead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDEUI_EXPORT_DEPRECATED QIcon UserIconSet(const QString& name);		KDEUI_EXPORT_DEPRECATED QIcon UserIconSet(const QString& name);
			#endif
	/**		/**
	* \relates KIconLoader		* \relates KIconLoader
	* Returns the current icon size for a specific group.		* Returns the current icon size for a specific group.
	*/		*/
	KDEUI_EXPORT int IconSize(KIconLoader::Group group);		KDEUI_EXPORT int IconSize(KIconLoader::Group group);
	inline KIconLoader::Group& operator++(KIconLoader::Group& group) { group = static_cast<KIconLoader::Group>(group+1); return group; }		inline KIconLoader::Group& operator++(KIconLoader::Group& group) { group = static_cast<KIconLoader::Group>(group+1); return group; }
	inline KIconLoader::Group operator++(KIconLoader::Group& group,int) { KIcon Loader::Group ret = group; ++group; return ret; }		inline KIconLoader::Group operator++(KIconLoader::Group& group,int) { KIcon Loader::Group ret = group; ++group; return ret; }
End of changes. 14 change blocks.
	1 lines changed or deleted		18 lines changed or added

	kidletime_export.h		kidletime_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KIDLETIME_EXPORT_H		#ifndef KIDLETIME_EXPORT_H
	#define KIDLETIME_EXPORT_H		#define KIDLETIME_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KIDLETIME_EXPORT		#ifndef KIDLETIME_EXPORT
	# if defined(MAKE_KIDLETIME_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KIDLETIME_EXPORT
			# elif defined(MAKE_KIDLETIME_LIB)
	/* We are building this library */		/* We are building this library */
	# define KIDLETIME_EXPORT KDE_EXPORT		# define KIDLETIME_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KIDLETIME_EXPORT KDE_IMPORT		# define KIDLETIME_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kimagecache.h		kimagecache.h
	skipping to change at line 156		skipping to change at line 156
	/**		/**
	* Enables or disables local pixmap caching. If it is anticipated that a pixmap		* Enables or disables local pixmap caching. If it is anticipated that a pixmap
	* will be frequently needed then this can actually save memory overall since the		* will be frequently needed then this can actually save memory overall since the
	* X server or graphics card will not have to store duplicate copies of the same		* X server or graphics card will not have to store duplicate copies of the same
	* image.		* image.
	*		*
	* @param enable Enables pixmap caching if true, disables otherwise.		* @param enable Enables pixmap caching if true, disables otherwise.
	*/		*/
	void setPixmapCaching(bool enable);		void setPixmapCaching(bool enable);
			/**
			* @return The highest memory size in bytes to be used by cached pixmap
			s.
			* @since 4.6
			*/
			int pixmapCacheLimit() const;
			/**
			* Sets the highest memory size the pixmap cache should use.
			*
			* @param size The size in bytes
			* @since 4.6
			*/
			void setPixmapCacheLimit(int size);
	private:		private:
	class Private;		class Private;
	Private *const d; ///< @internal		Private *const d; ///< @internal
	};		};
	#endif /* KIMAGECACHE_H */		#endif /* KIMAGECACHE_H */
End of changes. 1 change blocks.
	0 lines changed or deleted		15 lines changed or added

	kimproxy_export.h		kimproxy_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KIMPROXY_EXPORT_H		#ifndef KIMPROXY_EXPORT_H
	#define KIMPROXY_EXPORT_H		#define KIMPROXY_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KIMPROXY_EXPORT		#ifndef KIMPROXY_EXPORT
	# if defined(MAKE_KIMPROXY_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KIMPROXY_EXPORT
			# elif defined(MAKE_KIMPROXY_LIB)
	/* We are building this library */		/* We are building this library */
	# define KIMPROXY_EXPORT KDE_EXPORT		# define KIMPROXY_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KIMPROXY_EXPORT KDE_IMPORT		# define KIMPROXY_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kio_export.h		kio_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KIO_EXPORT_H		#ifndef KIO_EXPORT_H
	#define KIO_EXPORT_H		#define KIO_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KIO_EXPORT		#ifndef KIO_EXPORT
	# if defined(MAKE_KIO_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KIO_EXPORT
			# elif defined(MAKE_KIO_LIB)
	/* We are building this library */		/* We are building this library */
	# define KIO_EXPORT KDE_EXPORT		# define KIO_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KIO_EXPORT KDE_IMPORT		# define KIO_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KIO_EXPORT_DEPRECATED		# ifndef KIO_EXPORT_DEPRECATED
	# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT		# define KIO_EXPORT_DEPRECATED KDE_DEPRECATED KIO_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kjob.h		kjob.h
	skipping to change at line 333		skipping to change at line 333
	/**		/**
	* Returns whether this job automatically deletes itself once		* Returns whether this job automatically deletes itself once
	* the job is finished.		* the job is finished.
	*		*
	* @return whether the job is deleted automatically after		* @return whether the job is deleted automatically after
	* finishing.		* finishing.
	*/		*/
	bool isAutoDelete() const;		bool isAutoDelete() const;
	Q_SIGNALS:		Q_SIGNALS:
	#ifndef Q_MOC_RUN		#if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(I
	#ifndef DOXYGEN_SHOULD_SKIP_THIS		N_IDE_PARSER)
	private: // don't tell moc or doxygen, but those signals are in fact privat		private: // don't tell moc, doxygen or kdevelop, but those signals are in f
	e		act private
	#endif
	#endif		#endif
	/**		/**
	* Emitted when the job is finished, in any case. It is used to notify		* Emitted when the job is finished, in any case. It is used to notify
	* observers that the job is terminated and that progress can be hidden .		* observers that the job is terminated and that progress can be hidden .
	*		*
	* This is a private signal, it can't be emitted directly by subclasses of		* This is a private signal, it can't be emitted directly by subclasses of
	* KJob, use emitResult() instead.		* KJob, use emitResult() instead.
	*		*
	* Client code is not supposed to connect to this signal, signal result should		* Client code is not supposed to connect to this signal, signal result should
	* be used instead.		* be used instead.
	*		*
			* If you store a list of jobs and they might get killed silently,
			* then you must connect to this instead of result().
			*
	* @param job the job that emitted this signal		* @param job the job that emitted this signal
	* @internal		* @internal
			*
			* @see result
	*/		*/
	void finished(KJob *job);		void finished(KJob *job);
	/**		/**
	* Emitted when the job is suspended.		* Emitted when the job is suspended.
	*		*
	* This is a private signal, it can't be emitted directly by subclasses of		* This is a private signal, it can't be emitted directly by subclasses of
	* KJob.		* KJob.
	*		*
	* @param job the job that emitted this signal		* @param job the job that emitted this signal
	skipping to change at line 427		skipping to change at line 430
	/**		/**
	* Emitted to display a warning about this job.		* Emitted to display a warning about this job.
	*		*
	* @param job the job that emitted this signal		* @param job the job that emitted this signal
	* @param plain the warning message		* @param plain the warning message
	* @param rich the rich text version of the message, or QString() is no ne is available		* @param rich the rich text version of the message, or QString() is no ne is available
	*/		*/
	void warning( KJob *job, const QString &plain, const QString &rich = QS tring() );		void warning( KJob *job, const QString &plain, const QString &rich = QS tring() );
	Q_SIGNALS:		Q_SIGNALS:
	#ifndef Q_MOC_RUN		#if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(I
	#ifndef DOXYGEN_SHOULD_SKIP_THIS		N_IDE_PARSER)
	private: // don't tell moc, but those signals are in fact private		private: // don't tell moc, doxygen or kdevelop, but those signals are in f
	#endif		act private
	#endif		#endif
	/**		/**
	* Emitted when we know the amount the job will have to process. The un it of this		* Emitted when we know the amount the job will have to process. The un it of this
	* amount is sent too. It can be emitted several times if the job manag es several		* amount is sent too. It can be emitted several times if the job manag es several
	* different units.		* different units.
	*		*
	* This is a private signal, it can't be emitted directly by subclasses of		* This is a private signal, it can't be emitted directly by subclasses of
	* KJob, use setTotalAmount() instead.		* KJob, use setTotalAmount() instead.
	*		*
	* @param job the job that emitted this signal		* @param job the job that emitted this signal
End of changes. 4 change blocks.
	9 lines changed or deleted		13 lines changed or added

	kjsapi_export.h		kjsapi_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KJSAPI_EXPORT_H		#ifndef KJSAPI_EXPORT_H
	#define KJSAPI_EXPORT_H		#define KJSAPI_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KJSAPI_EXPORT		#ifndef KJSAPI_EXPORT
	# if defined(MAKE_KJSAPI_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KJSAPI_EXPORT
			# elif defined(MAKE_KJSAPI_LIB)
	/* We are building this library */		/* We are building this library */
	# define KJSAPI_EXPORT KDE_EXPORT		# define KJSAPI_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KJSAPI_EXPORT KDE_IMPORT		# define KJSAPI_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KJSAPI_EXPORT_DEPRECATED		# ifndef KJSAPI_EXPORT_DEPRECATED
	# define KJSAPI_EXPORT_DEPRECATED KDE_DEPRECATED KJSAPI_EXPORT		# define KJSAPI_EXPORT_DEPRECATED KDE_DEPRECATED KJSAPI_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kkeysequencewidget.h		kkeysequencewidget.h
	skipping to change at line 54		skipping to change at line 54
	*		*
	* \image html kkeysequencewidget.png "KDE Key Sequence Widget"		* \image html kkeysequencewidget.png "KDE Key Sequence Widget"
	*		*
	* @author Mark Donohoe <donohoe@kde.org>		* @author Mark Donohoe <donohoe@kde.org>
	* @internal		* @internal
	*/		*/
	class KDEUI_EXPORT KKeySequenceWidget: public QWidget		class KDEUI_EXPORT KKeySequenceWidget: public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
			Q_FLAGS(ShortcutTypes)
	Q_PROPERTY(		Q_PROPERTY(
	bool multiKeyShortcutsAllowed		bool multiKeyShortcutsAllowed
	READ multiKeyShortcutsAllowed		READ multiKeyShortcutsAllowed
	WRITE setMultiKeyShortcutsAllowed )		WRITE setMultiKeyShortcutsAllowed )
	Q_PROPERTY(		Q_PROPERTY(
	ShortcutTypes checkForConflictsAgainst		ShortcutTypes checkForConflictsAgainst
	READ checkForConflictsAgainst		READ checkForConflictsAgainst
	WRITE setCheckForConflictsAgainst )		WRITE setCheckForConflictsAgainst )
			Q_PROPERTY(
			bool modifierlessAllowed
			READ isModifierlessAllowed
			WRITE setModifierlessAllowed )
	public:		public:
	///An enum about validation when setting a key sequence.		///An enum about validation when setting a key sequence.
	///@see setKeySequence()		///@see setKeySequence()
	enum Validation {		enum Validation {
	///Validate key sequence		///Validate key sequence
	Validate = 0,		Validate = 0,
	///Use key sequence without validation		///Use key sequence without validation
	NoValidate = 1		NoValidate = 1
	};		};
	skipping to change at line 227		skipping to change at line 234
	* @since 4.1		* @since 4.1
	*/		*/
	void setCheckActionCollections(const QList<KActionCollection *>& action Collections);		void setCheckActionCollections(const QList<KActionCollection *>& action Collections);
	/**		/**
	* @deprecated since 4.1		* @deprecated since 4.1
	* use setCheckActionCollections so that KKeySequenceWidget knows		* use setCheckActionCollections so that KKeySequenceWidget knows
	* in which action collection to call the writeSettings method after st ealing		* in which action collection to call the writeSettings method after st ealing
	* a shortcut from an action.		* a shortcut from an action.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setCheckActionList(const QList<QAction*> &checkList );		KDE_DEPRECATED void setCheckActionList(const QList<QAction*> &checkList );
			#endif
	/**		/**
	* If the component using this widget supports shortcuts contexts, i t has		* If the component using this widget supports shortcuts contexts, i t has
	* to set its component name so we can check conflicts correctly.		* to set its component name so we can check conflicts correctly.
	*/		*/
	void setComponentName(const QString &componentName);		void setComponentName(const QString &componentName);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
End of changes. 4 change blocks.
	0 lines changed or deleted		9 lines changed or added

	kled.h		kled.h
	skipping to change at line 296		skipping to change at line 296
	*/		*/
	virtual void paintRect();		virtual void paintRect();
	/**		/**
	* Paints a rectangular LED, either raised or		* Paints a rectangular LED, either raised or
	* sunken, depending on its argument.		* sunken, depending on its argument.
	*/		*/
	virtual void paintRectFrame( bool raised );		virtual void paintRectFrame( bool raised );
	void paintEvent( QPaintEvent* );		void paintEvent( QPaintEvent* );
			void resizeEvent( QResizeEvent* );
	/**		/**
	* Paint the cached antialiased pixmap corresponding to the state if an y		* Paint the cached antialiased pixmap corresponding to the state if an y
	* @return true if the pixmap was painted, false if it hasn't been crea ted yet		* @return true if the pixmap was painted, false if it hasn't been crea ted yet
	*/		*/
	bool paintCachedPixmap();		bool paintCachedPixmap();
			/**
			* @internal
			* invalidates caches after property changes and calls update()
			*/
			void updateCachedPixmap();
			/**
			* @internal
			*/
			void paintLed(Shape shape, Look look);
	private:		private:
	class Private;		class Private;
	Private * const d;		Private * const d;
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		12 lines changed or added

	klibloader.h		klibloader.h
	skipping to change at line 33		skipping to change at line 33
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QHash>		#include <QtCore/QHash>
	#include <QtCore/QLibrary>		#include <QtCore/QLibrary>
	#include <QtCore/QtPlugin>		#include <QtCore/QtPlugin>
	#include "kpluginfactory.h"		#include "kpluginfactory.h"
	#include "kpluginloader.h"		#include "kpluginloader.h"
	#include "klibrary.h"		#include "klibrary.h"
			#ifndef KDE_NO_DEPRECATED
	# define K_EXPORT_COMPONENT_FACTORY( libname, factory ) \		# define K_EXPORT_COMPONENT_FACTORY( libname, factory ) \
	extern "C" { KDE_EXPORT KPluginFactory *init_##libname() { return new f actory; } }		extern "C" { KDE_EXPORT KPluginFactory *init_##libname() { return new f actory; } }
	/**		/**
	* \class KLibLoader klibloader.h <KLibLoader>		* \class KLibLoader klibloader.h <KLibLoader>
	*		*
	* The KLibLoader allows you to load libraries dynamically at runtime.		* The KLibLoader allows you to load libraries dynamically at runtime.
	* Dependent libraries are loaded automatically.		* Dependent libraries are loaded automatically.
	*		*
	* KLibLoader follows the singleton pattern. You can not create multiple		* KLibLoader follows the singleton pattern. You can not create multiple
	skipping to change at line 295		skipping to change at line 297
	return res;		return res;
	}		}
	private:		private:
	~KLibLoader();		~KLibLoader();
	KLibLoader();		KLibLoader();
	};		};
	#endif		#endif
			#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	klineedit.h		klineedit.h
	skipping to change at line 155		skipping to change at line 155
	*		*
	* @author Dawit Alemayehu <adawit@kde.org>		* @author Dawit Alemayehu <adawit@kde.org>
	*/		*/
	class KDEUI_EXPORT KLineEdit : public QLineEdit, public KCompletionBase //k razy:exclude=qclasses		class KDEUI_EXPORT KLineEdit : public QLineEdit, public KCompletionBase //k razy:exclude=qclasses
	{		{
	friend class KComboBox;		friend class KComboBox;
	friend class KLineEditStyle;		friend class KLineEditStyle;
	Q_OBJECT		Q_OBJECT
			#ifndef KDE_NO_DEPRECATED
	Q_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE set ContextMenuEnabled )		Q_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE set ContextMenuEnabled )
			#endif
	Q_PROPERTY( bool urlDropsEnabled READ urlDropsEnabled WRITE setUrlDrops Enabled )		Q_PROPERTY( bool urlDropsEnabled READ urlDropsEnabled WRITE setUrlDrops Enabled )
	Q_PROPERTY( bool trapEnterKeyEvent READ trapReturnKey WRITE setTrapRetu rnKey )		Q_PROPERTY( bool trapEnterKeyEvent READ trapReturnKey WRITE setTrapRetu rnKey )
	Q_PROPERTY( bool squeezedTextEnabled READ isSqueezedTextEnabled WRITE s etSqueezedTextEnabled )		Q_PROPERTY( bool squeezedTextEnabled READ isSqueezedTextEnabled WRITE s etSqueezedTextEnabled )
	Q_PROPERTY( QString clickMessage READ clickMessage WRITE setClickMessag e )		Q_PROPERTY( QString clickMessage READ clickMessage WRITE setClickMessag e )
	Q_PROPERTY( bool showClearButton READ isClearButtonShown WRITE setClear ButtonShown )		Q_PROPERTY( bool showClearButton READ isClearButtonShown WRITE setClear ButtonShown )
	Q_PROPERTY( bool passwordMode READ passwordMode WRITE setPasswordMode )		Q_PROPERTY( bool passwordMode READ passwordMode WRITE setPasswordMode )
	public:		public:
	/**		/**
	skipping to change at line 224		skipping to change at line 226
	* menu item are enabled. If you do not want to the completion		* menu item are enabled. If you do not want to the completion
	* item to be visible simply invoke hideModechanger() right		* item to be visible simply invoke hideModechanger() right
	* after calling this method. Also by default, the context		* after calling this method. Also by default, the context
	* menu is automatically created if this widget is editable. Thus		* menu is automatically created if this widget is editable. Thus
	* you need to call this function with the argument set to false		* you need to call this function with the argument set to false
	* if you do not want this behavior.		* if you do not want this behavior.
	*		*
	* @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
	virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );		virtual KDE_DEPRECATED void setContextMenuEnabled( bool showMenu );
			#endif
	/**		/**
	* Returns @p true when the context menu is enabled.		* Returns @p true when the context menu is enabled.
	* @deprecated use contextMenuPolicy		* @deprecated use contextMenuPolicy
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool isContextMenuEnabled() const;		KDE_DEPRECATED bool isContextMenuEnabled() const;
			#endif
	/**		/**
	* Enables/Disables handling of URL drops. If enabled and the user		* Enables/Disables handling of URL drops. If enabled and the user
	* drops an URL, the decoded URL will be inserted. Otherwise the defaul t		* drops an URL, the decoded URL will be inserted. Otherwise the defaul t
	* behavior of QLineEdit is used, which inserts the encoded URL.		* behavior of QLineEdit is used, which inserts the encoded URL.
	*		*
	* @param enable If @p true, insert decoded URLs		* @param enable If @p true, insert decoded URLs
	*/		*/
	void setUrlDropsEnabled( bool enable );		void setUrlDropsEnabled( bool enable );
	skipping to change at line 411		skipping to change at line 417
	* either when the user is physically typing keys, or when the text is changed programmatically,		* either when the user is physically typing keys, or when the text is changed programmatically,
	* for example, by calling setText().		* for example, by calling setText().
	* But not when automatic completion changes the text temporarily.		* But not when automatic completion changes the text temporarily.
	*		*
	* @since 4.2.2		* @since 4.2.2
	* @deprecated since 4.5. You probably want to connect to textEdited() instead,		* @deprecated since 4.5. You probably want to connect to textEdited() instead,
	* which is emitted whenever the text is actually changed by the user		* which is emitted whenever the text is actually changed by the user
	* (by typing or accepting autocompletion), without side effects from		* (by typing or accepting autocompletion), without side effects from
	* suggested autocompletion either. userTextChanged isn't needed anymor e.		* suggested autocompletion either. userTextChanged isn't needed anymor e.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void userTextChanged( const QString & );		QT_MOC_COMPAT void userTextChanged( const QString & );
			#endif
	/**		/**
	* Emitted when the text rotation key-bindings are pressed.		* Emitted when the text rotation key-bindings are pressed.
	*		*
	* The argument indicates which key-binding was pressed.		* The argument indicates which key-binding was pressed.
	* In KLineEdit's case this can be either one of two values:		* In KLineEdit's case this can be either one of two values:
	* PrevCompletionMatch or NextCompletionMatch. See		* PrevCompletionMatch or NextCompletionMatch. See
	* KCompletionBase::setKeyBinding for details.		* KCompletionBase::setKeyBinding for details.
	*		*
	* Note that this signal is @em not emitted if the completion		* Note that this signal is @em not emitted if the completion
	skipping to change at line 454		skipping to change at line 462
	void aboutToShowContextMenu(QMenu* menu);		void aboutToShowContextMenu(QMenu* menu);
	/**		/**
	* Emitted when the user clicked on the clear button		* Emitted when the user clicked on the clear button
	*/		*/
	void clearButtonClicked();		void clearButtonClicked();
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Re-implemented for internal reasons. API not changed.		* Sets the lineedit to read-only. Similar to QLineEdit::setReadOnly
			* but also takes care of the background color, and the clear button.
	*/		*/
	virtual void setReadOnly(bool);		virtual void setReadOnly(bool);
	/**		/**
	* Iterates through all possible matches of the completed text or		* Iterates through all possible matches of the completed text or
	* the history list.		* the history list.
	*		*
	* This function simply iterates over all possible matches in case		* This function simply iterates over all possible matches in case
	* multimple matches are found as a result of a text completion request .		* multiple matches are found as a result of a text completion request.
	* It will have no effect if only a single match is found.		* It will have no effect if only a single match is found.
	*		*
	* @param type The key-binding invoked.		* @param type The key-binding invoked.
	*/		*/
	void rotateText( KCompletionBase::KeyBindingType type );		void rotateText( KCompletionBase::KeyBindingType type );
	/**		/**
	* See KCompletionBase::setCompletedText.		* See KCompletionBase::setCompletedText.
	*/		*/
	virtual void setCompletedText( const QString& );		virtual void setCompletedText( const QString& );
End of changes. 10 change blocks.
	2 lines changed or deleted		11 lines changed or added

	klocale.h		klocale.h
	skipping to change at line 40		skipping to change at line 40
	class QStringList;		class QStringList;
	class QTextCodec;		class QTextCodec;
	class QDate;		class QDate;
	class QTime;		class QTime;
	class QDateTime;		class QDateTime;
	class KDateTime;		class KDateTime;
	class KCalendarSystem;		class KCalendarSystem;
	class KCurrencyCode;		class KCurrencyCode;
			class KDayPeriod;
	class KLocalePrivate;		class KLocalePrivate;
	/**		/**
	* \file klocale.h		* \file klocale.h
	*/		*/
	/**		/**
	*		*
	* KLocale provides support for country specific stuff like		* KLocale provides support for country specific stuff like
	skipping to change at line 83		skipping to change at line 84
	*		*
	* The constructor looks for an entry Language in the group Locale in t he		* The constructor looks for an entry Language in the group Locale in t he
	* 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		* If you specify a configuration file, it has to be valid until the KL
	* the KLocale object is destroyed.		ocale
			* object is destroyed. Note that a setLocale() will be performed on t
			he
			* config using the current locale langauge, which may cause a sync()
			* and reparseConfiguration() which will save any changes you have made
			and
			* 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
			* the config using the current locale langauge, which may cause a sync
			()
			* 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 language for the locale		* @param language the ISO Language Code for the locale, e.g. "en" for
	* @param country the country for the locale		English
			* @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 date and time		* 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(),
	KConfig *config = 0);		KConfig *config = 0);
	/**		/**
	* Copy constructor		* Copy constructor
	*/		*/
	KLocale(const KLocale & rhs);		KLocale(const KLocale & rhs);
	/**		/**
	skipping to change at line 757		skipping to change at line 765
	* @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;		bool nounDeclension() const;
			//KDE5 move to KDateTime namespace
			/**
			* @since 4.6
			*
			* Available Calendar Systems
			*
			* @see setCalendarSystem()
			* @see calendarSystem()
			*/
			enum CalendarSystem {
			QDateCalendar = 1, /**< KDE Default, hybrid of Gregorian and Julian
			as used by QDate */
			//BahaiCalendar = 2, /**< Baha'i Calendar */
			//BuddhistLunarCalendar = 3, /**< Buddhist Lunar Calendar*/
			//ChineseCalendar = 4, /**< Chinese Calendar */
			CopticCalendar = 5, /**< Coptic Calendar as used Coptic Church and
			some parts of Egypt */
			EthiopianCalendar = 6, /**< Ethiopian Calendar, aka Ethiopic Calend
			ar */
			//EthiopianAmeteAlemCalendar = 7, /**< Ethiopian Amete Alem version
			, aka Ethiopic Amete Alem */
			GregorianCalendar = 8, /**< Gregorian Calendar, pure proleptic impl
			ementation */
			HebrewCalendar = 9, /**< Hebrew Calendar, aka Jewish Calendar */
			//HinduCalendar = 10, /**< Hindu Lunar Calendar */
			//IslamicLunarCalendar = 11, /**< Islamic 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 */
			IndianNationalCalendar = 14, /**< Indian National Calendar, not the
			Lunar Calendar */
			//Iso8601Calendar = 15, /**< ISO 8601 Standard Calendar */
			JalaliCalendar = 16, /**< Jalali Calendar, aka Persian or Iranian,
			also used in Afganistan */
			//JalaliBirashkCalendar = 17, /**< Jalali Calendar, Birashk Algoryt
			hm variant */
			//Jalali33YearCalendar = 18, /**< Jalali Calendar, 33 Year cycle va
			riant */
			JapaneseCalendar= 19, /**< Japanese Calendar, Gregorian calculation
			using Japanese Era (Nengô) */
			//JucheCalendar = 20, /**< Juche Calendar, used in North Korea */
			JulianCalendar = 21, /**< Julian Calendar, as used in Orthodox Chur
			ches */
			MinguoCalendar= 22, /**< Minguo Calendar, aka ROC, Republic of Chin
			a or Taiwanese */
			ThaiCalendar = 23 /**< Thai Calendar, aka Buddhist or Thai Buddhist
			*/
			};
			//KDE5 move to KDateTime namespace
			/**
			* @since 4.6
			*
			* System used for Week Numbers
			*
			* @see setWeekNumberSystem()
			* @see weekNumberSystem()
			*/
			enum WeekNumberSystem {
			DefaultWeekNumber = -1, /**< The system locale default */
			IsoWeekNumber = 0 /**< ISO Week Number */
			//UsaWeekNumber = 1 /**< USA Week Number */
			};
			//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 */
	PosixFormat, /**< POSIX Standard */		PosixFormat, /**< POSIX Standard */
	UnicodeFormat /**< UNICODE Standard (Qt/Java/OSX/Windows) */		UnicodeFormat /**< UNICODE Standard (Qt/Java/OSX/Windows) */
	};		};
			//KDE5 move to KDateTime namespace
			/**
			* @since 4.6
			*
			* Mode to use when parsing a Date Time input string
			*/
			enum DateTimeParseMode {
			LiberalParsing /**< Parse Date/Time liberally. So long as the
			input string contains at least a reconizable
			month and day the input will be accepted. */
			//ModerateParsing, /**< Parse Date/Time with modeate tolerance.
			// The date components in the format must all
			// occur in the input and in the same order,
			// but the spacing and the componants themsel
			ves
			// may vary from the strict format. */
			//StrictParsing /**< Parse Date/Time strictly to the format. */
			};
			//KDE5 move to KDateTime namespace
			/**
			* @since 4.6
			*
			* The various Components that make up a Date / Time
			* In the future the Components may be combined as flags for dynamic
			* generation of Date Formats.
			*
			* @see KCalendarSystem
			* @see KLocalizedDate
			* @see DateTimeComponentFormat
			*/
			enum DateTimeComponent {
			Year = 0x1, /**< The Year portion of a date, may be
			number or name */
			YearName = 0x2, /**< The Year Name portion of a date */
			Month = 0x4, /**< The Month portion of a date, may b
			e number or name */
			MonthName = 0x8, /**< The Month Name portion of a date *
			/
			Day = 0x10, /**< The Day portion of a date, may be
			number or name */
			DayName = 0x20, /**< The Day Name portion of a date */
			JulianDay = 0x40, /**< The Julian Day of a date */
			EraName = 0x80, /**< The Era Name portion of a date */
			EraYear = 0x100, /**< The Era and Year portion of a date
			*/
			YearInEra = 0x200, /**< The Year In Era portion of a date
			*/
			DayOfYear = 0x400, /**< The Day Of Year portion of a date,
			may be number or name */
			DayOfYearName = 0x800, /**< The Day Of Year Name portion of a
			date */
			DayOfWeek = 0x1000, /**< The Day Of Week / Weekday portion
			of a date, may be number or name */
			DayOfWeekName = 0x2000, /**< The Day Of Week Name / Weekday Nam
			e portion of a date */
			Week = 0x4000, /**< The Week Number portion of a date
			*/
			WeekYear = 0x8000, /**< The Week Year portion of a date */
			MonthsInYear = 0x10000, /**< The Months In Year portion of a da
			te */
			WeeksInYear = 0x20000, /**< The Weeks In Year portion of a dat
			e */
			DaysInYear = 0x40000, /**< The Days In Year portion of a date
			*/
			DaysInMonth = 0x80000, /**< The Days In Month portion of a dat
			e */
			DaysInWeek = 0x100000, /**< The Days In Week portion of a date
			*/
			Hour = 0x200000, /**< The Hours portion of a date */
			Minute = 0x400000, /**< The Minutes portion of a date */
			Second = 0x800000, /**< The Seconds portion of a date */
			Millisecond = 0x1000000, /**< The Milliseconds portion of a date
			*/
			DayPeriod = 0x2000000, /**< The Day Period portion of a date,
			e.g. AM/PM */
			DayPeriodHour = 0x4000000, /**< The Day Period Hour portion of a d
			ate */
			Timezone = 0x8000000, /**< The Time Zone portion of a date, m
			ay be offset or name */
			TimezoneName = 0x10000000, /**< The Time Zone Name portion of a da
			te */
			UnixTime = 0x20000000 /**< The UNIX Time portion of a date */
			};
			Q_DECLARE_FLAGS(DateTimeComponents, DateTimeComponent)
			//KDE5 move to KDateTime namespace
			/**
			* @since 4.6
			*
			* 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
			*
			* @see DateTimeComponentFormat
			*/
			enum DateTimeComponentFormat {
			DefaultComponentFormat = -1, /**< The system locale default for the
			componant */
			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*/
			//OrdinalNumber /**< Ordinal number format, e.g. "2n
			d" for the 2nd */
			NarrowName = 3, /**< Narrow text format, e.g. M for Mo
			nday */
			ShortName, /**< Short text format, e.g. Mon for M
			onday */
			LongName /**< Long text format, e.g. Monday for
			Monday */
			};
			//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 */
	LongDate, /**< Locale Long date format, e.g. Sunday 08 Apri l 2007 */		LongDate, /**< Locale Long date format, e.g. Sunday 08 Apri l 2007 */
	FancyShortDate, /**< Same as ShortDate for dates a week or more a go. For more		FancyShortDate, /**< Same as ShortDate for dates a week or more a go. For more
	recent dates, it is represented as Today, Ye sterday, or		recent dates, it is represented as Today, Ye sterday, or
	the weekday name. */		the weekday name. */
	FancyLongDate, /**< Same as LongDate for dates a week or more ag o. For more		FancyLongDate, /**< Same as LongDate for dates a week or more ag o. For more
	recent dates, it is represented as Today, Ye sterday, or		recent dates, it is represented as Today, Ye sterday, or
	the weekday name. */		the weekday name. */
	IsoDate, /**< ISO-8601 Date format YYYY-MM-DD, e.g. 2009-1 2-31 */		IsoDate, /**< ISO-8601 Date format YYYY-MM-DD, e.g. 2009-1 2-31 */
	IsoWeekDate, /**< ISO-8601 Week Date format YYYY-Www-D, e.g. 2 009-W01-1 */		IsoWeekDate, /**< ISO-8601 Week Date format YYYY-Www-D, e.g. 2 009-W01-1 */
	IsoOrdinalDate /**< ISO-8601 Ordinal Date format YYYY-DDD, e.g. 2009-001 */		IsoOrdinalDate /**< ISO-8601 Ordinal Date format YYYY-DDD, e.g. 2009-001 */
	};		};
			//KDE5 move to KDateTime namespace
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Returns a string formatted to the current locale's conventions
	* regarding dates.		* regarding dates.
	*		*
	* @param date the date to be formatted		* @param date the date to be formatted
	* @param format category of date format to use		* @param format category of date format to use
	*		*
	* @return the date as a string		* @return the date as a string
	*/		*/
	QString formatDate(const QDate &date, DateFormat format = LongDate) con st;		QString formatDate(const QDate &date, DateFormat format = LongDate) con st;
			//KDE5 move to KDateTime namespace
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Returns a string formatted to the current locale's conventions
	* regarding both date and time.		* regarding both date and time.
	*		*
	* @param dateTime the date and time to be formatted		* @param dateTime the date and time to be formatted
	* @param format category of date format to use		* @param format category of date format to use
	* @param includeSecs if @c true, the string will include the seconds p art		* @param includeSecs if @c true, the string will include the seconds p art
	* of the time; otherwise, the seconds will be omitt ed		* of the time; otherwise, the seconds will be omitt ed
	*		*
	* @return the date and time as a string		* @return the date and time as a string
	*/		*/
	QString formatDateTime(const QDateTime &dateTime, DateFormat format = S hortDate,		QString formatDateTime(const QDateTime &dateTime, DateFormat format = S hortDate,
	bool includeSecs = false) const;		bool includeSecs = false) const;
			//KDE5 move to KDateTime namespace
	/**		/**
	* Options for formatting date-time values.		* Options for formatting date-time values.
	*/		*/
	enum DateTimeFormatOption {		enum DateTimeFormatOption {
	TimeZone = 0x01, /**< Include a time zone string */		TimeZone = 0x01, /**< Include a time zone string */
	Seconds = 0x02 /**< Include the seconds value */		Seconds = 0x02 /**< Include the seconds value */
	};		};
	Q_DECLARE_FLAGS(DateTimeFormatOptions, DateTimeFormatOption)		Q_DECLARE_FLAGS(DateTimeFormatOptions, DateTimeFormatOption)
			//KDE5 move to KDateTime namespace
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Returns a string formatted to the current locale's conventions
	* regarding both date and time.		* regarding both date and time.
	*		*
	* @param dateTime the date and time to be formatted		* @param dateTime the date and time to be formatted
	* @param format category of date format to use		* @param format category of date format to use
	* @param options additional output options		* @param options additional output options
	*		*
	* @return The date and time as a string		* @return The date and time as a string
	*/		*/
	skipping to change at line 856		skipping to change at line 1003
	* @param pTime The time to be formatted.		* @param pTime The time to be formatted.
	* @param includeSecs if true, seconds are included in the output,		* @param includeSecs if true, seconds are included in the output,
	* otherwise only hours and minutes are formatted.		* otherwise only hours and minutes are formatted.
	* @param isDuration if true, the given time is a duration, not a clock time.		* @param isDuration if true, the given time is a duration, not a clock time.
	* This means "am/pm" shouldn't be displayed.		* This means "am/pm" shouldn't be displayed.
	*		*
	* @return The time as a string		* @return The time as a string
	*/		*/
	QString formatTime(const QTime &pTime, bool includeSecs = false, bool i sDuration = false) const;		QString formatTime(const QTime &pTime, bool includeSecs = false, bool i sDuration = false) const;
			//KDE5 move to KDateTime namespace
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Format flags for readLocaleTime() and formatLocaleTime()		* Format flags for readLocaleTime() and formatLocaleTime()
	*/		*/
	enum TimeFormatOption {		enum TimeFormatOption {
	TimeDefault = 0x0, ///< Default formatting using seconds a nd the format		TimeDefault = 0x0, ///< Default formatting using seconds a nd the format
	///< as specified by the locale.		///< as specified by the locale.
	TimeWithoutSeconds = 0x1, ///< Exclude the seconds part of the ti me from display		TimeWithoutSeconds = 0x1, ///< Exclude the seconds part of the ti me from display
	TimeWithoutAmPm = 0x2, ///< Read/format time string without am /pm suffix but		TimeWithoutAmPm = 0x2, ///< Read/format time string without am /pm suffix but
	///< keep the 12/24h format as specifie d by locale time		///< keep the 12/24h format as specifie d by locale time
	///< format, eg. "07.33.05" instead of "07.33.05 pm" for		///< format, eg. "07.33.05" instead of "07.33.05 pm" for
	///< time format "%I.%M.%S %p".		///< time format "%I.%M.%S %p".
	TimeDuration = 0x6 ///< Read/format time string as duratio n. This will strip		TimeDuration = 0x6, ///< Read/format time string as duratio n. This will strip
	///< the am/pm suffix and read/format t imes with an hour		///< the am/pm suffix and read/format t imes with an hour
	///< value of 0-23 hours, eg. "19.33.05 " instead of		///< value of 0-23 hours, eg. "19.33.05 " instead of
	///< "07.33.05 pm" for time format "%I. %M.%S %p".		///< "07.33.05 pm" for time format "%I. %M.%S %p".
	///< This automatically implies @c Time WithoutAmPm.		///< This automatically implies @c Time WithoutAmPm.
			TimeFoldHours = 0xE ///< Read/format time string as duratio
			n. This will not
			///< not output the hours part of the d
			uration but will
			///< add the hours (times sixty) to the
			number of minutes,
			///< eg. "70.23" instead of "01.10.23"
			for time format
			///< "%I.%M.%S %p".
	};		};
	Q_DECLARE_FLAGS(TimeFormatOptions, TimeFormatOption)		Q_DECLARE_FLAGS(TimeFormatOptions, TimeFormatOption)
			//KDE5 move to KDateTime namespace
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Returns a string formatted to the current locale's conventions		* Returns a string formatted to the current locale's conventions
	* regarding times.		* regarding times.
	*		*
	* @param pTime the time to be formatted		* @param pTime the time to be formatted
	* @param options format option to use when formatting the time		* @param options format option to use when formatting the time
	* @return The time as a string		* @return The time as a string
	*/		*/
	skipping to change at line 909		skipping to change at line 1063
	DigitSet dateTimeDigitSet() const;		DigitSet dateTimeDigitSet() const;
	/**		/**
	* Use this to determine if the user wants a 12 hour clock.		* Use this to determine if the user wants a 12 hour clock.
	*		*
	* @return If the user wants 12h clock		* @return If the user wants 12h clock
	*/		*/
	bool use12Clock() const;		bool use12Clock() const;
	/**		/**
			* @since 4.6
			*
			* Returns the Day Period matching the time given
			*
			* @param time the time to return the day period for
			* @return the Day Period for the given time
			*/
			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;
	/**		/**
	* Use this to determine which day is the first working day of the week .		* Use this to determine which day is the first working day of the week .
	*		*
	* @since 4.2		* @since 4.2
	skipping to change at line 946		skipping to change at line 1110
	*/		*/
	int weekDayOfPray() const;		int weekDayOfPray() const;
	/**		/**
	* Returns a pointer to the calendar system object.		* Returns a pointer to the calendar system object.
	*		*
	* @return the current calendar system instance		* @return the current calendar system instance
	*/		*/
	const KCalendarSystem * calendar() const;		const KCalendarSystem * calendar() const;
			//KDE5 remove
	/**		/**
			* @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()
	* @return the name of the calendar system		* @return the name of the calendar system
	*/		*/
	QString calendarType() const;		QString calendarType() const;
	/**		/**
			* @since 4.6
			*
			* Returns the type of Calendar System used in this Locale
			*
			* @see KLocale::CalendarSystem
			* @see KCalendarSystem
			* @return the type of Calendar System
			*/
			KLocale::CalendarSystem calendarSystem() const;
			//KDE5 remove
			/**
			* @deprecated use setCalendarSystem() instead
			*
	* Changes the current calendar system to the calendar specified.		* Changes the current calendar system to the calendar specified.
	* Currently "gregorian" and "hijri" are supported. If the calendar		* If the calendar system specified is not found, gregorian will be use
	* system specified is not found, gregorian will be used.		d.
	*		*
			* @see setCalendarSystem()
	* @param calendarType the name of the calendar type		* @param calendarType the name of the calendar type
	*/		*/
	void setCalendar(const QString & calendarType);		void setCalendar(const QString & calendarType);
	/**		/**
			* @since 4.6
			*
			* Sets the type of Calendar System to use in this Locale
			*
			* @see KLocale::CalendarSystem
			* @see KCalendarSystem
			* @param calendarSystem the Calendar System to use
			*/
			void setCalendarSystem(KLocale::CalendarSystem calendarSystem);
			/**
			* @since 4.6
			*
			* Sets the type of Week Number System to use in this Locale
			*
			* Currently only ISO Weeks are supported.
			*
			* @see Klocale::WeekNumberSystem
			* @see weekNumberSystem()
			* @param weekNumberSystem the Week Number System to use
			*/
			void setWeekNumberSystem(KLocale::WeekNumberSystem weekNumberSystem);
			/**
			* @since 4.6
			*
			* Returns the type of Week Number System used in this Locale
			*
			* Currently only ISO Weeks are supported.
			*
			* @see Klocale::WeekNumberSystem
			* @see setWeekNumberSystem()
			* @returns the Week Number System used
			*/
			KLocale::WeekNumberSystem weekNumberSystem();
			/**
	* 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 985		skipping to change at line 1204
	* Converts a localized numeric string to a double.		* Converts a localized numeric 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 readNumber(const QString &numStr, bool * ok = 0) const;		double readNumber(const QString &numStr, bool * ok = 0) const;
			//KDE5 move to KDateTime namespace
	/**		/**
	* Converts a localized date string to a QDate. This method will try a ll		* Converts a localized date string to a QDate. This method will try a ll
	* ReadDateFlag formats in preferred order to read a valid date.		* ReadDateFlag formats in preferred order to read a valid date.
	*		*
	* The bool pointed by ok will be invalid if the date entered was not v alid.		* The bool pointed by ok will be invalid if the date entered was not v alid.
	*		*
	* @param str the string we want to convert.		* @param str the string we want to convert.
	* @param ok the boolean that is set to false if it's not a valid date.		* @param ok the boolean that is set to false if it's not a valid date.
	* If @p ok is 0, it will be ignored		* If @p ok is 0, it will be ignored
	*		*
	* @return The string converted to a QDate		* @return The string converted to a QDate
	* @see KCalendarSystem::readDate()		* @see KCalendarSystem::readDate()
	*/		*/
	QDate readDate(const QString &str, bool* ok = 0) const;		QDate readDate(const QString &str, bool* ok = 0) const;
			//KDE5 move to KDateTime namespace
	/**		/**
	* Converts a localized date string to a QDate, using the specified for mat.		* Converts a localized date string to a QDate, using the specified for mat.
	* You will usually not want to use this method.		* You will usually not want to use this method.
	* @see KCalendarSystem::readDate()		* @see KCalendarSystem::readDate()
	*/		*/
	QDate readDate(const QString &intstr, const QString &fmt, bool* ok = 0) const;		QDate readDate(const QString &intstr, const QString &fmt, bool* ok = 0) const;
			//KDE5 move to KDateTime namespace
	/**		/**
	* Flags for readDate()		* Flags for readDate()
	*/		*/
	enum ReadDateFlags {		enum ReadDateFlags {
	NormalFormat = 1, /**< Only accept a date string in		NormalFormat = 1, /**< Only accept a date string in
	the locale LongDate format */		the locale LongDate format */
	ShortFormat = 2, /**< Only accept a date string in		ShortFormat = 2, /**< Only accept a date string in
	the locale ShortDate format */		the locale ShortDate format */
	IsoFormat = 4, /**< Only accept a date string in		IsoFormat = 4, /**< Only accept a date string in
	ISO date format (YYYY-MM-DD) */		ISO date format (YYYY-MM-DD) */
	IsoWeekFormat = 8, /**< Only accept a date string in		IsoWeekFormat = 8, /**< Only accept a date string in
	ISO Week date format (YYYY-Www-D ) */		ISO Week date format (YYYY-Www-D ) */
	IsoOrdinalFormat = 16 /**< Only accept a date string in		IsoOrdinalFormat = 16 /**< Only accept a date string in
	ISO Week date format (YYYY-DDD) */		ISO Week date format (YYYY-DDD) */
	};		};
			//KDE5 move to KDateTime namespace
	/**		/**
	* 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 only accept		* This method is stricter than readDate(str,&ok): it will only accept
	* a date in a specific format, depending on @p flags.		* a date in a specific format, depending on @p flags.
	*		*
	* @param str the string we want to convert.		* @param str the string we want to convert.
	* @param flags what format the the date string will be in		* @param flags what format the the date string will be in
	* @param ok the boolean that is set to false if it's not a valid date.		* @param ok the boolean that is set to false if it's not a valid date.
	* If @p ok is 0, it will be ignored		* If @p ok is 0, it will be ignored
	*		*
	skipping to change at line 1133		skipping to change at line 1356
	* language name.		* language name.
	*		*
	* @return the currently used language code		* @return the currently used language code
	*		*
	* @see languageCodeToName		* @see languageCodeToName
	*/		*/
	QString language() const;		QString language() const;
	/**		/**
	* Returns the country code of the country where the user lives.		* Returns the country code of the country where the user lives.
	* defaultCountry() is returned by default, if no other available.		*
			* The returned code complies with the ISO 3166-1 alpha-2 standard,
			* except by KDE convention it is returned in lowercase whereas the
			* official standard is uppercase.
			* See http://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 for details.
			*
			* defaultCountry() is returned by default, if no other available,
			* this will always be uppercase 'C'.
	*		*
	* Use countryCodeToName(country) to get human readable, localized		* Use countryCodeToName(country) to get human readable, localized
	* country names.		* country names.
	*		*
	* @return the country code for the user		* @return the country code for the user
	*		*
	* @see countryCodeToName		* @see countryCodeToName
	*/		*/
	QString country() const;		QString country() const;
	/**		/**
			* @since 4.6
			*
			* Returns the Country Division Code of the Country where the user live
			s.
			* When no value is set, then the Country Code will be returned.
			*
			* The returned code complies with the ISO 3166-2 standard.
			* See http://en.wikipedia.org/wiki/ISO_3166-2 for details.
			*
			* Note that unlike country() this method will return the correct case,
			* i.e. normally uppercase..
			*
			* In KDE 4.6 it is the apps responsibility to obtain a translation for
			the
			* code, translation and other services will be priovided in KDE 4.7.
			*
			* @return the Country Division Code for the user
			* @see setCountryDivisionCode
			*/
			QString countryDivisionCode() const;
			/**
	* Returns the language codes selected by user, ordered by decreasing		* Returns the language codes selected by user, ordered by decreasing
	* priority.		* priority.
	*		*
	* Use languageCodeToName(language) to get human readable, localized		* Use languageCodeToName(language) to get human readable, localized
	* language name.		* language name.
	*		*
	* @return list of language codes		* @return list of language codes
	*		*
	* @see languageCodeToName		* @see languageCodeToName
	*/		*/
	skipping to change at line 1535		skipping to change at line 1785
	/**		/**
	* Changes the preferred measuring system.		* Changes the preferred measuring system.
	*		*
	* @return value The preferred measuring system		* @return value The preferred measuring system
	*/		*/
	void setMeasureSystem(MeasureSystem value);		void setMeasureSystem(MeasureSystem value);
	/**		/**
	* Adds another catalog to search for translation lookup.		* Adds another catalog to search for translation lookup.
	* This function is useful for extern libraries and/or code,		* This function is useful for extern libraries and/or code,
	* that provide there own messages.		* that provide their own messages.
	*		*
	* If the catalog does not exist for the chosen language,		* If the catalog does not exist for the chosen language,
	* it will be ignored and en_US will be used.		* it will be ignored and en_US will be used.
	*		*
	* @param catalog The catalog to add.		* @param catalog The catalog to add.
	*/		*/
	void insertCatalog(const QString& catalog);		void insertCatalog(const QString& catalog);
	/**		/**
	* Removes a catalog for translation lookup.		* Removes a catalog for translation lookup.
	skipping to change at line 1573		skipping to change at line 1823
	/**		/**
	* Provides list of all known language codes.		* Provides list of all known language codes.
	*		*
	* Use languageCodeToName(language) to get human readable, localized		* Use languageCodeToName(language) to get human readable, localized
	* language names.		* language names.
	*		*
	* @return list of all language codes		* @return list of all language codes
	*		*
	* @see languageCodeToName		* @see languageCodeToName
			* @see installedLanguages
	*/		*/
	QStringList allLanguagesList() const;		QStringList allLanguagesList() const;
	/**		/**
			* @since 4.6
			*
			* Provides list of all installed KDE Language Translations.
			*
			* Use languageCodeToName(language) to get human readable, localized
			* language names.
			*
			* @return list of all installed language codes
			*
			* @see languageCodeToName
			*/
			QStringList installedLanguages() const;
			/**
	* Convert a known language code to a human readable, localized form.		* Convert a known language code to a human readable, localized form.
	* If an unknown language code is supplied, empty string is returned;		* If an unknown language code is supplied, empty string is returned;
	* this will never happen if the code has been obtained by one of the		* this will never happen if the code has been obtained by one of the
	* KLocale methods.		* KLocale methods.
	*		*
	* @param language the language code		* @param language the language code
	*		*
	* @return the human readable and localized form if the code is known,		* @return the human readable and localized form if the code is known,
	* empty otherwise		* empty otherwise
	*		*
	* @see language		* @see language
	* @see languageList		* @see languageList
	* @see allLanguagesList		* @see allLanguagesList
			* @see installedLanguages
	*/		*/
	QString languageCodeToName(const QString &language) const;		QString languageCodeToName(const QString &language) const;
	/**		/**
	* Provides list of all known country codes.		* Provides list of all known country codes.
	*		*
	* Use countryCodeToName(country) to get human readable, localized		* Use countryCodeToName(country) to get human readable, localized
	* country names.		* country names.
	*		*
	* @return a list of all country codes		* @return a list of all country codes
	skipping to change at line 1670		skipping to change at line 1936
	static QString langLookup(const QString &fname, const char *rtype = "ht ml");		static QString langLookup(const QString &fname, const char *rtype = "ht ml");
	/**		/**
	* Returns the name of the internal language.		* Returns the name of the internal language.
	*		*
	* @return Name of the default language		* @return Name of the default language
	*/		*/
	static QString defaultLanguage();		static QString defaultLanguage();
	/**		/**
	* Returns the name of the default country.		* Returns the code of the default country, i.e. "C"
			*
			* This function will not provide a sensible value to use in your app,
			* please use country() instead.
			*
			* @see country
	*		*
	* @return Name of the default country		* @return Name of the default country
	*/		*/
	static QString defaultCountry();		static QString defaultCountry();
	/**		/**
	* @since 4.4		* @since 4.4
	*		*
	* Returns the ISO Code of the default currency.		* Returns the ISO Code of the default currency.
	*		*
	skipping to change at line 1711		skipping to change at line 1982
	*		*
	* @param locale the destination KLocale object		* @param locale the destination KLocale object
	*/		*/
	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.
			*
			* If you specify a configuration file, a setLocale() will be performed
			on
			* the config using the current locale langauge, which may cause a sync
			()
			* 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 date and time		* locale-related preferences (such as language and
	* formatting)		* 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);
	/**		/**
			* @since 4.6
			*
			* Sets the Country Division Code of the Country where the user lives.
			*
			* The code must comply with the ISO 3166-2 standard.
			* See http://en.wikipedia.org/wiki/ISO_3166-2 for details.
			*
			* In KDE 4.6 it is the apps responsibility to validate the input,
			* full validation and other services will be provided in KDE 4.7.
			*
			* @param countryDivision the Country Division Code for the user
			* @return @c true on success, @c false on failure
			* @see countryDivisionCode
			*/
			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
			* the config using the current locale langauge, which may cause a sync
			()
			* 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 date and time		* locale-related preferences (such as language and
	* formatting)		* formatting options).
	*		*
	* @return true on success		* @return true on success
	*/		*/
	bool setLanguage(const QString &language, KConfig *config);		bool setLanguage(const QString &language, KConfig *config);
	/**		/**
	* Changes the list of preferred languages for the locale. The first va lid		* Changes the list of preferred languages for the locale. The first va lid
	* language in the list will be used, or the default language (en_US)		* language in the list will be used, or the default language (en_US)
	* if none of the specified languages were available.		* if none of the specified languages were available.
	*		*
	skipping to change at line 1809		skipping to change at line 2107
	* @param ignoreContext unconditional conversion if @c true		* @param ignoreContext unconditional conversion if @c true
	*		*
	* @return string with converted digits		* @return string with converted digits
	*		*
	* @see DigitSet		* @see DigitSet
	*/		*/
	QString convertDigits(const QString &str, DigitSet digitSet,		QString convertDigits(const QString &str, DigitSet digitSet,
	bool ignoreContext = false) const;		bool ignoreContext = false) const;
	private:		private:
			friend class KLocalePrivate;
			friend class KLocaleTest;
			friend class KDateTimeFormatter;
	KLocalePrivate * const d;		KLocalePrivate * const d;
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::DateTimeFormatOptions)		Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::DateTimeFormatOptions)
			Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::DateTimeComponents)
	Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::TimeFormatOptions)		Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::TimeFormatOptions)
	Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::TimeProcessingOptions)		Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::TimeProcessingOptions)
	#endif		#endif
End of changes. 42 change blocks.
	18 lines changed or deleted		387 lines changed or added

	kmacroexpander.h		kmacroexpander.h
	skipping to change at line 303		skipping to change at line 303
	* \code		* \code
	* // Code example		* // Code example
	* QHash<QChar,QString> map;		* QHash<QChar,QString> map;
	* map.insert('u', "/tmp/myfile.txt");		* map.insert('u', "/tmp/myfile.txt");
	* map.insert('n', "My File");		* map.insert('n', "My File");
	* QString s = "%% Title: %u:%n";		* QString s = "%% Title: %u:%n";
	* s = KMacroExpander::expandMacros(s, map);		* s = KMacroExpander::expandMacros(s, map);
	* // s is now "% Title: /tmp/myfile.txt:My File";		* // s is now "% Title: /tmp/myfile.txt:My File";
	* \endcode		* \endcode
	*/		*/
	KDECORE_EXPORT QString expandMacros( const QString &str, const QHash<QC har,QString> &map, QChar c = '%' );		KDECORE_EXPORT QString expandMacros( const QString &str, const QHash<QC har,QString> &map, QChar c = QLatin1Char('%') );
	/**		/**
	* Perform safe macro expansion (substitution) on a string for use		* Perform safe macro expansion (substitution) on a string for use
	* in shell commands.		* in shell commands.
	* The escape char must be quoted with itself to obtain its literal		* The escape char must be quoted with itself to obtain its literal
	* representation in the resulting string.		* representation in the resulting string.
	*		*
	* @param str The string to expand		* @param str The string to expand
	* @param map map with substitutions		* @param map map with substitutions
	* @param c escape char indicating start of macro, or QChar::null if no ne		* @param c escape char indicating start of macro, or QChar::null if no ne
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kmediaplayer_export.h		kmediaplayer_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KMEDIAPLAYER_EXPORT_H		#ifndef KMEDIAPLAYER_EXPORT_H
	#define KMEDIAPLAYER_EXPORT_H		#define KMEDIAPLAYER_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KMEDIAPLAYER_EXPORT		#ifndef KMEDIAPLAYER_EXPORT
	# if defined(MAKE_KMEDIAPLAYER_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KMEDIAPLAYER_EXPORT
			# elif defined(MAKE_KMEDIAPLAYER_LIB)
	/* We are building this library */		/* We are building this library */
	# define KMEDIAPLAYER_EXPORT KDE_EXPORT		# define KMEDIAPLAYER_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KMEDIAPLAYER_EXPORT KDE_IMPORT		# define KMEDIAPLAYER_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kmessagebox.h		kmessagebox.h
	skipping to change at line 1089		skipping to change at line 1089
	* Create content and layout of a standard dialog		* Create content and layout of a standard dialog
	*		*
	* @param dialog The parent dialog base		* @param dialog The parent dialog base
	* @param icon Which predefined icon the message box shall show.		* @param icon Which predefined icon the message box shall show.
	* @param text Message string.		* @param text Message string.
	* @param strlist List of strings to be written in the listbox.		* @param strlist List of strings to be written in the listbox.
	* If the list is empty, it doesn't show any listbox		* If the list is empty, it doesn't show any listbox
	* @param ask The text of the checkbox. If empty none will be shown .		* @param ask The text of the checkbox. If empty none will be shown .
	* @param checkboxReturn The result of the checkbox. If it's initially		* @param checkboxReturn The result of the checkbox. If it's initially
	* true then the checkbox will be checked by default.		* true then the checkbox will be checked by default.
			* May be 0.
	* @param options see Options		* @param options see Options
	* @param details Detailed message string.		* @param details Detailed message string.
	* @return A KDialog button code, not a KMessageBox button code,		* @return A KDialog button code, not a KMessageBox button code,
	* based on the buttonmask given to the constructor of the		* based on the buttonmask given to the constructor of the
	* @p dialog (ie. will return KDialog::Yes [256] instead of		* @p dialog (ie. will return KDialog::Yes [256] instead of
	* KMessageBox::Yes [3]). Will return KMessageBox::Cancel		* KMessageBox::Yes [3]). Will return KMessageBox::Cancel
	* if the message box is queued for display instead of		* if the message box is queued for display instead of
	* exec()ed immediately or if the option NoExec is set.		* exec()ed immediately or if the option NoExec is set.
	* @note Unless NoExec is used,		* @note Unless NoExec is used,
	* the @p dialog that is passed in is deleted by this		* the @p dialog that is passed in is deleted by this
	skipping to change at line 1118		skipping to change at line 1119
	*		*
	* @param dialog The parent dialog base		* @param dialog The parent dialog base
	* @param icon A QPixmap containing the icon to be displayed in the		* @param icon A QPixmap containing the icon to be displayed in the
	* dialog next to the text.		* dialog next to the text.
	* @param text Message string.		* @param text Message string.
	* @param strlist List of strings to be written in the listbox.		* @param strlist List of strings to be written in the listbox.
	* If the list is empty, it doesn't show any listbox		* If the list is empty, it doesn't show any listbox
	* @param ask The text of the checkbox. If empty none will be shown .		* @param ask The text of the checkbox. If empty none will be shown .
	* @param checkboxReturn The result of the checkbox. If it's initially		* @param checkboxReturn The result of the checkbox. If it's initially
	* true then the checkbox will be checked by default.		* true then the checkbox will be checked by default.
			* May be 0.
	* @param options see Options		* @param options see Options
	* @param details Detailed message string.		* @param details Detailed message string.
	* @param notifyType The type of notification to send when this message		* @param notifyType The type of notification to send when this message
	* is presentend.		* is presentend.
	* @return A KDialog button code, not a KMessageBox button code,		* @return A KDialog button code, not a KMessageBox button code,
	* based on the buttonmask given to the constructor of the		* based on the buttonmask given to the constructor of the
	* @p dialog (ie. will return KDialog::Yes [256] instead of		* @p dialog (ie. will return KDialog::Yes [256] instead of
	* KMessageBox::Yes [3]). Will return KMessageBox::Cancel		* KMessageBox::Yes [3]). Will return KMessageBox::Cancel
	* if the message box is queued for display instead of		* if the message box is queued for display instead of
	* exec()ed immediately or if the option NoExec is set.		* exec()ed immediately or if the option NoExec is set.
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kmimetype.h		kmimetype.h
	skipping to change at line 46		skipping to change at line 46
	* Represent a mime type, like "text/plain", and the data that is associate d		* Represent a mime type, like "text/plain", and the data that is associate d
	* with it.		* with it.
	*		*
	* The starting point you need is often the static methods.		* The starting point you need is often the static methods.
	*		*
	* KMimeType inherits KServiceType because "text/plain" can be used to find		* KMimeType inherits KServiceType because "text/plain" can be used to find
	* services (apps and components) "which can open text/plain".		* services (apps and components) "which can open text/plain".
	*		*
	* @see KServiceType		* @see KServiceType
	*/		*/
	class KDECORE_EXPORT KMimeType : public KServiceType		class KDECORE_EXPORT KMimeType : public KServiceType // TODO KDE5: drop kse rvicetype inheritance, inherit kshared
	{		{
	Q_DECLARE_PRIVATE( KMimeType )		Q_DECLARE_PRIVATE( KMimeType )
	public:		public:
	typedef KSharedPtr<KMimeType> Ptr;		typedef KSharedPtr<KMimeType> Ptr;
	typedef QList<Ptr> List;		typedef QList<Ptr> List;
	virtual ~KMimeType();		virtual ~KMimeType();
	/**		/**
	* Return the filename of the icon associated with the mimetype.		* Return the filename of the icon associated with the mimetype.
	skipping to change at line 331		skipping to change at line 331
	/**		/**
	* If this mimetype is a subclass of another mimetype,		* If this mimetype is a subclass of another mimetype,
	* return the name of the parent.		* return the name of the parent.
	*		*
	* @return the parent mime type, or QString() if not set		* @return the parent mime type, or QString() if not set
	*		*
	* @deprecated this method does not support multiple inheritance,		* @deprecated this method does not support multiple inheritance,
	* which is actually part of the shared-mime-info standard.		* which is actually part of the shared-mime-info standard.
	* Use is(), parentMimeTypes(), or allParentMimeTypes() instead of pare ntMimeType()		* Use is(), parentMimeTypes(), or allParentMimeTypes() instead of pare ntMimeType()
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString parentMimeType() const;		KDE_DEPRECATED QString parentMimeType() const;
			#endif
	/**		/**
	* If this mimetype is a subclass of one or more other mimetypes,		* If this mimetype is a subclass of one or more other mimetypes,
	* return the list of those mimetypes.		* return the list of those mimetypes.
	*		*
	* For instance a application/javascript is a special kind of text/plai n,		* For instance a application/javascript is a special kind of text/plai n,
	* so the definition of application/javascript says		* so the definition of application/javascript says
	* sub-class-of type="text/plain"		* sub-class-of type="text/plain"
	*		*
	* Another example: application/x-shellscript is a subclass of two othe r mimetypes,		* Another example: application/x-shellscript is a subclass of two othe r mimetypes,
	skipping to change at line 414		skipping to change at line 416
	* @since 4.3		* @since 4.3
	* @return -1 on error, otherwise a version number to use like this:		* @return -1 on error, otherwise a version number to use like this:
	* @code		* @code
	* if (version >= KDE_MAKE_VERSION(0, 40, 0)) { ... }		* if (version >= KDE_MAKE_VERSION(0, 40, 0)) { ... }
	* @endcode		* @endcode
	*/		*/
	static int sharedMimeInfoVersion();		static int sharedMimeInfoVersion();
	protected:		protected:
	friend class KMimeTypeFactory; // for KMimeType(QDataStream&,int)		friend class KMimeTypeRepository; // for KMimeType(QString,QString,QStr
	friend class KBuildMimeTypeFactory; // for KMimeType(QDataStream&,int),		ing)
	setUserSpecifiedIcon etc.
	friend class KMimeFileParser; // for addPattern and addMagicRule
	/**		/**
	* @internal Construct a service from a stream.		* @internal Construct a service from a stream.
	*		*
	* The stream must already be positionned at the correct offset		* The stream must already be positionned at the correct offset
	*/		*/
	KMimeType( QDataStream& str, int offset );		KMimeType( QDataStream& str, int offset );
	/**		/**
	* Construct a mimetype and take all information from an XML file.		* Construct a mimetype and take all information from an XML file.
	skipping to change at line 452		skipping to change at line 452
	*		*
	* Allows the name and comment to be overridden.		* Allows the name and comment to be overridden.
	*		*
	* @param dd the private object		* @param dd the private object
	* @param name the name of the mimetype		* @param name the name of the mimetype
	* @param comment the comment associated with the mimetype		* @param comment the comment associated with the mimetype
	*/		*/
	KMimeType( KMimeTypePrivate &dd, const QString& name, const QString& co mment );		KMimeType( KMimeTypePrivate &dd, const QString& name, const QString& co mment );
	private:		private:
	/// @internal for kbuildsycoca		// Forbidden nowadays in KMimeType
	void setPatterns(const QStringList& patterns);		int offset() const;
	/// @internal for kbuildsycoca		void save(QDataStream &s);
	void internalClearData();
	/// @internal for kbuildsycoca
	void setUserSpecifiedIcon(const QString& icon);
	/// @internal for kbuildsycoca
	void setParentMimeType(const QString& parent);
	void loadInternal( QDataStream& _str);		void loadInternal( QDataStream& _str);
	static void buildDefaultType();		static void buildDefaultType();
	static void checkEssentialMimeTypes();		static void checkEssentialMimeTypes();
	static KMimeType::Ptr findByUrlHelper( const KUrl& url, mode_t mode,		static KMimeType::Ptr findByUrlHelper( const KUrl& url, mode_t mode,
	bool is_local_file, QIODevice* d evice, int* accuracy );		bool is_local_file, QIODevice* d evice, int* accuracy );
	};		};
	#endif		#endif
End of changes. 5 change blocks.
	13 lines changed or deleted		9 lines changed or added

	kmultitabbar.h		kmultitabbar.h
	skipping to change at line 60		skipping to change at line 60
	* The handling if only one tab at a time or multiple tabs		* The handling if only one tab at a time or multiple tabs
	* should be raisable is left to the "user".		* should be raisable is left to the "user".
	*		*
	* \image html kmultitabbar.png "KDE Multi Tab Bar Widget"		* \image html kmultitabbar.png "KDE Multi Tab Bar Widget"
	*		*
	* @author Joseph Wenninger		* @author Joseph Wenninger
	*/		*/
	class KDEUI_EXPORT KMultiTabBar: public QWidget		class KDEUI_EXPORT KMultiTabBar: public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
			Q_ENUMS(KMultiTabBarPosition KMultiTabBarStyle)
			Q_PROPERTY(KMultiTabBarPosition position READ position WRITE setPositio
			n)
			Q_PROPERTY(KMultiTabBarStyle tabStyle READ tabStyle WRITE setStyle)
	public:		public:
	enum KMultiTabBarPosition { Left, Right, Top, Bottom };		enum KMultiTabBarPosition { Left, Right, Top, Bottom };
	/**		/**
	* The list of available styles for KMultiTabBar		* The list of available styles for KMultiTabBar
	* - VSNET - Visual Studio .Net like, always shows icon, only show th e text of active tabs		* - VSNET - Visual Studio .Net like, always shows icon, only show th e text of active tabs
	* - KDEV3ICON - Kdevelop 3 like, always shows the text and icons		* - KDEV3ICON - Kdevelop 3 like, always shows the text and icons
	*/		*/
	enum KMultiTabBarStyle{VSNET=0, KDEV3ICON=2,STYLELAST=0xffff};		enum KMultiTabBarStyle{VSNET=0, KDEV3ICON=2,STYLELAST=0xffff};
End of changes. 1 change blocks.
	0 lines changed or deleted		4 lines changed or added

	knewfilemenu.h		knewfilemenu.h
	skipping to change at line 47		skipping to change at line 47
	* The same instance can be used by both for the File menu and the RMB popu p menu,		* The same instance can be used by both for the File menu and the RMB popu p menu,
	* in a file manager. This is also used in the file dialog's RMB menu.		* in a file manager. This is also used in the file dialog's RMB menu.
	*		*
	* To use this class, you need to connect aboutToShow() of the File menu		* To use this class, you need to connect aboutToShow() of the File menu
	* with slotCheckUpToDate() and to call slotCheckUpToDate() before showing		* with slotCheckUpToDate() and to call slotCheckUpToDate() before showing
	* the RMB popupmenu.		* the RMB popupmenu.
	*		*
	* KNewFileMenu automatically updates the list of templates shown if instal led templates		* KNewFileMenu automatically updates the list of templates shown if instal led templates
	* are added/updated/deleted.		* are added/updated/deleted.
	*		*
			* @author Björn Ruberg <bjoern@ruberg-wegener.de>
			* Made dialogs working asynchronously
	* @author David Faure <faure@kde.org>		* @author David Faure <faure@kde.org>
	* 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:
	/**		/**
	skipping to change at line 75		skipping to change at line 77
	/**		/**
	* 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
	* of it don't need to parse the installed templates multiple times. Th erefore		* of it don't need to parse the installed templates multiple times. Th erefore
	* you can safely create and delete KNewMenu instances without a perfor mance issue.		* you can safely create and delete KNewMenu instances without a perfor mance issue.
	*/		*/
	virtual ~KNewFileMenu();		virtual ~KNewFileMenu();
	/**		/**
	* Sets a parent widget for the dialogs shown by KNewFileMenu.		* Returns the modality of dialogs
	* This is strongly recommended, for apps with a main window.
	*/		*/
	void setParentWidget(QWidget* parentWidget);		bool isModal() const;
	/**		/**
	* Only show the files in a given set of mimetypes.		* Returns the files that the popup is shown for
	* This is useful in specialized applications (while file managers, on
	* the other hand, want to show all mimetypes).
	*/		*/
	void setSupportedMimeTypes(const QStringList& mime);		KUrl::List popupFiles() const;
	/**		/**
	* Returns the mimetypes set in supportedMimeTypes()		* Sets the modality of dialogs created by KNewFile. Set to false if yo
			u do not want to block
			* your application window when entering a new directory name i.e.
	*/		*/
	QStringList supportedMimeTypes() const;		void setModal(bool modality);
	/**		/**
	* Set if the directory view currently shows dot files.		* Sets a parent widget for the dialogs shown by KNewFileMenu.
			* This is strongly recommended, for apps with a main window.
	*/		*/
	void setViewShowsHiddenFiles(bool b);		void setParentWidget(QWidget* parentWidget);
	/**		/**
	* Set the files the popup is shown for		* Set the files the popup is shown for
	* Call this before showing up the menu		* Call this before showing up the menu
	*/		*/
	void setPopupFiles(const KUrl::List& files);		void setPopupFiles(const KUrl::List& files);
	/**		/**
	* Returns the files that the popup is shown for		* Only show the files in a given set of mimetypes.
			* This is useful in specialized applications (while file managers, on
			* the other hand, want to show all mimetypes).
	*/		*/
	KUrl::List popupFiles() const;		void setSupportedMimeTypes(const QStringList& mime);
			/**
			* Set if the directory view currently shows dot files.
			*/
			void setViewShowsHiddenFiles(bool b);
			/**
			* Returns the mimetypes set in supportedMimeTypes()
			*/
			QStringList supportedMimeTypes() const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Checks if updating the list is necessary		* Checks if updating the list is necessary
	* IMPORTANT : Call this in the slot for aboutToShow.		* IMPORTANT : Call this in the slot for aboutToShow.
	* And while you're there, you probably want to call setViewShowsHidden Files ;)		* And while you're there, you probably want to call setViewShowsHidden Files ;)
	*/		*/
	void checkUpToDate();		void checkUpToDate();
	/**		/**
	skipping to change at line 138		skipping to change at line 151
	* Emitted once the file (or symlink) @p url has been successfully crea ted		* Emitted once the file (or symlink) @p url has been successfully crea ted
	*/		*/
	void fileCreated(const KUrl& url);		void fileCreated(const KUrl& url);
	/**		/**
	* Emitted once the directory @p url has been successfully created		* Emitted once the directory @p url has been successfully created
	*/		*/
	void directoryCreated(const KUrl& url);		void directoryCreated(const KUrl& url);
	protected Q_SLOTS:		protected Q_SLOTS:
	/**		/**
	* Called when the job that copied the template has finished.		* Called when the job that copied the template has finished.
	* This method is virtual so that error handling can be reimplemented.		* This method is virtual so that error handling can be reimplemented.
	* Make sure to call the base class slotResult when !job->error() thoug h.		* Make sure to call the base class slotResult when !job->error() thoug h.
	*/		*/
	virtual void slotResult(KJob* job);		virtual void slotResult(KJob* job);
	private:		private:
			Q_PRIVATE_SLOT(d, void _k_slotAbortDialog())
	Q_PRIVATE_SLOT(d, void _k_slotActionTriggered(QAction*))		Q_PRIVATE_SLOT(d, void _k_slotActionTriggered(QAction*))
			Q_PRIVATE_SLOT(d, void _k_slotCreateDirectory(bool writeHiddenDir = fal
			se))
			Q_PRIVATE_SLOT(d, void _k_slotCreateHiddenDirectory())
	Q_PRIVATE_SLOT(d, void _k_slotFillTemplates())		Q_PRIVATE_SLOT(d, void _k_slotFillTemplates())
			Q_PRIVATE_SLOT(d, void _k_slotOtherDesktopFile())
			Q_PRIVATE_SLOT(d, void _k_slotRealFileOrDir())
			Q_PRIVATE_SLOT(d, void _k_slotTextChanged(const QString))
			Q_PRIVATE_SLOT(d, void _k_slotSymLink())
			Q_PRIVATE_SLOT(d, void _k_slotUrlDesktopFile())
	KNewFileMenuPrivate* const d;		KNewFileMenuPrivate* const d;
	};		};
	#endif		#endif
End of changes. 16 change blocks.
	13 lines changed or deleted		39 lines changed or added

	knewstuff_export.h		knewstuff_export.h
	skipping to change at line 25		skipping to change at line 25
	License along with this library. If not, see <http://www.gnu.org/licen ses/>.		License along with this library. If not, see <http://www.gnu.org/licen ses/>.
	*/		*/
	#ifndef KNEWSTUFF2_EXPORT_H		#ifndef KNEWSTUFF2_EXPORT_H
	#define KNEWSTUFF2_EXPORT_H		#define KNEWSTUFF2_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KNEWSTUFF_EXPORT		#ifndef KNEWSTUFF_EXPORT
	# if defined(MAKE_KNEWSTUFF2_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KNEWSTUFF_EXPORT
			# elif defined(MAKE_KNEWSTUFF2_LIB)
	/* We are building this library */		/* We are building this library */
	# define KNEWSTUFF_EXPORT KDE_EXPORT		# define KNEWSTUFF_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KNEWSTUFF_EXPORT KDE_IMPORT		# define KNEWSTUFF_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KNEWSTUFF_EXPORT_DEPRECATED		# ifndef KNEWSTUFF_EXPORT_DEPRECATED
	# define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT		# define KNEWSTUFF_EXPORT_DEPRECATED KDE_DEPRECATED KNEWSTUFF_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	knotifyconfig_export.h		knotifyconfig_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KNOTIFYCONFIG_EXPORT_H		#ifndef KNOTIFYCONFIG_EXPORT_H
	#define KNOTIFYCONFIG_EXPORT_H		#define KNOTIFYCONFIG_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KNOTIFYCONFIG_EXPORT		#ifndef KNOTIFYCONFIG_EXPORT
	# if defined(MAKE_KNOTIFYCONFIG_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KNOTIFYCONFIG_EXPORT
			# elif defined(MAKE_KNOTIFYCONFIG_LIB)
	/* We are building this library */		/* We are building this library */
	# define KNOTIFYCONFIG_EXPORT KDE_EXPORT		# define KNOTIFYCONFIG_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KNOTIFYCONFIG_EXPORT KDE_IMPORT		# define KNOTIFYCONFIG_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kntlm_export.h		kntlm_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KNTLM_EXPORT_H		#ifndef KNTLM_EXPORT_H
	#define KNTLM_EXPORT_H		#define KNTLM_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KNTLM_EXPORT		#ifndef KNTLM_EXPORT
	# if defined(MAKE_KNTLM_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KNTLM_EXPORT
			# elif defined(MAKE_KNTLM_LIB)
	/* We are building this library */		/* We are building this library */
	# define KNTLM_EXPORT KDE_EXPORT		# define KNTLM_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KNTLM_EXPORT KDE_IMPORT		# define KNTLM_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KNTLM_EXPORT_DEPRECATED		# ifndef KNTLM_EXPORT_DEPRECATED
	# define KNTLM_EXPORT_DEPRECATED KDE_DEPRECATED KNTLM_EXPORT		# define KNTLM_EXPORT_DEPRECATED KDE_DEPRECATED KNTLM_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	knuminput.h		knuminput.h
	skipping to change at line 61		skipping to change at line 61
	* window. If parent is another widget, this widget becomes a child		* window. If parent is another widget, this widget becomes a child
	* window inside parent. The new widget is deleted when its parent is d eleted.		* window inside parent. The new widget is deleted when its parent is d eleted.
	*/		*/
	explicit KNumInput(QWidget* parent=0);		explicit KNumInput(QWidget* parent=0);
	/**		/**
	* @param below A pointer to another KNumInput.		* @param below A pointer to another KNumInput.
	* @param parent parent widget		* @param parent parent widget
	* \deprecated - use the version without the below parameter instead		* \deprecated - use the version without the below parameter instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_CONSTRUCTOR_DEPRECATED KNumInput(QWidget *parent, KNumInput* below) ;		KDE_CONSTRUCTOR_DEPRECATED KNumInput(QWidget *parent, KNumInput* below) ;
			#endif
	/**		/**
	* Destructor		* Destructor
	*/		*/
	~KNumInput();		~KNumInput();
	/**		/**
	* Sets the text and alignment of the main description label.		* Sets the text and alignment of the main description label.
	*		*
	* @param label The text of the label.		* @param label The text of the label.
	skipping to change at line 173		skipping to change at line 175
	* It uses KIntValidator validator class. KIntNumInput enforces the		* It uses KIntValidator validator class. KIntNumInput enforces the
	* value to be in the given range, and can display it in any base		* value to be in the given range, and can display it in any base
	* between 2 and 36.		* between 2 and 36.
	*		*
	* \image html kintnuminput.png "KDE Int Number Input Spinbox"		* \image html kintnuminput.png "KDE Int Number Input Spinbox"
	*/		*/
	class KDEUI_EXPORT KIntNumInput : public KNumInput		class KDEUI_EXPORT KIntNumInput : public KNumInput
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( int value READ value WRITE setValue USER true )		Q_PROPERTY( int value READ value WRITE setValue NOTIFY valueChanged USE R true )
	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 singleStep READ singleStep WRITE setSingleStep )		Q_PROPERTY( int singleStep READ singleStep WRITE setSingleStep )
	Q_PROPERTY( int referencePoint READ referencePoint WRITE setReferencePo int )		Q_PROPERTY( int referencePoint READ referencePoint WRITE setReferencePo int )
	Q_PROPERTY( double relativeValue READ relativeValue WRITE setRelativeVa lue )		Q_PROPERTY( double relativeValue READ relativeValue WRITE setRelativeVa lue )
	Q_PROPERTY( QString suffix READ suffix WRITE setSuffix )		Q_PROPERTY( QString suffix READ suffix WRITE setSuffix )
	Q_PROPERTY( QString prefix READ prefix WRITE setPrefix )		Q_PROPERTY( QString prefix READ prefix WRITE setPrefix )
	Q_PROPERTY( QString specialValueText READ specialValueText WRITE setSpe cialValueText )		Q_PROPERTY( QString specialValueText READ specialValueText WRITE setSpe cialValueText )
	Q_PROPERTY( bool sliderEnabled READ showSlider WRITE setSliderEnabled )		Q_PROPERTY( bool sliderEnabled READ showSlider WRITE setSliderEnabled )
	skipping to change at line 221		skipping to change at line 223
	* with the layout of the other KNumInput's (you can build an arbitrary long		* with the layout of the other KNumInput's (you can build an arbitrary long
	* chain).		* chain).
	*		*
	* @param below append KIntNumInput to the KNumInput chain		* @param below append KIntNumInput to the KNumInput chain
	* @param value initial value for the control		* @param value initial value for the control
	* @param base numeric base used for display		* @param base numeric base used for display
	* @param parent parent QWidget		* @param parent parent QWidget
	*		*
	* \deprecated use the version without the below parameter instead.		* \deprecated use the version without the below parameter instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_CONSTRUCTOR_DEPRECATED KIntNumInput(KNumInput* below, int value, QW idget *parent, int base = 10);		KDE_CONSTRUCTOR_DEPRECATED KIntNumInput(KNumInput* below, int value, QW idget *parent, int base = 10);
			#endif
	/**		/**
	* Destructor		* Destructor
	*		*
	*		*
	*/		*/
	virtual ~KIntNumInput();		virtual ~KIntNumInput();
	/**		/**
	* @return the current value.		* @return the current value.
	skipping to change at line 274		skipping to change at line 278
	*		*
	* @param min minimum value		* @param min minimum value
	* @param max maximum value		* @param max maximum value
	* @param step step size		* @param step step size
	*/		*/
	void setRange(int min, int max, int singleStep=1);		void setRange(int min, int max, int singleStep=1);
	/**		/**
	* @deprecated Use the other setRange function and setSliderEnabled ins tead		* @deprecated Use the other setRange function and setSliderEnabled ins tead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setRange(int min, int max, int singleStep, bool sli der);		KDE_DEPRECATED void setRange(int min, int max, int singleStep, bool sli der);
			#endif
	/**		/**
	* @param enabled Show the slider		* @param enabled Show the slider
	* @default enabled		* @default enabled
	*/		*/
	void setSliderEnabled(bool enabled=true);		void setSliderEnabled(bool enabled=true);
	/**		/**
	* Sets the minimum value.		* Sets the minimum value.
	*/		*/
	skipping to change at line 446		skipping to change at line 452
	* it very simple to have all the sliders in a column be the same size.		* it very simple to have all the sliders in a column be the same size.
	*		*
	* \image html kdoublenuminput.png "KDE Double Number Input Spinbox"		* \image html kdoublenuminput.png "KDE Double Number Input Spinbox"
	*		*
	* @see KIntNumInput		* @see KIntNumInput
	*/		*/
	class KDEUI_EXPORT KDoubleNumInput : public KNumInput		class KDEUI_EXPORT KDoubleNumInput : public KNumInput
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( double value READ value WRITE setValue USER true )		Q_PROPERTY( double value READ value WRITE setValue NOTIFY valueChanged USER true )
	Q_PROPERTY( double minimum READ minimum WRITE setMinimum )		Q_PROPERTY( double minimum READ minimum WRITE setMinimum )
	Q_PROPERTY( double maximum READ maximum WRITE setMaximum )		Q_PROPERTY( double maximum READ maximum WRITE setMaximum )
	Q_PROPERTY( double singleStep READ singleStep WRITE setSingleStep )		Q_PROPERTY( double singleStep READ singleStep WRITE setSingleStep )
	Q_PROPERTY( QString suffix READ suffix WRITE setSuffix )		Q_PROPERTY( QString suffix READ suffix WRITE setSuffix )
	Q_PROPERTY( QString prefix READ prefix WRITE setPrefix )		Q_PROPERTY( QString prefix READ prefix WRITE setPrefix )
	Q_PROPERTY( QString specialValueText READ specialValueText WRITE setSpe cialValueText )		Q_PROPERTY( QString specialValueText READ specialValueText WRITE setSpe cialValueText )
	Q_PROPERTY( int decimals READ decimals WRITE setDecimals )		Q_PROPERTY( int decimals READ decimals WRITE setDecimals )
	Q_PROPERTY( double referencePoint READ referencePoint WRITE setReferenc ePoint )		Q_PROPERTY( double referencePoint READ referencePoint WRITE setReferenc ePoint )
	Q_PROPERTY( double relativeValue READ relativeValue WRITE setRelativeV alue )		Q_PROPERTY( double relativeValue READ relativeValue WRITE setRelativeV alue )
	Q_PROPERTY( bool sliderEnabled READ showSlider WRITE setSliderEnabled )		Q_PROPERTY( bool sliderEnabled READ showSlider WRITE setSliderEnabled )
	skipping to change at line 505		skipping to change at line 511
	* @param below append KDoubleNumInput to the KDoubleNumInput chain		* @param below append KDoubleNumInput to the KDoubleNumInput chain
	* @param lower lower boundary value		* @param lower lower boundary value
	* @param upper upper boundary value		* @param upper upper boundary value
	* @param value initial value for the control		* @param value initial value for the control
	* @param singleStep step size to use for up/down arrow clicks		* @param singleStep step size to use for up/down arrow clicks
	* @param precision number of digits after the decimal point		* @param precision number of digits after the decimal point
	* @param parent parent QWidget		* @param parent parent QWidget
	*		*
	* \deprecated use the version without below instead		* \deprecated use the version without below instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_CONSTRUCTOR_DEPRECATED KDoubleNumInput(KNumInput* below,		KDE_CONSTRUCTOR_DEPRECATED KDoubleNumInput(KNumInput* below,
	double lower, double upper, double value, QWidget *paren t=0,double singleStep=0.02,		double lower, double upper, double value, QWidget *paren t=0,double singleStep=0.02,
	int precision=2);		int precision=2);
			#endif
	/**		/**
	* @return the current value.		* @return the current value.
	*/		*/
	double value() const;		double value() const;
	/**		/**
	* @return the suffix.		* @return the suffix.
	* @see setSuffix()		* @see setSuffix()
	*/		*/
	skipping to change at line 584		skipping to change at line 592
	/**		/**
	* @return the step of the spin box		* @return the step of the spin box
	*/		*/
	void setSingleStep(double singleStep);		void setSingleStep(double singleStep);
	/**		/**
	* Specifies the number of digits to use.		* Specifies the number of digits to use.
	*/		*/
	void setDecimals(int decimals);		void setDecimals(int decimals);
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setPrecision(int precision) { setDecimals(precision ); }		KDE_DEPRECATED void setPrecision(int precision) { setDecimals(precision ); }
			#endif
	/**		/**
	* @return the reference point for relativeValue calculation		* @return the reference point for relativeValue calculation
	*/		*/
	double referencePoint() const;		double referencePoint() const;
	/**		/**
	* @return the current value in units of referencePoint.		* @return the current value in units of referencePoint.
	*/		*/
	double relativeValue() const;		double relativeValue() const;
End of changes. 12 change blocks.
	2 lines changed or deleted		12 lines changed or added

	kparts_export.h		kparts_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KPARTS_EXPORT_H		#ifndef KPARTS_EXPORT_H
	#define KPARTS_EXPORT_H		#define KPARTS_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KPARTS_EXPORT		#ifndef KPARTS_EXPORT
	# if defined(MAKE_KPARTS_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KPARTS_EXPORT
			# elif defined(MAKE_KPARTS_LIB)
	/* We are building this library */		/* We are building this library */
	# define KPARTS_EXPORT KDE_EXPORT		# define KPARTS_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KPARTS_EXPORT KDE_IMPORT		# define KPARTS_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kpixmapsequence.h		kpixmapsequence.h
	skipping to change at line 40		skipping to change at line 40
	class QPixmap;		class QPixmap;
	/**		/**
	* \class KPixmapSequence kpixmapsequence.h KPixmapSequence		* \class KPixmapSequence kpixmapsequence.h KPixmapSequence
	*		*
	* \brief Loads and gives access to the frames of a typical multi-row pixma p		* \brief Loads and gives access to the frames of a typical multi-row pixma p
	* as often used for spinners.		* as often used for spinners.
	*		*
	* KPixmapSequence is implicitly shared. Copying is fast.		* KPixmapSequence is implicitly shared. Copying is fast.
	*		*
	* Once typically uses the static methods loadFromPath and loadFromPixmap		* \author Aurélien Gâteau <agateau@kde.org>
	* to create an instance of KPixmapSequence.		* \author Sebastian Trueg <trueg@kde.org>
	*
	* \author Aurélien Gâteau <agateau@kde.org><br/>Sebastian Trueg <trueg@kde
	.org>
	*		*
	* \since 4.4		* \since 4.4
	*/		*/
	class KDEUI_EXPORT KPixmapSequence		class KDEUI_EXPORT KPixmapSequence
	{		{
	public:		public:
	/**		/**
	* Create an empty sequence		* Create an empty sequence
	*/		*/
	KPixmapSequence();		KPixmapSequence();
	/**		/**
	* Copy constructor		* Copy constructor
	*/		*/
	KPixmapSequence(const KPixmapSequence &other);		KPixmapSequence(const KPixmapSequence &other);
	/**		/**
	* Load a sequence from a pixmap.		* Create a sequence from a pixmap.
	*		*
	* \param pixmap Pixmap to load		* \param pixmap Pixmap to load
	* \param frameSize The size of the frames to load. The width of the fi le has to be		* \param frameSize The size of the frames to load. The width of the fi le has to be
	* a multiple of the frame width; the same is true for the height. If a n invalid		* a multiple of the frame width; the same is true for the height. If a n invalid
	* size is specified the file is considered to be one column of square frames.		* size is specified the file is considered to be one column of square frames.
	*
	* \return The sequence loaded from \a path or an invalid sequence if a
	n error occurred
	* (file could not be opened or \a frameSize does not match the file's
	size)
	*/		*/
	explicit KPixmapSequence(const QPixmap &pixmap, const QSize &frameSize = QSize());		explicit KPixmapSequence(const QPixmap &pixmap, const QSize &frameSize = QSize());
	/**		/**
	* Create a sequence from an xdg animation pixmap.		* Create a sequence from an icon name.
	*		*
	* \param xdgIconName The name of the icon (example: process-working)		* \param iconName The name of the icon (example: process-working)
	* \param size The icon/frame size		* \param size The icon/frame size
	*/		*/
	explicit KPixmapSequence(const QString &xdgIconName, int size = KIconLo ader::SizeSmall);		explicit KPixmapSequence(const QString &iconName, int size = KIconLoade r::SizeSmall);
	/**		/**
	* Destructor		* Destructor
	*/		*/
	~KPixmapSequence();		~KPixmapSequence();
	/**		/**
	* Create a copy of \p other. The data is implicitly shared.		* Create a copy of \p other. The data is implicitly shared.
	*/		*/
	KPixmapSequence &operator=(const KPixmapSequence &other);		KPixmapSequence &operator=(const KPixmapSequence &other);
	skipping to change at line 107		skipping to change at line 102
	/**		/**
	* \return \p true if no sequence was loaded successfully.		* \return \p true if no sequence was loaded successfully.
	*		*
	* \sa isValid		* \sa isValid
	*/		*/
	bool isEmpty() const;		bool isEmpty() const;
	/**		/**
	* \return The size of an individual frame in the sequence.		* \return The size of an individual frame in the sequence.
	* Be aware that frames are always taken to be squared.
	*/		*/
	QSize frameSize() const;		QSize frameSize() const;
	/**		/**
	* The number of frames in this sequence.		* The number of frames in this sequence.
	*/		*/
	int frameCount() const;		int frameCount() const;
	/**		/**
	* Retrieve the frame at \p index.		* Retrieve the frame at \p index.
End of changes. 7 change blocks.
	15 lines changed or deleted		6 lines changed or added

	kpixmapsequencewidget.h		kpixmapsequencewidget.h
	skipping to change at line 46		skipping to change at line 46
	* KPixmapSequenceOverlayPainter in case a widget is more appropriate than		* KPixmapSequenceOverlayPainter in case a widget is more appropriate than
	* an event filter.		* an event filter.
	*		*
	* \author Sebastian Trueg <trueg@kde.org>		* \author Sebastian Trueg <trueg@kde.org>
	*		*
	* \since 4.4		* \since 4.4
	*/		*/
	class KDEUI_EXPORT KPixmapSequenceWidget : public QWidget		class KDEUI_EXPORT KPixmapSequenceWidget : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(int interval READ interval WRITE setInterval)
	public:		public:
	/**		/**
	* Constructor		* Constructor
	*/		*/
	KPixmapSequenceWidget(QWidget *parent = 0);		KPixmapSequenceWidget(QWidget *parent = 0);
	/**		/**
	* Destructor		* Destructor
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	kpluginfactory.h		kpluginfactory.h
	skipping to change at line 262		skipping to change at line 262
	* componentData().		* componentData().
	* KPluginFactory takes ownership of the \p aboutData object, so don't delete it yourself!		* KPluginFactory takes ownership of the \p aboutData object, so don't delete it yourself!
	*		*
	* \param aboutData the KAboutData for the plugin		* \param aboutData the KAboutData for the plugin
	* \param parent a parent object		* \param parent a parent object
	*/		*/
	explicit KPluginFactory(const KAboutData &aboutData, QObject *parent = 0);		explicit KPluginFactory(const KAboutData &aboutData, QObject *parent = 0);
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_CONSTRUCTOR_DEPRECATED explicit KPluginFactory(const KAboutData *ab outData, QObject *parent = 0);		KDE_CONSTRUCTOR_DEPRECATED explicit KPluginFactory(const KAboutData *ab outData, QObject *parent = 0);
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	explicit KDE_CONSTRUCTOR_DEPRECATED KPluginFactory(QObject *parent);		explicit KDE_CONSTRUCTOR_DEPRECATED KPluginFactory(QObject *parent);
			#endif
	/**		/**
	* This destroys the PluginFactory. It will remove the translation cata log for the plugin,		* This destroys the PluginFactory. It will remove the translation cata log for the plugin,
	* 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.
	*		*
	* \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 creaful		* \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.
	* \param parent The parent of the object. If \p parent is a widget typ e, it will also passed		* \param parent The parent of the object. If \p parent is a widget typ e, it will also passed
	* to the parentWidget argument of the CreateInstanceFunc tion for the object.		* to the parentWidget argument of the CreateInstanceFunc tion for the object.
	* \param args Additional arguments which will be passed to the object.		* \param args Additional arguments which will be passed to the object.
	* \returns A pointer to the created object is returned, or 0 if an err or occurred.		* \returns A pointer to the created object is returned, or 0 if an err or occurred.
	*/		*/
	template<typename T>		template<typename T>
	T *create(QObject *parent = 0, const QVariantList &args = QVariantList( ));		T *create(QObject *parent = 0, const QVariantList &args = QVariantList( ));
	skipping to change at line 332		skipping to change at line 336
	* \param keyword The keyword of the object.		* \param keyword The keyword of the object.
	* \param args Additional arguments which will be passed to the object.		* \param args Additional arguments which will be passed to the object.
	* \returns A pointer to the created object is returned, or 0 if an err or occurred.		* \returns A pointer to the created object is returned, or 0 if an err or occurred.
	*/		*/
	template<typename T>		template<typename T>
	T *create(QWidget *parentWidget, QObject *parent, const QString &keywor d = QString(), const QVariantList &args = QVariantList());		T *create(QWidget *parentWidget, QObject *parent, const QString &keywor d = QString(), const QVariantList &args = QVariantList());
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template<typename T>		template<typename T>
	KDE_DEPRECATED		KDE_DEPRECATED
	T *create(QObject *parent, const QStringList &args)		T *create(QObject *parent, const QStringList &args)
	{		{
	return create<T>(parent, stringListToVariantList(args));		return create<T>(parent, stringListToVariantList(args));
	}		}
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QObject *create(QObject *parent = 0, const char *classna me = "QObject", const QStringList &args = QStringList())		KDE_DEPRECATED QObject *create(QObject *parent = 0, const char *classna me = "QObject", const QStringList &args = QStringList())
	{		{
	return create(classname, 0, parent, stringListToVariantList(args), QString());		return create(classname, 0, parent, stringListToVariantList(args), QString());
	}		}
			#endif
	Q_SIGNALS:		Q_SIGNALS:
	void objectCreated(QObject *object);		void objectCreated(QObject *object);
	protected:		protected:
	/**		/**
	* Function pointer type to a function that instantiates a plugin.		* Function pointer type to a function that instantiates a plugin.
	*/		*/
	typedef QObject *(*CreateInstanceFunction)(QWidget *, QObject *, const QVariantList &);		typedef QObject *(*CreateInstanceFunction)(QWidget *, QObject *, const QVariantList &);
	skipping to change at line 415		skipping to change at line 423
	*/		*/
	QStringList variantListToStringList(const QVariantList &list);		QStringList variantListToStringList(const QVariantList &list);
	virtual void setupTranslations();		virtual void setupTranslations();
	KPluginFactoryPrivate *const d_ptr;		KPluginFactoryPrivate *const d_ptr;
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	virtual KDE_DEPRECATED QObject *createObject(QObject *parent, const cha r *className, const QStringList &args);		virtual KDE_DEPRECATED QObject *createObject(QObject *parent, const cha r *className, const QStringList &args);
			#endif
	/**		/**
	* @deprecated		* @deprecated
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	virtual KDE_DEPRECATED KParts::Part *createPartObject(QWidget *parentWi dget, QObject *parent, const char *classname, const QStringList &args);		virtual KDE_DEPRECATED KParts::Part *createPartObject(QWidget *parentWi dget, QObject *parent, const char *classname, const QStringList &args);
			#endif
	/**		/**
	* This method sets the component data of the plugin. You can access th e component data object		* This method sets the component data of the plugin. You can access th e component data object
	* later with componentData().		* later with componentData().
	* Normally you don't have to call this, because the factory constructs a component data object		* Normally you don't have to call this, because the factory constructs a component data object
	* from the information given to the constructor.		* from the information given to the constructor.
	* The object is destroyed, when the module containing the plugin is un loaded. Normally this happens		* The object is destroyed, when the module containing the plugin is un loaded. Normally this happens
	* only on application shutdown.		* only on application shutdown.
	*		*
	* \param componentData the new KComponentData object		* \param componentData the new KComponentData object
End of changes. 13 change blocks.
	1 lines changed or deleted		13 lines changed or added

	kprintutils_export.h		kprintutils_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KPRINTUTILS_EXPORT_H		#ifndef KPRINTUTILS_EXPORT_H
	#define KPRINTUTILS_EXPORT_H		#define KPRINTUTILS_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KPRINTUTILS_EXPORT		#ifndef KPRINTUTILS_EXPORT
	# if defined(MAKE_KPRINTUTILS_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KPRINTUTILS_EXPORT
			# elif defined(MAKE_KPRINTUTILS_LIB)
	/* We are building this library */		/* We are building this library */
	# define KPRINTUTILS_EXPORT KDE_EXPORT		# define KPRINTUTILS_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KPRINTUTILS_EXPORT KDE_IMPORT		# define KPRINTUTILS_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kpropertiesdialog.h		kpropertiesdialog.h
	skipping to change at line 370		skipping to change at line 370
	* This function is called when the user presses 'Ok'. The last plugin in serted		* This function is called when the user presses 'Ok'. The last plugin in serted
	* is called first.		* is called first.
	*/		*/
	virtual void applyChanges();		virtual void applyChanges();
	/**		/**
	* Convenience method for most ::supports methods		* Convenience method for most ::supports methods
	* @return true if the file is a local, regular, readable, desktop file		* @return true if the file is a local, regular, readable, desktop file
	* @deprecated use KFileItem::isDesktopFile		* @deprecated use KFileItem::isDesktopFile
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool isDesktopFile( const KFileItem& _item );		static KDE_DEPRECATED bool isDesktopFile( const KFileItem& _item );
			#endif
	void setDirty( bool b );		void setDirty( bool b );
	bool isDirty() const;		bool isDirty() const;
	public Q_SLOTS:		public Q_SLOTS:
	void setDirty(); // same as setDirty( true ). TODO KDE5: void setDirty(bo ol dirty=true);		void setDirty(); // same as setDirty( true ). TODO KDE5: void setDirty(bo ol dirty=true);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emit this signal when the user changed anything in the plugin's tabs.		* Emit this signal when the user changed anything in the plugin's tabs.
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kprotocolinfo.h		kprotocolinfo.h
	skipping to change at line 324		skipping to change at line 324
	public:		public:
	// Internal functions:		// Internal functions:
	/**		/**
	* @internal construct a KProtocolInfo from a stream		* @internal construct a KProtocolInfo from a stream
	*/		*/
	KProtocolInfo( QDataStream& _str, int offset);		KProtocolInfo( QDataStream& _str, int offset);
	virtual ~KProtocolInfo();		virtual ~KProtocolInfo();
	typedef enum { Name, FromUrl } FileNameUsedForCopying;		typedef enum { Name, FromUrl, DisplayName } FileNameUsedForCopying;
	/// @internal. Use KProtocolManager instead.		/// @internal. Use KProtocolManager instead.
	bool supportsListing() const;		bool supportsListing() const;
	/// @internal. Use KProtocolManager instead.		/// @internal. Use KProtocolManager instead.
	QString defaultMimeType() const;		QString defaultMimeType() const;
	/// @internal. Use KProtocolManager instead.		/// @internal. Use KProtocolManager instead.
	QStringList archiveMimeTypes() const;		QStringList archiveMimeTypes() const;
	protected:		protected:
	QString m_name;		QString m_name;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kpty_export.h		kpty_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KPTY_EXPORT_H		#ifndef KPTY_EXPORT_H
	#define KPTY_EXPORT_H		#define KPTY_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KPTY_EXPORT		#ifndef KPTY_EXPORT
	# if defined(MAKE_KDECORE_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KPTY_EXPORT
			# elif defined(MAKE_KDECORE_LIB)
	/* We are building this library */		/* We are building this library */
	# define KPTY_EXPORT KDE_EXPORT		# define KPTY_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KPTY_EXPORT KDE_IMPORT		# define KPTY_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KPTY_EXPORT_DEPRECATED		# ifndef KPTY_EXPORT_DEPRECATED
	# define KPTY_EXPORT_DEPRECATED KDE_DEPRECATED KPTY_EXPORT		# define KPTY_EXPORT_DEPRECATED KDE_DEPRECATED KPTY_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kptydevice.h		kptydevice.h
	skipping to change at line 137		skipping to change at line 137
	/**		/**
	* @reimp		* @reimp
	*/		*/
	qint64 bytesToWrite() const;		qint64 bytesToWrite() const;
	bool waitForBytesWritten(int msecs = -1);		bool waitForBytesWritten(int msecs = -1);
	bool waitForReadyRead(int msecs = -1);		bool waitForReadyRead(int msecs = -1);
	Q_SIGNALS:		Q_SIGNALS:
	/** @reimp */
	void readyRead();
	/**		/**
	* Emitted when EOF is read from the PTY.		* Emitted when EOF is read from the PTY.
	*		*
	* Data may still remain in the buffers.		* Data may still remain in the buffers.
	*/		*/
	void readEof();		void readEof();
	protected:		protected:
	virtual qint64 readData(char *data, qint64 maxSize);		virtual qint64 readData(char *data, qint64 maxSize);
	virtual qint64 readLineData(char *data, qint64 maxSize);		virtual qint64 readLineData(char *data, qint64 maxSize);
End of changes. 1 change blocks.
	3 lines changed or deleted		0 lines changed or added

	kpushbutton.h		kpushbutton.h
	skipping to change at line 115		skipping to change at line 115
	* Sets the Icon Set for this button. It also takes into account the		* Sets the Icon Set for this button. It also takes into account the
	* KGlobalSettings::showIconsOnPushButtons() setting.		* KGlobalSettings::showIconsOnPushButtons() setting.
	*/		*/
	void setIcon( const KIcon &icon );		void setIcon( const KIcon &icon );
	/**		/**
	* Sets the pixmap for this button. Rarely used. This one exists mostly for usage in Qt designer,		* Sets the pixmap for this button. Rarely used. This one exists mostly for usage in Qt designer,
	* with icons embedded into the ui file. But you should rather save the m separately, and load them		* with icons embedded into the ui file. But you should rather save the m separately, and load them
	* with KIcon("name") so that the icons are themeable.		* with KIcon("name") so that the icons are themeable.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setIcon( const QIcon &pix );		KDE_DEPRECATED void setIcon( const QIcon &pix );
			#endif
	/**		/**
	* Sets the text of the button		* Sets the text of the button
	*/		*/
	void setText( const QString &text );		void setText( const QString &text );
	/**		/**
	* Sets a delayed popup menu		* Sets a delayed popup menu
	* for consistency, since menu() isn't virtual		* for consistency, since menu() isn't virtual
	*/		*/
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kratingpainter.h		kratingpainter.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 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 _NEPOMUK_RATING_PAINTER_H_		#ifndef _NEPOMUK_RATING_PAINTER_H_
	#define _NEPOMUK_RATING_PAINTER_H_		#define _NEPOMUK_RATING_PAINTER_H_
	#include "nepomuk_export.h"		#include <kdeui_export.h>
	#include <QtCore/Qt>		#include <QtCore/Qt>
	class QIcon;		class QIcon;
	class QPixmap;		class QPixmap;
	class QPainter;		class QPainter;
	class QPoint;		class QPoint;
	class QRect;		class QRect;
	/**		/**
	skipping to change at line 49		skipping to change at line 49
	* The KRatingPainter also allows to determine a rating value from		* The KRatingPainter also allows to determine a rating value from
	* a position in the draw area. it supports all different alignments		* a position in the draw area. it supports all different alignments
	* and custom icons.		* and custom icons.
	*		*
	* For showing a rating in a widget see KRatingWidget.		* For showing a rating in a widget see KRatingWidget.
	*		*
	* \author Sebastian Trueg <trueg@kde.org>		* \author Sebastian Trueg <trueg@kde.org>
	*		*
	* \since 4.1		* \since 4.1
	*/		*/
	class NEPOMUK_EXPORT KRatingPainter		class KDEUI_EXPORT KRatingPainter
	{		{
	public:		public:
	/**		/**
	* Create a new KRatingPainter.		* Create a new KRatingPainter.
	* For most cases the static methods paintRating and getRatingFromPosit ion		* For most cases the static methods paintRating and getRatingFromPosit ion
	* should be sufficient.		* should be sufficient.
	*/		*/
	KRatingPainter();		KRatingPainter();
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	kratingwidget.h		kratingwidget.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 KRATINGWIDGET_H		#ifndef KRATINGWIDGET_H
	#define KRATINGWIDGET_H		#define KRATINGWIDGET_H
	#include <QtGui/QFrame>		#include <QtGui/QFrame>
	#include "nepomuk_export.h"		#include <kdeui_export.h>
	/**		/**
	* \class KRatingWidget kratingwidget.h Nepomuk/KRatingWidget		* \class KRatingWidget kratingwidget.h KDE/KRatingWidget
	*		*
	* \brief Displays a rating value as a row of pixmaps.		* \brief Displays a rating value as a row of pixmaps.
	*		*
	* The KRatingWidget displays a range of stars or other arbitrary		* The KRatingWidget displays a range of stars or other arbitrary
	* pixmaps and allows the user to select a certain number by mouse.		* pixmaps and allows the user to select a certain number by mouse.
	*		*
	* \sa KRatingPainter		* \sa KRatingPainter
	*		*
	* \author Sebastian Trueg <trueg@kde.org>		* \author Sebastian Trueg <trueg@kde.org>
	*/		*/
	class NEPOMUK_EXPORT KRatingWidget : public QFrame		class KDEUI_EXPORT KRatingWidget : public QFrame
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY( int rating READ rating WRITE setRating )
			Q_PROPERTY( int maxRating READ maxRating WRITE setMaxRating )
			Q_PROPERTY( Qt::Alignment alignment READ alignment WRITE setAlignment )
			Q_PROPERTY( bool halfStepsEnabled READ halfStepsEnabled WRITE setHalfSt
			epsEnabled )
			Q_PROPERTY( int spacing READ spacing WRITE setSpacing )
			Q_PROPERTY( QIcon icon READ icon WRITE setIcon )
	public:		public:
	/**		/**
	* Creates a new rating widget.		* Creates a new rating widget.
	*/		*/
	KRatingWidget( QWidget* parent = 0 );		KRatingWidget( QWidget* parent = 0 );
	/**		/**
	* Destructor		* Destructor
	*/		*/
	skipping to change at line 124		skipping to change at line 130
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Set the current rating. Calling this method will trigger the		* Set the current rating. Calling this method will trigger the
	* ratingChanged signal if @p rating is different from the previous rat ing.		* ratingChanged signal if @p rating is different from the previous rat ing.
	*/		*/
	void setRating( int rating );		void setRating( int rating );
	/**		/**
	* \deprecated use setRating( int rating )		* \deprecated use setRating( int rating )
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setRating( unsigned int rating );		KDE_DEPRECATED void setRating( unsigned int rating );
			#endif
	/**		/**
	* Set the maximum allowed rating value. The default is 10 which means		* Set the maximum allowed rating value. The default is 10 which means
	* that a rating from 1 to 10 is selectable. If \a max is uneven steps		* that a rating from 1 to 10 is selectable. If \a max is uneven steps
	* are automatically only allowed full.		* are automatically only allowed full.
	*/		*/
	void setMaxRating( int max );		void setMaxRating( int max );
	/**		/**
	* \deprecated use setMaxRating( int max )		* \deprecated use setMaxRating( int max )
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setMaxRating( unsigned int max );		KDE_DEPRECATED void setMaxRating( unsigned int max );
			#endif
	/**		/**
	* If half steps are enabled (the default) then		* If half steps are enabled (the default) then
	* one rating step corresponds to half a star.		* one rating step corresponds to half a star.
	*/		*/
	void setHalfStepsEnabled( bool enabled );		void setHalfStepsEnabled( bool enabled );
	/**		/**
	* \deprecated Use setHalfStepsEnabled		* \deprecated Use setHalfStepsEnabled
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setOnlyPaintFullSteps( bool );		KDE_DEPRECATED void setOnlyPaintFullSteps( bool );
			#endif
	/**		/**
	* Set the spacing between the pixmaps. The default is 0.		* Set the spacing between the pixmaps. The default is 0.
	*/		*/
	void setSpacing( int );		void setSpacing( int );
	/**		/**
	* The alignment of the stars in the drawing rect.		* The alignment of the stars in the drawing rect.
	* All alignment flags are supported.		* All alignment flags are supported.
	*/		*/
	skipping to change at line 181		skipping to change at line 193
	* Set a custom pixmap.		* Set a custom pixmap.
	*/		*/
	void setCustomPixmap( const QPixmap& pixmap );		void setCustomPixmap( const QPixmap& pixmap );
	/**		/**
	* Set the pixap to be used to display a rating step.		* Set the pixap to be used to display a rating step.
	* By default the "rating" pixmap is loaded.		* By default the "rating" pixmap is loaded.
	*		*
	* \deprecated use setCustomPixmap		* \deprecated use setCustomPixmap
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setPixmap( const QPixmap& );		KDE_DEPRECATED void setPixmap( const QPixmap& );
			#endif
	/**		/**
	* Set the recommended size of the pixmaps. This is		* Set the recommended size of the pixmaps. This is
	* only used for the sizeHint. The actual size is always		* only used for the sizeHint. The actual size is always
	* dependent on the size of the widget itself.		* dependent on the size of the widget itself.
	*/		*/
	void setPixmapSize( int size );		void setPixmapSize( int size );
	protected:		protected:
	void mousePressEvent( QMouseEvent* e );		void mousePressEvent( QMouseEvent* e );
End of changes. 12 change blocks.
	3 lines changed or deleted		18 lines changed or added

	krecursivefilterproxymodel.h		krecursivefilterproxymodel.h
	skipping to change at line 103		skipping to change at line 103
	explicit KRecursiveFilterProxyModel(QObject* parent = 0);		explicit KRecursiveFilterProxyModel(QObject* parent = 0);
	/**		/**
	Destructor		Destructor
	*/		*/
	virtual ~KRecursiveFilterProxyModel();		virtual ~KRecursiveFilterProxyModel();
	/** @reimp */		/** @reimp */
	void setSourceModel( QAbstractItemModel *model );		void setSourceModel( QAbstractItemModel *model );
	/**
	* @reimplemented
	*/
	virtual QModelIndexList match( const QModelIndex& start, int role, const
	QVariant& value, int hits = 1,
	Qt::MatchFlags flags = Qt::MatchFlags( Qt:
	:MatchStartsWith | Qt::MatchWrap ) ) const;
	protected:		protected:
	/**		/**
	Reimplement this method for custom filtering strategies.		Reimplement this method for custom filtering strategies.
	*/		*/
	virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) co nst;		virtual bool acceptRow(int sourceRow, const QModelIndex &sourceParent) co nst;
	private:		private:
	/** @reimp */		/** @reimp */
	bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) con st;		bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) con st;
End of changes. 1 change blocks.
	8 lines changed or deleted		0 lines changed or added

	krichtextedit.h		krichtextedit.h
	skipping to change at line 208		skipping to change at line 208
	* Sets the alignment of the current block to Right Aligned		* Sets the alignment of the current block to Right Aligned
	*/		*/
	void alignRight();		void alignRight();
	/**		/**
	* Sets the alignment of the current block to Justified		* Sets the alignment of the current block to Justified
	*/		*/
	void alignJustify();		void alignJustify();
	/**		/**
			* Sets the direction of the current block to Right-To-Left
			*
			* @since 4.6
			*/
			void makeRightToLeft();
			/**
			* Sets the direction of the current block to Left-To-Right
			*
			* @since 4.6
			*/
			void makeLeftToRight();
			/**
	* Sets the list style of the current list, or creates a new list using the		* Sets the list style of the current list, or creates a new list using the
	* current block. The @a _styleindex corresponds to the QTextListFormat ::Style		* current block. The @a _styleindex corresponds to the QTextListFormat ::Style
	*		*
	* @param _styleIndex The list will get this style		* @param _styleIndex The list will get this style
	*/		*/
	void setListStyle(int _styleIndex);		void setListStyle(int _styleIndex);
	/**		/**
	* Increases the nesting level of the current block or selected blocks.		* Increases the nesting level of the current block or selected blocks.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		14 lines changed or added

	krichtextwidget.h		krichtextwidget.h
	skipping to change at line 48		skipping to change at line 48
	* @author Stephen Kelly <steveire@gmail.com>		* @author Stephen Kelly <steveire@gmail.com>
	* @author Thomas McGuire <thomas.mcguire@gmx.net>		* @author Thomas McGuire <thomas.mcguire@gmx.net>
	*		*
	* \image html krichtextedit.png "KDE Rich Text Widget"		* \image html krichtextedit.png "KDE Rich Text Widget"
	*		*
	* @since 4.1		* @since 4.1
	*/		*/
	class KDEUI_EXPORT KRichTextWidget : public KRichTextEdit		class KDEUI_EXPORT KRichTextWidget : public KRichTextEdit
	{		{
	Q_OBJECT		Q_OBJECT
			Q_FLAGS(RichTextSupport)
			Q_PROPERTY(RichTextSupport richTextSupport READ richTextSupport WRITE s
			etRichTextSupport)
	public:		public:
	/**		/**
	* These flags describe what actions will be created by createActions() after		* These flags describe what actions will be created by createActions() after
	* passing a combination of these flags to setRichTextSupport().		* passing a combination of these flags to setRichTextSupport().
	*/		*/
	enum RichTextSupportValues {		enum RichTextSupportValues {
	/**		/**
	* No rich text support at all, no actions will be created. Do not use		* No rich text support at all, no actions will be created. Do not use
	* in combination with other flags.		* in combination with other flags.
	skipping to change at line 217		skipping to change at line 219
	* Actions to format text as superscript or subscript. If no text i s selected,		* Actions to format text as superscript or subscript. If no text i s selected,
	* the word under the cursor is formatted as selected.		* the word under the cursor is formatted as selected.
	* This is a KToggleAction. The status is automatically updated whe n		* This is a KToggleAction. The status is automatically updated whe n
	* the text cursor is moved.		* the text cursor is moved.
	*/		*/
	SupportSuperScriptAndSubScript = 0x4000000,		SupportSuperScriptAndSubScript = 0x4000000,
	// SupportChangeParagraphSpacing = 0x200000,		// SupportChangeParagraphSpacing = 0x200000,
	/**		/**
			* Action to change direction of text to Right-To-Left or Left-To-R
			ight.
			*/
			SupportDirection = 0x8000000,
			/**
	* Includes all above actions for full rich text support		* Includes all above actions for full rich text support
	*/		*/
	FullSupport = 0xffffffff		FullSupport = 0xffffffff
	};		};
	Q_DECLARE_FLAGS(RichTextSupport, RichTextSupportValues)		Q_DECLARE_FLAGS(RichTextSupport, RichTextSupportValues)
	/**		/**
	* @brief Constructor		* @brief Constructor
	* @param parent the parent widget		* @param parent the parent widget
	*/		*/
	skipping to change at line 273		skipping to change at line 280
	* <tr><td>format_font_family</td><td>SupportFontFamily</td></tr>		* <tr><td>format_font_family</td><td>SupportFontFamily</td></tr>
	* <tr><td>format_font_size</td><td>SupportFontSize</td></tr>		* <tr><td>format_font_size</td><td>SupportFontSize</td></tr>
	* <tr><td>format_text_bold</td><td>SupportBold</td></tr>		* <tr><td>format_text_bold</td><td>SupportBold</td></tr>
	* <tr><td>format_text_italic</td><td>SupportItalic</td></tr>		* <tr><td>format_text_italic</td><td>SupportItalic</td></tr>
	* <tr><td>format_text_underline</td><td>SupportUnderline</td></tr>		* <tr><td>format_text_underline</td><td>SupportUnderline</td></tr>
	* <tr><td>format_text_strikeout</td><td>SupportStrikeOut</td></tr>		* <tr><td>format_text_strikeout</td><td>SupportStrikeOut</td></tr>
	* <tr><td>format_align_left</td><td>SupportAlignment</td></tr>		* <tr><td>format_align_left</td><td>SupportAlignment</td></tr>
	* <tr><td>format_align_center</td><td>SupportAlignment</td></tr>		* <tr><td>format_align_center</td><td>SupportAlignment</td></tr>
	* <tr><td>format_align_right</td><td>SupportAlignment</td></tr>		* <tr><td>format_align_right</td><td>SupportAlignment</td></tr>
	* <tr><td>format_align_justify</td><td>SupportAlignment</td></tr>		* <tr><td>format_align_justify</td><td>SupportAlignment</td></tr>
			* <tr><td>direction_ltr</td><td>SupportDirection</td></tr>
			* <tr><td>direction_rtl</td><td>SupportDirection</td></tr>
	* <tr><td>format_list_style</td><td>SupportChangeListStyle</td></tr>		* <tr><td>format_list_style</td><td>SupportChangeListStyle</td></tr>
	* <tr><td>format_list_indent_more</td><td>SupportIndentLists</td></tr>		* <tr><td>format_list_indent_more</td><td>SupportIndentLists</td></tr>
	* <tr><td>format_list_indent_less</td><td>SupportDedentLists</td></tr>		* <tr><td>format_list_indent_less</td><td>SupportDedentLists</td></tr>
	* <tr><td>insert_horizontal_rule</td><td>SupportRuleLine</td></tr>		* <tr><td>insert_horizontal_rule</td><td>SupportRuleLine</td></tr>
	* <tr><td>manage_link</td><td>SupportHyperlinks</td></tr>		* <tr><td>manage_link</td><td>SupportHyperlinks</td></tr>
	* <tr><td>format_painter</td><td>SupportFormatPainting</td></tr>		* <tr><td>format_painter</td><td>SupportFormatPainting</td></tr>
	* <tr><td>action_to_plain_text</td><td>SupportToPlainText</td></tr>		* <tr><td>action_to_plain_text</td><td>SupportToPlainText</td></tr>
	* <tr><td>format_text_subscript & format_text_superscript</td><td>Supp ortSuperScriptAndSubScript</td></tr>		* <tr><td>format_text_subscript & format_text_superscript</td><td>Supp ortSuperScriptAndSubScript</td></tr>
	* </table>		* </table>
	*		*
End of changes. 3 change blocks.
	0 lines changed or deleted		11 lines changed or added

	kross_export.h		kross_export.h
	skipping to change at line 28		skipping to change at line 28
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KROSS_EXPORT_H		#ifndef KROSS_EXPORT_H
	#define KROSS_EXPORT_H		#define KROSS_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KROSS_EXPORT		#ifndef KROSS_EXPORT
	# if defined(MAKE_KROSS_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KROSS_EXPORT
			# elif defined(MAKE_KROSS_LIB)
	/* We are building this library */		/* We are building this library */
	# define KROSS_EXPORT KDE_EXPORT		# define KROSS_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KROSS_EXPORT KDE_IMPORT		# define KROSS_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#ifndef KROSSCORE_EXPORT		#ifndef KROSSCORE_EXPORT
	# if defined(MAKE_KROSSCORE_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KROSSCORE_EXPORT
			# elif defined(MAKE_KROSSCORE_LIB)
	/* We are building this library */		/* We are building this library */
	# define KROSSCORE_EXPORT KDE_EXPORT		# define KROSSCORE_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KROSSCORE_EXPORT KDE_IMPORT		# define KROSSCORE_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#ifndef KROSSUI_EXPORT		#ifndef KROSSUI_EXPORT
	# if defined(MAKE_KROSSUI_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KROSSUI_EXPORT
			# elif defined(MAKE_KROSSUI_LIB)
	/* We are building this library */		/* We are building this library */
	# define KROSSUI_EXPORT KDE_EXPORT		# define KROSSUI_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KROSSUI_EXPORT KDE_IMPORT		# define KROSSUI_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KROSS_EXPORT_DEPRECATED		# ifndef KROSS_EXPORT_DEPRECATED
	# define KROSS_EXPORT_DEPRECATED KDE_DEPRECATED KROSS_EXPORT		# define KROSS_EXPORT_DEPRECATED KDE_DEPRECATED KROSS_EXPORT
End of changes. 3 change blocks.
	3 lines changed or deleted		12 lines changed or added

	kruler.h		kruler.h
	skipping to change at line 162		skipping to change at line 162
	*/		*/
	~KRuler();		~KRuler();
	/**		/**
	* Sets the minimal value of the ruler pointer (default is 0).		* Sets the minimal value of the ruler pointer (default is 0).
	*		*
	* This method calls update() so that the widget is painted after leaving		* This method calls update() so that the widget is painted after leaving
	* to the main event loop.		* to the main event loop.
	*		*
	**/		**/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setMinValue(int);		KDE_DEPRECATED void setMinValue(int);
			#endif
	/**		/**
	* Returns the minimal value of the ruler pointer.		* Returns the minimal value of the ruler pointer.
	**/		**/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED int minValue() const;		KDE_DEPRECATED int minValue() const;
			#endif
	/**		/**
	* Sets the maximum value of the ruler pointer (default is 100).		* Sets the maximum value of the ruler pointer (default is 100).
	*		*
	* This method calls update() so that the widget is painted after leaving		* This method calls update() so that the widget is painted after leaving
	* to the main event loop.		* to the main event loop.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setMaxValue(int);		KDE_DEPRECATED void setMaxValue(int);
			#endif
	/**		/**
	* Returns the maximal value of the ruler pointer.		* Returns the maximal value of the ruler pointer.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED int maxValue() const;		KDE_DEPRECATED int maxValue() const;
			#endif
	/**		/**
	* Sets the distance between tiny marks.		* Sets the distance between tiny marks.
	*		*
	* This is mostly used in the English system (inches) with distance of 1.		* This is mostly used in the English system (inches) with distance of 1.
	*/		*/
	void setTinyMarkDistance(int);		void setTinyMarkDistance(int);
	/**		/**
	* Returns the distance between tiny marks.		* Returns the distance between tiny marks.
	**/		**/
End of changes. 8 change blocks.
	0 lines changed or deleted		8 lines changed or added

	krun.h		krun.h
	skipping to change at line 316		skipping to change at line 316
	/**		/**
	* Quotes a string for the shell.		* Quotes a string for the shell.
	* An empty string will @em not be quoted.		* An empty string will @em not be quoted.
	*		*
	* @deprecated Use KShell::quoteArg() instead. @em Note that this funct ion		* @deprecated Use KShell::quoteArg() instead. @em Note that this funct ion
	* behaves differently for empty arguments and returns the result		* behaves differently for empty arguments and returns the result
	* differently.		* differently.
	*		*
	* @param str the string to quote. The quoted string will be written he re		* @param str the string to quote. The quoted string will be written he re
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED void shellQuote(QString &str);		static KDE_DEPRECATED void shellQuote(QString &str);
			#endif
	/**		/**
	* Processes a Exec= line as found in .desktop files.		* Processes a Exec= line as found in .desktop files.
	* @param _service the service to extract information from.		* @param _service the service to extract information from.
	* @param _urls The urls the service should open.		* @param _urls The urls the service should open.
	* @param tempFiles if true and urls are local files, they will be dele ted		* @param tempFiles if true and urls are local files, they will be dele ted
	* when the application exits.		* when the application exits.
	* @param suggestedFileName see setSuggestedFileName		* @param suggestedFileName see setSuggestedFileName
	*		*
	* @return a list of arguments suitable for KProcess::setProgram().		* @return a list of arguments suitable for KProcess::setProgram().
	skipping to change at line 492		skipping to change at line 494
	/**		/**
	* Returns the job.		* Returns the job.
	*/		*/
	KIO::Job* job();		KIO::Job* job();
	/**		/**
	* Returns the timer object.		* Returns the timer object.
	* @deprecated setFinished(true) now takes care of the timer().start(0) ,		* @deprecated setFinished(true) now takes care of the timer().start(0) ,
	* so this can be removed.		* so this can be removed.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QTimer& timer();		KDE_DEPRECATED QTimer& timer();
			#endif
	/**		/**
	* Indicate that the next action is to scan the file.		* Indicate that the next action is to scan the file.
	* @deprecated not useful in public API		* @deprecated not useful in public API
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setDoScanFile(bool scanFile);		KDE_DEPRECATED void setDoScanFile(bool scanFile);
			#endif
	/**		/**
	* Returns whether the file shall be scanned.		* Returns whether the file shall be scanned.
	* @deprecated not useful in public API		* @deprecated not useful in public API
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool doScanFile() const;		KDE_DEPRECATED bool doScanFile() const;
			#endif
	/**		/**
	* Sets whether it is a directory.		* Sets whether it is a directory.
	* @deprecated typo in the name, and not useful as a public method		* @deprecated typo in the name, and not useful as a public method
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setIsDirecory(bool isDirectory);		KDE_DEPRECATED void setIsDirecory(bool isDirectory);
			#endif
	/**		/**
	* Returns whether it is a directory.		* Returns whether it is a directory.
	*/		*/
	bool isDirectory() const;		bool isDirectory() const;
	/**		/**
	* @deprecated not useful in public API		* @deprecated not useful in public API
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setInitializeNextAction(bool initialize);		KDE_DEPRECATED void setInitializeNextAction(bool initialize);
			#endif
	/**		/**
	* @deprecated not useful in public API		* @deprecated not useful in public API
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool initializeNextAction() const;		KDE_DEPRECATED bool initializeNextAction() const;
			#endif
	/**		/**
	* Sets whether it is a local file.		* Sets whether it is a local file.
	*/		*/
	void setIsLocalFile(bool isLocalFile);		void setIsLocalFile(bool isLocalFile);
	/**		/**
	* Returns whether it is a local file.		* Returns whether it is a local file.
	*/		*/
	bool isLocalFile() const;		bool isLocalFile() const;
End of changes. 14 change blocks.
	0 lines changed or deleted		14 lines changed or added

	kselectionproxymodel.h		kselectionproxymodel.h
	skipping to change at line 239		skipping to change at line 239
	This is the behavior used by the Favourite Folder View in KMail.		This is the behavior used by the Favourite Folder View in KMail.
	*/		*/
	void setFilterBehavior(FilterBehavior behavior);		void setFilterBehavior(FilterBehavior behavior);
	FilterBehavior filterBehavior() const;		FilterBehavior filterBehavior() const;
	QModelIndex mapFromSource(const QModelIndex & sourceIndex) const;		QModelIndex mapFromSource(const QModelIndex & sourceIndex) const;
	QModelIndex mapToSource(const QModelIndex & proxyIndex) const;		QModelIndex mapToSource(const QModelIndex & proxyIndex) const;
			QItemSelection mapSelectionFromSource(const QItemSelection& selection)
			const;
			QItemSelection mapSelectionToSource(const QItemSelection& selection) co
			nst;
	virtual Qt::ItemFlags flags(const QModelIndex &index) const;		virtual Qt::ItemFlags flags(const QModelIndex &index) const;
	QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) co nst;		QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) co nst;
	virtual int rowCount(const QModelIndex & parent = QModelIndex()) const;		virtual int rowCount(const QModelIndex & parent = QModelIndex()) const;
	virtual QVariant headerData(int section, Qt::Orientation orientation, i nt role = Qt::DisplayRole) const;		virtual QVariant headerData(int section, Qt::Orientation orientation, i nt role = Qt::DisplayRole) const;
	virtual QMimeData* mimeData(const QModelIndexList & indexes) const;		virtual QMimeData* mimeData(const QModelIndexList & indexes) const;
	virtual QStringList mimeTypes() const;		virtual QStringList mimeTypes() const;
	virtual Qt::DropActions supportedDropActions() const;		virtual Qt::DropActions supportedDropActions() const;
	virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);		virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent);
	virtual bool hasChildren(const QModelIndex & parent = QModelIndex()) co nst;		virtual bool hasChildren(const QModelIndex & parent = QModelIndex()) co nst;
	virtual QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;		virtual QModelIndex index(int, int, const QModelIndex& = QModelIndex()) const;
	virtual QModelIndex parent(const QModelIndex&) const;		virtual QModelIndex parent(const QModelIndex&) const;
	virtual int columnCount(const QModelIndex& = QModelIndex()) const;		virtual int columnCount(const QModelIndex& = QModelIndex()) const;
	virtual QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1,		virtual QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1,
	Qt::MatchFlags flags = Qt::MatchFlags(Qt: :MatchStartsWith | Qt::MatchWrap)) const;		Qt::MatchFlags flags = Qt::MatchFlags(Qt: :MatchStartsWith | Qt::MatchWrap)) const;
	Q_SIGNALS:		Q_SIGNALS:
	#if !defined(Q_MOC_RUN)		#if !defined(Q_MOC_RUN) && !defined(DOXYGEN_SHOULD_SKIP_THIS) && !defined(I N_IDE_PARSER)
	private: // Don't allow subclasses to emit these signals.		private: // Don't allow subclasses to emit these signals.
	#endif		#endif
	/**		/**
	@internal		@internal
	Emitted before @p removeRootIndex, an index in the sourceModel is rem oved from		Emitted before @p removeRootIndex, an index in the sourceModel is rem oved from
	the root selected indexes. This may be unrelated to rows removed from the model,		the root selected indexes. This may be unrelated to rows removed from the model,
	depending on configuration.		depending on configuration.
	*/		*/
	void rootIndexAboutToBeRemoved(const QModelIndex &removeRootIndex);		void rootIndexAboutToBeRemoved(const QModelIndex &removeRootIndex);
End of changes. 2 change blocks.
	1 lines changed or deleted		6 lines changed or added

	kselector.h		kselector.h
	skipping to change at line 47		skipping to change at line 47
	*		*
	* A custom drawing routine for the widget surface has		* A custom drawing routine for the widget surface has
	* to be provided by the subclass.		* to be provided by the subclass.
	*/		*/
	class KDEUI_EXPORT KSelector : public QAbstractSlider		class KDEUI_EXPORT KSelector : public QAbstractSlider
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( int value READ value WRITE setValue )		Q_PROPERTY( int value READ value WRITE setValue )
	Q_PROPERTY( int minValue READ minimum WRITE setMinimum )		Q_PROPERTY( int minValue READ minimum WRITE setMinimum )
	Q_PROPERTY( int maxValue READ maximum WRITE setMaximum )		Q_PROPERTY( int maxValue READ maximum WRITE setMaximum )
			Q_PROPERTY( bool indent READ indent WRITE setIndent )
			Q_PROPERTY( Qt::ArrowType arrowDirection READ arrowDirection WRITE setArr
			owDirection )
	public:		public:
	/**		/**
	* Constructs a horizontal one-dimensional selection widget.		* Constructs a horizontal one-dimensional selection widget.
	*/		*/
	explicit KSelector( QWidget *parent=0 );		explicit KSelector( QWidget *parent=0 );
	/**		/**
	* Constructs a one-dimensional selection widget with		* Constructs a one-dimensional selection widget with
	* a given orientation.		* a given orientation.
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kservice.h		kservice.h
	skipping to change at line 27		skipping to change at line 27
	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 KSERVICE_H		#ifndef KSERVICE_H
	#define KSERVICE_H		#define KSERVICE_H
	#include "kserviceaction.h"		#include "kserviceaction.h"
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
			#ifndef KDE_NO_DEPRECATED
	#include <klibloader.h>		#include <klibloader.h>
			#endif
	#include <kpluginfactory.h>		#include <kpluginfactory.h>
	#include <kpluginloader.h>		#include <kpluginloader.h>
	#include <ksycocaentry.h>		#include <ksycocaentry.h>
	#include <klocale.h>		#include <klocale.h>
	class KServiceType;		class KServiceType;
	class QDataStream;		class QDataStream;
	class KDesktopFile;		class KDesktopFile;
	class QWidget;		class QWidget;
	skipping to change at line 56		skipping to change at line 58
	* The types of service a plugin provides is taken from the accompanying de sktop file		* The types of service a plugin provides is taken from the accompanying de sktop file
	* where the 'ServiceTypes=' field is used.		* where the 'ServiceTypes=' field is used.
	*		*
	* For a tutorial on how to build a plugin-loading mechanism and how to wri te plugins		* For a tutorial on how to build a plugin-loading mechanism and how to wri te plugins
	* in general, see http://techbase.kde.org/Development/Tutorials#Services:_ Applications_and_Plugins		* in general, see http://techbase.kde.org/Development/Tutorials#Services:_ Applications_and_Plugins
	*		*
	* @see KServiceType		* @see KServiceType
	* @see KServiceGroup		* @see KServiceGroup
	* @author Torben Weis		* @author Torben Weis
	*/		*/
	class KDECORE_EXPORT KService : public KSycocaEntry		class KDECORE_EXPORT KService : public KSycocaEntry // TODO KDE5: inherit k shared, but move KSycocaEntry to Private
	{		{
	public:		public:
	typedef KSharedPtr<KService> Ptr;		typedef KSharedPtr<KService> Ptr;
	typedef QList<Ptr> List;		typedef QList<Ptr> List;
	/**		/**
	* Construct a temporary service with a given name, exec-line and icon.		* Construct a temporary service with a given name, exec-line and icon.
	* @param name the name of the service		* @param name the name of the service
	* @param exec the executable		* @param exec the executable
	* @param icon the name of the icon		* @param icon the name of the icon
	skipping to change at line 104		skipping to change at line 106
	* @return true if this service is an application, i.e. it has Type=App lication in its		* @return true if this service is an application, i.e. it has Type=App lication in its
	* .desktop file and exec() will not be empty.		* .desktop file and exec() will not be empty.
	*/		*/
	bool isApplication() const;		bool isApplication() const;
	/**		/**
	* Returns the type of the service.		* Returns the type of the service.
	* @return the type of the service ("Application" or "Service")		* @return the type of the service ("Application" or "Service")
	* @deprecated use isApplication()		* @deprecated use isApplication()
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString type() const;		KDE_DEPRECATED QString type() const;
			#endif
	/**		/**
	* Returns the executable.		* Returns the executable.
	* @return the command that the service executes,		* @return the command that the service executes,
	* or QString() if not set		* or QString() if not set
	*/		*/
	QString exec() const;		QString exec() const;
	/**		/**
	* Returns the name of the service's library.		* Returns the name of the service's library.
	* @return the name of the library that contains the service's		* @return the name of the library that contains the service's
	skipping to change at line 169		skipping to change at line 173
	* This is a relative path if the desktop entry was found in any		* This is a relative path if the desktop entry was found in any
	* of the locations pointed to by $KDEDIRS (e.g. "Internet/kppp.desktop ")		* of the locations pointed to by $KDEDIRS (e.g. "Internet/kppp.desktop ")
	* It is a full path if the desktop entry originates from another		* It is a full path if the desktop entry originates from another
	* location.		* location.
	*		*
	* @deprecated use entryPath() instead		* @deprecated use entryPath() instead
	*		*
	* @return the path of the service's desktop file,		* @return the path of the service's desktop file,
	* or QString() if not set		* or QString() if not set
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString desktopEntryPath() const;		KDE_DEPRECATED QString desktopEntryPath() const;
			#endif
	/**		/**
	* Returns the filename of the service desktop entry without any		* Returns the filename of the service desktop entry without any
	* extension. E.g. "kppp"		* extension. E.g. "kppp"
	* @return the name of the desktop entry without path or extension,		* @return the name of the desktop entry without path or extension,
	* or QString() if not set		* or QString() if not set
	*/		*/
	QString desktopEntryName() const;		QString desktopEntryName() const;
	/**		/**
	skipping to change at line 275		skipping to change at line 281
	/**		/**
	* Checks whether the service supports this service type		* Checks whether the service supports this service type
	* @param serviceTypePtr The name of the service type you are		* @param serviceTypePtr The name of the service type you are
	* interested in determining whether this service supports.		* interested in determining whether this service supports.
	*		*
	* @return true if the service type you specified is supported, otherwi se false.		* @return true if the service type you specified is supported, otherwi se false.
	*/		*/
	bool hasServiceType( const QString& serviceTypePtr ) const;		bool hasServiceType( const QString& serviceTypePtr ) const;
	/**		/**
	* Checks whether the mime supports this mime type		* Checks whether the service supports this mime type
	* @param mimeTypePtr The name of the mime type you are		* @param mimeTypePtr The name of the mime type you are
	* interested in determining whether this service supports.		* interested in determining whether this service supports.
	*		*
	* Note that if you only have the name of the mime type, you have to lo ok it up		* Note that if you only have the name of the mime type, you have to lo ok it up
	* with KMimeType::mimeType( mimetype ) and use .data() on the result ( this is		* with KMimeType::mimeType( mimetype ) and use .data() on the result ( this is
	* because KService doesn't know KMimeType for dependency reasons)		* because KService doesn't know KMimeType for dependency reasons)
	*		*
	* Warning this method will fail to return true if this KService isn't from ksycoca		* Warning this method will fail to return true if this KService isn't from ksycoca
	* (i.e. it was created with a full path or a KDesktopFile) *and* the m imetype		* (i.e. it was created with a full path or a KDesktopFile) *and* the m imetype
	* isn't explicited listed in the .desktop file but a parent mimetype i s.		* isn't explicited listed in the .desktop file but a parent mimetype i s.
	* For this reason you should generally get KServices with KMimeTypeTra der		* For this reason you should generally get KServices with KMimeTypeTra der
	* or one of the KService::serviceBy methods.		* or one of the KService::serviceBy methods.
	*		*
	* @return true if the mime type you specified is supported, otherwise false.		* @return true if the mime type you specified is supported, otherwise false.
			* @deprecated, use hasMimeType(QString)
	*/		*/
	bool hasMimeType( const KServiceType* mimeTypePtr ) const;		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED bool hasMimeType( const KServiceType* mimeTypePtr ) cons
			t;
			#endif
			/**
			* Checks whether the service supports this mime type
			* @param mimeTypePtr The name of the mime type you are
			* interested in determining whether this service supports.
			* @since 4.6
			*/
			bool hasMimeType( const QString& mimeType ) const;
	/**		/**
	* Set to true if it is allowed to use this service as the default (mai n)		* Set to true if it is allowed to use this service as the default (mai n)
	* action for the files it supports (e.g. Left Click in a file manager, or KRun in general).		* action for the files it supports (e.g. Left Click in a file manager, or KRun in general).
	*		*
	* If not, then this service is only available in RMB popups, so it mus t		* If not, then this service is only available in RMB popups, so it mus t
	* be selected explicitly by the user in order to be used.		* be selected explicitly by the user in order to be used.
	* Note that servicemenus supersede this functionality though, at least in konqueror.		* Note that servicemenus supersede this functionality though, at least in konqueror.
	*		*
	* @return true if the service may be used as the default (main) handle r		* @return true if the service may be used as the default (main) handle r
	skipping to change at line 413		skipping to change at line 430
	/**		/**
	* Find a service by name, i.e. the translated Name field. Don't use th is.		* Find a service by name, i.e. the translated Name field. Don't use th is.
	* Use serviceByDesktopPath or serviceByStorageId instead.		* Use serviceByDesktopPath or serviceByStorageId instead.
	*		*
	* @param _name the name to search		* @param _name the name to search
	* @return a pointer to the requested service or 0 if the service is		* @return a pointer to the requested service or 0 if the service is
	* unknown.		* unknown.
	* @em Very @em important: Don't store the result in a KService* !		* @em Very @em important: Don't store the result in a KService* !
	* @deprecated there is never a good reason to use this method.		* @deprecated there is never a good reason to use this method.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static Ptr serviceByName( const QString& _name ); // KDE5: remove		static Ptr serviceByName( const QString& _name ); // KDE5: remove
			#endif
	/**		/**
	* Find a service based on its path as returned by entryPath().		* Find a service based on its path as returned by entryPath().
	* It's usually better to use serviceByStorageId() instead.		* It's usually better to use serviceByStorageId() instead.
	*		*
	* @param _path the path of the configuration file		* @param _path the path of the configuration file
	* @return a pointer to the requested service or 0 if the service is		* @return a pointer to the requested service or 0 if the service is
	* unknown.		* unknown.
	* @em Very @em important: Don't store the result in a KService* !		* @em Very @em important: Don't store the result in a KService* !
	*/		*/
	skipping to change at line 548		skipping to change at line 567
	else if (error) {		else if (error) {
	*error = pluginLoader.errorString();		*error = pluginLoader.errorString();
	pluginLoader.unload();		pluginLoader.unload();
	}		}
	return 0;		return 0;
	}		}
	/**		/**
	* @deprecated Use the non-static service->createInstance<T>(parent, ar gs, &error)		* @deprecated Use the non-static service->createInstance<T>(parent, ar gs, &error)
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T>		template <class T>
	static KDE_DEPRECATED T *createInstance(const KService::Ptr &service, Q Object *parent = 0,		static KDE_DEPRECATED T *createInstance(const KService::Ptr &service, Q Object *parent = 0,
	const QVariantList &args = QVariantList(), QString *error = 0)		const QVariantList &args = QVariantList(), QString *error = 0)
	{		{
	return service->createInstance<T>(parent, args, error);		return service->createInstance<T>(parent, args, error);
	}		}
			#endif
	/**		/**
	* @deprecated Use the non-static service->createInstance<T>(parent, ar gs, &error)		* @deprecated Use the non-static service->createInstance<T>(parent, ar gs, &error)
	* where args is a QVariantList rather than a QStringList		* where args is a QVariantList rather than a QStringList
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T>		template <class T>
	static KDE_DEPRECATED T *createInstance( const KService::Ptr &service,		static KDE_DEPRECATED T *createInstance( const KService::Ptr &service,
	QObject *parent,		QObject *parent,
	const QStringList &args,		const QStringList &args,
	int *error = 0 )		int *error = 0 )
	{		{
	const QString library = service->library();		const QString library = service->library();
	if ( library.isEmpty() ) {		if ( library.isEmpty() ) {
	if ( error )		if ( error )
	*error = KLibLoader::ErrServiceProvidesNoLibrary;		*error = KLibLoader::ErrServiceProvidesNoLibrary;
	return 0;		return 0;
	}		}
	return KLibLoader::createInstance<T>( library, parent, args, error );		return KLibLoader::createInstance<T>( library, parent, args, error );
	}		}
			#endif
	/**		/**
	* This template allows to create a component from a list of services,		* This template allows to create a component from a list of services,
	* usually coming from a trader query. You probably want to use KServic eTypeTrader instead.		* usually coming from a trader query. You probably want to use KServic eTypeTrader instead.
	*		*
	* @deprecated Use KServiceTypeTrader::createInstanceFromQuery instead		* @deprecated Use KServiceTypeTrader::createInstanceFromQuery instead
	*		*
	* @param begin The start iterator to the service describing the librar y to open		* @param begin The start iterator to the service describing the librar y to open
	* @param end The end iterator to the service describing the library to open		* @param end The end iterator to the service describing 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 KLibFactory)		* to the component (see KLibFactory)
	* @param error see KLibLoader		* @param error see KLibLoader
	* @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.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T, class ServiceIterator>		template <class T, class ServiceIterator>
	static KDE_DEPRECATED T *createInstance(ServiceIterator begin, ServiceI terator end, QObject *parent = 0,		static KDE_DEPRECATED T *createInstance(ServiceIterator begin, ServiceI terator end, QObject *parent = 0,
	const QVariantList &args = QVariantList(), QString *error = 0)		const QVariantList &args = QVariantList(), QString *error = 0)
	{		{
	for (; begin != end; ++begin) {		for (; begin != end; ++begin) {
	KService::Ptr service = *begin;		KService::Ptr service = *begin;
	if (error) {		if (error) {
	error->clear();		error->clear();
	}		}
	T *component = createInstance<T>(service, parent, args, error);		T *component = createInstance<T>(service, parent, args, error);
	if (component) {		if (component) {
	return component;		return component;
	}		}
	}		}
	if (error) {		if (error) {
	*error = KLibLoader::errorString(KLibLoader::ErrNoServiceFound) ;		*error = KLibLoader::errorString(KLibLoader::ErrNoServiceFound) ;
	}		}
	return 0;		return 0;
	}		}
			#endif
			#ifndef KDE_NO_DEPRECATED
	template <class T, class ServiceIterator>		template <class T, class ServiceIterator>
	static KDE_DEPRECATED T *createInstance( ServiceIterator begin, Service Iterator end,		static KDE_DEPRECATED T *createInstance( ServiceIterator begin, Service Iterator end,
	QObject *parent,		QObject *parent,
	const QStringList &args,		const QStringList &args,
	int *error = 0 )		int *error = 0 )
	{		{
	for (; begin != end; ++begin ) {		for (; begin != end; ++begin ) {
	KService::Ptr service = *begin;		KService::Ptr service = *begin;
	if ( error )		if ( error )
	*error = 0;		*error = 0;
	T *component = createInstance<T>( service, parent, args, error );		T *component = createInstance<T>( service, parent, args, error );
	if ( component )		if ( component )
	return component;		return component;
	}		}
	if ( error )		if ( error )
	*error = KLibLoader::ErrNoServiceFound;		*error = KLibLoader::ErrNoServiceFound;
	return 0;		return 0;
	}		}
			#endif
	protected:		protected:
	friend class KMimeAssociations;		friend class KMimeAssociations;
	friend class KBuildServiceFactory;		friend class KBuildServiceFactory;
	/// @internal for KBuildSycoca only		/// @internal for KBuildSycoca only
	struct ServiceTypeAndPreference		struct ServiceTypeAndPreference
	{		{
	ServiceTypeAndPreference()		ServiceTypeAndPreference()
	: preference(-1), serviceType() {}		: preference(-1), serviceType() {}
End of changes. 20 change blocks.
	3 lines changed or deleted		31 lines changed or added

	kservicegroup.h		kservicegroup.h
	skipping to change at line 251		skipping to change at line 251
	/**		/**
	* Returns the group for the given baseGroupName.		* Returns the group for the given baseGroupName.
	* Can return 0L if the directory (or the .directory file) was deleted.		* Can return 0L if the directory (or the .directory file) was deleted.
	* @return the base group with the given name, or 0 if not available.		* @return the base group with the given name, or 0 if not available.
	*		*
	* This mechanism was fragile and isn't used in kde4 anymore.		* This mechanism was fragile and isn't used in kde4 anymore.
	* @deprecated Use a servicetype and a proper trader query instead, for a better		* @deprecated Use a servicetype and a proper trader query instead, for a better
	* way of finding related services.		* way of finding related services.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED Ptr baseGroup( const QString &baseGroupName );		static KDE_DEPRECATED Ptr baseGroup( const QString &baseGroupName );
			#endif
	/**		/**
	* Returns the root service group.		* Returns the root service group.
	* @return the root service group		* @return the root service group
	*/		*/
	static Ptr root();		static Ptr root();
	/**		/**
	* Returns the group with the given relative path.		* Returns the group with the given relative path.
	* @param relPath the path of the service group		* @param relPath the path of the service group
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kservicetype.h		kservicetype.h
	skipping to change at line 43		skipping to change at line 43
	class KDesktopFile;		class KDesktopFile;
	class KServiceTypePrivate;		class KServiceTypePrivate;
	/**		/**
	* A service type is, well, a type of service, where a service is an applic ation or plugin.		* A service type is, well, a type of service, where a service is an applic ation or plugin.
	* For instance, "KOfficeFilter", which is the type of all koffice filters, is a service type.		* For instance, "KOfficeFilter", which is the type of all koffice filters, is a service type.
	* In order to discover services of a given type, using KServiceTypeTrader.		* In order to discover services of a given type, using KServiceTypeTrader.
	* Service types are stored as desktop files in $KDEDIR/share/servicetypes.		* Service types are stored as desktop files in $KDEDIR/share/servicetypes.
	* @see KService, KServiceTypeTrader		* @see KService, KServiceTypeTrader
	*/		*/
	class KDECORE_EXPORT KServiceType : public KSycocaEntry		class KDECORE_EXPORT KServiceType : public KSycocaEntry // TODO KDE5: inher it kshared, but move KSycocaEntry to Private
	{		{
	public:		public:
	typedef KSharedPtr<KServiceType> Ptr;		typedef KSharedPtr<KServiceType> Ptr;
	typedef QList<Ptr> List;		typedef QList<Ptr> List;
	/**		/**
	* Construct a service type and take all information from a desktop fil e.		* Construct a service type and take all information from a desktop fil e.
	* @param config the configuration file		* @param config the configuration file
	*/		*/
	explicit KServiceType( KDesktopFile *config );		explicit KServiceType( KDesktopFile *config );
	skipping to change at line 75		skipping to change at line 75
	* @return the comment, or QString()		* @return the comment, or QString()
	*/		*/
	QString comment() const;		QString comment() const;
	/**		/**
	* Returns the relative path to the desktop entry file responsible for		* Returns the relative path to the desktop entry file responsible for
	* this servicetype.		* this servicetype.
	* For instance inode/directory.desktop, or kpart.desktop		* For instance inode/directory.desktop, or kpart.desktop
	* @return the path of the desktop file		* @return the path of the desktop file
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString desktopEntryPath() const;		KDE_DEPRECATED QString desktopEntryPath() const;
			#endif
	/**		/**
	* Checks whether this service type inherits another one.		* Checks whether this service type inherits another one.
	* @return true if this service type inherits another one		* @return true if this service type inherits another one
	* @see parentServiceType()		* @see parentServiceType()
	*/		*/
	bool isDerived() const;		bool isDerived() const;
	/**		/**
	* If this service type inherits from another service type,		* If this service type inherits from another service type,
End of changes. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	kservicetypetrader.h		kservicetypetrader.h
	skipping to change at line 201		skipping to change at line 201
	if (error)		if (error)
	*error = i18n("No service matching the requirements was found") ;		*error = i18n("No service matching the requirements was found") ;
	return 0;		return 0;
	}		}
	/**		/**
	* @deprecated Use		* @deprecated Use
	* createInstanceFromQuery(const QString&, const QString&, QObject*, co nst QVariantList&, QString*)		* createInstanceFromQuery(const QString&, const QString&, QObject*, co nst QVariantList&, QString*)
	* instead		* instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	template <class T>		template <class T>
	static KDE_DEPRECATED T *createInstanceFromQuery(const QString &service Type, const QString &constraint,		static KDE_DEPRECATED T *createInstanceFromQuery(const QString &service Type, const QString &constraint,
	QObject *parent, const QStringList &args, int *error = 0)		QObject *parent, const QStringList &args, int *error = 0)
	{		{
	const KService::List offers = KServiceTypeTrader::self()->query(ser viceType, constraint);		const KService::List offers = KServiceTypeTrader::self()->query(ser viceType, constraint);
	if (offers.isEmpty()) {		if (offers.isEmpty()) {
	if (error) {		if (error) {
	*error = KLibLoader::ErrNoServiceFound;		*error = KLibLoader::ErrNoServiceFound;
	}		}
	return 0;		return 0;
	}		}
	return KService::createInstance<T>(offers.begin(), offers.end(), pa rent, args, error);		return KService::createInstance<T>(offers.begin(), offers.end(), pa rent, args, error);
	}		}
			#endif
	/**		/**
	* @internal (public for KMimeTypeTrader)		* @internal (public for KMimeTypeTrader)
	*/		*/
	static void applyConstraints( KService::List& lst,		static void applyConstraints( KService::List& lst,
	const QString& constraint );		const QString& constraint );
	private:		private:
	/**		/**
	* @internal		* @internal
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kshareddatacache.h		kshareddatacache.h
	skipping to change at line 69		skipping to change at line 69
	{		{
	public:		public:
	/**		/**
	* Attaches to a shared cache, creating it if necessary. If supported, this		* Attaches to a shared cache, creating it if necessary. If supported, this
	* data cache will be shared across all processes using this cache (wit h		* data cache will be shared across all processes using this cache (wit h
	* subsequent memory savings). If shared memory is unsupported or a		* subsequent memory savings). If shared memory is unsupported or a
	* failure occurs, caching will still be supported, but only in the sam e		* failure occurs, caching will still be supported, but only in the sam e
	* process, and only using the same KSharedDataCache object.		* process, and only using the same KSharedDataCache object.
	*		*
	* @param cacheName Name of the cache to use/share.		* @param cacheName Name of the cache to use/share.
	* @param defaultCacheSize Amount of data data to be able to store. Th e		* @param defaultCacheSize Amount of data to be able to store, in bytes . The
	* actual size will be slightly larger on disk due to accounting		* actual size will be slightly larger on disk due to accounting
	* overhead. If the cache already existed then it <em>will not</em> be		* overhead. If the cache already existed then it <em>will not</em> be
	* resized. For this reason you should specify some reasonable size.		* resized. For this reason you should specify some reasonable size.
	* @param expectedItemSize The average size of an item that would be st ored		* @param expectedItemSize The average size of an item that would be st ored
	* in the cache, in bytes. Choosing an average size of zero bytes cau ses		* in the cache, in bytes. Choosing an average size of zero bytes cau ses
	* KSharedDataCache to use whatever it feels is the best default for the		* KSharedDataCache to use whatever it feels is the best default for the
	* system.		* system.
	*/		*/
	KSharedDataCache(const QString &cacheName,		KSharedDataCache(const QString &cacheName,
	unsigned defaultCacheSize,		unsigned defaultCacheSize,
	skipping to change at line 173		skipping to change at line 173
	unsigned totalSize() const;		unsigned totalSize() const;
	/**		/**
	* Returns the amount of free space in the cache, in bytes. Due to		* Returns the amount of free space in the cache, in bytes. Due to
	* implementation details it is possible to still not be able to fit an		* implementation details it is possible to still not be able to fit an
	* entry in the cache at any given time even if it is smaller than the		* entry in the cache at any given time even if it is smaller than the
	* amount of space remaining.		* amount of space remaining.
	*/		*/
	unsigned freeSize() const;		unsigned freeSize() const;
			/**
			* @return The shared timestamp of the cache. The interpretation of the
			* timestamp returned is up to the application. KSharedDataCach
			e
			* will initialize the timestamp to the time returned by @c tim
			e(2)
			* on cache creation, but KSharedDataCache will not touch the
			* timestamp again.
			* @see setTimestamp()
			* @since 4.6
			*/
			unsigned timestamp() const;
			/**
			* Sets the shared timestamp of the cache. Timestamping is supported to
			* allow applications to more effectively "version" the data stored in
			the
			* cache. However, the timestamp is shared with <em>all</em> applicatio
			ns
			* using the cache so you should always be prepared for invalid
			* timestamps.
			*
			* When the cache is first created (note that this is different from
			* attaching to an existing shared cache on disk), the cache timestamp
			is
			* initialized to the time returned by @c time(2). KSharedDataCache wil
			l
			* not update the timestamp again, it is only updated through this meth
			od.
			*
			* Example:
			* @code
			* QImage loadCachedImage(const QString &key)
			* {
			* // Check timestamp
			* if (m_sharedCache->timestamp() < m_currentThemeTimestamp) {
			* // Cache is stale, clean it out.
			* m_sharedCache->clear();
			* m_sharedCache->setTimestamp(m_currentThemeTimestamp);
			* }
			*
			* // Check cache and load image as usual...
			* }
			* @endcode
			*
			* @param newTimestamp The new timestamp to mark the shared cache with.
			* @see timestamp()
			* @since 4.6
			*/
			void setTimestamp(unsigned newTimestamp);
	private:		private:
	class Private;		class Private;
	Private *d;		Private *d;
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		52 lines changed or added

	kshell.h		kshell.h
	skipping to change at line 186		skipping to change at line 186
	* @return the quoted argument		* @return the quoted argument
	*/		*/
	KDECORE_EXPORT QString quoteArg( const QString &arg );		KDECORE_EXPORT QString quoteArg( const QString &arg );
	/**		/**
	* Performs tilde expansion on @p path. Interprets "~/path" and		* Performs tilde expansion on @p path. Interprets "~/path" and
	* "~user/path". If the path starts with an escaped tilde ("\~" on UNIX ,		* "~user/path". If the path starts with an escaped tilde ("\~" on UNIX ,
	* "^~" on Windows), the escape char is removed and the path is returne d		* "^~" on Windows), the escape char is removed and the path is returne d
	* as is.		* as is.
	*		*
			* Note that if @p path starts with a tilde but cannot be properly expa
			nded,
			* this function will return an empty string.
			*
	* @param path the path to tilde-expand		* @param path the path to tilde-expand
	* @return the expanded path		* @return the expanded path
	*/		*/
	KDECORE_EXPORT QString tildeExpand( const QString &path );		KDECORE_EXPORT QString tildeExpand( const QString &path );
	}		}
	Q_DECLARE_OPERATORS_FOR_FLAGS(KShell::Options)		Q_DECLARE_OPERATORS_FOR_FLAGS(KShell::Options)
	#endif /* KSHELL_H */		#endif /* KSHELL_H */
End of changes. 1 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kshortcutseditor.h		kshortcutseditor.h
	skipping to change at line 184		skipping to change at line 184
	void writeConfiguration( KConfigGroup* config = 0 ) const;		void writeConfiguration( KConfigGroup* config = 0 ) const;
	/**		/**
	* Export the current setting to configuration @p config.		* Export the current setting to configuration @p config.
	*		*
	* This initializes the configuration object. This will export the glob al		* This initializes the configuration object. This will export the glob al
	* configuration too.		* configuration too.
	*		*
	* @param config Config object		* @param config Config object
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void exportConfiguration( KConfig *config) const;		KDE_DEPRECATED void exportConfiguration( KConfig *config) const;
			#endif
	void exportConfiguration( KConfigBase *config) const;		void exportConfiguration( KConfigBase *config) const;
	/**		/**
	* Import the settings from configuration @p config.		* Import the settings from configuration @p config.
	*		*
	* This will remove all current setting before importing. All shortcuts		* This will remove all current setting before importing. All shortcuts
	* are set to KShortcut() prior to importing from @p config!		* are set to KShortcut() prior to importing from @p config!
	*		*
	* @param config Config object		* @param config Config object
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void importConfiguration( KConfig *config);		KDE_DEPRECATED void importConfiguration( KConfig *config);
			#endif
	void importConfiguration( KConfigBase *config);		void importConfiguration( KConfigBase *config);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when an action's shortcut has been changed.		* Emitted when an action's shortcut has been changed.
	**/		**/
	void keyChange();		void keyChange();
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kshortcutwidget.h		kshortcutwidget.h
	skipping to change at line 34		skipping to change at line 34
	class KActionCollection;		class KActionCollection;
	class KShortcutWidgetPrivate;		class KShortcutWidgetPrivate;
	/**		/**
	* \image html kshortcutwidget.png "KDE Shortcut Widget"		* \image html kshortcutwidget.png "KDE Shortcut Widget"
	*/		*/
	class KDEUI_EXPORT KShortcutWidget : public QWidget		class KDEUI_EXPORT KShortcutWidget : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(bool modifierlessAllowed READ isModifierlessAllowed WRITE se tModifierlessAllowed)
	public:		public:
	KShortcutWidget(QWidget *parent = 0);		KShortcutWidget(QWidget *parent = 0);
	~KShortcutWidget();		~KShortcutWidget();
	void setModifierlessAllowed(bool allow);		void setModifierlessAllowed(bool allow);
	bool isModifierlessAllowed();		bool isModifierlessAllowed();
	void setClearButtonsShown(bool show);		void setClearButtonsShown(bool show);
	KShortcut shortcut() const;		KShortcut shortcut() const;
	skipping to change at line 66		skipping to change at line 67
	* @since 4.1		* @since 4.1
	*/		*/
	void setCheckActionCollections(const QList<KActionCollection *>& action Collections);		void setCheckActionCollections(const QList<KActionCollection *>& action Collections);
	/**		/**
	* @deprecated since 4.1		* @deprecated since 4.1
	* Use setCheckActionCollections so that KShortcutWidget knows		* Use setCheckActionCollections so that KShortcutWidget knows
	* in which action collection to call the writeSettings method after st ealing		* in which action collection to call the writeSettings method after st ealing
	* a shortcut from an action.		* a shortcut from an action.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setCheckActionList(const QList<QAction*> &checkList );		KDE_DEPRECATED void setCheckActionList(const QList<QAction*> &checkList );
			#endif
	Q_SIGNALS:		Q_SIGNALS:
	void shortcutChanged(const KShortcut &cut);		void shortcutChanged(const KShortcut &cut);
	public Q_SLOTS:		public Q_SLOTS:
	void setShortcut(const KShortcut &cut);		void setShortcut(const KShortcut &cut);
	void clearShortcut();		void clearShortcut();
	/**		/**
	* Actually remove the shortcut that the user wanted to steal, from the		* Actually remove the shortcut that the user wanted to steal, from the
End of changes. 3 change blocks.
	0 lines changed or deleted		3 lines changed or added

	ksocketfactory.h		ksocketfactory.h
	skipping to change at line 197		skipping to change at line 197
	* QTcpServer constructor		* QTcpServer constructor
	*/		*/
	KDECORE_EXPORT QTcpServer *listen(const QString &protocol, const QHostA ddress &address = QHostAddress::Any,		KDECORE_EXPORT QTcpServer *listen(const QString &protocol, const QHostA ddress &address = QHostAddress::Any,
	quint16 port = 0, QObject *parent = 0 );		quint16 port = 0, QObject *parent = 0 );
	// These functions below aren't done yet		// These functions below aren't done yet
	// Undocumented -> don't use!		// Undocumented -> don't use!
	KDECORE_EXPORT QUdpSocket *datagramSocket(const QString &protocol, cons t QString &host, QObject *parent = 0);		KDECORE_EXPORT QUdpSocket *datagramSocket(const QString &protocol, cons t QString &host, QObject *parent = 0);
			#ifndef QT_NO_NETWORKPROXY
	KDECORE_EXPORT QNetworkProxy proxyForConnection(const QString &protocol , const QString &host);		KDECORE_EXPORT QNetworkProxy proxyForConnection(const QString &protocol , const QString &host);
	KDECORE_EXPORT QNetworkProxy proxyForListening(const QString &protocol) ;		KDECORE_EXPORT QNetworkProxy proxyForListening(const QString &protocol) ;
	KDECORE_EXPORT QNetworkProxy proxyForDatagram(const QString &protocol, const QString &host);		KDECORE_EXPORT QNetworkProxy proxyForDatagram(const QString &protocol, const QString &host);
			#endif
	}		}
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	ksortablelist.h		ksortablelist.h
	skipping to change at line 123		skipping to change at line 123
	/**		/**
	* @return the second value (the item)		* @return the second value (the item)
	*/		*/
	const T& value() const { return this->second; }		const T& value() const { return this->second; }
	/**		/**
	* @return the first value (the key)		* @return the first value (the key)
	* @deprecated use key()		* @deprecated use key()
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Key index() const { return this->first; }		KDE_DEPRECATED Key index() const { return this->first; }
			#endif
	/**		/**
	* @return the first value.		* @return the first value.
	*/		*/
	Key key() const { return this->first; }		Key key() const { return this->first; }
	};		};
	/**		/**
	* \class KSortableList ksortablelist.h <KSortableList>		* \class KSortableList ksortablelist.h <KSortableList>
	*		*
	* KSortableList is a QList which associates a key with each item in the li st.		* KSortableList is a QList which associates a key with each item in the li st.
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kspeech_export.h		kspeech_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KSPEECH_EXPORT_H		#ifndef KSPEECH_EXPORT_H
	#define KSPEECH_EXPORT_H		#define KSPEECH_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KSPEECH_EXPORT		#ifndef KSPEECH_EXPORT
	# if defined(MAKE_KSPEECH_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KSPEECH_EXPORT
			# elif defined(MAKE_KSPEECH_LIB)
	/* We are building this library */		/* We are building this library */
	# define KSPEECH_EXPORT KDE_EXPORT		# define KSPEECH_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KSPEECH_EXPORT KDE_IMPORT		# define KSPEECH_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	ksqueezedtextlabel.h		ksqueezedtextlabel.h
	skipping to change at line 108		skipping to change at line 108
	* @param mode The new text.		* @param mode The new text.
	*/		*/
	void setText( const QString &text );		void setText( const QString &text );
	/**		/**
	* Clears the text. Same remark as above.		* Clears the text. Same remark as above.
	*		*
	*/		*/
	void clear();		void clear();
	protected:		protected:
	/**		/**
	* Called when widget is resized		* \reimp
	*/		*/
	void resizeEvent( QResizeEvent * );		void mouseReleaseEvent(QMouseEvent*);
	/**
			/**
			* Called when widget is resized
			*/
			void resizeEvent( QResizeEvent * );
			/**
	* \reimp		* \reimp
	*/		*/
	void contextMenuEvent(QContextMenuEvent* );		void contextMenuEvent(QContextMenuEvent* );
	/**		/**
	* does the dirty work		* does the dirty work
	*/		*/
	void squeezeTextToLabel();		void squeezeTextToLabel();
	private:		private:
	Q_PRIVATE_SLOT(d, void _k_copyFullText())		Q_PRIVATE_SLOT(d, void _k_copyFullText())
	KSqueezedTextLabelPrivate * const d;		KSqueezedTextLabelPrivate * const d;
	};		};
	#endif // KSQUEEZEDTEXTLABEL_H		#endif // KSQUEEZEDTEXTLABEL_H
End of changes. 2 change blocks.
	9 lines changed or deleted		14 lines changed or added

	kstandardaction.h		kstandardaction.h
	skipping to change at line 31		skipping to change at line 31
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <kstandardshortcut.h>		#include <kstandardshortcut.h>
	#include <QtCore/QList>		#include <QtCore/QList>
	class QObject;		class QObject;
	class QStringList;		class QStringList;
	class QWidget;		class QWidget;
	class KAction;		class KAction;
	class KRecentFilesAction;		class KRecentFilesAction;
			class KDualAction;
	class KToggleAction;		class KToggleAction;
	class KToggleFullScreenAction;		class KToggleFullScreenAction;
	/**		/**
	* Convenience methods to access all standard KDE actions.		* Convenience methods to access all standard KDE actions.
	*		*
	* These actions should be used instead of hardcoding menubar and		* These actions should be used instead of hardcoding menubar and
	* toolbar items. Using these actions helps your application easily		* toolbar items. Using these actions helps your application easily
	* conform to the KDE UI Style Guide		* conform to the KDE UI Style Guide
	* @see http://developer.kde.org/documentation/standards/kde/style/basics/i ndex.html .		* @see http://developer.kde.org/documentation/standards/kde/style/basics/i ndex.html .
	skipping to change at line 190		skipping to change at line 191
	*/		*/
	KDEUI_EXPORT KAction* create(StandardAction id, const QObject *recvr, con st char *slot,		KDEUI_EXPORT KAction* create(StandardAction id, const QObject *recvr, con st char *slot,
	QObject *parent);		QObject *parent);
	/**		/**
	* This will return the internal name of a given standard action.		* This will return the internal name of a given standard action.
	*/		*/
	KDEUI_EXPORT const char* name( StandardAction id );		KDEUI_EXPORT const char* name( StandardAction id );
	/// @deprecated use name()		/// @deprecated use name()
			#ifndef KDE_NO_DEPRECATED
	inline KDE_DEPRECATED const char* stdName(StandardAction act_enum) { retu rn name( act_enum ); }		inline KDE_DEPRECATED const char* stdName(StandardAction act_enum) { retu rn name( act_enum ); }
			#endif
	/**		/**
	* Returns a list of all standard names. Used by KAccelManager		* Returns a list of all standard names. Used by KAccelManager
	* to give those heigher weight.		* to give those heigher weight.
	*/		*/
	KDEUI_EXPORT QStringList stdNames();		KDEUI_EXPORT QStringList stdNames();
	/**		/**
	* Returns a list of all actionIds.		* Returns a list of all actionIds.
	*		*
End of changes. 3 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kstandarddirs.h		kstandarddirs.h
	skipping to change at line 36		skipping to change at line 36
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <kglobal.h>		#include <kglobal.h>
	#include <QtCore/QMap>		#include <QtCore/QMap>
	class KConfig;		class KConfig;
	/**		/**
	* @short Site-independent access to standard KDE directories.		* @short Site-independent access to standard KDE directories.
	* @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org >		* @author Stephan Kulow <coolo@kde.org> and Sirtaj Singh Kang <taj@kde.org >
	*		*
	* This is one of the most central classes in kdelibs as		* This is one of the most central classes in kdelibs: It knows where KDE-r
	* it provides a basic service: It knows where the files		elated files
	* reside on the user's hard disk. And it's meant to be the		* reside on the user's hard disk. It's meant to be the only one that knows
	* only one that knows -- to make the real location as		--
	* transparent as possible to both the user and the applications.		* so applications and the end user don't have to.
	*		*
	* To this end it insulates the application from all information		* Applications should always refer to a file with a resource type.
	* and applications always refer to a file with a resource type		* The application should leave it up to e.g.
	* (e.g. icon) and a filename (e.g. <tt>khexdit.xpm</tt>). In an ideal worl		* KStandardDirs::findResource("apps", "Home.desktop")
	d		* to return the desired path <tt>/opt/kde/share/applnk/Home.desktop</tt>
	* the application would make no assumption where this file is and
	* leave it up to KStandardDirs::findResource("apps", "Home.desktop")
	* to apply this knowledge to return <tt>/opt/kde/share/applnk/Home.desktop
	</tt>
	* or ::locate("data", "kgame/background.jpg") to return		* or ::locate("data", "kgame/background.jpg") to return
	* <tt>/opt/kde/share/apps/kgame/background.jpg</tt>		* <tt>/opt/kde/share/apps/kgame/background.jpg</tt>
	*		*
	* The main idea behind KStandardDirs is that there are several		* There are several toplevel prefixes under which files can be located.
	* toplevel prefixes below which the files lie. One of these prefixes is		* One of them is the kdelibs install location, one is the application
	* the one where the user installed kdelibs, one is where the		* install location, and one is <tt>$KDEHOME</tt>.
	* application was installed, and one is <tt>$HOME/.kde</tt>, but there		* Under these toplevel prefixes there are several well-defined suffixes
	* may be even more. Under these prefixes there are several well		* where specific resource types can be found.
	* defined suffixes where specific resource types are to be found.
	* For example, for the resource type @c "html" the suffixes could be		* For example, for the resource type @c "html" the suffixes could be
	* @c share/doc/HTML and @c share/doc/kde/HTML.		* @c share/doc/HTML and @c share/doc/kde/HTML.
	* So the search algorithm basically appends to each prefix each registered		* The search algorithm tries to locate the file under each prefix-suffix
	* suffix and tries to locate the file there.		* combination.
	* To make the thing even more complex, it's also possible to register		*
			* It is also possible to register
	* absolute paths that KStandardDirs looks up after not finding anything		* absolute paths that KStandardDirs looks up after not finding anything
	* in the former steps. They can be useful if the user wants to provide		* in the former steps. They can be useful if the user wants to provide
	* specific directories that aren't in his <tt>$HOME/.kde</tt> directory fo		* specific directories that aren't in his <tt>$KDEHOME</tt> directory, for
	r,		* example for icons.
	* for example, icons.
	*		*
	* <b>Standard resources that kdelibs allocates are:</b>\n		* <b>Standard resources that kdelibs allocates are:</b>\n
	*		*
	* @li @c apps - Applications menu (.desktop files).		* @li @c apps - Applications menu (.desktop files).
	* @li @c autostart - Autostart directories (both XDG and kde-specific)		* @li @c autostart - Autostart directories (both XDG and kde-specific)
	* @li @c cache - Cached information (e.g. favicons, web-pages)		* @li @c cache - Cached information (e.g. favicons, web-pages)
	* @li @c cgi - CGIs to run from kdehelp.		* @li @c cgi - CGIs to run from kdehelp.
	* @li @c config - Configuration files.		* @li @c config - Configuration files.
	* @li @c data - Where applications store data.		* @li @c data - Where applications store data.
	* @li @c emoticons - Emoticons themes		* @li @c emoticons - Emoticons themes
	skipping to change at line 255		skipping to change at line 251
	* like KGlobal::dirs()->addResourceType("app_pics", "data" ,"app/pics" );		* like KGlobal::dirs()->addResourceType("app_pics", "data" ,"app/pics" );
	*		*
	* @param type Specifies a short descriptive string to access		* @param type Specifies a short descriptive string to access
	* files of this type.		* files of this type.
	* @param relativename Specifies a directory relative to the root		* @param relativename Specifies a directory relative to the root
	* of the KFSSTND.		* of the KFSSTND.
	* @param priority if true, the directory is added before any other,		* @param priority if true, the directory is added before any other,
	* otherwise after		* otherwise after
	* @return true if successful, false otherwise.		* @return true if successful, false otherwise.
	*		*
	* @deprecated		* @deprecated, use addResourceType(type, 0, relativename, priority)
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool addResourceType( const char *type,		KDE_DEPRECATED bool addResourceType( const char *type,
	const QString& relativename, bool priority = true );		const QString& relativename, bool priority = true );
			#endif
	/**		/**
	* Adds suffixes for types.		* Adds suffixes for types.
	*		*
	* You may add as many as you need, but it is advised that there		* You may add as many as you need, but it is advised that there
	* is exactly one to make writing definite.		* is exactly one to make writing definite.
	* All basic types are added by addKDEDefaults(),		* All basic types are added by addKDEDefaults(),
	* but for those you can add more relative paths as well.		* but for those you can add more relative paths as well.
	*		*
	* The later a suffix is added, the higher its priority. Note, that the		* The later a suffix is added, the higher its priority. Note, that the
	skipping to change at line 653		skipping to change at line 651
	* @li @c xdgdata-dirs - @c desktop-directories		* @li @c xdgdata-dirs - @c desktop-directories
	* @li @c xdgdata-mime - @c mime		* @li @c xdgdata-mime - @c mime
	* @li @c xdgconf-menu - @c menus		* @li @c xdgconf-menu - @c menus
	*		*
	* @returns Static default for the specified resource. You		* @returns Static default for the specified resource. You
	* should probably be using locate() or locateLocal()		* should probably be using locate() or locateLocal()
	* instead.		* instead.
	* @see locate()		* @see locate()
	* @see locateLocal()		* @see locateLocal()
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED QString kde_default(const char *type);		static KDE_DEPRECATED QString kde_default(const char *type);
			#endif
	/**		/**
	* @internal (for use by sycoca only)		* @internal (for use by sycoca only)
	*/		*/
	QString kfsstnd_prefixes();		QString kfsstnd_prefixes();
	/**		/**
	* @internal (for use by sycoca only)		* @internal (for use by sycoca only)
	*/		*/
	QString kfsstnd_xdg_conf_prefixes();		QString kfsstnd_xdg_conf_prefixes();
End of changes. 10 change blocks.
	26 lines changed or deleted		25 lines changed or added

	kstandardshortcut.h		kstandardshortcut.h
	skipping to change at line 48		skipping to change at line 48
	*Don't forget to add the corresponding entries in g_infoStandardShortcut [] in kstandardshortcut.cpp, too.		*Don't forget to add the corresponding entries in g_infoStandardShortcut [] in kstandardshortcut.cpp, too.
	*Values of elements here and positions of the corresponding entries in		*Values of elements here and positions of the corresponding entries in
	*the big array g_infoStandardShortcut[] ABSOLUTELY MUST BE THE SAME.		*the big array g_infoStandardShortcut[] ABSOLUTELY MUST BE THE SAME.
	* !!! !!!! !!!!! !!!!		* !!! !!!! !!!!! !!!!
	* !!!! !!! !!!! !!!!		* !!!! !!! !!!! !!!!
	* Remember to also update kdoctools/genshortcutents.cpp.		* Remember to also update kdoctools/genshortcutents.cpp.
	*		*
	* Other Rules:		* Other Rules:
	*		*
	* - Never change the name of an existing shortcut		* - Never change the name of an existing shortcut
	* - Never translate the name of an shortcut		* - Never translate the name of a shortcut
	*/		*/
	/**		/**
	* Defines the identifier of all standard accelerators.		* Defines the identifier of all standard accelerators.
	*/		*/
	enum StandardShortcut {		enum StandardShortcut {
	//C++ requires that the value of an enum symbol be one more than the pr evious one.		//C++ requires that the value of an enum symbol be one more than the pr evious one.
	//This means that everything will be well-ordered from here on.		//This means that everything will be well-ordered from here on.
	AccelNone=0,		AccelNone=0,
	// File menu		// File menu
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kstatusnotifieritem.h		kstatusnotifieritem.h
	skipping to change at line 43		skipping to change at line 43
	class QMovie;		class QMovie;
	class KStatusNotifierItemPrivate;		class KStatusNotifierItemPrivate;
	/**		/**
	* \brief %KDE Status notifier Item protocol implementation		* \brief %KDE Status notifier Item protocol implementation
	*		*
	* This class implements the Status notifier Item Dbus specification.		* This class implements the Status notifier Item Dbus specification.
	* It provides an icon similar to the classical systemtray icons,		* It provides an icon similar to the classical systemtray icons,
	* with some key differences:		* with some key differences:
	* the actual representation is done by the systemtray
	* (or the app behaving like it) itself, not by this app.
	*		*
	* there is communication between the systemtray and the icon owner,		* - the actual representation is done by the systemtray (or the app behavi
	* so the system tray can know if the application is in a normal		ng
	* or in a requesting attention state		* like it) itself, not by this app. Since 4.5 this also includes the me
			nu,
			* which means you cannot use embed widgets in the menu.
	*		*
	* icons are divided in categories, so the systemtray can represent		* - there is communication between the systemtray and the icon owner, so t
	* in a different way the icons from normal applications and for		he
	* instance the ones about hardware status.		* system tray can know if the application is in a normal or in a request
	* @author Marco Martin <notmart@gmail.com>		ing
	* @since 4.4		* attention state.
			*
			* - icons are divided in categories, so the systemtray can represent in a
			* different way the icons from normal applications and for instance the
			ones
			* about hardware status.
			*
			* Whenever possible you should prefer passing icon by name rather than by
			* pixmap because:
			*
			* - it is much lighter on Dbus (no need to pass all image pixels).
			*
			* - it makes it possible for the systemtray to load an icon of the appropr
			iate
			* size or to replace your icon with a systemtray specific icon which mat
			ches
			* with the desktop theme.
			*
			* - some implementations of the system tray do not support passing icons b
			y
			* pixmap and will show a blank icon instead.
			*
			* @author Marco Martin <notmart@gmail.com>
			* @since 4.4
	*/		*/
	class KDEUI_EXPORT KStatusNotifierItem : public QObject		class KDEUI_EXPORT KStatusNotifierItem : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(ItemStatus)		Q_ENUMS(ItemStatus)
	Q_ENUMS(ItemCategory)		Q_ENUMS(ItemCategory)
	Q_PROPERTY( ItemCategory category READ category WRITE setCategory )		Q_PROPERTY( ItemCategory category READ category WRITE setCategory )
	Q_PROPERTY( QString title READ title WRITE setTitle )		Q_PROPERTY( QString title READ title WRITE setTitle )
	Q_PROPERTY( ItemStatus status READ status WRITE setStatus )		Q_PROPERTY( ItemStatus status READ status WRITE setStatus )
	skipping to change at line 356		skipping to change at line 371
	*/		*/
	void setContextMenu(KMenu *menu);		void setContextMenu(KMenu *menu);
	/**		/**
	* Access the context menu associated to this status notifier item		* Access the context menu associated to this status notifier item
	*/		*/
	KMenu *contextMenu() const;		KMenu *contextMenu() const;
	/**		/**
	* Sets the main widget associated with this StatusNotifierItem		* Sets the main widget associated with this StatusNotifierItem
			*
			* If you pass contextMenu() as a parent then the menu will be displaye
			d
			* when the user activate the icon. In this case the activate() method
			will
			* not be called and the activateRequested() signal will not be emitted
			*
	* @param parent the new main widget: must be a top level window,		* @param parent the new main widget: must be a top level window,
	* if it's not parent->window() will be used instead.		* if it's not parent->window() will be used instead.
	*/		*/
	void setAssociatedWidget(QWidget *parent);		void setAssociatedWidget(QWidget *parent);
	/**		/**
	* Access the main widget associated with this StatusNotifierItem		* Access the main widget associated with this StatusNotifierItem
	*/		*/
	QWidget *associatedWidget() const;		QWidget *associatedWidget() const;
End of changes. 4 change blocks.
	10 lines changed or deleted		40 lines changed or added

	ksvgrenderer.h		ksvgrenderer.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef KSVGRENDERER_H		#ifndef KSVGRENDERER_H
	#define KSVGRENDERER_H		#define KSVGRENDERER_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtSvg/QSvgRenderer>		#include <QtSvg/QSvgRenderer>
	/**		/**
	* Thin wrapper around QSvgRenderer with SVGZ support.		* Thin wrapper around QSvgRenderer with SVGZ support.
	*		*
	* Please refer to the QSvgRenderer documentation for details.		* @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
			* replace KSvgRenderer by QSvgRenderer in old code without any regressions
			.
	*/		*/
	class KDEUI_EXPORT KSvgRenderer : public QSvgRenderer		class KDEUI_EXPORT 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);
End of changes. 1 change blocks.
	1 lines changed or deleted		5 lines changed or added

	ksycoca.h		ksycoca.h
	skipping to change at line 164		skipping to change at line 164
	static void disableAutoRebuild();		static void disableAutoRebuild();
	/**		/**
	* When you receive a "databaseChanged" signal, you can query here if		* When you receive a "databaseChanged" signal, you can query here if
	* a change has occurred in a specific resource type.		* a change has occurred in a specific resource type.
	* @see KStandardDirs for the various resource types.		* @see KStandardDirs for the various resource types.
	*		*
	* This method is meant to be called from the GUI thread only.		* This method is meant to be called from the GUI thread only.
	* @deprecated use the signal databaseChanged(QStringList) instead.		* @deprecated use the signal databaseChanged(QStringList) instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool isChanged(const char *type);		static KDE_DEPRECATED bool isChanged(const char *type);
			#endif
	/**		/**
	* A read error occurs.		* A read error occurs.
	* @internal		* @internal
	*/		*/
	static void flagError();		static void flagError();
	/// @deprecated		/// @deprecated
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool readError();		static KDE_DEPRECATED bool readError();
			#endif
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Connect to this to get notified when the database changes		* Connect to this to get notified when the database changes
	* @deprecated use the databaseChanged(QStringList) signal		* @deprecated use the databaseChanged(QStringList) signal
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void databaseChanged(); // KDE5 TODO: remove		QT_MOC_COMPAT void databaseChanged(); // KDE5 TODO: remove
			#endif
	/**		/**
	* Connect to this to get notified when the database changes		* Connect to this to get notified when the database changes
	* Example: when mimetype definitions have changed, applications showin g		* Example: when mimetype definitions have changed, applications showin g
	* files as icons refresh icons to take into account the new mimetypes.		* files as icons refresh icons to take into account the new mimetypes.
	* Another example: after creating a .desktop file in KOpenWithDialog,		* Another example: after creating a .desktop file in KOpenWithDialog,
	* it must wait until kbuildsycoca4 finishes until the KService::Ptr is available.		* it must wait until kbuildsycoca4 finishes until the KService::Ptr is available.
	*		*
	* @param changedResources List of resources where changes were detecte d.		* @param changedResources List of resources where changes were detecte d.
	* This can include the following resources (as defined in KStandardDir s) :		* This can include the following resources (as defined in KStandardDir s) :
	* apps, xdgdata-apps, services, servicetypes, xdgdata-mime.		* apps, xdgdata-apps, services, servicetypes, xdgdata-mime.
	*/		*/
	void databaseChanged(const QStringList& changedResources);		void databaseChanged(const QStringList& changedResources);
	protected:		protected:
	// @internal used by kbuildsycoca		// @internal used by kbuildsycoca
	KSycocaFactoryList* factories();		KSycocaFactoryList* factories();
	// @internal was for kbuildsycoca		// @internal was for kbuildsycoca
			#ifndef KDE_NO_DEPRECATED
	QDataStream *m_str_deprecated; // KDE5: REMOVE		QDataStream *m_str_deprecated; // KDE5: REMOVE
			#endif
	// @internal used by factories and kbuildsycoca		// @internal used by factories and kbuildsycoca
	QDataStream*& stream();		QDataStream*& stream();
	friend class KSycocaFactory;		friend class KSycocaFactory;
	friend class KSycocaDict;		friend class KSycocaDict;
	private Q_SLOTS:		private Q_SLOTS:
	/**		/**
	* internal function for receiving kbuildsycoca's signal, when the syco ca file changes		* internal function for receiving kbuildsycoca's signal, when the syco ca file changes
	*/		*/
	void notifyDatabaseChanged(const QStringList &);		void notifyDatabaseChanged(const QStringList &);
End of changes. 8 change blocks.
	0 lines changed or deleted		8 lines changed or added

	ksycocaentry.h		ksycocaentry.h
	skipping to change at line 139		skipping to change at line 139
	bool isSeparator() const;		bool isSeparator() const;
	/**		/**
	* @internal		* @internal
	* @return the position of the entry in the sycoca file		* @return the position of the entry in the sycoca file
	*/		*/
	int offset() const;		int offset() const;
	/**		/**
	* @internal		* @internal
	* Save ourselves to the database. Don't forget to call the parent class		* Save ourselves to the database.
	* first if you override this function.
	*/		*/
	void save(QDataStream &s);		void save(QDataStream &s);
	// KSycocaEntry(const KSycocaEntry &copy);		// KSycocaEntry(const KSycocaEntry &copy);
	// KSycocaEntry &operator=(const KSycocaEntry &right);		// KSycocaEntry &operator=(const KSycocaEntry &right);
	protected:		protected:
	KSycocaEntry(KSycocaEntryPrivate &d);		KSycocaEntry(KSycocaEntryPrivate &d);
	KSycocaEntryPrivate *d_ptr;		KSycocaEntryPrivate *d_ptr;
	private:		private:
End of changes. 1 change blocks.
	2 lines changed or deleted		1 lines changed or added

	ksycocatype.h		ksycocatype.h
	skipping to change at line 32		skipping to change at line 32
	#define KSYCOCATYPE_H		#define KSYCOCATYPE_H
	/**		/**
	* \relates KSycocaEntry		* \relates KSycocaEntry
	* A KSycocaType is a code (out of the KSycocaType enum) assigned to each		* A KSycocaType is a code (out of the KSycocaType enum) assigned to each
	* class type derived from KSycocaEntry .		* class type derived from KSycocaEntry .
	* To use it, call the macro K_SYCOCATYPE( your_typecode, parent_class )		* To use it, call the macro K_SYCOCATYPE( your_typecode, parent_class )
	* at the top of your class definition.		* at the top of your class definition.
	*/		*/
	enum KSycocaType { KST_KSycocaEntry = 0, KST_KService = 1, KST_KServiceType = 2, KST_KMimeType = 3,		enum KSycocaType { KST_KSycocaEntry = 0, KST_KService = 1, KST_KServiceType = 2, KST_KMimeType = 3,
	KST_KFolderMimeType = 4, KST_KDEDesktopMimeType = 5 /*co mpat*/, /*6 is unused*/		KST_KFolderMimeType = 4, KST_KDEDesktopMimeType = 5 /*co mpat*/, KST_KMimeTypeEntry = 6 /*internal*/,
	KST_KServiceGroup = 7, KST_KImageIOFormat = 8, KST_KProt ocolInfo = 9,		KST_KServiceGroup = 7, KST_KImageIOFormat = 8, KST_KProt ocolInfo = 9,
	KST_KServiceSeparator = 10,		KST_KServiceSeparator = 10,
	KST_KCustom = 1000 };		KST_KCustom = 1000 };
	/**		/**
	* \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.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ksystemtimezone.h		ksystemtimezone.h
	/*		/*
	This file is part of the KDE libraries		This file is part of the KDE libraries
	Copyright (c) 2005-2007,2009 David Jarvie <djarvie@kde.org>		Copyright (c) 2005-2007,2009-2010 David Jarvie <djarvie@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Library General Public
	License as published by the Free Software Foundation; either		License as published by the Free Software Foundation; either
	version 2 of the License, or (at your option) any later version.		version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,		This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of		but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Library General Public License for more details.		Library General Public License for more details.
	skipping to change at line 51		skipping to change at line 51
	class KSystemTimeZonesPrivate;		class KSystemTimeZonesPrivate;
	class KSystemTimeZoneSourcePrivate;		class KSystemTimeZoneSourcePrivate;
	class KSystemTimeZoneDataPrivate;		class KSystemTimeZoneDataPrivate;
	/**		/**
	* The KSystemTimeZones class represents the system time zone database, con sisting		* The KSystemTimeZones class represents the system time zone database, con sisting
	* of a collection of individual system time zone definitions, indexed by n ame.		* of a collection of individual system time zone definitions, indexed by n ame.
	* Each individual time zone is defined in a KSystemTimeZone instance. Addi tional		* Each individual time zone is defined in a KSystemTimeZone instance. Addi tional
	* time zones (of any class derived from KTimeZone) may be added if desired .		* time zones (of any class derived from KTimeZone) may be added if desired .
	*		*
	* At initialisation, KSystemTimeZones reads the zone.tab file to obtain th		* At initialisation, KSystemTimeZones on UNIX systems reads the zone.tab f
	e list		ile
	* of system time zones, and creates a KSystemTimeZone instance for each on		* to obtain the list of system time zones, and creates a KSystemTimeZone
	e.		* instance for each one.
			*
			* @note KSystemTimeZones gets the system's time zone configuration, includ
			ing
			* the current local system time zone and the location of zone.tab, from th
			e KDE
			* time zone daemon, ktimezoned. If ktimezoned cannot be started, KSystemTi
			meZones
			* will only know about the UTC time zone.
	*		*
	* Note that KSystemTimeZones is not derived from KTimeZones, but instead c ontains		* Note that KSystemTimeZones is not derived from KTimeZones, but instead c ontains
	* a KTimeZones instance which holds the system time zone database. Conveni ence		* a KTimeZones instance which holds the system time zone database. Conveni ence
	* static methods are defined to access its data, or alternatively you can access		* static methods are defined to access its data, or alternatively you can access
	* the KTimeZones instance directly via the timeZones() method.		* the KTimeZones instance directly via the timeZones() method.
	*		*
	* As an example, find the local time in Oman corresponding to the local sy stem		* As an example, find the local time in Oman corresponding to the local sy stem
	* time of 12:15:00 on 13th November 1999:		* time of 12:15:00 on 13th November 1999:
	* \code		* \code
	* QDateTime sampleTime(QDate(1999,11,13), QTime(12,15,0), Qt::LocalTime);		* QDateTime sampleTime(QDate(1999,11,13), QTime(12,15,0), Qt::LocalTime);
	skipping to change at line 179		skipping to change at line 185
	* local system time zone.		* local system time zone.
	* To avoid confusion, it is recommended that calls to		* To avoid confusion, it is recommended that calls to
	* realLocalZone() should be conditionally compiled, e.g.:		* realLocalZone() should be conditionally compiled, e.g.:
	* \code		* \code
	* #ifndef NDEBUG		* #ifndef NDEBUG
	* tz = KSystemTimeZones::realLocalZone();		* tz = KSystemTimeZones::realLocalZone();
	* #endif		* #endif
	* \endcode		* \endcode
	*		*
	* @see setLocalZone()		* @see setLocalZone()
			* @since 4.3
	*/		*/
	static KTimeZone realLocalZone();		static KTimeZone realLocalZone();
	/**		/**
	* Set or clear the simulated local system time zone.		* Set or clear the simulated local system time zone.
	*		*
	* @warning This method is provided only for testing purposes, and shou ld		* @warning This method is provided only for testing purposes, and shou ld
	* not be used in released code. If the library is compiled wi thout		* not be used in released code. If the library is compiled wi thout
	* debug enabled, setLocalZone() has no effect.		* debug enabled, setLocalZone() has no effect.
	* To avoid confusion, it is recommended that calls to it shou ld be		* To avoid confusion, it is recommended that calls to it shou ld be
	* conditionally compiled, e.g.:		* conditionally compiled, e.g.:
	* \code		* \code
	* #ifndef NDEBUG		* #ifndef NDEBUG
	* KSystemTimeZones::setLocalZone(tz);		* KSystemTimeZones::setLocalZone(tz);
	* #endif		* #endif
	* \endcode		* \endcode
	*		*
	* @param tz the time zone to simulate, or an invalid KTimeZone instanc e		* @param tz the time zone to simulate, or an invalid KTimeZone instanc e
	* (i.e. \code tz.isValid() == false \endcode) to cancel		* (i.e. \code tz.isValid() == false \endcode) to cancel
	* simulation		* simulation
			* @since 4.3
	*/		*/
	static void setLocalZone(const KTimeZone& tz);		static void setLocalZone(const KTimeZone& tz);
	/**		/**
	* Check whether there is a simulated local system time zone.		* Check whether there is a simulated local system time zone.
	*		*
	* @warning This method is provided only for testing purposes, and shou ld		* @warning This method is provided only for testing purposes, and shou ld
	* not be used in released code. If the library is compiled wi thout		* not be used in released code. If the library is compiled wi thout
	* debug enabled, isSimulated() always returns false.		* debug enabled, isSimulated() always returns false.
	* To avoid confusion, it is recommended that calls to it shou ld be		* To avoid confusion, it is recommended that calls to it shou ld be
	skipping to change at line 220		skipping to change at line 228
	* \code		* \code
	* #ifndef NDEBUG		* #ifndef NDEBUG
	* if (KSystemTimeZones::isSimulated())		* if (KSystemTimeZones::isSimulated())
	* {		* {
	* ...		* ...
	* }		* }
	* #endif		* #endif
	* \endcode		* \endcode
	*		*
	* @see setLocalZone()		* @see setLocalZone()
			* @since 4.3
	*/		*/
	static bool isSimulated();		static bool isSimulated();
	/**		/**
	* Returns the location of the system time zone zoneinfo database.		* Returns the location of the system time zone zoneinfo database.
	*		*
	* @return path of directory containing the zoneinfo database		* @return path of directory containing the zoneinfo database
	*/		*/
	static QString zoneinfoDir();		static QString zoneinfoDir();
			/**
			* Return whether the KDE time zone daemon, ktimezoned, is available. I
			f
			* not, UTC will be the only recognized time zone.
			* @since 4.6
			*/
			static bool isTimeZoneDaemonAvailable();
	private Q_SLOTS:		private Q_SLOTS:
	// Connected to D-Bus signals		// Connected to D-Bus signals
	void configChanged();		void configChanged();
	void zonetabChanged(const QString &zonetab);		void zonetabChanged(const QString &zonetab);
	void zoneDefinitionChanged(const QString &zone);		void zoneDefinitionChanged(const QString &zone);
	private:		private:
	KSystemTimeZones();		KSystemTimeZones();
	KSystemTimeZonesPrivate * const d;		KSystemTimeZonesPrivate * const d;
End of changes. 6 change blocks.
	5 lines changed or deleted		24 lines changed or added

	ktabbar.h		ktabbar.h
	skipping to change at line 62		skipping to change at line 62
	* Sets the tab reordering enabled or disabled. If enabled,		* Sets the tab reordering enabled or disabled. If enabled,
	* the user can reorder the tabs by drag and drop the tab		* the user can reorder the tabs by drag and drop the tab
	* headers with the middle mouse button.		* headers with the middle mouse button.
	*		*
	* @deprecated Use QTabBar::setMovable() instead.		* @deprecated Use QTabBar::setMovable() instead.
	*		*
	* Note, however, that QTabBar::setMovable(true) disables		* Note, however, that QTabBar::setMovable(true) disables
	* dragging tabs out of the KTabBar (e.g., dragging the tab		* dragging tabs out of the KTabBar (e.g., dragging the tab
	* URL from Konqueror to another application)!		* URL from Konqueror to another application)!
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setTabReorderingEnabled( bool enable );		KDE_DEPRECATED void setTabReorderingEnabled( bool enable );
			#endif
	/**		/**
	* Returns whether tab reordering is enabled.		* Returns whether tab reordering is enabled.
	*		*
	* @deprecated Use QTabBar::isMovable() instead.		* @deprecated Use QTabBar::isMovable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool isTabReorderingEnabled() const;		KDE_DEPRECATED bool isTabReorderingEnabled() const;
			#endif
	/**		/**
	* If enabled, a close button is shown above the tab icon.		* If enabled, a close button is shown above the tab icon.
	* The signal KTabBar::closeRequest() is emitted, if the		* The signal KTabBar::closeRequest() is emitted, if the
	* close button has been clicked. Note that the tab must have		* close button has been clicked. Note that the tab must have
	* an icon to use this feature.		* an icon to use this feature.
	*		*
	* @deprecated Use QTabBar::setTabsClosable() instead.		* @deprecated Use QTabBar::setTabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setHoverCloseButton( bool );		KDE_DEPRECATED void setHoverCloseButton( bool );
			#endif
	/** @deprecated Use QTabBar::tabsClosable() instead. */		/** @deprecated Use QTabBar::tabsClosable() instead. */
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool hoverCloseButton() const;		KDE_DEPRECATED bool hoverCloseButton() const;
			#endif
	/**		/**
	* If enabled, the close button cannot get clicked until a		* If enabled, the close button cannot get clicked until a
	* minor delay has been passed. This prevents that user		* minor delay has been passed. This prevents that user
	* accidentally closes a tab.		* accidentally closes a tab.
	*		*
	* @deprecated Use QTabBar::setTabsClosable() instead.		* @deprecated Use QTabBar::setTabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setHoverCloseButtonDelayed( bool );		KDE_DEPRECATED void setHoverCloseButtonDelayed( bool );
			#endif
	/** @deprecated Use QTabBar::tabsClosable() instead. */		/** @deprecated Use QTabBar::tabsClosable() instead. */
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool hoverCloseButtonDelayed() const;		KDE_DEPRECATED bool hoverCloseButtonDelayed() const;
			#endif
	/**		/**
	* If enabled, a close button is available for each tab. The		* If enabled, a close button is available for each tab. The
	* signal KTabBar::closeRequest() is emitted, if the close button		* signal KTabBar::closeRequest() is emitted, if the close button
	* has been clicked.		* has been clicked.
	*		*
	* @since 4.1		* @since 4.1
	*		*
	* @deprecated Use QTabBar::setTabsClosable() instead.		* @deprecated Use QTabBar::setTabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setCloseButtonEnabled( bool );		KDE_DEPRECATED void setCloseButtonEnabled( bool );
			#endif
	/**		/**
	* Returns true if the close button is shown on tabs.		* Returns true if the close button is shown on tabs.
	*		*
	* @since 4.1		* @since 4.1
	*		*
	* @deprecated Use QTabBar::tabsClosable() instead.		* @deprecated Use QTabBar::tabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool isCloseButtonEnabled() const;		KDE_DEPRECATED bool isCloseButtonEnabled() const;
			#endif
	/**		/**
	* Sets the 'activate previous tab on close' feature enabled		* Sets the 'activate previous tab on close' feature enabled
	* or disabled. If enabled, as soon as you close a tab, the		* or disabled. If enabled, as soon as you close a tab, the
	* previously selected tab is activated again.		* previously selected tab is activated again.
	*		*
	* @deprecated Use QTabBar::setSelectionBehaviorOnRemove() instead.		* @deprecated Use QTabBar::setSelectionBehaviorOnRemove() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setTabCloseActivatePrevious( bool );		KDE_DEPRECATED void setTabCloseActivatePrevious( bool );
			#endif
	/**		/**
	* Returns whether the 'activate previous tab on close' feature		* Returns whether the 'activate previous tab on close' feature
	* is enabled.		* is enabled.
	*		*
	* @deprecated Use QTabBar::selectionBehaviorOnRemove() instead.		* @deprecated Use QTabBar::selectionBehaviorOnRemove() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool tabCloseActivatePrevious() const;		KDE_DEPRECATED bool tabCloseActivatePrevious() const;
			#endif
	/**		/**
	* Selects the tab which has a tab header at		* Selects the tab which has a tab header at
	* given @param position.		* given @param position.
	*		*
	* @param position the coordinates of the tab		* @param position the coordinates of the tab
	*/		*/
	int selectTab( const QPoint &position ) const;		int selectTab( const QPoint &position ) const;
	Q_SIGNALS:		Q_SIGNALS:
	skipping to change at line 153		skipping to change at line 173
	* A right mouse button click was performed over the tab with the @para m index.		* A right mouse button click was performed over the tab with the @para m index.
	* The signal is emitted on the press of the mouse button.		* The signal is emitted on the press of the mouse button.
	*/		*/
	void contextMenu( int index, const QPoint& globalPos );		void contextMenu( int index, const QPoint& globalPos );
	/**		/**
	* A right mouse button click was performed over the empty area on the tab bar.		* A right mouse button click was performed over the empty area on the tab bar.
	* The signal is emitted on the press of the mouse button.		* The signal is emitted on the press of the mouse button.
	*/		*/
	void emptyAreaContextMenu( const QPoint& globalPos );		void emptyAreaContextMenu( const QPoint& globalPos );
	/** @deprecated use tabDoubleClicked(int) and newTabRequest() instead. */		/** @deprecated use tabDoubleClicked(int) and newTabRequest() instead. */
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void mouseDoubleClick( int );		QT_MOC_COMPAT void mouseDoubleClick( int );
			#endif
	/**		/**
	* A double left mouse button click was performed over the tab with the @param index.		* A double left mouse button click was performed over the tab with the @param index.
	* The signal is emitted on the second press of the mouse button, befor e the release.		* The signal is emitted on the second press of the mouse button, befor e the release.
	*/		*/
	void tabDoubleClicked( int index );		void tabDoubleClicked( int index );
	/**		/**
	* A double left mouse button click was performed over the empty area o n the tab bar.		* A double left mouse button click was performed over the empty area o n the tab bar.
	* The signal is emitted on the second press of the mouse button, befor e the release.		* The signal is emitted on the second press of the mouse button, befor e the release.
	*/		*/
	void newTabRequest();		void newTabRequest();
	skipping to change at line 178		skipping to change at line 200
	void mouseMiddleClick( int index );		void mouseMiddleClick( int index );
	void initiateDrag( int );		void initiateDrag( int );
	void testCanDecode( const QDragMoveEvent*, bool& );		void testCanDecode( const QDragMoveEvent*, bool& );
	void receivedDropEvent( int, QDropEvent* );		void receivedDropEvent( int, QDropEvent* );
	/**		/**
	* Used internally by KTabBar's/KTabWidget's middle-click tab moving me chanism.		* Used internally by KTabBar's/KTabWidget's middle-click tab moving me chanism.
	* Tells the KTabWidget which owns the KTabBar to move a tab.		* Tells the KTabWidget which owns the KTabBar to move a tab.
	*/		*/
	void moveTab( int, int );		void moveTab( int, int );
	/** @deprecated Use QTabBar::tabCloseRequested(int) instead. */		/** @deprecated Use QTabBar::tabCloseRequested(int) instead. */
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void closeRequest( int );		QT_MOC_COMPAT void closeRequest( int );
			#endif
	#ifndef QT_NO_WHEELEVENT		#ifndef QT_NO_WHEELEVENT
	void wheelDelta( int );		void wheelDelta( int );
	#endif		#endif
	protected:		protected:
	virtual void mouseDoubleClickEvent( QMouseEvent *event );		virtual void mouseDoubleClickEvent( QMouseEvent *event );
	virtual void mousePressEvent( QMouseEvent *event );		virtual void mousePressEvent( QMouseEvent *event );
	virtual void mouseMoveEvent( QMouseEvent *event );		virtual void mouseMoveEvent( QMouseEvent *event );
	virtual void mouseReleaseEvent( QMouseEvent *event );		virtual void mouseReleaseEvent( QMouseEvent *event );
	#ifndef QT_NO_WHEELEVENT		#ifndef QT_NO_WHEELEVENT
	skipping to change at line 202		skipping to change at line 226
	virtual void dragEnterEvent( QDragEnterEvent *event );		virtual void dragEnterEvent( QDragEnterEvent *event );
	virtual void dragMoveEvent( QDragMoveEvent *event );		virtual void dragMoveEvent( QDragMoveEvent *event );
	virtual void dropEvent( QDropEvent *event );		virtual void dropEvent( QDropEvent *event );
	virtual void paintEvent( QPaintEvent *event );		virtual void paintEvent( QPaintEvent *event );
	virtual void leaveEvent( QEvent *event );		virtual void leaveEvent( QEvent *event );
	virtual QSize tabSizeHint( int index ) const;		virtual QSize tabSizeHint( int index ) const;
	protected Q_SLOTS:		protected Q_SLOTS:
	/** @deprecated */		/** @deprecated */
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void closeButtonClicked();		QT_MOC_COMPAT void closeButtonClicked();
			#endif
	/** @deprecated */		/** @deprecated */
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void enableCloseButton();		QT_MOC_COMPAT void enableCloseButton();
			#endif
	virtual void activateDragSwitchTab();		virtual void activateDragSwitchTab();
	protected:		protected:
	virtual void tabLayoutChange();		virtual void tabLayoutChange();
	private:		private:
	QPoint closeButtonPos( int tabIndex ) const;		QPoint closeButtonPos( int tabIndex ) const;
	QRect closeButtonRect( int tabIndex ) const;		QRect closeButtonRect( int tabIndex ) const;
	private:		private:
End of changes. 28 change blocks.
	0 lines changed or deleted		28 lines changed or added

	ktabwidget.h		ktabwidget.h
	skipping to change at line 47		skipping to change at line 47
	*		*
	* It is recommended to use KTabWidget instead of QTabWidget unless you hav e a good reason not to.		* It is recommended to use KTabWidget instead of QTabWidget unless you hav e a good reason not to.
	*		*
	* See also the QTabWidget documentation.		* See also the QTabWidget documentation.
	*		*
	* \image html ktabwidget.png "KDE Tab Widget"		* \image html ktabwidget.png "KDE Tab Widget"
	*/		*/
	class KDEUI_EXPORT KTabWidget : public QTabWidget //krazy:exclude=qclasses		class KDEUI_EXPORT KTabWidget : public QTabWidget //krazy:exclude=qclasses
	{		{
	Q_OBJECT		Q_OBJECT
			#ifndef KDE_NO_DEPRECATED
	Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )		Q_PROPERTY( bool tabReorderingEnabled READ isTabReorderingEnabled WRITE setTabReorderingEnabled )
	Q_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverC loseButton )		Q_PROPERTY( bool hoverCloseButton READ hoverCloseButton WRITE setHoverC loseButton )
	Q_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed W RITE setHoverCloseButtonDelayed )		Q_PROPERTY( bool hoverCloseButtonDelayed READ hoverCloseButtonDelayed W RITE setHoverCloseButtonDelayed )
	Q_PROPERTY( bool closeButtonEnabled READ isCloseButtonEnabled WRITE set CloseButtonEnabled )		Q_PROPERTY( bool closeButtonEnabled READ isCloseButtonEnabled WRITE set CloseButtonEnabled )
	Q_PROPERTY( bool tabCloseActivatePrevious READ tabCloseActivatePrevious WRITE setTabCloseActivatePrevious )		Q_PROPERTY( bool tabCloseActivatePrevious READ tabCloseActivatePrevious WRITE setTabCloseActivatePrevious )
			#endif
	Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE set AutomaticResizeTabs )		Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE set AutomaticResizeTabs )
	public:		public:
	/**		/**
	* Creates a new tab widget.		* Creates a new tab widget.
	*		*
	* @param parent The parent widgets.		* @param parent The parent widgets.
	* @param flags The Qt window flags @see QWidget.		* @param flags The Qt window flags @see QWidget.
	*/		*/
	skipping to change at line 95		skipping to change at line 97
	* @deprecated Use QTabWidget::isMovable() instead.		* @deprecated Use QTabWidget::isMovable() instead.
	*/		*/
	bool isTabReorderingEnabled() const;		bool isTabReorderingEnabled() const;
	/**		/**
	* Returns true if the close button is shown on tabs		* Returns true if the close button is shown on tabs
	* when mouse is hovering over them.		* when mouse is hovering over them.
	*		*
	* @deprecated Use QTabWidget::tabsClosable() instead.		* @deprecated Use QTabWidget::tabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool hoverCloseButton() const;		KDE_DEPRECATED bool hoverCloseButton() const;
			#endif
	/**		/**
	* Returns true if the close button is shown on tabs		* Returns true if the close button is shown on tabs
	* after a delay.		* after a delay.
	*		*
	* @deprecated Use QTabWidget::setTabsClosable() instead.		* @deprecated Use QTabWidget::setTabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool hoverCloseButtonDelayed() const;		KDE_DEPRECATED bool hoverCloseButtonDelayed() const;
			#endif
	/**		/**
	* Returns true if the close button is shown on tabs.		* Returns true if the close button is shown on tabs.
	*		*
	* @since 4.1		* @since 4.1
	*		*
	* @deprecated Use QTabWidget::tabsClosable() instead.		* @deprecated Use QTabWidget::tabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool isCloseButtonEnabled() const;		KDE_DEPRECATED bool isCloseButtonEnabled() const;
			#endif
	/**		/**
	* Returns true if closing the current tab activates the previous		* Returns true if closing the current tab activates the previous
	* actice tab instead of the one to the right.		* actice tab instead of the one to the right.
	*		*
	* @deprecated Use tabBar()->selectionBehaviorOnRemove() instead.		* @deprecated Use tabBar()->selectionBehaviorOnRemove() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool tabCloseActivatePrevious() const;		KDE_DEPRECATED bool tabCloseActivatePrevious() const;
			#endif
	/**		/**
	* Returns true if calling setTitle() will resize tabs		* Returns true if calling setTitle() will resize tabs
	* to the width of the tab bar.		* to the width of the tab bar.
	*/		*/
	bool automaticResizeTabs() const;		bool automaticResizeTabs() const;
	/**		/**
	* If \a hide is true, the tabbar is hidden along with any corner		* If \a hide is true, the tabbar is hidden along with any corner
	* widgets.		* widgets.
	skipping to change at line 165		skipping to change at line 175
	/**		/**
	* Reimplemented for internal reasons.		* Reimplemented for internal reasons.
	*/		*/
	QString tabText( int ) const; // but it's not virtual...		QString tabText( int ) const; // but it's not virtual...
	#ifdef KDE3_SUPPORT		#ifdef KDE3_SUPPORT
	/**		/**
	* @deprecated use tabText		* @deprecated use tabText
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	inline KDE_DEPRECATED QString label( int index ) const { return tabText ( index ); }		inline KDE_DEPRECATED QString label( int index ) const { return tabText ( index ); }
			#endif
	/**		/**
	* @deprecated use tabText		* @deprecated use tabText
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	inline KDE_DEPRECATED QString tabLabel( QWidget *w ) const { return tab Text( indexOf( w ) ); }		inline KDE_DEPRECATED QString tabLabel( QWidget *w ) const { return tab Text( indexOf( w ) ); }
			#endif
	/**		/**
	* @deprecated use setTabText		* @deprecated use setTabText
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	inline KDE_DEPRECATED void setTabLabel( QWidget *w, const QString &l ) { setTabText( indexOf( w ),l ); }		inline KDE_DEPRECATED void setTabLabel( QWidget *w, const QString &l ) { setTabText( indexOf( w ),l ); }
	#endif		#endif
			#endif
	/**		/**
	* Reimplemented for internal reasons.		* Reimplemented for internal reasons.
	*/		*/
	void setTabText( int , const QString & );		void setTabText( int , const QString & );
			using QTabWidget::tabBar;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Move a widget's tab from first to second specified index and emit		* Move a widget's tab from first to second specified index and emit
	* signal movedTab( int, int ) afterwards.		* signal movedTab( int, int ) afterwards.
	*/		*/
	virtual void moveTab( int, int );		virtual void moveTab( int, int );
	/**		/**
	* Removes the widget, reimplemented for		* Removes the widget, reimplemented for
	* internal reasons (keeping labels in sync).		* internal reasons (keeping labels in sync).
	skipping to change at line 218		skipping to change at line 236
	*		*
	* You can connect to signal movedTab(int, int) which will notify		* You can connect to signal movedTab(int, int) which will notify
	* you from which index to which index a tab has been moved.		* you from which index to which index a tab has been moved.
	*		*
	* @deprecated Use QTabWidget::setMovable() instead.		* @deprecated Use QTabWidget::setMovable() instead.
	*		*
	* Note, however, that QTabWidget::setMovable(true) disables		* Note, however, that QTabWidget::setMovable(true) disables
	* dragging tabs out of the KTabBar (e.g., dragging the tab		* dragging tabs out of the KTabBar (e.g., dragging the tab
	* URL from Konqueror to another application)!		* URL from Konqueror to another application)!
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void setTabReorderingEnabled( bool enable );		QT_MOC_COMPAT void setTabReorderingEnabled( bool enable );
			#endif
	/**		/**
	* If \a enable is true, a close button will be shown on mouse hover		* If \a enable is true, a close button will be shown on mouse hover
	* over tab icons which will emit signal closeRequest( QWidget * )		* over tab icons which will emit signal closeRequest( QWidget * )
	* when pressed.		* when pressed.
	*		*
	* @deprecated Use QTabWidget::setTabsClosable() instead.		* @deprecated Use QTabWidget::setTabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void setHoverCloseButton( bool enable );		QT_MOC_COMPAT void setHoverCloseButton( bool enable );
			#endif
	/**		/**
	* If \a delayed is true, a close button will be shown on mouse hover		* If \a delayed is true, a close button will be shown on mouse hover
	* over tab icons after mouse double click delay else immediately.		* over tab icons after mouse double click delay else immediately.
	*		*
	* @deprecated Use QTabWidget::setTabsClosable() instead.		* @deprecated Use QTabWidget::setTabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void setHoverCloseButtonDelayed( bool delayed );		QT_MOC_COMPAT void setHoverCloseButtonDelayed( bool delayed );
			#endif
	/**		/**
	* If enabled, a close button is available for each tab. The		* If enabled, a close button is available for each tab. The
	* signal KTabWidget::closeRequest() is emitted, if the close button		* signal KTabWidget::closeRequest() is emitted, if the close button
	* has been clicked.		* has been clicked.
	*		*
	* @since 4.1		* @since 4.1
	*		*
	* @deprecated Use QTabWidget::setTabsClosable() instead.		* @deprecated Use QTabWidget::setTabsClosable() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void setCloseButtonEnabled( bool );		QT_MOC_COMPAT void setCloseButtonEnabled( bool );
			#endif
	/**		/**
	* If \a previous is true, closing the current tab activates the		* If \a previous is true, closing the current tab activates the
	* previous active tab instead of the one to the right.		* previous active tab instead of the one to the right.
	*		*
	* @deprecated Use tabBar()->setSelectionBehaviorOnRemove() instead.		* @deprecated Use tabBar()->setSelectionBehaviorOnRemove() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	QT_MOC_COMPAT void setTabCloseActivatePrevious( bool previous );		QT_MOC_COMPAT void setTabCloseActivatePrevious( bool previous );
			#endif
	/**		/**
	* If \a enable is true, tabs will be resized to the width of the tab b ar.		* If \a enable is true, tabs will be resized to the width of the tab b ar.
	*		*
	* Does not work reliably with "QTabWidget* foo=new KTabWidget()" and i f		* Does not work reliably with "QTabWidget* foo=new KTabWidget()" and i f
	* you change tabs via the tabbar or by accessing tabs directly.		* you change tabs via the tabbar or by accessing tabs directly.
	*/		*/
	void setAutomaticResizeTabs( bool enable );		void setAutomaticResizeTabs( bool enable );
	Q_SIGNALS:		Q_SIGNALS:
	skipping to change at line 351		skipping to change at line 379
	#ifndef QT_NO_WHEELEVENT		#ifndef QT_NO_WHEELEVENT
	virtual void wheelEvent( QWheelEvent* );		virtual void wheelEvent( QWheelEvent* );
	#endif		#endif
	virtual void resizeEvent( QResizeEvent* );		virtual void resizeEvent( QResizeEvent* );
	virtual void tabInserted( int );		virtual void tabInserted( int );
	virtual void tabRemoved ( int );		virtual void tabRemoved ( int );
	/**		/**
	* @deprecated This method has no effect and should not be called		* @deprecated This method has no effect and should not be called
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void currentChanged( int );		KDE_DEPRECATED void currentChanged( int );
			#endif
	protected Q_SLOTS:		protected Q_SLOTS:
	virtual void receivedDropEvent( int, QDropEvent* );		virtual void receivedDropEvent( int, QDropEvent* );
	virtual void initiateDrag( int );		virtual void initiateDrag( int );
	virtual void contextMenu( int, const QPoint& );		virtual void contextMenu( int, const QPoint& );
	virtual void mouseDoubleClick( int );		virtual void mouseDoubleClick( int );
	virtual void mouseMiddleClick( int );		virtual void mouseMiddleClick( int );
	virtual void closeRequest( int );		virtual void closeRequest( int );
	#ifndef QT_NO_WHEELEVENT		#ifndef QT_NO_WHEELEVENT
	virtual void wheelDelta( int );		virtual void wheelDelta( int );
End of changes. 29 change blocks.
	0 lines changed or deleted		30 lines changed or added

	ktcpsocket.h		ktcpsocket.h
	skipping to change at line 261		skipping to change at line 261
	//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;
			#ifndef QT_NO_NETWORKPROXY
	/**		/**
	* @see: connectToHost()		* @see: connectToHost()
	*/		*/
	QNetworkProxy proxy() const;		QNetworkProxy proxy() const;
			#endif
	qint64 readBufferSize() const; //probably hard to implement correctly		qint64 readBufferSize() const; //probably hard to implement correctly
			#ifndef QT_NO_NETWORKPROXY
	/**		/**
	* @see: connectToHost()		* @see: connectToHost()
	*/		*/
	void setProxy(const QNetworkProxy &proxy); //people actually seem to ne ed it		void setProxy(const QNetworkProxy &proxy); //people actually seem to ne ed it
			#endif
	void setReadBufferSize(qint64 size);		void setReadBufferSize(qint64 size);
	State state() const;		State state() const;
	bool waitForConnected(int msecs = 30000);		bool waitForConnected(int msecs = 30000);
	bool waitForDisconnected(int msecs = 30000);		bool waitForDisconnected(int msecs = 30000);
	//from QSslSocket		//from QSslSocket
	void addCaCertificate(const QSslCertificate &certificate);		void addCaCertificate(const QSslCertificate &certificate);
	// bool addCaCertificates(const QString &path, QSsl::EncodingFormat form at = QSsl::Pem,		// bool addCaCertificates(const QString &path, QSsl::EncodingFormat form at = QSsl::Pem,
	// QRegExp::PatternSyntax syntax = QRegExp::Fixed String);		// QRegExp::PatternSyntax syntax = QRegExp::Fixed String);
	void addCaCertificates(const QList<QSslCertificate> &certificates);		void addCaCertificates(const QList<QSslCertificate> &certificates);
	skipping to change at line 330		skipping to change at line 334
	* @since 4.5.0		* @since 4.5.0
	*/		*/
	void setSocketOption(QAbstractSocket::SocketOption options, const QVari ant &value);		void setSocketOption(QAbstractSocket::SocketOption options, const QVari ant &value);
	Q_SIGNALS:		Q_SIGNALS:
	//from QAbstractSocket		//from QAbstractSocket
	void connected();		void connected();
	void disconnected();		void disconnected();
	void error(KTcpSocket::Error);		void error(KTcpSocket::Error);
	void hostFound();		void hostFound();
			#ifndef QT_NO_NETWORKPROXY
	void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthentic ator *authenticator);		void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthentic ator *authenticator);
			#endif
	// only for raw socket state, SSL is separate		// only for raw socket state, SSL is separate
	void stateChanged(KTcpSocket::State);		void stateChanged(KTcpSocket::State);
	//from QSslSocket		//from QSslSocket
	void encrypted();		void encrypted();
	void encryptionModeChanged(EncryptionMode);		void encryptionModeChanged(EncryptionMode);
	void sslErrors(const QList<KSslError> &errors);		void sslErrors(const QList<KSslError> &errors);
	public Q_SLOTS:		public Q_SLOTS:
	void ignoreSslErrors();		void ignoreSslErrors();
End of changes. 6 change blocks.
	0 lines changed or deleted		6 lines changed or added

	ktempdir.h		ktempdir.h
	skipping to change at line 138		skipping to change at line 138
	* Remove recursively a directory, even if it is not empty		* Remove recursively a directory, even if it is not empty
	* or contains other directories.		* or contains other directories.
	*		*
	* However the function works too when the @p path given		* However the function works too when the @p path given
	* is a non-directory file. In that case it simply remove that file.		* is a non-directory file. In that case it simply remove that file.
	*		*
	* The function stops on the first error.		* The function stops on the first error.
	*		*
	* @note This function is more meant for removing a directory		* @note This function is more meant for removing a directory
	* not created by the user. For user-created directories,		* not created by the user. For user-created directories,
	* using KIO::NetAccess::del is recommended instead,		* using KIO::del() is recommended instead,
	* especially as it has user feedback for long operations.		* especially as it has user feedback for long operations.
	*		*
	* @param path Path of the directory to delete		* @param path Path of the directory to delete
	* @return true if successful, otherwise false		* @return true if successful, otherwise false
	* (Use errno for more details about the error.)		* (Use errno for more details about the error.)
	* @todo decide how and where this function should be defined in KDE4		* @todo decide how and where this function should be defined in KDE5
	*/		*/
	static bool removeDir( const QString& path );		static bool removeDir( const QString& path );
	protected:		protected:
	/**		/**
	* Creates a "random" directory with specified mode		* Creates a "random" directory with specified mode
	* @param directoryPrefix to use when creating temp directory		* @param directoryPrefix to use when creating temp directory
	* (the rest is generated randomly)		* (the rest is generated randomly)
	* @param mode directory permissions		* @param mode directory permissions
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	ktextedit.h		ktextedit.h
	skipping to change at line 90		skipping to change at line 90
	*		*
	* \image html ktextedit.png "KDE Text Edit Widget"		* \image html ktextedit.png "KDE Text Edit Widget"
	*		*
	* @see QTextEdit		* @see QTextEdit
	* @author Carsten Pfeiffer <pfeiffer@kde.org>		* @author Carsten Pfeiffer <pfeiffer@kde.org>
	*/		*/
	class KDEUI_EXPORT KTextEdit : public QTextEdit //krazy:exclude=qclasses		class KDEUI_EXPORT KTextEdit : public QTextEdit //krazy:exclude=qclasses
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QString clickMessage READ clickMessage WRITE setClickMessag e )		Q_PROPERTY( QString clickMessage READ clickMessage WRITE setClickMessag e )
			Q_PROPERTY( bool checkSpellingEnabled READ checkSpellingEnabled WRITE s
			etCheckSpellingEnabled )
			Q_PROPERTY( QString spellCheckingLanguage READ spellCheckingLanguage WR
			ITE setSpellCheckingLanguage )
	public:		public:
	/**		/**
	* Constructs a KTextEdit object. See QTextEdit::QTextEdit		* Constructs a KTextEdit object. See QTextEdit::QTextEdit
	* for details.		* for details.
	*/		*/
	explicit KTextEdit( const QString& text, QWidget *parent = 0 );		explicit KTextEdit( const QString& text, QWidget *parent = 0 );
	/**		/**
	* Constructs a KTextEdit object. See QTextEdit::QTextEdit		* Constructs a KTextEdit object. See QTextEdit::QTextEdit
End of changes. 1 change blocks.
	0 lines changed or deleted		4 lines changed or added

	ktexteditor_export.h		ktexteditor_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KTEXTEDITOR_EXPORT_H		#ifndef KTEXTEDITOR_EXPORT_H
	#define KTEXTEDITOR_EXPORT_H		#define KTEXTEDITOR_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KTEXTEDITOR_EXPORT		#ifndef KTEXTEDITOR_EXPORT
	# if defined(MAKE_KTEXTEDITOR_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KTEXTEDITOR_EXPORT
			# elif defined(MAKE_KTEXTEDITOR_LIB)
	/* We are building this library */		/* We are building this library */
	# define KTEXTEDITOR_EXPORT KDE_EXPORT		# define KTEXTEDITOR_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KTEXTEDITOR_EXPORT KDE_IMPORT		# define KTEXTEDITOR_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KTEXTEDITOR_EXPORT_DEPRECATED		# ifndef KTEXTEDITOR_EXPORT_DEPRECATED
	# define KTEXTEDITOR_EXPORT_DEPRECATED KDE_DEPRECATED KTEXTEDITOR_EXPORT		# define KTEXTEDITOR_EXPORT_DEPRECATED KDE_DEPRECATED KTEXTEDITOR_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	ktoolbar.h		ktoolbar.h
	skipping to change at line 136		skipping to change at line 136
	* @return the default size for this type of toolbar.		* @return the default size for this type of toolbar.
	*/		*/
	int iconSizeDefault() const; // KDE5: hide from public API. Doesn't mak e sense to export this, and it isn't used.		int iconSizeDefault() const; // KDE5: hide from public API. Doesn't mak e sense to export this, and it isn't used.
	/**		/**
	* This allows you to enable or disable the context menu.		* This allows you to enable or disable the context menu.
	*		*
	* @param enable If false, then the context menu will be disabled		* @param enable If false, then the context menu will be disabled
	* @deprecated use setContextMenuPolicy		* @deprecated use setContextMenuPolicy
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setContextMenuEnabled( bool enable = true );		KDE_DEPRECATED void setContextMenuEnabled( bool enable = true );
			#endif
	/**		/**
	* Returns the context menu enabled flag		* Returns the context menu enabled flag
	* @return true if the context menu is disabled		* @return true if the context menu is disabled
	* @deprecated use contextMenuPolicy		* @deprecated use contextMenuPolicy
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool contextMenuEnabled() const;		KDE_DEPRECATED bool contextMenuEnabled() const;
			#endif
	/**		/**
	* Save the toolbar settings to group @p configGroup in @p config.		* Save the toolbar settings to group @p configGroup in @p config.
	*/		*/
	void saveSettings( KConfigGroup &cg );		void saveSettings( KConfigGroup &cg );
	/**		/**
	* Read the toolbar settings from group @p configGroup in @p config		* Read the toolbar settings from group @p configGroup in @p config
	* and apply them.		* and apply them.
	*		*
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	ktoolbarpopupaction.h		ktoolbarpopupaction.h
	skipping to change at line 79		skipping to change at line 79
	*/		*/
	virtual ~KToolBarPopupAction();		virtual ~KToolBarPopupAction();
	/**		/**
	* The popup menu that is shown when clicking (some time) on the toolba r		* The popup menu that is shown when clicking (some time) on the toolba r
	* button. You may want to plug items into it on creation, or connect t o		* button. You may want to plug items into it on creation, or connect t o
	* aboutToShow for a more dynamic menu.		* aboutToShow for a more dynamic menu.
	*		*
	* \deprecated use menu() instead		* \deprecated use menu() instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED KMenu *popupMenu() const;		KDE_DEPRECATED KMenu *popupMenu() const;
			#endif
	/**		/**
	* Returns true if this action creates a delayed popup menu		* Returns true if this action creates a delayed popup menu
	* when plugged in a KToolBar.		* when plugged in a KToolBar.
	*/		*/
	bool delayed() const;		bool delayed() const;
	/**		/**
	* If set to true, this action will create a delayed popup menu		* If set to true, this action will create a delayed popup menu
	* when plugged in a KToolBar. Otherwise it creates a normal popup.		* when plugged in a KToolBar. Otherwise it creates a normal popup.
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	ktoolinvocation.h		ktoolinvocation.h
	skipping to change at line 181		skipping to change at line 181
	static void invokeTerminal(const QString &command,		static void invokeTerminal(const QString &command,
	const QString& workdir = QString(),		const QString& workdir = QString(),
	const QByteArray &startup_id = "");		const QByteArray &startup_id = "");
	public:		public:
	/**		/**
	* Returns the D-Bus interface of the service launcher.		* Returns the D-Bus interface of the service launcher.
	* The returned object is owned by KApplication, do not delete it!		* The returned object is owned by KApplication, do not delete it!
	*/		*/
	static OrgKdeKLauncherInterface *klauncher();		static OrgKdeKLauncherInterface *klauncher();
			// KDE5: remove this from the public API. Make it kdelibs-private, and pr
			ovide
			// replacements for setLaunchEnv and for "making sure kdeinit/klauncher i
			s running".
			// (We could do the last two without waiting, of course).
	/**		/**
	* Starts a service based on the (translated) name of the service.		* Starts a service based on the (translated) name of the service.
	* E.g. "Web Browser"		* E.g. "Web Browser"
	*		*
	* @param _name the name of the service		* @param _name the name of the service
	* @param URL if not empty this URL is passed to the service		* @param URL if not empty this URL is passed to the service
	* @param error On failure, error contains a description of the error		* @param error On failure, error contains a description of the error
	* that occurred. If the pointer is 0, the argument will be		* that occurred. If the pointer is 0, the argument will be
	* ignored		* ignored
	skipping to change at line 203		skipping to change at line 206
	* not provide DCOP services. If the pointer is 0 the argument		* not provide DCOP services. If the pointer is 0 the argument
	* will be ignored		* will be ignored
	* @param pid On success, the process id of the new service will be writt en		* @param pid On success, the process id of the new service will be writt en
	* here. If the pointer is 0, the argument will be ignored.		* here. If the pointer is 0, the argument will be ignored.
	* @param startup_id for app startup notification, "0" for none,		* @param startup_id for app startup notification, "0" for none,
	* "" ( empty string ) is the default		* "" ( empty string ) is the default
	* @param noWait if set, the function does not wait till the service is r unning.		* @param noWait if set, the function does not wait till the service is r unning.
	* @return an error code indicating success (== 0) or failure (> 0).		* @return an error code indicating success (== 0) or failure (> 0).
	* @deprecated Use startServiceByDesktopName or startServiceByDesktopPath		* @deprecated Use startServiceByDesktopName or startServiceByDesktopPath
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static int startServiceByName( const QString& _name, const QString &URL,		KDE_DEPRECATED static int startServiceByName( const QString& _name, const QString &URL,
	QString *error=0, QString * serviceName=0, int *pid=0,		QString *error=0, QString * serviceName=0, int *pid=0,
	const QByteArray &startup_i d = QByteArray(), bool noWait = false );		const QByteArray &startup_i d = QByteArray(), bool noWait = false );
			#endif
	/**		/**
	* Starts a service based on the (translated) name of the service.		* Starts a service based on the (translated) name of the service.
	* E.g. "Web Browser"		* E.g. "Web Browser"
	*		*
	* @param _name the name of the service		* @param _name the name of the service
	* @param URLs if not empty these URLs will be passed to the service		* @param URLs if not empty these URLs will be passed to the service
	* @param error On failure, @p error contains a description of the error		* @param error On failure, @p error contains a description of the error
	* that occurred. If the pointer is 0, the argument will be		* that occurred. If the pointer is 0, the argument will be
	* ignored		* ignored
	skipping to change at line 228		skipping to change at line 233
	* not provide DCOP services. If the pointer is 0 the argument		* not provide DCOP services. If the pointer is 0 the argument
	* will be ignored		* will be ignored
	* @param pid On success, the process id of the new service will be writt en		* @param pid On success, the process id of the new service will be writt en
	* here. If the pointer is 0, the argument will be ignored.		* here. If the pointer is 0, the argument will be ignored.
	* @param startup_id for app startup notification, "0" for none,		* @param startup_id for app startup notification, "0" for none,
	* "" ( empty string ) is the default		* "" ( empty string ) is the default
	* @param noWait if set, the function does not wait till the service is r unning.		* @param noWait if set, the function does not wait till the service is r unning.
	* @return an error code indicating success (== 0) or failure (> 0).		* @return an error code indicating success (== 0) or failure (> 0).
	* @deprecated Use startServiceByDesktopName or startServiceByDesktopPath		* @deprecated Use startServiceByDesktopName or startServiceByDesktopPath
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static int startServiceByName( const QString& _name, const QStringList &URLs=QStringList(),		KDE_DEPRECATED static int startServiceByName( const QString& _name, const QStringList &URLs=QStringList(),
	QString *error=0, QString * serviceName=0, int *pid=0,		QString *error=0, QString * serviceName=0, int *pid=0,
	const QByteArray &startup_i d = QByteArray(), bool noWait = false );		const QByteArray &startup_i d = QByteArray(), bool noWait = false );
			#endif
	/**		/**
	* Starts a service based on the desktop path of the service.		* Starts a service based on the desktop path of the service.
	* E.g. "Applications/konqueror.desktop" or "/home/user/bla/myfile.deskto p"		* E.g. "Applications/konqueror.desktop" or "/home/user/bla/myfile.deskto p"
	*		*
	* @param _name the path of the desktop file		* @param _name the path of the desktop file
	* @param URL if not empty this URL is passed to the service		* @param URL if not empty this URL is passed to the service
	* @param error On failure, @p error contains a description of the error		* @param error On failure, @p error contains a description of the error
	* that occurred. If the pointer is 0, the argument will be		* that occurred. If the pointer is 0, the argument will be
	* ignored		* ignored
End of changes. 5 change blocks.
	0 lines changed or deleted		9 lines changed or added

	ktypelist.h		ktypelist.h
	skipping to change at line 603		skipping to change at line 603
	>::Result TailResult;		>::Result TailResult;
	public:		public:
	/**		/**
	* The resulting KTypeList calculated by this compile-time		* The resulting KTypeList calculated by this compile-time
	* algorithm.		* algorithm.
	*/		*/
	typedef KTypeList<T1, TailResult> Result;		typedef KTypeList<T1, TailResult> Result;
	};		};
			template<
			typename T2 , typename T3 ,
			typename T4 , typename T5 , typename T6 ,
			typename T7 , typename T8 , typename T9 ,
			typename T10, typename T11, typename T12,
			typename T13, typename T14, typename T15,
			typename T16, typename T17, typename T18
			>
			struct KMakeTypeList<KDE::NullType, T2, T3, T4, T5, T6, T7, T8, T9, T10, T1
			1, T12, T13, T14, T15, T16, T17, T18>
			{
			typedef KDE::NullType Result;
			};
	template<>		template<>
	struct KMakeTypeList<>		struct KMakeTypeList<>
	{		{
	typedef KDE::NullType Result;		typedef KDE::NullType Result;
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		14 lines changed or added

	ktypelistutils.h		ktypelistutils.h
	/* This file is part of the KDE libraries		/* This file is part of the KDE libraries
	Copyright (C) 2009 Jonathan Schmidt-Dominé <devel@the-user.org>		Copyright (C) 2009 Jonathan Schmidt-Dominé <devel@the-user.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU 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,
			or - at your option - any later version.
	This library is distributed in the hope that it will be useful,		This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of		but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	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.
	skipping to change at line 356		skipping to change at line 357
	typename KTypeListSort<		typename KTypeListSort<
	typename KTypeListAfterPivot<		typename KTypeListAfterPivot<
	typename List::Tail,		typename List::Tail,
	typename List::Head,		typename List::Head,
	Comparator>::Result,		Comparator>::Result,
	Comparator>::Result		Comparator>::Result
	>		>
	>::Result Result;		>::Result Result;
	};		};
			template<template<typename A, typename B> class Comparator>
			struct KTypeListSort<KDE::NullType, Comparator>
			{
			typedef KDE::NullType Result;
			};
	#undef NC		#undef NC
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		8 lines changed or added

	kunitconversion_export.h		kunitconversion_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KUNITCONVERSION_EXPORT_H		#ifndef KUNITCONVERSION_EXPORT_H
	#define KUNITCONVERSION_EXPORT_H		#define KUNITCONVERSION_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KUNITCONVERSION_EXPORT		#ifndef KUNITCONVERSION_EXPORT
	# if defined(MAKE_KUNITCONVERSION_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KUNITCONVERSION_EXPORT
			# elif defined(MAKE_KUNITCONVERSION_LIB)
	/* We are building this library */		/* We are building this library */
	# define KUNITCONVERSION_EXPORT KDE_EXPORT		# define KUNITCONVERSION_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KUNITCONVERSION_EXPORT KDE_IMPORT		# define KUNITCONVERSION_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KUNITCONVERSION_EXPORT_DEPRECATED		# ifndef KUNITCONVERSION_EXPORT_DEPRECATED
	# define KUNITCONVERSION_EXPORT_DEPRECATED KDE_DEPRECATED KUNITCONVERSION_ EXPORT		# define KUNITCONVERSION_EXPORT_DEPRECATED KDE_DEPRECATED KUNITCONVERSION_ EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kunittest_export.h		kunittest_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef KUNITTEST_EXPORT_H		#ifndef KUNITTEST_EXPORT_H
	#define KUNITTEST_EXPORT_H		#define KUNITTEST_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef KUNITTEST_EXPORT		#ifndef KUNITTEST_EXPORT
	# if defined(MAKE_KUNITTEST_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define KUNITTEST_EXPORT
			# elif defined(MAKE_KUNITTEST_LIB)
	/* We are building this library */		/* We are building this library */
	# define KUNITTEST_EXPORT KDE_EXPORT		# define KUNITTEST_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define KUNITTEST_EXPORT KDE_IMPORT		# define KUNITTEST_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef KUNITTEST_EXPORT_DEPRECATED		# ifndef KUNITTEST_EXPORT_DEPRECATED
	# define KUNITTEST_EXPORT_DEPRECATED KDE_DEPRECATED KUNITTEST_EXPORT		# define KUNITTEST_EXPORT_DEPRECATED KDE_DEPRECATED KUNITTEST_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	kurifilter.h		kurifilter.h
	skipping to change at line 40		skipping to change at line 40
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QHash>		#include <QtCore/QHash>
	#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 KUriFilterDataPrivate;		class KUriFilterDataPrivate;
	class KCModule;		class KCModule;
	/**		/**
	* A basic message object used for exchanging filtering information between		* Class that holds information about a search provider.
	the		*
	* filter plugins and the application requesting the filtering service.		* @since 4.6
			*/
			class KIO_EXPORT KUriFilterSearchProvider
			{
			public:
			/**
			* Default constructor.
			*/
			KUriFilterSearchProvider();
			/**
			* Copy constructor.
			*/
			KUriFilterSearchProvider(const KUriFilterSearchProvider&);
			/**
			* Destructor.
			*/
			virtual ~KUriFilterSearchProvider();
			/**
			* Returns the desktop filename of the search provider without any exte
			nsion.
			*
			* For example, if the desktop filename of the search provider was
			* "foobar.desktop", this function will return "foobar".
			*/
			QString desktopEntryName() const;
			/**
			* Returns the descriptive name of the search provider, e.g. "Google Ne
			ws".
			*
			* This name comes from the "Name=" property entry in the desktop file
			that
			* contains the search provider's information.
			*/
			QString name() const;
			/**
			* Returns the icon name associated with the search provider when avail
			able.
			*/
			QString iconName() const;
			/**
			* Returns all the web shortcut keys associated with this search provid
			er.
			*
			* @see defaultKey
			*/
			QStringList keys() const;
			/**
			* Returns the default web shortcut key for this search provider.
			*
			* Right now this is the same as doing keys().first(), it might however
			* change based on what the backend plugins do.
			*
			* @see keys
			*/
			QString defaultKey() const;
			/**
			* Assignment operator.
			*/
			KUriFilterSearchProvider& operator=(const KUriFilterSearchProvider&);
			protected:
			void setDesktopEntryName(const QString&);
			void setIconName(const QString&);
			void setKeys(const QStringList&);
			void setName(const QString&);
			private:
			friend class KUriFilterPlugin;
			class KUriFilterSearchProviderPrivate;
			KUriFilterSearchProviderPrivate * const d;
			};
			/**
			* This class is a basic messaging class used to exchange filtering informat
			ion
			* between the filter plugins and the application requesting the filtering
			* service.
	*		*
	* Use this object if you require a more detailed information about the URI you		* Use this object if you require a more detailed information about the URI you
	* want to filter. Any application can create an instance of this class and send		* want to filter. Any application can create an instance of this class and send
	* it to KUriFilter to have the plugins fill out all possible information ab out		* it to KUriFilter to have the plugins fill out all possible information ab out
	* the URI.		* the URI.
	*		*
	* The member functions provided by this class are thread safe and reentrant		* On successful filtering you can use @ref uriType() to determine what type
	. However,		* of resource the request was filtered into. See @ref KUriFilter::UriTypes
	* since the class itself is a Singleton, you have to take care when calling		for
	@ref self()		* details. If an error is encountered, then @ref KUriFilter::Error is retur
	* in multi-threaded applications. It is highly adviced that you hold a memb		ned.
	er variable		* You can use @ref errorMsg to obtain the error information.
			*
			* The functions in this class are not reentrant.
	*		*
	* \b Example		* \b Example
	*		*
			* Here is a basic example of how this class is used with @ref KUriFilter:
	* \code		* \code
	* QString text = "kde.org";		* KUriFilterData filterData (QLatin1String("kde.org"));
	* KUriFilterData d = text;		* bool filtered = KUriFilter::self()->filterUri(filterData);
	* bool filtered = KUriFilter::self()->filter( d );
	* cout << "URL: " << text.toLatin1() << endl
	* << "Filtered URL: " << d.uri().url().toLatin1() << endl
	* << "URI Type: " << d.uriType() << endl
	* << "Was Filtered: " << filtered << endl;
	* \endcode		* \endcode
	*		*
	* The above code should yield the following output:		* If you are only interested in getting the list of preferred search provid
			ers,
			* then you can do the following (requires KDE >= 4.5):
			*
	* \code		* \code
	* URI: kde.org		* KDE 4.5:
	* Filtered URI: http://kde.org		* KUriFilterData data;
	* URI Type: 0 <== means NET_PROTOCOL		* data.setData("<text-to-search-for>");
	* Was Filtered: 1 <== means the URL was successfully filtered		* data.setAlternateDefaultSearchProvider("google");
			* bool filtered = KUriFilter::self()->filterUri(data, "kuriikwsfilter");
			*
			* KDE >= 4.6:
			* KUriFilterData data;
			* data.setData("<text-to-search-for>");
			* data.setSearchFilteringOption(KUriFilterData::RetrievePreferredSearchProv
			idersOnly);
			* bool filtered = KUriFilter::self()->filterSearchUri(data, KUriFilter::Nor
			malTextFilter);
	* \endcode		* \endcode
	*		*
	* @short A message object for exchanging filtering URI info.		* @short A class for exchanging filtering information.
	* @author Dawit Alemayehu <adawit at kde.org>		* @author Dawit Alemayehu <adawit at kde.org>
	*/		*/
	class KIO_EXPORT KUriFilterData		class KIO_EXPORT KUriFilterData
	{		{
	public:		public:
	/**		/**
	* Describes the type of the URI that was filtered.		* Describes the type of the URI that was filtered.
	* Here is a brief description of the types:		* Here is a brief description of the types:
	*		*
	skipping to change at line 103		skipping to change at line 190
	* @li Shell - A shell executable (ex: echo "Test..." >> ~/testf ile)		* @li Shell - A shell executable (ex: echo "Test..." >> ~/testf ile)
	* @li Blocked - A URI that should be blocked/filtered (ex: ad fil tering)		* @li Blocked - A URI that should be blocked/filtered (ex: ad fil tering)
	* @li Error - An incorrect URI (ex: "~johndoe" when user johndo e		* @li Error - An incorrect URI (ex: "~johndoe" when user johndo e
	* does not exist in that system )		* does not exist in that system )
	* @li Unknown - A URI that is not identified. Default value when		* @li Unknown - A URI that is not identified. Default value when
	* a KUriFilterData is first created.		* a KUriFilterData is first created.
	*/		*/
	enum UriTypes { NetProtocol=0, LocalFile, LocalDir, Executable, Help, S hell, Blocked, Error, Unknown };		enum UriTypes { NetProtocol=0, LocalFile, LocalDir, Executable, Help, S hell, Blocked, Error, Unknown };
	/**		/**
			* This enum describes the search filtering options to be used.
			*
			* @li SearchFilterOptionNone
			* No search filter options are set and normal filtering is perfor
			med
			* on the input data.
			* @li RetrieveSearchProvidersOnly
			* If set, the list of all available search providers are returned
			without
			* any input filtering. This flag only applies when used in conjun
			ction
			* with the @ref KUriFilter::NormalTextFilter flag.
			* @li RetrievePreferredSearchProvidersOnly
			* If set, the list of preferred search providers are returned wit
			hout
			* any input filtering. This flag only applies when used in conjun
			ction
			* with the @ref KUriFilter::NormalTextFilter flag.
			* @li RetrieveAvailableSearchProvidersOnly
			* Same as doing RetrievePreferredSearchProvidersOnly | RetrieveSe
			archProvidersOnly,
			* where all available search providers are returned if no preferr
			ed ones
			* ones are available. No input filtering will be performed.
			*
			* @see setSearchFilteringOptions
			* @see KUriFilter::filterSearchUri
			* @since 4.6
			*/
			enum SearchFilterOption
			{
			SearchFilterOptionNone = 0x0,
			RetrieveSearchProvidersOnly = 0x01,
			RetrievePreferredSearchProvidersOnly = 0x02,
			RetrieveAvailableSearchProvidersOnly = (RetrievePreferredSearchProv
			idersOnly | RetrieveSearchProvidersOnly)
			};
			Q_DECLARE_FLAGS(SearchFilterOptions, SearchFilterOption)
			/**
	* Default constructor.		* Default constructor.
	*		*
	* Creates a UriFilterData object.		* Creates a UriFilterData object.
	*/		*/
	KUriFilterData();		KUriFilterData();
	/**		/**
	* Creates a KUriFilterData object from the given URL.		* Creates a KUriFilterData object from the given URL.
	*		*
	* @param url is the URL to be filtered.		* @param url is the URL to be filtered.
	skipping to change at line 248		skipping to change at line 367
	*		*
	* If @ref typedString was not filtered by a search filter plugin, this		* If @ref typedString was not filtered by a search filter plugin, this
	* function returns an empty string.		* function returns an empty string.
	*		*
	* @see typedString		* @see typedString
	* @since 4.5		* @since 4.5
	*/		*/
	QString searchProvider() const;		QString searchProvider() const;
	/**		/**
	* Returns a list of the names of the preferred search providers.		* Returns a list of the names of preferred or available search provide rs.
	*		*
	* This function returns the list of providers that are marked as favor		* This function returns the list of providers marked as preferred when
	ite		ever
	* or preferred by the user whenever the data it contains is filtered b		* the input data, i.e. @ref typedString, is successfully filtered.
	y the
	* 'kuriikwsfilter' search uri filter plugin.
	*		*
	* If no prior search providers were marked preferred or no default sea		* If no default search provider has been selected prior to a filter re
	rch		quest,
	* engine was selected, then this function will return an empty list un		* this function will return an empty list. To avoid this problem you m
	less		ust
	* you set alternate default or search providers using the appropriate		* either set an alternate default search provider using @ref setAltern
	function.		ateDefaultSearchProvider
	* See @ref setAlternateDefaultSearchProvider and @ref setAlternateSear		* or set one of the @ref SearchFilterOption flags if you are only inte
	chProviders.		rested
			* in getting the list of providers and not filtering the input.
	*		*
	* You can use @ref queryForPreferredServiceProvider to obtain the quer		* Additionally, you can also provide alternate search providers in cas
	ies		e
	* associated with the returned search providers.		* there are no preferred ones already selected.
	*		*
	* @see searchProvider		* You can use @ref queryForPreferredServiceProvider to obtain the quer
	* @see alternateSearchProviders		y
	* @see alternateDefaultSearchProvider		* associated with the list of search providers returned by this functi
			on.
			*
			* @see setAlternateSearchProviders
			* @see setAlternateDefaultSearchProvider
			* @see setSearchFilteringOption
	* @see queryForPreferredServiceProvider		* @see queryForPreferredServiceProvider
	* @since 4.5		* @since 4.5
	*/		*/
	QStringList preferredSearchProviders() const;		QStringList preferredSearchProviders() const;
	/**		/**
	* Returns the query url for the given preferred search provider.		* Returns information about @p provider.
			*
			* You can use this function to obtain the more information about the s
			earch
			* providers returned by @ref preferredSearchProviders.
			*
			* @see preferredSearchProviders
			* @see KUriFilterSearchProvider
			* @since 4.6
			*/
			KUriFilterSearchProvider queryForSearchProvider(const QString& provide
			r) const;
			/**
			* Returns the web shortcut url for the given preferred search provider
			.
	*		*
	* You can use this function to obtain the query for the preferred sear ch		* You can use this function to obtain the query for the preferred sear ch
	* providers returned by @ref preferredSearchProviders. Note that this		* providers returned by @ref preferredSearchProviders.
	* function actually returns a query, e.g. "gg:foo bar", that must be		*
	* processed using the KUriFilter class.		* The query returned by this function is in web shortcut format, i.e.
			* "gg:foo bar", and must be re-filtered through KUriFilter to obtain a
			* valid url.
	*		*
	* @see preferredSearchProviders		* @see preferredSearchProviders
	* @since 4.5		* @since 4.5
	*/		*/
	QString queryForPreferredSearchProvider(const QString &provider) const;		QString queryForPreferredSearchProvider(const QString &provider) const;
	/**		/**
			* Returns all the query urls for the given search provider.
			*
			* Use this function to obtain all the different queries that can be us
			ed
			* for the given provider. For example, if a search engine provider nam
			ed
			* "foobar" has web shortcuts named "foobar", "foo" and "bar", then thi
			s
			* function, unlike @ref queryForPreferredSearchProvider, will return a
			* a query for each and every web shortcut.
			*
			* @see queryForPreferredSearchProvider
			* @since 4.6
			*/
			QStringList allQueriesForSearchProvider(const QString& provider) const;
			/**
	* Returns the icon associated with the given preferred search provider .		* Returns the icon associated with the given preferred search provider .
	*		*
	* You can use this function to obtain the icon names associated with t he		* You can use this function to obtain the icon names associated with t he
	* preferred search providers returned by @ref preferredSearchProviders .		* preferred search providers returned by @ref preferredSearchProviders .
	*		*
	* @see preferredSearchProviders		* @see preferredSearchProviders
	* @since 4.5		* @since 4.5
	*/		*/
	QString iconNameForPreferredSearchProvider(const QString &provider) con st;		QString iconNameForPreferredSearchProvider(const QString &provider) con st;
	skipping to change at line 321		skipping to change at line 471
	* This function returns an empty string if @ref setAlternateDefaultSea rchProvider		* This function returns an empty string if @ref setAlternateDefaultSea rchProvider
	* was not called to set the default search provider to be used when no ne has been		* was not called to set the default search provider to be used when no ne has been
	* chosen by the user through the search configuration module.		* chosen by the user through the search configuration module.
	*		*
	* @see setAlternateDefaultSearchProvider		* @see setAlternateDefaultSearchProvider
	* @since 4.5		* @since 4.5
	*/		*/
	QString alternateDefaultSearchProvider() const;		QString alternateDefaultSearchProvider() const;
	/**		/**
			* Returns the default protocol to use when filtering potentially valid
			url inputs.
			*
			* By default this function will return an empty string.
			*
			* @see setDefaultUrlScheme
			* @since 4.6
			*/
			QString defaultUrlScheme() const;
			/**
			* Returns the specified search filter options.
			*
			* By default this function returns @ref SearchFilterOptionNone.
			*
			* @see setSearchFilteringOptions
			* @since 4.6
			*/
			SearchFilterOptions searchFilteringOptions() const;
			/**
	* The name of the icon that matches the current filtered URL.		* The name of the icon that matches the current filtered URL.
	*		*
	* This function returns a null string by default and when no icon is f ound		* This function returns a null string by default and when no icon is f ound
	* for the filtered URL.		* for the filtered URL.
	*/		*/
	QString iconName();		QString iconName();
	/**		/**
	* Check whether the provided uri is executable or not.		* Check whether the provided uri is executable or not.
	*		*
	skipping to change at line 404		skipping to change at line 574
	* the user. Otherwise, the default provider specified by through funct ion		* the user. Otherwise, the default provider specified by through funct ion
	* will be ignored.		* will be ignored.
	*		*
	* @see alternateDefaultSearchProvider		* @see alternateDefaultSearchProvider
	* @see preferredSearchProviders		* @see preferredSearchProviders
	* @since 4.5		* @since 4.5
	*/		*/
	void setAlternateDefaultSearchProvider(const QString &provider);		void setAlternateDefaultSearchProvider(const QString &provider);
	/**		/**
			* Sets the default scheme used when filtering potentially valid url in
			puts.
			*
			* Use this function to change the default protocol used when filtering
			* potentially valid url inputs. The default protocol is http.
			*
			* If the scheme is specified without a separator, then "://" will be
			used
			* as the separator by default. For example, if the default url scheme
			was
			* simply set to "ftp", then a potentially valid url input such as "kde
			.org"
			* will be filtered to "ftp://kde.org".
			*
			* @see defaultUrlScheme
			* @since 4.6
			*/
			void setDefaultUrlScheme(const QString&);
			/**
			* Sets the options used by search filter plugins to filter requests.
			*
			* The default search filter option is @ref SearchFilterOptionNone. Se
			e
			* @ref SearchFilterOption for the description of the other flags.
			*
			* It is important to note that the options set through this function
			can
			* prevent any filtering from being performed by search filter plugins
			.
			* As such, @ref uriTypes can return KUriFilterData::Unknown and @ref
			uri
			* can return an invalid url eventhough the filtering request returned
			* a successful response.
			*
			* @see searchFilteringOptions
			* @since 4.6
			*/
			void setSearchFilteringOptions(SearchFilterOptions options);
			/**
	* Overloaded assigenment operator.		* Overloaded assigenment operator.
	*		*
	* This function allows you to easily assign a KUrl		* This function allows you to easily assign a KUrl
	* to a KUriFilterData object.		* to a KUriFilterData object.
	*		*
	* @return an instance of a KUriFilterData object.		* @return an instance of a KUriFilterData object.
	*/		*/
	KUriFilterData& operator=( const KUrl& url );		KUriFilterData& operator=( const KUrl& url );
	/**		/**
	skipping to change at line 450		skipping to change at line 653
	class KIO_EXPORT KUriFilterPlugin : public QObject		class KIO_EXPORT KUriFilterPlugin : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* List for holding the following search provider information:		* List for holding the following search provider information:
	* ([search provider name], [search query, search query icon name])		* ([search provider name], [search query, search query icon name])
	*		*
	* @since 4.5		* @since 4.5
			* @deprecated Use @ref KUriFilterSearchProvider instead. See @ref setS earchProviders;
	*/		*/
	typedef QHash<QString, QPair<QString, QString> > ProviderInfoList;		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED typedef QHash<QString, QPair<QString, QString> > Provide
			rInfoList;
			#endif
	/**		/**
	* Constructs a filter plugin with a given name		* Constructs a filter plugin with a given name
	*		*
	* @param parent the parent object, or 0 for no parent		* @param parent the parent object, or 0 for no parent
	* @param name the name of the plugin, mandatory		* @param name the name of the plugin, mandatory
	*/		*/
	explicit KUriFilterPlugin( const QString &name, QObject *parent = 0 );		explicit KUriFilterPlugin( const QString &name, QObject *parent = 0 );
	/**		/**
	skipping to change at line 514		skipping to change at line 720
	* found during filterting.		* found during filterting.
	*/		*/
	void setArguments( KUriFilterData& data, const QString& args ) const;		void setArguments( KUriFilterData& data, const QString& args ) const;
	/**		/**
	* Sets the name of the search provider, the search term and keyword/te rm		* Sets the name of the search provider, the search term and keyword/te rm
	* separator in @p data.		* separator in @p data.
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	void setSearchProvider( KUriFilterData &data, const QString& provider,		void setSearchProvider( KUriFilterData& data, const QString& provider,
	const QString &term, const QChar &separator) co		const QString& term, const QChar& separator) co
	nst;		nst;
	/**		/**
	* Sets the name of the preferred search providers in @p data.		* Sets the name of the preferred search providers in @p data.
	*		*
	* @since 4.5		* @since 4.5
			* @deprecated Use @ref setSearchProviders instead.
	*/		*/
	void setPreferredSearchProviders(KUriFilterData &data, const ProviderIn		#ifndef KDE_NO_DEPRECATED
	foList &providers) const;		KDE_DEPRECATED void setPreferredSearchProviders(KUriFilterData& data, c
			onst ProviderInfoList& providers) const;
			#endif
			/**
			* Sets the information about the search @p providers in @p data.
			*
			* @since 4.6
			*/
			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;
	private:		private:
	class KUriFilterPluginPrivate * const d;		class KUriFilterPluginPrivate * const d;
	};		};
	class KUriFilterPrivate;
	/**		/**
	* Manages the filtering of URIs.		* KUriFilter applies a number of filters to a URI and returns a filtered v
	*		ersion if any
	* The intention of this plugin class is to allow people to extend the		* filter matches.
	* functionality of KUrl without modifying it directly. This way KUrl will		* A simple example is "kde.org" to "http://www.kde.org", which is commonpl
	* remain a generic parser capable of parsing any generic URL that adheres		ace in web browsers.
	to
	* specifications.
	*		*
	* The KUriFilter class applies a number of filters to a URI and returns th		* The filters are implemented as plugins in @ref KUriFilterPlugin subclass
	e		es.
	* filtered version whenever possible. The filters are implemented using
	* plugins to provide easy extensibility of the filtering mechanism. New
	* filters can be added in the future by simply inheriting from the
	* @ref KUriFilterPlugin class.
	*		*
	* Use of this plugin-manager class is straight forward. Since it is a		* KUriFilter is a singleton object: obtain the instance by calling
	* singleton object, all you have to do is obtain an instance by doing		* @p KUriFilter::self() and use the public member functions to
	* @p KUriFilter::self() and use any of the public member functions to		* perform the filtering.
	* preform the filtering.
	*		*
	* \b Example		* \b Example
	*		*
	* To simply filter a given string:		* To simply filter a given string:
	*		*
	* \code		* \code
	* bool filtered = KUriFilter::self()->filterUri( "kde.org" );		* QString url("kde.org");
			* bool filtered = KUriFilter::self()->filteredUri( url );
	* \endcode		* \endcode
	*		*
	* You can alternatively use a KUrl:		* You can alternatively use a KUrl:
	*		*
	* \code		* \code
	* KUrl url = "kde.org";		* KUrl url("kde.org");
	* bool filtered = KUriFilter::self()->filterUri( url );		* bool filtered = KUriFilter::self()->filterUri( url );
	* \endcode		* \endcode
	*		*
	* If you have a constant string or a constant URL, simply invoke the		* If you have a constant string or a constant URL, simply invoke the
	* corresponding function to obtain the filtered string or URL instead		* corresponding function to obtain the filtered string or URL instead
	* of a boolean flag:		* of a boolean flag:
	*		*
	* \code		* \code
	* QString u = KUriFilter::self()->filteredUri( "kde.org" );		* QString filteredText = KUriFilter::self()->filteredUri( "kde.org" );
	* \endcode		* \endcode
	*		*
	* You can also restrict the filter(s) to be used by supplying		* All of the above examples should result in "kde.org" being filtered into
	* the name of the filter(s) to use. By defualt all available		* "http://kde.org".
	* filters will be used. To use specific filters, add the names		*
	* of the filters you want to use to a QStringList and invoke		* You can also restrict the filters to be used by supplying the name of th
	* the appropriate filtering function. The examples below show		e
	* the use of specific filters. The first one uses a single		* filters you want to use. By defualt all available filters are used.
	* filter called kshorturifilter while the second example uses		*
	* multiple filters:		* To use specific filters, add the names of the filters you want to use to
			a
			* QStringList and invoke the appropriate filtering function.
			*
			* The examples below show the use of specific filters. KDE ships with the
			* following filter plugins by default:
			*
			* kshorturifilter:
			* This is used for filtering potentially valid url inputs such as "kde.org
			"
			* Additionally it filters shell variables and shortcuts such as $HOME and
			* ~ as well as man and info page shortcuts, # and ## respectively.
			*
			* kuriikwsfilter:
			* This is used for filtering normal input text into a web search url using
			the
			* configured fallback search engine selected by the user.
			*
			* kurisearchfilter:
			* 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
			* engine.
			*
			* localdomainfilter:
			* This is used for doing a DNS lookup to determine whether the input is a
			valid
			* local address.
	*		*
	* \code		* \code
	* QString text = "kde.org";		* QString text ("kde.org");
	* bool filtered = KUriFilter::self()->filterUri( text, "kshorturifilter" )		* 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".
			*
	* \code		* \code
	* QStringList list;		* QStringList list;
	* list << "kshorturifilter" << "localdomainfilter";		* list << QLatin1String("kshorturifilter") << QLatin1String("localdomainfi lter");
	* bool filtered = KUriFilter::self()->filterUri( text, list );		* bool filtered = KUriFilter::self()->filterUri( text, list );
	* \endcode		* \endcode
	*		*
	* KUriFilter also allows richer data exchange through a simple		* Additionally if you only want to do search related filtering, you can us
	* meta-object called @p KUriFilterData. Using this meta-object		e the
	* you can find out more information about the URL you want to		* search specific function, @ref filterSearchUri, that is available in KDE
	* filter. See KUriFilterData for examples and details.		* 4.5 and higher. For example, to search for a given input on the web you
			* can do the following:
	*		*
	* @short Filters a given URL into its proper format whenever possible.		* KUriFilterData filterData ("foo");
			* bool filtered = KUriFilter::self()->filterSearchUri(filterData, KUriFilt
			erData::NormalTextFilter);
			*
			* KUriFilter converts all filtering requests to use @ref KUriFilterData
			* internally. The use of this bi-directional class allows you to send spec
			ific
			* instructions to the filter plugins as well as receive detailed informati
			on
			* about the filtered request from them. See the documentation of KUriFilte
			rData
			* class for more examples and details.
			*
			* All functions in this class are thread safe and reentrant.
			*
			* @short Filters the given input into a valid url whenever possible.
	*/		*/
	class KIO_EXPORT KUriFilter		class KIO_EXPORT KUriFilter
	{		{
	public:		public:
	/**		/**
			* This enum describes the types of search plugin filters available.
			*
			* @li NormalTextFilter The plugin used to filter normal text, e.g.
			"some term to search".
			* @li WebShortcutFilter The plugin used to filter web shortcuts, e.
			g. gg:KDE.
			*/
			enum SearchFilterType {
			NormalTextFilter = 0x01,
			WebShortcutFilter = 0x02
			};
			Q_DECLARE_FLAGS(SearchFilterTypes, SearchFilterType)
			/**
	* Destructor		* Destructor
	*/		*/
	~KUriFilter ();		~KUriFilter ();
	/**		/**
	* Returns an instance of KUriFilter.		* Returns an instance of KUriFilter.
	*/		*/
	static KUriFilter* self();		static KUriFilter* self();
	/**		/**
	skipping to change at line 685		skipping to change at line 938
	* If the list is empty all available filters would be used.		* If the list is empty all available filters would be used.
	*		*
	* @param uri the URI to filter.		* @param uri the URI to filter.
	* @param filters specify the list of filters to be used.		* @param filters specify the list of filters to be used.
	*		*
	* @return the filtered URI or null if it cannot be filtered		* @return the filtered URI or null if it cannot be filtered
	*/		*/
	QString filteredUri( const QString &uri, const QStringList& filters = Q StringList() );		QString filteredUri( const QString &uri, const QStringList& filters = Q StringList() );
	/**		/**
	* Filters @p data using only the default search uri filter plugins.		* See @ref filterSearchUri(KUriFilterData&, SearchFilterTypes)
	*		*
	* Only use this function if you are sure that the input you want to		* @since 4.5
	* filter is a search term.		* @deprecated Use filterSearchUri(KUriFilterData&, SearchFilterTypes)
			instead.
			*/
			#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED bool filterSearchUri(KUriFilterData &data);
			#endif
			/**
			* Filter @p data using the criteria specified by @p types.
			*
			* The search filter type can be individual value of @ref SearchFilterT
			ypes
			* or a combination of those types using the bitwise OR operator.
			*
			* You can also use the flags from @ref KUriFilterData::SearchFilterOpt
			ion
			* to alter the filtering mechanisms of the search filter providers.
	*		*
	* @param data object that contains the URI to be filtered.		* @param data object that contains the URI to be filtered.
	* @return true if the the data specified by @p data was successfully f		* @param types the search filters used to filter the request.
	iltered.		* @return true if the specified @p data was successfully filtered.
	*		*
	* @since 4.5		* @see KUriFilterData::setSearchFilteringOptions
			* @since 4.6
	*/		*/
	bool filterSearchUri(KUriFilterData &data);		bool filterSearchUri(KUriFilterData &data, SearchFilterTypes types);
	/**		/**
	* Return a list of the names of all loaded plugins.		* Return a list of the names of all loaded plugins.
	*		*
	* @return a QStringList of plugin names		* @return a QStringList of plugin names
	*/		*/
	QStringList pluginNames() const;		QStringList pluginNames() const;
	protected:		protected:
	skipping to change at line 725		skipping to change at line 993
	* Loads all allowed plugins.		* Loads all allowed plugins.
	*		*
	* This function only loads URI filter plugins that have not been disab led.		* This function only loads URI filter plugins that have not been disab led.
	*/		*/
	void loadPlugins();		void loadPlugins();
	private:		private:
	KUriFilterPrivate * const d;		KUriFilterPrivate * const d;
	};		};
			Q_DECLARE_OPERATORS_FOR_FLAGS(KUriFilterData::SearchFilterOptions)
			Q_DECLARE_OPERATORS_FOR_FLAGS(KUriFilter::SearchFilterTypes)
	#endif		#endif
End of changes. 46 change blocks.
	99 lines changed or deleted		420 lines changed or added

	kurl.h		kurl.h
	skipping to change at line 118		skipping to change at line 118
	* context.		* context.
	*		*
	*/		*/
	class KDECORE_EXPORT KUrl : public QUrl // krazy:exclude=dpointer,qclasses (krazy can't deal with embedded classes)		class KDECORE_EXPORT KUrl : public QUrl // krazy:exclude=dpointer,qclasses (krazy can't deal with embedded classes)
	{		{
	public:		public:
	typedef QMap<QString, QString> MetaDataMap;		typedef QMap<QString, QString> MetaDataMap;
	enum MimeDataFlags { DefaultMimeDataFlags = 0, NoTextExport = 1 };		enum MimeDataFlags { DefaultMimeDataFlags = 0, NoTextExport = 1 };
	/**		/**
			* Options to be used in adjustPath
			*/
			enum AdjustPathOption
			{
			/**
			* strips a trailing '/', except when the path is already just "/".
			*/
			RemoveTrailingSlash,
			/**
			* Do not change the path.
			*/
			LeaveTrailingSlash,
			/**
			* adds a trailing '/' if there is none yet
			*/
			AddTrailingSlash
			};
			/**
	* \class List kurl.h <KUrl>		* \class List kurl.h <KUrl>
	*		*
	* KUrl::List is a QList that contains KUrls with a few		* KUrl::List is a QList that contains KUrls with a few
	* convenience methods.		* convenience methods.
	* @see KUrl		* @see KUrl
	* @see QList		* @see QList
	*/		*/
	class KDECORE_EXPORT List : public QList<KUrl> //krazy:exclude=dpointer ( just some convenience methods)		class KDECORE_EXPORT List : public QList<KUrl> //krazy:exclude=dpointer ( just some convenience methods)
	{		{
	public:		public:
	skipping to change at line 156		skipping to change at line 177
	* @param list the list containing the URLs		* @param list the list containing the URLs
	*/		*/
	List(const QList<KUrl> &list);		List(const QList<KUrl> &list);
	/**		/**
	* Converts the URLs of this list to a list of strings.		* Converts the URLs of this list to a list of strings.
	* @return the list of strings		* @return the list of strings
	*/		*/
	QStringList toStringList() const;		QStringList toStringList() const;
	/**		/**
			* Converts the URLs of this list to a list of strings.
			*
			* @param trailing use to add or remove a trailing slash to/from the
			path.
			*
			* @return the list of strings
			*
			* @since 4.6
			*/
			QStringList toStringList(KUrl::AdjustPathOption trailing) const;
			/**
	* Converts this KUrl::List to a QVariant, this allows to use KUrl::L ist		* Converts this KUrl::List to a QVariant, this allows to use KUrl::L ist
	* in QVariant() constructor		* in QVariant() constructor
	*/		*/
	operator QVariant() const;		operator QVariant() const;
	/**		/**
	* Adds URLs data into the given QMimeData.		* Adds URLs data into the given QMimeData.
	*		*
	* By default, populateMimeData also exports the URLs as plain text, for e.g. dropping		* By default, populateMimeData also exports the URLs as plain text, for e.g. dropping
	* onto a text editor.		* onto a text editor.
	skipping to change at line 392		skipping to change at line 424
	**/		**/
	bool hasPass() const;		bool hasPass() const;
	/**		/**
	* Test to see if this URL has a hostname included in it.		* Test to see if this URL has a hostname included in it.
	* @return true if the URL has a host		* @return true if the URL has a host
	**/		**/
	bool hasHost() const;		bool hasHost() const;
	/**		/**
	* Options to be used in adjustPath
	*/
	enum AdjustPathOption
	{
	/**
	* strips a trailing '/', except when the path is already just "/".
	*/
	RemoveTrailingSlash,
	/**
	* Do not change the path.
	*/
	LeaveTrailingSlash,
	/**
	* adds a trailing '/' if there is none yet
	*/
	AddTrailingSlash
	};
	/**
	* @param trailing use to add or remove a trailing slash to/from the path . see adjustPath		* @param trailing use to add or remove a trailing slash to/from the path . see adjustPath
	* @return The current decoded path. This does not include the query. Can		* @return The current decoded path. This does not include the query. Can
	* be QString() if no path is set.		* be QString() if no path is set.
	*/		*/
	QString path( AdjustPathOption trailing = LeaveTrailingSlash ) const;		QString path( AdjustPathOption trailing = LeaveTrailingSlash ) const;
	/**		/**
	* @param trailing use to add or remove a trailing slash to/from the loca l path. see adjustPath		* @param trailing use to add or remove a trailing slash to/from the loca l path. see adjustPath
	skipping to change at line 867		skipping to change at line 878
	* The same as equals(), just with a less obvious name.		* The same as equals(), just with a less obvious name.
	* Compares this url with @p u.		* Compares this url with @p u.
	* @param u the URL to compare this one with.		* @param u the URL to compare this one with.
	* @param ignore_trailing set to true to ignore trailing '/' characters.		* @param ignore_trailing set to true to ignore trailing '/' characters.
	* @return True if both urls are the same. If at least one of the urls is invalid,		* @return True if both urls are the same. If at least one of the urls is invalid,
	* false is returned.		* false is returned.
	* @see operator==. This function should be used if you want to		* @see operator==. This function should be used if you want to
	* ignore trailing '/' characters.		* ignore trailing '/' characters.
	* @deprecated Use equals() instead.		* @deprecated Use equals() instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool cmp( const KUrl &u, bool ignore_trailing = false ) co nst;		KDE_DEPRECATED bool cmp( const KUrl &u, bool ignore_trailing = false ) co nst;
			#endif
	/**		/**
	* Flags to be used in URL comparison functions like equals, or urlcmp		* Flags to be used in URL comparison functions like equals, or urlcmp
	*/		*/
	enum EqualsOption		enum EqualsOption
	{		{
	/**		/**
	* ignore trailing '/' characters. The paths "dir" and "dir/" are treat ed the same.		* ignore trailing '/' characters. The paths "dir" and "dir/" are treat ed the same.
	* Note however, that by default, the paths "" and "/" are not the same		* Note however, that by default, the paths "" and "/" are not the same
	* (For instance ftp://user@host redirects to ftp://user@host/home/user (on a linux server),		* (For instance ftp://user@host redirects to ftp://user@host/home/user (on a linux server),
	skipping to change at line 968		skipping to change at line 981
	* Reverses split(). Only the first URL may have a reference. This refere nce		* Reverses split(). Only the first URL may have a reference. This refere nce
	* is considered to be HTML-like and is appended at the end of the result ing		* is considered to be HTML-like and is appended at the end of the result ing
	* joined URL.		* joined URL.
	* @param _list the list to join		* @param _list the list to join
	* @return the joined URL		* @return the joined URL
	*/		*/
	static KUrl join( const List& _list );		static KUrl join( const List& _list );
	/**		/**
	* Creates a KUrl object from a QString representing an absolute path.		* Creates a KUrl object from a QString representing an absolute path.
	* KUrl url( somePath ) does the same, but this method is more explicit		* KUrl url( somePath ) is almost the same, but this method is more expli
	* and avoids the path-or-url detection in the KUrl constructor.		cit,
			* avoids the path-or-url detection in the KUrl constructor, and parses
			* "abc:def" as a filename, not as URL.
	*		*
	* @param text the path		* @param text the path
	* @return the new KUrl		* @return the new KUrl
	*/		*/
	static KUrl fromPath( const QString& text );		static KUrl fromPath( const QString& text );
	/**		/**
	* \deprecated		* \deprecated
	* Since KDE4 you can pass both urls and paths to the KUrl constructors.		* Since KDE4 you can pass both urls and paths to the KUrl constructors.
	* Use KUrl(text) instead.		* Use KUrl(text) instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED KUrl fromPathOrUrl( const QString& text );		static KDE_DEPRECATED KUrl fromPathOrUrl( const QString& text );
			#endif
	/**		/**
	* Creates a KUrl from a string, using the standard conventions for mime data		* Creates a KUrl from a string, using the standard conventions for mime data
	* (drag-n-drop or copy-n-paste).		* (drag-n-drop or copy-n-paste).
	* Internally used by KUrl::List::fromMimeData, which is probably what yo u want to use instead.		* Internally used by KUrl::List::fromMimeData, which is probably what yo u want to use instead.
	*/		*/
	static KUrl fromMimeDataByteArray( const QByteArray& str );		static KUrl fromMimeDataByteArray( const QByteArray& str );
	/**		/**
	* Adds URL data into the given QMimeData.		* Adds URL data into the given QMimeData.
	skipping to change at line 1020		skipping to change at line 1036
	/**		/**
	* Convert unicoded string to local encoding and use %-style		* Convert unicoded string to local encoding and use %-style
	* encoding for all common delimiters / non-ascii characters.		* encoding for all common delimiters / non-ascii characters.
	* @param str String to encode (can be QString()).		* @param str String to encode (can be QString()).
	* @return the encoded string		* @return the encoded string
	*		*
	* @deprecated use QUrl::toPercentEncoding instead, but note that it		* @deprecated use QUrl::toPercentEncoding instead, but note that it
	* returns a QByteArray and not a QString. Which makes sense since		* returns a QByteArray and not a QString. Which makes sense since
	* everything is 7 bit (ascii) after being percent-encoded.		* everything is 7 bit (ascii) after being percent-encoded.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED QString encode_string(const QString &str) {		static KDE_DEPRECATED QString encode_string(const QString &str) {
	return QString::fromLatin1( QUrl::toPercentEncoding( str ).constData() ); //krazy:exclude=qclasses		return QString::fromLatin1( QUrl::toPercentEncoding( str ).constData() ); //krazy:exclude=qclasses
	}		}
			#endif
	/**		/**
	* Convert unicoded string to local encoding and use %-style		* Convert unicoded string to local encoding and use %-style
	* encoding for all common delimiters / non-ascii characters		* encoding for all common delimiters / non-ascii characters
	* as well as the slash '/'.		* as well as the slash '/'.
	* @param str String to encode		* @param str String to encode
	*		*
	* @deprecated use QUrl::toPercentEncoding(str,"/") instead, but note tha t it		* @deprecated use QUrl::toPercentEncoding(str,"/") instead, but note tha t it
	* returns a QByteArray and not a QString. Which makes sense since		* returns a QByteArray and not a QString. Which makes sense since
	* everything is 7 bit (ascii) after being percent-encoded.		* everything is 7 bit (ascii) after being percent-encoded.
	*		*
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED QString encode_string_no_slash(const QString &str) {		static KDE_DEPRECATED QString encode_string_no_slash(const QString &str) {
	return QString::fromLatin1( QUrl::toPercentEncoding( str, "/" ).const Data() ); //krazy:exclude=qclasses		return QString::fromLatin1( QUrl::toPercentEncoding( str, "/" ).const Data() ); //krazy:exclude=qclasses
	}		}
			#endif
	/**		/**
	* Decode %-style encoding and convert from local encoding to unicode.		* Decode %-style encoding and convert from local encoding to unicode.
	* Reverse of encode_string()		* Reverse of encode_string()
	* @param str String to decode (can be QString()).		* @param str String to decode (can be QString()).
	*		*
	* @deprecated use QUrl::fromPercentEncoding(encodedURL) instead, but		* @deprecated use QUrl::fromPercentEncoding(encodedURL) instead, but
	* note that it takes a QByteArray and not a QString. Which makes sense s ince		* note that it takes a QByteArray and not a QString. Which makes sense s ince
	* everything is 7 bit (ascii) when being percent-encoded.		* everything is 7 bit (ascii) when being percent-encoded.
	*		*
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED QString decode_string(const QString &str) {		static KDE_DEPRECATED QString decode_string(const QString &str) {
	return QUrl::fromPercentEncoding( str.toLatin1() ); //krazy:exclude=q classes		return QUrl::fromPercentEncoding( str.toLatin1() ); //krazy:exclude=q classes
	}		}
			#endif
	/**		/**
	* Convenience function.		* Convenience function.
	*		*
	* Returns whether '_url' is likely to be a "relative" URL instead of		* Returns whether '_url' is likely to be a "relative" URL instead of
	* an "absolute" URL.		* an "absolute" URL.
	*		*
	* This is mostly meant for KUrl(url, relativeUrl).		* This is mostly meant for KUrl(url, relativeUrl).
	*		*
	* If you are looking for the notion of "relative path" (foo) vs "absolut e path" (/foo),		* If you are looking for the notion of "relative path" (foo) vs "absolut e path" (/foo),
	skipping to change at line 1127		skipping to change at line 1149
	Q_DECLARE_METATYPE(KUrl::List)		Q_DECLARE_METATYPE(KUrl::List)
	/**		/**
	* \relates KUrl		* \relates KUrl
	* Compares URLs. They are parsed, split and compared.		* Compares URLs. They are parsed, split and compared.
	* Two malformed URLs with the same string representation		* Two malformed URLs with the same string representation
	* are nevertheless considered to be unequal.		* are nevertheless considered to be unequal.
	* That means no malformed URL equals anything else.		* That means no malformed URL equals anything else.
	* @deprecated use KUrl(_url1).equals(KUrl(_url2)) instead.		* @deprecated use KUrl(_url1).equals(KUrl(_url2)) instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDECORE_EXPORT_DEPRECATED bool urlcmp( const QString& _url1, const QString& _url2 ); // KDE5: remove, KUrl::equals is better API		KDECORE_EXPORT_DEPRECATED bool urlcmp( const QString& _url1, const QString& _url2 ); // KDE5: remove, KUrl::equals is better API
			#endif
	/**		/**
	* \relates KUrl		* \relates KUrl
	* Compares URLs. They are parsed, split and compared.		* Compares URLs. They are parsed, split and compared.
	* Two malformed URLs with the same string representation		* Two malformed URLs with the same string representation
	* are nevertheless considered to be unequal.		* are nevertheless considered to be unequal.
	* That means no malformed URL equals anything else.		* That means no malformed URL equals anything else.
	*		*
	* @param _url1 A reference URL		* @param _url1 A reference URL
	* @param _url2 A URL that will be compared with the reference URL		* @param _url2 A URL that will be compared with the reference URL
	* @param options a set of KUrl::EqualsOption flags		* @param options a set of KUrl::EqualsOption flags
	* @deprecated use KUrl(_url1).equals(KUrl(_url2), options) instead.		* @deprecated use KUrl(_url1).equals(KUrl(_url2), options) instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDECORE_EXPORT_DEPRECATED bool urlcmp( const QString& _url1, const QString& _url2, const KUrl::EqualsOptions& options ); // KDE5: remove, KUrl::equals is better API		KDECORE_EXPORT_DEPRECATED bool urlcmp( const QString& _url1, const QString& _url2, const KUrl::EqualsOptions& options ); // KDE5: remove, KUrl::equals is better API
			#endif
	KDECORE_EXPORT uint qHash(const KUrl& kurl);		KDECORE_EXPORT uint qHash(const KUrl& kurl);
	#endif		#endif
End of changes. 18 change blocks.
	23 lines changed or deleted		51 lines changed or added

	kurlcompletion.h		kurlcompletion.h
	skipping to change at line 177		skipping to change at line 177
	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 ist& ) )		Q_PRIVATE_SLOT( d, void _k_slotEntries( KIO::Job*, const KIO::UDSEntryL ist& ) )
	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. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kurlnavigator.h		kurlnavigator.h
	skipping to change at line 279		skipping to change at line 279
	/**		/**
	* @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;
	/**		/**
	* @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
	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);
	skipping to change at line 341		skipping to change at line 353
	*/		*/
	void requestActivation();		void requestActivation();
	/* @see QWidget::setFocus() */		/* @see QWidget::setFocus() */
	void setFocus();		void setFocus();
	/**		/**
	* 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
	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 420		skipping to change at line 438
	/**		/**
	* 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
	protected:		protected:
	/*		/*
	* 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);
	/**		/**
End of changes. 20 change blocks.
	0 lines changed or deleted		20 lines changed or added

	kurlrequester.h		kurlrequester.h
	skipping to change at line 22		skipping to change at line 22
	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 KURLREQUESTER_H		#ifndef KURLREQUESTER_H
	#define KURLREQUESTER_H		#define KURLREQUESTER_H
	#include <keditlistbox.h>
	#include <kfile.h>		#include <kfile.h>
	#include <kpushbutton.h>		#include <kpushbutton.h>
	#include <kurl.h>		#include <kurl.h>
	#include <khbox.h>		#include <khbox.h>
			#ifndef KDE_NO_DEPRECATED
			#include <keditlistbox.h>
			#else
			#include <keditlistwidget.h>
			#endif
	class KComboBox;		class KComboBox;
	class KFileDialog;		class KFileDialog;
	class KLineEdit;		class KLineEdit;
	class KUrlCompletion;		class KUrlCompletion;
	class QString;		class QString;
	class QEvent;		class QEvent;
	/**		/**
	* This class is a widget showing a lineedit and a button, which invokes a		* This class is a widget showing a lineedit and a button, which invokes a
	skipping to change at line 58		skipping to change at line 63
	* The default window modality for the file dialog is Qt::ApplicationModal		* The default window modality for the file dialog is Qt::ApplicationModal
	*		*
	* \image html kurlrequester.png "KDE URL Requester"		* \image html kurlrequester.png "KDE URL Requester"
	*		*
	* @short A widget to request a filename/url from the user		* @short A widget to request a filename/url from the user
	* @author Carsten Pfeiffer <pfeiffer@kde.org>		* @author Carsten Pfeiffer <pfeiffer@kde.org>
	*/		*/
	class KIO_EXPORT KUrlRequester : public KHBox		class KIO_EXPORT KUrlRequester : public KHBox
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( KUrl url READ url WRITE setUrl USER true )		Q_PROPERTY( KUrl url READ url WRITE setUrl NOTIFY textChanged USER true )
	Q_PROPERTY( QString filter READ filter WRITE setFilter )		Q_PROPERTY( QString filter READ filter WRITE setFilter )
	Q_PROPERTY( KFile::Modes mode READ mode WRITE setMode )		Q_PROPERTY( KFile::Modes mode READ mode WRITE setMode )
	Q_PROPERTY( QString clickMessage READ clickMessage WRITE setClickMessag e )		Q_PROPERTY( QString clickMessage READ clickMessage WRITE setClickMessag e )
	Q_PROPERTY(QString text READ text WRITE setText)		Q_PROPERTY(QString text READ text WRITE setText)
	Q_PROPERTY( Qt::WindowModality fileDialogModality READ fileDialogModali ty WRITE setFileDialogModality )		Q_PROPERTY( Qt::WindowModality fileDialogModality READ fileDialogModali ty WRITE setFileDialogModality )
	public:		public:
	/**		/**
	* Constructs a KUrlRequester widget.		* Constructs a KUrlRequester widget.
	*/		*/
	skipping to change at line 185		skipping to change at line 190
	/**		/**
	* @returns an object, suitable for use with KEditListBox. It allows yo u		* @returns an object, suitable for use with KEditListBox. It allows yo u
	* to put this KUrlRequester into a KEditListBox.		* to put this KUrlRequester into a KEditListBox.
	* 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 );		* KEditListBox *editListBox = new KEditListBox( i18n("Some Title"), re q->customEditor(), someWidget );
	* \endcode		* \endcode
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	const KEditListBox::CustomEditor &customEditor();		const KEditListBox::CustomEditor &customEditor();
			#else
			const KEditListWidget::CustomEditor &customEditor();
			#endif
	/**		/**
	* @returns the message set with setClickMessage		* @returns the message set with setClickMessage
	* @since 4.2		* @since 4.2
	*/		*/
	QString clickMessage() const;		QString clickMessage() const;
	/**		/**
	* Set a click message @p msg		* Set a click message @p msg
	* @since 4.2		* @since 4.2
	skipping to change at line 233		skipping to change at line 242
	void setStartDir( const KUrl& startDir );		void setStartDir( const KUrl& startDir );
	/**		/**
	* Sets the url in the lineedit to @p KUrl::fromPath(path).		* Sets the url in the lineedit to @p KUrl::fromPath(path).
	* This is only for local paths; do not pass a url here.		* This is only for local paths; do not pass a url here.
	* This method is mostly for "local paths only" url requesters,		* This method is mostly for "local paths only" url requesters,
	* for instance those set up with setMode(KFile::File|KFile::ExistingOn ly|KFile::LocalOnly)		* for instance those set up with setMode(KFile::File|KFile::ExistingOn ly|KFile::LocalOnly)
	*		*
	* @deprecated Use setUrl(KUrl(path)) instead.		* @deprecated Use setUrl(KUrl(path)) instead.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setPath(const QString& path);		KDE_DEPRECATED void setPath(const QString& path);
			#endif
	/**		/**
	* Sets the current text in the lineedit or combobox.		* Sets the current text in the lineedit or combobox.
	* This is used for cases where KUrlRequester is used to		* This is used for cases where KUrlRequester is used to
	* enter URL-or-something-else, like KOpenWithDialog where you		* enter URL-or-something-else, like KOpenWithDialog where you
	* can type a full command with arguments.		* can type a full command with arguments.
	*		*
	* @see text		* @see text
	* @since 4.3		* @since 4.3
	*/		*/
End of changes. 7 change blocks.
	2 lines changed or deleted		13 lines changed or added

	kuser.h		kuser.h
	skipping to change at line 178		skipping to change at line 178
	* The login name of the user.		* The login name of the user.
	* @return the login name of the user or QString() if user is invalid		* @return the login name of the user or QString() if user is invalid
	*/		*/
	QString loginName() const;		QString loginName() const;
	/**		/**
	* The full name of the user.		* The full name of the user.
	* @return the full name of the user or QString() if user is invalid		* @return the full name of the user or QString() if user is invalid
	* @deprecated use property(KUser::FullName) instead		* @deprecated use property(KUser::FullName) instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString fullName() const;		KDE_DEPRECATED QString fullName() const;
			#endif
	/**		/**
	* The path to the user's home directory.		* The path to the user's home directory.
	* @return the home directory of the user or QString() if the		* @return the home directory of the user or QString() if the
	* user is invalid		* user is invalid
	*/		*/
	QString homeDir() const;		QString homeDir() const;
	/**		/**
	* The path to the user's face file.		* The path to the user's face file.
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kviewstatesaver.h		kviewstatesaver.h
	skipping to change at line 112		skipping to change at line 112
	// Will delete itself.		// Will delete itself.
	ConcreteTreeStateSaver *saver = new ConcreteStateSaver();		ConcreteTreeStateSaver *saver = new ConcreteStateSaver();
	saver->setTreeView(m_view);		saver->setTreeView(m_view);
	KConfigGroup cfg( KGlobal::config(), "ExampleViewState" );		KConfigGroup cfg( KGlobal::config(), "ExampleViewState" );
	saver->restoreState( cfg );		saver->restoreState( cfg );
	}		}
	@endcode		@endcode
	After creating a saver, the state can be saved using a KConfigGroup.		After creating a saver, the state can be saved using a KConfigGroup.
	It is also possbile to save and restore state directly by using the resto reSelection,		It is also possible to save and restore state directly by using the resto reSelection,
	restoreExpanded etc methods. Note that the implementation of these method s should return		restoreExpanded etc methods. Note that the implementation of these method s should return
	strings that the indexFromConfigString implementation can handle.		strings that the indexFromConfigString implementation can handle.
	@code		@code
	class DynamicTreeStateSaver : public KViewStateSaver		class DynamicTreeStateSaver : public KViewStateSaver
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	// ...		// ...
	skipping to change at line 270		skipping to change at line 270
	Reimplement to return a unique string for the @p index.		Reimplement to return a unique string for the @p index.
	*/		*/
	virtual QString indexToConfigString(const QModelIndex &index) const = 0;		virtual QString indexToConfigString(const QModelIndex &index) const = 0;
	private:		private:
	//@cond PRIVATE		//@cond PRIVATE
	Q_DECLARE_PRIVATE(KViewStateSaver)		Q_DECLARE_PRIVATE(KViewStateSaver)
	KViewStateSaverPrivate * const d_ptr;		KViewStateSaverPrivate * const d_ptr;
	Q_PRIVATE_SLOT( d_func(), void rowsInserted( const QModelIndex&, int, int ) )		Q_PRIVATE_SLOT( d_func(), void rowsInserted( const QModelIndex&, int, int ) )
	Q_PRIVATE_SLOT( d_func(), void restoreScrollBarState() )		Q_PRIVATE_SLOT( d_func(), void restoreScrollBarState() )
	Q_PRIVATE_SLOT( d_func(), void processPendingChanges() )
	//@endcond		//@endcond
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		1 lines changed or added

	kwebpage.h		kwebpage.h
	skipping to change at line 34		skipping to change at line 34
	*/		*/
	#ifndef KWEBPAGE_H		#ifndef KWEBPAGE_H
	#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;
	/**		/**
	* @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 and KWebPluginFactory for embedded non-html content handling us		* handling, KParts for embedding non-html content and KWallet for storing
	ing		* form data. It also sets standard icons for many of the actions provided
	* KDE KParts.		by
			* QWebPage.
			*
			* Most of this integration happens behind the scenes. If you want KWallet
			* 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
			* connect to the KWebWallet::saveFormDataRequested signal and call either
			* KWebWallet::acceptSaveFormDataRequest or
			* KWebWallet::rejectSaveFormDataRequest, typically after asking the user
			* whether they want to save the form data. If you do not do this, no form
			* data will be saved.
			*
			* KWebPage will also not automatically load form data for you. You should
			* connect to QWebPage::loadFinished and, if the page was loaded sucessfull
			y,
			* call
			* @code
			* page->wallet()->fillFormData(page->mainFrame());
			* @endcode
			*
			* @see KIO::Integration
			* @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>
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
	class KDEWEBKIT_EXPORT KWebPage : public QWebPage		class KDEWEBKIT_EXPORT KWebPage : public QWebPage
	{		{
	Q_OBJECT		Q_OBJECT
	Q_FLAGS (Integration)		Q_FLAGS (Integration)
	public:		public:
			/**
			* Flags for setting the desired level of integration.
			*/
	enum IntegrationFlags		enum IntegrationFlags
	{		{
	NoIntegration = 0x01,		/**
	KIOIntegration = 0x02,		* Provide only very basic integration such as using KDE icons for
	KPartsIntegration = 0x04,		the
	KWalletIntegration = 0x08		* actions provided by QWebPage.
			*/
			NoIntegration = 0x01,
			/**
			* Use KIO to handle network requests.
			*
			* @see KIO::Integration::AccessManager
			*/
			KIOIntegration = 0x02,
			/**
			* Use KPart componenets, if available, to display content in
			* &lt;embed&gt; and &lt;object&gt; tags.
			*/
			KPartsIntegration = 0x04,
			/**
			* Use KWallet to store login credentials and other form data from
			web
			* sites.
			*
			* @see wallet() and setWallet()
			*/
			KWalletIntegration = 0x08
	};		};
	Q_DECLARE_FLAGS(Integration, IntegrationFlags)		Q_DECLARE_FLAGS(Integration, IntegrationFlags)
	/**		/**
	* Constructs a KWebPage with parent @p parent.		* Constructs a KWebPage with parent @p parent.
	*		*
	* By default @p flags is set to zero which means integration with KDE		* Note that if no integration flags are set (the default), all integra
	is		tion
	* completely activated. If you inherit from this class you can use the		* options are activated. If you inherit from this class you can use t
	* flags in @ref IntegrationFlags to control which, if any, integration		he
	* should be automatically activated for you.		* flags in @ref IntegrationFlags to control how much integration shoul
			d
			* be used.
	*		*
	* @see KIO::Integration::CookieJar		* @see KIO::Integration::CookieJar
	* @see KIO::Integration::AccessManager		* @see KIO::Integration::AccessManager
			* @see wallet() and setWallet()
	*/		*/
	explicit KWebPage(QObject *parent = 0, Integration flags = Integration( ));		explicit KWebPage(QObject *parent = 0, Integration flags = Integration( ));
	/**		/**
	* Destroys the KWebPage.		* Destroys the KWebPage.
	*/		*/
	~KWebPage();		~KWebPage();
	/**		/**
	* Returns true if access to remote content is allowed.		* Whether access to remote content is permitted.
	*		*
	* By default access to remote content is allowed.		* If this is @c false, only resources on the local system can be acces
			sed
			* through this web page. By default access to remote content is allow
			ed.
			*
			* If KIO integration is disabled, this will always return @c true.
	*		*
	* @see setAllowExternalContent()		* @see setAllowExternalContent()
	* @see KIO::AccessManager::isExternalContentAllowed()		* @see KIO::Integration::AccessManager::isExternalContentAllowed()
			*
			* @return @c true if access to remote content is permitted, @c false o
			therwise
	*/		*/
	bool isExternalContentAllowed() const;		bool isExternalContentAllowed() const;
	/**		/**
	* Returns true KWallet used to store form data.		* The wallet integration manager.
	*		*
	* @see KWebWallet		* If you wish to use KDE wallet integration, you will have to connect
			to
			* signals emitted by this object and react accordingly. See KWebWalle
			t
			* for more information.
			*
			* @return the wallet integration manager, or 0 if KDE wallet integrati
			on
			* is disabled
	*/		*/
	KWebWallet *wallet() const;		KWebWallet *wallet() const;
	/**		/**
	* Set @p allow to false if you want to prevent access to remote conten t.		* Set whether to allow remote content.
	*		*
	* If this function is set to false, only resources on the local system		* If KIO integration is not enabled, this method will have no effect.
	* can be accessed through this class. By default fetching external con
	tent
	* is allowed.
	*		*
	* @see isExternalContentAllowed()		* @see isExternalContentAllowed()
	* @see KIO::AccessManager::setAllowExternalContent(bool)		* @see KIO::Integration::AccessManager::setAllowExternalContent(bool)
			*
			* @param allow @c true if access to remote content should be allowed,
			* @c false if only local content should be accessible
	*/		*/
	void setAllowExternalContent(bool allow);		void setAllowExternalContent(bool allow);
	/**		/**
	* Sets the @ref KWebWallet that is used to store form data.		* Set the @ref KWebWallet that is used to store form data.
	*		*
	* This function will set the parent of the KWebWallet object passed to		* This KWebPage will take ownership of @p wallet, so that the wallet
	* itself so that the wallet is deleted when this object is deleted. If		* is deleted when the KWebPage is deleted. If you do not want that
	* you do not want that to happen, you should change the wallet's paren		* to happen, you should call setParent() on @p wallet after calling
	t		* this function.
	* after calling this function. To disable wallet intgreation, call thi
	s
	* function with its parameter set to NULL.
	*		*
	* @see KWebWallet		* @see KWebWallet
			*
			* @param wallet the KWebWallet to be used for storing form data, or
			* 0 to disable KWallet integration
	*/		*/
	void setWallet(KWebWallet* wallet);		void setWallet(KWebWallet* wallet);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Downloads @p request using KIO.		* Download @p request using KIO.
	*		*
	* This slot first prompts the user where to put/save the requested		* This slot first prompts the user where to save the requested
	* resource and then downloads it using KIO.		* resource and then downloads it using KIO.
	*/		*/
	virtual void downloadRequest(const QNetworkRequest &request);		virtual void downloadRequest(const QNetworkRequest &request);
	/**		/**
	* Downloads @p url using KIO.		* Download @p url using KIO.
	*		*
	* This slot first prompts the user where to put/save the requested		* This slot first prompts the user where to save the requested
	* resource and then downloads it using KIO.		* resource and then downloads it using KIO.
	*/		*/
	virtual void downloadUrl(const KUrl &url);		virtual void downloadUrl(const KUrl &url);
	/**		/**
	* Downloads the resource specified by @p reply using KIO.		* Download the resource specified by @p reply using KIO.
	*		*
	* This slot first prompts the user where to save the requested resourc e		* This slot first prompts the user where to save the requested resourc e
	* and then downloads it using KIO.		* and then downloads it using KIO.
	*		*
	* @since 4.5		* @since 4.5
	*/		*/
	void downloadResponse(QNetworkReply *reply);		void downloadResponse(QNetworkReply *reply);
	protected:		protected:
	/**		/**
	* Returns the value of the permanent (per session) meta data for the g iven @p key.		* Get an item of session metadata.
	*		*
	* @see KIO::MetaData		* Retrieves the value of the permanent (per-session) metadata for @p k
			ey.
			*
			* If KIO integration is disabled, this will always return an empty str
			ing.
			*
			* @see KIO::Integration::AccessManager::sessionMetaData
			* @see setSessionMetaData
			*
			* @param key the key of the metadata to retrieve
			* @return the value of the metadata associated with @p key, or an
			* empty string if there is no such metadata
	*/		*/
	QString sessionMetaData(const QString &key) const;		QString sessionMetaData(const QString &key) const;
	/**		/**
	* Returns the value of the temporary (per request) meta data for the g iven @p key.		* Get an item of request metadata.
	*		*
	* @see KIO::MetaData		* Retrieves the value of the temporary (per-request) metadata for @p k
			ey.
			*
			* If KIO integration is disabled, this will always return an empty str
			ing.
			*
			* @see KIO::Integration::AccessManager::requestMetaData
			* @see setRequestMetaData
			*
			* @param key the key of the metadata to retrieve
			* @return the value of the metadata associated with @p key, or an
			* empty string if there is no such metadata
	*/		*/
	QString requestMetaData(const QString &key) const;		QString requestMetaData(const QString &key) const;
	/**		/**
	* Set meta data that will be sent to KIO slave with every request.		* Set an item of metadata to be sent to the KIO slave with every reque st.
	*		*
	* Note that meta data set using this function will be sent with		* If KIO integration is disabled, this method will have no effect.
	* every request.
	*		*
	* @see KIO::MetaData		* Metadata set using this method will be sent with every request.
			*
			* @see KIO::Integration::AccessManager::sessionMetaData
			*
			* @param key the key for the metadata; any existing metadata associ
			ated
			* with this key will be overwritten
			* @param value the value to associate with @p key
	*/		*/
	void setSessionMetaData(const QString &key, const QString &value);		void setSessionMetaData(const QString &key, const QString &value);
	/**		/**
	* Set meta data that will be sent to KIO slave with the first request.		* Set an item of metadata to be sent to the KIO slave with the next re quest.
	*		*
	* Note that a meta data set using this function will be deleted after		* If KIO integration is disabled, this method will have no effect.
	* it has been sent the first time.
	*		*
	* @see KIO::MetaData		* Metadata set using this method will be deleted after it has been sen
			t
			* once.
			*
			* @see KIO::Integration::AccessManager::requestMetaData
			*
			* @param key the key for the metadata; any existing metadata associ
			ated
			* with this key will be overwritten
			* @param value the value to associate with @p key
	*/		*/
	void setRequestMetaData(const QString &key, const QString &value);		void setRequestMetaData(const QString &key, const QString &value);
	/**		/**
	* Remove session meta data associated with @p key.		* Remove an item of session metadata.
			*
			* Removes the permanent (per-session) metadata associated with @p key.
			*
			* @see KIO::Integration::AccessManager::sessionMetaData
			* @see setSessionMetaData
			*
			* @param key the key for the metadata to remove
	*/		*/
	void removeSessionMetaData(const QString &key);		void removeSessionMetaData(const QString &key);
	/**		/**
	* Remove request meta data associated with @p key.		* Remove an item of request metadata.
			*
			* Removes the temporary (per-request) metadata associated with @p key.
			*
			* @see KIO::Integration::AccessManager::requestMetaData
			* @see setRequestMetaData
			*
			* @param key the key for the metadata to remove
	*/		*/
	void removeRequestMetaData(const QString &key);		void removeRequestMetaData(const QString &key);
	/**		/**
			* @reimp
			*
	* This function is re-implemented to provide KDE user-agent management		* This function is re-implemented to provide KDE user-agent management
	* integration through KProtocolManager.		* integration through KProtocolManager.
	*		*
	* @see KProtocolManager::userAgentForUrl.		* If a special user-agent has been configured for the host indicated b
			y
			* @p url, that user-agent will be returned. Otherwise, QWebPage's
			* default user agent is returned.
			*
			* @see KProtocolManager::userAgentForHost.
	* @see QWebPage::userAgentForUrl.		* @see QWebPage::userAgentForUrl.
	*/		*/
	virtual QString userAgentForUrl(const QUrl& url) const;		virtual QString userAgentForUrl(const QUrl& url) const;
	/**		/**
	* Reimplemented for internal reasons, the API is not affected.		* @reimp
	*		*
	* @see QWebPage::acceptNavigationRequest.		* This performs various integration-related actions when navigation
	* @internal		* is requested. If you override this method, you should ensure you
			* call KWebPage::acceptNaviationRequest (unless you want to block
			* the request outright), even if you do not use the return value.
			*
			* If you do override acceptNavigationRequest and call this method,
			* however, be aware of the effect of the page's
			* linkDelegationPolicy on how * QWebPage::acceptNavigationRequest
			* behaves.
			*
			* @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);
	private:		private:
	class KWebPagePrivate;		class KWebPagePrivate;
	KWebPagePrivate* const d;		KWebPagePrivate* const d;
			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. 39 change blocks.
	54 lines changed or deleted		186 lines changed or added

	kwebpluginfactory.h		kwebpluginfactory.h
	skipping to change at line 31		skipping to change at line 31
	*		*
	*/		*/
	#ifndef KWEBPLUGINFACTORY_H		#ifndef KWEBPLUGINFACTORY_H
	#define KWEBPLUGINFACTORY_H		#define KWEBPLUGINFACTORY_H
	#include <kdewebkit_export.h>		#include <kdewebkit_export.h>
	#include <QtWebKit/QWebPluginFactory>		#include <QtWebKit/QWebPluginFactory>
	/**		/**
	* @short An enhanced QWebPluginFactory with integration into the KDE envir		* @short A QWebPluginFactory with integration into the KDE environment.
	onment.		*
			* This class will attempt to find a KPart to satisfy a plugin request.
	*		*
	* @author Michael Howell <mhowell123@gmail.com>		* @author Michael Howell <mhowell123@gmail.com>
	* @author Dawit Alemayehu <adawit@kde.org>		* @author Dawit Alemayehu <adawit@kde.org>
	*		*
	* @see QWebPluginFactory		* @see QWebPluginFactory
	* @since 4.4		* @since 4.4
	*/		*/
	class KDEWEBKIT_EXPORT KWebPluginFactory : public QWebPluginFactory		class KDEWEBKIT_EXPORT KWebPluginFactory : public QWebPluginFactory
	{		{
	Q_OBJECT		Q_OBJECT
	skipping to change at line 54		skipping to change at line 56
	* Constructs a KWebPluginFactory with parent @p parent.		* Constructs a KWebPluginFactory with parent @p parent.
	*/		*/
	KWebPluginFactory(QObject *parent);		KWebPluginFactory(QObject *parent);
	/**		/**
	* Destroys the KWebPage.		* Destroys the KWebPage.
	*/		*/
	~KWebPluginFactory();		~KWebPluginFactory();
	/**		/**
			* @reimp
			*
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWebPluginFactory::create		* @see QWebPluginFactory::create
	* @internal		* @internal
	*/		*/
	virtual QObject *create(const QString &mimeType,		virtual QObject *create(const QString &mimeType,
	const QUrl &url,		const QUrl &url,
	const QStringList &argumentNames,		const QStringList &argumentNames,
	const QStringList &argumentValues) const;		const QStringList &argumentValues) const;
	/**		/**
			* @reimp
			*
	* 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;
End of changes. 3 change blocks.
	2 lines changed or deleted		7 lines changed or added

	kwebview.h		kwebview.h
	skipping to change at line 39		skipping to change at line 39
	#include <kdewebkit_export.h>		#include <kdewebkit_export.h>
	#include <QtWebKit/QWebView>		#include <QtWebKit/QWebView>
	class KUrl;		class KUrl;
	template<class T> class KWebViewPrivate;		template<class T> class KWebViewPrivate;
	/**		/**
	* @short A re-implementation of QWebView that provides KDE integration.		* @short A re-implementation of QWebView that provides KDE integration.
	*		*
	* This is a drop-in replacement for QWebView that provides full KDE integr		* This is a drop-in replacement for QWebView that provides full KDE
	ation		* integration through @ref KWebPage as well as additional signals that
	* through @ref KWebPage as well as additional signals that capture middle,		* capture middle, shift and ctrl mouse clicks on links and URL pasting
	* shift and ctrl mouse clicks on links and url pasting from the selection		* from the selection clipboard.
	* clipboard.		*
			* The specific functionality provided by this class (over and above what
			* would be acheived by using KWebPage with a QWebView) is that scrolling
			* with the mouse wheel while holding down CTRL zooms the page (see
			* QWebView::setZoomFactor) and several useful signals are emitted when
			* the user performs certain actions.
			*
			* See the signal documentation for more details.
	*		*
	* @author Urs Wolfer <uwolfer @ kde.org>		* @author Urs Wolfer <uwolfer @ kde.org>
	* @author Dawit Alemayehu <adawit @ kde.org>		* @author Dawit Alemayehu <adawit @ kde.org>
	* @since 4.4		* @since 4.4
	*/		*/
	class KDEWEBKIT_EXPORT KWebView : public QWebView		class KDEWEBKIT_EXPORT KWebView : public QWebView
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(bool externalContentAllowed READ isExternalContentAllowed WR ITE setAllowExternalContent)
	public:		public:
	/**		/**
	* Constructs a KWebView object with parent @p parent.		* Constructs a KWebView object with parent @p parent.
	*		*
	* Set @p createCustomPage to false to prevent the creation of a custom		* Set @p createCustomPage to false to prevent the creation of a
	* @ref KWebPage object for KDE integration. Doing so allows you to		* @ref KWebPage object for KDE integration. Doing so allows you to
	* avoid unnecessary object creation and deletion if you are going to		* avoid unnecessary object creation and deletion if you are going to
	* use your own custom implementation of KWebPage.		* use a subclass of KWebPage.
	*		*
	* @param parent the parent object.		* @param parent the parent object
	* @param createCustomPage if true, the default, creates a custom KWeb		* @param createCustomPage if @c true, the view's page is set to an
	Page object.		* instance of KWebPage
	*/		*/
	explicit KWebView(QWidget *parent = 0, bool createCustomPage = true);		explicit KWebView(QWidget *parent = 0, bool createCustomPage = true);
	/**		/**
	* Destroys the KWebView.		* Destroys the KWebView.
	*/		*/
	~KWebView();		~KWebView();
	/**		/**
	* Returns true if access to remote content is allowed.		* Returns true if access to remote content is allowed.
	skipping to change at line 94		skipping to change at line 104
	* can be accessed through this class. By default fetching external con tent		* can be accessed through this class. By default fetching external con tent
	* is allowed.		* is allowed.
	*		*
	* @see isExternalContentAllowed()		* @see isExternalContentAllowed()
	* @see KWebPage::setAllowExternalContent(bool)		* @see KWebPage::setAllowExternalContent(bool)
	*/		*/
	void setAllowExternalContent(bool allow);		void setAllowExternalContent(bool allow);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is emitted when a url from the selection clipboard is pa		* Emitted when a URL from the selection clipboard is pasted on this vi
	sted		ew.
	* on this view.
	*		*
	* @param url the url pasted from the selection clipboard.		* This is triggered when the user clicks on the page with the middle
			* mouse button when there is something in the global mouse selection
			* clipboard. This is typically only possible on X11.
			*
			* Uri filters are applied to the selection clipboard to generate @p ur
			l.
			*
			* If the content in the selection clipboard is not a valid url and a
			* default search engine is configured, @p url will be set to a query
			* to the default search engine.
			*
			* @param url url generated from the selection clipboard content
			*
			* @deprecated use selectionClipboardUrlPasted(KUrl, bool) instead
			* @see QClipboard
	*/		*/
	void selectionClipboardUrlPasted(const KUrl &url);		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED void selectionClipboardUrlPasted(const KUrl &url);
			#endif
	/**		/**
	* This signal is emitted when a link is shift clicked with the left mo		* Emitted when a URL from the selection clipboard is pasted on this vi
	use		ew.
	* button.
	*		*
	* @param url the url of the clicked link.		* This is triggered when the user clicks on the page with the middle
			* mouse button when there is something in the global mouse selection
			* clipboard. This is typically only possible on X11.
			*
			* Uri filters are applied to the selection clipboard to generate @p ur
			l.
			*
			* If the content in the selection clipboard is not a valid URL and a
			* default search engine is configured, @p searchText will be set to th
			e
			* content of the clipboard (250 characters maximum) and @p url will be
			* set to a query to the default search engine.
			*
			* @param url the URL generated from the selection clipboard co
			ntent
			* @param searchText content of the selection clipboard if it is not a
			* valid URL
			*
			* @see KUriFilter
			* @see QClipboard
			* @since 4.6
			*/
			void selectionClipboardUrlPasted(const KUrl &url, const QString& search
			Text);
			/**
			* Emitted when a link is clicked with the left mouse button while SHIF
			T is
			* held down.
			*
			* A KDE user would typically expect this to result in the triggering o
			f a
			* "save link as" action.
			*
			* @param url the URL of the clicked link
	*/		*/
	void linkShiftClicked(const KUrl &url);		void linkShiftClicked(const KUrl &url);
	/**		/**
	* This signal is emitted when a link is either clicked with the middle		* Emitted when a link is clicked with the middle mouse button or click
	* mouse button or ctrl-clicked with the left mouse button.		ed
			* with the left mouse button while CTRL is held down.
	*		*
	* @param url the url of the clicked link.		* Typically, the user would expect this to result in the URL being ope
			ned
			* in a new tab or window.
			*
			* @param url the URL of the clicked link
	*/		*/
	void linkMiddleOrCtrlClicked(const KUrl &url);		void linkMiddleOrCtrlClicked(const KUrl &url);
	protected:		protected:
	/**		/**
			* @reimp
			*
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWidget::wheelEvent		* @see QWidget::wheelEvent
	* @internal		* @internal
	*/		*/
	void wheelEvent(QWheelEvent *event);		void wheelEvent(QWheelEvent *event);
	/**		/**
			* @reimp
			*
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWidget::mousePressEvent		* @see QWidget::mousePressEvent
	* @internal		* @internal
	*/		*/
	virtual void mousePressEvent(QMouseEvent *event);		virtual void mousePressEvent(QMouseEvent *event);
	/**		/**
			* @reimp
			*
	* Reimplemented for internal reasons, the API is not affected.		* Reimplemented for internal reasons, the API is not affected.
	*		*
	* @see QWidget::mouseReleaseEvent		* @see QWidget::mouseReleaseEvent
	* @internal		* @internal
	*/		*/
	virtual void mouseReleaseEvent(QMouseEvent *event);		virtual void mouseReleaseEvent(QMouseEvent *event);
	private:		private:
	friend class KWebViewPrivate<KWebView>;		friend class KWebViewPrivate<KWebView>;
	KWebViewPrivate<KWebView> * const d;		KWebViewPrivate<KWebView> * const d;
End of changes. 15 change blocks.
	22 lines changed or deleted		89 lines changed or added

	kwebwallet.h		kwebwallet.h
	skipping to change at line 42		skipping to change at line 42
	#include <QtCore/QPair>		#include <QtCore/QPair>
	#include <QtGui/QWidget>		#include <QtGui/QWidget>
	#include <QtCore/QtGlobal>		#include <QtCore/QtGlobal>
	class QWebFrame;		class QWebFrame;
	class QWebPage;		class QWebPage;
	/**		/**
	* @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
			* connect to the saveFormDataRequested signal and call either
			* acceptSaveFormDataRequest or rejectSaveFormDataRequest, typically after
			* asking the user whether they want to save the form data.
			*
			* 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
			* loaded sucessfully, call
			* @code
			* page->wallet()->fillFormData(page->mainFrame());
			* @endcode
			*
			* If you wish to use this directly with a subclass of QWebPage, you should
			call
			* saveFormData from QWebPage::acceptNavigationRequest when a user submits
			a
			* form.
			*
			* @see KWebPage
			*
	* @author Dawit Alemayehu <adawit @ kde.org>		* @author Dawit Alemayehu <adawit @ kde.org>
	* @since 4.4		* @since 4.4
	*/		*/
	class KDEWEBKIT_EXPORT KWebWallet : public QObject		class KDEWEBKIT_EXPORT KWebWallet : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Structure to hold data from HTML <form> element.		* Holds data from a HTML &lt;form&gt; element.
	*
	* @p url holds the origination url of a form.
	* @p name holds the name attribute of a form.
	* @p index holds the order of a form on a web page.
	* @p fields holds the name and value attributes of each <input> in a f
	orm.
	*/		*/
	struct WebForm		struct WebForm
	{		{
	/**		/**
	* A typedef for storing the name and value attributes of HTML <inpu t&gt;		* A typedef for storing the name and value attributes of HTML <i nput&gt;
	* elements.		* elements.
	*/		*/
	typedef QPair<QString, QString> WebField;		typedef QPair<QString, QString> WebField;
			/** The URL the form was found at. */
	QUrl url;		QUrl url;
			/** The name attribute of the form. */
	QString name;		QString name;
			/** The position of the form on the web page, relative to other for ms. */
	QString index;		QString index;
			/** The name and value attributes of each input element in the form . */
	QList<WebField> fields;		QList<WebField> fields;
	};		};
			/**
			* A list of web forms
			*/
	typedef QList<WebForm> WebFormList;		typedef QList<WebForm> WebFormList;
	/**		/**
	* Constructs a KWebWallet with @p parent as its parent.		* Constructs a KWebWallet
			*
			* @p parent is usually the QWebPage this wallet is being used for.
			*
			* The @p wid parameter is used to tell KDE's wallet manager which wind
			ow
			* is requesting access to the wallet.
			*
			* @param parent the owner of this wallet
			* @param wid the window ID of the window the web page will be
			* embedded in
	*/		*/
	explicit KWebWallet(QObject* parent = 0, WId wid = 0);		explicit KWebWallet(QObject* parent = 0, WId wid = 0);
	/**		/**
	* Destructor		* Destructor
	*/		*/
	virtual ~KWebWallet();		virtual ~KWebWallet();
	/**		/**
	* Returns a list of forms in @p frame that have cached data in the		* Returns a list of forms in @p frame that have cached data in the
	skipping to change at line 130		skipping to change at line 159
	* If @p recursive is set to true, the default, then this function will		* If @p recursive is set to true, the default, then this function will
	* attempt to fill out forms in the specified frame and all its childre n		* attempt to fill out forms in the specified frame and all its childre n
	* frames.		* frames.
	*/		*/
	void fillFormData(QWebFrame *frame, bool recursive = true);		void fillFormData(QWebFrame *frame, bool recursive = true);
	/**		/**
	* Removes the form data specified by @p forms from the persistent stor age.		* Removes the form data specified by @p forms from the persistent stor age.
	*		*
	* This function is provided for convenience and simply calls @ref form sWithCachedData		* This function is provided for convenience and simply calls @ref form sWithCachedData
	* and @ref removeFormData. Note that this function will remove all cac hed		* and @ref removeFormData(WebFormList). Note that this function will r emove all cached
	* data for forms found in @p frame. If @p recursive is set to true, th en		* data for forms found in @p frame. If @p recursive is set to true, th en
	* all cached data for all of the child frames of @p frame will be remo ved		* all cached data for all of the child frames of @p frame will be remo ved
	* from the persistent storage as well.		* from the persistent storage as well.
	*		*
	* @see formsWithCachedData		* @see formsWithCachedData
	* @see removeFormData		* @see removeFormData
	*/		*/
	void removeFormData (QWebFrame *frame, bool recursive);		void removeFormData (QWebFrame *frame, bool recursive);
	/**		/**
End of changes. 10 change blocks.
	10 lines changed or deleted		43 lines changed or added

	kwidgetitemdelegate.h		kwidgetitemdelegate.h
	skipping to change at line 125		skipping to change at line 125
	*		*
	* @param painter the painter the widgets will be painted on.		* @param painter the painter the widgets will be painted on.
	* @param option the current set of style options for the view.		* @param option the current set of style options for the view.
	* @param index the model index of the item currently painted.		* @param index the model index of the item currently painted.
	*		*
	* @warning since 4.2 this method is not longer needed to be called. Al l widgets will kept		* @warning since 4.2 this method is not longer needed to be called. Al l widgets will kept
	* updated without the need of calling paintWidgets() in your paint() event. For the		* updated without the need of calling paintWidgets() in your paint() event. For the
	* widgets of a certain index to be updated your model has to emit dataChanged() on the		* widgets of a certain index to be updated your model has to emit dataChanged() on the
	* indexes that want to be updated.		* indexes that want to be updated.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void paintWidgets(QPainter *painter, const QStyleOptionV iewItem &option,		KDE_DEPRECATED void paintWidgets(QPainter *painter, const QStyleOptionV iewItem &option,
	const QPersistentModelIndex &index) co nst;		const QPersistentModelIndex &index) co nst;
			#endif
	/**		/**
	* Sets the list of event @p types that a @p widget will block.		* Sets the list of event @p types that a @p widget will block.
	*		*
	* Blocked events are not passed to the view. This way you can prevent an item		* Blocked events are not passed to the view. This way you can prevent an item
	* from being selected when a button is clicked for instance.		* from being selected when a button is clicked for instance.
	*		*
	* @param widget the widget which must block events		* @param widget the widget which must block events
	* @param types the list of event types the widget must block		* @param types the list of event types the widget must block
	*/		*/
	skipping to change at line 151		skipping to change at line 153
	*		*
	* @param widget the specified widget.		* @param widget the specified widget.
	*		*
	* @return the list of blocked event types, can be empty if no events a re blocked.		* @return the list of blocked event types, can be empty if no events a re blocked.
	*/		*/
	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 EventListener;		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_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. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	kxerrorhandler.h		kxerrorhandler.h
	skipping to change at line 83		skipping to change at line 83
	* NOTE: For the error flag to be set, the function must return a n on-zero		* NOTE: For the error flag to be set, the function must return a n on-zero
	* value.		* value.
	*/		*/
	explicit KXErrorHandler( int (*handler)( Display*, XErrorEvent* ), Display* dpy = QX11Info::display());		explicit KXErrorHandler( int (*handler)( Display*, XErrorEvent* ), Display* dpy = QX11Info::display());
	/**		/**
	* This constructor takes pointer to a function that will get reque st number,		* This constructor takes pointer to a function that will get reque st number,
	* error code number and resource id of the failed request, as prov ided		* error code number and resource id of the failed request, as prov ided
	* by XErrorEvent. If the function returns true, the error flag wil l be set.		* by XErrorEvent. If the function returns true, the error flag wil l be set.
	* @deprecated Use the variant with XErrorEvent.		* @deprecated Use the variant with XErrorEvent.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	explicit KXErrorHandler( bool (*handler)( int request, int error_co de, unsigned long resource_id ), Display* dpy = QX11Info::display()) KDE_DE PRECATED;		explicit KXErrorHandler( bool (*handler)( int request, int error_co de, unsigned long resource_id ), Display* dpy = QX11Info::display()) KDE_DE PRECATED;
			#endif
	/**		/**
	* This function returns true if the error flag is set (i.e. no cus tom handler		* This function returns true if the error flag is set (i.e. no cus tom handler
	* function was used and there was any error, or the custom handler indicated		* function was used and there was any error, or the custom handler indicated
	* an error by its return value).		* an error by its return value).
	*		*
	* @param sync if true, an explicit XSync() will be done. Not neces sary		* @param sync if true, an explicit XSync() will be done. Not neces sary
	* when the last X request required a roundtrip.		* when the last X request required a roundtrip.
	*/		*/
	bool error( bool sync ) const;		bool error( bool sync ) const;
	/**		/**
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kxmlguiclient.h		kxmlguiclient.h
	skipping to change at line 194		skipping to change at line 194
	/**		/**
	* Retrieves the client's GUI builder or 0 if no client specific		* Retrieves the client's GUI builder or 0 if no client specific
	* builder has been assigned via setClientBuilder()		* builder has been assigned via setClientBuilder()
	*/		*/
	KXMLGUIBuilder *clientBuilder() const;		KXMLGUIBuilder *clientBuilder() const;
	/**		/**
	* Forces this client to re-read its XML resource file. This is		* Forces this client to re-read its XML resource file. This is
	* intended to be used when you know that the resource file has		* intended to be used when you know that the resource file has
	* changed and you will soon be rebuilding the GUI. It has no		* changed and you will soon be rebuilding the GUI. This will only have
	* useful effect with non-KParts GUIs, so don't bother using it		* an effect if the client is then removed and re-added to the factory.
	* unless your app is component based.		*
			* This method is only for child clients, do not call it for a mainwindow
			!
			* For a mainwindow, use loadStandardsXmlFile + setXmlFile(xmlFile()) ins
			tead.
	*/		*/
	void reloadXML();		void reloadXML();
	/**		/**
	* ActionLists are a way for XMLGUI to support dynamic lists of		* ActionLists are a way for XMLGUI to support dynamic lists of
	* actions. E.g. if you are writing a file manager, and there is a		* actions. E.g. if you are writing a file manager, and there is a
	* menu file whose contents depend on the mimetype of the file that		* menu file whose contents depend on the mimetype of the file that
	* is selected, then you can achieve this using ActionLists. It		* is selected, then you can achieve this using ActionLists. It
	* works as follows:		* works as follows:
	* In your xxxui.rc file ( the one that you set in setXMLFile() / pass to setupGUI()		* In your xxxui.rc file ( the one that you set in setXMLFile() / pass to setupGUI()
	* ), you put a tag <tt>\<ActionList name="xxx"\></tt>.		* ), you put a tag <tt>\<ActionList name="xxx"\></tt>.
	*		*
	* Example:		* Example:
	* \code		* \code
	* <kpartgui name="xxx_part" version="1">		* <gui name="xxx_part" version="1">
	* <MenuBar>		* <MenuBar>
	* <Menu name="file">		* <Menu name="file">
	* ... <!-- some useful actions-->		* ... <!-- some useful actions-->
	* <ActionList name="xxx_file_actionlist" />		* <ActionList name="xxx_file_actionlist" />
	* ... <!-- even more useful actions-->		* ... <!-- even more useful actions-->
	* </Menu>		* </Menu>
	* ...		* ...
	* </MenuBar>		* </MenuBar>
	* </kpartgui>		* </gui>
	* \endcode		* \endcode
	*		*
	* This tag will get expanded to a list of actions. In the example		* This tag will get expanded to a list of actions. In the example
	* above ( a file manager with a dynamic file menu ), you would call		* above ( a file manager with a dynamic file menu ), you would call
	* \code		* \code
	* QList<QAction*> file_actions;		* QList<QAction*> file_actions;
	* for( ... )		* for( ... )
	* if( ... )		* if( ... )
	* file_actions.append( cool_action );		* file_actions.append( cool_action );
	* unplugActionList( "xxx_file_actionlist" );		* unplugActionList( "xxx_file_actionlist" );
	skipping to change at line 274		skipping to change at line 276
	QStringList actionsToDisable;		QStringList actionsToDisable;
	};		};
	StateChange getActionsToChangeForState(const QString& state);		StateChange getActionsToChangeForState(const QString& state);
	void beginXMLPlug( QWidget * );		void beginXMLPlug( QWidget * );
	void endXMLPlug();		void endXMLPlug();
	void prepareXMLUnplug( QWidget * );		void prepareXMLUnplug( QWidget * );
	/**		/**
	* Sets a new xmlFile() and localXMLFile(). The purpose of this pulic		* Sets a new xmlFile() and localXMLFile(). The purpose of this public
	* method is to allow non-inherited objects to replace the ui definition		* method is to allow non-inherited objects to replace the ui definition
	* of an embedded client with a customized version. It corresponds to the		* of an embedded client with a customized version. It corresponds to the
	* usual calls to setXMLFile() and setLocalXMLFile().		* usual calls to setXMLFile() and setLocalXMLFile().
	*		*
	* @param xmlfile The xml file to use. Contrary to setXMLFile(), this		* @param xmlfile The xml file to use. Contrary to setXMLFile(), this
	* must be an absolute file path.		* must be an absolute file path.
	* @param localxmfile The local xml file to set. This should be the full path		* @param localxmfile The local xml file to set. This should be the full path
	* to a writeable file, usually inside		* to a writeable file, usually inside
	* KStandardDirs::localkdedir(). You can set this to		* KStandardDirs::localkdedir(). You can set this to
	* QString(), but no user changes to shortcuts / toolb ars		* QString(), but no user changes to shortcuts / toolb ars
	skipping to change at line 331		skipping to change at line 333
	* filename, which will then be assumed to be installed		* filename, which will then be assumed to be installed
	* in the "data" resource, under a directory named like		* in the "data" resource, under a directory named like
	* the componentData.		* the componentData.
	* If you pass an absolute path here, make sure to also call		* If you pass an absolute path here, make sure to also call
	* setLocalXMLFile, otherwise toolbar editing won't work.		* setLocalXMLFile, otherwise toolbar editing won't work.
	* @param merge Whether to merge with the global document.		* @param merge Whether to merge with the global document.
	* @param setXMLDoc Specify whether to call setXML. Default is true.		* @param setXMLDoc Specify whether to call setXML. Default is true.
	**/		**/
	virtual void setXMLFile( const QString& file, bool merge = false, bool se tXMLDoc = true );		virtual void setXMLFile( const QString& file, bool merge = false, bool se tXMLDoc = true );
			/**
			* Load the ui_standards.rc file. Usually followed by setXMLFile(xmlFil
			e, true), for merging.
			* @since 4.6
			*/
			void loadStandardsXmlFile();
	/**		/**
	* Set the full path to the "local" xml file, the one used for saving		* Set the full path to the "local" xml file, the one used for saving
	* toolbar and shortcut changes. You normally don't need to call this,		* toolbar and shortcut changes. You normally don't need to call this,
	* if you pass a simple filename to setXMLFile.		* if you pass a simple filename to setXMLFile.
	*/		*/
	virtual void setLocalXMLFile( const QString &file );		virtual void setLocalXMLFile( const QString &file );
	/**		/**
	* Sets the XML for the part.		* Sets the XML for the part.
	*		*
	skipping to change at line 376		skipping to change at line 384
	* a \<State\> \</State\> group of the XMLfile. During program execution the		* a \<State\> \</State\> group of the XMLfile. During program execution the
	* programmer can call stateChanged() to set actions to a defined state.		* programmer can call stateChanged() to set actions to a defined state.
	*		*
	* @param newstate Name of a State in the XMLfile.		* @param newstate Name of a State in the XMLfile.
	* @param reverse If the flag reverse is set to StateReverse, the State i s reversed.		* @param reverse If the flag reverse is set to StateReverse, the State i s reversed.
	* (actions to be enabled will be disabled and action to be disabled will be enabled)		* (actions to be enabled will be disabled and action to be disabled will be enabled)
	* Default is reverse=false.		* Default is reverse=false.
	*/		*/
	virtual void stateChanged(const QString &newstate, ReverseStateChange re verse = StateNoReverse);		virtual void stateChanged(const QString &newstate, ReverseStateChange re verse = StateNoReverse);
			// KDE5 TODO: virtual void loadActionLists() {}, called when the guiclie
			nt is added to the xmlgui factory
	protected:		protected:
	virtual void virtual_hook( int id, void* data );		virtual void virtual_hook( int id, void* data );
	private:		private:
	KXMLGUIClientPrivate * const d;		KXMLGUIClientPrivate * const d;
	};		};
	#endif		#endif
End of changes. 6 change blocks.
	6 lines changed or deleted		20 lines changed or added

	lineedit.h		lineedit.h
	skipping to change at line 123		skipping to change at line 123
	* @return the native widget wrapped by this LineEdit		* @return the native widget wrapped by this LineEdit
	*/		*/
	KLineEdit *nativeWidget() const;		KLineEdit *nativeWidget() const;
	protected:		protected:
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);		void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	void changeEvent(QEvent *event);		void changeEvent(QEvent *event);
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q Widget *widget);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q Widget *widget);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
			void focusInEvent(QFocusEvent *event);
	void focusOutEvent(QFocusEvent *event);		void focusOutEvent(QFocusEvent *event);
	Q_SIGNALS:		Q_SIGNALS:
	void editingFinished();		void editingFinished();
	void returnPressed();		void returnPressed();
	void textEdited(const QString &text);		void textEdited(const QString &text);
	/**		/**
	* Emitted when the text changes		* Emitted when the text changes
	* @since 4.4		* @since 4.4
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	mainwindow.h		mainwindow.h
	skipping to change at line 55		skipping to change at line 55
	*/		*/
	class KPARTS_EXPORT MainWindow : public KXmlGuiWindow, virtual public PartB ase		class KPARTS_EXPORT MainWindow : public KXmlGuiWindow, virtual public PartB ase
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructor, same signature as KMainWindow.		* Constructor, same signature as KMainWindow.
	*/		*/
	explicit MainWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT _WINDOWFLAGS );		explicit MainWindow( QWidget* parent = 0, Qt::WindowFlags f = KDE_DEFAULT _WINDOWFLAGS );
	/// @deprecated, remove the name argument and use setObjectName instead		/// @deprecated, remove the name argument and use setObjectName instead
			#ifndef KDE_NO_DEPRECATED
	KDE_CONSTRUCTOR_DEPRECATED explicit MainWindow( QWidget* parent, const ch ar *name = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS );		KDE_CONSTRUCTOR_DEPRECATED explicit MainWindow( QWidget* parent, const ch ar *name = 0, Qt::WindowFlags f = KDE_DEFAULT_WINDOWFLAGS );
			#endif
	/**		/**
	* Destructor.		* Destructor.
	*/		*/
	virtual ~MainWindow();		virtual ~MainWindow();
	public Q_SLOTS:		public Q_SLOTS:
	virtual void configureToolbars();		virtual void configureToolbars();
	protected Q_SLOTS:		protected Q_SLOTS:
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	movinginterface.h		movinginterface.h
	skipping to change at line 36		skipping to change at line 36
	#include <ktexteditor/ktexteditor_export.h>		#include <ktexteditor/ktexteditor_export.h>
	#include <ktexteditor/movingcursor.h>		#include <ktexteditor/movingcursor.h>
	#include <ktexteditor/movingrange.h>		#include <ktexteditor/movingrange.h>
	#include <ktexteditor/movingrangefeedback.h>		#include <ktexteditor/movingrangefeedback.h>
	namespace KTextEditor		namespace KTextEditor
	{		{
	/**		/**
	* \short A class which provides the interface to create MovingCursors and MovingRanges.		* \brief Document interface for for MovingCursor%s and MovingRange%s.
	*		*
			* \ingroup kte_group_document_extension
	* \ingroup kte_group_moving_classes		* \ingroup kte_group_moving_classes
	*		*
	* This class provides the interface for KTextEditor::Documents to create M ovingCursors/Ranges.		* This class provides the interface for KTextEditor::Documents to create M ovingCursors/Ranges.
	*		*
	* \author Christoph Cullmann \<cullmann@kde.org\>		* \author Christoph Cullmann \<cullmann@kde.org\>
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	class KTEXTEDITOR_EXPORT MovingInterface		class KTEXTEDITOR_EXPORT MovingInterface
	{		{
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	movingrange.h		movingrange.h
	skipping to change at line 214		skipping to change at line 214
	* \param attribute MovingRangeFeedback to assign to this range. If nul l, simply		* \param attribute MovingRangeFeedback to assign to this range. If nul l, simply
	* removes the previous MovingRangeFeedback.		* removes the previous MovingRangeFeedback.
	*/		*/
	virtual void setFeedback (MovingRangeFeedback *feedback) = 0;		virtual void setFeedback (MovingRangeFeedback *feedback) = 0;
	/**		/**
	* Gets the current Z-depth of this range.		* Gets the current Z-depth of this range.
	* Ranges with smaller Z-depth than others will win during rendering.		* Ranges with smaller Z-depth than others will win during rendering.
	* Default is 0.0.		* Default is 0.0.
	*		*
			* Defined depths for common kind of ranges use in editor components im
			plenting this interface,
			* smaller depths are more more in the foreground and will win during r
			endering:
			* - Selection == -100000.0
			* - Search == -10000.0
			* - Bracket Highlighting == -1000.0
			* - Folding Hover == -100.0
			*
	* \return current Z-depth of this range		* \return current Z-depth of this range
	*/		*/
	virtual qreal zDepth () const = 0;		virtual qreal zDepth () const = 0;
	/**		/**
	* Set the current Z-depth of this range.		* Set the current Z-depth of this range.
	* Ranges with smaller Z-depth than others will win during rendering.		* Ranges with smaller Z-depth than others will win during rendering.
	* This will trigger update of the relevant view parts, if the depth ch anged.		* This will trigger update of the relevant view parts, if the depth ch anged.
	* Set depth before the attribute, that will avoid not needed redraws.		* Set depth before the attribute, that will avoid not needed redraws.
	* Default is 0.0.		* Default is 0.0.
End of changes. 1 change blocks.
	0 lines changed or deleted		9 lines changed or added

	nepomuk_export.h		nepomuk_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef NEPOMUK_EXPORT_H		#ifndef NEPOMUK_EXPORT_H
	#define NEPOMUK_EXPORT_H		#define NEPOMUK_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef NEPOMUK_EXPORT		#ifndef NEPOMUK_EXPORT
	# if defined(MAKE_NEPOMUK_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define NEPOMUK_EXPORT
			# elif defined(MAKE_NEPOMUK_LIB)
	/* We are building this library */		/* We are building this library */
	# define NEPOMUK_EXPORT KDE_EXPORT		# define NEPOMUK_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define NEPOMUK_EXPORT KDE_IMPORT		# define NEPOMUK_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	nepomukquery_export.h		nepomukquery_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef NEPOMUKQUERY_EXPORT_H		#ifndef NEPOMUKQUERY_EXPORT_H
	#define NEPOMUKQUERY_EXPORT_H		#define NEPOMUKQUERY_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef NEPOMUKQUERY_EXPORT		#ifndef NEPOMUKQUERY_EXPORT
	# if defined(MAKE_NEPOMUKQUERY_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define NEPOMUKQUERY_EXPORT
			# elif defined(MAKE_NEPOMUKQUERY_LIB)
	/* We are building this library */		/* We are building this library */
	# define NEPOMUKQUERY_EXPORT KDE_EXPORT		# define NEPOMUKQUERY_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define NEPOMUKQUERY_EXPORT KDE_IMPORT		# define NEPOMUKQUERY_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef NEPOMUKQUERY_EXPORT_DEPRECATED		# ifndef NEPOMUKQUERY_EXPORT_DEPRECATED
	# define NEPOMUKQUERY_EXPORT_DEPRECATED KDE_DEPRECATED NEPOMUKQUERY_EXPORT		# define NEPOMUKQUERY_EXPORT_DEPRECATED KDE_DEPRECATED NEPOMUKQUERY_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	netaccess.h		netaccess.h
	skipping to change at line 194		skipping to change at line 194
	* @param window main window associated with this job. This is used to		* @param window main window associated with this job. This is used to
	* automatically cache and discard authentication informa tion		* automatically cache and discard authentication informa tion
	* as needed. If NULL, authentication information will be cached		* as needed. If NULL, authentication information will be cached
	* only for a short duration after which the user will ag ain be		* only for a short duration after which the user will ag ain be
	* prompted for passwords as needed.		* prompted for passwords as needed.
	*		*
	* @return true if successful, false for failure		* @return true if successful, false for failure
	*/		*/
	static bool file_copy( const KUrl& src, const KUrl& target, QWidget* wi ndow = 0 );		static bool file_copy( const KUrl& src, const KUrl& target, QWidget* wi ndow = 0 );
	/// @deprecated, use file_copy instead		/// @deprecated, use file_copy instead
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool copy( const KUrl& src, const KUrl& target,		static KDE_DEPRECATED bool copy( const KUrl& src, const KUrl& target,
	QWidget* window = 0 );		QWidget* window = 0 );
			#endif
	/**		/**
	* Alternative method for copying over the network.		* Alternative method for copying over the network.
	*		*
	* This one takes two URLs and is a direct equivalent		* This one takes two URLs and is a direct equivalent
	* of KIO::copy!.		* of KIO::copy!.
	* This means that it can copy files and directories alike		* This means that it can copy files and directories alike
	* (it should have been named copy()).		* (it should have been named copy()).
	*		*
	* This method will bring up a dialog if the destination already exists .		* This method will bring up a dialog if the destination already exists .
	skipping to change at line 229		skipping to change at line 231
	/**		/**
	* Overloaded method, which takes a list of source URLs		* Overloaded method, which takes a list of source URLs
	*/		*/
	static bool dircopy( const KUrl::List& src, const KUrl& target, QWidget * window = 0L ); // TODO deprecate in favor of KIO::copy + synchronousRun ( or job->exec())		static bool dircopy( const KUrl::List& src, const KUrl& target, QWidget * window = 0L ); // TODO deprecate in favor of KIO::copy + synchronousRun ( or job->exec())
	/**		/**
	* Full-fledged equivalent of KIO::move.		* Full-fledged equivalent of KIO::move.
	* Moves or renames one file or directory.		* Moves or renames one file or directory.
	* @deprecated use KIO::move and then KIO::NetAccess::synchronousRun (o r job->exec())		* @deprecated use KIO::move and then KIO::NetAccess::synchronousRun (o r job->exec())
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool move( const KUrl& src, const KUrl& target, Q Widget* window = 0L );		static KDE_DEPRECATED bool move( const KUrl& src, const KUrl& target, Q Widget* window = 0L );
			#endif
	/**		/**
	* Full-fledged equivalent of KIO::move.		* Full-fledged equivalent of KIO::move.
	* Moves or renames a list of files or directories.		* Moves or renames a list of files or directories.
	* @deprecated use KIO::move and then KIO::NetAccess::synchronousRun (o r job->exec())		* @deprecated use KIO::move and then KIO::NetAccess::synchronousRun (o r job->exec())
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool move( const KUrl::List& src, const KUrl& tar get, QWidget* window = 0L );		static KDE_DEPRECATED bool move( const KUrl::List& src, const KUrl& tar get, QWidget* window = 0L );
			#endif
	/**		/**
	* Tests whether a URL exists.		* Tests whether a URL exists.
	*		*
	* @param url the URL we are testing		* @param url the URL we are testing
	* @param source if true, we want to read from that URL.		* @param source if true, we want to read from that URL.
	* If false, we want to write to it.		* If false, we want to write to it.
	* IMPORTANT: see documentation for KIO::stat for more details about th is.		* IMPORTANT: see documentation for KIO::stat for more details about th is.
	* @param window main window associated with this job. This is used to		* @param window main window associated with this job. This is used to
	* automatically cache and discard authentication informa tion		* automatically cache and discard authentication informa tion
	* as needed. If NULL, authentication information will be		* as needed. If NULL, authentication information will be
	* cached only for a short duration after which the user will		* cached only for a short duration after which the user will
	* again be prompted for passwords as needed.		* again be prompted for passwords as needed.
	* @return true if the URL exists and we can do the operation specified by		* @return true if the URL exists and we can do the operation specified by
	* @p source, false otherwise		* @p source, false otherwise
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool exists(const KUrl& url, bool source, QWidget * window);		static KDE_DEPRECATED bool exists(const KUrl& url, bool source, QWidget * window);
			#endif
	/**		/**
	* Tests whether a URL exists.		* Tests whether a URL exists.
	*		*
	* @param url the URL we are testing		* @param url the URL we are testing
	* @param statSide determines if we want to read or write.		* @param statSide determines if we want to read or write.
	* IMPORTANT: see documentation for KIO::stat for more details about th is.		* IMPORTANT: see documentation for KIO::stat for more details about th is.
	* @param window main window associated with this job. This is used to		* @param window main window associated with this job. This is used to
	* automatically cache and discard authentication informa tion		* automatically cache and discard authentication informa tion
	* as needed. If NULL, authentication information will be		* as needed. If NULL, authentication information will be
End of changes. 8 change blocks.
	0 lines changed or deleted		8 lines changed or added

	netwm.h		netwm.h
	skipping to change at line 1268		skipping to change at line 1268
	* Returns the window role for the window (i.e. WM_WINDOW_ROLE property ).		* Returns the window role for the window (i.e. WM_WINDOW_ROLE property ).
	*/		*/
	const char* windowRole() const;		const char* windowRole() const;
	/**		/**
	* Returns the client machine for the window (i.e. WM_CLIENT_MACHINE pr operty).		* Returns the client machine for the window (i.e. WM_CLIENT_MACHINE pr operty).
	*/		*/
	const char* clientMachine() const;		const char* clientMachine() const;
	/**		/**
			* returns a comma-separated list of the activities the window is assoc
			iated with.
			* FIXME this might be better as a NETRArray ?
			* @since 4.6
			*/
			const char* activities() 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		8 lines changed or added

	netwm_def.h		netwm_def.h
	skipping to change at line 688		skipping to change at line 688
	WM2TakeActivity = 1<<8,		WM2TakeActivity = 1<<8,
	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
	};		};
	/**		/**
	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		2 lines changed or added

	networking.h		networking.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Will Stephenson <wstephenson@kde.org>		Copyright 2006-2007 Will Stephenson <wstephenson@kde.org>
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_NETWORKING		#ifndef SOLID_NETWORKING
	#define SOLID_NETWORKING		#define SOLID_NETWORKING
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	12 lines changed or deleted		13 lines changed or added

	networkinterface.h		networkinterface.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_NETWORKINTERFACE_H		#ifndef SOLID_NETWORKINTERFACE_H
	#define SOLID_NETWORKINTERFACE_H		#define SOLID_NETWORKINTERFACE_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	opticaldisc.h		opticaldisc.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_OPTICALDISC_H		#ifndef SOLID_OPTICALDISC_H
	#define SOLID_OPTICALDISC_H		#define SOLID_OPTICALDISC_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/storagevolume.h>		#include <solid/storagevolume.h>
	namespace Solid		namespace Solid
	skipping to change at line 61		skipping to change at line 62
	public:		public:
	/**		/**
	* This enum type defines the type of content available in an optic al disc.		* This enum type defines the type of content available in an optic al disc.
	*		*
	* - Audio : A disc containing audio		* - Audio : A disc containing audio
	* - Data : A disc containing data		* - Data : A disc containing data
	* - VideoCd : A Video Compact Disc (VCD)		* - VideoCd : A Video Compact Disc (VCD)
	* - SuperVideoCd : A Super Video Compact Disc (SVCD)		* - SuperVideoCd : A Super Video Compact Disc (SVCD)
	* - VideoDvd : A Video Digital Versatile Disc (DVD-Video)		* - VideoDvd : A Video Digital Versatile Disc (DVD-Video)
	*/		*/
	enum ContentType { Audio = 0x01, Data = 0x02, VideoCd = 0x04, Super		enum ContentType {
	VideoCd = 0x08, VideoDvd = 0x10 };		NoContent = 0x00,
			Audio = 0x01,
			Data = 0x02,
			VideoCd = 0x04,
			SuperVideoCd = 0x08,
			VideoDvd = 0x10,
			VideoBluRay = 0x20
			};
	/**		/**
	* This type stores an OR combination of ContentType values.		* This type stores an OR combination of ContentType values.
	*/		*/
	Q_DECLARE_FLAGS(ContentTypes, ContentType)		Q_DECLARE_FLAGS(ContentTypes, ContentType)
	/**		/**
	* This enum type defines the type of optical disc it can be.		* This enum type defines the type of optical disc it can be.
	*		*
	* - UnknownDiscType : An undetermined disc type		* - UnknownDiscType : An undetermined disc type
	skipping to change at line 128		skipping to change at line 137
	* @return the OpticalDisc device interface type		* @return the OpticalDisc device interface type
	* @see Solid::Ifaces::Enums::DeviceInterface::Type		* @see Solid::Ifaces::Enums::DeviceInterface::Type
	*/		*/
	static Type deviceInterfaceType() { return DeviceInterface::Optical Disc; }		static Type deviceInterfaceType() { return DeviceInterface::Optical Disc; }
	/**		/**
	* Retrieves the content types this disc contains (audio, video,		* Retrieves the content types this disc contains (audio, video,
	* data...).		* data...).
	*		*
	* @return the flag set indicating the available contents		* @return the flag set indicating the available contents
			* @see Solid::OpticalDisc::ContentType
	*/		*/
	ContentTypes availableContent() const;		ContentTypes availableContent() const;
	/**		/**
	* Retrieves the disc type (cdr, cdrw...).		* Retrieves the disc type (cdr, cdrw...).
	*		*
	* @return the disc type		* @return the disc type
	*/		*/
	DiscType discType() const;		DiscType discType() const;
End of changes. 6 change blocks.
	13 lines changed or deleted		22 lines changed or added

	opticaldrive.h		opticaldrive.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_OPTICALDRIVE_H		#ifndef SOLID_OPTICALDRIVE_H
	#define SOLID_OPTICALDRIVE_H		#define SOLID_OPTICALDRIVE_H
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/solidnamespace.h>		#include <solid/solidnamespace.h>
	skipping to change at line 39		skipping to change at line 40
	#include <solid/storagedrive.h>		#include <solid/storagedrive.h>
	namespace Solid		namespace Solid
	{		{
	class OpticalDrivePrivate;		class OpticalDrivePrivate;
	class Device;		class Device;
	/**		/**
	* This device interface is available on CD-R*,DVD*,Blu-Ray,HD-DVD driv es.		* This device interface is available on CD-R*,DVD*,Blu-Ray,HD-DVD driv es.
	*		*
	* A Cdrom is a storage that can handle optical discs.		* An OpticalDrive is a storage that can handle optical discs.
	*/		*/
	class SOLID_EXPORT OpticalDrive : public StorageDrive		class SOLID_EXPORT OpticalDrive : public StorageDrive
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(MediumType)		Q_ENUMS(MediumType)
	Q_FLAGS(MediumTypes)		Q_FLAGS(MediumTypes)
	Q_PROPERTY(MediumTypes supportedMedia READ supportedMedia)		Q_PROPERTY(MediumTypes supportedMedia READ supportedMedia)
	Q_PROPERTY(int readSpeed READ readSpeed)		Q_PROPERTY(int readSpeed READ readSpeed)
	Q_PROPERTY(int writeSpeed READ writeSpeed)		Q_PROPERTY(int writeSpeed READ writeSpeed)
	Q_PROPERTY(QList<int> writeSpeeds READ writeSpeeds)		Q_PROPERTY(QList<int> writeSpeeds READ writeSpeeds)
	Q_DECLARE_PRIVATE(OpticalDrive)		Q_DECLARE_PRIVATE(OpticalDrive)
	friend class Device;		friend class Device;
	public:		public:
	/**		/**
	* This enum type defines the type of medium a cdrom drive supports .		* This enum type defines the type of medium an optical drive suppo rts.
	*		*
	* - Cdr : A Recordable Compact Disc (CD-R)		* - Cdr : A Recordable Compact Disc (CD-R)
	* - Cdrw : A ReWritable Compact Disc (CD-RW)		* - Cdrw : A ReWritable Compact Disc (CD-RW)
	* - Dvd : A Digital Versatile Disc (DVD)		* - Dvd : A Digital Versatile Disc (DVD)
	* - Dvdr : A Recordable Digital Versatile Disc (DVD-R)		* - Dvdr : A Recordable Digital Versatile Disc (DVD-R)
	* - Dvdrw : A ReWritable Digital Versatile Disc (DVD-RW)		* - Dvdrw : A ReWritable Digital Versatile Disc (DVD-RW)
	* - Dvdram : A Random Access Memory Digital Versatile Disc (DVD-RA M)		* - Dvdram : A Random Access Memory Digital Versatile Disc (DVD-RA M)
	* - Dvdplusr : A Recordable Digital Versatile Disc (DVD+R)		* - Dvdplusr : A Recordable Digital Versatile Disc (DVD+R)
	* - Dvdplusrw : A ReWritable Digital Versatile Disc (DVD+RW)		* - Dvdplusrw : A ReWritable Digital Versatile Disc (DVD+RW)
	* - Dvdplusdl : A Dual Layer Digital Versatile Disc (DVD+R DL)		* - Dvdplusdl : A Dual Layer Digital Versatile Disc (DVD+R DL)
	skipping to change at line 87		skipping to change at line 88
	Bd=0x00400, Bdr=0x00800, Bdre=0x01000,		Bd=0x00400, Bdr=0x00800, Bdre=0x01000,
	HdDvd=0x02000, HdDvdr=0x04000, HdDvdrw=0x08000 };		HdDvd=0x02000, HdDvdr=0x04000, HdDvdrw=0x08000 };
	/**		/**
	* This type stores an OR combination of MediumType values.		* This type stores an OR combination of MediumType values.
	*/		*/
	Q_DECLARE_FLAGS(MediumTypes, MediumType)		Q_DECLARE_FLAGS(MediumTypes, MediumType)
	private:		private:
	/**		/**
	* Creates a new Cdrom object.		* Creates a new OpticalDrive object.
	* You generally won't need this. It's created when necessary using		* You generally won't need this. It's created when necessary using
	* Device::as().		* Device::as().
	*		*
	* @param backendObject the device interface object provided by the backend		* @param backendObject the device interface object provided by the backend
	* @see Solid::Device::as()		* @see Solid::Device::as()
	*/		*/
	explicit OpticalDrive(QObject *backendObject);		explicit OpticalDrive(QObject *backendObject);
	public:		public:
	/**		/**
	* Destroys a Cdrom object.		* Destroys an OpticalDrive object.
	*/		*/
	virtual ~OpticalDrive();		virtual ~OpticalDrive();
	/**		/**
	* Get the Solid::DeviceInterface::Type of the Cdrom device interfa ce.		* Get the Solid::DeviceInterface::Type of the OpticalDrive device interface.
	*		*
	* @return the Cdrom device interface type		* @return the OpticalDrive device interface type
	* @see Solid::Ifaces::Enums::DeviceInterface::Type		* @see Solid::Ifaces::Enums::DeviceInterface::Type
	*/		*/
	static Type deviceInterfaceType() { return DeviceInterface::Optical Drive; }		static Type deviceInterfaceType() { return DeviceInterface::Optical Drive; }
	/**		/**
	* Retrieves the medium types this drive supports.		* Retrieves the medium types this drive supports.
	*		*
	* @return the flag set indicating the supported medium types		* @return the flag set indicating the supported medium types
	*/		*/
	MediumTypes supportedMedia() const;		MediumTypes supportedMedia() const;
End of changes. 10 change blocks.
	17 lines changed or deleted		18 lines changed or added

	package.h		package.h
	skipping to change at line 46		skipping to change at line 46
	* @short object representing an installed Plasmagik package		* @short object representing an installed Plasmagik package
	**/		**/
	class PackageMetadata;		class PackageMetadata;
	class PackagePrivate;		class PackagePrivate;
	class PLASMA_EXPORT Package		class PLASMA_EXPORT Package
	{		{
	public:		public:
	/**		/**
	* Default constructor		* Default constructor that creates an invalid Package
			* @since 4.6
			*/
			explicit Package();
			/**
			* Construct a Package object
	*		*
	* @arg packageRoot path to the package installation root		* @arg packageRoot path to the package installation root
	* @arg package the name of the package		* @arg package the name of the package
	* @arg structure the package structure describing this package		* @arg 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		* @arg packagePath full path to the package directory
	* @arg structure the package structure describing this package		* @arg structure the package structure describing this package
	*/		*/
	Package(const QString &packagePath, PackageStructure::Ptr structure );		Package(const QString &packagePath, PackageStructure::Ptr structure );
			/**
			* Copy constructore
			* @since 4.6
			*/
			Package(const Package &other);
	~Package();		~Package();
	/**		/**
			* Assignment operator
			* @since 4.6
			*/
			Package &operator=(const Package &rhs);
			/**
	* @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		* @arg fileType the type of file to look for, as defined in the
	* package structure		* package structure
	skipping to change at line 216		skipping to change at line 234
	* files to be added to the package		* files to be added to the package
	* @arg destination path to the package that should be created		* @arg destination path to the package that should be created
	* @arg icon path to the package icon		* @arg 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:
	Q_DISABLE_COPY(Package)
	PackagePrivate * const d;		PackagePrivate * const d;
	friend class Applet;		friend class Applet;
	friend class AppletPrivate;		friend class AppletPrivate;
	};		};
	} // Namespace		} // Namespace
			Q_DECLARE_METATYPE(Plasma::Package)
	#endif		#endif
End of changes. 5 change blocks.
	2 lines changed or deleted		20 lines changed or added

	packagestructure.h		packagestructure.h
	skipping to change at line 136		skipping to change at line 136
	/**		/**
	* The individual required files, by key, that are defined for this pac kage		* The individual required files, by key, that are defined for this pac kage
	**/		**/
	QList<const char*> requiredFiles() const;		QList<const char*> requiredFiles() const;
	/**		/**
	* Adds a directory to the structure of the package. It is added as		* Adds a directory to the structure of the package. It is added as
	* a not-required element with no associated mimetypes.		* a not-required element with no associated mimetypes.
	*		*
			* Starting in 4.6, if an entry with the given key
			* already exists, the path is added to it as a search alternative.
			*
	* @param key used as an internal label for this directory		* @param key used as an internal label for this directory
	* @param path the path within the package for this directory		* @param path the path within the package for this directory
	* @param name the user visible (translated) name for the directory		* @param name the user visible (translated) name for the directory
	**/		**/
	void addDirectoryDefinition(const char *key, const QString &path, const QString &name);		void addDirectoryDefinition(const char *key, const QString &path, const QString &name);
	/**		/**
	* Adds a file to the structure of the package. It is added as		* Adds a file to the structure of the package. It is added as
	* a not-required element with no associated mimetypes.		* a not-required element with no associated mimetypes.
	*		*
			* Starting in 4.6, if an entry with the given key
			* already exists, the path is added to it as a search alternative.
			*
	* @param key used as an internal label for this file		* @param key used as an internal label for this file
	* @param path the path within the package for this file		* @param path the path within the package for this file
	* @param name the user visible (translated) name for the file		* @param name the user visible (translated) name for the file
	**/		**/
	void addFileDefinition(const char *key, const QString &path, const QStr ing &name);		void addFileDefinition(const char *key, const QString &path, const QStr ing &name);
	/**		/**
			* Removes a definition from the structure of the package.
			* @since 4.6
			* @param key the internal label of the file or directory to remove
			*/
			void removeDefinition(const char *key);
			/**
	* @return path relative to the package root for the given entry		* @return path relative to the package root for the given entry
			* @deprecatd use searchPaths instead
	**/		**/
	QString path(const char *key) const;		QString path(const char *key) const;
	/**		/**
			* @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
			* will be searched in order
			* @since 4.6
			**/
			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		* @arg 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
	skipping to change at line 267		skipping to change at line 289
	*		*
	* When the process is complete, the newWidgetBrowserFinished() signal must be		* When the process is complete, the newWidgetBrowserFinished() signal must be
	* emitted.		* emitted.
	*		*
	* @param parent the parent widget to use for the widget		* @param parent the parent widget to use for the widget
	*/		*/
	virtual void createNewWidgetBrowser(QWidget *parent = 0);		virtual void createNewWidgetBrowser(QWidget *parent = 0);
	/**		/**
	* @return the prefix inserted between the base path and content entrie s		* @return the prefix inserted between the base path and content entrie s
			* @deprecated use contentsPrefixPaths() instead.
	*/		*/
	QString contentsPrefix() const;		KDE_DEPRECATED QString contentsPrefix() const;
			/**
			* @return the prefix paths inserted between the base path and content
			entries, in order of priority.
			* When searching for a file, all paths will be tried in order.
			* @since 4.6
			*/
			QStringList contentsPrefixPaths() const;
	/**		/**
	* @return preferred package root. This defaults to plasma/plasmoids/		* @return preferred package root. This defaults to plasma/plasmoids/
	*/		*/
	QString defaultPackageRoot() const;		QString defaultPackageRoot() const;
	/**		/**
	* @return service prefix used in desktop files. This defaults to plasm a-applet-		* @return service prefix used in desktop files. This defaults to plasm a-applet-
	*/		*/
	QString servicePrefix() const;		QString servicePrefix() const;
	skipping to change at line 317		skipping to change at line 347
	*/		*/
	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		* @arg prefix the directory prefix to use
			* @deprecated use setContentsPrefixPaths() instead.
	*/		*/
	void setContentsPrefix(const QString &prefix);		KDE_DEPRECATED void setContentsPrefix(const QString &prefix);
			/**
			* Sets the prefixes that all the contents in this package should
			* appear under. This defaults to "contents/" and is added automaticall
			y
			* between the base path and the entries as defined by the package
			* structure. Multiple entries can be added.
			* In this case each file request will be searched in all prefixes in o
			rder,
			* and the first found will be returned.
			*
			* @arg prefix paths the directory prefix to use
			* @since 4.6
			*/
			void setContentsPrefixPaths(const QStringList &prefixPaths);
	/**		/**
	* Sets preferred package root.		* Sets preferred package root.
	*/		*/
	void setDefaultPackageRoot(const QString &packageRoot);		void setDefaultPackageRoot(const QString &packageRoot);
	/**		/**
	* Called whenever the path changes so that subclasses may take		* Called whenever the path changes so that subclasses may take
	* package specific actions.		* package specific actions.
	*/		*/
End of changes. 9 change blocks.
	2 lines changed or deleted		51 lines changed or added

	part.h		part.h
	skipping to change at line 660		skipping to change at line 660
	/**		/**
	* Emit this if loading is canceled by the user or by an error.		* Emit this if loading is canceled by the user or by an error.
	* @param errMsg the error message, empty if the user canceled the load ing voluntarily.		* @param errMsg the error message, empty if the user canceled the load ing voluntarily.
	*/		*/
	void canceled( const QString &errMsg );		void canceled( const QString &errMsg );
	protected:		protected:
	/**		/**
	* If the part uses the standard implementation of openUrl(),		* If the part uses the standard implementation of openUrl(),
	* it must reimplement this, to open the local file.		* it must reimplement this, to open the local file.
	* Otherwise simply define it to { return false; }		* The default implementation is simply { return false; }
	*/		*/
	virtual bool openFile() = 0;		virtual bool openFile();
	/**		/**
	* @internal		* @internal
	*/		*/
	void abortLoad();		void abortLoad();
	/**		/**
	* Reimplemented from Part, so that the window caption is set to		* Reimplemented from Part, so that the window caption is set to
	* the current url (decoded) when the part is activated		* the current url (decoded) when the part is activated
	* This is the usual behavior in 99% of the apps		* This is the usual behavior in 99% of the apps
	skipping to change at line 684		skipping to change at line 684
	*		*
	* Technical note : this is done with GUIActivateEvent and not with		* Technical note : this is done with GUIActivateEvent and not with
	* PartActivateEvent because it's handled by the mainwindow		* PartActivateEvent because it's handled by the mainwindow
	* (which gets the even after the PartActivateEvent events have been se nt)		* (which gets the even after the PartActivateEvent events have been se nt)
	*/		*/
	virtual void guiActivateEvent( GUIActivateEvent *event );		virtual void guiActivateEvent( GUIActivateEvent *event );
	/**		/**
	* @internal		* @internal
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool isLocalFileTemporary() const;		KDE_DEPRECATED bool isLocalFileTemporary() const;
			#endif
	/**		/**
	* @internal		* @internal
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setLocalFileTemporary( bool temp );		KDE_DEPRECATED void setLocalFileTemporary( bool temp );
			#endif
	/**		/**
	* Sets the url associated with this part.		* Sets the url associated with this part.
	*/		*/
	void setUrl(const KUrl &url);		void setUrl(const KUrl &url);
	/**		/**
	* Returns the local file path associated with this part.		* Returns the local file path associated with this part.
	*/		*/
	QString localFilePath() const;		QString localFilePath() const;
	skipping to change at line 711		skipping to change at line 715
	/**		/**
	* Sets the local file path associated with this part.		* Sets the local file path associated with this part.
	*/		*/
	void setLocalFilePath( const QString &localFilePath );		void setLocalFilePath( const QString &localFilePath );
	protected:		protected:
	ReadOnlyPart(ReadOnlyPartPrivate &dd, QObject *parent);		ReadOnlyPart(ReadOnlyPartPrivate &dd, QObject *parent);
	private:		private:
	Q_PRIVATE_SLOT(d_func(), void _k_slotJobFinished( KJob * job ))		Q_PRIVATE_SLOT(d_func(), void _k_slotJobFinished( KJob * job ))
			Q_PRIVATE_SLOT(d_func(), void _k_slotStatJobFinished(KJob*))
	Q_PRIVATE_SLOT(d_func(), void _k_slotGotMimeType(KIO::Job *job, const Q String &mime))		Q_PRIVATE_SLOT(d_func(), void _k_slotGotMimeType(KIO::Job *job, const Q String &mime))
	Q_DISABLE_COPY(ReadOnlyPart)		Q_DISABLE_COPY(ReadOnlyPart)
	};		};
	class ReadWritePartPrivate;		class ReadWritePartPrivate;
	/**		/**
	* Base class for an "editor" part.		* Base class for an "editor" part.
	*		*
	* This class handles network transparency for you.		* This class handles network transparency for you.
End of changes. 7 change blocks.
	2 lines changed or deleted		7 lines changed or added

	plasma.h		plasma.h
	skipping to change at line 188		skipping to change at line 188
	and have full interaction */		and have full interaction */
	GroupZoom, /**< Plasmoids are shown as icons in visual groups; dr ag		GroupZoom, /**< Plasmoids are shown as icons in visual groups; dr ag
	and drop and limited context menu interaction only */		and drop and limited context menu interaction only */
	OverviewZoom /**< Groups become icons themselves */		OverviewZoom /**< Groups become icons themselves */
	};		};
	/**		/**
	* Possible timing alignments		* Possible timing alignments
	**/		**/
	enum IntervalAlignment {		enum IntervalAlignment {
	NoAlignment = 0,		NoAlignment = 0, /**< No alignment **/
	AlignToMinute,		AlignToMinute, /**< Align to the minute **/
	AlignToHour		AlignToHour /**< Align to the hour **/
	};		};
	enum ItemTypes {		enum ItemTypes {
	AppletType = QGraphicsItem::UserType + 1,		AppletType = QGraphicsItem::UserType + 1,
	LineEditType = QGraphicsItem::UserType + 2		LineEditType = QGraphicsItem::UserType + 2
	};		};
	/**		/**
	* Defines the immutability of items like applets, corona and containments		* Defines the immutability of items like applets, corona and containments
	* they can be free to modify, locked down by the user or locked down by th e		* they can be free to modify, locked down by the user or locked down by th e
	skipping to change at line 242		skipping to change at line 242
	AppletComponent = 1, /**< Plasma::Applet based plugins **/		AppletComponent = 1, /**< Plasma::Applet based plugins **/
	DataEngineComponent = 2, /**< Plasma::DataEngine based plugins **/		DataEngineComponent = 2, /**< Plasma::DataEngine based plugins **/
	RunnerComponent = 4, /**< Plasma::AbstractRunner based plugsin **/		RunnerComponent = 4, /**< Plasma::AbstractRunner based plugsin **/
	AnimatorComponent = 8, /**< Plasma::Animator based plugins **/		AnimatorComponent = 8, /**< Plasma::Animator based plugins **/
	ContainmentComponent = 16,/**< Plasma::Containment based plugins **/		ContainmentComponent = 16,/**< Plasma::Containment based plugins **/
	WallpaperComponent = 32 /**< Plasma::Wallpaper based plugins **/		WallpaperComponent = 32 /**< Plasma::Wallpaper based plugins **/
	};		};
	Q_DECLARE_FLAGS(ComponentTypes, ComponentType)		Q_DECLARE_FLAGS(ComponentTypes, ComponentType)
	enum MarginEdge {		enum MarginEdge {
	TopMargin = 0,		TopMargin = 0, /**< The top margin **/
	BottomMargin,		BottomMargin, /**< The bottom margin **/
	LeftMargin,		LeftMargin, /**< The left margin **/
	RightMargin		RightMargin /**< The right margin **/
	};		};
	enum MessageButton {		enum MessageButton {
	ButtonNone = 0,		ButtonNone = 0, /**< None **/
	ButtonOk = 1,		ButtonOk = 1, /**< OK Button **/
	ButtonYes = 2,		ButtonYes = 2, /**< Yes Button **/
	ButtonNo = 4,		ButtonNo = 4, /**< No Button **/
	ButtonCancel = 8		ButtonCancel = 8 /**< Cancel Button **/
	};		};
	Q_DECLARE_FLAGS(MessageButtons, MessageButton)		Q_DECLARE_FLAGS(MessageButtons, MessageButton)
	/**		/**
	* Status of an applet		* Status of an applet
	* @since 4.3		* @since 4.3
	*/		*/
	enum ItemStatus {		enum ItemStatus {
	UnknownStatus = 0,		UnknownStatus = 0, /**< The status is unknown **/
	PassiveStatus = 1,		PassiveStatus = 1, /**< The Item is passive **/
	ActiveStatus = 2,		ActiveStatus = 2, /**< The Item is active **/
	NeedsAttentionStatus = 3,		NeedsAttentionStatus = 3, /**< The Item needs attention **/
	AcceptingInputStatus = 4		AcceptingInputStatus = 4 /**< The Item is accepting input **/
	};		};
	Q_ENUMS(ItemStatus)		Q_ENUMS(ItemStatus)
	enum AnnouncementMethod {		enum AnnouncementMethod {
	NoAnnouncement = 0,		NoAnnouncement = 0, /**< No announcements **/
	ZeroconfAnnouncement = 1		ZeroconfAnnouncement = 1 /**< Announcements via ZeroConf **/
	};		};
	Q_DECLARE_FLAGS(AnnouncementMethods, AnnouncementMethod)		Q_DECLARE_FLAGS(AnnouncementMethods, AnnouncementMethod)
	enum TrustLevel {		enum TrustLevel {
	InvalidCredentials = 0,		InvalidCredentials = 0, /**< The credentials are invalid **/
	UnknownCredentials = 1,		UnknownCredentials = 1, /**< The credentials are unknown **/
	ValidCredentials = 2,		ValidCredentials = 2, /**< The credentials are valid **/
	TrustedCredentials = 3,		TrustedCredentials = 3, /**< The credentials are trusted **/
	UltimateCredentials = 4		UltimateCredentials = 4 /**< The ultimate trust level applies to the cr
			edentials **/
	};		};
	Q_ENUMS(TrustLevel)		Q_ENUMS(TrustLevel)
	/**		/**
	* @return the scaling factor (0..1) for a ZoomLevel		* @return the scaling factor (0..1) for a ZoomLevel
	**/		**/
	PLASMA_EXPORT qreal scalingFactor(ZoomLevel level);		PLASMA_EXPORT qreal scalingFactor(ZoomLevel level);
	/**		/**
	* Converts a location to a direction. Handy for figuring out which way to send a popup based on		* Converts a location to a direction. Handy for figuring out which way to send a popup based on
End of changes. 6 change blocks.
	24 lines changed or deleted		25 lines changed or added

	plasma_export.h		plasma_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef PLASMA_EXPORT_H		#ifndef PLASMA_EXPORT_H
	#define PLASMA_EXPORT_H		#define PLASMA_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef PLASMA_EXPORT		#ifndef PLASMA_EXPORT
	# if defined(MAKE_PLASMA_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define PLASMA_EXPORT
			# elif defined(MAKE_PLASMA_LIB)
	/* We are building this library */		/* We are building this library */
	# define PLASMA_EXPORT KDE_EXPORT		# define PLASMA_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define PLASMA_EXPORT KDE_IMPORT		# define PLASMA_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	# ifndef PLASMA_EXPORT_DEPRECATED		# ifndef PLASMA_EXPORT_DEPRECATED
	# define PLASMA_EXPORT_DEPRECATED KDE_DEPRECATED PLASMA_EXPORT		# define PLASMA_EXPORT_DEPRECATED KDE_DEPRECATED PLASMA_EXPORT
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	player.h		player.h
	skipping to change at line 138		skipping to change at line 138
	int state(void) const;		int state(void) const;
	Q_SIGNALS:		Q_SIGNALS:
	/** Emitted when the state changes. */		/** Emitted when the state changes. */
	void stateChanged(int);		void stateChanged(int);
	protected Q_SLOTS:		protected Q_SLOTS:
	/** Implementers use this to control what users see as the current		/** Implementers use this to control what users see as the current
	* state.*/		* state.*/
	void setState(int);		void setState(int);
			protected:
			/* Enable the stateChanged(QString&, ...) method that was hidden by
			the stateChanged(int) signal */
			using KXMLGUIClient::stateChanged;
	private:		private:
	bool currentLooping;		bool currentLooping;
	State currentState;		State currentState;
	struct Data;		struct Data;
	Data *d;		Data *d;
	};		};
	}		}
End of changes. 1 change blocks.
	0 lines changed or deleted		5 lines changed or added

	plugin.h		plugin.h
	skipping to change at line 173		skipping to change at line 173
	* 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);
	/**		/**
	* @internal		* @internal
	* @return The plugin created from the library @p libname		* @return The plugin created from the library @p libname
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static Plugin* loadPlugin( QObject * parent, const char* libname );		KDE_DEPRECATED static Plugin* loadPlugin( QObject * parent, const char* libname );
			#endif
	/**		/**
	* @internal, added only for source compatibility		* @internal, added only for source compatibility
	* @return The plugin created from the library @p libname		* @return The plugin created from the library @p libname
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static Plugin* loadPlugin( QObject * parent, const QByte Array &libname );		KDE_DEPRECATED static Plugin* loadPlugin( QObject * parent, const QByte Array &libname );
			#endif
	/**		/**
	* @internal		* @internal
	* @return The plugin created from the library @p libname		* @return The plugin created from the library @p libname
	*/		*/
	static Plugin* loadPlugin( QObject * parent, const QString &libname );		static Plugin* loadPlugin( QObject * parent, const QString &libname );
	static Plugin* loadPlugin( QObject * parent, const QString &libname, co nst QString &keyword );		static Plugin* loadPlugin( QObject * parent, const QString &libname, co nst QString &keyword );
	virtual void setComponentData(const KComponentData &instance);		virtual void setComponentData(const KComponentData &instance);
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	popupapplet.h		popupapplet.h
	skipping to change at line 55		skipping to change at line 55
	*		*
	* If you use this class as a base class for your extender using applet, th e extender will		* If you use this class as a base class for your extender using applet, th e extender will
	* automatically be used for the popup; reimplementing graphicsWidget() is unnecessary in this case.		* automatically be used for the popup; reimplementing graphicsWidget() is unnecessary in this case.
	* If you need a popup that does not steal window focus when openend or use d, set window flag		* If you need a popup that does not steal window focus when openend or use d, set window flag
	* Qt::X11BypassWindowManagerHint the widget returned by widget() or graphi csWidget().		* Qt::X11BypassWindowManagerHint the widget returned by widget() or graphi csWidget().
	*/		*/
	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)
	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.		* @arg 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.
	*/		*/
	skipping to change at line 102		skipping to change at line 104
	* Implement either this function or widget().		* Implement either this function or widget().
	* @return the widget that will get shown in either a layout, in the ap plet or in a Dialog,		* @return the widget that will get shown in either a layout, in the ap plet or in a Dialog,
	* depending on the form factor of the applet.		* depending on the form factor of the applet.
	* 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 .
	*/		*/
	virtual QGraphicsWidget *graphicsWidget();		virtual QGraphicsWidget *graphicsWidget();
	void setGraphicsWidget(QGraphicsWidget * widget);		void setGraphicsWidget(QGraphicsWidget * widget);
	/**		/**
	* @return the placement of the popup relating to the icon		* @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
			* @arg alignment the alignment to use; Qt::AlignLeft or Qt::AlignRight
			* @since 4.6
			*/
			void setPopupAlignment(Qt::AlignmentFlag alignment);
			/**
			* @return the default alignment of the popup relative to the applet
			* @since 4.6
			*/
			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		* @arg passive true if the dialog should be treated as a passive popup
	*/		*/
	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
	*/		*/
	bool isPopupShowing() const;		bool isPopupShowing() const;
			/**
			* @return true if the applet is collapsed to an icon
			* @since 4.6
			*/
			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		* @arg 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).
	skipping to change at line 187		skipping to change at line 208
	/**		/**
	* Reimplemented from QGraphicsLayoutItem		* Reimplemented from QGraphicsLayoutItem
	*/		*/
	void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);		void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
	/**		/**
	* Reimplemented from QGraphicsLayoutItem		* Reimplemented from QGraphicsLayoutItem
	*/		*/
	void dropEvent(QGraphicsSceneDragDropEvent *event);		void dropEvent(QGraphicsSceneDragDropEvent *event);
			/**
			* Reimplemented from QGraphicsLayoutItem
			*/
			void timerEvent(QTimerEvent *event);
	private:		private:
	/**		/**
	* @internal This constructor is to be used with the Package loading sy stem.		* @internal This constructor is to be used with the Package loading sy stem.
	*		*
	* @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 service id		* @param args a list of strings containing two entries: the service id
	* and the applet id		* and the applet id
	* @since 4.3		* @since 4.3
	*/		*/
	PopupApplet(const QString &packagePath, uint appletId, const QVariantLi st &args);		PopupApplet(const QString &packagePath, uint appletId, const QVariantLi st &args);
	skipping to change at line 209		skipping to change at line 235
	Q_PRIVATE_SLOT(d, void hideTimedPopup())		Q_PRIVATE_SLOT(d, void hideTimedPopup())
	Q_PRIVATE_SLOT(d, void clearPopupLostFocus())		Q_PRIVATE_SLOT(d, void clearPopupLostFocus())
	Q_PRIVATE_SLOT(d, void dialogSizeChanged())		Q_PRIVATE_SLOT(d, void dialogSizeChanged())
	Q_PRIVATE_SLOT(d, void dialogStatusChanged(bool))		Q_PRIVATE_SLOT(d, void dialogStatusChanged(bool))
	Q_PRIVATE_SLOT(d, void updateDialogPosition())		Q_PRIVATE_SLOT(d, void updateDialogPosition())
	Q_PRIVATE_SLOT(d, void appletActivated())		Q_PRIVATE_SLOT(d, void appletActivated())
	Q_PRIVATE_SLOT(d, void iconSizeChanged(int))		Q_PRIVATE_SLOT(d, void iconSizeChanged(int))
	friend class Applet;		friend class Applet;
	friend class AppletPrivate;		friend class AppletPrivate;
			friend class Extender;
	friend class PopupAppletPrivate;		friend class PopupAppletPrivate;
	PopupAppletPrivate * const d;		PopupAppletPrivate * const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
	#endif /* POPUPAPPLET_H */		#endif /* POPUPAPPLET_H */
End of changes. 6 change blocks.
	1 lines changed or deleted		29 lines changed or added

	portablemediaplayer.h		portablemediaplayer.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006 Davide Bettio <davbet@aliceposta.it>		Copyright 2006 Davide Bettio <davbet@aliceposta.it>
	Copyright (C) 2007 Kevin Ottens <ervin@kde.org>		Copyright 2007 Kevin Ottens <ervin@kde.org>
	Copyright (C) 2007 Jeff Mitchell <kde-dev@emailgoeshere.com>		Copyright 2007 Jeff Mitchell <kde-dev@emailgoeshere.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 Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_PORTABLEMEDIAPLAYER_H		#ifndef SOLID_PORTABLEMEDIAPLAYER_H
	#define SOLID_PORTABLEMEDIAPLAYER_H		#define SOLID_PORTABLEMEDIAPLAYER_H
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
End of changes. 4 change blocks.
	13 lines changed or deleted		14 lines changed or added

	powermanagement.h		powermanagement.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_POWERMANAGEMENT_H		#ifndef SOLID_POWERMANAGEMENT_H
	#define SOLID_POWERMANAGEMENT_H		#define SOLID_POWERMANAGEMENT_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QSet>		#include <QtCore/QSet>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	skipping to change at line 99		skipping to change at line 100
	SOLID_EXPORT int beginSuppressingSleep(const QString &reason = QStr ing());		SOLID_EXPORT int beginSuppressingSleep(const QString &reason = QStr ing());
	/**		/**
	* Tell the power management that a particular sleep suppression is no longer needed. When		* Tell the power management that a particular sleep suppression is no longer needed. When
	* no more suppressions are active, the system will be free to slee p automatically		* no more suppressions are active, the system will be free to slee p automatically
	* @param cookie The cookie acquired when requesting sleep suppress ion		* @param cookie The cookie acquired when requesting sleep suppress ion
	* @return true if the suppression was stopped, false if an invalid cookie was given		* @return true if the suppression was stopped, false if an invalid cookie was given
	*/		*/
	SOLID_EXPORT bool stopSuppressingSleep(int cookie);		SOLID_EXPORT bool stopSuppressingSleep(int cookie);
			/**
			* Tell the power management subsystem to suppress automatic screen
			power management until
			* further notice.
			*
			* @param reason Give a reason for not allowing screen power manage
			ment, to be used in giving user feedback
			* about why a screen power management event was prevented
			* @return a 'cookie' value representing the suppression request.
			Used by the power manager to
			* track the application's outstanding suppression requests. Retur
			ns -1 if the request was
			* denied.
			*
			* @since 4.6
			*/
			SOLID_EXPORT int beginSuppressingScreenPowerManagement(const QStrin
			g &reason = QString());
			/**
			* Tell the power management that a particular screen power managem
			ent suppression is no longer needed. When
			* no more suppressions are active, the system will be free to hand
			le screen power management automatically
			* @param cookie The cookie acquired when requesting screen power m
			anagement suppression
			* @return true if the suppression was stopped, false if an invalid
			cookie was given
			*
			* @since 4.6
			*/
			SOLID_EXPORT bool stopSuppressingScreenPowerManagement(int cookie);
	class SOLID_EXPORT Notifier : public QObject		class SOLID_EXPORT Notifier : public QObject
	{		{
	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
	*/		*/
End of changes. 5 change blocks.
	11 lines changed or deleted		45 lines changed or added

	predicate.h		predicate.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006 Kevin Ottens <ervin@kde.org>		Copyright 2006 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_PREDICATE_H		#ifndef SOLID_PREDICATE_H
	#define SOLID_PREDICATE_H		#define SOLID_PREDICATE_H
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <QtCore/QSet>		#include <QtCore/QSet>
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	predicateproperties.h		predicateproperties.h
	skipping to change at line 36		skipping to change at line 36
	class QValidator;		class QValidator;
	/**		/**
	* A predicate is part of the RDF trinity: subject, predicate, object.		* A predicate is part of the RDF trinity: subject, predicate, object.
	* It is identified by URI and it defines the type of the relationship.		* It is identified by URI and it defines the type of the relationship.
	* For file metadata, a predicate can be seen as a fieldname.		* For file metadata, a predicate can be seen as a fieldname.
	* It has a data type, a description, a short id, a cardinality		* It has a data type, a description, a short id, a cardinality
	*		*
	* @deprecated use Nepomuk::Types::Property instead		* @deprecated use Nepomuk::Types::Property instead
	**/		**/
	class KDE_DEPRECATED KIO_EXPORT PredicateProperties {		class KIO_EXPORT PredicateProperties {
	friend class PredicatePropertyProvider;		friend class PredicatePropertyProvider;
	public:		public:
	PredicateProperties(const QString& predicate = QString());		#ifndef KDE_NO_DEPRECATED
			KDE_DEPRECATED PredicateProperties(const QString& predicate = QString()
			);
			#endif
	PredicateProperties(const PredicateProperties& p);		PredicateProperties(const PredicateProperties& p);
	~PredicateProperties();		~PredicateProperties();
	const PredicateProperties& operator=(const PredicateProperties& p);		const PredicateProperties& operator=(const PredicateProperties& p);
	/**		/**
	* This enum is used to specify some attributes that an item can have,		* This enum is used to specify some attributes that an item can have,
	* which fit neither in the Hint nor in the Unit enum.		* which fit neither in the Hint nor in the Unit enum.
	*/		*/
	enum Attributes		enum Attributes
	{		{
	Addable = 1, ///< The item or group can be added by a user		Addable = 1, ///< The item or group can be added by a user
End of changes. 2 change blocks.
	2 lines changed or deleted		5 lines changed or added

	previewjob.h		previewjob.h
	skipping to change at line 115		skipping to change at line 115
	*/		*/
	static QStringList supportedMimeTypes();		static QStringList supportedMimeTypes();
	/**		/**
	* Returns the default "maximum file size", in bytes, used by Previ ewJob.		* Returns the default "maximum file size", in bytes, used by Previ ewJob.
	* This is useful for applications providing a GUI for letting the user change the size.		* This is useful for applications providing a GUI for letting the user change the size.
	* @since 4.1		* @since 4.1
	* @deprecated PreviewJob uses different maximum file sizes depende nt on the URL since 4.5.		* @deprecated PreviewJob uses different maximum file sizes depende nt on the URL since 4.5.
	* The returned file size is only valid for local URLs.		* The returned file size is only valid for local URLs.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static KIO::filesize_t maximumFileSize();		KDE_DEPRECATED static KIO::filesize_t maximumFileSize();
			#endif
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when a thumbnail picture for @p item has been successful ly		* Emitted when a thumbnail picture for @p item has been successful ly
	* retrieved.		* retrieved.
	* @param item the file of the preview		* @param item the file of the preview
	* @param preview the preview image		* @param preview the preview image
	*/		*/
	void gotPreview( const KFileItem& item, const QPixmap &preview );		void gotPreview( const KFileItem& item, const QPixmap &preview );
	/**		/**
	skipping to change at line 162		skipping to change at line 164
	* 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()
	*/		*/
	KIO_EXPORT PreviewJob *filePreview( const KFileItemList &items, int wid th, int height = 0, int iconSize = 0, int iconAlpha = 70, bool scale = true , bool save = true, const QStringList *enabledPlugins = 0 );		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
	/**		/**
	* 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
End of changes. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	processor.h		processor.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_PROCESSOR_H		#ifndef SOLID_PROCESSOR_H
	#define SOLID_PROCESSOR_H		#define SOLID_PROCESSOR_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
	skipping to change at line 121		skipping to change at line 122
	* (generally for power management).		* (generally for power management).
	*		*
	* @return true if the processor can change CPU frequency, false ot herwise		* @return true if the processor can change CPU frequency, false ot herwise
	*/		*/
	bool canChangeFrequency() const;		bool canChangeFrequency() const;
	/**		/**
	* Queries the instructions set extensions of the CPU.		* Queries the instructions set extensions of the CPU.
	*		*
	* @return the extensions supported by the CPU		* @return the extensions supported by the CPU
			* @see Solid::Processor::InstructionSet
	*/		*/
	InstructionSets instructionSets() const;		InstructionSets instructionSets() const;
	};		};
	}		}
	Q_DECLARE_OPERATORS_FOR_FLAGS(Solid::Processor::InstructionSets)		Q_DECLARE_OPERATORS_FOR_FLAGS(Solid::Processor::InstructionSets)
	#endif		#endif
End of changes. 5 change blocks.
	11 lines changed or deleted		13 lines changed or added

	pushbutton.h		pushbutton.h
	skipping to change at line 162		skipping to change at line 162
	void setCheckable(bool checkable);		void setCheckable(bool checkable);
	/**		/**
	* @return true if the button is checkable		* @return true if the button is checkable
	* @see setCheckable		* @see setCheckable
	* @since 4.4		* @since 4.4
	*/		*/
	bool isCheckable() const;		bool isCheckable() const;
	/**		/**
	* Sets whether or not this button is checked. Implies setIsCheckable(t
	rue).
	*
	* @since 4.3
	*/
	void setChecked(bool checked);
	/**
	* @return true if the button is checked; requires setIsCheckable(true) to		* @return true if the button is checked; requires setIsCheckable(true) to
	* be called		* be called
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	bool isChecked() const;		bool isChecked() const;
	/**		/**
	* @return true if the button is pressed down		* @return true if the button is pressed down
	* @since 4.4		* @since 4.4
	skipping to change at line 212		skipping to change at line 205
	/**		/**
	* Emitted when the button is pressed then released, completing a click		* Emitted when the button is pressed then released, completing a click
	*/		*/
	void clicked();		void clicked();
	/**		/**
	* Emitted when the button changes state from up to down		* Emitted when the button changes state from up to down
	*/		*/
	void toggled(bool);		void toggled(bool);
			public Q_SLOTS:
			/**
			* Performs a visual click and emits the associated signals
			* @since 4.6
			*/
			void click();
			/**
			* Sets whether or not this button is checked. Implies setIsCheckable(t
			rue).
			*
			* @since 4.3
			*/
			void setChecked(bool checked);
	protected:		protected:
	void paint(QPainter *painter,		void paint(QPainter *painter,
	const QStyleOptionGraphicsItem *option,		const QStyleOptionGraphicsItem *option,
	QWidget *widget = 0);		QWidget *widget = 0);
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);		void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	void changeEvent(QEvent *event);		void changeEvent(QEvent *event);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;		QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
	private:		private:
	Q_PRIVATE_SLOT(d, void syncBorders())		Q_PRIVATE_SLOT(d, void syncBorders())
	Q_PRIVATE_SLOT(d, void setPixmap())		Q_PRIVATE_SLOT(d, void setPixmap())
			Q_PRIVATE_SLOT(d, void pressedChanged())
	Q_PRIVATE_SLOT(d, void syncToAction())		Q_PRIVATE_SLOT(d, void syncToAction())
			Q_PRIVATE_SLOT(d, void clearAction())
			Q_PRIVATE_SLOT(d, void setPalette())
	friend class PushButtonPrivate;		friend class PushButtonPrivate;
	PushButtonPrivate *const d;		PushButtonPrivate *const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 4 change blocks.
	8 lines changed or deleted		18 lines changed or added

	query.h		query.h
	skipping to change at line 41		skipping to change at line 41
	#include "nepomukquery_export.h"		#include "nepomukquery_export.h"
	class QTextStream;		class QTextStream;
	namespace Nepomuk {		namespace Nepomuk {
	namespace Query {		namespace Query {
	class Term;		class Term;
	class QueryPrivate;		class QueryPrivate;
			class FileQuery;
	/**		/**
	* \brief Convinience definition for request property mappings as u sed in		* \brief Convinience definition for request property mappings as u sed in
	* QueryServiceClient::sparqlQuery() and QueryServiceClient::blocki ngSparqlQuery().		* QueryServiceClient::sparqlQuery() and QueryServiceClient::blocki ngSparqlQuery().
	*/		*/
	typedef QHash<QString, Nepomuk::Types::Property> RequestPropertyMap ;		typedef QHash<QString, Nepomuk::Types::Property> RequestPropertyMap ;
	/**		/**
	* \class Query query.h Nepomuk/Query/Query		* \class Query query.h Nepomuk/Query/Query
	*		*
	skipping to change at line 129		skipping to change at line 130
	* \return \p true if this is a file query that will		* \return \p true if this is a file query that will
	* only return files and folders.		* only return files and folders.
	*		*
	* \sa FileQuery		* \sa FileQuery
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	bool isFileQuery() const;		bool isFileQuery() const;
	/**		/**
			* \return A copy of this query which is restricted to files.
			*
			* \since 4.6
			*/
			FileQuery toFileQuery() const;
			/**
	* The root term of the query.		* The root term of the query.
	* This can be any type of term.		* This can be any type of term.
	*		*
	* \sa setTerm()		* \sa setTerm()
	*/		*/
	Term term() const;		Term term() const;
	/**		/**
	* The maximum number of results that this query should yield.		* The maximum number of results that this query should yield.
	*		*
	skipping to change at line 176		skipping to change at line 184
	/**		/**
	* The first result that should be retrieved. This can be combi ned		* The first result that should be retrieved. This can be combi ned
	* with setLimit() to do paged results.		* with setLimit() to do paged results.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	void setOffset( int offset );		void setOffset( int offset );
	/**		/**
			* %Nepomuk supports scoring the results based on any full text
			matching
			* used in the query (full text matching is done via Comparison
			Term with
			* the ComparisonTerm::Contains comperator) and sorting the res
			ults based
			* on that score.
			*
			* By default full text scoring is disabled since it can mean a
			serious
			* impact on query performance.
			*
			* \sa setFullTextScoringSortOrder(), Result::score()
			*
			* \since 4.6
			*/
			void setFullTextScoringEnabled( bool enabled );
			/**
			* Set the full text scoring sort order. Ignored if full text s
			coring is
			* disabled.
			*
			* By default the sort order is Qt::DescendingOrder.
			*
			* \sa setFullTextScoringEnabled()
			*
			* \since 4.6
			*/
			void setFullTextScoringSortOrder( Qt::SortOrder order );
			/**
			* \return \p true if full text scoring has been enabled.
			*
			* \sa setFullTextScoringEnabled()
			*
			* \since 4.6
			*/
			bool fullTextScoringEnabled() const;
			/**
			* \return The full text scoring sort order as set via setFullT
			extScoringSortOrder()
			*
			* \since 4.6
			*/
			Qt::SortOrder fullTextScoringSortOrder() const;
			/**
			* A set of flags that influence the result of the query.
			*
			* \sa setQueryFlags(), SparqlFlags
			*
			* \since 4.6
			*/
			enum QueryFlag {
			/**
			* No flags set. This is the default.
			*/
			NoQueryFlags = 0x0,
			/**
			* By default queries that will only return results which a
			re intended for
			* the user's eyes. In situations where an application need
			s to work on
			* internal or statistical data this restriction is not des
			ireable.
			* This flag disables the restriction and returns the full
			set of results.
			*/
			NoResultRestrictions = 0x1,
			/**
			* Disables the return of full text search excerpts for Com
			parisonTerm::Contains
			* terms which are normally reported through Result::excerp
			t(). It might make sense
			* to set this flag in case one has no need for excerpts an
			d does not want to suffer
			* the small performance penalty that comes from querying t
			hem
			*/
			WithoutFullTextExcerpt = 0x2
			};
			Q_DECLARE_FLAGS( QueryFlags, QueryFlag )
			/**
			* Set the query flags to configure this query.
			*
			* \sa queryFlags()
			*
			* \since 4.6
			*/
			void setQueryFlags( QueryFlags flags );
			/**
			* Get the query flags to configure this query.
			*
			* \sa setQueryFlags()
			*
			* \since 4.6
			*/
			QueryFlags queryFlags() const;
			/**
	* \class RequestProperty query.h Nepomuk/Query/Query		* \class RequestProperty query.h Nepomuk/Query/Query
	*		*
	* \brief A request property can be added to a Query to retriev e		* \brief A request property can be added to a Query to retriev e
	* additional information about the results.		* additional information about the results.
	*		*
	* Normally a query would simply yield a list of resources,		* Normally a query would simply yield a list of resources,
	* ie. URIs. Using RequestProperty one can request additional		* ie. URIs. Using RequestProperty one can request additional
	* fields such as the modification time or the label or whateve r		* fields such as the modification time or the label or whateve r
	* is of interest in the current context.		* is of interest in the current context.
	*		*
	skipping to change at line 277		skipping to change at line 377
	* \brief Aditional flags modifying the behaviour of toSparqlQu ery() and toSearchUrl().		* \brief Aditional flags modifying the behaviour of toSparqlQu ery() and toSearchUrl().
	*/		*/
	enum SparqlFlag {		enum SparqlFlag {
	/**		/**
	* No flags, i.e. create a default query.		* No flags, i.e. create a default query.
	*/		*/
	NoFlags = 0x0,		NoFlags = 0x0,
	/**		/**
	* Create a SPARQL count query which will return the number		* Create a SPARQL count query which will return the number
	* of results rather than the results themselves. Be aware		* of results rather than the results themselves. The resul
	that		ing query will have
	* with a count query any requestProperties() will result i		* a single binding called \p 'cnt'.
	n a grouping,
	* i.e. multiple count values will be returned with respect
	to the request
	* properties.
	*/		*/
	CreateCountQuery = 0x1,		CreateCountQuery = 0x1,
	/**		/**
	* Automatically handle inverse properties, consider for ex ample nie:isPartOf		* Automatically handle inverse properties, consider for ex ample nie:isPartOf
	* and nie:hasPart at the same time and even if only one of both is		* and nie:hasPart at the same time and even if only one of both is
	* defined.		* defined.
	*/		*/
	HandleInverseProperties = 0x2		HandleInverseProperties = 0x2,
			/**
			* Create a SPARQL ask query which will simply check if a m
			atching result exists.
			* Use Soprano::QueryResultIterator::boolValue() to check t
			he result.
			*
			* \since 4.6
			*/
			CreateAskQuery = 0x4
	};		};
	Q_DECLARE_FLAGS( SparqlFlags, SparqlFlag )		Q_DECLARE_FLAGS( SparqlFlags, SparqlFlag )
	/**		/**
	* Convert the query into a SPARQL query which can be used with the		* Convert the query into a SPARQL query which can be used with the
	* Nepomuk query service or directly in Soprano::Model::execute Query.		* Nepomuk query service or directly in Soprano::Model::execute Query.
	*		*
	* The resulting query will bind the results to variable \p 'r' . Request		* The resulting query will bind the results to variable \p 'r' . Request
	* properties will be bound to variables \p 'reqProp1' through		* properties will be bound to variables \p 'reqProp1' through
	\p 'reqPropN'.		\p 'reqPropN'
			* (the only exception is a count query created via the CreateC
			ountQuery flag).
	*		*
	* If you are looking for a serialization of a Query which can be parsed again		* If you are looking for a serialization of a Query which can be parsed again
	* use toString() instead.		* use toString() instead.
	*		*
	* \warning The SPARQL queries created by this method contain S PARQL extensions		* \warning The SPARQL queries created by this method contain S PARQL extensions
	* from Virtuoso and will not work with other RDF storage solut ions!		* from Virtuoso and will not work with other RDF storage solut ions!
	*		*
	* \param flags Optional flags to change the query.		* \param flags Optional flags to change the query.
	*		*
	* \return The SPARQL representation of this query or an empty string		* \return The SPARQL representation of this query or an empty string
	skipping to change at line 369		skipping to change at line 476
	RequestPropertyMap requestPropertyMap() const;		RequestPropertyMap requestPropertyMap() const;
	/**		/**
	* Comparison operator.		* Comparison operator.
	*		*
	* \return \p true if this query is equal to \p query.		* \return \p true if this query is equal to \p query.
	*/		*/
	bool operator==( const Query& query ) const;		bool operator==( const Query& query ) const;
	/**		/**
			* Comparison operator.
			*
			* \return \p true if this query differs from \p query.
			*
			* \since 4.6
			*/
			bool operator!=( const Query& query ) const;
			/**
			* Optimizes the query without chaning its meaning. This remove
			s
			* redundant terms such as NegationTerm and OptionalTerm nestin
			gs and flattens
			* AndTerm and OrTerm hierarchies.
			*
			* \return An optimized version of this query.
			*
			* \since 4.6
			*
			* \sa Term::optimized()
			*/
			Query optimized() const;
			/**
	* Encode the Query in a string. Be aware that this does NOT cr eate a SPARQL		* Encode the Query in a string. Be aware that this does NOT cr eate a SPARQL
	* query. The returned string can be used to serialize queries that can later		* query. The returned string can be used to serialize queries that can later
	* be read via fromString().		* be read via fromString().
	*		*
	* \sa fromString(), toSparqlQuery()		* \sa fromString(), toSparqlQuery()
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	QString toString() const;		QString toString() const;
	skipping to change at line 434		skipping to change at line 563
	* in case \p url is not a nepomuksearch:/ URL or a useful titl e		* in case \p url is not a nepomuksearch:/ URL or a useful titl e
	* cannot be extracted.		* cannot be extracted.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	static QString titleFromQueryUrl( const KUrl& url );		static QString titleFromQueryUrl( const KUrl& url );
	protected:		protected:
	/** \cond protected_query_members */		/** \cond protected_query_members */
	QSharedDataPointer<QueryPrivate> d;		QSharedDataPointer<QueryPrivate> d;
	friend class QueryParser;
	/** \endcond */		/** \endcond */
	};		};
			/**
			* Logical and operator which combines \p term into the term
			* of \p query to match both.
			*
			* \sa AndTerm
			*
			* \since 4.6
			*/
			NEPOMUKQUERY_EXPORT Query operator&&( const Query& query, const Ter
			m& term );
			/**
			* Logical or operator which combines \p term into the term
			* of \p query to match either one.
			*
			* \sa OrTerm
			*
			* \since 4.6
			*/
			NEPOMUKQUERY_EXPORT Query operator||( const Query& query, const Ter
			m& term );
			/**
			* Logical negation operator which negates the meaning of
			* a query.
			*
			* \sa NegationTerm::negateTerm()
			*
			* \since 4.6
			*/
			NEPOMUKQUERY_EXPORT Query operator!( const Query& query );
	NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Query& );		NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Query& );
	}		}
	}		}
	Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::Query::Query::SparqlFlags )		Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::Query::Query::SparqlFlags )
			Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::Query::Query::QueryFlags )
	NEPOMUKQUERY_EXPORT QDebug operator<<( QDebug, const Nepomuk::Query::Query& );		NEPOMUKQUERY_EXPORT QDebug operator<<( QDebug, const Nepomuk::Query::Query& );
	#endif		#endif
End of changes. 10 change blocks.
	12 lines changed or deleted		189 lines changed or added

	queryparser.h		queryparser.h
	/*		/*
	This file is part of the Nepomuk KDE project.		This file is part of the Nepomuk KDE project.
	Copyright (C) 2007-2009 Sebastian Trueg <trueg@kde.org>		Copyright (C) 2007-2010 Sebastian Trueg <trueg@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU 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 36		skipping to change at line 36
	#include "nepomukquery_export.h"		#include "nepomukquery_export.h"
	namespace Nepomuk {		namespace Nepomuk {
	namespace Query {		namespace Query {
	/**		/**
	* \class QueryParser queryparser.h Nepomuk/Query/QueryParser		* \class QueryParser queryparser.h Nepomuk/Query/QueryParser
	*		*
	* \brief Parser for desktop user queries.		* \brief Parser for desktop user queries.
	*		*
	* The QueryParser can be used to parse queries and convert them in		* \warning This is NOT a SPARQL parser.
	to		*
	* Query instances.		* The QueryParser can be used to parse user queries, ie. queries t
			hat the user
			* would enter in any search interface, and convert them into Query
			instances.
	*		*
	* The syntax is fairly simple: plain strings match to LiteralTerm terms,		* The syntax is fairly simple: plain strings match to LiteralTerm terms,
	* URIs need to be N3-encoded, when using white space parenthesis n eed to		* URIs need to be N3-encoded, when using white space parenthesis n eed to
	* be put around properties and values, terms can be excluded via \ p '-'.		* be put around properties and values, terms can be excluded via \ p '-'.
	*		*
	* \section queryparser_examples Examples		* \section queryparser_examples Examples
	*		*
	* %Query everything that contains the term "nepomuk":		* %Query everything that contains the term "nepomuk":
	* \code		* \code
	* nepomuk		* nepomuk
	skipping to change at line 121		skipping to change at line 123
	/**		/**
	* Make each full text term use a '*' wildcard		* Make each full text term use a '*' wildcard
	* to match longer strings ('foobar' is matched		* to match longer strings ('foobar' is matched
	* by 'foob*').		* by 'foob*').
	*		*
	* Be aware that the query engine needs at least		* Be aware that the query engine needs at least
	* 4 chars to do globbing though.		* 4 chars to do globbing though.
	*		*
	* This is disabled by default.		* This is disabled by default.
	*/		*/
	QueryTermGlobbing = 0x1		QueryTermGlobbing = 0x1,
			/**
			* Try to detect filename pattern like *.mp3
			* or hello*.txt and create appropriate ComparisonTerm
			* instances using ComparisonTerm::Regexp instead of
			* ComparisonTerm::Contains.
			*
			* \since 4.6
			*/
			DetectFilenamePattern = 0x2
	};		};
	Q_DECLARE_FLAGS( ParserFlags, ParserFlag )		Q_DECLARE_FLAGS( ParserFlags, ParserFlag )
	/**		/**
	* Parse a user query.		* Parse a user query.
	*		*
	* \return The parsed query or an invalid Query object		* \return The parsed query or an invalid Query object
	* in case the parsing failed.		* in case the parsing failed.
	*/		*/
	Query parse( const QString& query ) const;		Query parse( const QString& query ) const;
	skipping to change at line 173		skipping to change at line 185
	QList<Types::Property> matchProperty( const QString& fieldName ) const;		QList<Types::Property> matchProperty( const QString& fieldName ) const;
	/**		/**
	* Convenience method to quickly parse a query without creating an object.		* Convenience method to quickly parse a query without creating an object.
	*		*
	* \return The parsed query or an invalid Query object		* \return The parsed query or an invalid Query object
	* in case the parsing failed.		* in case the parsing failed.
	*/		*/
	static Query parseQuery( const QString& query );		static Query parseQuery( const QString& query );
			/**
			* \overload
			*
			* \param query The query string to parse
			* \param flags a set of flags influencing the parsing process.
			*
			* \since 4.6
			*/
			static Query parseQuery( const QString& query, ParserFlags flag
			s );
	private:		private:
	class Private;		class Private;
	Private* const d;		Private* const d;
	};		};
	}		}
	}		}
	Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::Query::QueryParser::ParserFlags )		Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::Query::QueryParser::ParserFlags )
	#endif		#endif
End of changes. 4 change blocks.
	5 lines changed or deleted		29 lines changed or added

	queryserviceclient.h		queryserviceclient.h
	skipping to change at line 259		skipping to change at line 259
	/**		/**
	* Close the client, thus stop to monitor the query		* Close the client, thus stop to monitor the query
	* for changes. Without closing the client it will continue		* for changes. Without closing the client it will continue
	* signalling changes to the results.		* signalling changes to the results.
	*		*
	* This will also make any blockingQuery return immediately.		* This will also make any blockingQuery return immediately.
	*/		*/
	void close();		void close();
			/**
			* \return \p true if all results have been listed (ie. finishe
			dListing() has
			* been emitted), close() has been called, or no query was star
			ted.
			*
			* \since 4.6
			*/
			bool isListingFinished() const;
			/**
			* The last error message which has been emitted via error() or
			an
			* empty string if there was no error.
			*
			* \since 4.6
			*/
			QString errorMessage() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted for new search results. This signal is emitted both		* Emitted for new search results. This signal is emitted both
	* for the initial listing and for changes to the search.		* for the initial listing and for changes to the search.
	*/		*/
	void newEntries( const QList<Nepomuk::Query::Result>& entries ) ;		void newEntries( const QList<Nepomuk::Query::Result>& entries ) ;
	/**		/**
	* Emitted if the search results changed when monitoring a quer y.		* Emitted if the search results changed when monitoring a quer y.
	* \param entries A list of resource URIs identifying the resou rces		* \param entries A list of resource URIs identifying the resou rces
	* that dropped out of the query results.		* that dropped out of the query results.
	*/		*/
	void entriesRemoved( const QList<QUrl>& entries );		void entriesRemoved( const QList<QUrl>& entries );
	/**		/**
			* The number of results that are reported via newEntries() bef
			ore the
			* finishedListing() signal.
			*
			* Emitted once the count of the results is available. This mig
			ht
			* happen before the first result is emitted, in between the re
			sults, or
			* in rare cases it could even happen after all results have be
			en reported.
			*
			* Also be aware that no count will be provided when using spar
			qlQuery()
			*
			* \since 4.6
			*/
			void resultCount( int count );
			/**
	* Emitted when the initial listing has been finished, ie. if a ll		* Emitted when the initial listing has been finished, ie. if a ll
	* results have been reported via newEntries. If no further upd ates		* results have been reported via newEntries. If no further upd ates
	* are necessary the client should be closed now.		* are necessary the client should be closed now.
			*
			* In case of an error this signal is not emitted.
			*
			* \sa error()
	*/		*/
	void finishedListing();		void finishedListing();
			/**
			* Emitted when an error occurs. This typically happens in case
			the query
			* service is not running or does not respond. No further signa
			ls will be
			* emitted after this one.
			*
			* \since 4.6
			*/
			void error( const QString& errorMessage );
	private:		private:
	class Private;		class Private;
	Private* const d;		Private* const d;
	Q_PRIVATE_SLOT( d, void _k_entriesRemoved( const QStringList& ) )		Q_PRIVATE_SLOT( d, void _k_entriesRemoved( const QStringList& ) )
	Q_PRIVATE_SLOT( d, void _k_finishedListing() )		Q_PRIVATE_SLOT( d, void _k_finishedListing() )
			Q_PRIVATE_SLOT( d, void _k_handleQueryReply(QDBusPendingCallWat cher*) )
	};		};
	}		}
	}		}
	#endif		#endif
End of changes. 5 change blocks.
	0 lines changed or deleted		54 lines changed or added

	renamedialog.h		renamedialog.h
	skipping to change at line 25		skipping to change at line 25
	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_RENAMEDIALOG_H		#ifndef KIO_RENAMEDIALOG_H
	#define KIO_RENAMEDIALOG_H		#define KIO_RENAMEDIALOG_H
			#include <ksqueezedtextlabel.h>
	#include <kurl.h>		#include <kurl.h>
	#include <QtGui/QDialog>		#include <QtGui/QDialog>
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <sys/types.h>		#include <sys/types.h>
	#include <kio/global.h>		#include <kio/global.h>
	class QScrollArea;		class QScrollArea;
	class QLabel;		class QLabel;
	class QPixmap;		class QPixmap;
	class KFileItem;		class KFileItem;
	namespace KIO {		namespace KIO
			{
	// KDE5: get rid of M_OVERWRITE_ITSELF, trigger it internally if src==dest		// KDE5: get rid of M_OVERWRITE_ITSELF, trigger it internally if src==dest
	// KDE5: get rid of M_SINGLE. If not multi, then single ;)		// KDE5: get rid of M_SINGLE. If not multi, then single ;)
	// KDE5: use QFlags to get rid of all the casting!		// KDE5: use QFlags to get rid of all the casting!
	/**		/**
	* M_OVERWRITE: We have an existing dest, show details about it and offer t o overwrite it.		* M_OVERWRITE: We have an existing dest, show details about it and offer t o overwrite it.
	* M_OVERWRITE_ITSELF: Warn that the current operation would overwrite a fi le with itself,		* M_OVERWRITE_ITSELF: Warn that the current operation would overwrite a fi le with itself,
	* which is not allowed.		* which is not allowed.
	* M_SKIP: Offer a "Skip" button, to skip other files too. Requires M_MULTI .		* M_SKIP: Offer a "Skip" button, to skip other files too. Requires M_MULTI .
	* M_SINGLE: Deprecated and unused, please ignore.		* M_SINGLE: Deprecated and unused, please ignore.
	skipping to change at line 69		skipping to change at line 71
	enum RenameDialog_Result {R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERWRITE_ALL = 5, R_SKIP = 2, R_AUTO_SKIP = 3, R_RENAME = 1, R_AUTO_RENA ME = 8, R_CANCEL = 0};		enum RenameDialog_Result {R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERWRITE_ALL = 5, R_SKIP = 2, R_AUTO_SKIP = 3, R_RENAME = 1, R_AUTO_RENA ME = 8, R_CANCEL = 0};
	/**		/**
	* The dialog shown when a CopyJob realizes that a destination file already exists,		* The dialog shown when a CopyJob realizes that a destination file already exists,
	* and wants to offer the user with the choice to either Rename, Overwrite, Skip;		* and wants to offer the user with the choice to either Rename, Overwrite, Skip;
	* this dialog is also used when a .part file exists and the user can choos e to		* this dialog is also used when a .part file exists and the user can choos e to
	* Resume a previous download.		* Resume a previous download.
	*/		*/
	class KIO_EXPORT RenameDialog : public QDialog		class KIO_EXPORT RenameDialog : public QDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Construct a "rename" dialog to let the user know that @p src is about		* Construct a "rename" dialog to let the user know that @p src is abou
	to overwrite @p dest.		t to overwrite @p dest.
	*		*
	* @param parent parent widget (often 0)		* @param parent parent widget (often 0)
	* @param caption the caption for the dialog box		* @param caption the caption for the dialog box
	* @param src the url to the file/dir we're trying to copy, as it's part		* @param src the url to the file/dir we're trying to copy, as it's par
	of the text message		t of the text message
	* @param dest the path to destination file/dir, i.e. the one that alread		* @param dest the path to destination file/dir, i.e. the one that alre
	y exists		ady exists
	* @param mode parameters for the dialog (which buttons to show...),		* @param mode parameters for the dialog (which buttons to show...),
	* @param sizeSrc size of source file		* @param sizeSrc size of source file
	* @param sizeDest size of destination file		* @param sizeDest size of destination file
	* @param ctimeSrc creation time of source file		* @param ctimeSrc creation time of source file
	* @param ctimeDest creation time of destination file		* @param ctimeDest creation time of destination file
	* @param mtimeSrc modification time of source file		* @param mtimeSrc modification time of source file
	* @param mtimeDest modification time of destination file		* @param mtimeDest modification time of destination file
	* @see RenameDialog_Mode		* @see RenameDialog_Mode
	*/		*/
	RenameDialog( QWidget *parent, const QString & caption,		RenameDialog(QWidget *parent, const QString & caption,
	const KUrl & src, const KUrl & dest,		const KUrl & src, const KUrl & dest,
	RenameDialog_Mode mode,		RenameDialog_Mode mode,
	KIO::filesize_t sizeSrc = KIO::filesize_t(-1),		KIO::filesize_t sizeSrc = KIO::filesize_t(-1),
	KIO::filesize_t sizeDest = KIO::filesize_t(-1),		KIO::filesize_t sizeDest = KIO::filesize_t(-1),
	time_t ctimeSrc = time_t(-1),		time_t ctimeSrc = time_t(-1),
	time_t ctimeDest = time_t(-1),		time_t ctimeDest = time_t(-1),
	time_t mtimeSrc = time_t(-1),		time_t mtimeSrc = time_t(-1),
	time_t mtimeDest = time_t(-1) );		time_t mtimeDest = time_t(-1));
	~RenameDialog();		~RenameDialog();
	/**		/**
	* @return the new destination		* @return the new destination
	* valid only if RENAME was chosen		* valid only if RENAME was chosen
	*/		*/
	KUrl newDestUrl();		KUrl newDestUrl();
	/**		/**
	* @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		,
	* in that directory. The existence is only checked for local urls though		* 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
	* The suggested file name is of the form foo_1 foo_2 etc.		gh.
	*/		* 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();
	void resumePressed();		void resumePressed();
	void resumeAllPressed();		void resumeAllPressed();
	void suggestNewNamePressed();		void suggestNewNamePressed();
	protected Q_SLOTS:		protected Q_SLOTS:
	void enableRenameButton(const QString &);		void enableRenameButton(const QString &);
	private Q_SLOTS:		private Q_SLOTS:
	void applyAllPressed();		void applyAllPressed();
	void showSrcIcon(const KFileItem &);		void showSrcIcon(const KFileItem &);
	void showDestIcon(const KFileItem &);		void showDestIcon(const KFileItem &);
	void showSrcPreview(const KFileItem &, const QPixmap &);		void showSrcPreview(const KFileItem &, const QPixmap &);
	void showDestPreview(const KFileItem &, const QPixmap &);		void showDestPreview(const KFileItem &, const QPixmap &);
	private:		private:
	QScrollArea* createContainerLayout(QWidget* parent, const KFileItem& it em, QLabel* preview);		QScrollArea* createContainerLayout(QWidget* parent, const KFileItem& it em, QLabel* preview);
	QLabel* createLabel(QWidget* parent, const QString& text);		QLabel* createLabel(QWidget* parent, const QString& text, const bool co
			ntainerTitle);
			KSqueezedTextLabel* createSqueezedLabel(QWidget* parent, const QString&
			text);
	class RenameDialogPrivate;		class RenameDialogPrivate;
	RenameDialogPrivate* const d;		RenameDialogPrivate* const d;
	};		};
	}		}
	#endif		#endif
End of changes. 10 change blocks.
	61 lines changed or deleted		68 lines changed or added

	resource.h		resource.h
	skipping to change at line 40		skipping to change at line 40
	#include "nepomuk_export.h"		#include "nepomuk_export.h"
	namespace Nepomuk {		namespace Nepomuk {
	class ResourceManager;		class ResourceManager;
	class ResourceData;		class ResourceData;
	class Variant;		class Variant;
	class Tag;		class Tag;
	class Thing;		class Thing;
			class File;
	namespace Types {		namespace Types {
	class Property;		class Property;
	}		}
	enum ErrorCode {		enum ErrorCode {
	NoError = 0,		NoError = 0,
	CommunicationError, /**< A communication error, i.e. connection fai lure */		CommunicationError, /**< A communication error, i.e. connection fai lure */
	InvalidType,		InvalidType,
	UnknownError		UnknownError
	};		};
	skipping to change at line 168		skipping to change at line 169
	* \param manager The resource manager to use. This allows to mix r esources from different		* \param manager The resource manager to use. This allows to mix r esources from different
	* managers and, thus, different models.		* managers and, thus, different models.
	*		*
	* \since 4.3		* \since 4.3
	*/		*/
	Resource( const QString& pathOrIdentifier, const QUrl& type, Resour ceManager* manager );		Resource( const QString& pathOrIdentifier, const QUrl& type, Resour ceManager* manager );
	/**		/**
	* \deprecated use Resource( const QString&, const QUrl& )		* \deprecated use Resource( const QString&, const QUrl& )
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Resource( const QString& pathOrIdentifier, const QSt ring& type );		KDE_DEPRECATED Resource( const QString& pathOrIdentifier, const QSt ring& type );
			#endif
	/**		/**
	* Creates a new Resource object.		* Creates a new Resource object.
	*		*
	* \param uri The URI of the resource. If no resource with this URI exists, a new one is		* \param uri The URI of the resource. If no resource with this URI exists, a new one is
	* created. Using an empty QUrl will result in a new resource with a random URI being created		* created. Using an empty QUrl will result in a new resource with a random URI being created
	* on the first call to setProperty.		* on the first call to setProperty.
	*		*
	* See the \ref nepomuk_resource_file_uris Special file URL handlin g.		* See the \ref nepomuk_resource_file_uris Special file URL handlin g.
	*		*
	skipping to change at line 240		skipping to change at line 243
	* (Although Nepomuk tries to keep the URI of file resources in syn c		* (Although Nepomuk tries to keep the URI of file resources in syn c
	* with the file URL for convenience.)		* with the file URL for convenience.)
	*		*
	* For historical reasons the method does return a URI as QString i nstead		* For historical reasons the method does return a URI as QString i nstead
	* of QUrl. The value equals resourceUri().toString().		* of QUrl. The value equals resourceUri().toString().
	*		*
	* \sa resourceUri(), getIdentifiers()		* \sa resourceUri(), getIdentifiers()
	*		*
	* \deprecated use resourceUri() instead		* \deprecated use resourceUri() instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString uri() const;		KDE_DEPRECATED QString uri() const;
			#endif
	/**		/**
	* The URI of the resource, uniquely identifying it. This URI in mo st		* The URI of the resource, uniquely identifying it. This URI in mo st
	* cases is a virtual one which has been created from a generic bas e		* cases is a virtual one which has been created from a generic bas e
	* namespace and some identifier.		* namespace and some identifier.
	*		*
	* The most important thing to remember is that the URI of for exam ple		* The most important thing to remember is that the URI of for exam ple
	* a file does not necessarily have a relation to its local path.		* a file does not necessarily have a relation to its local path.
	*		*
	* \return The resource URI of the resource or an empty url if the		* \return The resource URI of the resource or an empty url if the
	skipping to change at line 271		skipping to change at line 276
	* types from different type hierarchies, there is no guarantee whi ch		* types from different type hierarchies, there is no guarantee whi ch
	* one will be used here.		* one will be used here.
	*		*
	* For historical reasons the method does return a URI as QString i nstead		* For historical reasons the method does return a URI as QString i nstead
	* of QUrl. The value equals resourceType().toString().		* of QUrl. The value equals resourceType().toString().
	*		*
	* \sa name(), hasType(), types()		* \sa name(), hasType(), types()
	*		*
	* \deprecated use resourceType instead		* \deprecated use resourceType instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString type() const;		KDE_DEPRECATED QString type() const;
			#endif
	/**		/**
	* The main type of the resource. Nepomuk tries hard to make this		* The main type of the resource. Nepomuk tries hard to make this
	* the type furthest down the hierarchy. In case the resource has o nly		* the type furthest down the hierarchy. In case the resource has o nly
	* one type, this is no problem. However, if the resource has multi ple		* one type, this is no problem. However, if the resource has multi ple
	* types from different type hierarchies, there is no guarantee whi ch		* types from different type hierarchies, there is no guarantee whi ch
	* one will be used here.		* one will be used here.
	*		*
	* \sa name(), hasType(), types()		* \sa name(), hasType(), types()
	*/		*/
	skipping to change at line 325		skipping to change at line 332
	* For a translated user readable name of the resource see		* For a translated user readable name of the resource see
	* Ontology::typeName.		* Ontology::typeName.
	*		*
	* \sa type()		* \sa type()
	*/		*/
	QString className() const;		QString className() const;
	/**		/**
	* \deprecated Use properties()		* \deprecated Use properties()
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QHash<QString, Variant> allProperties() const;		KDE_DEPRECATED QHash<QString, Variant> allProperties() const;
			#endif
	/**		/**
	* \return A list of all defined properties		* \return A list of all defined properties
	*/		*/
	QHash<QUrl, Variant> properties() const;		QHash<QUrl, Variant> properties() const;
	/**		/**
	* Check if property identified by \a uri is defined		* Check if property identified by \a uri is defined
	* for this resource.		* for this resource.
	*		*
	skipping to change at line 352		skipping to change at line 361
	/**		/**
	* Check if the resource has a property \p p with value \p v.		* Check if the resource has a property \p p with value \p v.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	bool hasProperty( const Types::Property& p, const Variant& v ) cons t;		bool hasProperty( const Types::Property& p, const Variant& v ) cons t;
	/**		/**
	* \deprecated use hasProperty( const QUrl& ) const		* \deprecated use hasProperty( const QUrl& ) const
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool hasProperty( const QString& uri ) const;		KDE_DEPRECATED bool hasProperty( const QString& uri ) const;
			#endif
	/**		/**
	* Retrieve the value of property \a uri. If the property is not de fined for		* Retrieve the value of property \a uri. If the property is not de fined for
	* this resource an invalid, empty Variant object is returned.		* this resource an invalid, empty Variant object is returned.
	*		*
	* \param uri The URI identifying the property.		* \param uri The URI identifying the property.
	*/		*/
	Variant property( const QUrl& uri ) const;		Variant property( const QUrl& uri ) const;
	/**		/**
	* \deprecated use property( const QUrl& ) const		* \deprecated use property( const QUrl& ) const
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Variant property( const QString& uri ) const;		KDE_DEPRECATED Variant property( const QString& uri ) const;
			#endif
	/**		/**
	* Set a property of the resource.		* Set a property of the resource.
	*		*
	* \param uri The URI identifying the property.		* \param uri The URI identifying the property.
	* \param value The value of the property (i.e. the object of the R DF triple(s))		* \param value The value of the property (i.e. the object of the R DF triple(s))
	*/		*/
	void setProperty( const QUrl& uri, const Variant& value );		void setProperty( const QUrl& uri, const Variant& value );
	/**		/**
	skipping to change at line 388		skipping to change at line 401
	* \param uri The URI identifying the property.		* \param uri The URI identifying the property.
	* \param value The value of the property (i.e. the object of the R DF triple(s))		* \param value The value of the property (i.e. the object of the R DF triple(s))
	*		*
	* \since 4.3		* \since 4.3
	*/		*/
	void addProperty( const QUrl& uri, const Variant& value );		void addProperty( const QUrl& uri, const Variant& value );
	/**		/**
	* \deprecated use setProperty( const QUrl& )		* \deprecated use setProperty( const QUrl& )
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setProperty( const QString& uri, const Variant& value );		KDE_DEPRECATED void setProperty( const QString& uri, const Variant& value );
			#endif
	/**		/**
	* Remove property \a uri from this resource object.		* Remove property \a uri from this resource object.
	*		*
	* \param uri The URI identifying the property.		* \param uri The URI identifying the property.
	*/		*/
	void removeProperty( const QUrl& uri );		void removeProperty( const QUrl& uri );
	/**		/**
	* Remove \a value from property \a uri of this resource object.		* Remove \a value from property \a uri of this resource object.
	skipping to change at line 410		skipping to change at line 425
	* \param uri The URI identifying the property.		* \param uri The URI identifying the property.
	* \param value The value to remove		* \param value The value to remove
	*		*
	* \since 4.3		* \since 4.3
	*/		*/
	void removeProperty( const QUrl& uri, const Variant& value );		void removeProperty( const QUrl& uri, const Variant& value );
	/**		/**
	* \deprecated use removeProperty( const QUrl& )		* \deprecated use removeProperty( const QUrl& )
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void removeProperty( const QString& uri );		KDE_DEPRECATED void removeProperty( const QString& uri );
			#endif
	/**		/**
	* Remove this resource completely.		* Remove this resource completely.
	* CAUTION: After calling this method the resource will have been r emoved from the store		* CAUTION: After calling this method the resource will have been r emoved from the store
	* without any trace.		* without any trace.
	*/		*/
	void remove();		void remove();
	/**		/**
	* \return true if this resource (i.e. the uri of this resource) ex ists in the local		* \return true if this resource (i.e. the uri of this resource) ex ists in the local
	skipping to change at line 722		skipping to change at line 739
	QList<Resource> isRelatedOf() const;		QList<Resource> isRelatedOf() const;
	/**		/**
	* Retrieve a list of all available Resource resources. This list		* Retrieve a list of all available Resource resources. This list
	* consists of all resource of type Resource that are stored in		* consists of all resource of type Resource that are stored in
	* the local Nepomuk meta data storage and any changes made locally .		* the local Nepomuk meta data storage and any changes made locally .
	* Be aware that in some cases this list can get very big. Then it		* Be aware that in some cases this list can get very big. Then it
	* might be better to use libKNep directly.		* might be better to use libKNep directly.
	*		*
	* \sa ResourceManager::allResources		* \sa ResourceManager::allResources
			*
			* \warning This list will be very big. Usage of this method is
			* discouraged. Use Query::QueryServiceClient in combination with a
			n
			* empty Query::Query instead.
	*/		*/
	static QList<Resource> allResources();		static QList<Resource> allResources();
	/**		/**
	* \return The usage count stored for this resource.		* \return The usage count stored for this resource.
	*		*
	* \sa increaseUsageCount()		* \sa increaseUsageCount()
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	skipping to change at line 743		skipping to change at line 764
	/**		/**
	* Increase the usage count of this resource and also		* Increase the usage count of this resource and also
	* update the last used date to the current date and time.		* update the last used date to the current date and time.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	void increaseUsageCount();		void increaseUsageCount();
	/**		/**
			* \return \p true if this resource represents a file. Use toFile()
			to retrieve the
			* corresponding file resource which provides convinience methods t
			o handle file
			* resources.
			*
			* \since 4.6
			*/
			bool isFile() const;
			/**
			* Convert this resource into a File resource to have access to the
			convinience methods
			* provided by the File class.
			*
			* \since 4.6
			*/
			File toFile() const;
			/**
	* Allows to quickly load a resource from its resource URI without any		* Allows to quickly load a resource from its resource URI without any
	* additional checks. This is mostly used for optimized code within Nepomuk.		* additional checks. This is mostly used for optimized code within Nepomuk.
	*		*
	* In most situations the construtor Resource( QUrl, QUrl ) is bett er suited.		* In most situations the construtor Resource( QUrl, QUrl ) is bett er suited.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	static Resource fromResourceUri( const KUrl& uri, const Nepomuk::Ty pes::Class& type = Nepomuk::Types::Class(), ResourceManager* manager = 0 );		static Resource fromResourceUri( const KUrl& uri, const Nepomuk::Ty pes::Class& type = Nepomuk::Types::Class(), ResourceManager* manager = 0 );
	private:		private:
End of changes. 19 change blocks.
	0 lines changed or deleted		42 lines changed or added

	resourcemanager.h		resourcemanager.h
	skipping to change at line 112		skipping to change at line 112
	/**		/**
	* \deprecated Use the Resource constructor directly.		* \deprecated Use the Resource constructor directly.
	*		*
	* Creates a Resource object representing the data referenced by \a uri.		* Creates a Resource object representing the data referenced by \a uri.
	* The result is the same as from using the Resource::Resource( con st QString&, const QString& )		* The result is the same as from using the Resource::Resource( con st QString&, const QString& )
	* constructor with an empty type.		* constructor with an empty type.
	*		*
	* \return The Resource representing the data at \a uri or an inval id Resource object if the local		* \return The Resource representing the data at \a uri or an inval id Resource object if the local
	* NEPOMUK RDF store does not contain an object with URI \a uri.		* NEPOMUK RDF store does not contain an object with URI \a uri.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Resource createResourceFromUri( const QString& uri ) ;		KDE_DEPRECATED Resource createResourceFromUri( const QString& uri ) ;
			#endif
	/**		/**
	* Remove the resource denoted by \a uri completely.		* Remove the resource denoted by \a uri completely.
	*		*
	* This method is just a wrapper around Resource::remove. The resul t		* This method is just a wrapper around Resource::remove. The resul t
	* is the same.		* is the same.
	*/		*/
	void removeResource( const QString& uri );		void removeResource( const QString& uri );
	/**		/**
	* Retrieve a list of all resource managed by this manager.		* Retrieve a list of all resource managed by this manager.
	*		*
	* \warning This list will be very big. Usage of this method is		* \warning This list will be very big. Usage of this method is
	* discouraged.		* discouraged. Use Query::QueryServiceClient in combination with a
			n
			* empty Query::Query instead.
	*		*
	* \since 4.3		* \since 4.3
	*/		*/
	QList<Resource> allResources();		QList<Resource> allResources();
	/**		/**
	* Retrieve a list of all resources of the specified \a type.		* Retrieve a list of all resources of the specified \a type.
	*		*
	* This includes Resources that are not synced yet so it might		* This includes Resources that are not synced yet so it might
	* not represent exactly the state as in the RDF store.		* not represent exactly the state as in the RDF store.
			*
			* \warning This list can be very big. Usage of this method is
			* discouraged. Use Query::QueryServiceClient in combination with
			* a Query::Query containing one Query::ResourceTypeTerm instead.
	*/		*/
	QList<Resource> allResourcesOfType( const QUrl& type );		QList<Resource> allResourcesOfType( const QUrl& type );
	/**		/**
	* \deprecated Use allResourcesOfType( const QString& type )		* \deprecated Use allResourcesOfType( const QString& type )
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QList<Resource> allResourcesOfType( const QString& t ype );		KDE_DEPRECATED QList<Resource> allResourcesOfType( const QString& t ype );
			#endif
	/**		/**
	* Retrieve a list of all resources that have property \a uri defin ed with a value of \a v.		* Retrieve a list of all resources that have property \a uri defin ed with a value of \a v.
	*		*
	* This includes Resources that are not synced yet so it might		* This includes Resources that are not synced yet so it might
	* not represent exactly the state as in the RDF store.		* not represent exactly the state as in the RDF store.
	*		*
	* \param uri The URI identifying the property. If this URI does		* \param uri The URI identifying the property. If this URI does
	* not include a namespace the default namespace is		* not include a namespace the default namespace is
	* prepended.		* prepended.
	* \param v The value all returned resources should have set as pro perts \a uri.		* \param v The value all returned resources should have set as pro perts \a uri.
			*
			* \warning This list can be very big. Usage of this method is
			* discouraged. Use Query::QueryServiceClient in combination with
			* a Query::Query containing one Query::ComparisonTerm instead.
	*/		*/
	QList<Resource> allResourcesWithProperty( const QUrl& uri, const Va riant& v );		QList<Resource> allResourcesWithProperty( const QUrl& uri, const Va riant& v );
	/**		/**
	* \deprecated Use allResourcesWithProperty( const QString& type )		* \deprecated Use allResourcesWithProperty( const QString& type )
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QList<Resource> allResourcesWithProperty( const QStr ing& uri, const Variant& v );		KDE_DEPRECATED QList<Resource> allResourcesWithProperty( const QStr ing& uri, const Variant& v );
			#endif
	/**		/**
	* %ResourceManager caches resource locally so subsequent access is faster.		* %ResourceManager caches resource locally so subsequent access is faster.
	* This method clears this cache, deleting any Resource that is not used.		* This method clears this cache, deleting any Resource that is not used.
	*		*
	* \since 4.4		* \since 4.4
	*/		*/
	void clearCache();		void clearCache();
	/**		/**
	* \deprecated Use generateUniqueUri(const QString&)		* \deprecated Use generateUniqueUri(const QString&)
	*		*
	* Generates a unique URI that is not used in the store yet. This m ethod ca be used to		* Generates a unique URI that is not used in the store yet. This m ethod ca be used to
	* generate URIs for virtual types such as Tag.		* generate URIs for virtual types such as Tag.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QString generateUniqueUri();		KDE_DEPRECATED QString generateUniqueUri();
			#endif
	/**		/**
	* Generates a unique URI that is not used in the store yet. This m ethod can be used to		* Generates a unique URI that is not used in the store yet. This m ethod can be used to
	* generate URIs for virtual types such as Tag.		* generate URIs for virtual types such as Tag.
	*		*
	* \param label A label that the algorithm should use to try to cre ate a more readable URI.		* \param label A label that the algorithm should use to try to cre ate a more readable URI.
	*		*
	* \return A new unique URI which can be used to define a new resou rce.		* \return A new unique URI which can be used to define a new resou rce.
	*		*
	* \since 4.2		* \since 4.2
End of changes. 11 change blocks.
	1 lines changed or deleted		19 lines changed or added

	result.h		result.h
	skipping to change at line 92		skipping to change at line 92
	/**		/**
	* Assignment operator		* Assignment operator
	*/		*/
	Result& operator=( const Result& );		Result& operator=( const Result& );
	/**		/**
	* The score of the result. By default the value is 0.0		* The score of the result. By default the value is 0.0
	* which means no score.		* which means no score.
	*		*
			* Be aware that scoring needs to be enabled via Query::setFull
			TextScoringEnabled()
			* in order for this value to be filled.
			*
	* \sa setScore		* \sa setScore
	*/		*/
	double score() const;		double score() const;
	/**		/**
	* The result resource.		* The result resource.
	*/		*/
	Resource resource() const;		Resource resource() const;
	/**		/**
	* Set the score of the result.		* Set the score of the result.
	*		*
			* Normally there is no need to call this method as the query s
			ervice
			* does set the bindings.
			*
	* \sa score		* \sa score
	*/		*/
	void setScore( double score );		void setScore( double score );
	/**		/**
	* Add the value of a request property.		* Add the value of a request property.
	*		*
	* \sa Query::RequestProperty		* \sa Query::RequestProperty
	*/		*/
	void addRequestProperty( const Types::Property& property, const Soprano::Node& value );		void addRequestProperty( const Types::Property& property, const Soprano::Node& value );
	skipping to change at line 180		skipping to change at line 186
	* \endcode		* \endcode
	*		*
	* If for some reason one needs the plain binding values one		* If for some reason one needs the plain binding values one
	* could use additionalBinding().		* could use additionalBinding().
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	Variant additionalBinding( const QString& name ) const;		Variant additionalBinding( const QString& name ) const;
	/**		/**
			* Set the excerpt from the query.
			*
			* Normally there is no need to call this method as the query s
			ervice
			* does set the excerpt.
			*
			* \since 4.6
			*/
			void setExcerpt( const QString& text );
			/**
			* An excerpt of the matched text with highlighted search words
			* in case the query contained a full text matching.
			*
			* \return A rich-text snippet highlighting the search words or
			* and empty string if the query did not contain any full text
			* search terms.
			*
			* \sa LiteralTerm
			*
			* \since 4.6
			*/
			QString excerpt() const;
			/**
	* Comparison operator		* Comparison operator
	*/		*/
	bool operator==( const Result& ) const;		bool operator==( const Result& ) const;
	private:		private:
	class Private;		class Private;
	QSharedDataPointer<Private> d;		QSharedDataPointer<Private> d;
	};		};
	}		}
	}		}
End of changes. 3 change blocks.
	0 lines changed or deleted		33 lines changed or added

	runnermanager.h		runnermanager.h
	skipping to change at line 28		skipping to change at line 28
	* 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_RUNNERMANAGER_H		#ifndef PLASMA_RUNNERMANAGER_H
	#define PLASMA_RUNNERMANAGER_H		#define PLASMA_RUNNERMANAGER_H
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtCore/QObject>		#include <QtCore/QObject>
			#include <kplugininfo.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	#include "abstractrunner.h"		#include "abstractrunner.h"
	class QAction;		class QAction;
	class KConfigGroup;		class KConfigGroup;
	namespace Plasma		namespace Plasma
	{		{
	class QueryMatch;		class QueryMatch;
	class AbstractRunner;		class AbstractRunner;
	skipping to change at line 206		skipping to change at line 208
	* @since 4.5		* @since 4.5
	*/		*/
	QMimeData * mimeDataForMatch(const QueryMatch &match) const;		QMimeData * mimeDataForMatch(const QueryMatch &match) const;
	/**		/**
	* @return mime data of the specified match		* @return mime data of the specified match
	* @since 4.5		* @since 4.5
	*/		*/
	QMimeData * mimeDataForMatch(const QString &id) const;		QMimeData * mimeDataForMatch(const QString &id) const;
			/**
			* Returns a list of all known Runner implementations
			*
			* @param parentApp the application to filter applets on. Uses the
			* X-KDE-ParentApp entry (if any) in the plugin in
			fo.
			* The default value of QString() will result in a
			* list containing only applets not specifically
			* registered to an application.
			* @return list of AbstractRunners
			* @since 4.6
			**/
			static KPluginInfo::List listRunnerInfo(const QString &parentApp =
			QString());
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Call this method when the runners should be prepared for a query session.		* Call this method when the runners should be prepared for a query session.
	* Call matchSessionComplete when the query session is finished for the time		* Call matchSessionComplete when the query session is finished for the time
	* being.		* being.
	* @since 4.4		* @since 4.4
	* @see matchSessionComplete		* @see matchSessionComplete
	*/		*/
	void setupMatchSession();		void setupMatchSession();
	skipping to change at line 278		skipping to change at line 293
	* Emitted when the launchQuery finish		* Emitted when the launchQuery finish
	* @since 4.5		* @since 4.5
	*/		*/
	void queryFinished();		void queryFinished();
	private:		private:
	Q_PRIVATE_SLOT(d, void scheduleMatchesChanged())		Q_PRIVATE_SLOT(d, void scheduleMatchesChanged())
	Q_PRIVATE_SLOT(d, void matchesChanged())		Q_PRIVATE_SLOT(d, void matchesChanged())
	Q_PRIVATE_SLOT(d, void jobDone(ThreadWeaver::Job*))		Q_PRIVATE_SLOT(d, void jobDone(ThreadWeaver::Job*))
	Q_PRIVATE_SLOT(d, void unblockJobs())		Q_PRIVATE_SLOT(d, void unblockJobs())
			Q_PRIVATE_SLOT(d, void runnerMatchingSuspended(bool))
	RunnerManagerPrivate * const d;		RunnerManagerPrivate * const d;
	friend class RunnerManagerPrivate;		friend class RunnerManagerPrivate;
	};		};
	}		}
	#endif		#endif
End of changes. 3 change blocks.
	0 lines changed or deleted		18 lines changed or added

	scheduler.h		scheduler.h
	skipping to change at line 128		skipping to change at line 128
	* is available. This can be changed by calling scheduleJob.		* is available. This can be changed by calling scheduleJob.
	* @param job the job to register		* @param job the job to register
	*/		*/
	static void doJob(SimpleJob *job);		static void doJob(SimpleJob *job);
	/**		/**
	* Schedules @p job scheduled for later		* Schedules @p job scheduled for later
	* execution. This just sets the job's priority to 1 now.		* execution. This just sets the job's priority to 1 now.
	* @param job the job to schedule		* @param job the job to schedule
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static void scheduleJob(SimpleJob *job);		KDE_DEPRECATED static void scheduleJob(SimpleJob *job);
			#endif
	/**		/**
	* Changes the priority of @p job; jobs of the same priority run in the order in which		* Changes the priority of @p job; jobs of the same priority run in the order in which
	* they were created. Jobs of lower numeric priority always run bef ore any		* they were created. Jobs of lower numeric priority always run bef ore any
	* waiting jobs of higher numeric priority. The range of priority i s -10 to 10,		* waiting jobs of higher numeric priority. The range of priority i s -10 to 10,
	* the default priority of jobs is 0.		* the default priority of jobs is 0.
	* @param job the job to change		* @param job the job to change
	* @param priority new priority of @p job, lower runs earlier		* @param priority new priority of @p job, lower runs earlier
	*/		*/
	static void setJobPriority(SimpleJob *job, int priority);		static void setJobPriority(SimpleJob *job, int priority);
	skipping to change at line 286		skipping to change at line 288
	Scheduler();		Scheduler();
	~Scheduler();		~Scheduler();
	static Scheduler *self();		static Scheduler *self();
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveDied(KIO::Slave *sla ve))		Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveDied(KIO::Slave *sla ve))
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveStatus(pid_t pid, co nst QByteArray &protocol,		Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveStatus(pid_t pid, co 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 (const QString &))		Q_PRIVATE_SLOT(schedulerPrivate, void slotReparseSlaveConfiguration (const QString &, const QDBusMessage&))
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveConnected())		Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveConnected())
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveError(int error, con st QString &errorMsg))		Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveError(int error, con st QString &errorMsg))
	Q_PRIVATE_SLOT(schedulerPrivate, void slotUnregisterWindow(QObject *))		Q_PRIVATE_SLOT(schedulerPrivate, void slotUnregisterWindow(QObject *))
	private:		private:
	friend class SchedulerPrivate;		friend class SchedulerPrivate;
	SchedulerPrivate *const d;		SchedulerPrivate *const d;
	};		};
	}		}
End of changes. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	scrollbar.h		scrollbar.h
	skipping to change at line 46		skipping to change at line 46
	*		*
	* @short Provides a plasma-themed QScrollBar.		* @short Provides a plasma-themed QScrollBar.
	*/		*/
	class PLASMA_EXPORT ScrollBar : public QGraphicsProxyWidget		class PLASMA_EXPORT ScrollBar : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(int singleStep READ singleStep WRITE setSingleStep)		Q_PROPERTY(int singleStep READ singleStep WRITE setSingleStep)
	Q_PROPERTY(int pageStep READ pageStep WRITE setPageStep)		Q_PROPERTY(int pageStep READ pageStep WRITE setPageStep)
	Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)		Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged)
	Q_PROPERTY(int minimum READ minimum)		Q_PROPERTY(int minimum READ minimum WRITE setMinimum)
	Q_PROPERTY(int maximum READ maximum)		Q_PROPERTY(int maximum READ maximum WRITE setMaximum)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QScrollBar *nativeWidget READ nativeWidget)		Q_PROPERTY(QScrollBar *nativeWidget READ nativeWidget)
	Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)		Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)
	public:		public:
	/**		/**
	* Creates a scrollbar; the default orientation is vertical		* Creates a scrollbar; the default orientation is vertical
	*/		*/
	explicit ScrollBar(QGraphicsWidget *parent);		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		* @arg min minimum value
	* @arg max maximum value		* @arg max maximum value
	*/		*/
	void setRange(int min, int max);		void setRange(int min, int max);
	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
			* @since 4.6
			*/
			void setMinimum(const int min) const;
			/**
			* @arg the maximum value bound of this ScrollBar
			* @since 4.6
			*/
			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		* @arg 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();
	skipping to change at line 149		skipping to change at line 161
	* 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:
	/**		/**
	* Emitted when the value of the slider changes		* Emitted when the value of the slider changes
	*/		*/
	void valueChanged(int value);		void valueChanged(int value);
			/**
			* Emitted when the slider has been moved by the user
			* @since 4.6
			*/
			void sliderMoved(int value);
	private:		private:
	ScrollBarPrivate * const d;		ScrollBarPrivate * const d;
	};		};
	}		}
	#endif		#endif
End of changes. 4 change blocks.
	3 lines changed or deleted		21 lines changed or added

	scrollwidget.h		scrollwidget.h
	skipping to change at line 48		skipping to change at line 48
	* A container of widgets that can have horizontal and vertical scrollbars if the content is bigger than the widget itself		* A container of widgets that can have horizontal and vertical scrollbars if the content is bigger than the widget itself
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	class PLASMA_EXPORT ScrollWidget : public QGraphicsWidget		class PLASMA_EXPORT ScrollWidget : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *widget READ widget WRITE setWidget)		Q_PROPERTY(QGraphicsWidget *widget READ widget WRITE setWidget)
	Q_PROPERTY(Qt::ScrollBarPolicy horizontalScrollBarPolicy READ horizonta lScrollBarPolicy WRITE setHorizontalScrollBarPolicy)		Q_PROPERTY(Qt::ScrollBarPolicy horizontalScrollBarPolicy READ horizonta lScrollBarPolicy WRITE setHorizontalScrollBarPolicy)
	Q_PROPERTY(Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScr ollBarPolicy WRITE setVerticalScrollBarPolicy)		Q_PROPERTY(Qt::ScrollBarPolicy verticalScrollBarPolicy READ verticalScr ollBarPolicy WRITE setVerticalScrollBarPolicy)
			Q_PROPERTY(bool overflowBordersVisible READ overflowBordersVisible WRIT E setOverflowBordersVisible)
	Q_PROPERTY(QPointF scrollPosition READ scrollPosition WRITE setScrollPo sition)		Q_PROPERTY(QPointF scrollPosition READ scrollPosition WRITE setScrollPo sition)
	Q_PROPERTY(QSizeF contentsSize READ contentsSize)		Q_PROPERTY(QSizeF contentsSize READ contentsSize)
	Q_PROPERTY(QRectF viewportGeometry READ viewportGeometry)		Q_PROPERTY(QRectF viewportGeometry READ viewportGeometry)
	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:
	skipping to change at line 137		skipping to change at line 138
	* @arg policy desired policy		* @arg 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
			* is bigger than the viewport
			* @since 4.6
			*/
			bool overflowBordersVisible() const;
			/**
			* Sets whether borders should be shown when the inner widget
			* is bigger than the viewport
			* @param visible true if the border should be visible when
			* the inner widget overflows
			* @since 4.6
			*/
			void setOverflowBordersVisible(const bool visible);
			/**
	* Scroll the view until the given rectangle is visible		* Scroll the view until the given rectangle is visible
	*		*
	* @param rect rect we want visible, in coordinates mapped to the inner widget		* @param rect rect we want visible, in coordinates mapped to the inner widget
	* @since 4.4		* @since 4.4
	*/		*/
	Q_INVOKABLE void ensureRectVisible(const QRectF &rect);		Q_INVOKABLE void ensureRectVisible(const QRectF &rect);
	/**		/**
	* Scroll the view until the given item is visible		* Scroll the view until the given item is visible
	*		*
	skipping to change at line 166		skipping to change at line 183
	* between press and release.		* between press and release.
	*		*
	* This function is no more necessary, since it's the authomatic behavi our		* This function is no more necessary, since it's the authomatic behavi our
	* for all children items, the implementation has now no effect		* for all children items, the implementation has now no effect
	*		*
	* @param item the drag handle item. widget() must be an ancestor if it in		* @param item the drag handle item. widget() must be an ancestor if it in
	* the parent hierarchy. if item doesn't accept mose press events		* the parent hierarchy. if item doesn't accept mose press events
	* it's not necessary to call this function.		* it's not necessary to call this function.
	* @since 4.4		* @since 4.4
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE void registerAsDragHandle(QGraphicsWidget *i tem);		KDE_DEPRECATED Q_INVOKABLE void registerAsDragHandle(QGraphicsWidget *i tem);
			#endif
	/**		/**
	* Unregister the given item as drag handle (if it was registered)		* Unregister the given item as drag handle (if it was registered)
	*		*
	* This function is no more necessary, since it's the authomatic behavi our		* This function is no more necessary, since it's the authomatic behavi our
	* for all children items, the implementation has now no effect		* for all children items, the implementation has now no effect
	*		*
	* @since 4.4		* @since 4.4
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED Q_INVOKABLE void unregisterAsDragHandle(QGraphicsWidget *item);		KDE_DEPRECATED Q_INVOKABLE void unregisterAsDragHandle(QGraphicsWidget *item);
			#endif
	/**		/**
	* The geometry of the viewport.		* The geometry of the viewport.
	* @since 4.4		* @since 4.4
	*/		*/
	QRectF viewportGeometry() const;		QRectF viewportGeometry() const;
	/**		/**
	* @return the size of the internal widget		* @return the size of the internal widget
	* @since 4.4		* @since 4.4
End of changes. 6 change blocks.
	0 lines changed or deleted		21 lines changed or added

	serialinterface.h		serialinterface.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2009 Harald Fernengel <harry@kdevelop.org>		Copyright 2009 Harald Fernengel <harry@kdevelop.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_SERIALINTERFACE_H		#ifndef SOLID_SERIALINTERFACE_H
	#define SOLID_SERIALINTERFACE_H		#define SOLID_SERIALINTERFACE_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	service.h		service.h
	skipping to change at line 95		skipping to change at line 95
	* If the service will not be used after just one operation call, use:		* If the service will not be used after just one operation call, use:
	* @code		* @code
	* connect(job, SIGNAL(finished(KJob*)), service, SLOT(deleteLater()));		* connect(job, SIGNAL(finished(KJob*)), service, SLOT(deleteLater()));
	* @endcode		* @endcode
	*		*
	*/		*/
	class PLASMA_EXPORT Service : public QObject		class PLASMA_EXPORT Service : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	Q_DECLARE_PRIVATE(Service)		Q_DECLARE_PRIVATE(Service)
			Q_PROPERTY(QString destination READ destination WRITE setDestination)
			Q_PROPERTY(QStringList operationNames READ operationNames)
			Q_PROPERTY(QString name READ name)
	public:		public:
	/**		/**
	* Destructor		* Destructor
	*/		*/
	~Service();		~Service();
	/**		/**
	* Used to load a given service from a plugin.		* Used to load a given service from a plugin.
	*		*
	* @param name the plugin name of the service to load		* @param name the plugin name of the service to load
	skipping to change at line 312		skipping to change at line 316
	Q_PRIVATE_SLOT(d, void associatedGraphicsWidgetDestroyed(QObject *))		Q_PRIVATE_SLOT(d, void associatedGraphicsWidgetDestroyed(QObject *))
	ServicePrivate * const d;		ServicePrivate * const d;
	friend class Applet;		friend class Applet;
	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;
	};		};
	} // namespace Plasma		} // namespace Plasma
	/**		/**
	* 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)) \
End of changes. 2 change blocks.
	0 lines changed or deleted		5 lines changed or added

	servicejob.h		servicejob.h
	skipping to change at line 57		skipping to change at line 57
	* set a non-zero error code with setError(int) and an error message with		* set a non-zero error code with setError(int) and an error message with
	* setErrorText(QString).		* setErrorText(QString).
	*		*
	* If the job is longer (involving network access, for instance), you shoul d		* If the job is longer (involving network access, for instance), you shoul d
	* report the progress at regular intervals. See the KJob documentation fo r		* report the progress at regular intervals. See the KJob documentation fo r
	* information on how to do this.		* information on how to do this.
	*/		*/
	class PLASMA_EXPORT ServiceJob : public KJob		class PLASMA_EXPORT ServiceJob : public KJob
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(QString destination READ destination)
			Q_PROPERTY(QString operationName READ operationName)
			Q_PROPERTY(QVariant result READ result)
	public:		public:
	/**		/**
	* Default constructor		* Default constructor
	*		*
	* @arg destination the subject that the job is acting on		* @arg destination the subject that the job is acting on
	* @arg operation the action that the job is performing on the @p des tination		* @arg operation the action that the job is performing on the @p des tination
	* @arg parameters the parameters of the @p action		* @arg parameters the parameters of the @p action
	* @arg parent the parent object for this service		* @arg parent the parent object for this service
	*/		*/
	skipping to change at line 112		skipping to change at line 115
	* was successful. Instead, you should check the value of error().		* was successful. Instead, you should check the value of error().
	*		*
	* @return the result of the operation		* @return the result of the operation
	*/		*/
	QVariant result() const;		QVariant result() const;
	/**		/**
	* Default implementation of start, which simply sets the results to fa lse.		* Default implementation of start, which simply sets the results to fa lse.
	* This makes it easy to create a "failure" job.		* This makes it easy to create a "failure" job.
	*/		*/
	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 slotStart())
End of changes. 2 change blocks.
	1 lines changed or deleted		4 lines changed or added

	servicetypebrowser.h		servicetypebrowser.h
	skipping to change at line 97		skipping to change at line 97
	*		*
	* @see serviceTypeAdded(), serviceTypeRemoved() and finished()		* @see serviceTypeAdded(), serviceTypeRemoved() and finished()
	*/		*/
	void startBrowse();		void startBrowse();
	/**		/**
	* @deprecated		* @deprecated
	* This method is unnecessary, since it is safe to call startBrowse( )		* This method is unnecessary, since it is safe to call startBrowse( )
	* multiple times.		* multiple times.
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED bool isRunning() const;		KDE_DEPRECATED bool isRunning() const;
			#endif
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when there are no more services of this type		* Emitted when there are no more services of this type
	*		*
	* @warning		* @warning
	* This signal is not reliable: it is possible that it will not be		* This signal is not reliable: it is possible that it will not be
	* emitted even after last service of this type disappeared		* emitted even after last service of this type disappeared
	*		*
	* @param type the service type		* @param type the service type
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	signalplotter.h		signalplotter.h
	skipping to change at line 92		skipping to change at line 92
	* Add data to the graph, and advance the graph by one time period.		* Add data to the graph, and advance the graph by one time period.
	* The data must be given as a list in the same order that the plots we re		* The data must be given as a list in the same order that the plots we re
	* added (or consequently reordered).		* added (or consequently reordered).
	* @param samples a list with the new value for each plot		* @param samples a list with the new value for each plot
	*/		*/
	Q_INVOKABLE void addSample(const QList<double> &samples);		Q_INVOKABLE void addSample(const QList<double> &samples);
	/**		/**
	* Reorder the plots into the order given. For example:		* Reorder the plots into the order given. For example:
	* \code		* \code
	* KSignalPlotter *s = KSignalPlotter(parent);		* Plasma::SignalPlotter *s = new Plasma::SignalPlotter(parent);
	* s->addPlot(Qt::Blue);		* s->addPlot(Qt::Blue);
	* s->addPlot(Qt::Green);		* s->addPlot(Qt::Green);
	* QList neworder;		* QList neworder;
	* neworder << 1 << 0;		* neworder << 1 << 0;
	* reorderPlots(newOrder);		* s->reorderPlots(newOrder);
	* //Now the order is Green then Blue		* //Now the order is Green then Blue
	* \endcode		* \endcode
	* @param newOrder a list with the new position of each plot		* @param newOrder a list with the new position of each plot
	*/		*/
	Q_INVOKABLE void reorderPlots(const QList<uint>& newOrder);		Q_INVOKABLE void reorderPlots(const QList<uint>& newOrder);
	/**		/**
	* Removes the plot at the specified index.		* Removes the plot at the specified index.
	* @param pos the index of the plot to be removed		* @param pos the index of the plot to be removed
	*/		*/
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	smartcardreader.h		smartcardreader.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2009 Christopher Blauvelt <cblauvelt@gmail.com>		Copyright 2009 Christopher Blauvelt <cblauvelt@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 Lesser General Public
	License version 3 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_SMARTCARDREADER_H		#ifndef SOLID_SMARTCARDREADER_H
	#define SOLID_SMARTCARDREADER_H		#define SOLID_SMARTCARDREADER_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
	skipping to change at line 82		skipping to change at line 83
	*		*
	* @return the SmartCardReader device interface type		* @return the SmartCardReader device interface type
	* @see Solid::DeviceInterface::Type		* @see Solid::DeviceInterface::Type
	*/		*/
	static Type deviceInterfaceType() { return DeviceInterface::SmartCa rdReader; }		static Type deviceInterfaceType() { return DeviceInterface::SmartCa rdReader; }
	/**		/**
	* Retrieves the type of this smart card reader.		* Retrieves the type of this smart card reader.
	*		*
	* @return the smart card reader type		* @return the smart card reader type
	* @see Solid::Ifaces::Enums::SmartCardReader::ReaderType		* @see Solid::SmartCardReader::ReaderType
	*/		*/
	ReaderType readerType() const;		ReaderType readerType() const;
	};		};
	}		}
	#endif		#endif
End of changes. 5 change blocks.
	12 lines changed or deleted		13 lines changed or added

	smartrange.h		smartrange.h
	skipping to change at line 525		skipping to change at line 525
	/**		/**
	* Returns a list of notifiers which are receiving signals indicating c hange of state		* Returns a list of notifiers which are receiving signals indicating c hange of state
	* of this range. These notifiers may be receiving signals from other ranges as well.		* of this range. These notifiers may be receiving signals from other ranges as well.
	*/		*/
	const QList<SmartRangeNotifier*> notifiers() const;		const QList<SmartRangeNotifier*> notifiers() const;
	/**		/**
	* Register a notifier to receive signals indicating change of state of this range.		* Register a notifier to receive signals indicating change of state of this range.
	*		*
			* NOTE: Make sure you call @c removeNotifier() when deleting the notif
			ier before the range.
			*
	* \param notifier notifier to register. Ownership is not transferred.		* \param notifier notifier to register. Ownership is not transferred.
	*/		*/
	void addNotifier(SmartRangeNotifier* notifier);		void addNotifier(SmartRangeNotifier* notifier);
	/**		/**
	* Deregister a notifier and no longer deliver signals indicating chang e of state of this range.		* Deregister a notifier and no longer deliver signals indicating chang e of state of this range.
	*		*
	* \param notifier notifier to deregister.		* \param notifier notifier to deregister.
	*/		*/
	void removeNotifier(SmartRangeNotifier* notifier);		void removeNotifier(SmartRangeNotifier* notifier);
	skipping to change at line 560		skipping to change at line 562
	* \note this function may return watchers internal to the text editor' s implementation,		* \note this function may return watchers internal to the text editor' s implementation,
	* eg. in the case of arbitrary highlighting and kate part. Remo ving these watchers		* eg. in the case of arbitrary highlighting and kate part. Remo ving these watchers
	* with removeWatcher() will result in malfunction.		* with removeWatcher() will result in malfunction.
	*/		*/
	const QList<SmartRangeWatcher*>& watchers() const;		const QList<SmartRangeWatcher*>& watchers() const;
	/**		/**
	* Register a SmartRangeWatcher to receive calls indicating change of s tate		* Register a SmartRangeWatcher to receive calls indicating change of s tate
	* of this range. To finish receiving notifications, call removeWatcher ().		* of this range. To finish receiving notifications, call removeWatcher ().
	*		*
			* NOTE: Make sure you call @c removeWachter() when deleting the notifi
			er before the range.
			*
	* \param watcher the instance of a class which is to receive		* \param watcher the instance of a class which is to receive
	* notifications about changes to this range.		* notifications about changes to this range.
	*/		*/
	void addWatcher(SmartRangeWatcher* watcher);		void addWatcher(SmartRangeWatcher* watcher);
	/**		/**
	* Stop delivery of notifications to a SmartRangeWatcher.		* Stop delivery of notifications to a SmartRangeWatcher.
	*		*
	* \param watcher the watcher that no longer wants notifications.		* \param watcher the watcher that no longer wants notifications.
	*/		*/
End of changes. 2 change blocks.
	0 lines changed or deleted		6 lines changed or added

	solid_export.h		solid_export.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2007 David Faure <faure@kde.org>		Copyright 2007 David Faure <faure@kde.org>
	Copyright (C) 2007 Kevin Ottens <ervin@kde.org>		Copyright 2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library 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 of the License, or (at your option) any later version.		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
			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.
	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.		Lesser General Public License for more details.
	You should have received a copy of the GNU Library General Public Licen		You should have received a copy of the GNU Lesser General Public
	se		License along with this library. If not, see <http://www.gnu.org/licens
	along with this library; see the file COPYING.LIB. If not, write to		es/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef SOLID_EXPORT_H		#ifndef SOLID_EXPORT_H
	#define SOLID_EXPORT_H		#define SOLID_EXPORT_H
	#ifndef __KDE_HAVE_GCC_VISIBILITY		#ifndef __KDE_HAVE_GCC_VISIBILITY
	#define __KDE_HAVE_GCC_VISIBILITY		#define __KDE_HAVE_GCC_VISIBILITY
	#endif		#endif
	#ifdef SOLID_EXPORT		#ifdef SOLID_EXPORT
	skipping to change at line 43		skipping to change at line 44
	/* We are not building a test case */		/* We are not building a test case */
	# ifdef __KDE_HAVE_GCC_VISIBILITY		# ifdef __KDE_HAVE_GCC_VISIBILITY
	# define SOLID_NO_EXPORT __attribute__ ((visibility("hidden")))		# define SOLID_NO_EXPORT __attribute__ ((visibility("hidden")))
	# define SOLID_EXPORT __attribute__ ((visibility("default")))		# define SOLID_EXPORT __attribute__ ((visibility("default")))
	# elif defined(_WIN32) || defined(_WIN64)		# elif defined(_WIN32) || defined(_WIN64)
	# define SOLID_NO_EXPORT		# define SOLID_NO_EXPORT
	# if defined(MAKE_SOLID_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define SOLID_EXPORT
			# elif defined(MAKE_SOLID_LIB)
	/* We are building this library */		/* We are building this library */
	# define SOLID_EXPORT __declspec(dllexport)		# define SOLID_EXPORT __declspec(dllexport)
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define SOLID_EXPORT __declspec(dllimport)		# define SOLID_EXPORT __declspec(dllimport)
	# endif		# endif
	# else		# else
	# define SOLID_NO_EXPORT		# define SOLID_NO_EXPORT
End of changes. 6 change blocks.
	12 lines changed or deleted		16 lines changed or added

	solidnamespace.h		solidnamespace.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2007 Kevin Ottens <ervin@kde.org>		Copyright 2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#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 };
	}		}
End of changes. 4 change blocks.
	11 lines changed or deleted		12 lines changed or added

	storageaccess.h		storageaccess.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_STORAGEACCESS_H		#ifndef SOLID_STORAGEACCESS_H
	#define SOLID_STORAGEACCESS_H		#define SOLID_STORAGEACCESS_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/solidnamespace.h>		#include <solid/solidnamespace.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	skipping to change at line 46		skipping to change at line 47
	* (i.e. mount or unmount them).		* (i.e. mount or unmount them).
	*		*
	* A volume is anything that can contain data (partition, optical disc,		* A volume is anything that can contain data (partition, optical disc,
	* memory card). It's a particular kind of block device.		* memory card). It's a particular kind of block device.
	*/		*/
	class SOLID_EXPORT StorageAccess : public DeviceInterface		class SOLID_EXPORT StorageAccess : public DeviceInterface
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(bool accessible READ isAccessible)		Q_PROPERTY(bool accessible READ isAccessible)
	Q_PROPERTY(QString filePath READ filePath)		Q_PROPERTY(QString filePath READ filePath)
			Q_PROPERTY(bool ignored READ isIgnored)
	Q_DECLARE_PRIVATE(StorageAccess)		Q_DECLARE_PRIVATE(StorageAccess)
	friend class Device;		friend class Device;
	private:		private:
	/**		/**
	* Creates a new StorageAccess object.		* Creates a new StorageAccess object.
	* You generally won't need this. It's created when necessary using		* You generally won't need this. It's created when necessary using
	* Device::as().		* Device::as().
	*		*
	* @param backendObject the device interface object provided by the backend		* @param backendObject the device interface object provided by the backend
	skipping to change at line 90		skipping to change at line 92
	/**		/**
	* Retrieves the absolute path of this volume mountpoint.		* Retrieves the absolute path of this volume mountpoint.
	*		*
	* @return the absolute path to the mount point if the volume is		* @return the absolute path to the mount point if the volume is
	* mounted, QString() otherwise		* mounted, QString() otherwise
	*/		*/
	QString filePath() const;		QString filePath() const;
	/**		/**
			* Indicates if this volume should be ignored by applications.
			*
			* If it should be ignored, it generally means that it should be
			* invisible to the user. It's useful for firmware partitions or
			* OS reinstall partitions on some systems.
			*
			* @return true if the volume should be ignored
			*/
			bool isIgnored() const;
			/**
	* Mounts the volume.		* Mounts the volume.
	*		*
	* @return false if the operation is not supported, true if the		* @return false if the operation is not supported, true if the
	* operation is attempted		* operation is attempted
	*/		*/
	bool setup();		bool setup();
	/**		/**
	* Unmounts the volume.		* Unmounts the volume.
	*		*
End of changes. 6 change blocks.
	11 lines changed or deleted		24 lines changed or added

	storagedrive.h		storagedrive.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_STORAGEDRIVE_H		#ifndef SOLID_STORAGEDRIVE_H
	#define SOLID_STORAGEDRIVE_H		#define SOLID_STORAGEDRIVE_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
	skipping to change at line 46		skipping to change at line 47
	* hard disk, cdrom drive...). It's a particular kind of block device.		* hard disk, cdrom drive...). It's a particular kind of block device.
	*/		*/
	class SOLID_EXPORT StorageDrive : public DeviceInterface		class SOLID_EXPORT StorageDrive : public DeviceInterface
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(Bus DriveType)		Q_ENUMS(Bus DriveType)
	Q_PROPERTY(Bus bus READ bus)		Q_PROPERTY(Bus bus READ bus)
	Q_PROPERTY(DriveType driveType READ driveType)		Q_PROPERTY(DriveType driveType READ driveType)
	Q_PROPERTY(bool removable READ isRemovable)		Q_PROPERTY(bool removable READ isRemovable)
	Q_PROPERTY(bool hotpluggable READ isHotpluggable)		Q_PROPERTY(bool hotpluggable READ isHotpluggable)
			Q_PROPERTY(bool inUse READ isInUse)
	Q_PROPERTY(qulonglong size READ size)		Q_PROPERTY(qulonglong size READ size)
	Q_DECLARE_PRIVATE(StorageDrive)		Q_DECLARE_PRIVATE(StorageDrive)
	friend class Device;		friend class Device;
	public:		public:
	/**		/**
	* This enum type defines the type of bus a storage device is attac hed to.		* This enum type defines the type of bus a storage device is attac hed to.
	*		*
	* - Ide : An Integrated Drive Electronics (IDE) bus, also known as ATA		* - Ide : An Integrated Drive Electronics (IDE) bus, also known as ATA
	* - Usb : An Universal Serial Bus (USB)		* - Usb : An Universal Serial Bus (USB)
	skipping to change at line 99		skipping to change at line 101
	public:		public:
	/**		/**
	* Destroys a StorageDrive object.		* Destroys a StorageDrive object.
	*/		*/
	virtual ~StorageDrive();		virtual ~StorageDrive();
	/**		/**
	* Get the Solid::DeviceInterface::Type of the StorageDrive device interface.		* Get the Solid::DeviceInterface::Type of the StorageDrive device interface.
	*		*
	* @return the StorageDrive device interface type		* @return the StorageDrive device interface type
	* @see Solid::Ifaces::Enums::DeviceInterface::Type		* @see Solid::DeviceInterface::Type
	*/		*/
	static Type deviceInterfaceType() { return DeviceInterface::Storage Drive; }		static Type deviceInterfaceType() { return DeviceInterface::Storage Drive; }
	/**		/**
	* Retrieves the type of physical interface this storage device is		* Retrieves the type of physical interface this storage device is
	* connected to.		* connected to.
	*		*
	* @return the bus type		* @return the bus type
	* @see Solid::Ifaces::Enums::StorageDrive::Bus		* @see Solid::StorageDrive::Bus
	*/		*/
	Bus bus() const;		Bus bus() const;
	/**		/**
	* Retrieves the type of this storage drive.		* Retrieves the type of this storage drive.
	*		*
	* @return the drive type		* @return the drive type
	* @see Solid::Ifaces::Enums::StorageDrive::DriveType		* @see Solid::StorageDrive::DriveType
	*/		*/
	DriveType driveType() const;		DriveType driveType() const;
	/**		/**
	* Indicates if the media contained by this drive can be removed.		* Indicates if the media contained by this drive can be removed.
	*		*
	* For example memory card can be removed from the drive by the use r,		* For example memory card can be removed from the drive by the use r,
	* while partitions can't be removed from hard disks.		* while partitions can't be removed from hard disks.
	*		*
	* @return true if media can be removed, false otherwise.		* @return true if media can be removed, false otherwise.
	skipping to change at line 145		skipping to change at line 147
	*/		*/
	bool isHotpluggable() const;		bool isHotpluggable() const;
	/**		/**
	* Retrieves this drives size in bytes.		* Retrieves this drives size in bytes.
	*		*
	* @return the size of this drive		* @return the size of this drive
	*/		*/
	qulonglong size() const;		qulonglong size() const;
			/**
			* Indicates if the storage device is currently in use
			* i.e. if at least one child storage access is
			* mounted
			*
			* @return true if at least one child storage access is mounted
			*/
			bool isInUse() const;
	protected:		protected:
	/**		/**
	* @internal		* @internal
	*/		*/
	StorageDrive(StorageDrivePrivate &dd, QObject *backendObject);		StorageDrive(StorageDrivePrivate &dd, QObject *backendObject);
	};		};
	}		}
	#endif // SOLID_STORAGEDRIVE_H		#endif // SOLID_STORAGEDRIVE_H
End of changes. 9 change blocks.
	14 lines changed or deleted		25 lines changed or added

	storagevolume.h		storagevolume.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_STORAGEVOLUME_H		#ifndef SOLID_STORAGEVOLUME_H
	#define SOLID_STORAGEVOLUME_H		#define SOLID_STORAGEVOLUME_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	namespace Solid		namespace Solid
	skipping to change at line 84		skipping to change at line 85
	public:		public:
	/**		/**
	* Destroys a StorageVolume object.		* Destroys a StorageVolume object.
	*/		*/
	virtual ~StorageVolume();		virtual ~StorageVolume();
	/**		/**
	* Get the Solid::DeviceInterface::Type of the StorageVolume device interface.		* Get the Solid::DeviceInterface::Type of the StorageVolume device interface.
	*		*
	* @return the StorageVolume device interface type		* @return the StorageVolume device interface type
	* @see Solid::Ifaces::Enums::DeviceInterface::Type		* @see Solid::DeviceInterface::Type
	*/		*/
	static Type deviceInterfaceType() { return DeviceInterface::Storage Volume; }		static Type deviceInterfaceType() { return DeviceInterface::Storage Volume; }
	/**		/**
	* Indicates if this volume should be ignored by applications.		* Indicates if this volume should be ignored by applications.
	*		*
	* If it should be ignored, it generally means that it should be		* If it should be ignored, it generally means that it should be
	* invisible to the user. It's useful for firmware partitions or		* invisible to the user. It's useful for firmware partitions or
	* OS reinstall partitions on some systems.		* OS reinstall partitions on some systems.
	*		*
	* @return true if the volume should be ignored		* @return true if the volume should be ignored
	*/		*/
	bool isIgnored() const;		bool isIgnored() const;
	/**		/**
	* Retrieves the type of use for this volume (for example filesyste m).		* Retrieves the type of use for this volume (for example filesyste m).
	*		*
	* @return the usage type		* @return the usage type
	* @see Solid::Ifaces::Enums::StorageVolume::UsageType		* @see Solid::StorageVolume::UsageType
	*/		*/
	UsageType usage() const;		UsageType usage() const;
	/**		/**
	* Retrieves the filesystem type of this volume.		* Retrieves the filesystem type of this volume.
	*		*
	* FIXME: It's a platform dependent string, maybe we should switch to		* FIXME: It's a platform dependent string, maybe we should switch to
	* an enum?		* an enum?
	*		*
	* @return the filesystem type if applicable, QString() otherwise		* @return the filesystem type if applicable, QString() otherwise
End of changes. 6 change blocks.
	13 lines changed or deleted		14 lines changed or added

	stub.h		stub.h
	skipping to change at line 97		skipping to change at line 97
	#endif		#endif
	bool m_bXOnly;		bool m_bXOnly;
	int m_Priority;		int m_Priority;
	int m_Scheduler;		int m_Scheduler;
	QByteArray m_Command;		QByteArray m_Command;
	QByteArray m_User;		QByteArray m_User;
	KDESuPrivate::KCookie *m_pCookie;		KDESuPrivate::KCookie *m_pCookie;
	private:		private:
	QByteArray commaSeparatedList(const QList<QByteArray> &);		QByteArray commaSeparatedList(const QList<QByteArray> &);
			void writeString(const QByteArray &str);
	protected:		protected:
	virtual void virtual_hook( int id, void* data );		virtual void virtual_hook( int id, void* data );
	private:		private:
	class StubProcessPrivate;		class StubProcessPrivate;
	StubProcessPrivate * const d;		StubProcessPrivate * const d;
	};		};
	}		}
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	svg.h		svg.h
	skipping to change at line 60		skipping to change at line 60
	* convenient manner. Unless an absolute path to a file is provided, it loa ds		* convenient manner. Unless an absolute path to a file is provided, it loa ds
	* the SVG document using Plasma::Theme. It also provides a number of inter nal		* the SVG document using Plasma::Theme. It also provides a number of inter nal
	* optimizations to help lower the cost of painting SVGs, such as caching.		* optimizations to help lower the cost of painting SVGs, such as caching.
	*		*
	* @see Plasma::FrameSvg		* @see Plasma::FrameSvg
	**/		**/
	class PLASMA_EXPORT Svg : public QObject		class PLASMA_EXPORT Svg : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(ContentType)		Q_ENUMS(ContentType)
	Q_PROPERTY(QSize size READ size)		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 ring		* Constructs an SVG object that implicitly shares and caches rende ring
	* As opposed to QSvgRenderer, which this class uses internally,		* As opposed to 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
	skipping to change at line 258		skipping to change at line 258
	*/		*/
	void setTheme(Plasma::Theme *theme);		void setTheme(Plasma::Theme *theme);
	/**		/**
	* @return the theme used by this Svg		* @return the theme used by this Svg
	*/		*/
	Theme *theme() const;		Theme *theme() const;
	Q_SIGNALS:		Q_SIGNALS:
	void repaintNeeded();		void repaintNeeded();
			void sizeChanged();
	private:		private:
	SvgPrivate *const d;		SvgPrivate *const d;
	Q_PRIVATE_SLOT(d, void themeChanged())		Q_PRIVATE_SLOT(d, void themeChanged())
	Q_PRIVATE_SLOT(d, void colorsChanged())		Q_PRIVATE_SLOT(d, void colorsChanged())
	friend class SvgPrivate;		friend class SvgPrivate;
	friend class FrameSvgPrivate;		friend class FrameSvgPrivate;
			friend class FrameSvg;
	};		};
	} // Plasma namespace		} // Plasma namespace
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 3 change blocks.
	1 lines changed or deleted		3 lines changed or added

	svgwidget.h		svgwidget.h
	skipping to change at line 69		skipping to change at line 69
	Q_SIGNALS:		Q_SIGNALS:
	void clicked(Qt::MouseButton);		void clicked(Qt::MouseButton);
	protected:		protected:
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) cons t;		QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) cons t;
	void mousePressEvent(QGraphicsSceneMouseEvent * event);		void mousePressEvent(QGraphicsSceneMouseEvent * event);
	private:		private:
			Q_PRIVATE_SLOT(d, void svgChanged())
	SvgWidgetPrivate * const d;		SvgWidgetPrivate * const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	tabbar.h		tabbar.h
	skipping to change at line 51		skipping to change at line 51
	*		*
	* Provides a Tab bar for use in a tabbed interface where each page is a QG raphicsLayoutItem.		* Provides a Tab bar for use in a tabbed interface where each page is a QG raphicsLayoutItem.
	* Only one of them is displayed at a given time. It is possible to add and remove tabs		* Only one of them is displayed at a given time. It is possible to add and remove tabs
	* or modify their text label or their icon.		* or modify their text label or their icon.
	*/		*/
	class PLASMA_EXPORT TabBar : public QGraphicsWidget		class PLASMA_EXPORT TabBar : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(KTabBar *nativeWidget READ nativeWidget)		Q_PROPERTY(KTabBar *nativeWidget READ nativeWidget)
	Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex)		Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOT IFY currentChanged)
	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 *lastPositionWidget READ lastPositionWidget
			WRITE setLastPositionWidget)
	public:		public:
	/**		/**
	* Constructs a new TabBar		* Constructs a new TabBar
	*		*
	* @arg parent the parent of this widget		* @arg parent the parent of this widget
	*/		*/
	explicit TabBar(QGraphicsWidget *parent = 0);		explicit TabBar(QGraphicsWidget *parent = 0);
	~TabBar();		~TabBar();
	skipping to change at line 210		skipping to change at line 212
	/**		/**
	* @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 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
			* LayoutDirection and the Shape.
			* @param widget the widget to be displayed. Passing 0 will show nothin
			g.
			* Any previous widget will be deleted.
			* @since 4.6
			*/
			void setFirstPositionWidget(QGraphicsWidget *widget);
			/**
			* @return the widget in the first position
			* @since 4.6
			*/
			QGraphicsWidget *firstPositionWidget() const;
			/**
			* Set a widget to be displayed on one side of the TabBar, depending on
			the
			* LayoutDirection and the Shape.
			* @param widget the widget to be displayed. Passing 0 will show nothin
			g.
			* Any previous widget will be deleted.
			* @since 4.6
			*/
			void setLastPositionWidget(QGraphicsWidget *widget);
			/**
			* @return the widget in the last position
			* @since 4.6
			*/
			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		* @arg index the index of the tab to activate
	*/		*/
	void setCurrentIndex(int index);		void setCurrentIndex(int index);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
End of changes. 3 change blocks.
	1 lines changed or deleted		39 lines changed or added

	tag.h		tag.h
	skipping to change at line 118		skipping to change at line 118
	* Get all resources that have this resource set as property 'Tag'.		* Get all resources that have this resource set as property 'Tag'.
	* Each Resource can be tagged with an arbitrary number of Tags.		* Each Resource can be tagged with an arbitrary number of Tags.
	* This allows a simple grouping of resources. \sa ResourceManager: :allResourcesWithProperty		* This allows a simple grouping of resources. \sa ResourceManager: :allResourcesWithProperty
	*/		*/
	QList<Resource> tagOf() const;		QList<Resource> tagOf() const;
	/**		/**
	* Retrieve a list of all available Tag resources. This list consis ts		* Retrieve a list of all available Tag resources. This list consis ts
	* of all resource of type Tag that are stored in the local Nepomuk		* of all resource of type Tag that are stored in the local Nepomuk
	* meta data storage and any changes made locally. Be aware that		* meta data storage and any changes made locally. Be aware that
	* in some cases this list can get very big. Then it might be bette		* in some cases this list can get very big.
	r		*
	* to use libKNep directly.		* In those cases it might be better to use the asyncronous approac
			h
			* via Query::QueryServiceClient and a Query::ResourceTypeTerm with
			* type Soprano::Vocabulary::NAO::Tag().
	*/		*/
	static QList<Tag> allTags();		static QList<Tag> allTags();
	/**		/**
	* \return The URI of the resource type that is used in Tag instanc es.		* \return The URI of the resource type that is used in Tag instanc es.
	*/		*/
	static QString resourceTypeUri();		static QString resourceTypeUri();
	protected:		protected:
	Tag( const QString& uri, const QUrl& type );		Tag( const QString& uri, const QUrl& type );
End of changes. 1 change blocks.
	3 lines changed or deleted		6 lines changed or added

	tagwidget.h		tagwidget.h
	skipping to change at line 78		skipping to change at line 78
	/**		/**
	* \return The resources that are supposed to be tagged or an empty		* \return The resources that are supposed to be tagged or an empty
	* list if none have been set.		* list if none have been set.
	*/		*/
	QList<Resource> taggedResources() const;		QList<Resource> taggedResources() const;
	/**		/**
	* \deprecated use selectedTags() instead		* \deprecated use selectedTags() instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED QList<Tag> assignedTags() const;		KDE_DEPRECATED QList<Tag> assignedTags() const;
			#endif
	/**		/**
	* The list of selected tags.		* The list of selected tags.
	*		*
	* \return The list of all tags that are currently selected. In cas e		* \return The list of all tags that are currently selected. In cas e
	* resources to be tagged have been selected this list matches the		* resources to be tagged have been selected this list matches the
	* tags assigned to the resources.		* tags assigned to the resources.
	*		*
	* \sa setTaggedResource, taggedResource, Resource::getTags		* \sa setTaggedResource, taggedResource, Resource::getTags
	*		*
	skipping to change at line 185		skipping to change at line 187
	/**		/**
	* Set the resources to be tagged. If the list of resources is		* Set the resources to be tagged. If the list of resources is
	* empty TagWidget will only emit the selectionChanged() signal.		* empty TagWidget will only emit the selectionChanged() signal.
	*/		*/
	void setTaggedResources( const QList<Resource>& resources );		void setTaggedResources( const QList<Resource>& resources );
	/**		/**
	* \deprecated use setSelectedTags() instead		* \deprecated use setSelectedTags() instead
	*/		*/
			#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED void setAssignedTags( const QList<Nepomuk::Tag>& tag s );		KDE_DEPRECATED void setAssignedTags( const QList<Nepomuk::Tag>& tag s );
			#endif
	/**		/**
	* Set the list of selected tags. In case resources have been		* Set the list of selected tags. In case resources have been
	* set via setTaggedResource() or setTaggedResources() their		* set via setTaggedResource() or setTaggedResources() their
	* list of tags is changed automatically.		* list of tags is changed automatically.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	void setSelectedTags( const QList<Nepomuk::Tag>& tags );		void setSelectedTags( const QList<Nepomuk::Tag>& tags );
End of changes. 4 change blocks.
	0 lines changed or deleted		4 lines changed or added

	templateinterface.h		templateinterface.h
	skipping to change at line 141		skipping to change at line 141
	* implementation. The placeholder gets a value of "|" assigned.		* implementation. The placeholder gets a value of "|" assigned.
	*		*
	* If a macro is started with a % (persent sign) like "%{date}" it isn' t added		* If a macro is started with a % (persent sign) like "%{date}" it isn' t added
	* to the list editable strings ( for example TAB key navigation) if a value		* to the list editable strings ( for example TAB key navigation) if a value
	* differing from the macro name is found.		* differing from the macro name is found.
	*		*
	* If the editor supports some kind of smart indentation, the inserted code		* If the editor supports some kind of smart indentation, the inserted code
	* should be layouted by the indenter.		* should be layouted by the indenter.
	* @deprecated		* @deprecated
	*/		*/
	KDE_DEPRECATED bool insertTemplateText ( const Cursor &insertPosition, const QString &templateString, const QMap<QString,QString> &initialValues);		bool insertTemplateText ( const Cursor &insertPosition, const QString & templateString, const QMap<QString,QString> &initialValues);
	protected:		protected:
	/**		/**
	* You must implement this, it is called by insertTemplateText, after a ll		* You must implement this, it is called by insertTemplateText, after a ll
	* default values are inserted. If you are implementing this interface,		* default values are inserted. If you are implementing this interface,
	* this method should work as described in the documentation for		* this method should work as described in the documentation for
	* insertTemplateText above.		* insertTemplateText above.
	* \return true if any text was inserted.		* \return true if any text was inserted.
	* @deprecated		* @deprecated
	*/		*/
	virtual KDE_DEPRECATED bool insertTemplateTextImplementation ( const Cu rsor &insertPosition, const QString &templateString, const QMap<QString,QSt ring> &initialValues)=0;		virtual bool insertTemplateTextImplementation ( const Cursor &insertPos ition, const QString &templateString, const QMap<QString,QString> &initialV alues)=0;
	/**		/**
	* DO NOT USE !!!! THIS IS USED INTERNALLY by the interface only !!!!!!		* DO NOT USE !!!! THIS IS USED INTERNALLY by the interface only !!!!!!
	* Behaviour might change !!!!!!!		* Behaviour might change !!!!!!!
	*/		*/
	bool KTE_INTERNAL_setupIntialValues(const QString &templateString, QMap <QString,QString> *initialValues);		bool KTE_INTERNAL_setupIntialValues(const QString &templateString, QMap <QString,QString> *initialValues);
	private:		private:
	class TemplateInterfacePrivate* const d;		class TemplateInterfacePrivate* const d;
	};		};
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	term.h		term.h
	skipping to change at line 32		skipping to change at line 32
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtCore/QUrl>		#include <QtCore/QUrl>
	#include <QtCore/QSharedDataPointer>		#include <QtCore/QSharedDataPointer>
	#include <Soprano/LiteralValue>		#include <Soprano/LiteralValue>
	#include "nepomukquery_export.h"		#include "nepomukquery_export.h"
	namespace Nepomuk {		namespace Nepomuk {
			class Variant;
			namespace Types {
			class Property;
			}
	namespace Query {		namespace Query {
	class LiteralTerm;		class LiteralTerm;
	class ResourceTerm;		class ResourceTerm;
	class NegationTerm;		class NegationTerm;
	class AndTerm;		class AndTerm;
	class OrTerm;		class OrTerm;
	class ComparisonTerm;		class ComparisonTerm;
	class ResourceTypeTerm;		class ResourceTypeTerm;
	class OptionalTerm;		class OptionalTerm;
	skipping to change at line 164		skipping to change at line 171
	* term can be used to construct a Query.		* term can be used to construct a Query.
	*/		*/
	bool isValid() const;		bool isValid() const;
	/**		/**
	* \return the Term type.		* \return the Term type.
	*/		*/
	Type type() const;		Type type() const;
	/**		/**
			* Optimizes the term without chaning its meaning. This removes
			* redundant terms such as NegationTerm and OptionalTerm nestin
			gs and flattens
			* AndTerm and OrTerm hierarchies.
			*
			* \return An optimized version of this term.
			*
			* \since 4.6
			*
			* \sa Query::optimized()
			*/
			Term optimized() const;
			/**
	* \return \p true if this term is a LiteralTerm.		* \return \p true if this term is a LiteralTerm.
	*/		*/
	bool isLiteralTerm() const;		bool isLiteralTerm() const;
	/**		/**
	* \return \p true if this term is a ResourceTerm.		* \return \p true if this term is a ResourceTerm.
	*/		*/
	bool isResourceTerm() const;		bool isResourceTerm() const;
	/**		/**
	skipping to change at line 368		skipping to change at line 388
	*		*
	* \warning This method can NOT parse SPARQL syntax.		* \warning This method can NOT parse SPARQL syntax.
	*		*
	* \sa toString()		* \sa toString()
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	static Term fromString( const QString& s );		static Term fromString( const QString& s );
	/**		/**
			* Construct a Term from a Variant value. This is a convenience
			method
			* that simplifies handling Nepomuk values. However, list varia
			nts are
			* not supported and will result in an invalid Term.
			*
			* \return A ResourceTerm in case \p variant is a resource, a L
			iteralTerm
			* if \p variant is a supported literal value, or an invalid Te
			rm if \p
			* variant is invalid or a list.
			*
			* \since 4.6
			*/
			static Term fromVariant( const Variant& variant );
			/**
			* Create a term using a Types::Property and a Variant. Sadly t
			his cannot be modelled
			* as an operator since it would clash with Entity::operator==(
			).
			*
			* \param property The property to be used in the ComparisonTer
			m.
			* \param variant The value to be compared to. Either ResourceT
			erm or LiteralTerm is used. List
			* variants (Variant::isList()) are handled via an AndTerm mean
			ing all values need to match.
			*
			* \since 4.6
			*
			* \relates ComparisonTerm
			*/
			static Term fromProperty( const Types::Property& property, cons
			t Variant& variant );
			/**
	* Comparison operator.		* Comparison operator.
	*		*
	* \return \p true if this term is equal to \p term.		* \return \p true if this term is equal to \p term.
	*/		*/
	bool operator==( const Term& term ) const;		bool operator==( const Term& term ) const;
			/**
			* Comparison operator.
			*
			* \return \p true if this term differs from \p term.
			*
			* \since 4.6
			*/
			bool operator!=( const Term& term ) const;
	// FIXME: the compiler does not find this operator!		// FIXME: the compiler does not find this operator!
	QDebug operator<<( QDebug ) const;		QDebug operator<<( QDebug ) const;
	/** \cond protected_term_members */		/** \cond protected_term_members */
	protected:		protected:
	Term( TermPrivate* );		Term( TermPrivate* );
	QSharedDataPointer<TermPrivate> d_ptr;		QSharedDataPointer<TermPrivate> d_ptr;
	friend class TermPrivate;		friend class TermPrivate;
	friend class GroupTermPrivate;		friend class GroupTermPrivate;
	friend class AndTermPrivate;		friend class AndTermPrivate;
	friend class OrTermPrivate;		friend class OrTermPrivate;
	friend class ComparisonTermPrivate;		friend class ComparisonTermPrivate;
	friend class NegationTermPrivate;		friend class NegationTermPrivate;
	friend class OptionalTermPrivate;		friend class OptionalTermPrivate;
	friend class Query;		friend class Query;
	/** \endcond */		/** \endcond */
	};		};
			/**
			* Logical and operator which combines two terms into
			* one term matching both \p term1 and \p term2.
			*
			* \relates AndTerm
			*
			* \since 4.6
			*/
			NEPOMUKQUERY_EXPORT Term operator&&( const Term& term1, const Term&
			term2 );
			/**
			* Logical or operator which combines two terms into
			* one term matching either \p term1 or \p term2.
			*
			* \relates OrTerm
			*
			* \since 4.6
			*/
			NEPOMUKQUERY_EXPORT Term operator||( const Term& term1, const Term&
			term2 );
			/**
			* Logical negation operator which negates the meaning of
			* one term.
			*
			* \sa NegationTerm::negateTerm()
			* \relates NegationTerm
			*
			* \since 4.6
			*/
			NEPOMUKQUERY_EXPORT Term operator!( const Term& term );
			/**
			* Comparision operator for simple creation of ComparisonTerm objec
			ts using the
			* ComparisonTerm::Smaller comparator.
			*
			* \return A ComparisonTerm equvalent to:
			*
			* \code
			* ComparisonTerm( property, term, ComparisonTerm::Smaller );
			* \endcode
			*
			* \since 4.6
			*
			* \relates ComparisonTerm
			*/
			NEPOMUKQUERY_EXPORT ComparisonTerm operator<( const Types::Property
			& property, const Term& term );
			/**
			* Comparision operator for simple creation of ComparisonTerm objec
			ts using the
			* ComparisonTerm::Greater comparator.
			*
			* \return A ComparisonTerm equvalent to:
			*
			* \code
			* ComparisonTerm( property, term, ComparisonTerm::Greater );
			* \endcode
			*
			* \since 4.6
			*
			* \relates ComparisonTerm
			*/
			NEPOMUKQUERY_EXPORT ComparisonTerm operator>( const Types::Property
			& property, const Term& term );
			/**
			* Comparision operator for simple creation of ComparisonTerm objec
			ts using the
			* ComparisonTerm::SmallerOrEqual comparator.
			*
			* \return A ComparisonTerm equvalent to:
			*
			* \code
			* ComparisonTerm( property, term, ComparisonTerm::SmallerOrEqual )
			;
			* \endcode
			*
			* \since 4.6
			*
			* \relates ComparisonTerm
			*/
			NEPOMUKQUERY_EXPORT ComparisonTerm operator<=( const Types::Propert
			y& property, const Term& term );
			/**
			* Comparision operator for simple creation of ComparisonTerm objec
			ts using the
			* ComparisonTerm::GreaterOrEqual comparator.
			*
			* \return A ComparisonTerm equvalent to:
			*
			* \code
			* ComparisonTerm( property, term, ComparisonTerm::GreaterOrEqual )
			;
			* \endcode
			*
			* \since 4.6
			*
			* \relates ComparisonTerm
			*/
			NEPOMUKQUERY_EXPORT ComparisonTerm operator>=( const Types::Propert
			y& property, const Term& term );
			/**
			* Comparision operator for simple creation of ComparisonTerm objec
			ts using the
			* ComparisonTerm::Equal comparator.
			*
			* \return A ComparisonTerm equvalent to:
			*
			* \code
			* ComparisonTerm( property, term, ComparisonTerm::Equal );
			* \endcode
			*
			* \since 4.6
			*
			* \relates ComparisonTerm
			*/
			NEPOMUKQUERY_EXPORT ComparisonTerm operator==( const Types::Propert
			y& property, const Term& term );
			/**
			* Comparision operator for simple creation of negated ComparisionT
			erm objects using the
			* ComparisonTerm::Equal comparator.
			*
			* \since 4.6
			*
			* \return A Term equvalent to:
			*
			* \code
			* NegationTerm::negateTerm( ComparisonTerm( property, term, Compar
			isonTerm::Equal ) );
			* \endcode
			*
			* \relates ComparisonTerm
			*
			* \sa NegationTerm
			*/
			NEPOMUKQUERY_EXPORT Term operator!=( const Types::Property& propert
			y, const Term& term );
	NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Term& );		NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Term& );
	}		}
	}		}
			/** \cond hide_nepomuk_term_clone_from_doxygen */
	// there is a hand written instantiation of clone()		// there is a hand written instantiation of clone()
	template<> Nepomuk::Query::TermPrivate* QSharedDataPointer<Nepomuk::Query:: TermPrivate>::clone();		template<> Nepomuk::Query::TermPrivate* QSharedDataPointer<Nepomuk::Query:: TermPrivate>::clone();
			/** \endcond */
	// FIXME: the compiler does not find the operator in the class		// FIXME: the compiler does not find the operator in the class
	NEPOMUKQUERY_EXPORT QDebug operator<<( QDebug, const Nepomuk::Query::Term& );		NEPOMUKQUERY_EXPORT QDebug operator<<( QDebug, const Nepomuk::Query::Term& );
	#endif		#endif
End of changes. 8 change blocks.
	0 lines changed or deleted		216 lines changed or added

	theme.h		theme.h
	skipping to change at line 70		skipping to change at line 70
	public:		public:
	enum ColorRole {		enum ColorRole {
	TextColor = 0, /**< the text color to be used by items resting on the background */		TextColor = 0, /**< the text color to be used by items resting on the background */
	HighlightColor = 1, /**< the text higlight color to be used by items resting		HighlightColor = 1, /**< the text higlight color to be used by items resting
	on the background */		on the background */
	BackgroundColor = 2, /**< the default background color */		BackgroundColor = 2, /**< the default background color */
	ButtonTextColor = 4, /** text color for buttons */		ButtonTextColor = 4, /** text color for buttons */
	ButtonBackgroundColor = 8, /** background color for buttons*/		ButtonBackgroundColor = 8, /** background color for buttons*/
	LinkColor = 16, /** color for clickable links */		LinkColor = 16, /** color for clickable links */
	VisitedLinkColor = 32 /** color visited clickable links */		VisitedLinkColor = 32, /** color visited clickable links */
			ButtonHoverColor = 64, /** color for hover effect on buttons */
			ButtonFocusColor = 128, /** color for focus effect on buttons *
			/
			ViewTextColor = 256, /** text color for views */
			ViewBackgroundColor = 512, /** background color for views */
			ViewHoverColor = 1024, /** color for hover effect on view */
			ViewFocusColor = 2048 /** color for focus effect on view */
	};		};
	enum FontRole {		enum FontRole {
	DefaultFont = 0, /**< The standard text font */		DefaultFont = 0, /**< The standard text font */
	DesktopFont /**< The standard text font */		DesktopFont /**< The standard text font */
	};		};
	/**		/**
	* Singleton pattern accessor		* Singleton pattern accessor
	**/		**/
	skipping to change at line 333		skipping to change at line 339
	*		*
	* @arg image path of the image we want to check		* @arg image path of the image we want to check
	* @arg element sub element we want to retrieve		* @arg element sub element we want to retrieve
	* @arg rect output parameter of the element rect found in cache		* @arg 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.
			*
			* @arg image path of the image for which the keys should be return
			ed
			*
			* @return a QStringList whose elements are the entry keys in the r
			ects cache
			*
			* @since 4.6
			*/
			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		* @arg image path of the image we want to insert information
	* @arg element sub element we want insert the rect		* @arg element sub element we want insert the rect
	* @arg rect element rectangle		* @arg 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
End of changes. 2 change blocks.
	1 lines changed or deleted		21 lines changed or added

	threadweaver_export.h		threadweaver_export.h
	skipping to change at line 27		skipping to change at line 27
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef THREADWEAVER_EXPORT_H		#ifndef THREADWEAVER_EXPORT_H
	#define THREADWEAVER_EXPORT_H		#define THREADWEAVER_EXPORT_H
	/* needed for KDE_EXPORT and KDE_IMPORT macros */		/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <kdemacros.h>		#include <kdemacros.h>
	#ifndef THREADWEAVER_EXPORT		#ifndef THREADWEAVER_EXPORT
	# if defined(MAKE_THREADWEAVER_LIB)		# if defined(KDELIBS_STATIC_LIBS)
			/* No export/import for static libraries */
			# define THREADWEAVER_EXPORT
			# elif defined(MAKE_THREADWEAVER_LIB)
	/* We are building this library */		/* We are building this library */
	# define THREADWEAVER_EXPORT KDE_EXPORT		# define THREADWEAVER_EXPORT KDE_EXPORT
	# else		# else
	/* We are using this library */		/* We are using this library */
	# define THREADWEAVER_EXPORT KDE_IMPORT		# define THREADWEAVER_EXPORT KDE_IMPORT
	# endif		# endif
	#endif		#endif
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	toolbutton.h		toolbutton.h
	skipping to change at line 198		skipping to change at line 198
	private slots:		private slots:
	void setAnimationUpdate(qreal progress);		void setAnimationUpdate(qreal progress);
	qreal animationUpdate() const;		qreal animationUpdate() const;
	private:		private:
	Q_PRIVATE_SLOT(d, void syncBorders())		Q_PRIVATE_SLOT(d, void syncBorders())
	Q_PRIVATE_SLOT(d, void syncToAction())		Q_PRIVATE_SLOT(d, void syncToAction())
	Q_PRIVATE_SLOT(d, void clearAction())		Q_PRIVATE_SLOT(d, void clearAction())
	Q_PRIVATE_SLOT(d, void setPixmap())		Q_PRIVATE_SLOT(d, void setPixmap())
			Q_PRIVATE_SLOT(d, void setPalette())
	friend class ToolButtonPrivate;		friend class ToolButtonPrivate;
	ToolButtonPrivate *const d;		ToolButtonPrivate *const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	tools.h		tools.h
	skipping to change at line 38		skipping to change at line 38
	#include "nepomuk_export.h"		#include "nepomuk_export.h"
	#include <soprano/node.h>		#include <soprano/node.h>
	#include <kdemacros.h>		#include <kdemacros.h>
	namespace Nepomuk {		namespace Nepomuk {
	/**		/**
	* Used internally by Resource.		* Used internally by Resource.
	* Converts a Variant into a literal value to be used in the RDF store.		* Converts a Variant into a literal value to be used in the RDF store.
			*
			* \deprecated Use Nepomuk::Varaint::toNodeList()
	*/		*/
	NEPOMUK_EXPORT QList<Soprano::Node> valuesToRDFNodes( const Variant& );		KDE_DEPRECATED NEPOMUK_EXPORT QList<Soprano::Node> valuesToRDFNodes( co nst Variant& );
	/**		/**
	* Used internally by Resource.		* Used internally by Resource.
	* Converts a non-list Variant into a Soprano::Node.		* Converts a non-list Variant into a Soprano::Node.
			*
			* \deprecated Use Nepomuk::Varaint::toNode()
	*/		*/
	NEPOMUK_EXPORT Soprano::Node valueToRDFNode( const Variant& );		KDE_DEPRECATED NEPOMUK_EXPORT Soprano::Node valueToRDFNode( const Varia nt& );
	/**		/**
	* Used internally by Resource.		* Used internally by Resource.
	* Convert a list of resources to a list of Ts where T needs to be a su bclass		* Convert a list of resources to a list of Ts where T needs to be a su bclass
	* of Resource.		* of Resource.
	*		*
	* \return A list containing all resources in \p l represented as a T.		* \return A list containing all resources in \p l represented as a T.
	*/		*/
	template<typename T> QList<T> convertResourceList( const QList<Resource >& l ) {		template<typename T> QList<T> convertResourceList( const QList<Resource >& l ) {
	QList<T> rl;		QList<T> rl;
End of changes. 4 change blocks.
	2 lines changed or deleted		6 lines changed or added

	tooltipcontent.h		tooltipcontent.h
	skipping to change at line 33		skipping to change at line 33
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <QtCore/QUrl>		#include <QtCore/QUrl>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtGui/QPixmap>		#include <QtGui/QPixmap>
	#include <QtGui/QIcon>		#include <QtGui/QIcon>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	class QTextDocument;		class QTextDocument;
			class QGraphicsWidget;
	/**		/**
	* This provides the content for a tooltip.		* This provides the content for a tooltip.
	*		*
	* Normally you will want to set at least the @p mainText and		* Normally you will want to set at least the @p mainText and
	* @p subText.		* @p subText.
	*/		*/
	namespace Plasma		namespace Plasma
	{		{
	skipping to change at line 194		skipping to change at line 195
	*/		*/
	void setClickable(bool clickable);		void setClickable(bool clickable);
	/**		/**
	* @return true if the tooltip is clickabel		* @return true if the tooltip is clickabel
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	bool isClickable() const;		bool isClickable() const;
			/**
			* Sets an optional graphicsWidget that will be used for positioning th
			e tooltip
			* @since 4.6
			*/
			void setGraphicsWidget(QGraphicsWidget *widget);
			/**
			* the graphicsWidget used for positioning the tooltip, if any
			* @since 4.6
			*/
			QGraphicsWidget *graphicsWidget() const;
	private:		private:
	ToolTipContentPrivate * const d;		ToolTipContentPrivate * const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		14 lines changed or added

	tooltipmanager.h		tooltipmanager.h
	skipping to change at line 64		skipping to change at line 64
	*		*
	* Note that, since a Plasma::Applet is a QGraphicsWidget, you can use		* Note that, since a Plasma::Applet is a QGraphicsWidget, you can use
	* Plasma::ToolTipManager::self()->setContent(this, data); in the		* Plasma::ToolTipManager::self()->setContent(this, data); in the
	* applet's init() method to set a tooltip for the whole applet.		* applet's init() method to set a tooltip for the whole applet.
	*		*
	* The tooltip will be registered automatically by setContent(). It will b e		* The tooltip will be registered automatically by setContent(). It will b e
	* automatically unregistered when the associated widget is deleted, freein g the		* automatically unregistered when the associated widget is deleted, freein g the
	* memory used by the tooltip, but you can manually unregister it at any ti me by		* memory used by the tooltip, but you can manually unregister it at any ti me by
	* calling unregisterWidget().		* calling unregisterWidget().
	*		*
	* When a tooltip for a widget is about to be shown, the widget's toolTipAb outToShow slot will be		* When a tooltip for a widget is about to be shown, the widget's toolTipAb outToShow() slot will be
	* invoked if it exists. Similarly, when a tooltip is hidden, the widget's toolTipHidden() slot		* invoked if it exists. Similarly, when a tooltip is hidden, the widget's toolTipHidden() slot
	* will be invoked if it exists. This allows widgets to provide on-demand t ooltip data.		* will be invoked if it exists. This allows widgets to provide on-demand t ooltip data.
	*/		*/
	class PLASMA_EXPORT ToolTipManager : public QObject		class PLASMA_EXPORT ToolTipManager : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	enum State {		enum State {
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	udsentry.h		udsentry.h
	skipping to change at line 242		skipping to change at line 242
	/// @since 4.4		/// @since 4.4
	UDS_NEPOMUK_URI = 25 | UDS_STRING,		UDS_NEPOMUK_URI = 25 | UDS_STRING,
	/// A comma-separated list of supplementary icon overlays		/// A comma-separated list of supplementary icon overlays
	/// which will be added to the list of overlays created		/// which will be added to the list of overlays created
	/// by KFileItem.		/// by KFileItem.
	///		///
	/// @since 4.5		/// @since 4.5
	UDS_ICON_OVERLAY_NAMES = 26 | UDS_STRING,		UDS_ICON_OVERLAY_NAMES = 26 | UDS_STRING,
			/// A serialized Nepomuk::Query::Query which lists the contents
			of
			/// the folder this UDSEntry describes. This can be used to ena
			ble
			/// faceted browsing via any local KIO slave.
			///
			/// @since 4.6
			UDS_NEPOMUK_QUERY = 27 | UDS_STRING,
			/// A comment which will be displayed as is to the user. The st
			ring
			/// value may contain plain text or Qt-style rich-text extensio
			ns.
			///
			/// @since 4.6
			UDS_COMMENT = 28 | UDS_STRING,
	/// Extra data (used only if you specified Columns/ColumnsTypes )		/// Extra data (used only if you specified Columns/ColumnsTypes )
	/// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i		/// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i
	/// until UDS_EXTRA_END.		/// until UDS_EXTRA_END.
	UDS_EXTRA = 100 | UDS_STRING,		UDS_EXTRA = 100 | UDS_STRING,
	/// Extra data (used only if you specified Columns/ColumnsTypes )		/// Extra data (used only if you specified Columns/ColumnsTypes )
	/// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i		/// KDE 4.0 change: you cannot repeat this entry anymore, use U DS_EXTRA + i
	/// until UDS_EXTRA_END.		/// until UDS_EXTRA_END.
	UDS_EXTRA_END = 140 | UDS_STRING		UDS_EXTRA_END = 140 | UDS_STRING
	};		};
End of changes. 1 change blocks.
	0 lines changed or deleted		17 lines changed or added

	uploaddialog.h		uploaddialog.h
	skipping to change at line 117		skipping to change at line 117
	void setChangelog(const QString& changelog);		void setChangelog(const QString& changelog);
	/* *		/* *
	Set the suggested license displayed in the upload dialog.		Set the suggested license displayed in the upload dialog.
	The user can still change this.		The user can still change this.
	@param version version		@param version version
	*/		*/
	// enum License {}; // see fd.o api spec		// enum License {}; // see fd.o api spec
	// void setLicense(License license);		// void setLicense(License license);
	/* *		/**
	Set the suggested version displayed in the upload dialog.		Set one of the threee preview images displayed in the upload dialog.
	The user can still change this.		The user can still change this.
	@param version version		@param number The number of the preview image to set, either 1, 2, or
			3.
			@param file A URL to the file to be used as preview image
			@since 4.6
	*/		*/
	// void setPreviewImageFile(const KUrl& version);		void setPreviewImageFile(uint number, const KUrl& file);
	/**		/**
	Enable the UI to let the user to set a price for the uploaded item.		Enable the UI to let the user to set a price for the uploaded item.
	@param enabled enable the price option - it is enabled by default		@param enabled enable the price option - it is enabled by default
	@since 4.5		@since 4.5
	*/		*/
	void setPriceEnabled(bool enabled);		void setPriceEnabled(bool enabled);
	/**		/**
	Set the suggested price displayed in the upload dialog.		Set the suggested price displayed in the upload dialog.
End of changes. 3 change blocks.
	4 lines changed or deleted		7 lines changed or added

	variant.h		variant.h
	skipping to change at line 349		skipping to change at line 349
	QList<Resource> toResourceList() const;		QList<Resource> toResourceList() const;
	/**		/**
	* Convert a Variant to a list of Variants.		* Convert a Variant to a list of Variants.
	*		*
	* \since 4.3		* \since 4.3
	*/		*/
	QList<Variant> toVariantList() const;		QList<Variant> toVariantList() const;
	/**		/**
			* Convert a Variant to a Node.
			*
			* \since 4.6
			*/
			Soprano::Node toNode() const;
			/**
			* Convert a Variant to a a list of Nodes.
			*
			* \since 4.6
			*/
			QList<Soprano::Node> toNodeList() const;
			/**
	* Create a Variant object by parsing string \a value based on \a t ype.		* Create a Variant object by parsing string \a value based on \a t ype.
	* If \a type is unknown a simple string Variant object is returned		* If \a type is unknown a simple string Variant object is returned
	* containing the plain string \a value.		* containing the plain string \a value.
	*/		*/
	static Variant fromString( const QString& value, int type );		static Variant fromString( const QString& value, int type );
	/**		/**
	* Create a Variant object from a Soprano::Node.		* Create a Variant object from a Soprano::Node.
	*		*
	* \since 4.5		* \since 4.5
	*/		*/
	static Variant fromNode( const Soprano::Node& node );		static Variant fromNode( const Soprano::Node& node );
			/**
			* Create a Variant object from a list of Soprano::Node.
			*
			* \since 4.6
			*/
			static Variant fromNodeList( const QList<Soprano::Node>& node );
	private:		private:
	class Private;		class Private;
	Private* const d;		Private* const d;
	};		};
	}		}
	NEPOMUK_EXPORT QDebug operator<<( QDebug dbg, const Nepomuk::Variant& );		NEPOMUK_EXPORT QDebug operator<<( QDebug dbg, const Nepomuk::Variant& );
	Q_DECLARE_METATYPE(Nepomuk::Resource)		Q_DECLARE_METATYPE(Nepomuk::Resource)
	Q_DECLARE_METATYPE(QList<Nepomuk::Resource>)		Q_DECLARE_METATYPE(QList<Nepomuk::Resource>)
End of changes. 2 change blocks.
	0 lines changed or deleted		21 lines changed or added

	video.h		video.h
	/* This file is part of the KDE project		/*
	Copyright (C) 2006-2007 Kevin Ottens <ervin@kde.org>		Copyright 2006-2007 Kevin Ottens <ervin@kde.org>
	Copyright (C) 2007 Will Stephenson <wstephenson@kde.org>		Copyright 2007 Will Stephenson <wstephenson@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public		modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.		License as published by the Free Software Foundation; either
			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
			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.
	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.		Lesser General Public License for more details.
	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
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
			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/>.
	*/		*/
	#ifndef SOLID_VIDEO_H		#ifndef SOLID_VIDEO_H
	#define SOLID_VIDEO_H		#define SOLID_VIDEO_H
	#include <solid/solid_export.h>		#include <solid/solid_export.h>
	#include <solid/deviceinterface.h>		#include <solid/deviceinterface.h>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
End of changes. 4 change blocks.
	12 lines changed or deleted		13 lines changed or added

	wallpaper.h		wallpaper.h
	skipping to change at line 345		skipping to change at line 345
	* @since 4.5		* @since 4.5
	*/		*/
	bool isPreviewing() const;		bool isPreviewing() const;
	/**		/**
	* Puts the wallpaper into preview mode		* Puts the wallpaper into preview mode
	* @since 4.5		* @since 4.5
	*/		*/
	void setPreviewing(bool previewing);		void setPreviewing(bool previewing);
			/**
			* @return true if the wallpaper needs a live preview in the config
			uration UI
			* @since 4.6
			*/
			bool needsPreviewDuringConfiguration() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal indicates that wallpaper needs to be repainted.		* This signal indicates that wallpaper needs to be repainted.
	*/		*/
	void update(const QRectF &exposedArea);		void update(const QRectF &exposedArea);
	/**		/**
	* Emitted when the user wants to configure/change the wallpaper.		* Emitted when the user wants to configure/change the wallpaper.
	* @since 4.3		* @since 4.3
	*/		*/
	skipping to change at line 492		skipping to change at line 498
	*		*
	* @param actions A list of contextual actions for this wallpaper		* @param actions A list of contextual actions for this wallpaper
	*		*
	* @since 4.4		* @since 4.4
	**/		**/
	void setContextualActions(const QList<QAction*> &actions);		void setContextualActions(const QList<QAction*> &actions);
	//FIXME: KDE5, this must be moved to the dptr		//FIXME: KDE5, this must be moved to the dptr
	QList<QAction*> contextActions;		QList<QAction*> contextActions;
			/**
			* 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
			* hint, the configuration user interface can choose to ignore it
			*
			* @param preview true if a preview should be shown
			* @since 4.6
			*/
			void setPreviewDuringConfiguration(const bool preview);
	private:		private:
	Q_PRIVATE_SLOT(d, void renderCompleted(WallpaperRenderThread *rende		Q_PRIVATE_SLOT(d, void newRenderCompleted(WallpaperRenderThread *re
	rer, int token, const QImage &image,		nderer, int token, const QImage &image,
	const QString &sourceImagePa		const QString &sourceImag
	th, const QSize &size,		ePath, const QSize &size,
	int resizeMethod, const QCol		int resizeMethod, const Q
	or &color))		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. 3 change blocks.
	6 lines changed or deleted		25 lines changed or added

	webview.h		webview.h
	skipping to change at line 177		skipping to change at line 177
	* @return true if the page can be scrolled by dragging the mouse		* @return true if the page can be scrolled by dragging the mouse
	* @since 4.3		* @since 4.3
	*/		*/
	bool dragToScroll();		bool dragToScroll();
	/**		/**
	* Reimplementation		* Reimplementation
	*/		*/
	void setGeometry(const QRectF &geometry);		void setGeometry(const QRectF &geometry);
			public Q_SLOTS:
			/**
			* Loads the previous document in the list of documents built by na
			vigating links.
			* @since 4.6
			*/
			void back();
			/**
			* Loads the next document in the list of documents built by naviga
			ting links.
			* @since 4.6
			*/
			void forward();
			/**
			* Reloads the current document.
			* @since 4.6
			*/
			void reload();
			/**
			* Stops loading the document.
			* @since 4.6
			*/
			void stop();
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* During loading progress, this signal is emitted. The values		* During loading progress, this signal is emitted. The values
	* are always between 0 and 100, inclusive.		* are always between 0 and 100, inclusive.
	*		*
	* @param percent the estimated amount the loading is complete		* @param percent the estimated amount the loading is complete
	*/		*/
	void loadProgress(int percent);		void loadProgress(int percent);
	/**		/**
	* This signal is emitted when loading is completed.		* This signal is emitted when loading is completed.
	*		*
	* @param success true if the content was loaded successfully,		* @param success true if the content was loaded successfully,
	* otherwise false		* otherwise false
	*/		*/
	void loadFinished(bool success);		void loadFinished(bool success);
			/**
			* url displayed by the web page changed
			* @since 4.6
			*/
			void urlChanged(const QUrl &url);
	protected:		protected:
	/**		/**
	* Reimplementation		* Reimplementation
	*/		*/
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget = 0);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget = 0);
	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	void hoverMoveEvent(QGraphicsSceneHoverEvent *event);		void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);		void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
End of changes. 2 change blocks.
	0 lines changed or deleted		33 lines changed or added

	windoweffects.h		windoweffects.h
	skipping to change at line 45		skipping to change at line 45
	*/		*/
	namespace WindowEffects		namespace WindowEffects
	{		{
	enum Effect {		enum Effect {
	Slide = 1,		Slide = 1,
	WindowPreview = 2,		WindowPreview = 2,
	PresentWindows = 3,		PresentWindows = 3,
	PresentWindowsGroup = 4,		PresentWindowsGroup = 4,
	HighlightWindows = 5,		HighlightWindows = 5,
	OverrideShadow = 6,		OverrideShadow = 6,
	BlurBehind = 7		BlurBehind = 7,
			Dashboard = 8
	};		};
	/**		/**
	* @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);
	skipping to change at line 153		skipping to change at line 154
	*		*
	* Note that you will usually want to set the region to the shape of th e window,		* Note that you will usually want to set the region to the shape of th e window,
	* excluding any shadow or halo.		* excluding any shadow or halo.
	*		*
	* @param window The window for which to enable the blur effect		* @param window The window for which to enable the blur effect
	* @param enable Enable the effect if @a true, disable it if @false		* @param enable Enable the effect if @a true, disable it if @false
	* @param region The region within the window where the background will be blurred		* @param region The region within the window where the background will be blurred
	* @since 4.5		* @since 4.5
	*/		*/
	PLASMA_EXPORT void enableBlurBehind(WId window, bool enable = true, con st QRegion &region = QRegion());		PLASMA_EXPORT void enableBlurBehind(WId window, bool enable = true, con st QRegion &region = QRegion());
			/**
			* Instructs the window manager to handle the given window as dashboard
			window as
			* Dashboard windows should be handled diffrently and may have special
			effects
			* applied to them.
			*
			* @param window The window for which to enable the blur effect
			* @since 4.6
			*/
			PLASMA_EXPORT void markAsDashboard(WId window);
	}		}
	} // namespace Plasma		} // namespace Plasma
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		14 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/