DebuggingAids.h		DebuggingAids.h
	skipping to change at line 34		skipping to change at line 34
	Boston, MA 02110-1301, USA.		Boston, MA 02110-1301, USA.
	$Id: DebuggingAids.h 30 2005-08-16 16:16:04Z mirko $		$Id: DebuggingAids.h 30 2005-08-16 16:16:04Z mirko $
	*/		*/
	//krazy:excludeall=inline		//krazy:excludeall=inline
	#ifndef DEBUGGINGAIDS_H		#ifndef DEBUGGINGAIDS_H
	#define DEBUGGINGAIDS_H		#define DEBUGGINGAIDS_H
	#include <QtCore/qglobal.h>		#include <QtCore/QtGlobal>
	extern "C"		extern "C"
	{		{
	#include <stdarg.h>		#include <stdarg.h>
	#ifndef Q_WS_WIN		#ifndef Q_WS_WIN
	#include <unistd.h>		#include <unistd.h>
	#endif		#endif
	#include <stdio.h>		#include <stdio.h>
	#include <stdlib.h>		#include <stdlib.h>
	#include <assert.h>		#include <assert.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	abstractrunner.h		abstractrunner.h
	skipping to change at line 43		skipping to change at line 43
	#include <plasma/runnersyntax.h>		#include <plasma/runnersyntax.h>
	#include <plasma/version.h>		#include <plasma/version.h>
	class QAction;		class QAction;
	class KCompletion;		class KCompletion;
	namespace Plasma		namespace Plasma
	{		{
			class DataEngine;
	class Package;		class Package;
	class RunnerScript;		class RunnerScript;
	class QueryMatch;		class QueryMatch;
	class AbstractRunnerPrivate;		class AbstractRunnerPrivate;
	/**		/**
	* @class AbstractRunner plasma/abstractrunner.h <Plasma/AbstractRunner>		* @class AbstractRunner plasma/abstractrunner.h <Plasma/AbstractRunner>
	*		*
	* @short An abstract base class for Plasma Runner plugins.		* @short An abstract base class for Plasma Runner plugins.
	*		*
	* Be aware that runners have to be thread-safe. This is due to the fact th at		* Be aware that runners have to be thread-safe. This is due to the fact th at
	* 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
			* must set the "X-Plasma-AdvertiseSingleRunnerMode" key to true in the .de
			sktop file
			* 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
	public:		public:
	/** Specifies a nominal speed for the runner */		/** Specifies a nominal speed for the runner */
	enum Speed {		enum Speed {
	SlowSpeed,		SlowSpeed,
	NormalSpeed		NormalSpeed
	skipping to change at line 143		skipping to change at line 148
	/**		/**
	* Triggers a call to match. This will call match() internally.		* Triggers a call to match. This will call match() internally.
	*		*
	* @arg context the search context used in executing this match.		* @arg context the search context used in executing this match.
	*/		*/
	void performMatch(Plasma::RunnerContext &context);		void performMatch(Plasma::RunnerContext &context);
	/**		/**
	* If the runner has options that the user can interact with to mod ify		* If the runner has options that the user can interact with to mod ify
	* what happens when run or one of the actions created in fillMatch es		* what happens when run or one of the actions created in match
	* is called, the runner should return true		* is called, the runner should return true
	*/		*/
	bool hasRunOptions();		bool hasRunOptions();
	/**		/**
	* If hasRunOptions() returns true, this method may be called to ge t		* If hasRunOptions() returns true, this method may be called to ge t
	* a widget displaying the options the user can interact with to mo dify		* a widget displaying the options the user can interact with to mo dify
	* the behaviour of what happens when a given match is selected.		* the behaviour of what happens when a given match is selected.
	*		*
	* @param widget the parent of the options widgets.		* @param widget the parent of the options widgets.
	skipping to change at line 247		skipping to change at line 252
	*		*
	* Common usage:		* Common usage:
	*		*
	* {		* {
	* QMutexLocker lock(bigLock());		* QMutexLocker lock(bigLock());
	* .. do something that isn't thread safe ..		* .. do something that isn't thread safe ..
	* }		* }
	*/		*/
	static QMutex *bigLock();		static QMutex *bigLock();
			/**
			* @return the default syntax for the runner or 0 if no default syn
			tax has been defined
			*
			* @since 4.4
			*/
			RunnerSyntax *defaultSyntax() const;
			Q_SIGNALS:
			/**
			* 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
			* 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
			* remain extant for the lifespan of the AbstractRunner should be d
			one in init().
			* @see init()
			* @since 4.4
			*/
			void prepare();
			/**
			* 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()
			* method.
			* @since 4.4
			*/
			void teardown();
	protected:		protected:
	friend class RunnerManager;		friend class RunnerManager;
	friend class RunnerManagerPrivate;		friend class RunnerManagerPrivate;
	/**		/**
	* Constructs a Runner object. Since AbstractRunner has pure virtua ls,		* Constructs a Runner object. Since AbstractRunner has pure virtua ls,
	* this constructor can not be called directly. Rather a subclass m ust		* this constructor can not be called directly. Rather a subclass m ust
	* be created		* be created
	*/		*/
	explicit AbstractRunner(QObject *parent = 0, const QString &service Id = QString());		explicit AbstractRunner(QObject *parent = 0, const QString &service Id = QString());
	skipping to change at line 356		skipping to change at line 388
	*/		*/
	QHash<QString, QAction*> actions() const;		QHash<QString, QAction*> actions() const;
	/**		/**
	* Clears the action registry.		* Clears the action registry.
	* The action pool deletes the actions.		* The action pool deletes the actions.
	*/		*/
	void clearActions();		void clearActions();
	/**		/**
	* Adds a registed syntax that this runner understands. This is use d to		* Adds a registered syntax that this runner understands. This is u sed to
	* display to the user what this runner can understand and how it c an be		* display to the user what this runner can understand and how it c an be
	* used.		* used.
	*		*
	* @param syntax the syntax to register		* @param syntax the syntax to register
	* @since 4.3		* @since 4.3
	*/		*/
	void addSyntax(const RunnerSyntax &syntax);		void addSyntax(const RunnerSyntax &syntax);
	/**		/**
			* Set @p syntax as the default syntax for the runner; the default
			syntax will be
			* substituted to the empty query in single runner mode. This is al
			so used to
			* display to the user what this runner can understand and how it c
			an be
			* used.
			* The default syntax is automatically added to the list of registe
			red syntaxes, there
			* is no need to add it using addSyntax.
			* Note that there can be only one default syntax; if called more t
			han once, the last
			* call will determine the default syntax.
			* A default syntax (even trivial) is required to advertise single
			runner mode
			*
			* @param syntax the syntax to register and to set as default
			* @since 4.4
			**/
			void setDefaultSyntax(const RunnerSyntax &syntax);
			/**
	* Sets the list of syntaxes; passing in an empty list effectively clears		* Sets the list of syntaxes; passing in an empty list effectively clears
	* the syntaxes.		* the syntaxes.
	*		*
	* @param the syntaxes to register for this runner		* @param the syntaxes to register for this runner
	* @since 4.3		* @since 4.3
	*/		*/
	void setSyntaxes(const QList<RunnerSyntax> &syns);		void setSyntaxes(const QList<RunnerSyntax> &syns);
			/**
			* Loads the given DataEngine
			*
			* Tries to load the data engine given by @p name. Each engine is
			* only loaded once, and that instance is re-used on all subsequent
			* requests.
			*
			* If the data engine was not found, an invalid data engine is retu
			rned
			* (see DataEngine::isValid()).
			*
			* Note that you should <em>not</em> delete the returned engine.
			*
			* @param name Name of the data engine to load
			* @return pointer to the data engine if it was loaded,
			* or an invalid data engine if the requested engine
			* could not be loaded
			*
			* @since 4.4
			*/
			Q_INVOKABLE DataEngine *dataEngine(const QString &name) const;
	protected Q_SLOTS:		protected Q_SLOTS:
	void init();		void init();
	private:		private:
			friend class RunnerScript;
	AbstractRunnerPrivate *const d;		AbstractRunnerPrivate *const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
	#define K_EXPORT_PLASMA_RUNNER( libname, classname ) \		#define K_EXPORT_PLASMA_RUNNER( libname, classname ) \
	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \		K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
	K_EXPORT_PLUGIN(factory("plasma_runner_" #libname)) \		K_EXPORT_PLUGIN(factory("plasma_runner_" #libname)) \
	K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)		K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)
End of changes. 8 change blocks.
	2 lines changed or deleted		90 lines changed or added

	accessmanager.h		accessmanager.h
	skipping to change at line 26		skipping to change at line 26
	* You should have received a copy of the GNU Library General Public 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 KIO_ACCESSMANAGER_H		#ifndef KIO_ACCESSMANAGER_H
	#define KIO_ACCESSMANAGER_H		#define KIO_ACCESSMANAGER_H
			#include <kio/global.h>
	#include <QtNetwork/QNetworkAccessManager>		#include <QtNetwork/QNetworkAccessManager>
	#include <QtNetwork/QNetworkRequest>		#include <QtNetwork/QNetworkRequest>
			#include <QtNetwork/QNetworkCookieJar>
	#include <kio/global.h>		namespace KIO {
	/**		/**
	* KDE implementation of QNetworkAccessManager. Use this class instead of Q		* @short A KDE implementation of QNetworkAccessManager.
	NetworkAccessManager		*
	* for any KDE application since it uses KIO for network operations.		* Use this class instead of QNetworkAccessManager if you want to integrate
	* Please note that this class is not though as replacement for KIO API! Ju		* with KDE's KIO and KCookieJar modules for network operations and cookie
	st use if in places where		* handling respectively.
	* it is required, such as network binding with Qt classes (one example is		*
	QtWebKit); i.e. API		* Here is a simple example that shows how to set the QtWebKit module to us
	* requires a QNetworkAccessManager.		e KDE's
			* KIO for its network operations:
			* @code
			* QWebView *view = new QWebView(this);
			* KIO::Integration::AccessManager *manager = new KIO::Integration::Acces
			sManager(view);
			* view->page()->setNetworkAccessManager(manager);
			* @endcode
			*
			* To access member functions in the cookiejar class at a later point in yo
			ur
			* code simply downcast the pointer returned by QWebPage::networkAccessMana
			ger
			* as follows:
			* @code
			* KIO::Integration::AccessManager *manager = qobject_cast<KIO::Integrati
			on::AccessManager*>(view->page()->accessManager());
			* @endcode
			*
			* Please note that this class is in the KIO namespace for backward compata
			blity.
			* You should use KIO::Integration::AccessManager to access this class in y
			our
			* code.
			*
			* <b>IMPORTANT</b>This class is not a replacement for the standard KDE API
			.
			* It should ONLY be used to to provide KDE integration in applications tha
			t
			* cannot use the standard KDE API directly.
			*
			* @author Urs Wolfer \<uwolfer @ kde.org\>
			*
			* @deprecated Use the KIO::Integration::AccessManager typedef to access th
			is class instead.
	* @since 4.3		* @since 4.3
	*/		*/
	namespace KIO {
	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. */
	skipping to change at line 56		skipping to change at line 83
	/*!		/*!
	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 */
	};		};
	AccessManager(QObject *parent);		AccessManager(QObject *parent);
	virtual ~AccessManager();		virtual ~AccessManager();
	/**		/**
	* Set @p allowed to false if you don't want any external content to be		* Set @p allowed to false if you don't want any external content to be
	fetched,		fetched.
	* by default external content is allowed		* By default external content is fetched.
	*/		*/
	void setExternalContentAllowed(bool allowed);		void setExternalContentAllowed(bool allowed);
	/**		/**
	* returns if external content will be fetched, see setExternalContentA		* Returns true if external content is going to be fetched.
	llowed().		*
			* @see setExternalContentAllowed
	*/		*/
	bool isExternalContentAllowed() const;		bool isExternalContentAllowed() const;
			/**
			* Sets the cookiejar's window id to @p id.
			*
			* This is a convenience function that allows you to set the cookiejar'
			s
			* window id. Note that this function does nothing unless the cookiejar
			in
			* use is of type KIO::Integration::CookieJar.
			*
			* By default the cookiejar's window id is set to false. Make sure you
			call
			* this function and set the window id to its proper value when create
			an
			* instance of this object. Otherwise, the KDE cookiejar will not be ab
			le
			* to properly manage session based cookies.
			*
			* @see KIO::Integration::CookieJar::setWindowId.
			* @since 4.4
			*/
			void setCookieJarWindowId(WId id);
			/**
			* Returns the cookiejar's window id.
			*
			* This is a convenience function that returns the window id associated
			* with the cookiejar. Note that this function will return a 0 if the
			* cookiejar is not of type KIO::Integration::CookieJar or a window id
			* has not yet been set.
			*
			* @see KIO::Integration::CookieJar::windowId.
			* @since 4.4
			*/
			WId cookieJarWindowid() const;
			/**
			* Returns a reference to the temporary meta data container.
			*
			* See kdelibs/kio/DESIGN.metadata for list of supported KIO meta data.
			*
			* Use this function when you want to set per request KIO meta data tha
			t
			* will be removed after it has been sent once.
			*
			* @since 4.4
			*/
			KIO::MetaData& requestMetaData();
			/**
			* Returns a reference to the persistent meta data container.
			*
			* See kdelibs/kio/DESIGN.metadata for list of supported KIO meta data.
			*
			* Use this function when you want to set per session KIO meta data tha
			t
			* will be sent with every request.
			*
			* 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
			* request.
			*
			* @since 4.4
			*/
			KIO::MetaData& sessionMetaData();
	protected:		protected:
			/**
			* Reimplemented for internal reasons, the API is not affected.
			*
			* @see QNetworkAccessManager::createRequest
			* @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:
	class AccessManagerPrivate;		class AccessManagerPrivate;
	AccessManagerPrivate* const d;		AccessManagerPrivate* const d;
	};		};
			namespace Integration {
			// KDE5: Move AccessManager into the KIO::Integration namespace.
			typedef KIO::AccessManager AccessManager;
			/**
			* @short A KDE implementation of QNetworkCookieJar.
			*
			* Use this class in place of QNetworkCookieJar if you want to integrate wi
			th
			* KDE's cookiejar instead of the one that comes with Qt.
			*
			* Here is a simple example that shows how to set the QtWebKit module to us
			e KDE's
			* cookiejar:
			* @code
			* QWebView *view = new QWebView(this);
			* KIO::Integration::CookieJar *cookieJar = new KIO::Integration::CookieJ
			ar;
			* cookieJar->setWindowId(view->window()->winId());
			* view->page()->networkAccessManager()->setCookieJar(cookieJar);
			* @endcode
			*
			* To access member functions in the cookiejar class at a later point in yo
			ur
			* code simply downcast the pointer returned by QNetworkAccessManager::cook
			ieJar
			* as follows:
			* @code
			* KIO::Integration::CookieJar *cookieJar = qobject_cast<KIO::Integration
			::CookieJar*>(view->page()->accessManager()->cookieJar());
			* @endcode
			*
			* <b>IMPORTANT</b>This class is not a replacement for the standard KDE API
			.
			* It should ONLY be used to to provide KDE integration in applications tha
			t
			* cannot use the standard KDE API directly.
			*
			* @see QNetworkAccessManager::setCookieJar for details.
			*
			* @author Dawit Alemayehu \<adawit @ kde.org\>
			* @since 4.4
			*/
			class KIO_EXPORT CookieJar : public QNetworkCookieJar
			{
			Q_OBJECT
			public:
			/**
			* Constructs a KNetworkCookieJar with parent @p parent.
			*/
			explicit CookieJar(QObject *parent = 0);
			/**
			* Destroys the KNetworkCookieJar.
			*/
			~CookieJar();
			/**
			* Returns the currently set window id. The default value is -1.
			*/
			WId windowId() const;
			/**
			* Sets the window id of the application.
			*
			* This value is used by KDE's cookiejar to manage session cookies, nam
			ely
			* to delete them when the last application referring to such cookies i
			s
			* closed by the end user.
			*
			* @see QWidget::window()
			* @see QWidget::winId()
			*
			* @param id the value of @ref QWidget::winId() from the window that co
			ntains your widget.
			*/
			void setWindowId(WId id);
			/**
			* Reparse the KDE cookiejar configuration file.
			*/
			void reparseConfiguration();
			/**
			* Reimplemented for internal reasons, the API is not affected.
			*
			* @see QNetworkCookieJar::cookiesForUrl
			* @internal
			*/
			QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
			/**
			* Reimplemented for internal reasons, the API is not affected.
			*
			* @see QNetworkCookieJar::setCookiesFromUrl
			* @internal
			*/
			bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const Q
			Url &url);
			private:
			class CookieJarPrivate;
			CookieJarPrivate* const d;
			};
			}
	}		}
	#endif // KIO_ACCESSMANAGER_H		#endif // KIO_ACCESSMANAGER_H
End of changes. 12 change blocks.
	17 lines changed or deleted		235 lines changed or added

	action.h		action.h
	skipping to change at line 195		skipping to change at line 195
	/**		/**
	* \return true if the action is finalized, which means the		* \return true if the action is finalized, which means the
	* action is currently not running.		* action is currently not running.
	*/		*/
	bool isFinalized() const;		bool isFinalized() const;
	/**		/**
	* \return the \a Kross::Script implementation used by the scri pting		* \return the \a Kross::Script implementation used by the scri pting
	* backend. This returns NULL until the action got triggered or if		* backend. This returns NULL until the action got triggered or if
	* there was a error before that.		* there was an error before that.
	*		*
	* Normaly it shouldn't be necessary to deal with the scripting backend		* Normaly it shouldn't be necessary to deal with the scripting backend
	* depending instance of a \a Kross::Script implementation sinc e this		* depending instance of a \a Kross::Script implementation sinc e this
	* \a Action class already decorates all the things needed. It		* \a Action class already decorates all the things needed. It
	* may however be useful to provide additional interpreter depe ndent		* may however be useful to provide additional interpreter depe ndent
	* functionality.		* functionality.
	*/		*/
	Script* script() const;		Script* script() const;
	public Q_SLOTS:		public Q_SLOTS:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	animationdriver.h		animationdriver.h
	skipping to change at line 40		skipping to change at line 40
	#include <plasma/version.h>		#include <plasma/version.h>
	#include <plasma/animator.h>		#include <plasma/animator.h>
	class QGraphicsItem;		class QGraphicsItem;
	namespace Plasma		namespace Plasma
	{		{
	class AnimationDriverPrivate;		class AnimationDriverPrivate;
	class PLASMA_EXPORT AnimationDriver : public QObject		class PLASMA_EXPORT_DEPRECATED AnimationDriver : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	explicit AnimationDriver(QObject *parent = 0);		explicit AnimationDriver(QObject *parent = 0);
	~AnimationDriver();		~AnimationDriver();
	// Parameter definitions		// Parameter definitions
	virtual int animationFps(Plasma::Animator::Animation) const;		virtual int animationFps(Plasma::Animator::Animation) const;
	virtual int movementAnimationFps(Plasma::Animator::Movement) const;		virtual int movementAnimationFps(Plasma::Animator::Movement) const;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	animator.h		animator.h
	skipping to change at line 26		skipping to change at line 26
	* 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_ANIMATOR_H		#ifndef PLASMA_ANIMATOR_H
	#define PLASMA_ANIMATOR_H		#define PLASMA_ANIMATOR_H
	#include <QtGui/QImage>		#include <QtGui/QImage>
	#include <QtCore/QObject>		#include <QtCore/QObject>
			#include <QtCore/QAbstractAnimation>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	class QGraphicsItem;		class QGraphicsItem;
			class QGraphicsWidget;
	class QTimeLine;		class QTimeLine;
	namespace Plasma		namespace Plasma
	{		{
	class AnimatorPrivate;		class AnimatorPrivate;
			class Animation;
	/**		/**
	* @class Animator plasma/animator.h <Plasma/Animator>		* @class Animator plasma/animator.h <Plasma/Animator>
	*		*
	* @short A system for applying effects to Plasma elements		* @short A system for applying effects to Plasma elements
	*/		*/
	class PLASMA_EXPORT Animator : public QObject		class PLASMA_EXPORT Animator : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	Q_ENUMS(Animation)		Q_ENUMS(Animation)
	Q_ENUMS(CurveShape)		Q_ENUMS(CurveShape)
	Q_ENUMS(Movement)		Q_ENUMS(Movement)
	public:		public:
	enum Animation {		enum Animation {
			/* TODO: should we map older animations to new ones? */
	AppearAnimation = 0, /*<< Animate the appearance of an element */		AppearAnimation = 0, /*<< Animate the appearance of an element */
	DisappearAnimation, /*<< Animate the disappearance of an element * /		DisappearAnimation, /*<< Animate the disappearance of an element * /
	ActivateAnimation /*<< When something is activated or launched,		ActivateAnimation, /*<< When something is activated or launched,
	such as an app icon being clicked */		such as an app icon being clicked */
			/* TODO: change the names of animation classes */
			FadeAnimation, /*<< Can be used for both fade in and out */
			GrowAnimation, /*<< Grow animated object geometry */
			PulseAnimation, /*<< Pulse animated object (opacity/geometry/scale)
			*/
			RotationAnimation, /*<< Rotate an animated object */
			RotationStackedAnimation, /*<< for flipping one object with another
			*/
			SlideAnimation, /*<< Move the position of animated object */
			GeometryAnimation, /*<< Geometry animation*/
			ZoomAnimation /*<<Zoom animation */
	};		};
	enum CurveShape {		enum CurveShape {
	EaseInCurve = 0,		EaseInCurve = 0,
	EaseOutCurve,		EaseOutCurve,
	EaseInOutCurve,		EaseInOutCurve,
	LinearCurve		LinearCurve
	};		};
	enum Movement {		enum Movement {
	SlideInMovement = 0,		SlideInMovement = 0,
	SlideOutMovement,		SlideOutMovement,
	FastSlideInMovement,		FastSlideInMovement,
	FastSlideOutMovement		FastSlideOutMovement
	};		};
	/**		/**
	* Singleton accessor		* Singleton accessor
	**/		**/
	static Animator *self();		static KDE_DEPRECATED Animator *self();
			/**
			* Factory to build new animation objects. To control their behavior,
			* check \ref AbstractAnimation properties.
			**/
			static Plasma::Animation *create(Animator::Animation type, QObject *par
			ent = 0);
	/**		/**
	* 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
	**/		**/
	Q_INVOKABLE int animateItem(QGraphicsItem *item, Animation anim);		KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animatio n anim);
	/**		/**
	* 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
	*/		*/
	Q_INVOKABLE void stopItemAnimation(int id);		KDE_DEPRECATED Q_INVOKABLE void stopItemAnimation(int id);
	/**		/**
	* 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
	**/		**/
	Q_INVOKABLE int moveItem(QGraphicsItem *item, Movement movement, const QPoint &destination);		KDE_DEPRECATED Q_INVOKABLE int moveItem(QGraphicsItem *item, Movement m ovement, const QPoint &destination);
	/**		/**
	* 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
	*/		*/
	Q_INVOKABLE void stopItemMovement(int id);		KDE_DEPRECATED Q_INVOKABLE void stopItemMovement(int id);
	/**		/**
	* 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
	*/		*/
	Q_INVOKABLE int customAnimation(int frames, int duration, Animator::Cur		KDE_DEPRECATED Q_INVOKABLE int customAnimation(int frames, int duration
	veShape curve,		,
	QObject *receiver, const char *method);		Animator::CurveShape curve, QObject *receiver, const char *method);
	/**		/**
	* 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
	*/		*/
	Q_INVOKABLE void stopCustomAnimation(int id);		KDE_DEPRECATED Q_INVOKABLE void stopCustomAnimation(int id);
	Q_INVOKABLE int animateElement(QGraphicsItem *obj, Animation);		KDE_DEPRECATED Q_INVOKABLE int animateElement(QGraphicsItem *obj, Anima
	Q_INVOKABLE void stopElementAnimation(int id);		tion);
	Q_INVOKABLE void setInitialPixmap(int id, const QPixmap &pixmap);		KDE_DEPRECATED Q_INVOKABLE void stopElementAnimation(int id);
	Q_INVOKABLE QPixmap currentPixmap(int id);		KDE_DEPRECATED Q_INVOKABLE void setInitialPixmap(int id, const QPixmap
			&pixmap);
			KDE_DEPRECATED Q_INVOKABLE QPixmap currentPixmap(int id);
	/**		/**
	* 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
	*/		*/
	Q_INVOKABLE bool isAnimating() const;		KDE_DEPRECATED Q_INVOKABLE bool isAnimating() const;
			/**
			* Register a widget as a scrolling widget.
			* The widget will get animate scrolling with mouse dragging and mouse
			wheel.
			* It must provide
			* scrollValue, viewportGeometry and pageSize properties
			*
			* @param widget the widget that offers a scrolling behaviour
			* @since 4.4
			*/
			void registerScrollingManager(QGraphicsWidget *widget);
			/**
			* unregister the scrolling manager of a certain widget
			*
			* @param widget the widget we don't want no longer animated
			* @since 4.4
			*/
			void unregisterScrollingManager(QGraphicsWidget *widget);
	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);
			void scrollStateChanged(QGraphicsWidget *widget, QAbstractAnimation::St
			ate newState,
			QAbstractAnimation::State oldState);
	protected:		protected:
	void timerEvent(QTimerEvent *event);		void timerEvent(QTimerEvent *event);
	private:		private:
	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,
			QAbstractAnimation::State))
			friend class AnimatorPrivate;
	AnimatorPrivate * const d;		AnimatorPrivate * const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif		#endif
End of changes. 24 change blocks.
	16 lines changed or deleted		73 lines changed or added

	applet.h		applet.h
	skipping to change at line 84		skipping to change at line 84
	* See techbase.kde.org for tutorials on writing Applets using this class.		* See techbase.kde.org for tutorials on writing Applets using this class.
	*/		*/
	class PLASMA_EXPORT Applet : public QGraphicsWidget		class PLASMA_EXPORT Applet : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(bool hasConfigurationInterface READ hasConfigurationInterfac e)		Q_PROPERTY(bool hasConfigurationInterface READ hasConfigurationInterfac e)
	Q_PROPERTY(QString name READ name)		Q_PROPERTY(QString name READ name)
	Q_PROPERTY(QString category READ category)		Q_PROPERTY(QString category READ category)
	Q_PROPERTY(ImmutabilityType immutability READ immutability WRITE setImm utability)		Q_PROPERTY(ImmutabilityType immutability READ immutability WRITE setImm utability)
	Q_PROPERTY(bool hasFailedToLaunch READ hasFailedToLaunch WRITE setFaile dToLaunch)		Q_PROPERTY(bool hasFailedToLaunch READ hasFailedToLaunch WRITE setFaile dToLaunch)
	Q_PROPERTY(bool isBusy READ isBusy WRITE setBusy)		Q_PROPERTY(bool isBusy READ isBusy WRITE setBusy) //KDE5: remove
			Q_PROPERTY(bool busy READ isBusy WRITE setBusy)
	Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired)		Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired)
	Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry)		Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry)
	Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)		Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)
			Q_PROPERTY(uint id READ id)
	public:		public:
	typedef QList<Applet*> List;		typedef QList<Applet*> List;
	typedef QHash<QString, Applet*> Dict;		typedef QHash<QString, Applet*> Dict;
	/**		/**
	* Description on how draw a background for the applet		* Description on how draw a background for the applet
	*/		*/
	enum BackgroundHint {		enum BackgroundHint {
	NoBackground = 0, /**< Not drawing a background under t he		NoBackground = 0, /**< Not drawing a background under t he
	skipping to change at line 234		skipping to change at line 236
	/**		/**
	* Reccomended position for a popup window like a menu or a tooltip		* Reccomended position for a popup window like a menu or a tooltip
	* given its size		* given its size
	* @param s size of the popup		* @param s size of the popup
	* @returns reccomended position		* @returns reccomended position
	*/		*/
	QPoint popupPosition(const QSize &s) const;		QPoint popupPosition(const QSize &s) const;
	/**		/**
			* @since 4.4
			* Reccomended position for a popup window like a menu or a tooltip
			* given its size
			* @param s size of the popup
			* @param alignment alignment of the popup, valid flags are Qt::Ali
			gnLeft, Qt::AlignRight and Qt::AlignCenter
			* @returns reccomended position
			*/
			QPoint popupPosition(const QSize &s, Qt::AlignmentFlag alignment) c
			onst;
			/**
	* Called when any of the geometry constraints have been updated.		* Called when any of the geometry constraints have been updated.
	* This method calls constraintsEvent, which may be reimplemented,		* This method calls constraintsEvent, which may be reimplemented,
	* once the Applet has been prepared for updating the constraints.		* once the Applet has been prepared for updating the constraints.
	*		*
	* @param constraints the type of constraints that were updated		* @param constraints the type of constraints that were updated
	*/		*/
	void updateConstraints(Plasma::Constraints constraints = Plasma::Al lConstraints);		void updateConstraints(Plasma::Constraints constraints = Plasma::Al lConstraints);
	/**		/**
	* Returns the current form factor the applet is being displayed in .		* Returns the current form factor the applet is being displayed in .
	skipping to change at line 298		skipping to change at line 310
	const QString &parentApp = QS tring());		const QString &parentApp = QS tring());
	/**		/**
	* 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.
			*
			* @since 4.4
			* @return list of applets
			**/
			static KPluginInfo::List listAppletInfoForUrl(const QUrl &url);
			/**
	* Returns a list of all the categories used by installed applets.		* Returns a list of all the categories used by installed applets.
	*		*
	* @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 categories		* @return list of categories
	* @param visibleOnly true if it should only return applets that ar e marked as visible		* @param visibleOnly true if it should only return applets that ar e marked as visible
	*/		*/
	skipping to change at line 326		skipping to change at line 346
	*/		*/
	void setCustomCategories(const QStringList &categories);		void setCustomCategories(const QStringList &categories);
	/**		/**
	* @return the list of custom categories known to libplasma		* @return the list of custom categories known to libplasma
	* @since 4.3		* @since 4.3
	*/		*/
	QStringList customCategories();		QStringList customCategories();
	/**		/**
	* Attempts to load an apppet from a package		* Attempts to load an applet from a package
	*		*
	* Returns a pointer to the applet if successful.		* Returns a pointer to the applet if successful.
	* The caller takes responsibility for the applet, including		* The caller takes responsibility for the applet, including
	* deleting it when no longer needed.		* deleting it when no longer needed.
	*		*
	* @param path the path to the package		* @param path the path to the package
	* @param appletId unique ID to assign the applet, or zero to have one		* @param appletId unique ID to assign the applet, or zero to have one
	* assigned automatically.		* assigned automatically.
	* @param args to send the applet extra arguments		* @param args to send the applet extra arguments
	* @return a pointer to the loaded applet, or 0 on load failure		* @return a pointer to the loaded applet, or 0 on load failure
	skipping to change at line 562		skipping to change at line 582
	*/		*/
	virtual void addAssociatedWidget(QWidget *widget);		virtual void addAssociatedWidget(QWidget *widget);
	/**		/**
	* un-associate actions from this widget, including ones added afte r this call.		* un-associate actions from this widget, including ones added afte r this call.
	* needed to make keyboard shortcuts work.		* needed to make keyboard shortcuts work.
	*/		*/
	virtual void removeAssociatedWidget(QWidget *widget);		virtual void removeAssociatedWidget(QWidget *widget);
	/**		/**
	* Gets called when and extender item has to be initialized after a plasma restart. If you		* Gets called when an extender item has to be initialized after a plasma restart. If you
	* create ExtenderItems in your applet, you should implement this f unction to again create		* create ExtenderItems in your applet, you should implement this f unction to again create
	* the widget that should be shown in this extender item. This func tion might look something		* the widget that should be shown in this extender item. This func tion might look something
	* like this:		* like this:
	*		*
	* @code		* @code
	* SuperCoolWidget *widget = new SuperCoolWidget();		* SuperCoolWidget *widget = new SuperCoolWidget();
	* dataEngine("engine")->connectSource(item->config("dataSourceName "), widget);		* dataEngine("engine")->connectSource(item->config("dataSourceName "), widget);
	* item->setWidget(widget);		* item->setWidget(widget);
	* @endcode		* @endcode
	*		*
	skipping to change at line 629		skipping to change at line 649
	*/		*/
	virtual void createConfigurationInterface(KConfigDialog *parent);		virtual void createConfigurationInterface(KConfigDialog *parent);
	/**		/**
	* Returns true if the applet is allowed to perform functions cover ed by the given constraint		* Returns true if the applet is allowed to perform functions cover ed by the given constraint
	* eg. hasAuthorization("FileDialog") returns true if applets are a llowed to show filedialogs.		* eg. hasAuthorization("FileDialog") returns true if applets are a llowed to show filedialogs.
	* @since 4.3		* @since 4.3
	*/		*/
	bool hasAuthorization(const QString &constraint) const;		bool hasAuthorization(const QString &constraint) const;
			/**
			* Sets an application associated to this applet, that will be
			* regarded as a full view of what is represented in the applet
			*
			* @param string the name of the application. it can be
			* \li a name understood by KService::serviceByDesktopName
			* (e.g. "konqueror")
			* \li a command in $PATH
			* \li or an absolute path to an executable
			* @since 4.4
			*/
			void setAssociatedApplication(const QString &string);
			/**
			* Sets a list of urls associated to this application,
			* they will be used as parameters for the associated application
			* @see setAssociatedApplication()
			*
			* @param urls
			*/
			void setAssociatedApplicationUrls(const KUrl::List &urls);
			/**
			* @return the application associated to this applet
			* @since 4.4
			*/
			QString associatedApplication() const;
			/**
			* @return the urls associated to this applet
			* @since 4.4
			*/
			KUrl::List associatedApplicationUrls() const;
			/**
			* @return true if the applet has a valid associated application or
			urls
			* @since 4.4
			*/
			bool hasValidAssociatedApplication() const;
	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 hides when such an e vent is		* to ensure that the Dashboard view in Plasma hides when such an e vent is
	* triggered by an item it is displaying.		* triggered by an item it is displaying.
	*/		*/
	void releaseVisualFocus();		void releaseVisualFocus();
	/**		/**
	skipping to change at line 677		skipping to change at line 737
	void configNeedsSaving();		void configNeedsSaving();
	/**		/**
	* 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 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
			* @since 4.4
			*/
			void newStatus(Plasma::ItemStatus status);
			/**
	* Emitted when an ExtenderItem in a scripting applet needs to be i nitialized		* Emitted when an ExtenderItem in a scripting applet needs to be i nitialized
	*/		*/
	void extenderItemRestored(Plasma::ExtenderItem *item);		void extenderItemRestored(Plasma::ExtenderItem *item);
			/**
			* Emitted when the immutability changes
			* @since 4.4
			*/
			void immutabilityChanged(Plasma::ImmutabilityType immutable);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the immutability type for this applet (not immutable,		* Sets the immutability type for this applet (not immutable,
	* user immutable or system immutable)		* user immutable or system immutable)
	* @arg immutable the new immutability type of this applet		* @arg immutable the new immutability type of this applet
	*/		*/
	void setImmutability(const ImmutabilityType immutable);		void setImmutability(const ImmutabilityType immutable);
	/**		/**
	* Destroys the applet; it will be removed nicely and deleted.		* Destroys the applet; it will be removed nicely and deleted.
	skipping to change at line 765		skipping to change at line 843
	* @param busy show or hide the busy indicator		* @param busy show or hide the busy indicator
	*/		*/
	void setBusy(bool busy);		void setBusy(bool busy);
	/**		/**
	* @return the list of arguments which the applet was called with		* @return the list of arguments which the applet was called with
	* @since KDE4.3		* @since KDE4.3
	*/		*/
	QVariantList startupArguments() const;		QVariantList startupArguments() const;
			/**
			* @return the status of the applet
			* @since 4.4
			*/
			ItemStatus status() const;
			/**
			* sets the status for this applet
			* @since 4.4
			*/
			void setStatus(const ItemStatus stat);
			/**
			* Publishes and optionally announces this applet on the network fo
			r remote access.
			* @param methods the methods to use for announcing this applet.
			* @param resourceName the name under which this applet will be pub
			lished (has to be unique
			* for each machine)
			*/
			void publish(Plasma::AnnouncementMethods methods, const QString &re
			sourceName);
			void unpublish();
			bool isPublished() const;
			/**
			* Open the application associated to this applet, if it's not set
			* but some urls are, open those urls with the proper application
			* for their mimetype
			* @see setAssociatedApplication()
			* @see setAssociatedApplicationUrls()
			* @since 4.4
			*/
			void runAssociatedApplication();
	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 two elements: the KService service ID for the desktop en try		* to have two elements: the KService service ID for the desktop en try
	* and an applet ID which must be a base 10 number.		* and an applet ID which must be a base 10 number.
	*		*
	* @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
	skipping to change at line 955		skipping to change at line 1067
	* @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 checkImmutability())
	Q_PRIVATE_SLOT(d, void themeChanged())		Q_PRIVATE_SLOT(d, void themeChanged())
	Q_PRIVATE_SLOT(d, void appletAnimationComplete(QGraphicsItem *item,		Q_PRIVATE_SLOT(d, void appletAnimationComplete())
	Plasma::Animator::An
	imation anim))
	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))
	/**		/**
	* Reimplemented from QGraphicsItem		* Reimplemented from QGraphicsItem
	**/		**/
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget = 0);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio n, QWidget *widget = 0);
	AppletPrivate *const d;		AppletPrivate *const d;
	//Corona needs to access setFailedToLaunch and init		//Corona needs to access setFailedToLaunch and init
	friend class Corona;		friend class Corona;
	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 PopupApplet;		friend class PopupApplet;
	friend class PopupAppletPrivate;		friend class PopupAppletPrivate;
			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;
	};		};
	} // Plasma namespace		} // Plasma namespace
End of changes. 15 change blocks.
	6 lines changed or deleted		129 lines changed or added

	appletscript.h		appletscript.h
	skipping to change at line 28		skipping to change at line 28
	*/		*/
	#ifndef PLASMA_APPLETSCRIPT_H		#ifndef PLASMA_APPLETSCRIPT_H
	#define PLASMA_APPLETSCRIPT_H		#define PLASMA_APPLETSCRIPT_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QRect>		#include <QtCore/QRect>
	#include <QtCore/QSizeF>		#include <QtCore/QSizeF>
	#include <kgenericfactory.h>		#include <kgenericfactory.h>
			#include <kplugininfo.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	#include <plasma/scripting/scriptengine.h>		#include <plasma/scripting/scriptengine.h>
	class QAction;		class QAction;
	class QPainter;		class QPainter;
	class QStyleOptionGraphicsItem;		class QStyleOptionGraphicsItem;
	class KConfigDialog;		class KConfigDialog;
	namespace Plasma		namespace Plasma
	skipping to change at line 144		skipping to change at line 145
	/**		/**
	* @see Applet		* @see Applet
	*/		*/
	void configNeedsSaving() const;		void configNeedsSaving() const;
	/**		/**
	* @see Applet		* @see Applet
	*/		*/
	Extender *extender() const;		Extender *extender() const;
			Q_SIGNALS:
			/**
			* @see Applet
			*/
			void saveState(KConfigGroup &group) const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Show a configuration dialog.		* Show a configuration dialog.
	*/		*/
	virtual void showConfigurationInterface();		virtual void showConfigurationInterface();
	/**		/**
	* Configure was changed.		* Configure was changed.
	*/		*/
	skipping to change at line 176		skipping to change at line 183
	QString mainScript() const;		QString mainScript() const;
	/**		/**
	* @return the Package associated with this plasmoid which can		* @return the Package associated with this plasmoid which can
	* be used to request resources, such as images and		* be used to request resources, such as images and
	* interface files.		* interface files.
	*/		*/
	const Package *package() const;		const Package *package() const;
	/**		/**
			* @return the KPluginInfo associated with this plasmoid
			*/
			KPluginInfo description() const;
			/**
	* @return a standard Plasma applet configuration dialog, ready		* @return a standard Plasma applet configuration dialog, ready
	* to have pages added to it.		* to have pages added to it.
	*		*
	* Note that the dialog returned is set to delete on close.		* Note that the dialog returned is set to delete on close.
	*/		*/
	KConfigDialog *standardConfigurationDialog();		KConfigDialog *standardConfigurationDialog();
	/**		/**
	* This method should be called after a scripting applet has added		* This method should be called after a scripting applet has added
	* its own pages to a configuration dialog		* its own pages to a configuration dialog
	*		*
	* @since 4.3.1		* @since 4.3.1
	*/		*/
	void addStandardConfigurationPages(KConfigDialog *dialog);		void addStandardConfigurationPages(KConfigDialog *dialog);
			/**
			* @see Applet
			*/
			void showMessage(const QIcon &icon, const QString &message, const Messa
			geButtons buttons);
			/**
			* @see Applet
			*/
			void registerAsDragHandle(QGraphicsItem *item);
			/**
			* @see Applet
			*/
			void unregisterAsDragHandle(QGraphicsItem *item);
			/**
			* @see Applet
			*/
			bool isRegisteredAsDragHandle(QGraphicsItem *item);
	private:		private:
			friend class Applet;
	AppletScriptPrivate *const d;		AppletScriptPrivate *const d;
	};		};
	#define K_EXPORT_PLASMA_APPLETSCRIPTENGINE(libname, classname) \		#define K_EXPORT_PLASMA_APPLETSCRIPTENGINE(libname, classname) \
	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \		K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
	K_EXPORT_PLUGIN(factory("plasma_appletscriptengine_" #libname))		K_EXPORT_PLUGIN(factory("plasma_appletscriptengine_" #libname))
	} //Plasma namespace		} //Plasma namespace
	#endif		#endif
End of changes. 5 change blocks.
	0 lines changed or deleted		35 lines changed or added

	backgroundchecker.h		backgroundchecker.h
	/**		/*
	* backgroundchecker.h		* backgroundchecker.h
	*		*
	* Copyright (C) 2004 Zack Rusin <zack@kde.org>		* Copyright (C) 2004 Zack Rusin <zack@kde.org>
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	skipping to change at line 30		skipping to change at line 30
	*/		*/
	#ifndef SONNET_BACKGROUNDCHECKER_H		#ifndef SONNET_BACKGROUNDCHECKER_H
	#define SONNET_BACKGROUNDCHECKER_H		#define SONNET_BACKGROUNDCHECKER_H
	#include "speller.h"		#include "speller.h"
	#include <kdecore_export.h>		#include <kdecore_export.h>
	#include <QtCore/QObject>		#include <QtCore/QObject>
			/**
			* The sonnet namespace.
			*/
	namespace Sonnet		namespace Sonnet
	{		{
	class Speller;		class Speller;
	/**		/**
	*		*
	* BackgroundChecker is used to perform spell checking without		* BackgroundChecker is used to perform spell checking without
	* blocking the application. You can use it as is by calling		* blocking the application. You can use it as is by calling
	* the checkText function or subclass it and reimplement		* the checkText function or subclass it and reimplement
	* getMoreText function.		* getMoreText function.
End of changes. 2 change blocks.
	1 lines changed or deleted		4 lines changed or added

	browserextension.h		browserextension.h
	skipping to change at line 156		skipping to change at line 156
	/**		/**
	* Set the redirect flag to indicate URL is a result of either a META red irect		* Set the redirect flag to indicate URL is a result of either a META red irect
	* or HTTP redirect.		* or HTTP redirect.
	*		*
	* @param redirected		* @param redirected
	*/		*/
	void setRedirectedRequest(bool redirected);		void setRedirectedRequest(bool redirected);
	/**		/**
	* Set whether the URL specifies to be opened in a new window		* Set whether the URL specifies to be opened in a new window.
			*
			* When openUrlRequest is emitted:
			* <ul>
			* <li>normally the url would be opened in the current view.</li>
			* <li>setForcesNewWindow(true) specifies that a new window or tab shoul
			d be used:
			* setNewTab(true) requests a tab specifically, otherwise the user-prefe
			rence is followed.
			* This is typically used for target="_blank" in web browsers.</li>
			* </ul>
			*
			* When createNewWindow is emitted:
			* <ul>
			* <li>if setNewTab(true) was called, a tab is created.</li>
			* <li>otherwise, if setForcesNewWindow(true) was called, a window is cr
			eated.</li>
			* <li>otherwise the user preference is followed.</li>
			* </ul>
	*/		*/
	void setForcesNewWindow( bool forcesNewWindow );		void setForcesNewWindow( bool forcesNewWindow );
	/**		/**
	* Whether the URL specifies to be opened in a new window		* Whether the URL specifies to be opened in a new window
	*/		*/
	bool forcesNewWindow() const;		bool forcesNewWindow() const;
	private:		private:
	BrowserArgumentsPrivate *d;		BrowserArgumentsPrivate *d;
	skipping to change at line 285		skipping to change at line 300
	* The following standard actions are defined by the host of the view :		* The following standard actions are defined by the host of the view :
	*		*
	* [selection-dependent actions]		* [selection-dependent actions]
	* @li @p cut : Copy selected items to clipboard and store 'not cut' in cl ipboard.		* @li @p cut : Copy selected items to clipboard and store 'not cut' in cl ipboard.
	* @li @p copy : Copy selected items to clipboard and store 'cut' in clipb oard.		* @li @p copy : Copy selected items to clipboard and store 'cut' in clipb oard.
	* @li @p paste : Paste clipboard into view URL.		* @li @p paste : Paste clipboard into view URL.
	* @li @p pasteTo(const KUrl &) : Paste clipboard into given URL.		* @li @p pasteTo(const KUrl &) : Paste clipboard into given URL.
	* @li @p searchProvider : Lookup selected text at default search provider		* @li @p searchProvider : Lookup selected text at default search provider
	*		*
	* [normal actions]		* [normal actions]
	* @li @p print : Print :-)		* @li None anymore.
	* @li @p reparseConfiguration : Re-read configuration and apply it.
	* @li @p refreshMimeTypes : If the view uses mimetypes it should re-deter
	mine them.
	*		*
	*		*
	* The view defines a slot with the name of the action in order to impleme nt the action.		* The view defines a slot with the name of the action in order to impleme nt the action.
	* The browser will detect the slot automatically and connect its action t o it when		* The browser will detect the slot automatically and connect its action t o it when
	* appropriate (i.e. when the view is active).		* appropriate (i.e. when the view is active).
	*		*
	*		*
	* The selection-dependent actions are disabled by default and the view sh ould		* The selection-dependent actions are disabled by default and the view sh ould
	* enable them when the selection changes, emitting enableAction().		* enable them when the selection changes, emitting enableAction().
	*		*
	* The normal actions do not depend on the selection.		* The normal actions do not depend on the selection.
	* You need to enable 'print' when printing is possible - you can even do
	that
	* in the constructor.
	*		*
	* A special case is the configuration slots, not connected to any action		* A special case is the configuration slots, not connected to any action
	directly,		directly.
	* and having parameters.
	*		*
	* [configuration slot]		* [configuration slot]
			* @li @p reparseConfiguration : Re-read configuration and apply it.
	* @li @p disableScrolling: no scrollbars		* @li @p disableScrolling: no scrollbars
	*/		*/
	class KPARTS_EXPORT BrowserExtension : public QObject		class KPARTS_EXPORT BrowserExtension : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setU RLDropHandlingEnabled )		Q_PROPERTY( bool urlDropHandling READ isURLDropHandlingEnabled WRITE setU RLDropHandlingEnabled )
	public:		public:
	/**		/**
	* Constructor		* Constructor
	*		*
End of changes. 5 change blocks.
	11 lines changed or deleted		23 lines changed or added

	browserrun.h		browserrun.h
	skipping to change at line 85		skipping to change at line 85
	bool serverSuggestsSave() const { return contentDisposition() == QS tring::fromLatin1("attachment"); }		bool serverSuggestsSave() const { return contentDisposition() == QS tring::fromLatin1("attachment"); }
	enum AskSaveResult { Save, Open, Cancel };		enum AskSaveResult { Save, Open, Cancel };
	/**		/**
	* Ask the user whether to save or open a url in another applicatio n.		* Ask the user whether to save or open a url in another applicatio n.
	* @param url the URL in question		* @param url the URL in question
	* @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
			* @code
			* BrowserOpenOrSaveQuestion dlg(parent, url, mimeType, suggestedF
			ileName);
			* const BrowserOpenOrSaveQuestion::Result res = dlg.askOpenOrSave
			();
			* @endcode
	*/		*/
	static AskSaveResult askSave( const KUrl & url, KService::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() );
	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
			* @code
			* BrowserOpenOrSaveQuestion dlg(parent, url, mimeType, suggestedF
			ileName);
			* const BrowserOpenOrSaveQuestion::Result res = dlg.askEmbedOrSav
			e(flags);
			* // Important: returns Embed now, not Open!
			* @endcode
	*/		*/
	static AskSaveResult askEmbedOrSave( const KUrl & url, const QStrin g& 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 );
	// 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 );		QWidget* window =0 ); // KDE5: remove
			/**
			* If kget integration is enabled, passes the url to kget.
			* Otherwise, asks the user for a destination url, and calls saveUr
			lUsingKIO.
			* @since 4.4
			*/
			static void saveUrl(const KUrl & url, const QString & suggestedFile
			Name,
			QWidget* window, const KParts::OpenUrlArguments
			& args);
			/**
			* Starts the KIO file copy job to download @p srcUrl into @p destU
			rl.
			* @since 4.4
			*/
			static void saveUrlUsingKIO(const KUrl & srcUrl, const KUrl& destUr
			l,
			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 );
	protected:		protected:
	/**		/**
	* Reimplemented from KRun		* Reimplemented from KRun
	*/		*/
	virtual void scanFile();		virtual void scanFile();
End of changes. 5 change blocks.
	3 lines changed or deleted		38 lines changed or added

	checkbox.h		checkbox.h
	skipping to change at line 48		skipping to change at line 48
	*/		*/
	class PLASMA_EXPORT CheckBox : public QGraphicsProxyWidget		class PLASMA_EXPORT CheckBox : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText)		Q_PROPERTY(QString text READ text WRITE setText)
	Q_PROPERTY(QString image READ image WRITE setImage)		Q_PROPERTY(QString image READ image WRITE setImage)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QCheckBox *nativeWidget READ nativeWidget)		Q_PROPERTY(QCheckBox *nativeWidget READ nativeWidget)
	Q_PROPERTY(bool isChecked READ isChecked WRITE setChecked NOTIFY toggle d)		Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)
	public:		public:
	explicit CheckBox(QGraphicsWidget *parent = 0);		explicit CheckBox(QGraphicsWidget *parent = 0);
	~CheckBox();		~CheckBox();
	/**		/**
	* Sets the display text for this CheckBox		* Sets the display text for this CheckBox
	*		*
	* @arg text the text to display; should be translated.		* @arg text the text to display; should be translated.
	*/		*/
	skipping to change at line 112		skipping to change at line 112
	/**		/**
	* @return the checked state		* @return the checked state
	*/		*/
	bool isChecked() const;		bool isChecked() const;
	Q_SIGNALS:		Q_SIGNALS:
	void toggled(bool);		void toggled(bool);
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
			void changeEvent(QEvent *event);
	private:		private:
	Q_PRIVATE_SLOT(d, void setPalette())		Q_PRIVATE_SLOT(d, void setPalette())
	Q_PRIVATE_SLOT(d, void setPixmap())		Q_PRIVATE_SLOT(d, void setPixmap())
	CheckBoxPrivate * const d;		CheckBoxPrivate * const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	class.h		class.h
	/* This file is part of the Nepomuk-KDE libraries		/* This file is part of the Nepomuk-KDE libraries
	Copyright (c) 2007 Sebastian Trueg <trueg@kde.org>		Copyright (c) 2007-2009 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 92		skipping to change at line 92
	Class& operator=( const Class& );		Class& operator=( const Class& );
	/**		/**
	* A Property has a certain range which is a Class or a Literal .		* A Property has a certain range which is a Class or a Literal .
	* \return A list of all properties that have this Class as a r ange.		* \return A list of all properties that have this Class as a r ange.
	* \sa Property::range()		* \sa Property::range()
	*/		*/
	QList<Property> rangeOf();		QList<Property> rangeOf();
	/**		/**
			* A Property has a certain range which is a Class or a Literal
			.
			* \return A list of all properties that have this Class as a r
			ange.
			* \sa Property::range()
			*
			* Const version.
			*
			* \since 4.4
			*/
			QList<Property> rangeOf() const;
			/**
	* A Property has a certain domain which is a Class.		* A Property has a certain domain which is a Class.
	* \return A list of all properties that have this Class as a d omain.		* \return A list of all properties that have this Class as a d omain.
	* \sa Property::domain()		* \sa Property::domain()
	*/		*/
	QList<Property> domainOf();		QList<Property> domainOf();
	/**		/**
			* A Property has a certain domain which is a Class.
			* \return A list of all properties that have this Class as a d
			omain.
			* \sa Property::domain()
			*
			* Const version.
			*
			* \since 4.4
			*/
			QList<Property> domainOf() const;
			/**
	* Search for a property in the class by its name.		* Search for a property in the class by its name.
	* \param name The name of the property.		* \param name The name of the property.
	* \return the Property object identified by name or an invalid property if it could not be found.		* \return the Property object identified by name or an invalid property if it could not be found.
	*/		*/
	Property findPropertyByName( const QString& name );		Property findPropertyByName( const QString& name );
	/**		/**
			* Search for a property in the class by its name.
			* \param name The name of the property.
			* \return the Property object identified by name or an invalid
			property if it could not be found.
			*
			* Const version.
			*
			* \since 4.4
			*/
			Property findPropertyByName( const QString& name ) const;
			/**
	* Search for a property in the class by its label.		* Search for a property in the class by its label.
	* \param label The label of the property (i.e. rdfs:label)		* \param label The label of the property (i.e. rdfs:label)
	* \param language The language in which the label was specifie d. If empty the default rdfs:label		* \param language The language in which the label was specifie d. If empty the default rdfs:label
	* is returned.		* is returned.
	* \return the Property object identified by label or an invali d property if it could not be found.		* \return the Property object identified by label or an invali d property if it could not be found.
	*/		*/
	Property findPropertyByLabel( const QString& label, const QStri ng& language = QString() );		Property findPropertyByLabel( const QString& label, const QStri ng& language = QString() );
	/**		/**
			* Search for a property in the class by its label.
			* \param label The label of the property (i.e. rdfs:label)
			* \param language The language in which the label was specifie
			d. If empty the default rdfs:label
			* is returned.
			* \return the Property object identified by label or an invali
			d property if it could not be found.
			*
			* Const version.
			*
			* \since 4.4
			*/
			Property findPropertyByLabel( const QString& label, const QStri
			ng& language = QString() ) const;
			/**
	* Each class can have multiple parent classes. This method		* Each class can have multiple parent classes. This method
	* provides a list of all direct parents.		* provides a list of all direct parents.
	* \return A list of all parent classes of this class.		* \return A list of all parent classes of this class.
	* If the list is emppty it means that the class has no direct		* If the list is emppty it means that the class has no direct
	* parents, i.e. it is derived from rdf:Resource.		* parents, i.e. it is derived from rdf:Resource.
	* \sa allParentClasses()		* \sa allParentClasses()
	*/		*/
	QList<Class> parentClasses();		QList<Class> parentClasses();
	/**		/**
			* Each class can have multiple parent classes. This method
			* provides a list of all direct parents.
			* \return A list of all parent classes of this class.
			* If the list is emppty it means that the class has no direct
			* parents, i.e. it is derived from rdf:Resource.
			* \sa allParentClasses()
			*
			* Const version.
			*
			* \since 4.4
			*/
			QList<Class> parentClasses() const;
			/**
	* \return A list of all classes that have this class as a pare nt.		* \return A list of all classes that have this class as a pare nt.
	* Be aware that this list can never be final since other ontol ogies		* Be aware that this list can never be final since other ontol ogies
	* that have not been loaded yet may contain classes that are d erived		* that have not been loaded yet may contain classes that are d erived
	* from this class.		* from this class.
	*/		*/
	QList<Class> subClasses();		QList<Class> subClasses();
	/**		/**
			* \return A list of all classes that have this class as a pare
			nt.
			* Be aware that this list can never be final since other ontol
			ogies
			* that have not been loaded yet may contain classes that are d
			erived
			* from this class.
			*
			* Const version.
			*
			* \since 4.4
			*/
			QList<Class> subClasses() const;
			/**
	* Recursively determines all parent classes of this class, not		* Recursively determines all parent classes of this class, not
	* only the direct ones.		* only the direct ones.
	* \return A list of parent classes of this class.		* \return A list of parent classes of this class.
	* \sa parentClasses()		* \sa parentClasses()
	*/		*/
	QList<Class> allParentClasses();		QList<Class> allParentClasses();
	/**		/**
			* Recursively determines all parent classes of this class, not
			* only the direct ones.
			* \return A list of parent classes of this class.
			* \sa parentClasses()
			*
			* Const version.
			*
			* \since 4.4
			*/
			QList<Class> allParentClasses() const;
			/**
	* Recursively determines all sub classes of this class, not		* Recursively determines all sub classes of this class, not
	* only the direct ones.		* only the direct ones.
	* \return A list of sub classes of this class.		* \return A list of sub classes of this class.
	* \sa subClasses()		* \sa subClasses()
	*/		*/
	QList<Class> allSubClasses();		QList<Class> allSubClasses();
	/**		/**
			* Recursively determines all sub classes of this class, not
			* only the direct ones.
			* \return A list of sub classes of this class.
			* \sa subClasses()
			*
			* Const version.
			*
			* \since 4.4
			*/
			QList<Class> allSubClasses() const;
			/**
	* Check if a class inherits this class. This is a recursive me thod which		* Check if a class inherits this class. This is a recursive me thod which
	* does not only check direct child classes.		* does not only check direct child classes.
	*		*
	* \return true if other is derived from this class, false othe rwise.		* \return true if other is derived from this class, false othe rwise.
	*/		*/
	bool isParentOf( const Class& other );		bool isParentOf( const Class& other );
	/**		/**
			* Check if a class inherits this class. This is a recursive me
			thod which
			* does not only check direct child classes.
			*
			* \return true if other is derived from this class, false othe
			rwise.
			*
			* Const version.
			*
			* \since 4.4
			*/
			bool isParentOf( const Class& other ) const;
			/**
	* Check if this class is derived from another class. This is a recursive method which		* Check if this class is derived from another class. This is a recursive method which
	* does not only check direct child classes.		* does not only check direct child classes.
	*		*
	* \return true if this class is derived from other, false othe rwise.		* \return true if this class is derived from other, false othe rwise.
	*/		*/
	bool isSubClassOf( const Class& other );		bool isSubClassOf( const Class& other );
			/**
			* Check if this class is derived from another class. This is a
			recursive method which
			* does not only check direct child classes.
			*
			* \return true if this class is derived from other, false othe
			rwise.
			*
			* Const version.
			*
			* \since 4.4
			*/
			bool isSubClassOf( const Class& other ) const;
	};		};
	}		}
	}		}
	#ifndef DISABLE_NEPOMUK_LEGACY		#ifndef DISABLE_NEPOMUK_LEGACY
	namespace Nepomuk {		namespace Nepomuk {
	class Ontology;		class Ontology;
	class Property;		class Property;
End of changes. 11 change blocks.
	1 lines changed or deleted		135 lines changed or added

	combobox.h		combobox.h
	skipping to change at line 46		skipping to change at line 46
	*		*
	* @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)		Q_PROPERTY(KComboBox *nativeWidget READ nativeWidget WRITE setNativeWid get)
	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 70		skipping to change at line 70
	* @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();
	/**		/**
			* Sets the combo box wrapped by this ComboBox (widget must inherit KCo
			mboBox), ownership is transferred to the ComboBox
			*
			* @arg combo box that will be wrapped by this ComboBox
			* @since KDE4.4
			*/
			void setNativeWidget(KComboBox *nativeWidget);
			/**
	* @return the native widget wrapped by this ComboBox		* @return the native widget wrapped by this ComboBox
	*/		*/
	KComboBox *nativeWidget() const;		KComboBox *nativeWidget() const;
	/**		/**
	* Adds an item to the combobox 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.
	*/		*/
	void addItem(const QString &text);		void addItem(const QString &text);
	public Q_SLOTS:		public Q_SLOTS:
	void clear();		void clear();
	Q_SIGNALS:		Q_SIGNALS:
	void activated(const QString & text);		/**
	void textChanged(const QString & text);		* This signal is sent when the user chooses an item in the combobox.
			* The item's text is passed.
			*/
			void activated(const QString &text);
			/**
			* This signal is sent whenever the currentIndex in the combobox change
			s
			* either through user interaction or programmatically.
			* The item's text is passed.
			*/
			void textChanged(const QString &text);
	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 focusOutEvent(QFocusEvent *event);
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);		void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
			void changeEvent(QEvent *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 animationUpdate(qreal progress))		Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress))
			Q_PRIVATE_SLOT(d, void animationFinished(int id))
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 7 change blocks.
	4 lines changed or deleted		28 lines changed or added

	componentfactory.h		componentfactory.h
	skipping to change at line 78		skipping to change at line 78
	/*		/*
	* @deprecated use KPluginFactory::create instead		* @deprecated use KPluginFactory::create instead
	*/		*/
	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( libraryName );		KLibrary *library = KLibLoader::self()->library( QString( libra ryName ) ); // compatibility hack
	if ( !library )		if ( !library )
	{		{
	if ( error )		if ( error )
	*error = KLibLoader::ErrNoLibrary;		*error = KLibLoader::ErrNoLibrary;
	return 0;		return 0;
	}		}
	KLibFactory *factory = library->factory();		KLibFactory *factory = library->factory();
	if ( !factory )		if ( !factory )
	{		{
	library->unload();		library->unload();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	configdialog.h		configdialog.h
	/**		/*
	* configdialog.h		* configdialog.h
	*		*
	* Copyright (C) 2004 Zack Rusin <zack@kde.org>		* Copyright (C) 2004 Zack Rusin <zack@kde.org>
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	configinterface.h		configinterface.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef KDELIBS_KTEXTEDITOR_CONFIGINTERFACE_H		#ifndef KDELIBS_KTEXTEDITOR_CONFIGINTERFACE_H
	#define KDELIBS_KTEXTEDITOR_CONFIGINTERFACE_H		#define KDELIBS_KTEXTEDITOR_CONFIGINTERFACE_H
	#include <ktexteditor/ktexteditor_export.h>		#include <ktexteditor/ktexteditor_export.h>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	namespace KTextEditor		namespace KTextEditor
	{		{
	/**		/**
	* \brief Config interface extension for the View.		* \brief Config interface extension for the Document and View.
	*		*
	* \ingroup kte_group_view_extensions		* \ingroup kte_group_view_extensions
			* \ingroup kte_group_doc_extensions
	*		*
	* \section config_intro Introduction		* \section config_intro Introduction
	*		*
	* The ConfigInterface provides methods to access and modify the low level		* The ConfigInterface provides methods to access and modify the low level
	* config information for a given View. Examples of this config data can be		* config information for a given Document or View. Examples of this config data can be
	* displaying the icon bar, showing line numbers, etc. This generally allow s		* displaying the icon bar, showing line numbers, etc. This generally allow s
	* access to settings that otherwise are only accessible during runtime.		* access to settings that otherwise are only accessible during runtime.
	*		*
	* \section config_access Accessing the Interface		* \section config_access Accessing the Interface
	*		*
	* The ConfigInterface is supposed to be an extension interface for a View,		* The ConfigInterface is supposed to be an extension interface for a Docum
	* i.e. the View inherits the interface \e provided that the		ent or View,
			* i.e. the Document or View inherits the interface \e provided that the
	* KTextEditor library in use implements the interface. Use qobject_cast to access		* KTextEditor library in use implements the interface. Use qobject_cast to access
	* the interface:		* the interface:
	* \code		* \code
	* // view is of type KTextEditor::View*		* // ptr is of type KTextEditor::Document* or KTextEditor::View*
	* KTextEditor::ConfigInterface *iface =		* KTextEditor::ConfigInterface *iface =
	* qobject_cast<KTextEditor::ConfigInterface*>( view );		* qobject_cast<KTextEditor::ConfigInterface*>( ptr );
	*		*
	* if( iface ) {		* if( iface ) {
	*		*
	* // the implementation supports the interface		* // the implementation supports the interface
	* // do stuff		* // do stuff
	* }		* }
	* \endcode		* \endcode
	*		*
	* \section config_data Accessing Data		* \section config_data Accessing Data
	*		*
	* 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 KatePart has support for the following		* setConfigValue(). Right now, when using KatePart as editor component,
	* 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
			* - selection-color [QColor], read/set the default color for selections
	*		*
	* As a small example, if you want to enable dynamic word wrap simply call		* KTextEditor::Document has support for the following:
			* - auto-brackets [bool], enable/disable automatic bracket completion
			* - 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-suffix [string], set the suffix 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.
			* TODO: Add to interface in KDE 5.
			*
			* For instance, if you want to enable dynamic word wrap of a KTextEditor::
			View
			* simply call
	* \code		* \code
	* iface->setConfigValue("dynamic-word-wrap", true);		* iface->setConfigValue("dynamic-word-wrap", true);
	* \endcode		* \endcode
	*		*
	* \see KTextEditor::View		* \see KTextEditor::View, KTextEditor::Document
	* \author Matt Broadstone \<mbroadst@gmail.com\>		* \author Matt Broadstone \<mbroadst@gmail.com\>
	*/		*/
	class KTEXTEDITOR_EXPORT ConfigInterface		class KTEXTEDITOR_EXPORT ConfigInterface
	{		{
	public:		public:
	ConfigInterface ();		ConfigInterface ();
	/**		/**
	* Virtual destructor.		* Virtual destructor.
	*/		*/
End of changes. 11 change blocks.
	11 lines changed or deleted		31 lines changed or added

	configwidget.h		configwidget.h
	/**		/*
	*		*
	* Copyright (C) 2004 Zack Rusin <zack@kde.org>		* Copyright (C) 2004 Zack Rusin <zack@kde.org>
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	containment.h		containment.h
	/*		/*
	* Copyright 2007 by Aaron Seigo <aseigo@kde.org>		* Copyright 2007 by Aaron Seigo <aseigo@kde.org>
	* Copyright 2008 by Ménard Alexis <darktears31@gmail.com>		* Copyright 2008 by Ménard Alexis <darktears31@gmail.com>
			* Copyright (c) 2009 Chani Armitage <chani@kde.org>
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU Library General Public License as		* it under the terms of the GNU Library General Public License as
	* published by the Free Software Foundation; either version 2, or		* published by the Free Software Foundation; either version 2, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program 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		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details		* GNU General Public License for more details
	skipping to change at line 35		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 AppletHandle;		class AppletHandle;
	class DataEngine;		class DataEngine;
	class Package;		class Package;
	class Corona;		class Corona;
	class View;		class View;
	class Wallpaper;		class Wallpaper;
			class ContainmentActions;
	class ContainmentPrivate;		class ContainmentPrivate;
			class AbstractToolBox;
	/**		/**
	* @class Containment plasma/containment.h <Plasma/Containment>		* @class Containment plasma/containment.h <Plasma/Containment>
	*		*
	* @short The base class for plugins that provide backgrounds and applet gr ouping containers		* @short The base class for plugins that provide backgrounds and applet gr ouping containers
	*		*
	* Containment objects provide the means to group applets into functional s ets.		* Containment objects provide the means to group applets into functional s ets.
	* They also provide the following:		* They also provide the following:
	*		*
	* creation of focussing event		* creation of focussing event
	skipping to change at line 148		skipping to change at line 157
	/**		/**
	* Returns the Corona (if any) that this Containment is hosted by		* Returns the Corona (if any) that this Containment is hosted by
	*/		*/
	Corona *corona() const;		Corona *corona() const;
	/**		/**
	* Returns a list of all known containments.		* Returns a list of all known containments.
	*		*
	* @param category Only containments matching this category will be returned.		* @param category Only containments matching this category will be returned.
	* Useful in conjunction with knownCategories.		* Useful in conjunction with knownCategories.
	* If "Miscelaneous" is passed in, then applets wit hout a		* If "Miscellaneous" is passed in, then applets wi thout a
	* Categories= entry are also returned.		* Categories= entry are also returned.
	* 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
	**/		**/
	skipping to change at line 170		skipping to change at line 179
	const QString &parentApp = QString());		const QString &parentApp = QString());
	/**		/**
	* Returns a list of all known Containments that match the paramete rs.		* Returns a list of all known Containments that match the paramete rs.
	*		*
	* @param type Only Containments with this string in X-Plasma-Conta inmentCategories		* @param type Only Containments with this string in X-Plasma-Conta inmentCategories
	* in their .desktop files will be returned. Common val ues are panel and		* in their .desktop files will be returned. Common val ues are panel and
	* desktop		* desktop
	* @param category Only applets matchin this category will be retur ned.		* @param category Only applets matchin this category will be retur ned.
	* Useful in conjunction with knownCategories.		* Useful in conjunction with knownCategories.
	* If "Miscelaneous" is passed in, then applets wit hout a		* If "Miscellaneous" is passed in, then applets wi thout a
	* Categories= entry are also returned.		* Categories= entry are also returned.
	* 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
	**/		**/
	skipping to change at line 362		skipping to change at line 371
	/**		/**
	* Shows a visual clue for drag and drop		* Shows a visual clue for drag and drop
	* The default implementation does nothing,		* The default implementation does nothing,
	* reimplement in containments that need it		* reimplement in containments that need it
	*		*
	* @param pos point where to show the drop target; if an invalid po int is passed in		* @param pos point where to show the drop target; if an invalid po int is passed in
	* the drop zone should not be shown		* the drop zone should not be shown
	*/		*/
	virtual void showDropZone(const QPoint pos);		virtual void showDropZone(const QPoint pos);
			/**
			* Sets a containmentactions plugin.
			*
			* @param trigger the mouse button (and optional modifier) to assoc
			iate the plugin with
			* @param pluginName the name of the plugin to attempt to load. bla
			nk = set no plugin.
			* @since 4.4
			*/
			void setContainmentActions(const QString &trigger, const QString &p
			luginName);
			/**
			* @return a list of all triggers that have a containmentactions pl
			ugin associated
			* @since 4.4
			*/
			QStringList containmentActionsTriggers();
			/**
			* @return the plugin name for the given trigger
			* @since 4.4
			*/
			QString containmentActions(const QString &trigger);
	Q_SIGNALS:		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 522		skipping to change at line 552
	QVariant itemChange(GraphicsItemChange change, const QVariant &valu e);		QVariant itemChange(GraphicsItemChange change, const QVariant &valu e);
	/**		/**
	* @reimp		* @reimp
	* @sa QGraphicsItem::dragEnterEvent()		* @sa QGraphicsItem::dragEnterEvent()
	*/		*/
	void dragEnterEvent(QGraphicsSceneDragDropEvent *event);		void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
	/**		/**
	* @reimp		* @reimp
			* @sa QGraphicsItem::dragLeaveEvent()
			*/
			void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
			/**
			* @reimp
	* @sa QGraphicsItem::dragMoveEvent()		* @sa QGraphicsItem::dragMoveEvent()
	*/		*/
	void dragMoveEvent(QGraphicsSceneDragDropEvent *event);		void dragMoveEvent(QGraphicsSceneDragDropEvent *event);
	/**		/**
	* @reimp		* @reimp
	* @sa QGraphicsItem::dropEvent()		* @sa QGraphicsItem::dropEvent()
	*/		*/
	void dropEvent(QGraphicsSceneDragDropEvent *event);		void dropEvent(QGraphicsSceneDragDropEvent *event);
	/**		/**
	* @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
	*/		*/
	const QGraphicsItem *toolBoxItem() const;		KDE_DEPRECATED const QGraphicsItem *toolBoxItem() const;
			/**
			* Sets a custom ToolBox
			* if there was an old one it will be deleted
			* and the new one won't have any actions in it
			*
			* @param item the new toolbox item
			* @since 4.4
			*/
			void setToolBox(AbstractToolBox *toolBox);
			/**
			* @return the ToolBox
			* @since 4.4
			*/
			AbstractToolBox *toolBox() const;
	private:		private:
			/**
			* @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 args a list of strings containing two entries: the servic
			e id
			* and the applet id
			* @since 4.3
			*/
			Containment(const QString &packagePath, uint appletId, const QVaria
			ntList &args);
	Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))		Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))
	Q_PRIVATE_SLOT(d, void containmentAppletAnimationComplete(QGraphics		Q_PRIVATE_SLOT(d, void appletAppearAnimationComplete())
	Item *item,
	Plasma::A
	nimator::Animation anim))
	Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())		Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())
	Q_PRIVATE_SLOT(d, void handleDisappeared(AppletHandle *handle))		Q_PRIVATE_SLOT(d, void handleDisappeared(AppletHandle *handle))
	Q_PRIVATE_SLOT(d, void positionToolBox())		Q_PRIVATE_SLOT(d, void positionToolBox())
	Q_PRIVATE_SLOT(d, void zoomIn())		Q_PRIVATE_SLOT(d, void zoomIn())
	Q_PRIVATE_SLOT(d, void zoomOut())		Q_PRIVATE_SLOT(d, void zoomOut())
	Q_PRIVATE_SLOT(d, void requestConfiguration())		Q_PRIVATE_SLOT(d, void requestConfiguration())
	Q_PRIVATE_SLOT(d, void updateToolBoxVisibility())		Q_PRIVATE_SLOT(d, void updateToolBoxVisibility())
			Q_PRIVATE_SLOT(d, void showDropZoneDelayed())
			Q_PRIVATE_SLOT(d, void remoteAppletReady(Plasma::AccessAppletJob *)
			)
			/**
			* This slot is called when the 'stat' after a job event has finishe
			d.
			*/
			Q_PRIVATE_SLOT(d, void mimeTypeRetrieved(KIO::Job *, const QString
			&))
			Q_PRIVATE_SLOT(d, void dropJobResult(KJob *))
	friend class Applet;		friend class Applet;
	friend class AppletPrivate;		friend class AppletPrivate;
	friend class CoronaPrivate;		friend class CoronaPrivate;
	friend class ContainmentPrivate;		friend class ContainmentPrivate;
			friend class ContainmentActions;
			friend class PopupApplet;
	ContainmentPrivate *const d;		ContainmentPrivate *const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 14 change blocks.
	7 lines changed or deleted		85 lines changed or added

	corona.h		corona.h
	skipping to change at line 27		skipping to change at line 27
	* 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_CORONA_H		#ifndef PLASMA_CORONA_H
	#define PLASMA_CORONA_H		#define PLASMA_CORONA_H
	#include <QtGui/QGraphicsScene>		#include <QtGui/QGraphicsScene>
	#include <plasma/applet.h>		#include <plasma/applet.h>
			#include <plasma/containment.h>
	#include <plasma/plasma.h>		#include <plasma/plasma.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	class QGraphicsGridLayout;		class QGraphicsGridLayout;
	class QAction;		class QAction;
	class KAction;		class KAction;
	namespace Plasma		namespace Plasma
	{		{
	class Containment;
	class CoronaPrivate;		class CoronaPrivate;
			class ContainmentActionsPluginsConfig;
	/**		/**
	* @class Corona plasma/corona.h <Plasma/Corona>		* @class Corona plasma/corona.h <Plasma/Corona>
	*		*
	* @short A QGraphicsScene for Plasma::Applets		* @short A QGraphicsScene for Plasma::Applets
	*/		*/
	class PLASMA_EXPORT Corona : public QGraphicsScene		class PLASMA_EXPORT Corona : public QGraphicsScene
	{		{
	Q_OBJECT		Q_OBJECT
	skipping to change at line 160		skipping to change at line 161
	/**		/**
	* Recommended position for a popup window like a menu or a tooltip		* Recommended position for a popup window like a menu or a tooltip
	* given its size		* given its size
	* @param item the item that the popup should appear adjacent to (an app let, say)		* @param item the item that the popup should appear adjacent to (an app let, say)
	* @param size size of the popup		* @param size size of the popup
	* @returns reccomended position		* @returns reccomended position
	*/		*/
	QPoint popupPosition(const QGraphicsItem *item, const QSize &size);		QPoint popupPosition(const QGraphicsItem *item, const QSize &size);
	/**		/**
			* @since 4.4
			* Recommended position for a popup window like a menu or a tooltip
			* given its size
			* @param item the item that the popup should appear adjacent to (an app
			let, say)
			* @param size size of the popup
			* @param alignment alignment of the popup, valid flags are Qt::AlignLef
			t, Qt::AlignRight and Qt::AlignCenter
			* @returns reccomended position
			*/
			QPoint popupPosition(const QGraphicsItem *item, const QSize &size, Qt::
			AlignmentFlag alignment);
			/**
	* This method is useful in order to retrieve the list of available		* This method is useful in order to retrieve the list of available
	* screen edges for panel type containments.		* screen edges for panel type containments.
	* @param screen the id of the screen to look for free edges.		* @param screen the id of the screen to look for free edges.
	* @returns a list of free edges not filled with panel type containment s.		* @returns a list of free edges not filled with panel type containment s.
	*/		*/
	QList<Plasma::Location> freeEdges(int screen) const;		QList<Plasma::Location> freeEdges(int screen) const;
	/**		/**
	* Returns the QAction with the given name from our collection		* Returns the QAction with the given name from our collection
	*/		*/
	skipping to change at line 215		skipping to change at line 227
	/**		/**
	* @since 4.3		* @since 4.3
	* Creates an action in our collection under the given name		* Creates an action in our collection under the given name
	* @return the new action		* @return the new action
	* FIXME I'm wrapping so much of kactioncollection API now, maybe I sho uld just expose the		* FIXME I'm wrapping so much of kactioncollection API now, maybe I sho uld just expose the
	* collection itself :P		* collection itself :P
	*/		*/
	KAction* addAction(QString name);		KAction* addAction(QString name);
			/**
			* @since 4.4
			* Sets the default containmentactions plugins for the given containmen
			t type
			*/
			void setContainmentActionsDefaults(Containment::Type containmentType, c
			onst ContainmentActionsPluginsConfig &config);
			/**
			* @since 4.4
			* Returns the default containmentactions plugins for the given contain
			ment type
			*/
			ContainmentActionsPluginsConfig containmentActionsDefaults(Containment:
			:Type containmentType);
	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,
	* or the default config file if QString()		* or the default config file if QString()
	*/		*/
	void initializeLayout(const QString &config = QString());		void initializeLayout(const QString &config = QString());
End of changes. 5 change blocks.
	1 lines changed or deleted		32 lines changed or added

	cursorfeedback.h		cursorfeedback.h
	/* This file is part of the KDE project		/* This file is part of the KDE libraries
	Copyright (C) 2003-2005 Hamish Rodda <rodda@kde.org>		Copyright (C) 2009 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
	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.
	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 KDELIBS_KTEXTEDITOR_CURSORFEEDBACK_H		#ifndef KDELIBS_KTEXTEDITOR_CURSORFEEDBACK_H
	#define KDELIBS_KTEXTEDITOR_CURSORFEEDBACK_H		#define KDELIBS_KTEXTEDITOR_CURSORFEEDBACK_H
	#include <ktexteditor/ktexteditor_export.h>		#include "smartcursornotifier.h"
	#include <QtCore/QObject>		#include "smartcursorwatcher.h"
	#include <kdebug.h>
	namespace KTextEditor
	{
	class SmartCursor;
	/**
	* \short A class which provides notifications of state changes to a SmartC
	ursor via virtual inheritance.
	*
	* \ingroup kte_group_smart_classes
	*
	* This class provides notifications of changes to a SmartCursor such as th
	e
	* position in the document, and deletion or insertion of text immediately
	* before or after the cursor.
	*
	* If you prefer to receive notifications via QObject signals, see SmartCur
	sorNotifier.
	*
	* \sa SmartCursor, SmartCursorNotifier
	*
	* \author Hamish Rodda \<rodda@kde.org\>
	*/
	class KTEXTEDITOR_EXPORT SmartCursorWatcher
	{
	public:
	/**
	* Default constructor.
	*/
	SmartCursorWatcher();
	/**
	* Virtual destructor.
	*/
	virtual ~SmartCursorWatcher();
	/**
	* Returns whether this watcher wants to be notified of changes that ha
	ppen
	* directly to the cursor, e.g. by calls to SmartCursor::setPosition(),
	rather
	* than just when surrounding text changes.
	*/
	bool wantsDirectChanges() const;
	/**
	* Set whether this watcher should be notified of changes that happen
	* directly to the cursor, e.g. by calls to SmartCursor::setPosition(),
	rather
	* than just when surrounding text changes.
	*
	* \param wantsDirectChanges whether this watcher should receive notifi
	cations for direct changes.
	*/
	void setWantsDirectChanges(bool wantsDirectChanges);
	/**
	* The cursor's position was changed.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	*/
	virtual void positionChanged(SmartCursor* cursor);
	/**
	* The cursor's surrounding characters were both deleted simultaneously
	.
	* The cursor is automatically placed at the start of the deleted regio
	n.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	*/
	virtual void positionDeleted(SmartCursor* cursor);
	/**
	* The character immediately surrounding the cursor was deleted.
	* If both characters are simultaneously deleted, positionDeleted() is
	called instead.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	* \param deletedBefore \c true if the character immediately before was
	deleted,
	* \c false if the character immediately after was
	deleted.
	*/
	virtual void characterDeleted(SmartCursor* cursor, bool deletedBefore);
	/**
	* A character was inserted immediately before or after the cursor, as
	given
	* by \p insertedBefore.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	* \param insertedBefore \e true if a character was inserted before \p
	cursor,
	* \e false if a character was inserted after
	*/
	virtual void characterInserted(SmartCursor* cursor, bool insertedBefore
	);
	/**
	* The SmartCursor instance specified by \p cursor is being deleted.
	*
	* \param cursor pointer to the cursor which is about to be deleted. I
	t is
	* still safe to access information at this point.
	*/
	virtual void deleted(SmartCursor* cursor);
	private:
	bool m_wantDirectChanges;
	};
	/**
	* \short A class which provides notifications of state changes to a SmartC
	ursor via QObject signals.
	*
	* \ingroup kte_group_smart_classes
	*
	* This class provides notifications of changes to a SmartCursor such as th
	e
	* position in the document, and deletion or insertion of text immediately
	* before or after the cursor.
	*
	* If you prefer to receive notifications via virtual inheritance, see Smar
	tCursorWatcher.
	*
	* \sa SmartCursor, SmartCursorNotifier
	*
	* \author Hamish Rodda \<rodda@kde.org\>
	*/
	class KTEXTEDITOR_EXPORT SmartCursorNotifier : public QObject
	{
	Q_OBJECT
	public:
	/**
	* Default constructor.
	*/
	SmartCursorNotifier();
	/**
	* Returns whether this notifier will notify of changes that happen
	* directly to the cursor, e.g. by calls to SmartCursor::setPosition(),
	rather
	* than just when surrounding text changes.
	*/
	bool wantsDirectChanges() const;
	/**
	* Set whether this notifier should notify of changes that happen
	* directly to the cursor, e.g. by calls to SmartCursor::setPosition(),
	rather
	* than just when surrounding text changes.
	*
	* \param wantsDirectChanges whether this notifier should provide notif
	ications for direct changes.
	*/
	void setWantsDirectChanges(bool wantsDirectChanges);
	Q_SIGNALS:
	/**
	* The cursor's position was changed.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	*/
	void positionChanged(KTextEditor::SmartCursor* cursor);
	/**
	* The cursor's surrounding characters were both deleted simultaneously
	.
	* The cursor is automatically placed at the start of the deleted regio
	n.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	*/
	void positionDeleted(KTextEditor::SmartCursor* cursor);
	/**
	* One character immediately surrounding the cursor was deleted.
	* If both characters are simultaneously deleted, positionDeleted() is
	called instead.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	* \param deletedBefore \c true if the character immediately before was
	deleted,
	* \c false if the character immediately after was
	deleted.
	*/
	void characterDeleted(KTextEditor::SmartCursor* cursor, bool deletedBef
	ore);
	/**
	* A character was inserted immediately before or after the cursor, as
	given
	* by \p insertedBefore.
	*
	* \param cursor pointer to the cursor which generated the notification
	.
	* \param insertedBefore \e true if a character was inserted before \p
	cursor,
	* \e false if a character was inserted after
	*/
	void characterInserted(KTextEditor::SmartCursor* cursor, bool insertedB
	efore);
	/**
	* The SmartCursor instance specified by \p cursor is being deleted.
	*
	* \param cursor pointer to the cursor which is about to be deleted. I
	t is
	* still safe to access information at this point.
	*/
	void deleted(KTextEditor::SmartCursor* cursor);
	private:
	bool m_wantDirectChanges;
	};
	}
	#endif
	// kate: space-indent on; indent-width 2; replace-tabs on;		#endif // KDELIBS_KTEXTEDITOR_CURSORFEEDBACK_H
End of changes. 3 change blocks.
	233 lines changed or deleted		4 lines changed or added

	datacontainer.h		datacontainer.h
	skipping to change at line 134		skipping to change at line 134
	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);
			/**
			* Forces immediate update signals to all visualizations
			* @since 4.4
			*/
			void forceImmediateUpdate();
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the data has been updated, allowing visualizations to		* Emitted when the data has been updated, allowing visualizations to
	* reflect the new data.		* reflect the new data.
	*		*
	* Note that you should not normally emit this directly. Instead, use		* Note that you should not normally emit this directly. Instead, use
	* checkForUpdates() or the DataEngine::scheduleSourcesUpdated() sl ot.		* checkForUpdate() or the DataEngine::scheduleSourcesUpdated() slo t.
	*		*
	* @param source the objectName() of the DataContainer (and hence t he name		* @param source the objectName() of the DataContainer (and hence t he name
	* of the source) that updated its data		* of the source) that updated its data
	* @param data the updated data		* @param data the updated data
	**/		**/
	void dataUpdated(const QString &source, const Plasma::DataEngine::D ata &data);		void dataUpdated(const QString &source, const Plasma::DataEngine::D ata &data);
	/**		/**
	* Emitted when the last visualization is disconnected.		* Emitted when the last visualization is disconnected.
	*		*
End of changes. 2 change blocks.
	1 lines changed or deleted		7 lines changed or added

	dataengine.h		dataengine.h
	skipping to change at line 32		skipping to change at line 32
	#include <QtCore/QHash>		#include <QtCore/QHash>
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <kgenericfactory.h>		#include <kgenericfactory.h>
	#include <kservice.h>		#include <kservice.h>
	#include <plasma/version.h>		#include <plasma/version.h>
	#include <plasma/plasma.h>		#include <plasma/plasma.h>
			#include <plasma/service.h>
	namespace Plasma		namespace Plasma
	{		{
	class DataContainer;		class DataContainer;
	class DataEngineScript;		class DataEngineScript;
	class Package;		class Package;
	class Service;		class Service;
	class DataEnginePrivate;		class DataEnginePrivate;
	skipping to change at line 163		skipping to change at line 164
	* 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.
	* If the data has not changed, no update wi ll be sent.		* If the data has not changed, no update wi ll be sent.
	* @param intervalAlignment the number of ms to align the interval to		* @param intervalAlignment the number of ms to align the interval to
	**/		**/
	Q_INVOKABLE void connectAllSources(QObject *visualization, uint pol lingInterval = 0,		Q_INVOKABLE void connectAllSources(QObject *visualization, uint pol lingInterval = 0,
	Plasma::IntervalAlignment interv		Plasma::IntervalAlignment interv
	alAlignment = NoAlignment) const;		alAlignment =
			NoAlignment) const;
	/**		/**
	* Disconnects a source to an object that was receiving data update s.		* Disconnects a source to an object that was receiving data update s.
	*		*
	* @param source the name of the data source		* @param source the name of the data source
	* @param visualization the object to connect the data source to		* @param visualization the object to connect the data source to
	**/		**/
	Q_INVOKABLE void disconnectSource(const QString &source, QObject *v isualization) const;		Q_INVOKABLE void disconnectSource(const QString &source, QObject *v isualization) const;
	/**		/**
	skipping to change at line 445		skipping to change at line 447
	* Removes a data source.		* Removes a data source.
	* @param source the name of the data source to remove		* @param source the name of the data source to remove
	**/		**/
	void removeSource(const QString &source);		void removeSource(const QString &source);
	/**		/**
	* Immediately updates all existing sources when called		* Immediately updates all existing sources when called
	*/		*/
	void updateAllSources();		void updateAllSources();
			/**
			* Forces an immediate update to all connected sources, even those
			with
			* timeouts that haven't yet expired. This should _only_ be used wh
			en
			* there was no data available, e.g. due to network non-availabilit
			y,
			* and then it becomes available. Normal changes in data values due
			to
			* calls to updateSource or in the natural progression of the monit
			ored
			* object (e.g. CPU heat) should not result in a call to this metho
			d!
			*
			* @since 4.4
			*/
			void forceImmediateUpdateOfAllVisualizations();
	private:		private:
	friend class DataEnginePrivate;		friend class DataEnginePrivate;
	friend class DataEngineScript;		friend class DataEngineScript;
	friend class DataEngineManager;		friend class DataEngineManager;
			friend class PlasmoidServiceJob;
	friend class NullEngine;		friend class NullEngine;
	Q_PRIVATE_SLOT(d, void internalUpdateSource(DataContainer *source))		Q_PRIVATE_SLOT(d, void internalUpdateSource(DataContainer *source))
	DataEnginePrivate *const d;		DataEnginePrivate *const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
	/**		/**
End of changes. 4 change blocks.
	2 lines changed or deleted		23 lines changed or added

	dataenginescript.h		dataenginescript.h
	skipping to change at line 24		skipping to change at line 24
	* You should have received a copy of the GNU Library General Public		* You should have received a copy of the GNU Library General Public
	* License along with this program; if not, write to the		* License along with this program; if not, write to the
	* Free Software Foundation, Inc.,		* Free Software Foundation, Inc.,
	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef PLASMA_DATAENGINESCRIPT_H		#ifndef PLASMA_DATAENGINESCRIPT_H
	#define PLASMA_DATAENGINESCRIPT_H		#define PLASMA_DATAENGINESCRIPT_H
	#include <kgenericfactory.h>		#include <kgenericfactory.h>
			#include <kplugininfo.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			#include <plasma/dataengine.h>
	#include <plasma/scripting/scriptengine.h>		#include <plasma/scripting/scriptengine.h>
	namespace Plasma		namespace Plasma
	{		{
	class DataEngine;
	class DataEngineScriptPrivate;		class DataEngineScriptPrivate;
	class Service;		class Service;
	/**		/**
	* @class DataEngineScript plasma/scripting/dataenginescript.h <Plasma/Scri pting/DataEngineScript>		* @class DataEngineScript plasma/scripting/dataenginescript.h <Plasma/Scri pting/DataEngineScript>
	*		*
	* @short Provides a restricted interface for scripting a DataEngine		* @short Provides a restricted interface for scripting a DataEngine
	*/		*/
	class PLASMA_EXPORT DataEngineScript : public ScriptEngine		class PLASMA_EXPORT DataEngineScript : public ScriptEngine
	{		{
	skipping to change at line 113		skipping to change at line 114
	*/		*/
	QString mainScript() const;		QString mainScript() const;
	/**		/**
	* @return the Package associated with this plasmoid which can		* @return the Package associated with this plasmoid which can
	* be used to request resources, such as images and		* be used to request resources, such as images and
	* interface files.		* interface files.
	*/		*/
	const Package *package() const;		const Package *package() const;
			/**
			* @return the KPluginInfo associated with this plasmoid
			*/
			KPluginInfo description() const;
	void setData(const QString &source, const QString &key,		void setData(const QString &source, const QString &key,
	const QVariant &value);		const QVariant &value);
	void setData(const QString &source, const QVariant &value);		void setData(const QString &source, const QVariant &value);
	void removeAllData(const QString &source);		void removeAllData(const QString &source);
	void removeData(const QString &source, const QString &key);		void removeData(const QString &source, const QString &key);
	void setMaxSourceCount(uint limit);		void setMaxSourceCount(uint limit);
	void setMinimumPollingInterval(int minimumMs);		void setMinimumPollingInterval(int minimumMs);
	int minimumPollingInterval() const;		int minimumPollingInterval() const;
	void setPollingInterval(uint frequency);		void setPollingInterval(uint frequency);
	void removeAllSources();		void removeAllSources();
			void addSource(DataContainer *source);
			DataEngine::SourceDict containerDict() const;
			void setName(const QString &name);
			void setIcon(const QString &icon);
			void scheduleSourcesUpdated();
			void removeSource(const QString &source);
			void updateAllSources();
			void forceImmediateUpdateOfAllVisualizations();
	private:		private:
	DataEngineScriptPrivate *const d;		DataEngineScriptPrivate *const d;
	};		};
	#define K_EXPORT_PLASMA_DATAENGINESCRIPTENGINE(libname, classname) \		#define K_EXPORT_PLASMA_DATAENGINESCRIPTENGINE(libname, classname) \
	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \		K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
	K_EXPORT_PLUGIN(factory("plasma_dataenginescriptengine_" #libname))		K_EXPORT_PLUGIN(factory("plasma_dataenginescriptengine_" #libname))
	} //Plasma namespace		} //Plasma namespace
End of changes. 5 change blocks.
	1 lines changed or deleted		15 lines changed or added

	davjob.h		davjob.h
	skipping to change at line 109		skipping to change at line 109
	*		*
	* @param url the URL of the resource		* @param url the URL of the resource
	* @param nsURI the URI of the search method's qualified name		* @param nsURI the URI of the search method's qualified name
	* @param qName the local part of the search method's qualified name		* @param qName the local part of the search method's qualified name
	* @param query the search string		* @param query the search string
	* @param flags: We support HideProgressInfo here		* @param flags: We support HideProgressInfo here
	* @return the new DavJob		* @return the new DavJob
	*/		*/
	KIO_EXPORT DavJob* davSearch( const KUrl &url, const QString& nsURI, con st QString& qName, const QString& query, JobFlags flags = DefaultFlags );		KIO_EXPORT DavJob* davSearch( const KUrl &url, const QString& nsURI, con st QString& qName, const QString& query, JobFlags flags = DefaultFlags );
			/**
			* Creates a new DavJob that issues a REPORT command.
			*
			* @param url the URL of the resource
			* @param report a REPORT document that describes the request to make
			* @param depth the depth of the request. Can be "0", "1" or "infinity"
			* @param flags: We support HideProgressInfo here
			* @return the new DavJob
			* @since 4.4
			*/
			KIO_EXPORT DavJob* davReport( const KUrl& url, const QString& report, co
			nst QString &depth, JobFlags flags = DefaultFlags );
	}		}
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		13 lines changed or added

	delegate.h		delegate.h
	skipping to change at line 44		skipping to change at line 44
	/**		/**
	* @class Delegate plasma/delegate.h <Plasma/Delegate>		* @class Delegate plasma/delegate.h <Plasma/Delegate>
	*		*
	* Item delegate for rendering items in Plasma menus implemented with item views.		* Item delegate for rendering items in Plasma menus implemented with item views.
	*		*
	* The delegate makes use of its own data roles that are:		* The delegate makes use of its own data roles that are:
	* SubTitleRole: the text of the subtitle		* SubTitleRole: the text of the subtitle
	* SubTitleMandatoryRole: if the subtitle is to always be displayed		* SubTitleMandatoryRole: if the subtitle is to always be displayed
	* (as default the subtitle is displayed only on mouse over)		* (as default the subtitle is displayed only on mouse over)
			* NOTE: if model doesn't return a valid data for SubTitleMandatoryRole (i.
			e. if it returns QVaraint())
			* then subtitles will be shown for adjasent items with the same cont
			ent and not shown
			* otherwise.
			*
	* ColumnTypeRole: if the column is a main column (with title and subtitle)		* ColumnTypeRole: if the column is a main column (with title and subtitle)
	* or a secondary action column (only a little icon that appears on mouse		* or a secondary action column (only a little icon that appears on mouse
	* over is displayed)		* over is displayed)
	*/		*/
	class PLASMA_EXPORT Delegate : public QAbstractItemDelegate		class PLASMA_EXPORT Delegate : public QAbstractItemDelegate
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	enum SpecificRoles {		enum SpecificRoles {
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	device.h		device.h
	skipping to change at line 182		skipping to change at line 182
	/**		/**
	* Retrieves the name of the icon representing this device.		* Retrieves the name of the icon representing this device.
	* The naming follows the freedesktop.org specification.		* The naming follows the freedesktop.org specification.
	*		*
	* @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.
			* The naming follows the freedesktop.org specification.
			*
			* @return the emblem names
			*/
			QStringList emblems() const;
			/**
			* Retrieves the description of device.
			*
			* @return the description
			* @since 4.4
			*/
			QString description() const;
			/**
	* Tests if a device interface is available from the device.		* Tests if a device interface is available from the device.
	*		*
	* @param type the device interface type to query		* @param type the device interface type to query
	* @return true if the device interface is available, false otherwi se		* @return true if the device interface is available, false otherwi se
	*/		*/
	bool isDeviceInterface(const DeviceInterface::Type &type) const;		bool isDeviceInterface(const DeviceInterface::Type &type) const;
	/**		/**
	* Retrieves a specialized interface to interact with the device co rresponding to		* Retrieves a specialized interface to interact with the device co rresponding to
	* a particular device interface.		* a particular device interface.
End of changes. 1 change blocks.
	0 lines changed or deleted		17 lines changed or added

	deviceinterface.h		deviceinterface.h
	skipping to change at line 88		skipping to change at line 88
	/**		/**
	* 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.
	*		*
	* @return true if this device interface's device is available, fal se otherwise		* @return true if this device interface's device is available, fal se otherwise
	*/		*/
	bool isValid() const;		bool isValid() const;
	/**		/**
	*		*
	* @return the name of the device interface type		* @return the class name of the device interface type
	*/		*/
	static QString typeToString(Type type);		static QString typeToString(Type type);
	/**		/**
	*		*
	* @return the device interface type for the given name		* @return the device interface type for the given class name
	*/		*/
	static Type stringToType(const QString &type);		static Type stringToType(const QString &type);
			/**
			*
			* @return a description suitable to display in the UI of the devic
			e interface type
			* @since 4.4
			*/
			static QString typeDescription(Type type);
	protected:		protected:
	/**		/**
	* @internal		* @internal
	* Creates a new DeviceInterface object.		* Creates a new DeviceInterface object.
	*		*
	* @param dd the private d member. It will take care of deleting it upon destruction.		* @param dd the private d member. It will take care of deleting it upon destruction.
	* @param backendObject the device interface object provided by the backend		* @param backendObject the device interface object provided by the backend
	*/		*/
	DeviceInterface(DeviceInterfacePrivate &dd, QObject *backendObject) ;		DeviceInterface(DeviceInterfacePrivate &dd, QObject *backendObject) ;
End of changes. 3 change blocks.
	2 lines changed or deleted		10 lines changed or added

	dom2_events.h		dom2_events.h
	skipping to change at line 252		skipping to change at line 252
	*/		*/
	void initEvent(const DOMString &eventTypeArg, bool canBubbleArg, bool c ancelableArg);		void initEvent(const DOMString &eventTypeArg, bool canBubbleArg, bool c ancelableArg);
	/**		/**
	* @internal		* @internal
	* not part of the DOM		* not part of the DOM
	*/		*/
	EventImpl *handle() const;		EventImpl *handle() const;
	bool isNull() const;		bool isNull() const;
	protected:
	Event(EventImpl *i);		Event(EventImpl *i);
			protected:
	EventImpl *impl;		EventImpl *impl;
	};		};
	/**		/**
	* Introduced in DOM Level 2:		* Introduced in DOM Level 2:
	*		*
	* Event operations may throw an EventException as specified in their metho d		* Event operations may throw an EventException as specified in their metho d
	* descriptions.		* descriptions.
	*		*
	*/		*/
End of changes. 2 change blocks.
	1 lines changed or deleted		1 lines changed or added

	dom_node.h		dom_node.h
	skipping to change at line 916		skipping to change at line 916
	/**		/**
	* tests if this Node is 0. Useful especially, if casting to a derived		* tests if this Node is 0. Useful especially, if casting to a derived
	* class:		* class:
	*		*
	* \code		* \code
	* Node n = .....;		* Node n = .....;
	* // try to convert into an Element:		* // try to convert into an Element:
	* Element e = n;		* Element e = n;
	* if( e.isNull() )		* if( e.isNull() )
	* kDebug(300) << "node isn't an element node";		* kDebug() << "node isn't an element node";
	* \endcode		* \endcode
	*/		*/
	bool isNull() const { return !impl; }		bool isNull() const { return !impl; }
	/**		/**
	* @internal handle to the implementation object		* @internal handle to the implementation object
	*/		*/
	NodeImpl *handle() const { return impl; }		NodeImpl *handle() const { return impl; }
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	engine.h		engine.h
	/*		/*
	This file is part of KNewStuff2.		This file is part of KNewStuff2.
	Copyright (c) 2008 Jeremy Whiting <jeremy@scitools.com>		Copyright (c) 2008 Jeremy Whiting <jpwhiting@kde.org>
	Copyright (c) 2007 Josef Spillner <spillner@kde.org>		Copyright (c) 2007 Josef Spillner <spillner@kde.org>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Lesser General Public		modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either		License as published by the Free Software Foundation; either
	version 2.1 of the License, or (at your option) any later version.		version 2.1 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,		This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of		but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Lesser General Public License for more details.		Lesser General Public License for more details.
	You should have received a copy of the GNU Lesser General Public		You should have received a copy of the GNU Lesser General Public
	License along with this library. If not, see <http://www.gnu.org/licen ses/>.		License along with this library. If not, see <http://www.gnu.org/licen ses/>.
	*/		*/
	#ifndef KNEWSTUFF2_ENGINE_H		#ifndef KNEWSTUFF2_ENGINE_H
	#define KNEWSTUFF2_ENGINE_H		#define KNEWSTUFF2_ENGINE_H
	#include <knewstuff2/core/entry.h>		#include <knewstuff2/core/entry.h>
			#include <kdemacros.h>
	namespace KNS		namespace KNS
	{		{
	class EnginePrivate;		class EnginePrivate;
	/**		/**
	* @brief The KNewStuff2 engine is the top-level class to handle GHNS and D XS workflows.		* @brief The KNewStuff2 engine is the top-level class to handle GHNS and D XS workflows.
	*		*
	* An engine implements GHNS workflows, which consist of discrete steps		* An engine implements GHNS workflows, which consist of discrete steps
	* performed by the inherited engine. Depending on the provider, traditiona l		* performed by the inherited engine. Depending on the provider, traditiona l
	* GHNS or DXS are used transparently.		* GHNS or DXS are used transparently.
	* This class is the one which applications should use.		* This class is the one which applications should use.
	* In most cases, either \ref upload() or \ref download() will be called by the		* In most cases, either \ref upload() or \ref download() will be called by the
	* application to upload or download data.		* application to upload or download data.
			*
			* Deprecated, use knewstuff3!
	*/		*/
	class KNEWSTUFF_EXPORT Engine		class KNEWSTUFF_EXPORT_DEPRECATED Engine
	{		{
	public:		public:
	/**		/**
	* @brief Engine constructor.		* @brief Engine constructor.
	*		*
	* As many engines as needed can be instantiated, although one should u se		* As many engines as needed can be instantiated, although one should u se
	* the static methods \ref download() and \ref upload() instead.		* the static methods \ref download() and \ref upload() instead.
	*/		*/
	explicit Engine(QWidget* parent = 0);		explicit Engine(QWidget* parent = 0);
	skipping to change at line 100		skipping to change at line 103
	/**		/**
	* @brief Synchronous way of starting the upload workflow.		* @brief Synchronous way of starting the upload workflow.
	*		*
	* Starts the upload workflow. This workflow will offer provider		* Starts the upload workflow. This workflow will offer provider
	* selection and afterwards upload all files associated with an entry.		* selection and afterwards upload all files associated with an entry.
	* This method is a modal one. It will return the uploaded entry.		* This method is a modal one. It will return the uploaded entry.
	*		*
	* @return Uploaded entry, or \b null in case of failures		* @return Uploaded entry, or \b null in case of failures
	*/		*/
	KNS::Entry *uploadDialogModal(const QString& file);		KNS::Entry * uploadDialogModal(const QString& file);
	/**		/**
	* @brief Recommended upload workflow entry point.		* @brief Recommended upload workflow entry point.
	*		*
	* This method is a static convenience wrapper around \ref uploadDialog Modal()		* This method is a static convenience wrapper around \ref uploadDialog Modal()
	* which does not require the manual construction of an engine object.		* which does not require the manual construction of an engine object.
	* The engine will be configured to load appname.knsrc.		* The engine will be configured to load appname.knsrc.
	* The resulting entry must not be freed, as the engine will continue		* The resulting entry must not be freed, as the engine will continue
	* to keep track of it.		* to keep track of it.
	*		*
	* @return Uploaded entry, or \b null in case of failures		* @return Uploaded entry, or \b null in case of failures
	*		*
	* @see uploadDialogModal()		* @see uploadDialogModal()
	*/		*/
	static KNS::Entry *upload(const QString& file);		static KNS::Entry * upload(const QString& file);
	/**		/**
	* @brief Asynchronous way of starting the download workflow.		* @brief Asynchronous way of starting the download workflow.
	*		*
	* This method should be used whenever a blocking application with a		* This method should be used whenever a blocking application with a
	* non-blocking GUI during GHNS operations is not suitable.		* non-blocking GUI during GHNS operations is not suitable.
	*		*
	* @see downloadDialogModal()		* @see downloadDialogModal()
	*/		*/
	void downloadDialog();		void downloadDialog();
End of changes. 6 change blocks.
	4 lines changed or deleted		7 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 Sebastian Trueg <trueg@kde.org>		Copyright (c) 2007-2009 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 42		skipping to change at line 42
	#include "nepomuk_export.h"		#include "nepomuk_export.h"
	class QIcon;		class QIcon;
	namespace Nepomuk {		namespace Nepomuk {
	namespace Types {		namespace Types {
	class EntityPrivate;		class EntityPrivate;
	/**		/**
			* \brief Abstract base class for Class and Property;
			*
	* Base class for static ontology entities Class and Property.		* Base class for static ontology entities Class and Property.
	* It encapsulates the generic labels and comments that both		* It encapsulates the generic labels and comments that both
	* types have.		* types have.
	*		*
	* Due to internal optimizations comparing two Entities is much		* Due to internal optimizations comparing two Entities is much
	* faster than comparing two QUrl objects.		* faster than comparing two QUrl objects.
	*		*
	* \author Sebastian Trueg <trueg@kde.org>		* \author Sebastian Trueg <trueg@kde.org>
	*/		*/
	class NEPOMUK_EXPORT Entity		class NEPOMUK_EXPORT Entity
	skipping to change at line 94		skipping to change at line 96
	* language configured in KDE. As of KDE 4.3 on ly the currently		* language configured in KDE. As of KDE 4.3 on ly the currently
	* configured language is loaded to save memory .		* configured language is loaded to save memory .
	*		*
	* \return The label translated into \p language or the default fallback label		* \return The label translated into \p language or the default fallback label
	* if no translation is available or the name() if no label cou ld be found		* if no translation is available or the name() if no label cou ld be found
	* at all.		* at all.
	*/		*/
	QString label( const QString& language = KGlobal::locale()->lan guage() );		QString label( const QString& language = KGlobal::locale()->lan guage() );
	/**		/**
			* Retrieve the label of the entity (rdfs:label)
			*
			* \param language The code of the language to use. Defaults to
			the session
			* language configured in KDE. As of KDE 4.3 on
			ly the currently
			* configured language is loaded to save memory
			.
			*
			* \return The label translated into \p language or the default
			fallback label
			* if no translation is available or the name() if no label cou
			ld be found
			* at all.
			*
			* Const version
			*
			* \since 4.4
			*/
			QString label( const QString& language = KGlobal::locale()->lan
			guage() ) const;
			/**
	* Retrieve the comment of the entity (rdfs:comment)		* Retrieve the comment of the entity (rdfs:comment)
	*		*
	* \param language The code of the language to use. Defaults to the session		* \param language The code of the language to use. Defaults to the session
	* language configured in KDE. As of KDE 4.3 on ly the currently		* language configured in KDE. As of KDE 4.3 on ly the currently
	* configured language is loaded to save memory .		* configured language is loaded to save memory .
	*		*
	* \return The comment translated into \p language or the defau lt fallback comment		* \return The comment translated into \p language or the defau lt fallback comment
	* if no translation is available or an empty string if no comm ent could be found		* if no translation is available or an empty string if no comm ent could be found
	* at all.		* at all.
	*/		*/
	QString comment( const QString& language = KGlobal::locale()->l anguage() );		QString comment( const QString& language = KGlobal::locale()->l anguage() );
	/**		/**
			* Retrieve the comment of the entity (rdfs:comment)
			*
			* \param language The code of the language to use. Defaults to
			the session
			* language configured in KDE. As of KDE 4.3 on
			ly the currently
			* configured language is loaded to save memory
			.
			*
			* \return The comment translated into \p language or the defau
			lt fallback comment
			* if no translation is available or an empty string if no comm
			ent could be found
			* at all.
			*
			* Const version
			*
			* \since 4.4
			*/
			QString comment( const QString& language = KGlobal::locale()->l
			anguage() ) const;
			/**
	* Retrieve the icon stored for the entity (nao:hasSymbol)		* Retrieve the icon stored for the entity (nao:hasSymbol)
	*		*
	* If no symbol is defined for the entity a null icon will be r eturned.		* If no symbol is defined for the entity a null icon will be r eturned.
	*		*
	* \since 4.1		* \since 4.1
	*/		*/
	QIcon icon();		QIcon icon();
	/**		/**
			* Retrieve the icon stored for the entity (nao:hasSymbol)
			*
			* If no symbol is defined for the entity a null icon will be r
			eturned.
			*
			* Const version.
			*
			* \since 4.4
			*/
			QIcon icon() const;
			/**
	* Is this a valid Entity, i.e. has it a valid URI.		* Is this a valid Entity, i.e. has it a valid URI.
	* A valid Entity does not necessarily have a label and a comme nt, it		* A valid Entity does not necessarily have a label and a comme nt, it
	* does not even have to exist in the Nepomuk store.		* does not even have to exist in the Nepomuk store.
	*		*
	* \sa isAvailable		* \sa isAvailable
	*/		*/
	bool isValid() const;		bool isValid() const;
	/**		/**
	* Is this Entity available locally, i.e. could its properties		* Is this Entity available locally, i.e. could its properties
	* be loaded from the Nepomuk store.		* be loaded from the Nepomuk store.
	*/		*/
	bool isAvailable();		bool isAvailable();
	/**		/**
			* Is this Entity available locally, i.e. could its properties
			* be loaded from the Nepomuk store.
			*
			* Const version.
			*
			* \since 4.4
			*/
			bool isAvailable() const;
			/**
	* The Types classes are optimized for performance under the		* The Types classes are optimized for performance under the
	* aasumption that ontologies never change during the execution		* aasumption that ontologies never change during the execution
	* time of an application.		* time of an application.
	*		*
	* Since there might be situations where this does not apply		* Since there might be situations where this does not apply
	* 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.
	*		*
	skipping to change at line 171		skipping to change at line 228
	/**		/**
	* Create an invalid Entity instance.		* Create an invalid Entity instance.
	*/		*/
	Entity();		Entity();
	QExplicitlySharedDataPointer<EntityPrivate> d;		QExplicitlySharedDataPointer<EntityPrivate> d;
	};		};
	inline uint qHash( const Entity& c )		inline uint qHash( const Entity& c )
	{		{
	return qHash( c.uri().toString() );		return qHash( c.uri() );
	}		}
	}		}
	}		}
	#ifndef DISABLE_NEPOMUK_LEGACY		#ifndef DISABLE_NEPOMUK_LEGACY
	namespace Nepomuk {		namespace Nepomuk {
	class Ontology;		class Ontology;
End of changes. 7 change blocks.
	2 lines changed or deleted		72 lines changed or added

	extender.h		extender.h
	skipping to change at line 69		skipping to change at line 69
	*		*
	* As soon as an Extender is instantiated, ExtenderItems contained previous ly in this Extender are		* As soon as an Extender is instantiated, ExtenderItems contained previous ly in this Extender are
	* restored using the initExtenderItem function from the applet the items o riginally came from. For		* restored using the initExtenderItem function from the applet the items o riginally came from. For
	* more information on how this works and how to use ExtenderItems in gener al, see the ExtenderItem		* more information on how this works and how to use ExtenderItems in gener al, see the ExtenderItem
	* API documentation.		* API documentation.
	*/		*/
	class PLASMA_EXPORT Extender : public QGraphicsWidget		class PLASMA_EXPORT Extender : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QString emptyExtenderMessage READ emptyExtenderMessage WRITE setEmptyExtenderMessage)		Q_PROPERTY(QString emptyExtenderMessage READ emptyExtenderMessage WRITE setEmptyExtenderMessage)
			Q_PROPERTY(QList<ExtenderItem*> items READ items())
			Q_PROPERTY(QList<ExtenderItem*> attachedItems READ attachedItems())
			Q_PROPERTY(QList<ExtenderItem*> detachedItems READ detachedItems())
			Q_PROPERTY(QList<ExtenderGroup*> groups READ groups())
			Q_PROPERTY(bool empty READ isEmpty())
	public:		public:
	/**		/**
	* Description on how to render the extender's items.		* Description on how to render the extender's items.
	*/		*/
	enum Appearance {		enum Appearance {
	NoBorders = 0, /**< Draws no borders on the extender's items. When placed in an applet		NoBorders = 0, /**< Draws no borders on the extender's items. When placed in an applet
	on the desktop, use this setting and use t he standard margins of		on the desktop, use this setting and use t he standard margins of
	the applet containing this extender. */		the applet containing this extender. */
	BottomUpStacked = 1, /**< Draws no borders on the topmost exten deritem, but draws the		BottomUpStacked = 1, /**< Draws no borders on the topmost exten deritem, but draws the
	skipping to change at line 139		skipping to change at line 144
	*/		*/
	QList<ExtenderItem*> detachedItems() const;		QList<ExtenderItem*> detachedItems() const;
	/**		/**
	* This function can be used for obtaining the extender item specif ied by name. For checking		* This function can be used for obtaining the extender item specif ied by name. For checking
	* whether or not an item already exists, you should use hasItem in stead: while plasma is		* whether or not an item already exists, you should use hasItem in stead: while plasma is
	* starting up, not all detached items might have been instantiated yet. hasItem returns true		* starting up, not all detached items might have been instantiated yet. hasItem returns true
	* even if the requested item isn't instantiated yet.		* even if the requested item isn't instantiated yet.
	* @returns the requested item		* @returns the requested item
	*/		*/
	ExtenderItem *item(const QString &name) const;		Q_INVOKABLE ExtenderItem *item(const QString &name) const;
	/**		/**
	* Extra convenience function for obtaining groups specified by nam e. This will avoid needed		* Extra convenience function for obtaining groups specified by nam e. This will avoid needed
	* to call item and casting to ExtenderGroup, which is otherwise qu ite common.		* to call item and casting to ExtenderGroup, which is otherwise qu ite common.
	* @returns the requested group		* @returns the requested group
	* @since 4.3		* @since 4.3
	*/		*/
	ExtenderGroup *group(const QString &name) const;		Q_INVOKABLE ExtenderGroup *group(const QString &name) const;
	/**		/**
	* This function can be used for easily determining if a certain it em is already displayed		* This function can be used for easily determining if a certain it em is already displayed
	* in an extender item somewhere, so your applet doesn't duplicate this item. This is needed		* in an extender item somewhere, so your applet doesn't duplicate this item. This is needed
	* because ExtenderItems are persistent, so you can't blindly add n ew extender items in all		* because ExtenderItems are persistent, so you can't blindly add n ew extender items in all
	* cases.		* cases.
	* @returns whether or not this item already exists.		* @returns whether or not this item already exists.
	* @since 4.3		* @since 4.3
	*/		*/
	bool hasItem(const QString &name) const;		Q_INVOKABLE bool hasItem(const QString &name) const;
	/**		/**
	* @return true if the Extender is visually empty (though it may ha ve items such as		* @return true if the Extender is visually empty (though it may ha ve items such as
	* empty groups or detached items associatd with it)		* empty groups or detached items associatd with it)
	*/		*/
	bool isEmpty() const;		bool isEmpty() const;
	/**		/**
	* Use this function to instruct the extender on how to render its items. Usually you will		* Use this function to instruct the extender on how to render its items. Usually you will
	* want to call this function in your applet's constraintsEvent, al lthough this is already		* want to call this function in your applet's constraintsEvent, al lthough this is already
	skipping to change at line 184		skipping to change at line 189
	* @returns the current way of rendering extender items that is use d.		* @returns the current way of rendering extender items that is use d.
	*/		*/
	Appearance appearance() const;		Appearance appearance() const;
	/**		/**
	* @returns a list of groups that are contained in this extender.		* @returns a list of groups that are contained in this extender.
	* @since 4.3		* @since 4.3
	*/		*/
	QList<ExtenderGroup*> groups() const;		QList<ExtenderGroup*> groups() const;
			/**
			* @returns the Applet this Extender is associated with
			* @since 4.4
			*/
			Applet *applet() const;
	protected:		protected:
	/**		/**
	* Get's called after an item has been added to this extender. The bookkeeping has already		* Get's called after an item has been added to this extender. The bookkeeping has already
	* been done when this function get's called. The only thing left t o do is put it somewhere		* been done when this function get's called. The only thing left t o do is put it somewhere
	* appropriate. The default implementation adds the extenderItem to the appropriate place in		* appropriate. The default implementation adds the extenderItem to the appropriate place in
	* a QGraphicsLinearLayout.		* a QGraphicsLinearLayout.
	* @param item The item that has just been added.		* @param item The item that has just been added.
	* @param pos The location the item has been dropped in local coord inates.		* @param pos The location the item has been dropped in local coord inates.
	*/		*/
	virtual void itemAddedEvent(ExtenderItem *item, const QPointF &pos = QPointF(-1, -1));		virtual void itemAddedEvent(ExtenderItem *item, const QPointF &pos = QPointF(-1, -1));
	skipping to change at line 295		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(QObject *object))
	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. 6 change blocks.
	3 lines changed or deleted		16 lines changed or added

	extendergroup.h		extendergroup.h
	skipping to change at line 54		skipping to change at line 54
	* This ExtenderGroup is just the same as any other ExtenderItem, except fo r the expand group and		* This ExtenderGroup is just the same as any other ExtenderItem, except fo r the expand group and
	* collapse group buttons it provides, and the fact that it will automatica lly hide itself if less		* collapse group buttons it provides, and the fact that it will automatica lly hide itself if less
	* then one item belong to this group and autoHide is set to true.		* then one item belong to this group and autoHide is set to true.
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	class PLASMA_EXPORT ExtenderGroup : public ExtenderItem		class PLASMA_EXPORT ExtenderGroup : public ExtenderItem
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(bool autoHide READ autoHide WRITE setAutoHide)		Q_PROPERTY(bool autoHide READ autoHide WRITE setAutoHide)
			Q_PROPERTY(bool groupCollapsed READ isGroupCollapsed WRITE setGroupColl
			apsed)
			Q_PROPERTY(bool autoCollapse READ isAutoCollapse WRITE setAutoCollapse)
	public:		public:
	/**		/**
	* Creates a group.		* Creates a group.
	* @param applet The applet this group is part of. Null is not allo wed here.		* @param applet The applet this group is part of. Null is not allo wed here.
	*/		*/
	explicit ExtenderGroup(Extender *parent, uint groupId = 0);		explicit ExtenderGroup(Extender *parent, uint groupId = 0);
	~ExtenderGroup();		~ExtenderGroup();
	skipping to change at line 75		skipping to change at line 77
	* @return a list of items that belong to this group.		* @return a list of items that belong to this group.
	*/		*/
	QList<ExtenderItem*> items() const;		QList<ExtenderItem*> items() const;
	/**		/**
	* @return whether or not this item hides itself if there are less then 2 items in.		* @return whether or not this item hides itself if there are less then 2 items in.
	*/		*/
	bool autoHide() const;		bool autoHide() const;
	/**		/**
	* @param autoHide whether or not this item hides itself if less th en 2 items belong to this group.		* @param autoHide whether or not this item hides itself if less th en 2 items belong to this group. The default value is true.
	*/		*/
	void setAutoHide(bool autoHide);		void setAutoHide(bool autoHide);
			/**
			* @return if the group is collapsed
			* @since 4.4
			*/
			bool isGroupCollapsed() const;
			/**
			* @return whether or not this item collapses itself when the group
			gets collapsed
			* @since 4.4
			*/
			bool isAutoCollapse() const;
			/**
			* @param autoCollapse whether or not this item collapses itself wh
			en the group gets collapsed, the default value is false
			* @since 4.4
			*/
			void setAutoCollapse(bool collapse);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
			* expands or collapses this group
			* @since 4.4
			*/
			void setGroupCollapsed(bool collapsed);
			/**
	* Expands this group to show all ExtenderItems that are contained in this group.		* Expands this group to show all ExtenderItems that are contained in this group.
	*/		*/
	void expandGroup();		void expandGroup();
	/**		/**
	* Collapses this group to hide all ExtenderItems that are containe d in this group, and		* Collapses this group to hide all ExtenderItems that are containe d in this group, and
	* shows the summary item.		* shows the summary item.
	*/		*/
	void collapseGroup();		void collapseGroup();
End of changes. 4 change blocks.
	1 lines changed or deleted		30 lines changed or added

	extenderitem.h		extenderitem.h
	skipping to change at line 273		skipping to change at line 273
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);		void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	void hoverMoveEvent(QGraphicsSceneHoverEvent *event);		void hoverMoveEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);		bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
			QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const
			;
	private:		private:
	Q_PRIVATE_SLOT(d, void toggleCollapse())		Q_PRIVATE_SLOT(d, void toggleCollapse())
	Q_PRIVATE_SLOT(d, void updateToolBox())		Q_PRIVATE_SLOT(d, void updateToolBox())
	Q_PRIVATE_SLOT(d, void themeChanged())		Q_PRIVATE_SLOT(d, void themeChanged())
	Q_PRIVATE_SLOT(d, void sourceAppletRemoved())		Q_PRIVATE_SLOT(d, void sourceAppletRemoved())
	Q_PRIVATE_SLOT(d, void actionDestroyed(QObject*))		Q_PRIVATE_SLOT(d, void actionDestroyed(QObject*))
	ExtenderItemPrivate * const d;		ExtenderItemPrivate * const d;
	friend class Extender;		friend class Extender;
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	fixx11h.h		fixx11h.h
	skipping to change at line 255		skipping to change at line 255
	const int FontChange = XFontChange;		const int FontChange = XFontChange;
	#endif		#endif
	#undef FontChange		#undef FontChange
	#endif		#endif
	// template <---		// template <---
	// Affects: Should be without side effects.		// Affects: Should be without side effects.
	#ifdef NormalState		#ifdef NormalState
	#ifndef FIXX11H_NormalState		#ifndef FIXX11H_NormalState
	#define FIXX11H_NormalState		#define FIXX11H_NormalState
	const XID XNormalState = NormalState;		const int XNormalState = NormalState;
	#undef NormalState		#undef NormalState
	const XID NormalState = XNormalState;		const int NormalState = XNormalState;
	#endif		#endif
	#undef NormalState		#undef NormalState
	#endif		#endif
	// template --->		// template --->
	// Affects: Should be without side effects.		// Affects: Should be without side effects.
	#ifdef index		#ifdef index
	#ifndef FIXX11H_index		#ifndef FIXX11H_index
	#define FIXX11H_index		#define FIXX11H_index
	inline		inline
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	flashinglabel.h		flashinglabel.h
	skipping to change at line 42		skipping to change at line 42
	class FlashingLabelPrivate;		class FlashingLabelPrivate;
	/**		/**
	* @class FlashingLabel plasma/widgets/flashinglabel.h <Plasma/Widgets/Flas hingLabel>		* @class FlashingLabel plasma/widgets/flashinglabel.h <Plasma/Widgets/Flas hingLabel>
	*		*
	* @short Provides flashing text or icons inside Plasma		* @short Provides flashing text or icons inside Plasma
	*/		*/
	class PLASMA_EXPORT FlashingLabel : public QGraphicsWidget		class PLASMA_EXPORT FlashingLabel : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	public:		Q_PROPERTY(bool autohide READ autohide WRITE setAutohide)
	explicit FlashingLabel(QGraphicsItem *parent = 0);		Q_PROPERTY(QFont font READ font WRITE setFont)
	virtual ~FlashingLabel();		Q_PROPERTY(QColor color READ color WRITE setColor)
			Q_PROPERTY(int duration READ duration WRITE setDuration)
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *optio		public:
	n, QWidget *widget = 0);		explicit FlashingLabel(QGraphicsItem *parent = 0);
			virtual ~FlashingLabel();
	void setFont(const QFont &);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
	void setColor(const QColor &);		Widget *widget = 0);
	void setDuration(int duration);
	void flash(const QString &text, int duration = 0,		QFont font() const;
	const QTextOption &option = QTextOption(Qt::AlignCenter)		void setFont(const QFont &);
	);
	void flash(const QPixmap &pixmap, int duration = 0,
	Qt::Alignment align = Qt::AlignCenter);
	void setAutohide(bool autohide);		QColor color() const;
	bool autohide() const;		void setColor(const QColor &);
	public Q_SLOTS:		int duration() const;
	void kill();		void setDuration(int duration);
	protected Q_SLOTS:		Q_INVOKABLE void flash(const QString &text, int duration = 0,
	void fadeIn();		const QTextOption &option = QTextOption(Qt::Alig
	void fadeOut();		nCenter));
			Q_INVOKABLE void flash(const QPixmap &pixmap, int duration = 0,
			Qt::Alignment align = Qt::AlignCenter);
	private:		void setAutohide(bool autohide);
	Q_PRIVATE_SLOT(d, void elementAnimationFinished(int))		bool autohide() const;
	FlashingLabelPrivate *const d;
			protected:
			QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;
			public Q_SLOTS:
			void kill();
			protected Q_SLOTS:
			void fadeIn();
			void fadeOut();
			private:
			Q_PRIVATE_SLOT(d, void elementAnimationFinished(int))
			Q_PRIVATE_SLOT(d, void setPalette())
			FlashingLabelPrivate *const d;
	};		};
	}		}
	#endif		#endif
End of changes. 8 change blocks.
	23 lines changed or deleted		37 lines changed or added

	frame.h		frame.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_FRAME_H		#ifndef PLASMA_FRAME_H
	#define PLASMA_FRAME_H		#define PLASMA_FRAME_H
	#include <QtGui/QGraphicsWidget>		#include <QtGui/QGraphicsWidget>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			#include <plasma/framesvg.h>
	class QFrame;		class QFrame;
	namespace Plasma		namespace Plasma
	{		{
	class FramePrivate;		class FramePrivate;
	/**		/**
	* @class Frame plasma/widgets/frame.h <Plasma/Widgets/Frame>		* @class Frame plasma/widgets/frame.h <Plasma/Widgets/Frame>
	skipping to change at line 78		skipping to change at line 79
	*		*
	* @arg shadow plain, raised or sunken		* @arg shadow plain, raised or sunken
	*/		*/
	void setFrameShadow(Shadow shadow);		void setFrameShadow(Shadow shadow);
	/**		/**
	* @return the Frame's shadow style		* @return the Frame's shadow style
	*/		*/
	Shadow frameShadow() const;		Shadow frameShadow() const;
			/**
			* Sets what borders should be painted
			* @arg flags borders we want to paint
			*/
			void setEnabledBorders(const FrameSvg::EnabledBorders borders);
			/**
			* Convenience method to get the enabled borders
			* @return what borders are painted
			* @since 4.4
			*/
			FrameSvg::EnabledBorders enabledBorders() const;
	/**		/**
	* Set the text to display by this Frame		* Set the text to display by this Frame
	*		*
	* @arg text the text		* @arg text the text
			* @since 4.4
	*/		*/
	void setText(QString text);		void setText(QString text);
	/**		/**
	* @return text displayed from this Frame		* @return text displayed from this Frame
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	skipping to change at line 126		skipping to change at line 141
	*/		*/
	QWidget *nativeWidget() const;		QWidget *nativeWidget() const;
	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);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;		QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
			void changeEvent(QEvent *event);
	private:		private:
	FramePrivate * const d;		FramePrivate * const d;
	Q_PRIVATE_SLOT(d, void syncBorders())		Q_PRIVATE_SLOT(d, void syncBorders())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 4 change blocks.
	0 lines changed or deleted		16 lines changed or added

	framesvg.h		framesvg.h
	skipping to change at line 80		skipping to change at line 80
	* @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 Plamsa::Svg
	**/		**/
	class PLASMA_EXPORT FrameSvg : public Svg		class PLASMA_EXPORT FrameSvg : public Svg
	{		{
	Q_OBJECT		Q_OBJECT
	friend class Applet;		Q_FLAGS(EnabledBorders)
			Q_PROPERTY(EnabledBorders enabledBorders READ enabledBorders WRITE setE
			nabledBorders)
	public:		public:
	/**		/**
	* These flags represents what borders should be drawn		* These flags represents what borders should be drawn
	*/		*/
	enum EnabledBorder {		enum EnabledBorder {
	NoBorder = 0,		NoBorder = 0,
	TopBorder = 1,		TopBorder = 1,
	BottomBorder = 2,		BottomBorder = 2,
	LeftBorder = 4,		LeftBorder = 4,
	skipping to change at line 118		skipping to change at line 119
	/**		/**
	* Loads a new Svg		* Loads a new Svg
	* @arg imagePath the new file		* @arg imagePath the new file
	*/		*/
	Q_INVOKABLE void setImagePath(const QString &path);		Q_INVOKABLE void setImagePath(const QString &path);
	/**		/**
	* Sets what borders should be painted		* Sets what borders should be painted
	* @arg flags borders we want to paint		* @arg flags borders we want to paint
	*/		*/
	Q_INVOKABLE void setEnabledBorders(const EnabledBorders borders);		void setEnabledBorders(const EnabledBorders borders);
	/**		/**
	* Convenience method to get the enabled borders		* Convenience method to get the enabled borders
	* @return what borders are painted		* @return what borders are painted
	*/		*/
	Q_INVOKABLE EnabledBorders enabledBorders() const;		EnabledBorders enabledBorders() const;
	/**		/**
	* Resize the frame maintaining the same border size		* Resize the frame maintaining the same border size
	* @arg size the new size of the frame		* @arg size the new size of the frame
	*/		*/
	Q_INVOKABLE void resizeFrame(const QSizeF &size);		Q_INVOKABLE void resizeFrame(const QSizeF &size);
	/**		/**
	* @returns the size of the frame		* @returns the size of the frame
	*/		*/
	skipping to change at line 262		skipping to change at line 263
	/**		/**
	* Paints the loaded SVG with the elements that represents the bord er		* Paints the loaded SVG with the elements that represents the bord er
	* This is an overloaded member provided for convenience		* This is an overloaded member provided for convenience
	* @arg painter the QPainter to use		* @arg painter the QPainter to use
	* @arg pos where to paint the svg		* @arg pos where to paint the svg
	*/		*/
	Q_INVOKABLE void paintFrame(QPainter *painter, const QPointF &pos = QPointF(0, 0));		Q_INVOKABLE void paintFrame(QPainter *painter, const QPointF &pos = QPointF(0, 0));
	private:		private:
	FrameSvgPrivate *const d;		FrameSvgPrivate *const d;
			friend class Applet;
	Q_PRIVATE_SLOT(d, void updateSizes())		Q_PRIVATE_SLOT(d, void updateSizes())
	Q_PRIVATE_SLOT(d, void updateNeeded())		Q_PRIVATE_SLOT(d, void updateNeeded())
	};		};
	} // Plasma namespace		} // Plasma namespace
	Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::FrameSvg::EnabledBorders)		Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::FrameSvg::EnabledBorders)
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 4 change blocks.
	3 lines changed or deleted		6 lines changed or added

	genericfactory.h		genericfactory.h
	skipping to change at line 41		skipping to change at line 41
	/**		/**
	* @internal		* @internal
	*/		*/
	template <class T>		template <class T>
	class GenericFactoryBase : public KParts::Factory		class GenericFactoryBase : public KParts::Factory
	{		{
	public:		public:
	GenericFactoryBase()		GenericFactoryBase()
	{		{
	if ( s_self )		if ( s_self )
			{
	kWarning() << "KParts::GenericFactory instantiated more tha n once!";		kWarning() << "KParts::GenericFactory instantiated more tha n once!";
			}
	s_self = this;		s_self = this;
	}		}
	virtual ~GenericFactoryBase()		virtual ~GenericFactoryBase()
	{		{
	delete s_aboutData;		delete s_aboutData;
	delete s_componentData;		delete s_componentData;
	s_aboutData = 0;		s_aboutData = 0;
	s_componentData = 0;		s_componentData = 0;
	s_self = 0;		s_self = 0;
	}		}
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	groupbox.h		groupbox.h
	skipping to change at line 85		skipping to change at line 85
	/**		/**
	* @return the native widget wrapped by this GroupBox		* @return the native widget wrapped by this GroupBox
	*/		*/
	QGroupBox *nativeWidget() const;		QGroupBox *nativeWidget() const;
	Q_SIGNALS:		Q_SIGNALS:
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
			void changeEvent(QEvent *event);
	private:		private:
	GroupBoxPrivate * const d;		GroupBoxPrivate * const d;
			Q_PRIVATE_SLOT(d, void setPalette())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 2 change blocks.
	0 lines changed or deleted		2 lines changed or added

	highlighter.h		highlighter.h
	/**		/*
	* highlighter.h		* highlighter.h
	*		*
	* Copyright (C) 2004 Zack Rusin <zack@kde.org>		* Copyright (C) 2004 Zack Rusin <zack@kde.org>
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	skipping to change at line 31		skipping to change at line 31
	#ifndef SONNET_HIGHLIGHTER_H		#ifndef SONNET_HIGHLIGHTER_H
	#define SONNET_HIGHLIGHTER_H		#define SONNET_HIGHLIGHTER_H
	#include <QtGui/QSyntaxHighlighter>		#include <QtGui/QSyntaxHighlighter>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <kdemacros.h>		#include <kdemacros.h>
	#include <kdeui_export.h>		#include <kdeui_export.h>
	class QTextEdit;		class QTextEdit;
	/// The sonnet namespace
	namespace Sonnet		namespace Sonnet
	{		{
	/// The Sonnet Highlighter		/// The Sonnet Highlighter
	class KDEUI_EXPORT Highlighter : public QSyntaxHighlighter		class KDEUI_EXPORT Highlighter : public QSyntaxHighlighter
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	explicit Highlighter(QTextEdit *textEdit,		explicit Highlighter(QTextEdit *textEdit,
	const QString &configFile = QString(),		const QString &configFile = QString(),
	const QColor &col=QColor());		const QColor &col=QColor());
End of changes. 2 change blocks.
	2 lines changed or deleted		1 lines changed or added

	historyprovider.h		historyprovider.h
	skipping to change at line 51		skipping to change at line 51
	*/		*/
	class KPARTS_EXPORT HistoryProvider : public QObject		class KPARTS_EXPORT HistoryProvider : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	friend class ::KParts::HistoryProviderPrivate;		friend class ::KParts::HistoryProviderPrivate;
	public:		public:
	static HistoryProvider * self();		static HistoryProvider * self();
	/**		/**
			* @returns true if a provider has already been created.
			* @since 4.4
			*/
			static bool exists();
			/**
	* @returns true if @p item is present in the history.		* @returns true if @p item is present in the history.
	*/		*/
	virtual bool contains( const QString& item ) const;		virtual bool contains( const QString& item ) const;
	/**		/**
	* Inserts @p item into the history.		* Inserts @p item into the history.
	*/		*/
	virtual void insert( const QString& item );		virtual void insert( const QString& item );
	/**		/**
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	http.h		http.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef KIOSLAVE_HTTP_H_		#ifndef KIOSLAVE_HTTP_H_
	#define KIOSLAVE_HTTP_H_		#define KIOSLAVE_HTTP_H_
	namespace KIO {		namespace KIO {
	/** HTTP / DAV method **/		/** HTTP / DAV method **/
	enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,		enum HTTP_METHOD {HTTP_GET, HTTP_PUT, HTTP_POST, HTTP_HEAD, HTTP_DELETE,
	HTTP_OPTIONS, DAV_PROPFIND, DAV_PROPPATCH, DAV_MKCOL,		HTTP_OPTIONS, DAV_PROPFIND, DAV_PROPPATCH, DAV_MKCOL,
	DAV_COPY, DAV_MOVE, DAV_LOCK, DAV_UNLOCK, DAV_SEARCH,		DAV_COPY, DAV_MOVE, DAV_LOCK, DAV_UNLOCK, DAV_SEARCH,
	DAV_SUBSCRIBE, DAV_UNSUBSCRIBE, DAV_POLL, DAV_NOTIFY,		DAV_SUBSCRIBE, DAV_UNSUBSCRIBE, DAV_POLL, DAV_NOTIFY,
			DAV_REPORT,
	HTTP_UNKNOWN = -1};		HTTP_UNKNOWN = -1};
	}		}
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	iconwidget.h		iconwidget.h
	skipping to change at line 176		skipping to change at line 176
	* Plasma::IconWidget allows the user to specify a number of actions		* Plasma::IconWidget allows the user to specify a number of actions
	* (currently four) to be displayed around the widget. This method		* (currently four) to be displayed around the widget. This method
	* allows for a created QAction to be added to the Plasma::IconWidget.		* allows for a created QAction to be added to the Plasma::IconWidget.
	* @param action the QAction to associate with this icon.		* @param action the QAction to associate with this icon.
	*/		*/
	void addIconAction(QAction *action);		void addIconAction(QAction *action);
	/**		/**
	* Removes a previously set iconAction. The action will be removed from the widget		* Removes a previously set iconAction. The action will be removed from the widget
	* but will not be deleted.		* but will not be deleted.
			*
			* @param the QAction to be removed, if 0 all actions will be removed
	*/		*/
	void removeIconAction(QAction *action);		void removeIconAction(QAction *action);
	/**		/**
	* Associate an action with this IconWidget		* Associate an action with this IconWidget
	* this makes the IconWidget follow the state of the action, using its icon, text, etc.		* this makes the IconWidget follow the state of the action, using its icon, text, etc.
	* when the IconWidget is clicked, it will also trigger the action.		* when the IconWidget is clicked, it will also trigger the action.
	* Unlike addIconAction, there can be only one associated action.		* Unlike addIconAction, there can be only one associated action.
	*/		*/
	void setAction(QAction *action);		void setAction(QAction *action);
	skipping to change at line 266		skipping to change at line 268
	*/		*/
	void setPressed(bool pressed = true);		void setPressed(bool pressed = true);
	/**		/**
	* Shortcut for setPressed(false)		* Shortcut for setPressed(false)
	*/		*/
	void setUnpressed();		void setUnpressed();
	protected:		protected:
	void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q Widget *widget = 0);		void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q Widget *widget = 0);
			QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF( )) const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Indicates when the icon has been pressed.		* Indicates when the icon has been pressed.
	*/		*/
	void pressed(bool down);		void pressed(bool down);
	/**		/**
	* Indicates when the icon has been clicked.		* Indicates when the icon has been clicked.
	*/		*/
	skipping to change at line 306		skipping to change at line 309
	bool isDown();		bool isDown();
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);		void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);		void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);		void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);		bool sceneEventFilter(QGraphicsItem *watched, QEvent *event);
			void changeEvent(QEvent *event);
	public:		public:
	/**		/**
	* @internal		* @internal
	**/		**/
	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())
End of changes. 3 change blocks.
	0 lines changed or deleted		4 lines changed or added

	job.h		job.h
	skipping to change at line 44		skipping to change at line 44
	* Creates a single directory.		* Creates a single directory.
	*		*
	*		*
	*		*
	*		*
	* @param url The URL of the directory to create.		* @param url The URL of the directory to create.
	* @param permissions The permissions to set after creating the		* @param permissions The permissions to set after creating the
	* directory (unix-style), -1 for default permission s.		* directory (unix-style), -1 for default permission s.
	* @return A pointer to the job handling the operation.		* @return A pointer to the job handling the operation.
	*/		*/
	KIO_EXPORT SimpleJob * mkdir( const KUrl& url, int permissions = -1 );		KIO_EXPORT SimpleJob * mkdir( const KUrl& url, int permissions = -1 ); // TODO KDE5: return a MkdirJob and make that class public again
	/**		/**
	* Removes a single directory.		* Removes a single directory.
	*		*
	* The directory is assumed to be empty.		* The directory is assumed to be empty.
	* The job will fail if the directory is not empty.		* The job will fail if the directory is not empty.
	* Use KIO::del() (DeleteJob) to delete non-empty directories.		* Use KIO::del() (DeleteJob) to delete non-empty directories.
	*		*
	* @param url The URL of the directory to remove.		* @param url The URL of the directory to remove.
	* @return A pointer to the job handling the operation.		* @return A pointer to the job handling the operation.
	skipping to change at line 451		skipping to change at line 451
	*		*
	* @param url the url of the directory		* @param url the url of the directory
	* @param flags Can be HideProgressInfo here		* @param flags Can be HideProgressInfo here
	* @param includeHidden true for all files, false to cull out UNIX hidd en		* @param includeHidden true for all files, false to cull out UNIX hidd en
	* files/dirs (whose names start with dot)		* files/dirs (whose names start with dot)
	* @return the job handling the operation.		* @return the job handling the operation.
	*/		*/
	KIO_EXPORT ListJob *listRecursive( const KUrl& url, JobFlags flags = De faultFlags,		KIO_EXPORT ListJob *listRecursive( const KUrl& url, JobFlags flags = De faultFlags,
	bool includeHidden = true );		bool includeHidden = true );
			/**
			* Tries to map a local URL for the given URL, using a KIO job.
			*
			* Starts a (stat) job for determining the "most local URL" for a given
			URL.
			* Retrieve the result with StatJob::mostLocalUrl in the result slot.
			* @param url The URL we are testing.
			* \since 4.4
			*/
			KIO_EXPORT StatJob* mostLocalUrl(const KUrl& url, JobFlags flags = Defa
			ultFlags);
	}		}
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		13 lines changed or added

	jobclasses.h		jobclasses.h
	skipping to change at line 90		skipping to change at line 90
	* KIO::Job * job = KIO::someoperation( some parameters );		* KIO::Job * job = KIO::someoperation( some parameters );
	* connect( job, SIGNAL( result( KJob * ) ),		* connect( job, SIGNAL( result( KJob * ) ),
	* this, SLOT( slotResult( KJob * ) ) );		* this, SLOT( slotResult( KJob * ) ) );
	* \endcode		* \endcode
	* (other connects, specific to the job)		* (other connects, specific to the job)
	*		*
	* And slotResult is usually at least:		* And slotResult is usually at least:
	*		*
	* \code		* \code
	* if ( job->error() )		* if ( job->error() )
	* job->ui()->showErrorDialog();		* job->ui()->showErrorMessage();
	* \endcode		* \endcode
	* @see KIO::Scheduler		* @see KIO::Scheduler
	*/		*/
	class KIO_EXPORT Job : public KCompositeJob {		class KIO_EXPORT Job : public KCompositeJob {
	Q_OBJECT		Q_OBJECT
	protected:		protected:
	Job();		Job();
	Job(JobPrivate &dd);		Job(JobPrivate &dd);
	skipping to change at line 146		skipping to change at line 146
	* Converts an error code and a non-i18n error message into an		* Converts an error code and a non-i18n error message into an
	* error message in the current language. The low level (non-i18n)		* error message in the current language. The low level (non-i18n)
	* error message (usually a url) is put into the translated error		* error message (usually a url) is put into the translated error
	* message using %1.		* message using %1.
	*		*
	* Example for errid == ERR_CANNOT_OPEN_FOR_READING:		* Example for errid == ERR_CANNOT_OPEN_FOR_READING:
	* \code		* \code
	* i18n( "Could not read\n%1" ).arg( errortext );		* i18n( "Could not read\n%1" ).arg( errortext );
	* \endcode		* \endcode
	* Use this to display the error yourself, but for a dialog box		* Use this to display the error yourself, but for a dialog box
	* use Job::showErrorDialog. Do not call it if error()		* use ui()->showErrorMessage(). Do not call it if error()
	* is not 0.		* is not 0.
	* @return the error message and if there is no error, a message		* @return the error message and if there is no error, a message
	* telling the user that the app is broken, so check with		* telling the user that the app is broken, so check with
	* error() whether there is an error		* error() whether there is an error
	*/		*/
	QString errorString() const;		QString errorString() const;
	/**		/**
	* Converts an error code and a non-i18n error message into i18n		* Converts an error code and a non-i18n error message into i18n
	* strings suitable for presentation in a detailed error message bo x.		* strings suitable for presentation in a detailed error message bo x.
	skipping to change at line 363		skipping to change at line 363
	* Abort job.		* Abort job.
	* Suspends slave to be reused by another job for the same request.		* Suspends slave to be reused by another job for the same request.
	*/		*/
	virtual void putOnHold();		virtual void putOnHold();
	/**		/**
	* Discard suspended slave.		* Discard suspended slave.
	*/		*/
	static void removeOnHold();		static void removeOnHold();
			/**
			* Returns true if redirections are handled internally, the default
			.
			*
			* @since 4.4
			*/
			bool isRedirectionHandlingEnabled() const;
			/**
			* Set @p handle to false to prevent the internal handling of redir
			ections.
			*
			* When this flag is set, redirection requests are simply forwarded
			to the
			* caller instead of being handled internally.
			*
			* @since 4.4
			*/
			void setRedirectionHandlingEnabled(bool handle);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* @internal		* @internal
	* Called on a slave's error.		* Called on a slave's error.
	* Made public for the scheduler.		* Made public for the scheduler.
	*/		*/
	void slotError( int , const QString & );		void slotError( int , const QString & );
	protected Q_SLOTS:		protected Q_SLOTS:
	/**		/**
	skipping to change at line 463		skipping to change at line 480
	* 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
	*/		*/
	void setDetails( short int details );		void setDetails( short int details );
	/**		/**
			* @brief Result of the stat operation.
	* 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 result of the stat		* @return the result of the stat
	*/		*/
	const UDSEntry & statResult() const;		const UDSEntry & statResult() const;
			/**
			* @brief most local URL
			* Call this in the slot connected to result,
			* and only after making sure no error happened.
			* @return the most local URL for the URL we were stat'ing.
			*
			* Sample usage:
			* <code>
			* KIO::StatJob* job = KIO::mostLocalUrl("desktop:/foo");
			* job->ui()->setWindow(this);
			* connect(job, SIGNAL(result(KJob*)), this, SLOT(slotMostLocalUrlR
			esult(KJob*)));
			* [...]
			* // and in the slot
			* if (job->error()) {
			* [...] // doesn't exist
			* } else {
			* const KUrl localUrl = job->mostLocalUrl();
			* // localUrl = file:///$HOME/Desktop/foo
			* [...]
			* }
			*
			* \since 4.4
			*/
			KUrl mostLocalUrl() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Signals a redirection.		* Signals a redirection.
	* Use to update the URL shown to the user.		* Use to update the URL shown to the user.
	* The redirection itself is handled internally.		* The redirection itself is handled internally.
	* @param job the job that is redirected		* @param job the job that is redirected
	* @param url the new url		* @param url the new url
	*/		*/
	void redirection( KIO::Job *job, const KUrl &url );		void redirection( KIO::Job *job, const KUrl &url );
End of changes. 5 change blocks.
	2 lines changed or deleted		49 lines changed or added

	k3command.h		k3command.h
	skipping to change at line 140		skipping to change at line 140
	* Creates a macro command. You will then need to call addCommand		* Creates a macro command. You will then need to call addCommand
	* for each subcommand to be added to this macro command.		* for each subcommand to be added to this macro command.
	* @param name the name of this command, translated, since it will appe ar		* @param name the name of this command, translated, since it will appe ar
	* in the menus.		* in the menus.
	*/		*/
	K3MacroCommand( const QString & name );		K3MacroCommand( const QString & name );
	virtual ~K3MacroCommand();		virtual ~K3MacroCommand();
	/**		/**
	* Appends a command to this macro command.		* Appends a command to this macro command.
	* The ownership is transfered to the macro command.		* The ownership is transferred to the macro command.
	*/		*/
	void addCommand(K3Command *command);		void addCommand(K3Command *command);
	/**		/**
	* Executes this command, i.e. execute all the sub-commands		* Executes this command, i.e. execute all the sub-commands
	* in the order in which they were added.		* in the order in which they were added.
	*/		*/
	virtual void execute();		virtual void execute();
	/**		/**
	* Undoes the execution of this command, i.e. #unexecute all the sub-co mmands		* Undoes the execution of this command, i.e. #unexecute all the sub-co mmands
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3dockwidget.h		k3dockwidget.h
	skipping to change at line 294		skipping to change at line 294
	/**		/**
	* Loads the current button state from a KDE config container object.		* Loads the current button state from a KDE config container object.
	*		*
	* @param c the configuration safe		* @param c the configuration safe
	*/		*/
	virtual void loadConfig( KConfigGroup* c);		virtual void loadConfig( KConfigGroup* c);
	#endif		#endif
	/**		/**
	* add an arbitrary button to the dockwidget header		* add an arbitrary button to the dockwidget header
	* NOT PART OF THE PUBLIC API (you don't have access the class defintion anyways, without special		* NOT PART OF THE PUBLIC API (you don't have access the class definitio n anyways, without special
	* header file copying. (don't do it))		* header file copying. (don't do it))
	*/		*/
	void addButton(K3DockButton_Private*);		void addButton(K3DockButton_Private*);
	/**		/**
	* remove an arbtrary button from the dockwidget header		* remove an arbtrary button from the dockwidget header
	* NOT PART OF THE PUBLIC API (you don't have access the class defintion anyways, without special		* NOT PART OF THE PUBLIC API (you don't have access the class definitio n anyways, without special
	* header file copying. (don't do it))		* header file copying. (don't do it))
	*/		*/
	void removeButton(K3DockButton_Private*);		void removeButton(K3DockButton_Private*);
	protected Q_SLOTS:		protected Q_SLOTS:
	/**		/**
	* Sets dragging the dockwidget off when the stay button is pressed down and vice versa.		* Sets dragging the dockwidget off when the stay button is pressed down and vice versa.
	*/		*/
	void slotStayClicked();		void slotStayClicked();
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	k3socketaddress.h		k3socketaddress.h
	skipping to change at line 128		skipping to change at line 128
	* a KIpAddress or the system's in_addr.		* a KIpAddress or the system's in_addr.
	*		*
	* @param ip4addr the IPv4 address		* @param ip4addr the IPv4 address
	*/		*/
	inline KIpAddress(quint32 ip4addr)		inline KIpAddress(quint32 ip4addr)
	{ setAddress(&ip4addr, 4); }		{ setAddress(&ip4addr, 4); }
	/**		/**
	* Destructor. This frees resources associated with this object.		* Destructor. This frees resources associated with this object.
	*		*
	* Note: destructor is non-virtual. The compiler will happily optimise it		* Note: destructor is non-virtual. The compiler will happily optimize it
	* out of the way.		* out of the way.
	*/		*/
	inline ~KIpAddress()		inline ~KIpAddress()
	{ }		{ }
	/**		/**
	* Copy operator.		* Copy operator.
	*		*
	* Copies the data from the other object into this one.		* Copies the data from the other object into this one.
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	k3socks.h		k3socks.h
	skipping to change at line 37		skipping to change at line 37
	#include <sys/types.h>		#include <sys/types.h>
	#include <sys/socket.h>		#include <sys/socket.h>
	#include <sys/time.h>		#include <sys/time.h>
	#include <unistd.h>		#include <unistd.h>
	#ifdef Q_OS_UNIX		#ifdef Q_OS_UNIX
	class KConfigGroup;		class KConfigGroup;
	struct sockaddr;		struct sockaddr;
	#ifdef __CYGWIN__
	typedef unsigned ksocklen_t;
	#endif
	/**		/**
	* This class provides you with an interface to a		* This class provides you with an interface to a
	* <a href="http://www.socks.nec.com/">SOCKS</a> Proxy server. A SOCKS serv er		* <a href="http://www.socks.nec.com/">SOCKS</a> Proxy server. A SOCKS serv er
	* is able to provide full internet access behind a firewall.		* is able to provide full internet access behind a firewall.
	* KSocks is a singleton; there can only be one instance at any		* KSocks is a singleton; there can only be one instance at any
	* given time. To obtain a reference to that instance, use		* given time. To obtain a reference to that instance, use
	* self().		* self().
	*		*
	* @short Access to a SOCKS Proxy.		* @short Access to a SOCKS Proxy.
	* @deprecated Use KSocketFactory or KLocalSocket instead		* @deprecated Use KSocketFactory or KLocalSocket instead
End of changes. 1 change blocks.
	4 lines changed or deleted		0 lines changed or added

	kaboutapplicationdialog.h		kaboutapplicationdialog.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 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>
	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
	* KAboutData that is specified at the start of your program in		* KAboutData that is specified at the start of your program in
	* main(). Normally you should not use this class directly but rather		* main(). Normally you should not use this class directly but rather
	* the KHelpMenu class or even better just subclass your toplevel		* the KHelpMenu class or even better just subclass your toplevel
	* window from KMainWindow. If you do the latter, the help menu and		* window from KMainWindow. If you do the latter, the help menu and
	* thereby this dialog box is available through the		* thereby this dialog box is available through the
	* KMainWindow::helpMenu() function.		* KMainWindow::helpMenu() function.
	*		*
			* \image html kaboutapplicationdialog.png "KDE About Application Dialog"
			*
	* @author Urs Wolfer uwolfer @ kde.org		* @author Urs Wolfer uwolfer @ kde.org
	*/		*/
	class KDEUI_EXPORT KAboutApplicationDialog : public KDialog		class KDEUI_EXPORT KAboutApplicationDialog : public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
			Q_FLAGS( Options )
	public:		public:
			/**
			* Defines some options which can be applied to the about dialog
			*
			* @since 4.4
			*/
			enum Option {
			NoOptions = 0x0, ///< No options, show the standard about
			dialog
			HideTranslators = 0x1, ///< Don't show the translators tab
			HideKdeVersion = 0x2 ///< Don't show the KDE version next to
			the application name and version
			};
			Q_DECLARE_FLAGS( Options, Option )
			/**
			* Constructor. Creates a fully featured "About Application" dialog
			box.
			*
			* @param aboutData A pointer to a KAboutData object which data
			* will be used for filling the dialog.
			* @param opts Additional options that can be applied, such as hidi
			ng the KDE version
			* or the translators tab.
			* @param parent The parent of the dialog box. You should use the
			* toplevel window so that the dialog becomes centered.
			*
			* @since 4.4
			*/
			explicit KAboutApplicationDialog(const KAboutData *aboutData, Optio
			ns opts, QWidget *parent = 0);
	/**		/**
	* Constructor. Creates a fully featured "About Application" dialog box.		* Constructor. Creates a fully featured "About Application" dialog box.
	*		*
	* @param aboutData A pointer to a KAboutData object which data		* @param aboutData A pointer to a KAboutData object which data
	* will be used for filling the dialog.		* will be used for filling the dialog.
	* @param parent The parent of the dialog box. You should use the		* @param parent The parent of the dialog box. You should use the
	* toplevel window so that the dialog becomes centered.		* toplevel window so that the dialog becomes centered.
	*/		*/
	explicit KAboutApplicationDialog(const KAboutData *aboutData, QWidg et *parent = 0);		explicit KAboutApplicationDialog(const KAboutData *aboutData, QWidg et *parent = 0);
	skipping to change at line 70		skipping to change at line 101
	private:		private:
	class Private;		class Private;
	Private* const d;		Private* const d;
	Q_PRIVATE_SLOT( d, void _k_showLicense(const QString&) )		Q_PRIVATE_SLOT( d, void _k_showLicense(const QString&) )
	Q_DISABLE_COPY( KAboutApplicationDialog )		Q_DISABLE_COPY( KAboutApplicationDialog )
	};		};
			Q_DECLARE_OPERATORS_FOR_FLAGS( KAboutApplicationDialog::Options )
	#endif		#endif
End of changes. 5 change blocks.
	1 lines changed or deleted		39 lines changed or added

	kaboutdata.h		kaboutdata.h
	skipping to change at line 53		skipping to change at line 53
	* but the KAboutData methods KAboutData::authors() and KAboutData::credits ()		* but the KAboutData methods KAboutData::authors() and KAboutData::credits ()
	* return lists of KAboutPerson data objects which you can examine.		* return lists of KAboutPerson data objects which you can examine.
	*		*
	* Example usage within a main(), retrieving the list of people involved		* Example usage within a main(), retrieving the list of people involved
	* with a program and re-using data from one of them:		* with a program and re-using data from one of them:
	*		*
	* @code		* @code
	* KAboutData about("khello", "khello", ki18n("KHello"), "0.1",		* KAboutData about("khello", "khello", ki18n("KHello"), "0.1",
	* ki18n("A KDE version of Hello, world!"),		* ki18n("A KDE version of Hello, world!"),
	* KAboutData::License_LGPL,		* KAboutData::License_LGPL,
	* ki18n("Copyright (c) 2003 Developer"));		* ki18n("Copyright (C) 2003 Developer"));
	*		*
	* about.addAuthor(ki18n("Joe Developer"), ki18n("developer"), "joe@host.co m", 0);		* about.addAuthor(ki18n("Joe Developer"), ki18n("developer"), "joe@host.co m", 0);
	* QList<KAboutPerson> people = about.authors();		* QList<KAboutPerson> people = about.authors();
	* about.addCredit(people[0].name(), people[0].task());		* about.addCredit(people[0].name(), people[0].task());
	* @endcode		* @endcode
	*		*
	* @note Instead of the more usual i18n calls, for translatable text the ki 18n		* @note Instead of the more usual i18n calls, for translatable text the ki 18n
	* calls are used to produce KLocalizedStrings, which can delay the transla tion		* calls are used to produce KLocalizedStrings, which can delay the transla tion
	* lookup. This is necessary because the translation catalogs are usually n ot		* lookup. This is necessary because the translation catalogs are usually n ot
	* yet initialized at the point where KAboutData is constructed.		* yet initialized at the point where KAboutData is constructed.
	skipping to change at line 220		skipping to change at line 220
	* @param version The program version string.		* @param version The program version string.
	*		*
	* @param shortDescription A short description of what the program does .		* @param shortDescription A short description of what the program does .
	* This string should be marked for translation.		* This string should be marked for translation.
	* Example: ki18n("A simple text editor.")		* Example: ki18n("A simple text editor.")
	*		*
	* @param licenseType The license identifier. Use setLicenseText or		* @param licenseType The license identifier. Use setLicenseText or
	setLicenseTextFile if you use a license not predefined here.		setLicenseTextFile if you use a license not predefined here.
	*		*
	* @param copyrightStatement A copyright statement, that can look like this:		* @param copyrightStatement A copyright statement, that can look like this:
	* ki18n("(c) 1999-2000, Name"). The string specified here is		* ki18n("Copyright (C) 1999-2000 Name"). The string specified h ere is
	* taken verbatim; the author information from addAuthor is not used.		* taken verbatim; the author information from addAuthor is not used.
	*		*
	* @param text Some free form text, that can contain any kind of		* @param otherText Some free form text, that can contain any kind of
	* information. The text can contain newlines. This string		* information. The text can contain newlines. This string
	* should be marked for translation.		* should be marked for translation.
	*		*
	* @param homePageAddress The program homepage string.		* @param homePageAddress The program homepage string.
	* Start the address with "http://". "http://some.domain" is		* Start the address with "http://". "http://some.domain" is
	* is correct, "some.domain" is not.		* is correct, "some.domain" is not.
	* IMPORTANT: if you set a home page address, this will change the "org anization domain"		* IMPORTANT: if you set a home page address, this will change the "org anization domain"
	* of the application, which is used for automatic DBUS registration.		* of the application, which is used for automatic DBUS registration.
	* @see setOrganizationDomain		* @see setOrganizationDomain
	*		*
	skipping to change at line 245		skipping to change at line 245
	* This defaults to the kde.org bug system.		* This defaults to the kde.org bug system.
	*		*
	*/		*/
	KAboutData( const QByteArray &appName,		KAboutData( const QByteArray &appName,
	const QByteArray &catalogName,		const QByteArray &catalogName,
	const KLocalizedString &programName,		const KLocalizedString &programName,
	const QByteArray &version,		const QByteArray &version,
	const KLocalizedString &shortDescription = KLocalizedString (),		const KLocalizedString &shortDescription = KLocalizedString (),
	enum LicenseKey licenseType = License_Unknown,		enum LicenseKey licenseType = License_Unknown,
	const KLocalizedString &copyrightStatement = KLocalizedStri ng(),		const KLocalizedString &copyrightStatement = KLocalizedStri ng(),
	const KLocalizedString &text = KLocalizedString(),		const KLocalizedString &otherText = KLocalizedString(),
	const QByteArray &homePageAddress = QByteArray(),		const QByteArray &homePageAddress = QByteArray(),
	const QByteArray &bugsEmailAddress = "submit@bugs.kde.org"		const QByteArray &bugsEmailAddress = "submit@bugs.kde.org"
	);		);
	/**		/**
	* Copy constructor. Performs a deep copy.		* Copy constructor. Performs a deep copy.
	* @param other object to copy		* @param other object to copy
	*/		*/
	KAboutData(const KAboutData& other);		KAboutData(const KAboutData& other);
	skipping to change at line 482		skipping to change at line 482
	* @param licenseKey The license identifier.		* @param licenseKey The license identifier.
	* @see setLicenseText, addLicenseText, addLicenseTextFile		* @see setLicenseText, addLicenseText, addLicenseTextFile
	* @since 4.1		* @since 4.1
	*/		*/
	KAboutData &addLicense( LicenseKey licenseKey );		KAboutData &addLicense( LicenseKey licenseKey );
	/**		/**
	* Defines the copyright statement to show when displaying the license.		* Defines the copyright statement to show when displaying the license.
	*		*
	* @param copyrightStatement A copyright statement, that can look like		* @param copyrightStatement A copyright statement, that can look like
	* this: ki18n("(c) 1999-2000, Name"). The string specified here is		* this: ki18n("Copyright (C) 1999-2000 Name"). The string speci fied here is
	* taken verbatim; the author information from addAuthor is not used.		* taken verbatim; the author information from addAuthor is not used.
	*/		*/
	KAboutData &setCopyrightStatement( const KLocalizedString &copyrightSta tement );		KAboutData &setCopyrightStatement( const KLocalizedString &copyrightSta tement );
	/**		/**
	* Defines the additional text to show in the about dialog.		* Defines the additional text to show in the about dialog.
	*		*
	* @param otherText Some free form text, that can contain any kind of		* @param otherText Some free form text, that can contain any kind of
	* information. The text can contain newlines. This string		* information. The text can contain newlines. This string
	* should be marked for translation.		* should be marked for translation.
End of changes. 5 change blocks.
	5 lines changed or deleted		5 lines changed or added

	kabstractfilewidget.h		kabstractfilewidget.h
	skipping to change at line 41		skipping to change at line 41
	#include "kfile.h"		#include "kfile.h"
	#include <kmimetype.h>		#include <kmimetype.h>
	class KPushButton;		class KPushButton;
	class KActionCollection;		class KActionCollection;
	class KToolBar;		class KToolBar;
	class KFileWidgetPrivate;		class KFileWidgetPrivate;
	class KUrlComboBox;		class KUrlComboBox;
	class KFileFilterCombo;		class KFileFilterCombo;
			/**
			* Base class for KFileWidget.
			*
			* This abstract interface allows KFileDialog (in kio) to call methods
			* on the dlopened KFileWidget (from kfilemodule.so)
			*
			* In addition to the pure virtual methods defined below, the implementatio
			ns
			* of KAbstractFileWidget are expected to define the following signals:
			* <ul>
			* <li>fileSelected(const KUrl&)</li>
			* <li>fileHighlighted(const KUrl&)</li>
			* <li>selectionChanged()</li>
			* <li>filterChanged(const QString&)</li>
			* <li>accepted()</li>
			* </ul>
			*/
	class KIO_EXPORT KAbstractFileWidget		class KIO_EXPORT KAbstractFileWidget
	{		{
	public:		public:
	virtual ~KAbstractFileWidget() {}		virtual ~KAbstractFileWidget() {}
	/**		/**
	* Defines some default behavior of the filedialog.		* Defines some default behavior of the filedialog.
	* E.g. in mode @p Opening and @p Saving, the selected files/urls will		* E.g. in mode @p Opening and @p Saving, the selected files/urls will
	* be added to the "recent documents" list. The Saving mode also implie s		* be added to the "recent documents" list. The Saving mode also implie s
	* setKeepLocation() being set.		* setKeepLocation() being set.
	skipping to change at line 153		skipping to change at line 169
	* @returns whether the contents of the location edit are kept when		* @returns whether the contents of the location edit are kept when
	* changing directories.		* changing directories.
	*/		*/
	virtual bool keepsLocation() const = 0;		virtual bool keepsLocation() const = 0;
	/**		/**
	* Sets the filter to be used to @p filter.		* Sets the filter to be used to @p filter.
	*		*
	* You can set more		* You can set more
	* filters for the user to select separated by '\n'. Every		* filters for the user to select separated by '\n'. Every
	* filter entry is defined through namefilter|text to diplay.		* filter entry is defined through namefilter|text to display.
	* If no | is found in the expression, just the namefilter is		* If no | is found in the expression, just the namefilter is
	* shown. Examples:		* shown. Examples:
	*		*
	* \code		* \code
	* kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");		* kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
	* kfile->setFilter("*.cpp");		* kfile->setFilter("*.cpp");
	* kfile->setFilter("*.cpp|Sources (*.cpp)");		* kfile->setFilter("*.cpp|Sources (*.cpp)");
	* kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));		* kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
	* kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header fi les");		* kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header fi les");
	* \endcode		* \endcode
End of changes. 2 change blocks.
	1 lines changed or deleted		18 lines changed or added

	kaction.h		kaction.h
	skipping to change at line 39		skipping to change at line 39
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <kguiitem.h>		#include <kguiitem.h>
	#include <kshortcut.h>		#include <kshortcut.h>
	#include <QtGui/QWidgetAction>		#include <QtGui/QWidgetAction>
	class KIcon;		class KIcon;
	class KShapeGesture;		class KShapeGesture;
	class KRockerGesture;		class KRockerGesture;
			namespace KAuth {
			class Action;
			}
	//TODO Reduce the word count. This is not very focused and takes too long t o read.		//TODO Reduce the word count. This is not very focused and takes too long t o read.
	//Keep in mind that QAction also has documentation that we don't need to re peat here.		//Keep in mind that QAction also has documentation that we don't need to re peat here.
	/**		/**
	* @short Class to encapsulate user-driven action or event		* @short Class to encapsulate user-driven action or event
			* @extends QAction
	*		*
	* The KAction class (and derived and super classes) extends QAction,		* The KAction class (and derived and super classes) extends QAction,
	* which provides a way to easily encapsulate a "real" user-selected		* which provides a way to easily encapsulate a "real" user-selected
	* action or event in your program.		* action or event in your program.
	*		*
	* For instance, a user may want to @p paste the contents of		* For instance, a user may want to @p paste the contents of
	* the clipboard, @p scroll @p down a document, or @p quit the		* the clipboard, @p scroll @p down a document, or @p quit the
	* application. These are all \b actions -- events that the		* application. These are all \b actions -- events that the
	* user causes to happen. The KAction class allows the developer to		* user causes to happen. The KAction class allows the developer to
	* deal with these actions in an easy and intuitive manner, and conforms		* deal with these actions in an easy and intuitive manner, and conforms
	skipping to change at line 445		skipping to change at line 450
	/**		/**
	* 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
	* empty shortcut.		* empty shortcut.
	* This will also wipe out knowlegde about the existence of this action 's global shorctut		* This will also wipe out knowlegde about the existence of this action 's global shortcut
	* so it will not be considered anymore for shortcut conflict resolutio n. It will also not be		* so it will not be considered anymore for shortcut conflict resolutio n. It will also not be
	* visible anymore in the shortcuts KControl module.		* visible anymore in the shortcuts KControl module.
	* This method should not be used unless these effects are explicitly d esired.		* This method should not be used unless these effects are explicitly d esired.
	* @since 4.1		* @since 4.1
	*/		*/
	void forgetGlobalShortcut();		void forgetGlobalShortcut();
	KShapeGesture shapeGesture(ShortcutTypes type = ActiveShortcut) const;		KShapeGesture shapeGesture(ShortcutTypes type = ActiveShortcut) const;
	KRockerGesture rockerGesture(ShortcutTypes type = ActiveShortcut) const ;		KRockerGesture rockerGesture(ShortcutTypes type = ActiveShortcut) const ;
	void setShapeGesture(const KShapeGesture& gest, ShortcutTypes type = Sh ortcutTypes(ActiveShortcut | DefaultShortcut));		void setShapeGesture(const KShapeGesture& gest, ShortcutTypes type = Sh ortcutTypes(ActiveShortcut | DefaultShortcut));
	void setRockerGesture(const KRockerGesture& gest, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));		void setRockerGesture(const KRockerGesture& gest, ShortcutTypes type = ShortcutTypes(ActiveShortcut | DefaultShortcut));
	/**		/**
			* Returns the action object associated with this action, or 0 if it do
			es not have one
			*
			* @returns the KAuth::Action associated with this action.
			*/
			KAuth::Action *authAction() const;
			/**
			* Sets the action object associated with this action
			*
			* By setting a KAuth::Action, this action will become associated with
			it, and
			* whenever it gets clicked, it will trigger the authorization and exec
			ution process
			* for the action. The signal activated will also be emitted whenever t
			he action gets
			* clicked and the action gets authorized. Pass 0 to this function to d
			isassociate the action
			*
			* @param action the KAuth::Action to associate with this action.
			*/
			void setAuthAction(KAuth::Action *action);
			/**
			* Sets the action object associated with this action
			*
			* Overloaded member to allow creating the action by name
			*
			* @param actionName the name of the action to associate
			*/
			void setAuthAction(const QString &actionName);
			/**
	* @reimp		* @reimp
	*/		*/
	bool event(QEvent*);		bool event(QEvent*);
	Q_SIGNALS:		Q_SIGNALS:
	#ifdef KDE3_SUPPORT		#ifdef KDE3_SUPPORT
	/**		/**
	* Emitted when this action is activated		* Emitted when this action is activated
	*		*
	* \deprecated use triggered(bool checked) instead.		* \deprecated use triggered(bool checked) instead.
	skipping to change at line 481		skipping to change at line 514
	QT_MOC_COMPAT void activated();		QT_MOC_COMPAT void activated();
	#endif		#endif
	/**		/**
	* Emitted when the action is triggered. Also provides the state of the		* Emitted when the action is triggered. Also provides the state of the
	* keyboard modifiers and mouse buttons at the time.		* keyboard modifiers and mouse buttons at the time.
	*/		*/
	void triggered(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifier s);		void triggered(Qt::MouseButtons buttons, Qt::KeyboardModifiers modifier s);
	/**		/**
			* Signal emitted when the action is triggered and authorized
			*
			* If the action needs authorization, when the user triggers the action
			,
			* the authorization process automatically begins.
			* If it succeeds, this signal is emitted. The KAuth::Action object is
			provided for convenience
			* if you have multiple KAuthorizedAction objects, but of course it's a
			lways the same set with
			* setAuthAction().
			*
			* WARNING: If your action needs authorization you should connect event
			ual slots processing
			* stuff to this signal, and NOT triggered. Triggered will be emitted e
			ven if the user has not
			* been authorized
			*
			* @param action The object set with setAuthAction()
			*/
			void authorized(KAuth::Action *action);
			/**
	* Emitted when the global shortcut is changed. A global shortcut is		* Emitted when the global shortcut is changed. A global shortcut is
	* subject to be changed by the global shortcuts kcm.		* subject to be changed by the global shortcuts kcm.
	*/		*/
	void globalShortcutChanged(const QKeySequence&);		void globalShortcutChanged(const QKeySequence&);
	private:		private:
	friend class KGlobalAccelPrivate; // Needs access to the component		friend class KGlobalAccelPrivate; // Needs access to the component
	friend class KActionCollectionPrivate; // Needs access to the component		friend class KActionCollectionPrivate; // Needs access to the component
	friend class KShortcutsEditorDelegate; // Needs access to the component		friend class KShortcutsEditorDelegate; // Needs access to the component
	Q_PRIVATE_SLOT(d, void slotTriggered())		Q_PRIVATE_SLOT(d, void slotTriggered())
			Q_PRIVATE_SLOT(d, void authStatusChanged(int))
	class KActionPrivate* const d;		class KActionPrivate* const d;
	friend class KActionPrivate;		friend class KActionPrivate;
	friend class KGlobalShortcutTest;		friend class KGlobalShortcutTest;
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS(KAction::ShortcutTypes)		Q_DECLARE_OPERATORS_FOR_FLAGS(KAction::ShortcutTypes)
	#endif		#endif
End of changes. 6 change blocks.
	1 lines changed or deleted		62 lines changed or added

	kactionselector.h		kactionselector.h
	skipping to change at line 75		skipping to change at line 75
	To set whatsthis or tooltips for the listboxes, access them through		To set whatsthis or tooltips for the listboxes, access them through
	availableListWidget() and selectedListWidget().		availableListWidget() and selectedListWidget().
	All the moving buttons are automatically set enabled as expected.		All the moving buttons are automatically set enabled as expected.
	Signals are sent each time an item is moved, allowing you to follow the		Signals are sent each time an item is moved, allowing you to follow the
	users actions if you need to. See addedToSelection(), removedFromSelect ion(),		users actions if you need to. See addedToSelection(), removedFromSelect ion(),
	movedUp() and movedDown()		movedUp() and movedDown()
			\image html kactionselector.png "KDE Action Selector"
	@author Anders Lund <anders@alweb.dk>		@author Anders Lund <anders@alweb.dk>
	*/		*/
	class KDEUI_EXPORT KActionSelector : public QWidget {		class KDEUI_EXPORT KActionSelector : public QWidget {
	Q_OBJECT		Q_OBJECT
	Q_ENUMS( InsertionPolicy MoveButton )		Q_ENUMS( InsertionPolicy MoveButton )
	Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOn DoubleClick )		Q_PROPERTY( bool moveOnDoubleClick READ moveOnDoubleClick WRITE setMoveOn DoubleClick )
	Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEn abled )		Q_PROPERTY( bool keyboardEnabled READ keyboardEnabled WRITE setKeyboardEn abled )
	Q_PROPERTY( QString availableLabel READ availableLabel WRITE setAvailable Label )		Q_PROPERTY( QString availableLabel READ availableLabel WRITE setAvailable Label )
	Q_PROPERTY( QString selectedLabel READ selectedLabel WRITE setSelectedLab el )		Q_PROPERTY( QString selectedLabel READ selectedLabel WRITE setSelectedLab el )
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kapplication.h		kapplication.h
	skipping to change at line 92		skipping to change at line 92
	{		{
	Q_OBJECT		Q_OBJECT
	Q_CLASSINFO("D-Bus Interface", "org.kde.KApplication")		Q_CLASSINFO("D-Bus Interface", "org.kde.KApplication")
	public:		public:
	/**		/**
	* This constructor is the one you should use.		* This constructor is the one you should use.
	* It takes aboutData and command line arguments from KCmdLineArgs.		* It takes aboutData and command line arguments from KCmdLineArgs.
	*		*
	* @param GUIenabled Set to false to disable all GUI stuff.		* @param GUIenabled Set to false to disable all GUI stuff.
	* Note that for a non-GUI daemon, you might want to use QCoreApplication		* Note that for a non-GUI daemon, you might want to use QCoreApplication
	* and a KComponentData instance instead. The main difference will be		* and a KComponentData instance instead. You'll save an unnecessary depe
	* that you'll have to register to DBus yourself, but there is no		ndency
	* point in a kdeui dependency in a non-GUI daemon.		* to kdeui. The main difference is that you will have to do a number of
			things yourself:
			* <ul>
			* <li>Register to DBus, if necessary.</li>
			* <li>Call KGlobal::locale(), if using multiple threads.</li>
			* </ul>
	*/		*/
	explicit KApplication(bool GUIenabled = true);		explicit KApplication(bool GUIenabled = true);
	#ifdef Q_WS_X11		#ifdef Q_WS_X11
	/**		/**
	* Constructor. Parses command-line arguments. Use this constructor when you		* Constructor. Parses command-line arguments. Use this constructor when you
	* you need to use a non-default visual or colormap.		* you need to use a non-default visual or colormap.
	*		*
	* @param display Will be passed to Qt as the X display. The display must be		* @param display Will be passed to Qt as the X display. The display must be
	* valid and already opened.		* valid and already opened.
End of changes. 1 change blocks.
	3 lines changed or deleted		8 lines changed or added

	karrowbutton.h		karrowbutton.h
	skipping to change at line 27		skipping to change at line 27
	*/		*/
	#ifndef karrowbutton_h		#ifndef karrowbutton_h
	#define karrowbutton_h		#define karrowbutton_h
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QPushButton>		#include <QtGui/QPushButton>
	class KArrowButtonPrivate;		class KArrowButtonPrivate;
	/**		/**
			* @deprecated Use a QToolButton with the arrowType property set instead
			*
	* @short Draws a button with an arrow.		* @short Draws a button with an arrow.
	*		*
	* Draws a button which shows an arrow pointing into a certain direction. T he		* Draws a button which shows an arrow pointing into a certain direction. T he
	* arrow's alignment on the button depends on the direction it's pointing t o,		* arrow's alignment on the button depends on the direction it's pointing t o,
	* e.g. a left arrow is aligned at the left border, a upwards arrow at the top		* e.g. a left arrow is aligned at the left border, a upwards arrow at the top
	* border. This class honors the currently configured KStyle when drawing		* border. This class honors the currently configured KStyle when drawing
	* the arrow.		* the arrow.
	*		*
			* \image html karrowbutton.png "KDE Arrow Buttons"
			*
	* @author Frerich Raabe		* @author Frerich Raabe
	*/		*/
	class KDEUI_EXPORT KArrowButton : public QPushButton		class KDEUI_EXPORT_DEPRECATED KArrowButton : public QPushButton
	{		{
	Q_OBJECT		Q_OBJECT
	/**		/**
	* Arrow type for this button, from Qt::ArrowType.		* Arrow type for this button, from Qt::ArrowType.
	*/		*/
	Q_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )		Q_PROPERTY( int arrowType READ arrowTp WRITE setArrowTp )
	public:		public:
	/**		/**
	* Constructs an arrow button.		* Constructs an arrow button.
End of changes. 3 change blocks.
	1 lines changed or deleted		5 lines changed or added

	kassistantdialog.h		kassistantdialog.h
	skipping to change at line 49		skipping to change at line 49
	* The Finish Button has the code KDialog::User1, The Next button is KDialo g::User2		* The Finish Button has the code KDialog::User1, The Next button is KDialo g::User2
	* and the Back button is KDialog::User3.		* and the Back button is KDialog::User3.
	* The help button may be hidden using showButton(KDialog::Help, false)		* The help button may be hidden using showButton(KDialog::Help, false)
	*		*
	* Create and populate dialog pages that inherit from QWidget and add them		* Create and populate dialog pages that inherit from QWidget and add them
	* to the assistant dialog using addPage().		* to the assistant dialog using addPage().
	*		*
	* The functions next() and back() are virtual and may be reimplemented to		* The functions next() and back() are virtual and may be reimplemented to
	* override the default actions of the next and back buttons.		* override the default actions of the next and back buttons.
	*		*
			* \image html kassistantdialog.png "KDE Assistant Dialog"
			*
	* @author Olivier Goffart <ogoffart at kde.org>		* @author Olivier Goffart <ogoffart at kde.org>
	*/		*/
	class KDEUI_EXPORT KAssistantDialog : public KPageDialog		class KDEUI_EXPORT KAssistantDialog : public KPageDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Construct a new assistant dialog with @p parent as parent.		* Construct a new assistant dialog with @p parent as parent.
	* @param parent is the parent of the widget.		* @param parent is the parent of the widget.
	* @flags the window flags to give to the assistant dialog. The		* @flags the window flags to give to the assistant dialog. The
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kautomount.h		kautomount.h
	skipping to change at line 25		skipping to change at line 25
	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 KAUTOMOUNT_H		#ifndef KAUTOMOUNT_H
	#define KAUTOMOUNT_H		#define KAUTOMOUNT_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QString>		#include <QtCore/QString>
			#include <QtGlobal>
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
	#ifdef Q_OS_UNIX		#ifdef Q_OS_UNIX
	class KJob;		class KJob;
	namespace KIO {		namespace KIO {
	class Job;		class Job;
	}		}
	class KAutoMountPrivate;		class KAutoMountPrivate;
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kbookmark.h		kbookmark.h
	skipping to change at line 178		skipping to change at line 178
	QString icon() const;		QString icon() const;
	/**		/**
	* Set the icon name of the bookmark		* Set the icon name of the bookmark
	*		*
	* @param icon the new icon name for this bookmark		* @param icon the new icon name for this bookmark
	*/		*/
	void setIcon(const QString &icon);		void setIcon(const QString &icon);
	/**		/**
			* @return Description of the bookmark
			* @since 4.4
			*/
			QString description() const;
			/**
			* Set the description of the bookmark
			*
			* @param description
			* @since 4.4
			*/
			void setDescription(const QString &description);
			/**
	* @return Mime-Type of this item		* @return Mime-Type of this item
	* @since 4.1		* @since 4.1
	*/		*/
	QString mimeType() const;		QString mimeType() const;
	/**		/**
	* Set the Mime-Type of this item		* Set the Mime-Type of this item
	*		*
	* @param Mime-Type		* @param Mime-Type
	* @since 4.1		* @since 4.1
End of changes. 1 change blocks.
	0 lines changed or deleted		14 lines changed or added

	kbookmarkdialog.h		kbookmarkdialog.h
	skipping to change at line 39		skipping to change at line 39
	class QLabel;		class QLabel;
	class QTreeWidget;		class QTreeWidget;
	class KLineEdit;		class KLineEdit;
	class QTreeWidgetItem;		class QTreeWidgetItem;
	class QGridLayout;		class QGridLayout;
	/**		/**
	* This class provides a Dialog for editing properties, adding Bookmarks an d creating new folders.		* This class provides a Dialog for editing properties, adding Bookmarks an d creating new folders.
	* It can be used to show dialogs for common tasks with bookmarks.		* It can be used to show dialogs for common tasks with bookmarks.
	*		*
	* It is used by KBookmarkMenu to show a dialog for "Properties", "Add Book		* It is used by KBookmarkMenu to show a dialog for "Properties", "Add Book
	mark" and "Create New Folder"		mark" and "Create New Folder".
	* If you want to customize those dialogs, derive from KBookmarkOwner and r		* If you want to customize those dialogs, derive from KBookmarkOwner and r
	eimplement bookmarkDialog()		eimplement bookmarkDialog(),
	* Return a KBookmarkDialog subclass and reimplement initLayout(), aboutToS		* return a KBookmarkDialog subclass and reimplement initLayout(), aboutToS
	how() and save()		how() and save().
	**/		**/
	class KIO_EXPORT KBookmarkDialog : public KDialog		class KIO_EXPORT KBookmarkDialog : public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Creates a new KBookmarkDialog		* Creates a new KBookmarkDialog
	*/		*/
End of changes. 1 change blocks.
	6 lines changed or deleted		6 lines changed or added

	kbookmarkmanager.h		kbookmarkmanager.h
	skipping to change at line 118		skipping to change at line 118
	* @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
	*/		*/
			// KDE5 TODO: Use an enum and not a bool
	bool saveAs( const QString & filename, bool toolbarCache = true ) const ;		bool saveAs( const QString & filename, bool toolbarCache = true ) const ;
	/**		/**
	* Update access time stamps for a given url.		* Update access time stamps for a given url.
	* @param url the viewed url		* @param url the viewed url
	* @return true if any metadata was modified (bookmarks file is not sav ed automatically)		* @return true if any metadata was modified (bookmarks file is not sav ed automatically)
	*/		*/
	bool updateAccessMetadata( const QString &url );		bool updateAccessMetadata( const QString &url );
	/*		/*
	skipping to change at line 188		skipping to change at line 189
	void emitChanged( const KBookmarkGroup & group );		void emitChanged( const KBookmarkGroup & group );
	/**		/**
	* Save the bookmarks to an XML file on disk.		* Save the bookmarks to an XML file on disk.
	* You should use emitChanged() instead of this function, it saves		* You should use emitChanged() instead of this function, it saves
	* and notifies everyone that the file has changed.		* and notifies everyone that the file has changed.
	* Only use this if you don't want the emitChanged signal.		* Only use this if you don't want the emitChanged signal.
	* @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
	*/		*/
			// KDE5 TODO: Use an enum and not a bool
	bool save( bool toolbarCache = true ) const;		bool save( bool toolbarCache = true ) const;
	void emitConfigChanged();		void emitConfigChanged();
	/**		/**
	* Set options with which slotEditBookmarks called keditbookmarks		* Set options with which slotEditBookmarks called keditbookmarks
	* this can be used to change the appearance of the keditbookmarks		* this can be used to change the appearance of the keditbookmarks
	* in order to provide a slightly differing outer shell depending		* in order to provide a slightly differing outer shell depending
	* on the bookmarks file / app which calls it.		* on the bookmarks file / app which calls it.
	* @param caption the --caption string, for instance "Konsole"		* @param caption the --caption string, for instance "Konsole"
	* @param browser iff false display no browser specific		* @param browser iff false display no browser specific
	* menu items in keditbookmarks :: --nobrowser		* menu items in keditbookmarks :: --nobrowser
	*/		*/
			// KDE5 TODO: Use an enum and not a bool
	void setEditorOptions( const QString& caption, bool browser );		void setEditorOptions( const QString& caption, bool browser );
	/**		/**
	* This static function will return an instance of the		* This static function will return an instance of the
	* KBookmarkManager, responsible for the given @p bookmarksFile.		* KBookmarkManager, responsible for the given @p bookmarksFile.
	* If you do not instantiate this class either		* If you do not instantiate this class either
	* natively or in a derived class, then it will return an object		* natively or in a derived class, then it will return an object
	* with the default behaviors. If you wish to use different		* with the default behaviors. If you wish to use different
	* behaviors, you <em>must</em> derive your own class and		* behaviors, you <em>must</em> derive your own class and
	* instantiate it before this method is ever called.		* instantiate it before this method is ever called.
	skipping to change at line 356		skipping to change at line 359
	class KIO_EXPORT KBookmarkOwner		class KIO_EXPORT KBookmarkOwner
	{		{
	public:		public:
	virtual ~KBookmarkOwner() {}		virtual ~KBookmarkOwner() {}
	/**		/**
	* This function is called whenever the user wants to add the		* This function is called whenever the user wants to add the
	* current page to the bookmarks list. The title will become the		* current page to the bookmarks list. The title will become the
	* "name" of the bookmark. You must overload this function if you		* "name" of the bookmark. You must overload this function if you
	* wish to give your users the ability to add bookmarks.		* wish to give your users the ability to add bookmarks.
			* The default returns an empty string.
	*		*
	* @return the title of the current page.		* @return the title of the current page.
	*/		*/
	virtual QString currentTitle() const { return QString(); }		virtual QString currentTitle() const { return QString(); }
	/**		/**
	* This function is called whenever the user wants to add the		* This function is called whenever the user wants to add the
	* current page to the bookmarks list. The URL will become the URL		* current page to the bookmarks list. The URL will become the URL
	* of the bookmark. You must overload this function if you wish to		* of the bookmark. You must overload this function if you wish to
	* give your users the ability to add bookmarks.		* give your users the ability to add bookmarks.
			* The default returns an empty string.
	*		*
	* @return the URL of the current page.		* @return the URL of the current page.
	*/		*/
	virtual QString currentUrl() const { return QString(); }		virtual QString currentUrl() const { return QString(); }
	/**		/**
	* This function returns whether the owner supports tabs.		* This function returns whether the owner supports tabs.
			* The default returns @c false.
	*/		*/
	virtual bool supportsTabs() const { return false; }		virtual bool supportsTabs() const { return false; }
	/**		/**
	* Returns a list of title, URL pairs of the open tabs.		* Returns a list of title, URL pairs of the open tabs.
			* The default returns an empty list.
	*/		*/
	virtual QList<QPair<QString, QString> > currentBookmarkList() const { ret urn QList<QPair<QString, QString> >(); }		virtual QList<QPair<QString, QString> > currentBookmarkList() const { ret urn QList<QPair<QString, QString> >(); }
	enum BookmarkOption { ShowAddBookmark, ShowEditBookmark };		enum BookmarkOption { ShowAddBookmark, ShowEditBookmark };
	/** Returns true if \p action should be shown in the menu		/** Returns true if \p action should be shown in the menu
	* The default is to show both a add and editBookmark Entry		* The default is to show both a add and editBookmark Entry
	* //TODO ContextMenuAction? to disable the contextMenu?		* //TODO ContextMenuAction? to disable the contextMenu?
	* Delete and Propeties to disable those in the		* Delete and Propeties to disable those in the
	* context menu?		* context menu?
End of changes. 7 change blocks.
	0 lines changed or deleted		7 lines changed or added

	kbugreport.h		kbugreport.h
	skipping to change at line 36		skipping to change at line 36
	/**		/**
	* @short A dialog box for sending bug reports.		* @short A dialog box for sending bug reports.
	*		*
	* All the information needed by the dialog box		* All the information needed by the dialog box
	* (program name, version, bug-report address, etc.)		* (program name, version, bug-report address, etc.)
	* comes from the KAboutData class.		* comes from the KAboutData class.
	* Make sure you create an instance of KAboutData and pass it		* Make sure you create an instance of KAboutData and pass it
	* to KCmdLineArgs.		* to KCmdLineArgs.
	*		*
			* \image html kbugreport.png "KDE Bug Report Dialog"
			*
	* @author David Faure <faure@kde.org>		* @author David Faure <faure@kde.org>
	*/		*/
	class KDEUI_EXPORT KBugReport : public KDialog		class KDEUI_EXPORT KBugReport : public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Creates a bug-report dialog.		* Creates a bug-report dialog.
	* Note that you shouldn't have to do this manually,		* Note that you shouldn't have to do this manually,
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kbuttongroup.h		kbuttongroup.h
	skipping to change at line 37		skipping to change at line 37
	class QAbstractButton;		class QAbstractButton;
	/**		/**
	* @short Group box with index of the selected button		* @short Group box with index of the selected button
	* KGroupBox is a simple group box that can keep track of the current selec ted		* KGroupBox is a simple group box that can keep track of the current selec ted
	* button of the ones added to it.		* button of the ones added to it.
	*		*
	* Use normally as you would with a QGroupBox.		* Use normally as you would with a QGroupBox.
	*		*
			* \image html kbuttongroup.png "KDE Button Group containing 3 KPushButtons
			"
			*
	* @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)
	public:		public:
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kcalendarsystem.h		kcalendarsystem.h
	skipping to change at line 166		skipping to change at line 166
	/**		/**
	* Returns whether a given date is valid in this calendar system.		* Returns whether a given date is valid in this calendar system.
	*		*
	* @param year the year portion of the date to check		* @param year the year portion of the date to check
	* @param month the month portion of the date to check		* @param month the month portion of the date to check
	* @param day the day portion of the date to check		* @param day the day portion of the date to check
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool isValid( int year, int month, int day ) const = 0;		virtual bool isValid( int year, int month, int day ) const = 0;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Returns whether a given date is valid in this calendar system.
			*
			* @param year the year portion of the date to check
			* @param dayOfYear the day of year portion of the date to check
			* @return @c true if the date is valid, @c false otherwise
			*/
			bool isValid( int year, int dayOfYear ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Returns whether a given date is valid in this calendar system.
			*
			* @param year the year portion of the date to check
			* @param isoWeekNumber the ISO week portion of the date to check
			* @param dayOfIsoWeek the day of week portion of the date to check
			* @return @c true if the date is valid, @c false otherwise
			*/
			bool isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek
			) const;
	/**		/**
	* Returns whether a given date is valid in this calendar system.		* Returns whether a given date is valid in this calendar system.
	*		*
	* @param date the date to check		* @param date the date to check
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool isValid( const QDate &date ) const;		virtual bool isValid( const QDate &date ) const;
	/**		/**
	* Changes the date's year, month and day. The range of the year, month		* Changes the date's year, month and day. The range of the year, month
	skipping to change at line 188		skipping to change at line 213
	* entered in the range 00 to 99. Replaces setYMD.		* entered in the range 00 to 99. Replaces setYMD.
	*		*
	* @param date date to change		* @param date date to change
	* @param year year		* @param year year
	* @param month month number		* @param month month number
	* @param day day of month		* @param day day of month
	* @return @c true if the date is valid, @c false otherwise		* @return @c true if the date is valid, @c false otherwise
	*/		*/
	virtual bool setDate( QDate &date, int year, int month, int day ) const ;		virtual bool setDate( QDate &date, int year, int month, int day ) const ;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Set a date using the year number and day of year number only.
			*
			* @param date date to change
			* @param year year
			* @param dayOfYear day of year
			* @return @c true if the date is valid, @c false otherwise
			*/
			bool setDate( QDate &date, int year, int dayOfYear ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Set a date using the year number, ISO week number and day of week nu
			mber.
			*
			* @param date date to change
			* @param year year
			* @param isoWeekNumber ISO week of year
			* @param dayOfIsoWeek day of week Mon..Sun (1..7)
			* @return @c true if the date is valid, @c false otherwise
			*/
			bool setDateIsoWeek( QDate &date, int year, int isoWeekNumber, int dayO
			fIsoWeek ) const;
	/**		/**
	* @deprecated		* @deprecated
	*		*
	* Use setDate instead		* Use setDate instead
	*		*
	* @see KCalendarSystem::setDate		* @see KCalendarSystem::setDate
	*		*
	* Some implementations reject year range 00 to 99, but extended date		* Some implementations reject year range 00 to 99, but extended date
	* ranges now require these to be accepted. Equivalent in QDate is		* ranges now require these to be accepted. Equivalent in QDate is
	* obsoleted.		* obsoleted.
	skipping to change at line 410		skipping to change at line 462
	* @return day name, empty string if any error		* @return day name, empty string if any error
	*/		*/
	virtual QString weekDayName( const QDate &date, WeekDayNameFormat forma t = LongDayName ) const;		virtual QString weekDayName( const QDate &date, WeekDayNameFormat forma t = LongDayName ) const;
	/**		/**
	* Converts a date into a year literal		* Converts a date into a year literal
	*		*
	* @param date date to convert		* @param date date to convert
	* @param format format to return, either short or long		* @param format format to return, either short or long
	* @return year literal of the date, empty string if any error		* @return year literal of the date, empty string if any error
			* @see year()
	*/		*/
	virtual QString yearString( const QDate &date, StringFormat format = Lo ngFormat ) const;		virtual QString yearString( const QDate &date, StringFormat format = Lo ngFormat ) const;
	/**		/**
	* Converts a date into a month literal		* Converts a date into a month literal
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The month literal of the date, empty string if any error		* @return The month literal of the date, empty string if any error
			* @see month()
	*/		*/
	virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const;		virtual QString monthString( const QDate &pDate, StringFormat format = LongFormat ) const;
	/**		/**
	* Converts a date into a day literal		* Converts a date into a day literal
	*		*
	* @param pDate The date to convert		* @param pDate The date to convert
	* @param format The format to return, either short or long		* @param format The format to return, either short or long
	* @return The day literal of the date, empty string if any error		* @return The day literal of the date, empty string if any error
			* @see day()
	*/		*/
	virtual QString dayString( const QDate &pDate, StringFormat format = Lo ngFormat ) const;		virtual QString dayString( const QDate &pDate, StringFormat format = Lo ngFormat ) const;
			//KDE5 make virtual?
	/**		/**
			* @since 4.4
			*
			* Converts a date into a day of year literal
			*
			* @param pDate The date to convert
			* @param format The format to return, either short or long
			* @return The day of year literal of the date, empty string if any err
			or
			* @see dayOfYear()
			*/
			QString dayOfYearString( const QDate &pDate, StringFormat format = Long
			Format ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Converts a date into a day of week literal
			*
			* @param pDate The date to convert
			* @return The day of week literal of the date, empty string if any err
			or
			* @see dayOfWeek()
			*/
			QString dayOfWeekString( const QDate &pDate ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Converts a date into a week number literal
			*
			* @param pDate The date to convert
			* @param format The format to return, either short or long
			* @return The day literal of the date, empty string if any error
			* @see weekNumber()
			*/
			QString weekNumberString( const QDate &pDate, StringFormat format = Lon
			gFormat ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Returns the months in year for a date as a numeric string
			*
			* @param pDate The date to convert
			* @param format The format to return, either short or long
			* @return The months in year literal of the date, empty string if any
			error
			* @see monthsInYear()
			*/
			QString monthsInYearString( const QDate &pDate, StringFormat format = L
			ongFormat ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Returns the weeks in year for a date as a numeric string
			*
			* @param pDate The date to convert
			* @param format The format to return, either short or long
			* @return The weeks in year literal of the date, empty string if any e
			rror
			* @see weeksInYear()
			*/
			QString weeksInYearString( const QDate &pDate, StringFormat format = Lo
			ngFormat ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Returns the days in year for a date as a numeric string
			*
			* @param pDate The date to convert
			* @param format The format to return, either short or long
			* @return The days in year literal of the date, empty string if any er
			ror
			* @see daysInYear()
			*/
			QString daysInYearString( const QDate &pDate, StringFormat format = Lon
			gFormat ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Returns the days in month for a date as a numeric string
			*
			* @param pDate The date to convert
			* @param format The format to return, either short or long
			* @return The days in month literal of the date, empty string if any e
			rror
			* @see daysInMonth()
			*/
			QString daysInMonthString( const QDate &pDate, StringFormat format = Lo
			ngFormat ) const;
			//KDE5 make virtual?
			/**
			* @since 4.4
			*
			* Returns the days in week for a date as a numeric string
			*
			* @param date The date to convert
			* @return The days in week literal of the date, empty string if any er
			ror
			* @see daysInWeek()
			*/
			QString daysInWeekString( const QDate &date ) const;
			//KDE5 remove?
			/**
			* @deprecated
			*
	* Converts a year literal of a part of a string into a integer startin g at the beginning of the string		* Converts a year literal of a part of a string into a integer startin g at the beginning of the string
	*		*
	* @param sNum The string to parse		* @param sNum The string to parse
	* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string		* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string
	* @return An integer corresponding to the year		* @return An integer corresponding to the year
	*/		*/
	virtual int yearStringToInteger( const QString &sNum, int &iLength ) co nst;		virtual int yearStringToInteger( const QString &sNum, int &iLength ) co nst;
			//KDE5 remove?
	/**		/**
			* @deprecated
			*
	* Converts a month literal of a part of a string into a integer starti ng at the beginning of the string		* Converts a month literal of a part of a string into a integer starti ng at the beginning of the string
	*		*
	* @param sNum The string to parse		* @param sNum The string to parse
	* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string		* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string
	* @return An integer corresponding to the month		* @return An integer corresponding to the month
	*/		*/
	virtual int monthStringToInteger( const QString &sNum, int &iLength ) c onst;		virtual int monthStringToInteger( const QString &sNum, int &iLength ) c onst;
			//KDE5 remove?
	/**		/**
			* @deprecated
			*
	* Converts a day literal of a part of a string into a integer starting at the beginning of the string		* Converts a day literal of a part of a string into a integer starting at the beginning of the string
	*		*
	* @param sNum The string to parse		* @param sNum The string to parse
	* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string		* @param iLength The number of QChars used, and 0 if no valid symbols was found in the string
	* @return An integer corresponding to the day		* @return An integer corresponding to the day
	*/		*/
	virtual int dayStringToInteger( const QString &sNum, int &iLength ) con st;		virtual int dayStringToInteger( const QString &sNum, int &iLength ) con st;
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Returns a string formatted to the current locale's conventions
	* regarding dates.		* regarding dates.
	*		*
	* Uses the calendar system's internal locale set when the instance was		* Uses the calendar system's internal locale set when the instance was
	* created, which ensures that the correct calendar system and locale		* created, which ensures that the correct calendar system and locale
	* settings are respected, which would not occur in some cases if using		* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.		* the global locale. Defaults to global locale.
	*		*
	* @see KLocale::formatDate		* @see KLocale::formatDate
	*		*
	* @param date the date to be formatted		* @param fromDate the date to be formatted
	* @param format category of date format to use		* @param toFormat category of date format to use
	*		*
	* @return The date as a string		* @return The date as a string
	*/		*/
	virtual QString formatDate( const QDate &date, KLocale::DateFormat form		virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat
	at = KLocale::LongDate ) const;		toFormat = KLocale::LongDate ) const;
			//KDE5 Make virtual
			/**
			* @since 4.4
			*
			* Returns a string formatted to the given format and localised to the
			* correct language and digit set.
			*
			* *** WITH GREAT POWER COMES GREAT RESPONSIBILITY ***
			* Please use with care and only in situations where the DateFormat enu
			m
			* or locale formats or individual string methods do not provide what y
			ou
			* need. You should almost always translate your format string as
			* documented. Using the standard DateFormat options instead would tak
			e
			* care of the translation for you.
			*
			* Warning: The %n element differs from the GNU/POSIX standard where it
			is
			* defined as a newline. KDE currently uses this for short day number.
			It
			* is recommended for compatibility purposes to use %-m instead.
			*
			* The toFormat parameter is a good candidate to be made translatable,
			* so that translators can adapt it to their language's convention.
			* There should also be a context using the "kdedt-format" keyword (for
			* automatic validation of translations) and stating the format's purpo
			se:
			* \code
			* QDate reportDate;
			* KGlobal::locale()->calendar()->setDate(reportDate, reportYear, repor
			tMonth, 1);
			* dateFormat = i18nc("(kdedt-format) Report month and year in report h
			eader", "%B %Y"));
			* dateString = KGlobal::locale()->calendar()->formatDate(reportDate, d
			ateFormat);
			* \endcode
			*
			* The date format string closely follows the C / POSIX / UC / GNU stan
			dards
			* but with some exceptions.
			*
			* Date format strings are made up of date componants and string litera
			ls.
			* Date componants are prefixed by a % escape character and are made up
			of
			* optional padding and case modifier flags, an optional width value, a
			nd a
			* compulsary code for the actual date componant:
			* %[Flags][Width][Componant]
			* e.g. %_^5Y
			* No spaces are allowed.
			*
			* The Flags can modify the padding character and/or case of the Date C
			omponant.
			* The Flags are optional and may be combined and/or repeated in any or
			der,
			* in which case the last Padding Flag and last Case Flag will be the
			* ones used. The Flags must be immediately after the % and before any
			Width.
			*
			* The Width can modify how wide the date Componant is padded to. The
			Width
			* is an optional interger value and must be after any Flags but before
			the
			* Componant. If the Width is less than the minimum defined for a Comp
			onant
			* then the default minimum will be used instead.
			*
			* By default most numeric Date Componants are right-aligned with leadi
			ng 0's.
			*
			* By default all string name fields are capital case and unpadded.
			*
			* The following Flags may be specified:
			* @li - (hyphen) no padding (e.g. 1 Jan and "%-j" = "1")
			* @li _ (underscore) pad with spaces (e.g. 1 Jan and "%-j" = " 1")
			* @li 0 (zero) pad with 0's (e.g. 1 Jan and "%0j" = "001")
			* @li ^ (caret) make uppercase (e.g. 1 Jan and "%^B" = "JANUARY")
			* @li # (hash) invert case (e.g. 1 Jan and "%#B" = "???")
			*
			* The following Date Componants can be specified:
			* @li %Y the year to 4 digits (e.g. "1984" for 1984, "0584" for 584, "
			0084" for 84)
			* @li %C the 'century' portion of the year to 2 digits (e.g. "19" for
			1984, "05" for 584, "00" for 84)
			* @li %y the lower 2 digits of the year to 2 digits (e.g. "84" for 198
			4, "05" for 2005)
			* @li %m the month number to 2 digits (January="01", December="12")
			* @li %n the month number to 1 digit (January="1", December="12"), see
			notes!
			* @li %d the day number of the month to 2 digits (e.g. "01" on the fir
			st of March)
			* @li %e the day number of the month to 1 digit (e.g. "1" on the first
			of March)
			* @li %B the month name long form (e.g. "January")
			* @li %b the month name short form (e.g. "Jan" for January)
			* @li %h the month name short form (e.g. "Jan" for January)
			* @li %A the weekday name long form (e.g. "Wednesday" for Wednesday)
			* @li %a the weekday name short form (e.g. "Wed" for Wednesday)
			* @li %j the day of the year number to 3 digits (e.g. "001" for 1 Jan
			)
			* @li %V the ISO week of the year number to 2 digits (e.g. "01" for I
			SO Week 1)
			* @li %G the year number in long form of the ISO week of the year to 4
			digits (e.g. "2004" for 1 Jan 2005)
			* @li %g the year number in short form of the ISO week of the year to
			2 digits (e.g. "04" for 1 Jan 2005)
			* @li %u the day of the week number to 1 digit (e.g. "1" for Monday)
			* @li %D the US short date format (e.g. "%m/%d/%y")
			* @li %F the ISO short date format (e.g. "%Y-%m-%d")
			* @li %x the KDE locale short date format
			* @li %% the literal "%"
			* @li %t a tab character
			*
			* Everything else in the format string will be taken as literal text.
			*
			* Examples:
			* "%Y-%m-%d" = "2009-01-01"
			* "%Y-%-m-%_4d" = "2009-1- 1"
			*
			* The Date Componants are mostly equivalent to the C, GNU and POSIX st
			andard
			* but with some notable differences:
			* @li %e in GNU/POSIX is space padded to 2 digits, in KDE is not padde
			d
			* @li %n in GNU/POSIX is newline, in KDE is short month number
			* @li %U in GNU/POSIX is US week number, in KDE is not supported
			* @li %w in GNU/POSIX is US day of week, in KDE is not supported
			* @li %W in GNU/POSIX is US week number, in KDE is not supported
			* @li %E in GNU/POSIX is locale's alternative representation, in KDE i
			s not supported
			* @li %O in GNU/POSIX is locale's alternative numeric symbols, in KDE
			is not supported
			*
			* %0 is not supported as the returned result is always in the locale's
			chosen numeric symbol digit set.
			*
			* @see KLocale::formatDate
			*
			* @param fromDate the date to be formatted
			* @param toFormat the date format to use
			* @param formatStandard the standard the date format uses, defaults to
			KDE Standard
			*
			* @return The date as a string
			*/
			QString formatDate( const QDate &fromDate, const QString &toFormat,
			KLocale::DateTimeFormatStandard formatStandard = KL
			ocale::KdeFormat ) const;
			//KDE5 Make virtual
			/**
			* @since 4.4
			*
			* Returns a string formatted to the given format string and Digit Set.
			* Only use this version if you need control over the Digit Set and do
			* not want to use the locale Digit Set.
			*
			* @see formatDate
			*
			* @param fromDate the date to be formatted
			* @param toFormat the date format to use
			* @param digitSet the Digit Set to format the date in
			* @param formatStandard the standard the date format uses, defaults to
			KDE Standard
			*
			* @return The date as a string
			*/
			QString formatDate( const QDate &fromDate, const QString &toFormat, KLo
			cale::DigitSet digitSet,
			KLocale::DateTimeFormatStandard formatStandard = KL
			ocale::KdeFormat ) 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
	*		*
	* @param str the string to convert		* @param str the string to convert
	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid		* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid
	*		*
	* @return the string converted to a QDate		* @return the string converted to a QDate
	*/		*/
	virtual QDate readDate( const QString &str, bool *ok = 0 ) const;		virtual QDate readDate( const QString &str, bool *ok = 0 ) const;
	/**		/**
	* Converts a localized date string to a QDate, using the specified @p
	format.
	* You will usually not want to use this method.
	*
	* @see KLocale::readDate
	*/
	virtual QDate readDate( const QString &intstr, const QString &format, b
	ool *ok = 0 ) const;
	/**
	* Converts a localized date string to a QDate.		* Converts a localized date string to a QDate.
	* This method is stricter than readDate(str,&ok): it will either accep t		* This method is stricter than readDate(str,&ok): it will either accep t
	* a date in full format or a date in short format, depending on @p fla gs.		* a date in full format or a date in short format, depending on @p fla gs.
	*		*
	* Uses the calendar system's internal locale set when the instance was		* Uses the calendar system's internal locale set when the instance was
	* created, which ensures that the correct calendar system and locale		* created, which ensures that the correct calendar system and locale
	* settings are respected, which would not occur in some cases if using		* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.		* the global locale. Defaults to global locale.
	*		*
	* @see KLocale::readDate		* @see KLocale::readDate
	*		*
	* @param str the string to convert		* @param str the string to convert
	* @param flags whether the date string is to be in full format or in s hort format		* @param flags whether the date string is to be in full format or in s hort format
	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid		* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid
	*		*
	* @return the string converted to a QDate		* @return the string converted to a QDate
	*/		*/
	virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flag s, bool *ok = 0 ) const;		virtual QDate readDate( const QString &str, KLocale::ReadDateFlags flag s, bool *ok = 0 ) const;
	/**		/**
			* Converts a localized date string to a QDate, using the specified @p
			format.
			* You will usually not want to use this method.
			*
			* You must supply a format and string containing at least one of the f
			ollowing combinations to
			* create a valid date:
			* @li a month and day of month
			* @li a day of year
			* @li a ISO week number and day of week
			*
			* If a year number is not supplied then the current year will be assum
			ed.
			*
			* All date componants must be separated by a non-numeric character.
			*
			* The format is not applied strictly to the input string:
			* @li extra whitespace is ignored
			* @li leading 0's on numbers are ignored
			* @li capitalisation of literals is ignored
			*
			* The allowed format componants are almost the same as the formatDate(
			) function.
			* The following date componants will be read:
			* @li %Y the whole year (e.g. "1984" for 1984)
			* @li %y the lower 2 digits of the year (e.g. "84" for 1984)
			* @li %m the month number to two digits (January="01", December="12")
			* @li %n the month number (January="1", December="12")
			* @li %d the day number of the month to two digits (e.g. "01" on the f
			irst of March)
			* @li %e the day number of the month (e.g. "1" on the first of March)
			* @li %B the month name long form (e.g. "January")
			* @li %b the month name short form (e.g. "Jan" for January)
			* @li %h the month name short form (e.g. "Jan" for January)
			* @li %A the weekday name long form (e.g. "Wednesday" for Wednesday)
			* @li %a the weekday name short form (e.g. "Wed" for Wednesday)
			* @li %j the day of the year number to three digits (e.g. "001" for 1
			Jan)
			* @li %V the ISO week of the year number to two digits (e.g. "01" for
			ISO Week 1)
			* @li %u the day of the week number (e.g. "1" for Monday)
			*
			* The following date componants are NOT supported:
			* @li %C the 'century' portion of the year (e.g. "19" for 1984, "5" fo
			r 584, "" for 84)
			* @li %G the year number in long form of the ISO week of the year (e.g
			. "2004" for 1 Jan 2005)
			* @li %g the year number in short form of the ISO week of the year (e.
			g. "04" for 1 Jan 2005)
			* @li %D the US short date format (e.g. "%m/%d/%y")
			* @li %F the ISO short date format (e.g. "%Y-%m-%d")
			* @li %x the KDE locale short date format
			* @li %% the literal "%"
			* @li %t a tab character
			*
			* @param dateString the string to convert
			* @param dateFormat the date format to use
			* @param ok if non-null, will be set to @c true if the date is valid,
			@c false if invalid
			*
			* @return the string converted to a QDate
			*
			* @see formatDate
			* @see KLocale::readDate
			*/
			virtual QDate readDate( const QString &dateString, const QString &dateF
			ormat, bool *ok = 0 ) const;
			/**
	* Use this to determine which day is the first day of the week.		* Use this to determine which day is the first day of the week.
	*		*
	* Uses the calendar system's internal locale set when the instance was		* Uses the calendar system's internal locale set when the instance was
	* created, which ensures that the correct calendar system and locale		* created, which ensures that the correct calendar system and locale
	* settings are respected, which would not occur in some cases if using		* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.		* the global locale. Defaults to global locale.
	*		*
	* @see KLocale::weekStartDay		* @see KLocale::weekStartDay
	*		*
	* @return an integer (Monday = 1, ..., Sunday = 7)		* @return an integer (Monday = 1, ..., Sunday = 7)
	skipping to change at line 642		skipping to change at line 991
	* @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 KLoacle::readDate
	*		*
	* @return locale to use		* @return locale to use
	*/		*/
	const KLocale *locale() const;		const KLocale *locale() const;
			/**
			* Sets the maximum number of months in a year
			*
			* Only for internal calendar system use
			*/
			void setMaxMonthsInYear( int maxMonths );
			/**
			* Sets the maximum number of days in a week
			*
			* Only for internal calendar system use
			*/
			void setMaxDaysInWeek( int maxDays );
			/**
			* @since 4.4
			*
			* Sets if Calendar System has Year 0 or not
			*
			* Only for internal calendar system use
			*/
			void setHasYear0( bool hasYear0 );
	private:		private:
	Q_DISABLE_COPY( KCalendarSystem )		Q_DISABLE_COPY( KCalendarSystem )
	KCalendarSystemPrivate * const d;		KCalendarSystemPrivate * const d;
	};		};
	#endif		#endif
End of changes. 16 change blocks.
	14 lines changed or deleted		452 lines changed or added

	kcapacitybar.h		kcapacitybar.h
	skipping to change at line 40		skipping to change at line 40
	/**		/**
	* @brief This widget shows a bar which is filled to show the level of usa ge of		* @brief This widget shows a bar which is filled to show the level of usa ge of
	* a certain device.		* a certain device.
	*		*
	* This widget represents a bar which goal is to show the level of usage o f a		* This widget represents a bar which goal is to show the level of usage o f a
	* device. Its look is similar to a progress bar, but different, because t his		* device. Its look is similar to a progress bar, but different, because t his
	* widget does not want to give a notion of progress.		* widget does not want to give a notion of progress.
	*		*
	* @since 4.2		* @since 4.2
	*		*
			* \image html kcapacitybar.png "KDE Capacity Bar"
			*
	* @author Rafael Fernández López <ereslibre@kde.org>		* @author Rafael Fernández López <ereslibre@kde.org>
	*/		*/
	class KDEUI_EXPORT KCapacityBar		class KDEUI_EXPORT KCapacityBar
	: public QWidget		: public QWidget
	{		{
			Q_OBJECT
			Q_PROPERTY(int value READ value WRITE setValue)
			Q_PROPERTY(QString text READ text WRITE setText)
			Q_PROPERTY(DrawTextMode drawTextMode READ drawTextMode WRITE setDrawTex
			tMode)
			Q_PROPERTY(bool fillFullBlocks READ fillFullBlocks WRITE setFillFullBlo
			cks)
			Q_PROPERTY(bool continuous READ continuous WRITE setContinuous)
			Q_PROPERTY(int barHeight READ barHeight WRITE setBarHeight)
			Q_PROPERTY(Qt::Alignment horizontalTextAlignment READ horizontalTextAli
			gnment
			WRITE setHorizontalTex
			tAlignment)
			Q_ENUMS(DrawTextMode)
	public:		public:
	enum DrawTextMode {		enum DrawTextMode {
	DrawTextInline = 0, ///< If any text set, draw it into the capa city bar		DrawTextInline = 0, ///< If any text set, draw it into the capa city bar
	DrawTextOutline ///< If any text set, draw it out of the ca pacity bar		DrawTextOutline ///< If any text set, draw it out of the ca pacity bar
	};		};
	/**		/**
	* Capacity bar constructor.		* Capacity bar constructor.
	*		*
	* @param drawTextMode If any text set, whether to draw it into the ca pacity bar		* @param drawTextMode If any text set, whether to draw it into the ca pacity bar
	skipping to change at line 177		skipping to change at line 191
	* @note Its value is centered by default.		* @note Its value is centered by default.
	*/		*/
	void setHorizontalTextAlignment(Qt::Alignment textAlignment);		void setHorizontalTextAlignment(Qt::Alignment textAlignment);
	/**		/**
	* @return The horizontal alignment for the text that will be drawn.		* @return The horizontal alignment for the text that will be drawn.
	*/		*/
	Qt::Alignment horizontalTextAlignment() const;		Qt::Alignment horizontalTextAlignment() const;
	/**		/**
			* Set the way text is drawn if any is set
			*
			* @param drawTextMode If any text set, whether to draw it into the cap
			acity bar
			* or not.
			*/
			void setDrawTextMode(DrawTextMode mode);
			/**
			* The way text is drawn, inside the capacity bar or outside of it
			*/
			DrawTextMode drawTextMode() const;
			/**
	* This method allows you to draw the widget, directly, for example on		* This method allows you to draw the widget, directly, for example on
	* item delegates. You only need the painter object and the rect where		* item delegates. You only need the painter object and the rect where
	* this widget should be drawn.		* this widget should be drawn.
	*/		*/
	void drawCapacityBar(QPainter *p, const QRect &rect) const;		void drawCapacityBar(QPainter *p, const QRect &rect) const;
	// Reimplemented from QWidget		// Reimplemented from QWidget
	virtual QSize minimumSizeHint() const;		virtual QSize minimumSizeHint() const;
	protected:		protected:
End of changes. 3 change blocks.
	0 lines changed or deleted		32 lines changed or added

	kcategorizedview.h		kcategorizedview.h
	/**		/**
	* This file is part of the KDE project		* This file is part of the KDE project
	* Copyright (C) 2007 Rafael Fernández López <ereslibre@kde.org>		* Copyright (C) 2007, 2009 Rafael Fernández López <ereslibre@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 29		skipping to change at line 29
	*/		*/
	#ifndef KCATEGORIZEDVIEW_H		#ifndef KCATEGORIZEDVIEW_H
	#define KCATEGORIZEDVIEW_H		#define KCATEGORIZEDVIEW_H
	#include <QtGui/QListView>		#include <QtGui/QListView>
	#include <kdeui_export.h>		#include <kdeui_export.h>
	class KCategoryDrawer;		class KCategoryDrawer;
			class KCategoryDrawerV2;
	/**		/**
	* @short Item view for listing items		* @short Item view for listing items in a categorized fashion optionally
	*		*
	* KCategorizedView allows you to use it as it were a QListView.		* KCategorizedView basically has the same functionality as QListView, onl
	* Subclass KCategorizedSortFilterProxyModel to provide category informati		y that it also lets you
	on for items.		* layout items in a way that they are categorized visually.
	*		*
	* @see KCategorizedSortFilterProxyModel		* For it to work you will need to set a KCategorizedSortFilterProxyModel
			and a KCategoryDrawer
			* with methods setModel() and setCategoryDrawer() respectively. Also, the
			model will need to be
			* flagged as categorized with KCategorizedSortFilterProxyModel::setCatego
			rizedModel(true).
			*
			* The way it works (if categorization enabled):
			*
			* - When sorting, it does more things than QListView does. It will as
			k the model for the
			* special role CategorySortRole (@see KCategorizedSortFilterProxyMo
			del). This can return
			* a QString or an int in order to tell the view the order of catego
			ries. In this sense, for
			* instance, if we are sorting by name ascending, "A" would be befor
			e than "B". If we are
			* sorting by size ascending, 512 bytes would be before 1024 bytes.
			This way categories are
			* also sorted.
			*
			* - When the view has to paint, it will ask the model with the role C
			ategoryDisplayRole
			* (@see KCategorizedSortFilterProxyModel). It will for instance ret
			urn "F" for "foo.pdf" if
			* we are sorting by name ascending, or "Small" if a certain item ha
			s 100 bytes, for example.
			*
			* For drawing categories, KCategoryDrawer will be used. You can inherit t
			his class to do your own
			* drawing.
			*
			* @note All examples cited before talk about filesystems and such, but ha
			ve present that this
			* is a completely generic class, and it can be used for whatever yo
			ur purpose is. For
			* instance when talking about animals, you can separate them by "Ma
			mmal" and "Oviparous". In
			* this very case, for example, the CategorySortRole and the Categor
			yDisplayRole could be the
			* same ("Mammal" and "Oviparous").
			*
			* @note There is a really performance boost if CategorySortRole returns a
			n int instead of a QString.
			* Have present that this role is asked (n * log n) times when sorti
			ng and compared. Comparing
			* ints is always faster than comparing strings, whithout mattering
			how fast the string
			* comparison is. Consider thinking of a way of returning ints inste
			ad of QStrings if your
			* model can contain a high number of items.
			*
			* @warning Note that for really drawing items in blocks you will need som
			e things to be done:
			* - The model set to this view has to be (or inherit if you w
			ant to do special stuff
			* in it) KCategorizedSortFilterProxyModel.
			* - This model needs to be set setCategorizedModel to true.
			* - Set a category drawer by calling setCategoryDrawer.
			*
			* @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
	public:		public:
	KCategorizedView(QWidget *parent = 0);		KCategorizedView(QWidget *parent = 0);
	~KCategorizedView();		~KCategorizedView();
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void setModel(QAbstractItemModel *model);		virtual void setModel(QAbstractItemModel *model);
	void setGridSize(const QSize &size);		void setGridSize(const QSize &size);
			/**
			* @warning note that setGridSize is not virtual in the base class (QL
			istView), so if you are
			* calling to this method, make sure you have a KCategorizedV
			iew pointer around. This
			* means that something like:
			* @code
			* QListView *lv = new KCategorizedView();
			* lv->setGridSize(mySize);
			* @endcode
			*
			* will not call to the expected setGridSize method. Instead do someth
			ing like this:
			*
			* @code
			* QListView *lv;
			* ...
			* KCategorizedView *cv = qobject_cast<KCategorizedView*>(lv);
			* if (cv) {
			* cv->setGridSizeOwn(mySize);
			* } else {
			* lv->setGridSize(mySize);
			* }
			* @endcode
			*
			* @note this method will call to QListView::setGridSize among other o
			perations.
			*
			* @since 4.4
			*/
			void setGridSizeOwn(const QSize &size);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual QRect visualRect(const QModelIndex &index) const;		virtual QRect visualRect(const QModelIndex &index) const;
			/**
			* Returns the current category drawer.
			*/
	KCategoryDrawer *categoryDrawer() const;		KCategoryDrawer *categoryDrawer() const;
			/**
			* The category drawer that will be used for drawing categories.
			*/
	void setCategoryDrawer(KCategoryDrawer *categoryDrawer);		void setCategoryDrawer(KCategoryDrawer *categoryDrawer);
			/**
			* @since 4.4
			*/
			int categorySpacing() const;
			/**
			* @since 4.4
			*/
			void setCategorySpacing(int categorySpacing);
			/**
			* @since 4.4
			*/
			bool alternatingBlockColors() const;
			/**
			* @since 4.4
			*/
			void setAlternatingBlockColors(bool enable);
			/**
			* @since 4.4
			*/
			bool collapsibleBlocks() const;
			/**
			* @since 4.4
			*/
			void setCollapsibleBlocks(bool enable);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual QModelIndex indexAt(const QPoint &point) const;		virtual QModelIndex indexAt(const QPoint &point) const;
	public Q_SLOTS:		/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void reset();		virtual void reset();
	protected:		protected:
			/**
			* Reimplemented from QWidget.
			*/
	virtual void paintEvent(QPaintEvent *event);		virtual void paintEvent(QPaintEvent *event);
			/**
			* Reimplemented from QWidget.
			*/
	virtual void resizeEvent(QResizeEvent *event);		virtual void resizeEvent(QResizeEvent *event);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void setSelection(const QRect &rect,		virtual void setSelection(const QRect &rect,
	QItemSelectionModel::SelectionFlags flags);		QItemSelectionModel::SelectionFlags flags);
			/**
			* Reimplemented from QWidget.
			*/
	virtual void mouseMoveEvent(QMouseEvent *event);		virtual void mouseMoveEvent(QMouseEvent *event);
			/**
			* Reimplemented from QWidget.
			*/
	virtual void mousePressEvent(QMouseEvent *event);		virtual void mousePressEvent(QMouseEvent *event);
			/**
			* Reimplemented from QWidget.
			*/
	virtual void mouseReleaseEvent(QMouseEvent *event);		virtual void mouseReleaseEvent(QMouseEvent *event);
			/**
			* Reimplemented from QWidget.
			*/
	virtual void leaveEvent(QEvent *event);		virtual void leaveEvent(QEvent *event);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void startDrag(Qt::DropActions supportedActions);		virtual void startDrag(Qt::DropActions supportedActions);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void dragMoveEvent(QDragMoveEvent *event);		virtual void dragMoveEvent(QDragMoveEvent *event);
			/**
			* Reimplemented from QAbstractItemView.
			*/
			virtual void dragEnterEvent(QDragEnterEvent *event);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void dragLeaveEvent(QDragLeaveEvent *event);		virtual void dragLeaveEvent(QDragLeaveEvent *event);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void dropEvent(QDropEvent *event);		virtual void dropEvent(QDropEvent *event);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual QModelIndex moveCursor(CursorAction cursorAction,		virtual QModelIndex moveCursor(CursorAction cursorAction,
	Qt::KeyboardModifiers modifiers);		Qt::KeyboardModifiers modifiers);
	protected Q_SLOTS:		/**
	virtual void rowsInserted(const QModelIndex &parent,		* Reimplemented from QAbstractItemView.
	int start,		*/
	int end);		virtual void rowsAboutToBeRemoved(const QModelIndex &parent,
			int start,
	virtual void rowsInsertedArtifficial(const QModelIndex &parent,		int end);
	int start,
	int end);
	virtual void rowsRemoved(const QModelIndex &parent,
	int start,
	int end);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void updateGeometries();		virtual void updateGeometries();
	virtual void slotLayoutChanged();		/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void currentChanged(const QModelIndex &current,		virtual void currentChanged(const QModelIndex &current,
	const QModelIndex &previous);		const QModelIndex &previous);
			/**
			* Reimplemented from QAbstractItemView.
			*/
	virtual void dataChanged(const QModelIndex &topLeft,		virtual void dataChanged(const QModelIndex &topLeft,
	const QModelIndex &bottomRight);		const QModelIndex &bottomRight);
			/**
			* Reimplemented from QAbstractItemView.
			*/
			virtual void rowsInserted(const QModelIndex &parent,
			int start,
			int end);
			protected Q_SLOTS:
			/**
			* @internal
			* @warning Deprecated since 4.4.
			*/
			virtual KDE_DEPRECATED void rowsInsertedArtifficial(const QModelIndex &
			parent,
			int start,
			int end);
			/**
			* @internal
			* @warning Deprecated since 4.4.
			*/
			virtual KDE_DEPRECATED void rowsRemoved(const QModelIndex &parent,
			int start,
			int end);
			/**
			* @internal
			* Reposition items as needed.
			*/
			virtual void slotLayoutChanged();
	private:		private:
	class Private;		class Private;
	Private *const d;		Private *const d;
			Q_PRIVATE_SLOT(d, void _k_slotCollapseOrExpandClicked(QModelIndex))
	};		};
	#endif // KCATEGORIZEDVIEW_H		#endif // KCATEGORIZEDVIEW_H
End of changes. 29 change blocks.
	21 lines changed or deleted		236 lines changed or added

	kcategorydrawer.h		kcategorydrawer.h
	/**		/**
	* This file is part of the KDE project		* This file is part of the KDE project
	* Copyright (C) 2007 Rafael Fernández López <ereslibre@kde.org>		* Copyright (C) 2007, 2009 Rafael Fernández López <ereslibre@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 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 KCATEGORYDRAWER_H		#ifndef KCATEGORYDRAWER_H
	#define KCATEGORYDRAWER_H		#define KCATEGORYDRAWER_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
			#include <QtCore/QObject>
			#include <QtGui/QMouseEvent>
	class QPainter;		class QPainter;
	class QModelIndex;		class QModelIndex;
	class QStyleOption;		class QStyleOption;
			/**
			* @warning Please use KCategoryDrawerV2 instead.
			*/
	class KDEUI_EXPORT KCategoryDrawer		class KDEUI_EXPORT KCategoryDrawer
	{		{
	public:		public:
	KCategoryDrawer();		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
	*/		*/
	virtual void drawCategory(const QModelIndex &index,		virtual void drawCategory(const QModelIndex &index,
	int sortRole,		int sortRole,
	const QStyleOption &option,		const QStyleOption &option,
	QPainter *painter) const;		QPainter *painter) const;
	virtual int categoryHeight(const QModelIndex &index, const QStyleOption &option) const;		virtual int categoryHeight(const QModelIndex &index, const QStyleOption &option) const;
			//TODO KDE5: make virtual as leftMargin
			/**
			* @note 0 by default
			* @since 4.4
			*/
			int leftMargin() const;
			/**
			* @note call to this method on the KCategoryDrawer constructor to set
			the left margin
			* @since 4.4
			*/
			void setLeftMargin(int leftMargin);
			//TODO KDE5: make virtual as rightMargin
			/**
			* @note 0 by default
			* @since 4.4
			*/
			int rightMargin() const;
			/**
			* @note call to this method on the KCategoryDrawer constructor to set
			the right margin
			* @since 4.4
			*/
			void setRightMargin(int rightMargin);
			KCategoryDrawer &operator=(const KCategoryDrawer &cd);
			private:
			class Private;
			Private *const d;
			};
			/**
			* @since 4.4
			*/
			class KDEUI_EXPORT KCategoryDrawerV2
			: public QObject
			, public KCategoryDrawer
			{
			Q_OBJECT
			public:
			KCategoryDrawerV2(QObject *parent = 0);
			virtual ~KCategoryDrawerV2();
			// TODO
			virtual void mouseButtonPressed(const QModelIndex &index, QMouseEvent *
			event);
			// TODO
			virtual void mouseButtonReleased(const QModelIndex &index, QMouseEvent
			*event);
			// TODO
			virtual void mouseButtonMoved(const QModelIndex &index, QMouseEvent *ev
			ent);
			// TODO
			virtual void mouseButtonDoubleClicked(const QModelIndex &index, QMouseE
			vent *event);
			Q_SIGNALS:
			void collapseOrExpandClicked(const QModelIndex &index);
	};		};
	#endif // KCATEGORYDRAWER_H		#endif // KCATEGORYDRAWER_H
End of changes. 4 change blocks.
	1 lines changed or deleted		69 lines changed or added

	kcmodule.h		kcmodule.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef KCMODULE_H		#ifndef KCMODULE_H
	#define KCMODULE_H		#define KCMODULE_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <QtGui/QWidget>		#include <QtGui/QWidget>
			#ifdef Q_WS_X11
			#include <fixx11h.h>
			#endif
	class QStringList;		class QStringList;
	class KAboutData;		class KAboutData;
	class KConfigDialogManager;		class KConfigDialogManager;
	class KConfigSkeleton;		class KConfigSkeleton;
	class KCModulePrivate;		class KCModulePrivate;
	class KComponentData;		class KComponentData;
			namespace KAuth {
			class Action;
			}
	/**		/**
	* The base class for configuration modules.		* The base class for configuration modules.
	*		*
	* Configuration modules are realized as plugins that are loaded only when		* Configuration modules are realized as plugins that are loaded only when
	* needed.		* needed.
	*		*
	* The module in principle is a simple widget displaying the		* The module in principle is a simple widget displaying the
	* item to be changed. The module has a very small interface.		* item to be changed. The module has a very small interface.
	*		*
	* All the necessary glue logic and the GUI bells and whistles		* All the necessary glue logic and the GUI bells and whistles
	skipping to change at line 201		skipping to change at line 209
	*/		*/
	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.
			*
			* 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
			* this method is not technically needed to perform the action, but
			* using this and/or the setAuthAction() method will ensure that hosting
			* applications like System Settings or kcmshell behave correctly.
			*
			* Called with @c true, if no action has been previously set using setAut
			hAction(),
			* this method will set the action to a default value of "org.kde.kcontro
			l.name.save" where
			* "name" is the aboutData()->appName() return value. This default action
			won't be set if
			* the aboutData() object is not valid.
			*
			* 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.
			*/
			void setNeedsAuthorization(bool needsAuth);
			/**
			* Returns the value previously set with setNeedsAuthorization(). By defa
			ult it's @c false.
			*
			* @return @c true if the module's save() method requires authorization,
			@c false otherwise
			*/
			bool needsAuthorization() const;
			/**
			* Returns the action previously set with setAuthAction(). By default its
			an invalid action.
			*
			* @return The action that has to be authorized to execute the save() met
			hod.
			*/
			KAuth::Action *authAction() const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Load the configuration data into the module.		* Load the configuration data into the module.
	*		*
	* The load method sets the user interface elements of the		* The load method sets the user interface elements of the
	* module to reflect the current settings stored in the		* module to reflect the current settings stored in the
	* configuration files.		* configuration files.
	*		*
	* This method is invoked whenever the module should read its configurati on		* This method is invoked whenever the module should read its configurati on
	* (most of the times from a config file) and update the user interface.		* (most of the times from a config file) and update the user interface.
	skipping to change at line 293		skipping to change at line 335
	/**		/**
	* Indicate that the module's quickhelp has changed.		* Indicate that the module's quickhelp has changed.
	*		*
	* Emit this signal whenever the module's quickhelp changes.		* Emit this signal whenever the module's quickhelp changes.
	* Modules implemented as tabbed dialogs might want to implement		* Modules implemented as tabbed dialogs might want to implement
	* per-tab quickhelp for example.		* per-tab quickhelp for example.
	*		*
	*/		*/
	void quickHelpChanged();		void quickHelpChanged();
			/**
			* Indicate that the module's root message has changed.
			*
			* Emits this signal whenever the module's root message changes.
			*
			* @since 4.4
			*
			*/
			void rootOnlyMessageChanged(bool use, QString message);
	protected Q_SLOTS:		protected Q_SLOTS:
	/**		/**
	* Calling this slot is equivalent to emitting changed(true).		* Calling this slot is equivalent to emitting changed(true).
	*/		*/
	void changed();		void changed();
	/**		/**
	* A managed widget was changed, the widget settings and the current		* A managed widget was changed, the widget settings and the current
	* settings are compared and a corresponding changed() signal is emitted		* settings are compared and a corresponding changed() signal is emitted
	*/		*/
	void widgetChanged();		void widgetChanged();
			/**
			* The status of the auth action, if one, has changed
			*/
			void authStatusChanged(int);
	protected:		protected:
	/**		/**
	* Sets the buttons to display.		* Sets the buttons to display.
	*		*
	* Help: shows a "Help" button.		* Help: shows a "Help" button.
	*		*
	* Default: shows a "Use Defaults" button.		* Default: shows a "Use Defaults" button.
	*		*
	* Apply: in kcontrol this will show an "Apply" and "Reset" button,		* Apply: in kcontrol this will show an "Apply" and "Reset" button,
End of changes. 5 change blocks.
	0 lines changed or deleted		69 lines changed or added

	kcmultidialog.h		kcmultidialog.h
	skipping to change at line 176		skipping to change at line 176
	* 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 *))
	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))
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	kcodecaction.h		kcodecaction.h
	skipping to change at line 84		skipping to change at line 84
	/**		/**
	* Applicable only if showAutoOptions in c'tor was true		* Applicable only if showAutoOptions in c'tor was true
	*		*
	* KEncodingDetector::SemiautomaticDetection means 'Default' item		* KEncodingDetector::SemiautomaticDetection means 'Default' item
	*/		*/
	bool setCurrentAutoDetectScript(KEncodingDetector::AutoDetectScript) ;		bool setCurrentAutoDetectScript(KEncodingDetector::AutoDetectScript) ;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Specific (proper) codec was selected		* Specific (proper) codec was selected
	*/
	void triggered(QTextCodec *codec);
	/**
	* Specific (proper) codec was selected
	*		*
	* @returns codec name		* Note that triggered(const QString&) is emitted too (as defined i n KSelectAction)
	*/		*/
	void triggered(const QString&);		void triggered(QTextCodec *codec);
	/**		/**
	* Autodetection has been selected.		* Autodetection has been selected.
	* emits KEncodingDetector::SemiautomaticDetection if Default was s elected.		* emits KEncodingDetector::SemiautomaticDetection if Default was s elected.
	*		*
	* Applicable only if showAutoOptions in c'tor was true		* Applicable only if showAutoOptions in c'tor was true
	*/		*/
	void triggered(KEncodingDetector::AutoDetectScript);		void triggered(KEncodingDetector::AutoDetectScript);
	/**		/**
	* If showAutoOptions==true, then better handle triggered(KEncoding Detector::AutoDetectScript) signal		* If showAutoOptions==true, then better handle triggered(KEncoding Detector::AutoDetectScript) signal
	*/		*/
	void defaultItemTriggered();		void defaultItemTriggered();
	protected Q_SLOTS:		protected Q_SLOTS:
	virtual void actionTriggered(QAction*);		virtual void actionTriggered(QAction*);
			protected:
			using KSelectAction::triggered;
	private:		private:
	class Private;		class Private;
	Private* const d;		Private* const d;
	Q_PRIVATE_SLOT( d, void _k_subActionTriggered(QAction*) )		Q_PRIVATE_SLOT( d, void _k_subActionTriggered(QAction*) )
	};		};
	#endif		#endif
End of changes. 4 change blocks.
	7 lines changed or deleted		5 lines changed or added

	kcolorcombo.h		kcolorcombo.h
	skipping to change at line 41		skipping to change at line 41
	#include <kdeui_export.h>		#include <kdeui_export.h>
	class KColorComboPrivate;		class KColorComboPrivate;
	/**		/**
	* 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"
	*/		*/
	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 )
	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.
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kcolordialog.h		kcolordialog.h
	skipping to change at line 104		skipping to change at line 104
	friend class KColorCellsPrivate;		friend class KColorCellsPrivate;
	KColorCellsPrivate *const d;		KColorCellsPrivate *const d;
	Q_DISABLE_COPY(KColorCells)		Q_DISABLE_COPY(KColorCells)
	};		};
	/**		/**
	* @short A color displayer.		* @short A color displayer.
	*		*
	* The KColorPatch widget is a (usually small) widget showing		* The KColorPatch widget is a (usually small) widget showing
	* a selected color e. g. in the KColorDialog. It		* a selected color e.g. in the KColorDialog. It
	* automatically handles drag and drop from and on the widget.		* automatically handles drag and drop from and on the widget.
	*		*
			* \image html kcolorpatch.png "KDE Color Patch"
	*/		*/
	class KDEUI_EXPORT KColorPatch : public QFrame		class KDEUI_EXPORT KColorPatch : public QFrame
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(QColor color READ color WRITE setColor)
	public:		public:
	KColorPatch( QWidget *parent );		KColorPatch( QWidget *parent );
	virtual ~KColorPatch();		virtual ~KColorPatch();
	void setColor( const QColor &col );		/**
			* Get the currently displayed color
			*/
			QColor color() const;
			/**
			* Set the color to display and update the display
			*
			* @param col color to display
			*/
			void setColor( const QColor &col );
	Q_SIGNALS:		Q_SIGNALS:
	void colorChanged( const QColor&);		/**
			* This signal is emitted whenever the current color
			* changes due to a drop event
			*/
			void colorChanged(const QColor&);
	protected:		protected:
	virtual void paintEvent ( QPaintEvent * pe );		virtual void paintEvent ( QPaintEvent * pe );
	virtual void mouseMoveEvent( QMouseEvent * );		virtual void mouseMoveEvent( QMouseEvent * );
	virtual void dragEnterEvent( QDragEnterEvent *);		virtual void dragEnterEvent( QDragEnterEvent *);
	virtual void dropEvent( QDropEvent *);		virtual void dropEvent( QDropEvent *);
	private:		private:
	class KColorPatchPrivate;		class KColorPatchPrivate;
	KColorPatchPrivate *const d;		KColorPatchPrivate *const d;
	skipping to change at line 156		skipping to change at line 173
	*		*
	* Example:		* Example:
	*		*
	* \code		* \code
	* QColor myColor;		* QColor myColor;
	* int result = KColorDialog::getColor( myColor );		* int result = KColorDialog::getColor( myColor );
	* if ( result == KColorDialog::Accepted )		* if ( result == KColorDialog::Accepted )
	* ...		* ...
	* \endcode		* \endcode
	*		*
			* To react to the color selection as it is being selected, the colorSelect
			ed() signal
			* can be used. This can be used still in a modal way, for example:
			*
			* \code
			* KColorDialog dialog(this);
			* connect(&dialog, SIGNAL(colorSelected(const QColor &)), this, SLOT(temp
			orarilyChangeColor(const QColor &)));
			* QColor myColor;
			* dialog.setColor(myColor);
			* int result = dialog.exec();
			*
			* if ( result == KColorDialog::Accepted )
			* changeColor( dialog.color() );
			* else
			* temporarilyChangeColor(myColor); //change back to original color
			* \endcode
			*
			*
	* @image html kcolordialog.png "KDE Color Dialog"		* @image html kcolordialog.png "KDE Color Dialog"
	*		*
	* The color dialog is really a collection of several widgets which can		* The color dialog is really a collection of several widgets which can
	* you can also use separately: the quadratic plane in the top left of		* you can also use separately: the quadratic plane in the top left of
	* the dialog is a KXYSelector. Right next to it is a KHSSelector		* the dialog is a KXYSelector. Right next to it is a KHSSelector
	* for choosing hue/saturation.		* for choosing hue/saturation.
	*		*
	* On the right side of the dialog you see a KColorTable showing		* On the right side of the dialog you see a KColorTable showing
	* a number of colors with a combo box which offers several predefined		* a number of colors with a combo box which offers several predefined
	* palettes or a palette configured by the user. The small field showing		* palettes or a palette configured by the user. The small field showing
End of changes. 6 change blocks.
	4 lines changed or deleted		40 lines changed or added

	kcolorscheme.h		kcolorscheme.h
	skipping to change at line 163		skipping to change at line 163
	* Fourth color; corresponds to (unvisited) links.		* Fourth color; corresponds to (unvisited) links.
	*		*
	* Exactly what this might be used for is somewhat harder to qualif y;		* Exactly what this might be used for is somewhat harder to qualif y;
	* it might be used for bookmarks, as a 'you can click here' indica tor,		* it might be used for bookmarks, as a 'you can click here' indica tor,
	* or to highlight recent content (i.e. in a most-recently-accessed		* or to highlight recent content (i.e. in a most-recently-accessed
	* list).		* list).
	*/		*/
	LinkBackground = 3,		LinkBackground = 3,
	/**		/**
	* Fifth color; corresponds to visited links.		* Fifth color; corresponds to visited links.
			*
			* This can also be used to indicate "not recent" content, especial
			ly
			* when a color is needed to denote content which is "old" or
			* "archival".
	*/		*/
	VisitedBackground = 4,		VisitedBackground = 4,
	/**		/**
	* Sixth color; for example, errors, untrusted content, etc.		* Sixth color; for example, errors, untrusted content, etc.
	*/		*/
	NegativeBackground = 5,		NegativeBackground = 5,
	/**		/**
	* Seventh color; for example, warnings, secure/encrypted content.		* Seventh color; for example, warnings, secure/encrypted content.
	*/		*/
	NeutralBackground = 6,		NeutralBackground = 6,
	skipping to change at line 202		skipping to change at line 206
	* @li WhatsThis - LinkText		* @li WhatsThis - LinkText
	* @li Sticky - ActiveText		* @li Sticky - ActiveText
	*/		*/
	enum ForegroundRole {		enum ForegroundRole {
	/**		/**
	* Normal foreground.		* Normal foreground.
	*/		*/
	NormalText = 0,		NormalText = 0,
	/**		/**
	* Second color; for example, comments, items which are old, inacti ve		* Second color; for example, comments, items which are old, inacti ve
	* or disabled. InactiveText is not the same role as NormalText in		* or disabled. Generally used for things that are meant to be "les
	the		s
			* important". InactiveText is not the same role as NormalText in t
			he
	* inactive state.		* inactive state.
	*/		*/
	InactiveText = 1,		InactiveText = 1,
	/**		/**
	* Third color; for example items which are new, active, requesting		* Third color; for example items which are new, active, requesting
	* attention, etc. May be used as a hover color for clickable items .		* attention, etc. May be used as a hover color for clickable items .
	*/		*/
	ActiveText = 2,		ActiveText = 2,
	/**		/**
	* Fourth color; use for (unvisited) links. May also be used for ot her		* Fourth color; use for (unvisited) links. May also be used for ot her
	* clickable items.		* clickable items or content that indicates relationships, items t
			hat
			* indicate somewhere the user can visit, etc.
	*/		*/
	LinkText = 3,		LinkText = 3,
	/**		/**
	* Fifth color; used for (visited) links. As with LinkText, may be used		* Fifth color; used for (visited) links. As with LinkText, may be used
	* for clickable items that have been clicked, or otherwise accesse		* for items that have already been "visited" or accessed. May also
	d,		be
	* already.		* used to indicate "historical" (i.e. "old") items or information,
			* especially if InactiveText is being used in the same context to
			* express something different.
	*/		*/
	VisitedText = 4,		VisitedText = 4,
	/**		/**
	* Sixth color; for example, errors, untrusted content, etc.		* Sixth color; for example, errors, untrusted content, deletions,
			* etc.
	*/		*/
	NegativeText = 5,		NegativeText = 5,
	/**		/**
	* Seventh color; for example, warnings, secure/encrypted content.		* Seventh color; for example, warnings, secure/encrypted content.
	*/		*/
	NeutralText = 6,		NeutralText = 6,
	/**		/**
	* Eigth color; for example, success messages, trusted content.		* Eigth color; for example, additions, success messages, trusted
			* content.
	*/		*/
	PositiveText = 7		PositiveText = 7
	};		};
	/**		/**
	* This enumeration describes the decoration color being selected from the		* This enumeration describes the decoration color being selected from the
	* given set.		* given set.
	*		*
	* Decoration colors are used to draw decorations (such as frames) for		* Decoration colors are used to draw decorations (such as frames) for
	* special purposes. Like color shades, they are neither foreground nor		* special purposes. Like color shades, they are neither foreground nor
End of changes. 6 change blocks.
	8 lines changed or deleted		21 lines changed or added

	kcombobox.h		kcombobox.h
	skipping to change at line 144		skipping to change at line 144
	*		*
	* Miscellaneous function calls:		* Miscellaneous function calls:
	*		*
	* \code		* \code
	* // Tell the widget not to handle completion and rotation		* // Tell the widget not to handle completion and rotation
	* combo->setHandleSignals( false );		* combo->setHandleSignals( false );
	* // Set your own completion key for manual completions.		* // Set your own completion key for manual completions.
	* combo->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );		* combo->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );
	* \endcode		* \endcode
	*		*
			* \image html kcombobox.png "KDE Combo Boxes, one non-editable, one editab
			le with KUrlCompletion"
			*
	* @author Dawit Alemayehu <adawit@kde.org>		* @author Dawit Alemayehu <adawit@kde.org>
	*/		*/
	class KDEUI_EXPORT KComboBox : public QComboBox, public KCompletionBase //k razy:exclude=qclasses		class KDEUI_EXPORT KComboBox : public QComboBox, public KCompletionBase //k razy:exclude=qclasses
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompleti on )		Q_PROPERTY( bool autoCompletion READ autoCompletion WRITE setAutoCompleti on )
	Q_PROPERTY( bool urlDropsEnabled READ urlDropsEnabled WRITE setUrlDropsEn abled )		Q_PROPERTY( bool urlDropsEnabled READ urlDropsEnabled WRITE setUrlDropsEn abled )
	Q_PROPERTY( bool trapReturnKey READ trapReturnKey WRITE setTrapReturnKey )		Q_PROPERTY( bool trapReturnKey READ trapReturnKey WRITE setTrapReturnKey )
	public:		public:
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kcompletionbox.h		kcompletionbox.h
	skipping to change at line 181		skipping to change at line 181
	*/		*/
	void home();		void home();
	/**		/**
	* Moves the selection down to the last item.		* Moves the selection down to the last item.
	*/		*/
	void end();		void end();
	/**		/**
	* Re-implemented for internal reasons. API is unaffected.		* Re-implemented for internal reasons. API is unaffected.
			* Call it only if you really need it (i.e. the widget was hidden befor e) to have better performance.
	*/		*/
	virtual void setVisible( bool visible );		virtual void setVisible( bool visible );
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when an item was selected, contains the text of		* Emitted when an item was selected, contains the text of
	* the selected item.		* the selected item.
	*/		*/
	void activated( const QString& );		void activated( const QString& );
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	kcoreconfigskeleton.h		kcoreconfigskeleton.h
	skipping to change at line 1315		skipping to change at line 1315
	/**		/**
	* Set the @ref KSharedConfig object used for reading and writing the set tings.		* Set the @ref KSharedConfig object used for reading and writing the set tings.
	*/		*/
	void setSharedConfig(KSharedConfig::Ptr pConfig);		void setSharedConfig(KSharedConfig::Ptr pConfig);
	/**		/**
	* Return list of items managed by this KCoreConfigSkeleton object.		* Return list of items managed by this KCoreConfigSkeleton object.
	*/		*/
	KConfigSkeletonItem::List items() const;		KConfigSkeletonItem::List items() const;
			// KDE5 TODO: Remove this non-const version. Kept only for BC.
	/**		/**
	* Return whether a certain item is immutable		* Return whether a certain item is immutable
	*/		*/
	bool isImmutable(const QString & name);		bool isImmutable(const QString & name);
	/**		/**
			* Return whether a certain item is immutable
			* @since 4.4
			*/
			bool isImmutable(const QString & name) const;
			// KDE5 TODO: Remove this non-const version. Kept only for BC.
			/**
	* Lookup item by name		* Lookup item by name
	*/		*/
	KConfigSkeletonItem * findItem(const QString & name);		KConfigSkeletonItem * findItem(const QString & name);
	/**		/**
			* Lookup item by name
			* @since 4.4
			*/
			KConfigSkeletonItem * findItem(const QString & name) const;
			/**
	* Specify whether this object should reflect the actual values or the		* Specify whether this object should reflect the actual values or the
	* default values.		* default values.
	* This method is implemented by usrUseDefaults(), which can be overridde n		* This method is implemented by usrUseDefaults(), which can be overridde n
	* in derived classes if you have special requirements and can call		* in derived classes if you have special requirements and can call
	* usrUseDefaults() directly.		* usrUseDefaults() directly.
	* If you don't have control whether useDefaults() or usrUseDefaults() is		* If you don't have control whether useDefaults() or usrUseDefaults() is
	* called override useDefaults() directly.		* called override useDefaults() directly.
	* @param b true to make this object reflect the default values,		* @param b true to make this object reflect the default values,
	* false to make it reflect the actual values.		* false to make it reflect the actual values.
	* @return The state prior to this call		* @return The state prior to this call
End of changes. 3 change blocks.
	0 lines changed or deleted		14 lines changed or added

	kdatetable.h		kdatetable.h
	skipping to change at line 33		skipping to change at line 33
	#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>
	class KMenu;		class KMenu;
	class KCalendarSystem;		class KCalendarSystem;
			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
	{		{
	Q_OBJECT		Q_OBJECT
	protected:		protected:
	/**		/**
	skipping to change at line 131		skipping to change at line 132
	/**		/**
	* Date selection table.		* Date selection table.
	* This is a support class for the KDatePicker class. It just		* This is a support class for the KDatePicker class. It just
	* draws the calendar table without titles, but could theoretically		* draws the calendar table without titles, but could theoretically
	* be used as a standalone.		* be used as a standalone.
	*		*
	* When a date is selected by the user, it emits a signal:		* When a date is selected by the user, it emits a signal:
	* dateSelected(QDate)		* dateSelected(QDate)
	*		*
			* \image html kdatetable.png "KDE Date Selection Table"
			*
	* @internal		* @internal
	* @author Tim Gilman, Mirko Boehm		* @author Tim Gilman, Mirko Boehm
	*/		*/
	class KDEUI_EXPORT KDateTable : public QWidget		class KDEUI_EXPORT KDateTable : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QDate date READ date WRITE setDate )		Q_PROPERTY( QDate date READ date WRITE setDate )
	//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 popupMenu READ popupMenuEnabled WRITE setPopupMenuEnab led )		Q_PROPERTY( bool popupMenu READ popupMenuEnabled WRITE setPopupMenuEnab led )
	skipping to change at line 257		skipping to change at line 260
	/**		/**
	* React on mouse clicks that select a date.		* React on mouse clicks that select a date.
	*/		*/
	virtual void mousePressEvent( QMouseEvent *e );		virtual void mousePressEvent( QMouseEvent *e );
	virtual void wheelEvent( QWheelEvent *e );		virtual void wheelEvent( QWheelEvent *e );
	virtual void keyPressEvent( QKeyEvent *e );		virtual void keyPressEvent( QKeyEvent *e );
	virtual void focusInEvent( QFocusEvent *e );		virtual void focusInEvent( QFocusEvent *e );
	virtual void focusOutEvent( QFocusEvent *e );		virtual void focusOutEvent( QFocusEvent *e );
			/**
			* Cell highlight on mouse hovering
			*/
			virtual bool event(QEvent *e);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* The selected date changed.		* The selected date changed.
	*/		*/
	void dateChanged( const QDate &date );		void dateChanged( const QDate &date );
	/**		/**
	* This function behaves essentially like the one above.		* This function behaves essentially like the one above.
	* The selected date changed.		* The selected date changed.
	* @param cur The current date		* @param cur The current date
	skipping to change at line 297		skipping to change at line 305
	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 initAccels();		void initAccels();
	void paintCell( QPainter *painter, int row, int col );		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.
	1 lines changed or deleted		9 lines changed or added

	kdatetime.h		kdatetime.h
	skipping to change at line 1576		skipping to change at line 1576
	* 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, setSimulatedSystemTime() has no effect.		* debug enabled, setSimulatedSystemTime() 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
	* KDateTime::simulateSystemTime(kdt);		* KDateTime::simulateSystemTime(kdt);
	* #endif		* #endif
	* \endcode		* \endcode
	*		*
	* @param dt the current simulated time, or invalid to cancel simulatio n		* @param newTime the current simulated time, or invalid to cancel simu lation
	*		*
	* @see currentDateTime(), currentLocalDateTime(), currentUtcDateTime() ,		* @see currentDateTime(), currentLocalDateTime(), currentUtcDateTime() ,
	* currentLocalDate(), currentLocalTime()		* currentLocalDate(), currentLocalTime()
	*/		*/
	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
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 32		skipping to change at line 32
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QWidget>		#include <QtGui/QWidget>
	class KCalendarSystem;		class KCalendarSystem;
	class QDate;		class QDate;
	/**		/**
	* @short A pushbutton to display or allow user selection of a date.		* @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.
	*		*
	* @see KDatePicker		* \image html kdatewidget.png "KDE Date Widget"
	*/		*
			* @see KDatePicker
			*
			* @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 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.
	*/		*/
End of changes. 1 change blocks.
	6 lines changed or deleted		10 lines changed or added

	kde_file.h		kde_file.h
	skipping to change at line 179		skipping to change at line 179
	KDECORE_EXPORT int open(const QString &pathname, int flags, mode_t mode = 0);		KDECORE_EXPORT int open(const QString &pathname, int flags, mode_t mode = 0);
	/** replacement for ::rename() to handle pathnames in a platform independ ent way */		/** replacement for ::rename() to handle pathnames in a platform independ ent way */
	KDECORE_EXPORT int rename(const QString &in, const QString &out);		KDECORE_EXPORT int rename(const QString &in, const QString &out);
	/** replacement for ::stat()/::stat64() to handle filenames in a platform independent way */		/** replacement for ::stat()/::stat64() to handle filenames in a platform independent way */
	KDECORE_EXPORT int stat(const QString &path, KDE_struct_stat *buf);		KDECORE_EXPORT int stat(const QString &path, KDE_struct_stat *buf);
	/** replacement for ::utime() to handle filenames in a platform independe nt way */		/** replacement for ::utime() to handle filenames in a platform independe nt way */
	KDECORE_EXPORT int utime(const QString &filename, struct utimbuf *buf);		KDECORE_EXPORT int utime(const QString &filename, struct utimbuf *buf);
	#ifndef Q_WS_WIN		#ifndef Q_WS_WIN
	inline int access(const QString &path, int mode)		inline int access(const QString &path, int mode)
	{		{
	return ::access( QFile::encodeName(path), mode );		return ::access( QFile::encodeName(path).constData(), mode );
	}		}
	inline int chmod(const QString &path, mode_t mode)		inline int chmod(const QString &path, mode_t mode)
	{		{
	return ::chmod( QFile::encodeName(path), mode );		return ::chmod( QFile::encodeName(path).constData(), mode );
	}		}
	inline int lstat(const QString &path, KDE_struct_stat *buf)		inline int lstat(const QString &path, KDE_struct_stat *buf)
	{		{
	return KDE_lstat( QFile::encodeName(path), buf );		return KDE_lstat( QFile::encodeName(path).constData(), buf );
	}		}
	inline int mkdir(const QString &pathname, mode_t mode)		inline int mkdir(const QString &pathname, mode_t mode)
	{		{
	return KDE_mkdir( QFile::encodeName(pathname), mode );		return KDE_mkdir( QFile::encodeName(pathname).constData(), mode );
	}		}
	inline int open(const QString &pathname, int flags, mode_t mode)		inline int open(const QString &pathname, int flags, mode_t mode)
	{		{
	return KDE_open( QFile::encodeName(pathname), flags, mode );		return KDE_open( QFile::encodeName(pathname).constData(), flags, mode ) ;
	}		}
	inline int rename(const QString &in, const QString &out)		inline int rename(const QString &in, const QString &out)
	{		{
	return KDE_rename( QFile::encodeName(in), QFile::encodeName(out) );		return KDE_rename( QFile::encodeName(in).constData(), QFile::encodeName (out).constData() );
	}		}
	inline int stat(const QString &path, KDE_struct_stat *buf)		inline int stat(const QString &path, KDE_struct_stat *buf)
	{		{
	return KDE_stat( QFile::encodeName(path), buf );		return KDE_stat( QFile::encodeName(path).constData(), buf );
	}		}
	inline int utime(const QString &filename, struct utimbuf *buf)		inline int utime(const QString &filename, struct utimbuf *buf)
	{		{
	return ::utime( QFile::encodeName(filename), buf );		return ::utime( QFile::encodeName(filename).constData(), buf );
	}		}
	#endif		#endif
	}		}
	#if defined _WIN32 || defined _WIN64		#if defined _WIN32 || defined _WIN64
	#define KPATH_SEPARATOR ';'		#define KPATH_SEPARATOR ';'
	#define KDIR_SEPARATOR '\\' /* faster than QDir::separator() */		#define KDIR_SEPARATOR '\\' /* faster than QDir::separator() */
	#else		#else
	#ifndef O_BINARY		#ifndef O_BINARY
	#define O_BINARY 0 /* for open() */		#define O_BINARY 0 /* for open() */
End of changes. 8 change blocks.
	8 lines changed or deleted		8 lines changed or added

	kdebug.h		kdebug.h
	skipping to change at line 51		skipping to change at line 51
	# 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)
	# define KDE_NO_WARNING_OUTPUT		# define KDE_NO_WARNING_OUTPUT
	# endif		# endif
	#endif		#endif
			#ifdef QT_NO_DEBUG /* The application is compiled in release mode */
			# define KDE_DEBUG_ENABLED_BY_DEFAULT false
			#else
			# define KDE_DEBUG_ENABLED_BY_DEFAULT true
			#endif
	/**		/**
	* An indicator of where you are in a source file, to be used in		* An indicator of where you are in a source file, to be used in
	* warnings (perhaps debug messages too).		* warnings (perhaps debug messages too).
	* @deprecated kDebug takes care of printing the method name automatically now		* @deprecated kDebug takes care of printing the method name automatically now
	*/		*/
	#define k_funcinfo ""		#define k_funcinfo ""
	/**		/**
	* An indicator of where you are in a source file, to be used in		* An indicator of where you are in a source file, to be used in
	* warnings (perhaps debug messages too). Gives an accurate		* warnings (perhaps debug messages too). Gives an accurate
	skipping to change at line 237		skipping to change at line 243
	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:
	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)
	{ }		{ }
	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
			static KDECORE_EXPORT bool hasNullOutput(QtMsgType type,
			bool condition,
			int area,
			bool enableByDefault);
			/// @internal
			static inline bool hasNullOutputQtDebugMsg(int area = KDE_DEFAULT_DEBUG
			_AREA)
			{ return hasNullOutput(QtDebugMsg, true, area, KDE_DEBUG_ENABLED_BY
			_DEFAULT); }
			/// @internal
			static inline bool hasNullOutputQtDebugMsg(bool condition, int area = K
			DE_DEFAULT_DEBUG_AREA)
			{ return hasNullOutput(QtDebugMsg, condition, area, KDE_DEBUG_ENABL
			ED_BY_DEFAULT); }
			/**
			* @since 4.4
			* Register a debug area dynamically.
			* @param areaName the name of the area
			* @param enabled whether debug output should be enabled by default
			* (users can override this in kdebugdialog or with DisableAll=true in
			kdebugrc)
			* @return the area code that was allocated for this area
			*
			* Typical usage:
			* If all uses of the debug area are restricted to a single class, add
			a method like this
			* (e.g. into the Private class, if there's one)
			* <code>
			* static int debugArea() { static int s_area = KDebug::registerArea("
			areaName"); return s_area; }
			* </code>
			*
			* If all uses of the debug area are restricted to a single .cpp file,
			do the same
			* but outside any class, and then use a more specific name for the fun
			ction.
			*
			* If however multiple classes and files need the debug area, then
			* declare it in one file without static, and use "extern int debugArea
			();"
			* in other files (with a better name for the function of course).
			*/
			static KDECORE_EXPORT int registerArea(const QByteArray& areaName, bool
			enabled = true);
	};		};
	#if !defined(KDE_NO_DEBUG_OUTPUT)		#if !defined(KDE_NO_DEBUG_OUTPUT)
	# define kDebug KDebug(QtDebugMsg, __FILE__, __LINE__, Q_FUNC_INFO)		/* __VA_ARGS__ should work with any supported GCC version and MSVC > 2005 *
			/
			# if defined(Q_CC_GNU) || (defined(Q_CC_MSVC) && _MSC_VER >= 1500)
			# define kDebug(...) for (bool _k_kDebugDoOutput_ = !KDebug::hasNullOutput
			QtDebugMsg(__VA_ARGS__); \
			KDE_ISUNLIKELY(_k_kDebugDoOutput_); _k_kDebugDoO
			utput_ = false) \
			KDebug(QtDebugMsg, __FILE__, __LINE__, Q_FUNC_IN
			FO)(__VA_ARGS__)
			# else
			# define kDebug KDebug(QtDebugMsg, __FILE__, __LINE__, Q_FUNC_INFO)
			# endif
	#else		#else
	# define kDebug if (1); else 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 if (1); else kWarning		# define kWarning while (false) kWarning
	#endif		#endif
	/** @} */		/** @} */
	#endif		#endif
End of changes. 7 change blocks.
	4 lines changed or deleted		70 lines changed or added

	kdefakes.h		kdefakes.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 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 KDEFAKES_H		#ifndef KDEFAKES_H
	#define KDEFAKES_H		#define KDEFAKES_H
	/* This file defines the prototypes for a few system calls for platforms wh		/* This file defines the prototypes for a few (C library) functions for
	ich either		platforms which either
	1) have those system calls, but lack the prototypes in their header file		1) have those functions, but lack the prototypes in their header files.
	s.		2) don't have those functions, in which case kdecore provides them
	2) don't have those system calls, in which case kdecore provides those f
	unctions.
	You should include this file in any .cpp file that uses at least one of
	those functions:
	strlcat, strlcpy,
	strcasestr,
	setenv, unsetenv,
	usleep, initgroups,
	random, srandom (this is for KRandom itself, prefer using KRandom in a
	ny other code)
	mkdtemp (this is for KTempDir itself, prefer using KTempDir everywhere
	else)
	mkstemp, mkstemps (prefer to use QTemporaryfile instead)
	trunc
			You should include this file in any .cpp file that uses any one of these
			functions:
			strlcat, strlcpy,
			strcasestr,
			setenv, unsetenv,
			usleep, initgroups,
			random, srandom (this is for KRandom itself, prefer using KRandom in
			any other code)
			mkdtemp (this is for KTempDir itself, prefer using KTempDir everywhere
			else)
			mkstemp, mkstemps (prefer to use QTemporaryfile instead)
			trunc
			getgrouplist
	*/		*/
	/* #undef HAVE_STRLCAT_PROTO */		/* #undef HAVE_STRLCAT_PROTO */
	#if !defined(HAVE_STRLCAT_PROTO)		#if !defined(HAVE_STRLCAT_PROTO)
	#ifdef __cplusplus		#ifdef __cplusplus
	extern "C" {		extern "C" {
	#endif		#endif
	unsigned long strlcat(char*, const char*, unsigned long);		unsigned long strlcat(char*, const char*, unsigned long);
	#ifdef __cplusplus		#ifdef __cplusplus
	}		}
	skipping to change at line 182		skipping to change at line 184
	#if !defined(HAVE_TRUNC)		#if !defined(HAVE_TRUNC)
	#ifdef __cplusplus		#ifdef __cplusplus
	extern "C" {		extern "C" {
	#endif		#endif
	double trunc(double);		double trunc(double);
	#ifdef __cplusplus		#ifdef __cplusplus
	}		}
	#endif		#endif
	#endif		#endif
			#define HAVE_GETGROUPLIST 1
			#if !defined(HAVE_GETGROUPLIST)
			#include <sys/types.h> /* for gid_t */
			#ifdef __cplusplus
			extern "C" {
			#endif
			int getgrouplist(const char *, gid_t , gid_t *, int *);
			#ifdef __cplusplus
			}
			#endif
			#endif
	#endif /* KDEFAKES_H */		#endif /* KDEFAKES_H */
End of changes. 3 change blocks.
	19 lines changed or deleted		29 lines changed or added

	kdeprintdialog.h		kdeprintdialog.h
	skipping to change at line 38		skipping to change at line 38
	class QPrintDialog;		class QPrintDialog;
	class QPrinter;		class QPrinter;
	class QWidget;		class QWidget;
	/**		/**
	* Namespace for the KDE printing system		* Namespace for the KDE printing system
	*/		*/
	namespace KdePrint		namespace KdePrint
	{		{
	/**		/**
			* Whether pages to be printed are selected by the application or the p
			rint system.
			*
			* If ApplicationSelectsPages is set then the Application paints only t
			he
			* pages selected by the user in the Print Dialog and the Print System
			prints
			* all the pages.
			*
			* If SystemSelectsPages is set then the Application paints all the pag
			es
			* and the Server will attempt to select the user requested pages. Thi
			s
			* only works in CUPS, not LPR, Windows, or OSX.
			*/
			enum PageSelectPolicy { ApplicationSelectsPages, SystemSelectsPages };
			/**
			* @since 4.4
			*
	* Creates a printer dialog for a QPrinter with the given custom widget s.		* Creates a printer dialog for a QPrinter with the given custom widget s.
	*		*
			* If ApplicationSelectsPages is set then the Application paints only t
			he
			* pages selected by the user in the Print Dialog and the Print System
			prints
			* all the pages.
			*
			* If SystemSelectsPages is set then the Application paints all the pag
			es
			* and the Server will attempt to select the user requested pages. On
			* platforms where the Server does not support the selection of pages
			* (i.e. Windows, OSX, and LPR) then the Page Range input will be disab
			led
			* on the print dialog.
			*
	* Note that the custom widgets are only supported on X11		* Note that the custom widgets are only supported on X11
	* and will @b not be shown on Qt versions prior to 4.3.2.		* and will @b not be shown on Qt versions prior to 4.3.2.
	* On non-X11 systems it is preferred to provide the widgets		* On non-X11 systems it is preferred to provide the widgets
	* within configuration dialog of the application.		* within configuration dialog of the application.
	*		*
	* Setting the widgets will transfer their ownership to the print dialo g		* Setting the widgets will transfer their ownership to the print dialo g
	* even on non-X11 systems.		* even on non-X11 systems.
			*
	* The caller takes ownership of the dialog and is responsible		* The caller takes ownership of the dialog and is responsible
	* for deleting it.		* for deleting it.
	*		*
	* @param printer the QPrinter to apply settings to		* @param printer the QPrinter to apply settings to
	* @param parent the parent for the dialog		* @param pageSelectPolicy whether the Application or the System does t he page selection
	* @param customTabs a list of custom widgets to show as tabs, the name printed on the tab will		* @param customTabs a list of custom widgets to show as tabs, the name printed on the tab will
	* be taken from the widgets windowTitle().		* be taken from the widgets windowTitle().
			* @param parent the parent for the dialog
	* @see QWidget::setWindowTitle()		* @see QWidget::setWindowTitle()
	* @see QAbstractPrintDialog::setOptionTabs()		* @see QAbstractPrintDialog::setOptionTabs()
	*/		*/
	KDEUI_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer,		KDEUI_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer,
			PageSelectPolicy pageSelec tPolicy,
	const QList<QWidget*> &cus tomTabs,		const QList<QWidget*> &cus tomTabs,
	QWidget *parent = 0);		QWidget *parent = 0);
	/**		/**
			* Creates a printer dialog for a QPrinter with the given custom widget
			s.
			*
			* Convenience method, assumes PageSelectionMode of ApplicationSelectsP
			ages,
			* see full version method for full documentation.
			*
			* The caller takes ownership of the dialog and is responsible
			* for deleting it.
			*
			* @param printer the QPrinter to apply settings to
			* @param parent the parent for the dialog
			* @param customTabs a list of custom widgets to show as tabs, the name
			printed on the tab will
			* be taken from the widgets windowTitle().
			*/
			KDEUI_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer,
			const QList<QWidget*> &cust
			omTabs,
			QWidget *parent = 0);
			/**
			* @since 4.4
			*
			* Creates a printer dialog for a QPrinter with the given custom widget
			s.
			*
			* Convenience method, see full version method for full documentation.
			*
			* The caller takes ownership of the dialog and is responsible
			* for deleting it.
			*
			* @param printer the QPrinter to apply settings to
			* @param pageSelectPolicy whether the Application or the System does t
			he page selection
			* @param parent the parent for the dialog
			*/
			KDEUI_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer,
			PageSelectPolicy pageSelec
			tPolicy,
			QWidget *parent = 0);
			/**
	* Creates a printer dialog for a QPrinter		* Creates a printer dialog for a QPrinter
	*		*
			* Convenience method, assumes PageSelectionMode of ApplicationSelectsP
			ages,
			* see full version method for full documentation.
			*
	* The caller takes ownership of the dialog and is responsible		* The caller takes ownership of the dialog and is responsible
	* for deleting it.		* for deleting it.
	*		*
	* @param printer the QPrinter to apply settings to		* @param printer the QPrinter to apply settings to
	* @param parent the parent for the dialog		* @param parent the parent for the dialog
	*/		*/
	KDEUI_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer,		KDEUI_EXPORT QPrintDialog *createPrintDialog(QPrinter *printer,
	QWidget *parent = 0);		QWidget *parent = 0);
	}		}
End of changes. 8 change blocks.
	1 lines changed or deleted		85 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.3.5 (KDE 4.3.5)"		#define KDE_VERSION_STRING "4.4.00 (KDE 4.4.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 3		#define KDE_VERSION_MINOR 4
	/**		/**
	* @def KDE_VERSION_RELEASE		* @def KDE_VERSION_RELEASE
	* @ingroup KDEMacros		* @ingroup KDEMacros
	* @brief Release version of KDE, at compile time		* @brief Release version of KDE, at compile time
	*/		*/
	#define KDE_VERSION_RELEASE 5		#define KDE_VERSION_RELEASE 00
	/**		/**
	* @ingroup KDEMacros		* @ingroup KDEMacros
	* @brief Make a number from the major, minor and release number of a KDE v ersion		* @brief Make a number from the major, minor and release number of a KDE v ersion
	*		*
	* This function can be used for preprocessing when KDE_IS_VERSION is not		* This function can be used for preprocessing when KDE_IS_VERSION is not
	* appropriate.		* appropriate.
	*/		*/
	#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))		#define KDE_MAKE_VERSION( a,b,c ) (((a) << 16) | ((b) << 8) | (c))
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	kdialog.h		kdialog.h
	skipping to change at line 114		skipping to change at line 114
	* FooWidget *widget = new FooWidget( dialog );		* FooWidget *widget = new FooWidget( dialog );
	* dialog->setMainWidget( widget );		* dialog->setMainWidget( widget );
	* connect( dialog, SIGNAL( applyClicked() ), widget, SLOT( save() ) );		* connect( dialog, SIGNAL( applyClicked() ), widget, SLOT( save() ) );
	* connect( dialog, SIGNAL( okClicked() ), widget, SLOT( save() ) );		* connect( dialog, SIGNAL( okClicked() ), widget, SLOT( save() ) );
	* connect( widget, SIGNAL( changed( bool ) ), dialog, SLOT( enableButton Apply( bool ) ) );		* connect( widget, SIGNAL( changed( bool ) ), dialog, SLOT( enableButton Apply( bool ) ) );
	*		*
	* dialog->enableButtonApply( false );		* dialog->enableButtonApply( false );
	* dialog->show();		* dialog->show();
	* \endcode		* \endcode
	*		*
			* \image html kdialog.png "KDE Dialog example"
	*		*
	* This class can be used in many ways. Note that most KDE ui widgets		* This class can be used in many ways. Note that most KDE ui widgets
	* and many of KDE core applications use the KDialog so for more		* and many of KDE core applications use the KDialog so for more
	* inspiration you should study the code for these.		* inspiration you should study the code for these.
	*		*
	*		*
	* @see KPageDialog		* @see KPageDialog
	* @author Thomas Tanghus <tanghus@earthling.net>		* @author Thomas Tanghus <tanghus@earthling.net>
	* @author Espen Sand <espensa@online.no>		* @author Espen Sand <espensa@online.no>
	* @author Mirko Boehm <mirko@kde.org>		* @author Mirko Boehm <mirko@kde.org>
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	kdialogbuttonbox.h		kdialogbuttonbox.h
	skipping to change at line 39		skipping to change at line 39
	class KPushButton;		class KPushButton;
	class KGuiItem;		class KGuiItem;
	class KDialogButtonBoxPrivate;		class KDialogButtonBoxPrivate;
	/**		/**
	* Container widget for buttons.		* Container widget for buttons.
	*		*
	* An extension of QDialogButtonBox which allow the use of KGuiItem and		* An extension of QDialogButtonBox which allow the use of KGuiItem and
	* conveniance slot connection.		* conveniance slot connection.
	*		*
			* \image html kdialogbuttonbox.png "Various KDE Dialog Button Boxes with d
			ifferent buttons"
			*
	* @author Mario Weilguni <mweilguni@sime.com>		* @author Mario Weilguni <mweilguni@sime.com>
	* @author Olivier Goffart <ogoffart@kde.org>		* @author Olivier Goffart <ogoffart@kde.org>
	**/		**/
	class KDEUI_EXPORT KDialogButtonBox : public QDialogButtonBox		class KDEUI_EXPORT KDialogButtonBox : public QDialogButtonBox
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kdirlister.h		kdirlister.h
	skipping to change at line 122		skipping to change at line 122
	* @return true if successful,		* @return true if successful,
	* false otherwise (e.g. invalid @p _url)		* false otherwise (e.g. invalid @p _url)
	*/		*/
	virtual bool openUrl( const KUrl& _url, OpenUrlFlags _flags = NoFlags );		virtual bool openUrl( const KUrl& _url, OpenUrlFlags _flags = NoFlags );
	/**		/**
	* Stop listing all directories currently being listed.		* Stop listing all directories currently being listed.
	*		*
	* Emits canceled() if there was at least one job running.		* Emits canceled() if there was at least one job running.
	* Emits canceled( const KUrl& ) for each stopped job if		* Emits canceled( const KUrl& ) for each stopped job if
	* there are at least two dirctories being watched by KDirLister.		* there are at least two directories being watched by KDirLister.
	*/		*/
	virtual void stop();		virtual void stop();
	/**		/**
	* Stop listing the given directory.		* Stop listing the given directory.
	*		*
	* Emits canceled() if the killed job was the last running one.		* Emits canceled() if the killed job was the last running one.
	* Emits canceled( const KUrl& ) for the killed job if		* Emits canceled( const KUrl& ) for the killed job if
	* there are at least two directories being watched by KDirLister.		* there are at least two directories being watched by KDirLister.
	* No signal is emitted if there was no job running for @p _url.		* No signal is emitted if there was no job running for @p _url.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kdirnotify.h		kdirnotify.h
	skipping to change at line 24		skipping to change at line 24
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QByteArray>		#include <QtCore/QByteArray>
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtCore/QMap>		#include <QtCore/QMap>
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <QtDBus/QtDBus>		#include <QtDBus/QtDBus>
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
	/*		/**
	* Proxy class for interface org.kde.KDirNotify		* \class OrgKdeKDirNotifyInterface kdirnotify.h KDirNotify
			*
			* \brief Proxy class for interface org.kde.KDirNotify.
			*
			* KDirNotify can be used to inform KIO about changes in real or virtual fi
			le systems.
			* Classes like KDirModel connect to the signals as in the following exampl
			e to
			* be able to keep caches up-to-date.
			*
			* \code
			* kdirnotify = new org::kde::KDirNotify(QString(), QString(), QDBusConnect
			ion::sessionBus(), this);
			* connect(kdirnotify, SIGNAL(FileRenamed(QString,QString)), SLOT(slotFileR
			enamed(QString,QString)));
			* connect(kdirnotify, SIGNAL(FilesAdded(QString)), SLOT(slotFilesAdded(QSt
			ring)));
			* connect(kdirnotify, SIGNAL(FilesChanged(QStringList)), SLOT(slotFilesCha
			nged(QStringList)));
			* connect(kdirnotify, SIGNAL(FilesRemoved(QStringList)), SLOT(slotFilesRem
			oved(QStringList)));
			* \endcode
			*
			* Especially noteworthy are the empty strings for both \p service and \p p
			ath. That
			* way the client will connect to signals emitted by any application.
			*
			* The second usage is to actually emit the signals. For that emitFileRenam
			ed() and friends are
			* to be used.
	*/		*/
	class KIO_EXPORT OrgKdeKDirNotifyInterface: public QDBusAbstractInterface		class KIO_EXPORT OrgKdeKDirNotifyInterface: public QDBusAbstractInterface
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	static inline const char *staticInterfaceName()		static inline const char *staticInterfaceName()
	{ return "org.kde.KDirNotify"; }		{ return "org.kde.KDirNotify"; }
	public:		public:
			/**
			* Create a new KDirNotify interface.
			*
			* \param service The service whose signals one wants to listed to. Use
			an empty
			* string to connect to all services/applications.
			* \param path The path to the D-Bus object whose signals one wants to
			listed to.
			* Use an empty string to connect to signals from all objects.
			* \param connection Typically QDBusConnection::sessionBus().
			* \param parent The parent QObject.
			*/
	OrgKdeKDirNotifyInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);		OrgKdeKDirNotifyInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
			/**
			* Destructor.
			*/
	~OrgKdeKDirNotifyInterface();		~OrgKdeKDirNotifyInterface();
	public Q_SLOTS: // METHODS		public Q_SLOTS: // METHODS
	Q_SIGNALS: // SIGNALS		Q_SIGNALS: // SIGNALS
	void FileRenamed(const QString &src, const QString &dst);		void FileRenamed(const QString &src, const QString &dst);
	void FileMoved(const QString &src, const QString &dst);		void FileMoved(const QString &src, const QString &dst);
	void FilesAdded(const QString &directory);		void FilesAdded(const QString &directory);
	void FilesChanged(const QStringList &fileList);		void FilesChanged(const QStringList &fileList);
	void FilesRemoved(const QStringList &fileList);		void FilesRemoved(const QStringList &fileList);
	void enteredDirectory(const QString &url);		void enteredDirectory(const QString &url);
End of changes. 3 change blocks.
	2 lines changed or deleted		46 lines changed or added

	kdirselectdialog.h		kdirselectdialog.h
	skipping to change at line 58		skipping to change at line 58
	explicit KDirSelectDialog(const KUrl& startDir = KUrl(),		explicit KDirSelectDialog(const KUrl& startDir = KUrl(),
	bool localOnly = false,		bool localOnly = false,
	QWidget *parent = 0L);		QWidget *parent = 0L);
	/**		/**
	* Destroys the directory selection dialog.		* Destroys the directory selection dialog.
	*/		*/
	~KDirSelectDialog();		~KDirSelectDialog();
	/**		/**
	* @return The currently selected URL, or an empty one if no item is se		* Returns the currently selected URL, or an empty one if no item is se
	lected.		lected.
			*
			* If the URL entered in the combobox is valid and exists, it is return
			ed.
			* Otherwise, the URL selected in the treeview is returned instead.
	*/		*/
	KUrl url() const;		KUrl url() const;
	/**		/**
	* Returns a pointer to the view which is used for displaying the direc tories.		* Returns a pointer to the view which is used for displaying the direc tories.
	*/		*/
	QAbstractItemView* view() const;		QAbstractItemView* view() const;
	/**		/**
	* Returns whether only local directories can be selected.		* Returns whether only local directories can be selected.
End of changes. 1 change blocks.
	2 lines changed or deleted		6 lines changed or added

	kdirsortfilterproxymodel.h		kdirsortfilterproxymodel.h
	skipping to change at line 53		skipping to change at line 53
	* - item_2.png		* - item_2.png
	* - item_10.png		* - item_10.png
	*		*
	* Don't use it with non-KDirModel derivatives.		* Don't use it with non-KDirModel derivatives.
	*		*
	* @author Dominic Battre, Martin Pool and Peter Penz		* @author Dominic Battre, Martin Pool and Peter Penz
	*/		*/
	class KFILE_EXPORT KDirSortFilterProxyModel		class KFILE_EXPORT KDirSortFilterProxyModel
	: public KCategorizedSortFilterProxyModel		: public KCategorizedSortFilterProxyModel
	{		{
			Q_OBJECT
	public:		public:
	KDirSortFilterProxyModel(QObject* parent = 0);		KDirSortFilterProxyModel(QObject* parent = 0);
	virtual ~KDirSortFilterProxyModel();		virtual ~KDirSortFilterProxyModel();
	/** Reimplemented from QAbstractItemModel. Returns true for directories . */		/** Reimplemented from QAbstractItemModel. Returns true for directories . */
	virtual bool hasChildren(const QModelIndex& parent = QModelIndex()) con st;		virtual bool hasChildren(const QModelIndex& parent = QModelIndex()) con st;
	/**		/**
	* Reimplemented from QAbstractItemModel.		* Reimplemented from QAbstractItemModel.
	* Returns true for 'empty' directories so they can be populated later.		* Returns true for 'empty' directories so they can be populated later.
	skipping to change at line 90		skipping to change at line 92
	* @since 4.3		* @since 4.3
	*/		*/
	bool sortFoldersFirst() const;		bool sortFoldersFirst() const;
	protected:		protected:
	/**		/**
	* Reimplemented from KCategorizedSortFilterProxyModel.		* Reimplemented from KCategorizedSortFilterProxyModel.
	*/		*/
	virtual bool subSortLessThan(const QModelIndex& left,		virtual bool subSortLessThan(const QModelIndex& left,
	const QModelIndex& right) const;		const QModelIndex& right) const;
			private:
			Q_PRIVATE_SLOT(d, void slotNaturalSortingChanged())
	private:		private:
	class KDirSortFilterProxyModelPrivate;		class KDirSortFilterProxyModelPrivate;
	KDirSortFilterProxyModelPrivate* const d;		KDirSortFilterProxyModelPrivate* const d;
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		4 lines changed or added

	keditlistbox.h		keditlistbox.h
	skipping to change at line 37		skipping to change at line 37
	class KLineEdit;		class KLineEdit;
	class KComboBox;		class KComboBox;
	class QListView;		class QListView;
	class QPushButton;		class QPushButton;
	class KEditListBoxPrivate;		class KEditListBoxPrivate;
	/**		/**
	* An editable listbox		* An editable listbox
	*		*
	* This class provides a editable listbox ;-), this means		* This class provides an editable listbox, this means
	* a listbox which is accompanied by a line edit to enter new		* a listbox which is accompanied by a line edit to enter new
	* items into the listbox and pushbuttons to add and remove		* items into the listbox and pushbuttons to add and remove
	* items from the listbox and two buttons to move items up and down.		* items from the listbox and two buttons to move items up and down.
	*		*
	* \image html keditlistbox.png "KDE Edit List Box Widget"		* \image html keditlistbox.png "KDE Edit List Box Widget"
	*		*
	*/		*/
	class KDEUI_EXPORT KEditListBox : public QGroupBox		class KDEUI_EXPORT KEditListBox : public QGroupBox
	{		{
	Q_OBJECT		Q_OBJECT
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kedittoolbar.h		kedittoolbar.h
	skipping to change at line 63		skipping to change at line 63
	* find all of the action collections and XML files (there is one of each f or the		* find all of the action collections and XML files (there is one of each f or the
	* mainwindow, but there could be more, when adding other XMLGUI clients li ke		* mainwindow, but there could be more, when adding other XMLGUI clients li ke
	* KParts or plugins). The editor aims to be semi-intelligent about where i t		* KParts or plugins). The editor aims to be semi-intelligent about where i t
	* assigns any modifications. In other words, it will not write out part sp ecific		* assigns any modifications. In other words, it will not write out part sp ecific
	* changes to your application's main XML file.		* changes to your application's main XML file.
	*		*
	* KXmlGuiWindow and KParts::MainWindow take care of creating KEditToolBar correctly		* KXmlGuiWindow and KParts::MainWindow take care of creating KEditToolBar correctly
	* and connecting to its newToolBarConfig slot, but if you really really wa nt to do it		* and connecting to its newToolBarConfig slot, but if you really really wa nt to do it
	* yourself, see the KXmlGuiWindow::configureToolbars() and KXmlGuiWindow:: saveNewToolbarConfig() code.		* yourself, see the KXmlGuiWindow::configureToolbars() and KXmlGuiWindow:: saveNewToolbarConfig() code.
	*		*
			* \image html kedittoolbar.png "KDE Toolbar Editor (KWrite)"
			*
	* @author Kurt Granroth <granroth@kde.org>		* @author Kurt Granroth <granroth@kde.org>
	* @maintainer David Faure <faure@kde.org>		* @maintainer David Faure <faure@kde.org>
	*/		*/
	class KDEUI_EXPORT KEditToolBar : public KDialog		class KDEUI_EXPORT KEditToolBar : public KDialog
	{		{
	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
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kfile.h		kfile.h
	skipping to change at line 34		skipping to change at line 34
	/**		/**
	* KFile is a class which provides a namespace for some enumerated		* KFile is a class which provides a namespace for some enumerated
	* values associated with the kfile library. You will never need to		* values associated with the kfile library. You will never need to
	* construct a KFile object itself.		* construct a KFile object itself.
	*/		*/
	class KIO_EXPORT KFile		class KIO_EXPORT KFile
	{		{
	Q_GADGET		Q_GADGET
	Q_FLAGS(KFile::Modes)		Q_FLAGS(Modes)
	public:		public:
	/**		/**
	* Modes of operation for the dialog.		* Modes of operation for the dialog.
	* @li @p File - Get a single file name from the user.		* @li @p File - Get a single file name from the user.
	* @li @p Directory - Get a directory name from the user.		* @li @p Directory - Get a directory name from the user.
	* @li @p Files - Get multiple file names from the user.		* @li @p Files - Get multiple file names from the user.
	* @li @p ExistingOnly - Never return a filename which does not exist y et		* @li @p ExistingOnly - Never return a filename which does not exist y et
	* @li @p LocalOnly - Don't return remote filenames		* @li @p LocalOnly - Don't return remote filenames
	*/		*/
	enum Mode {		enum Mode {
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kfiledialog.h		kfiledialog.h
	// -*- c++ -*-		// -*- c++ -*-
	/* This file is part of the KDE libraries		/* This file is part of the KDE libraries
	Copyright (C) 1997, 1998 Richard Moore <rich@kde.org>		Copyright (C) 1997, 1998 Richard Moore <rich@kde.org>
	1998 Stephan Kulow <coolo@kde.org>		1998 Stephan Kulow <coolo@kde.org>
	1998 Daniel Grana <grana@ie.iwi.unibe.ch>		1998 Daniel Grana <grana@ie.iwi.unibe.ch>
	2000,2001 Carsten Pfeiffer <pfeiffer@kde.org>		2000,2001 Carsten Pfeiffer <pfeiffer@kde.org>
	2001 Frerich Raabe <raabe@kde.org>		2001 Frerich Raabe <raabe@kde.org>
	2007 David Faure <faure@kde.org>		2007 David Faure <faure@kde.org>
			2009 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 87		skipping to change at line 88
	* setKeepLocation() being set.		* setKeepLocation() being set.
	*		*
	* @p Other means that no default actions are performed.		* @p Other means that no default actions are performed.
	*		*
	* @see setOperationMode		* @see setOperationMode
	* @see operationMode		* @see operationMode
	*/		*/
	enum OperationMode { Other = 0, Opening, Saving };		enum OperationMode { Other = 0, Opening, Saving };
	/**		/**
			* Defines the options to use when calling getSave* functions.
			* @since 4.4
			*/
			enum Option {
			ConfirmOverwrite = 0x01, /**< Confirm whether to overwrite file
			to save. */
			ShowInlinePreview = 0x02 /**< Always show an inline preview. */
			};
			Q_DECLARE_FLAGS(Options, Option)
			/**
	* Constructs a file dialog.		* Constructs a file dialog.
	*		*
	* @param startDir Specifies the starting directory and/or initially s elected		* @param startDir Specifies the starting directory and/or initially s elected
	* file name, or a last used directory and optional fi le name		* file name, or a last used directory and optional fi le name
	* using the @c kfiledialog:/// syntax.		* using the @c kfiledialog:/// syntax.
	* Refer to the KFileWidget documentation for more inf ormation		* Refer to the KFileWidget documentation for more inf ormation
	* on this parameter.		* on this parameter.
	*		*
	* @param filter A shell glob or a mime-type-filter that specifies		* @param filter A shell glob or a mime-type-filter that specifies
	* which files to display.		* which files to display.
	skipping to change at line 456		skipping to change at line 467
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static QString getSaveFileName( const KUrl& startDir = KUrl(),		static QString getSaveFileName( const KUrl& startDir = KUrl(),
	const QString& filter = QString(),		const QString& filter = QString(),
	QWidget *parent = 0,		QWidget *parent = 0,
	const QString& caption = QString() );		const QString& caption = QString() );
	/**		/**
			* Creates a modal file dialog and returns the selected
			* filename or an empty string if none was chosen.
			*
			* Note that with this
			* method the user need not select an existing filename.
			*
			* @param startDir Starting directory or @c kfiledialog:/// URL.
			* Refer to the KFileWidget documentation for more info
			rmation
			* on this parameter.
			* @param filter A shell glob or a mime-type-filter that specifies whic
			h files to display.
			* The preferred option is to set a list of mimetype names, see setM
			imeFilter() for details.
			* Otherwise you can set the text to be displayed for the each glob,
			and
			* provide multiple globs, see setFilter() for details.
			* @param parent The widget the dialog will be centered on initially.
			* @param caption The name of the dialog widget.
			* @param options Dialog options.
			*
			* @see KFileWidget::KFileWidget()
			*
			* @since 4.4
			*/
			static QString getSaveFileName( const KUrl& startDir,
			const QString& filter,
			QWidget *parent,
			const QString& caption,
			Options options );
			/**
	* This function accepts the window id of the parent window, instead		* This function accepts the window id of the parent window, instead
	* of QWidget*. It should be used only when necessary.		* of QWidget*. It should be used only when necessary.
	*/		*/
	static QString getSaveFileNameWId( const KUrl &startDir, const QString& filter,		static QString getSaveFileNameWId( const KUrl &startDir, const QString& filter,
	WId parent_id,		WId parent_id,
	const QString& caption );		const QString& caption );
	/**		/**
			* This function accepts the window id of the parent window, instead
			* of QWidget*. It should be used only when necessary.
			*
			* @since 4.4
			*/
			static QString getSaveFileNameWId( const KUrl &startDir, const QString&
			filter,
			WId parent_id,
			const QString& caption,
			Options options );
			/**
	* Creates a modal file dialog and returns the selected		* Creates a modal file dialog and returns the selected
	* filename or an empty string if none was chosen.		* filename or an empty string if none was chosen.
	*		*
	* Note that with this		* Note that with this
	* method the user need not select an existing filename.		* method the user need not select an existing filename.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.		* @param filter A shell glob or a mime-type-filter that specifies whic h files to display.
	skipping to change at line 488		skipping to change at line 538
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	*		*
	* @see KFileWidget::KFileWidget()		* @see KFileWidget::KFileWidget()
	*/		*/
	static KUrl getSaveUrl( const KUrl& startDir = KUrl(),		static KUrl getSaveUrl( const KUrl& startDir = KUrl(),
	const QString& filter = QString(),		const QString& filter = QString(),
	QWidget *parent = 0,		QWidget *parent = 0,
	const QString& caption = QString() );		const QString& caption = QString() );
	/**		/**
			* Creates a modal file dialog and returns the selected
			* filename or an empty string if none was chosen.
			*
			* Note that with this
			* method the user need not select an existing filename.
			*
			* @param startDir Starting directory or @c kfiledialog:/// URL.
			* Refer to the KFileWidget documentation for more info
			rmation
			* on this parameter.
			* @param filter A shell glob or a mime-type-filter that specifies whic
			h files to display.
			* The preferred option is to set a list of mimetype names, see setM
			imeFilter() for details.
			* Otherwise you can set the text to be displayed for the each glob,
			and
			* provide multiple globs, see setFilter() for details.
			* @param parent The widget the dialog will be centered on initially.
			* @param caption The name of the dialog widget.
			* @param options Dialog options.
			*
			* @see KFileWidget::KFileWidget()
			*
			* @since 4.4
			*/
			static KUrl getSaveUrl( const KUrl& startDir,
			const QString& filter,
			QWidget *parent,
			const QString& caption,
			Options options );
			/**
	* Creates a modal directory-selection dialog and returns the selected		* Creates a modal directory-selection dialog and returns the selected
	* directory (local only) or an empty string if none was chosen.		* directory (local only) or an empty string if none was chosen.
	*		*
	* @param startDir Starting directory or @c kfiledialog:/// URL.		* @param startDir Starting directory or @c kfiledialog:/// URL.
	* Refer to the KFileWidget documentation for more info rmation		* Refer to the KFileWidget documentation for more info rmation
	* on this parameter.		* on this parameter.
	* @param parent The widget the dialog will be centered on initially.		* @param parent The widget the dialog will be centered on initially.
	* @param caption The name of the dialog widget.		* @param caption The name of the dialog widget.
	* @return the path to an existing local directory.		* @return the path to an existing local directory.
	*		*
	skipping to change at line 662		skipping to change at line 740
	int exec();		int exec();
	#endif		#endif
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the user selects a file. It is only emitted in single-		* Emitted when the user selects a file. It is only emitted in single-
	* selection mode. The best way to get notified about selected file(s)		* selection mode. The best way to get notified about selected file(s)
	* is to connect to the okClicked() signal inherited from KDialog		* is to connect to the okClicked() signal inherited from KDialog
	* and call selectedFile(), selectedFiles(),		* and call selectedFile(), selectedFiles(),
	* selectedUrl() or selectedUrls().		* selectedUrl() or selectedUrls().
			*
			* \since 4.4
	*/		*/
	void fileSelected(const QString&);		void fileSelected(const KUrl&);
			/**
			* @deprecated, connect to fileSelected(const KUrl&) instead
			*/
			QT_MOC_COMPAT void fileSelected(const QString&); // TODO KDE5: remove
	/**		/**
	* Emitted when the user highlights a file.		* Emitted when the user highlights a file.
			*
			* \since 4.4
	*/		*/
	void fileHighlighted(const QString&);		void fileHighlighted(const KUrl&);
			/**
			* @deprecated, connect to fileSelected(const KUrl&) instead
			*/
			QT_MOC_COMPAT void fileHighlighted(const QString&); // TODO KDE5: remov
			e
	/**		/**
	* Emitted when the user hilights one or more files in multiselection m ode.		* Emitted when the user hilights one or more files in multiselection m ode.
	*		*
	* Note: fileHighlighted() or fileSelected() are @em not		* Note: fileHighlighted() or fileSelected() are @em not
	* emitted in multiselection mode. You may use selectedItems() to		* emitted in multiselection mode. You may use selectedItems() to
	* ask for the current highlighted items.		* ask for the current highlighted items.
	* @see fileSelected		* @see fileSelected
	*/		*/
	void selectionChanged();		void selectionChanged();
End of changes. 9 change blocks.
	2 lines changed or deleted		103 lines changed or added

	kfileitem.h		kfileitem.h
	skipping to change at line 275		skipping to change at line 275
	/**		/**
	* Returns the target url of the file, which is the same as url()		* Returns the target url of the file, which is the same as url()
	* in cases where the slave doesn't specify UDS_TARGET_URL		* in cases where the slave doesn't specify UDS_TARGET_URL
	* @return the target url.		* @return the target url.
	* @since 4.1		* @since 4.1
	*/		*/
	KUrl targetUrl() const;		KUrl targetUrl() const;
	/**		/**
			* Returns the resource URI to be used for Nepomuk annotations. In case
			* the slave does not specify UDS_NEPOMUK_URI an invalid url is
			* returned.
			* For local files this is the same as url().
			* @return The Nepomuk resource URI.
			* @since 4.4
			*/
			KUrl nepomukUri() const;
			/**
	* Returns the local path if isLocalFile() == true or the KIO item has		* Returns the local path if isLocalFile() == true or the KIO item has
	* a UDS_LOCAL_PATH atom.		* a UDS_LOCAL_PATH atom.
	* @return the item local path, or QString() if not known		* @return the item local path, or QString() if not known
	*/		*/
	QString localPath() const;		QString localPath() const;
	/**		/**
	* Returns the size of the file, if known.		* Returns the size of the file, if known.
	* @return the file size, or 0 if not known		* @return the file size, or 0 if not known
	*/		*/
	skipping to change at line 360		skipping to change at line 370
	/**		/**
	* @return true if we have determined the mimetype of this file already ,		* @return true if we have determined the mimetype of this file already ,
	* i.e. if determineMimeType() will be fast. Otherwise it will have to		* i.e. if determineMimeType() will be fast. Otherwise it will have to
	* find what the mimetype is, which is a possibly slow operation; usual ly		* find what the mimetype is, which is a possibly slow operation; usual ly
	* this is delayed until necessary.		* this is delayed until necessary.
	*/		*/
	bool isMimeTypeKnown() const;		bool isMimeTypeKnown() const;
	/**		/**
	* Returns the descriptive comment for this mime type, or		* Returns the user-readable string representing the type of this file,
	* the mime type itself if none is present.		* like "OpenDocument Text File".
	* @return the mime type description, or the mime type itself		* @return the type of this KFileItem
	*/		*/
	QString mimeComment() const;		QString mimeComment() const;
	/**		/**
	* Returns the full path name to the icon that represents		* Returns the full path name to the icon that represents
	* this mime type.		* this mime type.
	* @return iconName the name of the file's icon		* @return iconName the name of the file's icon
	*/		*/
	QString iconName() const;		QString iconName() const;
	skipping to change at line 640		skipping to change at line 650
	/// @return the list of target URLs that those items represent		/// @return the list of target URLs that those items represent
	/// @since 4.2		/// @since 4.2
	KUrl::List targetUrlList() const;		KUrl::List targetUrlList() const;
	// TODO KDE-5 add d pointer here so that we can merge KFileItemListProper ties into KFileItemList		// TODO KDE-5 add d pointer here so that we can merge KFileItemListProper ties into KFileItemList
	};		};
	KIO_EXPORT QDataStream & operator<< ( QDataStream & s, const KFileItem & a );		KIO_EXPORT QDataStream & operator<< ( QDataStream & s, const KFileItem & a );
	KIO_EXPORT QDataStream & operator>> ( QDataStream & s, KFileItem & a );		KIO_EXPORT QDataStream & operator>> ( QDataStream & s, KFileItem & a );
			/**
			* Support for qDebug() << aFileItem
			* \since 4.4
			*/
			KIO_EXPORT QDebug operator<<(QDebug stream, const KFileItem& item);
	#endif		#endif
End of changes. 3 change blocks.
	3 lines changed or deleted		19 lines changed or added

	kfileitemactions.h		kfileitemactions.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 KFILEITEMACTIONS_H		#ifndef KFILEITEMACTIONS_H
	#define KFILEITEMACTIONS_H		#define KFILEITEMACTIONS_H
			#include <kservice.h>
	#include <kfileitem.h>		#include <kfileitem.h>
	#include <kio/kio_export.h>		#include <kio/kio_export.h>
	class KFileItemListProperties;		class KFileItemListProperties;
	class KAction;		class KAction;
	class QMenu;		class QMenu;
	class KFileItemActionsPrivate;		class KFileItemActionsPrivate;
	/**		/**
	* This class creates and handles the actions for a url (or urls) in a popu pmenu.		* This class creates and handles the actions for a url (or urls) in a popu pmenu.
	skipping to change at line 93		skipping to change at line 94
	/**		/**
	* Returns an action for the preferred application only.		* Returns an action for the preferred application only.
	* @param traderConstraint this constraint allows to exclude the curren t application		* @param traderConstraint this constraint allows to exclude the curren t application
	* from the "open with" list. Example: "DesktopEntryName != 'kfmclient' ".		* from the "open with" list. Example: "DesktopEntryName != 'kfmclient' ".
	* @return the action - or 0 if no application was found.		* @return the action - or 0 if no application was found.
	*/		*/
	KAction* preferredOpenWithAction(const QString& traderConstraint);		KAction* preferredOpenWithAction(const QString& traderConstraint);
	/**		/**
			* Helper method used internally, can also be used for similar GUIs tha
			t
			* show the list of associated applications.
			* Used in KParts::BrowserOpenOrSaveQuestion for example.
			*
			* This is basically a KMimeTypeTrader::query, but it also cleans up du
			plicates,
			* and honors OnlyShowIn and NotShowIn fields.
			*
			* Returns the applications associated with all the given mimetypes.
			* @param mimeTypeList the mimetypes
			* @param traderConstraint this optional constraint allows to exclude t
			he current application
			* from the "open with" list. Example: "DesktopEntryName != 'kfmclient'
			".
			* @return the list of services.
			* @since 4.4
			*/
			static KService::List associatedApplications(const QStringList& mimeTyp
			eList, const QString& traderConstraint);
			/**
	* Generate the user-defined actions and submenus, and adds them to the @p menu.		* Generate the user-defined actions and submenus, and adds them to the @p menu.
	* User-defined actions include:		* User-defined actions include:
	* - builtin services like mount/unmount for old-style device desktop f iles		* - builtin services like mount/unmount for old-style device desktop f iles
	* - user-defined actions for a .desktop file, defined in the file itse lf (see the desktop entry standard)		* - user-defined actions for a .desktop file, defined in the file itse lf (see the desktop entry standard)
	* - servicemenus actions, defined in .desktop files and selected based on the mimetype of the url		* - servicemenus actions, defined in .desktop files and selected based on the mimetype of the url
	*		*
	* When KFileItemListProperties::supportsWriting() is false, actions th at modify the files are not shown.		* When KFileItemListProperties::supportsWriting() is false, actions th at modify the files are not shown.
	* This is controlled by Require=Write in the servicemenu desktop files .		* This is controlled by Require=Write in the servicemenu desktop files .
	*		*
	* All actions are created as children of the menu.		* All actions are created as children of the menu.
End of changes. 2 change blocks.
	0 lines changed or deleted		23 lines changed or added

	kfileitemdelegate.h		kfileitemdelegate.h
	skipping to change at line 26		skipping to change at line 26
	You should have received a copy of the GNU Library General Public 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 KFILEITEMDELEGATE_H		#ifndef KFILEITEMDELEGATE_H
	#define KFILEITEMDELEGATE_H		#define KFILEITEMDELEGATE_H
	#include <QtGui/QAbstractItemDelegate>		#include <QtGui/QAbstractItemDelegate>
			#include <QtGui/QTextOption>
	#include <kio/global.h>		#include <kio/global.h>
	class QAbstractItemModel;		class QAbstractItemModel;
	class QAbstractItemView;		class QAbstractItemView;
	class QHelpEvent;		class QHelpEvent;
	class QModelIndex;		class QModelIndex;
	class QPainter;		class QPainter;
	/**		/**
	* KFileItemDelegate is intended to be used to provide a KDE file system		* KFileItemDelegate is intended to be used to provide a KDE file system
	skipping to change at line 360		skipping to change at line 361
	*		*
	* @note The tooltip will only be shown if the Qt::ToolTipRole diff ers		* @note The tooltip will only be shown if the Qt::ToolTipRole diff ers
	* from Qt::DisplayRole, or if they match, showToolTipWhenEli ded		* from Qt::DisplayRole, or if they match, showToolTipWhenEli ded
	* flag is set and the display role information is elided.		* flag is set and the display role information is elided.
	* @see setShowToolTipWhenElided()		* @see setShowToolTipWhenElided()
	* @since 4.2		* @since 4.2
	*/		*/
	bool showToolTipWhenElided() const;		bool showToolTipWhenElided() const;
	/**		/**
			* Returns the rectangle of the icon that is aligned inside the dec
			oration
			* rectangle.
			* @since 4.4
			*/
			QRect iconRect(const QStyleOptionViewItem &option, const QModelInde
			x &index) const;
			/**
			* When the contents text needs to be wrapped, @p wrapMode strategy
			* will be followed.
			*
			* @since 4.4
			*/
			void setWrapMode(QTextOption::WrapMode wrapMode);
			/**
			* Returns the wrapping strategy followed to show text when it need
			s
			* wrapping.
			*
			* @since 4.4
			*/
			QTextOption::WrapMode wrapMode() const;
			/**
	* Reimplemented from @ref QAbstractItemDelegate.		* Reimplemented from @ref QAbstractItemDelegate.
	*/		*/
	virtual bool eventFilter(QObject *object, QEvent *event);		virtual bool eventFilter(QObject *object, QEvent *event);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Reimplemented from @ref QAbstractItemDelegate.		* Reimplemented from @ref QAbstractItemDelegate.
	*/		*/
	bool helpEvent(QHelpEvent * event, QAbstractItemView *view, const Q StyleOptionViewItem &option, const QModelIndex &index);		bool helpEvent(QHelpEvent * event, QAbstractItemView *view, const Q StyleOptionViewItem &option, const QModelIndex &index);
End of changes. 2 change blocks.
	0 lines changed or deleted		27 lines changed or added

	kfilemetainfo.h		kfilemetainfo.h
	skipping to change at line 94		skipping to change at line 94
	// Preferred = 0x40, ///< get at least the preferred items		// Preferred = 0x40, ///< get at least the preferred items
	LinkedData = 0x80, //< extract linked/related files like html link s, source #include etc		LinkedData = 0x80, //< extract linked/related files like html link s, source #include etc
	Everything = 0xffff ///< read everything, even if it might take a while		Everything = 0xffff ///< read everything, even if it might take a while
	};		};
	Q_DECLARE_FLAGS(WhatFlags, What)		Q_DECLARE_FLAGS(WhatFlags, What)
	/**		/**
	* @brief Construct a KFileMetaInfo that contains metainformation about		* @brief Construct a KFileMetaInfo that contains metainformation about
	* the resource pointed to by @p path.		* the resource pointed to by @p path.
			*
			* When w is not Everything, a limit of 64kbytes is imposed on the file
			size.
	**/		**/
	explicit KFileMetaInfo(const QString& path, const QString& mimetype = Q String(),		explicit KFileMetaInfo(const QString& path, const QString& mimetype = Q String(),
	WhatFlags w = Everything);		WhatFlags w = Everything);
	/**		/**
	* @brief Construct a KFileMetaInfo that contains metainformation about		* @brief Construct a KFileMetaInfo that contains metainformation about
	* the resource pointed to by @p url.		* the resource pointed to by @p url.
			* @note that c'tor is not thread-safe
	**/		**/
	KFileMetaInfo(const KUrl& url);		KFileMetaInfo(const KUrl& url);
	/**		/**
	* @brief Construct an empty, invalid KFileMetaInfo instance.		* @brief Construct an empty, invalid KFileMetaInfo instance.
	**/		**/
	KFileMetaInfo();		KFileMetaInfo();
	/**		/**
	* @brief Construct a KFileMetaInfo instance from another one.		* @brief Construct a KFileMetaInfo instance from another one.
	**/		**/
	KFileMetaInfo(const KFileMetaInfo&);		KFileMetaInfo(const KFileMetaInfo&);
End of changes. 2 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kfileplacesmodel.h		kfileplacesmodel.h
	skipping to change at line 47		skipping to change at line 47
	* where user can access files. Only revelant when		* where user can access files. Only revelant when
	* used with QListView or QTableView.		* used with QListView or QTableView.
	*/		*/
	class KFILE_EXPORT KFilePlacesModel : public QAbstractItemModel		class KFILE_EXPORT KFilePlacesModel : public QAbstractItemModel
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	enum AdditionalRoles {		enum AdditionalRoles {
	UrlRole = 0x069CD12B,		UrlRole = 0x069CD12B,
	HiddenRole = 0x0741CAAC,		HiddenRole = 0x0741CAAC,
	SetupNeededRole = 0x059A935D		SetupNeededRole = 0x059A935D,
			FixedDeviceRole = 0x332896C1,
			CapacityBarRecommendedRole = 0x1548C5C4
	};		};
	KFilePlacesModel(QObject *parent=0);		KFilePlacesModel(QObject *parent=0);
	~KFilePlacesModel();		~KFilePlacesModel();
	KUrl url(const QModelIndex &index) const;		KUrl url(const QModelIndex &index) const;
	bool setupNeeded(const QModelIndex &index) const;		bool setupNeeded(const QModelIndex &index) const;
	KIcon icon(const QModelIndex &index) const;		KIcon icon(const QModelIndex &index) const;
	QString text(const QModelIndex &index) const;		QString text(const QModelIndex &index) const;
	bool isHidden(const QModelIndex &index) const;		bool isHidden(const QModelIndex &index) const;
End of changes. 1 change blocks.
	1 lines changed or deleted		3 lines changed or added

	kfilewidget.h		kfilewidget.h
	skipping to change at line 174		skipping to change at line 174
	* @returns whether the contents of the location edit are kept when		* @returns whether the contents of the location edit are kept when
	* changing directories.		* changing directories.
	*/		*/
	virtual bool keepsLocation() const;		virtual bool keepsLocation() const;
	/**		/**
	* Sets the filter to be used to @p filter.		* Sets the filter to be used to @p filter.
	*		*
	* You can set more		* You can set more
	* filters for the user to select separated by '\n'. Every		* filters for the user to select separated by '\n'. Every
	* filter entry is defined through namefilter|text to diplay.		* filter entry is defined through namefilter|text to display.
	* If no | is found in the expression, just the namefilter is		* If no | is found in the expression, just the namefilter is
	* shown. Examples:		* shown. Examples:
	*		*
	* \code		* \code
	* kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");		* kfile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
	* kfile->setFilter("*.cpp");		* kfile->setFilter("*.cpp");
	* kfile->setFilter("*.cpp|Sources (*.cpp)");		* kfile->setFilter("*.cpp|Sources (*.cpp)");
	* kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));		* kfile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
	* kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header fi les");		* kfile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header fi les");
	* \endcode		* \endcode
	skipping to change at line 440		skipping to change at line 440
	virtual void showEvent(QShowEvent* event);		virtual void showEvent(QShowEvent* event);
	virtual bool eventFilter(QObject* watched, QEvent* event);		virtual bool eventFilter(QObject* watched, QEvent* event);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the user selects a file. It is only emitted in single-		* Emitted when the user selects a file. It is only emitted in single-
	* selection mode. The best way to get notified about selected file(s)		* selection mode. The best way to get notified about selected file(s)
	* is to connect to the okClicked() signal inherited from KDialog		* is to connect to the okClicked() signal inherited from KDialog
	* and call selectedFile(), selectedFiles(),		* and call selectedFile(), selectedFiles(),
	* selectedUrl() or selectedUrls().		* selectedUrl() or selectedUrls().
			*
			* \since 4.4
	*/		*/
	void fileSelected(const QString&);		void fileSelected(const KUrl&);
	/**		/**
	* Emitted when the user highlights a file.		* @deprecated, connect to fileSelected(const KUrl&) instead
	*/		*/
	void fileHighlighted(const QString&);		QT_MOC_COMPAT void fileSelected(const QString&); // TODO KDE5: remove
			/**
			* Emitted when the user highlights a file.
			* \since 4.4
			*/
			void fileHighlighted(const KUrl&);
			/**
			* @deprecated, connect to fileSelected(const KUrl&) instead
			*/
			QT_MOC_COMPAT void fileHighlighted(const QString&); // TODO KDE5: remov
			e
	/**		/**
	* Emitted when the user hilights one or more files in multiselection m ode.		* Emitted when the user hilights one or more files in multiselection m ode.
	*		*
	* Note: fileHighlighted() or fileSelected() are @em not		* Note: fileHighlighted() or fileSelected() are @em not
	* emitted in multiselection mode. You may use selectedItems() to		* emitted in multiselection mode. You may use selectedItems() to
	* ask for the current highlighted items.		* ask for the current highlighted items.
	* @see fileSelected		* @see fileSelected
	*/		*/
	void selectionChanged();		void selectionChanged();
	skipping to change at line 483		skipping to change at line 495
	*/		*/
	void accepted();		void accepted();
	public:		public:
	/**		/**
	* @returns the KDirOperator used to navigate the filesystem		* @returns the KDirOperator used to navigate the filesystem
	* @since 4.3		* @since 4.3
	*/		*/
	KDirOperator* dirOperator();		KDirOperator* dirOperator();
			/**
			* reads the configuration for this widget from the given config group
			* @param group the KConfiGroup to read from
			* @since 4.4
			*/
			void readConfig( KConfigGroup& group );
	private:		private:
	friend class KFileWidgetPrivate;		friend class KFileWidgetPrivate;
	KFileWidgetPrivate* const d;		KFileWidgetPrivate* const d;
	Q_PRIVATE_SLOT(d, void _k_slotLocationChanged(const QString&))		Q_PRIVATE_SLOT(d, void _k_slotLocationChanged(const QString&))
	Q_PRIVATE_SLOT(d, void _k_urlEntered(const KUrl&))		Q_PRIVATE_SLOT(d, void _k_urlEntered(const KUrl&))
	Q_PRIVATE_SLOT(d, void _k_enterUrl(const KUrl&))		Q_PRIVATE_SLOT(d, void _k_enterUrl(const KUrl&))
	Q_PRIVATE_SLOT(d, void _k_enterUrl(const QString&))		Q_PRIVATE_SLOT(d, void _k_enterUrl(const QString&))
	Q_PRIVATE_SLOT(d, void _k_locationAccepted(const QString&))		Q_PRIVATE_SLOT(d, void _k_locationAccepted(const QString&))
	Q_PRIVATE_SLOT(d, void _k_slotFilterChanged())		Q_PRIVATE_SLOT(d, void _k_slotFilterChanged())
End of changes. 5 change blocks.
	5 lines changed or deleted		25 lines changed or added

	kfinddialog.h		kfinddialog.h
	skipping to change at line 64		skipping to change at line 64
	* {		* {
	* m_findDia = new KFindDialog(false,...);		* m_findDia = new KFindDialog(false,...);
	* connect( m_findDia, SIGNAL(okClicked()), this, SLOT(findTextNext()) );		* connect( m_findDia, SIGNAL(okClicked()), this, SLOT(findTextNext()) );
	* }		* }
	* \endcode		* \endcode
	* Don't forget to delete and reset m_findDia when closed.		* Don't forget to delete and reset m_findDia when closed.
	* (But do NOT delete your KFind object at that point, it's needed for "Fin d Next")		* (But do NOT delete your KFind object at that point, it's needed for "Fin d Next")
	*		*
	* To use your own extensions: see findExtension().		* To use your own extensions: see findExtension().
	*		*
			* \image html kfinddialog.png "KDE Find Dialog"
	*/		*/
	class KDEUI_EXPORT KFindDialog:		class KDEUI_EXPORT KFindDialog:
	public KDialog		public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Construct a modal find dialog		* Construct a modal find dialog
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	kfontchooser.h		kfontchooser.h
	skipping to change at line 41		skipping to change at line 41
	class QStringList;		class QStringList;
	/**		/**
	* @short A font selection widget.		* @short A font selection widget.
	*		*
	* While KFontChooser as an ordinary widget can be embedded in		* While KFontChooser as an ordinary widget can be embedded in
	* custom dialogs and therefore is very flexible, in most cases		* custom dialogs and therefore is very flexible, in most cases
	* it is preferable to use the convenience functions in		* it is preferable to use the convenience functions in
	* KFontDialog.		* KFontDialog.
	*		*
			* \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 USER true )
	public:		public:
	skipping to change at line 259		skipping to change at line 261
	Private * const d;		Private * const d;
	Q_DISABLE_COPY(KFontChooser)		Q_DISABLE_COPY(KFontChooser)
	Q_PRIVATE_SLOT(d, void _k_toggled_checkbox())		Q_PRIVATE_SLOT(d, void _k_toggled_checkbox())
	Q_PRIVATE_SLOT(d, void _k_family_chosen_slot(const QString&))		Q_PRIVATE_SLOT(d, void _k_family_chosen_slot(const QString&))
	Q_PRIVATE_SLOT(d, void _k_size_chosen_slot(const QString&))		Q_PRIVATE_SLOT(d, void _k_size_chosen_slot(const QString&))
	Q_PRIVATE_SLOT(d, void _k_style_chosen_slot(const QString&))		Q_PRIVATE_SLOT(d, void _k_style_chosen_slot(const QString&))
	Q_PRIVATE_SLOT(d, void _k_displaySample(const QFont &font))		Q_PRIVATE_SLOT(d, void _k_displaySample(const QFont &font))
	Q_PRIVATE_SLOT(d, void _k_showXLFDArea(bool))		Q_PRIVATE_SLOT(d, void _k_showXLFDArea(bool))
	Q_PRIVATE_SLOT(d, void _k_size_value_slot(int))		Q_PRIVATE_SLOT(d, void _k_size_value_slot(double))
	};		};
	Q_DECLARE_OPERATORS_FOR_FLAGS( KFontChooser::DisplayFlags )		Q_DECLARE_OPERATORS_FOR_FLAGS( KFontChooser::DisplayFlags )
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		3 lines changed or added

	kfontcombobox.h		kfontcombobox.h
	skipping to change at line 40		skipping to change at line 40
	* @short A lightweight font selection widget.		* @short A lightweight font selection widget.
	*		*
	* A combobox to select the font from. Lightweight counterpart to KFontChoo ser,		* A combobox to select the font from. Lightweight counterpart to KFontChoo ser,
	* for situations where only the font family should be selected, while the		* for situations where only the font family should be selected, while the
	* font style and size are handled by other means. Like in KFontChooser,		* font style and size are handled by other means. Like in KFontChooser,
	* this widget will show the font previews in the unrolled dropdown list.		* this widget will show the font previews in the unrolled dropdown list.
	*		*
	* @note The class is similar to QFontComboBox, but more tightly integrated		* @note The class is similar to QFontComboBox, but more tightly integrated
	* with KDE desktop. Use it instead of QFontComboBox by default in KDE code .		* with KDE desktop. Use it instead of QFontComboBox by default in KDE code .
	*		*
			* \image html kfontcombobox.png "KDE Font Combo Box"
			*
	* @author Chusslove Illich \<caslav.ilic@gmx.net\>		* @author Chusslove Illich \<caslav.ilic@gmx.net\>
	*		*
	* @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
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kglobal.h		kglobal.h
	skipping to change at line 25		skipping to change at line 25
	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 _KGLOBAL_H		#ifndef _KGLOBAL_H
	#define _KGLOBAL_H		#define _KGLOBAL_H
	#include <kdecore_export.h>		#include <kdecore_export.h>
	#include <QtCore/QAtomicPointer>		#include <QtCore/QAtomicPointer>
	#include <sys/types.h>		#include <sys/types.h>
			#include <QtCore/QObject>
	//		//
	// WARNING!!		// WARNING!!
	// This code uses undocumented Qt API		// This code uses undocumented Qt API
	// Do not copy it to your application! Use only the functions that are here !		// Do not copy it to your application! Use only the functions that are here !
	// Otherwise, it could break when a new version of Qt ships.		// Otherwise, it could break when a new version of Qt ships.
	//		//
	class KComponentData;		class KComponentData;
	class KCharsets;		class KCharsets;
	skipping to change at line 342		skipping to change at line 343
	/**		/**
	* 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();
	/**		/**
	* 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()
			* 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
			* done in the main thread. However KApplication takes care of this, so
			this
			* is only needed when not using KApplication.
	*/		*/
	KDECORE_EXPORT KLocale *locale();		KDECORE_EXPORT KLocale *locale();
	/**		/**
	* @internal		* @internal
	* Returns whether KGlobal has a valid KLocale object		* Returns whether KGlobal has a valid KLocale object
	*/		*/
	KDECORE_EXPORT bool hasLocale();		KDECORE_EXPORT bool hasLocale();
	/**		/**
	* The global charset manager.		* The global charset manager.
	skipping to change at line 472		skipping to change at line 479
	/**		/**
	* Returns a text for the window caption.		* Returns a text for the window caption.
	*		*
	* This may be set by		* This may be set by
	* "-caption", otherwise it will be equivalent to the name of the		* "-caption", otherwise it will be equivalent to the name of the
	* executable.		* executable.
	* @return the text for the window caption		* @return the text for the window caption
	*/		*/
	KDECORE_EXPORT QString caption();		KDECORE_EXPORT QString caption();
			/// @internal
			KDECORE_EXPORT QObject* findDirectChild_helper(const QObject* parent, c
			onst QMetaObject& mo);
			/**
			* Returns the child of the given object that can be cast into type T,
			or 0 if there is no such object.
			* Unlike QObject::findChild, the search is NOT performed recursively.
			* @since 4.4
			*/
			template<typename T>
			inline T findDirectChild(const QObject* object) {
			return static_cast<T>(findDirectChild_helper(object, ((T)0)->static
			MetaObject));
			}
	/**		/**
	* For setLocale		* For setLocale
	*/		*/
	enum CopyCatalogs { DoCopyCatalogs, DontCopyCatalogs};		enum CopyCatalogs { DoCopyCatalogs, DontCopyCatalogs};
	///@internal		///@internal
	KDECORE_EXPORT void setLocale(KLocale *, CopyCatalogs copy = DoCopyCata logs);		KDECORE_EXPORT void setLocale(KLocale *, CopyCatalogs copy = DoCopyCata logs);
	}		}
	#ifdef KDE_SUPPORT		#ifdef KDE_SUPPORT
End of changes. 3 change blocks.
	0 lines changed or deleted		26 lines changed or added

	kglobalsettings.h		kglobalsettings.h
	skipping to change at line 39		skipping to change at line 39
	#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
	#define KDE_DEFAULT_ICON_ON_PUSHBUTTON true		#define KDE_DEFAULT_ICON_ON_PUSHBUTTON true
	#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
	class KUrl;		class KUrl;
	class QColor;		class QColor;
	class QFont;		class QFont;
	class QPoint;		class QPoint;
	class QRect;		class QRect;
	class QWidget;		class QWidget;
	/**		/**
	skipping to change at line 441		skipping to change at line 442
	static QRect desktopGeometry(const QWidget* w);		static QRect desktopGeometry(const QWidget* w);
	/**		/**
	* This function determines if the user wishes to see icons on the		* This function determines if the user wishes to see icons on the
	* push buttons.		* push buttons.
	*		*
	* @return Returns true if user wants to show icons.		* @return Returns true if user wants to show icons.
	*/		*/
	static bool showIconsOnPushButtons();		static bool showIconsOnPushButtons();
			/**
			* Returns true, if user visible strings should be sorted in a natural
			way:
			* image 1.jpg
			* image 2.jpg
			* image 10.jpg
			* image 11.jpg
			* If false is returned, the strings are sorted by their unicode values
			:
			* image 1.jpg
			* image 10.jpg
			* image 11.jpg
			* image 2.jpg
			*
			* @since 4.4
			*/
			static bool naturalSorting();
	enum GraphicEffect {		enum GraphicEffect {
	NoEffects = 0x0000, ///< GUI with no effects at all.		NoEffects = 0x0000, ///< GUI with no effects at all.
	GradientEffects = 0x0001, ///< GUI with only gradients enab led.		GradientEffects = 0x0001, ///< GUI with only gradients enab led.
	SimpleAnimationEffects = 0x0002, ///< GUI with simple animations e nabled.		SimpleAnimationEffects = 0x0002, ///< GUI with simple animations e nabled.
	ComplexAnimationEffects = 0x0006 ///< GUI with complex animations enabled.		ComplexAnimationEffects = 0x0006 ///< GUI with complex animations enabled.
	///< Note that ComplexAnimationsE ffects implies SimpleAnimationEffects.		///< Note that ComplexAnimationsE ffects implies SimpleAnimationEffects.
	};		};
	Q_DECLARE_FLAGS(GraphicEffects, GraphicEffect)		Q_DECLARE_FLAGS(GraphicEffects, GraphicEffect)
	skipping to change at line 508		skipping to change at line 525
	*/		*/
	static QPalette createApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr());		static QPalette createApplicationPalette(const KSharedConfigPtr &config = KSharedConfigPtr());
	/**		/**
	* An identifier for change signals.		* An identifier for change signals.
	* \see emitChange		* \see emitChange
	*/		*/
	enum ChangeType { PaletteChanged = 0, FontChanged, StyleChanged,		enum ChangeType { PaletteChanged = 0, FontChanged, StyleChanged,
	SettingsChanged, IconChanged, CursorChanged,		SettingsChanged, IconChanged, CursorChanged,
	ToolbarStyleChanged, ClipboardConfigChanged,		ToolbarStyleChanged, ClipboardConfigChanged,
	BlockShortcuts };		BlockShortcuts, NaturalSortingChanged };
	/**		/**
	* Notifies all KDE applications on the current display of a change.		* Notifies all KDE applications on the current display of a change.
	*		*
	* This is typically called by kcontrol modules after changing the corr esponding		* This is typically called by kcontrol modules after changing the corr esponding
	* config file. Do not call this from a normal KDE application.		* config file. Do not call this from a normal KDE application.
	*/		*/
	static void emitChange(ChangeType changeType, int arg = 0);		static void emitChange(ChangeType changeType, int arg = 0);
	/**		/**
	skipping to change at line 616		skipping to change at line 633
	/**		/**
	* Emitted when the cursor theme has been changed.		* Emitted when the cursor theme has been changed.
	*/		*/
	void cursorChanged();		void cursorChanged();
	/**		/**
	* Emitted by BlockShortcuts		* Emitted by BlockShortcuts
	*/		*/
	void blockShortcuts(int data);		void blockShortcuts(int data);
			/**
			* Emitted when the natural sorting has been changed.
			* @since 4.4
			*/
			void naturalSortingChanged();
	private:		private:
	friend class KApplication;		friend class KApplication;
	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))
	};		};
End of changes. 4 change blocks.
	1 lines changed or deleted		26 lines changed or added

	khbox.h		khbox.h
	skipping to change at line 36		skipping to change at line 36
	class QChildEvent;		class QChildEvent;
	/**		/**
	* A container widget which arranges its children horizontally.		* A container widget which arranges its children horizontally.
	* When using a KHBox you don't need to create a layout nor		* When using a KHBox you don't need to create a layout nor
	* to add the child widgets to it.		* to add the child widgets to it.
	*		*
	* Both margin and spacing are initialized to 0. Use QHBoxLayout		* Both margin and spacing are initialized to 0. Use QHBoxLayout
	* if you need standard layout margins.		* if you need standard layout margins.
	*		*
			* \image html khbox.png "KDE Horizontal Box containing three buttons"
			*
	* @see KVBox		* @see KVBox
	*/		*/
	class KDEUI_EXPORT KHBox : public QFrame		class KDEUI_EXPORT KHBox : public QFrame
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Creates a new hbox.		* Creates a new hbox.
	*/		*/
	skipping to change at line 65		skipping to change at line 67
	*/		*/
	void setMargin( int margin );		void setMargin( int margin );
	/**		/**
	* Sets the spacing between the child widgets to @p space.		* Sets the spacing between the child widgets to @p space.
	*		*
	* To get the default layout spacing, set @p space to -1.		* To get the default layout spacing, set @p space to -1.
	*/		*/
	void setSpacing( int space );		void setSpacing( int space );
	/*		/**
	* Sets the stretch factor of @p widget to @p stretch.		* Sets the stretch factor of @p widget to @p stretch.
	*/		*/
	void setStretchFactor( QWidget* widget, int stretch );		void setStretchFactor( QWidget* widget, int stretch );
			/**
			* Calculate the recommended size for this hbox.
			*/
	virtual QSize sizeHint() const;		virtual QSize sizeHint() const;
			/**
			* Calculate the recommended minimum size for this hbox.
			*/
	virtual QSize minimumSizeHint() const;		virtual QSize minimumSizeHint() const;
	protected:		protected:
	/*		/*
	* @internal		* @internal
	*/		*/
	KHBox( bool vertical, QWidget* parent );		KHBox( bool vertical, QWidget* parent );
	virtual void childEvent( QChildEvent* ev );		virtual void childEvent( QChildEvent* ev );
End of changes. 4 change blocks.
	1 lines changed or deleted		10 lines changed or added

	khelpmenu.h		khelpmenu.h
	skipping to change at line 104		skipping to change at line 104
	* this, SLOT(myDialogSlot()));		* this, SLOT(myDialogSlot()));
	* ..		* ..
	* }		* }
	*		*
	* void MyClass::myDialogSlot()		* void MyClass::myDialogSlot()
	* {		* {
	* <activate your custom dialog>		* <activate your custom dialog>
	* }		* }
	* \endcode		* \endcode
	*		*
			* \image html khelpmenu.png "KDE Help Menu"
			*
	* @author Espen Sand (espen@kde.org)		* @author Espen Sand (espen@kde.org)
	*/		*/
	class KDEUI_EXPORT KHelpMenu : public QObject		class KDEUI_EXPORT KHelpMenu : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	khistorycombobox.h		khistorycombobox.h
	skipping to change at line 44		skipping to change at line 44
	* course). Additionally, weighted completion is available. So you should		* course). Additionally, weighted completion is available. So you should
	* load and save the completion list to preserve the weighting between		* load and save the completion list to preserve the weighting between
	* sessions.		* sessions.
	*		*
	* KHistoryComboBox obeys the HISTCONTROL environment variable to determine		* KHistoryComboBox obeys the HISTCONTROL environment variable to determine
	* whether duplicates in the history should be tolerated in		* whether duplicates in the history should be tolerated in
	* addToHistory() or not. During construction of KHistoryComboBox,		* addToHistory() or not. During construction of KHistoryComboBox,
	* duplicates will be disabled when HISTCONTROL is set to "ignoredups" or		* duplicates will be disabled when HISTCONTROL is set to "ignoredups" or
	* "ignoreboth". Otherwise, duplicates are enabled by default.		* "ignoreboth". Otherwise, duplicates are enabled by default.
	*		*
			* \image html khistorycombobox.png "KDE History Combo Box"
			*
	* @author Carsten Pfeiffer <pfeiffer@kde.org>		* @author Carsten Pfeiffer <pfeiffer@kde.org>
	*/		*/
	class KDEUI_EXPORT KHistoryComboBox : public KComboBox		class KDEUI_EXPORT KHistoryComboBox : public KComboBox
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QStringList historyItems READ historyItems WRITE setHistory Items )		Q_PROPERTY( QStringList historyItems READ historyItems WRITE setHistory Items )
	public:		public:
	/**		/**
	* Constructs a "read-write" combobox. A read-only history combobox		* Constructs a "read-write" combobox. A read-only history combobox
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	khtml_part.h		khtml_part.h
	skipping to change at line 1285		skipping to change at line 1285
	virtual void timerEvent(QTimerEvent *);		virtual void timerEvent(QTimerEvent *);
	/**		/**
	* Will pre-resolve @p name according to dnsPrefetch current settings		* Will pre-resolve @p name according to dnsPrefetch current settings
	* Returns @p true if the name will be pre-resolved.		* Returns @p true if the name will be pre-resolved.
	* Otherwise returns false.		* Otherwise returns false.
	*/		*/
	bool mayPrefetchHostname( const QString& name );		bool mayPrefetchHostname( const QString& name );
			/**
			* @internal
			*/
			void updateZoomFactor();
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the focused node of the document to the specified node. If the no de is a form control, the control will		* Sets the focused node of the document to the specified node. If the no de is a form control, the control will
	* receive focus in the same way that it would if the user had clicked on it or tabbed to it with the keyboard. For		* receive focus in the same way that it would if the user had clicked on it or tabbed to it with the keyboard. For
	* most other types of elements, there is no visual indication of whether or not they are focused.		* most other types of elements, there is no visual indication of whether or not they are focused.
	*		*
	* See activeNode		* See activeNode
	*		*
	* @param node The node to focus		* @param node The node to focus
End of changes. 1 change blocks.
	0 lines changed or deleted		5 lines changed or added

	khtml_settings.h		khtml_settings.h
	skipping to change at line 179		skipping to change at line 179
	const QColor& textColor() const;		const QColor& textColor() const;
	const QColor& baseColor() const;		const QColor& baseColor() const;
	const QColor& linkColor() const;		const QColor& linkColor() const;
	const QColor& vLinkColor() const;		const QColor& vLinkColor() const;
	// Autoload images		// Autoload images
	bool autoLoadImages() const;		bool autoLoadImages() const;
	bool unfinishedImageFrame() const;		bool unfinishedImageFrame() const;
	bool isOpenMiddleClickEnabled();		bool isOpenMiddleClickEnabled();
			/// @deprecated do not use, feature was moved to be only in konqueror
	bool isBackRightClickEnabled();		bool isBackRightClickEnabled();
	// Java and JavaScript		// Java and JavaScript
	bool isJavaEnabled( const QString& hostname = QString() ) const;		bool isJavaEnabled( const QString& hostname = QString() ) const;
	bool isJavaScriptEnabled( const QString& hostname = QString() ) const;		bool isJavaScriptEnabled( const QString& hostname = QString() ) const;
	bool isJavaScriptDebugEnabled( const QString& hostname = QString() ) co nst;		bool isJavaScriptDebugEnabled( const QString& hostname = QString() ) co nst;
	bool isJavaScriptErrorReportingEnabled( const QString& hostname = QStri ng() ) const;		bool isJavaScriptErrorReportingEnabled( const QString& hostname = QStri ng() ) const;
	bool isPluginsEnabled( const QString& hostname = QString() ) const;		bool isPluginsEnabled( const QString& hostname = QString() ) const;
	// AdBlocK Filtering		// AdBlocK Filtering
			/** tests whether @p url is filtered.
			* @param url the URL to test.
			* @return @c true if the URL is blacklisted and is not whitelisted.
			*/
	bool isAdFiltered( const QString &url ) const;		bool isAdFiltered( const QString &url ) const;
			/** identify the filter which matches @p url.
			* @param url the URL to test.
			* @param isWhiteListed if not @c NULL, set to @c true if the URL match
			ed
			* a whitelist filter; set to @c false if it matched a blacklist filter
			.
			* @return the filter string that matched,
			* or @c QString() if no filter matched.
			* @since 4.4
			*/
			QString adFilteredBy( const QString &url, bool *isWhiteListed = 0 ) con
			st;
	bool isAdFilterEnabled() const;		bool isAdFilterEnabled() const;
	bool isHideAdsEnabled() const;		bool isHideAdsEnabled() const;
	void addAdFilter( const QString &url );		void addAdFilter( const QString &url );
	// Access Keys		// Access Keys
	bool accessKeysEnabled() const;		bool accessKeysEnabled() const;
	KJSWindowOpenPolicy windowOpenPolicy( const QString& hostname = QString () ) const;		KJSWindowOpenPolicy windowOpenPolicy( const QString& hostname = QString () ) const;
	KJSWindowMovePolicy windowMovePolicy( const QString& hostname = QString () ) const;		KJSWindowMovePolicy windowMovePolicy( const QString& hostname = QString () ) const;
	KJSWindowResizePolicy windowResizePolicy( const QString& hostname = QSt ring() ) const;		KJSWindowResizePolicy windowResizePolicy( const QString& hostname = QSt ring() ) const;
End of changes. 3 change blocks.
	0 lines changed or deleted		20 lines changed or added

	kiconeffect.h		kiconeffect.h
	skipping to change at line 42		skipping to change at line 42
	#include <QtCore/QRect>		#include <QtCore/QRect>
	class KIconEffectPrivate;		class KIconEffectPrivate;
	/**		/**
	* Applies effects to icons.		* Applies effects to icons.
	*		*
	* This class applies effects to icons depending on their state and		* This class applies effects to icons depending on their state and
	* group. For example, it can be used to make all disabled icons		* group. For example, it can be used to make all disabled icons
	* in a toolbar gray.		* in a toolbar gray.
			*
			* \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.
	*/		*/
	KIconEffect();		KIconEffect();
	~KIconEffect();		~KIconEffect();
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kjob.h		kjob.h
	skipping to change at line 144		skipping to change at line 144
	*		*
	* @return if the job was suspended		* @return if the job was suspended
	* @see suspend() resume()		* @see suspend() resume()
	*/		*/
	bool isSuspended() const;		bool isSuspended() const;
	/**		/**
	* Starts the job asynchronously. When the job is finished,		* Starts the job asynchronously. When the job is finished,
	* result() is emitted.		* result() is emitted.
	*		*
			* Warning: Never implement any synchronous workload in this method. Th
			is method
			* should just trigger the job startup, not do any work itself. It is e
			xpected to
			* be non-blocking.
			*
	* This is the method all subclasses need to implement.		* This is the method all subclasses need to implement.
	* It should setup and trigger the workload of the job. It should not d o any		* It should setup and trigger the workload of the job. It should not d o any
	* work itself. This includes all signals and terminating the job, e.g. by		* work itself. This includes all signals and terminating the job, e.g. by
	* emitResult(). The workload, which could be another method of the		* emitResult(). The workload, which could be another method of the
	* subclass, is to be triggered using the event loop, e.g. by code like :		* subclass, is to be triggered using the event loop, e.g. by code like :
	* \code		* \code
	* void ExampleJob::start()		* void ExampleJob::start()
	* {		* {
	* QTimer::singleShot( 0, this, SLOT( doWork() ) );		* QTimer::singleShot( 0, this, SLOT( doWork() ) );
	* }		* }
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	kkeysequencewidget.h		kkeysequencewidget.h
	skipping to change at line 45		skipping to change at line 45
	/**		/**
	* @short A widget to input a QKeySequence.		* @short A widget to input a QKeySequence.
	*		*
	* This widget lets the user choose a QKeySequence, which is usually used a s a		* This widget lets the user choose a QKeySequence, which is usually used a s a
	* shortcut key. The recording is initiated by calling captureKeySequence() or		* shortcut key. The recording is initiated by calling captureKeySequence() or
	* the user clicking into the widget.		* the user clicking into the widget.
	*		*
	* The widgets provides support for conflict handling. See		* The widgets provides support for conflict handling. See
	* setCheckForConflictsAgainst() for more information.		* setCheckForConflictsAgainst() for more information.
	*		*
			* \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_PROPERTY(		Q_PROPERTY(
	bool multiKeyShortcutsAllowed		bool multiKeyShortcutsAllowed
	READ multiKeyShortcutsAllowed		READ multiKeyShortcutsAllowed
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kkeyserver_x11.h		kkeyserver_x11.h
	skipping to change at line 85		skipping to change at line 85
	/**		/**
	* Returns the X11 Win (Mod3) modifier mask/flag.		* Returns the X11 Win (Mod3) modifier mask/flag.
	* @return the X11 Win (Mod3) modifier mask/flag.		* @return the X11 Win (Mod3) modifier mask/flag.
	* @see keyboardHasWinKey()		* @see keyboardHasWinKey()
	* @see accelModMaskX()		* @see accelModMaskX()
	*/		*/
	KDEUI_EXPORT uint modXMeta();		KDEUI_EXPORT uint modXMeta();
	/**		/**
	* Returns the X11 Lock modifier mask/flag.
	* @return the X11 Lock modifier mask/flag.
	* @see accelModMaskX()
	*/
	KDEUI_EXPORT uint modXLock();
	/**
	* Returns the X11 NumLock modifier mask/flag.		* Returns the X11 NumLock modifier mask/flag.
	* @return the X11 NumLock modifier mask/flag.		* @return the X11 NumLock modifier mask/flag.
	* @see accelModMaskX()		* @see accelModMaskX()
	*/		*/
	KDEUI_EXPORT uint modXNumLock();		KDEUI_EXPORT uint modXNumLock();
	/**		/**
	* Returns the X11 ScrollLock modifier mask/flag.		* Returns the X11 ScrollLock modifier mask/flag.
	* @return the X11 ScrollLock modifier mask/flag.		* @return the X11 ScrollLock modifier mask/flag.
	* @see accelModMaskX()		* @see accelModMaskX()
End of changes. 1 change blocks.
	7 lines changed or deleted		0 lines changed or added

	klanguagebutton.h		klanguagebutton.h
	skipping to change at line 40		skipping to change at line 40
	class QAction;		class QAction;
	class KLocale;		class KLocale;
	class KLanguageButtonPrivate;		class KLanguageButtonPrivate;
	/**		/**
	* KLanguageButton is a pushbutton which allows a language to be selected f rom		* KLanguageButton is a pushbutton which allows a language to be selected f rom
	* a popup list.		* a popup list.
	*		*
	* Languages are identified by their ISO 639-1 codes, e.g. en, pt_BR.		* Languages are identified by their ISO 639-1 codes, e.g. en, pt_BR.
			*
			* \image html klanguagebutton.png "KDE Language Selection Widget"
			*
			* @author Hans Petter Bieker <bieker@kde.org>, Martijn Klingens <klingens@
			kde.org>,
			* David Jarvie <software@astrojar.org.uk>
	*/		*/
	class KDEUI_EXPORT KLanguageButton : public QWidget		class KDEUI_EXPORT KLanguageButton : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructs a button whose text is determined by the current language		* Constructs a button whose text is determined by the current language
	* in the popup list.		* in the popup list.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	klineedit.h		klineedit.h
	skipping to change at line 144		skipping to change at line 144
	* // Set your own key-bindings for a text completion mode.		* // Set your own key-bindings for a text completion mode.
	* edit->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );		* edit->setKeyBinding( KCompletionBase::TextCompletion, Qt::End );
	*		*
	* // Hide the context (popup) menu		* // Hide the context (popup) menu
	* edit->setContextMenuPolicy( Qt::NoContextMenu );		* edit->setContextMenuPolicy( Qt::NoContextMenu );
	*		*
	* // Default the key-bindings back to the default system settings.		* // Default the key-bindings back to the default system settings.
	* edit->useGlobalKeyBindings();		* edit->useGlobalKeyBindings();
	* \endcode		* \endcode
	*		*
			* \image html klineedit.png "KDE Line Edit Widgets with clear-button and c
			lickMessage"
			*
	* @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
	Q_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE set ContextMenuEnabled )		Q_PROPERTY( bool contextMenuEnabled READ isContextMenuEnabled WRITE set ContextMenuEnabled )
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	klocale.h		klocale.h
	// -*- c-basic-offset: 2 -*-
	/* This file is part of the KDE libraries		/* This file is part of the KDE libraries
	Copyright (C) 1997 Stephan Kulow <coolo@kde.org>		Copyright (C) 1997 Stephan Kulow <coolo@kde.org>
	Copyright (C) 1999-2003 Hans Petter Bieker <bieker@kde.org>		Copyright (C) 1999-2003 Hans Petter Bieker <bieker@kde.org>
	Copyright (c) 2002 Lukas Tinkl <lukas@kde.org>		Copyright (c) 2002 Lukas Tinkl <lukas@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.
	skipping to change at line 40		skipping to change at line 39
	#include <QtCore/QList>		#include <QtCore/QList>
	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 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 71		skipping to change at line 71
	* QString date = KGlobal::locale()->formatDate(QDate(1995,5,17));		* QString date = KGlobal::locale()->formatDate(QDate(1995,5,17));
	* \endcode		* \endcode
	*		*
	* @author Stephan Kulow <coolo@kde.org>, Preston Brown <pbrown@kde.org>,		* @author Stephan Kulow <coolo@kde.org>, Preston Brown <pbrown@kde.org>,
	* Hans Petter Bieker <bieker@kde.org>, Lukas Tinkl <lukas.tinkl@suse.cz>		* Hans Petter Bieker <bieker@kde.org>, Lukas Tinkl <lukas.tinkl@suse.cz>
	* @short class for supporting locale settings and national language		* @short class for supporting locale settings and national language
	*/		*/
	class KDECORE_EXPORT KLocale		class KDECORE_EXPORT KLocale
	{		{
	public:		public:
	/**		/**
	* Constructs a KLocale with the given catalog name		* Constructs a KLocale with the given catalog name
	*		*
	* The constructor looks for an entry Language in the group Locale in the		* The constructor looks for an entry Language in the group Locale in t
	* configuration file.		he
	*		* configuration file.
	* If no configuration file is specified, it will also look for languages		*
	* using the environment variables (KDE_LANG, LC_MESSAGES, LC_ALL, LANG),		* If no configuration file is specified, it will also look for languag
	* as well as the global configuration file. If KLocale is not able to us		es
	e		* using the environment variables (KDE_LANG, LC_MESSAGES, LC_ALL, LANG
	* any of the specified languages, the default language (en_US) will be		),
	* used.		* as well as the global configuration file. If KLocale is not able to
	*		use
	* If you specify a configuration file, it has to be valid until		* any of the specified languages, the default language (en_US) will be
	* the KLocale object is destroyed.		* used.
	*		*
	* @param catalog the name of the main language file		* If you specify a configuration file, it has to be valid until
	* @param config a configuration file with a Locale group detailing		* the KLocale object is destroyed.
	* locale-related preferences (such as language and		*
	* formatting options)		* @param catalog the name of the main language file
	*/		* @param config a configuration file with a Locale group detailing
	explicit KLocale(const QString& catalog, KSharedConfig::Ptr config = KSha		* locale-related preferences (such as language and
	redConfig::Ptr());		* formatting options)
			*/
			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.
	*		*
	* @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 language for the locale
	* @param country the country for the locale		* @param country the country for the locale
	* @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 date and time
	* formatting options)		* formatting options)
	*/		*/
	KLocale(const QString& catalog, const QString &language, const QString &c		KLocale(const QString& catalog, const QString &language, const QString
	ountry = QString(), KConfig *config = 0);		&country = QString(),
			KConfig *config = 0);
	/**		/**
	* Copy constructor		* Copy constructor
	*/		*/
	KLocale( const KLocale & rhs );		KLocale(const KLocale & rhs);
	/**		/**
	* Assignment operator		* Assignment operator
	*/		*/
	KLocale& operator= ( const KLocale & rhs );		KLocale& operator= (const KLocale & rhs);
	/**		/**
	* Destructor		* Destructor
	*/		*/
	virtual ~KLocale();		virtual ~KLocale();
	/**		/**
	* Raw translation from message catalogs.		* Raw translation from message catalogs.
	*		*
	* Never use this directly to get message translations. See the i18n and		* Never use this directly to get message translations. See the i18n an
	ki18n		d ki18n
	* family of calls related to KLocalizedString.		* family of calls related to KLocalizedString.
	*		*
	* @param msg the message. Must not be null. Must be UTF-8 encoded.		* @param msg the message. Must not be null. Must be UTF-8 encoded.
	* @param lang language in which the translation was found. If no transla		* @param lang language in which the translation was found. If no trans
	tion		lation
	* was found, KLocale::defaultLanguage() is reported. If null		* was found, KLocale::defaultLanguage() is reported. If nu
	,		ll,
	* the language is not reported.		* the language is not reported.
	* @param trans raw translation, or original if not found. If no translat		* @param trans raw translation, or original if not found. If no transl
	ion		ation
	* was found, original message is reported. If null, the		* was found, original message is reported. If null, the
	* translation is not reported.		* translation is not reported.
	*		*
	* @see KLocalizedString		* @see KLocalizedString
	*/		*/
	void translateRaw(const char* msg,		void translateRaw(const char* msg, QString *lang, QString *trans) const
	QString *lang, QString *trans) const;		;
	/**		/**
	* Raw translation from message catalogs, with given context.		* Raw translation from message catalogs, with given context.
	* Context + message are used as the lookup key in catalogs.		* Context + message are used as the lookup key in catalogs.
	*		*
	* Never use this directly to get message translations. See i18n* and ki1		* Never use this directly to get message translations. See i18n* and k
	8n*		i18n*
	* calls related to KLocalizedString.		* calls related to KLocalizedString.
	*		*
	* @param ctxt the context. Must not be null. Must be UTF-8 encoded.		* @param ctxt the context. Must not be null. Must be UTF-8 encoded.
	* @param msg the message. Must not be null. Must be UTF-8 encoded.		* @param msg the message. Must not be null. Must be UTF-8 encoded.
	* @param lang language in which the translation was found. If no transla		* @param lang language in which the translation was found. If no trans
	tion		lation
	* was found, KLocale::defaultLanguage() is reported. If null		* was found, KLocale::defaultLanguage() is reported. If nu
	,		ll,
	* the language is not reported.		* the language is not reported.
	* @param trans raw translation, or original if not found. If no translat		* @param trans raw translation, or original if not found. If no transl
	ion		ation
	* was found, original message is reported. If null, the		* was found, original message is reported. If null, the
	* translation is not reported.		* translation is not reported.
	*		*
	* @see KLocalizedString		* @see KLocalizedString
	*/		*/
	void translateRaw(const char *ctxt, const char *msg,		void translateRaw(const char *ctxt, const char *msg, QString *lang, QSt
	QString *lang, QString *trans) const;		ring *trans) const;
	/**		/**
	* Raw translation from message catalogs, with given singular/plural form		* Raw translation from message catalogs, with given singular/plural fo
	.		rm.
	* Singular form is used as the lookup key in catalogs.		* Singular form is used as the lookup key in catalogs.
	*		*
	* Never use this directly to get message translations. See i18n* and ki1		* Never use this directly to get message translations. See i18n* and k
	8n*		i18n*
	* calls related to KLocalizedString.		* calls related to KLocalizedString.
	*		*
	* @param singular the singular form. Must not be null. Must be UTF-8 enc		* @param singular the singular form. Must not be null. Must be UTF-8 e
	oded.		ncoded.
	* @param plural the plural form. Must not be null. Must be UTF-8 encoded		* @param plural the plural form. Must not be null. Must be UTF-8 encod
	.		ed.
	* @param n number on which the forms are decided.		* @param n number on which the forms are decided.
	* @param lang language in which the translation was found. If no transla		* @param lang language in which the translation was found. If no trans
	tion		lation
	* was found, KLocale::defaultLanguage() is reported. If null		* was found, KLocale::defaultLanguage() is reported. If nu
	,		ll,
	* the language is not reported.		* the language is not reported.
	* @param trans raw translation, or original if not found. If no translat		* @param trans raw translation, or original if not found. If no transl
	ion		ation
	* was found, original message is reported (either plural or		* was found, original message is reported (either plural
	* singular, as determined by @p n ). If null, the		or
	* translation is not reported.		* singular, as determined by @p n ). If null, the
	*		* translation is not reported.
	* @see KLocalizedString		*
	*/		* @see KLocalizedString
	void translateRaw(const char *singular, const char *plural, unsigned lon		*/
	g n,		void translateRaw(const char *singular, const char *plural, unsigned l
	QString *lang, QString *trans) const;		ong n, QString *lang,
			QString *trans) const;
	/**		/**
	* Raw translation from message catalogs, with given context and		* Raw translation from message catalogs, with given context and
	* singular/plural form.		* singular/plural form.
	* Context + singular form is used as the lookup key in catalogs.		* Context + singular form is used as the lookup key in catalogs.
	*		*
	* Never use this directly to get message translations. See i18n* and ki1		* Never use this directly to get message translations. See i18n* and k
	8n*		i18n*
	* calls related to KLocalizedString.		* calls related to KLocalizedString.
	*		*
	* @param ctxt the context. Must not be null. Must be UTF-8 encoded.		* @param ctxt the context. Must not be null. Must be UTF-8 encoded.
	* @param singular the singular form. Must not be null. Must be UTF-8 enc		* @param singular the singular form. Must not be null. Must be UTF-8 e
	oded.		ncoded.
	* @param plural the plural form. Must not be null. Must be UTF-8 encoded		* @param plural the plural form. Must not be null. Must be UTF-8 encod
	.		ed.
	* @param n number on which the forms are decided.		* @param n number on which the forms are decided.
	* @param lang language in which the translation was found. If no transla		* @param lang language in which the translation was found. If no trans
	tion		lation
	* was found, KLocale::defaultLanguage() is reported. If null		* was found, KLocale::defaultLanguage() is reported. If nu
	,		ll,
	* the language is not reported.		* the language is not reported.
	* @param trans raw translation, or original if not found. If no translat		* @param trans raw translation, or original if not found. If no transl
	ion		ation
	* was found, original message is reported (either plural or		* was found, original message is reported (either plural
	* singular, as determined by @p n ). If null, the		or
	* translation is not reported.		* singular, as determined by @p n ). If null, the
	*		* translation is not reported.
	* @see KLocalizedString		*
	*/		* @see KLocalizedString
	void translateRaw(const char *ctxt, const char *singular, const char *plu		*/
	ral,		void translateRaw(const char *ctxt, const char *singular, const char *p
	unsigned long n, QString *lang, QString *trans) const;		lural, unsigned long n,
			QString *lang, QString *trans) const;
	/**		/**
	* Changes the current encoding.		* Changes the current encoding.
	*		*
	* @param mibEnum The mib of the preferred codec		* @param mibEnum The mib of the preferred codec
	*		*
	* @return True on success.		* @return True on success.
	*/		*/
	bool setEncoding(int mibEnum);		bool setEncoding(int mibEnum);
	/**
	* Various positions for where to place the positive or negative
	* sign when they are related to a monetary value.
	*/
	enum SignPosition {
	/**		/**
	* Put parantheses around the quantity, e.g. "$ (217)"		* Various positions for where to place the positive or negative
			* sign when they are related to a monetary value.
	*/		*/
	ParensAround = 0,		enum SignPosition {
			/**
			* Put parantheses around the quantity, e.g. "$ (217)"
			*/
			ParensAround = 0,
			/**
			* Prefix the quantity with the sign, e.g. "$ -217"
			*/
			BeforeQuantityMoney = 1,
			/**
			* Suffix the quanitity with the sign, e.g. "$ 217-"
			*/
			AfterQuantityMoney = 2,
			/**
			* Prefix the currency symbol with the sign, e.g. "-$ 217"
			*/
			BeforeMoney = 3,
			/**
			* Suffix the currency symbol with the sign, e.g. "$- 217"
			*/
			AfterMoney = 4
			};
	/**		/**
	* Prefix the quantity with the sign, e.g. "$ -217"		* @since 4.3
			*
			* The set of digit characters used to display and enter numbers.
	*/		*/
	BeforeQuantityMoney = 1,		enum DigitSet {
			ArabicDigits, /**< 0123456789 (European and some Asian
			languages and western Arabic dialect
			s) */
			ArabicIndicDigits, /**< ٠١٢٣٤٥٦٧٨٩ (eastern Arabic dialects)
			*/
			EasternArabicIndicDigits, /**< ۰۱۲۳۴۵۶۷۸۹ (Persian and Urdu) */
			DevenagariDigits /**< ०१२३४५६७८९ (Hindi) */
			};
	/**		/**
	* Suffix the quanitity with the sign, e.g. "$ 217-"		* @since 4.3
			*
			* Convert a digit set identifier to a human readable, localized name.
			*
			* @param digitSet the digit set identifier
			* @param withDigits whether to add the digits themselves to the name
			*
			* @return the human readable and localized name of the digit set
			*
			* @see DigitSet
	*/		*/
	AfterQuantityMoney = 2,		QString digitSetToName(DigitSet digitSet, bool withDigits = false) cons
			t;
	/**		/**
	* Prefix the currency symbol with the sign, e.g. "-$ 217"		* @since 4.3
			*
			* Provides list of all known digit set identifiers.
			*
			* @return list of all digit set identifiers
			* @see DigitSet
			* @see digitSetToName
	*/		*/
	BeforeMoney = 3,		QList<DigitSet> allDigitSetsList() const;
	/**		/**
	* Suffix the currency symbol with the sign, e.g. "$- 217"		* Returns what a decimal point should look like ("." or "," etc.)
			* according to the current locale or user settings.
			*
			* @return The decimal symbol used by locale.
	*/		*/
	AfterMoney = 4		QString decimalSymbol() const;
	};
	/**		/**
	* @since 4.3		* Returns what the thousands separator should look
	*		* like ("," or "." etc.)
	* The set of digit characters used to display and enter numbers.		* according to the current locale or user settings.
	*/		*
	enum DigitSet {		* @return The thousands separator used by locale.
	ArabicDigits, /**< 0123456789 (European and some Asian		*/
	languages and western Arabic dialects) *		QString thousandsSeparator() const;
	/
	ArabicIndicDigits, /**< ٠١٢٣٤٥٦٧٨٩ (eastern Arabic dialects) */
	EasternArabicIndicDigits, /**< ۰۱۲۳۴۵۶۷۸۹ (Persian and Urdu) */
	DevenagariDigits /**< ०१२३४५६७८९ (Hindi) */
	};
	/**		/**
	* @since 4.3		* @since 4.3
	*		*
	* Convert a digit set identifier to a human readable, localized name.		* Returns the identifier of the digit set used to display numbers.
	*		*
	* @param digitSet the digit set identifier		* @return the digit set identifier
	* @param withDigits whether to add the digits themselves to the name		* @see DigitSet
	*		* @see digitSetToName
	* @return the human readable and localized name of the digit set		*/
	*		DigitSet digitSet() const;
	* @see DigitSet
	*/
	QString digitSetToName(DigitSet digitSet, bool withDigits = false) const;
	/**		/**
	* @since 4.3		* @since 4.4
	*		*
	* Provides list of all known digit set identifiers.		* Returns the ISO 4217 Currency Code for the current locale
	*		*
	* @return list of all digit set identifiers		* @return The default ISO Currency Code used by locale.
	* @see DigitSet		*/
	* @see digitSetToName		QString currencyCode() const;
	*/
	QList<DigitSet> allDigitSetsList () const;
	/**		/**
	* Returns what a decimal point should look like ("." or "," etc.)		* @since 4.4
	* according to the current locale or user settings.		*
	*		* Returns the Currency Code object for the current locale
	* @return The decimal symbol used by locale.		*
	*/		* @return The default Currency Code object used by locale.
	QString decimalSymbol() const;		*/
			KCurrencyCode *currency() const;
	/**		/**
	* Returns what the thousands separator should look		* Returns what the symbol denoting currency in the current locale
	* like ("," or "." etc.)		* as as defined by user settings should look like.
	* according to the current locale or user settings.		*
	*		* @return The default currency symbol used by locale.
	* @return The thousands separator used by locale.		*/
	*/		QString currencySymbol() const;
	QString thousandsSeparator() const;
	/**		/**
	* @since 4.3		* Returns what a decimal point should look like ("." or "," etc.)
	*		* for monetary values, according to the current locale or user
	* Returns the identifier of the digit set used to display numbers.		* settings.
	*		*
	* @return the digit set identifier		* @return The monetary decimal symbol used by locale.
	* @see DigitSet		*/
	* @see digitSetToName		QString monetaryDecimalSymbol() const;
	*/
	DigitSet digitSet() const;
	/**		/**
	* Returns what the symbol denoting currency in the current locale		* Returns what a thousands separator for monetary values should
	* as as defined by user settings should look like.		* look like ("," or " " etc.) according to the current locale or
	*		* user settings.
	* @return The default currency symbol used by locale.		*
	*/		* @return The monetary thousands separator used by locale.
	QString currencySymbol() const;		*/
			QString monetaryThousandsSeparator() const;
	/**		/**
	* Returns what a decimal point should look like ("." or "," etc.)		* Returns what a positive sign should look like ("+", " ", etc.)
	* for monetary values, according to the current locale or user		* according to the current locale or user settings.
	* settings.		*
	*		* @return The positive sign used by locale.
	* @return The monetary decimal symbol used by locale.		*/
	*/		QString positiveSign() const;
	QString monetaryDecimalSymbol() const;
	/**		/**
	* Returns what a thousands separator for monetary values should		* Returns what a negative sign should look like ("-", etc.)
	* look like ("," or " " etc.) according to the current locale or		* according to the current locale or user settings.
	* user settings.		*
	*		* @return The negative sign used by locale.
	* @return The monetary thousands separator used by locale.		*/
	*/		QString negativeSign() const;
	QString monetaryThousandsSeparator() const;
	/**		/**
	* Returns what a positive sign should look like ("+", " ", etc.)		* @deprecated use decimalPlaces() or monetaryDecimalPlaces()
	* according to the current locale or user settings.		*
	*		* The number of fractional digits to include in monetary values (usual
	* @return The positive sign used by locale.		ly 2).
	*/		*
	QString positiveSign() const;		* @return Default number of fractional digits used by locale.
			*/
			int fracDigits() const;
	/**		/**
	* Returns what a negative sign should look like ("-", etc.)		* @since 4.4
	* according to the current locale or user settings.		*
	*		* The number of decimal places to include in numeric values (usually 2
	* @return The negative sign used by locale.		).
	*/		*
	QString negativeSign() const;		* @return Default number of numeric decimal places used by locale.
			*/
			int decimalPlaces() const;
	/**		/**
	* The number of fractional digits to include in numeric/monetary		* @since 4.4
	* values (usually 2).		*
	*		* The number of decimal places to include in monetary values (usually
	* @return Default number of fractional digits used by locale.		2).
	*/		*
	int fracDigits() const;		* @return Default number of monetary decimal places used by locale.
			*/
			int monetaryDecimalPlaces() const;
	/**		/**
	* If and only if the currency symbol precedes a positive value,		* If and only if the currency symbol precedes a positive value,
	* this will be true.		* this will be true.
	*		*
	* @return Where to print the currency symbol for positive numbers.		* @return Where to print the currency symbol for positive numbers.
	*/		*/
	bool positivePrefixCurrencySymbol() const;		bool positivePrefixCurrencySymbol() const;
	/**		/**
	* If and only if the currency symbol precedes a negative value,		* If and only if the currency symbol precedes a negative value,
	* this will be true.		* this will be true.
	*		*
	* @return True if the currency symbol precedes negative numbers.		* @return True if the currency symbol precedes negative numbers.
	*/		*/
	bool negativePrefixCurrencySymbol() const;		bool negativePrefixCurrencySymbol() const;
	/**		/**
	* Returns the position of a positive sign in relation to a		* Returns the position of a positive sign in relation to a
	* monetary value.		* monetary value.
	*		*
	* @return Where/how to print the positive sign.		* @return Where/how to print the positive sign.
	* @see SignPosition		* @see SignPosition
	*/		*/
	SignPosition positiveMonetarySignPosition() const;		SignPosition positiveMonetarySignPosition() const;
	/**		/**
	* Denotes where to place a negative sign in relation to a		* Denotes where to place a negative sign in relation to a
	* monetary value.		* monetary value.
	*		*
	* @return Where/how to print the negative sign.		* @return Where/how to print the negative sign.
	* @see SignPosition		* @see SignPosition
	*/		*/
	SignPosition negativeMonetarySignPosition() const;		SignPosition negativeMonetarySignPosition() const;
	/**		/**
	* @since 4.3		* @since 4.3
	*		*
	* Retuns the digit set used to display monetary values.		* Retuns the digit set used to display monetary values.
	*		*
	* @return the digit set identifier		* @return the digit set identifier
	* @see DigitSet		* @see DigitSet
	* @see digitSetToName		* @see digitSetToName
	*/		*/
	DigitSet monetaryDigitSet() const;		DigitSet monetaryDigitSet() const;
	/**		/**
	* Given a double, converts that to a numeric string containing		* Given a double, converts that to a numeric string containing
	* the localized monetary equivalent.		* the localized monetary equivalent.
	*		*
	* e.g. given 123456, return "$ 123,456.00".		* e.g. given 123456, return "$ 123,456.00".
	*		*
	* @param num The number we want to format		* If precision isn't specified or is < 0, then the default monetaryDec
	* @param currency The currency symbol you want.		imalPlaces() is used.
	* @param digits Number of fractional digits, or -1 for the default		*
	* value		* @param num The number we want to format
	*		* @param currency The currency symbol you want.
	* @return The number of money as a localized string		* @param precision Number of decimal places displayed
	* @see fracDigits()		*
	*/		* @return The number of money as a localized string
	QString formatMoney(double num,		* @see monetaryDecimalPlaces()
	const QString & currency = QString(),		*/
	int digits = -1) const;		QString formatMoney(double num, const QString &currency = QString(), in
			t precision = -1) const;
	/**		/**
	* Given a double, converts that to a numeric string containing		* Given a double, converts that to a numeric string containing
	* the localized numeric equivalent.		* the localized numeric equivalent.
	*		*
	* e.g. given 123456.78F, return "123,456.78" (for some European country)		* e.g. given 123456.78F, return "123,456.78" (for some European countr
	.		y).
	* If precision isn't specified, 2 is used.		*
	*		* If precision isn't specified or is < 0, then the default decimalPlac
	* This function is a wrapper that is provided for convenience.		es() is used.
	*		*
	* @param num The number to convert		* This function is a wrapper that is provided for convenience.
	* @param precision Number of fractional digits used.		*
	*		* @param num The number to convert
	* @return The number as a localized string		* @param precision Number of decimal places used.
	* @see formatNumber(const QString, bool, int)		*
	*/		* @return The number as a localized string
	QString formatNumber(double num, int precision = -1) const;		* @see formatNumber(const QString, bool, int)
			* @see decimalPlaces()
			*/
			QString formatNumber(double num, int precision = -1) const;
	/**		/**
	* Given a string representing a number, converts that to a numeric		* Given a string representing a number, converts that to a numeric
	* string containing the localized numeric equivalent.		* string containing the localized numeric equivalent.
	*		*
	* e.g. given 123456.78F, return "123,456.78" (for some European country)		* e.g. given 123456.78F, return "123,456.78" (for some European countr
	.		y).
	*		*
	* @param numStr The number to format, as a string.		* If precision isn't specified or is < 0, then the default decimalPlac
	* @param round Round fractional digits. (default true)		es() is used.
	* @param precision Number of fractional digits used for rounding. Unused		*
	if round=false. (default 2)		* @param numStr The number to format, as a string.
	*		* @param round Round fractional digits. (default true)
	* @return The number as a localized string		* @param precision Number of fractional digits used for rounding. Unus
	*/		ed if round=false.
	QString formatNumber(const QString &numStr, bool round=true, int precisio		*
	n=2) const;		* @return The number as a localized string
			*/
			QString formatNumber(const QString &numStr, bool round = true, int prec
			ision = -1) const;
	/**		/**
	* Given an integer, converts that to a numeric string containing		* Given an integer, converts that to a numeric string containing
	* the localized numeric equivalent.		* the localized numeric equivalent.
	*		*
	* e.g. given 123456L, return "123,456" (for some European country).		* e.g. given 123456L, return "123,456" (for some European country).
	*		*
	* @param num The number to convert		* @param num The number to convert
	*		*
	* @return The number as a localized string		* @return The number as a localized string
	*/		*/
	QString formatLong(long num) const;		QString formatLong(long num) const;
	/**		/**
	* Converts @p size from bytes to the string representation using the		* These binary units are used in KDE by the formatByteSize()
	* IEC 60027-2 standard		* functions.
	*		*
	* Example:		* NOTE: There are several different units standards:
	* formatByteSize(1024) returns "1.0 KiB"		* 1) SI (i.e. metric), powers-of-10.
	*		* 2) IEC, powers-of-2, with specific units KiB, MiB, etc.
	* @param size size in bytes		* 3) JEDEC, powers-of-2, used for solid state memory sizing which
	* @return converted size as a string - e.g. 123.4 KiB , 12.0 MiB		* is why you see flash cards labels as e.g. 4GB. These (ab)use
	*/		* the metric units. Although JEDEC only defines KB, MB, GB, if
	QString formatByteSize( double size ) const;		* JEDEC is selected all units will be powers-of-2 with metric
			* prefixes for clarity in the event of sizes larger than 1024 GB.
			*
			* Although 3 different dialects are possible this enum only uses
			* metric names since adding all 3 different names of essentially the s
			ame
			* unit would be pointless. Use BinaryUnitDialect to control the exact
			* units returned.
			*
			* @since 4.4
			* @see binaryUnitDialect
			*/
			enum BinarySizeUnits {
			/// Auto-choose a unit such that the result is in the range [0, 100
			0 or 1024)
			DefaultBinaryUnits = -1,
	/**		// The first real unit must be 0 for the current implementation!
	* Given a number of milliseconds, converts that to a string containing		UnitByte, ///< B 1 byte
	* the localized equivalent		UnitKiloByte, ///< KiB/KB/kB 1024/1000 bytes.
	*		UnitMegaByte, ///< MiB/MB/MB 2^20/10^06 bytes.
	* e.g. given formatDuration(60000), returns "1.0 minutes"		UnitGigaByte, ///< GiB/GB/GB 2^30/10^09 bytes.
	*		UnitTeraByte, ///< TiB/TB/TB 2^40/10^12 bytes.
	* @param mSec Time duration in milliseconds		UnitPetaByte, ///< PiB/PB/PB 2^50/10^15 bytes.
	* @return converted duration as a string - e.g. "5.5 seconds" "23.0 minu		UnitExaByte, ///< EiB/EB/EB 2^60/10^18 bytes.
	tes"		UnitZettaByte, ///< ZiB/ZB/ZB 2^70/10^21 bytes.
	*/		UnitYottaByte, ///< YiB/YB/YB 2^80/10^24 bytes.
	QString formatDuration( unsigned long mSec) const;		UnitLastUnit = UnitYottaByte
			};
	/**		/**
	* Given a number of milliseconds, converts that to a pretty string conta		* This enum chooses what dialect is used for binary units.
	ining		*
	* the localized equivalent.		* Note: Although JEDEC abuses the metric prefixes and can therefore be
	*		* confusing, it has been used to describe *memory* sizes for quite som
	* e.g. given prettyFormatDuration(60001) returns "1 minute"		e time
	* given prettyFormatDuration(62005) returns "1 minute and 2 seconds		* and programs should therefore use either Default, JEDEC, or IEC 6002
	"		7-2
	* given prettyFormatDuration(90060000) returns "1 day and 1 hour"		* for memory sizes.
	*		*
	* @param mSec Time duration in milliseconds		* On the other hand network transmission rates are typically in metric
	* @return converted duration as a string.		so
	* Units not interesting to the user, for example seconds or minu		* Default, Metric, or IEC (which is unambiguous) should be chosen.
	tes when the first		*
	* unit is day, are not returned because they are irrelevant. The		* Normally choosing DefaultBinaryUnits is the best option as that uses
	same applies for seconds		* the user's selection for units.
	* when the first unit is hour.		*
	* @since 4.2		* @since 4.4
	*/		* @see binaryUnitDialect
	QString prettyFormatDuration( unsigned long mSec ) const;		* @see setBinaryUnitDialect
			*/
			enum BinaryUnitDialect {
			DefaultBinaryDialect = -1, ///< Used if no specific preference
			IECBinaryDialect, ///< KDE Default, KiB, MiB, etc. 2^(10*n
			)
			JEDECBinaryDialect, ///< KDE 3.5 default, KB, MB, etc. 2^(10
			*n)
			MetricBinaryDialect, ///< SI Units, kB, MB, etc. 10^(3*n)
			LastBinaryDialect = MetricBinaryDialect
			};
	/**		/**
	* @deprecated		* Converts @p size from bytes to the string representation using the
	*		* user's default binary unit dialect. The default unit dialect is
	* Use this to determine whether nouns are declined in		* IEC 60027-2.
	* locale's language. This property should remain		*
	* read-only (no setter function)		* Example:
	*		* formatByteSize(1024) returns "1.0 KiB" by default.
	* @return If nouns are declined		*
	*/		* @param size size in bytes
	bool nounDeclension() const;		* @return converted size as a string - e.g. 123.4 KiB , 12.0 MiB
			* @see BinaryUnitDialect
			* @todo KDE 5: Remove in favor of overload added in KDE 4.4.
			*/
			QString formatByteSize(double size) const;
	/**		/**
	* Format for date string.		* @since 4.4
	*/		*
	enum DateFormat {		* Converts @p size from bytes to the appropriate string representation
	ShortDate, /**< Short (numeric) date format, e.g. 08-04-2007 */		* using the binary unit dialect @p dialect and the specific units @p s
	LongDate, /**< Long (text) date format, e.g. Sunday 08 April 2007		pecificUnit.
	*/		*
	FancyShortDate, /**< Same as ShortDate for dates a week or more ago. Fo		* Example:
	r more		* formatByteSize(1000, unit, KLocale::BinaryUnitKilo) returns:
	recent dates, it is represented as Today, Yesterda		* for KLocale::MetricBinaryUnits, "1.0 kB",
	y, or		* for KLocale::IECBinaryUnits, "0.9 KiB",
	the weekday name. */		* for KLocale::JEDECBinaryUnits, "0.9 KB".
	FancyLongDate /**< Same as LongDate for dates a week or more ago. For		*
	more		* @param size size in bytes
	recent dates, it is represented as Today, Yesterda		* @param precision number of places after the decimal point to use. K
	y, or		DE uses
	the weekday name. */		* 1 by default so when in doubt use 1.
	};		* @param dialect binary unit standard to use. Use DefaultBinaryUnits
			to
			* use the localized user selection unless you need to use a spe
			cific
			* unit type (such as displaying a flash memory size in JEDEC).
			* @param specificUnit specific unit size to use in result. Use
			* DefaultBinarySize to automatically select a unit that will re
			turn
			* a sanely-sized number.
			* @return converted size as a translated string including the units.
			* E.g. "1.23 KiB", "2 GB" (JEDEC), "4.2 kB" (Metric).
			*/
			QString formatByteSize(double size, int precision,
			BinaryUnitDialect dialect = KLocale::DefaultBina
			ryDialect,
			BinarySizeUnits specificUnit = KLocale::DefaultB
			inaryUnits) const;
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Returns the user's default binary unit dialect.
	* regarding dates.		*
	*		* @since 4.4
	* @param date the date to be formatted		* @return User's default binary unit dialect
	* @param format category of date format to use		* @see BinaryUnitDialect
	*		*/
	* @return the date as a string		BinaryUnitDialect binaryUnitDialect() const;
	*/
	QString formatDate(const QDate &date, DateFormat format = LongDate) const
	;
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Sets @p newDialect to be the default dialect for this locale (and on
	* regarding both date and time.		ly
	*		* this locale). Newly created KLocale objects will continue to defaul
	* @param dateTime the date and time to be formatted		t
	* @param format category of date format to use		* to the user's choice.
	* @param includeSecs if @c true, the string will include the seconds par		*
	t		* @param newDialect the new dialect to set as default for this locale
	* of the time; otherwise, the seconds will be omitted		object.
	*		* @since 4.4
	* @return the date and time as a string		*/
	*/		void setBinaryUnitDialect(BinaryUnitDialect newDialect);
	QString formatDateTime(const QDateTime &dateTime, DateFormat format = Sho
	rtDate,
	bool includeSecs = false) const;
	/**		/**
	* Options for formatting date-time values.		* Given a number of milliseconds, converts that to a string containing
	*/		* the localized equivalent
	enum DateTimeFormatOption {		*
	TimeZone = 0x01, /**< Include a time zone string */		* e.g. given formatDuration(60000), returns "1.0 minutes"
	Seconds = 0x02 /**< Include the seconds value */		*
	};		* @param mSec Time duration in milliseconds
	Q_DECLARE_FLAGS(DateTimeFormatOptions, DateTimeFormatOption)		* @return converted duration as a string - e.g. "5.5 seconds" "23.0 mi
			nutes"
			*/
			QString formatDuration(unsigned long mSec) const;
	/**		/**
	* Returns a string formatted to the current locale's conventions		* Given a number of milliseconds, converts that to a pretty string con
	* regarding both date and time.		taining
	*		* the localized equivalent.
	* @param dateTime the date and time to be formatted		*
	* @param format category of date format to use		* e.g. given prettyFormatDuration(60001) returns "1 minute"
	* @param options additional output options		* given prettyFormatDuration(62005) returns "1 minute and 2 secon
	*		ds"
	* @return The date and time as a string		* given prettyFormatDuration(90060000) returns "1 day and 1 hour"
	*/		*
	QString formatDateTime(const KDateTime &dateTime, DateFormat format = Sho		* @param mSec Time duration in milliseconds
	rtDate,		* @return converted duration as a string.
	DateTimeFormatOptions options = 0) const;		* Units not interesting to the user, for example seconds or mi
			nutes when the first
			* unit is day, are not returned because they are irrelevant. T
			he same applies for
			* seconds when the first unit is hour.
			* @since 4.2
			*/
			QString prettyFormatDuration(unsigned long mSec) const;
	/**		/**
	* Use this to determine whether in dates a possessive form of month		* @deprecated
	* name is preferred ("of January" rather than "January")		*
	*		* Use this to determine whether nouns are declined in
	* @return If possessive form should be used		* locale's language. This property should remain
	*/		* read-only (no setter function)
	bool dateMonthNamePossessive() const;		*
			* @return If nouns are declined
			*/
			bool nounDeclension() const;
	/**		/**
	* Returns a string formatted to the current locale's conventions		* @since 4.4
	* regarding times.		*
	*		* Standard used for Date Time Format String
	* @param pTime The time to be formatted.		*/
	* @param includeSecs if true, seconds are included in the output,		enum DateTimeFormatStandard {
	* otherwise only hours and minutes are formatted.		KdeFormat /**< KDE Standard */
	* @param isDuration if true, the given time is a duration, not a clock t		//PosixFormat, /**< POSIX Standard */ KDE 4.5
	ime.		//GnuFormat /**< GNU Standard */ KDE 4.5
	* This means "am/pm" shouldn't be displayed.		//UnicodeFormat /**< UNICODE Standard (Java/OSX/Window
	*		s?) */ KDE 4.5
	* @return The time as a string		};
	*/
	QString formatTime(const QTime &pTime, bool includeSecs = false,
	bool isDuration = false) const;
	/**		/**
	* @since 4.3		* Format for date string.
	*		*/
	* Returns the identifier of the digit set used to display dates and time		enum DateFormat {
	.		ShortDate, /**< Locale Short date format, e.g. 08-04-2007 */
	*		LongDate, /**< Locale Long date format, e.g. Sunday 08 Apri
	* @return the digit set identifier		l 2007 */
	* @see DigitSet		FancyShortDate, /**< Same as ShortDate for dates a week or more a
	* @see digitSetToName		go. For more
	*/		recent dates, it is represented as Today, Ye
	DigitSet dateTimeDigitSet() const;		sterday, or
			the weekday name. */
			FancyLongDate, /**< Same as LongDate for dates a week or more ag
			o. For more
			recent dates, it is represented as Today, Ye
			sterday, or
			the weekday name. */
			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 */
			IsoOrdinalDate /**< ISO-8601 Ordinal Date format YYYY-DDD, e.g.
			2009-001 */
			};
	/**		/**
	* Use this to determine if the user wants a 12 hour clock.		* Returns a string formatted to the current locale's conventions
	*		* regarding dates.
	* @return If the user wants 12h clock		*
	*/		* @param date the date to be formatted
	bool use12Clock() const;		* @param format category of date format to use
			*
			* @return the date as a string
			*/
			QString formatDate(const QDate &date, DateFormat format = LongDate) con
			st;
	/**		/**
	* Use this to determine which day is the first day of the week.		* Returns a string formatted to the current locale's conventions
	*		* regarding both date and time.
	* @return an integer (Monday=1..Sunday=7)		*
	*/		* @param dateTime the date and time to be formatted
	int weekStartDay() const;		* @param format category of date format to use
			* @param includeSecs if @c true, the string will include the seconds p
			art
			* of the time; otherwise, the seconds will be omitt
			ed
			*
			* @return the date and time as a string
			*/
			QString formatDateTime(const QDateTime &dateTime, DateFormat format = S
			hortDate,
			bool includeSecs = false) const;
	/**		/**
	* Use this to determine which day is the first working day of the week.		* Options for formatting date-time values.
	*		*/
	* @since 4.2		enum DateTimeFormatOption {
	* @return an integer (Monday=1..Sunday=7)		TimeZone = 0x01, /**< Include a time zone string */
	*/		Seconds = 0x02 /**< Include the seconds value */
	int workingWeekStartDay() const;		};
			Q_DECLARE_FLAGS(DateTimeFormatOptions, DateTimeFormatOption)
	/**		/**
	* Use this to determine which day is the last working day of the week.		* Returns a string formatted to the current locale's conventions
	*		* regarding both date and time.
	* @since 4.2		*
	* @return an integer (Monday=1..Sunday=7)		* @param dateTime the date and time to be formatted
	*/		* @param format category of date format to use
	int workingWeekEndDay() const;		* @param options additional output options
			*
			* @return The date and time as a string
			*/
			QString formatDateTime(const KDateTime &dateTime, DateFormat format = S
			hortDate,
			DateTimeFormatOptions options = 0) const;
	/**		/**
	* Use this to determine which day is reserved for religious observance		* Use this to determine whether in dates a possessive form of month
	*		* name is preferred ("of January" rather than "January")
	* @since 4.2		*
	* @return day number (None = 0, Monday = 1, ..., Sunday = 7)		* @return If possessive form should be used
	*/		*/
	int weekDayOfPray() const;		bool dateMonthNamePossessive() const;
	/**		/**
	* Returns a pointer to the calendar system object.		* @deprecated replaced by formatLocaleTime()
	*		*
	* @return the current calendar system instance		* Returns a string formatted to the current locale's conventions
	*/		* regarding times.
	const KCalendarSystem * calendar() const;		*
			* @param pTime The time to be formatted.
			* @param includeSecs if true, seconds are included in the output,
			* otherwise only hours and minutes are formatted.
			* @param isDuration if true, the given time is a duration, not a clock
			time.
			* This means "am/pm" shouldn't be displayed.
			*
			* @return The time as a string
			*/
			QString formatTime(const QTime &pTime, bool includeSecs = false, bool i
			sDuration = false) const;
	/**		/**
	* Returns the name of the calendar system that is currently being		* @since 4.4
	* used by the system.		*
	*		* Format flags for readLocaleTime() and formatLocaleTime()
	* @return the name of the calendar system		*/
	*/		enum TimeFormatOption {
	QString calendarType() const;		TimeDefault = 0x0, ///< Default formatting using seconds a
			nd the format
			///< as specified by the locale.
			TimeWithoutSeconds = 0x1, ///< Exclude the seconds part of the ti
			me from display
			TimeWithoutAmPm = 0x2, ///< Read/format time string without am
			/pm suffix but
			///< keep the 12/24h format as specifie
			d by locale time
			///< format, eg. "07.33.05" instead of
			"07.33.05 pm" for
			///< time format "%I.%M.%S %p".
			TimeDuration = 0x6 ///< Read/format time string as duratio
			n. This will strip
			///< the am/pm suffix and read/format t
			imes with an hour
			///< value of 0-23 hours, eg. "19.33.05
			" instead of
			///< "07.33.05 pm" for time format "%I.
			%M.%S %p".
			///< This automatically implies @c Time
			WithoutAmPm.
			};
			Q_DECLARE_FLAGS(TimeFormatOptions, TimeFormatOption)
	/**		/**
	* Changes the current calendar system to the calendar specified.		* @since 4.4
	* Currently "gregorian" and "hijri" are supported. If the calendar		*
	* system specified is not found, gregorian will be used.		* Returns a string formatted to the current locale's conventions
	*		* regarding times.
	* @param calendarType the name of the calendar type		*
	*/		* @param pTime the time to be formatted
	void setCalendar(const QString & calendarType);		* @param options format option to use when formatting the time
			* @return The time as a string
			*/
			QString formatLocaleTime(const QTime &pTime,
			TimeFormatOptions options = KLocale::TimeDefau
			lt) const;
	/**		/**
	* Converts a localized monetary string to a double.		* @since 4.3
	*		*
	* @param numStr the string we want to convert.		* Returns the identifier of the digit set used to display dates and ti
	* @param ok the boolean that is set to false if it's not a number.		me.
	* If @p ok is 0, it will be ignored		*
	*		* @return the digit set identifier
	* @return The string converted to a double		* @see DigitSet
	*/		* @see digitSetToName
	double readMoney(const QString &numStr, bool * ok = 0) const;		*/
			DigitSet dateTimeDigitSet() const;
	/**		/**
	* Converts a localized numeric string to a double.		* Use this to determine if the user wants a 12 hour clock.
	*		*
	* @param numStr the string we want to convert.		* @return If the user wants 12h clock
	* @param ok the boolean that is set to false if it's not a number.		*/
	* If @p ok is 0, it will be ignored		bool use12Clock() const;
	*
	* @return The string converted to a double
	*/
	double readNumber(const QString &numStr, bool * ok = 0) const;
	/**		/**
	* Converts a localized date string to a QDate.		* Use this to determine which day is the first day of the week.
	* The bool pointed by ok will be invalid if the date entered was not val		*
	id.		* @return an integer (Monday=1..Sunday=7)
	*		*/
	* @param str the string we want to convert.		int weekStartDay() const;
	* @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
	*
	* @return The string converted to a QDate
	*/
	QDate readDate(const QString &str, bool* ok = 0) const;
	/**		/**
	* Converts a localized date string to a QDate, using the specified forma		* Use this to determine which day is the first working day of the week
	t.		.
	* You will usually not want to use this method.		*
	*/		* @since 4.2
	QDate readDate( const QString &intstr, const QString &fmt, bool* ok = 0)		* @return an integer (Monday=1..Sunday=7)
	const;		*/
			int workingWeekStartDay() const;
	/**		/**
	* Flags for readDate()		* Use this to determine which day is the last working day of the week.
	*/		*
	enum ReadDateFlags {		* @since 4.2
	NormalFormat = 1, ///< Only accept a date string in normal (long) fo		* @return an integer (Monday=1..Sunday=7)
	rmat		*/
	ShortFormat = 2 ///< Only accept a date string in short format		int workingWeekEndDay() const;
	};
	/**		/**
	* Converts a localized date string to a QDate.		* Use this to determine which day is reserved for religious observance
	* This method is stricter than readDate(str,&ok): it will either accept		*
	* a date in full format or a date in short format, depending on @p flags		* @since 4.2
	.		* @return day number (None = 0, Monday = 1, ..., Sunday = 7)
	*		*/
	* @param str the string we want to convert.		int weekDayOfPray() const;
	* @param flags whether the date string is to be in full format or in sho
	rt format.
	* @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
	*
	* @return The string converted to a QDate
	*/
	QDate readDate(const QString &str, ReadDateFlags flags, bool *ok = 0) con
	st;
	/**		/**
	* Converts a localized time string to a QTime.		* Returns a pointer to the calendar system object.
	* This method will try to parse it with seconds, then without seconds.		*
	* The bool pointed to by @p ok will be set to false if the time entered		* @return the current calendar system instance
	was		*/
	* not valid.		const KCalendarSystem * calendar() const;
	*
	* @param str the string we want to convert.
	* @param ok the boolean that is set to false if it's not a valid time.
	* If @p ok is 0, it will be ignored
	*
	* @return The string converted to a QTime
	*/
	QTime readTime(const QString &str, bool* ok = 0) const;
	/**		/**
	* Flags for readTime()		* Returns the name of the calendar system that is currently being
	*/		* used by the system.
	enum ReadTimeFlags {		*
	WithSeconds = 0, ///< Only accept a time string with seconds. Defa		* @return the name of the calendar system
	ult (no flag set)		*/
	WithoutSeconds = 1 ///< Only accept a time string without seconds.		QString calendarType() const;
	}; // (maybe use this enum as a bitfield, if adding independent features?
	)
	/**
	* Converts a localized time string to a QTime.
	* This method is stricter than readTime(str,&ok): it will either accept
	* a time with seconds or a time without seconds.
	* Use this method when the format is known by the application.
	*
	* @param str the string we want to convert.
	* @param flags whether the time string is expected to contain seconds or
	not.
	* @param ok the boolean that is set to false if it's not a valid time.
	* If @p ok is 0, it will be ignored
	*
	* @return The string converted to a QTime
	*/
	QTime readTime(const QString &str, ReadTimeFlags flags, bool *ok = 0) con
	st;
	/**		/**
	* Returns the language code used by this object. The domain AND the		* Changes the current calendar system to the calendar specified.
	* library translation must be available in this language.		* Currently "gregorian" and "hijri" are supported. If the calendar
	* defaultLanguage() is returned by default, if no other available.		* system specified is not found, gregorian will be used.
	*		*
	* Use languageCodeToName(language) to get human readable, localized		* @param calendarType the name of the calendar type
	* language name.		*/
	*		void setCalendar(const QString & calendarType);
	* @return the currently used language code
	*
	* @see languageCodeToName
	*/
	QString language() const;
	/**		/**
	* Returns the country code of the country where the user lives.		* Converts a localized monetary string to a double.
	* defaultCountry() is returned by default, if no other available.		*
	*		* @param numStr the string we want to convert.
	* Use countryCodeToName(country) to get human readable, localized		* @param ok the boolean that is set to false if it's not a number.
	* country names.		* If @p ok is 0, it will be ignored
	*		*
	* @return the country code for the user		* @return The string converted to a double
	*		*/
	* @see countryCodeToName		double readMoney(const QString &numStr, bool * ok = 0) const;
	*/
	QString country() const;
	/**		/**
	* Returns the language codes selected by user, ordered by decreasing		* Converts a localized numeric string to a double.
	* priority.		*
	*		* @param numStr the string we want to convert.
	* Use languageCodeToName(language) to get human readable, localized		* @param ok the boolean that is set to false if it's not a number.
	* language name.		* If @p ok is 0, it will be ignored
	*		*
	* @return list of language codes		* @return The string converted to a double
	*		*/
	* @see languageCodeToName		double readNumber(const QString &numStr, bool * ok = 0) const;
	*/
	QStringList languageList() const;
	/**		/**
	* Returns the user's preferred encoding.		* Converts a localized date string to a QDate. This method will try a
	*		ll
	* @return The name of the preferred encoding		* ReadDateFlag formats in preferred order to read a valid date.
	*		*
	* @see codecForEncoding		* The bool pointed by ok will be invalid if the date entered was not v
	* @see encodingMib		alid.
	*/		*
	const QByteArray encoding() const;		* @param str the string we want to convert.
			* @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
			*
			* @return The string converted to a QDate
			* @see KCalendarSystem::readDate()
			*/
			QDate readDate(const QString &str, bool* ok = 0) const;
	/**		/**
	* Returns the user's preferred encoding.		* Converts a localized date string to a QDate, using the specified for
	*		mat.
	* @return The Mib of the preferred encoding		* You will usually not want to use this method.
	*		* @see KCalendarSystem::readDate()
	* @see encoding		*/
	* @see codecForEncoding		QDate readDate(const QString &intstr, const QString &fmt, bool* ok = 0)
	*/		const;
	int encodingMib() const;
	/**
	* Returns the user's preferred encoding. Should never be NULL.
	*
	* @return The codec for the preferred encoding
	*
	* @see encoding
	* @see encodingMib
	*/
	QTextCodec * codecForEncoding() const;
	/**		/**
	* Returns the file encoding.		* Flags for readDate()
	*		*/
	* @return The Mib of the file encoding		enum ReadDateFlags {
	*		NormalFormat = 1, /**< Only accept a date string in
	* @see QFile::encodeName		the locale LongDate format */
	* @see QFile::decodeName		ShortFormat = 2, /**< Only accept a date string in
	*/		the locale ShortDate format */
	int fileEncodingMib() const;		IsoFormat = 4, /**< Only accept a date string in
			ISO date format (YYYY-MM-DD) */
			IsoWeekFormat = 8, /**< Only accept a date string in
			ISO Week date format (YYYY-Www-D
			) */
			IsoOrdinalFormat = 16 /**< Only accept a date string in
			ISO Week date format (YYYY-DDD)
			*/
			};
	/**		/**
	* Changes the current date format.		* Converts a localized date string to a QDate.
	*		* This method is stricter than readDate(str,&ok): it will only accept
	* The format of the date is a string which contains variables that will		* a date in a specific format, depending on @p flags.
	* be replaced:		*
	* @li %Y with the whole year (e.g. "2004" for "2004")		* @param str the string we want to convert.
	* @li %y with the lower 2 digits of the year (e.g. "04" for "2004")		* @param flags what format the the date string will be in
	* @li %n with the month (January="1", December="12")		* @param ok the boolean that is set to false if it's not a valid date.
	* @li %m with the month with two digits (January="01", December="12")		* If @p ok is 0, it will be ignored
	* @li %e with the day of the month (e.g. "1" on the first of march)		*
	* @li %d with the day of the month with two digits (e.g. "01" on the fir		* @return The string converted to a QDate
	st of march)		* @see KCalendarSystem::readDate()
	* @li %b with the short form of the month (e.g. "Jan" for January)		*/
	* @li %B with the long form of the month (e.g. "January")		QDate readDate(const QString &str, ReadDateFlags flags, bool *ok = 0) c
	* @li %a with the short form of the weekday (e.g. "Wed" for Wednesday)		onst;
	* @li %A with the long form of the weekday (e.g. "Wednesday" for Wednesd
	ay)
	*
	* Everything else in the format string will be taken as is.
	* For example, March 20th 1989 with the format "%y:%m:%d" results
	* in "89:03:20".
	*
	* @param format The new date format
	*/
	void setDateFormat(const QString & format);
	/**
	* Changes the current short date format.
	*
	* The format of the date is a string which contains variables that will
	* be replaced:
	* @li %Y with the whole year (e.g. "1984" for "1984")
	* @li %y with the lower 2 digits of the year (e.g. "84" for "1984")
	* @li %n with the month (January="1", December="12")
	* @li %m with the month with two digits (January="01", December="12")
	* @li %e with the day of the month (e.g. "1" on the first of march)
	* @li %d with the day of the month with two digits(e.g. "01" on the firs
	t of march)
	* @li %b with the short form of the month (e.g. "Jan" for January)
	* @li %B with the long form of the month (e.g. "January")
	* @li %a with the short form of the weekday (e.g. "Wed" for Wednesday)
	* @li %A with the long form of the weekday (e.g. "Wednesday" for Wednesd
	ay)
	*
	* Everything else in the format string will be taken as is.
	* For example, March 20th 1989 with the format "%y:%m:%d" results
	* in "89:03:20".
	*
	* @param format The new short date format
	*/
	void setDateFormatShort(const QString & format);
	/**
	* Changes the form of month name used in dates.
	*
	* @param possessive True if possessive forms should be used
	*/
	void setDateMonthNamePossessive(bool possessive);
	/**
	* Changes the current time format.
	*
	* The format of the time is string a which contains variables that will
	* be replaced:
	* @li %H with the hour in 24h format and 2 digits (e.g. 5pm is "17", 5am
	is "05")
	* @li %k with the hour in 24h format and one digits (e.g. 5pm is "17", 5
	am is "5")
	* @li %I with the hour in 12h format and 2 digits (e.g. 5pm is "05", 5am
	is "05")
	* @li %l with the hour in 12h format and one digits (e.g. 5pm is "5", 5a
	m is "5")
	* @li %M with the minute with 2 digits (e.g. the minute of 07:02:09 is "
	02")
	* @li %S with the seconds with 2 digits (e.g. the minute of 07:02:09 is
	"09")
	* @li %p with pm or am (e.g. 17.00 is "pm", 05.00 is "am")
	*
	* Everything else in the format string will be taken as is.
	* For example, 5.23pm with the format "%H:%M" results
	* in "17:23".
	*
	* @param format The new time format
	*/
	void setTimeFormat(const QString & format);
	/**		/**
	* @since 4.3		* Converts a localized time string to a QTime.
	*		* This method will try to parse it with seconds, then without seconds.
	* Set digit characters used to display dates and time.		* The bool pointed to by @p ok will be set to false if the time entere
	*		d was
	* @param digitSet the digit set identifier		* not valid.
	* @see DigitSet		*
	*/		* @param str the string we want to convert.
	void setDateTimeDigitSet(DigitSet digitSet);		* @param ok the boolean that is set to false if it's not a valid time.
			* If @p ok is 0, it will be ignored
			*
			* @return The string converted to a QTime
			*/
			QTime readTime(const QString &str, bool* ok = 0) const;
	/**		/**
	* Changes how KLocale defines the first day in week.		* Flags for the old version of readTime()
	*		*
	* @param day first day of the week (Monday=1..Sunday=7) as integer		* @deprecated replaced by TimeFormatOptions
	*/		*/
	void setWeekStartDay(int day);		enum ReadTimeFlags {
			WithSeconds = 0, ///< Only accept a time string with seconds. De
			fault (no flag set)
			WithoutSeconds = 1 ///< Only accept a time string without seconds.
			}; // (maybe use this enum as a bitfield, if adding independent feature
			s?)
	/**		/**
	* Changes how KLocale defines the first working day in week.		* @deprecated replaced readLocaleTime()
	*		*
	* @since 4.2		* Converts a localized time string to a QTime.
	* @param day first working day of the week (Monday=1..Sunday=7) as integ		* This method is stricter than readTime(str,&ok): it will either accep
	er		t
	*/		* a time with seconds or a time without seconds.
	void setWorkingWeekStartDay(int day);		* Use this method when the format is known by the application.
			*
			* @param str the string we want to convert.
			* @param flags whether the time string is expected to contain seconds
			or not.
			* @param ok the boolean that is set to false if it's not a valid time.
			* If @p ok is 0, it will be ignored
			*
			* @return The string converted to a QTime
			*/
			QTime readTime(const QString &str, ReadTimeFlags flags, bool *ok = 0) c
			onst;
	/**		/**
	* Changes how KLocale defines the last working day in week.		* Additional processing options for readLocaleTime().
	*		*
	* @since 4.2		* @remarks This is currently used as an enum but declared as a flag
	* @param day last working day of the week (Monday=1..Sunday=7) as intege		* to be extensible
	r		*/
	*/		enum TimeProcessingOption {
	void setWorkingWeekEndDay(int day);		ProcessStrict = 0x1, ///< Process time in a strict manner, ie
			.
			///< a read time string has to exactly m
			atch
			///< the defined time format.
			ProcessNonStrict = 0x2 ///< Process time in a lax manner, ie.
			///< allow spaces in the time-format to
			be
			///< left out when entering a time strin
			g.
			};
			Q_DECLARE_FLAGS(TimeProcessingOptions, TimeProcessingOption)
	/**		/**
	* Changes how KLocale defines the day reserved for religious observance.		* @since 4.4
	*		*
	* @since 4.2		* Converts a localized time string to a QTime.
	* @param day day of the week for religious observance (None=0,Monday=1..		* This method is stricter than readTime(str, &ok) in that it will eith
	Sunday=7) as integer		er
	*/		* accept a time with seconds or a time without seconds.
	void setWeekDayOfPray(int day);		*
			* @param str the string we want to convert
			* @param ok the boolean that is set to false if it's not a valid time.
			* If @p ok is 0, it will be ignored.
			* @param options format option to apply when formatting the time
			* @param processing if set to @c ProcessStrict, checking will be stric
			t
			* and the read time string has to have the exact time fo
			rmat
			* specified. If set to @c ProcessNonStrict processing th
			e time
			* is lax and spaces in the time string can be left out.
			*
			* @return The string converted to a QTime
			*/
			QTime readLocaleTime(const QString &str, bool *ok = 0,
			TimeFormatOptions options = KLocale::TimeDefault,
			TimeProcessingOptions processing = ProcessNonStric
			t) const;
	/**		/**
	* Returns the currently selected date format.		* Returns the language code used by this object. The domain AND the
	*		* library translation must be available in this language.
	* @return Current date format.		* defaultLanguage() is returned by default, if no other available.
	* @see setDateFormat()		*
	*/		* Use languageCodeToName(language) to get human readable, localized
	QString dateFormat() const;		* language name.
	/**		*
	* Returns the currently selected short date format.		* @return the currently used language code
	*		*
	* @return Current short date format.		* @see languageCodeToName
	* @see setDateFormatShort()		*/
	*/		QString language() const;
	QString dateFormatShort() const;
	/**
	* Returns the currently selected time format.
	*
	* @return Current time format.
	* @see setTimeFormat()
	*/
	QString timeFormat() const;
	/**		/**
	* Changes the symbol used to identify the decimal pointer.		* Returns the country code of the country where the user lives.
	*		* defaultCountry() is returned by default, if no other available.
	* @param symbol The new decimal symbol.		*
	*/		* Use countryCodeToName(country) to get human readable, localized
	void setDecimalSymbol(const QString & symbol);		* country names.
	/**		*
	* Changes the separator used to group digits when formating numbers.		* @return the country code for the user
	*		*
	* @param separator The new thousands separator.		* @see countryCodeToName
	*/		*/
	void setThousandsSeparator(const QString & separator);		QString country() const;
	/**
	* Changes the sign used to identify a positive number. Normally this is
	* left blank.
	*
	* @param sign Sign used for positive numbers.
	*/
	void setPositiveSign(const QString & sign);
	/**
	* Changes the sign used to identify a negative number.
	*
	* @param sign Sign used for negative numbers.
	*/
	void setNegativeSign(const QString & sign);
	/**
	* @since 4.3
	*
	* Changes the set of digit characters used to display numbers.
	*
	* @param digitSet the digit set identifier
	* @see DigitSet
	*/
	void setDigitSet(DigitSet digitSet);
	/**
	* Changes the sign position used for positive monetary values.
	*
	* @param signpos The new sign position
	*/
	void setPositiveMonetarySignPosition(SignPosition signpos);
	/**
	* Changes the sign position used for negative monetary values.
	*
	* @param signpos The new sign position
	*/
	void setNegativeMonetarySignPosition(SignPosition signpos);
	/**
	* Changes the position where the currency symbol should be printed for
	* positive monetary values.
	*
	* @param prefix True if the currency symbol should be prefixed instead o
	f
	* postfixed
	*/
	void setPositivePrefixCurrencySymbol(bool prefix);
	/**
	* Changes the position where the currency symbol should be printed for
	* negative monetary values.
	*
	* @param prefix True if the currency symbol should be prefixed instead o
	f
	* postfixed
	*/
	void setNegativePrefixCurrencySymbol(bool prefix);
	/**
	* Changes the number of digits used when formating numbers.
	*
	* @param digits The default number of digits to use.
	*/
	void setFracDigits(int digits);
	/**
	* Changes the separator used to group digits when formating monetary val
	ues.
	*
	* @param separator The new thousands separator.
	*/
	void setMonetaryThousandsSeparator(const QString & separator);
	/**
	* Changes the symbol used to identify the decimal pointer for monetary
	* values.
	*
	* @param symbol The new decimal symbol.
	*/
	void setMonetaryDecimalSymbol(const QString & symbol);
	/**
	* Changes the current currency symbol.
	*
	* @param symbol The new currency symbol
	*/
	void setCurrencySymbol(const QString & symbol);
	/**
	* @since 4.3
	*
	* Set digit characters used to display monetary values.
	*
	* @param digitSet the digit set identifier
	* @see DigitSet
	*/
	void setMonetaryDigitSet(DigitSet digitSet);
	/**		/**
	* Returns the preferred page size for printing.		* Returns the language codes selected by user, ordered by decreasing
	*		* priority.
	* @return The preferred page size, cast it to QPrinter::PageSize		*
	*/		* Use languageCodeToName(language) to get human readable, localized
	int pageSize() const;		* language name.
			*
			* @return list of language codes
			*
			* @see languageCodeToName
			*/
			QStringList languageList() const;
	/**		/**
	* Changes the preferred page size when printing.		* @since 4.4
	*		*
	* @param paperFormat the new preferred page size in the format QPrinter:		* Returns the ISO Currency Codes used in the locale, ordered by decrea
	:PageSize		sing
	*/		* priority.
	void setPageSize(int paperFormat);		*
			* Use KCurrency::currencyCodeToName(currencyCode) to get human readabl
			e,
			* localized language name.
			*
			* @return list of ISO Currency Codes
			*
			* @see currencyCodeToName
			*/
			QStringList currencyCodeList() const;
	/**		/**
	* The Metric system will give you information in mm, while the		* Returns the user's preferred encoding.
	* Imperial system will give you information in inches.		*
	*/		* @return The name of the preferred encoding
	enum MeasureSystem {		*
	Metric, ///< Metric system (used e.g. in Europe)		* @see codecForEncoding
	Imperial ///< Imperial system (used e.g. in the United States)		* @see encodingMib
	};		*/
			const QByteArray encoding() const;
	/**		/**
	* Returns which measuring system we use.		* Returns the user's preferred encoding.
	*		*
	* @return The preferred measuring system		* @return The Mib of the preferred encoding
	*/		*
	MeasureSystem measureSystem() const;		* @see encoding
			* @see codecForEncoding
			*/
			int encodingMib() const;
	/**		/**
	* Changes the preferred measuring system.		* Returns the user's preferred encoding. Should never be NULL.
	*		*
	* @return value The preferred measuring system		* @return The codec for the preferred encoding
	*/		*
	void setMeasureSystem(MeasureSystem value);		* @see encoding
			* @see encodingMib
			*/
			QTextCodec * codecForEncoding() const;
	/**		/**
	* Adds another catalog to search for translation lookup.		* Returns the file encoding.
	* This function is useful for extern libraries and/or code,		*
	* that provide there own messages.		* @return The Mib of the file encoding
	*		*
	* If the catalog does not exist for the chosen language,		* @see QFile::encodeName
	* it will be ignored and en_US will be used.		* @see QFile::decodeName
	*		*/
	* @param catalog The catalog to add.		int fileEncodingMib() const;
	*/
	void insertCatalog(const QString& catalog);
	/**		/**
	* Removes a catalog for translation lookup.		* Changes the current date format.
	* @param catalog The catalog to remove.		*
	* @see insertCatalog()		* The format of the date is a string which contains variables that wil
	*/		l
	void removeCatalog(const QString &catalog);		* be replaced:
			* @li %Y with the whole year (e.g. "2004" for "2004")
			* @li %y with the lower 2 digits of the year (e.g. "04" for "2004")
			* @li %n with the month (January="1", December="12")
			* @li %m with the month with two digits (January="01", December="12")
			* @li %e with the day of the month (e.g. "1" on the first of march)
			* @li %d with the day of the month with two digits (e.g. "01" on the f
			irst of march)
			* @li %b with the short form of the month (e.g. "Jan" for January)
			* @li %B with the long form of the month (e.g. "January")
			* @li %a with the short form of the weekday (e.g. "Wed" for Wednesday)
			* @li %A with the long form of the weekday (e.g. "Wednesday" for Wedne
			sday)
			*
			* Everything else in the format string will be taken as is.
			* For example, March 20th 1989 with the format "%y:%m:%d" results
			* in "89:03:20".
			*
			* @param format The new date format
			*/
			void setDateFormat(const QString & format);
	/**		/**
	* Sets the active catalog for translation lookup.		* Changes the current short date format.
	* @param catalog The catalog to activate.		*
	*/		* The format of the date is a string which contains variables that wil
	void setActiveCatalog(const QString &catalog);		l
			* be replaced:
			* @li %Y with the whole year (e.g. "1984" for "1984")
			* @li %y with the lower 2 digits of the year (e.g. "84" for "1984")
			* @li %n with the month (January="1", December="12")
			* @li %m with the month with two digits (January="01", December="12")
			* @li %e with the day of the month (e.g. "1" on the first of march)
			* @li %d with the day of the month with two digits(e.g. "01" on the fi
			rst of march)
			* @li %b with the short form of the month (e.g. "Jan" for January)
			* @li %B with the long form of the month (e.g. "January")
			* @li %a with the short form of the weekday (e.g. "Wed" for Wednesday)
			* @li %A with the long form of the weekday (e.g. "Wednesday" for Wedne
			sday)
			*
			* Everything else in the format string will be taken as is.
			* For example, March 20th 1989 with the format "%y:%m:%d" results
			* in "89:03:20".
			*
			* @param format The new short date format
			*/
			void setDateFormatShort(const QString & format);
	/**		/**
	* Translates a message as a QTranslator is supposed to.		* Changes the form of month name used in dates.
	* The parameters are similar to i18n(), but the result		*
	* value has other semantics (it can be QString())		* @param possessive True if possessive forms should be used
	**/		*/
	QString translateQt(const char *context,		void setDateMonthNamePossessive(bool possessive);
	const char *sourceText,
	const char *comment) const;
	/**		/**
	* Provides list of all known language codes.		* Changes the current time format.
	*		*
	* Use languageCodeToName(language) to get human readable, localized		* The format of the time is string a which contains variables that wil
	* language names.		l
	*		* be replaced:
	* @return list of all language codes		* @li %H with the hour in 24h format and 2 digits (e.g. 5pm is "17", 5
	*		am is "05")
	* @see languageCodeToName		* @li %k with the hour in 24h format and one digits (e.g. 5pm is "17",
	*/		5am is "5")
	QStringList allLanguagesList() const;		* @li %I with the hour in 12h format and 2 digits (e.g. 5pm is "05", 5
			am is "05")
			* @li %l with the hour in 12h format and one digits (e.g. 5pm is "5",
			5am is "5")
			* @li %M with the minute with 2 digits (e.g. the minute of 07:02:09 is
			"02")
			* @li %S with the seconds with 2 digits (e.g. the minute of 07:02:09
			is "09")
			* @li %p with pm or am (e.g. 17.00 is "pm", 05.00 is "am")
			*
			* Everything else in the format string will be taken as is.
			* For example, 5.23pm with the format "%H:%M" results
			* in "17:23".
			*
			* @param format The new time format
			*/
			void setTimeFormat(const QString & format);
	/**		/**
	* Convert a known language code to a human readable, localized form.		* @since 4.3
	* 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		* Set digit characters used to display dates and time.
	* KLocale methods.		*
	*		* @param digitSet the digit set identifier
	* @param language the language code		* @see DigitSet
	*		*/
	* @return the human readable and localized form if the code is known,		void setDateTimeDigitSet(DigitSet digitSet);
	* empty otherwise
	*
	* @see language
	* @see languageList
	* @see allLanguagesList
	*/
	QString languageCodeToName(const QString &language) const;
	/**		/**
	* Provides list of all known country codes.		* Changes how KLocale defines the first day in week.
	*		*
	* Use countryCodeToName(country) to get human readable, localized		* @param day first day of the week (Monday=1..Sunday=7) as integer
	* country names.		*/
	*		void setWeekStartDay(int day);
	* @return a list of all country codes
	*
	* @see countryCodeToName
	*/
	QStringList allCountriesList() const;
	/**		/**
	* Convert a known country code to a human readable, localized form.		* Changes how KLocale defines the first working day in week.
	*		*
	* If an unknown country code is supplied, empty string is returned;		* @since 4.2
	* this will never happen if the code has been obtained by one of the		* @param day first working day of the week (Monday=1..Sunday=7) as int
	* KLocale methods.		eger
	*		*/
	* @param country the country code		void setWorkingWeekStartDay(int day);
	*
	* @return the human readable and localized form of the country name
	*
	* @see country
	* @see allCountriesList
	*/
	QString countryCodeToName(const QString &country) const;
	/**		/**
	* Parses locale string into distinct parts.		* Changes how KLocale defines the last working day in week.
	* The format of locale is language_COUNTRY@modifier.CHARSET		*
	*		* @since 4.2
	* @param locale the locale string to split		* @param day last working day of the week (Monday=1..Sunday=7) as inte
	* @param language set to the language part of the locale		ger
	* @param country set to the country part of the locale		*/
	* @param modifier set to the modifer part of the locale		void setWorkingWeekEndDay(int day);
	* @param charset set to the charset part of the locale
	*/
	static void splitLocale(const QString &locale,
	QString &language,
	QString &country,
	QString &modifier,
	QString &charset);
	/**		/**
	* Use this as main catalog for *all* KLocales, if not the appname		* Changes how KLocale defines the day reserved for religious observanc
	* will be used. This function is best to be the very first instruction		e.
	* in your program's main function as it only has an effect before the		*
	* first KLocale object is created.		* @since 4.2
	*		* @param day day of the week for religious observance (None=0,Monday=1
	* @param catalog Catalog to override all other main Catalogs.		..Sunday=7) as integer
	*/		*/
	static void setMainCatalog(const char *catalog);		void setWeekDayOfPray(int day);
	/**		/**
	* @deprecated		* Returns the currently selected date format.
	*		*
	* Finds localized resource in resourceDir( rtype ) + \<lang> + fname.		* @return Current date format.
	*		* @see setDateFormat()
	* Since KDE 4.1, this service is provided in a slightly different form,		*/
	* automatically by e.g. KStandardDirs::locate() and other KDE core class		QString dateFormat() const;
	es
	* dealing with paths. For manual use, it is replaced by localizedFilePat
	h().
	*
	* @param fname relative path to find
	* @param rtype resource type to use
	*
	* @return path to localized resource
	*
	* @see localizedFilePath
	*/
	static QString langLookup(const QString &fname, const char *rtype = "html
	");
	/**		/**
	* Returns the name of the internal language.		* Returns the currently selected short date format.
	*		*
	* @return Name of the default language		* @return Current short date format.
	*/		* @see setDateFormatShort()
	static QString defaultLanguage();		*/
			QString dateFormatShort() const;
	/**		/**
	* Returns the name of the default country.		* Returns the currently selected time format.
	*		*
	* @return Name of the default country		* @return Current time format.
	*/		* @see setTimeFormat()
	static QString defaultCountry();		*/
			QString timeFormat() const;
	/**		/**
	* Reports whether evaluation of translation scripts is enabled.		* Changes the symbol used to identify the decimal pointer.
	*		*
	* @return true if script evaluation is enabled, false otherwise.		* @param symbol The new decimal symbol.
	*/		*/
	bool useTranscript() const;		void setDecimalSymbol(const QString & symbol);
	/**		/**
	* Checks whether or not the active catalog is found for the given langua		* Changes the separator used to group digits when formating numbers.
	ge.		*
	*		* @param separator The new thousands separator.
	* @param language language to check		*/
	*/		void setThousandsSeparator(const QString & separator);
	bool isApplicationTranslatedInto( const QString & language);
	/**		/**
	* Copies the catalogs of this object to an other KLocale object.		* Changes the sign used to identify a positive number. Normally this i
	*		s
	* @param locale the destination KLocale object		* left blank.
	*/		*
	void copyCatalogsTo(KLocale *locale);		* @param sign Sign used for positive numbers.
			*/
			void setPositiveSign(const QString & sign);
	/**		/**
	* Changes the current country. The current country will be left		* Changes the sign used to identify a negative number.
	* unchanged if failed. It will force a reload of the country specific		*
	* configuration.		* @param sign Sign used for negative numbers.
	*		*/
	* @param country the ISO 3166 country code		void setNegativeSign(const QString & sign);
	* @param config a configuration file with a Locale group detailing
	* locale-related preferences (such as date and time
	* formatting)
	*
	* @return @c true on success, @c false on failure
	*/
	bool setCountry(const QString & country, KConfig *config);
	/**		/**
	* Changes the current language. The current language will be left		* @since 4.3
	* unchanged if failed. It will force a reload of the country specific		*
	* configuration as well.		* Changes the set of digit characters used to display numbers.
	*		*
	* @param language the language code		* @param digitSet the digit set identifier
	* @param config a configuration file with a Locale group detailing		* @see DigitSet
	* locale-related preferences (such as date and time		*/
	* formatting)		void setDigitSet(DigitSet digitSet);
	*
	* @return true on success
	*/
	bool setLanguage(const QString &language, KConfig *config);
	/**		/**
	* Changes the list of preferred languages for the locale. The first vali		* Changes the sign position used for positive monetary values.
	d		*
	* language in the list will be used, or the default language (en_US)		* @param signpos The new sign position
	* if none of the specified languages were available.		*/
	*		void setPositiveMonetarySignPosition(SignPosition signpos);
	* @param languages the list of language codes
	*
	* @return true if one of the specified languages were used
	*/
	bool setLanguage(const QStringList &languages);
	/**		/**
	* @since 4.1		* Changes the sign position used for negative monetary values.
	*		*
	* Tries to find a path to the localized file for the given original path		* @param signpos The new sign position
	.		*/
	* This is intended mainly for non-text resources (images, sounds, etc.),		void setNegativeMonetarySignPosition(SignPosition signpos);
	* whereas text resources should be handled in more specific ways.
	*
	* The possible localized paths are checked in turn by priority of set
	* languages, in form of dirname/l10n/ll/basename, where dirname and
	* basename are those of the original path, and ll is the language code.
	*
	* KDE core classes which resolve paths internally (e.g. KStandardDirs)
	* will usually perform this lookup behind the scene.
	* In general, you should pipe resource paths through this method only
	* on explicit translators' request, or when a resource is an obvious
	* candidate for localization (e.g. a splash screen or a custom icon
	* with some text drawn on it).
	*
	* @param filePath path to the original file
	*
	* @return path to the localized file if found, original path otherwise
	*/
	QString localizedFilePath(const QString &filePath) const;
	/**		/**
	* @since 4.2		* Changes the position where the currency symbol should be printed for
	*		* positive monetary values.
	* Removes accelerator marker from a UI text label.		*
	*		* @param prefix True if the currency symbol should be prefixed instead
	* Accelerator marker is not always a plain ampersand (&),		of
	* so it is not enough to just remove it by @c QString::remove().		* postfixed
	* The label may contain escaped markers ("&&") which must be resolved		*/
	* and skipped, as well as CJK-style markers ("Foo (&F)") where		void setPositivePrefixCurrencySymbol(bool prefix);
	* the whole parenthesis construct should be removed.
	* Therefore always use this function to remove accelerator marker
	* from UI labels.
	*
	* @param label UI label which may contain an accelerator marker
	* @return label without the accelerator marker
	*/
	QString removeAcceleratorMarker(const QString &label) const;
	/**		/**
	* @since 4.3		* Changes the position where the currency symbol should be printed for
	*		* negative monetary values.
	* Convert all digits in the string to the given digit set.		*
	*		* @param prefix True if the currency symbol should be prefixed instead
	* Conversion is normally not performed if the given digit set		of
	* is not appropriate in the current locale and language context.		* postfixed
	* Unconditional conversion may be requested by setting		*/
	* @p ignoreContext to @c true.		void setNegativePrefixCurrencySymbol(bool prefix);
	*
	* @param str the string to convert		/**
	* @param digitSet the digit set identifier		* @deprecated use setDecimalPlaces() or setMonetaryDecimalPlaces()
	* @param ignoreContext unconditional conversion if @c true		*
	*		* Changes the number of digits used when formating numbers.
	* @return string with converted digits		*
	*		* @param digits The default number of digits to use.
	* @see DigitSet		*/
	*/		void setFracDigits(int digits);
	QString convertDigits(const QString &str, DigitSet digitSet,
	bool ignoreContext = false) const;		/**
			* @since 4.4
			*
			* Changes the number of decimal places used when formating numbers.
			*
			* @param digits The default number of digits to use.
			*/
			void setDecimalPlaces(int digits);
			/**
			* @since 4.4
			*
			* Changes the number of decimal places used when formating money.
			*
			* @param digits The default number of digits to use.
			*/
			void setMonetaryDecimalPlaces(int digits);
			/**
			* Changes the separator used to group digits when formating monetary v
			alues.
			*
			* @param separator The new thousands separator.
			*/
			void setMonetaryThousandsSeparator(const QString & separator);
			/**
			* Changes the symbol used to identify the decimal pointer for monetary
			* values.
			*
			* @param symbol The new decimal symbol.
			*/
			void setMonetaryDecimalSymbol(const QString & symbol);
			/**
			* @since 4.4
			*
			* Changes the current ISO Currency Code.
			*
			* @param newCurrencyCode The new Currency Code
			*/
			void setCurrencyCode(const QString &newCurrencyCode);
			/**
			* Changes the current currency symbol.
			*
			* This symbol should be consistant with the selected Currency Code
			*
			* @param symbol The new currency symbol
			* @see currencyCode, KCurrency::currencySymbols
			*/
			void setCurrencySymbol(const QString & symbol);
			/**
			* @since 4.3
			*
			* Set digit characters used to display monetary values.
			*
			* @param digitSet the digit set identifier
			* @see DigitSet
			*/
			void setMonetaryDigitSet(DigitSet digitSet);
			/**
			* Returns the preferred page size for printing.
			*
			* @return The preferred page size, cast it to QPrinter::PageSize
			*/
			int pageSize() const;
			/**
			* Changes the preferred page size when printing.
			*
			* @param paperFormat the new preferred page size in the format QPrinte
			r::PageSize
			*/
			void setPageSize(int paperFormat);
			/**
			* The Metric system will give you information in mm, while the
			* Imperial system will give you information in inches.
			*/
			enum MeasureSystem {
			Metric, ///< Metric system (used e.g. in Europe)
			Imperial ///< Imperial system (used e.g. in the United States)
			};
			/**
			* Returns which measuring system we use.
			*
			* @return The preferred measuring system
			*/
			MeasureSystem measureSystem() const;
			/**
			* Changes the preferred measuring system.
			*
			* @return value The preferred measuring system
			*/
			void setMeasureSystem(MeasureSystem value);
			/**
			* Adds another catalog to search for translation lookup.
			* This function is useful for extern libraries and/or code,
			* that provide there own messages.
			*
			* If the catalog does not exist for the chosen language,
			* it will be ignored and en_US will be used.
			*
			* @param catalog The catalog to add.
			*/
			void insertCatalog(const QString& catalog);
			/**
			* Removes a catalog for translation lookup.
			* @param catalog The catalog to remove.
			* @see insertCatalog()
			*/
			void removeCatalog(const QString &catalog);
			/**
			* Sets the active catalog for translation lookup.
			* @param catalog The catalog to activate.
			*/
			void setActiveCatalog(const QString &catalog);
			/**
			* Translates a message as a QTranslator is supposed to.
			* The parameters are similar to i18n(), but the result
			* value has other semantics (it can be QString())
			*/
			QString translateQt(const char *context, const char *sourceText, const
			char *comment) const;
			/**
			* Provides list of all known language codes.
			*
			* Use languageCodeToName(language) to get human readable, localized
			* language names.
			*
			* @return list of all language codes
			*
			* @see languageCodeToName
			*/
			QStringList allLanguagesList() const;
			/**
			* Convert a known language code to a human readable, localized form.
			* 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
			* KLocale methods.
			*
			* @param language the language code
			*
			* @return the human readable and localized form if the code is known,
			* empty otherwise
			*
			* @see language
			* @see languageList
			* @see allLanguagesList
			*/
			QString languageCodeToName(const QString &language) const;
			/**
			* Provides list of all known country codes.
			*
			* Use countryCodeToName(country) to get human readable, localized
			* country names.
			*
			* @return a list of all country codes
			*
			* @see countryCodeToName
			*/
			QStringList allCountriesList() const;
			/**
			* Convert a known country code to a human readable, localized form.
			*
			* If an unknown country code is supplied, empty string is returned;
			* this will never happen if the code has been obtained by one of the
			* KLocale methods.
			*
			* @param country the country code
			*
			* @return the human readable and localized form of the country name
			*
			* @see country
			* @see allCountriesList
			*/
			QString countryCodeToName(const QString &country) const;
			/**
			* Parses locale string into distinct parts.
			* The format of locale is language_COUNTRY@modifier.CHARSET
			*
			* @param locale the locale string to split
			* @param language set to the language part of the locale
			* @param country set to the country part of the locale
			* @param modifier set to the modifer part of the locale
			* @param charset set to the charset part of the locale
			*/
			static void splitLocale(const QString &locale, QString &language, QStri
			ng &country,
			QString &modifier, QString &charset);
			/**
			* Use this as main catalog for *all* KLocales, if not the appname
			* will be used. This function is best to be the very first instruction
			* in your program's main function as it only has an effect before the
			* first KLocale object is created.
			*
			* @param catalog Catalog to override all other main Catalogs.
			*/
			static void setMainCatalog(const char *catalog);
			/**
			* @deprecated
			*
			* Finds localized resource in resourceDir( rtype ) + \<lang> + fname.
			*
			* Since KDE 4.1, this service is provided in a slightly different form
			,
			* automatically by e.g. KStandardDirs::locate() and other KDE core cla
			sses
			* dealing with paths. For manual use, it is replaced by localizedFileP
			ath().
			*
			* @param fname relative path to find
			* @param rtype resource type to use
			*
			* @return path to localized resource
			*
			* @see localizedFilePath
			*/
			static QString langLookup(const QString &fname, const char *rtype = "ht
			ml");
			/**
			* Returns the name of the internal language.
			*
			* @return Name of the default language
			*/
			static QString defaultLanguage();
			/**
			* Returns the name of the default country.
			*
			* @return Name of the default country
			*/
			static QString defaultCountry();
			/**
			* @since 4.4
			*
			* Returns the ISO Code of the default currency.
			*
			* @return ISO Currency Code of the default currency
			*/
			static QString defaultCurrencyCode();
			/**
			* Reports whether evaluation of translation scripts is enabled.
			*
			* @return true if script evaluation is enabled, false otherwise.
			*/
			bool useTranscript() const;
			/**
			* Checks whether or not the active catalog is found for the given lang
			uage.
			*
			* @param language language to check
			*/
			bool isApplicationTranslatedInto(const QString & language);
			/**
			* Copies the catalogs of this object to an other KLocale object.
			*
			* @param locale the destination KLocale object
			*/
			void copyCatalogsTo(KLocale *locale);
			/**
			* Changes the current country. The current country will be left
			* unchanged if failed. It will force a reload of the country specific
			* configuration.
			*
			* @param country the ISO 3166 country code
			* @param config a configuration file with a Locale group detailing
			* locale-related preferences (such as date and time
			* formatting)
			*
			* @return @c true on success, @c false on failure
			*/
			bool setCountry(const QString & country, KConfig *config);
			/**
			* Changes the current language. The current language will be left
			* unchanged if failed. It will force a reload of the country specific
			* configuration as well.
			*
			* @param language the language code
			* @param config a configuration file with a Locale group detailing
			* locale-related preferences (such as date and time
			* formatting)
			*
			* @return true on success
			*/
			bool setLanguage(const QString &language, KConfig *config);
			/**
			* 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)
			* if none of the specified languages were available.
			*
			* @param languages the list of language codes
			*
			* @return true if one of the specified languages were used
			*/
			bool setLanguage(const QStringList &languages);
			/**
			* @since 4.1
			*
			* Tries to find a path to the localized file for the given original pa
			th.
			* This is intended mainly for non-text resources (images, sounds, etc.
			),
			* whereas text resources should be handled in more specific ways.
			*
			* The possible localized paths are checked in turn by priority of set
			* languages, in form of dirname/l10n/ll/basename, where dirname and
			* basename are those of the original path, and ll is the language code
			.
			*
			* KDE core classes which resolve paths internally (e.g. KStandardDirs)
			* will usually perform this lookup behind the scene.
			* In general, you should pipe resource paths through this method only
			* on explicit translators' request, or when a resource is an obvious
			* candidate for localization (e.g. a splash screen or a custom icon
			* with some text drawn on it).
			*
			* @param filePath path to the original file
			*
			* @return path to the localized file if found, original path otherwise
			*/
			QString localizedFilePath(const QString &filePath) const;
			/**
			* @since 4.2
			*
			* Removes accelerator marker from a UI text label.
			*
			* Accelerator marker is not always a plain ampersand (&),
			* so it is not enough to just remove it by @c QString::remove().
			* The label may contain escaped markers ("&&") which must be resolved
			* and skipped, as well as CJK-style markers ("Foo (&F)") where
			* the whole parenthesis construct should be removed.
			* Therefore always use this function to remove accelerator marker
			* from UI labels.
			*
			* @param label UI label which may contain an accelerator marker
			* @return label without the accelerator marker
			*/
			QString removeAcceleratorMarker(const QString &label) const;
			/**
			* @since 4.3
			*
			* Convert all digits in the string to the given digit set.
			*
			* Conversion is normally not performed if the given digit set
			* is not appropriate in the current locale and language context.
			* Unconditional conversion may be requested by setting
			* @p ignoreContext to @c true.
			*
			* @param str the string to convert
			* @param digitSet the digit set identifier
			* @param ignoreContext unconditional conversion if @c true
			*
			* @return string with converted digits
			*
			* @see DigitSet
			*/
			QString convertDigits(const QString &str, DigitSet digitSet,
			bool ignoreContext = false) const;
	private:		private:
	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::TimeFormatOptions)
			Q_DECLARE_OPERATORS_FOR_FLAGS(KLocale::TimeProcessingOptions)
	#endif		#endif
End of changes. 115 change blocks.
	1298 lines changed or deleted		1702 lines changed or added

	kmainwindow.h		kmainwindow.h
	skipping to change at line 697		skipping to change at line 697
	KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WFlags f);		KMainWindow(KMainWindowPrivate &dd, QWidget *parent, Qt::WFlags f);
	KMainWindowPrivate * const k_ptr;		KMainWindowPrivate * const k_ptr;
	private:		private:
	Q_PRIVATE_SLOT(k_func(), void _k_shuttingDown())		Q_PRIVATE_SLOT(k_func(), void _k_shuttingDown())
	Q_PRIVATE_SLOT(k_func(), void _k_slotSettingsChanged(int))		Q_PRIVATE_SLOT(k_func(), void _k_slotSettingsChanged(int))
	Q_PRIVATE_SLOT(k_func(), void _k_slotSaveAutoSaveSize())		Q_PRIVATE_SLOT(k_func(), void _k_slotSaveAutoSaveSize())
	};		};
	/**		/**
			* @def RESTORE
			* @ingroup KDEUIMacros
	* Restores the last session. (To be used in your main function).		* Restores the last session. (To be used in your main function).
	*		*
	* If your client has only one kind of toplevel widgets (which		* If your client has only one kind of toplevel widgets (which
	* should be pretty usual) then you can use this macro,		* should be pretty usual) then you can use this macro,
	* which is provided for backwards compatibility with 3.1 and 3.0		* which is provided for backwards compatibility with 3.1 and 3.0
	* branches:		* branches:
	*		*
	* \code		* \code
	* if (qApp->isSessionRestored())		* if (qApp->isSessionRestored())
	* RESTORE(childMW)		* RESTORE(childMW)
	skipping to change at line 727		skipping to change at line 729
	*		*
	* @see KMainWindow::restore()		* @see KMainWindow::restore()
	* @see kRestoreMainWindows()		* @see kRestoreMainWindows()
	**/		**/
	#define RESTORE(type) { int n = 1;\		#define RESTORE(type) { int n = 1;\
	while (KMainWindow::canBeRestored(n)){\		while (KMainWindow::canBeRestored(n)){\
	(new type)->restore(n);\		(new type)->restore(n);\
	n++;}}		n++;}}
	/**		/**
			* @def KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS
			* @ingroup KDEUIMacros
	* Returns the maximal number of arguments that are actually		* Returns the maximal number of arguments that are actually
	* supported by kRestoreMainWindows().		* supported by kRestoreMainWindows().
	**/		**/
	#define KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS 3		#define KDE_RESTORE_MAIN_WINDOWS_NUM_TEMPLATE_ARGS 3
	/**		/**
	* Restores the last session. (To be used in your main function).		* Restores the last session. (To be used in your main function).
	*		*
	* These functions work also if you have more than one kind of toplevel		* These functions work also if you have more than one kind of toplevel
	* widget (each derived from KMainWindow, of course).		* widget (each derived from KMainWindow, of course).
End of changes. 2 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kmanagerselection.h		kmanagerselection.h
	skipping to change at line 180		skipping to change at line 180
	* This constructor accepts the selection name and creates the appr opriate atom		* This constructor accepts the selection name and creates the appr opriate atom
	* for it automatically.		* for it automatically.
	*		*
	* @param selection name of the manager selection		* @param selection name of the manager selection
	* @param screen X screen, or -1 for default		* @param screen X screen, or -1 for default
	* @param parent parent object, or NULL if there is none		* @param parent parent object, or NULL if there is none
	*/		*/
	explicit KSelectionWatcher( const char* selection, int screen = -1, QObject* parent = NULL );		explicit KSelectionWatcher( const char* selection, int screen = -1, QObject* parent = NULL );
	virtual ~KSelectionWatcher();		virtual ~KSelectionWatcher();
	/**		/**
	* Return the current owner of the manager selection, if any.		* Return the current owner of the manager selection, if any. Note
			that if the event
			* informing about the owner change is still in the input queue, ne
			wOwner() might
			* have been emitted yet.
	*/		*/
	Window owner();		Window owner();
	/**		/**
	* @internal		* @internal
	*/		*/
	void filterEvent( XEvent* ev_P ); // internal		void filterEvent( XEvent* ev_P ); // internal
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is emitted when the selection is successfully claime d by a new		* This signal is emitted when the selection is successfully claime d by a new
	* owner.		* owner.
End of changes. 1 change blocks.
	1 lines changed or deleted		5 lines changed or added

	kmessagebox.h		kmessagebox.h
	skipping to change at line 58		skipping to change at line 58
	* dontAskAgainName and/or options. In those cases, adding an addit ional		* dontAskAgainName and/or options. In those cases, adding an addit ional
	* parameter KStandardGuiItem::cancel() leads to the old behavior. The		* parameter KStandardGuiItem::cancel() leads to the old behavior. The
	* following functions are affected (omitting function arguments in the		* following functions are affected (omitting function arguments in the
	* list): questionYesNoCancel(), questionYesNoCancelWId(),		* list): questionYesNoCancel(), questionYesNoCancelWId(),
	* warningContinueCancel(), warningContinueCancelWId(),		* warningContinueCancel(), warningContinueCancelWId(),
	* warningContinueCancelList(), warningContinueCancelListWId(),		* warningContinueCancelList(), warningContinueCancelListWId(),
	* warningYesNoCancel(), warningYesNoCancelWId(),		* warningYesNoCancel(), warningYesNoCancelWId(),
	* warningYesNoCancelList(), warningYesNoCancelListWId(), messageBo x(),		* warningYesNoCancelList(), warningYesNoCancelListWId(), messageBo x(),
	* messageBoxWId().		* messageBoxWId().
	*		*
			* \image html kmessagebox.png "KDE Message Box (using questionYesNo())"
			*
	* @author Waldo Bastian (bastian@kde.org)		* @author Waldo Bastian (bastian@kde.org)
	*/		*/
	class KDEUI_EXPORT KMessageBox		class KDEUI_EXPORT KMessageBox
	{		{
	public:		public:
	/**		/**
	* Button types.		* Button types.
	**/		**/
	enum ButtonCode		enum ButtonCode
	{		{
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kmetadatatagwidget.h		kmetadatatagwidget.h
	skipping to change at line 100		skipping to change at line 100
	void updateAssignedTagsFromMenu();		void updateAssignedTagsFromMenu();
	void slotTagUpdateDone();		void slotTagUpdateDone();
	void slotTagClicked( const QString& text );		void slotTagClicked( const QString& text );
	private:		private:
	class Private;		class Private;
	Private* const d;		Private* const d;
	};		};
	}		}
	uint qHash( const Nepomuk::Tag& res );
	#endif		#endif
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	kmimetype.h		kmimetype.h
	skipping to change at line 178		skipping to change at line 178
	* If that does not help it		* If that does not help it
	* looks at the extension. This is fine for FTP, FILE, TAR and		* looks at the extension. This is fine for FTP, FILE, TAR and
	* friends, but is not for HTTP ( cgi scripts! ). You should use		* friends, but is not for HTTP ( cgi scripts! ). You should use
	* KRun instead, but this function returns immediately while		* KRun instead, but this function returns immediately while
	* KRun is async. If no extension matches, then		* KRun is async. If no extension matches, then
	* the file contents will be examined if the URL is a local file, or		* the file contents will be examined if the URL is a local file, or
	* "application/octet-stream" is returned otherwise.		* "application/octet-stream" is returned otherwise.
	*		*
	* Equivalent to		* Equivalent to
	* \code		* \code
	* KUrl u;		* KUrl u(path);
	* u.setPath(path);
	* return findByUrl( u, mode, true, fast_mode );		* return findByUrl( u, mode, true, fast_mode );
	* \endcode		* \endcode
	*		*
	* @param path the path to the file		* @param path the path to the file (a file name is enough, in fast mod e)
	* @param mode the mode of the file (used, for example, to identify		* @param mode the mode of the file (used, for example, to identify
	* executables)		* executables)
	* @param fast_mode If set to true no disk access is allowed to		* @param fast_mode If set to true no disk access is allowed to
	* find out the mimetype. The result may be suboptimal, but		* find out the mimetype. The result may be suboptimal, but
	* it is @em fast.		* it is @em fast.
	* @param accuracy If not a null pointer, *accuracy is set to the		* @param accuracy If not a null pointer, *accuracy is set to the
	* accuracy of the match (which is in the range 0..100)		* accuracy of the match (which is in the range 0..100)
	* @return A pointer to the matching mimetype. 0 is never returned.		* @return A pointer to the matching mimetype. 0 is never returned.
	*/		*/
	static Ptr findByPath( const QString& path, mode_t mode = 0,		static Ptr findByPath( const QString& path, mode_t mode = 0,
	skipping to change at line 227		skipping to change at line 226
	* Only used for the extension, not used as a local filename.		* Only used for the extension, not used as a local filename.
	* @param data the data to examine when the extension isn't conclusive in itself		* @param data the data to examine when the extension isn't conclusive in itself
	* @param mode the mode of the file (used, for example, to identify exe cutables)		* @param mode the mode of the file (used, for example, to identify exe cutables)
	* @param accuracy If not a null pointer, *accuracy is set to the		* @param accuracy If not a null pointer, *accuracy is set to the
	* accuracy of the match (which is in the range 0..100)		* accuracy of the match (which is in the range 0..100)
	*/		*/
	static Ptr findByNameAndContent( const QString& name, const QByteArray& data,		static Ptr findByNameAndContent( const QString& name, const QByteArray& data,
	mode_t mode = 0, int *accuracy=0 );		mode_t mode = 0, int *accuracy=0 );
	/**		/**
			* Tries to find out the MIME type of a data chunk by looking for
			* certain magic numbers and characteristic strings in it.
			*
			* @param device the IO device providing the data to examine
			* @param accuracy If not a null pointer, *accuracy is set to the
			* accuracy of the match (which is in the range 0..100)
			* @return a pointer to the KMimeType. "application/octet-stream" is
			* returned if the type can not be found this way.
			* @since 4.4
			*/
			static Ptr findByContent( QIODevice* device, int* accuracy = 0 );
			/**
			* Tries to find out the MIME type of filename/url and a data chunk.
			* Whether to trust the extension or the data depends on the results of
			both approaches,
			* and is determined automatically.
			*
			* This method is useful for instance in the get() method of kioslaves,
			and anywhere else
			* where a filename is associated with some data which is available imm
			ediately.
			*
			* @param name the filename or url representing this data.
			* Only used for the extension, not used as a local filename.
			* @param device the IO device providing the data to examine when the e
			xtension isn't conclusive in itself
			* @param mode the mode of the file (used, for example, to identify exe
			cutables)
			* @param accuracy If not a null pointer, *accuracy is set to the
			* accuracy of the match (which is in the range 0..100)
			* @return a pointer to the KMimeType. "application/octet-stream" is
			* returned if the type can not be found this way.
			* @since 4.4
			*/
			static Ptr findByNameAndContent( const QString& name, QIODevice* device
			,
			mode_t mode = 0, int* accuracy = 0 );
			/**
	* Tries to find out the MIME type of a file by looking for		* Tries to find out the MIME type of a file by looking for
	* certain magic numbers and characteristic strings in it.		* certain magic numbers and characteristic strings in it.
	* This function is similar to the previous one. Note that the		* This function is similar to the previous one. Note that the
	* file name is not used for determining the file type, it is just		* file name is not used for determining the file type, it is just
	* used for loading the file's contents.		* used for loading the file's contents.
	*		*
	* @param fileName the path to the file		* @param fileName the path to the file
	* @param accuracy If not a null pointer, *accuracy is set to the		* @param accuracy If not a null pointer, *accuracy is set to the
	* accuracy of the match (which is in the range 0..100)		* accuracy of the match (which is in the range 0..100)
	* @return a pointer to the KMimeType, or the default mimetype		* @return a pointer to the KMimeType, or the default mimetype
End of changes. 3 change blocks.
	3 lines changed or deleted		42 lines changed or added

	kmodifierkeyinfo.h		kmodifierkeyinfo.h
	skipping to change at line 42		skipping to change at line 42
	*		*
	* This class provides cross-platform information about the state of the		* This class provides cross-platform information about the state of the
	* keyboard's modifier keys and the mouse buttons and allows to change the		* keyboard's modifier keys and the mouse buttons and allows to change the
	* state as well.		* state as well.
	*		*
	* It recognizes two states a key can be in:		* It recognizes two states a key can be in:
	* <ul><li><i>locked</i>: eg. caps-locked (aka toggled)</li>		* <ul><li><i>locked</i>: eg. caps-locked (aka toggled)</li>
	* <li><i>latched</i>: the key is temporarily locked but will be unlock ed upon		* <li><i>latched</i>: the key is temporarily locked but will be unlock ed upon
	* the next keypress.</li></ul>		* the next keypress.</li></ul>
	*		*
	* An application can either query the states synchroneously (@see isKeyLat ched,		* An application can either query the states synchronously (@see isKeyLatc hed,
	* @see isKeyLocked) or connect to KModifierKeyInfo's signals to be notifie d about		* @see isKeyLocked) or connect to KModifierKeyInfo's signals to be notifie d about
	* changes (@see keyLatched, @see keyLocked).		* changes (@see keyLatched, @see keyLocked).
	*/		*/
	class KDEUI_EXPORT KModifierKeyInfo : public QObject		class KDEUI_EXPORT KModifierKeyInfo : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Default constructor		* Default constructor
	skipping to change at line 77		skipping to change at line 77
	bool knowsKey(Qt::Key key) const;		bool knowsKey(Qt::Key key) const;
	/**		/**
	* Get a list of known keys.		* Get a list of known keys.
	*		*
	* @return A list of known keys of which states will be reported.		* @return A list of known keys of which states will be reported.
	*/		*/
	const QList<Qt::Key> knownKeys() const;		const QList<Qt::Key> knownKeys() const;
	/**		/**
	* Synchroneously check if a key is pressed.		* Synchronously check if a key is pressed.
	*		*
	* @param key The key to check		* @param key The key to check
	* @return true if the key is pressed, false if the key is not pressed or unknown.		* @return true if the key is pressed, false if the key is not pressed or unknown.
	* @see isKeyLatched, @see isKeyLocked, @see keyPressed		* @see isKeyLatched, @see isKeyLocked, @see keyPressed
	*/		*/
	bool isKeyPressed(Qt::Key key) const;		bool isKeyPressed(Qt::Key key) const;
	/**		/**
	* Synchroneously check if a key is latched.		* Synchronously check if a key is latched.
	*		*
	* @param key The key to check		* @param key The key to check
	* @return true if the key is latched, false if the key is not latched or unknown.		* @return true if the key is latched, false if the key is not latched or unknown.
	* @see isKeyPressed, @see isKeyLocked, @see keyLatched		* @see isKeyPressed, @see isKeyLocked, @see keyLatched
	*/		*/
	bool isKeyLatched(Qt::Key key) const;		bool isKeyLatched(Qt::Key key) const;
	/**		/**
	* Set the latched state of a key.		* Set the latched state of a key.
	*		*
	* @param key The key to latch		* @param key The key to latch
	* @param latched true to latch the key, false to unlatch it.		* @param latched true to latch the key, false to unlatch it.
	* @return false if the key is unknown. true doesn't guarantee you the		* @return false if the key is unknown. true doesn't guarantee you the
	* operation worked.		* operation worked.
	*/		*/
	bool setKeyLatched(Qt::Key key, bool latched);		bool setKeyLatched(Qt::Key key, bool latched);
	/**		/**
	* Synchroneously check if a key is locked.		* Synchronously check if a key is locked.
	*		*
	* @param key The key to check		* @param key The key to check
	* @return true if the key is locked, false if the key is not locked or unknown.		* @return true if the key is locked, false if the key is not locked or unknown.
	* @see isKeyPressed, @see isKeyLatched, @see keyLocked		* @see isKeyPressed, @see isKeyLatched, @see keyLocked
	*/		*/
	bool isKeyLocked(Qt::Key key) const;		bool isKeyLocked(Qt::Key key) const;
	/**		/**
	* Set the locked state of a key.		* Set the locked state of a key.
	*		*
	* @param key The key to lock		* @param key The key to lock
	* @param latched true to lock the key, false to unlock it.		* @param latched true to lock the key, false to unlock it.
	* @return false if the key is unknown. true doesn't guarantee you the		* @return false if the key is unknown. true doesn't guarantee you the
	* operation worked.		* operation worked.
	*/		*/
	bool setKeyLocked(Qt::Key key, bool locked);		bool setKeyLocked(Qt::Key key, bool locked);
	/**		/**
	* Synchroneously check if a mouse button is pressed.		* Synchronously check if a mouse button is pressed.
	*		*
	* @param button The mouse button to check		* @param button The mouse button to check
	* @return true if the mouse button is pressed, false if the mouse butt on		* @return true if the mouse button is pressed, false if the mouse butt on
	* is not pressed or its state is unknown.		* is not pressed or its state is unknown.
	*/		*/
	bool isButtonPressed(Qt::MouseButton button) const;		bool isButtonPressed(Qt::MouseButton button) const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* This signal is emitted whenever the pressed state of a key changes		* This signal is emitted whenever the pressed state of a key changes
End of changes. 5 change blocks.
	5 lines changed or deleted		5 lines changed or added

	kmultitabbar.h		kmultitabbar.h
	skipping to change at line 52		skipping to change at line 52
	class KMultiTabBarButtonPrivate;		class KMultiTabBarButtonPrivate;
	class KMultiTabBarInternal;		class KMultiTabBarInternal;
	/**		/**
	* A Widget for horizontal and vertical tabs.		* A Widget for horizontal and vertical tabs.
	* (Note that in Qt4, QTabBar can be vertical as well)		* (Note that in Qt4, QTabBar can be vertical as well)
	*		*
	* It is possible to add normal buttons to the top/left		* It is possible to add normal buttons to the top/left
	* 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".
	*@author Joseph Wenninger		*
			* \image html kmultitabbar.png "KDE Multi Tab Bar Widget"
			*
			* @author Joseph Wenninger
	*/		*/
	class KDEUI_EXPORT KMultiTabBar: public QWidget		class KDEUI_EXPORT KMultiTabBar: public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	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
End of changes. 1 change blocks.
	1 lines changed or deleted		4 lines changed or added

	knewpassworddialog.h		knewpassworddialog.h
	skipping to change at line 37		skipping to change at line 37
	#include <kdialog.h>		#include <kdialog.h>
	class QWidget;		class QWidget;
	/**		/**
	* @short A password input dialog.		* @short A password input dialog.
	*		*
	* This dialog asks the user to enter a password.		* This dialog asks the user to enter a password.
	*		*
	* \image html kpassworddialog.png "KDE Password Dialog"
	*
	* \section usage Usage Exemple		* \section usage Usage Exemple
	* \subsection asynchronous Asynchronous		* \subsection asynchronous Asynchronous
	*		*
	* \code		* \code
	* KNewPasswordDialog *dlg = new KNewPasswordDialog( parent );		* KNewPasswordDialog *dlg = new KNewPasswordDialog( parent );
	* dlg->setPrompt( i18n( "Enter a password" );		* dlg->setPrompt( i18n( "Enter a password" );
	* connect( dlg, SIGNAL( newPassword( const QString& ) ) , this, SLOT( se tPassword( const QString &) ) );		* connect( dlg, SIGNAL( newPassword( const QString& ) ) , this, SLOT( se tPassword( const QString &) ) );
	* connect( dlg, SIGNAL( rejected() ) , this, SLOT( slotCancel() ) );		* connect( dlg, SIGNAL( rejected() ) , this, SLOT( slotCancel() ) );
	* dlg->show();		* dlg->show();
	* \endcode		* \endcode
	*		*
	* \subsection synchronous Synchronous		* \subsection synchronous Synchronous
	*		*
	* \code		* \code
	* KNewPasswordDialog dlg( parent );		* KNewPasswordDialog dlg( parent );
	* dlg.setPrompt( i18n( "Enter a password" );		* dlg.setPrompt( i18n( "Enter a password" );
	* if( dlg.exec() )		* if( dlg.exec() )
	* setPassword( dlg.password() );		* setPassword( dlg.password() );
	* \endcode		* \endcode
	*		*
			* \image html knewpassworddialog.png "KDE New Password Dialog"
			*
	* @author Geert Jansen <jansen@kde.org>		* @author Geert Jansen <jansen@kde.org>
	* @author Olivier Goffart <ogoffart@kde.org>		* @author Olivier Goffart <ogoffart@kde.org>
	*/		*/
	class KDEUI_EXPORT KNewPasswordDialog		class KDEUI_EXPORT KNewPasswordDialog
	: public KDialog		: public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	knewstuffaction.h		knewstuffaction.h
	skipping to change at line 29		skipping to change at line 29
	#define KNEWSTUFFACTION_H		#define KNEWSTUFFACTION_H
	#include <knewstuff2/knewstuff_export.h>		#include <knewstuff2/knewstuff_export.h>
	class QObject;		class QObject;
	class KAction;		class KAction;
	class KActionCollection;		class KActionCollection;
	namespace KNS		namespace KNS
	{		{
	/**		/**
	* @brief Standard action for all GHNS workflows.		* @brief Standard action for all GHNS workflows.
	*		*
	* This action can be used to add KNewStuff support to menus and toolbars.		* This action can be used to add KNewStuff support to menus and toolbars.
			*
			* @param what text describing what is being downloaded. For consistency,
			* set it to "Get New Foobar...".
			* Examples: "Get New Wallpapers...", "Get New Emoticons..."
			* @param receiver the QObject to connect the triggered(bool) signal to.
			* @param slot the slot to connect the triggered(bool) signal to.
			* @param parent the action's parent collection.
			* @param name The name by which the action will be retrieved again from th
			e collection.
			*
			* Deprecated, use knewstuff3!
	*/		*/
	KNEWSTUFF_EXPORT KAction* standardAction(const QString& what,		KNEWSTUFF_EXPORT_DEPRECATED KAction * standardAction(const QString &what,
	const QObject *recvr,		const QObject *receiver,
	const char *slot,		const char *slot,
	KActionCollection* parent,		KActionCollection *parent,
	const char *name = 0);		const char *name = 0);
	}		}
	#endif // KNEWSTUFFACTION_H		#endif // KNEWSTUFFACTION_H
End of changes. 5 change blocks.
	4 lines changed or deleted		15 lines changed or added

	knotification.h		knotification.h
	skipping to change at line 125		skipping to change at line 125
	Action=Sound|Popup		Action=Sound|Popup
	[Event/contactOnline]		[Event/contactOnline]
	Name=Contact goes online		Name=Contact goes online
	Comment=One of your contact has been connected		Comment=One of your contact has been connected
	Contexts=group		Contexts=group
	Sound=filetoplay.ogg		Sound=filetoplay.ogg
	Action=None		Action=None
	* </pre>		* </pre>
	* These are the default settings for each notifiable event.		* These are the default settings for each notifiable event.
	* Action is a bitmask of KNotification::NotifyPresentation		* Action is the string representing the action. Actions can be added to
			* the KNotify daemon as plugins, by deriving from KNotifyPlugin.
			* At the time of writing, the following actions are available: Taskbar,
			* Sound, Popup, Logfile, KTTS, Execute.
			* Actions can be combined by seperating them with '|'.
	*		*
	* Contexts is a comma separated list of possible context for this event.		* Contexts is a comma separated list of possible context for this event.
	*		*
	* \section userfile The user's config file		* \section userfile The user's config file
	*		*
	* This is an implementation detail, and is described here for your inform ation.		* This is an implementation detail, and is described here for your inform ation.
	*		*
	* In the config file, there are two parts: the event configuration, and the context information		* In the config file, there are two parts: the event configuration, and the context information
	* \subsection context Context information		* \subsection context Context information
	* These are hints for the configuration dialog. They contain both the int ernal id of the context, and the user visible string.		* These are hints for the configuration dialog. They contain both the int ernal id of the context, and the user visible string.
	skipping to change at line 160		skipping to change at line 164
	[Event/contactOnline/group/1]		[Event/contactOnline/group/1]
	Action=Popup|Sound		Action=Popup|Sound
	* </pre>		* </pre>
	*		*
	* \section example Example of code		* \section example Example of code
	*		*
	* This portion of code will fire the event for the "contactOnline" event		* This portion of code will fire the event for the "contactOnline" event
	*		*
	* @code		* @code
	KNotification *notification= new KNotification ( "contactOnline", wi dget );		KNotification *notification= new KNotification ( "contactOnline", wi dget );
	notification->setText( i18n("The contact <i>%1</i> has gone online") .arg( contact->name() ) );		notification->setText( i18n("The contact <i>%1</i> has gone online", contact->name() );
	notification->setPixmap( contact->pixmap() );		notification->setPixmap( contact->pixmap() );
	notification->setActions( QStringList( i18n( "Open chat" ) ) );		notification->setActions( QStringList( i18n( "Open chat" ) ) );
	foreach( const QString &group , contact->groups() ) {		foreach( const QString &group , contact->groups() ) {
	notification->addContext( "group" , group ) ;		notification->addContext( "group" , group ) ;
	}		}
	connect(notification, SIGNAL(activated(unsigned int )), contact , SL OT(slotOpenChat()) );		connect(notification, SIGNAL(activated(unsigned int )), contact , SL OT(slotOpenChat()) );
	notification->sendEvent();		notification->sendEvent();
	skipping to change at line 269		skipping to change at line 274
	* Make sure you use one of the NotificationFlags CloseOnTimeOut or		* Make sure you use one of the NotificationFlags CloseOnTimeOut or
	* CloseWhenWidgetActivated, if not,		* CloseWhenWidgetActivated, if not,
	* you have to close the notification yourself.		* you have to close the notification yourself.
	*		*
	* @param eventId is the name of the event		* @param eventId is the name of the event
	* @param widget is a widget where the notification reports to		* @param widget is a widget where the notification reports to
	* @param flags is a bitmask of NotificationFlag		* @param flags is a bitmask of NotificationFlag
	*/		*/
	explicit KNotification(const QString & eventId , QWidget *widget=0L, const NotificationFlags &flags=CloseOnTimeout);		explicit KNotification(const QString & eventId , QWidget *widget=0L, const NotificationFlags &flags=CloseOnTimeout);
			/**
			* Create a new notification.
			*
			* You have to use sendEvent to show the notification.
			*
			* The pointer is automatically deleted when the event is closed.
			*
			* Make sure you use one of the NotificationFlags CloseOnTimeOut or
			* CloseWhenWidgetActivated, if not,
			* you have to close the notification yourself.
			*
			* @since 4.4
			*
			* @param eventId is the name of the event
			* @param flags is a bitmask of NotificationFlag
			* @param parent parent object
			*/
			// KDE5: Clean up this mess
			// Only this constructor should stay with saner argument order and
			// defaults. Because of binary and source compatibility issues it ha
			s to
			// stay this way for now. The second argument CANNOT have a default
			// argument. if someone needs a widget associated with the notificat
			ion he
			// should use setWidget after creating the object (or some xyz_cast
			magic)
			explicit KNotification(const QString & eventId , const NotificationF
			lags &flags, QObject *parent = NULL );
	~KNotification();		~KNotification();
	/**		/**
	* @brief the widget associated to the notification		* @brief the widget associated to the notification
	*		*
	* If the widget is destroyed, the notification will be automaticall y cancelled.		* If the widget is destroyed, the notification will be automaticall y cancelled.
	* If the widget is activated, the notification will be automaticall y closed if the NotificationFlags specify that		* If the widget is activated, the notification will be automaticall y closed if the NotificationFlags specify that
	*		*
	* When the notification is activated, the widget might be raised.		* When the notification is activated, the widget might be raised.
	* Depending on the configuration, the taskbar entry of the window c ontaining the widget may blink.		* Depending on the configuration, the taskbar entry of the window c ontaining the widget may blink.
	skipping to change at line 295		skipping to change at line 325
	* \see widget()		* \see widget()
	* @param widget the new widget		* @param widget the new widget
	*/		*/
	void setWidget(QWidget *widget);		void setWidget(QWidget *widget);
	/**		/**
	* @return the name of the event		* @return the name of the event
	*/		*/
	QString eventId() const;		QString eventId() const;
	/**		/**
	* @return the notification title		* @return the notification title
	* @see setTitle		* @see setTitle
	* @since 4.3		* @since 4.3
	*/		*/
	QString title() const;		QString title() const;
	/**		/**
	* Set the title of the notification popup.		* Set the title of the notification popup.
	* If no title is set, the application name will be used.		* If no title is set, the application name will be used.
	*		*
	* @param title the title		* @param title the title
	* @since 4.3		* @since 4.3
	*/		*/
	void setTitle(const QString &title);		void setTitle(const QString &title);
	/**		/**
	* @return the notification text		* @return the notification text
	* @see setText		* @see setText
	*/		*/
	QString text() const ;		QString text() const ;
	/**		/**
	* Set the notification text that will appear in the popup.		* Set the notification text that will appear in the popup.
	*		*
	skipping to change at line 371		skipping to change at line 401
	* @param context the context which is added		* @param context the context which is added
	*/		*/
	void addContext( const Context & context);		void addContext( const Context & context);
	/**		/**
	* @overload		* @overload
	* @param context_key is the key of the context		* @param context_key is the key of the context
	* @param context_value is the value of the context		* @param context_value is the value of the context
	*/		*/
	void addContext( const QString & context_key, const QString & contex t_value );		void addContext( const QString & context_key, const QString & contex t_value );
	/**		/**
	* @return the notification flags.		* @return the notification flags.
	*/		*/
	NotificationFlags flags() const;		NotificationFlags flags() const;
	/**		/**
	* Set the notification flags.		* Set the notification flags.
	* should be called before sendEvent().		* should be called before sendEvent().
	*/		*/
	void setFlags(const NotificationFlags &flags);		void setFlags(const NotificationFlags &flags);
	/**		/**
	* The componentData is used to determine the location of the config fi		* The componentData is used to determine the location of the config
	le. By default, kapp is used		file. By default, kapp is used
	* @param componentData the new componentData		* @param componentData the new componentData
	*/		*/
	void setComponentData(const KComponentData &componentData);		void setComponentData(const KComponentData &componentData);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emit only when the default activation has occurred		* Emit only when the default activation has occurred
	*/		*/
	void activated();		void activated();
	/**		/**
	* Emit when an action has been activated.		* Emit when an action has been activated.
	* @param action will be 0 is the default aciton was activated, or a ny action id		* @param action will be 0 is the default aciton was activated, or a ny action id
	*/		*/
	void activated(unsigned int action);		void activated(unsigned int action);
	/**		/**
	* Convenience signal that is emitted when the first action is activate		* Convenience signal that is emitted when the first action is activ
	d.		ated.
	*/		*/
	void action1Activated();		void action1Activated();
	/**		/**
	* \overload		* \overload
	*/		*/
	void action2Activated();		void action2Activated();
	/**		/**
	* \overload		* \overload
	*/		*/
	void action3Activated();		void action3Activated();
	/**		/**
	* Emitted when the notification is closed. Both when it is activate d or if it is just ignored.		* Emitted when the notification is closed. Both when it is activate d or if it is just ignored.
	*/		*/
	void closed();		void closed();
	/**		/**
	* The notification has been ignored		* The notification has been ignored
	*/		*/
	void ignored();		void ignored();
	skipping to change at line 503		skipping to change at line 533
	*		*
	* return a KNotification . You may use that pointer to connect som e signals or slot.		* return a KNotification . You may use that pointer to connect som e signals or slot.
	* the pointer is automatically deleted when the event is closed.		* the pointer is automatically deleted when the event is closed.
	*		*
	* Make sure you use one of the CloseOnTimeOut or CloseWhenWidgetAct ivated, if not,		* Make sure you use one of the CloseOnTimeOut or CloseWhenWidgetAct ivated, if not,
	* you have to close yourself the notification.		* you have to close yourself the notification.
	*		*
	* @note the text is shown in a QLabel, you should escape HTML, if n eeded.		* @note the text is shown in a QLabel, you should escape HTML, if n eeded.
	*		*
	* @param eventId is the name of the event		* @param eventId is the name of the event
			* @param title is title of the notification to show in the popup.
	* @param text is the text of the notification to show in the popup.		* @param text is the text of the notification to show in the popup.
	* @param pixmap is a picture which may be shown in the popup.		* @param pixmap is a picture which may be shown in the popup.
	* @param widget is a widget where the notification reports to		* @param widget is a widget where the notification reports to
	* @param flags is a bitmask of NotificationFlag		* @param flags is a bitmask of NotificationFlag
	* @param componentData used to determine the location of the config fi		* @param componentData used to determine the location of the config
	le. by default, kapp is used		file. by default, kapp is used
			* @since 4.4
	*/		*/
	static KNotification *event(const QString &eventId , const QString		static KNotification *event(const QString &eventId , const QString &
	&text = QString(),		title, const QString &text,
	const QPixmap &pixmap = QPixmap(), QWidget *widget = 0L,		const QPixmap &pixmap = QPixmap(), QWidget *widget =
	const NotificationFlags &flags = CloseOnTimeout,		0L,
	const KComponentData &componentData = KComponentData());		const NotificationFlags &flags = CloseOnTimeout,
			const KComponentData &componentData = KComponentData
			());
	/**		/**
	* @brief emit a standard event		* @brief emit a standard event
			*
			* @overload
			*
			* This will emit a standard event
			*
			* @param eventId is the name of the event
			* @param text is the text of the notification to show in the popup.
			* @param pixmap is a picture which may be shown in the popup.
			* @param widget is a widget where the notification reports to
			* @param flags is a bitmask of NotificationFlag
			* @param componentData used to determine the location of the config
			file. by default, kapp is used
			*/
			static KNotification *event(const QString &eventId , const QString &
			text = QString(),
			const QPixmap &pixmap = QPixmap(), QWidget *widget =
			0L,
			const NotificationFlags &flags = CloseOnTimeout,
			const KComponentData &componentData = KComponentData
			());
			/**
			* @brief emit a standard event
			*
	* @overload		* @overload
	*		*
	* This will emit a standard event		* This will emit a standard event
	*		*
	* @param eventId is the name of the event		* @param eventId is the name of the event
	* @param text is the text of the notification to show in the popup		* @param text is the text of the notification to show in the popup
	* @param pixmap is a picture which may be shown in the popup		* @param pixmap is a picture which may be shown in the popup
	* @param widget is a widget where the notification reports to		* @param widget is a widget where the notification reports to
	* @param flags is a bitmask of NotificationFlag		* @param flags is a bitmask of NotificationFlag
	*/		*/
	static KNotification *event( StandardEvent eventId , const QString& text=QString(),		static KNotification *event( StandardEvent eventId , const QString& text=QString(),
	const QPixm ap& pixmap=QPixmap(), QWidget *widget=0L,		const QPixm ap& pixmap=QPixmap(), QWidget *widget=0L,
	const Notif icationFlags& flags=CloseOnTimeout);		const Notif icationFlags& flags=CloseOnTimeout);
	/**		/**
			* @brief emit a standard event
			*
			* @overload
			*
			* This will emit a standard event
			*
			* @param eventId is the name of the event
			* @param title is title of the notification to show in the popup.
			* @param text is the text of the notification to show in the popup
			* @param pixmap is a picture which may be shown in the popup
			* @param widget is a widget where the notification reports to
			* @param flags is a bitmask of NotificationFlag
			* @since 4.4
			*/
			static KNotification *event( StandardEvent eventId , const QString&
			title, const QString& text,
			const QPixmap& pixmap=QPixmap(), QWidget *w
			idget=0L,
			const NotificationFlags& flags=CloseOnTimeo
			ut);
			/**
	* This is a simple substitution for QApplication::beep()		* This is a simple substitution for QApplication::beep()
	*		*
	* @param reason a short text explaining what has happened (may be e mpty)		* @param reason a short text explaining what has happened (may be e mpty)
	* @param widget the widget the notification refers to		* @param widget the widget the notification refers to
	*/		*/
	static void beep( const QString& reason = QString() , QWidget *widge t=0L);		static void beep( const QString& reason = QString() , QWidget *widge t=0L);
	//prevent warning		//prevent warning
	using QObject::event;		using QObject::event;
	};		};
End of changes. 16 change blocks.
	51 lines changed or deleted		134 lines changed or added

	knuminput.h		knuminput.h
	skipping to change at line 438		skipping to change at line 438
	* The slider is created only when the user specifies a range		* The slider is created only when the user specifies a range
	* for the control using the setRange function with the slider		* for the control using the setRange function with the slider
	* parameter set to "true".		* parameter set to "true".
	*		*
	* A special feature of KDoubleNumInput, designed specifically for		* A special feature of KDoubleNumInput, designed specifically for
	* the situation when there are several instances in a column,		* the situation when there are several instances in a column,
	* is that you can specify what portion of the control is taken by the		* is that you can specify what portion of the control is taken by the
	* QSpinBox (the remaining portion is used by the slider). This makes		* QSpinBox (the remaining portion is used by the slider). This makes
	* 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.
	*		*
	* It uses the KDoubleValidator validator class. KDoubleNumInput		* \image html kdoublenuminput.png "KDE Double Number Input Spinbox"
	* enforces the value to be in the given range, but see the class
	* documentation of KDoubleSpinBox for the tricky
	* interrelationship of precision and values. All of what is said
	* there applies here, too.
	*		*
	* @see KIntNumInput, KDoubleSpinBox		* @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 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 )
	skipping to change at line 705		skipping to change at line 701
	/* ------------------------------------------------------------------------ */		/* ------------------------------------------------------------------------ */
	/**		/**
	* @short A QSpinBox with support for arbitrary base numbers.		* @short A QSpinBox with support for arbitrary base numbers.
	*		*
	* A QSpinBox with support for arbitrary base numbers		* A QSpinBox with support for arbitrary base numbers
	* (e.g. hexadecimal).		* (e.g. hexadecimal).
	*		*
	* The class provides an easy interface to use other		* The class provides an easy interface to use other
	* numeric systems than the decimal.		* numeric systems than the decimal.
			*
			* \image html kintspinbox.png "KDE Integer Input Spinboxes with hexadecima
			l and binary input"
	*/		*/
	class KDEUI_EXPORT KIntSpinBox : public QSpinBox		class KDEUI_EXPORT KIntSpinBox : public QSpinBox
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( int base READ base WRITE setBase )		Q_PROPERTY( int base READ base WRITE setBase )
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
End of changes. 3 change blocks.
	6 lines changed or deleted		5 lines changed or added

	knumvalidator.h		knumvalidator.h
	skipping to change at line 46		skipping to change at line 46
	text entry. Can be provided with a base value (default is 10), to allow		text entry. Can be provided with a base value (default is 10), to allow
	the proper entry of hexadecimal, octal, or any other base numeric data.		the proper entry of hexadecimal, octal, or any other base numeric data.
	@author Glen Parker <glenebob@nwlink.com>		@author Glen Parker <glenebob@nwlink.com>
	@version 0.0.1		@version 0.0.1
	*/		*/
	class KDEUI_EXPORT KIntValidator : public QValidator {		class KDEUI_EXPORT KIntValidator : public QValidator {
	public:		public:
	/**		/**
	Constuctor. Also sets the base value.		* Constructor. Also sets the base value.
	*/		*/
	explicit KIntValidator ( QWidget * parent, int base = 10 );		explicit KIntValidator ( QWidget * parent, int base = 10 );
	/**		/**
	* Constructor. Also sets the minimum, maximum, and numeric base value s.		* Constructor. Also sets the minimum, maximum, and numeric base value s.
	*/		*/
	KIntValidator ( int bottom, int top, QWidget * parent, int base = 10 );		KIntValidator ( int bottom, int top, QWidget * parent, int base = 10 );
	/**		/**
	* Destructs the validator.		* Destructs the validator.
	*/		*/
	virtual ~KIntValidator ();		virtual ~KIntValidator ();
	/**		/**
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	konqbookmarkmenu.h		konqbookmarkmenu.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 __konqbookmarkmenu_h__		#ifndef __konqbookmarkmenu_h__
	#define __konqbookmarkmenu_h__		#define __konqbookmarkmenu_h__
	#include "kbookmarkmenu.h"		#include "kbookmarkmenu.h"
	class KIO_EXPORT KonqBookmarkOwner : public KBookmarkOwner		class KIO_EXPORT KonqBookmarkOwner : public KBookmarkOwner // KDE5 TODO: me rge with KBookmarkOwner
	{		{
	public:		public:
	virtual ~KonqBookmarkOwner();		virtual ~KonqBookmarkOwner();
	virtual void openInNewTab(const KBookmark &bm) = 0;		virtual void openInNewTab(const KBookmark &bm) = 0;
	virtual void openInNewWindow(const KBookmark &bm) = 0;		virtual void openInNewWindow(const KBookmark &bm) = 0;
	};		};
	class KIO_EXPORT KonqBookmarkMenu : public KBookmarkMenu		class KIO_EXPORT KonqBookmarkMenu : public KBookmarkMenu
	{		{
	//friend class KBookmarkBar;		//friend class KBookmarkBar;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kpassivepopup.h		kpassivepopup.h
	// -*- c++ -*-		// -*- c++ -*-
	/*		/*
	* Copyright : (C) 2001-2006 by Richard Moore		* Copyright (C) 2001-2006 by Richard Moore <rich@kde.org>
	* Copyright : (C) 2004-2005 by Sascha Cunz		* Copyright (C) 2004-2005 by Sascha Cunz <sascha.cunz@tiscali.de>
	* License : This file is released under the terms of the LG
	PL, version 2.
	* Email : rich@kde.org
	* Email : sascha.cunz@tiscali.de
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2 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
	* Lesser General Public License for more details.		* Lesser General Public License for more details.
	skipping to change at line 69		skipping to change at line 66
	* This screenshot shows a popup with both a caption and a main text which is		* This screenshot shows a popup with both a caption and a main text which is
	* being displayed next to the toolbar icon of the window that triggered it :		* being displayed next to the toolbar icon of the window that triggered it :
	* \image html kpassivepopup.png "A passive popup"		* \image html kpassivepopup.png "A passive popup"
	*		*
	* For more control over the popup, you can use the setView(QWidget *) meth od		* For more control over the popup, you can use the setView(QWidget *) meth od
	* to create a custom popup.		* to create a custom popup.
	* \code		* \code
	* KPassivePopup *pop = new KPassivePopup( parent );		* KPassivePopup *pop = new KPassivePopup( parent );
	*		*
	* KVBox *vb = new KVBox( pop );		* KVBox *vb = new KVBox( pop );
	* (void) new QLabel( vb, "<b>Isn't this great?</b>" );		* (void) new QLabel( "<b>Isn't this great?</b>", vb);
	*		*
	* KHBox *box = new KHBox( vb );		* KHBox *box = new KHBox( vb );
	* (void) new QPushButton( "Yes", box );		* (void) new QPushButton( "Yes", box );
	* (void) new QPushButton( "No", box );		* (void) new QPushButton( "No", box );
	*		*
	* pop->setView( vb );		* pop->setView( vb );
	* pop->show();		* pop->show();
	* \endcode		* \endcode
	*		*
	* @author Richard Moore, rich@kde.org		* @author Richard Moore, rich@kde.org
End of changes. 2 change blocks.
	7 lines changed or deleted		3 lines changed or added

	kpassworddialog.h		kpassworddialog.h
	skipping to change at line 52		skipping to change at line 52
	* Requesting a login and a password, synchronous		* Requesting a login and a password, synchronous
	*		*
	* \code		* \code
	* KPasswordDialog dlg(parent, KPasswordDialog::ShowUsernameLine);		* KPasswordDialog dlg(parent, KPasswordDialog::ShowUsernameLine);
	* dlg.setPrompt(i18n("Enter a login and a password"));		* dlg.setPrompt(i18n("Enter a login and a password"));
	* if( !dlg.exec() )		* if( !dlg.exec() )
	* return; //the user canceled		* return; //the user canceled
	* use( dlg.username() , dlg.password() );		* use( dlg.username() , dlg.password() );
	* \endcode		* \endcode
	*		*
			* \image html kpassworddialog.png "KDE Password Dialog"
			*
	* @short dialog for requesting login and password from the end user		* @short dialog for requesting login and password from the end user
	*/		*/
	class KDEUI_EXPORT KPasswordDialog : public KDialog		class KDEUI_EXPORT KPasswordDialog : public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	enum KPasswordDialogFlag		enum KPasswordDialogFlag
	{		{
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kpixmapcache.h		kpixmapcache.h
	skipping to change at line 128		skipping to change at line 128
	* and can later be retrieved using @p timestamp() method.		* and can later be retrieved using @p timestamp() method.
	* By default the timestamp is set to the cache creation time.		* By default the timestamp is set to the cache creation time.
	**/		**/
	void setTimestamp(unsigned int time);		void setTimestamp(unsigned int time);
	/**		/**
	* Sets whether QPixmapCache (memory caching) should be used in additio n		* Sets whether QPixmapCache (memory caching) should be used in additio n
	* to disk cache.		* to disk cache.
	* QPixmapCache is used by default.		* QPixmapCache is used by default.
	**/		**/
	void setUseQPixmapCache(bool use);		void setUseQPixmapCache(bool use);
	/**		/**
	* Whether QPixmapCache should be used to cache pixmaps in memory in		* Whether QPixmapCache should be used to cache pixmaps in memory in
	* addition to caching them on the disk.		* addition to caching them on the disk.
			*
			* @b NOTE: The design of QPixmapCache means that the entries stored in
			* the cache are shared throughout the entire process, and not just in
			* this particular KPixmapCache. KPixmapCache makes an effort to ensure
			* that entries from other KPixmapCaches do not inadvertently spill ove
			r
			* into this one, but is not entirely successful (@see discard())
	**/		**/
	bool useQPixmapCache() const;		bool useQPixmapCache() const;
	/**		/**
	* @return approximate size of the cache, in kilobytes.		* @return approximate size of the cache, in kilobytes.
	**/		**/
	int size() const;		int size() const;
	/**		/**
	* @return maximum size of the cache (in kilobytes).		* @return maximum size of the cache (in kilobytes).
	* Default setting is 3 megabytes.		* Default setting is 3 megabytes.
	skipping to change at line 187		skipping to change at line 194
	* @return true when the cache is ready to be used.		* @return true when the cache is ready to be used.
	* False usually means that some additional initing has to be done befo re		* False usually means that some additional initing has to be done befo re
	* the cache can be used.		* the cache can be used.
	**/		**/
	bool isValid() const;		bool isValid() const;
	/**		/**
	* Deletes a pixmap cache.		* Deletes a pixmap cache.
	* @param name unique name of the cache to be deleted		* @param name unique name of the cache to be deleted
	**/		**/
	static void deleteCache(const QString& name);		static void deleteCache(const QString& name);
	/**		/**
	* Deletes all entries and reinitializes this cache.		* Deletes all entries and reinitializes this cache.
	**/		*
			* @b NOTE: If useQPixmapCache is set to true then that cache must also
			* be cleared. There is only one QPixmapCache for the entire process
			* however so other KPixmapCaches and other QPixmapCache users may also
			* be affected, leading to a temporary slowdown until the QPixmapCache
			is
			* repopulated.
			*/
	void discard();		void discard();
	/**		/**
	* Removes some of the entries in the cache according to current		* Removes some of the entries in the cache according to current
	* @ref removeEntryStrategy().		* @ref removeEntryStrategy().
	* @param newsize wanted size of the cache, in bytes. If 0 is given the n		* @param newsize wanted size of the cache, in bytes. If 0 is given the n
	* current @ref cacheLimit() is used.		* current @ref cacheLimit() is used.
	*		*
	* Warning: this works by copying some entries to a new cache and then		* Warning: this works by copying some entries to a new cache and then
	* replacing the old cache with the new one. Thus it might be slow and		* replacing the old cache with the new one. Thus it might be slow and
End of changes. 4 change blocks.
	2 lines changed or deleted		18 lines changed or added

	kpixmapregionselectordialog.h		kpixmapregionselectordialog.h
	skipping to change at line 40		skipping to change at line 40
	* A dialog that uses a KPixmapRegionSelectorWidget to allow the user		* A dialog that uses a KPixmapRegionSelectorWidget to allow the user
	* to select a region of an image. If you want to use special features		* to select a region of an image. If you want to use special features
	* like forcing the selected area to have a fixed aspect ratio, you can use		* like forcing the selected area to have a fixed aspect ratio, you can use
	* @see pixmapRegionSelectorWidget() to get the pointer to the		* @see pixmapRegionSelectorWidget() to get the pointer to the
	* KPixmapRegionSelectorWidget object and set the desired options there.		* KPixmapRegionSelectorWidget object and set the desired options there.
	*		*
	* There are some convenience methods that allow to easily show a dialog		* There are some convenience methods that allow to easily show a dialog
	* for the user to select a region of an image, and just care about the sel ected		* for the user to select a region of an image, and just care about the sel ected
	* image.		* image.
	*		*
			* \image html kpixmapregionselectordialog.png "KDE Pixmap Region Selector
			Dialog"
			*
	* @author Antonio Larrosa <larrosa@kde.org>		* @author Antonio Larrosa <larrosa@kde.org>
	*/		*/
	class KDEUI_EXPORT KPixmapRegionSelectorDialog : public KDialog		class KDEUI_EXPORT KPixmapRegionSelectorDialog : public KDialog
	{		{
	public:		public:
	/**		/**
	* The constructor of an empty KPixmapRegionSelectorDialog, you have to call		* The constructor of an empty KPixmapRegionSelectorDialog, you have to call
	* later the setPixmap method of the KPixmapRegionSelectorWidget widget of		* later the setPixmap method of the KPixmapRegionSelectorWidget widget of
	* the new object.		* the new object.
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kpixmapregionselectorwidget.h		kpixmapregionselectorwidget.h
	skipping to change at line 39		skipping to change at line 39
	/**		/**
	* KPixmapRegionSelectorWidget is a widget that shows a picture and provide s the		* KPixmapRegionSelectorWidget is a widget that shows a picture and provide s the
	* user with a friendly way to select a rectangular subregion of the pixmap .		* user with a friendly way to select a rectangular subregion of the pixmap .
	*		*
	* NOTE: There are two copies of this .h and the .cpp file, with subtle dif ferences.		* NOTE: There are two copies of this .h and the .cpp file, with subtle dif ferences.
	* One copy is in kdelibs/kdeui, and the other copy is in kdepim/libkdepim		* One copy is in kdelibs/kdeui, and the other copy is in kdepim/libkdepim
	* This is because kdepim has to remain backwards compatible. Any changes		* This is because kdepim has to remain backwards compatible. Any changes
	* to either file should be made to the other.		* to either file should be made to the other.
	*		*
			* \image html kpixmapregionselectorwidget.png "KDE Pixmap Region Selector"
			*
	* @author Antonio Larrosa <larrosa@kde.org>		* @author Antonio Larrosa <larrosa@kde.org>
	*/		*/
	class KDEUI_EXPORT KPixmapRegionSelectorWidget : public QWidget		class KDEUI_EXPORT KPixmapRegionSelectorWidget : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(QPixmap pixmap READ pixmap WRITE setPixmap)
	public:		public:
	/**		/**
	* This enum provides a rotation direction.		* This enum provides a rotation direction.
	* @see KPixmapRegionSelectorWidget::rotate()		* @see KPixmapRegionSelectorWidget::rotate()
	*/		*/
	enum RotateDirection{ Rotate90, //!< Rotate 90 degrees to the right.		enum RotateDirection{ Rotate90, //!< Rotate 90 degrees to the right.
	Rotate180, //!< Rotate 180 degrees.		Rotate180, //!< Rotate 180 degrees.
	Rotate270 //!< Rotate 90 degrees to the left.		Rotate270 //!< Rotate 90 degrees to the left.
	};		};
End of changes. 2 change blocks.
	0 lines changed or deleted		4 lines changed or added

	kpluginfactory.h		kpluginfactory.h
	skipping to change at line 144		skipping to change at line 144
	* \param name The name of the KPluginFactory derived class. This is the na me you'll need for		* \param name The name of the KPluginFactory derived class. This is the na me you'll need for
	* K_EXPORT_PLUGIN		* K_EXPORT_PLUGIN
	*		*
	* \see K_PLUGIN_FACTORY		* \see K_PLUGIN_FACTORY
	* \see K_PLUGIN_FACTORY_DEFINITION		* \see K_PLUGIN_FACTORY_DEFINITION
	*/		*/
	#define K_PLUGIN_FACTORY_DECLARATION(name) K_PLUGIN_FACTORY_DECLARATION_WIT H_BASEFACTORY(name, KPluginFactory)		#define K_PLUGIN_FACTORY_DECLARATION(name) K_PLUGIN_FACTORY_DECLARATION_WIT H_BASEFACTORY(name, KPluginFactory)
	/**		/**
	* \relates KPluginFactory		* \relates KPluginFactory
	* K_PLUGIN_FACTORY_DECLARATION defines the KPluginFactory subclass. This m acro can <b>not</b> be used in a		* K_PLUGIN_FACTORY_DEFINITION defines the KPluginFactory subclass. This ma cro can <b>not</b> be used in a
	* header file.		* header file.
	*		*
	* \param name The name of the KPluginFactory derived class. This is the na me you'll need for		* \param name The name of the KPluginFactory derived class. This is the na me you'll need for
	* K_EXPORT_PLUGIN		* K_EXPORT_PLUGIN
	*		*
	* \param pluginRegistrations This is code inserted into the constructors t he class. You'll want to		* \param pluginRegistrations This is code inserted into the constructors t he class. You'll want to
	* call registerPlugin from there.		* call registerPlugin from there.
	*		*
	* \see K_PLUGIN_FACTORY		* \see K_PLUGIN_FACTORY
	* \see K_PLUGIN_FACTORY_DECLARATION		* \see K_PLUGIN_FACTORY_DECLARATION
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kprogressdialog.h		kprogressdialog.h
	skipping to change at line 42		skipping to change at line 42
	*		*
	* Since knowing how long it can take to complete an action and it is		* Since knowing how long it can take to complete an action and it is
	* undesirable to show a dialog for a split second before hiding it,		* undesirable to show a dialog for a split second before hiding it,
	* there are a few ways to control the timing behavior of KProgressDialog.		* there are a few ways to control the timing behavior of KProgressDialog.
	* There is a time out that can be set before showing the dialog as well		* There is a time out that can be set before showing the dialog as well
	* as an option to autohide or keep displaying the dialog once complete.		* as an option to autohide or keep displaying the dialog once complete.
	*		*
	* All the functionality of QProgressBar is available through direct access		* All the functionality of QProgressBar is available through direct access
	* to the progress bar widget via progressBar();		* to the progress bar widget via progressBar();
	*		*
			* \image html kprogressdialog.png "KDE Progress Dialog"
			*
	* @author Aaron J. Seigo		* @author Aaron J. Seigo
	* @author Urs Wolfer uwolfer @ kde.org		* @author Urs Wolfer uwolfer @ kde.org
	*/		*/
	class KDEUI_EXPORT KProgressDialog : public KDialog		class KDEUI_EXPORT KProgressDialog : public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructs a KProgressDialog		* Constructs a KProgressDialog
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kpropertiesdialog.h		kpropertiesdialog.h
	skipping to change at line 376		skipping to change at line 376
	* 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
	*/		*/
	static KDE_DEPRECATED bool isDesktopFile( const KFileItem& _item );		static KDE_DEPRECATED bool isDesktopFile( const KFileItem& _item );
	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 )		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.
	* The hosting PropertiesDialog will call applyChanges only if the		* The hosting PropertiesDialog will call applyChanges only if the
	* PropsPlugin has emitted this signal or if you have called setDirty() b efore.		* PropsPlugin has emitted this signal or if you have called setDirty() b efore.
	*/		*/
	void changed();		void changed();
	protected:		protected:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kprotocolinfo.h		kprotocolinfo.h
	skipping to change at line 222		skipping to change at line 222
	*		*
	* This corresponds to the "maxInstances=" field in the protocol descript ion file.		* This corresponds to the "maxInstances=" field in the protocol descript ion file.
	* The default is 1.		* The default is 1.
	*		*
	* @param protocol the protocol to check		* @param protocol the protocol to check
	* @return the maximum number of slaves, or 1 if unknown		* @return the maximum number of slaves, or 1 if unknown
	*/		*/
	static int maxSlaves( const QString& protocol );		static int maxSlaves( const QString& protocol );
	/**		/**
			* Returns the limit on the number of slaves for this protocol per host.
			*
			* This corresponds to the "maxInstancesPerHost=" field in the protocol d
			escription file.
			* The default is 0 which means there is no per host limit.
			*
			* @param protocol the protocol to check
			* @return the maximum number of slaves, or 1 if unknown
			*
			* @since 4.4
			*/
			static int maxSlavesPerHost( const QString& protocol );
			/**
	* Returns whether mimetypes can be determined based on extension for thi s		* Returns whether mimetypes can be determined based on extension for thi s
	* protocol. For some protocols, e.g. http, the filename extension in the URL		* protocol. For some protocols, e.g. http, the filename extension in the URL
	* can not be trusted to truly reflect the file type.		* can not be trusted to truly reflect the file type.
	*		*
	* This corresponds to the "determineMimetypeFromExtension=" field in the protocol description file.		* This corresponds to the "determineMimetypeFromExtension=" field in the protocol description file.
	* Valid values for this field are "true" (default) or "false".		* Valid values for this field are "true" (default) or "false".
	*		*
	* @param protocol the protocol to check		* @param protocol the protocol to check
	* @return true if the mime types can be determined by extension		* @return true if the mime types can be determined by extension
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		14 lines changed or added

	kpushbutton.h		kpushbutton.h
	skipping to change at line 31		skipping to change at line 31
	#define KPUSHBUTTON_H		#define KPUSHBUTTON_H
	#include <QtGui/QPushButton>		#include <QtGui/QPushButton>
	#include <kstandardguiitem.h>		#include <kstandardguiitem.h>
	class QDrag;		class QDrag;
	class QMenu;		class QMenu;
	class KIcon;		class KIcon;
			namespace KAuth {
			class Action;
			}
	/**		/**
	* @brief A QPushButton with drag-support and KGuiItem support		* @brief A QPushButton with drag-support and KGuiItem support
	*		*
	* This is nothing but a QPushButton with drag-support and KGuiItem support .		* This is nothing but a QPushButton with drag-support and KGuiItem support .
	* You must call #setDragEnabled (true) and override the virtual method		* You must call #setDragEnabled (true) and override the virtual method
	* dragObject() to specify the QDragObject to be used.		* dragObject() to specify the QDragObject to be used.
	*		*
			* \image html kpushbutton.png "KDE Push Button"
			*
	* @author Carsten Pfeiffer <pfeiffer@kde.org>		* @author Carsten Pfeiffer <pfeiffer@kde.org>
	*/		*/
	class KDEUI_EXPORT KPushButton : public QPushButton		class KDEUI_EXPORT KPushButton : public QPushButton
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled)		Q_PROPERTY(bool isDragEnabled READ isDragEnabled WRITE setDragEnabled)
	public:		public:
	/**		/**
	skipping to change at line 99		skipping to change at line 105
	* Sets the standard KGuiItem for this button.		* Sets the standard KGuiItem for this button.
	*/		*/
	void setGuiItem( KStandardGuiItem::StandardItem item );		void setGuiItem( KStandardGuiItem::StandardItem item );
	/**		/**
	* Reads the standard KGuiItem for this button.		* Reads the standard KGuiItem for this button.
	*/		*/
	KStandardGuiItem::StandardItem guiItem() const;		KStandardGuiItem::StandardItem guiItem() const;
	/**		/**
	* Sets the Icon Set for this button. It also takes into account hte		* 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.
	*/		*/
	KDE_DEPRECATED void setIcon( const QIcon &pix );		KDE_DEPRECATED void setIcon( const QIcon &pix );
	skipping to change at line 128		skipping to change at line 134
	* for consistency, since menu() isn't virtual		* for consistency, since menu() isn't virtual
	*/		*/
	void setDelayedMenu(QMenu *delayed_menu);		void setDelayedMenu(QMenu *delayed_menu);
	/**		/**
	* returns a delayed popup menu		* returns a delayed popup menu
	* since menu() isn't virtual		* since menu() isn't virtual
	*/		*/
	QMenu *delayedMenu();		QMenu *delayedMenu();
			/**
			* Reimplemented to add arrow for delayed menu
			* @since 4.4
			*/
			virtual QSize sizeHint() const;
			/**
			* Returns the action object associated with this button, or 0 if it do
			es not have one
			*
			* @returns the KAuth::Action associated with this button.
			*/
			KAuth::Action *authAction() const;
			/**
			* Sets the action object associated with this button
			*
			* By setting a KAuth::Action, this button will become associated with
			it, and
			* whenever it gets clicked, it will trigger the authorization and exec
			ution process
			* for the action. The signal activated will also be emitted whenever t
			he button gets
			* clicked and the action gets authorized. Pass 0 to this function to d
			isassociate the button
			*
			* @param action the KAuth::Action to associate with this button.
			*/
			void setAuthAction(KAuth::Action *action);
			/**
			* Sets the action object associated with this button
			*
			* Overloaded member to allow creating the action by name
			*
			* @param actionName the name of the action to associate
			*/
			void setAuthAction(const QString &actionName);
	protected:		protected:
	/**		/**
	* Reimplement this and return the QDrag object that should be used		* Reimplement this and return the QDrag object that should be used
	* for the drag. Remember to give it "this" as parent.		* for the drag. Remember to give it "this" as parent.
	*		*
	* Default implementation returns 0, so that no drag is initiated.		* Default implementation returns 0, so that no drag is initiated.
	*/		*/
	virtual QDrag * dragObject();		virtual QDrag * dragObject();
	/**		/**
	* Reimplemented to add drag-support		* Reimplemented to add drag-support
	*/		*/
	virtual void mousePressEvent( QMouseEvent * );		virtual void mousePressEvent( QMouseEvent * );
	/**		/**
	* Reimplemented to add drag-support		* Reimplemented to add drag-support
	*/		*/
	virtual void mouseMoveEvent( QMouseEvent * );		virtual void mouseMoveEvent( QMouseEvent * );
	/**		/**
			* Reimplemented to add arrow for delayed menu
			* @since 4.4
			*/
			virtual void paintEvent( QPaintEvent * );
			/**
	* Starts a drag (dragCopy() by default) using dragObject()		* Starts a drag (dragCopy() by default) using dragObject()
	*/		*/
	virtual void startDrag();		virtual void startDrag();
			Q_SIGNALS:
			/**
			* Signal emitted when the button is triggered and authorized
			*
			* If the button needs authorization, whenever the user triggers it,
			* the authorization process automatically begins.
			* If it succeeds, this signal is emitted. The KAuth::Action object is
			provided for convenience
			* if you have multiple Action objects, but of course it's always the s
			ame set with
			* setAuthAction().
			*
			* WARNING: If your button needs authorization you should connect event
			ual slots processing
			* stuff to this signal, and NOT clicked. Clicked will be emitted even
			if the user has not
			* been authorized
			*
			* @param action The object set with setAuthAction()
			*/
			void authorized(KAuth::Action *action);
	private:		private:
	/**		/**
	* Internal.		* Internal.
	* Initialize the KPushButton instance		* Initialize the KPushButton instance
	*/		*/
	void init( const KGuiItem &item );		void init( const KGuiItem &item );
	private:		private:
	class KPushButtonPrivate;		class KPushButtonPrivate;
	KPushButtonPrivate * const d;		KPushButtonPrivate * const d;
	Q_PRIVATE_SLOT(d, void slotSettingsChanged( int ))		Q_PRIVATE_SLOT(d, void slotSettingsChanged( int ))
	Q_PRIVATE_SLOT(d, void slotPressedInternal())		Q_PRIVATE_SLOT(d, void slotPressedInternal())
	Q_PRIVATE_SLOT(d, void slotClickedInternal())		Q_PRIVATE_SLOT(d, void slotClickedInternal())
	Q_PRIVATE_SLOT(d, void slotDelayedMenuTimeout())		Q_PRIVATE_SLOT(d, void slotDelayedMenuTimeout())
			Q_PRIVATE_SLOT(d, void authStatusChanged(int))
	};		};
	#endif // KPUSHBUTTON_H		#endif // KPUSHBUTTON_H
End of changes. 7 change blocks.
	1 lines changed or deleted		75 lines changed or added

	kreplacedialog.h		kreplacedialog.h
	skipping to change at line 50		skipping to change at line 50
	*		*
	* To use the basic replace dialog:		* To use the basic replace dialog:
	*		*
	* \code		* \code
	* \endcode		* \endcode
	*		*
	* To use your own extensions:		* To use your own extensions:
	*		*
	* \code		* \code
	* \endcode		* \endcode
			*
			* \image html kreplacedialog.png "KDE Replace Dialog"
	*/		*/
	class KDEUI_EXPORT KReplaceDialog:		class KDEUI_EXPORT KReplaceDialog:
	public KFindDialog		public KFindDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	// Options.		// Options.
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	krestrictedline.h		krestrictedline.h
	skipping to change at line 43		skipping to change at line 43
	* All other characters will be discarded and the signal invalidChar()		* All other characters will be discarded and the signal invalidChar()
	* will be emitted for each of them.		* will be emitted for each of them.
	*		*
	* Valid characters can be passed as a QString to the constructor		* Valid characters can be passed as a QString to the constructor
	* or set afterwards via setValidChars().		* or set afterwards via setValidChars().
	* The default key bindings of QLineEdit are still in effect.		* The default key bindings of QLineEdit are still in effect.
	*		*
	* This is almost like setting a QRegExpValidator on a KLineEdit;		* This is almost like setting a QRegExpValidator on a KLineEdit;
	* the difference is that with KRestrictedLine it can all be done in Qt des igner.		* the difference is that with KRestrictedLine it can all be done in Qt des igner.
	*		*
			* \image html krestrictedline.png "KDE Restricted Line Edit allowing all c
			haracters but 'o'"
			*
	* @author Michael Wiedmann <mw@miwie.in-berlin.de>		* @author Michael Wiedmann <mw@miwie.in-berlin.de>
	*/		*/
	class KDEUI_EXPORT KRestrictedLine : public KLineEdit		class KDEUI_EXPORT KRestrictedLine : public KLineEdit
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( QString validChars READ validChars WRITE setValidChars )		Q_PROPERTY( QString validChars READ validChars WRITE setValidChars )
	public:		public:
	/**		/**
	* Constructor: This contructor takes three - optional - arguments.		* Constructor
	* The first two parameters are simply passed on to QLineEdit.
	* @param parent pointer to the parent widget		* @param parent pointer to the parent widget
	*/		*/
	explicit KRestrictedLine( QWidget* parent = 0);		explicit KRestrictedLine( QWidget* parent = 0);
	/**		/**
	* Destructs the restricted line editor.		* Destructs the restricted line editor.
	*/		*/
	~KRestrictedLine();		~KRestrictedLine();
	/**		/**
	skipping to change at line 82		skipping to change at line 83
	QString validChars() const;		QString validChars() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when an invalid character was typed.		* Emitted when an invalid character was typed.
	*/		*/
	void invalidChar(int);		void invalidChar(int);
	protected:		protected:
	void keyPressEvent( QKeyEvent *e );		void keyPressEvent( QKeyEvent *e );
			void inputMethodEvent(QInputMethodEvent *e);
	private:		private:
	KRestrictedLinePrivate * const d;		KRestrictedLinePrivate * const d;
	};		};
	#endif // KRESTRICTEDLINE_H		#endif // KRESTRICTEDLINE_H
End of changes. 3 change blocks.
	3 lines changed or deleted		6 lines changed or added

	krichtextedit.h		krichtextedit.h
	skipping to change at line 59		skipping to change at line 59
	*		*
	* The KRichTextEdit can be in two modes: Rich text mode and plain text mod e.		* The KRichTextEdit can be in two modes: Rich text mode and plain text mod e.
	* Calling functions which modify the format/style of the text will automat ically		* Calling functions which modify the format/style of the text will automat ically
	* enable the rich text mode. Rich text mode is sometimes also referred to as		* enable the rich text mode. Rich text mode is sometimes also referred to as
	* HTML mode.		* HTML mode.
	*		*
	* Do not call setAcceptRichText() or acceptRichText() yourself. Instead si mply		* Do not call setAcceptRichText() or acceptRichText() yourself. Instead si mply
	* connect to the slots which insert the rich text, use switchToPlainText() or		* connect to the slots which insert the rich text, use switchToPlainText() or
	* enableRichTextMode().		* enableRichTextMode().
	*		*
			* \image html krichtextedit.png "KDE Rich Text Edit Widget"
			*
	* @since 4.1		* @since 4.1
	*/		*/
	class KDEUI_EXPORT KRichTextEdit : public KTextEdit		class KDEUI_EXPORT KRichTextEdit : public KTextEdit
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* The mode the edit widget is in.		* The mode the edit widget is in.
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	krichtextwidget.h		krichtextwidget.h
	skipping to change at line 41		skipping to change at line 41
	* All you need to do is to call createActions(), and the actions will be		* All you need to do is to call createActions(), and the actions will be
	* added to your KXMLGUIWindow. Remember to also add the chosen actions to		* added to your KXMLGUIWindow. Remember to also add the chosen actions to
	* your application ui.rc file.		* your application ui.rc file.
	*		*
	* See the KRichTextWidget::RichTextSupportValues enum for an overview of		* See the KRichTextWidget::RichTextSupportValues enum for an overview of
	* supported actions.		* supported actions.
	*		*
	* @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"
			*
	* @since 4.1		* @since 4.1
	*/		*/
	class KDEUI_EXPORT KRichTextWidget : public KRichTextEdit		class KDEUI_EXPORT KRichTextWidget : public KRichTextEdit
	{		{
	Q_OBJECT		Q_OBJECT
	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().
	skipping to change at line 127		skipping to change at line 129
	/**		/**
	* Action to change the background color of the currently selected text. If no		* Action to change the background color of the currently selected text. If no
	* text is selected, the backgound color of the word under the curs or is		* text is selected, the backgound color of the word under the curs or is
	* changed.		* changed.
	* Opens a KColorDialog to select the color.		* Opens a KColorDialog to select the color.
	*/		*/
	SupportTextBackgroundColor = 0x80,		SupportTextBackgroundColor = 0x80,
	/**		/**
	* A combination of all the falgs above.		* A combination of all the flags above.
	* Includes all actions that change the format of the text.		* Includes all actions that change the format of the text.
	*/		*/
	FullTextFormattingSupport = 0xff,		FullTextFormattingSupport = 0xff,
	/**		/**
	* Action to make the current line a list element, change the		* Action to make the current line a list element, change the
	* list style or remove list formatting.		* list style or remove list formatting.
	* Displayed as a combobox when inserted into a toolbar.		* Displayed as a combobox when inserted into a toolbar.
	* This is a KSelectAction. The status is automatically updated whe n		* This is a KSelectAction. The status is automatically updated whe n
	* the text cursor is moved.		* the text cursor is moved.
End of changes. 2 change blocks.
	1 lines changed or deleted		3 lines changed or added

	kruler.h		kruler.h
	skipping to change at line 68		skipping to change at line 68
	* For performance reasons, the public methods don't call QWidget::repaint( ).		* For performance reasons, the public methods don't call QWidget::repaint( ).
	* (Slots do, see documentation below.)		* (Slots do, see documentation below.)
	* All the changed settings will be painted once after leaving		* All the changed settings will be painted once after leaving
	* to the main event loop.		* to the main event loop.
	* For performance painting the slot methods should be used,		* For performance painting the slot methods should be used,
	* they do a fast QWidget::repaint() call after changing the values.		* they do a fast QWidget::repaint() call after changing the values.
	* For setting multiple values like minValue(), maxValue(), offset() etc.		* For setting multiple values like minValue(), maxValue(), offset() etc.
	* using the public methods is recommended		* using the public methods is recommended
	* so the widget will be painted only once when entering the main event loo p.		* so the widget will be painted only once when entering the main event loo p.
	*		*
			* \image html kruler.png "KDE Ruler Widget"
			*
	* @short A ruler widget.		* @short A ruler widget.
	* @author Jörg Habenicht		* @author Jörg Habenicht
	*/		*/
	class KDEUI_EXPORT KRuler : public QAbstractSlider		class KDEUI_EXPORT KRuler : public QAbstractSlider
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( bool showTinyMarks READ showTinyMarks WRITE setShowTinyMarks )		Q_PROPERTY( bool showTinyMarks READ showTinyMarks WRITE setShowTinyMarks )
	Q_PROPERTY( bool showLittleMarks READ showLittleMarks WRITE setShowLittle Marks )		Q_PROPERTY( bool showLittleMarks READ showLittleMarks WRITE setShowLittle Marks )
	Q_PROPERTY( bool showMediumMarks READ showMediumMarks WRITE setShowMedium Marks )		Q_PROPERTY( bool showMediumMarks READ showMediumMarks WRITE setShowMedium Marks )
	Q_PROPERTY( bool showBigMarks READ showBigMarks WRITE setShowBigMarks )		Q_PROPERTY( bool showBigMarks READ showBigMarks WRITE setShowBigMarks )
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	krun.h		krun.h
	skipping to change at line 241		skipping to change at line 241
	* See also isExecutable().		* See also isExecutable().
	* @param suggestedFileName see setSuggestedFileName		* @param suggestedFileName see setSuggestedFileName
	* @param asn Application startup notification id, if any (otherwise "" ).		* @param asn Application startup notification id, if any (otherwise "" ).
	* @return @c true on success, @c false on error		* @return @c true on success, @c false on error
	*/		*/
	static bool runUrl(const KUrl& url, const QString& mimetype, QWidget* w indow,		static bool runUrl(const KUrl& url, const QString& mimetype, QWidget* w indow,
	bool tempFile = false , bool runExecutables = true,		bool tempFile = false , bool runExecutables = true,
	const QString& suggestedFileName = QString(), const QByteArray& asn = QByteArray());		const QString& suggestedFileName = QString(), const QByteArray& asn = QByteArray());
	/**		/**
	* Run the given shell command and notifies kicker of the starting		* Run the given shell command and notifies KDE of the starting
	* of the application. If the program to be called doesn't exist,		* of the application. If the program to be called doesn't exist,
	* an error box will be displayed.		* an error box will be displayed.
	*		*
	* Use only when you know the full command line. Otherwise use the othe r		* Use only when you know the full command line. Otherwise use the othe r
	* static methods, or KRun's constructor.		* static methods, or KRun's constructor.
	*		*
	* @p cmd must be a shell command. You must not append "&"		* @p cmd must be a shell command. You must not append "&"
	* to it, since the function will do that for you.		* to it, since the function will do that for you.
	* @param window The top-level widget of the app that invoked this obje ct.		* @param window The top-level widget of the app that invoked this obje ct.
	*		*
	* @return @c true on success, @c false on error		* @return @c true on success, @c false on error
	*/		*/
	static bool runCommand(const QString &cmd, QWidget* window);		static bool runCommand(const QString &cmd, QWidget* window);
	/**		/**
			* Overload that also takes a working directory, so that a command like
			* "kwrite file.txt" finds file.txt from the right place.
			* @since 4.4
			*/
			static bool runCommand(const QString &cmd, QWidget* window, const QStri
			ng& workingDirectory);
			// TODO KDE5: merge the above with 2-args runCommand, using QString()
			/**
	* Same as the other runCommand(), but it also takes the name of the		* Same as the other runCommand(), but it also takes the name of the
	* binary, to display an error message in case it couldn't find it.		* binary, to display an error message in case it couldn't find it.
	*		*
	* @param cmd must be a shell command. You must not append "&"		* @param cmd must be a shell command. You must not append "&"
	* to it, since the function will do that for you.		* to it, since the function will do that for you.
	* @param execName the name of the executable		* @param execName the name of the executable
	* @param icon icon for app starting notification		* @param icon icon for app starting notification
	* @param window The top-level widget of the app that invoked this obje ct.		* @param window The top-level widget of the app that invoked this obje ct.
	* @param asn Application startup notification id, if any (otherwise "" ).		* @param asn Application startup notification id, if any (otherwise "" ).
	* @return @c true on success, @c false on error		* @return @c true on success, @c false on error
	*/		*/
	static bool runCommand(const QString& cmd, const QString & execName,		static bool runCommand(const QString& cmd, const QString & execName,
	const QString & icon, QWidget* window, const QBy teArray& asn = QByteArray());		const QString & icon, QWidget* window, const QBy teArray& asn = QByteArray());
	/**		/**
			* Overload that also takes a working directory, so that a command like
			* "kwrite file.txt" finds file.txt from the right place.
			* @param workingDirectory the working directory for the started proces
			s. The default
			* (if passing an empty string) is the user's d
			ocument path.
			* @since 4.4
			*/
			static bool runCommand(const QString& cmd, const QString & execName,
			const QString & icon, QWidget* window,
			const QByteArray& asn, const QString& workingDir
			ectory);
			// TODO KDE5: merge the above with 5-args runCommand, using QString()
			/**
	* Display the Open-With dialog for those URLs, and run the chosen appl ication.		* Display the Open-With dialog for those URLs, and run the chosen appl ication.
	* @param lst the list of applications to run		* @param lst the list of applications to run
	* @param window The top-level widget of the app that invoked this obje ct.		* @param window The top-level widget of the app that invoked this obje ct.
	* @param tempFiles if true and lst are local files, they will be delet ed		* @param tempFiles if true and lst are local files, they will be delet ed
	* when the application exits.		* when the application exits.
	* @param suggestedFileName see setSuggestedFileName		* @param suggestedFileName see setSuggestedFileName
	* @param asn Application startup notification id, if any (otherwise "" ).		* @param asn Application startup notification id, if any (otherwise "" ).
	* @return false if the dialog was canceled		* @return false if the dialog was canceled
	*/		*/
	static bool displayOpenWithDialog(const KUrl::List& lst, QWidget* windo w,		static bool displayOpenWithDialog(const KUrl::List& lst, QWidget* windo w,
	skipping to change at line 349		skipping to change at line 369
	/**		/**
	* @internal		* @internal
	*/		*/
	static bool checkStartupNotify(const QString& binName, const KService* service, bool* silent_arg,		static bool checkStartupNotify(const QString& binName, const KService* service, bool* silent_arg,
	QByteArray* wmclass_arg);		QByteArray* wmclass_arg);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when the operation finished.		* Emitted when the operation finished.
			* This signal is emitted in all cases of completion, whether successfu l or with error.
	* @see hasFinished()		* @see hasFinished()
	*/		*/
	void finished();		void finished();
	/**		/**
	* Emitted when the operation had an error.		* Emitted when the operation had an error.
	* @see hasError()		* @see hasError()
	*/		*/
	void error();		void error();
	protected Q_SLOTS:		protected Q_SLOTS:
	skipping to change at line 412		skipping to change at line 433
	/**		/**
	* Start scanning a file.		* Start scanning a file.
	*/		*/
	virtual void scanFile();		virtual void scanFile();
	/**		/**
	* Called if the mimetype has been detected. The function runs		* Called if the mimetype has been detected. The function runs
	* the application associated with this mimetype.		* the application associated with this mimetype.
	* Reimplement this method to implement a different behavior,		* Reimplement this method to implement a different behavior,
	* like opening the component for displaying the URL embedded.		* like opening the component for displaying the URL embedded.
			*
			* Important: call setFinished(true) once you are done!
			* Usually at the end of the foundMimeType reimplementation, but if the
			* reimplementation is asynchronous (e.g. uses KIO jobs) then
			* it can be called later instead.
	*/		*/
	virtual void foundMimeType(const QString& type);		virtual void foundMimeType(const QString& type);
	/**		/**
	* Kills the file scanning job.		* Kills the file scanning job.
	*/		*/
	virtual void killJob();		virtual void killJob();
	/**		/**
	* Sets the url.		* Sets the url.
	skipping to change at line 462		skipping to change at line 488
	*/		*/
	void setJob(KIO::Job *job);		void setJob(KIO::Job *job);
	/**		/**
	* 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)
			,
			* so this can be removed.
	*/		*/
	QTimer& timer();		KDE_DEPRECATED QTimer& timer();
	/**		/**
	* 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
	*/		*/
	KDE_DEPRECATED void setDoScanFile(bool scanFile);		KDE_DEPRECATED void setDoScanFile(bool scanFile);
	/**		/**
	* 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
End of changes. 7 change blocks.
	2 lines changed or deleted		35 lines changed or added

	kseparator.h		kseparator.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef KSEPARATOR_H		#ifndef KSEPARATOR_H
	#define KSEPARATOR_H		#define KSEPARATOR_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QFrame>		#include <QtGui/QFrame>
	/**		/**
	* Standard horizontal or vertical separator.		* Standard horizontal or vertical separator.
	*		*
			* \image html kseparator-horizontal.png "KDE Separator with horizontal ori
			entation"
			* \image html kseparator-vertical.png "KDE Separator with vertical orienta
			tion"
			*
	* @author Michael Roth <mroth@wirlweb.de>		* @author Michael Roth <mroth@wirlweb.de>
	*/		*/
	class KDEUI_EXPORT KSeparator : public QFrame		class KDEUI_EXPORT KSeparator : public QFrame
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrienta tion )		Q_PROPERTY( Qt::Orientation orientation READ orientation WRITE setOrienta tion )
	public:		public:
	/**		/**
	* Constructor.		* Constructor.
End of changes. 1 change blocks.
	0 lines changed or deleted		5 lines changed or added

	kservice.h		kservice.h
	skipping to change at line 530		skipping to change at line 530
	name(), QString::fromLatin1(T::staticMetaObje ct.className()), pluginKeyword());		name(), QString::fromLatin1(T::staticMetaObje ct.className()), pluginKeyword());
	return o;		return o;
	}		}
	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)
			*/
	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);
	}		}
			/**
			* @deprecated Use the non-static service->createInstance<T>(parent, ar
			gs, &error)
			* where args is a QVariantList rather than a QStringList
			*/
	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;
End of changes. 2 change blocks.
	0 lines changed or deleted		9 lines changed or added

	kservicetypetrader.h		kservicetypetrader.h
	skipping to change at line 63		skipping to change at line 63
	* to put brackets around the property name, in order to correctly separate arithmetic operations from		* to put brackets around the property name, in order to correctly separate arithmetic operations from
	* the name. So for example a constraint expression like		* the name. So for example a constraint expression like
	* \code		* \code
	* X-KMyApp-InterfaceVersion > 4 // wrong!		* X-KMyApp-InterfaceVersion > 4 // wrong!
	* \endcode		* \endcode
	* needs to be written as		* needs to be written as
	* \code		* \code
	* [X-KMyApp-InterfaceVersion] > 4		* [X-KMyApp-InterfaceVersion] > 4
	* \endcode		* \endcode
	* otherwise it could also be interpreted as		* otherwise it could also be interpreted as
	* Substract the numeric value of the property "KMyApp" and "InterfaceVersi on" from the		* Subtract the numeric value of the property "KMyApp" and "InterfaceVersio n" from the
	* property "X" and make sure it is greater than 4.\n		* property "X" and make sure it is greater than 4.\n
	* Instead of the other meaning, make sure that the numeric value of "X-KMy App-InterfaceVersion" is		* Instead of the other meaning, make sure that the numeric value of "X-KMy App-InterfaceVersion" is
	* greater than 4.		* greater than 4.
	*		*
	* @see KMimeTypeTrader, KService		* @see KMimeTypeTrader, KService
	*/		*/
	class KDECORE_EXPORT KServiceTypeTrader		class KDECORE_EXPORT KServiceTypeTrader
	{		{
	public:		public:
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kshortcutsdialog.h		kshortcutsdialog.h
	skipping to change at line 62		skipping to change at line 62
	*		*
	* example:		* example:
	* \code		* \code
	* KShortcutsDialog dlg;		* KShortcutsDialog dlg;
	* dlg.addCollection(myActions);		* dlg.addCollection(myActions);
	* dlg.setModal(false);		* dlg.setModal(false);
	* connect(&dlg, SIGNAL(saved()), this, SLOT(doExtraStuff()));		* connect(&dlg, SIGNAL(saved()), this, SLOT(doExtraStuff()));
	* dlg.configure();		* dlg.configure();
	* \endcode		* \endcode
	*		*
			* \image html kshortcutsdialog.png "KDE Shortcuts Dialog"
			*
	* @author Nicolas Hadacek <hadacek@via.ecp.fr>		* @author Nicolas Hadacek <hadacek@via.ecp.fr>
	* @author Hamish Rodda <rodda@kde.org> (KDE 4 porting)		* @author Hamish Rodda <rodda@kde.org> (KDE 4 porting)
	* @author Michael Jansen <kde@michael-jansen.biz>		* @author Michael Jansen <kde@michael-jansen.biz>
	*/		*/
	class KDEUI_EXPORT KShortcutsDialog : public KDialog		class KDEUI_EXPORT KShortcutsDialog : public KDialog
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kshortcutseditor.h		kshortcutseditor.h
	skipping to change at line 206		skipping to change at line 206
	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:
	/**		/**
	* Resize colums to width required		* Resize columns to width required
	*/		*/
	void resizeColumns();		void resizeColumns();
	/**		/**
	* Set all shortcuts to their default values (bindings).		* Set all shortcuts to their default values (bindings).
	**/		**/
	void allDefault();		void allDefault();
	/**		/**
	* Opens a printing dialog to print all the shortcuts		* Opens a printing dialog to print all the shortcuts
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	kshortcutwidget.h		kshortcutwidget.h
	skipping to change at line 28		skipping to change at line 28
	*/		*/
	#ifndef KSHORTCUTWIDGET_H		#ifndef KSHORTCUTWIDGET_H
	#define KSHORTCUTWIDGET_H		#define KSHORTCUTWIDGET_H
	#include <QtGui/QWidget>		#include <QtGui/QWidget>
	#include "kshortcut.h"		#include "kshortcut.h"
	class KActionCollection;		class KActionCollection;
	class KShortcutWidgetPrivate;		class KShortcutWidgetPrivate;
			/**
			* \image html kshortcutwidget.png "KDE Shortcut Widget"
			*/
	class KDEUI_EXPORT KShortcutWidget : public QWidget		class KDEUI_EXPORT KShortcutWidget : public QWidget
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	KShortcutWidget(QWidget *parent = 0);		KShortcutWidget(QWidget *parent = 0);
	~KShortcutWidget();		~KShortcutWidget();
	void setModifierlessAllowed(bool allow);		void setModifierlessAllowed(bool allow);
	bool isModifierlessAllowed();		bool isModifierlessAllowed();
End of changes. 1 change blocks.
	0 lines changed or deleted		3 lines changed or added

	kspeech.h		kspeech.h
	/***************************************************** vim:set ts=4 sw=4 st s=4:		/***************************************************** vim:set ts=4 sw=4 st s=4:
	KSpeech		KSpeech
	The KDE Text-to-Speech API.		The KDE Text-to-Speech API.
	------------------------------		------------------------------
	Copyright:		Copyright:
	(C) 2006 by Gary Cramblitt <garycramblitt@comcast.net>		(C) 2006 by Gary Cramblitt <garycramblitt@comcast.net>
			(C) 2009 by Jeremy Whiting <jpwhiting@kde.org>
	-------------------		-------------------
	Original author: Gary Cramblitt <garycramblitt@comcast.net>		Original author: Gary Cramblitt <garycramblitt@comcast.net>
	This library is free software; you can redistribute it and/or		This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Lesser General Public		modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either		License as published by the Free Software Foundation; either
	version 2 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
	Lesser General Public License for more details.		Lesser General Public License for more details.
	You should have received a copy of the GNU Lesser General Public		You should have received a copy of the GNU Lesser General Public
	License along with this library; if not, write to the Free Software		License along with this library; if not, write to the Free Software
	Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA		Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	************************************************************************** ****/		************************************************************************** ****/
	#ifndef _KSPEECH_H_		#ifndef KSPEECH_H
	#define _KSPEECH_H_		#define KSPEECH_H
			#include "kspeech_export.h"
	// Qt includes		// Qt includes
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QByteRef>		#include <QtCore/QByteArray>
	#include <kspeech_export.h>
	class KSpeechPrivate;		class KSpeechPrivate;
	/**		/**
	* KSpeech -- the KDE Text-to-Speech API.		* KSpeech -- the KDE Text-to-Speech API.
	*		*
	* Note: Applications do not use this class directly. Instead,		* Note: Applications do not use this class directly. Instead,
	* use the @ref OrgKdeKSpeechInterface object as described in		* use the @ref KSpeechInterface object as described in
	* @ref programming.		* @ref programming.
	*		*
	* See also @ref kspeech_intro		* See also @ref kspeech_intro
	*/		*/
	class KSPEECH_EXPORT KSpeech : public QObject		class KSPEECH_EXPORT KSpeech : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* @enum JobPriority		* @enum JobPriority
	* Determines the priority of jobs submitted by @ref say.		* Determines the priority of jobs submitted by @ref say.
			* maps directly to SPDPriority
	*/		*/
	enum JobPriority		enum JobPriority
	{		{
	jpAll = 0, /**< All priorities. Used for informa tion retrieval only. */		jpAll = 0, /**< All priorities. Used for informa tion retrieval only. */
	jpScreenReaderOutput = 1, /**< Screen Reader job. */		jpScreenReaderOutput = 1, /**< Screen Reader job. SPD_IMPORTANT
	jpWarning = 2, /**< Warning job. */		*/
	jpMessage = 3, /**< Message job.*/		jpWarning = 2, /**< Warning job. SPD_NOTIFICATION */
	jpText = 4 /**< Text job. */		jpMessage = 3, /**< Message job.SPD_MESSAGE */
			jpText = 4, /**< Text job. SPD_TEXT */
			jpProgress = 5 /**< Progress report. SPD_PROGRESS add
			ed KDE 4.4 */
	};		};
	/**		/**
	* @enum JobState		* @enum JobState
	* Job states returned by method @ref getJobState.		* Job states returned by method @ref getJobState.
	*/		*/
	enum JobState		enum JobState
	{		{
	jsQueued = 0, /**< Job has been queued but is not yet speakab le. */		jsQueued = 0, /**< Job has been queued but is not yet speakab le. */
	jsFiltering = 1, /**< Job is being filtered. */		jsFiltering = 1, /**< Job is being filtered. */
	skipping to change at line 92		skipping to change at line 95
	/**		/**
	* @enum SayOptions		* @enum SayOptions
	* Hints about text content when sending via @ref say.		* Hints about text content when sending via @ref say.
	*/		*/
	enum SayOptions		enum SayOptions
	{		{
	soNone = 0x0000, /**< No options specified. Autodetected. * /		soNone = 0x0000, /**< No options specified. Autodetected. * /
	soPlainText = 0x0001, /**< The text contains plain text. */		soPlainText = 0x0001, /**< The text contains plain text. */
	soHtml = 0x0002, /**< The text contains HTML markup. */		soHtml = 0x0002, /**< The text contains HTML markup. */
	soSsml = 0x0004, /**< The text contains SSML markup. */		soSsml = 0x0004, /**< The text contains SSML markup. */
	// FUTURE:
	soChar = 0x0008, /**< The text should be spoken as individua l characters. */		soChar = 0x0008, /**< The text should be spoken as individua l characters. */
	soKey = 0x0010, /**< The text contains a keyboard symbolic key name. */		soKey = 0x0010, /**< The text contains a keyboard symbolic key name. */
	soSoundIcon = 0x0020 /**< The text is the name of a sound icon. */		soSoundIcon = 0x0020 /**< The text is the name of a sound icon. */
	};		};
	/**		/**
	* @enum TalkerCapabilities1		* @enum TalkerCapabilities1
	* Flags for synthesizer/talker capabilities.		* Flags for synthesizer/talker capabilities.
	* All items marked FALSE are hard-coded off at this time.		* All items marked FALSE are hard-coded off at this time.
	*/		*/
	skipping to change at line 395		skipping to change at line 398
	* When called by a System Manager, pauses all jobs of all applications.		* When called by a System Manager, pauses all jobs of all applications.
	*/		*/
	void pause();		void pause();
	/**		/**
	* Resumes speech jobs belonging to the application.		* Resumes speech jobs belonging to the application.
	* When called by a System Manager, resumes all jobs of all applications .		* When called by a System Manager, resumes all jobs of all applications .
	*/		*/
	void resume();		void resume();
			void stop();
			void cancel();
			void setSpeed(int speed);
			void setPitch(int pitch);
			void setVolume(int volume);
	/**		/**
	* Removes the specified job. If the job is speaking, it is stopped.		* Removes the specified job. If the job is speaking, it is stopped.
	* @param jobNum Job Number. If 0, the last job submitted b y		* @param jobNum Job Number. If 0, the last job submitted b y
	* the application.		* the application.
	*/		*/
	void removeJob(int jobNum);		void removeJob(int jobNum);
	/**		/**
	* Removes all jobs belonging to the application.		* Removes all jobs belonging to the application.
	* When called from a System Manager, removes all jobs of all applicatio ns.		* When called from a System Manager, removes all jobs of all applicatio ns.
	skipping to change at line 615		skipping to change at line 625
	* Only one instance of KttsMgr is displayed.		* Only one instance of KttsMgr is displayed.
	*/		*/
	void showManagerDialog();		void showManagerDialog();
	/**		/**
	* Shuts down KTTSD. Do not call this!		* Shuts down KTTSD. Do not call this!
	*/		*/
	void kttsdExit();		void kttsdExit();
	/**		/**
			* post ctor helper method that instantiates the dbus adaptor class, and
			registers
			*/
			void init();
			/**
	* Cause KTTSD to re-read its configuration.		* Cause KTTSD to re-read its configuration.
	*/		*/
	void reinit();		void reinit();
	/** Called by DBusAdaptor so that KTTSD knows the application that		/** Called by DBusAdaptor so that KTTSD knows the application that
	* called it.		* called it.
	* @param appId DBUS connection name that called KSpeech.		* @param appId DBUS connection name that called KSpeech.
	*/		*/
	void setCallingAppId(const QString& appId);		void setCallingAppId(const QString& appId);
	skipping to change at line 658		skipping to change at line 673
	* @param appId The DBUS connection name of the application that submitted the job.		* @param appId The DBUS connection name of the application that submitted the job.
	* @param jobNum Job Number of the job emitting the marker.		* @param jobNum Job Number of the job emitting the marker.
	* @param markerType The type of marker.		* @param markerType The type of marker.
	* Currently either mtSentenceBegin or mtSentenceEn d.		* Currently either mtSentenceBegin or mtSentenceEn d.
	* @param markerData Data for the marker.		* @param markerData Data for the marker.
	* Currently, this is the sentence number of the se ntence		* Currently, this is the sentence number of the se ntence
	* begun or ended. Sentence numbers begin at 1.		* begun or ended. Sentence numbers begin at 1.
	*/		*/
	void marker(const QString &appId, int jobNum, int markerType, const QSt ring &markerData);		void marker(const QString &appId, int jobNum, int markerType, const QSt ring &markerData);
	protected:
	/**		/**
	* This signal is emitted by KNotify when a notification event occurs.		* This signal is emitted when a new job coming in is filtered (or not
	*/		filtered if no filters
	void notificationSignal(const QString &event, const QString &fromApp,		* are on).
	const QString &text, const QString &sound, cons		* @param prefilterText The text of the speech job
	t QString &file,		* @param postfilterText The text of the speech job after any filter
	const int present, const int level, const int w		s have been applied
	inId, const int eventId );		*/
			void newJobFiltered(const QString &prefilterText, const QString &postfi
			lterText);
	private Q_SLOTS:		private Q_SLOTS:
	void slotJobStateChanged(const QString& appId, int jobNum, KSpeech::Job State state);		void slotJobStateChanged(const QString& appId, int jobNum, KSpeech::Job State state);
	void slotMarker(const QString& appId, int jobNum, KSpeech::MarkerType m arkerType, const QString& markerData);		void slotMarker(const QString& appId, int jobNum, KSpeech::MarkerType m arkerType, const QString& markerData);
	void slotFilteringFinished();		void slotFilteringFinished();
	private:		private:
	/**		/**
	* The DBUS connection name of the last application that called KTTSD.		* The DBUS connection name of the last application that called KTTSD.
	*/		*/
	skipping to change at line 691		skipping to change at line 705
	*/		*/
	bool ready();		bool ready();
	/**		/**
	* Create and initialize the Configuration Data object.		* Create and initialize the Configuration Data object.
	*/		*/
	bool initializeConfigData();		bool initializeConfigData();
	/*		/*
	* Create and initialize the SpeechData object.		* Create and initialize the SpeechData object.
			* Deprecated, remove in KDE 5
	*/		*/
	bool initializeSpeechData();		bool initializeSpeechData();
	/*		/*
	* Create and initialize the TalkerMgr object.		* Create and initialize the TalkerMgr object.
	*/		*/
	bool initializeTalkerMgr();		bool initializeTalkerMgr();
	/*		/*
	* Create and initialize the speaker.		* Create and initialize the speaker.
	skipping to change at line 726		skipping to change at line 741
	void announceEvent(const QString& slotName, const QString& eventName);		void announceEvent(const QString& slotName, const QString& eventName);
	void announceEvent(const QString& slotName, const QString& eventName, c onst QString& appId,		void announceEvent(const QString& slotName, const QString& eventName, c onst QString& appId,
	int jobNum, MarkerType markerType, const QString& markerData);		int jobNum, MarkerType markerType, const QString& markerData);
	void announceEvent(const QString& slotName, const QString& eventName, c onst QString& appId,		void announceEvent(const QString& slotName, const QString& eventName, c onst QString& appId,
	int jobNum, JobState state);		int jobNum, JobState state);
	private:		private:
	KSpeechPrivate* d;		KSpeechPrivate* d;
	};		};
	#endif // _KSPEECH_H_		#endif // KSPEECH_H
End of changes. 13 change blocks.
	20 lines changed or deleted		38 lines changed or added

	ksplashscreen.h		ksplashscreen.h
	skipping to change at line 38		skipping to change at line 38
	/**		/**
	* @short %KDE splash screen		* @short %KDE splash screen
	*		*
	* This class is based on QSplashScreen and exists solely to make		* This class is based on QSplashScreen and exists solely to make
	* splash screens obey KDE's Xinerama settings.		* splash screens obey KDE's Xinerama settings.
	*		*
	* For documentation on how to use the class, see the documentation		* For documentation on how to use the class, see the documentation
	* for QSplashScreen.		* for QSplashScreen.
	*		*
			* \image html ksplashscreen.png "KDE Splash Screen"
			*
	* @author Chris Howells (howells@kde.org)		* @author Chris Howells (howells@kde.org)
	*/		*/
	class KDEUI_EXPORT KSplashScreen : public QSplashScreen //krazy:exclude=qcl asses		class KDEUI_EXPORT KSplashScreen : public QSplashScreen //krazy:exclude=qcl asses
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructs a splash screen.		* Constructs a splash screen.
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	ksqueezedtextlabel.h		ksqueezedtextlabel.h
	skipping to change at line 78		skipping to change at line 78
	* Returns the text elide mode.		* Returns the text elide mode.
	*/		*/
	Qt::TextElideMode textElideMode() const;		Qt::TextElideMode textElideMode() const;
	/**		/**
	* Sets the text elide mode.		* Sets the text elide mode.
	* @param mode The text elide mode.		* @param mode The text elide mode.
	*/		*/
	void setTextElideMode( Qt::TextElideMode mode );		void setTextElideMode( Qt::TextElideMode mode );
			/**
			* Get the full text set via setText.
			*
			* @since 4.4
			*/
			QString fullText() const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the text. Note that this is not technically a reimplementation of QLabel::setText(),		* Sets the text. Note that this is not technically a reimplementation of QLabel::setText(),
	* which is not virtual (in Qt 4.3). Therefore, you may need to cast the object to		* which is not virtual (in Qt 4.3). Therefore, you may need to cast the object to
	* KSqueezedTextLabel in some situations:		* KSqueezedTextLabel in some situations:
	* \Example		* \Example
	* \code		* \code
	* KSqueezedTextLabel* squeezed = new KSqueezedTextLabel("text", parent);		* KSqueezedTextLabel* squeezed = new KSqueezedTextLabel("text", parent);
	* QLabel* label = squeezed;		* QLabel* label = squeezed;
	* label->setText("new text"); // this will not work		* label->setText("new text"); // this will not work
End of changes. 1 change blocks.
	0 lines changed or deleted		7 lines changed or added

	kstandarddirs.h		kstandarddirs.h
	skipping to change at line 321		skipping to change at line 321
	/**		/**
	* Tries to find a resource in the following order:		* Tries to find a resource in the following order:
	* @li All PREFIX/\<relativename> paths (most recent first).		* @li All PREFIX/\<relativename> paths (most recent first).
	* @li All absolute paths (most recent first).		* @li All absolute paths (most recent first).
	*		*
	* The filename should be a filename relative to the base dir		* The filename should be a filename relative to the base dir
	* for resources. So is a way to get the path to libkdecore.la		* for resources. So is a way to get the path to libkdecore.la
	* to findResource("lib", "libkdecore.la"). KStandardDirs will		* to findResource("lib", "libkdecore.la"). KStandardDirs will
	* then look into the subdir lib of all elements of all prefixes		* then look into the subdir lib of all elements of all prefixes
	* ($KDEDIRS) for a file libkdecore.la and return the path to		* ($KDEDIRS) for a file libkdecore.la and return the path to
	* the first one it finds (e.g. /opt/kde/lib/libkdecore.la)		* the first one it finds (e.g. /opt/kde/lib/libkdecore.la).
			* You can use the program kde4-config to list all resource types:
			* @code
			* $ kde4-config --types
			* @endcode
			*
			* Example:
			* @code
			* QString iconfilename=KGlobal::dirs()->findResource("icon",QString("o
			xygen/22x22/apps/ktip.png"));
			* @endcode
	*		*
	* @param type The type of the wanted resource		* @param type The type of the wanted resource
	* @param filename A relative filename of the resource.		* @param filename A relative filename of the resource.
	*		*
	* @return A full path to the filename specified in the second		* @return A full path to the filename specified in the second
	* argument, or QString() if not found.		* argument, or QString() if not found.
	*/		*/
	QString findResource( const char *type,		QString findResource( const char *type,
	const QString& filename ) const;		const QString& filename ) const;
	skipping to change at line 368		skipping to change at line 377
	*		*
	* @return A number identifying the current version of the		* @return A number identifying the current version of the
	* resource.		* resource.
	*/		*/
	quint32 calcResourceHash( const char *type,		quint32 calcResourceHash( const char *type,
	const QString& filename,		const QString& filename,
	SearchOptions options = NoSearchOptions) cons t;		SearchOptions options = NoSearchOptions) cons t;
	/**		/**
	* Tries to find all directories whose names consist of the		* Tries to find all directories whose names consist of the
	* specified type and a relative path. So would		* specified type and a relative path. So
	* findDirs("apps", "Settings") return		* findDirs("apps", "Settings") would return
	* @li /opt/kde/share/applnk/Settings/
	* @li /home/joe/.kde/share/applnk/Settings/		* @li /home/joe/.kde/share/applnk/Settings/
			* @li /opt/kde/share/applnk/Settings/
			*
			* (from the most local to the most global)
	*		*
	* Note that it appends @c / to the end of the directories,		* Note that it appends @c / to the end of the directories,
	* so you can use this right away as directory names.		* so you can use this right away as directory names.
	*		*
	* @param type The type of the base directory.		* @param type The type of the base directory.
	* @param reldir Relative directory.		* @param reldir Relative directory.
	*		*
	* @return A list of matching directories, or an empty		* @return A list of matching directories, or an empty
	* list if the resource specified is not found.		* list if the resource specified is not found.
	*/		*/
	skipping to change at line 441		skipping to change at line 452
	/**		/**
	* Tries to find all resources with the specified type.		* Tries to find all resources with the specified type.
	*		*
	* The function will look into all specified directories		* The function will look into all specified directories
	* and return all filenames (full and relative paths) in		* and return all filenames (full and relative paths) in
	* these directories.		* these directories.
	*		*
	* The "most local" files are returned before the "more global" files.		* The "most local" files are returned before the "more global" files.
	*		*
	* @param type The type of resource to locate directories for.		* @param type The type of resource to locate directories for. Can be i
			con,
			* lib, pixmap, .... To get a complete list, call
			* @code
			* kde4-config --types
			* @endcode
	* @param filter Only accept filenames that fit to filter. The filter		* @param filter Only accept filenames that fit to filter. The filter
	* may consist of an optional directory and a QRegExp		* may consist of an optional directory and a QRegExp
	* wildcard expression. E.g. <tt>"images\*.jpg"</tt>.		* wildcard expression. E.g. <tt>"images\*.jpg"</tt>.
	* Use QString() if you do not want a filter.		* Use QString() if you do not want a filter.
	* @param options if the flags passed include Recursive, subdirectories		* @param options if the flags passed include Recursive, subdirectories
	* will also be search; if NoDuplicates is passed then only entr ies with		* will also be search; if NoDuplicates is passed then only entr ies with
	* unique filenames will be returned eliminating duplicates.		* unique filenames will be returned eliminating duplicates.
	*		*
	* @param relPaths The list to store the relative paths into		* @param relPaths The list to store the relative paths into
	* These can be used later to ::locate() the file		* These can be used later to ::locate() the file
End of changes. 4 change blocks.
	5 lines changed or deleted		22 lines changed or added

	kstringhandler.h		kstringhandler.h
	skipping to change at line 216		skipping to change at line 216
	is smaller than \a b. A positive value is returned if \a a is greater than \a b. 0		is smaller than \a b. A positive value is returned if \a a is greater than \a b. 0
	is returned if both values are equal.		is returned if both values are equal.
	@param a first string to compare		@param a first string to compare
	@param b second string to compare		@param b second string to compare
	@param caseSensitivity whether to use case sensitive compare or not		@param caseSensitivity whether to use case sensitive compare or not
	@since 4.1		@since 4.1
	*/		*/
	KDECORE_EXPORT int naturalCompare( const QString& a, const QString& b, Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive );		KDECORE_EXPORT int naturalCompare( const QString& a, const QString& b, Qt::CaseSensitivity caseSensitivity = Qt::CaseSensitive );
			/**
			Preprocesses the given string in order to provide additional line bre
			aking
			opportunities for QTextLayout.
			This is done by inserting ZWSP (Zero-width space) characters in the s
			tring
			at points that wouldn't normally be considered word boundaries by QTe
			xtLayout,
			but where wrapping the text will produce good results.
			Examples of such points includes after punctuation signs, underscores
			and
			dashes, that aren't followed by spaces.
			@since 4.4
			*/
			KDECORE_EXPORT QString preProcessWrap( const QString& text );
	}		}
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		19 lines changed or added

	kstyle.h		kstyle.h
	skipping to change at line 43		skipping to change at line 43
	*/		*/
	#ifndef KDE_KSTYLE_H		#ifndef KDE_KSTYLE_H
	#define KDE_KSTYLE_H		#define KDE_KSTYLE_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QCommonStyle>		#include <QtGui/QCommonStyle>
	#include <QtGui/QPalette>		#include <QtGui/QPalette>
	#include <QtGui/QStylePlugin>		#include <QtGui/QStylePlugin>
			#include <typeinfo>
	class QStyleOptionProgressBar;		class QStyleOptionProgressBar;
	class QStyleOptionTab;		class QStyleOptionTab;
	class KStylePrivate;		class KStylePrivate;
	/**		/**
	* Makes style coding more convenient.		* Makes style coding more convenient.
	*		*
	* @todo and allows to style KDE specific widgets.		* @todo and allows to style KDE specific widgets.
	*		*
	skipping to change at line 1570		skipping to change at line 1571
	QRect insideMargin(const QRect &orig, WidgetType widget, int baseMargin Metric, const QStyleOption* opt, const QWidget* w) const;		QRect insideMargin(const QRect &orig, WidgetType widget, int baseMargin Metric, const QStyleOption* opt, const QWidget* w) const;
	///Internal subrect calculations, for e.g. scrollbar arrows,		///Internal subrect calculations, for e.g. scrollbar arrows,
	///where we fake our output to get Qt to do what we want		///where we fake our output to get Qt to do what we want
	QRect internalSubControlRect (ComplexControl control, const QStyleOptio nComplex* opt,		QRect internalSubControlRect (ComplexControl control, const QStyleOptio nComplex* opt,
	SubControl subControl, const QWidget* w) const;		SubControl subControl, const QWidget* w) const;
	// fitt's law label support: QLabel focusing its buddy widget		// fitt's law label support: QLabel focusing its buddy widget
	const QObject *clickedLabel;		const QObject *clickedLabel;
			template<typename T>
			static T extractOptionHelper(T*);
	public:		public:
	/** @name QStyle Methods		/** @name QStyle Methods
	* These are methods reimplemented from QStyle. Usually it's not necessary to		* These are methods reimplemented from QStyle. Usually it's not necessary to
	* reimplement them yourself.		* reimplement them yourself.
	*		*
	* Some of them are there for binary compatibility reasons only; all they d o is to call		* Some of them are there for binary compatibility reasons only; all they d o is to call
	* the implementation from QCommonStyle.		* the implementation from QCommonStyle.
	*/		*/
	//@{		//@{
	void drawControl (ControlElement elem, const QStyleOption* opt, QPainter* p, const QWidget* w) const;		void drawControl (ControlElement elem, const QStyleOption* opt, QPainter* p, const QWidget* w) const;
	skipping to change at line 1661		skipping to change at line 1665
	{		{
	QStringList names = keys();		QStringList names = keys();
	//check whether included in the keys		//check whether included in the keys
	if (names.contains(id, Qt::CaseInsensitive))		if (names.contains(id, Qt::CaseInsensitive))
	return new T();		return new T();
	return 0;		return 0;
	}		}
	};		};
			// get the pointed-to type from a pointer
			template<typename T>
			T KStyle::extractOptionHelper(T*)
			{
			return T();
			}
	template<typename T>		template<typename T>
	T KStyle::extractOption(Option* option)		T KStyle::extractOption(Option* option)
	{		{
	if (option && dynamic_cast<T>(option)) {		if (option) {
	return static_cast<T>(option);		if (dynamic_cast<T>(option))
			return static_cast<T>(option);
			// Ugly hacks for when RTLD_GLOBAL is not used (quite common with p
			lugins, really)
			// and dynamic_cast fails.
			// This is still partially broken as it doesn't take into account s
			ubclasses.
			// ### KDE5 do this somehow differently
			if ( qstrcmp(typeid(*option).name(), typeid(extractOptionHelper(sta
			tic_cast<T>(0))).name()) == 0 )
			return static_cast<T>(option);
	}		}
	//### warn if cast failed?		//### warn if cast failed?
	//since T is a pointer type, need this to get to the static.		//since T is a pointer type, need this to get to the static.
	return static_cast<T>(0)->defaultOption();		return static_cast<T>(0)->defaultOption();
	}		}
	#define K_EXPORT_STYLE(name,type) template<> const char* kstyleName<type>() { return name; } \		#define K_EXPORT_STYLE(name,type) template<> const char* kstyleName<type>() { return name; } \
	Q_EXPORT_PLUGIN(KStyleFactory<type>)		Q_EXPORT_PLUGIN(KStyleFactory<type>)
End of changes. 4 change blocks.
	2 lines changed or deleted		23 lines changed or added

	ksycoca.h		ksycoca.h
	skipping to change at line 188		skipping to change at line 188
	* @deprecated use the databaseChanged(QStringList) signal		* @deprecated use the databaseChanged(QStringList) signal
	*/		*/
	QT_MOC_COMPAT void databaseChanged(); // KDE5 TODO: remove		QT_MOC_COMPAT void databaseChanged(); // KDE5 TODO: remove
	/**		/**
	* 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.
			* This can include the following resources (as defined in KStandardDir
			s) :
			* 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
	QDataStream *m_str_deprecated; // KDE5: REMOVE		QDataStream *m_str_deprecated; // KDE5: REMOVE
	// @internal used by factories and kbuildsycoca		// @internal used by factories and kbuildsycoca
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	ksystemtrayicon.h		ksystemtrayicon.h
	skipping to change at line 49		skipping to change at line 49
	* into the system tray in the desktop panel. It usually displays an		* into the system tray in the desktop panel. It usually displays an
	* icon or an animated icon there. The icon represents		* icon or an animated icon there. The icon represents
	* the application, similar to a taskbar button, but consumes less		* the application, similar to a taskbar button, but consumes less
	* screen space.		* screen space.
	*		*
	* When the user clicks with the left mouse button on the icon, the		* When the user clicks with the left mouse button on the icon, the
	* main application window is shown/raised and activated. With the		* main application window is shown/raised and activated. With the
	* right mouse button, she gets a popupmenu with application specific		* right mouse button, she gets a popupmenu with application specific
	* commands, including "Minimize/Restore" and "Quit".		* commands, including "Minimize/Restore" and "Quit".
	*		*
	* Please note that QSystemTrayIcon::showMessage(..) should not be		* Please note that this class is being phased out in favor of the KStatusN
			otifierItem
			* class, you should consider to use it instead if you are writing a new ap
			plication
			* or consider porting the code that uses this class to the KStatusNotifier
			Item API.
			*
			* Also, QSystemTrayIcon::showMessage(..) should not be
	* used for KDE application because the popup message has no KDE standard		* used for KDE application because the popup message has no KDE standard
	* look & feel and cannot be controlled by KDE configurations.		* look & feel and cannot be controlled by KDE configurations.
	* Use KNotification or KPassivePopup instead.		* Use KNotification or KPassivePopup instead.
	*		*
	* @author Matthias Ettrich <ettrich@kde.org>		* @author Matthias Ettrich <ettrich@kde.org>
	**/		**/
	class KDEUI_EXPORT KSystemTrayIcon : public QSystemTrayIcon //krazy:exclude =qclasses		class KDEUI_EXPORT KSystemTrayIcon : public QSystemTrayIcon //krazy:exclude =qclasses
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Construct a system tray icon.		* Construct a system tray icon.
	*		*
	* The parent widget @p parent has a special meaning:		* The parent widget @p parent has a special meaning:
	* Besides owning the tray window, the parent widget will		* Besides owning the tray window, the parent widget will
	* dissappear from taskbars when it is iconified while the tray		* disappear from taskbars when it is iconified while the tray
	* window is visible. This is the desired behavior. After all,		* window is visible. This is the desired behavior. After all,
	* the tray window @p is the parent's taskbar icon.		* the tray window @p is the parent's taskbar icon.
	*		*
	* Furthermore, the parent widget is shown or raised respectively		* Furthermore, the parent widget is shown or raised respectively
	* when the user clicks on the tray window with the left mouse		* when the user clicks on the tray window with the left mouse
	* button.		* button.
	**/		**/
	explicit KSystemTrayIcon( QWidget* parent = 0 );		explicit KSystemTrayIcon( QWidget* parent = 0 );
	/**		/**
End of changes. 2 change blocks.
	2 lines changed or deleted		9 lines changed or added

	ktabbar.h		ktabbar.h
	skipping to change at line 31		skipping to change at line 31
	#ifndef KTABBAR_H		#ifndef KTABBAR_H
	#define KTABBAR_H		#define KTABBAR_H
	#include <kdeui_export.h>		#include <kdeui_export.h>
	#include <QtGui/QTabBar>		#include <QtGui/QTabBar>
	/**		/**
	* A QTabBar with extended features.		* A QTabBar with extended features.
			*
			* \image html ktabbar.png "KDE Tab Bar"
	*/		*/
	class KDEUI_EXPORT KTabBar: public QTabBar //krazy:exclude=qclasses		class KDEUI_EXPORT KTabBar: public QTabBar //krazy:exclude=qclasses
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Creates a new tab bar.		* Creates a new tab bar.
	*		*
	* @param parent The parent widget.		* @param parent The parent widget.
	skipping to change at line 52		skipping to change at line 54
	explicit KTabBar( QWidget* parent = 0 );		explicit KTabBar( QWidget* parent = 0 );
	/**		/**
	* Destroys the tab bar.		* Destroys the tab bar.
	*/		*/
	virtual ~KTabBar();		virtual ~KTabBar();
	/**		/**
	* 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.		* headers with the middle mouse button.
	*		*
	* @deprecated Use QTabBar::setMovable() instead.		* @deprecated Use QTabBar::setMovable() instead.
			*
			* Note, however, that QTabBar::setMovable(true) disables
			* dragging tabs out of the KTabBar (e.g., dragging the tab
			* URL from Konqueror to another application)!
	*/		*/
	KDE_DEPRECATED void setTabReorderingEnabled( bool enable );		KDE_DEPRECATED void setTabReorderingEnabled( bool enable );
	/**		/**
	* Returns whether tab reordering is enabled.		* Returns whether tab reordering is enabled.
	*		*
	* @deprecated Use QTabBar::isMovable() instead.		* @deprecated Use QTabBar::isMovable() instead.
	*/		*/
	KDE_DEPRECATED bool isTabReorderingEnabled() const;		KDE_DEPRECATED bool isTabReorderingEnabled() const;
	skipping to change at line 136		skipping to change at line 142
	/**		/**
	* 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:
	/** Emitted when the user right-clicks a tab. */		/**
	void contextMenu( int, const QPoint& );		* A right mouse button click was performed over the tab with the @para
	/** Emitted when the user right-clicks the empty area on the tab bar. *		m index.
	/		* The signal is emitted on the press of the mouse button.
	void emptyAreaContextMenu( const QPoint& );		*/
			void contextMenu( int index, const QPoint& globalPos );
			/**
			* 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.
			*/
			void emptyAreaContextMenu( const QPoint& globalPos );
	/** @deprecated use tabDoubleClicked(int) and newTabRequest() instead. */		/** @deprecated use tabDoubleClicked(int) and newTabRequest() instead. */
	QT_MOC_COMPAT void mouseDoubleClick( int );		QT_MOC_COMPAT void mouseDoubleClick( int );
	/** Emitted when a tab has been double-clicked. */		/**
	void tabDoubleClicked( int );		* A double left mouse button click was performed over the tab with the
	/** Emitted when the user double-clicks the empty area on the tab bar.		@param index.
	*/		* The signal is emitted on the second press of the mouse button, befor
			e the release.
			*/
			void tabDoubleClicked( int index );
			/**
			* 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.
			*/
	void newTabRequest();		void newTabRequest();
	/** Emitted when a tab has been middle-clicked. */		/**
	void mouseMiddleClick( int );		* A double middle mouse button click was performed over the tab with t
			he @param index.
			* The signal is emitted on the release of the mouse button.
			*/
			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* );
	/** @deprecated Use QTabBar::tabMoved(int,int) instead.*/		/**
	QT_MOC_COMPAT void moveTab( int, int );		* Used internally by KTabBar's/KTabWidget's middle-click tab moving me
			chanism.
			* Tells the KTabWidget which owns the KTabBar to move a tab.
			*/
			void moveTab( int, int );
	/** @deprecated Use QTabBar::tabCloseRequested(int) instead. */		/** @deprecated Use QTabBar::tabCloseRequested(int) instead. */
	QT_MOC_COMPAT void closeRequest( int );		QT_MOC_COMPAT void closeRequest( int );
	#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 );
End of changes. 7 change blocks.
	14 lines changed or deleted		44 lines changed or added

	ktabwidget.h		ktabwidget.h
	skipping to change at line 41		skipping to change at line 41
	/**		/**
	* \brief A widget containing multiple tabs		* \brief A widget containing multiple tabs
	*		*
	* It extends the Qt QTabWidget, providing extra optionally features such a s close buttons when you hover		* It extends the Qt QTabWidget, providing extra optionally features such a s close buttons when you hover
	* over the icon in the tab, and also adds functionality such as responding to mouse wheel scroll events to switch		* over the icon in the tab, and also adds functionality such as responding to mouse wheel scroll events to switch
	* the active tab.		* the active tab.
	*		*
	* 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"
	*/		*/
	class KDEUI_EXPORT KTabWidget : public QTabWidget //krazy:exclude=qclasses		class KDEUI_EXPORT KTabWidget : public QTabWidget //krazy:exclude=qclasses
	{		{
	Q_OBJECT		Q_OBJECT
	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 )
	Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE set AutomaticResizeTabs )		Q_PROPERTY( bool automaticResizeTabs READ automaticResizeTabs WRITE set AutomaticResizeTabs )
	skipping to change at line 116		skipping to change at line 118
	* @since 4.1		* @since 4.1
	*		*
	* @deprecated Use QTabWidget::tabsClosable() instead.		* @deprecated Use QTabWidget::tabsClosable() instead.
	*/		*/
	KDE_DEPRECATED bool isCloseButtonEnabled() const;		KDE_DEPRECATED bool isCloseButtonEnabled() const;
	/**		/**
	* 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 QTabBar::selectionBehaviorOnRemove() instead.		* @deprecated Use tabBar()->selectionBehaviorOnRemove() instead.
	*/		*/
	KDE_DEPRECATED bool tabCloseActivatePrevious() const;		KDE_DEPRECATED bool tabCloseActivatePrevious() const;
	/**		/**
	* 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.
	*/		*/
	void setTabBarHidden( bool hide );		void setTabBarHidden( bool hide );
	/**		/**
	* Returns true if the tabbar is hidden.		* Returns true if the tabbar was hidden by a call to setTabBarHidden(
			true ).
			* Returns false if the widget itself is hidden, but no call to setTabB
			arHidden( true )
			* has been made.
	*/		*/
	bool isTabBarHidden() const;		bool isTabBarHidden() const;
	/**		/**
	Reimplemented for internal reasons.		Reimplemented for internal reasons.
	*		*
	virtual void insertTab( QWidget *, const QString &, int index = -1 );		virtual void insertTab( QWidget *, const QString &, int index = -1 );
	*!		*!
	Reimplemented for internal reasons.		Reimplemented for internal reasons.
	skipping to change at line 209		skipping to change at line 213
	/**		/**
	* If \a enable is true, tab reordering with middle button will be enab led.		* If \a enable is true, tab reordering with middle button will be enab led.
	*		*
	* Note that once enabled you shouldn't rely on previously queried		* Note that once enabled you shouldn't rely on previously queried
	* currentPageIndex() or indexOf( QWidget * ) values anymore.		* currentPageIndex() or indexOf( QWidget * ) values anymore.
	*		*
	* 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
			* dragging tabs out of the KTabBar (e.g., dragging the tab
			* URL from Konqueror to another application)!
	*/		*/
	QT_MOC_COMPAT void setTabReorderingEnabled( bool enable );		QT_MOC_COMPAT void setTabReorderingEnabled( bool enable );
	/**		/**
	* 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.
	*/		*/
	skipping to change at line 244		skipping to change at line 252
	* @since 4.1		* @since 4.1
	*		*
	* @deprecated Use QTabWidget::setTabsClosable() instead.		* @deprecated Use QTabWidget::setTabsClosable() instead.
	*/		*/
	QT_MOC_COMPAT void setCloseButtonEnabled( bool );		QT_MOC_COMPAT void setCloseButtonEnabled( bool );
	/**		/**
	* 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 QTabWidget::setSelectionBehaviorOnRemove() instead.		* @deprecated Use tabBar()->setSelectionBehaviorOnRemove() instead.
	*/		*/
	QT_MOC_COMPAT void setTabCloseActivatePrevious( bool previous );		QT_MOC_COMPAT void setTabCloseActivatePrevious( bool previous );
	/**		/**
	* 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 );
	skipping to change at line 297		skipping to change at line 305
	void contextMenu( QWidget *, const QPoint & );		void contextMenu( QWidget *, const QPoint & );
	/**		/**
	* A tab was moved from first to second index. This signal is only		* A tab was moved from first to second index. This signal is only
	* possible after you have called setTabReorderingEnabled( true ).		* possible after you have called setTabReorderingEnabled( true ).
	*/		*/
	void movedTab( int, int );		void movedTab( int, int );
	/**		/**
	* A double left mouse button click was performed over empty space besi des tabbar.		* A double left mouse button click was performed over empty space besi des tabbar.
			* The signal is emitted on the second press of the mouse button, befor e the release.
	*/		*/
	void mouseDoubleClick();		void mouseDoubleClick();
	/**		/**
	* A double left mouse button click was performed over the widget.		* A double left mouse button click was performed over the widget.
			* The signal is emitted on the second press of the mouse button, befor e the release.
	*/		*/
	void mouseDoubleClick( QWidget * );		void mouseDoubleClick( QWidget * );
	/**		/**
	* A middle mouse button click was performed over empty space besides t abbar.		* A middle mouse button click was performed over empty space besides t abbar.
			* The signal is emitted on the release of the mouse button.
	*/		*/
	void mouseMiddleClick();		void mouseMiddleClick();
	/**		/**
	* A middle mouse button click was performed over the widget.		* A middle mouse button click was performed over the widget.
			* The signal is emitted on the release of the mouse button.
	*/		*/
	void mouseMiddleClick( QWidget * );		void mouseMiddleClick( QWidget * );
	/**		/**
	* The close button of a widget's tab was clicked. This signal is		* The close button of a widget's tab was clicked. This signal is
	* only possible after you have called setCloseButtonEnabled( true ).		* only possible after you have called setCloseButtonEnabled( true ).
	*/		*/
	void closeRequest( QWidget * );		void closeRequest( QWidget * );
	protected:		protected:
	skipping to change at line 336		skipping to change at line 348
	virtual void dragMoveEvent( QDragMoveEvent* );		virtual void dragMoveEvent( QDragMoveEvent* );
	virtual void dropEvent( QDropEvent* );		virtual void dropEvent( QDropEvent* );
	int tabBarWidthForMaxChars( int );		int tabBarWidthForMaxChars( int );
	#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
			*/
			KDE_DEPRECATED void currentChanged( int );
	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 );
	void currentChanged( int );
	#ifndef QT_NO_WHEELEVENT		#ifndef QT_NO_WHEELEVENT
	virtual void wheelDelta( int );		virtual void wheelDelta( int );
	#endif		#endif
	private:		private:
	class Private;		class Private;
	Private * const d;		Private * const d;
	};		};
	#endif		#endif
End of changes. 11 change blocks.
	4 lines changed or deleted		22 lines changed or added

	ktcpsocket.h		ktcpsocket.h
	skipping to change at line 319		skipping to change at line 319
	void bytesWritten(qint64 bytes);		void bytesWritten(qint64 bytes);
	void readyRead();		void readyRead();
	//from QAbstractSocket		//from QAbstractSocket
	void connected();		void connected();
	void disconnected();		void disconnected();
	void error(KTcpSocket::Error);		void error(KTcpSocket::Error);
	void hostFound();		void hostFound();
	void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthentic ator *authenticator);		void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthentic ator *authenticator);
	// only for raw socket state, SSL is separate		// only for raw socket state, SSL is separate
	void stateChanged(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();
	void startClientEncryption();		void startClientEncryption();
	// void startServerEncryption(); //not implemented		// void startServerEncryption(); //not implemented
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ktextbrowser.h		ktextbrowser.h
	skipping to change at line 85		skipping to change at line 85
	* or if a signal should be emitted.		* or if a signal should be emitted.
	*/		*/
	bool isNotifyClick() const;		bool isNotifyClick() const;
	protected:		protected:
	/**		/**
	* Reimplemented to NOT set the source but to do the special handling		* Reimplemented to NOT set the source but to do the special handling
	* of links being clicked. Do not call this.		* of links being clicked. Do not call this.
	*		*
	* If you need to set an initial source url in the text browser, call		* If you need to set an initial source url in the text browser, call
	* the QTextBrowser method explicitely, like this:		* the QTextBrowser method explicitly, like this:
	* <code>myTextBrowser->QTextBrowser::setSource(url)</code>		* <code>myTextBrowser->QTextBrowser::setSource(url)</code>
	*/		*/
	void setSource( const QUrl& name );		void setSource( const QUrl& name );
	/**		/**
	* Makes sure Key_Escape is ignored		* Makes sure Key_Escape is ignored
	*/		*/
	virtual void keyPressEvent( QKeyEvent *event );		virtual void keyPressEvent( QKeyEvent *event );
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	ktextedit.h		ktextedit.h
	skipping to change at line 81		skipping to change at line 81
	* some standard KDE features, like cursor auto-hiding, configurable		* some standard KDE features, like cursor auto-hiding, configurable
	* wheelscrolling (fast-scroll or zoom), spell checking and deleting of ent ire		* wheelscrolling (fast-scroll or zoom), spell checking and deleting of ent ire
	* words with Ctrl-Backspace or Ctrl-Delete.		* words with Ctrl-Backspace or Ctrl-Delete.
	*		*
	* This text edit provides two ways of spell checking: background checking,		* This text edit provides two ways of spell checking: background checking,
	* which will mark incorrectly spelled words red, and a spell check dialog,		* which will mark incorrectly spelled words red, and a spell check dialog,
	* which lets the user check and correct all incorrectly spelled words.		* which lets the user check and correct all incorrectly spelled words.
	*		*
	* Basic rule: whenever you want to use QTextEdit, use KTextEdit!		* Basic rule: whenever you want to use QTextEdit, use KTextEdit!
	*		*
			* \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 )
	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
	skipping to change at line 236		skipping to change at line 239
	void setSpellInterface( KTextEditSpellInterface *spellInterface );		void setSpellInterface( KTextEditSpellInterface *spellInterface );
	/**		/**
	* @return the spell checking language which was set by		* @return the spell checking language which was set by
	* setSpellCheckingLanguage(), the spellcheck dialog or the spe llcheck		* setSpellCheckingLanguage(), the spellcheck dialog or the spe llcheck
	* config dialog, or an empty string if that has never been cal led.		* config dialog, or an empty string if that has never been cal led.
	* @since 4.2		* @since 4.2
	*/		*/
	const QString& spellCheckingLanguage() const;		const QString& spellCheckingLanguage() const;
			/**
			* This makes the text edit display a grayed-out hinting text as long a
			s
			* the user didn't enter any text. It is often used as indication about
			* the purpose of the text edit.
			* @since 4.4
			*/
			void setClickMessage(const QString &msg);
			/**
			* @return the message set with setClickMessage
			* @since 4.4
			*/
			QString clickMessage() const;
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* emit signal when we activate or not autospellchecking		* emit signal when we activate or not autospellchecking
	*		*
	* @since 4.1		* @since 4.1
	*/		*/
	void checkSpellingChanged( bool );		void checkSpellingChanged( bool );
	/**		/**
	* Signal sends when spell checking is finished/stopped/completed		* Signal sends when spell checking is finished/stopped/completed
	skipping to change at line 322		skipping to change at line 339
	*/		*/
	void slotSpeakText();		void slotSpeakText();
	protected:		protected:
	/**		/**
	* Reimplemented to catch "delete word" shortcut events.		* Reimplemented to catch "delete word" shortcut events.
	*/		*/
	virtual bool event(QEvent*);		virtual bool event(QEvent*);
	/**		/**
			* Reimplemented to paint clickMessage.
			*/
			virtual void paintEvent(QPaintEvent *);
			virtual void focusOutEvent(QFocusEvent *);
			/**
	* Reimplemented for internal reasons		* Reimplemented for internal reasons
	*/		*/
	virtual void keyPressEvent( QKeyEvent* );		virtual void keyPressEvent( QKeyEvent* );
	/**		/**
	* Reimplemented to instantiate a KDictSpellingHighlighter, if		* Reimplemented to instantiate a KDictSpellingHighlighter, if
	* spellchecking is enabled.		* spellchecking is enabled.
	*/		*/
	virtual void focusInEvent( QFocusEvent* );		virtual void focusInEvent( QFocusEvent* );
End of changes. 4 change blocks.
	0 lines changed or deleted		24 lines changed or added

	ktimezonewidget.h		ktimezonewidget.h
	skipping to change at line 55		skipping to change at line 55
	* \endcode		* \endcode
	*		*
	* To use the class to implement a multiple-choice custom time zone selecto r:		* To use the class to implement a multiple-choice custom time zone selecto r:
	* \code		* \code
	*		*
	* m_timezones = new KTimeZoneWidget( this, "Time zones", vcalendarTimezon es );		* m_timezones = new KTimeZoneWidget( this, "Time zones", vcalendarTimezon es );
	* m_timezones->setSelectionMode( QTreeView::MultiSelection );		* m_timezones->setSelectionMode( QTreeView::MultiSelection );
	* ...		* ...
	* \endcode		* \endcode
	*		*
			* \image html ktimezonewidget.png "KDE Time Zone Widget"
			*
	* @author S.R.Haque <srhaque@iee.org>		* @author S.R.Haque <srhaque@iee.org>
	*/		*/
	class KDEUI_EXPORT KTimeZoneWidget : public QTreeWidget		class KDEUI_EXPORT KTimeZoneWidget : public QTreeWidget
	{		{
	Q_OBJECT		Q_OBJECT
			Q_PROPERTY(bool itemsCheckable READ itemsCheckable WRITE setItemsChecka
			ble)
			Q_PROPERTY(QAbstractItemView::SelectionMode selectionMode READ selectio
			nMode WRITE setSelectionMode)
	public:		public:
	/**		/**
	* Constructs a time zone selection widget.		* Constructs a time zone selection widget.
	*		*
	* @param parent The parent widget.		* @param parent The parent widget.
	* @param timeZones The time zone database to use. If 0, the system tim e zone		* @param timeZones The time zone database to use. If 0, the system tim e zone
	* database is used.		* database is used.
	*/		*/
	explicit KTimeZoneWidget( QWidget *parent = 0, KTimeZones *timeZones = 0 );		explicit KTimeZoneWidget( QWidget *parent = 0, KTimeZones *timeZones = 0 );
	/**		/**
	* Destroys the time zone selection widget.		* Destroys the time zone selection widget.
	*/		*/
	virtual ~KTimeZoneWidget();		virtual ~KTimeZoneWidget();
	/**		/**
			* Makes all items show a checkbox, so that the user can select multipl
			e
			* timezones by means of checking checkboxes, rather than via multi-sel
			ection.
			*
			* In "items checkable" mode, the selection(), setSelected() and clearS
			election()
			* methods work on the check states rather than on selecting/unselectin
			g.
			*
			* @since 4.4
			*/
			void setItemsCheckable(bool enable);
			/**
			* @return true if setItemsCheckable(true) was called.
			* @since 4.4
			*/
			bool itemsCheckable() const;
			/**
			* Allows to select multiple timezones. This is the same as
			* setSelectionMode(KTimeZoneWidget::MultiSelection) normally,
			* but in "items checkable" mode, this is rather about allowing to
			* check multiple items. In that case, the actual QTreeWidget selection
			* mode remains unchanged.
			* @since 4.4
			*/
			void setSelectionMode(QAbstractItemView::SelectionMode mode);
			/**
			* @return the selection mode set by setSelectionMode().
			* @since 4.4
			*/
			QAbstractItemView::SelectionMode selectionMode() const;
			/**
	* Returns the currently selected time zones. See QTreeView::selectionC hanged().		* Returns the currently selected time zones. See QTreeView::selectionC hanged().
	*		*
	* @return a list of time zone names, in the format used by the databas e		* @return a list of time zone names, in the format used by the databas e
	* supplied to the {@link KTimeZoneWidget() } constructor.		* supplied to the {@link KTimeZoneWidget() } constructor.
	*/		*/
	QStringList selection() const;		QStringList selection() const;
	/**		/**
	* Select/deselect the named time zone.		* Select/deselect the named time zone.
	*		*
	* @param zone The time zone name to be selected. Ignored if not recogn ized!		* @param zone The time zone name to be selected. Ignored if not recogn ized!
	* @param selected The new selection state.		* @param selected The new selection state.
	*/		*/
	void setSelected( const QString &zone, bool selected );		void setSelected( const QString &zone, bool selected );
	/**		/**
			* Unselect all timezones.
			* This is the same as QTreeWidget::clearSelection, except in checkable
			items mode,
			* where items are all unchecked.
			* The overload is @since 4.4.
			*/
			void clearSelection();
			/**
	* Format a time zone name in a standardised manner. The returned value is		* Format a time zone name in a standardised manner. The returned value is
	* transformed via an i18n lookup, so the caller should previously have		* transformed via an i18n lookup, so the caller should previously have
	* set the time zone catalog:		* set the time zone catalog:
	* \code		* \code
	* KGlobal::locale()->insertCatalog( "timezones4" );		* KGlobal::locale()->insertCatalog( "timezones4" );
	* \endcode		* \endcode
	*		*
	* @return formatted time zone name.		* @return formatted time zone name.
	*/		*/
	static QString displayName( const KTimeZone &zone );		static QString displayName( const KTimeZone &zone );
End of changes. 4 change blocks.
	0 lines changed or deleted		51 lines changed or added

	ktip.h		ktip.h
	skipping to change at line 48		skipping to change at line 48
	* when a KTipDatabase object is created.		* when a KTipDatabase object is created.
	*		*
	* Once the file is read in, you can access the tips to display		* Once the file is read in, you can access the tips to display
	* them in the tip of the day dialog.		* them in the tip of the day dialog.
	*		*
	* The state of the tipdialog is saved to the applications's config file		* The state of the tipdialog is saved to the applications's config file
	* in the group "TipOfDay" with a bool entry "RunOnStart". Check this value		* in the group "TipOfDay" with a bool entry "RunOnStart". Check this value
	* if you want to allow the user to enable/disable the tipdialog in the		* if you want to allow the user to enable/disable the tipdialog in the
	* application's configuration dialog.		* application's configuration dialog.
	*		*
			* \image html ktip.png "KDE Tip-of-the-Day Dialog"
			*
	* @author Matthias Hoelzer-Kluepfel <mhk@kde.org>		* @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
	*		*
	*/		*/
	class KDEUI_EXPORT KTipDatabase		class KDEUI_EXPORT KTipDatabase
	{		{
	public:		public:
	/**		/**
	* This constructor reads in the tips from a file with the given name. If		* This constructor reads in the tips from a file with the given name. If
	* no name is given, a file called 'application-name/tips' will be load ed.		* no name is given, a file called 'application-name/tips' will be load ed.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kuniqueapplication.h		kuniqueapplication.h
	skipping to change at line 45		skipping to change at line 45
	* Instances of KUniqueApplication can be made to behave like a normal appl ication by passing		* Instances of KUniqueApplication can be made to behave like a normal appl ication by passing
	* the StartFlag::NonUniqueInstance flag to start().		* the StartFlag::NonUniqueInstance flag to start().
	*		*
	* Please note that this supports only one process per KDE session. If		* Please note that this supports only one process per KDE session. If
	* your application can only be opened once per user or once per host, you		* your application can only be opened once per user or once per host, you
	* need to ensure this independently of KUniqueApplication.		* need to ensure this independently of KUniqueApplication.
	*		*
	* The .desktop file for the application should state X-DBUS-StartupType=Un ique,		* The .desktop file for the application should state X-DBUS-StartupType=Un ique,
	* see ktoolinvocation.h		* see ktoolinvocation.h
	*		*
			* If you use command line options before start() is called, you MUST call
			addCmdLineOptions()
			* so that the KUniqueApplication-specific command-line options can still w
			ork.
			*
	* If your application is used to open files, it should also support the -- tempfile		* If your application is used to open files, it should also support the -- tempfile
	* option (see KCmdLineArgs::addTempFileOption()), to delete tempfiles afte r use.		* option (see KCmdLineArgs::addTempFileOption()), to delete tempfiles afte r use.
	* Add X-KDE-HasTempFileOption=true to the .desktop file to indicate this.		* Add X-KDE-HasTempFileOption=true to the .desktop file to indicate this.
	*		*
	* @see KApplication		* @see KApplication
	* @author Preston Brown <pbrown@kde.org>		* @author Preston Brown <pbrown@kde.org>
	*/		*/
	class KDEUI_EXPORT KUniqueApplication : public KApplication		class KDEUI_EXPORT KUniqueApplication : public KApplication
	{		{
	Q_OBJECT		Q_OBJECT
End of changes. 1 change blocks.
	0 lines changed or deleted		5 lines changed or added

	kurl.h		kurl.h
	skipping to change at line 818		skipping to change at line 818
	* both paths and urls.		* both paths and urls.
	*		*
	* @return the new KUrl		* @return the new KUrl
	*/		*/
	QString pathOrUrl() const;		QString pathOrUrl() const;
	/**		/**
	* Overload with @p trailing parameter		* Overload with @p trailing parameter
	* @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.
	* @since 4.2		* @since 4.2
	*/		*/
	QString pathOrUrl(AdjustPathOption trailing) const; // KDE5: merge with a bove		QString pathOrUrl(AdjustPathOption trailing) const; // KDE5: merge with a bove. Rename to toUrlOrLocalFile?
	/**		/**
	* Returns the URL as a string, using the standard conventions for mime d ata		* Returns the URL as a string, using the standard conventions for mime d ata
	* (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.
	*/		*/
	QString toMimeDataString() const;		QString toMimeDataString() const;
	/**		/**
	* This function is useful to implement the "Up" button in a file manager for example.		* This function is useful to implement the "Up" button in a file manager for example.
	skipping to change at line 1003		skipping to change at line 1003
	* 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.
	*/		*/
	static KDE_DEPRECATED QString encode_string(const QString &str) {		static KDE_DEPRECATED QString encode_string(const QString &str) {
	return QLatin1String( QUrl::toPercentEncoding( str ) ); //krazy:exclu de=qclasses		return QString::fromLatin1( QUrl::toPercentEncoding( str ).constData() ); //krazy:exclude=qclasses
	}		}
	/**		/**
	* 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.
	*		*
	*/		*/
	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, "/" ) ); // krazy:exclude=qclasses		return QString::fromLatin1( QUrl::toPercentEncoding( str, "/" ).const Data() ); //krazy:exclude=qclasses
	}		}
	/**		/**
	* 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.
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	kurlrequester.h		kurlrequester.h
	skipping to change at line 48		skipping to change at line 48
	* filedialog. File name completion is available in the lineedit.		* filedialog. File name completion is available in the lineedit.
	*		*
	* The defaults for the filedialog are to ask for one existing local file, i.e.		* The defaults for the filedialog are to ask for one existing local file, i.e.
	* KFileDialog::setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOn ly )		* KFileDialog::setMode( KFile::File | KFile::ExistingOnly | KFile::LocalOn ly )
	* The default filter is "*", i.e. show all files, and the start directory is		* The default filter is "*", i.e. show all files, and the start directory is
	* the current working directory, or the last directory where a file has be en		* the current working directory, or the last directory where a file has be en
	* selected.		* selected.
	*		*
	* You can change this behavior by using setMode() or setFilter().		* You can change this behavior by using setMode() or setFilter().
	*		*
			* 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 USER true )
	Q_PROPERTY( QString filter READ filter WRITE setFilter )		Q_PROPERTY( QString filter READ filter WRITE setFilter )
	Q_FLAGS( KFile::Modes )
	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 )
	public:		public:
	/**		/**
	* Constructs a KUrlRequester widget.		* Constructs a KUrlRequester widget.
	*/		*/
	explicit KUrlRequester( QWidget *parent=0);		explicit KUrlRequester( QWidget *parent=0);
	/**		/**
	* Constructs a KUrlRequester widget with the initial URL @p url.		* Constructs a KUrlRequester widget with the initial URL @p url.
	*/		*/
	skipping to change at line 136		skipping to change at line 138
	*/		*/
	void setFilter( const QString& filter );		void setFilter( const QString& filter );
	/**		/**
	* Returns the current filter for the file dialog.		* Returns the current filter for the file dialog.
	* @see KFileDialog::filter()		* @see KFileDialog::filter()
	*/		*/
	QString filter() const;		QString filter() const;
	/**		/**
	* @returns a pointer to the filedialog		* @returns a pointer to the filedialog.
	* You can use this to customize the dialog, e.g. to specify a filter.		* You can use this to customize the dialog, e.g. to call setLocationLa
	* Never returns 0L.		bel
			* or other things which are not accessible in the KUrlRequester API.
	*		*
	* Remove in KDE4? KUrlRequester should use KDirSelectDialog for		* Never returns 0. This method creates the file dialog on demand.
	* (mode & KFile::Directory) && !(mode & KFile::File)		*
			* Important: in "Directory only" mode, a KDirSelectDialog is used
			* instead, so calling this method is useless.
	*/		*/
	virtual KFileDialog * fileDialog() const;		virtual KFileDialog * fileDialog() const;
	/**		/**
	* @returns a pointer to the lineedit, either the default one, or the		* @returns a pointer to the lineedit, either the default one, or the
	* special one, if you used the special constructor.		* special one, if you used the special constructor.
	*		*
	* It is provided so that you can e.g. set an own completion object		* It is provided so that you can e.g. set an own completion object
	* (e.g. KShellCompletion) into it.		* (e.g. KShellCompletion) into it.
	*/		*/
	skipping to change at line 195		skipping to change at line 199
	* @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
	*/		*/
	void setClickMessage(const QString& msg);		void setClickMessage(const QString& msg);
			/**
			* @returns the window modality of the file dialog set with setFileDial
			ogModality
			* @since 4.4
			*/
			Qt::WindowModality fileDialogModality() const;
			/**
			* Set the window modality for the file dialog to @p modality
			* Directory selection dialogs are always modal
			* @since 4.4
			*/
			void setFileDialogModality(Qt::WindowModality modality);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the url in the lineedit to @p url.		* Sets the url in the lineedit to @p url.
	*/		*/
	void setUrl( const KUrl& url );		void setUrl( const KUrl& url );
	/**		/**
	* Sets the start dir @p startDir.		* Sets the start dir @p startDir.
	* The start dir is only used when the URL isn't set.		* The start dir is only used when the URL isn't set.
	* @since 4.3		* @since 4.3
	skipping to change at line 284		skipping to change at line 301
	bool eventFilter( QObject *obj, QEvent *ev );		bool eventFilter( QObject *obj, QEvent *ev );
	private:		private:
	class KUrlRequesterPrivate;		class KUrlRequesterPrivate;
	KUrlRequesterPrivate* const d;		KUrlRequesterPrivate* const d;
	Q_DISABLE_COPY(KUrlRequester)		Q_DISABLE_COPY(KUrlRequester)
	Q_PRIVATE_SLOT(d, void _k_slotUpdateUrl())		Q_PRIVATE_SLOT(d, void _k_slotUpdateUrl())
	Q_PRIVATE_SLOT(d, void _k_slotOpenDialog())		Q_PRIVATE_SLOT(d, void _k_slotOpenDialog())
			Q_PRIVATE_SLOT(d, void _k_slotFileDialogFinished())
	};		};
	class KIO_EXPORT KUrlComboRequester : public KUrlRequester // krazy:exclude =dpointer (For use in Qt Designer)		class KIO_EXPORT KUrlComboRequester : public KUrlRequester // krazy:exclude =dpointer (For use in Qt Designer)
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Constructs a KUrlRequester widget with a combobox.		* Constructs a KUrlRequester widget with a combobox.
	*/		*/
End of changes. 7 change blocks.
	6 lines changed or deleted		26 lines changed or added

	kvbox.h		kvbox.h
	skipping to change at line 32		skipping to change at line 32
	#include <khbox.h>		#include <khbox.h>
	/**		/**
	* A container widget which arranges its children vertically.		* A container widget which arranges its children vertically.
	* When using a KVBox you don't need to create a layout nor		* When using a KVBox you don't need to create a layout nor
	* to add the child widgets to it.		* to add the child widgets to it.
	*		*
	* Both margin and spacing are initialized to 0. Use QVBoxLayout		* Both margin and spacing are initialized to 0. Use QVBoxLayout
	* if you need standard layout margins.		* if you need standard layout margins.
	*		*
			* \image html kvbox.png "KDE Vertical Box containing three buttons"
			*
	* @see KHBox		* @see KHBox
	*/		*/
	class KDEUI_EXPORT KVBox : public KHBox		class KDEUI_EXPORT KVBox : public KHBox
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	* Creates a new vbox.		* Creates a new vbox.
	*		*
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	kxmlguiclient.h		kxmlguiclient.h
	skipping to change at line 273		skipping to change at line 273
	QStringList actionsToEnable;		QStringList actionsToEnable;
	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
			* method is to allow non-inherited objects to replace the ui definition
			* of an embedded client with a customized version. It corresponds to the
			* usual calls to setXMLFile() and setLocalXMLFile().
			*
			* @param xmlfile The xml file to use. Contrary to setXMLFile(), this
			* must be an absolute file path.
			* @param localxmfile The local xml file to set. This should be the full
			path
			* to a writeable file, usually inside
			* KStandardDirs::localkdedir(). You can set this to
			* QString(), but no user changes to shortcuts / toolb
			ars
			* will be possible in this case. @see setLocalXMLFile
			()
			* @param merge Whether to merge with the global document
			*
			* @note If in any doubt whether you need this or not, use setXMLFile()
			* and setLocalXMLFile(), instead of this function.
			* @note Just like setXMLFile(), this function has to be called before
			* the client is added to a KXMLGUIFactory in order to have an
			* effect.
			*
			* @since 4.4
			*/
			void replaceXMLFile( const QString& xmlfile, const QString& localxmlfile,
			bool merge = false );
	protected:		protected:
	/**		/**
	* Returns true if client was added to super client list.		* Returns true if client was added to super client list.
	* Returns false if client was already in list.		* Returns false if client was already in list.
	*/		*/
	//bool addSuperClient( KXMLGUIClient * );		//bool addSuperClient( KXMLGUIClient * );
	/**		/**
	* Sets the componentData ( KComponentData) for this part.		* Sets the componentData ( KComponentData) for this part.
	*		*
	skipping to change at line 325		skipping to change at line 350
	*		*
	* Call this in the Part-inherited class constructor if you		* Call this in the Part-inherited class constructor if you
	* don't call setXMLFile().		* don't call setXMLFile().
	**/		**/
	virtual void setXML( const QString &document, bool merge = false );		virtual void setXML( const QString &document, bool merge = false );
	/**		/**
	* Sets the Document for the part, describing the layout of the GUI.		* Sets the Document for the part, describing the layout of the GUI.
	*		*
	* Call this in the Part-inherited class constructor if you don't call		* Call this in the Part-inherited class constructor if you don't call
	* setXMLFile or setXML .		* setXMLFile or setXML.
			*
			* WARNING: using this method is not recommended. Many code paths
			* lead to reloading from the XML file on disk. And editing toolbars requ
			ires
			* that the result is written to disk anyway, and loaded from there the n
			ext time.
			*
			* For application-specific changes to a client's XML, it is a better ide
			a to
			* save the modified dom document to an app/default-client.xml and define
			a local-xml-file
			* to something specific like app/local-client.xml, using replaceXMLFile.
			* See kdepimlibs/kontactinterface/plugin.cpp for an example.
	*/		*/
	virtual void setDOMDocument( const QDomDocument &document, bool merge = f alse );		virtual void setDOMDocument( const QDomDocument &document, bool merge = f alse );
	/**		/**
	* Actions can collectively be assigned a "State". To accomplish this		* Actions can collectively be assigned a "State". To accomplish this
	* the respective actions are tagged as \<enable\> or \<disable\> in		* the respective actions are tagged as \<enable\> or \<disable\> in
	* 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.
End of changes. 2 change blocks.
	1 lines changed or deleted		43 lines changed or added

	kxmlguiwindow.h		kxmlguiwindow.h
	skipping to change at line 80		skipping to change at line 80
	public:		public:
	/**		/**
	* Construct a main window.		* Construct a main window.
	*		*
	* @param parent The widget parent. This is usually 0 but it may also b e the window		* @param parent The widget parent. This is usually 0 but it may also b e the window
	* group leader. In that case, the KMainWindow becomes sort of a		* group leader. In that case, the KMainWindow becomes sort of a
	* secondary window.		* secondary window.
	*		*
	* @param f Specify the widget flags. The default is		* @param f Specify the widget flags. The default is
	* WType_TopLevel and WDestructiveClose. TopLevel indicates that a		* Qt::Window and Qt::WA_DeleteOnClose. Qt::Window indicates that a
	* main window is a toplevel window, regardless of whether it has a		* main window is a toplevel window, regardless of whether it has a
	* parent or not. DestructiveClose indicates that a main window is		* parent or not. Qt::WA_DeleteOnClose indicates that a main window is
	* automatically destroyed when its window is closed. Pass 0 if		* automatically destroyed when its window is closed. Pass 0 if
	* you do not want this behavior.		* you do not want this behavior.
	*		*
	* @see http://doc.trolltech.com/3.2/qt.html#WidgetFlags-enum		* @see http://doc.trolltech.com/qt.html#WindowType-enum
	*		*
	* KMainWindows must be created on the heap with 'new', like:		* KMainWindows must be created on the heap with 'new', like:
	* \code		* \code
	* KMainWindow *kmw = new KMainWindow(...);		* KMainWindow *kmw = new KMainWindow(...);
	* kmw->setObjectName(...);		* kmw->setObjectName(...);
	* \endcode		* \endcode
	*		*
	* IMPORTANT: For session management and window management to work		* IMPORTANT: For session management and window management to work
	* properly, all main windows in the application should have a		* properly, all main windows in the application should have a
	* different name. If you don't do it, KMainWindow will create		* different name. If you don't do it, KMainWindow will create
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	kzip.h		kzip.h
	skipping to change at line 25		skipping to change at line 25
	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 KZIP_H		#ifndef KZIP_H
	#define KZIP_H		#define KZIP_H
	#include <karchive.h>		#include <karchive.h>
	class KZipFileEntry;		class KZipFileEntry;
	/**		/**
	* This class implements a kioslave to access zip files from KDE.		* A class for reading / writing zip archives.
			*
	* You can use it in QIODevice::ReadOnly or in QIODevice::WriteOnly mode, and it		* You can use it in QIODevice::ReadOnly or in QIODevice::WriteOnly mode, and it
	* behaves just as expected.		* behaves just as expected.
	* It can also be used in QIODevice::ReadWrite mode, in this case one can		* It can also be used in QIODevice::ReadWrite mode, in this case one can
	* append files to an existing zip archive. When you append new files, wh ich		* append files to an existing zip archive. When you append new files, wh ich
	* are not yet in the zip, it works as expected, i.e. the files are appen ded at the end.		* are not yet in the zip, it works as expected, i.e. the files are appen ded at the end.
	* When you append a file, which is already in the file, the reference to the		* When you append a file, which is already in the file, the reference to the
	* old file is dropped and the new one is added to the zip - but the		* old file is dropped and the new one is added to the zip - but the
	* old data from the file itself is not deleted, it is still in the		* old data from the file itself is not deleted, it is still in the
	* zipfile. so when you want to have a small and garbage-free zipfile,		* zipfile. So when you want to have a small and garbage-free zipfile,
	* just read the contents of the appended zip file and write it to a new one		* just read the contents of the appended zip file and write it to a new one
	* in QIODevice::WriteOnly mode. This is especially important when you do n't want		* in QIODevice::WriteOnly mode. This is especially important when you do n't want
	* to leak information of how intermediate versions of files in the zip		* to leak information of how intermediate versions of files in the zip
	* were looking.		* were looking.
			*
	* For more information on the zip fileformat go to		* For more information on the zip fileformat go to
	* http://www.pkware.com/products/enterprise/white_papers/appnote.html		* http://www.pkware.com/products/enterprise/white_papers/appnote.html
	* @short A class for reading/writing zip archives.
	* @author Holger Schroeder <holger-kde@holgis.net>		* @author Holger Schroeder <holger-kde@holgis.net>
	*/		*/
	class KIO_EXPORT KZip : public KArchive		class KIO_EXPORT KZip : public KArchive
	{		{
	public:		public:
	/**		/**
	* Creates an instance that operates on the given filename.		* Creates an instance that operates on the given filename.
	* using the compression filter associated to given mimetype.		* using the compression filter associated to given mimetype.
	*		*
	* @param filename is a local path (e.g. "/home/holger/myfile.zip")		* @param filename is a local path (e.g. "/home/holger/myfile.zip")
End of changes. 4 change blocks.
	3 lines changed or deleted		4 lines changed or added

	label.h		label.h
	skipping to change at line 110		skipping to change at line 110
	* @arg scale		* @arg scale
	*/		*/
	void setScaledContents(bool scaled);		void setScaledContents(bool scaled);
	/**		/**
	* @return true if the contents are scaled to the label size		* @return true if the contents are scaled to the label size
	*/		*/
	bool hasScaledContents() const;		bool hasScaledContents() const;
	/**		/**
			* Set if the text on the label can be selected with the mouse
			*
			* @arg enable true if we want to manage text selection with the mouse
			* @since 4.4
			*/
			void setTextSelectable(bool enable);
			/**
			* @return true if the text is selectable with the mouse
			* @since 4.4
			*/
			bool textSelectable() const;
			/**
	* Sets the stylesheet used to control the visual display of this Label		* Sets the stylesheet used to control the visual display of this Label
	*		*
	* @arg stylesheet a CSS string		* @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 135		skipping to change at line 149
	Q_SIGNALS:		Q_SIGNALS:
	void linkActivated(const QString &link);		void linkActivated(const QString &link);
	void linkHovered(const QString &link);		void linkHovered(const QString &link);
	public Q_SLOTS:		public Q_SLOTS:
	void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);		void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
			void mousePressEvent(QGraphicsSceneMouseEvent *event);
			void paint(QPainter *painter,
			const QStyleOptionGraphicsItem *option,
			QWidget *widget);
			void changeEvent(QEvent *event);
			bool event(QEvent *event);
			void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
	private:		private:
	Q_PRIVATE_SLOT(d, void setPalette())		Q_PRIVATE_SLOT(d, void setPalette())
	Q_PRIVATE_SLOT(d, void setPixmap())		Q_PRIVATE_SLOT(d, void setPixmap())
	LabelPrivate * const d;		LabelPrivate * const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
End of changes. 2 change blocks.
	0 lines changed or deleted		21 lines changed or added

	lineedit.h		lineedit.h
	skipping to change at line 45		skipping to change at line 45
	* @class LineEdit plasma/widgets/lineedit.h <Plasma/Widgets/LineEdit>		* @class LineEdit plasma/widgets/lineedit.h <Plasma/Widgets/LineEdit>
	*		*
	* @short Provides a plasma-themed KLineEdit.		* @short Provides a plasma-themed KLineEdit.
	*/		*/
	class PLASMA_EXPORT LineEdit : public QGraphicsProxyWidget		class PLASMA_EXPORT LineEdit : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText NOTIFY textEdited)		Q_PROPERTY(QString text READ text WRITE setText NOTIFY textEdited)
	Q_PROPERTY(bool isClearButtonShown READ isClearButtonShown WRITE setCle arButtonShown)		Q_PROPERTY(bool clearButtonShown READ isClearButtonShown WRITE setClear ButtonShown)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KLineEdit *nativeWidget READ nativeWidget)		Q_PROPERTY(KLineEdit *nativeWidget READ nativeWidget WRITE setNativeWid get)
	public:		public:
	explicit LineEdit(QGraphicsWidget *parent = 0);		explicit LineEdit(QGraphicsWidget *parent = 0);
	~LineEdit();		~LineEdit();
	/**		/**
	* Sets the display text for this LineEdit		* Sets the display text for this LineEdit
	*		*
	* @arg text the text to display; should be translated.		* @arg text the text to display; should be translated.
	*/		*/
	skipping to change at line 90		skipping to change at line 90
	* @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();
	/**		/**
			* Sets the line edit wrapped by this LineEdit (widget must inherit KLi
			neEdit), ownership is transferred to the LineEdit
			*
			* @arg text edit that will be wrapped by this LineEdit
			* @since KDE4.4
			*/
			void setNativeWidget(KLineEdit *nativeWidget);
			/**
	* @return the native widget wrapped by this LineEdit		* @return the native widget wrapped by this LineEdit
	*/		*/
	KLineEdit *nativeWidget() const;		KLineEdit *nativeWidget() const;
			protected:
			void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
			void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
			void changeEvent(QEvent *event);
			void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
			Widget *widget);
	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
			* @since 4.4
			*/
			void textChanged(const QString &text);
	private:		private:
	Q_PRIVATE_SLOT(d, void setPalette())		Q_PRIVATE_SLOT(d, void setPalette())
	LineEditPrivate *const d;		LineEditPrivate *const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 5 change blocks.
	2 lines changed or deleted		24 lines changed or added

	manager.h		manager.h
	skipping to change at line 218		skipping to change at line 218
	* plugins which could be loaded on demand to provide additiona l		* plugins which could be loaded on demand to provide additiona l
	* functionality.		* functionality.
	*		*
	* \param modulename The name of the module we should try to lo ad.		* \param modulename The name of the module we should try to lo ad.
	* \return The QObject instance that repesents the module or NU LL		* \return The QObject instance that repesents the module or NU LL
	* if loading failed.		* if loading failed.
	*/		*/
	QObject* module(const QString& modulename);		QObject* module(const QString& modulename);
	/**		/**
			* External modules are dynamically loadable and are normally d
			eleted
			* when the kross library is unloaded.
			* Applications may choose to call deleteModules() instead to c
			ontrol
			* deletion of the modules at another time.
			*/
			void deleteModules();
			/**
	* Execute a script file.		* Execute a script file.
	* \param file The script file that should be executed.		* \param file The script file that should be executed.
	*/		*/
	bool executeScriptFile(const QUrl& file = QUrl());		bool executeScriptFile(const QUrl& file = QUrl());
	void addQObject(QObject* obj, const QString &name = QString());		void addQObject(QObject* obj, const QString &name = QString());
	QObject* qobject(const QString &name) const;		QObject* qobject(const QString &name) const;
	QStringList qobjectNames() const;		QStringList qobjectNames() const;
	Q_SIGNALS:		Q_SIGNALS:
End of changes. 1 change blocks.
	0 lines changed or deleted		10 lines changed or added

	markinterface.h		markinterface.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef KDELIBS_KTEXTEDITOR_MARKINTERFACE_H		#ifndef KDELIBS_KTEXTEDITOR_MARKINTERFACE_H
	#define KDELIBS_KTEXTEDITOR_MARKINTERFACE_H		#define KDELIBS_KTEXTEDITOR_MARKINTERFACE_H
	#include <ktexteditor/ktexteditor_export.h>		#include <ktexteditor/ktexteditor_export.h>
	#include <QtCore/QHash>		#include <QtCore/QHash>
	#include <QtCore/QObject>		#include <QtCore/QObject>
	class QPixmap;		class QPixmap;
			class QPoint;
			class QMenu;
	namespace KTextEditor		namespace KTextEditor
	{		{
	class Document;		class Document;
	/**		/**
	* \brief Mark class containing line and mark types.		* \brief Mark class containing line and mark types.
	*		*
	* \section mark_intro Introduction		* \section mark_intro Introduction
	skipping to change at line 360		skipping to change at line 362
	/**		/**
	* The \p document emits this signal whenever the \p mark changes.		* The \p document emits this signal whenever the \p mark changes.
	* \param document the document which emitted the signal		* \param document the document which emitted the signal
	* \param mark changed mark		* \param mark changed mark
	* \param action action, either removed or added		* \param action action, either removed or added
	* \see marksChanged()		* \see marksChanged()
	*/		*/
	virtual void markChanged ( KTextEditor::Document* document, KTextEditor ::Mark mark,		virtual void markChanged ( KTextEditor::Document* document, KTextEditor ::Mark mark,
	KTextEditor::MarkInterface::MarkChangeAction action) = 0;		KTextEditor::MarkInterface::MarkChangeAction action) = 0;
			Q_SIGNALS:
			/**
			* The \p document emits this signal whenever the \p mark is hovered us
			ing the mouse,
			* and the receiver may show a tooltip.
			* \param document the document which emitted the signal
			* \param mark mark that was hovered
			* \param position mouse position during the hovering
			* \param handled set this to 'true' if this event was handled external
			ly
			*/
			void markToolTipRequested ( KTextEditor::Document* document, KTextEdito
			r::Mark mark,
			QPoint position, bool& handled );
			/**
			* The \p document emits this signal whenever the \p mark is right-clic
			ked to show a context menu.
			* The receiver may show an own context menu instead of the kate intern
			al one.
			* \param document the document which emitted the signal
			* \param mark mark that was right-clicked
			* \param pos position where the menu should be started
			* \param handled set this to 'true' if this event was handled external
			ly, and kate should not create an own context menu.
			*/
			void markContextMenuRequested( KTextEditor::Document* document, KTextEd
			itor::Mark mark,
			QPoint pos, bool& handled );
			/**
			* The \p document emits this signal whenever the \p mark is left-click
			ed.
			* \param document the document which emitted the signal
			* \param mark mark that was right-clicked
			* \param pos position where the menu should be started
			* \param handled set this to 'true' if this event was handled external
			ly, and kate should not do own handling of the left click.
			*/
			void markClicked( KTextEditor::Document* document, KTextEditor::Mark ma
			rk, bool& handled );
	private:		private:
	class MarkInterfacePrivate* const d;		class MarkInterfacePrivate* const d;
	};		};
	}		}
	Q_DECLARE_INTERFACE(KTextEditor::MarkInterface, "org.kde.KTextEditor.MarkIn terface")		Q_DECLARE_INTERFACE(KTextEditor::MarkInterface, "org.kde.KTextEditor.MarkIn terface")
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		45 lines changed or added

	meter.h		meter.h
	skipping to change at line 90		skipping to change at line 90
	* @param parent the QObject this meter is parented to.		* @param parent the QObject this meter is parented to.
	*/		*/
	explicit Meter(QGraphicsItem *parent = 0);		explicit Meter(QGraphicsItem *parent = 0);
	/**		/**
	* Destructor		* Destructor
	*/		*/
	~Meter();		~Meter();
	/**		/**
	* Set maximum value for the meter
	*/
	void setMaximum(int maximum);
	/**
	* @return maximum value for the meter		* @return maximum value for the meter
	*/		*/
	int maximum() const;		int maximum() const;
	/**		/**
	* Set minimum value for the meter
	*/
	void setMinimum(int minimum);
	/**
	* @return minimum value for the meter		* @return minimum value for the meter
	*/		*/
	int minimum() const;		int minimum() const;
	/**		/**
	* Set value for the meter
	*/
	void setValue(int value);
	/**
	* @return value for the meter		* @return value for the meter
	*/		*/
	int value() const;		int value() const;
	/**		/**
	* Set svg file name		* Set svg file name
	*/		*/
	void setSvg(const QString &svg);		void setSvg(const QString &svg);
	/**		/**
	skipping to change at line 204		skipping to change at line 189
	* @return the size of this label.		* @return the size of this label.
	*/		*/
	QRectF labelRect(int index) const;		QRectF labelRect(int index) const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Used when connecting to a DataEngine		* Used when connecting to a DataEngine
	*/		*/
	void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);		void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);
			/**
			* Set maximum value for the meter
			*/
			void setMaximum(int maximum);
			/**
			* Set minimum value for the meter
			*/
			void setMinimum(int minimum);
			/**
			* Set value for the meter
			*/
			void setValue(int value);
	protected:		protected:
	/**		/**
	* Reimplemented from Plasma::Widget		* Reimplemented from Plasma::Widget
	*/		*/
	virtual void paint(QPainter *p,		virtual void paint(QPainter *p,
	const QStyleOptionGraphicsItem *option,		const QStyleOptionGraphicsItem *option,
	QWidget *widget = 0);		QWidget *widget = 0);
	private:		private:
	Q_PRIVATE_SLOT(d, void progressChanged(qreal))		Q_PRIVATE_SLOT(d, void progressChanged(qreal))
End of changes. 4 change blocks.
	15 lines changed or deleted		15 lines changed or added

	nepomuk_export.h		nepomuk_export.h
	skipping to change at line 36		skipping to change at line 36
	#ifndef NEPOMUK_EXPORT		#ifndef NEPOMUK_EXPORT
	# if defined(MAKE_NEPOMUK_LIB)		# if 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
	#ifndef NEPOMUK_MIDDLEWARE_EXPORT
	# if defined(MAKE_NEPOMUK_MIDDLEWARE_LIB)
	/* We are building this library */
	# define NEPOMUK_MIDDLEWARE_EXPORT KDE_EXPORT
	# else
	/* We are using this library */
	# define NEPOMUK_MIDDLEWARE_EXPORT KDE_IMPORT
	# endif
	#endif
	#endif		#endif
End of changes. 1 change blocks.
	10 lines changed or deleted		0 lines changed or added

	netaccess.h		netaccess.h
	skipping to change at line 54		skipping to change at line 54
	/**		/**
	* Net Transparency.		* Net Transparency.
	*		*
	* NetAccess allows you to do simple file operation (load, save,		* NetAccess allows you to do simple file operation (load, save,
	* copy, delete...) without working with KIO::Job directly.		* copy, delete...) without working with KIO::Job directly.
	* Whereas a KIO::Job is asynchronous, meaning that the		* Whereas a KIO::Job is asynchronous, meaning that the
	* developer has to connect slots for it, KIO::NetAccess provides		* developer has to connect slots for it, KIO::NetAccess provides
	* synchronous downloads and uploads, as well as temporary file		* synchronous downloads and uploads, as well as temporary file
	* creation and removal. The functions appear to be blocking,		* creation and removal. The functions appear to be blocking,
	* but the Qt event loop continues running while the operations		* but the Qt event loop continues running while the operations
	* are handled. This means that the GUI will not freeze.		* are handled. More precisely, the GUI will still repaint, but no user
			* interaction will be possible. If you can, please use async KIO jobs in
			stead!
			* See the documentation of KJob::exec() for more about the dangers of Ne
			tAccess.
	*		*
	* This class isn't meant to be used as a class but only as a simple		* This class isn't meant to be used as a class but only as a simple
	* namespace for static functions, though an instance of the class		* namespace for static functions, though an instance of the class
	* is built for internal purposes.		* is built for internal purposes. TODO KDE5: turn into namespace,
			* and make the qobject class private.
	*		*
	* Port to kio done by David Faure, faure@kde.org		* Port to kio done by David Faure, faure@kde.org
	*		*
	* @short Provides an easy, synchronous interface to KIO file operations.		* @short Provides a blocking interface to KIO file operations.
	*/		*/
	class KIO_EXPORT NetAccess : public QObject		class KIO_EXPORT NetAccess : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	enum StatSide {		enum StatSide {
	SourceSide,		SourceSide,
	DestinationSide		DestinationSide
	};		};
	skipping to change at line 298		skipping to change at line 301
	*		*
	* This is a convenience function for KIO::stat + parsing the		* This is a convenience function for KIO::stat + parsing the
	* resulting UDSEntry.		* resulting UDSEntry.
	*		*
	* @param url The URL we are testing.		* @param url The URL we are testing.
	* @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 a local URL corresponding to the same ressource than the		* @return a local URL corresponding to the same resource than the
	* original URL, or the original URL if no local URL can be map ped		* original URL, or the original URL if no local URL can be map ped
	*/		*/
	static KUrl mostLocalUrl(const KUrl& url, QWidget* window);		static KUrl mostLocalUrl(const KUrl& url, QWidget* window);
	/**		/**
	* Deletes a file or a directory in a synchronous way.		* Deletes a file or a directory in a synchronous way.
	*		*
	* This is a convenience function for KIO::del		* This is a convenience function for KIO::del
	* (it saves creating a slot and testing for the job result).		* (it saves creating a slot and testing for the job result).
	*		*
End of changes. 4 change blocks.
	4 lines changed or deleted		9 lines changed or added

	netwm.h		netwm.h
	skipping to change at line 118		skipping to change at line 118
	is interested in. The elements contain OR'ed values of constants		is interested in. The elements contain OR'ed values of constants
	from the NET base class, in the following order: [0]= NET::Property,		from the NET base class, in the following order: [0]= NET::Property,
	[1]= NET::Property2.		[1]= NET::Property2.
	@param properties_size The number of elements in the properties arra y.		@param properties_size The number of elements in the properties arra y.
	@param screen For Clients that support multiple screen (ie. "multihe aded")		@param screen For Clients that support multiple screen (ie. "multihe aded")
	displays, the screen number may be explicitly defined. If this argum ent is		displays, the screen number may be explicitly defined. If this argum ent is
	omitted, the default screen will be used.		omitted, the default screen will be used.
	@param doActivate true to activate the window		@param doActivate true to call activate() to do an initial data read
			/update
			of the query information.
	**/		**/
	NETRootInfo(Display *display, const unsigned long properties[], int pro perties_size,		NETRootInfo(Display *display, const unsigned long properties[], int pro perties_size,
	int screen = -1, bool doActivate = true);		int screen = -1, bool doActivate = true);
	/**		/**
	This constructor differs from the above one only in the way it acce pts		This constructor differs from the above one only in the way it acce pts
	the list of supported properties. The properties argument is equiva lent		the list of supported properties. The properties argument is equiva lent
	to the first element of the properties array in the above construct or,		to the first element of the properties array in the above construct or,
	and therefore you cannot read all root window properties using it.		and therefore you cannot read all root window properties using it.
	**/		**/
	skipping to change at line 180		skipping to change at line 181
	const char *wmName() const;		const char *wmName() const;
	/**		/**
	Returns the screenNumber.		Returns the screenNumber.
	@return the screen number		@return the screen number
	**/		**/
	int screenNumber() const;		int screenNumber() const;
	/**		/**
			Sets the given property if on is true, and clears the property otherw
			ise.
			In WindowManager mode this function updates _NET_SUPPORTED.
			In Client mode this function does nothing.
			@since 4.4
			**/
			void setSupported( NET::Property property, bool on = true );
			/**
			@overload
			@since 4.4
			**/
			void setSupported( NET::Property2 property, bool on = true );
			/**
			@overload
			@since 4.4
			**/
			void setSupported( NET::WindowType property, bool on = true );
			/**
			@overload
			@since 4.4
			**/
			void setSupported( NET::State property, bool on = true );
			/**
			@overload
			@since 4.4
			**/
			void setSupported( NET::Action property, bool on = true );
			/**
	Returns true if the given property is supported by the window		Returns true if the given property is supported by the window
	manager. Note that for Client mode, NET::Supported needs		manager. Note that for Client mode, NET::Supported needs
	to be passed in the properties argument for this to work.		to be passed in the properties argument for this to work.
	**/		**/
	bool isSupported( NET::Property property ) const;		bool isSupported( NET::Property property ) const;
	/**		/**
	@overload		@overload
	**/		**/
	bool isSupported( NET::Property2 property ) const;		bool isSupported( NET::Property2 property ) const;
	/**		/**
	skipping to change at line 1116		skipping to change at line 1150
	void setFrameExtents(NETStrut strut);		void setFrameExtents(NETStrut strut);
	/**		/**
	Returns the frame decoration strut, i.e. the width of the decoration borders.		Returns the frame decoration strut, i.e. the width of the decoration borders.
	@since 4.3		@since 4.3
	**/		**/
	NETStrut frameExtents() const;		NETStrut frameExtents() const;
	/**		/**
			Sets the window frame overlap strut, i.e. how far the window frame e
			xtends
			behind the client area on each side.
			Set the strut values to -1 if you want the window frame to cover the
			whole
			client area.
			The default values are 0.
			@since 4.4
			**/
			void setFrameOverlap(NETStrut strut);
			/**
			Returns the frame overlap strut, i.e. how far the window frame exten
			ds
			behind the client area on each side.
			@since 4.4
			**/
			NETStrut frameOverlap() const;
			/**
	Returns an icon. If width and height are passed, the icon returned will be		Returns an icon. If width and height are passed, the icon returned will be
	the closest it can find (the next biggest). If width and height are omitted,		the closest it can find (the next biggest). If width and height are omitted,
	then the largest icon in the list is returned.		then the largest icon in the list is returned.
	@param width the preferred width for the icon, -1 to ignore		@param width the preferred width for the icon, -1 to ignore
	@param height the preferred height for the icon, -1 to ignore		@param height the preferred height for the icon, -1 to ignore
	@return the icon		@return the icon
	**/		**/
End of changes. 3 change blocks.
	1 lines changed or deleted		61 lines changed or added

	netwm_def.h		netwm_def.h
	skipping to change at line 687		skipping to change at line 687
	WM2ExtendedStrut = 1<<7,		WM2ExtendedStrut = 1<<7,
	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
	};		};
	/**		/**
	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

	package.h		package.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 PLASMA_PACKAGE_H		#ifndef PLASMA_PACKAGE_H
	#define PLASMA_PACKAGE_H		#define PLASMA_PACKAGE_H
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <plasma/plasma_export.h>		#include <plasma/plasma.h>
	#include <plasma/packagestructure.h>		#include <plasma/packagestructure.h>
			#include <plasma/plasma_export.h>
	namespace Plasma		namespace Plasma
	{		{
	/**		/**
	* @class Package plasma/package.h <Plasma/Package>		* @class Package plasma/package.h <Plasma/Package>
	*		*
	* @short object representing an installed Plasmagik package		* @short object representing an installed Plasmagik package
	**/		**/
	skipping to change at line 112		skipping to change at line 113
	PackageMetadata metadata() const;		PackageMetadata metadata() const;
	/**		/**
	* Sets the path to the root of this package		* Sets the path to the root of this package
	* @arg path and absolute path		* @arg path and absolute path
	* @since 4.3		* @since 4.3
	*/		*/
	void setPath(const QString &path);		void setPath(const QString &path);
	/**		/**
			* Publish this package on the network.
			* @param methods the ways to announce this package on the network.
			*/
			void publish(AnnouncementMethods methods, const QString &name);
			/**
			* Remove this package from the network.
			*/
			void unpublish(const QString &name = QString());
			/**
			* @returns whether or not this service is currently published on t
			he network.
			*/
			bool isPublished() const;
			/**
	* @return the path to the root of this particular package		* @return the path to the root of this particular package
	*/		*/
	const QString path() const;		const QString path() const;
	/**		/**
	* @return the PackageStructure use in this Package		* @return the PackageStructure use in this Package
	*/		*/
	const PackageStructure::Ptr structure() const;		const PackageStructure::Ptr structure() const;
	/**		/**
			* @return a SHA1 hash digest of the contents of the package in hex
			adecimal form
			* @since 4.4
			*/
			QString contentsHash() const;
			/**
	* Returns a list of all installed packages by name		* Returns a list of all installed packages by name
	*		*
	* @param packageRoot path to the directory where Plasmagik package s		* @param packageRoot path to the directory where Plasmagik package s
	* have been installed to		* have been installed to
	* @return a list of installed Plasmagik packages		* @return a list of installed Plasmagik packages
	**/		**/
	static QStringList listInstalled(const QString &packageRoot);		static QStringList listInstalled(const QString &packageRoot);
	/**		/**
	* Returns a list of all paths of installed packages in the given r oot		* Returns a list of all paths of installed packages in the given r oot
	skipping to change at line 195		skipping to change at line 218
	* @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)		Q_DISABLE_COPY(Package)
	PackagePrivate * const d;		PackagePrivate * const d;
			friend class Applet;
			friend class AppletPrivate;
	};		};
	} // Namespace		} // Namespace
	#endif		#endif
End of changes. 5 change blocks.
	1 lines changed or deleted		29 lines changed or added

	packagemetadata.h		packagemetadata.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_PACKAGEMETADATA_H		#ifndef PLASMA_PACKAGEMETADATA_H
	#define PLASMA_PACKAGEMETADATA_H		#define PLASMA_PACKAGEMETADATA_H
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			#include <kurl.h>
	namespace Plasma		namespace Plasma
	{		{
	class PackageMetadataPrivate;		class PackageMetadataPrivate;
	/**		/**
	* @class PackageMetadata plasma/packagemetadata.h <Plasma/PackageMetadata>		* @class PackageMetadata plasma/packagemetadata.h <Plasma/PackageMetadata>
	*		*
	* @short Provides metadata for a Package.		* @short Provides metadata for a Package.
	**/		**/
	skipping to change at line 54		skipping to change at line 56
	**/		**/
	explicit PackageMetadata(const QString &path = QString());		explicit PackageMetadata(const QString &path = QString());
	/**		/**
	* Copy constructor		* Copy constructor
	**/		**/
	PackageMetadata(const PackageMetadata &other);		PackageMetadata(const PackageMetadata &other);
	~PackageMetadata();		~PackageMetadata();
			PackageMetadata &operator=(const PackageMetadata &other);
	bool isValid() const;		bool isValid() const;
	/**		/**
	* Writes out the metadata to filename, which should be a .desktop		* Writes out the metadata to filename, which should be a .desktop
	* file. It writes out the information in a format that is compatible		* file. It writes out the information in a format that is compatible
	* with KPluginInfo		* with KPluginInfo
	* @see KPluginInfo		* @see KPluginInfo
	*		*
	* @arg filename path to the file to write to		* @arg filename path to the file to write to
	**/		**/
	skipping to change at line 90		skipping to change at line 94
	QString author() const;		QString author() const;
	QString email() const;		QString email() const;
	QString version() const;		QString version() const;
	QString website() const;		QString website() const;
	QString license() const;		QString license() const;
	QString application() const;		QString application() const;
	QString category() const;		QString category() const;
	QString requiredVersion() const;		QString requiredVersion() const;
	QString pluginName() const;		QString pluginName() const;
	QString implementationApi() const;		QString implementationApi() const;
			KUrl remoteLocation() const;
	QString type() const;		QString type() const;
	/**		/**
	* Set the name of the package used to displayed		* Set the name of the package used to displayed
	* a short describing name.		* a short describing name.
	*/		*/
	void setName(const QString &);		void setName(const QString &);
	/**		/**
	skipping to change at line 165		skipping to change at line 170
	*/		*/
	void setCategory(const QString &);		void setCategory(const QString &);
	/**		/**
	* Set the required version. See also the setVersion()		* Set the required version. See also the setVersion()
	* method.		* method.
	*/		*/
	void setRequiredVersion(const QString &);		void setRequiredVersion(const QString &);
	/**		/**
			* Set the url where this package is hosted.
			*/
			void setRemoteLocation(const KUrl &);
			/**
	* Set the type of the package. If not defined this		* Set the type of the package. If not defined this
	* defaults to "Service" in the desktop file.		* defaults to "Service" in the desktop file.
	*/		*/
	void setType(const QString &type);		void setType(const QString &type);
	/**		/**
	* Set the plugin name of the package.		* Set the plugin name of the package.
	*		*
	* The plugin name is used to locate the package;		* The plugin name is used to locate the package;
	* @code		* @code
End of changes. 4 change blocks.
	0 lines changed or deleted		10 lines changed or added

	paintutils.h		paintutils.h
	skipping to change at line 64		skipping to change at line 64
	QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),		QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),
	QPoint offset = QPoint(1,1),		QPoint offset = QPoint(1,1),
	int radius = 2);		int radius = 2);
	PLASMA_EXPORT QPixmap shadowText(QString text,		PLASMA_EXPORT QPixmap shadowText(QString text,
	QColor textColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme:: TextColor),		QColor textColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme:: TextColor),
	QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),		QColor shadowColor = Plasma::Theme::defaultTheme()->color(Plasma::Theme ::BackgroundColor),
	QPoint offset = QPoint(1,1),		QPoint offset = QPoint(1,1),
	int radius = 2);		int radius = 2);
			PLASMA_EXPORT void drawHalo(QPainter *painter, const QRectF &rect);
	/**		/**
	* Returns a nicely rounded rectanglular path for painting.		* Returns a nicely rounded rectanglular path for painting.
	*/		*/
	PLASMA_EXPORT QPainterPath roundedRectangle(const QRectF &rect, qreal radiu s);		PLASMA_EXPORT QPainterPath roundedRectangle(const QRectF &rect, qreal radiu s);
	/**		/**
	* Blends a pixmap into another		* Blends a pixmap into another
	*/		*/
	PLASMA_EXPORT QPixmap transition(const QPixmap &from, const QPixmap &to, qr eal amount);		PLASMA_EXPORT QPixmap transition(const QPixmap &from, const QPixmap &to, qr eal amount);
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	plasma.h		plasma.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef PLASMA_DEFS_H		#ifndef PLASMA_DEFS_H
	#define PLASMA_DEFS_H		#define PLASMA_DEFS_H
	/** @header plasma/plasma.h <Plasma/Plasma> */		/** @header plasma/plasma.h <Plasma/Plasma> */
	#include <QtGui/QGraphicsItem>		#include <QtGui/QGraphicsItem>
	#include <QtGui/QPainterPath>		#include <QtGui/QPainterPath>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			class QAction;
	class QGraphicsView;		class QGraphicsView;
	/**		/**
	* Namespace for everything in libplasma		* Namespace for everything in libplasma
	*/		*/
	namespace Plasma		namespace Plasma
	{		{
	/**		/**
	* The Constraint enumeration lists the various constraints that Plasma		* The Constraint enumeration lists the various constraints that Plasma
	skipping to change at line 59		skipping to change at line 60
	/** Which screen an object is on */		/** Which screen an object is on */
	ScreenConstraint = 4,		ScreenConstraint = 4,
	/** the size of the applet was changed */		/** the size of the applet was changed */
	SizeConstraint = 8,		SizeConstraint = 8,
	/** the immutability (locked) nature of the applet changed */		/** the immutability (locked) nature of the applet changed */
	ImmutableConstraint = 16,		ImmutableConstraint = 16,
	/** application startup has completed */		/** application startup has completed */
	StartupCompletedConstraint = 32,		StartupCompletedConstraint = 32,
	/** the desktop context has changed */		/** the desktop context has changed */
	ContextConstraint = 64,		ContextConstraint = 64,
			/** the position of the popup needs to be recalculated*/
			PopupConstraint = 128,
	AllConstraints = FormFactorConstraint | LocationConstraint | ScreenCons traint |		AllConstraints = FormFactorConstraint | LocationConstraint | ScreenCons traint |
	SizeConstraint | ImmutableConstraint | ContextConstraint		SizeConstraint | ImmutableConstraint | ContextConstraint | PopupConstra int
	};		};
	Q_DECLARE_FLAGS(Constraints, Constraint)		Q_DECLARE_FLAGS(Constraints, Constraint)
	/**		/**
	* The FormFactor enumeration describes how a Plasma::Applet should arrange		* The FormFactor enumeration describes how a Plasma::Applet should arrange
	* itself. The value is derived from the container managing the Applet		* itself. The value is derived from the container managing the Applet
	* (e.g. in Plasma, a Corona on the desktop or on a panel).		* (e.g. in Plasma, a Corona on the desktop or on a panel).
	**/		**/
	enum FormFactor {		enum FormFactor {
	Planar = 0, /**< The applet lives in a plane and has two		Planar = 0, /**< The applet lives in a plane and has two
	skipping to change at line 233		skipping to change at line 236
	/**		/**
	* The ComonentType enumeration refers to the various types of components,		* The ComonentType enumeration refers to the various types of components,
	* or plugins, supported by plasma.		* or plugins, supported by plasma.
	*/		*/
	enum ComponentType {		enum ComponentType {
	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 **/
	};		};
	Q_DECLARE_FLAGS(ComponentTypes, ComponentType)		Q_DECLARE_FLAGS(ComponentTypes, ComponentType)
	enum MarginEdge {		enum MarginEdge {
	TopMargin = 0,		TopMargin = 0,
	BottomMargin,		BottomMargin,
	LeftMargin,		LeftMargin,
	RightMargin		RightMargin
	};		};
	enum MessageButton {		enum MessageButton {
	ButtonNone = 0,		ButtonNone = 0,
	ButtonOk = 1,		ButtonOk = 1,
	ButtonYes = 2,		ButtonYes = 2,
	ButtonNo = 4,		ButtonNo = 4,
	ButtonCancel = 8		ButtonCancel = 8
	};		};
	Q_DECLARE_FLAGS(MessageButtons, MessageButton)		Q_DECLARE_FLAGS(MessageButtons, MessageButton)
	/**		/**
			* Status of an applet
			* @since 4.3
			*/
			enum ItemStatus {
			UnknownStatus = 0,
			PassiveStatus = 1,
			ActiveStatus = 2,
			NeedsAttentionStatus = 3,
			AcceptingInputStatus = 4
			};
			Q_ENUMS(ItemStatus)
			enum AnnouncementMethod {
			NoAnnouncement = 0,
			ZeroconfAnnouncement = 1
			};
			Q_DECLARE_FLAGS(AnnouncementMethods, AnnouncementMethod)
			enum TrustLevel {
			InvalidCredentials = 0,
			UnknownCredentials = 1,
			ValidCredentials = 2,
			TrustedCredentials = 3,
			UltimateCredentials = 4
			};
			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
	* location or to point arrows and other directional items.		* location or to point arrows and other directional items.
	*		*
	* @param location the location of the container the element will appear in		* @param location the location of the container the element will appear in
	* @return the visual direction the element should be oriented in		* @return the visual direction the element should be oriented in
	skipping to change at line 284		skipping to change at line 316
	PLASMA_EXPORT Direction locationToInverseDirection(Location location);		PLASMA_EXPORT Direction locationToInverseDirection(Location location);
	/**		/**
	* Returns the most appropriate QGraphicsView for the item.		* Returns the most appropriate QGraphicsView for the item.
	*		*
	* @arg item the QGraphicsItem to locate a view for		* @arg item the QGraphicsItem to locate a view for
	* @return pointer to a view, or 0 if none was found		* @return pointer to a view, or 0 if none was found
	*/		*/
	PLASMA_EXPORT QGraphicsView *viewFor(const QGraphicsItem *item);		PLASMA_EXPORT QGraphicsView *viewFor(const QGraphicsItem *item);
			/**
			* Returns a list of all actions in the given QMenu
			* This method flattens the hierarchy of the menu by prefixing the
			* text of all actions in a submenu with the submenu title.
			*
			* @param menu the QMenu storing the actions
			* @param prefix text to display before the text of all actions in the menu
			* @param parent QObject to be passed as parent of all the actions in the l
			ist
			*
			* @since 4.4
			*/
			PLASMA_EXPORT QList<QAction*> actionsFromMenu(QMenu *menu,
			const QString &prefix = QStri
			ng(),
			QObject *parent = 0);
	} // Plasma namespace		} // Plasma namespace
	Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::Constraints)		Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::Constraints)
	Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::Flip)		Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::Flip)
	Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::ComponentTypes)		Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::ComponentTypes)
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 6 change blocks.
	2 lines changed or deleted		51 lines changed or added

	pluginpage.h		pluginpage.h
	skipping to change at line 37		skipping to change at line 37
	namespace KSettings		namespace KSettings
	{		{
	class PluginPagePrivate;		class PluginPagePrivate;
	/**		/**
	* @short Convenience KCModule for creating a plugins config page.		* @short Convenience KCModule for creating a plugins config page.
	*		*
	* This class makes it very easy to create a plugins configuration page to your		* This class makes it very easy to create a plugins configuration page to your
	* program. All you need to do is create a class that is derived from		* program. All you need to do is create a class that is derived from
	* PluginPage and add the appropriate plugin infos to the KPluginSelector.		* PluginPage and add the appropriate plugin information to the KPluginSele ctor.
	* This is done using the pluginSelector() method:		* This is done using the pluginSelector() method:
	* \code		* \code
	* typedef KGenericFactory<MyAppPluginConfig, QWidget> MyAppPluginConfigFac tory;		* typedef KGenericFactory<MyAppPluginConfig, QWidget> MyAppPluginConfigFac tory;
	* K_EXPORT_COMPONENT_FACTORY( kcm_myapppluginconfig, MyAppPluginConfigFact ory( "kcm_myapppluginconfig" ) );		* K_EXPORT_COMPONENT_FACTORY( kcm_myapppluginconfig, MyAppPluginConfigFact ory( "kcm_myapppluginconfig" ) );
	*		*
	* MyAppPluginConfig( QWidget * parent, const QStringList & args )		* MyAppPluginConfig( QWidget * parent, const QStringList & args )
	* : PluginPage( MyAppPluginConfigFactory::componentData(), parent, arg s )		* : PluginPage( MyAppPluginConfigFactory::componentData(), parent, arg s )
	* {		* {
	* pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "General Plugins" ), "General" );		* pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "General Plugins" ), "General" );
	* pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "Effects" ), "Effects" );		* pluginSelector()->addPlugins( KGlobal::mainComponent().componentName (), i18n( "Effects" ), "Effects" );
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	popupapplet.h		popupapplet.h
	skipping to change at line 25		skipping to change at line 25
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor,		* Foundation, Inc., 51 Franklin St, Fifth Floor,
	* Boston, MA 02110-1301 USA		* Boston, MA 02110-1301 USA
	*/		*/
	#ifndef PLASMA_POPUPAPPLET_H		#ifndef PLASMA_POPUPAPPLET_H
	#define PLASMA_POPUPAPPLET_H		#define PLASMA_POPUPAPPLET_H
	#include <plasma/applet.h>		#include <plasma/applet.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			#include <plasma/plasma.h>
	class QGraphicsProxyWidget;		class QGraphicsProxyWidget;
	class QGraphicsLinearLayout;		class QGraphicsLinearLayout;
	namespace Plasma		namespace Plasma
	{		{
	class Dialog;		class Dialog;
	class IconWidget;		class IconWidget;
	class PopupAppletPrivate;		class PopupAppletPrivate;
	skipping to change at line 60		skipping to change at line 61
	class PLASMA_EXPORT PopupApplet : public Plasma::Applet		class PLASMA_EXPORT PopupApplet : public Plasma::Applet
	{		{
	Q_OBJECT		Q_OBJECT
	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
			* will provide an interface for when the PopupApplet is not
			showing
			* the widget() or graphicsWidget() directly.
	*/		*/
	void setPopupIcon(const QIcon &icon);		void setPopupIcon(const QIcon &icon);
	/**		/**
	* @arg icon the icon that has to be displayed when the applet is in a panel.		* @arg icon the icon that has to be displayed when the applet is in a panel.
			* Passing in an empty QString() means that the popup applet
			itself
			* will provide an interface for when the PopupApplet is not
			showing
			* the widget() or graphicsWidget() directly.
	*/		*/
	void setPopupIcon(const QString &iconName);		void setPopupIcon(const QString &iconName);
	/**		/**
	* @return the icon that is displayed when the applet is in a panel.		* @return the icon that is displayed when the applet is in a panel.
	*/		*/
	QIcon popupIcon() const;		QIcon popupIcon() const;
	/**		/**
	* Implement either this function or graphicsWidget().		* Implement either this function or graphicsWidget().
	skipping to change at line 148		skipping to change at line 155
	virtual void popupEvent(bool show);		virtual void popupEvent(bool show);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	bool eventFilter(QObject *watched, QEvent *event);		bool eventFilter(QObject *watched, QEvent *event);
	void dragEnterEvent(QGraphicsSceneDragDropEvent *event);		void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
	void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);		void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
	void dropEvent(QGraphicsSceneDragDropEvent *event);		void dropEvent(QGraphicsSceneDragDropEvent *event);
	private:		private:
			/**
			* @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 args a list of strings containing two entries: the service id
			* and the applet id
			* @since 4.3
			*/
			PopupApplet(const QString &packagePath, uint appletId, const QVariantLi
			st &args);
	Q_PRIVATE_SLOT(d, void internalTogglePopup())		Q_PRIVATE_SLOT(d, void internalTogglePopup())
	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())
	friend class Applet;		friend class Applet;
			friend class AppletPrivate;
	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. 5 change blocks.
	0 lines changed or deleted		23 lines changed or added

	predicate.h		predicate.h
	skipping to change at line 56		skipping to change at line 56
	public:		public:
	/**		/**
	* The comparison operator which can be used for matching within th e predicate.		* The comparison operator which can be used for matching within th e predicate.
	*		*
	* - Equals, the property and the value will match for strict equal ity		* - Equals, the property and the value will match for strict equal ity
	* - Mask, the property and the value will match if the bitmasking is not null		* - Mask, the property and the value will match if the bitmasking is not null
	*/		*/
	enum ComparisonOperator { Equals, Mask };		enum ComparisonOperator { Equals, Mask };
	/**		/**
			* The predicate type which controls how the predicate is handled
			*
			* - PropertyCheck, the predicate contains a comparison that needs
			to be matched using a ComparisonOperator
			* - Conjunction, the two contained predicates need to be true for
			this predicate to be true
			* - Disjunction, either of the two contained predicates may be tru
			e for this predicate to be true
			* - InterfaceCheck, the device type is compared
			*/
			enum Type { PropertyCheck, Conjunction, Disjunction, InterfaceCheck
			};
			/**
	* Constructs an invalid predicate.		* Constructs an invalid predicate.
	*/		*/
	Predicate();		Predicate();
	/**		/**
	* Copy constructor.		* Copy constructor.
	*		*
	* @param other the predicate to copy		* @param other the predicate to copy
	*/		*/
	Predicate(const Predicate &other);		Predicate(const Predicate &other);
	skipping to change at line 192		skipping to change at line 202
	/**		/**
	* Converts a string to a predicate.		* Converts a string to a predicate.
	*		*
	* @param predicate the string to convert		* @param predicate the string to convert
	* @return a new valid predicate if the given string is syntactical ly		* @return a new valid predicate if the given string is syntactical ly
	* correct, Predicate() otherwise		* correct, Predicate() otherwise
	*/		*/
	static Predicate fromString(const QString &predicate);		static Predicate fromString(const QString &predicate);
			/**
			* Retrieves the predicate type, used to determine how to handle the
			predicate
			*
			* @since 4.4
			* @return the predicate type
			*/
			Type type() const;
			/**
			* Retrieves the interface type.
			*
			* @note This is only valid for InterfaceCheck and PropertyCheck ty
			pes
			* @since 4.4
			* @return a device interface type used by the predicate
			*/
			DeviceInterface::Type interfaceType() const;
			/**
			* Retrieves the property name used when retrieving the value to co
			mpare against
			*
			* @note This is only valid for the PropertyCheck type
			* @since 4.4
			* @return a property name
			*/
			QString propertyName() const;
			/**
			* Retrieves the value used when comparing a devices property to se
			e if it matches the predicate
			*
			* @note This is only valid for the PropertyCheck type
			* @since 4.4
			* @return the value used
			*/
			QVariant matchingValue() const;
			/**
			* Retrieves the comparison operator used to compare a property's v
			alue
			*
			* @since 4.4
			* @note This is only valid for Conjunction and Disjunction types
			* @return the comparison operator used
			*/
			ComparisonOperator comparisonOperator() const;
			/**
			* A smaller, inner predicate which is the first to appear and is c
			ompared with the second one
			*
			* @since 4.4
			* @note This is only valid for Conjunction and Disjunction types
			* @return The predicate used for the first operand
			*/
			Predicate firstOperand() const;
			/**
			* A smaller, inner predicate which is the second to appear and is
			compared with the first one
			*
			* @since 4.4
			* @note This is only valid for Conjunction and Disjunction types
			* @return The predicate used for the second operand
			*/
			Predicate secondOperand() const;
	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		83 lines changed or added

	property.h		property.h
	skipping to change at line 95		skipping to change at line 95
	/**		/**
	* Each property can have multiple parent properties.		* Each property can have multiple parent properties.
	* \return A list of all parent properties of this property.		* \return A list of all parent properties of this property.
	* If the list is emppty it means that the property has no dire ct		* If the list is emppty it means that the property has no dire ct
	* parents, i.e. it is derived from rdf:Resource.		* parents, i.e. it is derived from rdf:Resource.
	*/		*/
	QList<Property> parentProperties();		QList<Property> parentProperties();
	/**		/**
			* Each property can have multiple parent properties.
			* \return A list of all parent properties of this property.
			* If the list is emppty it means that the property has no dire
			ct
			* parents, i.e. it is derived from rdf:Resource.
			*
			* Const version
			*
			* \since 4.4
			*/
			QList<Property> parentProperties() const;
			/**
	* \return A list of all properties that have this property as a parent.		* \return A list of all properties that have this property as a parent.
	* Be aware that this list can never be final since other ontol ogies		* Be aware that this list can never be final since other ontol ogies
	* that have not been loaded yet may contain properties that ar e derived		* that have not been loaded yet may contain properties that ar e derived
	* from this property.		* from this property.
	*/		*/
	QList<Property> subProperties();		QList<Property> subProperties();
	/**		/**
			* \return A list of all properties that have this property as
			a parent.
			* Be aware that this list can never be final since other ontol
			ogies
			* that have not been loaded yet may contain properties that ar
			e derived
			* from this property.
			*
			* Const version
			*
			* \since 4.4
			*/
			QList<Property> subProperties() const;
			/**
	* The inverse property (nrl:inverseProperty).		* The inverse property (nrl:inverseProperty).
	* \return A Property instance representing the inverse propert y of this one		* \return A Property instance representing the inverse propert y of this one
	* or 0 if none was specified in the ontology.		* or 0 if none was specified in the ontology.
	*/		*/
	Property inverseProperty();		Property inverseProperty();
	/**		/**
			* The inverse property (nrl:inverseProperty).
			* \return A Property instance representing the inverse propert
			y of this one
			* or 0 if none was specified in the ontology.
			*
			* Const version
			*
			* \since 4.4
			*/
			Property inverseProperty() const;
			/**
	* The range of the property.		* The range of the property.
	* \return The range of the property or an invalid Class in cas e		* \return The range of the property or an invalid Class in cas e
	* the range of this poperty is a literal.		* the range of this poperty is a literal.
	* \sa literalRange		* \sa literalRange
	*/		*/
	Class range();		Class range();
	/**		/**
			* The range of the property.
			* \return The range of the property or an invalid Class in cas
			e
			* the range of this poperty is a literal.
			* \sa literalRange
			*
			* Const version
			*
			* \since 4.4
			*/
			Class range() const;
			/**
	* If the rage of this property is a literal (i.e. range return s an invalid Class)		* If the rage of this property is a literal (i.e. range return s an invalid Class)
	* this method provides the literal type.		* this method provides the literal type.
	*		*
	* \returns the literal type of this property or an empty, inva lid Literal		* \returns the literal type of this property or an empty, inva lid Literal
	* if the range is a Class.		* if the range is a Class.
	*		*
	* \sa range		* \sa range
	*/		*/
	Literal literalRangeType();		Literal literalRangeType();
	/**		/**
			* If the rage of this property is a literal (i.e. range return
			s an invalid Class)
			* this method provides the literal type.
			*
			* \returns the literal type of this property or an empty, inva
			lid Literal
			* if the range is a Class.
			*
			* \sa range
			*
			* Const version
			*
			* \since 4.4
			*/
			Literal literalRangeType() const;
			/**
	* The domain of the property.		* The domain of the property.
	*/		*/
	Class domain();		Class domain();
	/**		/**
			* The domain of the property.
			*
			* Const version
			*
			* \since 4.4
			*/
			Class domain() const;
			/**
	* The cardinality of this property as specified by nrl:cardina lity.		* The cardinality of this property as specified by nrl:cardina lity.
	*		*
	* \return the cardinality of the property or -1 if none was se t.		* \return the cardinality of the property or -1 if none was se t.
	*/		*/
	int cardinality();		int cardinality();
	/**		/**
			* The cardinality of this property as specified by nrl:cardina
			lity.
			*
			* \return the cardinality of the property or -1 if none was se
			t.
			*
			* Const version
			*
			* \since 4.4
			*/
			int cardinality() const;
			/**
	* The minimum cardinality of this property as specified by nrl :minCardinality.		* The minimum cardinality of this property as specified by nrl :minCardinality.
	*		*
	* \return the minimum cardinality of the property or -1 if non e was set.		* \return the minimum cardinality of the property or -1 if non e was set.
	*/		*/
	int minCardinality();		int minCardinality();
	/**		/**
			* The minimum cardinality of this property as specified by nrl
			:minCardinality.
			*
			* \return the minimum cardinality of the property or -1 if non
			e was set.
			*
			* Const version
			*
			* \since 4.4
			*/
			int minCardinality() const;
			/**
	* The maximum cardinality of this property as specified by nrl :maxCardinality.		* The maximum cardinality of this property as specified by nrl :maxCardinality.
	*		*
	* \return the maximum cardinality of the property or -1 if non e was set.		* \return the maximum cardinality of the property or -1 if non e was set.
	*/		*/
	int maxCardinality();		int maxCardinality();
	/**		/**
			* The maximum cardinality of this property as specified by nrl
			:maxCardinality.
			*
			* \return the maximum cardinality of the property or -1 if non
			e was set.
			*
			* Const version
			*
			* \since 4.4
			*/
			int maxCardinality() const;
			/**
	* Check if a property inherits this property. This is a recurs ive method which		* Check if a property inherits this property. This is a recurs ive method which
	* does not only check direct child propertyes.		* does not only check direct child propertyes.
	*		*
	* \return true if other is derived from this property, false o therwise.		* \return true if other is derived from this property, false o therwise.
	*/		*/
	bool isParentOf( const Property& other );		bool isParentOf( const Property& other );
	/**		/**
			* Check if a property inherits this property. This is a recurs
			ive method which
			* does not only check direct child propertyes.
			*
			* \return true if other is derived from this property, false o
			therwise.
			*
			* Const version
			*
			* \since 4.4
			*/
			bool isParentOf( const Property& other ) const;
			/**
	* Check if this property is derived from another property. Thi s is a recursive method which		* Check if this property is derived from another property. Thi s is a recursive method which
	* does not only check direct child propertyes.		* does not only check direct child propertyes.
	*		*
	* \return true if this property is derived from other, false o therwise.		* \return true if this property is derived from other, false o therwise.
	*/		*/
	bool isSubPropertyOf( const Property& other );		bool isSubPropertyOf( const Property& other );
			/**
			* Check if this property is derived from another property. Thi
			s is a recursive method which
			* does not only check direct child propertyes.
			*
			* \return true if this property is derived from other, false o
			therwise.
			*
			* Const version
			*
			* \since 4.4
			*/
			bool isSubPropertyOf( const Property& other ) const;
	};		};
	}		}
	}		}
	#ifndef DISABLE_NEPOMUK_LEGACY		#ifndef DISABLE_NEPOMUK_LEGACY
	namespace Nepomuk {		namespace Nepomuk {
	class Ontology;		class Ontology;
	class Class;		class Class;
End of changes. 11 change blocks.
	0 lines changed or deleted		146 lines changed or added

	publicservice.h		publicservice.h
	skipping to change at line 36		skipping to change at line 36
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	namespace DNSSD		namespace DNSSD
	{		{
	class PublicServicePrivate;		class PublicServicePrivate;
	/**		/**
	* @class PublicService publicservice.h DNSSD/PublicService		* @class PublicService publicservice.h DNSSD/PublicService
	* @short Represents a service to be published		* @short Represents a service to be published
	*		*
	* This class allows you to publish the existance of a network		* This class allows you to publish the existence of a network
	* service provided by your application.		* service provided by your application.
	*		*
	* If you are providing a web server and want to advertise it		* If you are providing a web server and want to advertise it
	* on the local network, you might do		* on the local network, you might do
	* @code		* @code
	* DNSSD::PublicService *service = new DNSSD::PublicService("My files", "_h ttp._tcp", 80);		* DNSSD::PublicService *service = new DNSSD::PublicService("My files", "_h ttp._tcp", 80);
	* bool isOK = service->publish();		* bool isOK = service->publish();
	* @endcode		* @endcode
	*		*
	* In this example publish() is synchronous: it will not return		* In this example publish() is synchronous: it will not return
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	pushbutton.h		pushbutton.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_PUSHBUTTON_H		#ifndef PLASMA_PUSHBUTTON_H
	#define PLASMA_PUSHBUTTON_H		#define PLASMA_PUSHBUTTON_H
	#include <QtGui/QGraphicsProxyWidget>		#include <QtGui/QGraphicsProxyWidget>
			#include <kicon.h>
	class KPushButton;		class KPushButton;
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	namespace Plasma		namespace Plasma
	{		{
	class PushButtonPrivate;		class PushButtonPrivate;
	/**		/**
	skipping to change at line 46		skipping to change at line 48
	*		*
	* @short Provides a plasma-themed KPushButton.		* @short Provides a plasma-themed KPushButton.
	*/		*/
	class PLASMA_EXPORT PushButton : public QGraphicsProxyWidget		class PLASMA_EXPORT PushButton : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText)		Q_PROPERTY(QString text READ text WRITE setText)
	Q_PROPERTY(QString image READ image WRITE setImage)		Q_PROPERTY(QString image READ image WRITE setImage)
	Q_PROPERTY(QString stylesheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KPushButton *nativeWidget READ nativeWidget)		Q_PROPERTY(KPushButton *nativeWidget READ nativeWidget)
	Q_PROPERTY(QAction *action READ action WRITE setAction)		Q_PROPERTY(QAction *action READ action WRITE setAction)
			Q_PROPERTY(QIcon icon READ icon WRITE setIcon)
			Q_PROPERTY(bool checkable READ isCheckable WRITE setCheckable)
			Q_PROPERTY(bool checked READ isChecked WRITE setChecked)
			Q_PROPERTY(bool down READ isDown)
	public:		public:
	explicit PushButton(QGraphicsWidget *parent = 0);		explicit PushButton(QGraphicsWidget *parent = 0);
	~PushButton();		~PushButton();
	/**		/**
	* Sets the display text for this PushButton		* Sets the display text for this PushButton
	*		*
	* @arg text the text to display; should be translated.		* @arg text the text to display; should be translated.
	*/		*/
	skipping to change at line 74		skipping to change at line 80
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
			* Sets the path to an svg image to display and the id of the used svg
			element, if necessary.
			*
			* @arg path the path to the image; if a relative path, then a themed i
			mage will be loaded.
			* @arg elementid the id of a svg element.
			*
			* @since 4.4
			*/
			void setImage(const QString &path, const QString &elementid);
			/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
	* Sets the stylesheet used to control the visual display of this PushB utton		* Sets the stylesheet used to control the visual display of this PushB utton
	*		*
	* @arg stylesheet a CSS string		* @arg stylesheet a CSS string
	*/		*/
	void setStyleSheet(const QString &stylesheet);		void setStyleSheet(const QString &stylesheet);
	skipping to change at line 107		skipping to change at line 123
	void setAction(QAction *action);		void setAction(QAction *action);
	/**		/**
	* @return the currently associated action, if any.		* @return the currently associated action, if any.
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	QAction *action() const;		QAction *action() const;
	/**		/**
	* sets the icon for this toolbutton		* sets the icon for this push button
	*		*
	* @arg icon the icon we want to use		* @arg icon the icon to use
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setIcon(const QIcon &icon);		void setIcon(const QIcon &icon);
	/**		/**
			* sets the icon for this push button using a KIcon
			*
			* @arg icon the icon to use
			*
			* @since 4.4
			*/
			void setIcon(const KIcon &icon);
			/**
	* @return the icon of this button		* @return the icon of this button
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	QIcon icon() const;		QIcon icon() const;
	/**		/**
	* Sets whether or not this button can be toggled on/off		* Sets whether or not this button can be toggled on/off
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setCheckable(bool checkable);		void setCheckable(bool checkable);
	/**		/**
			* @return true if the button is checkable
			* @see setCheckable
			* @since 4.4
			*/
			bool isCheckable() const;
			/**
	* Sets whether or not this button is checked. Implies setIsCheckable(t rue).		* Sets whether or not this button is checked. Implies setIsCheckable(t rue).
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setChecked(bool checked);		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
			* @since 4.4
			*/
			bool isDown() const;
			/**
	* @return the native widget wrapped by this PushButton		* @return the native widget wrapped by this PushButton
	*/		*/
	KPushButton *nativeWidget() const;		KPushButton *nativeWidget() const;
	Q_SIGNALS:		Q_SIGNALS:
			/**
			* Emitted when the button is pressed down; usually the clicked() signa
			l
			* will suffice, however.
			* @since 4.4
			*/
			void pressed();
			/**
			* Emitted when the button is released; usually the clicked() signal
			* will suffice, however.
			* @since 4.4
			*/
			void released();
			/**
			* 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
			*/
	void toggled(bool);		void toggled(bool);
	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);
			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 animationUpdate(qreal progress))		Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress))
	Q_PRIVATE_SLOT(d, void setPixmap())		Q_PRIVATE_SLOT(d, void setPixmap())
	friend class PushButtonPrivate;		friend class PushButtonPrivate;
	PushButtonPrivate *const d;		PushButtonPrivate *const d;
	};		};
End of changes. 12 change blocks.
	3 lines changed or deleted		67 lines changed or added

	querymatch.h		querymatch.h
	skipping to change at line 86		skipping to change at line 86
	*/		*/
	explicit QueryMatch(AbstractRunner *runner);		explicit QueryMatch(AbstractRunner *runner);
	/**		/**
	* Copy constructor		* Copy constructor
	*/		*/
	QueryMatch(const QueryMatch &other);		QueryMatch(const QueryMatch &other);
	~QueryMatch();		~QueryMatch();
	QueryMatch &operator=(const QueryMatch &other);		QueryMatch &operator=(const QueryMatch &other);
			bool operator==(const QueryMatch &other) const;
	bool operator<(const QueryMatch &other) const;		bool operator<(const QueryMatch &other) const;
	/**		/**
	* @return the runner associated with this action		* @return the runner associated with this action
	*/		*/
	AbstractRunner *runner() const;		AbstractRunner *runner() const;
	/**		/**
	* @return true if the match is valid and can therefore be run,		* @return true if the match is valid and can therefore be run,
	* an invalid match does not have an associated AbstractRun ner		* an invalid match does not have an associated AbstractRun ner
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	radiobutton.h		radiobutton.h
	skipping to change at line 48		skipping to change at line 48
	*/		*/
	class PLASMA_EXPORT RadioButton : public QGraphicsProxyWidget		class PLASMA_EXPORT RadioButton : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText)		Q_PROPERTY(QString text READ text WRITE setText)
	Q_PROPERTY(QString image READ image WRITE setImage)		Q_PROPERTY(QString image READ image WRITE setImage)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QRadioButton *nativeWidget READ nativeWidget)		Q_PROPERTY(QRadioButton *nativeWidget READ nativeWidget)
	Q_PROPERTY(bool isChecked READ isChecked WRITE setChecked NOTIFY toggle d)		Q_PROPERTY(bool checked READ isChecked WRITE setChecked NOTIFY toggled)
	public:		public:
	explicit RadioButton(QGraphicsWidget *parent = 0);		explicit RadioButton(QGraphicsWidget *parent = 0);
	~RadioButton();		~RadioButton();
	/**		/**
	* Sets the display text for this RadioButton		* Sets the display text for this RadioButton
	*		*
	* @arg text the text to display; should be translated.		* @arg text the text to display; should be translated.
	*/		*/
	skipping to change at line 112		skipping to change at line 112
	/**		/**
	* @return the checked state		* @return the checked state
	*/		*/
	bool isChecked() const;		bool isChecked() const;
	Q_SIGNALS:		Q_SIGNALS:
	void toggled(bool);		void toggled(bool);
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
			void changeEvent(QEvent *event);
	private:		private:
	Q_PRIVATE_SLOT(d, void setPixmap())		Q_PRIVATE_SLOT(d, void setPixmap(RadioButton *))
	RadioButtonPrivate * const d;		RadioButtonPrivate * const d;
			Q_PRIVATE_SLOT(d, void setPalette())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 4 change blocks.
	2 lines changed or deleted		4 lines changed or added

	rangefeedback.h		rangefeedback.h
	/* This file is part of the KDE project		/* This file is part of the KDE libraries
	Copyright (C) 2003-2005 Hamish Rodda <rodda@kde.org>		Copyright (C) 2009 Bernhard Beschow <bbeschow@cs.tu-berlin.de>
	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.
	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 KDELIBS_KTEXTEDITOR_RANGEFEEDBACK_H		#ifndef KDELIBS_KTEXTEDITOR_RANGEFEEDBACK_H
	#define KDELIBS_KTEXTEDITOR_RANGEFEEDBACK_H		#define KDELIBS_KTEXTEDITOR_RANGEFEEDBACK_H
	#include <ktexteditor/ktexteditor_export.h>		#include "smartrangenotifier.h"
	#include <QtCore/QObject>		#include "smartrangewatcher.h"
	#include <ktexteditor/attribute.h>
	// TODO: Should SmartRangeWatcher become a base class for SmartRangeNotifie
	r?
	namespace KTextEditor
	{
	class SmartRange;
	class View;
	/**
	* \short A class which provides notifications of state changes to a SmartR
	ange via QObject signals.
	*
	* \ingroup kte_group_smart_classes
	*
	* This class provides notifications of changes to the position or contents
	of
	* a SmartRange via QObject signals.
	*
	* If you prefer to receive notifications via virtual inheritance, see Smar
	tRangeWatcher.
	*
	* \sa SmartRange, SmartRangeWatcher
	*
	* \author Hamish Rodda \<rodda@kde.org\>
	*/
	class KTEXTEDITOR_EXPORT SmartRangeNotifier : public QObject
	{
	Q_OBJECT
	friend class SmartRange;
	public:
	/**
	* Default constructor.
	*/
	SmartRangeNotifier();
	/**
	* Returns whether this notifier will notify of changes that happen
	* directly to the range, e.g. by calls to SmartCursor::setRange(), or
	by
	* direct assignment to either of the start() or end() cursors, rather
	* than just when surrounding text changes.
	*/
	bool wantsDirectChanges() const;
	/**
	* Set whether this notifier should notify of changes that happen
	* directly to the range, e.g. by calls to SmartCursor::setRange(), or
	by
	* direct assignment to either of the start() or end() cursors, rather
	* than just when surrounding text changes.
	*
	* \param wantsDirectChanges whether this watcher should provide notifi
	cations for direct changes.
	*/
	void setWantsDirectChanges(bool wantsDirectChanges);
	Q_SIGNALS:
	/**
	* The range's position changed.
	*
	* \param range pointer to the range which generated the notification.
	*/
	void rangePositionChanged(KTextEditor::SmartRange* range);
	/**
	* The contents of the range changed.
	*
	* \param range pointer to the range which generated the notification.
	*/
	void rangeContentsChanged(KTextEditor::SmartRange* range);
	/**
	* The contents of the range changed.
	*
	* \warning This notification is special in that it is only emitted by
	* the top range of a heirachy, and also gives the furthest descendant
	child range which still
	* encompasses the whole change (see \p contents).
	*
	* \param range pointer to the range which generated the notification.
	* \param mostSpecificChild the child range which both contains the ent
	ire change and is
	* the furthest descendant of this range.
	*/
	void rangeContentsChanged(KTextEditor::SmartRange* range, KTextEditor::
	SmartRange* mostSpecificChild);
	/**
	* The mouse cursor on \a view entered \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	void mouseEnteredRange(KTextEditor::SmartRange* range, KTextEditor::Vie
	w* view);
	/**
	* The mouse cursor on \a view exited \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	void mouseExitedRange(KTextEditor::SmartRange* range, KTextEditor::View
	* view);
	/**
	* The caret on \a view entered \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	void caretEnteredRange(KTextEditor::SmartRange* range, KTextEditor::Vie
	w* view);
	/**
	* The caret on \a view exited \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	void caretExitedRange(KTextEditor::SmartRange* range, KTextEditor::View
	* view);
	/**
	* The range now contains no characters (ie. the start and end cursors
	are the same).
	*
	* \param range pointer to the range which generated the notification.
	*/
	void rangeEliminated(KTextEditor::SmartRange* range);
	/**
	* The SmartRange instance specified by \p range is being deleted.
	*
	* \param range pointer to the range which is about to be deleted. It
	is
	* still safe to access information at this point.
	*/
	void rangeDeleted(KTextEditor::SmartRange* range);
	/**
	* The range's parent was changed.
	*
	* \param range pointer to the range which generated the notification.
	* \param newParent pointer to the range which was is now the parent ra
	nge.
	* \param oldParent pointer to the range which used to be the parent ra
	nge.
	*/
	void parentRangeChanged(KTextEditor::SmartRange* range, KTextEditor::Sm
	artRange* newParent, KTextEditor::SmartRange* oldParent);
	/**
	* The range \a child was inserted as a child range into the current \a
	range.
	*
	* \param range pointer to the range which generated the notification.
	* \param child pointer to the range which was inserted as a child rang
	e.
	*/
	void childRangeInserted(KTextEditor::SmartRange* range, KTextEditor::Sm
	artRange* child);
	/**
	* The child range \a child was removed from the current \a range.
	*
	* \param range pointer to the range which generated the notification.
	* \param child pointer to the child range which was removed.
	*/
	void childRangeRemoved(KTextEditor::SmartRange* range, KTextEditor::Sma
	rtRange* child);
	/**
	* The highlighting attribute of \a range was changed from \a previousA
	ttribute to
	* \a currentAttribute.
	*
	* \param range pointer to the range which generated the notification.
	* \param currentAttribute the attribute newly assigned to this range
	* \param previousAttribute the attribute previously assigned to this r
	ange
	*/
	void rangeAttributeChanged(KTextEditor::SmartRange* range, KTextEditor:
	:Attribute::Ptr currentAttribute, KTextEditor::Attribute::Ptr previousAttri
	bute);
	private:
	bool m_wantDirectChanges;
	};
	/**
	* \short A class which provides notifications of state changes to a SmartR
	ange via virtual inheritance.
	*
	* \ingroup kte_group_smart_classes
	*
	* This class provides notifications of changes to the position or contents
	of
	* a SmartRange via virtual inheritance.
	*
	* If you prefer to receive notifications via QObject signals, see SmartRan
	geNotifier.
	*
	* Before destruction, you must unregister the watcher from any ranges it i
	s watching.
	*
	* \sa SmartRange, SmartRangeNotifier
	*
	* \author Hamish Rodda \<rodda@kde.org\>
	*/
	class KTEXTEDITOR_EXPORT SmartRangeWatcher
	{
	public:
	/**
	* Default constructor
	*/
	SmartRangeWatcher();
	/**
	* Virtual destructor
	*/
	virtual ~SmartRangeWatcher();
	/**
	* Returns whether this watcher will be notified of changes that happen
	* directly to the range, e.g. by calls to SmartCursor::setRange(), or
	by
	* direct assignment to either of the start() or end() cursors, rather
	* than just when surrounding text changes.
	*/
	bool wantsDirectChanges() const;
	/**
	* Set whether this watcher should be notified of changes that happen
	* directly to the range, e.g. by calls to SmartCursor::setRange(), or
	by
	* direct assignment to either of the start() or end() cursors, rather
	* than just when surrounding text changes.
	*
	* \param wantsDirectChanges whether this watcher should receive notifi
	cations for direct changes.
	*/
	void setWantsDirectChanges(bool wantsDirectChanges);
	/**
	* The range's position changed.
	*
	* \param range pointer to the range which generated the notification.
	*/
	virtual void rangePositionChanged(SmartRange* range);
	/**
	* The contents of the range changed.
	*
	* \param range pointer to the range which generated the notification.
	*/
	virtual void rangeContentsChanged(SmartRange* range);
	/**
	* The contents of the range changed. This notification is special in
	that it is only emitted by
	* the top range of a heirachy, and also gives the furthest descendant
	child range which still
	* encompasses the whole change (see \p contents).
	*
	* \param range the range which has changed
	* \param mostSpecificChild the child range which both contains the ent
	ire change and is
	* the furthest descendant of this range.
	*/
	virtual void rangeContentsChanged(SmartRange* range, SmartRange* mostSp
	ecificChild);
	/**
	* The mouse cursor on \a view entered \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	virtual void mouseEnteredRange(SmartRange* range, View* view);
	/**
	* The mouse cursor on \a view exited \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	virtual void mouseExitedRange(SmartRange* range, View* view);
	/**
	* The caret on \a view entered \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	virtual void caretEnteredRange(SmartRange* range, View* view);
	/**
	* The caret on \a view exited \p range.
	*
	* \todo For now, to receive this notification, the range heirachy must
	be registered with
	* the SmartInterface as for arbitrary highlighting with dynamic highli
	ghting.
	* Need to add another (and probably simplify existing) method.
	*
	* \param range pointer to the range which generated the notification.
	* \param view view over which the mouse moved to generate the notifica
	tion
	*/
	virtual void caretExitedRange(SmartRange* range, View* view);
	/**
	* The range now contains no characters (ie. the start and end cursors
	are the same).
	*
	* \param range pointer to the range which generated the notification.
	*/
	virtual void rangeEliminated(SmartRange* range);
	/**
	* The SmartRange instance specified by \p range is being deleted.
	*
	* \param range pointer to the range which is about to be deleted. It
	is
	* still safe to access information at this point.
	*/
	virtual void rangeDeleted(SmartRange* range);
	/**
	* The range's parent was changed.
	*
	* \param range pointer to the range which generated the notification.
	* \param newParent pointer to the range which was is now the parent ra
	nge.
	* \param oldParent pointer to the range which used to be the parent ra
	nge.
	*/
	virtual void parentRangeChanged(SmartRange* range, SmartRange* newParen
	t, SmartRange* oldParent);
	/**
	* The range \a child was inserted as a child range into the current \a
	range.
	*
	* \param range pointer to the range which generated the notification.
	* \param child pointer to the range which was inserted as a child rang
	e.
	*/
	virtual void childRangeInserted(SmartRange* range, SmartRange* child);
	/**
	* The child range \a child was removed from the current \a range.
	*
	* \param range pointer to the range which generated the notification.
	* \param child pointer to the child range which was removed.
	*/
	virtual void childRangeRemoved(SmartRange* range, SmartRange* child);
	/**
	* The highlighting attribute of \a range was changed from \a previousA
	ttribute to
	* \a currentAttribute.
	*
	* \param range pointer to the range which generated the notification.
	* \param currentAttribute the attribute newly assigned to this range
	* \param previousAttribute the attribute previously assigned to this r
	ange
	*/
	virtual void rangeAttributeChanged(SmartRange* range, Attribute::Ptr cu
	rrentAttribute, Attribute::Ptr previousAttribute);
	private:
	bool m_wantDirectChanges;
	};
	}
	#endif
	// kate: space-indent on; indent-width 2; replace-tabs on;		#endif // KDELIBS_KTEXTEDITOR_RANGEFEEDBACK_H
End of changes. 3 change blocks.
	436 lines changed or deleted		4 lines changed or added

	resource.h		resource.h
	skipping to change at line 68		skipping to change at line 68
	* correlates directly with the URI in the local NEPOMUK RDF storage.		* correlates directly with the URI in the local NEPOMUK RDF storage.
	*		*
	* Resource objects with the same URI share their data.		* Resource objects with the same URI share their data.
	*		*
	* All methods in Resource are thread-safe.		* All methods in Resource are thread-safe.
	*		*
	* See \ref hacking for details on how to use Resource.		* See \ref hacking for details on how to use Resource.
	*		*
	* \see ResourceManager		* \see ResourceManager
	*		*
			* \section nepomuk_resource_file_uris Special case: file URLs
			*
			* \p file:/ URLs are handled as a special case in Nepomuk. Starting wi
			th KDE 4.4
			* they are no longer used to identify the Nepomuk resource but only st
			ored as
			* nie:url property. All resources have \p nepomuk:/res/<UUID> URIs. Th
			e Resource
			* constructors handle this automatically. Thus, one can still use file
			URLs to
			* construct the objects. But be aware of the following example:
			*
			* \code
			* KUrl fileUrl("file:///home/foobar/example.txt");
			* Nepomuk::Resource fileRes(fileUrl);
			* QUrl fileResUri = fileRes.resourceUri();
			* \endcode
			*
			* Here \p fileUrl and \p fileResUri are NOT equal. The latter is the r
			esource URI
			* of the form \p nepomuk:/res/<UUID>.
			*
	* \author Sebastian Trueg <trueg@kde.org>		* \author Sebastian Trueg <trueg@kde.org>
	*/		*/
	class NEPOMUK_EXPORT Resource		class NEPOMUK_EXPORT Resource
	{		{
	public:		public:
	/**		/**
	* Creates an empty invalid Resource.		* Creates an empty invalid Resource.
	* An invalid resource will become valid (i.e. get a new random URI ) once setProperty		* An invalid resource will become valid (i.e. get a new random URI ) once setProperty
	* is called.		* is called.
	*/		*/
	skipping to change at line 109		skipping to change at line 126
	*		*
	* The actual resource data is loaded on demand. Thus, it is possib le to work		* The actual resource data is loaded on demand. Thus, it is possib le to work
	* with Resources as if they were in memory all the time.		* with Resources as if they were in memory all the time.
	*		*
	* \param pathOrIdentifier The path to a file or an arbitrary ident ifier of the resource.		* \param pathOrIdentifier The path to a file or an arbitrary ident ifier of the resource.
	* The following cases are handled:		* The following cases are handled:
	* \li A local file path is converted to a local file URL		* \li A local file path is converted to a local file URL
	* \li A URI which already exist in Nepomuk results in loading of t hat particular resource.		* \li A URI which already exist in Nepomuk results in loading of t hat particular resource.
	* \li A string which already exists as the nao:identifier of a res ource results in loading		* \li A string which already exists as the nao:identifier of a res ource results in loading
	* of that particular resource.		* of that particular resource.
	* \li A URI which does not exist yet is used to create a new resou
	rce (Caution: due to
	* encoding weirdness using KUrl::url or QUrl::toString here might
	result in unwanted
	* behaviour. It is recommended to always use the Resource(QUrl,QUr
	l) constructor if
	* possible)
	* \li Any other string is used as nao:identifier for a new resourc e. This resource can		* \li Any other string is used as nao:identifier for a new resourc e. This resource can
	* later be loaded again by using the same identifier with this con structor.		* later be loaded again by using the same identifier with this con structor.
	*		*
	* \param type The URI identifying the type of the resource. If it is empty		* \param type The URI identifying the type of the resource. If it is empty
	* Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or		* Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or
	* in case the resource already exists the type will be read from the		* in case the resource already exists the type will be read from the
	* store.		* store.
	*		*
	* Example:		* Example:
	*		*
	skipping to change at line 158		skipping to change at line 171
	*/		*/
	KDE_DEPRECATED Resource( const QString& pathOrIdentifier, const QSt ring& type );		KDE_DEPRECATED Resource( const QString& pathOrIdentifier, const QSt ring& type );
	/**		/**
	* 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.
			*
	* \param type The URI identifying the type of the resource. If it is empty		* \param type The URI identifying the type of the resource. If it is empty
	* Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or		* Resource falls back to http://www.w3.org/2000/01/rdf -schema\#Resource or
	* in case the resource already exists the type will be read from the		* in case the resource already exists the type will be read from the
	* store.		* store.
	*/		*/
	Resource( const QUrl& uri, const QUrl& type = QUrl() );		Resource( const QUrl& uri, const QUrl& type = QUrl() );
	/**		/**
	* \overload		* \overload
	*		*
	skipping to change at line 215		skipping to change at line 230
	* 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.
	* (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
	*/		*/
	KDE_DEPRECATED QString uri() const;		KDE_DEPRECATED QString uri() const;
	/**		/**
	* 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.
	* (Although Nepomuk tries to keep the URI of file resources in syn
	c
	* with the file URL for convenience.)
	*		*
	* \sa uri, getIdentifiers		* \return The resource URI of the resource or an empty url if the
			* resource does not exist() yet.
			*
			* \sa getIdentifiers()
	*/		*/
	QUrl resourceUri() const;		QUrl resourceUri() const;
	/**		/**
	* 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.
	*		*
	skipping to change at line 442		skipping to change at line 458
	* Get or create the PIMO thing that relates to this resource. If t his resource		* Get or create the PIMO thing that relates to this resource. If t his resource
	* itself is a pimo:Thing, a reference to this is returned. If a pi mo:Thing exists		* itself is a pimo:Thing, a reference to this is returned. If a pi mo:Thing exists
	* with has as occurrence this resource, the thing is returned. Oth erwise a new thing		* with has as occurrence this resource, the thing is returned. Oth erwise a new thing
	* is created.		* is created.
	*		*
	* \since 4.2		* \since 4.2
	*/		*/
	Thing pimoThing();		Thing pimoThing();
	/**		/**
	* Operator to compare two Resource objects. Normally one does not		* Operator to compare two Resource objects.
	need this. It is
	* mainly intended for testing and debugging purposes.
	*/		*/
	bool operator==( const Resource& ) const;		bool operator==( const Resource& ) const;
	/**		/**
			* Operator to compare two Resource objects.
			*
			* \since 4.4
			*/
			bool operator!=( const Resource& ) const;
			/**
	* Get property 'description'. Everything can be annotated with		* Get property 'description'. Everything can be annotated with
	* a simple string comment.		* a simple string comment.
	*/		*/
	QString description() const;		QString description() const;
	/**		/**
	* Set property 'description'. Everything can be annotated with		* Set property 'description'. Everything can be annotated with
	* a simple string comment.		* a simple string comment.
	*/		*/
	void setDescription( const QString& value );		void setDescription( const QString& value );
	skipping to change at line 698		skipping to change at line 720
	static QList<Resource> allResources();		static QList<Resource> allResources();
	private:		private:
	ResourceData* m_data;		ResourceData* m_data;
	class Private;		class Private;
	Private* d; // unused		Private* d; // unused
	friend class ResourceData;		friend class ResourceData;
	};		};
			NEPOMUK_EXPORT uint qHash( const Resource& res );
	}		}
	#endif		#endif
End of changes. 10 change blocks.
	16 lines changed or deleted		41 lines changed or added

	resourcemanager.h		resourcemanager.h
	skipping to change at line 125		skipping to change at line 125
	* 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
			* discouraged.
			*
	* \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.
	*/		*/
	skipping to change at line 161		skipping to change at line 164
	* \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.
	*/		*/
	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 )
	*/		*/
	KDE_DEPRECATED QList<Resource> allResourcesWithProperty( const QStr ing& uri, const Variant& v );		KDE_DEPRECATED QList<Resource> allResourcesWithProperty( const QStr ing& uri, const Variant& v );
	/**		/**
			* %ResourceManager caches resource locally so subsequent access is
			faster.
			* This method clears this cache, deleting any Resource that is not
			used.
			*
			* \since 4.4
			*/
			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.
	*/		*/
	KDE_DEPRECATED QString generateUniqueUri();		KDE_DEPRECATED QString generateUniqueUri();
	/**		/**
	* 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 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
	*/		*/
	QUrl generateUniqueUri( const QString& label );		QUrl generateUniqueUri( const QString& label );
	skipping to change at line 218		skipping to change at line 229
	/**		/**
	* Whenever a problem occurs (like for example failed resource sync ing) this		* Whenever a problem occurs (like for example failed resource sync ing) this
	* signal is emitted.		* signal is emitted.
	*		*
	* \param uri The resource related to the error.		* \param uri The resource related to the error.
	* \param errorCode The type of the error (Resource::ErrorCode)		* \param errorCode The type of the error (Resource::ErrorCode)
	*/		*/
	void error( const QString& uri, int errorCode );		void error( const QString& uri, int errorCode );
			/**
			* Emitted once the Nepomuk system is up and can be used.
			*
			* \warning This signal will not be emitted if the Nepomuk
			* system is running when the ResourceManager is created.
			* Use initialized() to check the status.
			*
			* \since 4.4
			*/
			void nepomukSystemStarted();
			/**
			* Emitted once the Nepomuk system goes down.
			*
			* \since 4.4
			*/
			void nepomukSystemStopped();
	private Q_SLOTS:		private Q_SLOTS:
	void slotStoreChanged();		void slotStoreChanged();
	private:		private:
	friend class Nepomuk::ResourceManagerHelper;		friend class Nepomuk::ResourceManagerHelper;
	friend class Nepomuk::Resource;		friend class Nepomuk::Resource;
			friend class Nepomuk::ResourceManagerPrivate;
	ResourceManager();		ResourceManager();
	~ResourceManager();		~ResourceManager();
	ResourceManagerPrivate* const d;		ResourceManagerPrivate* const d;
			Q_PRIVATE_SLOT( d, void _k_storageServiceInitialized(bool) )
			Q_PRIVATE_SLOT( d, void _k_dbusServiceOwnerChanged(QString, QString
			, QString) )
	};		};
	}		}
	#endif		#endif
End of changes. 6 change blocks.
	1 lines changed or deleted		38 lines changed or added

	runnercontext.h		runnercontext.h
	skipping to change at line 70		skipping to change at line 70
	FileSystem = Directory | File | Executable | ShellCommand		FileSystem = Directory | File | Executable | ShellCommand
	};		};
	Q_DECLARE_FLAGS(Types, Type)		Q_DECLARE_FLAGS(Types, Type)
	explicit RunnerContext(QObject *parent = 0);		explicit RunnerContext(QObject *parent = 0);
	/**		/**
	* Copy constructor		* Copy constructor
	*/		*/
	explicit RunnerContext(RunnerContext &other, QObject *parent = 0);		RunnerContext(RunnerContext &other, QObject *parent = 0);
			/**
			* Assignment operator
			* @since 4.4
			*/
			RunnerContext &operator=(const RunnerContext &other);
	~RunnerContext();		~RunnerContext();
	/**		/**
	* Resets the search term for this object.		* Resets the search term for this object.
	* This removes all current matches in the process.		* This removes all current matches in the process and
			* turns off single runner query mode.
	*/		*/
	void reset();		void reset();
	/**		/**
	* Sets the query term for this object and attempts to determine		* Sets the query term for this object and attempts to determine
	* the type of the search.		* the type of the search.
	*/		*/
	void setQuery(const QString &term);		void setQuery(const QString &term);
	/**		/**
	skipping to change at line 120		skipping to change at line 127
	*		*
	* while (.. a possibly large iteration) {		* while (.. a possibly large iteration) {
	* if (!context.isValid()) {		* if (!context.isValid()) {
	* return;		* return;
	* }		* }
	*		*
	* ... some processing ...		* ... some processing ...
	* }		* }
	*		*
	* While not required to be used within runners, it provies a nice way		* While not required to be used within runners, it provies a nice way
	* to avoid unecessary processing in runners that may run for an ex tended		* to avoid unnecessary processing in runners that may run for an e xtended
	* period (as measured in 10s of ms) and therefore improve the user experience.		* period (as measured in 10s of ms) and therefore improve the user experience.
	* @since 4.2.3		* @since 4.2.3
	*/		*/
	bool isValid() const;		bool isValid() const;
	/**		/**
	* Appends lists of matches to the list of matches.		* Appends lists of matches to the list of matches.
	*		*
	* This method is thread safe and causes the matchesChanged() signa l to be emitted.		* This method is thread safe and causes the matchesChanged() signa l to be emitted.
	*		*
	skipping to change at line 152		skipping to change at line 159
	* @arg term the search term that this match was generated for.		* @arg term the search term that this match was generated for.
	* @arg match the match to add		* @arg match the match to add
	*		*
	* @return true if the match was added, false otherwise.		* @return true if the match was added, false otherwise.
	*/		*/
	// trueg: what do we need the term for? It is stored in the context anyway! Plus: matches() does not have a term parameter!		// trueg: what do we need the term for? It is stored in the context anyway! Plus: matches() does not have a term parameter!
	// plus: it is Q_UNUSED		// plus: it is Q_UNUSED
	bool addMatch(const QString &term, const QueryMatch &match);		bool addMatch(const QString &term, const QueryMatch &match);
	/**		/**
			* Removes a match from the existing list of matches.
			*
			* If you are going to be removing multiple matches, use removeMatc
			hes instead.
			*
			* @arg matchId the id of match to remove
			*
			* @return true if the match was removed, false otherwise.
			* @since 4.4
			*/
			bool removeMatch(const QString matchId);
			/**
			* Removes lists of matches from the existing list of matches.
			*
			* This method is thread safe and causes the matchesChanged() signa
			l to be emitted.
			*
			* @arg matchIdList the list of matches id to remove
			*
			* @return true if at least one match was removed, false otherwise.
			* @since 4.4
			*/
			bool removeMatches(const QStringList matchIdList);
			/**
	* Retrieves all available matches for the current search term.		* Retrieves all available matches for the current search term.
	*		*
	* @return a list of matches		* @return a list of matches
	*/		*/
	QList<QueryMatch> matches() const;		QList<QueryMatch> matches() const;
	/**		/**
	* Retrieves a match by id.		* Retrieves a match by id.
	*		*
	* @param id the id of the match to return		* @param id the id of the match to return
	* @return the match associated with this id, or an invalid QueryMa tch object		* @return the match associated with this id, or an invalid QueryMa tch object
	* if the id does not eixst		* if the id does not eixst
	*/		*/
	QueryMatch match(const QString &id) const;		QueryMatch match(const QString &id) const;
	/**		/**
			* Sets single runner query mode. Note that a call to reset() will
			* turn off single runner query mode.
			*
			* @see reset()
			* @since 4.4
			*/
			void setSingleRunnerQueryMode(bool enabled);
			/**
			* @return true if the current query is a single runner query
			* @since 4.4
			*/
			bool singleRunnerQueryMode() const;
			/**
	* Sets the launch counts for the associated match ids		* Sets the launch counts for the associated match ids
	*		*
	* If a runner adds a match to this context, the context will check if the		* If a runner adds a match to this context, the context will check if the
	* match id has been launched before and increase the matches relev ance		* match id has been launched before and increase the matches relev ance
	* correspondingly. In this manner, any front end can implement ada ptive search		* correspondingly. In this manner, any front end can implement ada ptive search
	* by sorting items according to relevance.		* by sorting items according to relevance.
	*		*
	* @param config the config group where launch data was stored		* @param config the config group where launch data was stored
	*/		*/
	void restore(const KConfigGroup &config);		void restore(const KConfigGroup &config);
End of changes. 5 change blocks.
	3 lines changed or deleted		51 lines changed or added

	runnermanager.h		runnermanager.h
	skipping to change at line 64		skipping to change at line 64
	~RunnerManager();		~RunnerManager();
	/**		/**
	* Finds and returns a loaded runner or NULL		* Finds and returns a loaded runner or NULL
	* @arg name the name of the runner		* @arg name the name of the runner
	* @return Pointer to the runner		* @return Pointer to the runner
	*/		*/
	AbstractRunner *runner(const QString &name) const;		AbstractRunner *runner(const QString &name) const;
	/**		/**
			* @return the currently active "single mode" runner, or null if no
			ne
			* @since 4.4
			*/
			AbstractRunner *singleModeRunner() const;
			/**
			* Puts the manager into "single runner" mode using the given
			* runner; if the runner does not exist or can not be loaded then
			* the single runner mode will not be started and singleModeRunner(
			)
			* will return NULL
			* @arg id the id of the runner to use
			* @since 4.4
			*/
			void setSingleModeRunnerId(const QString &id);
			/**
			* @return the id of the runner to use in single mode
			* @since 4.4
			*/
			QString singleModeRunnerId() const;
			/**
			* @return true if the manager is set to run in single runner mode
			* @since 4.4
			*/
			bool singleMode() const;
			/**
			* Sets whether or not the manager is in single mode.
			*
			* @arg singleMode true if the manager should be in single mode, fa
			lse otherwise
			* @since 4.4
			*/
			void setSingleMode(bool singleMode);
			/**
			* Returns the translated name of a runner
			* @arg id the id of the runner
			*
			* @since 4.4
			*/
			QString runnerName(const QString &id) const;
			/**
	* @return the list of all currently loaded runners		* @return the list of all currently loaded runners
	*/		*/
	QList<AbstractRunner *> runners() const;		QList<AbstractRunner *> runners() const;
	/**		/**
			* @return the names of all runners that advertise single query mod
			e
			* @since 4.4
			*/
			QStringList singleModeAdvertisedRunnerIds() const;
			/**
	* Retrieves the current context		* Retrieves the current context
	* @return pointer to the current context		* @return pointer to the current context
	*/		*/
	RunnerContext *searchContext() const;		RunnerContext *searchContext() const;
	/**		/**
	* Retrieves all available matches found so far for the previously launched query		* Retrieves all available matches found so far for the previously launched query
	* @return List of matches		* @return List of matches
	*/		*/
	QList<QueryMatch> matches() const;		QList<QueryMatch> matches() const;
	skipping to change at line 107		skipping to change at line 157
	/**		/**
	* @return the current query term		* @return the current query term
	*/		*/
	QString query() const;		QString query() const;
	/**		/**
	* Causes a reload of the current configuration		* Causes a reload of the current configuration
	*/		*/
	void reloadConfiguration();		void reloadConfiguration();
			/**
			* Sets a whitelist for the plugins that can be loaded
			*
			* @arg plugins the plugin names of allowed runners
			* @since 4.4
			*/
			void setAllowedRunners(const QStringList &runners);
			/**
			* @return the list of allowed plugins
			* @since 4.4
			*/
			QStringList allowedRunners() const;
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
			* Call this method when the runners should be prepared for a query
			session.
			* Call matchSessionComplete when the query session is finished for
			the time
			* being.
			* @since 4.4
			* @see matchSessionComplete
			*/
			void setupMatchSession();
			/**
			* Call this method when the query session is finished for the time
			* being.
			* @since 4.4
			* @see prepareForMatchSession
			*/
			void matchSessionComplete();
			/**
	* Launch a query, this will create threads and return inmediately.		* Launch a query, this will create threads and return inmediately.
	* When the information will be available can be known using the		* When the information will be available can be known using the
	* matchesChanged signal.		* matchesChanged signal.
	*		*
	* @arg term the term we want to find matches for		* @arg term the term we want to find matches for
	* @arg runner optional, if only one specific runner is to be used		* @arg runnerId optional, if only one specific runner is to be use
			d;
			* providing an id will put the manager into single r
			unner mode
	*/		*/
	void launchQuery(const QString &term, const QString &runnerName);		void launchQuery(const QString &term, const QString &runnerId);
	/**		/**
	* Convenience version of above		* Convenience version of above
	*/		*/
	void launchQuery(const QString &term);		void launchQuery(const QString &term);
	/**		/**
	* Execute a query, this method will only return when the query is executed		* Execute a query, this method will only return when the query is executed
	* This means that the method may be dangerous as it wait a variabl e amount		* This means that the method may be dangerous as it wait a variabl e amount
	* of time for the runner to finish.		* of time for the runner to finish.
End of changes. 6 change blocks.
	2 lines changed or deleted		92 lines changed or added

	runnerscript.h		runnerscript.h
	skipping to change at line 24		skipping to change at line 24
	* You should have received a copy of the GNU Library General Public		* You should have received a copy of the GNU Library General Public
	* License along with this program; if not, write to the		* License along with this program; if not, write to the
	* Free Software Foundation, Inc.,		* Free Software Foundation, Inc.,
	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef PLASMA_RUNNERSCRIPT_H		#ifndef PLASMA_RUNNERSCRIPT_H
	#define PLASMA_RUNNERSCRIPT_H		#define PLASMA_RUNNERSCRIPT_H
	#include <kgenericfactory.h>		#include <kgenericfactory.h>
			#include <kplugininfo.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			#include <plasma/abstractrunner.h>
	#include <plasma/scripting/scriptengine.h>		#include <plasma/scripting/scriptengine.h>
	namespace Plasma		namespace Plasma
	{		{
	class AbstractRunner;
	class RunnerContext;
	class QueryMatch;
	class RunnerScriptPrivate;		class RunnerScriptPrivate;
	/**		/**
	* @class RunnerScript plasma/scripting/runnerscript.h <Plasma/Scripting/Ru nnerScript>		* @class RunnerScript plasma/scripting/runnerscript.h <Plasma/Scripting/Ru nnerScript>
	*		*
	* @short Provides a restricted interface for scripting a runner.		* @short Provides a restricted interface for scripting a runner.
	*/		*/
	class PLASMA_EXPORT RunnerScript : public ScriptEngine		class PLASMA_EXPORT RunnerScript : public ScriptEngine
	{		{
	Q_OBJECT		Q_OBJECT
	skipping to change at line 79		skipping to change at line 78
	* RunnerContext::addPossibleMatch.		* RunnerContext::addPossibleMatch.
	*/		*/
	virtual void match(Plasma::RunnerContext &search);		virtual void match(Plasma::RunnerContext &search);
	/**		/**
	* Called whenever an exact or possible match associated with this		* Called whenever an exact or possible match associated with this
	* runner is triggered.		* runner is triggered.
	*/		*/
	virtual void run(const Plasma::RunnerContext &search, const Plasma::Que ryMatch &action);		virtual void run(const Plasma::RunnerContext &search, const Plasma::Que ryMatch &action);
			Q_SIGNALS:
			void prepare();
			void teardown();
			void createRunOptions(QWidget *widget);
			void reloadConfiguration();
			void actionsForMatch(const Plasma::QueryMatch &match, QList<QAction*>*
			actions);
	protected:		protected:
	/**		/**
	* @return absolute path to the main script file for this plasmoid		* @return absolute path to the main script file for this plasmoid
	*/		*/
	QString mainScript() const;		QString mainScript() const;
	/**		/**
	* @return the Package associated with this plasmoid which can		* @return the Package associated with this plasmoid which can
	* be used to request resources, such as images and		* be used to request resources, such as images and
	* interface files.		* interface files.
	*/		*/
	const Package *package() const;		const Package *package() const;
			/**
			* @return the KPluginInfo associated with this plasmoid
			*/
			KPluginInfo description() const;
			/**
			* @return a Plasma::DataEngine matchin name
			* @since 4.4
			*/
			DataEngine *dataEngine(const QString &name);
			KConfigGroup config() const;
			void setIgnoredTypes(RunnerContext::Types types);
			void setHasRunOptions(bool hasRunOptions);
			void setSpeed(AbstractRunner::Speed newSpeed);
			void setPriority(AbstractRunner::Priority newPriority);
			KService::List serviceQuery(const QString &serviceType,
			const QString &constraint = QString()) cons
			t;
			QAction* addAction(const QString &id, const QIcon &icon, const QString
			&text);
			void addAction(const QString &id, QAction *action);
			void removeAction(const QString &id);
			QAction* action(const QString &id) const;
			QHash<QString, QAction*> actions() const;
			void clearActions();
			void addSyntax(const RunnerSyntax &syntax);
			void setSyntaxes(const QList<RunnerSyntax> &syns);
	private:		private:
			friend class AbstractRunner;
	RunnerScriptPrivate *const d;		RunnerScriptPrivate *const d;
	};		};
	#define K_EXPORT_PLASMA_RUNNERSCRIPTENGINE(libname, classname) \		#define K_EXPORT_PLASMA_RUNNERSCRIPTENGINE(libname, classname) \
	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \		K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
	K_EXPORT_PLUGIN(factory("plasma_runnerscriptengine_" #libname))		K_EXPORT_PLUGIN(factory("plasma_runnerscriptengine_" #libname))
	} //Plasma namespace		} //Plasma namespace
	#endif		#endif
End of changes. 6 change blocks.
	3 lines changed or deleted		41 lines changed or added

	scriptengine.h		scriptengine.h
	skipping to change at line 43		skipping to change at line 43
	namespace Plasma		namespace Plasma
	{		{
	class AbstractRunner;		class AbstractRunner;
	class Applet;		class Applet;
	class AppletScript;		class AppletScript;
	class DataEngine;		class DataEngine;
	class DataEngineScript;		class DataEngineScript;
	class RunnerScript;		class RunnerScript;
			class Wallpaper;
			class WallpaperScript;
	class Package;		class Package;
	class ScriptEnginePrivate;		class ScriptEnginePrivate;
	/**		/**
	* @class ScriptEngine plasma/scripting/scriptengine.h <Plasma/Scripting/Sc riptEngine>		* @class ScriptEngine plasma/scripting/scriptengine.h <Plasma/Scripting/Sc riptEngine>
	*		*
	* @short The base class for scripting interfaces to be used in loading		* @short The base class for scripting interfaces to be used in loading
	* plasmoids of a given language.		* plasmoids of a given language.
	*		*
	* All ScriptEngines should export as consistent an interface as possible		* All ScriptEngines should export as consistent an interface as possible
	skipping to change at line 132		skipping to change at line 134
	* Loads an Applet script engine for the given language.		* Loads an Applet script engine for the given language.
	*		*
	* @param language the language to load for		* @param language the language to load for
	* @param runner the Plasma::AbstractRunner for this script		* @param runner the Plasma::AbstractRunner for this script
	* @return pointer to the RunnerScript or 0 on failure; the caller is respo nsible		* @return pointer to the RunnerScript or 0 on failure; the caller is respo nsible
	* for the return object which will be parented to the AbstractRunn er		* for the return object which will be parented to the AbstractRunn er
	**/		**/
	PLASMA_EXPORT RunnerScript *loadScriptEngine(const QString &language, Abstr actRunner *runner);		PLASMA_EXPORT RunnerScript *loadScriptEngine(const QString &language, Abstr actRunner *runner);
	/**		/**
			* Loads an Wallpaper script engine for the given language.
			*
			* @param language the language to load for
			* @param runner the Plasma::Wallpaper for this script
			* @return pointer to the RunnerScript or 0 on failure; the caller is respo
			nsible
			* for the return object which will be parented to the Wallpaper
			**/
			PLASMA_EXPORT WallpaperScript *loadScriptEngine(const QString &language, Wa
			llpaper *wallpaper);
			/**
	* Loads an appropriate PackageStructure for the given language and type		* Loads an appropriate PackageStructure for the given language and type
	*		*
	* @param language the language to load the PackageStructure for		* @param language the language to load the PackageStructure for
	* @param type the component type		* @param type the component type
	* @return a guarded PackageStructure pointer		* @return a guarded PackageStructure pointer
	*/		*/
	PLASMA_EXPORT PackageStructure::Ptr packageStructure(const QString &languag e, ComponentType type);		PLASMA_EXPORT PackageStructure::Ptr packageStructure(const QString &languag e, ComponentType type);
	} // namespace Plasma		} // namespace Plasma
End of changes. 2 change blocks.
	0 lines changed or deleted		14 lines changed or added

	scrollbar.h		scrollbar.h
	skipping to change at line 48		skipping to change at line 48
	*/		*/
	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)
	Q_PROPERTY(int maximum READ maximum)		Q_PROPERTY(int maximum READ maximum)
	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)
	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);
	~ScrollBar();		~ScrollBar();
	/**		/**
	skipping to change at line 121		skipping to change at line 122
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this ScrollBar		* @return the native widget wrapped by this ScrollBar
	*/		*/
	QScrollBar *nativeWidget() const;		QScrollBar *nativeWidget() const;
			/**
			* @return the orientation of the scrollbar
			* @since 4.4
			*/
			Qt::Orientation orientation() const;
			protected:
			void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the current value for the ScrollBar		* Sets the current value for the ScrollBar
	* @arg value must be minimum() <= value <= maximum()		* @arg value must be minimum() <= value <= maximum()
	*/		*/
	void setValue(int val);		void setValue(int val);
	/**		/**
	* Sets the orientation of the ScrollBar.		* Sets the orientation of the ScrollBar.
	*/		*/
End of changes. 3 change blocks.
	1 lines changed or deleted		11 lines changed or added

	scrollwidget.h		scrollwidget.h
	skipping to change at line 23		skipping to change at line 23
	*		*
	* You should have received a copy of the GNU Library General Public		* You should have received a copy of the GNU Library General Public
	* License along with this program; if not, write to the		* License along with this program; if not, write to the
	* Free Software Foundation, Inc.,		* Free Software Foundation, Inc.,
	* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	*/		*/
	#ifndef PLASMA_SCROLLWIDGET_H		#ifndef PLASMA_SCROLLWIDGET_H
	#define PLASMA_SCROLLWIDGET_H		#define PLASMA_SCROLLWIDGET_H
			#include <QtCore/QAbstractAnimation>
	#include <QtGui/QGraphicsWidget>		#include <QtGui/QGraphicsWidget>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	namespace Plasma		namespace Plasma
	{		{
	class ScrollWidgetPrivate;		class ScrollWidgetPrivate;
	/**		/**
	skipping to change at line 47		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(QPointF scrollPosition READ scrollPosition WRITE setScrollPo
			sition)
			Q_PROPERTY(QSizeF contentsSize READ contentsSize)
			Q_PROPERTY(QRectF viewportGeometry READ viewportGeometry)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	public:		public:
	/**		/**
	* Constructs a new ScrollWidget		* Constructs a new ScrollWidget
	*		*
	* @arg parent the parent of this widget		* @arg parent the parent of this widget
	*/		*/
	explicit ScrollWidget(QGraphicsWidget *parent = 0);		explicit ScrollWidget(QGraphicsWidget *parent = 0);
			explicit ScrollWidget(QGraphicsItem *parent);
	~ScrollWidget();		~ScrollWidget();
	/**		/**
	* Sets the widget this ScrollWidget will contain		* Sets the widget this ScrollWidget will contain
	* ownership is transferred to this scrollwidget,		* ownership is transferred to this scrollwidget,
	* if an old one was already in, it will be deleted		* if an old one was already in, it will be deleted.
			* If the widget size policy will have an horizontal expand direction,
			* it will be resized when possible, otherwise it will be keps to which
			ever
			* width the widget resizes itself.
			* The same thing it's true for the vertical size hint.
	*		*
	* @arg widget the new main sub widget		* @arg widget the new main sub widget
	*/		*/
	void setWidget(QGraphicsWidget *widget);		void setWidget(QGraphicsWidget *widget);
	/**		/**
	* @return the main widget		* @return the main widget
	*/		*/
	QGraphicsWidget *widget() const;		QGraphicsWidget *widget() const;
	skipping to change at line 98		skipping to change at line 107
	* @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;
	/**		/**
			* Scroll the view until the given rectangle is visible
			*
			* @param rect rect we want visible, in coordinates mapped to the inner
			widget
			* @since 4.4
			*/
			Q_INVOKABLE void ensureRectVisible(const QRectF &rect);
			/**
			* Scroll the view until the given item is visible
			*
			* @param item item we want visible
			* @since 4.4
			*/
			Q_INVOKABLE void ensureItemVisible(QGraphicsItem *item);
			/**
			* Register an item as a drag handle, it means mouse events will pass t
			rough it
			* and will be possible to drag the view by dragging the item itself.
			* The item will still receive mouse clicks if the mouse didn't move
			* between press and release.
			*
			* @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
			* it's not necessary to call this function.
			* @since 4.4
			*/
			Q_INVOKABLE void registerAsDragHandle(QGraphicsWidget *item);
			/**
			* Unregister the given item as drag handle (if it was registered)
			* @since 4.4
			*/
			Q_INVOKABLE void unregisterAsDragHandle(QGraphicsWidget *item);
			/**
			* The geometry of the viewport.
			* @since 4.4
			*/
			QRectF viewportGeometry() const;
			/**
			* @return the size of the internal widget
			* @since 4.4
			*/
			QSizeF contentsSize() const;
			/**
			* Sets the position of the internal widget relative to this widget
			* @since 4.4
			*/
			void setScrollPosition(const QPointF &position);
			/**
			* @return the position of the internal widget relative to this widget
			* @since 4.4
			*/
			QPointF scrollPosition() const;
			/**
	* Sets the stylesheet used to control the visual display of this Scrol lWidget		* Sets the stylesheet used to control the visual display of this Scrol lWidget
	*		*
	* @arg stylesheet a CSS string		* @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() const;		QString styleSheet() const;
	/**		/**
	* @return the native widget wrapped by this ScrollWidget		* @return the native widget wrapped by this ScrollWidget
	*/		*/
	QWidget *nativeWidget() const;		QWidget *nativeWidget() const;
			Q_SIGNALS:
			void scrollStateChanged(QAbstractAnimation::State newState,
			QAbstractAnimation::State oldState);
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);		void mousePressEvent(QGraphicsSceneMouseEvent *event);
			void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	void wheelEvent(QGraphicsSceneWheelEvent *event);		void wheelEvent(QGraphicsSceneWheelEvent *event);
	bool eventFilter(QObject *watched, QEvent *event);		bool eventFilter(QObject *watched, QEvent *event);
			void focusInEvent(QFocusEvent *event);
			QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;
	private:		private:
	ScrollWidgetPrivate * const d;		ScrollWidgetPrivate * const d;
	Q_PRIVATE_SLOT(d, void verticalScroll(int value))		Q_PRIVATE_SLOT(d, void verticalScroll(int value))
	Q_PRIVATE_SLOT(d, void horizontalScroll(int value))		Q_PRIVATE_SLOT(d, void horizontalScroll(int value))
			Q_PRIVATE_SLOT(d, void makeRectVisible())
			Q_PRIVATE_SLOT(d, void makeItemVisible())
			Q_PRIVATE_SLOT(d, void cleanupDragHandles(QObject *destroyed))
			Q_PRIVATE_SLOT(d, void adjustScrollbars())
			Q_PRIVATE_SLOT(d, void scrollStateChanged(QGraphicsWidget *, QAbstractA
			nimation::State,
			QAbstractAnimation::State))
			friend class ScrollWidgetPrivate;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 9 change blocks.
	1 lines changed or deleted		91 lines changed or added

	service.h		service.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef PLASMA_SERVICE_H		#ifndef PLASMA_SERVICE_H
	#define PLASMA_SERVICE_H		#define PLASMA_SERVICE_H
	#include <QtCore/QMap>		#include <QtCore/QMap>
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <kconfiggroup.h>		#include <kconfiggroup.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			#include <plasma/plasma.h>
			#include "packagemetadata.h"
	class QGraphicsWidget;		class QGraphicsWidget;
	class QIODevice;		class QIODevice;
	class QWidget;		class QWidget;
	namespace Plasma		namespace Plasma
	{		{
	class ServiceJob;		class ServiceJob;
	class ServicePrivate;		class ServicePrivate;
	skipping to change at line 78		skipping to change at line 80
	* Plasma::Service *service = twitter.serviceForSource("aseigo");		* Plasma::Service *service = twitter.serviceForSource("aseigo");
	* KConfigGroup op = service->operationDescription("update");		* KConfigGroup op = service->operationDescription("update");
	* op.writeEntry("tweet", "Hacking on plasma!");		* op.writeEntry("tweet", "Hacking on plasma!");
	* Plasma::ServiceJob *job = service->startOperationCall(op);		* Plasma::ServiceJob *job = service->startOperationCall(op);
	* connect(job, SIGNAL(finished(KJob*)), this, SLOT(jobCompeted()));		* connect(job, SIGNAL(finished(KJob*)), this, SLOT(jobCompeted()));
	* @endcode		* @endcode
	*/		*/
	class PLASMA_EXPORT Service : public QObject		class PLASMA_EXPORT Service : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
			Q_DECLARE_PRIVATE(Service)
	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
	* @param parent the parent object, if any, for the service		* @param parent the parent object, if any, for the service
	*		*
	* @return a Service object, guaranteed to be not null.		* @return a Service object, guaranteed to be not null.
	*/		*/
	static Service *load(const QString &name, QObject *parent = 0);		static Service *load(const QString &name, QObject *parent = 0);
	/**		/**
			* Used to access a service from an url. Always check for the signal se
			rviceReady() that fires
			* when this service is actually ready for use.
			*/
			static Service *access(const KUrl &url, QObject *parent = 0);
			/**
	* Sets the destination for this Service to operate on		* Sets the destination for this Service to operate on
	*		*
	* @arg destination specific to each Service, this sets which		* @arg destination specific to each Service, this sets which
	* target or address for ServiceJobs to operate on		* target or address for ServiceJobs to operate on
	*/		*/
	Q_INVOKABLE void setDestination(const QString &destination);		Q_INVOKABLE void setDestination(const QString &destination);
	/**		/**
	* @return the target destination, if any, that this service is associa ted with		* @return the target destination, if any, that this service is associa ted with
	*/		*/
	skipping to change at line 186		skipping to change at line 195
	/**		/**
	* Disassociates a widget if it has been associated with an operation		* Disassociates a widget if it has been associated with an operation
	* on this service.		* on this service.
	*		*
	* This will not change the enabled state of the widget.		* This will not change the enabled state of the widget.
	*		*
	* @param widget the QGraphicsWidget to disassociate.		* @param widget the QGraphicsWidget to disassociate.
	*/		*/
	Q_INVOKABLE void disassociateWidget(QGraphicsWidget *widget);		Q_INVOKABLE void disassociateWidget(QGraphicsWidget *widget);
			/**
			* @return a parameter map for the given description
			* @arg description the configuration values to turn into the parameter
			map
			* @since 4.4
			*/
			Q_INVOKABLE QMap<QString, QVariant> parametersFromDescription(const KCo
			nfigGroup &description);
	Q_SIGNALS:		Q_SIGNALS:
	/**		/**
	* Emitted when a job associated with this Service completes its task		* Emitted when a job associated with this Service completes its task
	*/		*/
	void finished(Plasma::ServiceJob *job);		void finished(Plasma::ServiceJob *job);
	/**		/**
	* Emitted when the Service's operations change. For example, a		* Emitted when the Service's operations change. For example, a
	* media player service may change what operations are available		* media player service may change what operations are available
	* in response to the state of the player.		* in response to the state of the player.
	*/		*/
	void operationsChanged();		void operationsChanged();
			/**
			* Emitted when this service is ready for use
			*/
			void serviceReady(Plasma::Service *service);
	protected:		protected:
	/**		/**
	* Default constructor		* Default constructor
	*		*
	* @arg parent the parent object for this service		* @arg parent the parent object for this service
	*/		*/
	explicit Service(QObject *parent = 0);		explicit Service(QObject *parent = 0);
	/**		/**
	* Constructor for plugin loading		* Constructor for plugin loading
	skipping to change at line 259		skipping to change at line 280
	*/		*/
	void setOperationEnabled(const QString &operation, bool enable);		void setOperationEnabled(const QString &operation, bool enable);
	private:		private:
	Q_PRIVATE_SLOT(d, void jobFinished(KJob *))		Q_PRIVATE_SLOT(d, void jobFinished(KJob *))
	Q_PRIVATE_SLOT(d, void associatedWidgetDestroyed(QObject *))		Q_PRIVATE_SLOT(d, void associatedWidgetDestroyed(QObject *))
	Q_PRIVATE_SLOT(d, void associatedGraphicsWidgetDestroyed(QObject *))		Q_PRIVATE_SLOT(d, void associatedGraphicsWidgetDestroyed(QObject *))
	ServicePrivate * const d;		ServicePrivate * const d;
	friend class ServicePrivate;		friend class Applet;
			friend class DataEnginePrivate;
			friend class GetSource;
			friend class PackagePrivate;
			friend class ServiceProvider;
			friend class RemoveService;
	};		};
	} // 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. 6 change blocks.
	1 lines changed or deleted		30 lines changed or added

	servicejob.h		servicejob.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef PLASMA_SERVICEJOB_H		#ifndef PLASMA_SERVICEJOB_H
	#define PLASMA_SERVICEJOB_H		#define PLASMA_SERVICEJOB_H
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	#include <kjob.h>		#include <kjob.h>
	#include <kservice.h>		#include <kservice.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
			#include "credentials.h"
	namespace Plasma		namespace Plasma
	{		{
	class ServiceJobPrivate;		class ServiceJobPrivate;
	/**		/**
	* @class ServiceJob plasma/servicejob.h <Plasma/ServiceJob>		* @class ServiceJob plasma/servicejob.h <Plasma/ServiceJob>
	*		*
	* @short This class provides jobs for use with Plasma::Service		* @short This class provides jobs for use with Plasma::Service
	skipping to change at line 90		skipping to change at line 91
	* @return the operation the job is performing on the destination		* @return the operation the job is performing on the destination
	*/		*/
	QString operationName() const;		QString operationName() const;
	/**		/**
	* @return the parameters for the operation		* @return the parameters for the operation
	*/		*/
	QMap<QString, QVariant> parameters() const;		QMap<QString, QVariant> parameters() const;
	/**		/**
			* @return the identity of the caller of this operation
			*/
			Credentials identity() const;
			/**
	* Returns the result of the operation		* Returns the result of the operation
	*		*
	* The result will be invalid if the job has not completed yet, or		* The result will be invalid if the job has not completed yet, or
	* if the job does not have a meaningful result.		* if the job does not have a meaningful result.
	*		*
	* Note that this should not be used to find out whether the operation		* Note that this should not be used to find out whether the operation
	* 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
	*/		*/
	skipping to change at line 118		skipping to change at line 124
	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())
	ServiceJobPrivate * const d;		ServiceJobPrivate * const d;
			friend class ServiceProvider;
			friend class RemoteServiceJob;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 3 change blocks.
	0 lines changed or deleted		9 lines changed or added

	sessionconfiginterface.h		sessionconfiginterface.h
	/* This file is part of the KDE libraries		/* This file is part of the KDE libraries
	Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>		Copyright (C) 2001 Christoph Cullmann <cullmann@kde.org>
	Copyright (C) 2005 Dominik Haumann (dhdev@gmx.de) (documentation)		Copyright (C) 2005 Dominik Haumann (dhdev@gmx.de) (documentation)
			Copyright (C) 2009 Michel Ludwig (michel.ludwig@kdemail.net)
	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 122		skipping to change at line 123
	*		*
	* \param config write the session settings to this KConfigGroup		* \param config write the session settings to this KConfigGroup
	* \see readSessionConfig()		* \see readSessionConfig()
	*/		*/
	virtual void writeSessionConfig (KConfigGroup& config) = 0;		virtual void writeSessionConfig (KConfigGroup& config) = 0;
	private:		private:
	class SessionConfigInterfacePrivate* const d;		class SessionConfigInterfacePrivate* const d;
	};		};
			/**
			* \brief Parameterized session config interface extension for the Document
			.
			*
			* \ingroup kte_group_doc_extensions
			*
			* \section parameterizedsessionconfig_intro Introduction
			*
			* The ParameterizedSessionConfigInterface is an extension for Documents
			* to add support for session-specific configuration settings with more fin
			e-grained
			* control over the settings that are manipulated.
			* The readParameterizedSessionConfig() method is called whenever session-s
			pecific settings are to be
			* read from the given KConfig* and the writeParameterizedSessionConfig() m
			ethod whenever they are to
			* be written, for example when a session changed or was closed.
			*
			* \note A \e session does not have anything to do with an X-session under
			Unix.
			* What is meant is rather a context, think of sessions in Kate or
			* projects in KDevelop for example.
			*
			* \note ParameterizedSessionConfigInterface is meant to be an extension of
			SessionConfigInterface.
			* Due to limitations with qobject_cast it is not possible in KDE4 to
			derive this interface
			* from SessionConfigInterface.
			*
			* \section parameterizedsessionconfig_support Adding Session Support
			*
			* To add support for sessions a KTextEditor implementation has to derive t
			he
			* Document class from ParameterizedSessionConfigInterface and reimplement
			the methods defined
			* in this class.
			*
			* \section parameterizedsessionconfig_access Accessing the ParameterizedSe
			ssionConfigInterface
			*
			* The ParameterizedSessionConfigInterface is supposed to be an extension i
			nterface for a
			* Document i.e. the Document inherits the
			* interface \e provided that it implements the interface. Use qobject_cast
			to
			* access the interface:
			* \code
			* // object is of type KTextEditor::Document*
			* KTextEditor::ParameterizedSessionConfigInterface *iface =
			* qobject_cast<KTextEditor::ParameterizedSessionConfigInterface*>( obj
			ect );
			*
			* if( iface ) {
			* // interface is supported
			* // do stuff
			* }
			* \endcode
			*
			* \see KTextEditor::Document
			*
			* \since 4.4
			*/
			class KTEXTEDITOR_EXPORT ParameterizedSessionConfigInterface
			{
			public:
			ParameterizedSessionConfigInterface();
			/**
			* Virtual destructor.
			*/
			virtual ~ParameterizedSessionConfigInterface();
			public:
			enum SessionConfigParameter {
			SkipNone = 0,
			SkipUrl = 1 << 0,
			SkipMode = 1 << 1,
			SkipHighlighting = 1 << 2,
			SkipEncoding = 1 << 3
			};
			/**
			* Read session settings from the given \p config excluding the setting
			s specified in
			* \p parameters.
			*
			* That means for example
			* - a Document should reload the file, restore all marks etc...
			* - a View should scroll to the last position and restore the cursor
			* position etc...
			* - a Plugin should restore session specific settings
			* - If no file is being loaded, because an empty new document is goin
			g to be displayed or
			* 'SkipUrl' is set, this function should emit ReadOnlyPart::complet
			ed
			*
			* \param config read the session settings from this KConfigGroup
			* \param parameters settings that should not be read (i.e. a combinati
			on of flags from SessionConfigParameter)
			* \see writeSessionConfig()
			*/
			virtual void readParameterizedSessionConfig (const KConfigGroup& config
			,
			unsigned long parameters)
			= 0;
			/**
			* Write session settings to the \p config excluding the settings speci
			fied in
			* \p parameters.
			* See readSessionConfig() for more details.
			*
			* \param config write the session settings to this KConfigGroup
			* \param parameters settings that should not be written (i.e. a combin
			ation of flags from SessionConfigParameter)
			* \see readSessionConfig()
			*/
			virtual void writeParameterizedSessionConfig (KConfigGroup& config,
			unsigned long parameters)
			= 0;
			};
	}		}
	Q_DECLARE_INTERFACE(KTextEditor::SessionConfigInterface, "org.kde.KTextEdit or.SessionConfigInterface")		Q_DECLARE_INTERFACE(KTextEditor::SessionConfigInterface, "org.kde.KTextEdit or.SessionConfigInterface")
			Q_DECLARE_INTERFACE(KTextEditor::ParameterizedSessionConfigInterface, "org. kde.KTextEditor.ParameterizedSessionConfigInterface")
	#endif		#endif
	// kate: space-indent on; indent-width 2; replace-tabs on;		// kate: space-indent on; indent-width 2; replace-tabs on;
End of changes. 3 change blocks.
	0 lines changed or deleted		125 lines changed or added

	settings.h		settings.h
	skipping to change at line 26		skipping to change at line 26
	static Configuration *self();		static Configuration *self();
	~Configuration();		~Configuration();
	/**		/**
	Set Additional domains for browsing		Set Additional domains for browsing
	*/		*/
	static		static
	void setDomainList( const QStringList & v )		void setDomainList( const QStringList & v )
	{		{
	if (!self()->isImmutable( QString::fromLatin1 ( "DomainList" ) ))		if (!self()->isImmutable( QString::fromLatin1( "DomainList" ) ))
	self()->mDomainList = v;		self()->mDomainList = v;
	}		}
	/**		/**
	Get Additional domains for browsing		Get Additional domains for browsing
	*/		*/
	static		static
	QStringList domainList()		QStringList domainList()
	{		{
	return self()->mDomainList;		return self()->mDomainList;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	signalplotter.h		signalplotter.h
	skipping to change at line 396		skipping to change at line 396
	QString lastValueAsString(uint i) const;		QString lastValueAsString(uint i) const;
	/**		/**
	* Whether to show a white line on the left and bottom of the widget,		* Whether to show a white line on the left and bottom of the widget,
	* for a 3D effect		* for a 3D effect
	* @param set true if the frame should get drawn		* @param set true if the frame should get drawn
	*/		*/
	void setThinFrame(bool set);		void setThinFrame(bool set);
	/**		/**
	* show a white line on the left and botton of the widget for a 3D effe ct		* show a white line on the left and bottom of the widget for a 3D effe ct
	* @return true if frame show be draw		* @return true if frame show be draw
	* @since 4.3		* @since 4.3
	*/		*/
	bool thinFrame() const;		bool thinFrame() const;
	/**		/**
	* Whether to stack the plots on top of each other. The first plot		* Whether to stack the plots on top of each other. The first plot
	* added will be at the bottom. The next plot will be drawn on top,		* added will be at the bottom. The next plot will be drawn on top,
	* and so on.		* and so on.
	* @param stack true if the plots should be stacked		* @param stack true if the plots should be stacked
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	slavebase.h		slavebase.h
	skipping to change at line 376		skipping to change at line 376
	*		*
	* When the slave was operating in connection-oriented mode,		* When the slave was operating in connection-oriented mode,
	* it should reset itself to connectionless (default) mode.		* it should reset itself to connectionless (default) mode.
	*/		*/
	virtual void closeConnection();		virtual void closeConnection();
	/**		/**
	* get, aka read.		* get, aka read.
	* @param url the full url for this request. Host, port and user of the URL		* @param url the full url for this request. Host, port and user of the URL
	* can be assumed to be the same as in the last setHost() call.		* can be assumed to be the same as in the last setHost() call.
	* The slave should first emit mimeType(), and then emit the data using		*
	the data() method.		* The slave should first "emit" the mimetype by calling mimeType(),
			* and then "emit" the data using the data() method.
			*
			* The reason why we need get() to emit the mimetype is:
			* when pasting a URL in krunner, or konqueror's location bar,
			* we have to find out what is the mimetype of that URL.
			* Rather than doing it with a call to mimetype(), then the app or part
			* would have to do a second request to the same server, this is done
			* like this: get() is called, and when it emits the mimetype, the job
			* is put on hold and the right app or part is launched. When that app
			* or part calls get(), the slave is magically reused, and the download
			* can now happen. All with a single call to get() in the slave.
			* This mechanism is also described in KIO::get().
	*/		*/
	virtual void get( const KUrl& url );		virtual void get( const KUrl& url );
	/**		/**
	* open.		* open.
	* @param url the full url for this request. Host, port and user of the URL		* @param url the full url for this request. Host, port and user of the URL
	* can be assumed to be the same as in the last setHost() call.		* can be assumed to be the same as in the last setHost() call.
	* @param mode see \ref QIODevice::OpenMode		* @param mode see \ref QIODevice::OpenMode
	*/		*/
	virtual void open( const KUrl &url, QIODevice::OpenMode mode );		virtual void open( const KUrl &url, QIODevice::OpenMode mode );
	skipping to change at line 469		skipping to change at line 482
	/**		/**
	* Rename @p oldname into @p newname.		* Rename @p oldname into @p newname.
	* If the slave returns an error ERR_UNSUPPORTED_ACTION, the job will		* If the slave returns an error ERR_UNSUPPORTED_ACTION, the job will
	* ask for copy + del instead.		* ask for copy + del instead.
	*		*
	* Important: the slave must implement the logic "if the destination al ready		* Important: the slave must implement the logic "if the destination al ready
	* exists, error ERR_DIR_ALREADY_EXIST or ERR_FILE_ALREADY_EXIST".		* exists, error ERR_DIR_ALREADY_EXIST or ERR_FILE_ALREADY_EXIST".
	* For performance reasons no stat is done in the destination before ha nd,		* For performance reasons no stat is done in the destination before ha nd,
	* the slave must do it.		* the slave must do it.
	*		*
			* By default, rename() is only called when renaming (moving) from
			* yourproto://host/path to yourproto://host/otherpath.
			*
			* If you set renameFromFile=true then rename() will also be called whe
			n
			* moving a file from file:///path to yourproto://host/otherpath.
			* Otherwise such a move would have to be done the slow way (copy+delet
			e).
			* See KProtocolManager::canRenameFromFile() for more details.
			*
			* If you set renameToFile=true then rename() will also be called when
			* moving a file from yourproto: to file:.
			* See KProtocolManager::canRenameToFile() for more details.
			*
	* @param src where to move the file from		* @param src where to move the file from
	* @param dest where to move the file to		* @param dest where to move the file to
	* @param flags: We support Overwrite here		* @param flags: We support Overwrite here
	*/		*/
	virtual void rename( const KUrl& src, const KUrl& dest, JobFlags flags );		virtual void rename( const KUrl& src, const KUrl& dest, JobFlags flags );
	/**		/**
	* Creates a symbolic link named @p dest, pointing to @p target, which		* Creates a symbolic link named @p dest, pointing to @p target, which
	* may be a relative or an absolute path.		* may be a relative or an absolute path.
	* @param target The string that will become the "target" of the link ( can be relative)		* @param target The string that will become the "target" of the link ( can be relative)
	skipping to change at line 507		skipping to change at line 532
	* Sets the modification time for @url		* Sets the modification time for @url
	* For instance this is what CopyJob uses to set mtime on dirs at the e nd of a copy.		* For instance this is what CopyJob uses to set mtime on dirs at the e nd of a copy.
	* It could also be used to set the mtime on any file, in theory.		* It could also be used to set the mtime on any file, in theory.
	* The usual implementation on unix is to call utime(path, &myutimbuf).		* The usual implementation on unix is to call utime(path, &myutimbuf).
	* The slave emits ERR_DOES_NOT_EXIST or ERR_CANNOT_SETTIME		* The slave emits ERR_DOES_NOT_EXIST or ERR_CANNOT_SETTIME
	*/		*/
	virtual void setModificationTime( const KUrl& url, const QDateTime& mti me );		virtual void setModificationTime( const KUrl& url, const QDateTime& mti me );
	/**		/**
	* Copy @p src into @p dest.		* Copy @p src into @p dest.
			*
			* By default, copy() is only called when copying a file from
			* yourproto://host/path to yourproto://host/otherpath.
			*
			* If you set copyFromFile=true then copy() will also be called when
			* moving a file from file:///path to yourproto://host/otherpath.
			* Otherwise such a copy would have to be done the slow way (get+put).
			* See also KProtocolManager::canCopyFromFile().
			*
			* If you set copyToFile=true then copy() will also be called when
			* moving a file from yourproto: to file:.
			* See also KProtocolManager::canCopyToFile().
			*
	* If the slave returns an error ERR_UNSUPPORTED_ACTION, the job will		* If the slave returns an error ERR_UNSUPPORTED_ACTION, the job will
	* ask for get + put instead.		* ask for get + put instead.
	* @param src where to copy the file from (decoded)		* @param src where to copy the file from (decoded)
	* @param dest where to copy the file to (decoded)		* @param dest where to copy the file to (decoded)
	* @param permissions may be -1. In this case no special permission mod e is set.		* @param permissions may be -1. In this case no special permission mod e is set.
	* @param flags: We support Overwrite here		* @param flags: We support Overwrite here
	*		*
	* Don't forget to set the modification time of @p dest to be the modif ication time of @p src.		* Don't forget to set the modification time of @p dest to be the modif ication time of @p src.
	*/		*/
	virtual void copy( const KUrl &src, const KUrl &dest, int permissions, JobFlags flags );		virtual void copy( const KUrl &src, const KUrl &dest, int permissions, JobFlags flags );
	/**		/**
	* Delete a file or directory.		* Delete a file or directory.
	* @param url file/directory to delete		* @param url file/directory to delete
	* @param isfile if true, a file should be deleted.		* @param isfile if true, a file should be deleted.
	* if false, a directory should be deleted.		* if false, a directory should be deleted.
			*
			* By default, del() on a directory should FAIL if the directory is not
			empty.
			* However, if metadata("recurse") == "true", then the slave can do a r
			ecursive deletion.
			* This behavior is only invoked if the slave specifies deleteRecursive
			=true in its protocol file.
	*/		*/
	virtual void del( const KUrl &url, bool isfile);		virtual void del( const KUrl &url, bool isfile);
	// TODO KDE4: use setLinkDest for kio_file but also kio_remote (#97129)
	// For kio_file it's the same as del+symlink, but for kio_remote it all
	ows
	// to keep the icon etc.
	/**		/**
	* Change the destination of a symlink		* Change the destination of a symlink
	* @param url the url of the symlink to modify		* @param url the url of the symlink to modify
	* @param target the new destination (target) of the symlink		* @param target the new destination (target) of the symlink
	*/		*/
	virtual void setLinkDest( const KUrl& url, const QString& target );		virtual void setLinkDest( const KUrl& url, const QString& target );
	/**		/**
	* Used for any command that is specific to this slave (protocol)		* Used for any command that is specific to this slave (protocol)
	* Examples are : HTTP POST, mount and unmount (kio_file)		* Examples are : HTTP POST, mount and unmount (kio_file)
	skipping to change at line 833		skipping to change at line 871
	* Name of the protocol supported by this slave		* Name of the protocol supported by this slave
	*/		*/
	QByteArray mProtocol;		QByteArray mProtocol;
	//Often used by TcpSlaveBase and unlikely to change		//Often used by TcpSlaveBase and unlikely to change
	MetaData mOutgoingMetaData;		MetaData mOutgoingMetaData;
	MetaData mIncomingMetaData;		MetaData mIncomingMetaData;
	virtual void virtual_hook( int id, void* data );		virtual void virtual_hook( int id, void* data );
	private:		private:
			#if 0 // TODO KDE5: enable
			// This helps catching missing tr() calls in error().
			void error( int _errid, const QByteArray &_text );
			#endif
	void send(int cmd, const QByteArray& arr = QByteArray());		void send(int cmd, const QByteArray& arr = QByteArray());
	SlaveBasePrivate* const d;		SlaveBasePrivate* const d;
	friend class SlaveBasePrivate;		friend class SlaveBasePrivate;
	};		};
	}		}
	#endif		#endif
End of changes. 6 change blocks.
	7 lines changed or deleted		52 lines changed or added

	smartrange.h		smartrange.h
	skipping to change at line 364		skipping to change at line 364
	* \param range to seach backwards from		* \param range to seach backwards from
	*		*
	* \return the range before \p range if one exists, otherwise null.		* \return the range before \p range if one exists, otherwise null.
	*/		*/
	SmartRange* childBefore( const SmartRange * range ) const;		SmartRange* childBefore( const SmartRange * range ) const;
	/**		/**
	* Find the child after \p range, if any.		* Find the child after \p range, if any.
	* The order is determined by the range end-cursors.		* The order is determined by the range end-cursors.
	*		*
	* \param range to seach backwards from		* \param range to seach forwards from
	*		*
	* \return the range before \p range if one exists, otherwise null.		* \return the range after \p range if one exists, otherwise null.
	*/		*/
	SmartRange* childAfter( const SmartRange * range ) const;		SmartRange* childAfter( const SmartRange * range ) const;
	/**		/**
	* Finds the most specific range in a heirachy for the given input rang e		* Finds the most specific range in a heirachy for the given input rang e
	* (ie. the smallest range which wholly contains the input range)		* (ie. the smallest range which wholly contains the input range)
	*		*
	* In case of overlaps, the smallest containing range is chosen,		* In case of overlaps, the smallest containing range is chosen,
	* if there are multiple of the same size, then the first one.		* if there are multiple of the same size, then the first one.
	*		*
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	speller.h		speller.h
	// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*-		// -*- Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil; -*-
	/**		/*
	*		*
	* Copyright (C) 2007 Zack Rusin <zack@kde.org>		* Copyright (C) 2007 Zack Rusin <zack@kde.org>
	*		*
	* This library is free software; you can redistribute it and/or		* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public		* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either		* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.		* version 2.1 of the License, or (at your option) any later version.
	*		*
	* This library is distributed in the hope that it will be useful,		* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	spinbox.h		spinbox.h
	skipping to change at line 87		skipping to change at line 87
	/**		/**
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this SpinBox		* @return the native widget wrapped by this SpinBox
	*/		*/
	KIntSpinBox *nativeWidget() const;		KIntSpinBox *nativeWidget() const;
			protected:
			void changeEvent(QEvent *event);
			void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
			void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
			void resizeEvent(QGraphicsSceneResizeEvent *event);
			void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, Q
			Widget *widget);
	public Q_SLOTS:		public Q_SLOTS:
	/**		/**
	* Sets the maximum value the slider can take.		* Sets the maximum value the slider can take.
	*/		*/
	void setMaximum(int maximum);		void setMaximum(int maximum);
	/**		/**
	* Sets the minimum value the slider can take.		* Sets the minimum value the slider can take.
	*/		*/
	void setMinimum(int minimum);		void setMinimum(int minimum);
End of changes. 1 change blocks.
	0 lines changed or deleted		8 lines changed or added

	svgwidget.h		svgwidget.h
	skipping to change at line 61		skipping to change at line 61
	Svg *svg() const;		Svg *svg() const;
	void setElementID(const QString &elementID);		void setElementID(const QString &elementID);
	QString elementID() const;		QString elementID() const;
	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;
	private:		private:
	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		1 lines changed or added

	tabbar.h		tabbar.h
	skipping to change at line 76		skipping to change at line 76
	* Adds a new tab in the desired position		* Adds a new tab in the desired position
	*		*
	* @arg index the position where to insert the new tab,		* @arg index the position where to insert the new tab,
	* if index <=0 will be the first position,		* if index <=0 will be the first position,
	* if index >= count() will be the last		* if index >= count() will be the last
	* @arg icon the icon for this tab		* @arg icon the icon for this tab
	* @arg label the text label of the tab		* @arg label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @arg content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	int insertTab(int index, const QIcon &icon, const QString &label,		Q_INVOKABLE int insertTab(int index, const QIcon &icon, const QString &
	QGraphicsLayoutItem *content = 0);		label,
			QGraphicsLayoutItem *content = 0);
	/**		/**
	* Adds a new tab in the desired position		* Adds a new tab in the desired position
	* This is an overloaded member provided for convenience		* This is an overloaded member provided for convenience
	* equivalent to insertTab(index, QIcon(), label);		* equivalent to insertTab(index, QIcon(), label);
	*		*
	* @arg index the position where to insert the new tab,		* @arg index the position where to insert the new tab,
	* if index <=0 will be the first position,		* if index <=0 will be the first position,
	* if index >= count() will be the last		* if index >= count() will be the last
	* @arg label the text label of the tab		* @arg label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @arg content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	int insertTab(int index, const QString &label, QGraphicsLayoutItem *con tent = 0);		Q_INVOKABLE int insertTab(int index, const QString &label, QGraphicsLay outItem *content = 0);
	/**		/**
	* Adds a new tab in the last position		* Adds a new tab in the last position
	*		*
	* @arg icon the icon for this tab		* @arg icon the icon for this tab
	* @arg label the text label of the tab		* @arg label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @arg content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	int addTab(const QIcon &icon, const QString &label, QGraphicsLayoutItem *content = 0);		Q_INVOKABLE int addTab(const QIcon &icon, const QString &label, QGraphi csLayoutItem *content = 0);
	/**		/**
	* Adds a new tab in the last position		* Adds a new tab in the last position
	* This is an overloaded member provided for convenience		* This is an overloaded member provided for convenience
	* equivalent to addTab(QIcon(), label, page)		* equivalent to addTab(QIcon(), label, page)
	*		*
	* @arg label the text label of the tab		* @arg label the text label of the tab
	* @arg content the page content that will be shown by this tab		* @arg content the page content that will be shown by this tab
	* @return the index of the inserted tab		* @return the index of the inserted tab
	*/		*/
	int addTab(const QString &label, QGraphicsLayoutItem *content = 0);		Q_INVOKABLE int addTab(const QString &label, QGraphicsLayoutItem *conte nt = 0);
	/**		/**
	* Removes a tab		* Removes a tab, contents are deleted
	*		*
	* @arg index the index of the tab to remove		* @arg index the index of the tab to remove
	*/		*/
	void removeTab(int index);		Q_INVOKABLE void removeTab(int index);
			/**
			* Removes a tab, the page is reparented to 0 and is returned
			*
			* @arg index the index of the tab to remove
			* @since 4.4
			*/
			Q_INVOKABLE QGraphicsLayoutItem *takeTab(int index);
			/**
			* Returns the contents of a page
			*
			* @arg index the index of the tab to retrieve
			* @since 4.4
			*/
			Q_INVOKABLE QGraphicsLayoutItem *tabAt(int index);
	/**		/**
	* @return the index of the tab currently active		* @return the index of the tab currently active
	*/		*/
	int currentIndex() const;		int currentIndex() const;
	/**		/**
	* @return the number of tabs in this tabbar		* @return the number of tabs in this tabbar
	*/		*/
	int count() const;		int count() const;
	/**		/**
	* Sets the text label of the given tab		* Sets the text label of the given tab
	*		*
	* @arg index the index of the tab to modify		* @arg index the index of the tab to modify
	* @arg label the new text label of the given tab		* @arg label the new text label of the given tab
	*/		*/
	void setTabText(int index, const QString &label);		Q_INVOKABLE void setTabText(int index, const QString &label);
	/**		/**
	* @return the text label of the given tab		* @return the text label of the given tab
	*		*
	* @arg index the index of the tab we want to know its label		* @arg index the index of the tab we want to know its label
	*/		*/
	QString tabText(int index) const;		Q_INVOKABLE QString tabText(int index) const;
	/**		/**
	* Sets an icon for a given tab		* Sets an icon for a given tab
	*		*
	* @arg index the index of the tab to modify		* @arg index the index of the tab to modify
	* @arg icon the new icon for the given tab		* @arg icon the new icon for the given tab
	*/		*/
	void setTabIcon(int index, const QIcon &icon);		Q_INVOKABLE void setTabIcon(int index, const QIcon &icon);
	/**		/**
	* @return the current icon for a given tab		* @return the current icon for a given tab
	*		*
	* @arg index the index of the tab we want to know its icon		* @arg index the index of the tab we want to know its icon
	*/		*/
	QIcon tabIcon(int index) const;		Q_INVOKABLE QIcon tabIcon(int index) const;
	/**		/**
	* shows or hides the tabbar, used if you just want to display the		* shows or hides the tabbar, used if you just want to display the
	* pages, when the tabbar doesn't have content pages at all this		* pages, when the tabbar doesn't have content pages at all this
	* function has no effect		* function has no effect
	*		*
	* @arg show true if we want to show the tabbar		* @arg show true if we want to show the tabbar
	* @since 4.3		* @since 4.3
	*/		*/
	void setTabBarShown(bool show);		void setTabBarShown(bool show);
	skipping to change at line 213		skipping to change at line 229
	/**		/**
	* Emitted when the active tab changes		* Emitted when the active tab changes
	*		*
	* @arg index the newly activated tab		* @arg index the newly activated tab
	*/		*/
	void currentChanged(int index);		void currentChanged(int index);
	protected:		protected:
	void wheelEvent(QGraphicsSceneWheelEvent *event);		void wheelEvent(QGraphicsSceneWheelEvent *event);
	void resizeEvent(QGraphicsSceneResizeEvent * event);		void resizeEvent(QGraphicsSceneResizeEvent * event);
			void changeEvent(QEvent *event);
	private:		private:
	TabBarPrivate * const d;		TabBarPrivate * const d;
			friend class TabBarPrivate;
	Q_PRIVATE_SLOT(d, void slidingCompleted(QGraphicsItem *item))		Q_PRIVATE_SLOT(d, void slidingCompleted(QGraphicsItem *item))
	Q_PRIVATE_SLOT(d, void shapeChanged(const QTabBar::Shape shape))		Q_PRIVATE_SLOT(d, void shapeChanged(const QTabBar::Shape shape))
			Q_PRIVATE_SLOT(d, void setPalette())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 13 change blocks.
	11 lines changed or deleted		32 lines changed or added

	textbrowser.h		textbrowser.h
	skipping to change at line 48		skipping to change at line 48
	* @short Provides a plasma-themed KTextBrowser.		* @short Provides a plasma-themed KTextBrowser.
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	class PLASMA_EXPORT TextBrowser : public QGraphicsProxyWidget		class PLASMA_EXPORT TextBrowser : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)		Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
	Q_PROPERTY(QString stylesheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KTextBrowser *nativeWidget READ nativeWidget)		Q_PROPERTY(KTextBrowser *nativeWidget READ nativeWidget)
	public:		public:
	explicit TextBrowser(QGraphicsWidget *parent = 0);		explicit TextBrowser(QGraphicsWidget *parent = 0);
	~TextBrowser();		~TextBrowser();
	/**		/**
	* Sets the display text for this TextBrowser		* Sets the display text for this TextBrowser
	*		*
	* @arg text the text to display; should be translated.		* @arg text the text to display; should be translated.
	skipping to change at line 95		skipping to change at line 95
	* @return the stylesheet currently used with this widget		* @return the stylesheet currently used with this widget
	*/		*/
	QString styleSheet();		QString styleSheet();
	/**		/**
	* @return the native widget wrapped by this TextBrowser		* @return the native widget wrapped by this TextBrowser
	*/		*/
	KTextBrowser *nativeWidget() const;		KTextBrowser *nativeWidget() const;
	public Q_SLOTS:		public Q_SLOTS:
			/**
			* Allows appending text to the text browser
			* @since 4.4
			*/
			void append(const QString &text);
	void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);		void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);
	Q_SIGNALS:		Q_SIGNALS:
	void textChanged();		void textChanged();
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	void wheelEvent(QGraphicsSceneWheelEvent *event);		void wheelEvent(QGraphicsSceneWheelEvent *event);
			void changeEvent(QEvent *event);
			void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
	private:		private:
	TextBrowserPrivate * const d;		TextBrowserPrivate * const d;
	Q_PRIVATE_SLOT(d, void setFixedHeight())		Q_PRIVATE_SLOT(d, void setFixedHeight())
			Q_PRIVATE_SLOT(d, void setPalette())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 4 change blocks.
	1 lines changed or deleted		10 lines changed or added

	textedit.h		textedit.h
	skipping to change at line 46		skipping to change at line 46
	* @class TextEdit plasma/widgets/textedit.h <Plasma/Widgets/TextEdit>		* @class TextEdit plasma/widgets/textedit.h <Plasma/Widgets/TextEdit>
	*		*
	* @short Provides a plasma-themed KTextEdit.		* @short Provides a plasma-themed KTextEdit.
	*/		*/
	class PLASMA_EXPORT TextEdit : public QGraphicsProxyWidget		class PLASMA_EXPORT TextEdit : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)		Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)
	Q_PROPERTY(QString stylesheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KTextEdit *nativeWidget READ nativeWidget)		Q_PROPERTY(KTextEdit *nativeWidget READ nativeWidget WRITE setNativeWid
			get)
			Q_PROPERTY(bool readOnly READ isReadOnly WRITE setReadOnly)
	public:		public:
	explicit TextEdit(QGraphicsWidget *parent = 0);		explicit TextEdit(QGraphicsWidget *parent = 0);
	~TextEdit();		~TextEdit();
	/**		/**
	* Sets the display text for this TextEdit		* Sets the display text for this TextEdit
	*		*
	* @arg text the text to display; should be translated.		* @arg text the text to display; should be translated.
	*/		*/
	void setText(const QString &text);		void setText(const QString &text);
	/**		/**
	* @return the display text		* @return the display text
	*/		*/
	QString text() const;		QString text() const;
	/**		/**
			* Sets the text area to be read only or interactive
			* @arg true to make it read only, false for interactive
			* @since 4.4
			*/
			void setReadOnly(bool readOnly);
			/**
			* @return true if the text area is non-interacive
			*/
			bool isReadOnly() const;
			/**
	* Sets the stylesheet used to control the visual display of this TextE dit		* Sets the stylesheet used to control the visual display of this TextE dit
	*		*
	* @arg stylesheet a CSS string		* @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();
	/**		/**
			* Sets the text edit wrapped by this TextEdit (widget must inherit KTe
			xtEdit), ownership is transferred to the TextEdit
			*
			* @arg text edit that will be wrapped by this TextEdit
			* @since KDE4.4
			*/
			void setNativeWidget(KTextEdit *nativeWidget);
			/**
	* @return the native widget wrapped by this TextEdit		* @return the native widget wrapped by this TextEdit
	*/		*/
	KTextEdit *nativeWidget() const;		KTextEdit *nativeWidget() const;
	public Q_SLOTS:		public Q_SLOTS:
			/**
			* Allows appending text to the text browser
			* @since 4.4
			*/
			void append(const QString &text);
	void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);		void dataUpdated(const QString &sourceName, const Plasma::DataEngine::D ata &data);
	Q_SIGNALS:		Q_SIGNALS:
	void textChanged();		void textChanged();
	protected:		protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
			void changeEvent(QEvent *event);
			void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
	private:		private:
	TextEditPrivate * const d;		TextEditPrivate * const d;
			Q_PRIVATE_SLOT(d, void setPalette())
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // multiple inclusion guard		#endif // multiple inclusion guard
End of changes. 6 change blocks.
	2 lines changed or deleted		34 lines changed or added

	theme.h		theme.h
	skipping to change at line 68		skipping to change at line 68
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QString themeName READ themeName)		Q_PROPERTY(QString themeName READ themeName)
	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 */
			VisitedLinkColor = 32 /** color visited clickable links */
	};		};
	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 130		skipping to change at line 132
	/**		/**
	* Retrieve the path for an SVG image in the current theme.		* Retrieve the path for an SVG image in the current theme.
	*		*
	* @arg name the name of the file in the theme directory (without t he		* @arg name the name of the file in the theme directory (without t he
	* ".svg" part or a leading slash)		* ".svg" part or a leading slash)
	* @return the full path to the requested file for the current them e		* @return the full path to the requested file for the current them e
	*/		*/
	Q_INVOKABLE QString imagePath(const QString &name) const;		Q_INVOKABLE QString imagePath(const QString &name) const;
	/**		/**
	* Retreives the default wallpaper associated with this theme.		* Retrieves the default wallpaper associated with this theme.
	*		*
	* @arg size the target height and width of the wallpaper; if an in valid size		* @arg size the target height and width of the wallpaper; if an in valid size
	* is passed in, then a default size will be provided ins tead.		* is passed in, then a default size will be provided ins tead.
	* @return the full path to the wallpaper image		* @return the full path to the wallpaper image
	*/		*/
	Q_INVOKABLE QString wallpaperPath(const QSize &size = QSize()) cons t;		Q_INVOKABLE QString wallpaperPath(const QSize &size = QSize()) cons t;
	/**		/**
	* Checks if this theme has an image named in a certain way		* Checks if this theme has an image named in a certain way
	*		*
End of changes. 2 change blocks.
	2 lines changed or deleted		4 lines changed or added

	thing.h		thing.h
	skipping to change at line 161		skipping to change at line 161
	*		*
	* \sa pimo:groundingResource		* \sa pimo:groundingResource
	*/		*/
	QList<Resource> groundingOccurrences() const;		QList<Resource> groundingOccurrences() const;
	QList<Resource> referencingOccurrences() const;		QList<Resource> referencingOccurrences() const;
	QList<Resource> occurrences() const;		QList<Resource> occurrences() const;
	/**		/**
			* Add a grounding occurrence for this Thing.
			* Grounding resources are physical representations
			* of the Thing.
			*
			* An example is an mp3 file which represents an audio track
			* or a website which represents a company or a person. Or the
			* addressbook entry for an abstract person thing.
			*
			* \sa pimo:groundingResource
			*/
			void addGroundingOccurrence( const Resource &res );
			/**
	* Merges two Things that represent the same real-world		* Merges two Things that represent the same real-world
	* entity.		* entity.
	*		*
	* \param other The Thing that should be merged into this		* \param other The Thing that should be merged into this
	* Thing.		* Thing.
	*		*
	* All properties of \p other will be merged into this		* All properties of \p other will be merged into this
	* Thing and all references to \p other will be replaced		* Thing and all references to \p other will be replaced
	* with references to this Thing.		* with references to this Thing.
	*/		*/
End of changes. 1 change blocks.
	0 lines changed or deleted		13 lines changed or added

	thumbcreator.h		thumbcreator.h
	skipping to change at line 94		skipping to change at line 94
	* naming all mimetypes your ThumbCreator supports. You can also use simple		* naming all mimetypes your ThumbCreator supports. You can also use simple
	* wildcards, like (where you see [slash], put a /)		* wildcards, like (where you see [slash], put a /)
	* \code		* \code
	* text[slash]* or image[slash]*.		* text[slash]* or image[slash]*.
	* \endcode		* \endcode
	*		*
	* If your plugin is rather inexpensive (e.g. like the text preview ThumbCr eator),		* If your plugin is rather inexpensive (e.g. like the text preview ThumbCr eator),
	* you can set CacheThumbnail=false to prevent your thumbnails from being c ached		* you can set CacheThumbnail=false to prevent your thumbnails from being c ached
	* on disk.		* on disk.
	*		*
			* The following optional property can also be added to the .desktop file:
			* \code
			* ThumbnailerVersion=N
			* \endcode
			* where N is some nonnegative integer. If a cached thumbnail has been crea
			ted with a
			* previous version of the thumbnailer, then the cached thumbnail will be d
			iscarded and
			* a new one will be regenerated. Increase (or define) the version number i
			f and only if
			* old thumbnails need to be regenerated.
			* If no version number is provided, then the version is assumed to be <0.
			*
	* @short Baseclass for thumbnail-generating plugins.		* @short Baseclass for thumbnail-generating plugins.
	*/		*/
	class KIO_EXPORT ThumbCreator		class KIO_EXPORT ThumbCreator
	{		{
	public:		public:
	/**		/**
	* The flags of this plugin.		* The flags of this plugin.
	* @see flags()		* @see flags()
	*/		*/
	enum Flags { None = 0, DrawFrame = 1, BlendIcon = 2 };		enum Flags { None = 0, DrawFrame = 1, BlendIcon = 2 };
End of changes. 1 change blocks.
	0 lines changed or deleted		13 lines changed or added

	thumbsequencecreator.h		thumbsequencecreator.h
	skipping to change at line 33		skipping to change at line 33
	#include "thumbcreator.h"		#include "thumbcreator.h"
	/**		/**
	* @see ThumbCreator		* @see ThumbCreator
	*		*
	* This is an extension of ThumbCreator that allows creating a thumbnail se quence for		* This is an extension of ThumbCreator that allows creating a thumbnail se quence for
	* a file. If your thumbnail plugin can create a thumbnail sequence, you sh ould base it		* a file. If your thumbnail plugin can create a thumbnail sequence, you sh ould base it
	* on ThumbSequenceCreator instead of ThumbCreator, and should use sequence Index()		* on ThumbSequenceCreator instead of ThumbCreator, and should use sequence Index()
	* to decide what thumbnail you generate.		* to decide what thumbnail you generate.
	*		*
			* You also need to set the following key in the thumbcreator .desktop file
			* \code
			* HandleSequences=true;
			* \endcode
			*
	* @since 4.3		* @since 4.3
	*/		*/
	class KIO_EXPORT ThumbSequenceCreator : public ThumbCreator		class KIO_EXPORT ThumbSequenceCreator : public ThumbCreator
	{		{
	public:		public:
	Q_DISABLE_COPY(ThumbSequenceCreator)		Q_DISABLE_COPY(ThumbSequenceCreator)
	ThumbSequenceCreator();		ThumbSequenceCreator();
	virtual ~ThumbSequenceCreator();		virtual ~ThumbSequenceCreator();
	/**		/**
End of changes. 1 change blocks.
	0 lines changed or deleted		5 lines changed or added

	toolbutton.h		toolbutton.h
	skipping to change at line 47		skipping to change at line 47
	* @short Provides a plasma-themed QToolButton.		* @short Provides a plasma-themed QToolButton.
	*/		*/
	class PLASMA_EXPORT ToolButton : public QGraphicsProxyWidget		class PLASMA_EXPORT ToolButton : public QGraphicsProxyWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)		Q_PROPERTY(QGraphicsWidget *parentWidget READ parentWidget)
	Q_PROPERTY(QString text READ text WRITE setText)		Q_PROPERTY(QString text READ text WRITE setText)
	Q_PROPERTY(bool autoRaise READ autoRaise WRITE setAutoRaise)		Q_PROPERTY(bool autoRaise READ autoRaise WRITE setAutoRaise)
	Q_PROPERTY(QString image READ image WRITE setImage)		Q_PROPERTY(QString image READ image WRITE setImage)
	Q_PROPERTY(QString stylesheet READ styleSheet WRITE setStyleSheet)		Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QToolButton *nativeWidget READ nativeWidget)		Q_PROPERTY(QToolButton *nativeWidget READ nativeWidget)
	Q_PROPERTY(QAction *action READ action WRITE setAction)		Q_PROPERTY(QAction *action READ action WRITE setAction)
	public:		public:
	explicit ToolButton(QGraphicsWidget *parent = 0);		explicit ToolButton(QGraphicsWidget *parent = 0);
	~ToolButton();		~ToolButton();
	/**		/**
	* Sets if the toolbutton has an autoraise behaviour		* Sets if the toolbutton has an autoraise behaviour
	*		*
	skipping to change at line 87		skipping to change at line 87
	QString text() const;		QString text() const;
	/**		/**
	* Sets the path to an image to display.		* Sets the path to an image to display.
	*		*
	* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.		* @arg path the path to the image; if a relative path, then a themed i mage will be loaded.
	*/		*/
	void setImage(const QString &path);		void setImage(const QString &path);
	/**		/**
			* Sets the path to an svg image to display and the id of the used svg
			element, if necessary.
			*
			* @arg path the path to the image; if a relative path, then a themed i
			mage will be loaded.
			* @arg elementid the id of a svg element.
			*
			* @since 4.4
			*/
			void setImage(const QString &path, const QString &elementid);
			/**
	* @return the image path being displayed currently, or an empty string if none.		* @return the image path being displayed currently, or an empty string if none.
	*/		*/
	QString image() const;		QString image() const;
	/**		/**
			* @return true if the button is pressed down
			* @since 4.4
			*/
			bool isDown() const;
			/**
	* Sets the stylesheet used to control the visual display of this ToolB utton		* Sets the stylesheet used to control the visual display of this ToolB utton
	*		*
	* @arg stylesheet a CSS string		* @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 142		skipping to change at line 158
	*/		*/
	QIcon icon() const;		QIcon icon() const;
	/**		/**
	* @return the native widget wrapped by this ToolButton		* @return the native widget wrapped by this ToolButton
	*/		*/
	QToolButton *nativeWidget() const;		QToolButton *nativeWidget() const;
	Q_SIGNALS:		Q_SIGNALS:
	void clicked();		void clicked();
			/**
			* @since 4.4
			*/
			void pressed();
			/**
			* @since 4.4
			*/
			void released();
	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);
			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 animationUpdate(qreal progress))		Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress))
	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())
	friend class ToolButtonPrivate;		friend class ToolButtonPrivate;
	ToolButtonPrivate *const d;		ToolButtonPrivate *const d;
End of changes. 5 change blocks.
	1 lines changed or deleted		29 lines changed or added

	tooltipcontent.h		tooltipcontent.h
	skipping to change at line 51		skipping to change at line 51
	namespace Plasma		namespace Plasma
	{		{
	class ToolTipContentPrivate;		class ToolTipContentPrivate;
	class PLASMA_EXPORT ToolTipContent		class PLASMA_EXPORT ToolTipContent
	{		{
	public:		public:
	enum ResourceType { ImageResource = 0, HtmlResource, CssResource };		enum ResourceType { ImageResource = 0, HtmlResource, CssResource };
	/** Creates an empty Content */		/**
			* Creates an empty Content
			*/
	ToolTipContent();		ToolTipContent();
	~ToolTipContent();		~ToolTipContent();
	/** Copy constructor */		/**
			* Copy constructor
			*/
	ToolTipContent(const ToolTipContent &other);		ToolTipContent(const ToolTipContent &other);
	/** Constructor that sets the common fields */		/**
			* Constructor that sets the common fields
			*/
	ToolTipContent(const QString &mainText,		ToolTipContent(const QString &mainText,
	const QString &subText,		const QString &subText,
	const QPixmap &image = QPixmap());		const QPixmap &image = QPixmap());
	/** Constructor that sets the common fields */		/**
			* Constructor that sets the common fields
			*/
	ToolTipContent(const QString &mainText,		ToolTipContent(const QString &mainText,
	const QString &subText,		const QString &subText,
	const QIcon &icon);		const QIcon &icon);
	ToolTipContent &operator=(const ToolTipContent &other);		ToolTipContent &operator=(const ToolTipContent &other);
	/** @return true if all the fields are empty */		/**
			* @return true if all the fields are empty
			*/
	bool isEmpty() const;		bool isEmpty() const;
	/** Sets the main text which containts important information, e.g. the		/**
	title */		* Sets the main text which containts important information, e.g. the t
			itle
			*/
	void setMainText(const QString &text);		void setMainText(const QString &text);
	/** Important information, e.g. the title */		/**
			* Important information, e.g. the title
			*/
	QString mainText() const;		QString mainText() const;
	/** Sets text which elaborates on the @p mainText */		/**
			* Sets text which elaborates on the @p mainText
			*/
	void setSubText(const QString &text) ;		void setSubText(const QString &text) ;
	/** Elaborates on the @p mainText */		/**
			* Elaborates on the @p mainText
			*/
	QString subText() const;		QString subText() const;
	/** Sets the icon to show **/		/**
			* Sets the icon to show
			*/
	void setImage(const QPixmap &image);		void setImage(const QPixmap &image);
	/** Sets the icon to show **/		/**
			* Sets the icon to show
			*/
	void setImage(const QIcon &icon);		void setImage(const QIcon &icon);
	/** An icon to display */		/**
			* An icon to display
			*/
	QPixmap image() const;		QPixmap image() const;
	//BIC FIXME: remove when we can break BC		/**
	/** Sets the ID of the window to show a preview for */		* Sets the ID of the window to show a preview for.
			* @deprecated
			* @see setWindowsToPreview
			*/
	void setWindowToPreview(WId id);		void setWindowToPreview(WId id);
	//BIC FIXME: remove when we can break BC		/**
	/** Id of a window if you want to show a preview */		* Id of a window if you want to show a preview
			* @deprecated
			* @see windowsToPreview
			*/
	WId windowToPreview() const;		WId windowToPreview() const;
	/** Sets the IDS of the windows to show a preview for		/**
	@since 4.3*/		* Sets the IDS of the windows to show a preview for
			* @since 4.3
			*/
	void setWindowsToPreview(const QList<WId> &ids);		void setWindowsToPreview(const QList<WId> &ids);
	/** Ids of a windows if you want to show a preview		/**
	@since 4.3*/		* Ids of a windows if you want to show a preview
			* @since 4.3
			*/
	QList<WId> windowsToPreview() const;		QList<WId> windowsToPreview() const;
	/** Sets whether or not to autohide the tooltip, defaults to true */		/**
			* sets if when the mouse will be over a thumbnail the corresponding wi
			ndow
			* will be highlighted by reducing opacity of all the other windows
			* @since 4.4
			*/
			void setHighlightWindows(bool highlight);
			/**
			* true if when the mouse will be over a thumbnail the corresponding wi
			ndow
			* will be highlighted by reducing opacity of all the other windows
			* @since 4.4
			*/
			bool highlightWindows() const;
			/** Sets whether or not to autohide the tooltip, defaults to true
			*/
	void setAutohide(bool autohide);		void setAutohide(bool autohide);
	/** Whether or not to autohide the tooltip, defaults to true */		/**
			* Whether or not to autohide the tooltip, defaults to true
			*/
	bool autohide() const;		bool autohide() const;
	/** Adds a resource that can then be referenced from the text elements		/**
	using rich text **/		* Adds a resource that can then be referenced from the text elements
			* using rich text
			*/
	void addResource(ResourceType type, const QUrl &path, const QVariant &r esource);		void addResource(ResourceType type, const QUrl &path, const QVariant &r esource);
	/** Registers all resources with a given document */		/**
			* Registers all resources with a given document
			*/
	void registerResources(QTextDocument *document) const;		void registerResources(QTextDocument *document) const;
			/**
			* Sets whether or not the tooltip contains clickable content, such as
			* window previews. Defaults to false, or not clickable.
			*
			* @since 4.3
			*/
			void setClickable(bool clickable);
			/**
			* @return true if the tooltip is clickabel
			*
			* @since 4.3
			*/
			bool isClickable() const;
	private:		private:
	ToolTipContentPrivate * const d;		ToolTipContentPrivate * const d;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif		#endif
End of changes. 21 change blocks.
	26 lines changed or deleted		98 lines changed or added

	tooltipmanager.h		tooltipmanager.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU Lesser General Public		* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software		* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor,		* Foundation, Inc., 51 Franklin St, Fifth Floor,
	* Boston, MA 02110-1301 USA		* Boston, MA 02110-1301 USA
	*/		*/
	#ifndef PLASMA_TOOLTIP_MANAGER_H		#ifndef PLASMA_TOOLTIP_MANAGER_H
	#define PLASMA_TOOLTIP_MANAGER_H		#define PLASMA_TOOLTIP_MANAGER_H
	//plasma		#include <kurl.h>
	#include <plasma/plasma.h>		#include <plasma/plasma.h>
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	#include <plasma/tooltipcontent.h>		#include <plasma/tooltipcontent.h>
	namespace Plasma		namespace Plasma
	{		{
	class ToolTipManagerPrivate;		class ToolTipManagerPrivate;
	class Applet;		class Applet;
	class Corona;		class Corona;
	skipping to change at line 167		skipping to change at line 168
	* @see State		* @see State
	* @arg state the state to put the manager in		* @arg state the state to put the manager in
	*/		*/
	void setState(ToolTipManager::State state);		void setState(ToolTipManager::State state);
	/**		/**
	* @return the current state of the manager; @see State		* @return the current state of the manager; @see State
	*/		*/
	ToolTipManager::State state() const;		ToolTipManager::State state() const;
			Q_SIGNALS:
			/**
			* This signal is emitted when a window preview in the tooltip is click
			ed.
			* @arg window the id of the window that was clicked
			* @arg buttons the mouse buttons involved in the activation
			* @arg modifiers the keyboard modifiers involved in the activation, if
			any
			* @since 4.4
			*/
			void windowPreviewActivated(WId window, Qt::MouseButtons buttons, Qt::K
			eyboardModifiers modifiers,
			const QPoint &screenPos);
			/**
			* This signal is emitted when a link in the tooltip is clicked.
			* @arg anchor the achor text (e.g. url) that was clicked on
			* @arg buttons the mouse buttons involved in the activation
			* @arg modifiers the keyboard modifiers involved in the activation, if
			any
			* @since 4.4
			*/
			void linkActivated(const QString &anchor, Qt::MouseButtons buttons, Qt:
			:KeyboardModifiers modifiers,
			const QPoint &screenPos);
	private:		private:
	/**		/**
	* Default constructor.		* Default constructor.
	*		*
	* You should normall use self() instead.		* You should normall use self() instead.
	*/		*/
	explicit ToolTipManager(QObject *parent = 0);		explicit ToolTipManager(QObject *parent = 0);
	/**		/**
	* Default destructor.		* Default destructor.
	skipping to change at line 189		skipping to change at line 211
	friend class ToolTipManagerSingleton;		friend class ToolTipManagerSingleton;
	friend class Corona; // The corona needs to register itself		friend class Corona; // The corona needs to register itself
	friend class ToolTipManagerPrivate;		friend class ToolTipManagerPrivate;
	bool eventFilter(QObject *watched, QEvent *event);		bool eventFilter(QObject *watched, QEvent *event);
	ToolTipManagerPrivate *const d;		ToolTipManagerPrivate *const d;
	Corona* m_corona;		Corona* m_corona;
	Q_PRIVATE_SLOT(d, void showToolTip())		Q_PRIVATE_SLOT(d, void showToolTip())
			Q_PRIVATE_SLOT(d, void toolTipHovered(bool))
	Q_PRIVATE_SLOT(d, void resetShownState())		Q_PRIVATE_SLOT(d, void resetShownState())
	Q_PRIVATE_SLOT(d, void onWidgetDestroyed(QObject*))		Q_PRIVATE_SLOT(d, void onWidgetDestroyed(QObject*))
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // PLASMA_TOOL_TIP_MANAGER_H		#endif // PLASMA_TOOL_TIP_MANAGER_H
End of changes. 3 change blocks.
	1 lines changed or deleted		29 lines changed or added

	udsentry.h		udsentry.h
	skipping to change at line 216		skipping to change at line 216
	/// If set, contains the label to display instead of		/// If set, contains the label to display instead of
	/// the 'real name' in UDS_NAME		/// the 'real name' in UDS_NAME
	/// @since 4.1		/// @since 4.1
	UDS_DISPLAY_NAME = 22 | UDS_STRING,		UDS_DISPLAY_NAME = 22 | UDS_STRING,
	/// This file is a shortcut or mount, pointing to an		/// This file is a shortcut or mount, pointing to an
	/// URL in a different hierarchy		/// URL in a different hierarchy
	/// @since 4.1		/// @since 4.1
	UDS_TARGET_URL = 23 | UDS_STRING,		UDS_TARGET_URL = 23 | UDS_STRING,
			/// User-readable type of file (if not specified,
			/// the mimetype's description is used)
			/// @since 4.4
			UDS_DISPLAY_TYPE = 24 | UDS_STRING,
			/// The URI of the corresponding Nepomuk resource.
			/// KIO slaves can use this optional entry to provide
			/// client applications with a Nepomuk resource to be used
			/// for annotations like tags or ratings. A typical example
			/// is to provide the URI of the Nepomuk resource corresponding
			/// to a file in a search result
			/// Client applications should only provide annotations for
			/// entries that provide this URI
			///
			/// URIs need to be encoded using KUrl::url()
			///
			/// @since 4.4
			UDS_NEPOMUK_URI = 25 | 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		19 lines changed or added

	variant.h		variant.h
	/*		/*
	* This file is part of the Nepomuk KDE project.		* This file is part of the Nepomuk KDE project.
	* Copyright (C) 2006-2008 Sebastian Trueg <trueg@kde.org>		* Copyright (C) 2006-2009 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 52		skipping to change at line 52
	* Important differences are:		* Important differences are:
	* \li No new types can be added other than the ones that have defined		* \li No new types can be added other than the ones that have defined
	* constructors and get-methods		* constructors and get-methods
	* \li Variant supports automatic list generation. For example a Varian t		* \li Variant supports automatic list generation. For example a Varian t
	* containing an int also can produce an int-list via the toIntList		* containing an int also can produce an int-list via the toIntList
	* method.		* method.
	* \li toString and toStringList always return a valid list and do auto matic		* \li toString and toStringList always return a valid list and do auto matic
	* conversion from the actual type used in the Variant. Thus, if on e only		* conversion from the actual type used in the Variant. Thus, if on e only
	* needs to display the value in a Variant toString and toStringLis t		* needs to display the value in a Variant toString and toStringLis t
	* do the job.		* do the job.
			* \li Variant comes with direct support for Resource. There is one spe
			cial
			* thing about QUrl Variants though: for both isUrl() and
			* isResource() return \p true. However, toUrl() will return differ
			ent
			* values for Resource and for QUrl Variants: in the former case th
			e
			* actual Resource::resourceUri() is returned which can be differen
			t
			* in case of file:/ URLs.
	*		*
	* \author Sebastian Trueg <trueg@kde.org>		* \author Sebastian Trueg <trueg@kde.org>
	*/		*/
	class NEPOMUK_EXPORT Variant		class NEPOMUK_EXPORT Variant
	{		{
	public:		public:
	Variant();		Variant();
	~Variant();		~Variant();
	Variant( const Variant& other );		Variant( const Variant& other );
	skipping to change at line 218		skipping to change at line 224
	bool isDoubleList() const;		bool isDoubleList() const;
	bool isStringList() const;		bool isStringList() const;
	bool isDateList() const;		bool isDateList() const;
	bool isTimeList() const;		bool isTimeList() const;
	bool isDateTimeList() const;		bool isDateTimeList() const;
	bool isUrlList() const;		bool isUrlList() const;
	bool isResourceList() const;		bool isResourceList() const;
	QVariant variant() const;		QVariant variant() const;
			/**
			* Convert into an int value. Returns a valid value for
			* all decimal types.
			*
			* Will return the first value of an int list.
			*/
	int toInt() const;		int toInt() const;
			/**
			* Convert into a qlonglong value. Returns a valid value for
			* all decimal types.
			*
			* Will return the first value of a qlonglong list.
			*/
	qlonglong toInt64() const;		qlonglong toInt64() const;
			/**
			* Convert into a uint value. Returns a valid value for
			* all decimal types.
			*
			* Will return the first value of a uint list.
			*/
	uint toUnsignedInt() const;		uint toUnsignedInt() const;
			/**
			* Convert into a qulonglong value. Returns a valid value for
			* all decimal types.
			*
			* Will return the first value of a qulonglong list.
			*/
	qulonglong toUnsignedInt64() const;		qulonglong toUnsignedInt64() const;
			/**
			* Convert into a bool value.
			*
			* Will return the first value of a bool list.
			*/
	bool toBool() const;		bool toBool() const;
			/**
			* Convert into a double value.
			*
			* Will return the first value of a double list.
			*/
	double toDouble() const;		double toDouble() const;
	/**		/**
	* The toString() method is a little more powerful than other		* The toString() method is a little more powerful than other
	* toXXX methods since it actually converts all values to string.		* toXXX methods since it actually converts all values to string.
	* Thus, toString should work always (even list variants are conver ted		* Thus, toString should work always (even list variants are conver ted
	* to a comma-separated list)		* to a comma-separated list)
	*		*
	* Resources are converted to a string representation of their URI.		* Resources are converted to a string representation of their URI.
	*/		*/
	QString toString() const;		QString toString() const;
			/**
			* Convert into a QDate value.
			*
			* Will return the first value of a QDate list.
			*/
	QDate toDate() const;		QDate toDate() const;
			/**
			* Convert into a QTime value.
			*
			* Will return the first value of a QTime list.
			*/
	QTime toTime() const;		QTime toTime() const;
			/**
			* Convert into a QDateTime value.
			*
			* Will return the first value of a QDateTime list.
			*/
	QDateTime toDateTime() const;		QDateTime toDateTime() const;
			/**
			* Convert into a QUrl value. Can handle both QUrl and Resource var
			iants.
			* The latter will be converted into its resource URI
			*
			* Will return the first value of a QUrl list.
			*
			* \sa Resource::resourceUri
			*/
	QUrl toUrl() const;		QUrl toUrl() const;
			/**
			* Convert into a Resource value.
			*
			* Will return the first value of a Resource list. Will also conver
			t QUrl
			* variants.
			*/
	Resource toResource() const;		Resource toResource() const;
	QList<int> toIntList() const;		QList<int> toIntList() const;
	QList<qlonglong> toInt64List() const;		QList<qlonglong> toInt64List() const;
	QList<uint> toUnsignedIntList() const;		QList<uint> toUnsignedIntList() const;
	QList<qulonglong> toUnsignedInt64List() const;		QList<qulonglong> toUnsignedInt64List() const;
	QList<bool> toBoolList() const;		QList<bool> toBoolList() const;
	QList<double> toDoubleList() const;		QList<double> toDoubleList() const;
	/**		/**
End of changes. 13 change blocks.
	1 lines changed or deleted		85 lines changed or added

	version.h		version.h
	skipping to change at line 31		skipping to change at line 31
	#define PLASMA_VERSION_H		#define PLASMA_VERSION_H
	/** @file plasma/version.h <Plasma/Version> */		/** @file plasma/version.h <Plasma/Version> */
	#include <plasma/plasma_export.h>		#include <plasma/plasma_export.h>
	/**		/**
	* String version of libplasma version, suitable for use in		* String version of libplasma version, suitable for use in
	* file formats or network protocols		* file formats or network protocols
	*/		*/
	#define PLASMA_VERSION_STRING "3.1.0"		#define PLASMA_VERSION_STRING "3.2.0"
	/// @brief Major version of libplasma, at compile time		/// @brief Major version of libplasma, at compile time
	#define PLASMA_VERSION_MAJOR 3		#define PLASMA_VERSION_MAJOR 3
	/// @brief Minor version of libplasma, at compile time		/// @brief Minor version of libplasma, at compile time
	#define PLASMA_VERSION_MINOR 1		#define PLASMA_VERSION_MINOR 2
	/// @brief Release version of libplasma, at compile time		/// @brief Release version of libplasma, at compile time
	#define PLASMA_VERSION_RELEASE 0		#define PLASMA_VERSION_RELEASE 0
	#define PLASMA_MAKE_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))		#define PLASMA_MAKE_VERSION(a,b,c) (((a) << 16) | ((b) << 8) | (c))
	/**		/**
	* Compile time macro for the version number of libplasma		* Compile time macro for the version number of libplasma
	*/		*/
	#define PLASMA_VERSION \		#define PLASMA_VERSION \
	PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, PLASMA_VERSION_MINOR, PLASMA_ VERSION_RELEASE)		PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, PLASMA_VERSION_MINOR, PLASMA_ VERSION_RELEASE)
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	wallpaper.h		wallpaper.h
	skipping to change at line 35		skipping to change at line 35
	#include <plasma/plasma.h>		#include <plasma/plasma.h>
	#include <plasma/packagestructure.h>		#include <plasma/packagestructure.h>
	#include <plasma/version.h>		#include <plasma/version.h>
	namespace Plasma		namespace Plasma
	{		{
	class DataEngine;		class DataEngine;
	class WallpaperPrivate;		class WallpaperPrivate;
			class Package;
	/**		/**
	* @class Wallpaper plasma/wallpaper.h <Plasma/Wallpaper>		* @class Wallpaper plasma/wallpaper.h <Plasma/Wallpaper>
	*		*
	* @short The base Wallpaper class		* @short The base Wallpaper class
	*		*
	* "Wallpapers" are components that paint the background for Containments t hat		* "Wallpapers" are components that paint the background for Containments t hat
	* do not provide their own background rendering.		* do not provide their own background rendering.
	*		*
	* Wallpaper plugins are registered using .desktop files. These files shoul d be		* Wallpaper plugins are registered using .desktop files. These files shoul d be
	skipping to change at line 89		skipping to change at line 90
	/**		/**
	* Default constructor for an empty or null wallpaper		* Default constructor for an empty or null wallpaper
	*/		*/
	explicit Wallpaper(QObject * parent = 0);		explicit Wallpaper(QObject * parent = 0);
	~Wallpaper();		~Wallpaper();
	/**		/**
	* Returns a list of all known wallpapers.		* Returns a list of all known wallpapers.
	*		*
			* @arg formFactor the format of the wallpaper being search for (e. g. desktop)
	* @return list of wallpapers		* @return list of wallpapers
	**/		**/
	static KPluginInfo::List listWallpaperInfo(const QString &formFacto r = QString());		static KPluginInfo::List listWallpaperInfo(const QString &formFacto r = QString());
	/**		/**
			* Returns a list of all known wallpapers that can accept the given
			mimetype
			* @arg mimetype the mimetype to search for
			* @arg formFactor the format of the wallpaper being search for (e.
			g. desktop)
			* @return list of wallpapers
			*/
			static KPluginInfo::List listWallpaperInfoForMimetype(const QString
			&mimetype,
			const QString
			&formFactor = QString());
			/**
	* Attempts to load a wallpaper		* Attempts to load a wallpaper
	*		*
	* Returns a pointer to the wallpaper if successful.		* Returns a pointer to the wallpaper if successful.
	* The caller takes responsibility for the wallpaper, including		* The caller takes responsibility for the wallpaper, including
	* deleting it when no longer needed.		* deleting it when no longer needed.
	*		*
	* @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 wallpaper extra arguments		* @param args to send the wallpaper extra arguments
	* @return a pointer to the loaded wallpaper, or 0 on load failure		* @return a pointer to the loaded wallpaper, or 0 on load failure
	**/		**/
	skipping to change at line 139		skipping to change at line 150
	/**		/**
	* Returns the user-visible name for the wallpaper, as specified in the		* Returns the user-visible name for the wallpaper, as specified in the
	* .desktop file.		* .desktop file.
	*		*
	* @return the user-visible name for the wallpaper.		* @return the user-visible name for the wallpaper.
	**/		**/
	QString name() const;		QString name() const;
	/**		/**
			* Accessor for the associated Package object if any.
			*
			* @return the Package object, or 0 if none
			**/
			const Package *package() const;
			/**
	* Returns the plugin name for the wallpaper		* Returns the plugin name for the wallpaper
	*/		*/
	QString pluginName() const;		QString pluginName() const;
	/**		/**
	* Returns the icon related to this wallpaper		* Returns the icon related to this wallpaper
	**/		**/
	QString icon() const;		QString icon() const;
	/**		/**
	skipping to change at line 298		skipping to change at line 316
	* Wallpaper's current state, allowing for better selection of pape rs from packages,		* Wallpaper's current state, allowing for better selection of pape rs from packages,
	* for instance.		* for instance.
	*		*
	* @arg resizeMethod The resize method to assume will be used for f uture wallpaper		* @arg resizeMethod The resize method to assume will be used for f uture wallpaper
	* scaling; may later be changed by calls to rend er()		* scaling; may later be changed by calls to rend er()
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod);		void setResizeMethodHint(Wallpaper::ResizeMethod resizeMethod);
	/*		/**
	* Allows one to set rendering hints that may differ from the actua lities of the		* Allows one to set rendering hints that may differ from the actua lities of the
	* Wallpaper's current state, allowing for better selection of pape rs from packages,		* Wallpaper's current state, allowing for better selection of pape rs from packages,
	* for instance.		* for instance.
	*		*
	* @arg targetSize The size to assume will be used for future wallp aper scaling		* @arg targetSize The size to assume will be used for future wallp aper scaling
	*		*
	* @since 4.3		* @since 4.3
	*/		*/
	void setTargetSizeHint(const QSizeF &targetSize);		void setTargetSizeHint(const QSizeF &targetSize);
			/**
			* Returns a list of wallpaper contextual actions (nothing by defau
			lt)
			*/
			QList<QAction*> contextualActions() 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 342		skipping to change at line 365
	*/		*/
	void configNeedsSaving();		void configNeedsSaving();
	/**		/**
	* Emitted when a wallpaper image render is completed.		* Emitted when a wallpaper image render is completed.
	* @since 4.3		* @since 4.3
	*/		*/
	void renderCompleted(const QImage &image);		void renderCompleted(const QImage &image);
	/**		/**
			* Emitted when a URL matching X-Plasma-DropMimeTypes is dropped on
			the wallpaper
			*
			* @arg url the URL of the dropped file
			* @since 4.4
			*/
			void urlDropped(const KUrl &url);
			/**
	* @internal		* @internal
	*/		*/
	void renderHintsChanged();		void renderHintsChanged();
	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.
	*		*
	skipping to change at line 436		skipping to change at line 467
	* @param key the name use in the cache for this image; if the imag e is specific		* @param key the name use in the cache for this image; if the imag e is specific
	* to this wallpaper plugin, consider including the name () as part of		* to this wallpaper plugin, consider including the name () as part of
	* the cache key to avoid collisions with other plugins.		* the cache key to avoid collisions with other plugins.
	* @param image the image to store in the cache; passing in a null image will cause		* @param image the image to store in the cache; passing in a null image will cause
	* the cached image to be removed from the cache		* the cached image to be removed from the cache
	*		*
	* @since 4.3		* @since 4.3
	**/		**/
	void insertIntoCache(const QString& key, const QImage &image);		void insertIntoCache(const QString& key, const QImage &image);
			/**
			* Sets the contextual actions for this wallpaper.
			*
			* @param actions A list of contextual actions for this wallpaper
			*
			* @since 4.4
			**/
			void setContextualActions(const QList<QAction*> &actions);
			QList<QAction*> contextActions;
	private:		private:
	Q_PRIVATE_SLOT(d, void renderCompleted(int token, const QImage &ima ge,		Q_PRIVATE_SLOT(d, void renderCompleted(int token, const QImage &ima ge,
	const QString &sourceImagePa th, const QSize &size,		const QString &sourceImagePa th, const QSize &size,
	int resizeMethod, const QCol or &color))		int resizeMethod, const QCol or &color))
			Q_PRIVATE_SLOT(d, void initScript())
	friend class WallpaperPackage;		friend class WallpaperPackage;
	friend class WallpaperPrivate;		friend class WallpaperPrivate;
			friend class WallpaperScript;
			friend class WallpaperWithPaint;
			friend class ContainmentPrivate;
	WallpaperPrivate *const d;		WallpaperPrivate *const d;
	};		};
	} // Plasma namespace		} // Plasma namespace
	/**		/**
	* Register a wallpaper when it is contained in a loadable module		* Register a wallpaper when it is contained in a loadable module
	*/		*/
	#define K_EXPORT_PLASMA_WALLPAPER(libname, classname) \		#define K_EXPORT_PLASMA_WALLPAPER(libname, classname) \
	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \		K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
End of changes. 10 change blocks.
	1 lines changed or deleted		53 lines changed or added

	webview.h		webview.h
	skipping to change at line 53		skipping to change at line 53
	*		*
	* @short Provides a widget to display html content in Plasma.		* @short Provides a widget to display html content in Plasma.
	*/		*/
	class PLASMA_EXPORT WebView : public QGraphicsWidget		class PLASMA_EXPORT WebView : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(KUrl url READ url WRITE setUrl)		Q_PROPERTY(KUrl url READ url WRITE setUrl)
	Q_PROPERTY(QString html READ html WRITE setHtml)		Q_PROPERTY(QString html READ html WRITE setHtml)
	Q_PROPERTY(bool dragToScroll READ dragToScroll WRITE setDragToScroll)		Q_PROPERTY(bool dragToScroll READ dragToScroll WRITE setDragToScroll)
			Q_PROPERTY(QPointF scrollPosition READ scrollPosition WRITE setScrollPo
			sition)
			Q_PROPERTY(QSizeF contentsSize READ contentsSize)
			Q_PROPERTY(QRectF viewportGeometry READ viewportGeometry)
			Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
	public:		public:
	explicit WebView(QGraphicsItem *parent = 0);		explicit WebView(QGraphicsItem *parent = 0);
	~WebView();		~WebView();
	/**		/**
	* Sets the URL to display. Loading may happen asynchronously.		* Sets the URL to display. Loading may happen asynchronously.
	*		*
	* @param url the location of the content to load.		* @param url the location of the content to load.
	*/		*/
	skipping to change at line 99		skipping to change at line 103
	* @param baseUrl the base url for relative references		* @param baseUrl the base url for relative references
	*/		*/
	void setHtml(const QString &html, const KUrl &baseUrl = KUrl());		void setHtml(const QString &html, const KUrl &baseUrl = KUrl());
	/**		/**
	* Reimplementation		* Reimplementation
	*/		*/
	QRectF geometry() const;		QRectF geometry() const;
	/**		/**
			* @return the size of the internal widget
			* @since 4.4
			*/
			QSizeF contentsSize() const;
			/**
			* Sets the position of the webpage relative to this widget
			* @since 4.4
			*/
			void setScrollPosition(const QPointF &position);
			/**
			* @return the position of the webpage relative to this widget
			* @since 4.4
			*/
			QPointF scrollPosition() const;
			/**
			* The geometry of the area that actually displays the web page
			* @since 4.4
			*/
			QRectF viewportGeometry() const;
			/**
			* The zoom factor of the page
			*
			* @since 4.4
			*/
			qreal zoomFactor() const;
			/**
			* Sets the zoom factor of the page
			*
			* @since 4.4
			*/
			void setZoomFactor(const qreal zoom);
			/**
	* Sets the page to use in this item. The owner of the webpage rema ins,		* Sets the page to use in this item. The owner of the webpage rema ins,
	* however if this WebView object is the owner of the current page,		* however if this WebView object is the owner of the current page,
	* then the current page is deleted		* then the current page is deleted
	*		*
	* @param page the page to set in this view		* @param page the page to set in this view
	*/		*/
	void setPage(QWebPage *page);		void setPage(QWebPage *page);
	/**		/**
	* The QWebPage associated with this item. Useful when more		* The QWebPage associated with this item. Useful when more
	skipping to change at line 172		skipping to change at line 214
	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);		void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
	void wheelEvent(QGraphicsSceneWheelEvent *event);		void wheelEvent(QGraphicsSceneWheelEvent *event);
	void keyPressEvent(QKeyEvent * event);		void keyPressEvent(QKeyEvent * event);
	void keyReleaseEvent(QKeyEvent * event);		void keyReleaseEvent(QKeyEvent * event);
	void focusInEvent(QFocusEvent * event);		void focusInEvent(QFocusEvent * event);
	void focusOutEvent(QFocusEvent * event);		void focusOutEvent(QFocusEvent * event);
	void dragEnterEvent(QGraphicsSceneDragDropEvent * event);		void dragEnterEvent(QGraphicsSceneDragDropEvent * event);
	void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);		void dragLeaveEvent(QGraphicsSceneDragDropEvent * event);
	void dragMoveEvent(QGraphicsSceneDragDropEvent * event);		void dragMoveEvent(QGraphicsSceneDragDropEvent * event);
	void dropEvent(QGraphicsSceneDragDropEvent * event);		void dropEvent(QGraphicsSceneDragDropEvent * event);
			QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const ;
	private:		private:
	Q_PRIVATE_SLOT(d, void loadingFinished(bool success))		Q_PRIVATE_SLOT(d, void loadingFinished(bool success))
	Q_PRIVATE_SLOT(d, void updateRequested(const QRect& dirtyRect))		Q_PRIVATE_SLOT(d, void updateRequested(const QRect& dirtyRect))
	Q_PRIVATE_SLOT(d, void scrollRequested(int dx, int dy, const QRect &scrollRect))		Q_PRIVATE_SLOT(d, void scrollRequested(int dx, int dy, const QRect &scrollRect))
	Q_PRIVATE_SLOT(d, void dragTimeoutExpired())
	WebViewPrivate * const d;		WebViewPrivate * const d;
	friend class WebViewPrivate;		friend class WebViewPrivate;
	};		};
	} // namespace Plasma		} // namespace Plasma
	#endif // Multiple incluson guard		#endif // Multiple incluson guard
End of changes. 4 change blocks.
	1 lines changed or deleted		44 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/