kde-libs: headers diff between 4.4.5 and 4.5.0 versions

	abstractrunner.h	abstractrunner.h

	skipping to change at line 37	skipping to change at line 37
	#include <kconfiggroup.h>	#include <kconfiggroup.h>
	#include <kservice.h>	#include <kservice.h>

	#include <plasma/plasma_export.h>	#include <plasma/plasma_export.h>
	#include <plasma/querymatch.h>	#include <plasma/querymatch.h>
	#include <plasma/runnercontext.h>	#include <plasma/runnercontext.h>
	#include <plasma/runnersyntax.h>	#include <plasma/runnersyntax.h>
	#include <plasma/version.h>	#include <plasma/version.h>

	class QAction;	class QAction;

		class QMimeData;

	class KCompletion;	class KCompletion;

	namespace Plasma	namespace Plasma
	{	{

	class DataEngine;	class DataEngine;
	class Package;	class Package;
	class RunnerScript;	class RunnerScript;
	class QueryMatch;	class QueryMatch;

	skipping to change at line 283	skipping to change at line 284
	* the opportunity to tear down anything set up as a result of the prepare()	* the opportunity to tear down anything set up as a result of the prepare()
	* method.	* method.
	* @since 4.4	* @since 4.4
	*/	*/
	void teardown();	void teardown();

	protected:	protected:
	friend class RunnerManager;	friend class RunnerManager;
	friend class RunnerManagerPrivate;	friend class RunnerManagerPrivate;


	/**	explicit AbstractRunner(QObject *parent = 0, const QString &path =
	* Constructs a Runner object. Since AbstractRunner has pure virtua	QString());
	ls,	explicit AbstractRunner(const KService::Ptr service, QObject *paren
	* this constructor can not be called directly. Rather a subclass m	t = 0);
	ust
	* be created
	*/
	explicit AbstractRunner(QObject *parent = 0, const QString &service
	Id = QString());
	AbstractRunner(QObject *parent, const QVariantList &args);	AbstractRunner(QObject *parent, const QVariantList &args);

	/**	/**
	* Provides access to the runner's configuration object.	* Provides access to the runner's configuration object.
	*/	*/
	KConfigGroup config() const;	KConfigGroup config() const;

	/**	/**
	* Sets whether or not the runner has options for matches	* Sets whether or not the runner has options for matches
	*/	*/

	skipping to change at line 446	skipping to change at line 444
	* or an invalid data engine if the requested engine	* or an invalid data engine if the requested engine
	* could not be loaded	* could not be loaded
	*	*
	* @since 4.4	* @since 4.4
	*/	*/
	Q_INVOKABLE DataEngine *dataEngine(const QString &name) const;	Q_INVOKABLE DataEngine *dataEngine(const QString &name) const;

	protected Q_SLOTS:	protected Q_SLOTS:
	void init();	void init();


		/**
		* Reimplement this slot if you want your runner
		* to support serialization and drag and drop
		* @since 4.5
		*/
		QMimeData * mimeDataForMatch(const Plasma::QueryMatch *match);

	private:	private:
	friend class RunnerScript;	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>();) \

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

	accessmanager.h	accessmanager.h

	skipping to change at line 176	skipping to change at line 176
	private:	private:
	class AccessManagerPrivate;	class AccessManagerPrivate;
	AccessManagerPrivate* const d;	AccessManagerPrivate* const d;
	};	};

	namespace Integration {	namespace Integration {
	// KDE5: Move AccessManager into the KIO::Integration namespace.	// KDE5: Move AccessManager into the KIO::Integration namespace.
	typedef KIO::AccessManager AccessManager;	typedef KIO::AccessManager AccessManager;

	/**	/**

		* Maps KIO SSL meta data into the given QSslConfiguration object.
		*
		* @since 4.5
		* @return true if @p metadata contains ssl information and the mapping suc
		ceeded.
		*/
		KIO_EXPORT bool sslConfigFromMetaData(const KIO::MetaData& metadata, QSslCo
		nfiguration& sslconfig);

		/**
	* @short A KDE implementation of QNetworkCookieJar.	* @short A KDE implementation of QNetworkCookieJar.
	*	*
	* Use this class in place of QNetworkCookieJar if you want to integrate wi th	* 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.	* 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	* Here is a simple example that shows how to set the QtWebKit module to us e KDE's
	* cookiejar:	* cookiejar:
	* @code	* @code
	* QWebView *view = new QWebView(this);	* QWebView *view = new QWebView(this);
	* KIO::Integration::CookieJar *cookieJar = new KIO::Integration::CookieJ ar;	* KIO::Integration::CookieJar *cookieJar = new KIO::Integration::CookieJ ar;

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

	animator.h	animator.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_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 <QtCore/QAbstractAnimation>

		#include <QtCore/QEasingCurve>

	#include <plasma/plasma_export.h>	#include <plasma/plasma_export.h>

	class QGraphicsItem;	class QGraphicsItem;
	class QGraphicsWidget;	class QGraphicsWidget;
	class QTimeLine;	class QTimeLine;

	namespace Plasma	namespace Plasma
	{	{


	skipping to change at line 55	skipping to change at line 56
	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 /	FadeAnimation, /<< Can be used for both fade in and out /
	GrowAnimation, /<< Grow animated object geometry /	GrowAnimation, /<< Grow animated object geometry /
	PulseAnimation, /<< Pulse animated object (opacity/geometry/scale) /	PulseAnimation, /<< Pulse animated object (opacity/geometry/scale) /
	RotationAnimation, /<< Rotate an animated object /	RotationAnimation, /<< Rotate an animated object /
	RotationStackedAnimation, /<< for flipping one object with another /	RotationStackedAnimation, /<< for flipping one object with another /
	SlideAnimation, /<< Move the position of animated object /	SlideAnimation, /<< Move the position of animated object /
	GeometryAnimation, /<< Geometry animation/	GeometryAnimation, /<< Geometry animation/

	ZoomAnimation /<<Zoom animation /	ZoomAnimation, /<<Zoom animation /
		PixmapTransitionAnimation, /<< Transition between two pixmaps/
		WaterAnimation /<< Water animation using ripple effect /,
		LastAnimation = 1024
	};	};

	enum CurveShape {	enum CurveShape {
	EaseInCurve = 0,	EaseInCurve = 0,
	EaseOutCurve,	EaseOutCurve,
	EaseInOutCurve,	EaseInOutCurve,

	LinearCurve	LinearCurve,
		PendularCurve
	};	};

	enum Movement {	enum Movement {
	SlideInMovement = 0,	SlideInMovement = 0,
	SlideOutMovement,	SlideOutMovement,
	FastSlideInMovement,	FastSlideInMovement,
	FastSlideOutMovement	FastSlideOutMovement
	};	};

	/**	/**
	* Singleton accessor	* Singleton accessor
	**/	**/
	static KDE_DEPRECATED Animator *self();	static KDE_DEPRECATED Animator *self();

	/**	/**
	* Factory to build new animation objects. To control their behavior,	* Factory to build new animation objects. To control their behavior,
	* check \ref AbstractAnimation properties.	* check \ref AbstractAnimation properties.

		* @since 4.4
	**/	**/
	static Plasma::Animation create(Animator::Animation type, QObject par ent = 0);	static Plasma::Animation create(Animator::Animation type, QObject par ent = 0);

	/**	/**

		* Factory to build new animation objects from Javascript files. To con
		trol their behavior,
		* check \ref AbstractAnimation properties.
		* @since 4.5
		**/
		static Plasma::Animation *create(const QString &animationName, QObject
		*parent = 0);

		/**
		* Factory to build new custom easing curves.
		* @since 4.5
		*/
		static QEasingCurve create(Animator::CurveShape type);

		/**
	* Starts a standard animation on a QGraphicsItem.	* Starts a standard animation on a QGraphicsItem.
	*	*
	* @arg item the item to animate in some fashion	* @arg item the item to animate in some fashion
	* @arg anim the type of animation to perform	* @arg anim the type of animation to perform
	* @return the id of the animation	* @return the id of the animation
	* @deprecated use new Animator API with Qt Kinetic	* @deprecated use new Animator API with Qt Kinetic
	**/	**/
	KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animatio n anim);	KDE_DEPRECATED Q_INVOKABLE int animateItem(QGraphicsItem *item,Animatio n anim);

	/**	/**

	skipping to change at line 183	skipping to change at line 200
	* Can be used to query if there are other animations happening. This w ay	* Can be used to query if there are other animations happening. This w ay
	* heavy operations can be delayed until all animations are finished.	* heavy operations can be delayed until all animations are finished.
	* @return true if there are animations going on.	* @return true if there are animations going on.
	* @since 4.1	* @since 4.1
	* @deprecated use new Animator API with Qt Kinetic	* @deprecated use new Animator API with Qt Kinetic
	*/	*/
	KDE_DEPRECATED Q_INVOKABLE bool isAnimating() const;	KDE_DEPRECATED Q_INVOKABLE bool isAnimating() const;

	/**	/**
	* Register a widget as a scrolling widget.	* Register a widget as a scrolling widget.

	* The widget will get animate scrolling with mouse dragging and mouse	* This function is deprecated:
	wheel.	* use a ScrollWidget, with setWidget() as your widget instead.
	* It must provide
	* scrollValue, viewportGeometry and pageSize properties
	*	*
	* @param widget the widget that offers a scrolling behaviour	* @param widget the widget that offers a scrolling behaviour
	* @since 4.4	* @since 4.4
	*/	*/

	void registerScrollingManager(QGraphicsWidget *widget);	KDE_DEPRECATED void registerScrollingManager(QGraphicsWidget *widget);

	/**	/**
	* unregister the scrolling manager of a certain widget	* unregister the scrolling manager of a certain widget

		* This function is deprecated: use ScrollWidget instead.
	*	*
	* @param widget the widget we don't want no longer animated	* @param widget the widget we don't want no longer animated
	* @since 4.4	* @since 4.4
	*/	*/

	void unregisterScrollingManager(QGraphicsWidget *widget);	KDE_DEPRECATED 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,	KDE_DEPRECATED void scrollStateChanged(QGraphicsWidget *widget, QAbstra ctAnimation::State newState,
	QAbstractAnimation::State oldState);	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();


End of changes. 12 change blocks.
	11 lines changed or deleted	29 lines changed or added

	annotationinterface.h	annotationinterface.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries

	Copyright 2008 Andreas Pakulat <apaku@gmx.de>	* Copyright 2008 Andreas Pakulat <apaku@gmx.de>
	Copyright 2008 Dominik Haumann <dhaumann kde org>	* Copyright 2008 Dominik Haumann <dhaumann kde org>
		*
	This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	* modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	* License as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,	*
	but WITHOUT ANY WARRANTY; without even the implied warranty of	* This library is distributed in the hope that it will be useful,
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	Library General Public License for more details.	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* 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 Licen
	along with this library; see the file COPYING.LIB. If not, write to	se
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* along with this library; see the file COPYING.LIB. If not, write to
	Boston, MA 02110-1301, USA.	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	*/	* Boston, MA 02110-1301, USA
		*/

	#ifndef KDELIBS_KTEXTEDITOR_ANNOTATIONINTERFACE_H	#ifndef KDELIBS_KTEXTEDITOR_ANNOTATIONINTERFACE_H
	#define KDELIBS_KTEXTEDITOR_ANNOTATIONINTERFACE_H	#define KDELIBS_KTEXTEDITOR_ANNOTATIONINTERFACE_H

	#include <ktexteditor/ktexteditor_export.h>	#include <ktexteditor/ktexteditor_export.h>

	#include <QtCore/QObject>	#include <QtCore/QObject>

	class QMenu;	class QMenu;


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

	applet.h	applet.h

	skipping to change at line 90	skipping to change at line 90
	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) //KDE5: remove	Q_PROPERTY(bool isBusy READ isBusy WRITE setBusy) //KDE5: remove
	Q_PROPERTY(bool busy READ isBusy WRITE setBusy)	Q_PROPERTY(bool busy READ isBusy WRITE setBusy)
	Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired)	Q_PROPERTY(bool configurationRequired READ configurationRequired WRITE setConfigurationRequired)
	Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry)	Q_PROPERTY(QRectF geometry READ geometry WRITE setGeometry)
	Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)	Q_PROPERTY(bool shouldConserveResources READ shouldConserveResources)
	Q_PROPERTY(uint id READ id)	Q_PROPERTY(uint id READ id)

		Q_PROPERTY(bool userConfiguring READ isUserConfiguring)

	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 112	skipping to change at line 113
	TranslucentBackground = 2, /**< An alternate version of the bac kground is drawn,	TranslucentBackground = 2, /**< An alternate version of the bac kground is drawn,
	usually more translucent */	usually more translucent */
	DefaultBackground = StandardBackground /**< Default settings:	DefaultBackground = StandardBackground /**< Default settings:
	both standard background */	both standard background */
	};	};
	Q_DECLARE_FLAGS(BackgroundHints, BackgroundHint)	Q_DECLARE_FLAGS(BackgroundHints, BackgroundHint)

	~Applet();	~Applet();

	/**	/**

	* @return a package structure representing a Theme	* @return a package structure representing an Applet
	*/	*/
	static PackageStructure::Ptr packageStructure();	static PackageStructure::Ptr packageStructure();

	/**	/**
	* @return the id of this applet	* @return the id of this applet
	*/	*/
	uint id() const;	uint id() const;

	/**	/**
	* Returns the KConfigGroup to access the applets configuration.	* Returns the KConfigGroup to access the applets configuration.

	skipping to change at line 285	skipping to change at line 286
	*/	*/
	Plasma::AspectRatioMode aspectRatioMode() const;	Plasma::AspectRatioMode aspectRatioMode() const;

	/**	/**
	* Sets the preferred aspect ratio mode for placement and resizing	* Sets the preferred aspect ratio mode for placement and resizing
	*/	*/
	void setAspectRatioMode(Plasma::AspectRatioMode);	void setAspectRatioMode(Plasma::AspectRatioMode);

	/**	/**
	* Returns a list of all known applets.	* Returns a list of all known applets.

		* This may skip applets based on security settings and ExcludeCate gories in the application's config.
	*	*
	* @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 "Misc" is passed in, then applets without a	* If "Misc" is passed in, then applets without 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

	skipping to change at line 637	skipping to change at line 639
	* @return true if destroy() was called; useful for Applets which s hould avoid	* @return true if destroy() was called; useful for Applets which s hould avoid
	* certain tasks if they are about to be deleted permanently	* certain tasks if they are about to be deleted permanently
	*/	*/
	bool destroyed() const;	bool destroyed() const;

	/**	/**
	* Reimplement this method so provide a configuration interface,	* Reimplement this method so provide a configuration interface,
	* parented to the supplied widget. Ownership of the widgets is pas sed	* parented to the supplied widget. Ownership of the widgets is pas sed
	* to the parent widget.	* to the parent widget.
	*	*

		* Typically one would add custom pages to the config dialog @p par
		ent
		* and then connect to the applyClicked() and okClicked() signals
		* or @p parent to react on config changes:
		*
		* @code
		* connect(parent, SIGNAL(applyClicked()), this, SLOT(myConfigAccep
		ted()));
		* connect(parent, SIGNAL(okClicked()), this, SLOT(myConfigAccepted
		()));
		* @endcode
		*
		* With this approach it makes sense to store the custom pages in m
		ember
		* variables to make their fields accessible from the myConfigAccep
		ted()
		* slot.
		*
		* Use config() to store your configuration.
		*
	* @param parent the dialog which is the parent of the configuratio n	* @param parent the dialog which is the parent of the configuratio n
	* widgets	* widgets
	*/	*/
	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
	*/	*/

	skipping to change at line 693	skipping to change at line 710
	/**	/**
	* @return true if the applet has a valid associated application or urls	* @return true if the applet has a valid associated application or urls
	* @since 4.4	* @since 4.4
	*/	*/
	bool hasValidAssociatedApplication() const;	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 Desktop hides when s uch an event is
	* triggered by an item it is displaying.	* triggered by an item it is displaying.
	*/	*/
	void releaseVisualFocus();	void releaseVisualFocus();

	/**	/**
	* Emitted whenever the applet makes a geometry change, so that vie ws	* Emitted whenever the applet makes a geometry change, so that vie ws
	* can coordinate themselves with these changes if they desire.	* can coordinate themselves with these changes if they desire.
	*/	*/
	void geometryChanged();	void geometryChanged();


	skipping to change at line 795	skipping to change at line 812
	/**	/**
	* Lets the user interact with the plasmoid options.	* Lets the user interact with the plasmoid options.
	* Called when the user selects the configure entry	* Called when the user selects the configure entry
	* from the context menu.	* from the context menu.
	*	*
	* Unless there is good reason for overriding this method,	* Unless there is good reason for overriding this method,
	* Applet subclasses should actually override createConfigurationIn terface	* Applet subclasses should actually override createConfigurationIn terface
	* instead. A good example of when this isn't plausible is	* instead. A good example of when this isn't plausible is
	* when using a dialog prepared by another library, such	* when using a dialog prepared by another library, such
	* as KPropertiesDialog from libkfile.	* as KPropertiesDialog from libkfile.

		* You probably want to call showConfigurationInterface(QWidget*)
		* with the custom widget you created to actually show your interfa
		ce
	*/	*/
	virtual void showConfigurationInterface();	virtual void showConfigurationInterface();

	/**	/**

		* Actually show your custom configuration interface
		* Use this only if you reimplemented showConfigurationInterface()
		*
		* @arg widget the widget representing your configuration interface
		*
		* @since 4.5
		*/
		void showConfigurationInterface(QWidget *widget);

		/**
		* @return true when the configuration interface is being shown
		* @since 4.5
		*/
		bool isUserConfiguring() const;

		/**
	* Causes this applet to raise above all other applets.	* Causes this applet to raise above all other applets.
	*/	*/
	void raise();	void raise();

	/**	/**
	* Causes this applet to lower below all the other applets.	* Causes this applet to lower below all the other applets.
	*/	*/
	void lower();	void lower();

	/**	/**

	skipping to change at line 1075	skipping to change at line 1110
	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())	Q_PRIVATE_SLOT(d, void appletAnimationComplete())
	Q_PRIVATE_SLOT(d, void selectItemToDestroy())	Q_PRIVATE_SLOT(d, void selectItemToDestroy())
	Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect))	Q_PRIVATE_SLOT(d, void updateRect(const QRectF& rect))
	Q_PRIVATE_SLOT(d, void destroyMessageOverlay())	Q_PRIVATE_SLOT(d, void destroyMessageOverlay())
	Q_PRIVATE_SLOT(d, void clearShortcutEditorPtr())	Q_PRIVATE_SLOT(d, void clearShortcutEditorPtr())
	Q_PRIVATE_SLOT(d, void configDialogFinished())	Q_PRIVATE_SLOT(d, void configDialogFinished())
	Q_PRIVATE_SLOT(d, void updateShortcuts())	Q_PRIVATE_SLOT(d, void updateShortcuts())
	Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))	Q_PRIVATE_SLOT(d, void publishCheckboxStateChanged(int state))

		Q_PRIVATE_SLOT(d, void globalShortcutChanged())

	/**	/**
	* Reimplemented from QGraphicsItem	* Reimplemented from QGraphicsItem
	**/	**/
	void paint(QPainter painter, const QStyleOptionGraphicsItem optio n, QWidget *widget = 0);	void paint(QPainter painter, const QStyleOptionGraphicsItem optio n, QWidget *widget = 0);

	AppletPrivate *const d;	AppletPrivate *const d;

	//Corona needs to access setFailedToLaunch and init	//Corona needs to access setFailedToLaunch and init
	friend class Corona;	friend class Corona;

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

	appletscript.h	appletscript.h

	skipping to change at line 41	skipping to change at line 41
	#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
	{	{


		class Animation;
	class AppletScriptPrivate;	class AppletScriptPrivate;
	class Extender;	class Extender;

	/**	/**
	* @class AppletScript plasma/scripting/appletscript.h <Plasma/Scripting/Ap pletScript>	* @class AppletScript plasma/scripting/appletscript.h <Plasma/Scripting/Ap pletScript>
	*	*
	* @short Provides a restricted interface for scripted applets.	* @short Provides a restricted interface for scripted applets.
	*/	*/
	class PLASMA_EXPORT AppletScript : public ScriptEngine	class PLASMA_EXPORT AppletScript : public ScriptEngine
	{	{

	skipping to change at line 151	skipping to change at line 152
	* @see Applet	* @see Applet
	*/	*/
	Extender *extender() const;	Extender *extender() const;

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* @see Applet	* @see Applet
	*/	*/
	void saveState(KConfigGroup &group) const;	void saveState(KConfigGroup &group) const;


		/**
		* @see PopupApplet
		*/
		void popupEvent(bool popped) 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 223	skipping to change at line 229
	/**	/**
	* @see Applet	* @see Applet
	*/	*/
	void unregisterAsDragHandle(QGraphicsItem *item);	void unregisterAsDragHandle(QGraphicsItem *item);

	/**	/**
	* @see Applet	* @see Applet
	*/	*/
	bool isRegisteredAsDragHandle(QGraphicsItem *item);	bool isRegisteredAsDragHandle(QGraphicsItem *item);


		/**
		* Loads an animation from the applet package
		* @arg animation the animation to load
		* @return an Animation object on success, a NULL pointer on failure
		* @since 4.5
		*/
		Animation loadAnimationFromPackage(const QString &name, QObject paren
		t);

	private:	private:
	friend class Applet;	friend class Applet;

		friend class PopupApplet;

	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


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

	attribute.h	attribute.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries

	Copyright (C) 2003-2005 Hamish Rodda <rodda@kde.org>	* Copyright (C) 2003-2005 Hamish Rodda <rodda@kde.org>
		*
	This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	* modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	* License as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,	*
	but WITHOUT ANY WARRANTY; without even the implied warranty of	* This library is distributed in the hope that it will be useful,
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	Library General Public License for more details.	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* 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 Licen
	along with this library; see the file COPYING.LIB. If not, write to	se
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* along with this library; see the file COPYING.LIB. If not, write to
	Boston, MA 02110-1301, USA.	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	*/	* Boston, MA 02110-1301, USA.
		*/

	#ifndef KDELIBS_KTEXTEDITOR_ATTRIBUTE_H	#ifndef KDELIBS_KTEXTEDITOR_ATTRIBUTE_H
	#define KDELIBS_KTEXTEDITOR_ATTRIBUTE_H	#define KDELIBS_KTEXTEDITOR_ATTRIBUTE_H

	#include <QtGui/QTextFormat>	#include <QtGui/QTextFormat>

	#include <ksharedptr.h>	#include <ksharedptr.h>
	#include <ktexteditor/ktexteditor_export.h>	#include <ktexteditor/ktexteditor_export.h>

	class KAction;	class KAction;

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

	authinfo.h	authinfo.h

	skipping to change at line 187	skipping to change at line 187
	/**	/**
	* A unique identifier that allows caching of multiple	* A unique identifier that allows caching of multiple
	* passwords for different resources in the same server.	* passwords for different resources in the same server.
	*	*
	* Mostly this setting is applicable to the HTTP protocol	* Mostly this setting is applicable to the HTTP protocol
	* whose authentication scheme explicitly defines the use	* whose authentication scheme explicitly defines the use
	* of such a unique key. However, any protocol that can	* of such a unique key. However, any protocol that can
	* generate or supply a unique id can effectively use it	* generate or supply a unique id can effectively use it
	* to distinguish passwords.	* to distinguish passwords.
	*	*

	* (If you are instead interested in caching the authentication
	* info for multiple users to the same server, refer to
	* multipleUserCaching below)
	*
	* This setting is @em optional and not set by default.	* This setting is @em optional and not set by default.
	*/	*/
	QString realmValue;	QString realmValue;

	/**	/**
	* Field to store any extra authentication information for	* Field to store any extra authentication information for

	* protocols that need it (ex: http).	* protocols that need it.
	*	*
	* This setting is @em optional and mostly applicable for HTTP	* This setting is @em optional and mostly applicable for HTTP
	* protocol. However, any protocol can make use of it to	* protocol. However, any protocol can make use of it to
	* store extra info.	* store extra info.
	*/	*/
	QString digestInfo;	QString digestInfo;

	/**	/**
	* Flag that, if set, indicates whether a path match should be	* Flag that, if set, indicates whether a path match should be
	* performed when requesting for cached authorization.	* performed when requesting for cached authorization.

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

	browserrun.h	browserrun.h

	skipping to change at line 166	skipping to change at line 166

	/**	/**
	* NotHandled means that foundMimeType should call KRun::foundMimeT ype,	* NotHandled means that foundMimeType should call KRun::foundMimeT ype,
	* i.e. launch an external app.	* i.e. launch an external app.
	*/	*/
	enum NonEmbeddableResult { Handled, NotHandled, Delayed };	enum NonEmbeddableResult { Handled, NotHandled, Delayed };

	/**	/**
	* Helper for foundMimeType: call this if the mimetype couldn't be embedded	* Helper for foundMimeType: call this if the mimetype couldn't be embedded
	*/	*/

	NonEmbeddableResult handleNonEmbeddable( const QString& mimeType );	NonEmbeddableResult handleNonEmbeddable( const QString& mimeType );
		// TODO KDE5: remove, and add =0 to the other overload

		/**
		* Helper for foundMimeType: call this if the mimetype couldn't be
		embedded
		* @param mimeType the mimetype found for the URL
		* @param pSelectedService Output variable: pointer to a KService::
		Ptr, which will be set
		* to the service selected in the BrowserOpenOrSaveQuestion
		dialog, if any.
		*
		* How to handle this properly: if pSelectedService is non-zero, th
		en the dialog will show
		* additional "open with" buttons. In your code, you should write:
		* @code
		if (selectedService) {
		KRun::setPreferredService(selectedService->desktopEntryName
		());
		// and let this code path fall back to KRun::foundMimeType(
		mimeType);
		} else {
		KRun::displayOpenWithDialog(url(), m_window, false, suggest
		edFileName());
		setFinished(true);
		}
		* @endcode
		*
		* @since 4.5
		*/
		NonEmbeddableResult handleNonEmbeddable(const QString& mimeType, KS
		ervice::Ptr* pSelectedService);

	protected Q_SLOTS:	protected Q_SLOTS:
	void slotBrowserScanFinished(KJob *job);	void slotBrowserScanFinished(KJob *job);
	void slotBrowserMimetype(KIO::Job *job, const QString &type);	void slotBrowserMimetype(KIO::Job *job, const QString &type);
	void slotCopyToTempFileResult(KJob *job);	void slotCopyToTempFileResult(KJob *job);
	virtual void slotStatResult( KJob *job );	virtual void slotStatResult( KJob *job );

	private:	private:
	void redirectToError( int error, const QString& errorText );	void redirectToError( int error, const QString& errorText );
	class BrowserRunPrivate;	class BrowserRunPrivate;

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

	codecompletionmodelcontrollerinterface.h	codecompletionmodelcontrollerinterface.h

	skipping to change at line 70	skipping to change at line 70
	* Q_INTERFACES(KTextEditor::CodeCompletionModelControllerInterface)	* Q_INTERFACES(KTextEditor::CodeCompletionModelControllerInterface)
	* public:	* public:
	* KTextEditor::Range completionRange(KTextEditor::View* view, const KTex tEditor::Cursor &position);	* KTextEditor::Range completionRange(KTextEditor::View* view, const KTex tEditor::Cursor &position);
	* };	* };
	* \endcode	* \endcode
	*	*
	* \see CodeCompletionModel	* \see CodeCompletionModel
	* \author Niko Sams \<niko.sams@gmail.com\>	* \author Niko Sams \<niko.sams@gmail.com\>
	* \since 4.2	* \since 4.2
	*/	*/

	class KTEXTEDITOR_EXPORT CodeCompletionModelControllerInterface	class KTEXTEDITOR_EXPORT_DEPRECATED CodeCompletionModelControllerInterface
	{	{
	public:	public:
	CodeCompletionModelControllerInterface();	CodeCompletionModelControllerInterface();
	virtual ~CodeCompletionModelControllerInterface();	virtual ~CodeCompletionModelControllerInterface();

	/**	/**
	* This function decides if the automatic completion should be started when	* This function decides if the automatic completion should be started when
	* the user entered some text.	* the user entered some text.
	*	*
	* The default implementation will return true if the last character in	* The default implementation will return true if the last character in

	skipping to change at line 170	skipping to change at line 170
	virtual bool shouldExecute(const QModelIndex& selected, QChar inserted) ;	virtual bool shouldExecute(const QModelIndex& selected, QChar inserted) ;

	/**	/**
	* Notification that completion for this model has been aborted.	* Notification that completion for this model has been aborted.
	* \param view The view in which the completion for this model was abor ted	* \param view The view in which the completion for this model was abor ted
	*/	*/
	virtual void aborted(View* view);	virtual void aborted(View* view);
	};	};

	///Extension of CodeCompletionModelControllerInterface	///Extension of CodeCompletionModelControllerInterface

	class KTEXTEDITOR_EXPORT CodeCompletionModelControllerInterface2 : public C odeCompletionModelControllerInterface {	class KTEXTEDITOR_EXPORT_DEPRECATED CodeCompletionModelControllerInterface2 : public CodeCompletionModelControllerInterface {
	public:	public:
	enum MatchReaction {	enum MatchReaction {
	None,	None,
	HideListIfAutomaticInvocation /** If this is returned, the completion -list is hidden if it was invoked automatically */	HideListIfAutomaticInvocation /** If this is returned, the completion -list is hidden if it was invoked automatically */
	};	};
	/**	/**
	* Called whenever an item in the completion-list perfectly matches the current filter text.	* Called whenever an item in the completion-list perfectly matches the current filter text.
	* \param The index that is matched	* \param The index that is matched
	* \return Whether the completion-list should be hidden on this event. The default-implementation always returns HideListIfAutomaticInvocation	* \return Whether the completion-list should be hidden on this event. The default-implementation always returns HideListIfAutomaticInvocation
	*/	*/
	virtual MatchReaction matchingItem(const QModelIndex& matched);	virtual MatchReaction matchingItem(const QModelIndex& matched);
	};	};


		//BEGIN V3
		/**
		* \short Controller interface for a CodeCompletionModel
		*
		* \ingroup kte_group_ccmodel_extensions
		*
		* The CodeCompletionModelControllerInterface3 gives an CodeCompletionModel
		better
		* control over the completion.
		*
		* By implementing methods defined in this interface you can:
		* - control when automatic completion should start (shouldStartCompletion(
		))
		* - define a custom completion range (that will be replaced when the compl
		etion
		* is executed) (completionRange())
		* - dynamically modify the completion range during completion (updateCompl
		etionRange())
		* - specify the string used for filtering the completion (filterString())
		* - control when completion should stop (shouldAbortCompletion())
		*
		* When the interface is not implemented, or no methods are overridden the
		* default behaviour is used, which will be correct in many situations.
		*
		*
		* \section markext_access Implemeting the Interface
		* To use this class implement it in your CodeCompletionModel.
		*
		* \code
		* class MyCodeCompletion : public KTextEditor::CodeCompletionTestModel,
		public KTextEditor::CodeCompletionModelControllerInterf
		ace3
		* {
		* Q_OBJECT
		* Q_INTERFACES(KTextEditor::CodeCompletionModelControllerInterface3)
		* public:
		* KTextEditor::Range completionRange(KTextEditor::View* view, const KTex
		tEditor::Cursor &position);
		* };
		* \endcode
		*
		* \see CodeCompletionModel
		* \author Niko Sams \<niko.sams@gmail.com\>
		* \author Joseph Wenninger
		* \since 4.5
		*/
		class KTEXTEDITOR_EXPORT CodeCompletionModelControllerInterface3
		{
		public:
		CodeCompletionModelControllerInterface3();
		virtual ~CodeCompletionModelControllerInterface3();

		/**
		* This function decides if the automatic completion should be started
		when
		* the user entered some text.
		*
		* The default implementation will return true if the last character in
		* \p insertedText is a letter, a number, '.', '_' or '\>'
		*
		* \param view The view to generate completions for
		* \param insertedText The text that was inserted by the user
		* \param userInsertion Whether the the text was inserted by the user u
		sing typing.
		* If false, it may have been inserted for example
		by code-completion.
		* \param position Current cursor position
		* \return \e true, if the completion should be started, otherwise \e f
		alse
		*/
		virtual bool shouldStartCompletion(View* view, const QString &insertedT
		ext, bool userInsertion, const Cursor &position);

		/**
		* This function returns the completion range that will be used for the
		* current completion.
		*
		* This range will be used for filtering the completion list and will g
		et
		* replaced when executing the completion
		*
		* The default implementation will work for most languages that don't h
		ave
		* special chars in identifiers.
		*
		* \param view The view to generate completions for
		* \param position Current cursor position
		* \return the completion range
		*/
		virtual Range completionRange(View* view, const Cursor &position);

		/**
		* This function lets the CompletionModel dynamically modify the range.
		* Called after every change to the range (eg. when user entered text)
		*
		* The default implementation does nothing.
		*
		* The smart-mutex is not locked when this is called.
		* @warning Make sure you lock it before you change the range
		*
		* \param view The view to generate completions for
		* \param range Reference to the current range
		* \returns the modified range
		*/
		virtual Range updateCompletionRange(View* view, const Range& range);

		/**
		* This function returns the filter-text used for the current completio
		n.
		* Can return an empty string to disable filtering.
		*
		* The default implementation will return the text from \p range start
		to
		* the cursor \p position.
		*
		* The smart-mutex is not locked when this is called.
		*
		* \param view The view to generate completions for
		* \param range The completion range
		* \param position Current cursor position
		* \return the string used for filtering the completion list
		*/
		virtual QString filterString(View* view, const Range& range, const Curs
		or &position);

		/**
		* This function decides if the completion should be aborted.
		* Called after every change to the range (eg. when user entered text)
		*
		* The default implementation will return true when any special charact
		er was entered, or when the range is empty.
		*
		* The smart-mutex is not locked when this is called.
		*
		* \param view The view to generate completions for
		* \param range The completion range
		* \param currentCompletion The text typed so far
		* \return \e true, if the completion should be aborted, otherwise \e f
		alse
		*/
		virtual bool shouldAbortCompletion(View* view, const Range& range, cons
		t QString &currentCompletion);

		/**
		* When an item within this model is currently selected in the completi
		on-list, and the user inserted the given character,
		* should the completion-item be executed? This can be used to execute
		items from other inputs than the return-key.
		* For example a function item could be executed by typing '(', or vari
		able items by typing '.'.
		* \param selected The currently selected index
		* \param inserted The character that was inserted by tue user
		*/
		virtual bool shouldExecute(const QModelIndex& selected, QChar inserted)
		;

		/**
		* Notification that completion for this model has been aborted.
		* \param view The view in which the completion for this model was abor
		ted
		*/
		virtual void aborted(View* view);

		public:
		enum MatchReaction {
		None=0,
		HideListIfAutomaticInvocation=1, /** If this is returned, the complet
		ion-list is hidden if it was invoked automatically */
		ForExtension=0xffff
		};
		/**
		* Called whenever an item in the completion-list perfectly matches the
		current filter text.
		* \param The index that is matched
		* \return Whether the completion-list should be hidden on this event.
		The default-implementation always returns HideListIfAutomaticInvocation
		*/
		virtual MatchReaction matchingItem(const QModelIndex& matched);
		};
		//END V3

	}	}

	Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface, "o rg.kde.KTextEditor.CodeCompletionModelControllerInterface")	Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface, "o rg.kde.KTextEditor.CodeCompletionModelControllerInterface")
	Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface2, " org.kde.KTextEditor.CodeCompletionModelControllerInterface2")	Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface2, " org.kde.KTextEditor.CodeCompletionModelControllerInterface2")

		Q_DECLARE_INTERFACE(KTextEditor::CodeCompletionModelControllerInterface3, " org.kde.KTextEditor.CodeCompletionModelControllerInterface3")
	#endif // KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODELCONTROLLERINTERFACE_H	#endif // KDELIBS_KTEXTEDITOR_CODECOMPLETIONMODELCONTROLLERINTERFACE_H

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

	combobox.h	combobox.h

	skipping to change at line 86	skipping to change at line 86

	/**	/**
	* @return the native widget wrapped by this ComboBox	* @return the native widget wrapped by this ComboBox
	*/	*/
	KComboBox *nativeWidget() const;	KComboBox *nativeWidget() const;

	/**	/**
	* Adds an item to the combo box with the given text. The	* Adds an item to the combo box with the given text. The
	* item is appended to the list of existing items.	* item is appended to the list of existing items.
	*/	*/

	void addItem(const QString &text);	Q_INVOKABLE void addItem(const QString &text);

	public Q_SLOTS:	public Q_SLOTS:
	void clear();	void clear();

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* This signal is sent when the user chooses an item in the combobox.	* This signal is sent when the user chooses an item in the combobox.
	* The item's text is passed.	* The item's text is passed.
	*/	*/
	void activated(const QString &text);	void activated(const QString &text);

	skipping to change at line 115	skipping to change at line 115
	protected:	protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);	void resizeEvent(QGraphicsSceneResizeEvent *event);
	void paint(QPainter *painter,	void paint(QPainter *painter,
	const QStyleOptionGraphicsItem *option,	const QStyleOptionGraphicsItem *option,
	QWidget *widget);	QWidget *widget);
	void focusInEvent(QFocusEvent *event);	void focusInEvent(QFocusEvent *event);
	void focusOutEvent(QFocusEvent *event);	void focusOutEvent(QFocusEvent *event);
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	void changeEvent(QEvent *event);	void changeEvent(QEvent *event);

		void mousePressEvent(QGraphicsSceneMouseEvent *event);

	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 animationFinished(int id))
	};	};

	} // namespace Plasma	} // namespace Plasma

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

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

	comparisonterm.h	comparisonterm.h
	/*	/*
	This file is part of the Nepomuk KDE project.	This file is part of the Nepomuk KDE project.

	Copyright (C) 2009 Sebastian Trueg <trueg@kde.org>	Copyright (C) 2009-2010 Sebastian Trueg <trueg@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Lesser General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either
	version 2.1 of the License, or (at your option) version 3, or any	version 2.1 of the License, or (at your option) version 3, or any
	later version accepted by the membership of KDE e.V. (or its	later version accepted by the membership of KDE e.V. (or its
	successor approved by the membership of KDE e.V.), which shall	successor approved by the membership of KDE e.V.), which shall
	act as a proxy defined in Section 6 of version 3 of the license.	act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,

	skipping to change at line 41	skipping to change at line 41
	class Property;	class Property;
	}	}

	namespace Query {	namespace Query {
	/**	/**
	* \class ComparisonTerm comparisonterm.h Nepomuk/Query/ComparisonT erm	* \class ComparisonTerm comparisonterm.h Nepomuk/Query/ComparisonT erm
	*	*
	* \brief A term matching the value of a property.	* \brief A term matching the value of a property.
	*	*
	* The %ComparisonTerm is the most important term in the query API. It can be	* The %ComparisonTerm is the most important term in the query API. It can be

	* used to match the values of properties. As such it consists of a	* used to match the values of properties. As such its core compone
	property(),	nts are
	* a comparator() and a subTerm().	* a property(), a comparator() (see Comparator for details) and a
	*	subTerm().
	* The latter can be any other term including AndTerm and OrTerm. T	* The latter can be any other term including AndTerm, OrTerm, or e
	he matching	ven an invalid
	* is done in one of two ways:	* term. The matching is done as follows:
	*	*
	* \li A LiteralTerm as subTerm() is directly matched to the value of a literal	* \li A LiteralTerm as subTerm() is directly matched to the value of a literal
	* property (see also Nepomuk::Types::Property::literalRangeType()) or to the	* property (see also Nepomuk::Types::Property::literalRangeType()) or to the
	* labels of related resources in case of a property that has a res ource range.	* labels of related resources in case of a property that has a res ource range.

		* \li An invalid sub term simply matches any resource or value, ef
		fectively
		* acting as a wildcard.
	* \li Any other term type will be used as a sort of subquery to ma tch the	* \li Any other term type will be used as a sort of subquery to ma tch the
	* related resources. This means that the property() needs to have a resource	* related resources. This means that the property() needs to have a resource
	* range.	* range.
	*	*

	* For more details see the Comparator enumeration.	* In addition to these basic features %ComparisonTerm has a few tr
		icks up its
		* sleeve:
		*
		* \li By forcing the variable name via setVariableName() it is pos
		sible to
		* include a value matched by the term in the resulting SPARQL quer
		y (Query::toSparqlQuery())
		* or accessing it via Result::additionalBinding().
		* \li It is possible to set an aggregate function via setAggregate
		Function()
		* to count or sum up the results instead of returning the actual v
		alues.
		* \li Using setSortWeight() the sorting of the results in the fina
		l query
		* can be influenced in a powerful way - especially when combined w
		ith setAggregateFunction().
	*	*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*	*
	* \since 4.4	* \since 4.4
	*/	*/
	class NEPOMUKQUERY_EXPORT ComparisonTerm : public SimpleTerm	class NEPOMUKQUERY_EXPORT ComparisonTerm : public SimpleTerm
	{	{
	public:	public:
	/**	/**
	* %ComparisonTerm supports different ways to compare values.	* %ComparisonTerm supports different ways to compare values.

	skipping to change at line 108	skipping to change at line 118
	*/	*/
	GreaterOrEqual,	GreaterOrEqual,

	/**	/**
	* A LiteralTerm sub-term is matched to smaller or equal li teral values.	* A LiteralTerm sub-term is matched to smaller or equal li teral values.
	*/	*/
	SmallerOrEqual	SmallerOrEqual
	};	};

	/**	/**

	* Default constructor: creates an invalid comparison term.	* Aggregate functions which can be applied to a comparison ter
		m to influence
		* the value they return.
		*
		* \sa setAggregateFunction()
		*
		* \since 4.5
		*/
		enum AggregateFunction {
		/**
		* Do not use any aggregate function.
		*/
		NoAggregateFunction = 0,

		/**
		* Count the number of matching results instead
		* of returning the results themselves.
		* For counting the results of a complete query use
		* Query::CreateCountQuery.
		*/
		Count,

		/**
		* The same as Count except that no two similar results
		* are counted twice.
		*/
		DistinctCount,

		/**
		* Return the maximum value of all results instead
		* of the results themselves.
		* Does only make sense for numerical values.
		*/
		Max,

		/**
		* Return the minimum value of all results instead
		* of the results themselves.
		* Does only make sense for numerical values.
		*/
		Min,

		/**
		* Return the sum of all result values instead
		* of the results themselves.
		* Does only make sense for numerical values.
		*/
		Sum,

		/**
		* The same as Sum except that no two similar results
		* are added twice.
		*/
		DistinctSum,

		/**
		* Return the average value of all results instead
		* of the results themselves.
		* Does only make sense for numerical values.
		*/
		Average,

		/**
		* The same as Average except that no two similar results
		* are counted twice.
		*/
		DistinctAverage
		};

		/**
		* Default constructor: creates a comparison term that matches
		all properties.
	*/	*/
	ComparisonTerm();	ComparisonTerm();

	/**	/**
	* Copy constructor.	* Copy constructor.
	*/	*/
	ComparisonTerm( const ComparisonTerm& term );	ComparisonTerm( const ComparisonTerm& term );

	/**	/**

	* Default constructor.	* Convinience constructor which covers most simple use cases.
	*	*

	* \param property The property that should be matched.	* \param property The property that should be matched. An inva lid property will act as a wildcard.
	* \param term The sub term to match to.	* \param term The sub term to match to.
	* \param comparator The Comparator to use for comparison. Not all Comparators make sense	* \param comparator The Comparator to use for comparison. Not all Comparators make sense
	* with all sub term types.	* with all sub term types.
	*/	*/
	ComparisonTerm( const Types::Property& property, const Term& te rm, Comparator comparator = Contains );	ComparisonTerm( const Types::Property& property, const Term& te rm, Comparator comparator = Contains );

	/**	/**
	* Destructor.	* Destructor.
	*/	*/
	~ComparisonTerm();	~ComparisonTerm();

	skipping to change at line 146	skipping to change at line 225

	/**	/**
	* The Comparator used by ComparisonTerm Terms.	* The Comparator used by ComparisonTerm Terms.
	*	*
	* \sa setComparator	* \sa setComparator
	*/	*/
	Comparator comparator() const;	Comparator comparator() const;

	/**	/**
	* A property used for ComparisonTerm Terms.	* A property used for ComparisonTerm Terms.

		* An invalid property will act as a wildcard.
	*	*
	* \sa setProperty	* \sa setProperty
	*/	*/
	Types::Property property() const;	Types::Property property() const;

	/**	/**
	* Set the comparator	* Set the comparator
	*/	*/
	void setComparator( Comparator );	void setComparator( Comparator );

	/**	/**
	* Set the property for ComparisonTerm	* Set the property for ComparisonTerm

	* Terms.	* Terms. An invalid property will act as a wildcard.
	*	*
	* \sa property	* \sa property
	*/	*/
	void setProperty( const Types::Property& );	void setProperty( const Types::Property& );


		/**
		* Set the variable name that is to be used for the
		* variable to match to. The variable will then be added
		* to the set of variables returned in the results and can
		* be read via Result::additionalBinding(). Setting
		* the variable name can be seen as a less restricted variant
		* of Query::addRequestProperty().
		*
		* When manually setting the variable name on more
		* than one ComparisonTerm there is no guarantee for the
		* uniqueness of variable names anymore which can result
		* in unwanted query results. However, this can also be
		* used deliberately in case one needs to compare the
		* same variable twice:
		*
		* \code
		* ComparisonTerm ct1( prop1, Term() );
		* ComparisonTerm ct1( prop2, Term() );
		* ct1.setVariableName( "myvar" );
		* ct2.setVariableName( "myvar" );
		* \endcode
		*
		* The above example would result in a SPARQL query
		* pattern along the lines of
		*
		* \code
		* ?r <prop1> ?myVar .
		* ?r <prop2> ?myVar .
		* \endcode
		*
		* Be aware that the variable name does not apply
		* to sub terms of types ResourceTerm or LiteralTerm.
		* In those cases the value will be ignored. The only exception
		* are LiteralTerm sub terms that are compared other than
		* with equals.
		*
		* \param name The name of the variable to be used when request
		ing
		* the binding via Result::additionalBinding()
		*
		* \sa Result::additionalBinding(), Query::HandleInversePropert
		ies, \ref examples_query
		*
		* \since 4.5
		*/
		void setVariableName( const QString& name );

		/**
		* The variable name set in setVariableName() or an empty
		* string if none has been set.
		*
		* \sa setVariableName()
		*
		* \since 4.5
		*/
		QString variableName() const;

		/**
		* Set an aggregate function which changes the
		* result. The typical usage is to count the results instead of
		actually
		* returning them. For counting the results of a complete query
		use
		* Query::CreateCountQuery.
		*
		* \sa aggregateFunction()
		*
		* \since 4.5
		*/
		void setAggregateFunction( AggregateFunction function );

		/**
		* The aggregate function to be used with the additional bindin
		g set in
		* setVariableName().
		*
		* \sa setAggregateFunction()
		*
		* \since 4.5
		*/
		AggregateFunction aggregateFunction() const;

		/**
		* Set the sort weight of this property. By default all Compari
		sonTerms have
		* a weight of 0 which means that they are ignored for sorting.
		By setting \p
		* weight to a value different from 0 (typically higher than 0)
		the comparison
		* subterm will be used for sorting.
		*
		* Be aware that as with the variableName() sorting does not ap
		ply to sub
		* terms of types ResourceTerm or LiteralTerm.
		* In those cases the value will be ignored. The only exception
		* are LiteralTerm sub terms that are compared other than
		* with equals.
		*
		* \param weight The new sort weight. If different from 0 this
		term will be
		* used for sorting in the Query.
		* \param sortOrder The sort order to use for this term.
		*
		* \sa sortWeight()
		*
		* \since 4.5
		*/
		void setSortWeight( int weight, Qt::SortOrder sortOrder = Qt::A
		scendingOrder );

		/**
		* \return The sort weight as set in setSortWeight() or 0 if
		* sorting is disabled for this term.
		*
		* \since 4.5
		*/
		int sortWeight() const;

		/**
		* \return The sort order as set in setSortWeight().
		*
		* \since 4.5
		*/
		Qt::SortOrder sortOrder() const;

		/**
		* \return \p true if the comparison is inverted.
		* \sa setInverted
		*
		* \since 4.5
		*/
		bool isInverted() const;

		/**
		* Invert the comparison, i.e. make the subterm the subject
		* of the term and match to objects of the term.
		*
		* A typical example would be:
		*
		* \code
		* ComparisonTerm term( Soprano::Vocabulary::NAO::hasTag(),
		* ResourceTerm( somefile ) );
		* term.setInverted(true);
		* \endcode
		*
		* which would yield a query like the following:
		*
		* \code
		* select ?r where { <somefile> nao:hasTag ?r . }
		* \endcode
		*
		* to get all tags attached to a file.
		*
		* Be aware that this does only make sense with
		* sub terms that match to resources. When using
		* LiteralTerm as a sub term \p invert is ignored.
		*
		* \sa inverted()
		*
		* \since 4.5
		*/
		void setInverted( bool invert );

		/**
		* Create an inverted copy of this %ComparisonTerm.
		* This is a convenience method to allow inline creation of
		* inverted comparison terms when creating queries in a
		* single line of code.
		*
		* Be aware that calling this method twice wil result in
		* a non-inverted comparison term:
		*
		* \code
		* // always true:
		* (term.inverted().inverted() == term);
		* \endcode
		*
		* \sa setInverted()
		*
		* \since 4.5
		*/
		ComparisonTerm inverted() const;
	};	};
	}	}
	}	}

	#endif	#endif

End of changes. 10 change blocks.
	13 lines changed or deleted	287 lines changed or added

	configpage.h	configpage.h
	/* This file is part of the KDE project	/* This file is part of the KDE project

	Copyright (C) 2001-2005 Christoph Cullmann <cullmann@kde.org>	* Copyright (C) 2001-2005 Christoph Cullmann <cullmann@kde.org>
	Copyright (C) 2005 Dominik Haumann (dhdev@gmx.de) (documentation)	* Copyright (C) 2005 Dominik Haumann (dhdev@gmx.de) (documentation)
		*
	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 as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,	*
	but WITHOUT ANY WARRANTY; without even the implied warranty of	* This library is distributed in the hope that it will be useful,
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	Library General Public License for more details.	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* 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 Licen
	along with this library; see the file COPYING.LIB. If not, write to	se
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* along with this library; see the file COPYING.LIB. If not, write to
	Boston, MA 02110-1301, USA.	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	*/	* Boston, MA 02110-1301, USA.
		*/

	#ifndef KDELIBS_KTEXTEDITOR_CONFIGPAGE_H	#ifndef KDELIBS_KTEXTEDITOR_CONFIGPAGE_H
	#define KDELIBS_KTEXTEDITOR_CONFIGPAGE_H	#define KDELIBS_KTEXTEDITOR_CONFIGPAGE_H

	#include <ktexteditor/ktexteditor_export.h>	#include <ktexteditor/ktexteditor_export.h>

	#include <QtGui/QWidget>	#include <QtGui/QWidget>

	namespace KTextEditor	namespace KTextEditor
	{	{

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

	containment.h	containment.h

	skipping to change at line 259	skipping to change at line 259
	*/	*/
	void setScreen(int screen, int desktop = -1);	void setScreen(int screen, int desktop = -1);

	/**	/**
	* @return the screen number this containment is serving as the des ktop for	* @return the screen number this containment is serving as the des ktop for
	* or -1 if none	* or -1 if none
	*/	*/
	int screen() const;	int screen() const;

	/**	/**

		* @return the last screen number this containment had
		* only returns -1 if it's never ever been on a screen
		* @since 4.5
		*/
		int lastScreen() const;

		/**
	* @return the viewport (e.g. virtual desktop) this Containment is associated with.	* @return the viewport (e.g. virtual desktop) this Containment is associated with.
	*/	*/
	int desktop() const;	int desktop() const;

	/**	/**

		* @return the viewport (e.g. virtual desktop) this Containment was
		associated with
		* last time it had a screen
		* @since 4.5
		*/
		int lastDesktop() const;

		/**
	* @reimp	* @reimp
	* @sa Applet::save(KConfigGroup &)	* @sa Applet::save(KConfigGroup &)
	*/	*/
	void save(KConfigGroup &group) const;	void save(KConfigGroup &group) const;

	/**	/**
	* @reimp	* @reimp
	* @sa Applet::restore(KConfigGroup &)	* @sa Applet::restore(KConfigGroup &)
	*/	*/
	void restore(KConfigGroup &group);	void restore(KConfigGroup &group);

	skipping to change at line 301	skipping to change at line 315
	void removeToolBoxAction(QAction *action);	void removeToolBoxAction(QAction *action);

	/**	/**
	* Sets the open or closed state of the Containment's toolbox	* Sets the open or closed state of the Containment's toolbox
	*	*
	* @arg open true to open the ToolBox, false to close it	* @arg open true to open the ToolBox, false to close it
	*/	*/
	void setToolBoxOpen(bool open);	void setToolBoxOpen(bool open);

	/**	/**

		* @return true if the toolbox is open
		* @since 4.5
		*/
		bool isToolBoxOpen() const;

		/**
	* Open the Containment's toolbox	* Open the Containment's toolbox
	*/	*/
	void openToolBox();	void openToolBox();

	/**	/**
	* Closes Containment's toolbox	* Closes Containment's toolbox
	*/	*/
	void closeToolBox();	void closeToolBox();

	/**	/**

	skipping to change at line 345	skipping to change at line 365
	void setWallpaper(const QString &pluginName, const QString &mode = QString());	void setWallpaper(const QString &pluginName, const QString &mode = QString());

	/**	/**
	* Return wallpaper plugin.	* Return wallpaper plugin.
	*/	*/
	Plasma::Wallpaper *wallpaper() const;	Plasma::Wallpaper *wallpaper() const;

	/**	/**
	* Sets the current activity by name	* Sets the current activity by name
	*	*

	* @param activity the name of the activity; if it doesn't exist in	* @param activity the name of the activity
	the
	* semantic store, it will be created.
	*/	*/
	void setActivity(const QString &activity);	void setActivity(const QString &activity);

	/**	/**

	* @return the current activity associated with this activity	* @return the current activity name associated with this containme nt
	*/	*/
	QString activity() const;	QString activity() const;

	/**	/**

		* @return the context for this containment
		* @since 4.5
		*/
		Context* context() const;

		/**
	* Shows the context menu for the containment directly, bypassing A pplets	* Shows the context menu for the containment directly, bypassing A pplets
	* altogether.	* altogether.
	*/	*/
	void showContextMenu(const QPointF &containmentPos, const QPoint &s creenPos);	void showContextMenu(const QPointF &containmentPos, const QPoint &s creenPos);

	/**	/**
	* 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
	*	*

	skipping to change at line 405	skipping to change at line 430
	*/	*/
	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);

	/**	/**
	* Emitted when the containment requests zooming in or out one step .	* Emitted when the containment requests zooming in or out one step .

		* @deprecated
	*/	*/
	void zoomRequested(Plasma::Containment *containment, Plasma::ZoomDi rection direction);	void zoomRequested(Plasma::Containment *containment, Plasma::ZoomDi rection direction);

	/**	/**
	* Emitted when the user clicks on the toolbox	* Emitted when the user clicks on the toolbox
	*/	*/
	void toolBoxToggled();	void toolBoxToggled();

	/**	/**
	* Emitted when the toolbox is hidden or shown	* Emitted when the toolbox is hidden or shown

	skipping to change at line 450	skipping to change at line 476
	* @param containment the containment switching screens	* @param containment the containment switching screens
	*/	*/
	void screenChanged(int wasScreen, int isScreen, Plasma::Containment *containment);	void screenChanged(int wasScreen, int isScreen, Plasma::Containment *containment);

	/**	/**
	* Emitted when the user wants to configure/change containment.	* Emitted when the user wants to configure/change containment.
	*/	*/
	void configureRequested(Plasma::Containment *containment);	void configureRequested(Plasma::Containment *containment);

	/**	/**

	* The activity associated to this containemnt has changed	* The context associated to this containment has changed
	*/	*/
	void contextChanged(Plasma::Context *context);	void contextChanged(Plasma::Context *context);

	public Q_SLOTS:	public Q_SLOTS:
	/**	/**
	* Informs the Corona as to what position it is in. This is informa tional	* Informs the Corona as to what position it is in. This is informa tional
	* only, as the Corona doesn't change its actual location. This is,	* only, as the Corona doesn't change its actual location. This is,
	* however, passed on to Applets that may be managed by this Corona .	* however, passed on to Applets that may be managed by this Corona .
	*	*
	* @param location the new location of this Corona	* @param location the new location of this Corona

	skipping to change at line 611	skipping to change at line 637
	* and the applet id	* and the applet id
	* @since 4.3	* @since 4.3
	*/	*/
	Containment(const QString &packagePath, uint appletId, const QVaria ntList &args);	Containment(const QString &packagePath, uint appletId, const QVaria ntList &args);

	Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))	Q_PRIVATE_SLOT(d, void appletDestroyed(Plasma::Applet*))
	Q_PRIVATE_SLOT(d, void appletAppearAnimationComplete())	Q_PRIVATE_SLOT(d, void appletAppearAnimationComplete())
	Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())	Q_PRIVATE_SLOT(d, void triggerShowAddWidgets())
	Q_PRIVATE_SLOT(d, void handleDisappeared(AppletHandle *handle))	Q_PRIVATE_SLOT(d, void 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 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 showDropZoneDelayed())

		Q_PRIVATE_SLOT(d, void checkStatus(Plasma::ItemStatus))
	Q_PRIVATE_SLOT(d, void remoteAppletReady(Plasma::AccessAppletJob *) )	Q_PRIVATE_SLOT(d, void remoteAppletReady(Plasma::AccessAppletJob *) )

		Q_PRIVATE_SLOT(d, void onContextChanged(Plasma::Context *con))
	/**	/**
	* This slot is called when the 'stat' after a job event has finishe d.	* This slot is called when the 'stat' after a job event has finishe d.
	*/	*/
	Q_PRIVATE_SLOT(d, void mimeTypeRetrieved(KIO::Job *, const QString &))	Q_PRIVATE_SLOT(d, void mimeTypeRetrieved(KIO::Job *, const QString &))
	Q_PRIVATE_SLOT(d, void dropJobResult(KJob *))	Q_PRIVATE_SLOT(d, void dropJobResult(KJob *))

	friend class Applet;	friend class Applet;
	friend class AppletPrivate;	friend class AppletPrivate;
	friend class CoronaPrivate;	friend class CoronaPrivate;
	friend class ContainmentPrivate;	friend class ContainmentPrivate;

End of changes. 11 change blocks.
	7 lines changed or deleted	33 lines changed or added

	context.h	context.h

	skipping to change at line 41	skipping to change at line 41
	class ContextPrivate;	class ContextPrivate;

	class PLASMA_EXPORT Context : public QObject	class PLASMA_EXPORT Context : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	explicit Context(QObject *parent = 0);	explicit Context(QObject *parent = 0);
	~Context();	~Context();


		//don't use these two
	void createActivity(const QString &name);	void createActivity(const QString &name);
	QStringList listActivities() const;	QStringList listActivities() const;


		//activity name
	void setCurrentActivity(const QString &name);	void setCurrentActivity(const QString &name);
	QString currentActivity() const;	QString currentActivity() const;


		//activity id
		void setCurrentActivityId(const QString &id);
		QString currentActivityId() const;

	//TODO: location	//TODO: location

	Q_SIGNALS:	Q_SIGNALS:
	void changed(Plasma::Context *context);	void changed(Plasma::Context *context);
	void activityChanged(Plasma::Context *context);	void activityChanged(Plasma::Context *context);
	void locationChanged(Plasma::Context *context);	void locationChanged(Plasma::Context *context);

	private:	private:
	ContextPrivate * const d;	ContextPrivate * const d;
	};	};

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

	converter.h	converter.h

	skipping to change at line 32	skipping to change at line 32

	#include <kunitconversion/value.h>	#include <kunitconversion/value.h>
	#include <kunitconversion/kunitconversion_export.h>	#include <kunitconversion/kunitconversion_export.h>
	#include <QtCore/QVariant>	#include <QtCore/QVariant>

	namespace KUnitConversion	namespace KUnitConversion
	{	{
	enum CategoryId {	enum CategoryId {
	InvalidCategory = -1, LengthCategory, AreaCategory, VolumeCategory, Tem peratureCategory,	InvalidCategory = -1, LengthCategory, AreaCategory, VolumeCategory, Tem peratureCategory,
	VelocityCategory, MassCategory, PressureCategory, EnergyCategory, Curre ncyCategory,	VelocityCategory, MassCategory, PressureCategory, EnergyCategory, Curre ncyCategory,

	PowerCategory, TimeCategory, FuelEfficiencyCategory, DensityCategory	PowerCategory, TimeCategory, FuelEfficiencyCategory, DensityCategory, A
		ccelerationCategory,
		AngleCategory, FrequencyCategory, ForceCategory
	};	};
	enum UnitId {	enum UnitId {
	InvalidUnit = -1, NoUnit = 0, Percent = 1,	InvalidUnit = -1, NoUnit = 0, Percent = 1,
	// Area	// Area
	SquareYottameter = 1000, SquareZettameter, SquareExameter, SquarePetame ter, SquareTerameter,	SquareYottameter = 1000, SquareZettameter, SquareExameter, SquarePetame ter, SquareTerameter,
	SquareGigameter, SquareMegameter, SquareKilometer, SquareHectometer, Sq uareDecameter,	SquareGigameter, SquareMegameter, SquareKilometer, SquareHectometer, Sq uareDecameter,
	SquareMeter, SquareDecimeter, SquareCentimeter, SquareMillimeter, Squar eMicrometer,	SquareMeter, SquareDecimeter, SquareCentimeter, SquareMillimeter, Squar eMicrometer,
	SquareNanometer, SquarePicometer, SquareFemtometer, SquareAttometer, Sq uareZeptometer,	SquareNanometer, SquarePicometer, SquareFemtometer, SquareAttometer, Sq uareZeptometer,
	SquareYoctometer, Acre, SquareFoot, SquareInch, SquareMile,	SquareYoctometer, Acre, SquareFoot, SquareInch, SquareMile,


	skipping to change at line 70	skipping to change at line 71
	Yottagram = 4000, Zettagram, Exagram, Petagram, Teragram, Gigagram, Meg agram, Kilogram,	Yottagram = 4000, Zettagram, Exagram, Petagram, Teragram, Gigagram, Meg agram, Kilogram,
	Hectogram, Decagram, Gram, Decigram, Centigram, Milligram, Microgram, N anogram, Picogram,	Hectogram, Decagram, Gram, Decigram, Centigram, Milligram, Microgram, N anogram, Picogram,
	Femtogram, Attogram, Zeptogram, Yoctogram, Ton, Carat, Pound, Ounce, Tr oyOunce, MassNewton,	Femtogram, Attogram, Zeptogram, Yoctogram, Ton, Carat, Pound, Ounce, Tr oyOunce, MassNewton,
	Kilonewton,	Kilonewton,

	// Pressure	// Pressure
	Yottapascal = 5000, Zettapascal, Exapascal, Petapascal, Terapascal, Gig apascal, Megapascal,	Yottapascal = 5000, Zettapascal, Exapascal, Petapascal, Terapascal, Gig apascal, Megapascal,
	Kilopascal, Hectopascal, Decapascal, Pascal, Decipascal, Centipascal, M illipascal,	Kilopascal, Hectopascal, Decapascal, Pascal, Decipascal, Centipascal, M illipascal,
	Micropascal, Nanopascal, Picopascal, Femtopascal, Attopascal, Zeptopasc al, Yoctopascal,	Micropascal, Nanopascal, Picopascal, Femtopascal, Attopascal, Zeptopasc al, Yoctopascal,
	Bar, Millibar, Decibar, Torr, TechnicalAtmosphere, Atmosphere, PoundFor cePerSquareInch,	Bar, Millibar, Decibar, Torr, TechnicalAtmosphere, Atmosphere, PoundFor cePerSquareInch,

	InchesOfMercury,	InchesOfMercury, MillimetersOfMercury,

	// Temperature	// Temperature
	Kelvin = 6000, Celsius, Fahrenheit, Rankine, Delisle, TemperatureNewton , Reaumur, Romer,	Kelvin = 6000, Celsius, Fahrenheit, Rankine, Delisle, TemperatureNewton , Reaumur, Romer,

	// Energy	// Energy
	Yottajoule = 7000, Zettajoule, Exajoule, Petajoule, Terajoule, Gigajoul e, Megajoule,	Yottajoule = 7000, Zettajoule, Exajoule, Petajoule, Terajoule, Gigajoul e, Megajoule,
	Kilojoule, Hectojoule, Decajoule, Joule, Decijoule, Centijoule, Millijo ule, Microjoule,	Kilojoule, Hectojoule, Decajoule, Joule, Decijoule, Centijoule, Millijo ule, Microjoule,
	Nanojoule, Picojoule, Femtojoule, Attojoule, Zeptojoule, Yoctojoule, Gu idelineDailyAmount,	Nanojoule, Picojoule, Femtojoule, Attojoule, Zeptojoule, Yoctojoule, Gu idelineDailyAmount,
	Electronvolt, Rydberg, Kilocalorie,	Electronvolt, Rydberg, Kilocalorie,


	skipping to change at line 114	skipping to change at line 115
	// Density	// Density
	YottakilogramsPerCubicMeter = 13000, ZettakilogramPerCubicMeter, Exakil ogramPerCubicMeter,	YottakilogramsPerCubicMeter = 13000, ZettakilogramPerCubicMeter, Exakil ogramPerCubicMeter,
	PetakilogramPerCubicMeter, TerakilogramPerCubicMeter, GigakilogramPerCu bicMeter,	PetakilogramPerCubicMeter, TerakilogramPerCubicMeter, GigakilogramPerCu bicMeter,
	MegakilogramPerCubicMeter, KilokilogramPerCubicMeter, HectokilogramsPer CubicMeter,	MegakilogramPerCubicMeter, KilokilogramPerCubicMeter, HectokilogramsPer CubicMeter,
	DecakilogramsPerCubicMeter, KilogramsPerCubicMeter, DecikilogramsPerCub icMeter,	DecakilogramsPerCubicMeter, KilogramsPerCubicMeter, DecikilogramsPerCub icMeter,
	CentikilogramsPerCubicMeter, MillikilogramsPerCubicMeter, Microkilogram sPerCubicMeter,	CentikilogramsPerCubicMeter, MillikilogramsPerCubicMeter, Microkilogram sPerCubicMeter,
	NanokilogramsPerCubicMeter, PicokilogramsPerCubicMeter, FemtokilogramsP erCubicMeter,	NanokilogramsPerCubicMeter, PicokilogramsPerCubicMeter, FemtokilogramsP erCubicMeter,
	AttokilogramsPerCubicMeter, ZeptokilogramsPerCubicMeter, Yoctokilograms PerCubicMeter,	AttokilogramsPerCubicMeter, ZeptokilogramsPerCubicMeter, Yoctokilograms PerCubicMeter,
	KilogramPerLiter, GramPerLiter, GramPerMilliliter,	KilogramPerLiter, GramPerLiter, GramPerMilliliter,
	OuncePerCubicInch, OuncePerCubicFoot, OuncePerCubicYard,	OuncePerCubicInch, OuncePerCubicFoot, OuncePerCubicYard,

	PoundPerCubicInch, PoundPerCubicFoot, PoundPerCubicYard	PoundPerCubicInch, PoundPerCubicFoot, PoundPerCubicYard,

		// Acceleration
		MetresPerSecondSquared = 14000, FeetPerSecondSquared, StandardGravity,

		// Force
		Yottanewton = 15000, Zettanewton, Exanewton, Petanewton, Teranewton, Gi
		ganewton, Meganewton,
		KilonewtonForce, Hectonewton, Decanewton, Newton, Decinewton, Centinewt
		on, Millinewton, Micronewton,
		Nanonewton, Piconewton, Femtonewton, Attonewton, Zeptonewton, Yoctonewt
		on, Dyne, Kilopond,
		PoundForce, Poundal,

		// Angle
		Degree = 16000, Radian, Gradian, ArcMinute, ArcSecond,

		// Frequency
		Yottahertz = 17000, Zettahertz, Exahertz, Petahertz, Terahertz, Gigaher
		tz, Megahertz,
		Kilohertz, Hectohertz, Decahertz, Hertz, Decihertz, Centihertz, Millihe
		rtz, Microhertz,
		Nanohertz, Picohertz, Femtohertz, Attohertz, Zeptohertz, Yoctohertz, RP
		M
	};	};

	class UnitCategory;	class UnitCategory;

	class ConverterPrivate;	class ConverterPrivate;
	class KUNITCONVERSION_EXPORT Converter : public QObject	class KUNITCONVERSION_EXPORT Converter : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	explicit Converter(QObject* parent = 0);	explicit Converter(QObject* parent = 0);

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

	copyjob.h	copyjob.h

	skipping to change at line 269	skipping to change at line 269

	/**	/**
	* Copy a file or directory @p src into the destination @p dest,	* Copy a file or directory @p src into the destination @p dest,
	* which can be a file (including the final filename) or a directory	* which can be a file (including the final filename) or a directory
	* (into which @p src will be copied).	* (into which @p src will be copied).
	*	*
	* This emulates the cp command completely.	* This emulates the cp command completely.
	*	*
	* @param src the file or directory to copy	* @param src the file or directory to copy
	* @param dest the destination	* @param dest the destination

	* @param flags: We support HideProgressInfo here	* @param flags: copy() supports HideProgressInfo and Overwrite.
		* Note: Overwrite has the meaning of both "write into existing directo
		ries" and
		* "overwrite existing files". However if "dest" exists, then src is co
		pied
		* into a subdir of dest, just like "cp" does. Use copyAs if you don't
		want that.
		*
	* @return the job handling the operation	* @return the job handling the operation
	* @see copyAs()	* @see copyAs()
	*/	*/
	KIO_EXPORT CopyJob *copy( const KUrl& src, const KUrl& dest, JobFlags f lags = DefaultFlags );	KIO_EXPORT CopyJob *copy( const KUrl& src, const KUrl& dest, JobFlags f lags = DefaultFlags );

	/**	/**
	* Copy a file or directory @p src into the destination @p dest,	* Copy a file or directory @p src into the destination @p dest,
	* which is the destination name in any case, even for a directory.	* which is the destination name in any case, even for a directory.
	*	*
	* As opposed to copy(), this doesn't emulate cp, but is the only	* As opposed to copy(), this doesn't emulate cp, but is the only
	* way to copy a directory, giving it a new name and getting an error	* way to copy a directory, giving it a new name and getting an error

	* box if a directory already exists with the same name.	* box if a directory already exists with the same name (or writing the
		* contents of @p src into @p dest, when using Overwrite).
	*	*
	* @param src the file or directory to copy	* @param src the file or directory to copy
	* @param dest the destination	* @param dest the destination

	* @param flags: We support HideProgressInfo here	* @param flags: copyAs() supports HideProgressInfo and Overwrite.
	* @return the job handling the operation	* Note: Overwrite has the meaning of both "write into existing directo
		ries" and
		* "overwrite existing files".
		*
		* * @return the job handling the operation
	*/	*/
	KIO_EXPORT CopyJob *copyAs( const KUrl& src, const KUrl& dest, JobFlags flags = DefaultFlags );	KIO_EXPORT CopyJob *copyAs( const KUrl& src, const KUrl& dest, JobFlags flags = DefaultFlags );

	/**	/**
	* Copy a list of file/dirs @p src into a destination directory @p dest .	* Copy a list of file/dirs @p src into a destination directory @p dest .
	*	*
	* @param src the list of files and/or directories	* @param src the list of files and/or directories
	* @param dest the destination	* @param dest the destination

	* @param flags: We support HideProgressInfo here	* @param flags: copy() supports HideProgressInfo and Overwrite.
		* Note: Overwrite has the meaning of both "write into existing directo
		ries" and
		* "overwrite existing files". However if "dest" exists, then src is co
		pied
		* into a subdir of dest, just like "cp" does.
	* @return the job handling the operation	* @return the job handling the operation
	*/	*/
	KIO_EXPORT CopyJob *copy( const KUrl::List& src, const KUrl& dest, JobF lags flags = DefaultFlags );	KIO_EXPORT CopyJob *copy( const KUrl::List& src, const KUrl& dest, JobF lags flags = DefaultFlags );

	/**	/**
	* Moves a file or directory @p src to the given destination @p dest.	* Moves a file or directory @p src to the given destination @p dest.
	*	*
	* @param src the file or directory to copy	* @param src the file or directory to copy
	* @param dest the destination	* @param dest the destination

	* @param flags: We support HideProgressInfo here	* @param flags: move() supports HideProgressInfo and Overwrite.
		* Note: Overwrite has the meaning of both "write into existing directo
		ries" and
		* "overwrite existing files". However if "dest" exists, then src is co
		pied
		* into a subdir of dest, just like "cp" does.
	* @return the job handling the operation	* @return the job handling the operation
	* @see copy()	* @see copy()
	* @see moveAs()	* @see moveAs()
	*/	*/
	KIO_EXPORT CopyJob *move( const KUrl& src, const KUrl& dest, JobFlags f lags = DefaultFlags );	KIO_EXPORT CopyJob *move( const KUrl& src, const KUrl& dest, JobFlags f lags = DefaultFlags );
	/**	/**
	* Moves a file or directory @p src to the given destination @p dest. U nlike move()	* Moves a file or directory @p src to the given destination @p dest. U nlike move()

	* this operation will fail when the directory already exists.	* this operation will not move @p src into @p dest when @p dest exists
		: it will
		* either fail, or move the contents of @p src into it if Overwrite is
		set.
	*	*
	* @param src the file or directory to copy	* @param src the file or directory to copy
	* @param dest the destination	* @param dest the destination

	* @param flags: We support HideProgressInfo here	* @param flags: moveAs() supports HideProgressInfo and Overwrite.
		* Note: Overwrite has the meaning of both "write into existing directo
		ries" and
		* "overwrite existing files".
	* @return the job handling the operation	* @return the job handling the operation
	* @see copyAs()	* @see copyAs()
	*/	*/
	KIO_EXPORT CopyJob *moveAs( const KUrl& src, const KUrl& dest, JobFlags flags = DefaultFlags );	KIO_EXPORT CopyJob *moveAs( const KUrl& src, const KUrl& dest, JobFlags flags = DefaultFlags );
	/**	/**
	* Moves a list of files or directories @p src to the given destination @p dest.	* Moves a list of files or directories @p src to the given destination @p dest.
	*	*
	* @param src the list of files or directories to copy	* @param src the list of files or directories to copy
	* @param dest the destination	* @param dest the destination

	* @param flags: We support HideProgressInfo here	* @param flags: move() supports HideProgressInfo and Overwrite.
		* Note: Overwrite has the meaning of both "write into existing directo
		ries" and
		* "overwrite existing files". However if "dest" exists, then src is co
		pied
		* into a subdir of dest, just like "cp" does.
	* @return the job handling the operation	* @return the job handling the operation
	* @see copy()	* @see copy()
	*/	*/
	KIO_EXPORT CopyJob *move( const KUrl::List& src, const KUrl& dest, JobF lags flags = DefaultFlags );	KIO_EXPORT CopyJob *move( const KUrl::List& src, const KUrl& dest, JobF lags flags = DefaultFlags );

	/**	/**
	* Create a link.	* Create a link.
	* If the protocols and hosts are the same, a Unix symlink will be crea ted.	* If the protocols and hosts are the same, a Unix symlink will be crea ted.
	* Otherwise, a .desktop file of Type Link and pointing to the src URL will be created.	* Otherwise, a .desktop file of Type Link and pointing to the src URL will be created.
	*	*
	* @param src The existing file or directory, 'target' of the link.	* @param src The existing file or directory, 'target' of the link.
	* @param destDir Destination directory where the link will be created.	* @param destDir Destination directory where the link will be created.

	* @param flags: We support HideProgressInfo here	* @param flags: link() supports HideProgressInfo only
	* @return the job handling the operation	* @return the job handling the operation
	*/	*/
	KIO_EXPORT CopyJob *link( const KUrl& src, const KUrl& destDir, JobFlag s flags = DefaultFlags );	KIO_EXPORT CopyJob *link( const KUrl& src, const KUrl& destDir, JobFlag s flags = DefaultFlags );

	/**	/**
	* Create several links	* Create several links
	* If the protocols and hosts are the same, a Unix symlink will be crea ted.	* If the protocols and hosts are the same, a Unix symlink will be crea ted.
	* Otherwise, a .desktop file of Type Link and pointing to the src URL will be created.	* Otherwise, a .desktop file of Type Link and pointing to the src URL will be created.
	*	*
	* @param src The existing files or directories, 'targets' of the link.	* @param src The existing files or directories, 'targets' of the link.
	* @param destDir Destination directory where the links will be created .	* @param destDir Destination directory where the links will be created .

	* @param flags: We support HideProgressInfo here	* @param flags: link() supports HideProgressInfo only
	* @return the job handling the operation	* @return the job handling the operation
	* @see link()	* @see link()
	*/	*/
	KIO_EXPORT CopyJob *link( const KUrl::List& src, const KUrl& destDir, J obFlags flags = DefaultFlags );	KIO_EXPORT CopyJob *link( const KUrl::List& src, const KUrl& destDir, J obFlags flags = DefaultFlags );

	/**	/**
	* Create a link. Unlike link() this operation will fail when the direc tory already	* Create a link. Unlike link() this operation will fail when the direc tory already
	* exists.	* exists.
	* If the protocols and hosts are the same, a Unix symlink will be crea ted.	* If the protocols and hosts are the same, a Unix symlink will be crea ted.
	* Otherwise, a .desktop file of Type Link and pointing to the src URL will be created.	* Otherwise, a .desktop file of Type Link and pointing to the src URL will be created.
	*	*
	* @param src The existing file or directory, 'target' of the link.	* @param src The existing file or directory, 'target' of the link.
	* @param dest Destination directory where the link will be created.	* @param dest Destination directory where the link will be created.

	* @param flags: We support HideProgressInfo here	* @param flags: linkAs() supports HideProgressInfo only
	* @return the job handling the operation	* @return the job handling the operation
	* @see link ()	* @see link ()
	* @see copyAs()	* @see copyAs()
	*/	*/
	KIO_EXPORT CopyJob *linkAs( const KUrl& src, const KUrl& dest, JobFlags flags = DefaultFlags );	KIO_EXPORT CopyJob *linkAs( const KUrl& src, const KUrl& dest, JobFlags flags = DefaultFlags );

	/**	/**
	* Trash a file or directory.	* Trash a file or directory.
	* This is currently only supported for local files and directories.	* This is currently only supported for local files and directories.
	* Use "KUrl src; src.setPath( path );" to create a URL from a path.	* Use "KUrl src; src.setPath( path );" to create a URL from a path.
	*	*
	* @param src file to delete	* @param src file to delete

	* @param flags: We support HideProgressInfo here	* @param flags: trash() supports HideProgressInfo only
	* @return the job handling the operation	* @return the job handling the operation
	*/	*/
	KIO_EXPORT CopyJob *trash( const KUrl& src, JobFlags flags = DefaultFla gs );	KIO_EXPORT CopyJob *trash( const KUrl& src, JobFlags flags = DefaultFla gs );

	/**	/**
	* Trash a list of files or directories.	* Trash a list of files or directories.
	* This is currently only supported for local files and directories.	* This is currently only supported for local files and directories.
	*	*
	* @param src the files to delete	* @param src the files to delete

	* @param flags: We support HideProgressInfo here	* @param flags: trash() supports HideProgressInfo only
	* @return the job handling the operation	* @return the job handling the operation
	*/	*/
	KIO_EXPORT CopyJob *trash( const KUrl::List& src, JobFlags flags = Defa ultFlags );	KIO_EXPORT CopyJob *trash( const KUrl::List& src, JobFlags flags = Defa ultFlags );

	}	}

	#endif	#endif

End of changes. 13 change blocks.
	14 lines changed or deleted	47 lines changed or added

	corona.h	corona.h

	skipping to change at line 41	skipping to change at line 41
	class QGraphicsGridLayout;	class QGraphicsGridLayout;
	class QAction;	class QAction;

	class KAction;	class KAction;

	namespace Plasma	namespace Plasma
	{	{

	class CoronaPrivate;	class CoronaPrivate;
	class ContainmentActionsPluginsConfig;	class ContainmentActionsPluginsConfig;

		class AbstractDialogManager;

	/**	/**
	* @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 239	skipping to change at line 240
	* Sets the default containmentactions plugins for the given containmen t type	* Sets the default containmentactions plugins for the given containmen t type
	*/	*/
	void setContainmentActionsDefaults(Containment::Type containmentType, c onst ContainmentActionsPluginsConfig &config);	void setContainmentActionsDefaults(Containment::Type containmentType, c onst ContainmentActionsPluginsConfig &config);

	/**	/**
	* @since 4.4	* @since 4.4
	* Returns the default containmentactions plugins for the given contain ment type	* Returns the default containmentactions plugins for the given contain ment type
	*/	*/
	ContainmentActionsPluginsConfig containmentActionsDefaults(Containment: :Type containmentType);	ContainmentActionsPluginsConfig containmentActionsDefaults(Containment: :Type containmentType);


		/**
		* @param the AbstractDialogManager implementaion
		*
		* @since 4.5
		*/
		void setDialogManager(AbstractDialogManager *manager);

		/**
		* @return the AbstractDialogManager that will show dialogs used by app
		lets, like configuration dialogs
		*
		* @since 4.5
		*/
		AbstractDialogManager *dialogManager();

		/**
		* Imports an applet layout from a config file. The results will be add
		ed to the
		* current set of Containments.
		*
		* @param config the name of the config file to load from,
		* or the default config file if QString()
		* @return the list of containments that were loaded
		* @since 4.5
		*/
		QList<Plasma::Containment *> importLayout(const KConfigBase &config);

	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());

	skipping to change at line 292	skipping to change at line 318

	/**	/**
	* Schedules a time sensitive flush-to-disk synchronization of the	* Schedules a time sensitive flush-to-disk synchronization of the
	* configuration state. Since this method does not provide any sort of	* configuration state. Since this method does not provide any sort of
	* event compression, it should only be used when an immediate disk	* event compression, it should only be used when an immediate disk
	* sync is absolutely required. Otherwise, use @see requestConfigSync ()	* sync is absolutely required. Otherwise, use @see requestConfigSync ()
	* which does do event compression.	* which does do event compression.
	*/	*/
	void requireConfigSync();	void requireConfigSync();


		/**
		* @since 4.5
		* Layout the containments on this corona. The default implementation
		* organizes them in a grid-like view, but subclasses can reimplement
		* this slot to provide their own layout.
		*/
		void layoutContainments();

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* This signal indicates a new containment has been added to	* This signal indicates a new containment has been added to
	* the Corona	* the Corona
	*/	*/
	void containmentAdded(Plasma::Containment *containment);	void containmentAdded(Plasma::Containment *containment);

	/**	/**
	* This signal indicates that a containment has been newly	* This signal indicates that a containment has been newly
	* associated (or dissociated) with a physical screen.	* associated (or dissociated) with a physical screen.

	skipping to change at line 368	skipping to change at line 402
	* containment plugin will be used (usually DesktopContainment). If the	* containment plugin will be used (usually DesktopContainment). If the
	* string literal "null" is passed in, then no plugin will be lo aded and	* string literal "null" is passed in, then no plugin will be lo aded and
	* a simple Containment object will be created instead.	* a simple Containment object will be created instead.
	* @param args argument list to pass to the containment	* @param args argument list to pass to the containment
	*	*
	* @return a pointer to the containment on success, or 0 on failure	* @return a pointer to the containment on success, or 0 on failure
	**/	**/
	Containment *addContainmentDelayed(const QString &name,	Containment *addContainmentDelayed(const QString &name,
	const QVariantList &args = QVariantL ist());	const QVariantList &args = QVariantL ist());


		/**
		* Maps a stock animation to one of the semantic animations. Used to co
		ntrol things such
		* as what animation is used to make a Plasma::Appear appear in a conta
		inment.
		* @arg from the animation to map a new value to
		* @arg to the animation value to map to from
		* @since 4.5
		*/
		void mapAnimation(Animator::Animation from, Animator::Animation to);

		/**
		* Maps a loadable animation to one of the semantic animations. Used to
		control things such
		* as what animation is used to make a Plasma::Appear appear in a conta
		inment.
		* @arg from the animation to map a new value to
		* @arg to the animation value to map to from; this must map to a Javas
		cript animation
		* @since 4.5
		*/
		void mapAnimation(Animator::Animation from, const QString &to);

	//Reimplemented from QGraphicsScene	//Reimplemented from QGraphicsScene
	void dragEnterEvent(QGraphicsSceneDragDropEvent *event);	void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
	void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);	void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
	void dragMoveEvent(QGraphicsSceneDragDropEvent *event);	void dragMoveEvent(QGraphicsSceneDragDropEvent *event);

	private:	private:
	CoronaPrivate *const d;	CoronaPrivate *const d;

	Q_PRIVATE_SLOT(d, void containmentDestroyed(QObject*))	Q_PRIVATE_SLOT(d, void containmentDestroyed(QObject*))
	Q_PRIVATE_SLOT(d, void offscreenWidgetDestroyed(QObject *))	Q_PRIVATE_SLOT(d, void offscreenWidgetDestroyed(QObject *))
	Q_PRIVATE_SLOT(d, void syncConfig())	Q_PRIVATE_SLOT(d, void syncConfig())
	Q_PRIVATE_SLOT(d, void toggleImmutability())	Q_PRIVATE_SLOT(d, void toggleImmutability())
	Q_PRIVATE_SLOT(d, void showShortcutConfig())	Q_PRIVATE_SLOT(d, void showShortcutConfig())

	friend class CoronaPrivate;	friend class CoronaPrivate;

		friend class View;
	};	};

	} // namespace Plasma	} // namespace Plasma

	#endif	#endif

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

	credentials.h	credentials.h
	/*	/*

	Copyright (C) 2009 Rob Scheepmaker <r.scheepmaker@student.utwente.nl>	* Copyright © 2009 Rob Scheepmaker <r.scheepmaker@student.utwente.nl>
		*
	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 General Public License as published by	* it under the terms of the GNU Library General Public License version 2
	the Free Software Foundation, either version 3 of the License, or	as
	(at your option) any later version.	* published by the Free Software Foundation
		*
	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
		*
	You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU Library General Public
	along with this program. If not, see <http://www.gnu.org/licenses/>.	* License along with this program; if not, write to the
	*/	* Free Software Foundation, Inc.,
		* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
		*/

	#ifndef CREDENTIALS_H	#ifndef CREDENTIALS_H
	#define CREDENTIALS_H	#define CREDENTIALS_H

	#include "plasma.h"	#include "plasma.h"

	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include <QtCore/QDataStream>	#include <QtCore/QDataStream>
	#include <QtCore/QMetaType>	#include <QtCore/QMetaType>


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

	css_stylesheet.h	css_stylesheet.h

	skipping to change at line 196	skipping to change at line 196
	*/	*/
	unsigned short code;	unsigned short code;

	enum ExceptionCode	enum ExceptionCode
	{	{
	SYNTAX_ERR = 0,	SYNTAX_ERR = 0,
	INVALID_MODIFICATION_ERR = 1,	INVALID_MODIFICATION_ERR = 1,
	_EXCEPTION_OFFSET = 1000,	_EXCEPTION_OFFSET = 1000,
	_EXCEPTION_MAX = 1999	_EXCEPTION_MAX = 1999
	};	};


		/// Returns the name of this error
		DOMString codeAsString() const;

		/// Returns the name of given error code
		static DOMString codeAsString(int cssCode);

		/** @internal - checks to see whether internal code is a CSS one */
		static bool isCSSExceptionCode(int exceptioncode);
	};	};

	class CSSStyleSheetImpl;	class CSSStyleSheetImpl;
	class CSSRule;	class CSSRule;
	class CSSRuleList;	class CSSRuleList;

	/**	/**
	* The \c CSSStyleSheet interface is a concrete interface	* The \c CSSStyleSheet interface is a concrete interface
	* used to represent a CSS style sheet i.e. a style sheet whose	* used to represent a CSS style sheet i.e. a style sheet whose
	* content type is "text/css".	* content type is "text/css".

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

	dataengine.h	dataengine.h

	skipping to change at line 64	skipping to change at line 64
	* DataEngines are loaded as plugins on demand and provide zero, one or mor e	* DataEngines are loaded as plugins on demand and provide zero, one or mor e
	* data sources which are identified by name. For instance, a network	* data sources which are identified by name. For instance, a network
	* DataEngine might provide a data source for each network interface.	* DataEngine might provide a data source for each network interface.
	**/	**/
	class PLASMA_EXPORT DataEngine : public QObject	class PLASMA_EXPORT DataEngine : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(QStringList sources READ sources)	Q_PROPERTY(QStringList sources READ sources)
	Q_PROPERTY(bool valid READ isValid)	Q_PROPERTY(bool valid READ isValid)
	Q_PROPERTY(QString icon READ icon WRITE setIcon)	Q_PROPERTY(QString icon READ icon WRITE setIcon)

		Q_PROPERTY(QString name READ name)

	public:	public:
	typedef QHash<QString, DataEngine*> Dict;	typedef QHash<QString, DataEngine*> Dict;
	typedef QHash<QString, QVariant> Data;	typedef QHash<QString, QVariant> Data;
	typedef QHashIterator<QString, QVariant> DataIterator;	typedef QHashIterator<QString, QVariant> DataIterator;
	typedef QHash<QString, DataContainer*> SourceDict;	typedef QHash<QString, DataContainer*> SourceDict;

	/**	/**
	* Constructor.	* Constructor.
	*	*

	skipping to change at line 95	skipping to change at line 96
	* which have the need to perform a startup routine.	* which have the need to perform a startup routine.
	**/	**/
	virtual void init();	virtual void init();

	/**	/**
	* @return a list of all the data sources available via this DataEn gine	* @return a list of all the data sources available via this DataEn gine
	* Whether these sources are currently available (which is what	* Whether these sources are currently available (which is what
	* the default implementation provides) or not is up to the	* the default implementation provides) or not is up to the
	* DataEngine to decide.	* DataEngine to decide.
	**/	**/

	Q_INVOKABLE virtual QStringList sources() const;	virtual QStringList sources() const;

	/**	/**
	* @param source the source to target the Service at	* @param source the source to target the Service at
	* @return a Service that has the source as a destination. The serv ice	* @return a Service that has the source as a destination. The serv ice

	* is parented to the DataEngine, but may be deleted by the	* is parented to the DataEngine, but should be deleted by the
	* caller when finished with it	* caller when finished with it
	*/	*/
	Q_INVOKABLE virtual Service *serviceForSource(const QString &source );	Q_INVOKABLE virtual Service *serviceForSource(const QString &source );

	/**	/**
	* Returns the engine name for the DataEngine	* Returns the engine name for the DataEngine
	*/	*/

	Q_INVOKABLE QString name() const;	QString name() const;

	/**	/**
	* Connects a source to an object for data updates. The object must	* Connects a source to an object for data updates. The object must
	* have a slot with the following signature:	* have a slot with the following signature:
	*	*
	* dataUpdated(const QString &sourceName, const Plasma::DataEngine: :Data &data)	* dataUpdated(const QString &sourceName, const Plasma::DataEngine: :Data &data)
	*	*
	* The data is a QHash of QVariants keyed by QString names, allowin g	* The data is a QHash of QVariants keyed by QString names, allowin g
	* one data source to provide sets of related data.	* one data source to provide sets of related data.
	*	*

	skipping to change at line 168	skipping to change at line 169
	* 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 alAlignment =	Plasma::IntervalAlignment interv alAlignment =
	NoAlignment) const;	NoAlignment) const;

	/**	/**

	* Disconnects a source to an object that was receiving data update s.	* Disconnects a source from an object that was receiving data upda tes.
	*	*
	* @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;

	/**	/**

	* Retrevies a pointer to the DataContainer for a given source. Thi s method	* Retrieves a pointer to the DataContainer for a given source. Thi s method
	* should not be used if possible. An exception is for script engin es that	* should not be used if possible. An exception is for script engin es that
	* can not provide a QMetaObject as required by connectSource for t he initial	* can not provide a QMetaObject as required by connectSource for t he initial
	* call to dataUpdated. Using this method, such engines can provide their own	* call to dataUpdated. Using this method, such engines can provide their own
	* connectSource API.	* connectSource API.
	*	*
	* @param source the name of the source.	* @param source the name of the source.
	* @return pointer to a DataContainer, or zero on failure	* @return pointer to a DataContainer, or zero on failure
	**/	**/
	Q_INVOKABLE DataContainer *containerForSource(const QString &source );	Q_INVOKABLE DataContainer *containerForSource(const QString &source );


	skipping to change at line 201	skipping to change at line 202
	* one data source to provide sets of related data.	* one data source to provide sets of related data.
	*	*
	* @param source the data source to retrieve the data for	* @param source the data source to retrieve the data for
	* @return the Data associated with the source; if the source doesn 't	* @return the Data associated with the source; if the source doesn 't
	* exist an empty data set is returned	* exist an empty data set is returned
	**/	**/
	Q_INVOKABLE DataEngine::Data query(const QString &source) const;	Q_INVOKABLE DataEngine::Data query(const QString &source) const;

	/**	/**
	* Returns true if this engine is valid, otherwise returns false	* Returns true if this engine is valid, otherwise returns false

		*
		* @return true if the engine is valid
	**/	**/
	bool isValid() const;	bool isValid() const;

	/**	/**
	* Returns true if the data engine is empty, which is to say that i t has no	* Returns true if the data engine is empty, which is to say that i t has no
	* data sources currently.	* data sources currently.

		*
		* @return true if the engine has no sources currently
	*/	*/
	bool isEmpty() const;	bool isEmpty() const;

	/**	/**
	* Returns the maximum number of sources this DataEngine will have	* Returns the maximum number of sources this DataEngine will have
	* at any given time.	* at any given time.
	*	*
	* @return the maximum number of sources; zero means no limit.	* @return the maximum number of sources; zero means no limit.
	*/	*/
	uint maxSourceCount() const;	uint maxSourceCount() const;

	skipping to change at line 232	skipping to change at line 237
	QString icon() const;	QString icon() const;

	/**	/**
	* Accessor for the associated Package object if any.	* Accessor for the associated Package object if any.
	*	*
	* @return the Package object, or 0 if none	* @return the Package object, or 0 if none
	**/	**/
	const Package *package() const;	const Package *package() const;

	/**	/**

	* Returns the plugin name for the applet	* @return the plugin name for the applet
	*/	*/
	QString pluginName() const;	QString pluginName() const;


		/**
		* Initializes and returns a new service from the name that was set
		* with setDefaultService. (service name is set internally). Rememb
		er to dispose
		* of the Service* when you are finished with it (even if a parent
		is passed)
		* A DataEngine* is sent to the created service via the QVariantLis
		t arguments.
		*
		* @see setDefaultService
		* @param the parent of the object, if any, for the returned servi
		ce
		* @return the newly created service
		* @since 4.5
		*/
		Q_INVOKABLE Service* createDefaultService(QObject *parent = 0);

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Emitted when a new data source is created	* Emitted when a new data source is created
	*	*
	* Note that you do not need to emit this yourself unless	* Note that you do not need to emit this yourself unless
	* you are reimplementing sources() and want to advertise	* you are reimplementing sources() and want to advertise
	* that a new source is available (but hasn't been created	* that a new source is available (but hasn't been created
	* yet).	* yet).
	*	*
	* @param source the name of the new data source	* @param source the name of the new data source

	skipping to change at line 386	skipping to change at line 404
	* Sets up an internal update tick for all data sources. On every u pdate,	* Sets up an internal update tick for all data sources. On every u pdate,
	* updateSourceEvent will be called for each applicable source.	* updateSourceEvent will be called for each applicable source.
	* @see updateSourceEvent	* @see updateSourceEvent
	*	*
	* @param frequency the time, in milliseconds, between updates. A v alue of 0	* @param frequency the time, in milliseconds, between updates. A v alue of 0
	* will stop internally triggered updates.	* will stop internally triggered updates.
	**/	**/
	void setPollingInterval(uint frequency);	void setPollingInterval(uint frequency);

	/**	/**

	* Returns the current update frequency.
	* @see setPollingInterval
	NOTE: This is not implemented to prevent having to store the value
	internally.
	When there is a good use case for needing access to this val
	ue, we can
	add another member to the Private class and add this method.
	uint pollingInterval();
	**/

	/**
	* Removes all data sources	* Removes all data sources
	**/	**/
	void removeAllSources();	void removeAllSources();

	/**	/**
	* Sets whether or not this engine is valid, e.g. can be used.	* Sets whether or not this engine is valid, e.g. can be used.
	* In practice, only the internal fall-back engine, the NullEngine	* In practice, only the internal fall-back engine, the NullEngine
	* should have need for this.	* should have need for this.
	*	*
	* @param valid whether or not the engine is valid	* @param valid whether or not the engine is valid

	skipping to change at line 428	skipping to change at line 437
	/**	/**
	* Sets the engine name for the DataEngine	* Sets the engine name for the DataEngine
	*/	*/
	void setName(const QString &name);	void setName(const QString &name);

	/**	/**
	* Sets the icon for this data engine	* Sets the icon for this data engine
	**/	**/
	void setIcon(const QString &icon);	void setIcon(const QString &icon);


		/**
		* Should be set if there will be 1 main service.
		* This saves any users of this DataEngine from having to know the
		service name to load.
		* It is not created until createDefaultService is called.
		*
		* @code
		* DataEngine *engine = dataEngine("foo");
		* Service *service = engine->createDefaultService(this);
		* @endcode
		*
		* @see createDefaultService
		* @param serviceName the name of the service to load (plugin name
		)
		* @since 4.5
		*/
		void setDefaultService(const QString &serviceName);

	protected Q_SLOTS:	protected Q_SLOTS:
	/**	/**
	* Call this method when you call setData directly on a DataContain er instead	* Call this method when you call setData directly on a DataContain er instead
	* of using the DataEngine::setData methods.	* of using the DataEngine::setData methods.
	* If this method is not called, no dataUpdated(..) signals will be emitted!	* If this method is not called, no dataUpdated(..) signals will be emitted!
	*/	*/
	void scheduleSourcesUpdated();	void scheduleSourcesUpdated();

	/**	/**
	* Removes a data source.	* Removes a data source.

	skipping to change at line 467	skipping to change at line 492
	void forceImmediateUpdateOfAllVisualizations();	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 PlasmoidServiceJob;
	friend class NullEngine;	friend class NullEngine;

	Q_PRIVATE_SLOT(d, void internalUpdateSource(DataContainer *source))	Q_PRIVATE_SLOT(d, void internalUpdateSource(DataContainer *source))

		Q_PRIVATE_SLOT(d, void sourceDestroyed(QObject *object))

	DataEnginePrivate *const d;	DataEnginePrivate *const d;
	};	};

	} // Plasma namespace	} // Plasma namespace

	/**	/**
	* Register a data engine when it is contained in a loadable module	* Register a data engine when it is contained in a loadable module
	*/	*/
	#define K_EXPORT_PLASMA_DATAENGINE(libname, classname) \	#define K_EXPORT_PLASMA_DATAENGINE(libname, classname) \
	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \	K_PLUGIN_FACTORY(factory, registerPlugin<classname>();) \
	K_EXPORT_PLUGIN(factory("plasma_engine_" #libname)) \	K_EXPORT_PLUGIN(factory("plasma_engine_" #libname)) \
	K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)	K_EXPORT_PLUGIN_VERSION(PLASMA_VERSION)


		Q_DECLARE_METATYPE(Plasma::DataEngine*)

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

End of changes. 14 change blocks.
	17 lines changed or deleted	49 lines changed or added

	dialog.h	dialog.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 Licen se	You should have received a copy of the GNU Library General Public Licen se
	along with this library; see the file COPYING.LIB. If not, write to	along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.	Boston, MA 02110-1301, USA.

	*/	*/

	#ifndef KSETTINGS_DIALOG_H	#ifndef KSETTINGS_DIALOG_H
	#define KSETTINGS_DIALOG_H	#define KSETTINGS_DIALOG_H


	#include "../kutils_export.h"	#include "../kcmutils_export.h"
	#include "../kcmultidialog.h"	#include "../kcmultidialog.h"

	#include <kservice.h>	#include <kservice.h>
	#include <kplugininfo.h>	#include <kplugininfo.h>

	template<class T> class QList;	template<class T> class QList;
	class KPluginInfo;	class KPluginInfo;
	class KCModuleInfo;	class KCModuleInfo;

	namespace KSettings	namespace KSettings

	skipping to change at line 73	skipping to change at line 73
	* KStandardAction::preferences( m_cfgdlg, SLOT( show() ), actionCollection () );	* KStandardAction::preferences( m_cfgdlg, SLOT( show() ), actionCollection () );
	* \endcode	* \endcode
	*	*
	* If you need to be informed when the config was changed and applied in th e	* If you need to be informed when the config was changed and applied in th e
	* dialog you might want to take a look at Dispatcher.	* dialog you might want to take a look at Dispatcher.
	*	*
	* For more information see \ref KSettings.	* For more information see \ref KSettings.
	*	*
	* @author Matthias Kretz <kretz@kde.org>	* @author Matthias Kretz <kretz@kde.org>
	*/	*/

	class KUTILS_EXPORT Dialog : public KCMultiDialog	class KCMUTILS_EXPORT Dialog : public KCMultiDialog
	{	{
	friend class PageNode;	friend class PageNode;
	Q_DECLARE_PRIVATE(Dialog)	Q_DECLARE_PRIVATE(Dialog)
	Q_OBJECT	Q_OBJECT
	public:	public:
	/**	/**
	* Construct a new Preferences Dialog for the application. It uses all	* Construct a new Preferences Dialog for the application. It uses all
	* KCMs with X-KDE-ParentApp set to KGlobal::mainComponent().compon entName().	* KCMs with X-KDE-ParentApp set to KGlobal::mainComponent().compon entName().
	*	*
	* @param content Select whether you want a static or configur able	* @param content Select whether you want a static or configur able

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

	document.h	document.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)

	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 as published by the Free Software Foundation; either
		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.

	You should have received a copy of the GNU Library General Public Licens e	You should have received a copy of the GNU Library General Public Licens e
	along with this library; see the file COPYING.LIB. If not, write to	along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.	Boston, MA 02110-1301, USA.

	skipping to change at line 570	skipping to change at line 571
	/**	/**
	* The \p document emits this signal whenever \p range was removed, i.e .	* The \p document emits this signal whenever \p range was removed, i.e .
	* text was removed.	* text was removed.
	* \param document document which emitted this signal	* \param document document which emitted this signal
	* \param range range that the removed text previously occupied	* \param range range that the removed text previously occupied
	* \see removeText(), removeLine(), clear()	* \see removeText(), removeLine(), clear()
	*/	*/
	void textRemoved(KTextEditor::Document *document, const KTextEditor::Ra nge& range);	void textRemoved(KTextEditor::Document *document, const KTextEditor::Ra nge& range);

	/**	/**

		* The \p document emits this signal whenever \p range was removed, i.e
		.
		* text was removed.
		* \param document document which emitted this signal
		* \param range range that the removed text previously occupied
		* \param oldText the text that has been removed
		* \see removeText(), removeLine(), clear()
		*/
		void textRemoved(KTextEditor::Document *document, const KTextEditor::Ra
		nge& range, const QString& oldText);

		/**
	* The \p document emits this signal whenever the text in range	* The \p document emits this signal whenever the text in range
	* \p oldRange was removed and replaced with the text now in \e newRang e,	* \p oldRange was removed and replaced with the text now in \e newRang e,
	* e.g. the user selects text and pastes new text to replace the select ion.	* e.g. the user selects text and pastes new text to replace the select ion.
	* \note \p oldRange.start() is guaranteed to equal \p newRange.start() .	* \note \p oldRange.start() is guaranteed to equal \p newRange.start() .
	* \param document document which emitted this signal	* \param document document which emitted this signal
	* \param oldRange range that the text previously occupied	* \param oldRange range that the text previously occupied
	* \param newRange range that the changed text now occupies	* \param newRange range that the changed text now occupies
	* \see insertText(), insertLine(), removeText(), removeLine(), clear()	* \see insertText(), insertLine(), removeText(), removeLine(), clear()
	*/	*/
	void textChanged(KTextEditor::Document *document, const KTextEditor::Ra nge& oldRange, const KTextEditor::Range& newRange);	void textChanged(KTextEditor::Document *document, const KTextEditor::Ra nge& oldRange, const KTextEditor::Range& newRange);

	/**	/**

		* The \p document emits this signal whenever the text in range
		* \p oldRange was removed and replaced with the text now in \e newRang
		e,
		* e.g. the user selects text and pastes new text to replace the select
		ion.
		* \note \p oldRange.start() is guaranteed to equal \p newRange.start()
		.
		* \param document document which emitted this signal
		* \param oldRange range that the text previously occupied
		* \param oldText old text that has been replaced
		* \param newRange range that the changed text now occupies
		* \see insertText(), insertLine(), removeText(), removeLine(), clear()
		*/
		void textChanged(KTextEditor::Document *document, const KTextEditor::Ra
		nge& oldRange, const QString& oldText, const KTextEditor::Range& newRange);

		/**
	* Warn anyone listening that the current document is about to close.	* Warn anyone listening that the current document is about to close.
	* At this point all of the information is still accessible, such as th e text,	* At this point all of the information is still accessible, such as th e text,
	* cursors and ranges.	* cursors and ranges.
	*	*
	* Any modifications made to the document at this point will be lost.	* Any modifications made to the document at this point will be lost.
	*	*
	* \param document the document being closed	* \param document the document being closed
	*/	*/
	void aboutToClose(KTextEditor::Document *document);	void aboutToClose(KTextEditor::Document *document);


	skipping to change at line 603	skipping to change at line 627
	* Warn anyone listening that the current document is about to reload.	* Warn anyone listening that the current document is about to reload.
	* At this point all of the information is still accessible, such as th e text,	* At this point all of the information is still accessible, such as th e text,
	* cursors and ranges.	* cursors and ranges.
	*	*
	* Any modifications made to the document at this point will be lost.	* Any modifications made to the document at this point will be lost.
	*	*
	* \param document the document being reloaded	* \param document the document being reloaded
	*/	*/
	void aboutToReload(KTextEditor::Document *document);	void aboutToReload(KTextEditor::Document *document);


		/**
		* Upon emission, the document's content may only be changed by the ini
		tiator
		* of this signal until exclusiveEditEnd() is signalled. It is, however
		,
		* possible to listen to changes of the content.
		*
		* Signalled e.g. on undo or redo.
		*
		* @since 4.5
		*/
		void exclusiveEditStart(KTextEditor::Document *document);

		/**
		* In conjunction with exclusiveEditStart(), signals that the document'
		s content
		* may be changed again without restriction.
		*
		* @since 4.5
		*/
		void exclusiveEditEnd(KTextEditor::Document *document);

	/*	/*
	* Access to the mode/highlighting subsystem	* Access to the mode/highlighting subsystem
	*/	*/
	public:	public:
	/**	/**
	* Return the name of the currently used mode	* Return the name of the currently used mode
	* \return name of the used mode	* \return name of the used mode
	* \see modes(), setMode()	* \see modes(), setMode()
	*/	*/
	virtual QString mode() const = 0;	virtual QString mode() const = 0;

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

	dom2_events.h	dom2_events.h

	skipping to change at line 288	skipping to change at line 288
	* exception.	* exception.
	*	*
	*/	*/
	enum EventExceptionCode {	enum EventExceptionCode {
	UNSPECIFIED_EVENT_TYPE_ERR = 0,	UNSPECIFIED_EVENT_TYPE_ERR = 0,
	_EXCEPTION_OFFSET = 3000,	_EXCEPTION_OFFSET = 3000,
	_EXCEPTION_MAX = 3999	_EXCEPTION_MAX = 3999
	};	};

	unsigned short code;	unsigned short code;


		/// Returns the name of this error
		DOMString codeAsString() const;

		/// Returns the name of given error code
		static DOMString codeAsString(int cssCode);

		/** @internal - checks to see whether internal code is an event one */
		static bool isEventExceptionCode(int exceptioncode);

	};	};

	/**	/**
	* Introduced in DOM Level 2	* Introduced in DOM Level 2
	*	*
	* The UIEvent interface provides specific contextual information associate d	* The UIEvent interface provides specific contextual information associate d
	* with User Interface events.	* with User Interface events.
	*	*
	*/	*/
	class KHTML_EXPORT UIEvent : public Event {	class KHTML_EXPORT UIEvent : public Event {

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

	dom2_range.h	dom2_range.h

	skipping to change at line 67	skipping to change at line 67
	* An integer indicating the type of error generated.	* An integer indicating the type of error generated.
	*	*
	*/	*/
	enum RangeExceptionCode {	enum RangeExceptionCode {
	BAD_BOUNDARYPOINTS_ERR = 1,	BAD_BOUNDARYPOINTS_ERR = 1,
	INVALID_NODE_TYPE_ERR = 2,	INVALID_NODE_TYPE_ERR = 2,
	_EXCEPTION_OFFSET = 2000,	_EXCEPTION_OFFSET = 2000,
	_EXCEPTION_MAX = 2999	_EXCEPTION_MAX = 2999
	};	};
	unsigned short code;	unsigned short code;


		/// Returns the name of this error
		DOMString codeAsString() const;

		/// Returns the name of given DOM error code
		static DOMString codeAsString(int rangeCode);

		/** @internal - checks to see whether internal code is a Range one */
		static bool isRangeExceptionCode(int exceptioncode);
	};	};

	class KHTML_EXPORT Range	class KHTML_EXPORT Range
	{	{
	friend class DocumentImpl;	friend class DocumentImpl;
	friend class Document;	friend class Document;
	friend class RangeImpl;	friend class RangeImpl;
	public:	public:
	Range();	Range();
	Range(const Document rootContainer);	Range(const Document rootContainer);

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

	dom_doc.h	dom_doc.h

	skipping to change at line 921	skipping to change at line 921
	* The result of a call to this method is the same as the result of a c all	* The result of a call to this method is the same as the result of a c all
	* to DOMParser.parseWithContext with an input stream containing the st ring	* to DOMParser.parseWithContext with an input stream containing the st ring
	* passed to this call, the document as the context node, and the actio n	* passed to this call, the document as the context node, and the actio n
	* ACTION_REPLACE_CHILDREN.	* ACTION_REPLACE_CHILDREN.
	*	*
	* @param source A string containing an XML document.	* @param source A string containing an XML document.
	*/	*/
	void loadXML( const DOMString &source );	void loadXML( const DOMString &source );

	/**	/**

		* Introduced in Selectors Level 1.
		*
		* Returns the first (in document order) element matching the given
		* CSS selector @p query.
		*
		* @since 4.5
		*/
		Element querySelector(const DOMString& query) const;

		/**
		* Introduced in Selectors Level 1.
		*
		* Returns all (in document order) elements matching the given
		* CSS selector @p query. Note that the returned NodeList is
		* static and not live, and will not be updated when the document
		* changes
		*
		* @since 4.5
		*/
		NodeList querySelectorAll(const DOMString& query) const;

		/**
	* not part of the official DOM	* not part of the official DOM
	*	*
	* Documents are read-only by default, but they can be made editable by	* Documents are read-only by default, but they can be made editable by
	* entering "design mode".	* entering "design mode".
	*	*
	* @return whether this document is in design mode.	* @return whether this document is in design mode.
	*/	*/
	bool designMode() const;	bool designMode() const;

	/**	/**

	skipping to change at line 1034	skipping to change at line 1056
	DocumentFragment();	DocumentFragment();
	DocumentFragment(const DocumentFragment &other);	DocumentFragment(const DocumentFragment &other);
	DocumentFragment(const Node &other) : Node()	DocumentFragment(const Node &other) : Node()
	{(*this)=other;}	{(*this)=other;}

	DocumentFragment & operator = (const Node &other);	DocumentFragment & operator = (const Node &other);
	DocumentFragment & operator = (const DocumentFragment &other);	DocumentFragment & operator = (const DocumentFragment &other);

	~DocumentFragment();	~DocumentFragment();


		/**
		* Introduced in Selectors Level 1.
		*
		* Returns the first (in document order) element in this fragment
		* matching the given CSS selector @p query.
		*
		* @since 4.5
		*/
		Element querySelector(const DOMString& query) const;

		/**
		* Introduced in Selectors Level 1.
		*
		* Returns all (in document order) elements in this fragment matching t
		he
		* given CSS selector @p query. Note that the returned NodeList is
		* static and not live, and will not be updated when the document
		* changes
		*
		* @since 4.5
		*/
		NodeList querySelectorAll(const DOMString& query) const;
	protected:	protected:
	DocumentFragment(DocumentFragmentImpl *i);	DocumentFragment(DocumentFragmentImpl *i);
	};	};

	class NamedNodeMap;	class NamedNodeMap;
	class DOMString;	class DOMString;

	/**	/**
	* Each \c Document has a \c doctype attribute	* Each \c Document has a \c doctype attribute
	* whose value is either \c null or a \c DocumentType	* whose value is either \c null or a \c DocumentType

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

	dom_element.h	dom_element.h

	skipping to change at line 212	skipping to change at line 212
	* value may contain entity references, an \c Attr object	* value may contain entity references, an \c Attr object
	* should be retrieved to examine the possibly fairly complex sub-tree	* should be retrieved to examine the possibly fairly complex sub-tree
	* representing the attribute value. On the other hand, in HTML, where	* representing the attribute value. On the other hand, in HTML, where
	* all attributes have simple string values, methods to directly	* all attributes have simple string values, methods to directly
	* access an attribute value can safely be used as a convenience.	* access an attribute value can safely be used as a convenience.
	*	*
	*/	*/
	class KHTML_EXPORT Element : public Node	class KHTML_EXPORT Element : public Node
	{	{
	friend class Document;	friend class Document;

		friend class DocumentFragment;
	friend class HTMLDocument;	friend class HTMLDocument;
	// friend class AttrImpl;	// friend class AttrImpl;
	friend class Attr;	friend class Attr;

	public:	public:
	Element();	Element();
	Element(const Node &other) : Node()	Element(const Node &other) : Node()
	{(*this)=other;}	{(*this)=other;}
	Element(const Element &other);	Element(const Element &other);


	skipping to change at line 609	skipping to change at line 610
	/**	/**
	* Introduced in DOM level 3	* Introduced in DOM level 3
	* This method is part of the ElementTraversal interface	* This method is part of the ElementTraversal interface
	*	*
	* @return The current number of child nodes of that element which are of nodeType ELEMENT_NODE	* @return The current number of child nodes of that element which are of nodeType ELEMENT_NODE
	*	*
	*/	*/
	unsigned long childElementCount ( ) const;	unsigned long childElementCount ( ) const;

	/**	/**

		* Introduced in Selectors Level 1.
		*
		* Returns the first (in document order) element in this element's subt
		ree
		* matching the given CSS selector @p query.
		*
		* @since 4.5
		*/
		Element querySelector(const DOMString& query) const;

		/**
		* Introduced in Selectors Level 1.
		*
		* Returns all (in document order) elements in this element's subtree
		* matching the given CSS selector @p query. Note that the returned Nod
		eList
		* is static and not live, and will not be updated when the document
		* changes
		*
		* @since 4.5
		*/
		NodeList querySelectorAll(const DOMString& query) const;

		/**
	* not part of the official DOM	* not part of the official DOM
	*	*
	* This method will always reflect the editability setting of this	* This method will always reflect the editability setting of this
	* element as specified by a direct or indirect (that means, inherited)	* element as specified by a direct or indirect (that means, inherited)
	* assignment to contentEditable or the respective CSS rule, even if	* assignment to contentEditable or the respective CSS rule, even if
	* design mode is active.	* design mode is active.
	*	*
	* @return whether this element is editable.	* @return whether this element is editable.
	* @see setContentEditable	* @see setContentEditable
	*/	*/

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

	dom_exception.h	dom_exception.h

	skipping to change at line 33	skipping to change at line 33
	* http://www.w3.org/TR/REC-DOM-Level-1/	* http://www.w3.org/TR/REC-DOM-Level-1/
	* Copyright © World Wide Web Consortium , (Massachusetts Institute of	* Copyright © World Wide Web Consortium , (Massachusetts Institute of
	* Technology , Institut National de Recherche en Informatique et en	* Technology , Institut National de Recherche en Informatique et en
	* Automatique , Keio University ). All Rights Reserved.	* Automatique , Keio University ). All Rights Reserved.
	*	*
	*/	*/
	#ifndef _DOM_DOMException_h_	#ifndef _DOM_DOMException_h_
	#define _DOM_DOMException_h_	#define _DOM_DOMException_h_

	#include <dom/dom_misc.h>	#include <dom/dom_misc.h>

		#include <dom/dom_string.h>

	namespace DOM {	namespace DOM {

	/**	/**
	* DOM operations only raise exceptions in "exceptional"	* DOM operations only raise exceptions in "exceptional"
	* circumstances, i.e., when an operation is impossible to perform	* circumstances, i.e., when an operation is impossible to perform
	* (either for logical reasons, because data is lost, or because the	* (either for logical reasons, because data is lost, or because the
	* implementation has become unstable). In general, DOM methods return	* implementation has become unstable). In general, DOM methods return
	* specific error values in ordinary processing situation, such as	* specific error values in ordinary processing situation, such as
	* out-of-bound errors when using \c NodeList .	* out-of-bound errors when using \c NodeList .

	skipping to change at line 91	skipping to change at line 92
	INVALID_STATE_ERR = 11,	INVALID_STATE_ERR = 11,
	SYNTAX_ERR = 12,	SYNTAX_ERR = 12,
	INVALID_MODIFICATION_ERR = 13,	INVALID_MODIFICATION_ERR = 13,
	NAMESPACE_ERR = 14,	NAMESPACE_ERR = 14,
	INVALID_ACCESS_ERR = 15,	INVALID_ACCESS_ERR = 15,
	VALIDATION_ERR = 16,	VALIDATION_ERR = 16,
	TYPE_MISMATCH_ERR = 17,	TYPE_MISMATCH_ERR = 17,
	SECURITY_ERR = 18	SECURITY_ERR = 18
	};	};
	unsigned short code;	unsigned short code;


		/// Returns the name of this error
		DOMString codeAsString() const;

		/// Returns the name of given error code
		static DOMString codeAsString(int code);

		/** @internal - checks to see whether internal code is a DOMException o
		ne */
		static bool isDOMExceptionCode(int exceptioncode);

	};	};

	} //namespace	} //namespace
	#endif	#endif

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

	dom_node.h	dom_node.h

	skipping to change at line 393	skipping to change at line 393
	ATTRIBUTE_NODE = 2,	ATTRIBUTE_NODE = 2,
	TEXT_NODE = 3,	TEXT_NODE = 3,
	CDATA_SECTION_NODE = 4,	CDATA_SECTION_NODE = 4,
	ENTITY_REFERENCE_NODE = 5,	ENTITY_REFERENCE_NODE = 5,
	ENTITY_NODE = 6,	ENTITY_NODE = 6,
	PROCESSING_INSTRUCTION_NODE = 7,	PROCESSING_INSTRUCTION_NODE = 7,
	COMMENT_NODE = 8,	COMMENT_NODE = 8,
	DOCUMENT_NODE = 9,	DOCUMENT_NODE = 9,
	DOCUMENT_TYPE_NODE = 10,	DOCUMENT_TYPE_NODE = 10,
	DOCUMENT_FRAGMENT_NODE = 11,	DOCUMENT_FRAGMENT_NODE = 11,

	NOTATION_NODE = 12	NOTATION_NODE = 12,
		XPATH_NAMESPACE_NODE = 13 //< Part of DOM L3 XPath, @since 4.5
	};	};

	/**	/**
	* The name of this node, depending on its type; see the table	* The name of this node, depending on its type; see the table
	* above.	* above.
	*	*
	*/	*/
	DOMString nodeName() const;	DOMString nodeName() const;

	/**	/**

	skipping to change at line 962	skipping to change at line 963
	*	*
	* The items in the \c NodeList are accessible via an	* The items in the \c NodeList are accessible via an
	* integral index, starting from 0.	* integral index, starting from 0.
	*	*
	*/	*/
	class KHTML_EXPORT NodeList	class KHTML_EXPORT NodeList
	{	{
	friend class Element;	friend class Element;
	friend class Node;	friend class Node;
	friend class Document;	friend class Document;

		friend class DocumentFragment;
	friend class HTMLDocument;	friend class HTMLDocument;
	friend class KJS::HTMLDocument;	friend class KJS::HTMLDocument;
	friend class KJS::Window;	friend class KJS::Window;

	public:	public:
	NodeList();	NodeList();
	NodeList(const NodeList &other);	NodeList(const NodeList &other);

	NodeList & operator = (const NodeList &other);	NodeList & operator = (const NodeList &other);


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

	downloaddialog.h	downloaddialog.h
	/*	/*
	knewstuff3/ui/downloaddialog.h.	knewstuff3/ui/downloaddialog.h.
	Copyright (C) 2005 by Enrico Ros <eros.kde@email.it>	Copyright (C) 2005 by Enrico Ros <eros.kde@email.it>
	Copyright (C) 2005 - 2007 Josef Spillner <spillner@kde.org>	Copyright (C) 2005 - 2007 Josef Spillner <spillner@kde.org>
	Copyright (C) 2007 Dirk Mueller <mueller@kde.org>	Copyright (C) 2007 Dirk Mueller <mueller@kde.org>
	Copyright (C) 2007-2009 Jeremy Whiting <jpwhiting@kde.org>	Copyright (C) 2007-2009 Jeremy Whiting <jpwhiting@kde.org>

	Copyright (C) 2009 Frederik Gladhorn <gladhorn@kde.org>	Copyright (C) 2009-2010 Frederik Gladhorn <gladhorn@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.

	skipping to change at line 33	skipping to change at line 33
	#ifndef KNEWSTUFF3_UI_DOWNLOADDIALOG_H	#ifndef KNEWSTUFF3_UI_DOWNLOADDIALOG_H
	#define KNEWSTUFF3_UI_DOWNLOADDIALOG_H	#define KNEWSTUFF3_UI_DOWNLOADDIALOG_H

	#include <kdialog.h>	#include <kdialog.h>

	#include "knewstuff_export.h"	#include "knewstuff_export.h"
	#include "entry.h"	#include "entry.h"

	namespace KNS3	namespace KNS3
	{	{

	class ItemsModel;
	class ItemsViewDelegate;
	class DownloadDialogPrivate;	class DownloadDialogPrivate;

	/**	/**
	* KNewStuff download dialog.	* KNewStuff download dialog.
	*	*
	* The download dialog will present items to the user	* The download dialog will present items to the user
	* for installation, updates and removal.	* for installation, updates and removal.
	* Preview images as well as other meta information can be seen.	* Preview images as well as other meta information can be seen.
	*	*
	* \section knsrc knsrc Files	* \section knsrc knsrc Files

	skipping to change at line 69	skipping to change at line 67
	* <li>always: assume all downloaded files are archives and need to be extr acted</li>	* <li>always: assume all downloaded files are archives and need to be extr acted</li>
	* <li>never: never try to extract the file</li>	* <li>never: never try to extract the file</li>
	* <li>archive: if the file is an archive, uncompress it, otherwise just pa ss it on</li>	* <li>archive: if the file is an archive, uncompress it, otherwise just pa ss it on</li>
	* </ol>	* </ol>
	*	*
	* You have different options to set the target install directory:	* You have different options to set the target install directory:
	* <ol><li>StandardResource: standard ressouce dir, such as <em>.kde/shar e/wallpapers</em>.	* <ol><li>StandardResource: standard ressouce dir, such as <em>.kde/shar e/wallpapers</em>.
	* This is what KStandardDirs::locateLocal(name) will return.</li >	* This is what KStandardDirs::locateLocal(name) will return.</li >
	* <li>TargetDir: a directory in the share/apps section, such as <em> .kde/share/apps/wallpapers</em>.	* <li>TargetDir: a directory in the share/apps section, such as <em> .kde/share/apps/wallpapers</em>.
	* This is what KStandardDirs::locateLocal("data", name) will ret urn.</li>	* This is what KStandardDirs::locateLocal("data", name) will ret urn.</li>

		* <li>XdgTargetDir: a directory in the $XDG_DATA_HOME directory such as <em>.local/share/wallpapers</em> (since 4.5).
	* </ol>	* </ol>
	*	*
	* @since 4.4	* @since 4.4
	*/	*/
	class KNEWSTUFF_EXPORT DownloadDialog :public KDialog	class KNEWSTUFF_EXPORT DownloadDialog :public KDialog
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	/**	/**

	skipping to change at line 118	skipping to change at line 117
	/**	/**
	* The list of entries that have been newly installed	* The list of entries that have been newly installed
	* @return the list of entries	* @return the list of entries
	*/	*/
	KNS3::Entry::List installedEntries();	KNS3::Entry::List installedEntries();

	private:	private:
	void init(const QString& configFile);	void init(const QString& configFile);

	DownloadDialogPrivate *const d;	DownloadDialogPrivate *const d;

		Q_DISABLE_COPY(DownloadDialog)
	};	};

	}	}

	#endif	#endif

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

	editor.h	editor.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries

	Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org>	* Copyright (C) 2005 Christoph Cullmann <cullmann@kde.org>
	Copyright (C) 2005 Dominik Haumann (dhdev@gmx.de) (documentation)	* Copyright (C) 2005 Dominik Haumann (dhdev@gmx.de) (documentation)
		*
	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 as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,	*
	but WITHOUT ANY WARRANTY; without even the implied warranty of	* This library is distributed in the hope that it will be useful,
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	Library General Public License for more details.	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* 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 Licen
	along with this library; see the file COPYING.LIB. If not, write to	se
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* along with this library; see the file COPYING.LIB. If not, write to
	Boston, MA 02110-1301, USA.	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	*/	* Boston, MA 02110-1301, USA.*/

	#ifndef KDELIBS_KTEXTEDITOR_EDITOR_H	#ifndef KDELIBS_KTEXTEDITOR_EDITOR_H
	#define KDELIBS_KTEXTEDITOR_EDITOR_H	#define KDELIBS_KTEXTEDITOR_EDITOR_H

	#include <ktexteditor/ktexteditor_export.h>	#include <ktexteditor/ktexteditor_export.h>
	// our main baseclass of the KTextEditor::Editor	// our main baseclass of the KTextEditor::Editor
	#include <QtCore/QObject>	#include <QtCore/QObject>

	#include <kicon.h>	#include <kicon.h>


	skipping to change at line 169	skipping to change at line 169
	/*	/*
	* General Information about this editor.	* General Information about this editor.
	*/	*/
	public:	public:
	/**	/**
	* Get the about data of this Editor part.	* Get the about data of this Editor part.
	* \return about data	* \return about data
	*/	*/
	virtual const KAboutData *aboutData () const = 0;	virtual const KAboutData *aboutData () const = 0;


		/**
		* Get the current default encoding for this Editor part.
		* \return default encoding
		* \since 4.5
		*/
		const QString &defaultEncoding () const;

		protected:
		/**
		* Set the current default encoding for this Editor part.
		* Editor part implementation should call this internally on creation a
		nd config changes.
		* \param defaultEncoding new default encoding
		* \since 4.5
		*/
		void setDefaultEncoding (const QString &defaultEncoding);

	/*	/*
	* Configuration management.	* Configuration management.
	*/	*/
	public:	public:
	/**	/**
	* Read editor configuration from KConfig \p config.	* Read editor configuration from KConfig \p config.
	*	*
	* \note Implementation Notes: If \p config is NULL you should use	* \note Implementation Notes: If \p config is NULL you should use
	* kapp->config() as a fallback solution. Additionally the	* kapp->config() as a fallback solution. Additionally the
	* readConfig() call should be forwarded to every loaded plugin.	* readConfig() call should be forwarded to every loaded plugin.

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

	editorchooser.h	editorchooser.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries

	Copyright (C) 2005 Joseph Wenninger <jowenn@kde.org>	* Copyright (C) 2005 Joseph Wenninger <jowenn@kde.org>
		*
	This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	* modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	* License as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,	*
	but WITHOUT ANY WARRANTY; without even the implied warranty of	* This library is distributed in the hope that it will be useful,
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	Library General Public License for more details.	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* 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 Licen
	along with this library; see the file COPYING.LIB. If not, write to	se
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* along with this library; see the file COPYING.LIB. If not, write to
	Boston, MA 02110-1301, USA.	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	*/	* Boston, MA 02110-1301, USA.
		*/
	#ifndef _EDITOR_CHOOSER_H_	#ifndef _EDITOR_CHOOSER_H_
	#define _EDITOR_CHOOSER_H_	#define _EDITOR_CHOOSER_H_

	#include <ktexteditor/ktexteditor_export.h>	#include <ktexteditor/ktexteditor_export.h>
	#include <ktexteditor/document.h>	#include <ktexteditor/document.h>
	#include <ktexteditor/editor.h>	#include <ktexteditor/editor.h>

	#include <QtGui/QWidget>	#include <QtGui/QWidget>

	class KConfig;	class KConfig;

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

	entity.h	entity.h

	skipping to change at line 213	skipping to change at line 213
	* An Entity can be used as a QUrl automagically.	* An Entity can be used as a QUrl automagically.
	*/	*/
	operator QUrl() const { return uri(); }	operator QUrl() const { return uri(); }

	/**	/**
	* Compares two Entity instances by simply comparing their URI.	* Compares two Entity instances by simply comparing their URI.
	*/	*/
	bool operator==( const Entity& other ) const;	bool operator==( const Entity& other ) const;

	/**	/**

		* Compares the Entity with a URI.
		*
		* \since 4.5
		*/
		bool operator==( const QUrl& other ) const;

		/**
	* Compares two Entity instances by simply comparing their URI.	* Compares two Entity instances by simply comparing their URI.
	*/	*/
	bool operator!=( const Entity& other ) const;	bool operator!=( const Entity& other ) const;


		/**
		* Compares the Entity with a URI.
		*
		* \since 4.5
		*/
		bool operator!=( const QUrl& other ) const;

	protected:	protected:
	/**	/**
	* 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 )

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

	extendergroup.h	extendergroup.h

	skipping to change at line 117	skipping to change at line 117
	* 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();


		protected:
		void resizeEvent(QGraphicsSceneResizeEvent *event);
		bool eventFilter(QObject watched, QEvent event);
		void dragEnterEvent(QGraphicsSceneDragDropEvent *event);
		void dragMoveEvent(QGraphicsSceneDragDropEvent *event);
		void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);
		void dropEvent(QGraphicsSceneDragDropEvent *event);

	private:	private:
	ExtenderGroupPrivate * const d;	ExtenderGroupPrivate * const d;

	Q_PRIVATE_SLOT(d, void addItemToGroup(Plasma::ExtenderItem *item))	Q_PRIVATE_SLOT(d, void addItemToGroup(Plasma::ExtenderItem *item))
	Q_PRIVATE_SLOT(d, void removeItemFromGroup(Plasma::ExtenderItem *it em))	Q_PRIVATE_SLOT(d, void removeItemFromGroup(Plasma::ExtenderItem *it em))
	Q_PRIVATE_SLOT(d, void themeChanged())	Q_PRIVATE_SLOT(d, void themeChanged())

	friend class ExtenderItem;	friend class ExtenderItem;
	};	};
	} // Plasma namespace	} // Plasma namespace

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

	extenderitem.h	extenderitem.h

	skipping to change at line 183	skipping to change at line 183
	Extender *extender() const;	Extender *extender() const;

	/**	/**
	* @param group the group you want this item to belong to. Note tha t you can't nest	* @param group the group you want this item to belong to. Note tha t you can't nest
	* ExtenderGroups.	* ExtenderGroups.
	* @since 4.3	* @since 4.3
	*/	*/
	void setGroup(ExtenderGroup *group);	void setGroup(ExtenderGroup *group);

	/**	/**

		* @param group the group you want this item to belong to. Note tha
		t you can't nest
		* ExtenderGroups.
		*
		* @param group the new group
		* @param pos position inside the extender group
		* @since 4.5
		*/
		void setGroup(ExtenderGroup *group, const QPointF &pos);

		/**
	* @returns the group this item belongs to.	* @returns the group this item belongs to.
	* @since 4.3	* @since 4.3
	*/	*/
	ExtenderGroup *group() const;	ExtenderGroup *group() const;

	/**	/**
	* @returns whether or not this is an ExtenderGroup.	* @returns whether or not this is an ExtenderGroup.
	* @since 4.3	* @since 4.3
	*/	*/
	bool isGroup() const;	bool isGroup() const;

	skipping to change at line 291	skipping to change at line 301

	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 Applet;
	friend class Extender;	friend class Extender;
	friend class ExtenderPrivate;	friend class ExtenderPrivate;
	friend class ExtenderItemPrivate;	friend class ExtenderItemPrivate;
	};	};
	} // namespace Plasma	} // namespace Plasma
	#endif // PLASMA_EXTENDERITEM_H	#endif // PLASMA_EXTENDERITEM_H

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

	filequery.h	filequery.h
	/*	/*
	This file is part of the Nepomuk KDE project.	This file is part of the Nepomuk KDE project.

	Copyright (C) 2009 Sebastian Trueg <trueg@kde.org>	Copyright (C) 2009-2010 Sebastian Trueg <trueg@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	License version 2 as published by the Free Software Foundation.

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


	skipping to change at line 53	skipping to change at line 53
	*/	*/
	class NEPOMUKQUERY_EXPORT FileQuery : public Query	class NEPOMUKQUERY_EXPORT FileQuery : public Query
	{	{
	public:	public:
	/**	/**
	* Create an empty invalid file query object.	* Create an empty invalid file query object.
	*/	*/
	FileQuery();	FileQuery();

	/**	/**

		* Create a file query with root term \a term.
		*
		* \since 4.6
		*/
		explicit FileQuery( const Term& term );

		/**
	* Copy constructor.	* Copy constructor.
	*/	*/
	FileQuery( const Query& query );	FileQuery( const Query& query );

	/**	/**
	* Destructor	* Destructor
	*/	*/
	~FileQuery();	~FileQuery();

	/**	/**

	skipping to change at line 126	skipping to change at line 133
	*/	*/
	void setExcludeFolders( const KUrl::List& folders );	void setExcludeFolders( const KUrl::List& folders );

	/**	/**
	* The list of exclude folders set via addExcludeFolder() and	* The list of exclude folders set via addExcludeFolder() and
	* setExcludeFolders().	* setExcludeFolders().
	*	*
	* \sa addExcludeFolder, setExcludeFolders, includeFolders	* \sa addExcludeFolder, setExcludeFolders, includeFolders
	*/	*/
	KUrl::List excludeFolders() const;	KUrl::List excludeFolders() const;


		/**
		* An enumeration used in setFileMode() to state wether the que
		ry
		* should return files and folders or only files or only folder
		s.
		*
		* \since 4.5
		*/
		enum FileModeFlags {
		QueryFiles = 0x1,
		QueryFolders = 0x2,
		QueryFilesAndFolders = QueryFiles\|QueryFolders
		};
		Q_DECLARE_FLAGS( FileMode, FileModeFlags )

		/**
		* Set the file mode, i.e. wether the query should return
		* files and folders or only files or only folders.
		* By default both files and folders are returned.
		*
		* \sa fileMode()
		*
		* \since 4.5
		*/
		void setFileMode( FileMode mode );

		/**
		* \return The file mode set in setFileMode()
		*
		* \since 4.5
		*/
		FileMode fileMode() const;
	};	};
	}	}
	}	}


		Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::Query::FileQuery::FileMode )

	#endif	#endif

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

	fixx11h.h	fixx11h.h

	skipping to change at line 214	skipping to change at line 214
	#ifdef Status	#ifdef Status
	#ifndef FIXX11H_Status	#ifndef FIXX11H_Status
	#define FIXX11H_Status	#define FIXX11H_Status
	typedef Status XStatus;	typedef Status XStatus;
	#undef Status	#undef Status
	typedef XStatus Status;	typedef XStatus Status;
	#endif	#endif
	#undef Status	#undef Status
	#endif	#endif


	// Affects: Should be without side effects.
	#ifdef CursorShape
	#ifndef FIXX11H_CursorShape
	#define FIXX11H_CursorShape
	const int XCursorShape = CursorShape;
	#undef CursorShape
	const int CursorShape = CursorShape;
	#endif
	#undef CursorShape
	#endif

	// template --->	// template --->
	// Affects: Should be without side effects.	// Affects: Should be without side effects.
	#ifdef CursorShape	#ifdef CursorShape
	#ifndef FIXX11H_CursorShape	#ifndef FIXX11H_CursorShape
	#define FIXX11H_CursorShape	#define FIXX11H_CursorShape
	const int XCursorShape = CursorShape;	const int XCursorShape = CursorShape;
	#undef CursorShape	#undef CursorShape
	const int CursorShape = XCursorShape;	const int CursorShape = XCursorShape;
	#endif	#endif
	#undef CursorShape	#undef CursorShape

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

	flashinglabel.h	flashinglabel.h

	skipping to change at line 81	skipping to change at line 81
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;	QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;

	public Q_SLOTS:	public Q_SLOTS:
	void kill();	void kill();

	protected Q_SLOTS:	protected Q_SLOTS:
	void fadeIn();	void fadeIn();
	void fadeOut();	void fadeOut();

	private:	private:

	Q_PRIVATE_SLOT(d, void elementAnimationFinished(int))	Q_PRIVATE_SLOT(d, void elementAnimationFinished())
	Q_PRIVATE_SLOT(d, void setPalette())	Q_PRIVATE_SLOT(d, void setPalette())
	FlashingLabelPrivate *const d;	FlashingLabelPrivate *const d;
	};	};

	}	}

	#endif	#endif

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

	framesvg.h	framesvg.h

	skipping to change at line 164	skipping to change at line 164

	/**	/**
	* @return the rectangle of the center element, taking the margins into account.	* @return the rectangle of the center element, taking the margins into account.
	*/	*/
	Q_INVOKABLE QRectF contentsRect() const;	Q_INVOKABLE QRectF contentsRect() const;

	/**	/**
	* Sets the prefix (@see setElementPrefix) to 'north', 'south', 'we st' and 'east'	* Sets the prefix (@see setElementPrefix) to 'north', 'south', 'we st' and 'east'
	* when the location is TopEdge, BottomEdge, LeftEdge and RightEdge ,	* when the location is TopEdge, BottomEdge, LeftEdge and RightEdge ,
	* respectively. Clears the prefix in other cases.	* respectively. Clears the prefix in other cases.

	* @arg location location	*
		* The prefix must exist in the SVG document, which means that this
		can only be
		* called successfully after setImagePath is called.
		* @arg location location in the UI this frame will be drawn
	*/	*/
	Q_INVOKABLE void setElementPrefix(Plasma::Location location);	Q_INVOKABLE void setElementPrefix(Plasma::Location location);

	/**	/**
	* Sets the prefix for the SVG elements to be used for painting. Fo r example,	* Sets the prefix for the SVG elements to be used for painting. Fo r example,
	* if prefix is 'active', then instead of using the 'top' element o f the SVG	* if prefix is 'active', then instead of using the 'top' element o f the SVG
	* file to paint the top border, 'active-top' element will be used. The same	* file to paint the top border, 'active-top' element will be used. The same
	* goes for other SVG elements.	* goes for other SVG elements.
	*	*
	* If the elements with prefixes are not present, the default ones are used.	* If the elements with prefixes are not present, the default ones are used.
	* (for the sake of speed, the test is present only for the 'center ' element)	* (for the sake of speed, the test is present only for the 'center ' element)
	*	*
	* Setting the prefix manually resets the location to Floating.	* Setting the prefix manually resets the location to Floating.

	* If the	*
	* @arg prefix prefix for the SVG element names	* The prefix must exist in the SVG document, which means that this
		can only be
		* called successfully after setImagePath is called.
		*
		* @arg prefix prefix for the SVG elements that make up the frame
	*/	*/
	Q_INVOKABLE void setElementPrefix(const QString & prefix);	Q_INVOKABLE void setElementPrefix(const QString & prefix);

	/**	/**
	* @return true if the svg has the necessary elements with the give n prefix	* @return true if the svg has the necessary elements with the give n prefix
	* to draw a frame	* to draw a frame
	* @arg prefix the given prefix we want to check if drawable	* @arg prefix the given prefix we want to check if drawable
	*/	*/
	Q_INVOKABLE bool hasElementPrefix(const QString & prefix) const;	Q_INVOKABLE bool hasElementPrefix(const QString & prefix) const;


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

	highlighter.h	highlighter.h

	skipping to change at line 125	skipping to change at line 125
	* @since 4.1	* @since 4.1
	*/	*/
	bool isWordMisspelled(const QString &word);	bool isWordMisspelled(const QString &word);

	/**	/**
	* Sets the color in which the highlighter underlines misspelled wo rds.	* Sets the color in which the highlighter underlines misspelled wo rds.
	* @since 4.2	* @since 4.2
	*/	*/
	void setMisspelledColor(const QColor &color);	void setMisspelledColor(const QColor &color);


		/**
		* Return true if checker is enabled by default
		* @since 4.5
		*/
		bool checkerEnabledByDefault() const;

	Q_SIGNALS:	Q_SIGNALS:

	/**	/**
	* Emitted when as-you-type spell checking is enabled or disabled.	* Emitted when as-you-type spell checking is enabled or disabled.
	*	*
	* @param description is a i18n description of the new state,	* @param description is a i18n description of the new state,
	* with an optional reason	* with an optional reason
	*/	*/
	void activeChanged(const QString &description);	void activeChanged(const QString &description);


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

	highlightinterface.h	highlightinterface.h

	skipping to change at line 62	skipping to change at line 62
	* qobject_cast<KTextEditor::HighlightInterface*>( doc );	* qobject_cast<KTextEditor::HighlightInterface*>( doc );
	*	*
	* if( iface ) {	* if( iface ) {
	* // the implementation supports the interface	* // the implementation supports the interface
	* // do stuff	* // do stuff
	* }	* }
	* \endcode	* \endcode
	*	*
	* \see KTextEditor::Document	* \see KTextEditor::Document
	* \author Milian Wolff \<mail@milianw.de\>	* \author Milian Wolff \<mail@milianw.de\>

		* \since 4.4
	*/	*/
	class KTEXTEDITOR_EXPORT HighlightInterface	class KTEXTEDITOR_EXPORT HighlightInterface
	{	{
	public:	public:
	///TODO: Documentation	///TODO: Documentation
	enum DefaultStyle {	enum DefaultStyle {
	dsNormal,	dsNormal,
	dsKeyword,	dsKeyword,
	dsDataType,	dsDataType,
	dsDecVal,	dsDecVal,

	skipping to change at line 119	skipping to change at line 120
	int start;	int start;
	/// The number of columns this attribute spans.	/// The number of columns this attribute spans.
	int length;	int length;
	/// The attribute for the current range.	/// The attribute for the current range.
	Attribute::Ptr attribute;	Attribute::Ptr attribute;
	};	};

	/**	/**
	* Get the list of AttributeBlocks for a given \p line in the document.	* Get the list of AttributeBlocks for a given \p line in the document.
	*	*

	* \return List of AttributeBlocks for given \p line.	* \return list of AttributeBlocks for given \p line.
	*
	* TODO: I intended to make this const but Kate's implementation needs
	to
	* call kateTextline which is non-const. Solution?
	* TODO: Cannot be QVector since we have a CTor. Should it be removed?
	*/	*/
	virtual QList<AttributeBlock> lineAttributes(const unsigned int line) = 0;	virtual QList<AttributeBlock> lineAttributes(const unsigned int line) = 0;

	/**	/**
	* \brief Get all available highlighting modes for the current document .	* \brief Get all available highlighting modes for the current document .
	*	*
	* Each document can be highlighted using an arbitrary number of highli ghting	* Each document can be highlighted using an arbitrary number of highli ghting
	* contexts. This method will return the names for each of the used mod es.	* contexts. This method will return the names for each of the used mod es.
	*	*
	* Example: The "PHP (HTML)" mode includes the highlighting for PHP, HT ML, CSS and JavaScript.	* Example: The "PHP (HTML)" mode includes the highlighting for PHP, HT ML, CSS and JavaScript.

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

	iconwidget.h	iconwidget.h

	skipping to change at line 27	skipping to change at line 27
	* 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_ICONWIDGET_H	#ifndef PLASMA_ICONWIDGET_H
	#define PLASMA_ICONWIDGET_H	#define PLASMA_ICONWIDGET_H

	#include <QtCore/QObject>	#include <QtCore/QObject>

		#include <QtCore/QWeakPointer>
	#include <QtGui/QGraphicsTextItem>	#include <QtGui/QGraphicsTextItem>
	#include <QtGui/QIcon>	#include <QtGui/QIcon>
	#include <QtGui/QGraphicsWidget>	#include <QtGui/QGraphicsWidget>

	#include <plasma/dataengine.h>	#include <plasma/dataengine.h>
	#include <plasma/animator.h>	#include <plasma/animator.h>
	#include <plasma/plasma_export.h>	#include <plasma/plasma_export.h>

	class QAction;	class QAction;

		class QPropertyAnimation;

	/**	/**
	* @class IconWidget plasma/widgets/iconwidget.h <Plasma/Widgets/IconWidget >	* @class IconWidget plasma/widgets/iconwidget.h <Plasma/Widgets/IconWidget >
	*	*
	* @short Provides a generic icon.	* @short Provides a generic icon.
	*	*
	* An icon, in this sense, is not restricted to just an image, but can also	* An icon, in this sense, is not restricted to just an image, but can also
	* contain text. Currently, the IconWidget class is primarily used for desk top items,	* contain text. Currently, the IconWidget class is primarily used for desk top items,
	* but is designed to be used anywhere an icon is needed in an applet.	* but is designed to be used anywhere an icon is needed in an applet.
	*	*

	skipping to change at line 63	skipping to change at line 65

	class PLASMA_EXPORT IconWidget : public QGraphicsWidget	class PLASMA_EXPORT IconWidget : public QGraphicsWidget
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(QString text READ text WRITE setText)	Q_PROPERTY(QString text READ text WRITE setText)
	Q_PROPERTY(QString infoText READ infoText WRITE setInfoText)	Q_PROPERTY(QString infoText READ infoText WRITE setInfoText)
	Q_PROPERTY(QIcon icon READ icon WRITE setIcon)	Q_PROPERTY(QIcon icon READ icon WRITE setIcon)
	Q_PROPERTY(QColor textBackgroundColor READ textBackgroundColor WRITE se tTextBackgroundColor)	Q_PROPERTY(QColor textBackgroundColor READ textBackgroundColor WRITE se tTextBackgroundColor)
	Q_PROPERTY(QSizeF iconSize READ iconSize)	Q_PROPERTY(QSizeF iconSize READ iconSize)
	Q_PROPERTY(QString svg READ svg WRITE setSvg)	Q_PROPERTY(QString svg READ svg WRITE setSvg)

		Q_PROPERTY(bool drawBackground READ drawBackground WRITE setDrawBackgro und)
	Q_PROPERTY(QAction *action READ action WRITE setAction)	Q_PROPERTY(QAction *action READ action WRITE setAction)
	Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)	Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)
	Q_PROPERTY(int numDisplayLines READ numDisplayLines WRITE setNumDisplay Lines)	Q_PROPERTY(int numDisplayLines READ numDisplayLines WRITE setNumDisplay Lines)

		Q_PROPERTY(QSizeF preferredIconSize READ preferredIconSize WRITE setPre
		ferredIconSize)
		Q_PROPERTY(QSizeF minimumIconSize READ minimumIconSize WRITE setMinimum
		IconSize)
		Q_PROPERTY(QSizeF maximumIconSize READ maximumIconSize WRITE setMaximum
		IconSize)

	public:	public:
	/**	/**
	* Creates a new Plasma::IconWidget.	* Creates a new Plasma::IconWidget.
	* @param parent the QGraphicsItem this icon is parented to.	* @param parent the QGraphicsItem this icon is parented to.
	*/	*/
	explicit IconWidget(QGraphicsItem *parent = 0);	explicit IconWidget(QGraphicsItem *parent = 0);

	/**	/**
	* Convenience constructor to create a Plasma::IconWidget with text.	* Convenience constructor to create a Plasma::IconWidget with text.

	skipping to change at line 166	skipping to change at line 172
	* @param icon the path to the icon to associate with this Plasma::IconW idget.	* @param icon the path to the icon to associate with this Plasma::IconW idget.
	*/	*/
	Q_INVOKABLE void setIcon(const QString &icon);	Q_INVOKABLE void setIcon(const QString &icon);

	/**	/**
	* @return the size of this Plasma::IconWidget's graphical icon.	* @return the size of this Plasma::IconWidget's graphical icon.
	*/	*/
	QSizeF iconSize() const;	QSizeF iconSize() const;

	/**	/**

		* Set the size you prefer the icon will be when positioned in a layout
		.
		* @param preferred icon size, pass an invalid size to unset this value
		*
		* @since 4.5
		*/
		void setPreferredIconSize(const QSizeF &size);

		/**
		* @return The size you prefer the icon will be when positioned in a la
		yout.
		* The default is QSizeF(-1, -1); an invalid size means the ico
		n
		* will attempt to be at its default and "optimal" size
		*
		* @since 4.5
		*/
		QSizeF preferredIconSize() const;

		/**
		* Set the size that should be the minimum beyond the icon shouldn't sc
		ale when
		* the icon will be when positioned in a layout.
		* @param preferred icon size, pass an invalid size to unset this value
		*
		* @since 4.5
		*/
		void setMinimumIconSize(const QSizeF &size);

		/**
		* @return The size that should be the minimum beyond the icon shouldn'
		t scale when
		* the icon will be when positioned in a layout.
		* The default is QSizeF(-1, -1); an invalid size means the ico
		n
		* will attempt to be at its default and "optimal" size
		*
		* @since 4.5
		*/
		QSizeF minimumIconSize() const;

		/**
		* Set the size that should be the maximum beyond the icon shouldn't sc
		ale when
		* the icon will be when positioned in a layout.
		* @param preferred icon size, pass an invalid size to unset this value
		*
		* @since 4.5
		*/
		void setMaximumIconSize(const QSizeF &size);

		/**
		* @return The size that should be the maximum beyond the icon shouldn'
		t scale when
		* the icon will be when positioned in a layout.
		* The default is QSizeF(-1, -1); an invalid size means the ico
		n
		* will attempt to be at its default and "optimal" size
		*
		* @since 4.5
		*/
		QSizeF maximumIconSize() const;

		/**
	* 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.

	skipping to change at line 224	skipping to change at line 285

	/**	/**
	* @return if the layout of the icons should appear inverted or not	* @return if the layout of the icons should appear inverted or not
	*/	*/
	bool invertedLayout() const;	bool invertedLayout() const;

	/**	/**
	* @return optimal size given a size for the icon	* @return optimal size given a size for the icon
	* @param iconWidth desired width of the icon	* @param iconWidth desired width of the icon
	*/	*/

	QSizeF sizeFromIconSize(const qreal iconWidth) const;	Q_INVOKABLE QSizeF sizeFromIconSize(const qreal iconWidth) const;

	/**	/**
	* @return the number of lines allowed to display	* @return the number of lines allowed to display
	*/	*/
	int numDisplayLines();	int numDisplayLines();

	/**	/**
	* @param numLines the number of lines to show in the display.	* @param numLines the number of lines to show in the display.
	*/	*/
	void setNumDisplayLines(int numLines);	void setNumDisplayLines(int numLines);

	skipping to change at line 322	skipping to change at line 383
	/**	/**
	* @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())
	Q_PRIVATE_SLOT(d, void svgChanged())	Q_PRIVATE_SLOT(d, void svgChanged())
	Q_PRIVATE_SLOT(d, void actionDestroyed(QObject *obj))	Q_PRIVATE_SLOT(d, void actionDestroyed(QObject *obj))

	Q_PRIVATE_SLOT(d, void hoverAnimationUpdate(qreal progress))	Q_PRIVATE_SLOT(d, void hoverAnimationFinished())
	Q_PRIVATE_SLOT(d, void colorConfigChanged())	Q_PRIVATE_SLOT(d, void colorConfigChanged())
	Q_PRIVATE_SLOT(d, void iconConfigChanged())	Q_PRIVATE_SLOT(d, void iconConfigChanged())

	IconWidgetPrivate * const d;	IconWidgetPrivate * const d;
	friend class IconWidgetPrivate;	friend class IconWidgetPrivate;

		friend class PopupAppletPrivate;
	};	};

	} // namespace Plasma	} // namespace Plasma

	#endif	#endif

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

	itembackground.h	itembackground.h

	skipping to change at line 46	skipping to change at line 46

	class FrameSvg;	class FrameSvg;
	class ItemBackgroundPrivate;	class ItemBackgroundPrivate;

	class PLASMA_EXPORT ItemBackground : public QGraphicsWidget	class PLASMA_EXPORT ItemBackground : public QGraphicsWidget
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(QRectF target READ target WRITE setTarget)	Q_PROPERTY(QRectF target READ target WRITE setTarget)
	Q_PROPERTY(QGraphicsItem* targetItem READ targetItem WRITE setTargetIte m)	Q_PROPERTY(QGraphicsItem* targetItem READ targetItem WRITE setTargetIte m)


		Q_PROPERTY(qreal animationUpdate READ animationUpdate WRITE setAnimatio
		nUpdate)

	public:	public:
	ItemBackground(QGraphicsWidget *parent = 0);	ItemBackground(QGraphicsWidget *parent = 0);
	~ItemBackground();	~ItemBackground();

	/**	/**
	* Sets a new target geometry we want at the end of animation	* Sets a new target geometry we want at the end of animation
	*	*
	* @arg newGeometry the final geometry target	* @arg newGeometry the final geometry target
	*/	*/
	void setTarget(const QRectF &newGeometry);	void setTarget(const QRectF &newGeometry);

	skipping to change at line 123	skipping to change at line 125
	* @reimp from QGraphicsItem	* @reimp from QGraphicsItem
	*/	*/
	bool sceneEventFilter(QGraphicsItem watched, QEvent event);	bool sceneEventFilter(QGraphicsItem watched, QEvent event);

	/**	/**
	* @reimp from QGraphicsItem	* @reimp from QGraphicsItem
	*/	*/
	void resizeEvent(QGraphicsSceneResizeEvent *);	void resizeEvent(QGraphicsSceneResizeEvent *);

	private:	private:

	Q_PRIVATE_SLOT(d, void animationUpdate(qreal progress))	void setAnimationUpdate(qreal progress);
		qreal animationUpdate() const;

		private:
	Q_PRIVATE_SLOT(d, void targetDestroyed(QObject*))	Q_PRIVATE_SLOT(d, void targetDestroyed(QObject*))
	Q_PRIVATE_SLOT(d, void frameSvgChanged())	Q_PRIVATE_SLOT(d, void frameSvgChanged())
	Q_PRIVATE_SLOT(d, void refreshCurrentTarget())	Q_PRIVATE_SLOT(d, void refreshCurrentTarget())

	friend class ItemBackgroundPrivate;	friend class ItemBackgroundPrivate;
	ItemBackgroundPrivate * const d;	ItemBackgroundPrivate * const d;
	};	};
	}	}

	#endif	#endif

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

	jobclasses.h	jobclasses.h

	skipping to change at line 364	skipping to change at line 364
	* 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 .	* Returns true when redirections are handled internally, the defau lt.
	*	*
	* @since 4.4	* @since 4.4
	*/	*/
	bool isRedirectionHandlingEnabled() const;	bool isRedirectionHandlingEnabled() const;

	/**	/**
	* Set @p handle to false to prevent the internal handling of redir ections.	* 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	* When this flag is set, redirection requests are simply forwarded to the
	* caller instead of being handled internally.	* caller instead of being handled internally.

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

	jobuidelegate.h	jobuidelegate.h

	skipping to change at line 87	skipping to change at line 87
	* @param mtimeSrc modification time of source file	* @param mtimeSrc modification time of source file
	* @param mtimeDest modification time of destination file	* @param mtimeDest modification time of destination file
	* @return the result	* @return the result
	*/	*/
	virtual RenameDialog_Result askFileRename(KJob * job,	virtual RenameDialog_Result askFileRename(KJob * job,
	const QString & caption,	const QString & caption,
	const QString& src,	const QString& src,
	const QString & dest,	const QString & dest,
	KIO::RenameDialog_Mode mode,	KIO::RenameDialog_Mode mode,
	QString& newDest,	QString& newDest,

	KIO::filesize_t sizeSrc = (KI	KIO::filesize_t sizeSrc = KIO
	O::filesize_t) -1,	::filesize_t(-1),
	KIO::filesize_t sizeDest = (K	KIO::filesize_t sizeDest = KI
	IO::filesize_t) -1,	O::filesize_t(-1),
	time_t ctimeSrc = (time_t) -1	time_t ctimeSrc = time_t(-1),
	,	time_t ctimeDest = time_t(-1)
	time_t ctimeDest = (time_t) -	,
	1,	time_t mtimeSrc = time_t(-1),
	time_t mtimeSrc = (time_t) -1	time_t mtimeDest = time_t(-1)
	,	);
	time_t mtimeDest = (time_t) -
	1);

	/**	/**
	* @internal	* @internal
	* See skipdialog.h	* See skipdialog.h
	*/	*/
	virtual SkipDialog_Result askSkip(KJob * job,	virtual SkipDialog_Result askSkip(KJob * job,
	bool multi,	bool multi,
	const QString & error_text);	const QString & error_text);

	/**	/**

	* The type of deletion: real deletion, or moving the files to the tras	* The type of deletion: real deletion, moving the files to the trash
	h	* or emptying the trash
	* Used by askDeleteConfirmation.	* Used by askDeleteConfirmation.
	*/	*/

	enum DeletionType { Delete, Trash };	enum DeletionType { Delete, Trash, EmptyTrash };
	/**	/**
	* ForceConfirmation: always ask the user for confirmation	* ForceConfirmation: always ask the user for confirmation
	* DefaultConfirmation: don't ask the user if he/she said "don't ask ag ain".	* DefaultConfirmation: don't ask the user if he/she said "don't ask ag ain".
	*	*
	* Used by askDeleteConfirmation.	* Used by askDeleteConfirmation.
	*/	*/
	enum ConfirmationType { DefaultConfirmation, ForceConfirmation };	enum ConfirmationType { DefaultConfirmation, ForceConfirmation };
	/**	/**
	* Ask for confirmation before deleting/trashing @p urls.	* Ask for confirmation before deleting/trashing @p urls.
	*	*

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

	k3sconfig.h	k3sconfig.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries
	Copyright (C) 1997 David Sweet <dsweet@kde.org>	Copyright (C) 1997 David Sweet <dsweet@kde.org>

		Copyright (C) 2007-2008 Kevin Kofler <Kevin@tigcc.ticalc.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	License version 2 as published by the Free Software Foundation.

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


	skipping to change at line 63	skipping to change at line 64
	KS_E_KOI8R=12,	KS_E_KOI8R=12,
	KS_E_KOI8U=13,	KS_E_KOI8U=13,
	KS_E_CP1251=14,	KS_E_CP1251=14,
	KS_E_CP1255=15	KS_E_CP1255=15
	};	};

	enum K3SpellClients {	enum K3SpellClients {
	KS_CLIENT_ISPELL=0,	KS_CLIENT_ISPELL=0,
	KS_CLIENT_ASPELL=1,	KS_CLIENT_ASPELL=1,
	KS_CLIENT_HSPELL=2,	KS_CLIENT_HSPELL=2,

	KS_CLIENT_ZEMBEREK=3	KS_CLIENT_ZEMBEREK=3,
		KS_CLIENT_HUNSPELL=4
	};	};

	/**	/**
	* A configuration class/dialog for K3Spell.	* A configuration class/dialog for K3Spell.
	*	*
	* It contains all of the options settings.The options are set to default	* It contains all of the options settings.The options are set to default
	* values by the constructor and can be reset either by using the	* values by the constructor and can be reset either by using the
	* public interface or by using K3SpellConfig as a widget in a dialog	* public interface or by using K3SpellConfig as a widget in a dialog
	* (or, preferably a tabbed dialog using KPageDialog) and letting	* (or, preferably a tabbed dialog using KPageDialog) and letting
	* the user change the settings. This way an application that uses	* the user change the settings. This way an application that uses

	skipping to change at line 288	skipping to change at line 290
	//QPushButton *browsebutton1;	//QPushButton *browsebutton1;
	QStringList langfnames;	QStringList langfnames;

	Q_SIGNALS:	Q_SIGNALS:
	void configChanged();	void configChanged();

	private:	private:
	K3SpellConfigPrivate *const d;	K3SpellConfigPrivate *const d;
	void getAvailDictsIspell();	void getAvailDictsIspell();
	void getAvailDictsAspell();	void getAvailDictsAspell();

		void getAvailDictsHunspell();
	};	};

	#endif // KDELIBS_KSCONFIG_H	#endif // KDELIBS_KSCONFIG_H

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

	kactioncollection.h	kactioncollection.h

	skipping to change at line 330	skipping to change at line 330
	*/	*/
	void removeAction(QAction *action);	void removeAction(QAction *action);

	/**	/**
	* Removes an action from the collection.	* Removes an action from the collection.
	* @param action the action to remove.	* @param action the action to remove.
	*/	*/
	QAction* takeAction(QAction *action);	QAction* takeAction(QAction *action);

	/**	/**

	* Creates a new standard action, adds it to the collection and connects	* Creates a new standard action, adds it to the collection and connects
	the action's triggered() signal to the	the
	* specified receiver/member. The newly created action is also returned.	* action's triggered(bool) signal to the specified receiver/member. The
		* newly created action is also returned.
		*
		* Note: Using KStandardAction::OpenRecent will cause a different signal
		than
		* triggered(bool) to be used, see KStandardAction for more information.
	*	*
	* The action can be retrieved later from the collection by its standard name as per	* The action can be retrieved later from the collection by its standard name as per
	* KStandardAction::stdName.	* KStandardAction::stdName.
	*/	*/
	KAction addAction(KStandardAction::StandardAction actionType, const QObj ect receiver = 0, const char *member = 0);	KAction addAction(KStandardAction::StandardAction actionType, const QObj ect receiver = 0, const char *member = 0);


	/**	/**

	* Creates a new standard action, adds to the collection under the given	* Creates a new standard action, adds to the collection under the given
	name and connects the action's triggered() signal to the	name
	* specified receiver/member. The newly created action is also returned.	* and connects the action's triggered(bool) signal to the specified
		* receiver/member. The newly created action is also returned.
		*
		* Note: Using KStandardAction::OpenRecent will cause a different signal
		than
		* triggered(bool) to be used, see KStandardAction for more information.
	*	*
	* The action can be retrieved later from the collection by the specified name.	* The action can be retrieved later from the collection by the specified name.
	*/	*/
	KAction *addAction(KStandardAction::StandardAction actionType, const QStr ing &name,	KAction *addAction(KStandardAction::StandardAction actionType, const QStr ing &name,
	const QObject receiver = 0, const char member = 0);	const QObject receiver = 0, const char member = 0);

	/**	/**

	* Creates a new action under the given name to the collection and connec	* Creates a new action under the given name to the collection and connec
	ts the action's triggered()	ts
	* signal to the specified receiver/member. The newly created action is r	* the action's triggered(bool) signal to the specified receiver/member.
	eturned.	The
		* newly created action is returned.
		*
		* NOTE: KDE prior to 4.2 used the triggered() signal instead of the trig
		gered(bool)
		* signal.
	*	*
	* Inserting an action that was previously inserted under a different nam e will replace the	* Inserting an action that was previously inserted under a different nam e will replace the
	* old entry, i.e. the action will not be available under the old name an ymore but only under	* old entry, i.e. the action will not be available under the old name an ymore but only under
	* the new one.	* the new one.
	*	*
	* Inserting an action under a name that is already used for another acti on will replace	* Inserting an action under a name that is already used for another acti on will replace
	* the other action in the collection.	* the other action in the collection.
	*	*
	* @param name The name by which the action be retrieved again from the c ollection.	* @param name The name by which the action be retrieved again from the c ollection.
	* @param action The action to add.	* @param action The action to add.

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

	kar.h	kar.h

	skipping to change at line 29	skipping to change at line 29
	#define KAR_H	#define KAR_H

	#include <karchive.h>	#include <karchive.h>

	/**	/**
	* KAr is a class for reading archives in ar format. Writing	* KAr is a class for reading archives in ar format. Writing
	* is not supported.	* is not supported.
	* @short A class for reading ar archives.	* @short A class for reading ar archives.
	* @author Laurence Anderson <l.d.anderson@warwick.ac.uk>	* @author Laurence Anderson <l.d.anderson@warwick.ac.uk>
	*/	*/

	class KIO_EXPORT KAr : public KArchive	class KDECORE_EXPORT KAr : public KArchive
	{	{
	public:	public:
	/**	/**
	* Creates an instance that operates on the given filename.	* Creates an instance that operates on the given filename.
	*	*
	* @param filename is a local path (e.g. "/home/holger/myfile.ar")	* @param filename is a local path (e.g. "/home/holger/myfile.ar")
	*/	*/
	KAr( const QString& filename );	KAr( const QString& filename );

	/**	/**

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

	karchive.h	karchive.h

	skipping to change at line 32	skipping to change at line 32
	#define KARCHIVE_H	#define KARCHIVE_H

	#include <sys/stat.h>	#include <sys/stat.h>
	#include <sys/types.h>	#include <sys/types.h>

	#include <QtCore/QDate>	#include <QtCore/QDate>
	#include <QtCore/QString>	#include <QtCore/QString>
	#include <QtCore/QStringList>	#include <QtCore/QStringList>
	#include <QtCore/QHash>	#include <QtCore/QHash>


	#include <kio/kio_export.h>	#include <kdecore_export.h>

	class KArchiveDirectory;	class KArchiveDirectory;
	class KArchiveFile;	class KArchiveFile;

	class KArchivePrivate;	class KArchivePrivate;
	/**	/**
	* KArchive is a base class for reading and writing archives.	* KArchive is a base class for reading and writing archives.
	* @short generic class for reading/writing archives	* @short generic class for reading/writing archives
	* @author David Faure <faure@kde.org>	* @author David Faure <faure@kde.org>
	*/	*/

	class KIO_EXPORT KArchive	class KDECORE_EXPORT KArchive
	{	{
	protected:	protected:
	/**	/**
	* Base constructor (protected since this is a pure virtual class).	* Base constructor (protected since this is a pure virtual class).
	* @param fileName is a local path (e.g. "/tmp/myfile.ext"),	* @param fileName is a local path (e.g. "/tmp/myfile.ext"),
	* from which the archive will be read from, or into which the archive	* from which the archive will be read from, or into which the archive
	* will be written, depending on the mode given to open().	* will be written, depending on the mode given to open().
	*/	*/
	KArchive( const QString& fileName );	KArchive( const QString& fileName );


	skipping to change at line 369	skipping to change at line 369
	};	};

	class KArchiveEntryPrivate;	class KArchiveEntryPrivate;
	/**	/**
	* A base class for entries in an KArchive.	* A base class for entries in an KArchive.
	* @short Base class for the archive-file's directory structure.	* @short Base class for the archive-file's directory structure.
	*	*
	* @see KArchiveFile	* @see KArchiveFile
	* @see KArchiveDirectory	* @see KArchiveDirectory
	*/	*/

	class KIO_EXPORT KArchiveEntry	class KDECORE_EXPORT KArchiveEntry
	{	{
	public:	public:
	/**	/**
	* Creates a new entry.	* Creates a new entry.
	* @param archive the entries archive	* @param archive the entries archive
	* @param name the name of the entry	* @param name the name of the entry
	* @param access the permissions in unix format	* @param access the permissions in unix format
	* @param date the date (in seconds since 1970)	* @param date the date (in seconds since 1970)
	* @param user the user that owns the entry	* @param user the user that owns the entry
	* @param group the group that owns the entry	* @param group the group that owns the entry

	skipping to change at line 457	skipping to change at line 457
	};	};

	class KArchiveFilePrivate;	class KArchiveFilePrivate;
	/**	/**
	* Represents a file entry in a KArchive.	* Represents a file entry in a KArchive.
	* @short A file in an archive.	* @short A file in an archive.
	*	*
	* @see KArchive	* @see KArchive
	* @see KArchiveDirectory	* @see KArchiveDirectory
	*/	*/

	class KIO_EXPORT KArchiveFile : public KArchiveEntry	class KDECORE_EXPORT KArchiveFile : public KArchiveEntry
	{	{
	public:	public:
	/**	/**
	* Creates a new file entry. Do not call this, KArchive takes care of i t.	* Creates a new file entry. Do not call this, KArchive takes care of i t.
	* @param archive the entries archive	* @param archive the entries archive
	* @param name the name of the entry	* @param name the name of the entry
	* @param access the permissions in unix format	* @param access the permissions in unix format
	* @param date the date (in seconds since 1970)	* @param date the date (in seconds since 1970)
	* @param user the user that owns the entry	* @param user the user that owns the entry
	* @param group the group that owns the entry	* @param group the group that owns the entry

	skipping to change at line 542	skipping to change at line 542
	};	};

	class KArchiveDirectoryPrivate;	class KArchiveDirectoryPrivate;
	/**	/**
	* Represents a directory entry in a KArchive.	* Represents a directory entry in a KArchive.
	* @short A directory in an archive.	* @short A directory in an archive.
	*	*
	* @see KArchive	* @see KArchive
	* @see KArchiveFile	* @see KArchiveFile
	*/	*/

	class KIO_EXPORT KArchiveDirectory : public KArchiveEntry	class KDECORE_EXPORT KArchiveDirectory : public KArchiveEntry
	{	{
	public:	public:
	/**	/**
	* Creates a new directory entry.	* Creates a new directory entry.
	* @param archive the entries archive	* @param archive the entries archive
	* @param name the name of the entry	* @param name the name of the entry
	* @param access the permissions in unix format	* @param access the permissions in unix format
	* @param date the date (in seconds since 1970)	* @param date the date (in seconds since 1970)
	* @param user the user that owns the entry	* @param user the user that owns the entry
	* @param group the group that owns the entry	* @param group the group that owns the entry

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

	kassistantdialog.h	kassistantdialog.h

	skipping to change at line 142	skipping to change at line 142
	* Calls the KPageDialog(KPageWidget widget, QWidget parent, Qt:: WFlags flags) constructor	* Calls the KPageDialog(KPageWidget widget, QWidget parent, Qt:: WFlags flags) constructor
	*/	*/
	explicit KAssistantDialog(KPageWidget widget, QWidget parent=0, Q t::WFlags flags=0);	explicit KAssistantDialog(KPageWidget widget, QWidget parent=0, Q t::WFlags flags=0);

	virtual void showEvent(QShowEvent * event);	virtual void showEvent(QShowEvent * event);

	private:	private:
	class Private;	class Private;
	Private * const d;	Private * const d;


	Q_PRIVATE_SLOT( d, void _k_slotCurrentPageChanged() )	Q_PRIVATE_SLOT( d, void _k_slotUpdateButtons() )

	Q_DISABLE_COPY( KAssistantDialog )	Q_DISABLE_COPY( KAssistantDialog )
	};	};

	#endif	#endif

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

	kauthaction.h	kauthaction.h

	skipping to change at line 199	skipping to change at line 199
	*	*
	* In other words, the action name has to match this perl-like	* In other words, the action name has to match this perl-like
	* regular expression:	* regular expression:
	* @verbatim	* @verbatim
	* /^[a-z]+(\.[a-z]+)*$/	* /^[a-z]+(\.[a-z]+)*$/
	* @endverbatim	* @endverbatim
	*	*
	* This method returns false if the action name doesn't match the	* This method returns false if the action name doesn't match the
	* valid syntax.	* valid syntax.
	*	*

		* If the backend supports it, this method also checks if the action is
		* valid and recognized by the backend itself.
		*
	* Invalid actions cannot be authorized nor executed.	* Invalid actions cannot be authorized nor executed.
	* The empty string is not a valid action name, so the default	* The empty string is not a valid action name, so the default
	* constructor returns an invalid action.	* constructor returns an invalid action.
	*/	*/
	bool isValid() const;	bool isValid() const;

	/**	/**
	* @brief Gets the default helper ID used for actions execution	* @brief Gets the default helper ID used for actions execution
	*	*
	* The helper ID is the string that uniquely identifies the helper in	* The helper ID is the string that uniquely identifies the helper in

	skipping to change at line 222	skipping to change at line 225
	* ID by calling setHelperID(). This method returns the current default	* ID by calling setHelperID(). This method returns the current default
	* value.	* value.
	*	*
	* @return The default helper ID.	* @return The default helper ID.
	*/	*/
	QString helperID() const;	QString helperID() const;

	/**	/**
	* @brief Sets the default helper ID used for actions execution	* @brief Sets the default helper ID used for actions execution
	*	*

		* This method sets the helper ID which contains the body of this actio
		n.
		* If the string is non-empty, the corresponding helper will be fired a
		nd
		* the action executed inside the helper. Otherwise, the action will be
		just
		* authorized.
		*
		* @note To unset a previously set helper, just pass an empty string
		*
	* @param id The default helper ID.	* @param id The default helper ID.

		*
		* @see hasHelper
		* @see helperID
	*/	*/
	void setHelperID(const QString &id);	void setHelperID(const QString &id);

	/**	/**

		* @brief Checks if the action has an helper
		*
		* This function can be used to check if an helper will be called upon
		the
		* execution of an action. Such an helper can be set through setHelperI
		D. If
		* this function returns false, upon execution the action will be just
		authorized.
		*
		* @since 4.5
		*
		* @return Whether the action has an helper or not
		*
		* @see setHelperID
		*/
		bool hasHelper() const;

		/**
	* @brief Gets the ActionWatcher object for this action	* @brief Gets the ActionWatcher object for this action
	*	*
	* ActionWatcher objects are used to get notifications about the action	* ActionWatcher objects are used to get notifications about the action
	* execution status. Every action watcher is tied to an action and	* execution status. Every action watcher is tied to an action and
	* every action has a watcher. This means that if you call this method	* every action has a watcher. This means that if you call this method
	* on two different Action objects with the same name, you'll get the	* on two different Action objects with the same name, you'll get the
	* same watcher object.	* same watcher object.
	*	*
	* @return The action watcher for this action	* @return The action watcher for this action
	*/	*/

	skipping to change at line 276	skipping to change at line 304
	* add a new entry.	* add a new entry.
	*	*
	* @param key The new entry's key	* @param key The new entry's key
	* @param value The value of the new entry	* @param value The value of the new entry
	*/	*/
	void addArgument(const QString &key, const QVariant &value);	void addArgument(const QString &key, const QVariant &value);

	/**	/**
	* @brief Acquires authorization for an action without excuting it.	* @brief Acquires authorization for an action without excuting it.
	*	*

	* This method acquires the authorization rights for the action, asking	* @note Please use this method if you really know what you are doing.
	* the user to authenticate if needed.	If you are
		* implementing a GUI, you probably should look into earlyAuthori
		ze instead.
	*	*

	* The result of this method is strictly related to the result of statu	* @note Please remember that calling this method is not required for a
	s().	successful action
	* If it returns Action::Denied or Action::Authorized, this method	* execution: it is safe and advised to call execute() only, with
	* will always return the same. Instead, if the status()	out a previous call
	* result was Action::AuthRequired, the method would ask the user to au	* to authorize or earlyAuthorize.
	thenticate.
	* The Action::UserCancelled value is intended to be returned when the
	authentication
	* fails because the user purposely cancelled it. Unfortunately, this i
	sn't currently
	* supported by policykit, so instead you'll get a Denied result in thi
	s case.
	* The Mac OS X backend will return UserCancelled when appropriate.
	*	*

	* It's not so common to use this method directly, because it's already	* This method acquires the authorization rights for the action, asking
	* called by any of the execute methods. Use it only if you need to acq	* the user to authenticate if needed. It tries very hard to resolve a
	uire the	possible
	* authorization long time before the execution, for example if you wan	* challenge (AuthRequired); for this reason, it is meant only for adva
	t to	nced usages.
	* enable some GUI elements after user authentication.	* If you are unsure, always use earlyAuthorize or execute the action d
		irectly.
	*	*
	* @return The result of the authorization process	* @return The result of the authorization process

		*
		* @see earlyAuthorize
	*/	*/
	AuthStatus authorize() const;	AuthStatus authorize() const;

	/**	/**

		* @brief Tries to resolve authorization status in the best possible wa
		y without executing the action
		*
		* This method checks for the status of the action, and tries to acquir
		e authorization
		* (if needed) if the backend being used supports client-side authoriza
		tion.
		*
		* This means this method is not reliable - its purpose it's to provide
		user interfaces
		* an efficient mean to acquire authorization as early as possible, wit
		hout interrupting
		* the user's workflow. If the backend's authentication phase happens i
		n the helper and the
		* action requires authentication, \c Authorized will be returned.
		*
		* The main difference with authorize is that this method does not try
		to acquire authorization
		* if the backend's authentication phase happens in the helper: using a
		uthorize in such a case
		* might lead to ask the user its password twice, as the helper might t
		ime out, or in the case
		* of a one shot authorization, the scope of the authorization would en
		d with the authorization
		* check itself. For this reason, you should @b always use this method
		instead of authorize, which
		* is meant only for very advanced usages.
		*
		* This method is always safe to be called and used before an execution
		, even if not needed.
		*
		* @since 4.5
		*
		* @return The result of the early authorization process, with the cave
		ats described above.
		*/
		AuthStatus earlyAuthorize() const;

		/**
	* @brief Gets information about the authorization status of an action	* @brief Gets information about the authorization status of an action
	*	*
	* This methods query the authorization backend to know if the user can try	* This methods query the authorization backend to know if the user can try
	* to acquire the authorization for this action. If the result is Actio n::AuthRequired,	* to acquire the authorization for this action. If the result is Actio n::AuthRequired,
	* the user can try to acquire the authorization by authenticating.	* the user can try to acquire the authorization by authenticating.
	*	*
	* It should not be needed to call this method directly, because the ex ecution methods	* It should not be needed to call this method directly, because the ex ecution methods
	* already take care of all the authorization stuff.	* already take care of all the authorization stuff.
	*	*
	* @return @c Action::Denied if the user doesn't have the authorization to execute the action,	* @return @c Action::Denied if the user doesn't have the authorization to execute the action,

	skipping to change at line 322	skipping to change at line 373
	AuthStatus status() const;	AuthStatus status() const;

	/**	/**
	* @brief Synchronously executes the action	* @brief Synchronously executes the action
	*	*
	* This is the simpler of all the action execution methods. It sends an execution request to the	* This is the simpler of all the action execution methods. It sends an execution request to the
	* caller, and returns the reply directly to the caller. The ActionRepl y object will contain the	* caller, and returns the reply directly to the caller. The ActionRepl y object will contain the
	* custom data coming from the helper.	* custom data coming from the helper.
	*	*
	* The method blocks the execution, and will	* The method blocks the execution, and will

	* return only when the action has been completed (or failed). Take not e, however, that with the dbus	* return only when the action has been completed (or failed). Take not e, however, that with the D-Bus
	* helper proxy (currently the only one implemented on all the supporte d platforms), the request is	* helper proxy (currently the only one implemented on all the supporte d platforms), the request is
	* sent using the QDBus::BlockWithGui flag.	* sent using the QDBus::BlockWithGui flag.
	*	*
	* This means the method will enter a local eventloop to wait	* This means the method will enter a local eventloop to wait
	* for the reply. This allows the application GUI to stay responsive, b ut you have to be prepared to	* for the reply. This allows the application GUI to stay responsive, b ut you have to be prepared to
	* receive other events in the meantime.	* receive other events in the meantime.
	*	*
	* All the signals from the ActionWatcher class are emitted also with t his method (although they're more	* All the signals from the ActionWatcher class are emitted also with t his method (although they're more
	* useful with the asynchronous calls)	* useful with the asynchronous calls)
	*	*

	skipping to change at line 366	skipping to change at line 417

	void setExecutesAsync(bool async);	void setExecutesAsync(bool async);
	bool executesAsync() const;	bool executesAsync() const;

	/**	/**
	* @brief Asynchronously executes a group of actions with a single requ est	* @brief Asynchronously executes a group of actions with a single requ est
	*	*
	* This method executes each action in the list. It checks for authoriz ation of each action, and put the	* This method executes each action in the list. It checks for authoriz ation of each action, and put the
	* denied actions, if any, in the list pointed by the deniedActions par ameter, if not NULL.	* denied actions, if any, in the list pointed by the deniedActions par ameter, if not NULL.
	*	*

	* Please note that with the dbus helper proxy (currently the only one implemented), the execution of a group	* Please note that with the D-Bus helper proxy (currently the only one implemented), the execution of a group
	* of actions is very different from executing in sequence each action using, for example, executeAsync().	* of actions is very different from executing in sequence each action using, for example, executeAsync().
	* Currently, the helper can execute only one request at the time. For this reason, if you have to call	* Currently, the helper can execute only one request at the time. For this reason, if you have to call
	* different actions in sequence, you can't call executeAsync() like th is:	* different actions in sequence, you can't call executeAsync() like th is:
	* @code	* @code
	* action1.executeAsync();	* action1.executeAsync();
	* action2.executeAsync();	* action2.executeAsync();
	* @endcode	* @endcode
	* because the second call will almost certainly return ActionReply::He lperBusy. You would have to execute the second	* because the second call will almost certainly return ActionReply::He lperBusy. You would have to execute the second
	* action in the slot connected to the first action's actionPerformed() signal. This is not so good. This method	* action in the slot connected to the first action's actionPerformed() signal. This is not so good. This method
	* allows the application to send a request with a list of actions. Wit h this method, the code above becomes:	* allows the application to send a request with a list of actions. Wit h this method, the code above becomes:

End of changes. 11 change blocks.
	23 lines changed or deleted	93 lines changed or added

	kbookmarkdialog.h	kbookmarkdialog.h

	skipping to change at line 116	skipping to change at line 116
	*/	*/
	KBookmarkGroup parentBookmark();	KBookmarkGroup parentBookmark();

	void slotButtonClicked(int);	void slotButtonClicked(int);

	BookmarkDialogMode m_mode;	BookmarkDialogMode m_mode;
	void fillGroup( QTreeWidgetItem * parentItem, const KBookmarkGroup &group );	void fillGroup( QTreeWidgetItem * parentItem, const KBookmarkGroup &group );
	QWidget * m_main;	QWidget * m_main;
	KLineEdit * m_url;	KLineEdit * m_url;
	KLineEdit * m_title;	KLineEdit * m_title;

		KLineEdit * m_comment;
	QLabel * m_titleLabel;	QLabel * m_titleLabel;
	QLabel * m_urlLabel;	QLabel * m_urlLabel;

		QLabel * m_commentLabel;
	QTreeWidget * m_folderTree;	QTreeWidget * m_folderTree;
	KBookmarkManager * m_mgr;	KBookmarkManager * m_mgr;
	KBookmark m_bm;	KBookmark m_bm;
	QList<QPair<QString, QString> > m_list;	QList<QPair<QString, QString> > m_list;
	bool m_layout;	bool m_layout;
	void initLayoutPrivate();	void initLayoutPrivate();

	protected Q_SLOTS:	protected Q_SLOTS:
	void newFolderButton();	void newFolderButton();
	};	};

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

	kcalendarsystem.h	kcalendarsystem.h
	/*	/*
	Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es>	Copyright (c) 2002 Carlos Moro <cfmoro@correo.uniovi.es>
	Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org>	Copyright (c) 2002-2003 Hans Petter Bieker <bieker@kde.org>

	Copyright (c) 2007 John Layt <john@layt.net>	Copyright 2007, 2009, 2010 John Layt <john@layt.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 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 81	skipping to change at line 81
	*	*
	* @param calType string identification of the specific calendar type	* @param calType string identification of the specific calendar type
	* to be constructed	* to be constructed
	* @param locale locale to use for translations. The global locale is u sed if null.	* @param locale locale to use for translations. The global locale is u sed if null.
	* @return a KCalendarSystem object	* @return a KCalendarSystem object
	*/	*/
	static KCalendarSystem *create( const QString & calType = QLatin1String ( "gregorian" ),	static KCalendarSystem *create( const QString & calType = QLatin1String ( "gregorian" ),
	const KLocale * locale = 0 );	const KLocale * locale = 0 );

	/**	/**

		* Creates specific calendar type
		*
		* @param calType string identification of the specific calendar type t
		o be constructed
		* @param config a configuration file with a 'KCalendarSystem %calendar
		Type' group detailing
		* locale-related preferences (such as era options). The
		global config is used
		if null.
		* @param locale locale to use for translations. The global locale is u
		sed if null.
		* @return a KCalendarSystem object
		*/
		static KCalendarSystem *create( const QString & calType, KSharedConfig:
		:Ptr config,
		const KLocale * locale = 0 );

		/**
	* Gets a list of names of supported calendar systems.	* Gets a list of names of supported calendar systems.
	*	*
	* @return list of names	* @return list of names
	*/	*/
	static QStringList calendarSystems();	static QStringList calendarSystems();

	/**	/**
	* Returns a typographically correct and translated label to display fo r	* Returns a typographically correct and translated label to display fo r
	* the calendar system type. Use with calendarSystems() to neatly	* the calendar system type. Use with calendarSystems() to neatly
	* format labels to display on combo widget of available calendar syste ms.	* format labels to display on combo widget of available calendar syste ms.

	skipping to change at line 106	skipping to change at line 119
	static QString calendarLabel( const QString &calendarType );	static QString calendarLabel( const QString &calendarType );

	/**	/**
	* Constructor of abstract calendar class. This will be called by deriv ed classes.	* Constructor of abstract calendar class. This will be called by deriv ed classes.
	*	*
	* @param locale locale to use for translations. The global locale is u sed if null.	* @param locale locale to use for translations. The global locale is u sed if null.
	*/	*/
	explicit KCalendarSystem( const KLocale *locale = 0 );	explicit KCalendarSystem( const KLocale *locale = 0 );

	/**	/**

		* Constructor of abstract calendar class. This will be called by deriv
		ed classes.
		*
		* @param config a configuration file with a 'KCalendarSystem %calendar
		Name' group detailing
		* locale-related preferences (such as era options). The
		global config is used
		if null.
		* @param locale locale to use for translations. The global locale is u
		sed if null.
		*/
		explicit KCalendarSystem( const KSharedConfig::Ptr config, const KLocal
		e *locale = 0 );

		/**
	* Destructor.	* Destructor.
	*/	*/
	virtual ~KCalendarSystem();	virtual ~KCalendarSystem();

	/**	/**
	* Returns the calendar system type.	* Returns the calendar system type.
	*	*
	* @return type of calendar system	* @return type of calendar system
	*/	*/
	virtual QString calendarType() const = 0;	virtual QString calendarType() const = 0;

	skipping to change at line 180	skipping to change at line 203
	* Returns whether a given date is valid in this calendar system.	* Returns whether a given date is valid in this calendar system.
	*	*
	* @param year the year portion of the date to check	* @param year the year portion of the date to check
	* @param dayOfYear the day of year portion of the date to check	* @param dayOfYear the day of year portion of the date to check
	* @return @c true if the date is valid, @c false otherwise	* @return @c true if the date is valid, @c false otherwise
	*/	*/
	bool isValid( int year, int dayOfYear ) const;	bool isValid( int year, int dayOfYear ) const;

	//KDE5 make virtual?	//KDE5 make virtual?
	/**	/**

		* @since 4.5
		*
		* Returns whether a given date is valid in this calendar system.
		*
		* @param era the Era Name portion of the date to check
		* @param yearInEra the Year In Era portion of the date to check
		* @param month the Month portion of the date to check
		* @param day the Day portion of the date to check
		* @return @c true if the date is valid, @c false otherwise
		*/
		bool isValid( const QString &eraName, int yearInEra, int month, int day
		) const;

		//KDE5 make virtual?
		/**
	* @since 4.4	* @since 4.4
	*	*
	* Returns whether a given date is valid in this calendar system.	* Returns whether a given date is valid in this calendar system.
	*	*
	* @param year the year portion of the date to check	* @param year the year portion of the date to check
	* @param isoWeekNumber the ISO week portion of the date to check	* @param isoWeekNumber the ISO week portion of the date to check
	* @param dayOfIsoWeek the day of week portion of the date to check	* @param dayOfIsoWeek the day of week portion of the date to check
	* @return @c true if the date is valid, @c false otherwise	* @return @c true if the date is valid, @c false otherwise
	*/	*/
	bool isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek ) const;	bool isValidIsoWeekDate( int year, int isoWeekNumber, int dayOfIsoWeek ) const;

	skipping to change at line 228	skipping to change at line 265
	*	*
	* @param date date to change	* @param date date to change
	* @param year year	* @param year year
	* @param dayOfYear day of year	* @param dayOfYear day of year
	* @return @c true if the date is valid, @c false otherwise	* @return @c true if the date is valid, @c false otherwise
	*/	*/
	bool setDate( QDate &date, int year, int dayOfYear ) const;	bool setDate( QDate &date, int year, int dayOfYear ) const;

	//KDE5 make virtual?	//KDE5 make virtual?
	/**	/**

		* @since 4.5
		*
		* Set a date using the era, year in era number, month and day
		*
		* @param date date to change
		* @param eraName Era string
		* @param year Year In Era number
		* @param month Month number
		* @param day Day Of Month number
		* @return @c true if the date is valid, @c false otherwise
		*/
		bool setDate( QDate &date, QString eraName, int yearInEra, int month, i
		nt day ) const;

		//KDE5 make virtual?
		/**
	* @since 4.4	* @since 4.4
	*	*
	* Set a date using the year number, ISO week number and day of week nu mber.	* Set a date using the year number, ISO week number and day of week nu mber.
	*	*
	* @param date date to change	* @param date date to change
	* @param year year	* @param year year
	* @param isoWeekNumber ISO week of year	* @param isoWeekNumber ISO week of year
	* @param dayOfIsoWeek day of week Mon..Sun (1..7)	* @param dayOfIsoWeek day of week Mon..Sun (1..7)
	* @return @c true if the date is valid, @c false otherwise	* @return @c true if the date is valid, @c false otherwise
	*/	*/

	skipping to change at line 262	skipping to change at line 314
	* and day depends on which calendar is being used.	* and day depends on which calendar is being used.
	*	*
	* @param date Date to change	* @param date Date to change
	* @param y Year	* @param y Year
	* @param m Month number	* @param m Month number
	* @param d Day of month	* @param d Day of month
	* @return true if the date is valid; otherwise returns false.	* @return true if the date is valid; otherwise returns false.
	*/	*/
	virtual bool setYMD( QDate &date, int y, int m, int d ) const;	virtual bool setYMD( QDate &date, int y, int m, int d ) const;


		//KDE5 make virtual?
		/**
		* @since 4.5
		*
		* Returns the year, month and day portion of a given date in the curre
		nt calendar system
		*
		* @param date date to get year, month and day for
		* @param year year number returned in this variable
		* @param month month number returned in this variable
		* @param day day of month returned in this variable
		*/
		void getDate( const QDate date, int year, int month, int *day ) const
		;

	/**	/**
	* Returns the year portion of a given date in the current calendar sys tem	* Returns the year portion of a given date in the current calendar sys tem
	*	*
	* @param date date to return year for	* @param date date to return year for
	* @return year, 0 if input date is invalid	* @return year, 0 if input date is invalid
	*/	*/
	virtual int year( const QDate &date ) const;	virtual int year( const QDate &date ) const;

	/**	/**
	* Returns the month portion of a given date in the current calendar sy stem	* Returns the month portion of a given date in the current calendar sy stem

	skipping to change at line 286	skipping to change at line 351
	virtual int month( const QDate &date ) const;	virtual int month( const QDate &date ) const;

	/**	/**
	* Returns the day portion of a given date in the current calendar syst em	* Returns the day portion of a given date in the current calendar syst em
	*	*
	* @param date date to return day for	* @param date date to return day for
	* @return day of the month, 0 if input date is invalid	* @return day of the month, 0 if input date is invalid
	*/	*/
	virtual int day( const QDate &date ) const;	virtual int day( const QDate &date ) const;


		//KDE5 make virtual?
		/**
		* @since 4.5
		*
		* Returns the Era Name portion of a given date in the current calendar
		system,
		* for example "AD" or "Anno Domini" for the Gregorian calendar and Chr
		istian Era.
		*
		* @param date date to return Era Name for
		* @param format format to return, either short or long
		* @return era name, empty string if input date is invalid
		*/
		QString eraName( const QDate &date, StringFormat format = ShortFormat )
		const;

		//KDE5 make virtual?
		/**
		* @since 4.5
		*
		* Returns the Era Year portion of a given date in the current
		* calendar system, for example "2000 AD" or "Heisei 22".
		*
		* @param date date to return Era Year for
		* @param format format to return, either short or long
		* @return era name, empty string if input date is invalid
		*/
		QString eraYear( const QDate &date, StringFormat format = ShortFormat )
		const;

		//KDE5 make virtual?
		/**
		* @since 4.5
		*
		* Returns the Year In Era portion of a given date in the current calen
		dar
		* system, for example 1 for "1 BC".
		*
		* @param date date to return Year In Era for
		* @return Year In Era, -1 if input date is invalid
		*/
		int yearInEra( const QDate &date ) const;

	/**	/**
	* Returns a QDate containing a date @p nyears years later.	* Returns a QDate containing a date @p nyears years later.
	*	*
	* @param date The old date	* @param date The old date
	* @param nyears The number of years to add	* @param nyears The number of years to add
	* @return The new date, null date if any errors	* @return The new date, null date if any errors
	*/	*/
	virtual QDate addYears( const QDate &date, int nyears ) const;	virtual QDate addYears( const QDate &date, int nyears ) const;

	/**	/**

	skipping to change at line 313	skipping to change at line 416

	/**	/**
	* Returns a QDate containing a date @p ndays days later.	* Returns a QDate containing a date @p ndays days later.
	*	*
	* @param date The old date	* @param date The old date
	* @param ndays number of days to add	* @param ndays number of days to add
	* @return The new date, null date if any errors	* @return The new date, null date if any errors
	*/	*/
	virtual QDate addDays( const QDate &date, int ndays ) const;	virtual QDate addDays( const QDate &date, int ndays ) const;


		//KDE5 make virtual?
		/**
		* Returns the difference between two dates in years, months and days.
		* The difference is always caculated from the earlier date to the late
		r
		* date in year, month and day order, with the @p direction parameter
		* indicating which direction the difference is applied from the @p toD
		ate.
		*
		* For example, the difference between 2010-06-10 and 2012-09-5 is 2 ye
		ars,
		* 2 months and 26 days. Note that the difference between two last day
		s of
		* the month is always 1 month, e.g. 2010-01-31 to 2010-02-28 is 1 mont
		h
		* not 28 days.
		*
		* @param fromDate The date to start from
		* @param toDate The date to end at
		* @param yearsDiff Returns number of years difference
		* @param monthsDiff Returns number of months difference
		* @param daysDiff Returns number of days difference
		* @param direction Returns direction of difference, 1 if fromDate <= t
		oDate, -1 otherwise
		*/
		void dateDifference( const QDate &fromDate, const QDate &toDate,
		int yearsDiff, int monthsDiff, int *daysDiff, in
		t *direction ) const;

		//KDE5 make virtual?
		/**
		* Returns the difference between two dates in completed calendar years.
		* The returned value will be negative if @p fromDate > @p toDate.
		*
		* For example, the difference between 2010-06-10 and 2012-09-5 is 2 yea
		rs.
		*
		* @param fromDate The date to start from
		* @param toDate The date to end at
		* @return The number of years difference
		*/
		int yearsDifference( const QDate &fromDate, const QDate &toDate ) const
		;

		//KDE5 make virtual?
		/**
		* Returns the difference between two dates in completed calendar month
		s
		* The returned value will be negative if @p fromDate > @p toDate.
		*
		* For example, the difference between 2010-06-10 and 2012-09-5 is 26 m
		onths.
		* Note that the difference between two last days of the month is alway
		s 1
		* month, e.g. 2010-01-31 to 2010-02-28 is 1 month not 28 days.
		*
		* @param fromDate The date to start from
		* @param toDate The date to end at
		* @return The number of months difference
		*/
		int monthsDifference( const QDate &fromDate, const QDate &toDate ) cons
		t;

		//KDE5 make virtual?
		/**
		* Returns the difference between two dates in days
		* The returned value will be negative if @p fromDate > @p toDate.
		*
		* @param fromDate The date to start from
		* @param toDate The date to end at
		* @return The number of days difference
		*/
		int daysDifference( const QDate &fromDate, const QDate &toDate ) const;

	/**	/**
	* Returns number of months in the given year	* Returns number of months in the given year
	*	*
	* @param date the date to obtain year from	* @param date the date to obtain year from
	* @return number of months in the year, -1 if input date invalid	* @return number of months in the year, -1 if input date invalid
	*/	*/
	virtual int monthsInYear( const QDate &date ) const;	virtual int monthsInYear( const QDate &date ) const;


		//KDE5 make virtual?
		/**
		* @since 4.5
		*
		* Returns number of months in the given year
		*
		* @param year the required year
		* @return number of months in the year, -1 if input date invalid
		*/
		int monthsInYear( int year ) const;

	/**	/**
	* Returns the number of ISO weeks in the given year.	* Returns the number of ISO weeks in the given year.
	*	*
	* @param date the date to obtain year from	* @param date the date to obtain year from
	* @return number of weeks in the year, -1 if input date invalid	* @return number of weeks in the year, -1 if input date invalid
	*/	*/
	virtual int weeksInYear( const QDate &date ) const;	virtual int weeksInYear( const QDate &date ) const;

	/**	/**
	* Returns the number of ISO weeks in the given year.	* Returns the number of ISO weeks in the given year.

	skipping to change at line 348	skipping to change at line 523
	virtual int weeksInYear( int year ) const;	virtual int weeksInYear( int year ) const;

	/**	/**
	* Returns the number of days in the given year.	* Returns the number of days in the given year.
	*	*
	* @param date the date to obtain year from	* @param date the date to obtain year from
	* @return number of days in year, -1 if input date invalid	* @return number of days in year, -1 if input date invalid
	*/	*/
	virtual int daysInYear( const QDate &date ) const;	virtual int daysInYear( const QDate &date ) const;


		//KDE5 make virtual?
		/**
		* @since 4.5
		*
		* Returns the number of days in the given year.
		*
		* @param year the year
		* @return number of days in year, -1 if input date invalid
		*/
		int daysInYear( int year ) const;

	/**	/**
	* Returns the number of days in the given month.	* Returns the number of days in the given month.
	*	*
	* @param date the date to obtain month from	* @param date the date to obtain month from
	* @return number of days in month, -1 if input date invalid	* @return number of days in month, -1 if input date invalid
	*/	*/
	virtual int daysInMonth( const QDate &date ) const;	virtual int daysInMonth( const QDate &date ) const;


		//KDE5 make virtual?
		/**
		* @since 4.5
		*
		* Returns the number of days in the given month.
		*
		* @param year the year the month is in
		* @param month the month
		* @return number of days in month, -1 if input date invalid
		*/
		int daysInMonth( int year, int month ) const;

	/**	/**
	* Returns the number of days in the given week.	* Returns the number of days in the given week.
	*	*
	* @param date the date to obtain week from	* @param date the date to obtain week from
	* @return number of days in week, -1 if input date invalid	* @return number of days in week, -1 if input date invalid
	*/	*/
	virtual int daysInWeek( const QDate &date ) const;	virtual int daysInWeek( const QDate &date ) const;

	/**	/**
	* Returns the day number of year for the given date	* Returns the day number of year for the given date

	skipping to change at line 488	skipping to change at line 686
	*	*
	* @param pDate The date to convert	* @param pDate The date to convert
	* @param format The format to return, either short or long	* @param format The format to return, either short or long
	* @return The day literal of the date, empty string if any error	* @return The day literal of the date, empty string if any error
	* @see day()	* @see day()
	*/	*/
	virtual QString dayString( const QDate &pDate, StringFormat format = Lo ngFormat ) const;	virtual QString dayString( const QDate &pDate, StringFormat format = Lo ngFormat ) const;

	//KDE5 make virtual?	//KDE5 make virtual?
	/**	/**

		* @since 4.5
		*
		* Converts a date into a Year In Era literal
		*
		* @param date date to return Year In Era for
		* @param format format to return, either short or long
		* @return Year In Era literal of the date, empty string if any error
		*/
		QString yearInEraString( const QDate &date, StringFormat format = Short
		Format ) const;

		//KDE5 make virtual?
		/**
	* @since 4.4	* @since 4.4
	*	*
	* Converts a date into a day of year literal	* Converts a date into a day of year literal
	*	*
	* @param pDate The date to convert	* @param pDate The date to convert
	* @param format The format to return, either short or long	* @param format The format to return, either short or long
	* @return The day of year literal of the date, empty string if any err or	* @return The day of year literal of the date, empty string if any err or
	* @see dayOfYear()	* @see dayOfYear()
	*/	*/
	QString dayOfYearString( const QDate &pDate, StringFormat format = Long Format ) const;	QString dayOfYearString( const QDate &pDate, StringFormat format = Long Format ) const;

	skipping to change at line 588	skipping to change at line 798
	* @since 4.4	* @since 4.4
	*	*
	* Returns the days in week for a date as a numeric string	* Returns the days in week for a date as a numeric string
	*	*
	* @param date The date to convert	* @param date The date to convert
	* @return The days in week literal of the date, empty string if any er ror	* @return The days in week literal of the date, empty string if any er ror
	* @see daysInWeek()	* @see daysInWeek()
	*/	*/
	QString daysInWeekString( const QDate &date ) const;	QString daysInWeekString( const QDate &date ) const;


	//KDE5 remove?	//KDE5 make protected or remove?
	/**	/**
	* @deprecated	* @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?	//KDE5 make protected or remove?
	/**	/**
	* @deprecated	* @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?	//KDE5 make protected or remove?
	/**	/**
	* @deprecated	* @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;

	skipping to change at line 647	skipping to change at line 857
	*	*
	* @return The date as a string	* @return The date as a string
	*/	*/
	virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const;	virtual QString formatDate( const QDate &fromDate, KLocale::DateFormat toFormat = KLocale::LongDate ) const;

	//KDE5 Make virtual	//KDE5 Make virtual
	/**	/**
	* @since 4.4	* @since 4.4
	*	*
	* Returns a string formatted to the given format and localised to the	* Returns a string formatted to the given format and localised to the

	* correct language and digit set.	* correct language and digit set using the requested format standard.
	*	*
	* * WITH GREAT POWER COMES GREAT RESPONSIBILITY *	* * WITH GREAT POWER COMES GREAT RESPONSIBILITY *
	* Please use with care and only in situations where the DateFormat enu m	* Please use with care and only in situations where the DateFormat enu m
	* or locale formats or individual string methods do not provide what y ou	* or locale formats or individual string methods do not provide what y ou
	* need. You should almost always translate your format string as	* need. You should almost always translate your format string as
	* documented. Using the standard DateFormat options instead would tak e	* documented. Using the standard DateFormat options instead would tak e
	* care of the translation for you.	* care of the translation for you.
	*	*
	* Warning: The %n element differs from the GNU/POSIX standard where it is	* 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	* defined as a newline. KDE currently uses this for short day number. It

	skipping to change at line 671	skipping to change at line 881
	* so that translators can adapt it to their language's convention.	* so that translators can adapt it to their language's convention.
	* There should also be a context using the "kdedt-format" keyword (for	* There should also be a context using the "kdedt-format" keyword (for
	* automatic validation of translations) and stating the format's purpo se:	* automatic validation of translations) and stating the format's purpo se:
	* \code	* \code
	* QDate reportDate;	* QDate reportDate;
	* KGlobal::locale()->calendar()->setDate(reportDate, reportYear, repor tMonth, 1);	* KGlobal::locale()->calendar()->setDate(reportDate, reportYear, repor tMonth, 1);
	* dateFormat = i18nc("(kdedt-format) Report month and year in report h eader", "%B %Y"));	* dateFormat = i18nc("(kdedt-format) Report month and year in report h eader", "%B %Y"));
	* dateString = KGlobal::locale()->calendar()->formatDate(reportDate, d ateFormat);	* dateString = KGlobal::locale()->calendar()->formatDate(reportDate, d ateFormat);
	* \endcode	* \endcode
	*	*

	* The date format string closely follows the C / POSIX / UC / GNU stan	* The date format string can be defined using either the KDE or POSIX
	dards	standards.
	* but with some exceptions.	* The KDE standard closely follows the POSIX standard but with some ex
		ceptions.
		* Always use the KDE standard within KDE, but where interaction is req
		uired with
		* external POSIX compliant systems (e.g. Gnome, glibc, etc) the POSIX
		standard
		* should be used.
	*	*
	* Date format strings are made up of date componants and string litera ls.	* 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	* 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	* optional padding and case modifier flags, an optional width value, a nd a
	* compulsary code for the actual date componant:	* compulsary code for the actual date componant:
	* %[Flags][Width][Componant]	* %[Flags][Width][Componant]
	* e.g. %_^5Y	* e.g. %_^5Y
	* No spaces are allowed.	* No spaces are allowed.
	*	*
	* The Flags can modify the padding character and/or case of the Date C omponant.	* The Flags can modify the padding character and/or case of the Date C omponant.

	skipping to change at line 707	skipping to change at line 920
	* @li - (hyphen) no padding (e.g. 1 Jan and "%-j" = "1")	* @li - (hyphen) no padding (e.g. 1 Jan and "%-j" = "1")
	* @li _ (underscore) pad with spaces (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 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 ^ (caret) make uppercase (e.g. 1 Jan and "%^B" = "JANUARY")
	* @li # (hash) invert case (e.g. 1 Jan and "%#B" = "???")	* @li # (hash) invert case (e.g. 1 Jan and "%#B" = "???")
	*	*
	* The following Date Componants can be specified:	* 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 %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 %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 %y the lower 2 digits of the year to 2 digits (e.g. "84" for 198 4, "05" for 2005)

		* @li %EY the full local era year (e.g. "2000 AD")
		* @li %EC the era name short form (e.g. "AD")
		* @li %Ey the year in era to 1 digit (e.g. 1 or 2000)
	* @li %m the month number to 2 digits (January="01", December="12")	* @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 %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 %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 %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 long form (e.g. "January")
	* @li %b the month name short form (e.g. "Jan" for 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 %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 long form (e.g. "Wednesday" for Wednesday)
	* @li %a the weekday name short form (e.g. "Wed" 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 %j the day of the year number to 3 digits (e.g. "001" for 1 Jan )

	skipping to change at line 733	skipping to change at line 949
	* @li %x the KDE locale short date format	* @li %x the KDE locale short date format
	* @li %% the literal "%"	* @li %% the literal "%"
	* @li %t a tab character	* @li %t a tab character
	*	*
	* Everything else in the format string will be taken as literal text.	* Everything else in the format string will be taken as literal text.
	*	*
	* Examples:	* Examples:
	* "%Y-%m-%d" = "2009-01-01"	* "%Y-%m-%d" = "2009-01-01"
	* "%Y-%-m-%_4d" = "2009-1- 1"	* "%Y-%-m-%_4d" = "2009-1- 1"
	*	*

	* The Date Componants are mostly equivalent to the C, GNU and POSIX st	* The following format codes behave differently in the KDE and POSIX s
	andard	tandards
	* but with some notable differences:
	* @li %e in GNU/POSIX is space padded to 2 digits, in KDE is not padde d	* @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 %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	* The following POSIX format codes are currently not supported:
	* @li %W in GNU/POSIX is US week number, in KDE is not supported	* @li %U US week number
	* @li %E in GNU/POSIX is locale's alternative representation, in KDE i	* @li %w US day of week
	s not supported	* @li %W US week number
	* @li %O in GNU/POSIX is locale's alternative numeric symbols, in KDE	* @li %O locale's alternative numeric symbols, in KDE is not supported
	is not supported
	*	*
	* %0 is not supported as the returned result is always in the locale's chosen numeric symbol digit set.	* %0 is not supported as the returned result is always in the locale's chosen numeric symbol digit set.
	*	*
	* @see KLocale::formatDate	* @see KLocale::formatDate
	*	*
	* @param fromDate the date to be formatted	* @param fromDate the date to be formatted
	* @param toFormat the date format to use	* @param toFormat the date format to use
	* @param formatStandard the standard the date format uses, defaults to KDE Standard	* @param formatStandard the standard the date format uses, defaults to KDE Standard
	*	*
	* @return The date as a string	* @return The date as a string

	skipping to change at line 816	skipping to change at line 1032
	* @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.	* Converts a localized date string to a QDate, using the specified @p format.

		* You will usually not want to use this method. Uses teh KDE format s
		tandard.
		*
		* @param dateString the string to convert
		* @param dateFormat the date format to use, in KDE format standard
		* @param ok if non-null, will be set to @c true if the date is valid,
		@c false if invalid
		*
		* @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;

		//KDE5 Make virtual
		/**
		* Converts a localized date string to a QDate, using the specified @p
		format.
	* You will usually not want to use this method.	* You will usually not want to use this method.
	*	*
	* You must supply a format and string containing at least one of the f ollowing combinations to	* You must supply a format and string containing at least one of the f ollowing combinations to
	* create a valid date:	* create a valid date:
	* @li a month and day of month	* @li a month and day of month
	* @li a day of year	* @li a day of year
	* @li a ISO week number and day of week	* @li a ISO week number and day of week
	*	*
	* If a year number is not supplied then the current year will be assum ed.	* If a year number is not supplied then the current year will be assum ed.
	*	*

	skipping to change at line 837	skipping to change at line 1069
	*	*
	* The format is not applied strictly to the input string:	* The format is not applied strictly to the input string:
	* @li extra whitespace is ignored	* @li extra whitespace is ignored
	* @li leading 0's on numbers are ignored	* @li leading 0's on numbers are ignored
	* @li capitalisation of literals is ignored	* @li capitalisation of literals is ignored
	*	*
	* The allowed format componants are almost the same as the formatDate( ) function.	* The allowed format componants are almost the same as the formatDate( ) function.
	* The following date componants will be read:	* The following date componants will be read:
	* @li %Y the whole year (e.g. "1984" for 1984)	* @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 %y the lower 2 digits of the year (e.g. "84" for 1984)

		* @li %EY the full local era year (e.g. "2000 AD")
		* @li %EC the era name short form (e.g. "AD")
		* @li %Ey the year in era to 1 digit (e.g. 1 or 2000)
	* @li %m the month number to two digits (January="01", December="12")	* @li %m the month number to two digits (January="01", December="12")
	* @li %n the month number (January="1", 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 %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 %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 long form (e.g. "January")
	* @li %b the month name short form (e.g. "Jan" for 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 %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 long form (e.g. "Wednesday" for Wednesday)
	* @li %a the weekday name short form (e.g. "Wed" 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 %j the day of the year number to three digits (e.g. "001" for 1 Jan)

	skipping to change at line 863	skipping to change at line 1098
	* @li %g the year number in short form of the ISO week of the year (e. g. "04" 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 %D the US short date format (e.g. "%m/%d/%y")
	* @li %F the ISO short date format (e.g. "%Y-%m-%d")	* @li %F the ISO short date format (e.g. "%Y-%m-%d")
	* @li %x the KDE locale short date format	* @li %x the KDE locale short date format
	* @li %% the literal "%"	* @li %% the literal "%"
	* @li %t a tab character	* @li %t a tab character
	*	*
	* @param dateString the string to convert	* @param dateString the string to convert
	* @param dateFormat the date format to use	* @param dateFormat the date format to use
	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid	* @param ok if non-null, will be set to @c true if the date is valid, @c false if invalid

		* @param formatStandard the standard the date format uses
	*	*
	* @return the string converted to a QDate	* @return the string converted to a QDate
	*	*
	* @see formatDate	* @see formatDate
	* @see KLocale::readDate	* @see KLocale::readDate
	*/	*/

	virtual QDate readDate( const QString &dateString, const QString &dateF	QDate readDate( const QString &dateString, const QString &dateFormat, b
	ormat, bool *ok = 0 ) const;	ool *ok,
		KLocale::DateTimeFormatStandard formatStandard ) const;

	/**	/**
	* Use this to determine which day is the first day of the week.	* Use this to determine which day is the first day of the week.
	*	*
	* Uses the calendar system's internal locale set when the instance was	* Uses the calendar system's internal locale set when the instance was
	* created, which ensures that the correct calendar system and locale	* created, which ensures that the correct calendar system and locale
	* settings are respected, which would not occur in some cases if using	* settings are respected, which would not occur in some cases if using
	* the global locale. Defaults to global locale.	* the global locale. Defaults to global locale.
	*	*
	* @see KLocale::weekStartDay	* @see KLocale::weekStartDay

	skipping to change at line 929	skipping to change at line 1166
	* before the epoch are supported.	* before the epoch are supported.
	*	*
	* @see KCalendarSystem::epoch	* @see KCalendarSystem::epoch
	*	*
	* @return @c true if the calendar system is proleptic, @c false if not	* @return @c true if the calendar system is proleptic, @c false if not
	*/	*/
	virtual bool isProleptic() const = 0;	virtual bool isProleptic() const = 0;

	protected:	protected:


	friend class KCalendarSystemPrivate;

	/**	/**
	* Internal method to convert a Julian Day number into the YMD values f or	* Internal method to convert a Julian Day number into the YMD values f or
	* this calendar system.	* this calendar system.
	*	*
	* All calendar system implementations MUST implement julianDayToDate a nd	* All calendar system implementations MUST implement julianDayToDate a nd
	* dateToJulianDay methods as all other methods can be expressed as	* dateToJulianDay methods as all other methods can be expressed as
	* functions of these. Does no internal validity checking.	* functions of these. Does no internal validity checking.
	*	*
	* @see KCalendarSystem::dateToJulianDay	* @see KCalendarSystem::dateToJulianDay
	*	*

	skipping to change at line 992	skipping to change at line 1227
	* @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;

	/**	/**

		* @deprecated
		*
	* Sets the maximum number of months in a year	* Sets the maximum number of months in a year
	*	*
	* Only for internal calendar system use	* Only for internal calendar system use
	*/	*/
	void setMaxMonthsInYear( int maxMonths );	void setMaxMonthsInYear( int maxMonths );

	/**	/**

		* @deprecated
		*
	* Sets the maximum number of days in a week	* Sets the maximum number of days in a week
	*	*
	* Only for internal calendar system use	* Only for internal calendar system use
	*/	*/
	void setMaxDaysInWeek( int maxDays );	void setMaxDaysInWeek( int maxDays );

	/**	/**

		* @deprecated
		*
	* @since 4.4	* @since 4.4
	*	*
	* Sets if Calendar System has Year 0 or not	* Sets if Calendar System has Year 0 or not
	*	*
	* Only for internal calendar system use	* Only for internal calendar system use
	*/	*/
	void setHasYear0( bool hasYear0 );	void setHasYear0( bool hasYear0 );


		/**
		* Constructor of abstract calendar class. This will be called by deriv
		ed classes.
		*
		* @param dd derived private d-pointer.
		* @param config a configuration file with a 'KCalendarSystem %calendar
		Name' group detailing
		* locale-related preferences (such as era options). The
		global config is used
		if null.
		* @param locale locale to use for translations. The global locale is u
		sed if null.
		*/
		KCalendarSystem( KCalendarSystemPrivate &dd,
		const KSharedConfig::Ptr config = KSharedConfig::Ptr()
		,
		const KLocale *locale = 0 );

	private:	private:

		//Required for shared d-pointer as already private, remove in KDE5
		friend class KCalendarSystemCoptic;
		friend class KCalendarSystemEthiopian;
		friend class KCalendarSystemGregorian;
		friend class KCalendarSystemGregorianProleptic;
		friend class KCalendarSystemHebrew;
		friend class KCalendarSystemHijri;
		friend class KCalendarSystemIndianNational;
		friend class KCalendarSystemJalali;
		friend class KCalendarSystemJapanese;
		friend class KCalendarSystemJulian;
		friend class KCalendarSystemMinguo;
		friend class KCalendarSystemThai;

	Q_DISABLE_COPY( KCalendarSystem )	Q_DISABLE_COPY( KCalendarSystem )

	KCalendarSystemPrivate * const d;	KCalendarSystemPrivate * const d_ptr; // KDE5 make protected
		Q_DECLARE_PRIVATE( KCalendarSystem )
	};	};

	#endif	#endif

End of changes. 31 change blocks.
	23 lines changed or deleted	335 lines changed or added

	kcategorizedview.h	kcategorizedview.h

	skipping to change at line 94	skipping to change at line 94
	public:	public:
	KCategorizedView(QWidget *parent = 0);	KCategorizedView(QWidget *parent = 0);

	~KCategorizedView();	~KCategorizedView();

	/**	/**
	* Reimplemented from QAbstractItemView.	* Reimplemented from QAbstractItemView.
	*/	*/
	virtual void setModel(QAbstractItemModel *model);	virtual void setModel(QAbstractItemModel *model);


		/**
		* Calls to setGridSizeOwn().
		*/
	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	* @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	* calling to this method, make sure you have a KCategorizedV iew pointer around. This
	* means that something like:	* means that something like:
	* @code	* @code
	* QListView *lv = new KCategorizedView();	* QListView *lv = new KCategorizedView();
	* lv->setGridSize(mySize);	* lv->setGridSize(mySize);
	* @endcode	* @endcode

	skipping to change at line 140	skipping to change at line 143
	* Returns the current category drawer.	* Returns the current category drawer.
	*/	*/
	KCategoryDrawer *categoryDrawer() const;	KCategoryDrawer *categoryDrawer() const;

	/**	/**
	* The category drawer that will be used for drawing categories.	* The category drawer that will be used for drawing categories.
	*/	*/
	void setCategoryDrawer(KCategoryDrawer *categoryDrawer);	void setCategoryDrawer(KCategoryDrawer *categoryDrawer);

	/**	/**

		* @return Category spacing. The spacing between categories.
		*
	* @since 4.4	* @since 4.4
	*/	*/
	int categorySpacing() const;	int categorySpacing() const;

	/**	/**

		* Stablishes the category spacing. This is the spacing between catego
		ries.
		*
	* @since 4.4	* @since 4.4
	*/	*/
	void setCategorySpacing(int categorySpacing);	void setCategorySpacing(int categorySpacing);

	/**	/**

		* @return Whether blocks should be drawn with alternating colors.
		*
	* @since 4.4	* @since 4.4
	*/	*/
	bool alternatingBlockColors() const;	bool alternatingBlockColors() const;

	/**	/**

		* Sets whether blocks should be drawn with alternating colors.
		*
	* @since 4.4	* @since 4.4
	*/	*/
	void setAlternatingBlockColors(bool enable);	void setAlternatingBlockColors(bool enable);

	/**	/**

		* @return Whether blocks can be collapsed or not.
		*
	* @since 4.4	* @since 4.4
	*/	*/
	bool collapsibleBlocks() const;	bool collapsibleBlocks() const;

	/**	/**

		* Sets whether blocks can be collapsed or not.
		*
	* @since 4.4	* @since 4.4
	*/	*/
	void setCollapsibleBlocks(bool enable);	void setCollapsibleBlocks(bool enable);

	/**	/**

		* @return Block of indexes that are into @p category.
		*
		* @since 4.5
		*/
		QModelIndexList block(const QString &category);

		/**
		* @return Block of indexes that are represented by @p representative.
		*
		* @since 4.5
		*/
		QModelIndexList block(const QModelIndex &representative);

		/**
	* Reimplemented from QAbstractItemView.	* Reimplemented from QAbstractItemView.
	*/	*/
	virtual QModelIndex indexAt(const QPoint &point) const;	virtual QModelIndex indexAt(const QPoint &point) const;

	/**	/**
	* Reimplemented from QAbstractItemView.	* Reimplemented from QAbstractItemView.
	*/	*/
	virtual void reset();	virtual void reset();

	protected:	protected:

End of changes. 8 change blocks.
	0 lines changed or deleted	30 lines changed or added

	kcategorydrawer.h	kcategorydrawer.h

	skipping to change at line 33	skipping to change at line 33

	#include <kdeui_export.h>	#include <kdeui_export.h>

	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include <QtGui/QMouseEvent>	#include <QtGui/QMouseEvent>

	class QPainter;	class QPainter;
	class QModelIndex;	class QModelIndex;
	class QStyleOption;	class QStyleOption;


		class KCategorizedView;

	/**	/**

	* @warning Please use KCategoryDrawerV2 instead.	* @deprecated
		*
		* The category drawing is performed by this class. It also gives informat
		ion about the category
		* height and margins.
		*
		* @warning Please use KCategoryDrawerV3 instead
	*/	*/

	class KDEUI_EXPORT KCategoryDrawer	class KDEUI_EXPORT_DEPRECATED 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;


		/**
		* @return The category height for the category representated by index
		@p index with
		* style options @p option.
		*/
	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	//TODO KDE5: make virtual as leftMargin
	/**	/**
	* @note 0 by default	* @note 0 by default

		*
	* @since 4.4	* @since 4.4
	*/	*/
	int leftMargin() const;	int leftMargin() const;


	/**	/**
	* @note call to this method on the KCategoryDrawer constructor to set the left margin	* @note call to this method on the KCategoryDrawer constructor to set the left margin

		*
	* @since 4.4	* @since 4.4
	*/	*/
	void setLeftMargin(int leftMargin);	void setLeftMargin(int leftMargin);

	//TODO KDE5: make virtual as rightMargin	//TODO KDE5: make virtual as rightMargin
	/**	/**
	* @note 0 by default	* @note 0 by default

		*
	* @since 4.4	* @since 4.4
	*/	*/
	int rightMargin() const;	int rightMargin() const;


	/**	/**
	* @note call to this method on the KCategoryDrawer constructor to set the right margin	* @note call to this method on the KCategoryDrawer constructor to set the right margin

		*
	* @since 4.4	* @since 4.4
	*/	*/
	void setRightMargin(int rightMargin);	void setRightMargin(int rightMargin);

	KCategoryDrawer &operator=(const KCategoryDrawer &cd);	KCategoryDrawer &operator=(const KCategoryDrawer &cd);

	private:	private:
	class Private;	class Private;
	Private *const d;	Private *const d;
	};	};

	/**	/**

		* @deprecated
		*
	* @since 4.4	* @since 4.4

		*
		* @warning Please use KCategoryDrawerV3 instead
	*/	*/

	class KDEUI_EXPORT KCategoryDrawerV2	class KDEUI_EXPORT_DEPRECATED KCategoryDrawerV2
	: public QObject	: public QObject
	, public KCategoryDrawer	, public KCategoryDrawer
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	KCategoryDrawerV2(QObject *parent = 0);	KCategoryDrawerV2(QObject *parent = 0);
	virtual ~KCategoryDrawerV2();	virtual ~KCategoryDrawerV2();


	// TODO
	virtual void mouseButtonPressed(const QModelIndex &index, QMouseEvent * event);	virtual void mouseButtonPressed(const QModelIndex &index, QMouseEvent * event);

	// TODO
	virtual void mouseButtonReleased(const QModelIndex &index, QMouseEvent *event);	virtual void mouseButtonReleased(const QModelIndex &index, QMouseEvent *event);

	// TODO
	virtual void mouseButtonMoved(const QModelIndex &index, QMouseEvent *ev ent);	virtual void mouseButtonMoved(const QModelIndex &index, QMouseEvent *ev ent);

	// TODO
	virtual void mouseButtonDoubleClicked(const QModelIndex &index, QMouseE vent *event);	virtual void mouseButtonDoubleClicked(const QModelIndex &index, QMouseE vent *event);

	Q_SIGNALS:	Q_SIGNALS:

		/**
		* This signal becomes emitted when collapse or expand has been clicke
		d.
		*/
	void collapseOrExpandClicked(const QModelIndex &index);	void collapseOrExpandClicked(const QModelIndex &index);


		/**
		* Emit this signal on your subclass implementation to notify that som
		ething happened. Usually
		* this will be triggered when you have received an event, and its pos
		ition matched some "hot spot".
		*
		* You give this action the integer you want, and having connected thi
		s signal to your code,
		* the connected slot can perform the needed changes (view, model, sel
		ection model, delegate...)
		*/
		void actionRequested(int action, const QModelIndex &index);
		};

		/**
		* @since 4.5
		*/
		class KDEUI_EXPORT KCategoryDrawerV3
		: public KCategoryDrawerV2
		{
		friend class KCategorizedView;

		public:
		KCategoryDrawerV3(KCategorizedView *view);
		virtual ~KCategoryDrawerV3();

		/**
		* @return The view this category drawer is associated with.
		*/
		KCategorizedView *view() const;

		protected:
		/**
		* Method called when the mouse button has been pressed.
		*
		* @param index The representative index of the block of items.
		* @param blockRect The rect occupied by the block of items.
		* @param event The mouse event.
		*
		* @warning You explicitly have to determine whether the event has bee
		n accepted or not. You
		* have to call event->accept() or event->ignore() at all pos
		sible case branches in
		* your code.
		*/
		virtual void mouseButtonPressed(const QModelIndex &index, const QRect &
		blockRect, QMouseEvent *event);

		/**
		* Method called when the mouse button has been released.
		*
		* @param index The representative index of the block of items.
		* @param blockRect The rect occupied by the block of items.
		* @param event The mouse event.
		*
		* @warning You explicitly have to determine whether the event has bee
		n accepted or not. You
		* have to call event->accept() or event->ignore() at all pos
		sible case branches in
		* your code.
		*/
		virtual void mouseButtonReleased(const QModelIndex &index, const QRect
		&blockRect, QMouseEvent *event);

		/**
		* Method called when the mouse has been moved.
		*
		* @param index The representative index of the block of items.
		* @param blockRect The rect occupied by the block of items.
		* @param event The mouse event.
		*/
		virtual void mouseMoved(const QModelIndex &index, const QRect &blockRec
		t, QMouseEvent *event);

		/**
		* Method called when the mouse button has been double clicked.
		*
		* @param index The representative index of the block of items.
		* @param blockRect The rect occupied by the block of items.
		* @param event The mouse event.
		*
		* @warning You explicitly have to determine whether the event has bee
		n accepted or not. You
		* have to call event->accept() or event->ignore() at all pos
		sible case branches in
		* your code.
		*/
		virtual void mouseButtonDoubleClicked(const QModelIndex &index, const Q
		Rect &blockRect, QMouseEvent *event);

		/**
		* Method called when the mouse button has left this block.
		*
		* @param index The representative index of the block of items.
		* @param blockRect The rect occupied by the block of items.
		*/
		virtual void mouseLeft(const QModelIndex &index, const QRect &blockRect
		);

		private:
		class Private;
		Private *const d;
	};	};

	#endif // KCATEGORYDRAWER_H	#endif // KCATEGORYDRAWER_H

End of changes. 19 change blocks.
	7 lines changed or deleted	136 lines changed or added

	kcmdlineargs.h	kcmdlineargs.h

	skipping to change at line 88	skipping to change at line 88
	*	*
	* Note that if the option name begins with "no" that you will need to test	* Note that if the option name begins with "no" that you will need to test
	* for the name without the "no" and the result will be the inverse of what	* for the name without the "no" and the result will be the inverse of what
	* is specified. i.e. if "nofoo" is the name of the option and	* is specified. i.e. if "nofoo" is the name of the option and
	* <i>myapp --nofoo</i> is called:	* <i>myapp --nofoo</i> is called:
	*	*
	* @code	* @code
	* KCmdLineArgs::parsedArgs()->isSet("foo"); // false	* KCmdLineArgs::parsedArgs()->isSet("foo"); // false
	* @endcode	* @endcode
	*	*

		* Here are some more examples showing various features:
		*
		* @code
		* KCmdLineOptions options;
		* options.add("a", ki18n("A short binary option"));
		* options.add("b \<file>", ki18n("A short option which takes an argum
		ent"));
		* options.add("c \<speed>", ki18n("As above but with a default value"
		), "9600");
		* options.add("option1", ki18n("A long binary option, off by default"
		));
		* options.add("nooption2", ki18n("A long binary option, on by default
		"));
		* options.add(":", ki18n("Extra options:"));
		* options.add("option3 \<file>", ki18n("A long option which takes an
		argument"));
		* options.add("option4 \<speed>", ki18n("A long option which takes an
		argument, defaulting to 9600"), "9600");
		* options.add("d").add("option5", ki18n("A long option which has a sh
		ort option as alias"));
		* options.add("e").add("nooption6", ki18n("Another long option with a
		n alias"));
		* options.add("f").add("option7 \<speed>", ki18n("'--option7 speed' i
		s the same as '-f speed'"));
		* options.add("!option8 \<cmd>", ki18n("All options following this on
		e will be treated as arguments"));
		* options.add("+file", ki18n("A required argument 'file'"));
		* options.add("+[arg1]", ki18n("An optional argument 'arg1'"));
		* options.add("!+command", ki18n("A required argument 'command', that
		can contain multiple words, even starting with '-'"));
		* options.add("", ki18n("Additional help text not associated with any
		particular option"));
		* @endcode
		*
	* @param name option name	* @param name option name
	* @param description option description, made available for translatio n;	* @param description option description, made available for translatio n;
	* can be left off	* can be left off
	* @param defaultValue default option value, when the value is not spec ified	* @param defaultValue default option value, when the value is not spec ified
	* on the command line; can be left off	* on the command line; can be left off
	*/	*/
	KCmdLineOptions &add (const QByteArray &name,	KCmdLineOptions &add (const QByteArray &name,
	const KLocalizedString &description = KLocalizedS tring(),	const KLocalizedString &description = KLocalizedS tring(),
	const QByteArray &defaultValue = QByteArray());	const QByteArray &defaultValue = QByteArray());


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

	kcmoduleinfo.h	kcmoduleinfo.h

	skipping to change at line 27	skipping to change at line 27

	You should have received a copy of the GNU Library General Public License	You should have received a copy of the GNU Library General Public License
	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 KCMODULEINFO_H	#ifndef KCMODULEINFO_H
	#define KCMODULEINFO_H	#define KCMODULEINFO_H


	#include <kutils_export.h>	#include <kcmutils_export.h>
	#include <kservice.h>	#include <kservice.h>

	class QString;	class QString;
	class QStringList;	class QStringList;

	/**	/**
	* A class that provides information about a KCModule	* A class that provides information about a KCModule
	*	*
	* KCModuleInfo provides various technical information, such as icon, libra ry	* KCModuleInfo provides various technical information, such as icon, libra ry
	* etc. about a KCModule.n	* etc. about a KCModule.n
	* @note Any values set with the set* functions is not	* @note Any values set with the set* functions is not
	* written back with KCModuleInfo it only reads value from the desktop file .	* written back with KCModuleInfo it only reads value from the desktop file .
	*	*
	* @internal	* @internal
	* @author Matthias Hoelzer-Kluepfel <mhk@kde.org>	* @author Matthias Hoelzer-Kluepfel <mhk@kde.org>
	* @author Matthias Elter <elter@kde.org>	* @author Matthias Elter <elter@kde.org>
	* @author Daniel Molkentin <molkentin@kde.org>	* @author Daniel Molkentin <molkentin@kde.org>
	*	*
	*/	*/

	class KUTILS_EXPORT KCModuleInfo // krazy:exclude=dpointer (implicitly shar ed)	class KCMUTILS_EXPORT KCModuleInfo // krazy:exclude=dpointer (implicitly sh ared)
	{	{

	public:	public:

	/**	/**
	* Constructs a KCModuleInfo.	* Constructs a KCModuleInfo.
	* @note a KCModuleInfo object will have to be manually deleted, it is no t	* @note a KCModuleInfo object will have to be manually deleted, it is no t
	* done automatically for you.	* done automatically for you.
	* @param desktopFile the desktop file representing the module, or	* @param desktopFile the desktop file representing the module, or
	* the name of the module.	* the name of the module.

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

	kcmoduleproxy.h	kcmoduleproxy.h

	skipping to change at line 21	skipping to change at line 21
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Library General Public License for more details.	Library General Public License for more details.

	You should have received a copy of the GNU Library General Public Licen se	You should have received a copy of the GNU Library General Public Licen se
	along with this library; see the file COPYING.LIB. If not, write to	along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.	Boston, MA 02110-1301, USA.

	*/	*/


	#ifndef KUTILS_KCMODULEPROXY_H	#ifndef KCMUTILS_KCMODULEPROXY_H
	#define KUTILS_KCMODULEPROXY_H	#define KCMUTILS_KCMODULEPROXY_H

	#include <QtGui/QImage>	#include <QtGui/QImage>
	#include <QtCore/QStringList>	#include <QtCore/QStringList>

	#include <kcmodule.h>	#include <kcmodule.h>
	#include <kservice.h>	#include <kservice.h>

	#include <kutils_export.h>	#include <kcmutils_export.h>

	class KAboutData;	class KAboutData;
	class KCModuleInfo;	class KCModuleInfo;
	class KComponentData;	class KComponentData;
	class KCModuleProxyPrivate;	class KCModuleProxyPrivate;

	/**	/**
	*	*
	* @brief Encapsulates a KCModule for embedding.	* @brief Encapsulates a KCModule for embedding.
	*	*

	skipping to change at line 67	skipping to change at line 67
	* modules will only be loaded when they are actually needed as well as it is possible to	* modules will only be loaded when they are actually needed as well as it is possible to
	* load many KCModuleProxy without any speed penalty.	* load many KCModuleProxy without any speed penalty.
	*	*
	* KCModuleProxy should be used in all cases where modules are embedded in order to	* KCModuleProxy should be used in all cases where modules are embedded in order to
	* promote code efficiency and usability consistency.	* promote code efficiency and usability consistency.
	*	*
	* @author Frans Englich <frans.englich@telia.com>	* @author Frans Englich <frans.englich@telia.com>
	* @author Matthias Kretz <kretz@kde.org>	* @author Matthias Kretz <kretz@kde.org>
	*	*
	*/	*/

	class KUTILS_EXPORT KCModuleProxy : public QWidget	class KCMUTILS_EXPORT KCModuleProxy : public QWidget
	{	{
	Q_DECLARE_PRIVATE(KCModuleProxy)	Q_DECLARE_PRIVATE(KCModuleProxy)
	Q_OBJECT	Q_OBJECT
	public:	public:
	/**	/**
	* Constructs a KCModuleProxy from a KCModuleInfo class.	* Constructs a KCModuleProxy from a KCModuleInfo class.
	*	*
	* @param info The KCModuleInfo to construct the module from.	* @param info The KCModuleInfo to construct the module from.
	* @param parent the parent QWidget.	* @param parent the parent QWidget.
	* @param args This is used in the implementation and is internal.	* @param args This is used in the implementation and is internal.

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

	kcmultidialog.h	kcmultidialog.h

	skipping to change at line 37	skipping to change at line 37
	#include <kpagedialog.h>	#include <kpagedialog.h>

	class KCMultiDialogPrivate;	class KCMultiDialogPrivate;

	/**	/**
	* @short A class that offers a KPageDialog containing arbitrary	* @short A class that offers a KPageDialog containing arbitrary
	* KControl Modules.	* KControl Modules.
	*	*
	* @author Matthias Elter <elter@kde.org>, Daniel Molkentin <molkentin@kde. org>	* @author Matthias Elter <elter@kde.org>, Daniel Molkentin <molkentin@kde. org>
	*/	*/

	class KUTILS_EXPORT KCMultiDialog : public KPageDialog	class KCMUTILS_EXPORT KCMultiDialog : public KPageDialog
	{	{
	Q_OBJECT	Q_OBJECT
	Q_DECLARE_PRIVATE(KCMultiDialog)	Q_DECLARE_PRIVATE(KCMultiDialog)

	public:	public:
	/**	/**
	* Constructs a new KCMultiDialog	* Constructs a new KCMultiDialog
	*	*
	* @param parent The parent widget	* @param parent The parent widget
	**/	**/

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

	kcolorbutton.h	kcolorbutton.h

	skipping to change at line 42	skipping to change at line 42
	*	*
	* @see KColorDialog	* @see KColorDialog
	*	*
	* \image html kcolorbutton.png "KDE Color Button"	* \image html kcolorbutton.png "KDE Color Button"
	*/	*/
	class KDEUI_EXPORT KColorButton : public QPushButton	class KDEUI_EXPORT KColorButton : public QPushButton
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY( QColor color READ color WRITE setColor USER true )	Q_PROPERTY( QColor color READ color WRITE setColor USER true )
	Q_PROPERTY( QColor defaultColor READ defaultColor WRITE setDefaultColor )	Q_PROPERTY( QColor defaultColor READ defaultColor WRITE setDefaultColor )

		Q_PROPERTY( bool alphaChannelEnabled READ isAlphaChannelEnabled WRITE s etAlphaChannelEnabled )

	public:	public:
	/**	/**
	* Creates a color button.	* Creates a color button.
	*/	*/
	explicit KColorButton( QWidget *parent = 0 );	explicit KColorButton( QWidget *parent = 0 );

	/**	/**
	* Creates a color button with an initial color @p c.	* Creates a color button with an initial color @p c.
	*/	*/

	skipping to change at line 71	skipping to change at line 72
	/**	/**
	* Returns the currently chosen color.	* Returns the currently chosen color.
	*/	*/
	QColor color() const;	QColor color() const;

	/**	/**
	* Sets the current color to @p c.	* Sets the current color to @p c.
	*/	*/
	void setColor( const QColor &c );	void setColor( const QColor &c );


		/**
		* When set to true, allow the user to change the alpha component
		* of the color. The default value is false.
		* @since 4.5
		*/
		void setAlphaChannelEnabled( bool alpha );

		/**
		* Returns true if the user is allowed to change the alpha component.
		* @since 4.5
		*/
		bool isAlphaChannelEnabled() const;

	/**	/**
	* Returns the default color or an invalid color	* Returns the default color or an invalid color
	* if no default color is set.	* if no default color is set.
	*/	*/
	QColor defaultColor() const;	QColor defaultColor() const;

	/**	/**
	* Sets the default color to @p c.	* Sets the default color to @p c.
	*/	*/
	void setDefaultColor( const QColor &c );	void setDefaultColor( const QColor &c );

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

	kcolordialog.h	kcolordialog.h

	skipping to change at line 269	skipping to change at line 269
	* This can be used to mean "the default text color", for instance,	* This can be used to mean "the default text color", for instance,
	* the one with the KDE text color on screen, but black when printing.	* the one with the KDE text color on screen, but black when printing.
	*/	*/
	void setDefaultColor( const QColor& defaultCol );	void setDefaultColor( const QColor& defaultCol );

	/**	/**
	* @return the value passed to setDefaultColor	* @return the value passed to setDefaultColor
	*/	*/
	QColor defaultColor() const;	QColor defaultColor() const;


		/**
		* When set to true, the user is allowed to change the alpha component
		of the color.
		* The default value is false.
		* @since 4.5
		*/
		void setAlphaChannelEnabled(bool alpha);

		/**
		* Returns true when the user can change the alpha channel.
		* @since 4.5
		*/
		bool isAlphaChannelEnabled() const;

	public Q_SLOTS:	public Q_SLOTS:
	/**	/**
	* Preselects a color.	* Preselects a color.
	*/	*/
	void setColor( const QColor &col );	void setColor( const QColor &col );

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Emitted when a color is selected.	* Emitted when a color is selected.
	* Connect to this to monitor the color as it as selected if you are	* Connect to this to monitor the color as it as selected if you are
	* not running modal.	* not running modal.
	*/	*/
	void colorSelected( const QColor &col );	void colorSelected( const QColor &col );

	private:	private:
	Q_PRIVATE_SLOT(d, void slotRGBChanged( void ))	Q_PRIVATE_SLOT(d, void slotRGBChanged( void ))

		Q_PRIVATE_SLOT(d, void slotAlphaChanged( void ))
	Q_PRIVATE_SLOT(d, void slotHSVChanged( void ))	Q_PRIVATE_SLOT(d, void slotHSVChanged( void ))
	Q_PRIVATE_SLOT(d, void slotHtmlChanged( void ))	Q_PRIVATE_SLOT(d, void slotHtmlChanged( void ))
	Q_PRIVATE_SLOT(d, void slotHSChanged( int, int ))	Q_PRIVATE_SLOT(d, void slotHSChanged( int, int ))
	Q_PRIVATE_SLOT(d, void slotVChanged( int ))	Q_PRIVATE_SLOT(d, void slotVChanged( int ))

		Q_PRIVATE_SLOT(d, void slotAChanged( int ))
	Q_PRIVATE_SLOT(d, void slotColorSelected( const QColor &col ))	Q_PRIVATE_SLOT(d, void slotColorSelected( const QColor &col ))
	Q_PRIVATE_SLOT(d, void slotColorSelected( const QColor &col, const QStr ing &name ))	Q_PRIVATE_SLOT(d, void slotColorSelected( const QColor &col, const QStr ing &name ))
	Q_PRIVATE_SLOT(d, void slotColorDoubleClicked( const QColor &col, const QString &name ))	Q_PRIVATE_SLOT(d, void slotColorDoubleClicked( const QColor &col, const QString &name ))
	Q_PRIVATE_SLOT(d, void slotColorPicker())	Q_PRIVATE_SLOT(d, void slotColorPicker())
	Q_PRIVATE_SLOT(d, void slotAddToCustomColors())	Q_PRIVATE_SLOT(d, void slotAddToCustomColors())
	Q_PRIVATE_SLOT(d, void slotDefaultColorClicked())	Q_PRIVATE_SLOT(d, void slotDefaultColorClicked())

	Q_PRIVATE_SLOT(d, void setHMode ( void ))	Q_PRIVATE_SLOT(d, void slotModeChanged( int id ))
	Q_PRIVATE_SLOT(d, void setSMode ( void ))
	Q_PRIVATE_SLOT(d, void setVMode ( void ))
	Q_PRIVATE_SLOT(d, void setRMode ( void ))
	Q_PRIVATE_SLOT(d, void setGMode ( void ))
	Q_PRIVATE_SLOT(d, void setBMode ( void ))

	/**	/**
	* Write the settings of the dialog to config file.	* Write the settings of the dialog to config file.
	**/	**/
	Q_PRIVATE_SLOT(d, void slotWriteSettings())	Q_PRIVATE_SLOT(d, void slotWriteSettings())

	private:	private:
	/**	/**
	* Read the settings for the dialog from config file.	* Read the settings for the dialog from config file.
	**/	**/

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

	kcolorvalueselector.h	kcolorvalueselector.h

	skipping to change at line 51	skipping to change at line 51
	~KColorValueSelector();	~KColorValueSelector();

	/**	/**
	* Updates the widget's contents.	* Updates the widget's contents.
	*/	*/
	void updateContents();	void updateContents();

	/**	/**
	* Returns the current hue value.	* Returns the current hue value.
	*	*

	* @return The hue value (0-255)	* @return The hue value (0-359)
	*/	*/
	int hue() const;	int hue() const;

	/**	/**
	* Sets the hue value. Doesn't automatically update the widget;	* Sets the hue value. Doesn't automatically update the widget;
	* you have to call updateContents manually.	* you have to call updateContents manually.
	*	*

	* @param hue Sets the hue value (0-255)	* @param hue Sets the hue value (0-359)
	*/	*/
	void setHue( int hue );	void setHue( int hue );

	/**	/**
	* Returns the current saturation value.	* Returns the current saturation value.
	*	*
	* @return The saturation value (0-255)	* @return The saturation value (0-255)
	*/	*/
	int saturation() const;	int saturation() const;


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

	kcompletionbox.h	kcompletionbox.h

	skipping to change at line 231	skipping to change at line 231
	virtual QPoint globalPositionHint() const;	virtual QPoint globalPositionHint() const;

	protected Q_SLOTS:	protected Q_SLOTS:
	/**	/**
	* Called when an item was activated. Emits	* Called when an item was activated. Emits
	* activated() with the item.	* activated() with the item.
	*/	*/
	virtual void slotActivated( QListWidgetItem * );	virtual void slotActivated( QListWidgetItem * );

	private Q_SLOTS:	private Q_SLOTS:

	void slotCurrentChanged();
	void canceled();	void canceled();
	void slotItemClicked( QListWidgetItem * );	void slotItemClicked( QListWidgetItem * );

	private:	private:
	class KCompletionBoxPrivate;	class KCompletionBoxPrivate;
	KCompletionBoxPrivate* const d;	KCompletionBoxPrivate* const d;
	};	};

	#endif // KCOMPLETIONBOX_H	#endif // KCOMPLETIONBOX_H

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

	kcomponentdata.h	kcomponentdata.h

	skipping to change at line 154	skipping to change at line 154
	/**	/**
	* Returns the about data of this component.	* Returns the about data of this component.
	*	*
	* @return The about data of the component. If none has been set in the	* @return The about data of the component. If none has been set in the
	* constructor but a component name was set, a default construc ted	* constructor but a component name was set, a default construc ted
	* KAboutData object is returned.	* KAboutData object is returned.
	*/	*/
	const KAboutData *aboutData() const;	const KAboutData *aboutData() const;

	/**	/**

		* Sets the about data of this component.
		*
		* @since 4.5
		*/
		void setAboutData(const KAboutData &aboutData);

		/**
	* Returns the name of the component.	* Returns the name of the component.
	*	*
	* @return The component name.	* @return The component name.
	*/	*/
	QString componentName() const;	QString componentName() const;

	/**	/**
	* Returns the name of the translation catalog.	* Returns the name of the translation catalog.
	*	*
	* @return The catalog name.	* @return The catalog name.

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

	kconfig.h	kconfig.h

	skipping to change at line 118	skipping to change at line 118
	* specified by resourceType. If no path is provided, a default	* specified by resourceType. If no path is provided, a default
	* configuration file will be used based on the name of the main	* configuration file will be used based on the name of the main
	* application component.	* application component.
	*	*
	* @p mode determines whether the user or global settings will be allow ed	* @p mode determines whether the user or global settings will be allow ed
	* to influence the values returned by this object. See OpenFlags for	* to influence the values returned by this object. See OpenFlags for
	* more details.	* more details.
	*	*
	* @note You probably want to use KSharedConfig::openConfig instead.	* @note You probably want to use KSharedConfig::openConfig instead.
	*	*

	* @param file the name of the file	* @param file the name of the file. If an empty string is pass
		ed in
		* and SimpleConfig is passed in for the OpenFlags,
		then an in-memory
		* KConfig object is created which will not write o
		ut to file nor which
		* requires any file in the filesystem at all.
	* @param mode how global settings should affect the configurat ion	* @param mode how global settings should affect the configurat ion
	* options exposed by this KConfig object	* options exposed by this KConfig object
	* @param resourceType The standard directory to look for the configura tion	* @param resourceType The standard directory to look for the configura tion
	* file in (see KStandardDirs)	* file in (see KStandardDirs)
	*	*
	* @sa KSharedConfig::openConfig(const QString&, OpenFlags, const char* )	* @sa KSharedConfig::openConfig(const QString&, OpenFlags, const char* )
	*/	*/
	explicit KConfig(const QString& file = QString(), OpenFlags mode = Full Config,	explicit KConfig(const QString& file = QString(), OpenFlags mode = Full Config,
	const char* resourceType = "config");	const char* resourceType = "config");


	skipping to change at line 147	skipping to change at line 150
	* configuration file will be used based on the component's name.	* configuration file will be used based on the component's name.
	*	*
	* @p mode determines whether the user or global settings will be allow ed	* @p mode determines whether the user or global settings will be allow ed
	* to influence the values returned by this object. See KConfig::OpenF lags for	* to influence the values returned by this object. See KConfig::OpenF lags for
	* more details.	* more details.
	*	*
	* @note You probably want to use KSharedConfig::openConfig instead.	* @note You probably want to use KSharedConfig::openConfig instead.
	*	*
	* @param componentData the component that you wish to load a configura tion	* @param componentData the component that you wish to load a configura tion
	* file for	* file for

	* @param file overrides the configuration file name if not em	* @param file overrides the configuration file name if not em
	pty	pty; if it is empty
		* and SimpleConfig is passed in for the OpenFlags
		, then an in-memory
		* KConfig object is created which will not write
		out to file nor which
		* requires any file in the filesystem at all.
	* @param mode how global settings should affect the configura tion	* @param mode how global settings should affect the configura tion
	* options exposed by this KConfig object.	* options exposed by this KConfig object.
	* See OpenFlags	* See OpenFlags
	* @param resourceType The standard directory to look for the configur ation	* @param resourceType The standard directory to look for the configur ation
	* file in	* file in
	*	*
	* @sa KSharedConfig::openConfig(const KComponentData&, const QString&, OpenFlags, const char*)	* @sa KSharedConfig::openConfig(const KComponentData&, const QString&, OpenFlags, const char*)
	*/	*/
	explicit KConfig(const KComponentData& componentData, const QString& fi le = QString(),	explicit KConfig(const KComponentData& componentData, const QString& fi le = QString(),
	OpenFlags mode = FullConfig, const char* resourceType = "config");	OpenFlags mode = FullConfig, const char* resourceType = "config");

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

	kcrash.h	kcrash.h

	skipping to change at line 30	skipping to change at line 30
	*/	*/

	#ifndef KCRASH_H	#ifndef KCRASH_H
	#define KCRASH_H	#define KCRASH_H

	#include <kdeui_export.h>	#include <kdeui_export.h>

	class QString;	class QString;

	/**	/**

	* This class handles segmentation-faults.	* This namespace contains functions to handle crashes.
	* By default it displays a message-box saying the application crashed.	* It allows you to set a crash handler function that will be called
	* This default can be overridden by setting a custom crash handler with	* when your application crashes and also provides a default crash
	* setCrashHandler().	* handler that implements the following functionality:
	* If a function is specified with setEmergencySaveFunction() it will	* @li Launches the KDE crash display application (DrKonqi) to let
	* be called by the default crash handler, giving the application a chance	* the user report the bug and/or debug it.
	* to save its data.	* @li Calls an emergency save function that you can set with
		* setEmergencySaveFunction() to attempt to save the application's data.
		* @li Autorestarts your application.
		*
		* @note All the above features are optional and you need to enable them
		* explicitly. By default, the defaultCrashHandler() will not do anything.
		* However, if you are using KApplication, it will by default enable launch
		ing
		* DrKonqi on crashes, unless the --nocrashhandler argument was passed on
		* the command line or the environment variable KDE_DEBUG is set to any val
		ue.
	*/	*/
	namespace KCrash	namespace KCrash
	{	{
	/**	/**
	* The default crash handler.	* The default crash handler.

		* Do not call this function directly. Instead, use
		* setCrashHandler() to set it as your application's crash handler.
	* @param signal the signal number	* @param signal the signal number

		* @note If you implement your own crash handler, you will have to
		* call this function from your implementation if you want to use the
		* features of this namespace.
	*/	*/
	KDEUI_EXPORT void defaultCrashHandler (int signal);	KDEUI_EXPORT void defaultCrashHandler (int signal);

	/**	/**

	* This function type is a pointer to a crash handler function.	* Typedef for a pointer to a crash handler function.
	* The function's argument is the number of the signal.	* The function's argument is the number of the signal.
	*/	*/
	typedef void (*HandlerType)(int);	typedef void (*HandlerType)(int);

	/**	/**

	* Install a function to be called in case a SIGSEGV is caught.	* Install a function to be called when a crash occurs.
	* @param handler HandlerType handler can be one of	* A crash occurs when one of the following signals is
	* @li null in which case signal-catching is disabled	* caught: SIGSEGV, SIGBUS, SIGFPE, SIGILL, SIGABRT.
	* (by calling signal(SIGSEGV, SIG_DFL))	* @param handler this can be one of:
	* @li if handler is omitted the default crash handler is installed.	* @li null, in which case signal catching is disabled
	* @li an user defined function in the form:	* (by setting the signal handler for the crash signals to SIG_DFL)
		* @li a user defined function in the form:
	* static (if in a class) void myCrashHandler(int);	* static (if in a class) void myCrashHandler(int);

	* @param handler the crash handler	* @li if handler is omitted, the default crash handler is installed
		* @note If you use setDrKonqiEnabled(true), setEmergencySaveFunction(myf
		unc)
		* or setFlags(AutoRestart), you do not need to call this function
		* explicitly. The default crash handler is automatically installed by
		* those functions if needed. However, if you set a custom crash handler,
		* those functions will not change it.
	*/	*/


	KDEUI_EXPORT void setCrashHandler (HandlerType handler = defaultCrashHand ler);	KDEUI_EXPORT void setCrashHandler (HandlerType handler = defaultCrashHand ler);

	/**	/**
	* Returns the installed crash handler.	* Returns the installed crash handler.
	* @return the crash handler	* @return the crash handler
	*/	*/
	KDEUI_EXPORT HandlerType crashHandler();	KDEUI_EXPORT HandlerType crashHandler();

	/**	/**

	* Installs a function which should try to save the applications data.	* Installs a function which should try to save the application's data.
	* It is the crash handler's responsibility to call this function.	* @note It is the crash handler's responsibility to call this function.
	* Therefore, if no crash handler is set, the default crash handler	* Therefore, if no crash handler is set, the default crash handler

	* is installed to ensure the save function is called.	* is installed to ensure the save function will be called.
	* @param saveFunction the handler to install	* @param saveFunction the handler to install
	*/	*/
	KDEUI_EXPORT void setEmergencySaveFunction (HandlerType saveFunction = 0) ;	KDEUI_EXPORT void setEmergencySaveFunction (HandlerType saveFunction = 0) ;

	/**	/**

	* Return the currently set emergency save function.	* Returns the currently set emergency save function.
	* @return the emergency save function	* @return the emergency save function
	*/	*/
	KDEUI_EXPORT HandlerType emergencySaveFunction();	KDEUI_EXPORT HandlerType emergencySaveFunction();

	/**	/**

	* Options to determine how KCrash should behave while firing up DrKonqi.	* Options to determine how the default crash handler should behave.
	*/	*/
	enum CrashFlag {	enum CrashFlag {
	KeepFDs = 1, ///< don't close all file descriptors immediately	KeepFDs = 1, ///< don't close all file descriptors immediately
	SaferDialog = 2, ///< start DrKonqi without arbitrary disk access	SaferDialog = 2, ///< start DrKonqi without arbitrary disk access

	AlwaysDirectly = 4, ///< never try to to start DrKonqi via kdeinit	AlwaysDirectly = 4, ///< never try to to start DrKonqi via kdeinit. U se fork() and exec() instead.
	AutoRestart = 8 ///< autorestart this application. Only sensible for KUniqueApplications. @since 4.1.	AutoRestart = 8 ///< autorestart this application. Only sensible for KUniqueApplications. @since 4.1.
	};	};
	Q_DECLARE_FLAGS(CrashFlags, CrashFlag)	Q_DECLARE_FLAGS(CrashFlags, CrashFlag)

	/**	/**

	* Set DrKonqi fire-up options.	* Set options to determine how the default crash handler should behave.
	* @param flags ORed together CrashFlags	* @param flags ORed together CrashFlags
	*/	*/
	KDEUI_EXPORT void setFlags( CrashFlags flags );	KDEUI_EXPORT void setFlags( CrashFlags flags );

	/**	/**
	* Sets the application @p path which should be passed to	* Sets the application @p path which should be passed to

	* Dr. Konqi, our nice crash display application.	* DrKonqi, our nice crash display application.
	* @param path the application path.	* @param path the application path
	*/	*/
	KDEUI_EXPORT void setApplicationPath (const QString &path);	KDEUI_EXPORT void setApplicationPath (const QString &path);

	/**	/**

	* Sets the application name @p name which should be passed to	* Sets the application @p name which should be passed to
	* Dr. Konqi, our nice crash display application.	* DrKonqi, our nice crash display application.
	* @param name the name of the application, as shown in Dr. Konqi	* @param name the name of the application, as shown in DrKonqi
	*/	*/
	KDEUI_EXPORT void setApplicationName (const QString &name);	KDEUI_EXPORT void setApplicationName (const QString &name);


		/**
		* Enables or disables launching DrKonqi from the crash handler.
		* By default, launching DrKonqi is disabled. However, KApplication
		* will enable it in its constructor, so you don't need to call this
		* function if you are using KApplication.
		* @note It is the crash handler's responsibility to launch DrKonqi.
		* Therefore, if no crash handler is set, this method also installs
		* the default crash handler to ensure that DrKonqi will be launched.
		* @since 4.5
		*/
		KDEUI_EXPORT void setDrKonqiEnabled(bool enabled);

		/**
		* Returns true if DrKonqi is set to be launched from the crash handler o
		r false otherwise.
		* @since 4.5
		*/
		KDEUI_EXPORT bool isDrKonqiEnabled();
	}	}

	Q_DECLARE_OPERATORS_FOR_FLAGS(KCrash::CrashFlags)	Q_DECLARE_OPERATORS_FOR_FLAGS(KCrash::CrashFlags)

	#endif	#endif

End of changes. 16 change blocks.
	28 lines changed or deleted	68 lines changed or added

	kdatetime.h	kdatetime.h
	/*	/*
	This file is part of the KDE libraries	This file is part of the KDE libraries

	Copyright (c) 2005-2009 David Jarvie <djarvie@kde.org>	Copyright (c) 2005-2010 David Jarvie <djarvie@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either
	version 2 of the License, or (at your option) any later version.	version 2 of the License, or (at your option) any later version.

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

	skipping to change at line 32	skipping to change at line 32
	* Date/times with associated time zone	* Date/times with associated time zone
	* @author David Jarvie <djarvie@kde.org>.	* @author David Jarvie <djarvie@kde.org>.
	*/	*/

	#ifndef _KDATETIME_H_	#ifndef _KDATETIME_H_
	#define _KDATETIME_H_	#define _KDATETIME_H_

	#include <kdecore_export.h>	#include <kdecore_export.h>
	#include <ktimezone.h>	#include <ktimezone.h>


		#include <QMetaType>
	#include <QtCore/QSharedDataPointer>	#include <QtCore/QSharedDataPointer>

	class QDataStream;	class QDataStream;
	class KDateTimePrivate;	class KDateTimePrivate;
	class KDateTimeSpecPrivate;	class KDateTimeSpecPrivate;

	/**	/**
	* @short A class representing a date and time with an associated time zone	* @short A class representing a date and time with an associated time zone
	*	*
	* Topics:	* Topics:

	skipping to change at line 1607	skipping to change at line 1608
	*/	*/
	static KDateTime realCurrentLocalDateTime();	static KDateTime realCurrentLocalDateTime();

	friend QDataStream &operator<<(QDataStream &out, const KDateTime &dateT ime);	friend QDataStream &operator<<(QDataStream &out, const KDateTime &dateT ime);
	friend QDataStream &operator>>(QDataStream &in, KDateTime &dateTime);	friend QDataStream &operator>>(QDataStream &in, KDateTime &dateTime);

	private:	private:
	QSharedDataPointer<KDateTimePrivate> d;	QSharedDataPointer<KDateTimePrivate> d;
	};	};


		Q_DECLARE_METATYPE(KDateTime)
		Q_DECLARE_METATYPE(KDateTime::Spec)

	/** Write @p spec to the datastream @p out, in binary format. */	/** Write @p spec to the datastream @p out, in binary format. */

	QDataStream &operator<<(QDataStream &out, const KDateTime::Spec &spec);	QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime::S pec &spec);
	/** Read a KDateTime::Spec object into @p spec from @p in, in binary format . */	/** Read a KDateTime::Spec object into @p spec from @p in, in binary format . */

	QDataStream &operator>>(QDataStream &in, KDateTime::Spec &spec);	QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime::Spec &sp ec);

	/** Write @p dateTime to the datastream @p out, in binary format. */	/** Write @p dateTime to the datastream @p out, in binary format. */

	QDataStream &operator<<(QDataStream &out, const KDateTime &dateTime);	QDataStream KDECORE_EXPORT &operator<<(QDataStream &out, const KDateTime &d ateTime);
	/** Read a KDateTime object into @p dateTime from @p in, in binary format. */	/** Read a KDateTime object into @p dateTime from @p in, in binary format. */

	QDataStream &operator>>(QDataStream &in, KDateTime &dateTime);	QDataStream KDECORE_EXPORT &operator>>(QDataStream &in, KDateTime &dateTime );

	#endif	#endif

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

	kdebug.h	kdebug.h

	skipping to change at line 229	skipping to change at line 229

	static inline KDE_DEPRECATED QDebug kdDebug(int area = KDE_DEFAULT_DEBUG_AR EA) { return kDebug(area); }	static inline KDE_DEPRECATED QDebug kdDebug(int area = KDE_DEFAULT_DEBUG_AR EA) { return kDebug(area); }
	static inline KDE_DEPRECATED QDebug kdWarning(int area = KDE_DEFAULT_DEBUG_ AREA) { return kWarning(area); }	static inline KDE_DEPRECATED QDebug kdWarning(int area = KDE_DEFAULT_DEBUG_ AREA) { return kWarning(area); }
	static inline KDE_DEPRECATED QDebug kdError(int area = KDE_DEFAULT_DEBUG_AR EA) { return kError(area); }	static inline KDE_DEPRECATED QDebug kdError(int area = KDE_DEFAULT_DEBUG_AR EA) { return kError(area); }
	static inline KDE_DEPRECATED QDebug kdFatal(int area = KDE_DEFAULT_DEBUG_AR EA) { return kFatal(area); }	static inline KDE_DEPRECATED QDebug kdFatal(int area = KDE_DEFAULT_DEBUG_AR EA) { return kFatal(area); }
	inline KDE_DEPRECATED QString kdBacktrace(int levels=-1) { return kBacktrac e( levels ); }	inline KDE_DEPRECATED QString kdBacktrace(int levels=-1) { return kBacktrac e( levels ); }

	static inline KDE_DEPRECATED QDebug kndDebug() { return kDebugDevNull(); }	static inline KDE_DEPRECATED QDebug kndDebug() { return kDebugDevNull(); }
	#endif	#endif


		class WrongSyntax {};

	/**	/**
	* @internal	* @internal
	* A class for using operator()	* A class for using operator()
	*/	*/
	class KDebug //krazy= ?	class KDebug //krazy= ?
	{	{
	const char *file;	const char *file;
	const char *funcinfo;	const char *funcinfo;
	int line;	int line;
	QtMsgType level;	QtMsgType level;

	skipping to change at line 285	skipping to change at line 287
	* </code>	* </code>
	*	*
	* If all uses of the debug area are restricted to a single .cpp file, do the same	* 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.	* 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	* If however multiple classes and files need the debug area, then
	* declare it in one file without static, and use "extern int debugArea ();"	* declare it in one file without static, and use "extern int debugArea ();"
	* in other files (with a better name for the function of course).	* in other files (with a better name for the function of course).
	*/	*/
	static KDECORE_EXPORT int registerArea(const QByteArray& areaName, bool enabled = true);	static KDECORE_EXPORT int registerArea(const QByteArray& areaName, bool enabled = true);

		private:
		WrongSyntax operator()(const char*) {return WrongSyntax();} // error! U
		se kDebug() << "..." or kWarning() << "..." instead.
	};	};

	#if !defined(KDE_NO_DEBUG_OUTPUT)	#if !defined(KDE_NO_DEBUG_OUTPUT)
	/* __VA_ARGS__ should work with any supported GCC version and MSVC > 2005 * /	/* __VA_ARGS__ should work with any supported GCC version and MSVC > 2005 * /
	# if defined(Q_CC_GNU) \|\| (defined(Q_CC_MSVC) && _MSC_VER >= 1500)	# if defined(Q_CC_GNU) \|\| (defined(Q_CC_MSVC) && _MSC_VER >= 1500)
	# define kDebug(...) for (bool _k_kDebugDoOutput_ = !KDebug::hasNullOutput QtDebugMsg(__VA_ARGS__); \	# define kDebug(...) for (bool _k_kDebugDoOutput_ = !KDebug::hasNullOutput QtDebugMsg(__VA_ARGS__); \
	KDE_ISUNLIKELY(_k_kDebugDoOutput_); _k_kDebugDoO utput_ = false) \	KDE_ISUNLIKELY(_k_kDebugDoOutput_); _k_kDebugDoO utput_ = false) \
	KDebug(QtDebugMsg, __FILE__, __LINE__, Q_FUNC_IN FO)(__VA_ARGS__)	KDebug(QtDebugMsg, __FILE__, __LINE__, Q_FUNC_IN FO)(__VA_ARGS__)
	# else	# else
	# define kDebug KDebug(QtDebugMsg, __FILE__, __LINE__, Q_FUNC_INFO)	# define kDebug KDebug(QtDebugMsg, __FILE__, __LINE__, Q_FUNC_INFO)

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

	kdedmodule.h	kdedmodule.h

	skipping to change at line 65	skipping to change at line 65
	/**	/**
	* Constructor	* Constructor
	*/	*/
	explicit KDEDModule(QObject* parent = 0);	explicit KDEDModule(QObject* parent = 0);

	virtual ~KDEDModule();	virtual ~KDEDModule();

	/**	/**
	* @internal called by kded after loading a module	* @internal called by kded after loading a module
	* The module name is set from the path of the desktop file, and is	* The module name is set from the path of the desktop file, and is

	* used to register the module to dbus.	* used to register the module to D-Bus.
	*/	*/
	void setModuleName( const QString& name );	void setModuleName( const QString& name );

	QString moduleName() const;	QString moduleName() const;

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Emitted when the module is being deleted.	* Emitted when the module is being deleted.
	*/	*/
	void moduleDeleted(KDEDModule *);	void moduleDeleted(KDEDModule *);

	skipping to change at line 88	skipping to change at line 88
	* Emitted when a mainwindow registers itself.	* Emitted when a mainwindow registers itself.
	*/	*/
	void windowRegistered(qlonglong windowId);	void windowRegistered(qlonglong windowId);

	/**	/**
	* Emitted when a mainwindow unregisters itself.	* Emitted when a mainwindow unregisters itself.
	*/	*/
	void windowUnregistered(qlonglong windowId);	void windowUnregistered(qlonglong windowId);

	/**	/**

	* Emitted after the module is registered successfully with dbus	* Emitted after the module is registered successfully with D-Bus
	*	*
	* @since 4.2	* @since 4.2
	*/	*/
	void moduleRegistered(const QDBusObjectPath &path);	void moduleRegistered(const QDBusObjectPath &path);

	private:	private:
	KDEDModulePrivate* const d;	KDEDModulePrivate* const d;
	};	};

	#endif	#endif

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

	kdemacros.h	kdemacros.h

	skipping to change at line 418	skipping to change at line 418
	* by all compilers.	* by all compilers.
	*	*
	* @sa KDE_CAST_BF_ENUM	* @sa KDE_CAST_BF_ENUM
	*/	*/

	/**	/**
	* @def KDE_CAST_BF_ENUM	* @def KDE_CAST_BF_ENUM
	* @ingroup KDEMacros	* @ingroup KDEMacros
	*	*
	* The KDE_CAST_BF_ENUM is used when retrieving an	* The KDE_CAST_BF_ENUM is used when retrieving an

	* enumfrom a bitfield, to ensure correct conversion	* enum from a bitfield, to ensure correct conversion
	* by all compilers.	* by all compilers.
	*	*
	* @sa KDE_BF_ENUM	* @sa KDE_BF_ENUM
	*/	*/

	#ifdef Q_CC_MSVC	#ifdef Q_CC_MSVC
	# define KDE_BF_ENUM(a) unsigned int	# define KDE_BF_ENUM(a) unsigned int
	# define KDE_CAST_BF_ENUM(a,b) static_cast<a>(b)	# define KDE_CAST_BF_ENUM(a,b) static_cast<a>(b)
	#else	#else
	# define KDE_BF_ENUM(a) a	# define KDE_BF_ENUM(a) a

End of changes. 1 change blocks.
	1 lines changed or deleted	1 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.4.5 (KDE 4.4.5)"	#define KDE_VERSION_STRING "4.5.00 (KDE 4.5.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 4	#define KDE_VERSION_MINOR 5
	/**	/**
	* @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

	kdirmodel.h	kdirmodel.h

	skipping to change at line 28	skipping to change at line 28
	*/	*/
	#ifndef KDIRMODEL_H	#ifndef KDIRMODEL_H
	#define KDIRMODEL_H	#define KDIRMODEL_H

	#include <QtCore/QAbstractItemModel>	#include <QtCore/QAbstractItemModel>
	#include <kio/kio_export.h>	#include <kio/kio_export.h>
	#include <kfileitem.h>	#include <kfileitem.h>

	class KDirLister;	class KDirLister;
	class KDirModelPrivate;	class KDirModelPrivate;

		class JobUrlCache;

	/**	/**
	* @short A model for a KIO-based directory tree.	* @short A model for a KIO-based directory tree.
	*	*
	* KDirModel implements the QAbstractItemModel interface (for use with Qt's model/view widgets)	* KDirModel implements the QAbstractItemModel interface (for use with Qt's model/view widgets)
	* around the directory listing for one directory or a tree of directories.	* around the directory listing for one directory or a tree of directories.
	*	*
	* Note that there are some cases when using QPersistentModelIndexes from t his model will not give	* Note that there are some cases when using QPersistentModelIndexes from t his model will not give
	* expected results. QPersistentIndexes will remain valid and updated if it s siblings are added or	* expected results. QPersistentIndexes will remain valid and updated if it s siblings are added or
	* removed. However, if the QPersistentIndex or one of its ancestors is mov ed, the QPersistentIndex will become	* removed. However, if the QPersistentIndex or one of its ancestors is mov ed, the QPersistentIndex will become

	skipping to change at line 135	skipping to change at line 136
	};	};

	/// Possible return value for data(ChildCountRole), meaning the item is n't a directory,	/// Possible return value for data(ChildCountRole), meaning the item is n't a directory,
	/// or we haven't calculated its child count yet	/// or we haven't calculated its child count yet
	enum { ChildCountUnknown = -1 };	enum { ChildCountUnknown = -1 };

	enum AdditionalRoles {	enum AdditionalRoles {
	// Note: use printf "0x%08X\n" $(($RANDOM*$RANDOM))	// Note: use printf "0x%08X\n" $(($RANDOM*$RANDOM))
	// to define additional roles.	// to define additional roles.
	FileItemRole = 0x07A263FF, ///< returns the KFileItem for a given index	FileItemRole = 0x07A263FF, ///< returns the KFileItem for a given index

	ChildCountRole = 0x2C4D0A40 ///< returns the number of items in a d	ChildCountRole = 0x2C4D0A40, ///< returns the number of items in a
	irectory, or ChildCountUnknown	directory, or ChildCountUnknown
		HasJobRole = 0x01E555A5 ///< returns whether or not there is a job
		on an item (file/directory)
	};	};

	enum DropsAllowedFlag {	enum DropsAllowedFlag {
	NoDrops = 0,	NoDrops = 0,
	DropOnDirectory = 1, ///< allow drops on any directory	DropOnDirectory = 1, ///< allow drops on any directory
	DropOnAnyFile = 2, ///< allow drops on any file	DropOnAnyFile = 2, ///< allow drops on any file
	DropOnLocalExecutable = 4 ///< allow drops on local executables, sh ell scripts and desktop files. Can be used with DropOnDirectory.	DropOnLocalExecutable = 4 ///< allow drops on local executables, sh ell scripts and desktop files. Can be used with DropOnDirectory.
	};	};
	Q_DECLARE_FLAGS(DropsAllowed, DropsAllowedFlag)	Q_DECLARE_FLAGS(DropsAllowed, DropsAllowedFlag)


	skipping to change at line 207	skipping to change at line 209
	* If there is a KFilePreviewGenerator attached to this model, that gen erator will care	* If there is a KFilePreviewGenerator attached to this model, that gen erator will care
	* about creating another preview.	* about creating another preview.
	*	*
	* @param index Index of the item that should get another icon	* @param index Index of the item that should get another icon
	* @param sequenceIndex Index in the sequence. If it is zero, the stand ard icon will be assigned.	* @param sequenceIndex Index in the sequence. If it is zero, the stand ard icon will be assigned.
	* For higher indices, arbitrary different meaningful icons will be generated.	* For higher indices, arbitrary different meaningful icons will be generated.
	* @since 4.3	* @since 4.3
	*/	*/
	void requestSequenceIcon(const QModelIndex& index, int sequenceIndex);	void requestSequenceIcon(const QModelIndex& index, int sequenceIndex);


		/**
		* Enable/Disable the displaying of an animated overlay that is shown f
		or any destination
		* urls (in the view). When enabled, the animations (if any) will be dr
		awn automatically.
		*
		* Only the files/folders that are visible and have jobs associated wit
		h them
		* will display the animation.
		* You would likely not want this enabled if you perform some kind of c
		ustom painting
		* that takes up a whole item, and will just make this(and what you pai
		nt) look funky.
		*
		* Default is disabled.
		*
		* Note: KFileItemDelegate needs to have it's method called with the sa
		me
		* value, when you make the call to this method.
		*
		* @since 4.5
		*/
		void setJobTransfersVisible(bool value);

		/**
		* Returns whether or not displaying job transfers has been enabled.
		* @since 4.5
		*/
		bool jobTransfersVisible() const;

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Emitted for each subdirectory that is a parent of a url passed to ex pandToUrl	* Emitted for each subdirectory that is a parent of a url passed to ex pandToUrl
	* This allows to asynchronously open a tree view down to a given direc tory.	* This allows to asynchronously open a tree view down to a given direc tory.
	* Also emitted for the final file, if expandToUrl is called with a fil e	* Also emitted for the final file, if expandToUrl is called with a fil e
	* (for instance so that it can be selected).	* (for instance so that it can be selected).
	*/	*/
	void expand(const QModelIndex& index);	void expand(const QModelIndex& index);
	/**	/**
	* Emitted when another icon sequence index is requested	* Emitted when another icon sequence index is requested

	skipping to change at line 242	skipping to change at line 268

	private:	private:
	friend class KDirModelPrivate;	friend class KDirModelPrivate;
	KDirModelPrivate *const d;	KDirModelPrivate *const d;

	Q_PRIVATE_SLOT( d, void _k_slotNewItems(const KUrl&, const KFileItemLis t&) )	Q_PRIVATE_SLOT( d, void _k_slotNewItems(const KUrl&, const KFileItemLis t&) )
	Q_PRIVATE_SLOT( d, void _k_slotDeleteItems(const KFileItemList&) )	Q_PRIVATE_SLOT( d, void _k_slotDeleteItems(const KFileItemList&) )
	Q_PRIVATE_SLOT( d, void _k_slotRefreshItems(const QList<QPair<KFileItem , KFileItem> >&) )	Q_PRIVATE_SLOT( d, void _k_slotRefreshItems(const QList<QPair<KFileItem , KFileItem> >&) )
	Q_PRIVATE_SLOT( d, void _k_slotClear() )	Q_PRIVATE_SLOT( d, void _k_slotClear() )
	Q_PRIVATE_SLOT( d, void _k_slotRedirection(const KUrl&, const KUrl&) )	Q_PRIVATE_SLOT( d, void _k_slotRedirection(const KUrl&, const KUrl&) )

		Q_PRIVATE_SLOT( d, void _k_slotJobUrlsChanged(const QStringList&))
	};	};

	Q_DECLARE_OPERATORS_FOR_FLAGS(KDirModel::DropsAllowed)	Q_DECLARE_OPERATORS_FOR_FLAGS(KDirModel::DropsAllowed)

	#endif /* KDIRMODEL_H */	#endif /* KDIRMODEL_H */

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

	kdiroperator.h	kdiroperator.h

	skipping to change at line 187	skipping to change at line 187
	* @see mimeFilter	* @see mimeFilter
	*/	*/
	void setMimeFilter(const QStringList& mimetypes);	void setMimeFilter(const QStringList& mimetypes);

	/**	/**
	* @returns the current mime filter.	* @returns the current mime filter.
	*/	*/
	QStringList mimeFilter() const;	QStringList mimeFilter() const;

	/**	/**

		* Only show the files in a given set of mimetypes.
		* This is useful in specialized applications (while file managers, on
		* the other hand, want to show all mimetypes). Internally uses
		* KNewFileMenu::setSupportedMimeTypes
		*
		* Example:
		* \code
		* QStringList mimeTypes;
		* mimeTypes << "text/html" << "inode/directory";
		* dirOperator->setNewFileMenuSupportedMimeTypes(mimeTypes);
		* \endcode
		*
		* Note: If the list is empty, all options will be shown. Otherwise,
		* without the mimetype inode/directory, only file options will be show
		n.
		*
		* @see KNewFileMenu::setSupportedMimeTypes
		* @see newFileMenuSupportedMimeTypes
		* @since 4.5
		*/
		void setNewFileMenuSupportedMimeTypes(const QStringList& mime);

		/**
		* @returns the current Supported Mimes Types.
		* @since 4.5
		*/
		QStringList newFileMenuSupportedMimeTypes() const;

		/**
	* Clears both the namefilter and mimetype filter, so that all files an d	* Clears both the namefilter and mimetype filter, so that all files an d
	* directories will be shown. Call updateDir() to apply it.	* directories will be shown. Call updateDir() to apply it.
	*	*
	* @see setMimeFilter	* @see setMimeFilter
	* @see setNameFilter	* @see setNameFilter
	*/	*/
	void clearFilter();	void clearFilter();

	/**	/**
	* @returns the current url	* @returns the current url

	skipping to change at line 613	skipping to change at line 641
	virtual QAbstractItemView* createView(QWidget *parent, KFile::FileView viewKind);	virtual QAbstractItemView* createView(QWidget *parent, KFile::FileView viewKind);

	/**	/**
	* Sets a custom KDirLister to list directories.	* Sets a custom KDirLister to list directories.
	* The KDirOperator takes ownership of the given KDirLister.	* The KDirOperator takes ownership of the given KDirLister.
	*/	*/
	virtual void setDirLister(KDirLister *lister);	virtual void setDirLister(KDirLister *lister);

	virtual void resizeEvent(QResizeEvent *event);	virtual void resizeEvent(QResizeEvent *event);


		virtual void keyPressEvent(QKeyEvent * event);

	/**	/**
	* Sets up all the actions. Called from the constructor, you usually	* Sets up all the actions. Called from the constructor, you usually
	* better not call this.	* better not call this.
	*/	*/
	void setupActions();	void setupActions();

	/**	/**
	* Updates the sorting-related actions to comply with the current sorti ng	* Updates the sorting-related actions to comply with the current sorti ng
	* @see sorting	* @see sorting
	*/	*/

	skipping to change at line 866	skipping to change at line 896
	class Private;	class Private;
	Private* const d;	Private* const d;

	Q_PRIVATE_SLOT( d, void _k_slotDetailedView() )	Q_PRIVATE_SLOT( d, void _k_slotDetailedView() )
	Q_PRIVATE_SLOT( d, void _k_slotSimpleView() )	Q_PRIVATE_SLOT( d, void _k_slotSimpleView() )
	Q_PRIVATE_SLOT( d, void _k_slotTreeView() )	Q_PRIVATE_SLOT( d, void _k_slotTreeView() )
	Q_PRIVATE_SLOT( d, void _k_slotDetailedTreeView() )	Q_PRIVATE_SLOT( d, void _k_slotDetailedTreeView() )
	Q_PRIVATE_SLOT( d, void _k_slotToggleHidden(bool) )	Q_PRIVATE_SLOT( d, void _k_slotToggleHidden(bool) )
	Q_PRIVATE_SLOT( d, void _k_togglePreview(bool) )	Q_PRIVATE_SLOT( d, void _k_togglePreview(bool) )
	Q_PRIVATE_SLOT( d, void _k_toggleInlinePreviews(bool) )	Q_PRIVATE_SLOT( d, void _k_toggleInlinePreviews(bool) )

		Q_PRIVATE_SLOT( d, void _k_slotOpenFileManager() )
	Q_PRIVATE_SLOT( d, void _k_slotSortByName() )	Q_PRIVATE_SLOT( d, void _k_slotSortByName() )
	Q_PRIVATE_SLOT( d, void _k_slotSortBySize() )	Q_PRIVATE_SLOT( d, void _k_slotSortBySize() )
	Q_PRIVATE_SLOT( d, void _k_slotSortByDate() )	Q_PRIVATE_SLOT( d, void _k_slotSortByDate() )
	Q_PRIVATE_SLOT( d, void _k_slotSortByType() )	Q_PRIVATE_SLOT( d, void _k_slotSortByType() )
	Q_PRIVATE_SLOT( d, void _k_slotSortReversed(bool) )	Q_PRIVATE_SLOT( d, void _k_slotSortReversed(bool) )
	Q_PRIVATE_SLOT( d, void _k_slotToggleDirsFirst() )	Q_PRIVATE_SLOT( d, void _k_slotToggleDirsFirst() )
	Q_PRIVATE_SLOT( d, void _k_slotToggleIgnoreCase() )	Q_PRIVATE_SLOT( d, void _k_slotToggleIgnoreCase() )
	Q_PRIVATE_SLOT( d, void _k_slotStarted() )	Q_PRIVATE_SLOT( d, void _k_slotStarted() )
	Q_PRIVATE_SLOT( d, void _k_slotProgress(int) )	Q_PRIVATE_SLOT( d, void _k_slotProgress(int) )
	Q_PRIVATE_SLOT( d, void _k_slotShowProgress() )	Q_PRIVATE_SLOT( d, void _k_slotShowProgress() )

	skipping to change at line 893	skipping to change at line 924
	Q_PRIVATE_SLOT( d, void _k_slotSelectionChanged() )	Q_PRIVATE_SLOT( d, void _k_slotSelectionChanged() )
	Q_PRIVATE_SLOT( d, void _k_openContextMenu(const QPoint&) )	Q_PRIVATE_SLOT( d, void _k_openContextMenu(const QPoint&) )
	Q_PRIVATE_SLOT( d, void _k_triggerPreview(const QModelIndex&) )	Q_PRIVATE_SLOT( d, void _k_triggerPreview(const QModelIndex&) )
	Q_PRIVATE_SLOT( d, void _k_showPreview() )	Q_PRIVATE_SLOT( d, void _k_showPreview() )
	Q_PRIVATE_SLOT( d, void _k_slotSplitterMoved(int, int) )	Q_PRIVATE_SLOT( d, void _k_slotSplitterMoved(int, int) )
	Q_PRIVATE_SLOT( d, void _k_assureVisibleSelection() )	Q_PRIVATE_SLOT( d, void _k_assureVisibleSelection() )
	Q_PRIVATE_SLOT( d, void _k_synchronizeSortingState(int, Qt::SortOrder) )	Q_PRIVATE_SLOT( d, void _k_synchronizeSortingState(int, Qt::SortOrder) )
	Q_PRIVATE_SLOT( d, void _k_slotChangeDecorationPosition() )	Q_PRIVATE_SLOT( d, void _k_slotChangeDecorationPosition() )
	Q_PRIVATE_SLOT( d, void _k_slotExpandToUrl(const QModelIndex&) )	Q_PRIVATE_SLOT( d, void _k_slotExpandToUrl(const QModelIndex&) )
	Q_PRIVATE_SLOT( d, void _k_slotItemsChanged() )	Q_PRIVATE_SLOT( d, void _k_slotItemsChanged() )

		Q_PRIVATE_SLOT( d, void _k_slotDirectoryCreated(const KUrl&) )
	};	};

	#endif	#endif

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

	kdirwatch.h	kdirwatch.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 _KDIRWATCH_H	#ifndef _KDIRWATCH_H
	#define _KDIRWATCH_H	#define _KDIRWATCH_H

	#include <QtCore/QDateTime>	#include <QtCore/QDateTime>
	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include <QtCore/QString>	#include <QtCore/QString>


	#include <kio/kio_export.h>	#include <kdecore_export.h>

	class KDirWatchPrivate;	class KDirWatchPrivate;

	/**	/**
	* @short Class for watching directory and file changes.	* @short Class for watching directory and file changes.
	*	*
	* Watch directories and files for changes.	* Watch directories and files for changes.
	* The watched directories or files don't have to exist yet.	* The watched directories or files don't have to exist yet.
	*	*
	* When a watched directory is changed, i.e. when files therein are	* When a watched directory is changed, i.e. when files therein are

	skipping to change at line 62	skipping to change at line 62
	* The implementation uses the FAM service when available;	* The implementation uses the FAM service when available;
	* if FAM is not available, the INOTIFY functionality is used on LINUX.	* if FAM is not available, the INOTIFY functionality is used on LINUX.
	* As a last resort, a regular polling for change of modification times	* As a last resort, a regular polling for change of modification times
	* is done; the polling interval is a global config option:	* is done; the polling interval is a global config option:
	* DirWatch/PollInterval and DirWatch/NFSPollInterval for NFS mounted	* DirWatch/PollInterval and DirWatch/NFSPollInterval for NFS mounted
	* directories.	* directories.
	*	*
	* @see self()	* @see self()
	* @author Sven Radej <sven@lisa.exp.univie.ac.at>	* @author Sven Radej <sven@lisa.exp.univie.ac.at>
	*/	*/

	class KIO_EXPORT KDirWatch : public QObject	class KDECORE_EXPORT KDirWatch : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:

	/**	/**
	* Available watch modes for directory monitoring	* Available watch modes for directory monitoring
	**/	**/
	enum WatchMode {	enum WatchMode {
	WatchDirOnly = 0, ///< Watch just the specified directory	WatchDirOnly = 0, ///< Watch just the specified directory

	skipping to change at line 148	skipping to change at line 148
	* Removes a file from the list of watched files.	* Removes a file from the list of watched files.
	*	*
	* If specified path is not in the list this does nothing.	* If specified path is not in the list this does nothing.
	* @param file the file to be removed from the list	* @param file the file to be removed from the list
	*/	*/
	void removeFile(const QString& file);	void removeFile(const QString& file);

	/**	/**
	* Stops scanning the specified path.	* Stops scanning the specified path.
	*	*

	* The @p path is not deleted from the interal just, it is just skipped.	* The @p path is not deleted from the internal list, it is just skipped .
	* Call this function when you perform an huge operation	* Call this function when you perform an huge operation
	* on this directory (copy/move big files or many files). When finished,	* on this directory (copy/move big files or many files). When finished,
	* call restartDirScan(path).	* call restartDirScan(path).
	*	*
	* @param path the path to skip	* @param path the path to skip
	* @return true if the @p path is being watched, otherwise false	* @return true if the @p path is being watched, otherwise false
	* @see restartDirScanning()	* @see restartDirScanning()
	*/	*/
	bool stopDirScan(const QString& path);	bool stopDirScan(const QString& path);

	/**	/**
	* Restarts scanning for specified path.	* Restarts scanning for specified path.
	*	*

	* Resets ctime. It doesn't notify	* It doesn't notify about the changes (by emitting a signal).
	* the change (by emitted a signal), since the ctime value is reset.	* The ctime value is reset.
	*	*
	* Call it when you are finished with big operations on that path,	* Call it when you are finished with big operations on that path,
	* @em and when @em you have refreshed that path.	* @em and when @em you have refreshed that path.
	*	*
	* @param path the path to restart scanning	* @param path the path to restart scanning
	* @return true if the @p path is being watched, otherwise false	* @return true if the @p path is being watched, otherwise false
	* @see stopDirScanning()	* @see stopDirScanning()
	*/	*/
	bool restartDirScan(const QString& path);	bool restartDirScan(const QString& path);


	skipping to change at line 214	skipping to change at line 214
	bool isStopped();	bool isStopped();

	/**	/**
	* Check if a directory is being watched by this KDirWatch instance	* Check if a directory is being watched by this KDirWatch instance
	* @param path the directory to check	* @param path the directory to check
	* @return true if the directory is being watched	* @return true if the directory is being watched
	*/	*/
	bool contains( const QString& path ) const;	bool contains( const QString& path ) const;

	/**	/**

	* Dump statistic information about all KDirWatch instances.	* Dump statistic information about the KDirWatch::self() instance.
	* This checks for consistency, too.	* This checks for consistency, too.
	*/	*/

	static void statistics();	static void statistics(); // TODO implement a QDebug operator for KDirWa tch instead.

	enum Method { FAM, INotify, DNotify, Stat };	enum Method { FAM, INotify, DNotify, Stat };
	/**	/**
	* Returns the preferred internal method to	* Returns the preferred internal method to
	* watch for changes.	* watch for changes.
	*/	*/
	Method internalMethod();	Method internalMethod();

	/**	/**
	* The KDirWatch instance usually globally used in an application.	* The KDirWatch instance usually globally used in an application.

End of changes. 6 change blocks.
	7 lines changed or deleted	7 lines changed or added

	kemoticons.h	kemoticons.h

	skipping to change at line 22	skipping to change at line 22
	* 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/lice nses/>.*	* License along with this library. If not, see <http://www.gnu.org/lice nses/>.*
	* *	* *
	************************************************************************ ******/	************************************************************************ ******/

	#ifndef KEMOTICONS_H	#ifndef KEMOTICONS_H
	#define KEMOTICONS_H	#define KEMOTICONS_H


	#include "kutils_export.h"	#include "kemoticons_export.h"
	#include "kemoticonstheme.h"	#include "kemoticonstheme.h"

	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include <QtCore/QHash>	#include <QtCore/QHash>

	#include <kservicetypetrader.h>	#include <kservicetypetrader.h>

	class KEmoticonsPrivate;	class KEmoticonsPrivate;

	/**	/**

	skipping to change at line 44	skipping to change at line 44
	* For example if you want to get the current emoticon theme	* For example if you want to get the current emoticon theme
	* @code	* @code
	* KEmoticons ke;	* KEmoticons ke;
	* KEmoticonsTheme et = ke.theme();	* KEmoticonsTheme et = ke.theme();
	* //do whatever you want with the theme	* //do whatever you want with the theme
	* @endcode	* @endcode
	* it can also be used to set the emoticon theme and the parse mode in the config file	* it can also be used to set the emoticon theme and the parse mode in the config file
	* @author Carlo Segato (brandon.ml@gmail.com)	* @author Carlo Segato (brandon.ml@gmail.com)
	*/	*/


	class KUTILS_EXPORT KEmoticons : public QObject	class KEMOTICONS_EXPORT KEmoticons : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:

	/**	/**
	* Default constructor	* Default constructor
	*/	*/
	KEmoticons();	KEmoticons();

	/**	/**

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

	kemoticonsprovider.h	kemoticonsprovider.h

	skipping to change at line 22	skipping to change at line 22
	* 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/lice nses/>.*	* License along with this library. If not, see <http://www.gnu.org/lice nses/>.*
	* *	* *
	************************************************************************ ******/	************************************************************************ ******/

	#ifndef KEMOTICONS_PROVIDER_H	#ifndef KEMOTICONS_PROVIDER_H
	#define KEMOTICONS_PROVIDER_H	#define KEMOTICONS_PROVIDER_H


	#include "kutils_export.h"	#include "kemoticons_export.h"
	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include <QtCore/QVariant>	#include <QtCore/QVariant>
	#include <QtCore/QStringList>	#include <QtCore/QStringList>
	#include <QtCore/QPair>	#include <QtCore/QPair>

	class QString;	class QString;
	class KEmoticonsProviderPrivate;	class KEmoticonsProviderPrivate;
	struct Emoticon;	struct Emoticon;

	/**	/**
	* This is the base class for the emoticons provider plugins	* This is the base class for the emoticons provider plugins
	*/	*/

	class KUTILS_EXPORT KEmoticonsProvider : public QObject	class KEMOTICONS_EXPORT KEmoticonsProvider : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	struct Emoticon	struct Emoticon
	{	{
	Emoticon(){}	Emoticon(){}
	/* sort by longest to shortest matchText */	/* sort by longest to shortest matchText */
	bool operator < (const Emoticon &e) const { return matchText.length () > e.matchText.length(); }	bool operator < (const Emoticon &e) const { return matchText.length () > e.matchText.length(); }
	QString matchText;	QString matchText;
	QString matchTextEscaped;	QString matchTextEscaped;

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

	kemoticonstheme.h	kemoticonstheme.h

	skipping to change at line 34	skipping to change at line 34

	#include "kemoticonsprovider.h"	#include "kemoticonsprovider.h"

	#include <QtCore/QSharedDataPointer>	#include <QtCore/QSharedDataPointer>

	class QString;	class QString;

	/**	/**
	* This class contains the emoticons theme	* This class contains the emoticons theme
	*/	*/

	class KUTILS_EXPORT KEmoticonsTheme	class KEMOTICONS_EXPORT KEmoticonsTheme
	{	{
	public:	public:

	/**	/**
	* The possible parse modes	* The possible parse modes
	*/	*/
	enum ParseModeEnum {	enum ParseModeEnum {
	DefaultParse = 0x0, /*< Use strict or relaxed according to th e config /	DefaultParse = 0x0, /*< Use strict or relaxed according to th e config /
	StrictParse = 0x1, /*< Strict parsing requires a space betwe en each emoticon /	StrictParse = 0x1, /*< Strict parsing requires a space betwe en each emoticon /
	RelaxedParse = 0x2, /*< Parse mode where all possible emotico n matches are allowed /	RelaxedParse = 0x2, /*< Parse mode where all possible emotico n matches are allowed /

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

	kfileitem.h	kfileitem.h

	skipping to change at line 48	skipping to change at line 48
	* A KFileItem is a generic class to handle a file, local or remote.	* A KFileItem is a generic class to handle a file, local or remote.
	* In particular, it makes it easier to handle the result of KIO::listDir	* In particular, it makes it easier to handle the result of KIO::listDir
	* (UDSEntry isn't very friendly to use).	* (UDSEntry isn't very friendly to use).
	* It includes many file attributes such as mimetype, icon, text, mode, lin k...	* It includes many file attributes such as mimetype, icon, text, mode, lin k...
	*	*
	* KFileItem is implicitly shared, i.e. it can be used as a value and copie d around at almost no cost.	* KFileItem is implicitly shared, i.e. it can be used as a value and copie d around at almost no cost.
	*/	*/
	class KIO_EXPORT KFileItem	class KIO_EXPORT KFileItem
	{	{
	public:	public:

	enum { Unknown = (mode_t) - 1 };	enum { Unknown = static_cast<mode_t>(-1) };

	/**	/**
	* The timestamps associated with a file.	* The timestamps associated with a file.
	* - ModificationTime: the time the file's contents were last modified	* - ModificationTime: the time the file's contents were last modified
	* - AccessTime: the time the file was last accessed (last read or writ ten to)	* - AccessTime: the time the file was last accessed (last read or writ ten to)
	* - CreationTime: the time the file was created	* - CreationTime: the time the file was created
	*/	*/
	enum FileTimes {	enum FileTimes {
	// warning: don't change without looking at the Private class	// warning: don't change without looking at the Private class
	ModificationTime = 0,	ModificationTime = 0,

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

	kfileitemactions.h	kfileitemactions.h

	skipping to change at line 82	skipping to change at line 82
	* can find a statusbar, too.	* can find a statusbar, too.
	*/	*/
	void setParentWidget(QWidget* widget);	void setParentWidget(QWidget* widget);

	/**	/**
	* Generate the "Open With <Application>" actions, and adds them to the @p menu.	* Generate the "Open With <Application>" actions, and adds them to the @p menu.
	* All actions are created as children of the menu.	* All actions are created as children of the menu.
	* @param menu the QMenu where to add actions	* @param menu the QMenu where to add actions
	* @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' ".

		* (Default value added in kdelibs-4.5, pass QString() explicitely for earlier versions).
	*/	*/

	void addOpenWithActionsTo(QMenu* menu, const QString& traderConstraint) ;	void addOpenWithActionsTo(QMenu* menu, const QString& traderConstraint = QString());

	/**	/**
	* 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	* Helper method used internally, can also be used for similar GUIs tha t
	* show the list of associated applications.	* show the list of associated applications.
	* Used in KParts::BrowserOpenOrSaveQuestion for example.	* Used in KParts::BrowserOpenOrSaveQuestion for example.
	*	*

	* This is basically a KMimeTypeTrader::query, but it also cleans up du	* This is basically a KMimeTypeTrader::query, but it supports multiple
	plicates,	mimetypes, and
	* and honors OnlyShowIn and NotShowIn fields.	* also cleans up "apparent" duplicates, such as the kde3 and kde4 appl
		ications with the same name.
		*
		* The list is sorted according to the user preferences for the given m
		imetype(s).
		* In case multiple mimetypes appear in the url list, the logic is:
		* applications that on average appear earlier on the associated applic
		ations
		* list for the given mimetypes also appear earlier on the final applic
		ations list.
		*
		* Note that for a single mimetype there is no need to use this, you sh
		ould use
		* KMimeTypeTrader instead, e.g. query() or preferredService().
	*	*
	* Returns the applications associated with all the given mimetypes.	* Returns the applications associated with all the given mimetypes.
	* @param mimeTypeList the mimetypes	* @param mimeTypeList the mimetypes
	* @param traderConstraint this optional constraint allows to exclude t he current application	* @param traderConstraint this optional constraint allows to exclude t he current application
	* from the "open with" list. Example: "DesktopEntryName != 'kfmclient' ".	* from the "open with" list. Example: "DesktopEntryName != 'kfmclient' ".

	* @return the list of services.	* @return the sorted list of services.
	* @since 4.4	* @since 4.4
	*/	*/
	static KService::List associatedApplications(const QStringList& mimeTyp eList, const QString& traderConstraint);	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.
	* @return the number of actions added	* @return the number of actions added
	*/	*/
	int addServiceActionsTo(QMenu* menu);	int addServiceActionsTo(QMenu* menu);


		public Q_SLOTS:
		/**
		* Slot used to execute a list of files in their respective preferred a
		pplication.
		* @param fileOpenList the list of KFileItems to open.
		* @param traderConstraint this optional constraint allows to exclude t
		he current application
		* @since 4.5
		*/
		void runPreferredApplications(const KFileItemList& fileOpenList, const
		QString& traderConstraint);

	private:	private:
	KFileItemActionsPrivate* const d;	KFileItemActionsPrivate* const d;
	};	};

	#endif /* KFILEITEMACTIONS_H */	#endif /* KFILEITEMACTIONS_H */

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

	kfileitemdelegate.h	kfileitemdelegate.h

	skipping to change at line 128	skipping to change at line 128

	/**	/**
	* This property determines whether a tooltip will be shown by the dele gate	* This property determines whether a tooltip will be shown by the dele gate
	* if the display role is elided. This tooltip will contain the full di splay	* if the display role is elided. This tooltip will contain the full di splay
	* role information. The tooltip will only be shown if the Qt::ToolTipR ole differs	* role information. The tooltip will only be shown if the Qt::ToolTipR ole differs
	* from Qt::DisplayRole, or if they match, showToolTipWhenElided flag i s set and	* from Qt::DisplayRole, or if they match, showToolTipWhenElided flag i s set and
	* the display role information is elided.	* the display role information is elided.
	*/	*/
	Q_PROPERTY(bool showToolTipWhenElided READ showToolTipWhenElided WRITE setShowToolTipWhenElided)	Q_PROPERTY(bool showToolTipWhenElided READ showToolTipWhenElided WRITE setShowToolTipWhenElided)


		/**
		* This property determines if there are KIO jobs on a destination URL
		visible, then
		* they will have a small animation overlay displayed on them.
		* @since 4.5
		*/
		Q_PROPERTY(bool jobTransfersVisible READ jobTransfersVisible WRITE setJ
		obTransfersVisible)

	Q_ENUMS(Information)	Q_ENUMS(Information)

	public:	public:
	/**	/**
	* This enum defines the additional information that can be display ed below item	* This enum defines the additional information that can be display ed below item
	* labels in icon views.	* labels in icon views.
	*	*
	* The information will only be shown for indexes for which the mod el provides	* The information will only be shown for indexes for which the mod el provides
	* a valid value for KDirModel::FileItemRole, and only when there's sufficient vertical	* a valid value for KDirModel::FileItemRole, and only when there's sufficient vertical
	* space to display at least one line of the information, along wit h the display label.	* space to display at least one line of the information, along wit h the display label.

	skipping to change at line 163	skipping to change at line 170
	NoInformation, ///< No additional information will be shown for items.	NoInformation, ///< No additional information will be shown for items.
	Size, ///< The file size for files, and the number of items for folders.	Size, ///< The file size for files, and the number of items for folders.
	Permissions, ///< A UNIX permissions string, e.g. -rwxr-x r-x.	Permissions, ///< A UNIX permissions string, e.g. -rwxr-x r-x.
	OctalPermissions, ///< The permissions as an octal value, e.g. 0644.	OctalPermissions, ///< The permissions as an octal value, e.g. 0644.
	Owner, ///< The user name of the file owner, e.g. r oot	Owner, ///< The user name of the file owner, e.g. r oot
	OwnerAndGroup, ///< The user and group that owns the file, e.g. root:root	OwnerAndGroup, ///< The user and group that owns the file, e.g. root:root
	CreationTime, ///< The date and time the file/folder was c reated.	CreationTime, ///< The date and time the file/folder was c reated.
	ModificationTime, ///< The date and time the file/folder was l ast modified.	ModificationTime, ///< The date and time the file/folder was l ast modified.
	AccessTime, ///< The date and time the file/folder was l ast accessed.	AccessTime, ///< The date and time the file/folder was l ast accessed.
	MimeType, ///< The mime type for the item, e.g. text/h tml.	MimeType, ///< The mime type for the item, e.g. text/h tml.

	FriendlyMimeType ///< The descriptive name for the mime type,	FriendlyMimeType, ///< The descriptive name for the mime type,
	e.g. HTML Document.	e.g. HTML Document.
		LinkDest, ///< The destination of a symbolic link. @si
		nce 4.5
		LocalPathOrUrl ///< The local path to the file or the URL i
		n case it is not a local file. @since 4.5
	};	};

	typedef QList<Information> InformationList;	typedef QList<Information> InformationList;

	/**	/**
	* Constructs a new KFileItemDelegate.	* Constructs a new KFileItemDelegate.
	*	*
	* @param parent The parent object for the delegate.	* @param parent The parent object for the delegate.
	*/	*/
	explicit KFileItemDelegate(QObject *parent = 0);	explicit KFileItemDelegate(QObject *parent = 0);

	skipping to change at line 384	skipping to change at line 393

	/**	/**
	* Returns the wrapping strategy followed to show text when it need s	* Returns the wrapping strategy followed to show text when it need s
	* wrapping.	* wrapping.
	*	*
	* @since 4.4	* @since 4.4
	*/	*/
	QTextOption::WrapMode wrapMode() const;	QTextOption::WrapMode wrapMode() const;

	/**	/**

		* Enable/Disable the displaying of an animated overlay that is sho
		wn for any destination
		* urls (in the view). When enabled, the animations (if any) will b
		e drawn automatically.
		*
		* Only the files/folders that are visible and have jobs associated
		with them
		* will display the animation.
		* You would likely not want this enabled if you perform some kind
		of custom painting
		* that takes up a whole item, and will just make this(and what you
		paint) look funky.
		*
		* Default is disabled.
		*
		* Note: The model (KDirModel) needs to have it's method called wit
		h the same
		* value, when you make the call to this method.
		*
		* @since 4.5
		*/
		void setJobTransfersVisible(bool jobTransfersVisible);

		/**
		* Returns whether or not the displaying of job transfers is enable
		d.
		* @see setJobTransfersVisible()
		* @since 4.5
		*/
		bool jobTransfersVisible() 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. 3 change blocks.
	2 lines changed or deleted	47 lines changed or added

	kfilemetainfo.h	kfilemetainfo.h

	skipping to change at line 43	skipping to change at line 43
	class KIO_EXPORT KFileMetaInfoGroup {	class KIO_EXPORT KFileMetaInfoGroup {
	public:	public:
	KFileMetaInfoGroup();	KFileMetaInfoGroup();
	KFileMetaInfoGroup(const KFileMetaInfoGroup&);	KFileMetaInfoGroup(const KFileMetaInfoGroup&);
	~KFileMetaInfoGroup();	~KFileMetaInfoGroup();
	const KFileMetaInfoGroup& operator=(const KFileMetaInfoGroup&);	const KFileMetaInfoGroup& operator=(const KFileMetaInfoGroup&);
	KFileMetaInfoItemList items() const;	KFileMetaInfoItemList items() const;
	const QString& name() const;	const QString& name() const;
	const QStringList& keys() const;	const QStringList& keys() const;
	private:	private:

	QSharedDataPointer<KFileMetaInfoGroupPrivate> p;	QSharedDataPointer<KFileMetaInfoGroupPrivate> d;
	};	};

	typedef QList<KFileMetaInfoGroup> KFileMetaInfoGroupList;	typedef QList<KFileMetaInfoGroup> KFileMetaInfoGroupList;

	class KFileMetaInfoPrivate;	class KFileMetaInfoPrivate;
	/**	/**
	* KFileMetaInfo provides metadata extracted from a file or other resource.	* KFileMetaInfo provides metadata extracted from a file or other resource.
	*	*
	* When instantiating an instance of this class, the metadata related to it	* When instantiating an instance of this class, the metadata related to it
	* will be retrieved and stored in the instance. The data can be inspected	* will be retrieved and stored in the instance. The data can be inspected

	skipping to change at line 156	skipping to change at line 156
	KDE_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;	KDE_DEPRECATED KFileMetaInfoGroupList preferredGroups() const;
	/**	/**
	* Deprecated	* Deprecated
	**/	**/
	KDE_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;	KDE_DEPRECATED KFileMetaInfoGroupList supportedGroups() const;
	KFileMetaInfoGroupList groups() const;	KFileMetaInfoGroupList groups() const;
	QStringList keys() const;	QStringList keys() const;
	const KUrl& url() const;	const KUrl& url() const;

	private:	private:

	QSharedDataPointer<KFileMetaInfoPrivate> p;	QSharedDataPointer<KFileMetaInfoPrivate> d;
	};	};

	Q_DECLARE_OPERATORS_FOR_FLAGS(KFileMetaInfo::WhatFlags)	Q_DECLARE_OPERATORS_FOR_FLAGS(KFileMetaInfo::WhatFlags)

	#endif	#endif

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

	kfilemetainfoitem.h	kfilemetainfoitem.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries

	Copyright (c) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org>	Copyright (c) 2001,2002 Carsten Pfeiffer <pfeiffer@kde.org>
	2007 Jos van den Oever <jos@vandenoever.info>	2007 Jos van den Oever <jos@vandenoever.info>

		2010 Sebastian Trueg <trueg@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License (LGPL) as published by the Free Software Foundation; either	License (LGPL) 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 30	skipping to change at line 31
	*/	*/
	#ifndef KFILEMETAINFOITEM_H	#ifndef KFILEMETAINFOITEM_H
	#define KFILEMETAINFOITEM_H	#define KFILEMETAINFOITEM_H

	#include <kio/kio_export.h>	#include <kio/kio_export.h>
	#include <QtCore/QSharedData>	#include <QtCore/QSharedData>

	class KFileWritePlugin;	class KFileWritePlugin;
	class QVariant;	class QVariant;
	class PredicateProperties;	class PredicateProperties;

		class KUrl;

	class KFileMetaInfoItemPrivate;	class KFileMetaInfoItemPrivate;
	class KIO_EXPORT KFileMetaInfoItem {	class KIO_EXPORT KFileMetaInfoItem {
	friend class KFileMetaInfo;	friend class KFileMetaInfo;
	friend class KFileMetaInfoPrivate;	friend class KFileMetaInfoPrivate;
	friend class KMetaInfoWriter;	friend class KMetaInfoWriter;
	public:	public:
	/**	/**
	* @brief Default constructor	* @brief Default constructor
	**/	**/

	skipping to change at line 58	skipping to change at line 60
	~KFileMetaInfoItem();	~KFileMetaInfoItem();
	/**	/**
	* @brief Copy operator	* @brief Copy operator
	**/	**/
	const KFileMetaInfoItem& operator=(const KFileMetaInfoItem& item);	const KFileMetaInfoItem& operator=(const KFileMetaInfoItem& item);
	/**	/**
	* @brief Can this item be edited.	* @brief Can this item be edited.
	**/	**/
	bool isEditable() const;	bool isEditable() const;
	/**	/**

	* @brief Has this value been removed, e.g with setValue(QVarian())	* @brief Has this value been removed, e.g with setValue(QVariant())
	**/	**/
	bool isRemoved() const;	bool isRemoved() const;
	/**	/**
	* @brief Can this item be removed.	* @brief Can this item be removed.
	**/	**/
	bool isModified() const;	bool isModified() const;
	/**	/**
	* @brief Has this value been skipped by analyzer due to performance or other considerations.	* @brief Has this value been skipped by analyzer due to performance or other considerations.
	**/	**/
	bool isSkipped() const;	bool isSkipped() const;

	skipping to change at line 87	skipping to change at line 89
	/**	/**
	* @brief Append a value to the properties in this file.	* @brief Append a value to the properties in this file.
	**/	**/
	bool addValue(const QVariant&);	bool addValue(const QVariant&);
	/**	/**
	* @brief Is this a valid item.	* @brief Is this a valid item.
	**/	**/
	bool isValid() const;	bool isValid() const;
	/**	/**
	* @brief Retrieve the properties of this field type.	* @brief Retrieve the properties of this field type.

		*
		* @deprecated
	**/	**/

	const PredicateProperties& properties() const;	KDE_DEPRECATED const PredicateProperties& properties() const;
	/**	/**
	* Localized name of the predicate.	* Localized name of the predicate.

	* Convenience function for properties().name();
	**/	**/
	const QString& name() const;	const QString& name() const;
	/**	/**
	* This method returns a translated suffix to be displayed after the	* This method returns a translated suffix to be displayed after the
	* value. Think of the kbps in 128kbps	* value. Think of the kbps in 128kbps
	*	*
	* @return the suffix	* @return the suffix
	*/	*/
	QString suffix() const;	QString suffix() const;
	/**	/**
	* This method returns a translated prefix to be displayed before the	* This method returns a translated prefix to be displayed before the
	* value.	* value.
	*	*
	* @return the prefix	* @return the prefix
	*/	*/
	QString prefix() const;	QString prefix() const;
	private:	private:

	QSharedDataPointer<KFileMetaInfoItemPrivate> p;	QSharedDataPointer<KFileMetaInfoItemPrivate> d;


	KFileMetaInfoItem(const PredicateProperties& p,	KFileMetaInfoItem(const QString& p,
	const QVariant& v, KFileWritePlugin* w, bool e);	const QVariant& v, KFileWritePlugin* w, bool e);
	};	};

	#endif	#endif

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

	kfilterproxysearchline.h	kfilterproxysearchline.h

	skipping to change at line 49	skipping to change at line 49
	* @since 4.2	* @since 4.2
	*/	*/

	class KDEUI_EXPORT KFilterProxySearchLine	class KDEUI_EXPORT KFilterProxySearchLine
	: public QWidget	: public QWidget
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	/**	/**

	* Contructor	* Constructor
	*/	*/
	explicit KFilterProxySearchLine( QWidget* parent = 0 );	explicit KFilterProxySearchLine( QWidget* parent = 0 );

	/**	/**
	* Destructor	* Destructor
	*/	*/
	~KFilterProxySearchLine();	~KFilterProxySearchLine();

	/**	/**
	* Associate a proxy	* Associate a proxy

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

	kglobalaccel.h	kglobalaccel.h

	skipping to change at line 34	skipping to change at line 34

	#include "kdeui_export.h"	#include "kdeui_export.h"
	#include "kaction.h"	#include "kaction.h"
	#include "kglobalshortcutinfo.h"	#include "kglobalshortcutinfo.h"

	#include <QtCore/QObject>	#include <QtCore/QObject>

	class QWidget;	class QWidget;
	class KShortcut;	class KShortcut;
	class KComponentData;	class KComponentData;

		class OrgKdeKglobalaccelComponentInterface;

	/**	/**
	* @short Configurable global shortcut support	* @short Configurable global shortcut support
	*	*
	* KGlobalAccel allows you to have global accelerators that are independent of	* KGlobalAccel allows you to have global accelerators that are independent of
	* the focused window. Unlike regular shortcuts, the application's window does not need focus	* the focused window. Unlike regular shortcuts, the application's window does not need focus
	* for them to be activated.	* for them to be activated.
	*	*
	* @see KKeyChooser	* @see KKeyChooser
	* @see KKeyDialog	* @see KKeyDialog

	skipping to change at line 233	skipping to change at line 234
	private:	private:

	friend class KAction;	friend class KAction;

	/// Creates a new KGlobalAccel object	/// Creates a new KGlobalAccel object
	KGlobalAccel();	KGlobalAccel();

	/// Destructor	/// Destructor
	~KGlobalAccel();	~KGlobalAccel();


		//! get component @p componentUnique
		OrgKdeKglobalaccelComponentInterface* getComponent(const QString &compo
		nentUnique);

	class KGlobalAccelPrivate *const d;	class KGlobalAccelPrivate *const d;


	Q_PRIVATE_SLOT(d, void _k_invokeAction(const QStringList&,qlonglong))	Q_PRIVATE_SLOT(d, void _k_invokeAction(const QString &, const QString & , qlonglong))
	Q_PRIVATE_SLOT(d, void _k_shortcutGotChanged(const QStringList&, const QList<int>&))	Q_PRIVATE_SLOT(d, void _k_shortcutGotChanged(const QStringList&, const QList<int>&))
	Q_PRIVATE_SLOT(d, void _k_serviceOwnerChanged(const QString&, const QSt ring&, const QString&))	Q_PRIVATE_SLOT(d, void _k_serviceOwnerChanged(const QString&, const QSt ring&, const QString&))
	};	};

	#endif // _KGLOBALACCEL_H_	#endif // _KGLOBALACCEL_H_

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

	khtml_part.h	khtml_part.h

	skipping to change at line 122	skipping to change at line 122
	class WindowFunc;	class WindowFunc;
	class ExternalFunc;	class ExternalFunc;
	class JSEventListener;	class JSEventListener;
	class JSLazyEventListener;	class JSLazyEventListener;
	class JSNodeFilter;	class JSNodeFilter;
	class DOMDocument;	class DOMDocument;
	class SourceFile;	class SourceFile;
	class ScheduledAction;	class ScheduledAction;
	class DOMSelection;	class DOMSelection;
	class DOMSelectionProtoFunc;	class DOMSelectionProtoFunc;

		class KHTMLPartScriptable;
	}	}

	namespace KParts	namespace KParts
	{	{
	class PartManager;	class PartManager;

	class LiveConnectExtension;	class ScriptableExtension;
	}	}

	namespace KWallet	namespace KWallet
	{	{
	class Wallet;	class Wallet;
	}	}

	/**	/**
	* This class is khtml's main class. It features an almost complete	* This class is khtml's main class. It features an almost complete
	* web browser, and html renderer.	* web browser, and html renderer.

	skipping to change at line 232	skipping to change at line 233
	friend class KJS::JSNodeFilter;	friend class KJS::JSNodeFilter;
	friend class KJS::WindowFunc;	friend class KJS::WindowFunc;
	friend class KJS::ExternalFunc;	friend class KJS::ExternalFunc;
	friend class KJS::JSEventListener;	friend class KJS::JSEventListener;
	friend class KJS::JSLazyEventListener;	friend class KJS::JSLazyEventListener;
	friend class KJS::DOMDocument;	friend class KJS::DOMDocument;
	friend class KJS::HTMLElement;	friend class KJS::HTMLElement;
	friend class KJS::SourceFile;	friend class KJS::SourceFile;
	friend class KJS::DOMSelection;	friend class KJS::DOMSelection;
	friend class KJS::DOMSelectionProtoFunc;	friend class KJS::DOMSelectionProtoFunc;

		friend class KJS::KHTMLPartScriptable;
	friend class KJSProxy;	friend class KJSProxy;
	friend class KHTMLPartBrowserExtension;	friend class KHTMLPartBrowserExtension;
	friend class DOM::DocumentImpl;	friend class DOM::DocumentImpl;
	friend class DOM::HTMLDocumentImpl;	friend class DOM::HTMLDocumentImpl;
	friend class DOM::Selection;	friend class DOM::Selection;
	friend class DOM::Editor;	friend class DOM::Editor;
	friend class KHTMLPartBrowserHostExtension;	friend class KHTMLPartBrowserHostExtension;
	friend class khtml::HTMLTokenizer;	friend class khtml::HTMLTokenizer;
	friend class khtml::XMLTokenizer;	friend class khtml::XMLTokenizer;
	friend class khtml::RenderWidget;	friend class khtml::RenderWidget;

	skipping to change at line 1669	skipping to change at line 1671
	void emitSelectionChanged();	void emitSelectionChanged();
	void onFirstData();	void onFirstData();
	// Returns whether callingHtmlPart may access this part	// Returns whether callingHtmlPart may access this part
	bool checkFrameAccess(KHTMLPart *callingHtmlPart);	bool checkFrameAccess(KHTMLPart *callingHtmlPart);
	bool openUrlInFrame(const KUrl &url, const KParts::OpenUrlArguments& argu ments, const KParts::BrowserArguments &browserArguments);	bool openUrlInFrame(const KUrl &url, const KParts::OpenUrlArguments& argu ments, const KParts::BrowserArguments &browserArguments);
	void startAutoScroll();	void startAutoScroll();
	void stopAutoScroll();	void stopAutoScroll();
	void overURL( const QString &url, const QString &target, bool shiftPresse d = false );	void overURL( const QString &url, const QString &target, bool shiftPresse d = false );
	void resetHoverText(); // Undo overURL and reset HoverText	void resetHoverText(); // Undo overURL and reset HoverText


	bool processObjectRequest( khtml::ChildFrame *child, const KUrl &url, con	KParts::ScriptableExtension scriptableExtension( const DOM::NodeImpl );
	st QString &mimetype );
	KParts::LiveConnectExtension liveConnectExtension( const DOM::NodeImpl
	);

	KWallet::Wallet* wallet();	KWallet::Wallet* wallet();

	void openWallet(DOM::HTMLFormElementImpl*);	void openWallet(DOM::HTMLFormElementImpl*);
	void saveToWallet(const QString& key, const QMap<QString,QString>& data);	void saveToWallet(const QString& key, const QMap<QString,QString>& data);
	void dequeueWallet(DOM::HTMLFormElementImpl*);	void dequeueWallet(DOM::HTMLFormElementImpl*);
	void saveLoginInformation(const QString& host, const QString& key, const QMap<QString, QString>& walletMap);	void saveLoginInformation(const QString& host, const QString& key, const QMap<QString, QString>& walletMap);

	void enableFindAheadActions(bool);	void enableFindAheadActions(bool);


	skipping to change at line 1718	skipping to change at line 1719
	const QString& boundary = QString() );	const QString& boundary = QString() );

	void popupMenu( const QString &url );	void popupMenu( const QString &url );

	void init( KHTMLView *view, GUIProfile prof );	void init( KHTMLView *view, GUIProfile prof );

	void clear();	void clear();

	QVariant crossFrameExecuteScript(const QString& target, const QString& sc ript);	QVariant crossFrameExecuteScript(const QString& target, const QString& sc ript);


	bool requestFrame( DOM::HTMLPartContainerElementImpl *frame, const QStrin
	g &url, const QString &frameName,
	const QStringList &args = QStringList(), bool isIFrame
	= false );

	/**	/**
	* @internal returns a name for a frame without a name.	* @internal returns a name for a frame without a name.
	* This function returns a sequence of names.	* This function returns a sequence of names.
	* All names in a sequence are different but the sequence is	* All names in a sequence are different but the sequence is
	* always the same.	* always the same.
	* The sequence is reset in clear().	* The sequence is reset in clear().
	*/	*/
	QString requestFrameName();	QString requestFrameName();


	bool requestObject( DOM::HTMLPartContainerElementImpl *frame, const QStr	// Requests loading of a frame or iframe element
	ing &url, const QString &serviceType,	bool loadFrameElement( DOM::HTMLPartContainerElementImpl *frame, const QS
	const QStringList &args = QStringList() );	tring &url, const QString &frameName,
		const QStringList &args = QStringList(), bool isIF
		rame = false );

		// Requests loading of an object or embed element. Returns true if
		// loading succeeded.
		bool loadObjectElement( DOM::HTMLPartContainerElementImpl *frame, const Q
		String &url, const QString &serviceType,
		const QStringList &args = QStringList() );


		// Tries an open a URL in given ChildFrame with all known navigation info
		rmation
		// like mimetype and the like in the KParts arguments.
		//
		// Returns true if it's done -- which excludes the case when it's still r
		esolving
		// the mimetype.
		// ### refine comment wrt to error case
	bool requestObject( khtml::ChildFrame *child, const KUrl &url,	bool requestObject( khtml::ChildFrame *child, const KUrl &url,
	const KParts::OpenUrlArguments &args = KParts::OpenUr lArguments(),	const KParts::OpenUrlArguments &args = KParts::OpenUr lArguments(),
	const KParts::BrowserArguments& browserArgs = KParts: :BrowserArguments() );	const KParts::BrowserArguments& browserArgs = KParts: :BrowserArguments() );


	// Called when a child could not be loaded.	// This method does the loading inside a ChildFrame once we know what mim
		etype to
		// load it as
		bool processObjectRequest( khtml::ChildFrame *child, const KUrl &url, con
		st QString &mimetype );

		// helper for reporting ChildFrame load failure
	void childLoadFailure( khtml::ChildFrame *child );	void childLoadFailure( khtml::ChildFrame *child );


		// Updates the ChildFrame to use the particular part, hooking up the vari
		ous
		// signals, connections, etc.
		void connectToChildPart( khtml::ChildFrame child, KParts::ReadOnlyPart
		part,
		const QString &mimetype );

		// Low-level navigation of the part itself --- this doesn't ask the user
		// to save things or such, and assumes that all the ChildFrame info is al
		ready
		// filed in with things like the mimetype and so on
		//
		// Returns if successful or not
		bool navigateChild( khtml::ChildFrame *child, const KUrl& url );

		// Helper for executing javascript: or about: protocols
		bool navigateLocalProtocol( khtml::ChildFrame *child, KParts::ReadOnlyPar
		t *part,
		const KUrl& url );

	DOM::EventListener createHTMLEventListener( QString code, QString name, DOM::NodeImpl node, bool svg = false );	DOM::EventListener createHTMLEventListener( QString code, QString name, DOM::NodeImpl node, bool svg = false );

	DOM::HTMLDocumentImpl *docImpl() const;	DOM::HTMLDocumentImpl *docImpl() const;
	DOM::DocumentImpl *xmlDocImpl() const;	DOM::DocumentImpl *xmlDocImpl() const;
	khtml::ChildFrame frame( const QObject obj );	khtml::ChildFrame frame( const QObject obj );

	khtml::ChildFrame recursiveFrameRequest( KHTMLPart callingHtmlPart, con st KUrl &url,	khtml::ChildFrame recursiveFrameRequest( KHTMLPart callingHtmlPart, con st KUrl &url,
	const KParts::OpenUrlArguments& args, const KParts::BrowserArguments &browserArgs,	const KParts::OpenUrlArguments& args, const KParts::BrowserArguments &browserArgs,
	bool callParent = true );	bool callParent = true );


End of changes. 9 change blocks.
	14 lines changed or deleted	50 lines changed or added

	khtmlview.h	khtmlview.h

	skipping to change at line 68	skipping to change at line 68
	class RenderObject;	class RenderObject;
	class RenderCanvas;	class RenderCanvas;
	class RenderLineEdit;	class RenderLineEdit;
	class RenderPartObject;	class RenderPartObject;
	class RenderWidget;	class RenderWidget;
	class RenderLayer;	class RenderLayer;
	class RenderBox;	class RenderBox;
	class CSSStyleSelector;	class CSSStyleSelector;
	class LineEditWidget;	class LineEditWidget;
	class CaretBox;	class CaretBox;

		class HTMLTokenizer;
	class KHTMLWidgetPrivate;	class KHTMLWidgetPrivate;
	class KHTMLWidget	class KHTMLWidget
	{	{
	public:	public:
	KHTMLWidget();	KHTMLWidget();
	~KHTMLWidget();	~KHTMLWidget();
	KHTMLWidgetPrivate* m_kwp;	KHTMLWidgetPrivate* m_kwp;
	};	};
	void applyRule(DOM::CSSProperty *prop);	void applyRule(DOM::CSSProperty *prop);
	}	}

	skipping to change at line 117	skipping to change at line 118
	friend class khtml::RenderCanvas;	friend class khtml::RenderCanvas;
	friend class khtml::RenderObject;	friend class khtml::RenderObject;
	friend class khtml::RenderLineEdit;	friend class khtml::RenderLineEdit;
	friend class khtml::RenderPartObject;	friend class khtml::RenderPartObject;
	friend class khtml::RenderWidget;	friend class khtml::RenderWidget;
	friend class khtml::KHTMLWidgetPrivate;	friend class khtml::KHTMLWidgetPrivate;
	friend class khtml::RenderLayer;	friend class khtml::RenderLayer;
	friend class khtml::RenderBox;	friend class khtml::RenderBox;
	friend class khtml::CSSStyleSelector;	friend class khtml::CSSStyleSelector;
	friend class khtml::LineEditWidget;	friend class khtml::LineEditWidget;

		friend class khtml::HTMLTokenizer;
	friend class KJS::WindowFunc;	friend class KJS::WindowFunc;
	friend class KJS::ExternalFunc;	friend class KJS::ExternalFunc;
	friend void khtml::applyRule(DOM::CSSProperty *prop);	friend void khtml::applyRule(DOM::CSSProperty *prop);

	public:	public:
	/**	/**
	* Constructs a KHTMLView.	* Constructs a KHTMLView.
	*/	*/
	KHTMLView( KHTMLPart part, QWidget parent );	KHTMLView( KHTMLPart part, QWidget parent );
	virtual ~KHTMLView();	virtual ~KHTMLView();

	skipping to change at line 400	skipping to change at line 402
	* used for autoscrolling with MMB	* used for autoscrolling with MMB
	*/	*/
	void slotMouseScrollTimer();	void slotMouseScrollTimer();

	private:	private:
	void resizeContentsToViewport();	void resizeContentsToViewport();

	void scheduleRelayout(khtml::RenderObject* clippedObj=0);	void scheduleRelayout(khtml::RenderObject* clippedObj=0);
	void unscheduleRelayout();	void unscheduleRelayout();


		bool hasLayoutPending();

	void scheduleRepaint(int x, int y, int w, int h, bool asap=false);	void scheduleRepaint(int x, int y, int w, int h, bool asap=false);
	void unscheduleRepaint();	void unscheduleRepaint();

	bool needsFullRepaint() const;	bool needsFullRepaint() const;

	void closeChildDialogs();	void closeChildDialogs();
	bool dialogsAllowed();	bool dialogsAllowed();

	void setMouseEventsTarget( QWidget* w );	void setMouseEventsTarget( QWidget* w );
	QWidget* mouseEventsTarget() const;	QWidget* mouseEventsTarget() const;

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

	kiconcache.h	kiconcache.h

	skipping to change at line 41	skipping to change at line 41
	class QString;	class QString;
	class QStringList;	class QStringList;
	class QPixmap;	class QPixmap;
	class QDataStream;	class QDataStream;

	/**	/**
	* Icon cache for KDE.	* Icon cache for KDE.
	*	*
	* Note that this is the KDE-wide cache for storing icons and should only b e	* Note that this is the KDE-wide cache for storing icons and should only b e
	* used by KIconLoader. If you want to cache your own pixmaps you should l ook	* used by KIconLoader. If you want to cache your own pixmaps you should l ook

	* at KPixmapCache instead.	* at KImageCache or KSharedDataCache instead.
		*
		* @internal
	*/	*/

		// KDE5: Un-export the symbols for this. Better yet, remove it entirely
		// since KPixmapCache is deprecated.
	class KDEUI_EXPORT KIconCache : public KPixmapCache	class KDEUI_EXPORT KIconCache : public KPixmapCache
	{	{
	public:	public:
	/**	/**
	* Constucts the icon cache object.	* Constucts the icon cache object.
	**/	**/
	explicit KIconCache();	explicit KIconCache();
	virtual ~KIconCache();	virtual ~KIconCache();

	bool find(const QString& key, QPixmap& pix, QString* path);	bool find(const QString& key, QPixmap& pix, QString* path);

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

	kiconloader.h	kiconloader.h

	skipping to change at line 90	skipping to change at line 90

	public:	public:
	/**	/**
	* Defines the context of the icon.	* Defines the context of the icon.
	*/	*/
	enum Context {	enum Context {
	Any, ///< Some icon with unknown purpose.	Any, ///< Some icon with unknown purpose.
	Action, ///< An action icon (e.g. 'save', 'print').	Action, ///< An action icon (e.g. 'save', 'print').
	Application, ///< An icon that represents an application.	Application, ///< An icon that represents an application.
	Device, ///< An icon that represents a device.	Device, ///< An icon that represents a device.

	FileSystem, ///< An icon that represents a file system.	FileSystem, ///< An icon that represents a file system. @depreca ted Use Place instead.
	MimeType, ///< An icon that represents a mime type (or file ty pe).	MimeType, ///< An icon that represents a mime type (or file ty pe).
	Animation, ///< An icon that is animated.	Animation, ///< An icon that is animated.
	Category, ///< An icon that represents a category.	Category, ///< An icon that represents a category.
	Emblem, ///< An icon that adds information to an existing ic on.	Emblem, ///< An icon that adds information to an existing ic on.
	Emote, ///< An icon that expresses an emotion.	Emote, ///< An icon that expresses an emotion.
	International, ///< An icon that represents a country's flag.	International, ///< An icon that represents a country's flag.
	Place, ///< An icon that represents a location (e.g. 'home' , 'trash').	Place, ///< An icon that represents a location (e.g. 'home' , 'trash').
	StatusIcon ///< An icon that represents an event.	StatusIcon ///< An icon that represents an event.
	};	};


	skipping to change at line 134	skipping to change at line 134
	/// Desktop icons	/// Desktop icons
	Desktop=0,	Desktop=0,
	/// First group	/// First group
	FirstGroup=0,	FirstGroup=0,
	/// Toolbar icons	/// Toolbar icons
	Toolbar,	Toolbar,
	/// Main toolbar icons	/// Main toolbar icons
	MainToolbar,	MainToolbar,
	/// Small icons, e.g. for buttons	/// Small icons, e.g. for buttons
	Small,	Small,

	/// Panel (Kicker) icons	/// Panel (Plasma Taskbar) icons
	Panel,	Panel,
	/// Icons for use in dialog titles, page lists, etc	/// Icons for use in dialog titles, page lists, etc
	Dialog,	Dialog,
	/// Last group	/// Last group
	LastGroup,	LastGroup,
	/// User icons	/// User icons
	User	User
	};	};

	/**	/**

	skipping to change at line 233	skipping to change at line 233
	* @param group The icon group. This will specify the size of and effec ts to	* @param group The icon group. This will specify the size of and effec ts to
	* be applied to the icon.	* be applied to the icon.
	* @param size If nonzero, this overrides the size specified by @p grou p.	* @param size If nonzero, this overrides the size specified by @p grou p.
	* See KIconLoader::StdSizes.	* See KIconLoader::StdSizes.
	* @param state The icon state: @p DefaultState, @p ActiveState or	* @param state The icon state: @p DefaultState, @p ActiveState or
	* @p DisabledState. Depending on the user's preferences, the iconloade r	* @p DisabledState. Depending on the user's preferences, the iconloade r
	* may apply a visual effect to hint about its state.	* may apply a visual effect to hint about its state.
	* @param overlays a list of emblem icons to overlay, by name. the embl em	* @param overlays a list of emblem icons to overlay, by name. the embl em
	* prefix is applied automatically to each name, e.g.	* prefix is applied automatically to each name, e.g.
	* "zip" becomes "emblem-zip"	* "zip" becomes "emblem-zip"

	* @param path_store If not null, the path of the icon is stored here.	* @param path_store If not null, the path of the icon is stored here,
		* if the icon was found. If the icon was not found @p path_stor
		e
		* is unaltered even if the "unknown" pixmap was returned.
	* @param canReturnNull Can return a null pixmap? If false, the	* @param canReturnNull Can return a null pixmap? If false, the

	* "unknown" pixmap is returned when no appropriate icon has been found	* "unknown" pixmap is returned when no appropriate icon has bee
	.	n
		* found. <em>Note:</em> a null pixmap can still be returned in
		the
		* event of invalid parameters, such as empty names, negative si
		zes,
		* and etc.
	* @return the QPixmap. Can be null when not found, depending on	* @return the QPixmap. Can be null when not found, depending on
	* @p canReturnNull.	* @p canReturnNull.
	*/	*/
	QPixmap loadIcon(const QString& name, KIconLoader::Group group, int siz e=0,	QPixmap loadIcon(const QString& name, KIconLoader::Group group, int siz e=0,
	int state=KIconLoader::DefaultState, const QStringList &overlays = QStringList(),	int state=KIconLoader::DefaultState, const QStringList &overlays = QStringList(),
	QString *path_store=0L,	QString *path_store=0L,
	bool canReturnNull=false) const;	bool canReturnNull=false) const;

	/**	/**
	* Loads an icon for a mimetype.	* Loads an icon for a mimetype.

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

	kidletime.h	kidletime.h

	skipping to change at line 24	skipping to change at line 24
	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 KIDLETIME_H	#ifndef KIDLETIME_H
	#define KIDLETIME_H	#define KIDLETIME_H

	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include <QtCore/QHash>	#include <QtCore/QHash>

	#include <kutils_export.h>	#include <kidletime_export.h>
	class KIdleTimePrivate;	class KIdleTimePrivate;

	/**	/**
	* KIdleTime is a singleton reporting information on idle time. It is usefu l not	* KIdleTime is a singleton reporting information on idle time. It is usefu l not
	* only for finding out about the current idle time of the PC, but also for getting	* only for finding out about the current idle time of the PC, but also for getting
	* notified upon idle time events, such as custom timeouts, or user activit y.	* notified upon idle time events, such as custom timeouts, or user activit y.
	*	*
	* @note All the intervals and times in this library are in milliseconds, u nless	* @note All the intervals and times in this library are in milliseconds, u nless
	* specified otherwise	* specified otherwise
	*	*
	* @author Dario Freddi	* @author Dario Freddi
	*	*
	* @since 4.4	* @since 4.4
	*/	*/

	class KUTILS_EXPORT KIdleTime : public QObject	class KIDLETIME_EXPORT KIdleTime : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_DECLARE_PRIVATE(KIdleTime)	Q_DECLARE_PRIVATE(KIdleTime)
	Q_DISABLE_COPY(KIdleTime)	Q_DISABLE_COPY(KIdleTime)

	public:	public:
	/**	/**
	* Returns the singleton instance. Use this method to access KIdleTime	* Returns the singleton instance. Use this method to access KIdleTime
	*	*
	* @returns the instance of KIdleTime	* @returns the instance of KIdleTime

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

	kjob.h	kjob.h

	skipping to change at line 229	skipping to change at line 229
	*	*
	* @param capabilities are the capabilities supported by this job	* @param capabilities are the capabilities supported by this job
	* @see capabilities()	* @see capabilities()
	*/	*/
	void setCapabilities( Capabilities capabilities );	void setCapabilities( Capabilities capabilities );

	public:	public:
	/**	/**
	* Executes the job synchronously.	* Executes the job synchronously.
	*	*

		* This will start a nested QEventLoop internally. Nested event loop ca
		n be dangerous and
		* can have unintended side effects, you should avoid calling exec() wh
		enever you can and use the
		* asyncronous interface of KJob instead.
		*
		* Should you indeed call this method, you need to make sure that all c
		allers are reentrant,
		* so that events delivered by the inner event loop don't cause non-ree
		ntrant functions to be
		* called, which usually wreaks havoc.
		*
		* Note that the event loop started by this method does not process use
		r input events, which means
		* your user interface will effectivly be blocked. Other events like pa
		int or network events are
		* still being processed. The advantage of not processing user input ev
		ents is that the chance of
		* accidental reentrancy is greatly reduced. Still you should avoid cal
		ling this function.
		*
	* @return true if the job has been executed without error, false other wise	* @return true if the job has been executed without error, false other wise
	*/	*/
	bool exec();	bool exec();

	enum	enum
	{	{
	NoError = 0,	NoError = 0,
	KilledJobError = 1,	KilledJobError = 1,
	UserDefinedError = 100	UserDefinedError = 100
	};	};

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

	klineedit.h	klineedit.h

	skipping to change at line 274	skipping to change at line 274
	bool trapReturnKey() const;	bool trapReturnKey() const;

	/**	/**
	* @returns the completion-box, that is used in completion mode	* @returns the completion-box, that is used in completion mode
	* KGlobalSettings::CompletionPopup.	* KGlobalSettings::CompletionPopup.
	* This method will create a completion-box if none is there, yet.	* This method will create a completion-box if none is there, yet.
	*	*
	* @param create Set this to false if you don't want the box to be crea ted	* @param create Set this to false if you don't want the box to be crea ted
	* i.e. to test if it is available.	* i.e. to test if it is available.
	*/	*/

	KCompletionBox * completionBox( bool create = true );	KCompletionBox * completionBox( bool create = true ); // KDE5 TODO: mak e virtual, so konq can reimplement i

	/**	/**
	* Reimplemented for internal reasons, the API is not affected.	* Reimplemented for internal reasons, the API is not affected.
	*/	*/
	virtual void setCompletionObject( KCompletion *, bool hsig = true );	virtual void setCompletionObject( KCompletion *, bool hsig = true );

	/**	/**
	* Reimplemented for internal reasons, the API is not affected.	* Reimplemented for internal reasons, the API is not affected.
	*/	*/
	virtual void copy() const;	virtual void copy() const;

	skipping to change at line 400	skipping to change at line 400
	* @em normal.	* @em normal.
	*/	*/
	void completion( const QString& );	void completion( const QString& );

	/**	/**
	* Emitted when the shortcut for substring completion is pressed.	* Emitted when the shortcut for substring completion is pressed.
	*/	*/
	void substringCompletion( const QString& );	void substringCompletion( const QString& );

	/**	/**

	* Emitted when the text is changed NOT by autocompletion	* Emitted when the text is changed NOT by the suggested autocompletion
		:
		* either when the user is physically typing keys, or when the text is
		changed programmatically,
		* for example, by calling setText().
		* But not when automatic completion changes the text temporarily.
		*
	* @since 4.2.2	* @since 4.2.2

		* @deprecated since 4.5. You probably want to connect to textEdited()
		instead,
		* which is emitted whenever the text is actually changed by the user
		* (by typing or accepting autocompletion), without side effects from
		* suggested autocompletion either. userTextChanged isn't needed anymor
		e.
	*/	*/

	void userTextChanged( const QString & );	QT_MOC_COMPAT void userTextChanged( const QString & );

	/**	/**
	* Emitted when the text rotation key-bindings are pressed.	* Emitted when the text rotation key-bindings are pressed.
	*	*
	* The argument indicates which key-binding was pressed.	* The argument indicates which key-binding was pressed.
	* In KLineEdit's case this can be either one of two values:	* In KLineEdit's case this can be either one of two values:
	* PrevCompletionMatch or NextCompletionMatch. See	* PrevCompletionMatch or NextCompletionMatch. See
	* KCompletionBase::setKeyBinding for details.	* KCompletionBase::setKeyBinding for details.
	*	*
	* Note that this signal is @em not emitted if the completion	* Note that this signal is @em not emitted if the completion

	skipping to change at line 430	skipping to change at line 438
	* popupmenu.	* popupmenu.
	*/	*/
	void completionModeChanged( KGlobalSettings::Completion );	void completionModeChanged( KGlobalSettings::Completion );

	/**	/**
	* Emitted before the context menu is displayed.	* Emitted before the context menu is displayed.
	*	*
	* The signal allows you to add your own entries into the	* The signal allows you to add your own entries into the
	* the context menu that is created on demand.	* the context menu that is created on demand.
	*	*

	* NOTE: Do not store the pointer to the QPopupMenu	* NOTE: Do not store the pointer to the QMenu
	* provided through since it is created and deleted	* provided through since it is created and deleted
	* on demand.	* on demand.
	*	*
	* @param p the context menu about to be displayed	* @param p the context menu about to be displayed
	*/	*/

	void aboutToShowContextMenu( QMenu * p );	void aboutToShowContextMenu(QMenu* menu);

	/**	/**
	* Emitted when the user clicked on the clear button	* Emitted when the user clicked on the clear button
	*/	*/
	void clearButtonClicked();	void clearButtonClicked();

	public Q_SLOTS:	public Q_SLOTS:

	/**	/**
	* Re-implemented for internal reasons. API not changed.	* Re-implemented for internal reasons. API not changed.

	skipping to change at line 621	skipping to change at line 629
	virtual void paintEvent( QPaintEvent *ev );	virtual void paintEvent( QPaintEvent *ev );

	virtual void focusInEvent( QFocusEvent *ev );	virtual void focusInEvent( QFocusEvent *ev );

	virtual void focusOutEvent( QFocusEvent *ev );	virtual void focusOutEvent( QFocusEvent *ev );

	private Q_SLOTS:	private Q_SLOTS:
	void completionMenuActivated( QAction *act );	void completionMenuActivated( QAction *act );
	void tripleClickTimeout(); // resets possibleTripleClick	void tripleClickTimeout(); // resets possibleTripleClick
	void slotRestoreSelectionColors();	void slotRestoreSelectionColors();

	void setTextWorkaround( const QString& text );	void _k_slotCompletionBoxTextChanged( const QString& text );

	/**	/**
	* updates the icon of the clear button on text change	* updates the icon of the clear button on text change
	**/	**/
	void updateClearButtonIcon(const QString&);	void updateClearButtonIcon(const QString&);

	private:	private:

	/**	/**
	* Initializes variables. Called from the constructors.	* Initializes variables. Called from the constructors.

	skipping to change at line 653	skipping to change at line 661
	/**	/**
	* updates the geometry of the clear button on resize events	* updates the geometry of the clear button on resize events
	**/	**/
	void updateClearButton();	void updateClearButton();

	private:	private:
	friend class KLineEditPrivate;	friend class KLineEditPrivate;
	KLineEditPrivate *const d;	KLineEditPrivate *const d;

	Q_PRIVATE_SLOT( d, void _k_slotSettingsChanged( int category ) )	Q_PRIVATE_SLOT( d, void _k_slotSettingsChanged( int category ) )

	Q_PRIVATE_SLOT( d, void _k_updateUserText(const QString&) )	Q_PRIVATE_SLOT( d, void _k_textChanged(const QString&) )
	};	};

	#endif	#endif

End of changes. 8 change blocks.
	7 lines changed or deleted	19 lines changed or added

	klocale.h	klocale.h

	skipping to change at line 125	skipping to change at line 125
	* 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.	* @since 4.5
		*
		* Raw translation from a message catalog.
		* If catalog name is null or empty,
		* all loaded catalogs are searched for the translation.
	*	*
	* Never use this directly to get message translations. See the i18n an d ki18n	* Never use this directly to get message translations. See the i18n an 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 catname the catalog name. Must be UTF-8 encoded.
		* @param msg the message. Must not be null or empty. Must be UTF-8 enc
		oded.
	* @param lang language in which the translation was found. If no trans lation	* @param lang language in which the translation was found. If no trans lation
	* was found, KLocale::defaultLanguage() is reported. If nu ll,	* 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 transl ation	* @param trans raw translation, or original if not found. If no transl 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 translateRawFrom(const char* catname, const char* msg, QString *la
		ng, QString *trans) const;

		/**
		* Like translateRawFrom, with implicit lookup through all loaded catal
		ogs.
		*
		* @deprecated Use translateRawFrom with null or empty catalog name.
		*/
	void translateRaw(const char* msg, QString lang, QString trans) const ;	void translateRaw(const char* msg, QString lang, QString trans) const ;

	/**	/**

	* Raw translation from message catalogs, with given context.	* @since 4.5
	* Context + message are used as the lookup key in catalogs.	*
		* Raw translation from a message catalog, with given context.
		* Context + message are used as the lookup key in the catalog.
		* If catalog name is null or empty,
		* all loaded catalogs are searched for the translation.
	*	*
	* Never use this directly to get message translations. See i18n* and k i18n*	* Never use this directly to get message translations. See i18n* and k i18n*
	* calls related to KLocalizedString.	* calls related to KLocalizedString.
	*	*

		* @param catname the catalog name. Must be UTF-8 encoded.
	* @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 or empty. Must be UTF-8 enc oded.
	* @param lang language in which the translation was found. If no trans lation	* @param lang language in which the translation was found. If no trans lation
	* was found, KLocale::defaultLanguage() is reported. If nu ll,	* 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 transl ation	* @param trans raw translation, or original if not found. If no transl 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 translateRawFrom(const char catname, const char ctxt, const char
		msg, QString lang, QString *trans) const;

		/**
		* Like translateRawFrom, with implicit lookup through all loaded catal
		ogs.
		*
		* @deprecated Use translateRawFrom with null or empty catalog name.
		*/
	void translateRaw(const char ctxt, const char msg, QString lang, QSt ring trans) const;	void translateRaw(const char ctxt, const char msg, QString lang, QSt ring trans) const;

	/**	/**

	* Raw translation from message catalogs, with given singular/plural fo	* @since 4.5
	rm.	*
	* Singular form is used as the lookup key in catalogs.	* Raw translation from a message catalog, with given singular/plural f
		orm.
		* Singular form is used as the lookup key in the catalog.
		* If catalog name is null or empty,
		* all loaded catalogs are searched for the translation.
	*	*
	* Never use this directly to get message translations. See i18n* and k i18n*	* Never use this directly to get message translations. See i18n* and k i18n*
	* calls related to KLocalizedString.	* calls related to KLocalizedString.
	*	*

	* @param singular the singular form. Must not be null. Must be UTF-8 e	* @param catname the catalog name. Must be UTF-8 encoded.
	ncoded.	* @param singular the singular form. Must not be null or empty. Must b
		e UTF-8 encoded.
	* @param plural the plural form. Must not be null. Must be UTF-8 encod ed.	* @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 trans lation	* @param lang language in which the translation was found. If no trans lation
	* was found, KLocale::defaultLanguage() is reported. If nu ll,	* 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 transl ation	* @param trans raw translation, or original if not found. If no transl ation
	* was found, original message is reported (either plural or	* was found, original message is reported (either plural or
	* singular, as determined by @p n ). If null, the	* singular, as determined by @p n ). If null, the
	* translation is not reported.	* translation is not reported.
	*	*
	* @see KLocalizedString	* @see KLocalizedString
	*/	*/

		void translateRawFrom(const char catname, const char singular, const
		char *plural, unsigned long n,
		QString lang, QString trans) const;

		/**
		* Like translateRawFrom, with implicit lookup through all loaded catal
		ogs.
		*
		* @deprecated Use translateRawFrom with null or empty catalog name.
		*/
	void translateRaw(const char singular, const char plural, unsigned l ong n, QString *lang,	void translateRaw(const char singular, const char plural, unsigned l ong n, QString *lang,
	QString *trans) const;	QString *trans) const;

	/**	/**

	* Raw translation from message catalogs, with given context and	* @since 4.5
		*
		* Raw translation from a message catalog, 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 the catalog.
		* If catalog name is null or empty,
		* all loaded catalogs are searched for the translation.
	*	*
	* Never use this directly to get message translations. See i18n* and k i18n*	* Never use this directly to get message translations. See i18n* and k i18n*
	* calls related to KLocalizedString.	* calls related to KLocalizedString.
	*	*

		* @param catname the catalog name. Must be UTF-8 encoded.
	* @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 e ncoded.	* @param singular the singular form. Must not be null or empty. Must b e UTF-8 encoded.
	* @param plural the plural form. Must not be null. Must be UTF-8 encod ed.	* @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 trans lation	* @param lang language in which the translation was found. If no trans lation
	* was found, KLocale::defaultLanguage() is reported. If nu ll,	* 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 transl ation	* @param trans raw translation, or original if not found. If no transl ation
	* was found, original message is reported (either plural or	* was found, original message is reported (either plural or
	* singular, as determined by @p n ). If null, the	* singular, as determined by @p n ). If null, the
	* translation is not reported.	* translation is not reported.
	*	*
	* @see KLocalizedString	* @see KLocalizedString
	*/	*/

		void translateRawFrom(const char catname, const char ctxt, const char
		singular, const char plural,
		unsigned long n, QString lang, QString trans)
		const;

		/**
		* Like translateRawFrom, with implicit lookup through all loaded catal
		ogs.
		*
		* @deprecated Use translateRawFrom with null or empty catalog name.
		*/
	void translateRaw(const char ctxt, const char singular, const char *p lural, unsigned long n,	void translateRaw(const char ctxt, const char singular, const char *p lural, unsigned long n,
	QString lang, QString trans) const;	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.
	*/	*/

	skipping to change at line 256	skipping to change at line 306
	/**	/**
	* @since 4.3	* @since 4.3
	*	*
	* The set of digit characters used to display and enter numbers.	* The set of digit characters used to display and enter numbers.
	*/	*/
	enum DigitSet {	enum DigitSet {
	ArabicDigits, /**< 0123456789 (European and some Asian	ArabicDigits, /**< 0123456789 (European and some Asian
	languages and western Arabic dialect s) */	languages and western Arabic dialect s) */
	ArabicIndicDigits, /*< ٠١٢٣٤٥٦٧٨٩ (eastern Arabic dialects) /	ArabicIndicDigits, /*< ٠١٢٣٤٥٦٧٨٩ (eastern Arabic dialects) /
	EasternArabicIndicDigits, /*< ۰۱۲۳۴۵۶۷۸۹ (Persian and Urdu) /	EasternArabicIndicDigits, /*< ۰۱۲۳۴۵۶۷۸۹ (Persian and Urdu) /

	DevenagariDigits /*< ०१२३४५६७८९ (Hindi) /	DevenagariDigits, /*< ०१२३४५६७८९ (Hindi) /
		BengaliDigits, /*< ০১২৩৪৫৬৭৮৯ (Bengali and Assamese)
		/
		GujaratiDigits, /*< ૦૧૨૩૪૫૬૭૮૯ (Gujarati) /
		GurmukhiDigits, /*< ੦੧੨੩੪੫੬੭੮੯ (Punjabi) /
		KannadaDigits, /*< ೦೧೨೩೪೫೬೭೮೯ (Kannada) /
		KhmerDigits, /*< ០១២៣៤៥៦៧៨៩ (Khmer) /
		MalayalamDigits, /*< ൦൧൨൩൪൫൬൭൮൯ (Malayalam) /
		OriyaDigits, /*< ୦୧୨୩୪୫୬୭୮୯ (Oriya) /
		TamilDigits, /*< ௦௧௨௩௪௫௬௭௮ (Tamil) /
		TeluguDigits, /*< ౦౧౨౩౪౫౬౭౯ (Telugu) /
		ThaiDigits /*< ๐๑๒๓๔๕๖๗๘๙ (Thai) /
		// The following Decimal Digit Sets are defined in Unicode but the asso
		ciated
		// languages are not yet translated in KDE, so are not yet enabled.
		// The script names are taken from the Unicode standard, the associated
		// languages from Wikipedia.
		// BalineseDigits, /*< ᭐᭑᭒᭓᭔᭕᭖᭗᭘᭙ (Balinese) /
		// ChamDigits, /*< ꩐꩑꩒꩓꩔꩕꩖꩗꩘꩙ (Cham) /
		// JavaneseDigits, /*< ꧐꧑꧒꧓꧔꧕꧖꧗꧘꧙ (Javanese) /
		// KayahLiDigits, /*< ꤀꤁꤂꤃꤄꤅꤆꤇꤈꤉ (Kayah) /
		// LaoDigits, /*< ໐໑໒໓໔໕໖໗໘໙ (Lao) /
		// LepchaDigits, /*< ᱀᱁᱂᱃᱄᱅᱆᱇᱈᱉ (Lepcha) /
		// LimbuDigits, /*< ᥆᥇᥈᥉᥊᥋᥌᥍᥎᥏ (Limbu) /
		// MeeteiMayekDigits, /*< ꯰꯱꯲꯳꯴꯵꯶꯷꯸꯹ (Meitei) /
		// MongolianDigits, /*< ᠐᠑᠒᠓᠔᠕᠖᠗᠘᠙ (Mongolian) /
		// MyanmarDigits, /*< ၀၁၂၃၄၅၆၇၈၉ (Myanmar/Burmese ) /
		// MyanmarShanDigits, /*< ႐႑႒႓႔႕႖႗႘႙ (Shan) /
		// NewTaiLueDigits, /*< ᧐᧑᧒᧓᧔᧕᧖᧗᧘᧙ (Tai Lü) /
		// NKoDigits, /*< ߀߁߂߃߄߅߆߇߈߉ (Mande and N'Ko) /
		// OlChikiDigits, /*< ᱐᱑᱒᱓᱔᱕᱖᱗᱘᱙ (Santali) /
		// OsmanyaDigits, /*< ҠҡҢңҤҥҦҧҨҩ (Somali) /
		// SaurashtraDigits, /*< ꣐꣑꣒꣓꣔꣕꣖꣗꣘꣙ (Saurashtra) /
		// SundaneseDigits, /*< ᮰᮱᮲᮳᮴᮵᮶᮷᮸᮹ (Sundanese) /
		// TaiThamDigits, /*< ᪐᪑᪒᪓᪔᪕᪖᪗᪘᪙ (Tai Lü) /
		// TibetanDigits, /*< ༠༡༢༣༤༥༦༧༨༩ (Tibetan) /
		// VaiDigits, /*< ꘠꘡꘢꘣꘤꘥꘦꘧꘨꘩ (Vai) /
	};	};

	/**	/**
	* @since 4.3	* @since 4.3
	*	*
	* Convert a digit set identifier to a human readable, localized name.	* Convert a digit set identifier to a human readable, localized name.
	*	*
	* @param digitSet the digit set identifier	* @param digitSet the digit set identifier
	* @param withDigits whether to add the digits themselves to the name	* @param withDigits whether to add the digits themselves to the name
	*	*

	skipping to change at line 679	skipping to change at line 763
	* @return If nouns are declined	* @return If nouns are declined
	*/	*/
	bool nounDeclension() const;	bool nounDeclension() const;

	/**	/**
	* @since 4.4	* @since 4.4
	*	*
	* Standard used for Date Time Format String	* Standard used for Date Time Format String
	*/	*/
	enum DateTimeFormatStandard {	enum DateTimeFormatStandard {

	KdeFormat /*< KDE Standard /	KdeFormat, /*< KDE Standard /
	//PosixFormat, /*< POSIX Standard / KDE 4.5	PosixFormat, /*< POSIX Standard /
	//GnuFormat /*< GNU Standard / KDE 4.5	UnicodeFormat /*< UNICODE Standard (Qt/Java/OSX/Windows) /
	//UnicodeFormat /**< UNICODE Standard (Java/OSX/Window
	s?) */ KDE 4.5
	};	};

	/**	/**
	* Format for date string.	* Format for date string.
	*/	*/
	enum DateFormat {	enum DateFormat {
	ShortDate, /*< Locale Short date format, e.g. 08-04-2007 /	ShortDate, /*< Locale Short date format, e.g. 08-04-2007 /
	LongDate, /*< Locale Long date format, e.g. Sunday 08 Apri l 2007 /	LongDate, /*< Locale Long date format, e.g. Sunday 08 Apri l 2007 /
	FancyShortDate, /**< Same as ShortDate for dates a week or more a go. For more	FancyShortDate, /**< Same as ShortDate for dates a week or more a go. For more
	recent dates, it is represented as Today, Ye sterday, or	recent dates, it is represented as Today, Ye sterday, or

End of changes. 17 change blocks.
	19 lines changed or deleted	113 lines changed or added

	klocalizedstring.h	klocalizedstring.h

	skipping to change at line 219	skipping to change at line 219
	* QString s = ki18np("File found", "%1 files found").subs(n).toString();	* QString s = ki18np("File found", "%1 files found").subs(n).toString();
	* QString s = ki18ncp("Personal file", "One file", "%1 files").subs(n).t oString();	* QString s = ki18ncp("Personal file", "One file", "%1 files").subs(n).t oString();
	* \endcode	* \endcode
	*	*
	* If you need translation using locale (ie. KLocale object) other than the	* If you need translation using locale (ie. KLocale object) other than the
	* default, you can use overloaded toString method which takes pointer to a	* default, you can use overloaded toString method which takes pointer to a
	* locale:	* locale:
	* \code	* \code
	* KLocale *myLocale;	* KLocale *myLocale;
	* ...	* ...

	* ki18n("Welcome").toString(myLocale);	* QString msg = ki18n("Welcome").toString(myLocale);
		* \endcode
		*
		* Normally all loaded catalogs are searched for translation,
		* and the first found translation is returned.
		* Sometimes this may lead to clashes, especially when dealing with
		* specialized collection catalogs (country names, language names, etc.)
		* in which messages are not equipped with contexts.
		* In such situations, toString method can take the name of
		* the specific catalog in which to look for translation:
		* \code
		* QString trName = ki18n("Georgia").toString("countries");
	* \endcode	* \endcode
	*	*
	* Translators have a capability to script translations at runtime, which i s	* Translators have a capability to script translations at runtime, which i s
	* for the most part transparent to the programmer. However, sometimes the	* for the most part transparent to the programmer. However, sometimes the
	* programmer may help by providing some @e dynamic context to the message,	* programmer may help by providing some @e dynamic context to the message,
	* using the inContext method of KLocalizedString. Unlike the ordinary	* using the inContext method of KLocalizedString. Unlike the ordinary
	* context, this one changes at runtime; translators have the means to fetc h	* context, this one changes at runtime; translators have the means to fetc h
	* it and use it to script the translation properly. An example:	* it and use it to script the translation properly. An example:
	* \code	* \code
	* KLocalizedString ks = ki18nc("%1 is user name; may have "	* KLocalizedString ks = ki18nc("%1 is user name; may have "

	skipping to change at line 323	skipping to change at line 334
	*/	*/
	KLocalizedString& operator= (const KLocalizedString &rhs);	KLocalizedString& operator= (const KLocalizedString &rhs);

	/**	/**
	* Destructor.	* Destructor.
	*/	*/
	~KLocalizedString ();	~KLocalizedString ();

	/**	/**
	* Finalizes the translation, creates QString with placeholders	* Finalizes the translation, creates QString with placeholders

	* substituted. Translations is obtained from default locale.	* substituted. Translation is obtained from default locale.
	*	*
	* If there was any mismatch between placeholders and arguments	* If there was any mismatch between placeholders and arguments
	* returned string will contain error marks (in debug mode).	* returned string will contain error marks (in debug mode).
	*	*
	* @return finalized translation	* @return finalized translation
	*/	*/
	QString toString () const;	QString toString () const;

	/**	/**

		* @since 4.5
		*
		* Like toString, but looks for translation only in specific catalog.
		*
		* @param catalogName the name of the catalog to check for translation
		* @return finalized translation
		*/
		QString toString (const QString &catalogName) const;

		/**
	* Finalizes the translation, creates QString with placeholders	* Finalizes the translation, creates QString with placeholders

	* substituted. Translations is obtained from given locale. If locale	* substituted. Translation is obtained from given locale. If locale
	* is NULL, original message is used instead of translated.	* is NULL, original message is used instead of translated.
	*	*
	* If there was any mismatch between placeholders and arguments	* If there was any mismatch between placeholders and arguments
	* returned string will contain error marks (in debug mode).	* returned string will contain error marks (in debug mode).
	*	*
	* @param locale locale from which translations are to be taken	* @param locale locale from which translations are to be taken
	* @return finalized translation	* @return finalized translation
	*/	*/
	QString toString (const KLocale *locale) const;	QString toString (const KLocale *locale) const;

	/**	/**

		* @since 4.5
		*
		* Like toString, but looks for translation only in specific catalog.
		*
		* @param locale locale from which translations are to be taken
		* @param catalogName the name of the catalog to check for translation
		* @return finalized translation
		*/
		QString toString (const KLocale *locale, const QString &catalogName) co
		nst;

		/**
	* Checks whether the message is empty. This will happen if you just	* Checks whether the message is empty. This will happen if you just
	* constructed the object via default constructor.	* constructed the object via default constructor.
	*	*
	* Empty messages are not valid for finalization; if you use toString() on	* Empty messages are not valid for finalization; if you use toString() on
	* them, you will get error mark instead of empty QString (in debug mod e).	* them, you will get error mark instead of empty QString (in debug mod e).
	*	*
	* @return @c true if the message is empty, else @c false	* @return @c true if the message is empty, else @c false
	*/	*/
	bool isEmpty() const;	bool isEmpty() const;


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

	kmetadatatagwidget.h	kmetadatatagwidget.h

	/*	// backwards compatibility
	* This file is part of the Nepomuk KDE project.	#include "tagwidget.h"
	* Copyright (C) 2006-2007 Sebastian Trueg <trueg@kde.org>
	*
	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public
	* License as published by the Free Software Foundation; either
	* version 2 of the License, or (at your option) any later version.
	*
	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Library General Public License for more details.
	*
	* 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
	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.
	*/

	#ifndef _KMETADATA_TAG_WIDGET_H_
	#define _KMETADATA_TAG_WIDGET_H_

	#include "nepomuk_export.h"

	#include <QtGui/QWidget>

	namespace Nepomuk {
	class Resource;
	class Tag;

	/**
	* TagWidget provides a simple GUI interface to assign tags.
	* It consists of a single text line displaying the assigned
	* tags and a menu to change the tags.
	*/
	class NEPOMUK_EXPORT TagWidget : public QWidget
	{
	Q_OBJECT

	public:
	/**
	* Creates a new TagWidget for resource. The assigned tags are load
	ed
	* instantly.
	*/
	explicit TagWidget( const Resource& resource, QWidget* parent = 0 )
	;
	TagWidget( QWidget* parent = 0 );
	~TagWidget();

	/**
	* \return The resources that are supposed to be tagged or an empty
	* list if none have been set.
	*/
	QList<Resource> taggedResources() const;

	/**
	* \return The list of all tags that are assigned to the currently
	set
	* resource or an empty list if no resource has been set.
	*
	* \sa setTaggedResource, taggedResource, Resource::getTags
	*/
	QList<Tag> assignedTags() const;

	Q_SIGNALS:
	/**
	* This signal is emitted whenever a tag is clicked.
	*/
	void tagClicked( Tag );

	public Q_SLOTS:
	/**
	* Set the Resource to be tagged. The assigned tags will be loaded
	* instantly.
	*/
	void setTaggedResource( const Resource& resource );

	void setTaggedResources( const QList<Resource>& resources );

	/**
	* Set the list of tags to be assigned to the configured resource.
	* If no resource has been set this method does nothing.
	*
	* \sa setTaggedResource
	*/
	void setAssignedTags( const QList<Tag>& tags );

	private Q_SLOTS:
	void fillTagMenu();
	void createTag();
	void updateAssignedTagsFromMenu();
	void slotTagUpdateDone();
	void slotTagClicked( const QString& text );

	private:
	class Private;
	Private* const d;
	};
	}

	#endif

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

	kmimetypetrader.h	kmimetypetrader.h

	skipping to change at line 89	skipping to change at line 89
	* (preferred service first)	* (preferred service first)
	* @see http://techbase.kde.org/Development/Tutorials/Services/Traders# The_KTrader_Query_Language	* @see http://techbase.kde.org/Development/Tutorials/Services/Traders# The_KTrader_Query_Language
	*/	*/
	KService::List query( const QString& mimeType,	KService::List query( const QString& mimeType,
	const QString& genericServiceType = QString::from Latin1("Application"),	const QString& genericServiceType = QString::from Latin1("Application"),
	const QString& constraint = QString() ) const;	const QString& constraint = QString() ) const;

	/**	/**
	* Returns the preferred service for @p mimeType and @p genericServiceT ype	* Returns the preferred service for @p mimeType and @p genericServiceT ype
	*	*

	* This is almost like offers().first(), except that it also checks	* This is almost like query().first(), except that it also checks
	* if the service is allowed as a preferred service (see KService::allo wAsDefault).	* if the service is allowed as a preferred service (see KService::allo wAsDefault).
	*	*

	* @param mimeType the mime type (see offers())	* @param mimeType the mime type (see query())
	* @param genericServiceType the service type (see offers())	* @param genericServiceType the service type (see query())
	* @return the preferred service, or 0 if no service is available	* @return the preferred service, or 0 if no service is available
	*/	*/
	KService::Ptr preferredService( const QString & mimeType, const QString & genericServiceType = QString::fromLatin1("Application") );	KService::Ptr preferredService( const QString & mimeType, const QString & genericServiceType = QString::fromLatin1("Application") );

	/**	/**
	* This method creates and returns a part object from the trader query for a given \p mimeType.	* This method creates and returns a part object from the trader query for a given \p mimeType.
	*	*
	* Example:	* Example:
	* \code	* \code
	* KParts::ReadOnlyPart* part = KMimeTypeTrader::createInstanceFromQuer y<KParts::ReadOnlyPart>("text/plain", parentWidget, parentObject);	* KParts::ReadOnlyPart* part = KMimeTypeTrader::createInstanceFromQuer y<KParts::ReadOnlyPart>("text/plain", parentWidget, parentObject);

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

	kmountpoint.h	kmountpoint.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 KMOUNTPOINT_H	#ifndef KMOUNTPOINT_H
	#define KMOUNTPOINT_H	#define KMOUNTPOINT_H


	#include <kio/kio_export.h>	#include <kdecore_export.h>
	#include <ksharedptr.h>	#include <ksharedptr.h>

	#include <QtCore/QStringList>	#include <QtCore/QStringList>

	/**	/**
	* The KMountPoint class provides information about mounted and unmounted d isks.	* The KMountPoint class provides information about mounted and unmounted d isks.
	* It provides a system independent interface to fstab.	* It provides a system independent interface to fstab.
	*	*
	* @author Waldo Bastian <bastian@kde.org>	* @author Waldo Bastian <bastian@kde.org>
	*/	*/

	class KIO_EXPORT KMountPoint : public KShared	class KDECORE_EXPORT KMountPoint : public KShared
	{	{
	public:	public:
	typedef KSharedPtr<KMountPoint> Ptr;	typedef KSharedPtr<KMountPoint> Ptr;
	/**	/**
	* List of mount points.	* List of mount points.
	*/	*/

	class KIO_EXPORT List : public QList<Ptr>	class KDECORE_EXPORT List : public QList<Ptr>
	{	{
	public:	public:
	List();	List();
	/**	/**
	* Find the mountpoint on which resides @p path	* Find the mountpoint on which resides @p path
	* For instance if /home is a separate partition, findByPath("/home /user/blah")	* For instance if /home is a separate partition, findByPath("/home /user/blah")
	* will return /home	* will return /home
	* @param path the path to check	* @param path the path to check
	* @return the mount point of the given file	* @return the mount point of the given file
	*/	*/

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

	kmultitabbar.h	kmultitabbar.h

	skipping to change at line 174	skipping to change at line 174
	* this is emitted if the button is clicked	* this is emitted if the button is clicked
	* @param id the ID identifying the button	* @param id the ID identifying the button
	*/	*/
	void clicked(int id);	void clicked(int id);
	protected Q_SLOTS:	protected Q_SLOTS:
	virtual void slotClicked();	virtual void slotClicked();

	protected:	protected:
	virtual void hideEvent( class QHideEvent*);	virtual void hideEvent( class QHideEvent*);
	virtual void showEvent( class QShowEvent*);	virtual void showEvent( class QShowEvent*);

		virtual void paintEvent( class QPaintEvent*);

	/** Should not be created directly. Use KMultiTabBar::appendButton	/** Should not be created directly. Use KMultiTabBar::appendButton
	*/	*/
	KMultiTabBarButton(const QPixmap& pic, const QString&, int id, QWidget *parent);	KMultiTabBarButton(const QPixmap& pic, const QString&, int id, QWidget *parent);
	private:	private:
	friend class KMultiTabBar;	friend class KMultiTabBar;

	int m_id;	int m_id;
	KMultiTabBarButtonPrivate * const d;	KMultiTabBarButtonPrivate * const d;
	};	};

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

	kpagedialog.h	kpagedialog.h

	skipping to change at line 222	skipping to change at line 222

	/**	/**
	* Returns the page widget of the dialog or 0 if no page widget is set.	* Returns the page widget of the dialog or 0 if no page widget is set.
	*/	*/
	KPageWidget *pageWidget();	KPageWidget *pageWidget();

	/**	/**
	* Returns the page widget of the dialog or 0 if no page widget is set.	* Returns the page widget of the dialog or 0 if no page widget is set.
	*/	*/
	const KPageWidget *pageWidget() const;	const KPageWidget *pageWidget() const;


		/**
		* Set the page widget of the dialog.
		*
		* @note the previous pageWidget will be deleted.
		*
		* @param widget The KPageWidget object will be reparented to this obje
		ct, so you can create
		* it without parent and you are not allowed to delete it.
		*/
		void setPageWidget(KPageWidget *widget);

	};	};

	#endif	#endif

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

	kpixmapregionselectordialog.h	kpixmapregionselectordialog.h

	skipping to change at line 46	skipping to change at line 46
	* 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"	* \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
	{	{

		Q_OBJECT
	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.
	*/	*/
	explicit KPixmapRegionSelectorDialog( QWidget *parent = 0 );	explicit KPixmapRegionSelectorDialog( QWidget *parent = 0 );

	/**	/**
	* The destructor of the dialog	* The destructor of the dialog

	skipping to change at line 105	skipping to change at line 106
	* Creates a modal dialog, lets the user to select a region of the @p pi xmap	* Creates a modal dialog, lets the user to select a region of the @p pi xmap
	* with the same aspect ratio than @p aspectRatioWidth x @p aspectRatioH eight	* with the same aspect ratio than @p aspectRatioWidth x @p aspectRatioH eight
	* and returns when the dialog is closed.	* and returns when the dialog is closed.
	*	*
	* @returns the selected image, or an invalid image if the user	* @returns the selected image, or an invalid image if the user
	* pressed the Cancel button.	* pressed the Cancel button.
	*/	*/
	static QImage getSelectedImage( const QPixmap &pixmap, int aspectRatioWi dth,	static QImage getSelectedImage( const QPixmap &pixmap, int aspectRatioWi dth,
	int aspectRatioHeight, QWidget *parent = 0L );	int aspectRatioHeight, QWidget *parent = 0L );


		/**
		* @since 4.4.3
		* Adjusts the size of the KPixmapRegionSelectorWidget to not overflow t
		he screen size
		*/
		void adjustRegionSelectorWidgetSizeToFitScreen();

	private:	private:
	class Private;	class Private;
	Private* const d;	Private* const d;


		Q_PRIVATE_SLOT( d, void _k_adjustPixmapSize() )

	Q_DISABLE_COPY( KPixmapRegionSelectorDialog )	Q_DISABLE_COPY( KPixmapRegionSelectorDialog )
	};	};

	#endif	#endif

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

	kpixmapregionselectorwidget.h	kpixmapregionselectorwidget.h

	skipping to change at line 146	skipping to change at line 146
	public Q_SLOTS:	public Q_SLOTS:
	/**	/**
	* Rotates the current image 90º clockwise	* Rotates the current image 90º clockwise
	*/	*/
	void rotateClockwise();	void rotateClockwise();
	/**	/**
	* Rotates the current image 90º counterclockwise	* Rotates the current image 90º counterclockwise
	*/	*/
	void rotateCounterclockwise();	void rotateCounterclockwise();


		Q_SIGNALS:
		void pixmapRotated();

	protected:	protected:
	/**	/**
	* Creates a KMenu with the menu that appears when clicking with the rig ht button on the label	* Creates a KMenu with the menu that appears when clicking with the rig ht button on the label
	*/	*/
	virtual KMenu *createPopupMenu();	virtual KMenu *createPopupMenu();

	private:	private:
	bool eventFilter(QObject obj, QEvent ev);	bool eventFilter(QObject obj, QEvent ev);

	class Private;	class Private;

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

	kpluginselector.h	kpluginselector.h

	skipping to change at line 28	skipping to change at line 28
	* Boston, MA 02110-1301, USA.	* Boston, MA 02110-1301, USA.
	*/	*/

	#ifndef KPLUGINSELECTOR_H	#ifndef KPLUGINSELECTOR_H
	#define KPLUGINSELECTOR_H	#define KPLUGINSELECTOR_H

	#include <QtGui/QWidget>	#include <QtGui/QWidget>

	#include <QtCore/QList>	#include <QtCore/QList>


	#include <kutils_export.h>	#include <kcmutils_export.h>
	#include <ksharedconfig.h>	#include <ksharedconfig.h>

	class KComponentData;	class KComponentData;
	class KPluginInfo;	class KPluginInfo;

	/**	/**
	* @short A widget to select what plugins to load and configure the plugin s.	* @short A widget to select what plugins to load and configure the plugin s.
	*	*
	* It shows the list of available plugins	* It shows the list of available plugins
	*	*

	skipping to change at line 57	skipping to change at line 57
	*	*
	* You can add plugins from different KConfig[group], by just calling all times	* You can add plugins from different KConfig[group], by just calling all times
	* you want addPlugins method with the correct parameters	* you want addPlugins method with the correct parameters
	*	*
	* Additionally, calls to constructor with same @p categoryName, will add new	* Additionally, calls to constructor with same @p categoryName, will add new
	* items to the same category, even if plugins are from different categori es	* items to the same category, even if plugins are from different categori es
	*	*
	* @author Matthias Kretz <kretz@kde.org>	* @author Matthias Kretz <kretz@kde.org>
	* @author Rafael Fernández López <ereslibre@kde.org>	* @author Rafael Fernández López <ereslibre@kde.org>
	*/	*/

	class KUTILS_EXPORT KPluginSelector	class KCMUTILS_EXPORT KPluginSelector
	: public QWidget	: public QWidget
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	enum PluginLoadMethod {	enum PluginLoadMethod {
	ReadConfigFile = 0,	ReadConfigFile = 0,
	IgnoreConfigFile	IgnoreConfigFile
	};	};


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

	kprintpreview.h	kprintpreview.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 Licen se	* You should have received a copy of the GNU Library General Public Licen se
	* along with this library; see the file COPYING.LIB. If not, write to	* along with this library; see the file COPYING.LIB. If not, write to
	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.	* Boston, MA 02110-1301, USA.
	**/	**/

	#ifndef KPRINTPREVIEW_H	#ifndef KPRINTPREVIEW_H
	#define KPRINTPREVIEW_H	#define KPRINTPREVIEW_H


	#include <kutils_export.h>	#include <kprintutils_export.h>

	#include <kdialog.h>	#include <kdialog.h>

	class KPrintPreviewPrivate;	class KPrintPreviewPrivate;

	/**	/**
	* KPrintPreview provides a print preview dialog.	* KPrintPreview provides a print preview dialog.
	*	*
	* Use it like this:	* Use it like this:
	*	*
	* @code	* @code
	* QPrinter printer;	* QPrinter printer;
	* KPrintPreview preview(&printer);	* KPrintPreview preview(&printer);
	* doPrint(printer); // draws to the QPrinter	* doPrint(printer); // draws to the QPrinter
	* preview.exec();	* preview.exec();
	* @endcode	* @endcode
	*/	*/

	class KUTILS_EXPORT KPrintPreview : public KDialog	class KPRINTUTILS_EXPORT KPrintPreview : public KDialog
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	/**	/**
	* Create a KPrintPreview object.	* Create a KPrintPreview object.
	*	*
	* This will change the settings on the QPrinter, so you	* This will change the settings on the QPrinter, so you
	* should not re-use the QPrinter object for printing	* should not re-use the QPrinter object for printing
	* normally.	* normally.
	*	*
	* @param printer pointer to a QPrinter to configure for	* @param printer pointer to a QPrinter to configure for
	* print preview	* print preview
	* @param parent pointer to the parent widget for the dialog	* @param parent pointer to the parent widget for the dialog
	*/	*/
	explicit KPrintPreview(QPrinter printer, QWidget parent = 0);	explicit KPrintPreview(QPrinter printer, QWidget parent = 0);
	virtual ~KPrintPreview();	virtual ~KPrintPreview();


		/**
		* Returns true if the print preview system is available
		* @since KDE 4.5
		*/
		static bool isAvailable();

	protected:	protected:
	void showEvent(QShowEvent *event);	void showEvent(QShowEvent *event);

	private:	private:
	KPrintPreviewPrivate * const d;	KPrintPreviewPrivate * const d;
	};	};

	#endif // KPRINTPREVIEW_H	#endif // KPRINTPREVIEW_H

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

	kprotocolinfo.h	kprotocolinfo.h

	skipping to change at line 287	skipping to change at line 287
	* This corresponds to the "ShowPreviews=" field in the protocol descript ion file.	* This corresponds to the "ShowPreviews=" field in the protocol descript ion file.
	*	*
	* By default previews are shown if protocolClass is :local.	* By default previews are shown if protocolClass is :local.
	*	*
	* @param protocol the protocol to check	* @param protocol the protocol to check
	* @return true if previews should be shown by default, false otherwise	* @return true if previews should be shown by default, false otherwise
	*/	*/
	static bool showFilePreview( const QString& protocol );	static bool showFilePreview( const QString& protocol );

	/**	/**

	* Returns the suggested URI parsing mode for the KUrl parser.
	*
	* This corresponds to the "URIMode=" field in the protocol description f
	ile.
	*
	* The following parsing modes are defined:
	* @li "url" for a standards compliant URL
	* @li "rawuri" for a non-conformant URI for which URL parsing would be m
	eaningless
	* @li "mailto" for a mailto style URI (the path part contains only an em
	ail address)
	*
	* @param protocol the protocol to check
	* @return the suggested parsing mode, or KUrl::Auto if unspecified
	*/
	//static KUrl::URIMode uriParseMode( const QString& protocol ); - gone in
	Qt-4.x

	/**
	* Returns the list of capabilities provided by the kioslave implementing	* Returns the list of capabilities provided by the kioslave implementing
	* this protocol.	* this protocol.
	*	*
	* This corresponds to the "Capabilities=" field in the protocol descript ion file.	* This corresponds to the "Capabilities=" field in the protocol descript ion file.
	*	*
	* The capability names are not defined globally, they are up to each	* The capability names are not defined globally, they are up to each
	* slave implementation. For example when adding support for a new	* slave implementation. For example when adding support for a new
	* special command for mounting, one would add the string "Mount" to the	* special command for mounting, one would add the string "Mount" to the
	* capabilities list, and applications could check for that string	* capabilities list, and applications could check for that string
	* before sending a special() command that would otherwise do nothing	* before sending a special() command that would otherwise do nothing

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

	krandomsequence.h	krandomsequence.h

	skipping to change at line 110	skipping to change at line 110
	*/	*/
	bool getBool();	bool getBool();

	/**	/**
	* Put a list in random order.	* Put a list in random order.
	*	*
	* @param list the list whose order will be modified	* @param list the list whose order will be modified
	* @note modifies the list in place	* @note modifies the list in place
	*/	*/
	template<typename T> void randomize(QList<T>& list) {	template<typename T> void randomize(QList<T>& list) {

	if (!list.isEmpty()) {	if (!list.isEmpty()) {
	QList<T> l;	QList<T> l;


	l.append(list.takeFirst());	l.append(list.takeFirst());
	while (list.count())	while (list.count())
	l.insert(int(getLong(l.count()+1)), list.takeFirst());	l.insert(int(getLong(l.count()+1)), list.takeFirst());
	list = l;	list = l;

	}	}
	}	}

	/**	/**
	* Modulate the random sequence.	* Modulate the random sequence.
	*	*
	* If S(i) is the sequence of numbers that will follow	* If S(i) is the sequence of numbers that will follow
	* given the current state after calling modulate(i),	* given the current state after calling modulate(i),
	* then S(i) != S(j) for i != j and	* then S(i) != S(j) for i != j and
	* S(i) == S(j) for i == j.	* S(i) == S(j) for i == j.
	*	*

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

	kratingpainter.h	kratingpainter.h

	skipping to change at line 35	skipping to change at line 35

	#include <QtCore/Qt>	#include <QtCore/Qt>

	class QIcon;	class QIcon;
	class QPixmap;	class QPixmap;
	class QPainter;	class QPainter;
	class QPoint;	class QPoint;
	class QRect;	class QRect;

	/**	/**

		* \class KRatingPainter kratingpainter.h Nepomuk/KRatingPainter
		*
	* \brief Utility class that draws a row of stars for a rating value.	* \brief Utility class that draws a row of stars for a rating value.
	*	*
	* The KRatingPainter also allows to determine a rating value from	* The KRatingPainter also allows to determine a rating value from
	* a position in the draw area. it supports all different alignments	* a position in the draw area. it supports all different alignments
	* and custom icons.	* and custom icons.
	*	*
	* For showing a rating in a widget see KRatingWidget.	* For showing a rating in a widget see KRatingWidget.
	*	*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*	*

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

	kratingwidget.h	kratingwidget.h

	skipping to change at line 29	skipping to change at line 29
	*/	*/

	#ifndef KRATINGWIDGET_H	#ifndef KRATINGWIDGET_H
	#define KRATINGWIDGET_H	#define KRATINGWIDGET_H

	#include <QtGui/QFrame>	#include <QtGui/QFrame>

	#include "nepomuk_export.h"	#include "nepomuk_export.h"

	/**	/**

		* \class KRatingWidget kratingwidget.h Nepomuk/KRatingWidget
		*
	* \brief Displays a rating value as a row of pixmaps.	* \brief Displays a rating value as a row of pixmaps.
	*	*
	* The KRatingWidget displays a range of stars or other arbitrary	* The KRatingWidget displays a range of stars or other arbitrary
	* pixmaps and allows the user to select a certain number by mouse.	* pixmaps and allows the user to select a certain number by mouse.
	*	*
	* \sa KRatingPainter	* \sa KRatingPainter
	*	*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*/	*/
	class NEPOMUK_EXPORT KRatingWidget : public QFrame	class NEPOMUK_EXPORT KRatingWidget : public QFrame

	skipping to change at line 107	skipping to change at line 109
	/**	/**
	* The icon used to draw a star. In case a custom pixmap has been set	* The icon used to draw a star. In case a custom pixmap has been set
	* this value is ignored.	* this value is ignored.
	*	*
	* \sa setIcon, setCustomPixmap	* \sa setIcon, setCustomPixmap
	*/	*/
	QIcon icon() const;	QIcon icon() const;

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**

	* Emitted if the rating is changed by user interaction (ie. mouse clic	* This signal is emitted when the rating is changed.
	k).
	* A call to setRating does not trigger this signal.
	*/	*/
	void ratingChanged( unsigned int rating );	void ratingChanged( unsigned int rating );
	void ratingChanged( int rating );	void ratingChanged( int rating );

	public Q_SLOTS:	public Q_SLOTS:
	/**	/**

	* Set the current rating. Calling this method will NOT trigger the	* Set the current rating. Calling this method will trigger the
	* ratingChanged signal.	* ratingChanged signal if @p rating is different from the previous rat
		ing.
	*/	*/
	void setRating( int rating );	void setRating( int rating );

	/**	/**

	* \deprecated use setRating( int max )	* \deprecated use setRating( int rating )
	*/	*/
	KDE_DEPRECATED void setRating( unsigned int rating );	KDE_DEPRECATED void setRating( unsigned int rating );

	/**	/**
	* Set the maximum allowed rating value. The default is 10 which means	* Set the maximum allowed rating value. The default is 10 which means
	* that a rating from 1 to 10 is selectable. If \a max is uneven steps	* that a rating from 1 to 10 is selectable. If \a max is uneven steps
	* are automatically only allowed full.	* are automatically only allowed full.
	*/	*/
	void setMaxRating( int max );	void setMaxRating( int max );


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

	kselectionproxymodel.h	kselectionproxymodel.h

	skipping to change at line 50	skipping to change at line 50

	This takes away the need for the developer to handle the selection betwee n the views, including all the	This takes away the need for the developer to handle the selection betwee n the views, including all the
	mapToSource, mapFromSource and setRootIndex calls.	mapToSource, mapFromSource and setRootIndex calls.

	@code	@code
	MyModel *sourceModel = new MyModel(this);	MyModel *sourceModel = new MyModel(this);
	QTreeView *leftView = new QTreeView(this);	QTreeView *leftView = new QTreeView(this);
	leftView->setModel(sourceModel);	leftView->setModel(sourceModel);

	KSelectionProxyModel *selectionProxy = new KSelectionProxyModel(leftView- >selectionModel(), this);	KSelectionProxyModel *selectionProxy = new KSelectionProxyModel(leftView- >selectionModel(), this);

		selectionProxy->setSourceModel(sourceModel);

	QTreeView *rightView = new QTreeView(this);	QTreeView *rightView = new QTreeView(this);
	rightView->setModel(selectionProxy);	rightView->setModel(selectionProxy);
	@endcode	@endcode

	\image html selectionproxymodelsimpleselection.png "A Selection in one vi ew creating a model for use with another view."	\image html selectionproxymodelsimpleselection.png "A Selection in one vi ew creating a model for use with another view."

	The KSelectionProxyModel can handle complex selections.	The KSelectionProxyModel can handle complex selections.

	\image html selectionproxymodelmultipleselection.png "Non-contiguous sele ction creating a new simple model in a second view."	\image html selectionproxymodelmultipleselection.png "Non-contiguous sele ction creating a new simple model in a second view."

	skipping to change at line 87	skipping to change at line 88
	this is how the Favourite Folder View in KMail works, and is also used in unit testing.	this is how the Favourite Folder View in KMail works, and is also used in unit testing.

	See also: http://doc.trolltech.com/4.5/model-view-proxy-models.html	See also: http://doc.trolltech.com/4.5/model-view-proxy-models.html

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

	*/	*/
	class KDEUI_EXPORT KSelectionProxyModel : public QAbstractProxyModel	class KDEUI_EXPORT KSelectionProxyModel : public QAbstractProxyModel
	{	{

	Q_OBJECT	Q_OBJECT
	public:	public:

	/**	/**
	ctor.	ctor.


	@p selectionModel The selection model used to filter what is presented by	@p selectionModel The selection model used to filter what is presented
	the proxy.	by the proxy.
	*/	*/


	explicit KSelectionProxyModel(QItemSelectionModel selectionModel, QObjec t parent = 0 );	explicit KSelectionProxyModel(QItemSelectionModel selectionModel, QObj ect parent = 0);


	/**	/**
	dtor	dtor
	*/	*/
	virtual ~KSelectionProxyModel();	virtual ~KSelectionProxyModel();


	/**	/**
	reimp.	reimp.
	*/	*/
	virtual void setSourceModel ( QAbstractItemModel * sourceModel );	virtual void setSourceModel(QAbstractItemModel * sourceModel);


	QItemSelectionModel *selectionModel() const;	QItemSelectionModel *selectionModel() const;


	enum FilterBehavior	enum FilterBehavior {
	{	SubTrees,
	SubTrees,	SubTreeRoots,
	SubTreeRoots,	SubTreesWithoutRoots,
	SubTreesWithoutRoots,	ExactSelection,
	ExactSelection,	ChildrenOfExactSelection
	ChildrenOfExactSelection	};
	};	Q_ENUMS(FilterBehavior)
	Q_ENUMS(FilterBehavior)


	/**	/**
	Set the filter behaviors of this model.	Set the filter behaviors of this model.
	The filter behaviors of the model govern the content of the model based	The filter behaviors of the model govern the content of the model bas
	on the selection of the contained QItemSelectionModel.	ed on the selection of the contained QItemSelectionModel.


	See kdeui/proxymodeltestapp to try out the different proxy model behavi ors.	See kdeui/proxymodeltestapp to try out the different proxy model beha viors.


	The most useful behaviors are SubTrees, ExactSelection and ChildrenOfEx actSelection.	The most useful behaviors are SubTrees, ExactSelection and ChildrenOf ExactSelection.


	The default behavior is SubTrees. This means that this proxy model will	The default behavior is SubTrees. This means that this proxy model wi
	contain the roots of the items in the source model.	ll contain the roots of the items in the source model.
	Any descendants which are also selected have no additional effect.	Any descendants which are also selected have no additional effect.
	For example if the source model is like:	For example if the source model is like:


	@verbatim	@verbatim
	(root)	(root)
	- A	- A
	- B	- B
	- C	- C
	- D	- D
	- E	- E
	- F	- F
	- G	- G
	- H	- H
	- I	- I
	- J	- J
	- K	- K
	- L	- L
	@endverbatim	@endverbatim


	And A, B, C and D are selected, the proxy will contain:	And A, B, C and D are selected, the proxy will contain:


	@verbatim	@verbatim
	(root)	(root)
	- A	- A
	- B	- B
		- C
		- D
		- E
		- F
		- G
		@endverbatim

		That is, selecting 'D' or 'C' if 'B' is also selected has no effect.
		If 'B' is de-selected, then 'C' amd 'D' become top-level items:

		@verbatim
		(root)
		- A
	- C	- C
	- D	- D
	- E	- E
	- F	- F
	- G	- G

	@endverbatim	@endverbatim


	That is, selecting 'D' or 'C' if 'B' is also selected has no effect. If 'B' is de-selected, then 'C' amd 'D' become top-level items:	This is the behavior used by KJots when rendering books.


	@verbatim	If the behavior is set to SubTreeRoots, then the children of selected
	(root)	indexes are not part of the model. If 'A', 'B' and 'D' are selected,
	- A
	- C
	- D
	- E
	- F
	- G
	@endverbatim


	This is the behavior used by KJots when rendering books.	@verbatim
		(root)
		- A
		- B
		@endverbatim


	If the behavior is set to SubTreeRoots, then the children of selected i ndexes are not part of the model. If 'A', 'B' and 'D' are selected,	Note that although 'D' is selected, it is not part of the proxy model , because its parent 'B' is already selected.


	@verbatim	SubTreesWithoutRoots has the effect of not making the selected items
	(root)	part of the model, but making their children part of the model instead. If
	- A	'A', 'B' and 'I' are selected:
	- B
	@endverbatim


	Note that although 'D' is selected, it is not part of the proxy model,	@verbatim
	because its parent 'B' is already selected.	(root)
		- C
		- D
		- E
		- F
		- G
		- J
		- K
		- L
		@endverbatim


	SubTreesWithoutRoots has the effect of not making the selected items pa rt of the model, but making their children part of the model instead. If 'A ', 'B' and 'I' are selected:	Note that 'A' has no children, so selecting it has no outward effect on the model.


	@verbatim	ChildrenOfExactSelection causes the proxy model to contain the childr
	(root)	en of the selected indexes,but further descendants are omitted.
	- C	Additionally, if descendants of an already selected index are selecte
	- D	d, their children are part of the proxy model.
		For example, if 'A', 'B', 'D' and 'I' are selected:

		@verbatim
		(root)
		- C
		- D
	- E	- E

	- F
	- G	- G

	- J	- J
	- K	- K
	- L	- L
	@endverbatim	@endverbatim

	Note that 'A' has no children, so selecting it has no outward effect on
	the model.

	ChildrenOfExactSelection causes the proxy model to contain the children
	of the selected indexes,but further descendants are omitted.
	Additionally, if descendants of an already selected index are selected,
	their children are part of the proxy model.
	For example, if 'A', 'B', 'D' and 'I' are selected:

	@verbatim
	(root)
	- C
	- D
	- E
	- G
	- J
	- K
	- L
	@endverbatim


	This would be useful for example if showing containers (for example mai	This would be useful for example if showing containers (for example m
	ldirs) in one view and their items in another. Sub-maildirs would still app	aildirs) in one view and their items in another. Sub-maildirs would still a
	ear in the proxy, but	ppear in the proxy, but
	could be filtered out using a QSortfilterProxyModel.	could be filtered out using a QSortfilterProxyModel.


	The ExactSelection behavior causes the selected items to be part of the proxy model, even if their ancestors are already selected, but children of selected items are not included.	The ExactSelection behavior causes the selected items to be part of t he proxy model, even if their ancestors are already selected, but children of selected items are not included.


	Again, if 'A', 'B', 'D' and 'I' are selected:	Again, if 'A', 'B', 'D' and 'I' are selected:


	@verbatim	@verbatim
	(root)	(root)
	- A	- A
	- B	- B
	- D	- D
	- I	- I
	@endverbatim	@endverbatim


	This is the behavior used by the Favourite Folder View in KMail.	This is the behavior used by the Favourite Folder View in KMail.


	*/	*/
	void setFilterBehavior(FilterBehavior behavior);	void setFilterBehavior(FilterBehavior behavior);
	FilterBehavior filterBehavior() const;	FilterBehavior filterBehavior() const;


	QModelIndex mapFromSource ( const QModelIndex & sourceIndex ) const;	QModelIndex mapFromSource(const QModelIndex & sourceIndex) const;
	QModelIndex mapToSource ( const QModelIndex & proxyIndex ) const;	QModelIndex mapToSource(const QModelIndex & proxyIndex) const;


	virtual Qt::ItemFlags flags( const QModelIndex &index ) const;	virtual Qt::ItemFlags flags(const QModelIndex &index) const;
	QVariant data( const QModelIndex & index, int role = Qt::DisplayRole ) co	QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) co
	nst;	nst;
	virtual int rowCount( const QModelIndex & parent = QModelIndex() ) const;	virtual int rowCount(const QModelIndex & parent = QModelIndex()) const;
	virtual QVariant headerData( int section, Qt::Orientation orientation, in	virtual QVariant headerData(int section, Qt::Orientation orientation, i
	t role = Qt::DisplayRole ) const;	nt role = Qt::DisplayRole) const;


	virtual QMimeData* mimeData( const QModelIndexList & indexes ) const;	virtual QMimeData* mimeData(const QModelIndexList & indexes) const;
	virtual QStringList mimeTypes() const;	virtual QStringList mimeTypes() const;
	virtual Qt::DropActions supportedDropActions() const;	virtual Qt::DropActions supportedDropActions() const;
	virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action, i	virtual bool dropMimeData(const QMimeData* data, Qt::DropAction action,
	nt row, int column, const QModelIndex& parent);	int row, int column, const QModelIndex& parent);


	virtual bool hasChildren ( const QModelIndex & parent = QModelIndex() ) c	virtual bool hasChildren(const QModelIndex & parent = QModelIndex()) co
	onst;	nst;
	virtual QModelIndex index(int, int, const QModelIndex& = QModelIndex() )	virtual QModelIndex index(int, int, const QModelIndex& = QModelIndex())
	const;	const;
	virtual QModelIndex parent(const QModelIndex&) const;	virtual QModelIndex parent(const QModelIndex&) const;
	virtual int columnCount(const QModelIndex& = QModelIndex() ) const;	virtual int columnCount(const QModelIndex& = QModelIndex()) const;


	virtual QModelIndexList match(const QModelIndex& start, int role, const Q	virtual QModelIndexList match(const QModelIndex& start, int role, const
	Variant& value, int hits = 1,	QVariant& value, int hits = 1,
	Qt::MatchFlags flags = Qt::MatchFlags(Qt::M	Qt::MatchFlags flags = Qt::MatchFlags(Qt:
	atchStartsWith \| Qt::MatchWrap)) const;	:MatchStartsWith \| Qt::MatchWrap)) const;

	Q_SIGNALS:	Q_SIGNALS:
	#if !defined(Q_MOC_RUN)	#if !defined(Q_MOC_RUN)
	private: // Don't allow subclasses to emit these signals.	private: // Don't allow subclasses to emit these signals.
	#endif	#endif


	/**	/**
	@internal	@internal
	Emitted before @p removeRootIndex, an index in the sourceModel is remov	Emitted before @p removeRootIndex, an index in the sourceModel is rem
	ed from	oved from
	the root selected indexes. This may be unrelated to rows removed from t	the root selected indexes. This may be unrelated to rows removed from
	he model,	the model,
	depending on configuration.	depending on configuration.
	*/	*/
	void rootIndexAboutToBeRemoved( const QModelIndex &removeRootIndex );	void rootIndexAboutToBeRemoved(const QModelIndex &removeRootIndex);


	/**	/**
	@internal	@internal
	Emitted when @p newIndex, an index in the sourceModel is added to the r	Emitted when @p newIndex, an index in the sourceModel is added to the
	oot selected	root selected
	indexes. This may be unrelated to rows inserted to the model,	indexes. This may be unrelated to rows inserted to the model,
	depending on configuration.	depending on configuration.
	*/	*/
	void rootIndexAdded( const QModelIndex &newIndex );	void rootIndexAdded(const QModelIndex &newIndex);

		/**
		@internal
		Emitted before @p selection, a selection in the sourceModel, is remov
		ed from
		the root selection.
		*/
		void rootSelectionAboutToBeRemoved(const QItemSelection &selection);

		/**
		@internal
		Emitted after @p selection, a selection in the sourceModel, is added
		to
		the root selection.
		*/
		void rootSelectionAdded(const QItemSelection &selection);

	protected:	protected:

	QList<QPersistentModelIndex> sourceRootIndexes() const;	QList<QPersistentModelIndex> sourceRootIndexes() const;

	private:	private:

	Q_DECLARE_PRIVATE(KSelectionProxyModel)	Q_DECLARE_PRIVATE(KSelectionProxyModel)
	//@cond PRIVATE	//@cond PRIVATE
	KSelectionProxyModelPrivate *d_ptr;	KSelectionProxyModelPrivate *d_ptr;


	Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeInserted(const QModelInd	Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeInserted(const QModelI
	ex &, int, int))	ndex &, int, int))
	Q_PRIVATE_SLOT(d_func(), void sourceRowsInserted(const QModelIndex &, int	Q_PRIVATE_SLOT(d_func(), void sourceRowsInserted(const QModelIndex &, i
	, int))	nt, int))
	Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeRemoved(const QModelInde	Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeRemoved(const QModelIn
	x &, int, int))	dex &, int, int))
	Q_PRIVATE_SLOT(d_func(), void sourceRowsRemoved(const QModelIndex &, int,	Q_PRIVATE_SLOT(d_func(), void sourceRowsRemoved(const QModelIndex &, in
	int))	t, int))
	Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeMoved(const QModelIndex	Q_PRIVATE_SLOT(d_func(), void sourceRowsAboutToBeMoved(const QModelInde
	&, int, int, const QModelIndex &, int))	x &, int, int, const QModelIndex &, int))
	Q_PRIVATE_SLOT(d_func(), void sourceRowsMoved(const QModelIndex &, int, i	Q_PRIVATE_SLOT(d_func(), void sourceRowsMoved(const QModelIndex &, int,
	nt, const QModelIndex &, int))	int, const QModelIndex &, int))
	Q_PRIVATE_SLOT(d_func(), void sourceModelAboutToBeReset())	Q_PRIVATE_SLOT(d_func(), void sourceModelAboutToBeReset())
	Q_PRIVATE_SLOT(d_func(), void sourceModelReset())	Q_PRIVATE_SLOT(d_func(), void sourceModelReset())
	Q_PRIVATE_SLOT(d_func(), void sourceLayoutAboutToBeChanged())	Q_PRIVATE_SLOT(d_func(), void sourceLayoutAboutToBeChanged())
	Q_PRIVATE_SLOT(d_func(), void sourceLayoutChanged())	Q_PRIVATE_SLOT(d_func(), void sourceLayoutChanged())
	Q_PRIVATE_SLOT(d_func(), void sourceDataChanged(const QModelIndex &, cons	Q_PRIVATE_SLOT(d_func(), void sourceDataChanged(const QModelIndex &, co
	t QModelIndex &))	nst QModelIndex &))
	Q_PRIVATE_SLOT(d_func(), void selectionChanged(const QItemSelection & sel	Q_PRIVATE_SLOT(d_func(), void selectionChanged(const QItemSelection & s
	ected, const QItemSelection & deselected))	elected, const QItemSelection & deselected))
	Q_PRIVATE_SLOT(d_func(), void sourceModelDestroyed())	Q_PRIVATE_SLOT(d_func(), void sourceModelDestroyed())
		Q_PRIVATE_SLOT(d_func(), void selectionModelSourceAboutToBeReset())
		Q_PRIVATE_SLOT(d_func(), void selectionModelSourceReset())


	//@endcond	//@endcond

	};	};

	#endif	#endif

End of changes. 44 change blocks.
	188 lines changed or deleted	208 lines changed or added

	kselector.h	kselector.h

	skipping to change at line 29	skipping to change at line 29
	//------------------------------------------------------------------------- ----	//------------------------------------------------------------------------- ----
	// Selector widgets for KDE Color Selector, but probably useful for other	// Selector widgets for KDE Color Selector, but probably useful for other
	// stuff also.	// stuff also.

	#ifndef KSELECTOR_H	#ifndef KSELECTOR_H
	#define KSELECTOR_H	#define KSELECTOR_H

	#include <kdeui_export.h>	#include <kdeui_export.h>

	#include <QtGui/QAbstractSlider>	#include <QtGui/QAbstractSlider>

		#include <QtGui/QGradient>
	#include <QtGui/QWidget>	#include <QtGui/QWidget>

	/**	/**
	* KSelector is the base class for other widgets which	* KSelector is the base class for other widgets which
	* provides the ability to choose from a one-dimensional	* provides the ability to choose from a one-dimensional
	* range of values. An example is the KGradientSelector	* range of values. An example is the KGradientSelector
	* which allows to choose from a range of colors.	* which allows to choose from a range of colors.
	*	*
	* A custom drawing routine for the widget surface has	* A custom drawing routine for the widget surface has
	* to be provided by the subclass.	* to be provided by the subclass.

	skipping to change at line 152	skipping to change at line 153
	explicit KGradientSelector( QWidget *parent=0 );	explicit KGradientSelector( QWidget *parent=0 );
	/**	/**
	* Constructs a colors selector with orientation o which	* Constructs a colors selector with orientation o which
	* contains a gradient between white and black.	* contains a gradient between white and black.
	*/	*/
	explicit KGradientSelector( Qt::Orientation o, QWidget *parent=0 );	explicit KGradientSelector( Qt::Orientation o, QWidget *parent=0 );
	/**	/**
	* Destructs the widget.	* Destructs the widget.
	*/	*/
	~KGradientSelector();	~KGradientSelector();


		/**
		* Sets the colors that make up the gradient. Any previously set colors
		* are removed.
		* @since 4.5
		*/
		void setStops(const QGradientStops &stops);

		/**
		* Get the colors that make up the gradient.
		* @since 4.5
		*/
		QGradientStops stops() const;

	/**	/**
	* Sets the two colors which span the gradient.	* Sets the two colors which span the gradient.
	*/	*/
	void setColors( const QColor &col1, const QColor &col2 );	void setColors( const QColor &col1, const QColor &col2 );
	void setText( const QString &t1, const QString &t2 );	void setText( const QString &t1, const QString &t2 );

	/**	/**
	* Set each color on its own.	* Set each color on its own.
	*/	*/
	void setFirstColor( const QColor &col );	void setFirstColor( const QColor &col );

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

	kservice.h	kservice.h

	skipping to change at line 151	skipping to change at line 151
	* Checks whether the service runs with a different user id.	* Checks whether the service runs with a different user id.
	* @return true if the service has to be run under a different uid.	* @return true if the service has to be run under a different uid.
	* @see username()	* @see username()
	*/	*/
	bool substituteUid() const;	bool substituteUid() const;
	/**	/**
	* Returns the user name, if the service runs with a	* Returns the user name, if the service runs with a
	* different user id.	* different user id.
	* @return the username under which the service has to be run,	* @return the username under which the service has to be run,
	* or QString() if not set	* or QString() if not set

	* @see substututeUid()a	* @see substituteUid()
	*/	*/
	QString username() const;	QString username() const;

	/**	/**
	* Returns the path to the location where the service desktop entry	* Returns the path to the location where the service desktop entry
	* is stored.	* is stored.
	*	*
	* This is a relative path if the desktop entry was found in any	* This is a relative path if the desktop entry was found in any
	* of the locations pointed to by $KDEDIRS (e.g. "Internet/kppp.desktop ")	* of the locations pointed to by $KDEDIRS (e.g. "Internet/kppp.desktop ")
	* It is a full path if the desktop entry originates from another	* It is a full path if the desktop entry originates from another

	skipping to change at line 327	skipping to change at line 327

	/**	/**
	* What preference to associate with this service initially (before	* What preference to associate with this service initially (before
	* the user has had any chance to define a profile for it).	* the user has had any chance to define a profile for it).
	* The bigger the value, the most preferred the service is.	* The bigger the value, the most preferred the service is.
	* @return the service preference level of the service	* @return the service preference level of the service
	*/	*/
	int initialPreference() const;	int initialPreference() const;

	/**	/**

	* Whether the entry should be suppressed in menus.	* Whether the entry should be suppressed in the K menu.
	* @return true to suppress this service	* @return true to suppress this service

		*
		* Such services still appear in trader queries, i.e. in
		* "Open With" popup menus for instance.
	*/	*/
	bool noDisplay() const;	bool noDisplay() const;

	/**	/**

		* Whether the service should be shown in KDE at all
		* (including in context menus).
		* @return true if the service should be shown.
		*
		* KMimeTypeTrader honours this and removes such services
		* from its results.
		*
		* @since 4.5
		*/
		bool showInKDE() const;

		/**
	* Name of the application this service belongs to.	* Name of the application this service belongs to.
	* (Useful for e.g. plugins)	* (Useful for e.g. plugins)
	* @return the parent application, or QString() if not set	* @return the parent application, or QString() if not set
	*/	*/
	QString parentApp() const;	QString parentApp() const;

	/**	/**
	* The keyword to be used when constructing the plugin using KPluginFac tory. The keyword is	* The keyword to be used when constructing the plugin using KPluginFac tory. The keyword is
	* defined with X-KDE-PluginKeyword in the .desktop file and with K_REG ISTER_PLUGIN_WITH_KEYWORD	* defined with X-KDE-PluginKeyword in the .desktop file and with K_REG ISTER_PLUGIN_WITH_KEYWORD
	* when implementing the plugin.	* when implementing the plugin.

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

	kstandardaction.h	kstandardaction.h

	skipping to change at line 166	skipping to change at line 166

	// Other standard actions	// Other standard actions
	ConfigureNotifications,	ConfigureNotifications,
	FullScreen,	FullScreen,
	Clear,	Clear,
	PasteText,	PasteText,
	SwitchApplicationLanguage	SwitchApplicationLanguage
	};	};

	/**	/**

	* Creates an action corresponding to the	* Creates an action corresponding to one of the
	* KStandardAction::StandardAction enum.	* KStandardAction::StandardAction actions, which is connected to the giv
		en
		* object and @p slot, and is owned by @p parent.
		*
		* The signal that is connected to @p slot is triggered(bool), except for
		the case of
		* OpenRecent standard action, which uses the urlSelected(const KUrl &) s
		ignal of
		* KRecentFilesAction.
		*
		* @param id The StandardAction identifier to create a KAction for.
		* @param recvr The QObject to receive the signal, or 0 if no notificatio
		n
		* is needed.
		* @param slot The slot to connect the signal to (remember to use the SL
		OT() macro).
		* @param parent The QObject that should own the created KAction, or 0 if
		no parent will
		* own the KAction returned (ensure you delete it manually
		in this case).
	*/	*/
	KDEUI_EXPORT KAction* create(StandardAction id, const QObject recvr, con st char slot,	KDEUI_EXPORT KAction* create(StandardAction id, const QObject recvr, con st char slot,
	QObject *parent);	QObject *parent);

	/**	/**
	* This will return the internal name of a given standard action.	* This will return the internal name of a given standard action.
	*/	*/
	KDEUI_EXPORT const char* name( StandardAction id );	KDEUI_EXPORT const char* name( StandardAction id );

	/// @deprecated use name()	/// @deprecated use name()

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

	kstartupinfo.h	kstartupinfo.h

	skipping to change at line 634	skipping to change at line 634
	* 0 if unknown.	* 0 if unknown.
	*/	*/
	WId launchedBy() const;	WId launchedBy() const;

	/**	/**
	* Sets the toplevel window of the application that caused this star tup notification.	* Sets the toplevel window of the application that caused this star tup notification.
	* @param window window ID of the toplevel window that is responsibl e for this startup	* @param window window ID of the toplevel window that is responsibl e for this startup
	*/	*/
	void setLaunchedBy( WId window );	void setLaunchedBy( WId window );


		/**
		* The .desktop file used to initiate this startup notification, or
		empty. This information
		* should be used only to identify the application, not to read any
		additional information.
		* @since 4.5
		**/
		QString applicationId() const;

		/**
		* Sets the .desktop file that was used to initiate the startup not
		ification.
		* @since 4.5
		*/
		void setApplicationId( const QString& desktop );

	/**	/**
	* Updates the notification data from the given data. Some data, suc h as the desktop	* Updates the notification data from the given data. Some data, suc h as the desktop
	* or the name, won't be rewritten if already set.	* or the name, won't be rewritten if already set.
	* @param data the data to update	* @param data the data to update
	*/	*/
	void update( const KStartupInfoData& data );	void update( const KStartupInfoData& data );

	/**	/**
	* Constructor. Initializes all the data to their default empty valu es.	* Constructor. Initializes all the data to their default empty valu es.
	*/	*/

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

	kstatusnotifieritem.h	kstatusnotifieritem.h

	skipping to change at line 441	skipping to change at line 441

	protected:	protected:
	bool eventFilter(QObject watched, QEvent event);	bool eventFilter(QObject watched, QEvent event);

	private:	private:
	KStatusNotifierItemPrivate *const d;	KStatusNotifierItemPrivate *const d;

	Q_PRIVATE_SLOT(d, void serviceChange(const QString& name,	Q_PRIVATE_SLOT(d, void serviceChange(const QString& name,
	const QString& oldOwner,	const QString& oldOwner,
	const QString& newOwner))	const QString& newOwner))

		Q_PRIVATE_SLOT(d, void checkForRegisteredHosts())
	Q_PRIVATE_SLOT(d, void registerToDaemon())	Q_PRIVATE_SLOT(d, void registerToDaemon())
	Q_PRIVATE_SLOT(d, void contextMenuAboutToShow())	Q_PRIVATE_SLOT(d, void contextMenuAboutToShow())
	Q_PRIVATE_SLOT(d, void maybeQuit())	Q_PRIVATE_SLOT(d, void maybeQuit())
	Q_PRIVATE_SLOT(d, void minimizeRestore())	Q_PRIVATE_SLOT(d, void minimizeRestore())
	Q_PRIVATE_SLOT(d, void hideMenu())	Q_PRIVATE_SLOT(d, void hideMenu())
	Q_PRIVATE_SLOT(d, void legacyWheelEvent(int))	Q_PRIVATE_SLOT(d, void legacyWheelEvent(int))
	Q_PRIVATE_SLOT(d, void legacyActivated(QSystemTrayIcon::ActivationReaso n))	Q_PRIVATE_SLOT(d, void legacyActivated(QSystemTrayIcon::ActivationReaso n))
	};	};

	#endif	#endif

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

	ksycoca.h	ksycoca.h

	skipping to change at line 219	skipping to change at line 219
	*/	*/
	void notifyDatabaseChanged(const QStringList &);	void notifyDatabaseChanged(const QStringList &);

	private:	private:
	/**	/**
	* Clear all caches related to ksycoca contents.	* Clear all caches related to ksycoca contents.
	* @internal only used by kded and kbuildsycoca.	* @internal only used by kded and kbuildsycoca.
	*/	*/
	static void clearCaches();	static void clearCaches();
	friend class KBuildSycoca;	friend class KBuildSycoca;

		friend class Kded;

	Q_DISABLE_COPY(KSycoca)	Q_DISABLE_COPY(KSycoca)
	friend class KSycocaPrivate;	friend class KSycocaPrivate;
	KSycocaPrivate * const d;	KSycocaPrivate * const d;
	};	};

	#endif	#endif

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

	ktar.h	ktar.h

	skipping to change at line 32	skipping to change at line 32
	#include <karchive.h>	#include <karchive.h>

	/**	/**
	* A class for reading / writing (optionally compressed) tar archives.	* A class for reading / writing (optionally compressed) tar archives.
	*	*
	* KTar allows you to read and write tar archives, including those	* KTar allows you to read and write tar archives, including those
	* that are compressed using gzip, bzip2 or xz.	* that are compressed using gzip, bzip2 or xz.
	*	*
	* @author Torben Weis <weis@kde.org>, David Faure <faure@kde.org>	* @author Torben Weis <weis@kde.org>, David Faure <faure@kde.org>
	*/	*/

	class KIO_EXPORT KTar : public KArchive	class KDECORE_EXPORT KTar : 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/weis/myfile.tgz")	* @param filename is a local path (e.g. "/home/weis/myfile.tgz")
	* @param mimetype "application/x-gzip", "application/x-bzip" or	* @param mimetype "application/x-gzip", "application/x-bzip" or
	* "application/x-xz"	* "application/x-xz"
	* Do not use application/x-compressed-tar or similar - you only need t o	* Do not use application/x-compressed-tar or similar - you only need t o

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

	ktcpsocket.h	ktcpsocket.h

	skipping to change at line 306	skipping to change at line 306
	QSsl::EncodingFormat format = QSsl::Pem,	QSsl::EncodingFormat format = QSsl::Pem,
	const QByteArray &passPhrase = QByteArray()); //TODO	const QByteArray &passPhrase = QByteArray()); //TODO
	void setAdvertisedSslVersion(SslVersion version);	void setAdvertisedSslVersion(SslVersion version);
	SslVersion advertisedSslVersion() const; //always equal to last setS slAdvertisedVersion	SslVersion advertisedSslVersion() const; //always equal to last setS slAdvertisedVersion
	SslVersion negotiatedSslVersion() const; //negotiated version; down grades are possible.	SslVersion negotiatedSslVersion() const; //negotiated version; down grades are possible.
	QString negotiatedSslVersionName() const;	QString negotiatedSslVersionName() const;
	bool waitForEncrypted(int msecs = 30000);	bool waitForEncrypted(int msecs = 30000);

	EncryptionMode encryptionMode() const;	EncryptionMode encryptionMode() const;


	Q_SIGNALS:	/**
	//from QIODevice	* Returns the state of the socket @p option.
	void aboutToClose();	*
	void bytesWritten(qint64 bytes);	* @see QAbstractSocket::socketOption
	void readyRead();	*
		* @since 4.5.0
		*/
		QVariant socketOption(QAbstractSocket::SocketOption options) const;


		/**
		* Sets the socket @p option to @p value.
		*
		* @see QAbstractSocket::setSocketOption
		*
		* @since 4.5.0
		*/
		void setSocketOption(QAbstractSocket::SocketOption options, const QVari
		ant &value);

		Q_SIGNALS:
	//from QAbstractSocket	//from QAbstractSocket
	void connected();	void connected();
	void disconnected();	void disconnected();
	void error(KTcpSocket::Error);	void error(KTcpSocket::Error);
	void hostFound();	void hostFound();
	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(KTcpSocket::State);	void stateChanged(KTcpSocket::State);

	//from QSslSocket	//from QSslSocket

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

	ktextedit.h	ktextedit.h

	skipping to change at line 276	skipping to change at line 276

	/**	/**
	* Emitted when the user changes the language in the spellcheck dialog	* Emitted when the user changes the language in the spellcheck dialog
	* shown by checkSpelling() or when calling setSpellCheckingLanguage() .	* shown by checkSpelling() or when calling setSpellCheckingLanguage() .
	*	*
	* @param language the new language the user selected	* @param language the new language the user selected
	* @since 4.1	* @since 4.1
	*/	*/
	void languageChanged(const QString &language);	void languageChanged(const QString &language);


		/**
		* Emitted before the context menu is displayed.
		*
		* The signal allows you to add your own entries into the
		* the context menu that is created on demand.
		*
		* NOTE: Do not store the pointer to the QMenu
		* provided through since it is created and deleted
		* on demand.
		*
		* @param p the context menu about to be displayed
		* @since 4.5
		*/
		void aboutToShowContextMenu(QMenu* menu);

	public Q_SLOTS:	public Q_SLOTS:

	/**	/**
	* Set the spell check language which will be used for highlighting spe lling	* Set the spell check language which will be used for highlighting spe lling
	* mistakes and for the spellcheck dialog.	* mistakes and for the spellcheck dialog.
	* The languageChanged() signal will be emitted when the new language i s	* The languageChanged() signal will be emitted when the new language i s
	* different from the old one.	* different from the old one.
	*	*
	* @since 4.1	* @since 4.1
	*/	*/
	void setSpellCheckingLanguage(const QString &language);	void setSpellCheckingLanguage(const QString &language);

	/**	/**

	* Create a modal dialog to check the spelling. This slot will not ret	* Show a dialog to check the spelling. The spellCheckStatus() signal
	urn	* will be emitted when the spell checking dialog is closed.
	* until spell checking has been completed.
	*/	*/
	void checkSpelling();	void checkSpelling();

	/**	/**
	* Opens a Sonnet::ConfigDialog for this text edit. The config settings the	* Opens a Sonnet::ConfigDialog for this text edit. The config settings the
	* user makes are read from and stored to the given config file.	* user makes are read from and stored to the given config file.
	* The spellcheck language of the config dialog is set to the current s pellcheck	* The spellcheck language of the config dialog is set to the current s pellcheck
	* language of the textedit. If the user changes the language in that d ialog,	* language of the textedit. If the user changes the language in that d ialog,
	* the languageChanged() signal is emitted.	* the languageChanged() signal is emitted.
	*	*

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

	ktexteditor_export.h	ktexteditor_export.h

	skipping to change at line 36	skipping to change at line 36
	#ifndef KTEXTEDITOR_EXPORT	#ifndef KTEXTEDITOR_EXPORT
	# if defined(MAKE_KTEXTEDITOR_LIB)	# if defined(MAKE_KTEXTEDITOR_LIB)
	/* We are building this library */	/* We are building this library */
	# define KTEXTEDITOR_EXPORT KDE_EXPORT	# define KTEXTEDITOR_EXPORT KDE_EXPORT
	# else	# else
	/* We are using this library */	/* We are using this library */
	# define KTEXTEDITOR_EXPORT KDE_IMPORT	# define KTEXTEDITOR_EXPORT KDE_IMPORT
	# endif	# endif
	#endif	#endif


		# ifndef KTEXTEDITOR_EXPORT_DEPRECATED
		# define KTEXTEDITOR_EXPORT_DEPRECATED KDE_DEPRECATED KTEXTEDITOR_EXPORT
		# endif

	#endif	#endif

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

	ktip.h	ktip.h

	skipping to change at line 111	skipping to change at line 111
	* @author Matthias Hoelzer-Kluepfel <mhk@caldera.de>	* @author Matthias Hoelzer-Kluepfel <mhk@caldera.de>
	*/	*/
	class KDEUI_EXPORT KTipDialog : public KDialog	class KDEUI_EXPORT KTipDialog : public KDialog
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	/**	/**
	* Construct a tip dialog.	* Construct a tip dialog.
	*	*

	* @param database TipDatabase that should be used by the TipDialog.	* @param database TipDatabase that should be used by the TipDialog. Th
		e KTipDialog
		* will take ownership of the database, including delet
		ing it.
	* @param parent Parent widget of TipDialog.	* @param parent Parent widget of TipDialog.
	*/	*/
	explicit KTipDialog( KTipDatabase database, QWidget parent = 0 );	explicit KTipDialog( KTipDatabase database, QWidget parent = 0 );

	/**	/**
	* Destroys the tip dialog.	* Destroys the tip dialog.
	*/	*/
	~KTipDialog();	~KTipDialog();

	/**	/**

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

	kurifilter.h	kurifilter.h
	/*	/*
	* This file is part of the KDE libraries	* This file is part of the KDE libraries

	* Copyright (C) 2000-2001,2003 Dawit Alemayehu <adawit at kde.org>	* Copyright (C) 2000-2001,2003,2010 Dawit Alemayehu <adawit at kde.org>
	*	*
	* Original author	* Original author
	* Copyright (C) 2000 Yves Arrouye <yves@realnames.com>	* Copyright (C) 2000 Yves Arrouye <yves@realnames.com>
	*	*
	*	*
	* This library is free software; you can redistribute it and/or	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Library General Public	* modify it under the terms of the GNU Library General Public
	* License 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 29	skipping to change at line 29
	* You should have received a copy of the GNU Library General Public Licen se	* You should have received a copy of the GNU Library General Public Licen se
	* along with this library; see the file COPYING.LIB. If not, write to	* along with this library; see the file COPYING.LIB. If not, write to
	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	* Boston, MA 02110-1301, USA.	* Boston, MA 02110-1301, USA.
	**/	**/

	#ifndef KURIFILTER_H	#ifndef KURIFILTER_H
	#define KURIFILTER_H	#define KURIFILTER_H

	#include <kio/kio_export.h>	#include <kio/kio_export.h>

		#include <kurl.h>

	#include <QtCore/QObject>	#include <QtCore/QObject>

		#include <QtCore/QHash>
		#include <QtCore/QPair>
	#include <QtCore/QStringList>	#include <QtCore/QStringList>


	#include <kurl.h>

	#ifdef Q_OS_WIN	#ifdef Q_OS_WIN
	#undef ERROR	#undef ERROR
	#endif	#endif

	class KUriFilterDataPrivate;	class KUriFilterDataPrivate;

	class KCModule;	class KCModule;

	/**	/**

	* A basic message object used for exchanging filtering	* A basic message object used for exchanging filtering information between
	* information between the filter plugins and the application	the
	* requesting the filtering service.	* filter plugins and the application requesting the filtering service.
	*	*

	* Use this object if you require a more detailed information	* Use this object if you require a more detailed information about the URI
	* about the URI you want to filter. Any application can create	you
	* an instance of this class and send it to KUriFilter to	* want to filter. Any application can create an instance of this class and
	* have the plugins fill out all possible information about the	send
	* URI.	* it to KUriFilter to have the plugins fill out all possible information ab
		out
		* the URI.
		*
		* The member functions provided by this class are thread safe and reentrant
		. However,
		* since the class itself is a Singleton, you have to take care when calling
		@ref self()
		* in multi-threaded applications. It is highly adviced that you hold a memb
		er variable
	*	*
	* \b Example	* \b Example
	*	*
	* \code	* \code
	* QString text = "kde.org";	* QString text = "kde.org";
	* KUriFilterData d = text;	* KUriFilterData d = text;
	* bool filtered = KUriFilter::self()->filter( d );	* bool filtered = KUriFilter::self()->filter( d );
	* cout << "URL: " << text.toLatin1() << endl	* cout << "URL: " << text.toLatin1() << endl
	* << "Filtered URL: " << d.uri().url().toLatin1() << endl	* << "Filtered URL: " << d.uri().url().toLatin1() << endl
	* << "URI Type: " << d.uriType() << endl	* << "URI Type: " << d.uriType() << endl

	skipping to change at line 79	skipping to change at line 83
	* URI Type: 0 <== means NET_PROTOCOL	* URI Type: 0 <== means NET_PROTOCOL
	* Was Filtered: 1 <== means the URL was successfully filtered	* Was Filtered: 1 <== means the URL was successfully filtered
	* \endcode	* \endcode
	*	*
	* @short A message object for exchanging filtering URI info.	* @short A message object for exchanging filtering URI info.
	* @author Dawit Alemayehu <adawit at kde.org>	* @author Dawit Alemayehu <adawit at kde.org>
	*/	*/

	class KIO_EXPORT KUriFilterData	class KIO_EXPORT KUriFilterData
	{	{

	friend class KUriFilterPlugin;

	public:	public:
	/**	/**
	* Describes the type of the URI that was filtered.	* Describes the type of the URI that was filtered.
	* Here is a brief description of the types:	* Here is a brief description of the types:
	*	*
	* @li NetProtocol - Any network protocol: http, ftp, nttp, pop3, etc. ..	* @li NetProtocol - Any network protocol: http, ftp, nttp, pop3, etc. ..
	* @li LocalFile - A local file whose executable flag is not set	* @li LocalFile - A local file whose executable flag is not set
	* @li LocalDir - A local directory	* @li LocalDir - A local directory
	* @li Executable - A local file whose executable flag is set	* @li Executable - A local file whose executable flag is set
	* @li Help - A man or info page	* @li Help - A man or info page

	skipping to change at line 108	skipping to change at line 110
	enum UriTypes { NetProtocol=0, LocalFile, LocalDir, Executable, Help, S hell, Blocked, Error, Unknown };	enum UriTypes { NetProtocol=0, LocalFile, LocalDir, Executable, Help, S hell, Blocked, Error, Unknown };

	/**	/**
	* Default constructor.	* Default constructor.
	*	*
	* Creates a UriFilterData object.	* Creates a UriFilterData object.
	*/	*/
	KUriFilterData();	KUriFilterData();

	/**	/**

	* Creates a UriFilterData object from the given URL.	* Creates a KUriFilterData object from the given URL.
	*	*
	* @param url is the URL to be filtered.	* @param url is the URL to be filtered.
	*/	*/
	explicit KUriFilterData( const KUrl& url );	explicit KUriFilterData( const KUrl& url );

	/**	/**

	* Creates a UriFilterData object from the given string.	* Creates a KUriFilterData object from the given string.
	*	*
	* @param url is the string to be filtered.	* @param url is the string to be filtered.
	*/	*/
	explicit KUriFilterData( const QString& url );	explicit KUriFilterData( const QString& url );

	/**	/**
	* Copy constructor.	* Copy constructor.
	*	*

	* Creates a UriFilterData object from another	* Creates a KUriFilterData object from another KURIFilterData object.
	* URI filter data object.
	*	*

	* @param data the uri filter data to be copied.	* @param other the uri filter data to be copied.
	*/	*/

	KUriFilterData( const KUriFilterData& data );	KUriFilterData( const KUriFilterData& other );

	/**	/**
	* Destructor.	* Destructor.
	*/	*/
	~KUriFilterData();	~KUriFilterData();

	/**	/**
	* Returns the filtered or the original URL.	* Returns the filtered or the original URL.
	*	*

	* This function returns the filtered url if one	* If one of the plugins successfully filtered the original input, this
	* of the plugins successfully filtered the original	* function returns it. Otherwise, it will return the input itself.
	* URL. Otherwise, it returns the original URL.
	* See hasBeenFiltered() and
	*	*
	* @return the filtered or original url.	* @return the filtered or original url.
	*/	*/
	KUrl uri() const;	KUrl uri() const;

	/**	/**
	* Returns an error message.	* Returns an error message.
	*	*

	* This functions returns the error message set	* This functions returns the error message set by the plugin whenever
	* by the plugin whenever the uri type is set to	the
	* KUriFilterData::ERROR. Otherwise, it returns	* uri type is set to KUriFilterData::ERROR. Otherwise, it returns a NU
	* a QString().	LL
		* string.
	*	*
	* @return the error message or a NULL when there is none.	* @return the error message or a NULL when there is none.
	*/	*/
	QString errorMsg() const;	QString errorMsg() const;

	/**	/**
	* Returns the URI type.	* Returns the URI type.
	*	*

	* This method always returns KUriFilterData::UNKNOWN	* This method always returns KUriFilterData::UNKNOWN if the given URL
	* if the given URL was not filtered.	was
		* not filtered.
		*
	* @return the type of the URI	* @return the type of the URI
	*/	*/
	UriTypes uriType() const;	UriTypes uriType() const;

	/**	/**

	* Same as above except the argument is a URL.	* Returns the absolute path if one has already been set.
	*	*

	* Use this function to set the string to be	* @return the absolute path, or QString()
	* filtered when you construct an empty filter
	* object.
	*	*

	* @param url the URL to be filtered.	* @see hasAbsolutePath()
	*/	*/

	void setData( const KUrl& url );	QString absolutePath() const;

	/**	/**

	* Sets the URL to be filtered.	* Checks whether the supplied data had an absolute path.
	*	*

	* Use this function to set the string to be	* @return true if the supplied data has an absolute path
	* filtered when you construct an empty filter
	* object.
	*	*

	* @param url the string to be filtered.	* @see absolutePath()
	*/	*/

	void setData( const QString& url );	bool hasAbsolutePath() const;

	/**	/**

	* Sets the absolute path to be used whenever the supplied	* Returns the command line options and arguments for a local resource
	* data is a relative local URL.	* when present.
	*	*

	* NOTE: This function should only be used for local resources,	* @return options and arguments when present, otherwise QString()
	* i.e. the "file:/" protocol. It is useful for specifying the	*/
	* absolute path in cases where the actual URL might be relative.	QString argsAndOptions() const;
	* meta object. If deriving the path from a KUrl, make sure you
	* set the argument for this function to the result of calling	/**
	* path () instead of url ().	* Checks whether the current data is a local resource with command lin
		e
		* options and arguments.
	*	*

	* @param abs_path the abolute path to the local resource.	* @return true if the current data has command line options and argume
	* @return true if absolute path is successfully set. Otherwise, false.	nts
	*/	*/

	bool setAbsolutePath( const QString& abs_path );	bool hasArgsAndOptions() const;

	/**	/**

	* Returns the absolute path if one has already been set.	* @return true if the filters should attempt to check whether the
	* @return the absolute path, or QString()	* supplied uri is an executable. False otherwise.
	* @see hasAbsolutePath()
	*/	*/

	QString absolutePath() const;	bool checkForExecutables() const;

	/**	/**

	* Checks whether the supplied data had an absolute path.	* The string as typed by the user, before any URL processing is done.
	* @return true if the supplied data has an absolute path
	* @see absolutePath()
	*/	*/

	bool hasAbsolutePath() const;	QString typedString() const;

	/**	/**

	* Returns the command line options and arguments for a	* Returns the search term portion of the typed string.
	* local resource when present.
	*	*

	* @return options and arguments when present, otherwise QString()	* If the @ref typedString was not filtered by a search filter plugin,
		this
		* function returns an empty string.
		*
		* @see typedString
		* @since 4.5
	*/	*/

	QString argsAndOptions() const;	QString searchTerm() const;

	/**	/**

	* Checks whether the current data is a local resource with	* Returns the character that is used to separate the search term from
	* command line options and arguments.	the
	* @return true if the current data has command line options and argume	* keyword.
	nts	*
		* If @ref typedString was not filtered by a search filter plugin, this
		* function returns a null charater.
		*
		* @see typedString
		* @since 4.5
	*/	*/

	bool hasArgsAndOptions() const;	QChar searchTermSeparator() const;

	/**	/**

	* Returns the name of the icon that matches	* Returns the name of the search service provider, e.g. Google.
	* the current filtered URL.
	*	*

	* NOTE that this function will return a NULL	* If @ref typedString was not filtered by a search filter plugin, this
	* string by default and when no associated icon	* function returns an empty string.
	* is found.
	*	*

	* @return the name of the icon associated with the resource,	* @see typedString
	* or QString() if not found	* @since 4.5
		*/
		QString searchProvider() const;

		/**
		* Returns a list of the names of the preferred search providers.
		*
		* This function returns the list of favorite or preferred providers on
		ly
		* when this data filtered through the default search uri plugin 'kuris
		earchfilter'.
		* Otherwise, it returns an empty list.
		*
		* You can use @ref queryForPreferredServiceProvider to obtain the quer
		ies
		* associated with the returned search providers.
		*
		* @see searchProvider
		* @since 4.5
		*/
		QStringList preferredSearchProviders() const;

		/**
		* Returns the query url for the given preferred search provider.
		*
		* You can use this function to obtain the query for the preferred sear
		ch
		* providers returned by @ref preferredSearchProviders. Note that this
		* function actually returns a query, e.g. "gg:foo bar", that must be
		* processed using the KUriFilter class.
		*
		* @see preferredSearchProviders
		* @since 4.5
		*/
		QString queryForPreferredSearchProvider(const QString &provider) const;

		/**
		* Returns the icon associated with the given preferred search provider
		.
		*
		* You can use this function to obtain the icon names associated with t
		he
		* preferred search providers returned by @ref preferredSearchProviders
		.
		*
		* @see preferredSearchProviders
		* @since 4.5
		*/
		QString iconNameForPreferredSearchProvider(const QString &provider) con
		st;

		/**
		* Returns the list of alternate search providers.
		*
		* This function returns an empty list if @ref setAlternateSearchProvid
		ers
		* was not called to set alternate search providers to be used in place
		of
		* the preferred search providers when they are not available.
		*
		* @see setAlternatteSearchProviders
		* @see preferredSearchProviders
		* @since 4.5
		*/
		QStringList alternateSearchProviders() const;

		/**
		* Returns the search provider to use when a default provider is not av
		ailable.
		*
		* The alternate default search provider is not set by default and this
		function
		* returns an empty string.
		*
		* @see setAlternateDefaultSearchProvider
		* @since 4.5
		*/
		QString alternateDefaultSearchProvider() const;

		/**
		* The name of the icon that matches the current filtered URL.
		*
		* This function returns a null string by default and when no icon is f
		ound
		* for the filtered URL.
	*/	*/
	QString iconName();	QString iconName();

	/**	/**
	* Check whether the provided uri is executable or not.	* Check whether the provided uri is executable or not.
	*	*

	* Setting this to false ensures that typing the name of	* Setting this to false ensures that typing the name of an executable
	* an executable does not start that application. This is	does
	* useful in the location bar of a browser. The default	* not start that application. This is useful in the location bar of a
	* value is true.	* browser. The default value is true.
	*/	*/
	void setCheckForExecutables (bool check);	void setCheckForExecutables (bool check);

	/**	/**

	* @return true if the filters should attempt to check whether the	* Same as above except the argument is a URL.
	* supplied uri is an executable. False otherwise.	*
		* Use this function to set the string to be filtered when you construc
		t an
		* empty filter object.
		*
		* @param url the URL to be filtered.
	*/	*/

	bool checkForExecutables() const;	void setData( const KUrl& url );

	/**	/**

	* @return the string as typed by the user, before any URL processing i	* Sets the URL to be filtered.
	s done	*
		* Use this function to set the string to be
		* filtered when you construct an empty filter
		* object.
		*
		* @param url the string to be filtered.
	*/	*/

	QString typedString() const;	void setData( const QString& url );

		/**
		* Sets the absolute path to be used whenever the supplied data is a
		* relative local URL.
		*
		* NOTE: This function should only be used for local resources, i.e. th
		e
		* "file:/" protocol. It is useful for specifying the absolute path in
		* cases where the actual URL might be relative. If deriving the path f
		rom
		* a KUrl, make sure you set the argument for this function to the resu
		lt
		* of calling path () instead of url ().
		*
		* @param abs_path the abolute path to the local resource.
		*
		* @return true if absolute path is successfully set. Otherwise, false.
		*/
		bool setAbsolutePath( const QString& abs_path );

		/**
		* Sets a list of search providers to use in case no default preferred
		search
		* providers are available.
		*
		* The list of preferred search providers set using this function will
		only be
		* used if the default and favorite search providers have not yet been
		configured
		* through the configuration dialogs. Otherwise, the providers specifie
		d by this
		* function will be ignored.
		*
		* @see alternatteSearchProviders
		* @see preferredSearchProviders
		* @since 4.5
		*/
		void setAlternateSearchProviders(const QStringList &providers);

		/**
		* Sets the search provider to use when there no default provider has b
		een
		* set by though the web shortcuts configuration dialog.
		*
		* @see setAlternateDefaultSearchProvider
		* @since 4.5
		*/
		void setAlternateDefaultSearchProvider(const QString &provider);

	/**	/**
	* Overloaded assigenment operator.	* Overloaded assigenment operator.
	*	*
	* This function allows you to easily assign a KUrl	* This function allows you to easily assign a KUrl
	* to a KUriFilterData object.	* to a KUriFilterData object.
	*	*
	* @return an instance of a KUriFilterData object.	* @return an instance of a KUriFilterData object.
	*/	*/
	KUriFilterData& operator=( const KUrl& url );	KUriFilterData& operator=( const KUrl& url );

	/**	/**
	* Overloaded assigenment operator.	* Overloaded assigenment operator.
	*	*

	* This function allows you to easily assign a QString	* This function allows you to easily assign a QString to a KUriFilterD
	* to a KUriFilterData object.	ata
		* object.
	*	*
	* @return an instance of a KUriFilterData object.	* @return an instance of a KUriFilterData object.
	*/	*/
	KUriFilterData& operator=( const QString& url );	KUriFilterData& operator=( const QString& url );

	private:	private:

		friend class KUriFilterPlugin;
	KUriFilterDataPrivate * const d;	KUriFilterDataPrivate * const d;
	};	};

	/**	/**
	* Base class for URI filter plugins.	* Base class for URI filter plugins.
	*	*

	* This class applies a single filter to a URI. All plugins designed	* This class applies a single filter to a URI. All plugins designed to pro
	* to provide URI filtering service should inherit from this abstract	vide
	* class and provide a concrete implementation.	* URI filtering service should inherit from this abstract class and provid
		e a
		* concrete implementation.
	*	*
	* All inheriting classes need to implement the pure virtual function	* All inheriting classes need to implement the pure virtual function

	* filterUri.	* @ref filterUri.
	*	*
	* @short Abstract class for URI filter plugins.	* @short Abstract class for URI filter plugins.
	*/	*/
	class KIO_EXPORT KUriFilterPlugin : public QObject	class KIO_EXPORT KUriFilterPlugin : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:

		/**
		* List for holding the following search provider information:
		* ([search provider name], [search query, search query icon name])
		*
		* @since 4.5
		*/
		typedef QHash<QString, QPair<QString, QString> > ProviderInfoList;

	/**	/**
	* Constructs a filter plugin with a given name	* Constructs a filter plugin with a given name
	*	*
	* @param parent the parent object, or 0 for no parent	* @param parent the parent object, or 0 for no parent
	* @param name the name of the plugin, mandatory	* @param name the name of the plugin, mandatory
	*/	*/
	explicit KUriFilterPlugin( const QString &name, QObject *parent = 0 );	explicit KUriFilterPlugin( const QString &name, QObject *parent = 0 );

	/**	/**
	* Filters a URI.	* Filters a URI.
	*	*
	* @param data the URI data to be filtered.	* @param data the URI data to be filtered.
	* @return A boolean indicating whether the URI has been changed.	* @return A boolean indicating whether the URI has been changed.
	*/	*/
	virtual bool filterUri( KUriFilterData& data ) const = 0;	virtual bool filterUri( KUriFilterData& data ) const = 0;

	/**	/**
	* Creates a configuration module for the filter.	* Creates a configuration module for the filter.
	*	*

	* It is the responsibility of the caller to delete the module	* It is the responsibility of the caller to delete the module once it
	* once it is not needed anymore.	is
		* not needed anymore.
	*	*
	* @return A configuration module, 0 if the filter isn't configurable.	* @return A configuration module, 0 if the filter isn't configurable.
	*/	*/
	virtual KCModule configModule( QWidget, const char* ) const;	virtual KCModule configModule( QWidget, const char* ) const;

	/**	/**
	* Returns the name of the configuration module for the filter.	* Returns the name of the configuration module for the filter.
	*	*
	* @return the name of a configuration module or QString() if none.	* @return the name of a configuration module or QString() if none.
	*/	*/

	skipping to change at line 363	skipping to change at line 488
	* Sets the error message in @p data to @p errormsg.	* Sets the error message in @p data to @p errormsg.
	*/	*/
	void setErrorMsg ( KUriFilterData& data, const QString& errmsg ) const;	void setErrorMsg ( KUriFilterData& data, const QString& errmsg ) const;

	/**	/**
	* Sets the URI type in @p data to @p type.	* Sets the URI type in @p data to @p type.
	*/	*/
	void setUriType ( KUriFilterData& data, KUriFilterData::UriTypes type) const;	void setUriType ( KUriFilterData& data, KUriFilterData::UriTypes type) const;

	/**	/**

	* Sets the arguments and options string in @p data	* Sets the arguments and options string in @p data to @p args if any w
	* to @p args if any were found during filterting.	ere
		* found during filterting.
	*/	*/
	void setArguments( KUriFilterData& data, const QString& args ) const;	void setArguments( KUriFilterData& data, const QString& args ) const;


		/**
		* Sets the name of the search provider, the search term and keyword/te
		rm
		* separator in @p data.
		*
		* @since 4.5
		*/
		void setSearchProvider( KUriFilterData &data, const QString& provider,
		const QString &term, const QChar &separator) co
		nst;

		/**
		* Sets the name of the preferred search providers in @p data.
		*
		* @since 4.5
		*/
		void setPreferredSearchProviders(KUriFilterData &data, const ProviderIn
		foList &providers) const;

		/**
		* Returns the icon name for the given @p url and URI @p type.
		*
		* @since 4.5
		*/
		QString iconNameFor(const KUrl& url, KUriFilterData::UriTypes type) con
		st;

	private:	private:
	class KUriFilterPluginPrivate * const d;	class KUriFilterPluginPrivate * const d;
	};	};

	class KUriFilterPrivate;	class KUriFilterPrivate;
	/**	/**
	* Manages the filtering of URIs.	* Manages the filtering of URIs.
	*	*
	* The intention of this plugin class is to allow people to extend the	* The intention of this plugin class is to allow people to extend the
	* functionality of KUrl without modifying it directly. This way KUrl will	* functionality of KUrl without modifying it directly. This way KUrl will

	* remain a generic parser capable of parsing any generic URL that adheres	* remain a generic parser capable of parsing any generic URL that adheres
	* to specifications.	to
		* specifications.
	*	*
	* The KUriFilter class applies a number of filters to a URI and returns th e	* The KUriFilter class applies a number of filters to a URI and returns th e
	* filtered version whenever possible. The filters are implemented using	* filtered version whenever possible. The filters are implemented using
	* plugins to provide easy extensibility of the filtering mechanism. New	* plugins to provide easy extensibility of the filtering mechanism. New

	* filters can be added in the future by simply inheriting from	* filters can be added in the future by simply inheriting from the
	* KUriFilterPlugin and implementing the KUriFilterPlugin::filterUri	* @ref KUriFilterPlugin class.
	* method.
	*	*
	* Use of this plugin-manager class is straight forward. Since it is a	* Use of this plugin-manager class is straight forward. Since it is a
	* singleton object, all you have to do is obtain an instance by doing	* singleton object, all you have to do is obtain an instance by doing
	* @p KUriFilter::self() and use any of the public member functions to	* @p KUriFilter::self() and use any of the public member functions to
	* preform the filtering.	* preform the filtering.
	*	*
	* \b Example	* \b Example
	*	*
	* To simply filter a given string:	* To simply filter a given string:
	*	*

	skipping to change at line 458	skipping to change at line 605
	* Destructor	* Destructor
	*/	*/
	~KUriFilter ();	~KUriFilter ();

	/**	/**
	* Returns an instance of KUriFilter.	* Returns an instance of KUriFilter.
	*/	*/
	static KUriFilter* self();	static KUriFilter* self();

	/**	/**

	* Filters the URI given by the object UriFilterData.	* Filters @p data using the specified @p filters.
	*	*

	* The given URL is filtered based on the specified list of filters.	* If no named filters are specified, the default, then all the
	* If the list is empty all available filters would be used.	* URI filter plugins found will be used.
	*	*
	* @param data object that contains the URI to be filtered.	* @param data object that contains the URI to be filtered.
	* @param filters specify the list of filters to be used.	* @param filters specify the list of filters to be used.
	*	*
	* @return a boolean indicating whether the URI has been changed	* @return a boolean indicating whether the URI has been changed
	*/	*/
	bool filterUri( KUriFilterData& data, const QStringList& filters = QStr ingList() );	bool filterUri( KUriFilterData& data, const QStringList& filters = QStr ingList() );

	/**	/**
	* Filters the URI given by the URL.	* Filters the URI given by the URL.

	skipping to change at line 523	skipping to change at line 670
	* If the list is empty all available filters would be used.	* If the list is empty all available filters would be used.
	*	*
	* @param uri the URI to filter.	* @param uri the URI to filter.
	* @param filters specify the list of filters to be used.	* @param filters specify the list of filters to be used.
	*	*
	* @return the filtered URI or null if it cannot be filtered	* @return the filtered URI or null if it cannot be filtered
	*/	*/
	QString filteredUri( const QString &uri, const QStringList& filters = Q StringList() );	QString filteredUri( const QString &uri, const QStringList& filters = Q StringList() );

	/**	/**

		* Filters @p data using only the default search uri filter plugins.
		*
		* Only use this function if you are sure that the input you want to
		* filter is a search term.
		*
		* @param data object that contains the URI to be filtered.
		* @return true if the the data specified by @p data was successfully f
		iltered.
		*
		* @since 4.5
		*/
		bool filterSearchUri(KUriFilterData &data);

		/**
	* Return a list of the names of all loaded plugins.	* Return a list of the names of all loaded plugins.
	*	*
	* @return a QStringList of plugin names	* @return a QStringList of plugin names
	*/	*/
	QStringList pluginNames() const;	QStringList pluginNames() const;

	protected:	protected:

	/**	/**

	* A protected constructor.	* Constructor.
	*	*

	* This constructor creates a KUriFilter and	* Creates a KUriFilter object and calls @ref loadPlugins to load all
	* initializes all plugins it can find by invoking	* available URI filter plugins.
	* loadPlugins.
	*/	*/
	KUriFilter();	KUriFilter();

	/**	/**
	* Loads all allowed plugins.	* Loads all allowed plugins.
	*	*

	* This function loads all filters that have not	* This function only loads URI filter plugins that have not been disab
	* been disbled.	led.
	*/	*/
	void loadPlugins();	void loadPlugins();

	private:	private:
	KUriFilterPrivate * const d;	KUriFilterPrivate * const d;
	};	};

	#endif	#endif

End of changes. 60 change blocks.
	110 lines changed or deleted	316 lines changed or added

	kurl.h	kurl.h

	skipping to change at line 397	skipping to change at line 397
	* @return true if the URL has a host	* @return true if the URL has a host
	**/	**/
	bool hasHost() const;	bool hasHost() const;

	/**	/**
	* Options to be used in adjustPath	* Options to be used in adjustPath
	*/	*/
	enum AdjustPathOption	enum AdjustPathOption
	{	{
	/**	/**

	* strips any trailing '/'	* strips a trailing '/', except when the path is already just "/".
	*/	*/
	RemoveTrailingSlash,	RemoveTrailingSlash,

	/**	/**
	* Do not change the path.	* Do not change the path.
	*/	*/
	LeaveTrailingSlash,	LeaveTrailingSlash,

	/**	/**
	* adds a trailing '/' if there is none yet	* adds a trailing '/' if there is none yet

	skipping to change at line 543	skipping to change at line 543
	* Returns the query of the URL.	* Returns the query of the URL.
	* The query may contain the 0 character.	* The query may contain the 0 character.
	* If a query is present it always starts with a '?'.	* If a query is present it always starts with a '?'.
	* A single '?' means an empty query.	* A single '?' means an empty query.
	* An empty string means no query.	* An empty string means no query.
	* @return The encoded query, or QString() if there is none.	* @return The encoded query, or QString() if there is none.
	*/	*/
	QString query() const;	QString query() const;

	/**	/**

		* Returns the reference (or "fragment") of the URL.
	* The reference is @em never decoded automatically.	* The reference is @em never decoded automatically.
	* @return the undecoded reference, or QString() if there is none	* @return the undecoded reference, or QString() if there is none
	*/	*/
	QString ref() const;	QString ref() const;

	/**	/**

	* Sets the reference part (everything after '#').	* Sets the reference/fragment part (everything after '#').
	* If you have an encoded fragment already (as a QByteArray), you can cal l setFragment directly.	* If you have an encoded fragment already (as a QByteArray), you can cal l setFragment directly.

	* @param fragment the encoded reference (or QString() to remove it).	* @param fragment the unencoded reference (or QString() to remove it).
	*/	*/
	void setRef( const QString& fragment );	void setRef( const QString& fragment );

	/**	/**

	* Checks whether the URL has a reference part.	* Checks whether the URL has a reference/fragment part.
	* @return true if the URL has a reference part. In a URL like	* @return true if the URL has a reference part. In a URL like
	* http://www.kde.org/kdebase.tar#tar:/README it would	* http://www.kde.org/kdebase.tar#tar:/README it would
	* return true, too.	* return true, too.
	*/	*/
	bool hasRef() const;	bool hasRef() const;

	/**	/**
	* Returns the HTML reference (the part of the URL after "#").	* Returns the HTML reference (the part of the URL after "#").
	* @return The HTML-style reference.	* @return The HTML-style reference.
	* @see split	* @see split

	skipping to change at line 869	skipping to change at line 870
	* @param ignore_trailing set to true to ignore trailing '/' characters.	* @param ignore_trailing set to true to ignore trailing '/' characters.
	* @return True if both urls are the same. If at least one of the urls is invalid,	* @return True if both urls are the same. If at least one of the urls is invalid,
	* false is returned.	* false is returned.
	* @see operator==. This function should be used if you want to	* @see operator==. This function should be used if you want to
	* ignore trailing '/' characters.	* ignore trailing '/' characters.
	* @deprecated Use equals() instead.	* @deprecated Use equals() instead.
	*/	*/
	KDE_DEPRECATED bool cmp( const KUrl &u, bool ignore_trailing = false ) co nst;	KDE_DEPRECATED bool cmp( const KUrl &u, bool ignore_trailing = false ) co nst;

	/**	/**

	* flags to be used in url compartators function like equal, or urlcmp	* Flags to be used in URL comparison functions like equals, or urlcmp
	**/	*/
	enum EqualsOption	enum EqualsOption
	{	{
	/**	/**

	* ignore trailing '/' characters	* ignore trailing '/' characters. The paths "dir" and "dir/" are treat
		ed the same.
		* Note however, that by default, the paths "" and "/" are not the same
		* (For instance ftp://user@host redirects to ftp://user@host/home/user
		(on a linux server),
		* while ftp://user@host/ is the root dir).
		* This is also why path(RemoveTrailingSlash) for "/" returns "/" and n
		ot "".
		*
		* When dealing with web pages however, you should also set AllowEmptyP
		ath so that
		* no path and "/" are considered equal.
	*/	*/
	CompareWithoutTrailingSlash = 0x01,	CompareWithoutTrailingSlash = 0x01,
	/**	/**
	* disables comparison of HTML-style references.	* disables comparison of HTML-style references.
	*/	*/

	CompareWithoutFragment = 0x02	CompareWithoutFragment = 0x02,
		/**
		* Treat a URL with no path as equal to a URL with a path of "/",
		* when CompareWithoutTrailingSlash is set.
		* Example:
		* KUrl::urlcmp("http://www.kde.org", "http://www.kde.org/", KUrl::Comp
		areWithoutTrailingSlash \| KUrl::AllowEmptyPath)
		* returns true.
		* This option is ignored if CompareWithoutTrailingSlash isn't set.
		* @since 4.5
		*/
		AllowEmptyPath = 0x04
	};	};
	Q_DECLARE_FLAGS(EqualsOptions,EqualsOption)	Q_DECLARE_FLAGS(EqualsOptions,EqualsOption)

	/**	/**
	* Compares this url with @p u.	* Compares this url with @p u.
	* @param u the URL to compare this one with.	* @param u the URL to compare this one with.
	* @param options a set of EqualsOption flags	* @param options a set of EqualsOption flags
	* @return True if both urls are the same. If at least one of the urls is invalid,	* @return True if both urls are the same. If at least one of the urls is invalid,
	* false is returned.	* false is returned.
	* @see operator==. This function should be used if you want to	* @see operator==. This function should be used if you want to

	* ignore trailing '/' characters.	* set additional options, like ignoring trailing '/' characters.
	*/	*/
	bool equals( const KUrl &u, const EqualsOptions& options=0 ) const;	bool equals( const KUrl &u, const EqualsOptions& options=0 ) const;

	/**	/**
	* Checks whether the given URL is parent of this URL.	* Checks whether the given URL is parent of this URL.
	* For instance, ftp://host/dir/ is a parent of ftp://host/dir/subdir/sub subdir/.	* For instance, ftp://host/dir/ is a parent of ftp://host/dir/subdir/sub subdir/.
	* @return true if this url is a parent of @p u (or the same URL as @p u)	* @return true if this url is a parent of @p u (or the same URL as @p u)
	*	*
	*/	*/
	bool isParentOf( const KUrl& u ) const;	bool isParentOf( const KUrl& u ) const;

	skipping to change at line 1089	skipping to change at line 1107
	* whether @p path has @p base_dir is a parent dir.	* whether @p path has @p base_dir is a parent dir.
	*/	*/
	static QString relativePath(const QString &base_dir, const QString &path, bool *isParent=0);	static QString relativePath(const QString &base_dir, const QString &path, bool *isParent=0);

	private:	private:
	void _setQuery( const QString& query );	void _setQuery( const QString& query );
	void _setEncodedUrl(const QByteArray& url);	void _setEncodedUrl(const QByteArray& url);
	QString toString() const; // forbidden, use url(), prettyUrl(), or pathOr Url() instead.	QString toString() const; // forbidden, use url(), prettyUrl(), or pathOr Url() instead.
	operator QString() const; // forbidden, use url(), prettyUrl(), or pathOr Url() instead.	operator QString() const; // forbidden, use url(), prettyUrl(), or pathOr Url() instead.
	private:	private:

	KUrlPrivate* const d;	KUrlPrivate* const d; // Don't ever use this, it would break clear() (whi ch is in QUrl)
	};	};

	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::EncodedPathAndQueryOptions)	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::EncodedPathAndQueryOptions)
	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::CleanPathOptions)	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::CleanPathOptions)
	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::QueryItemsOptions)	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::QueryItemsOptions)
	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::EqualsOptions)	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::EqualsOptions)
	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::DirectoryOptions)	Q_DECLARE_OPERATORS_FOR_FLAGS(KUrl::DirectoryOptions)

	Q_DECLARE_METATYPE(KUrl)	Q_DECLARE_METATYPE(KUrl)
	Q_DECLARE_METATYPE(KUrl::List)	Q_DECLARE_METATYPE(KUrl::List)

	/**	/**
	* \relates KUrl	* \relates KUrl
	* Compares URLs. They are parsed, split and compared.	* Compares URLs. They are parsed, split and compared.
	* Two malformed URLs with the same string representation	* Two malformed URLs with the same string representation
	* are nevertheless considered to be unequal.	* are nevertheless considered to be unequal.
	* That means no malformed URL equals anything else.	* That means no malformed URL equals anything else.

		* @deprecated use KUrl(_url1).equals(KUrl(_url2)) instead.
	*/	*/

	KDECORE_EXPORT bool urlcmp( const QString& _url1, const QString& _url2 );	KDECORE_EXPORT_DEPRECATED bool urlcmp( const QString& _url1, const QString& _url2 ); // KDE5: remove, KUrl::equals is better API

	/**	/**
	* \relates KUrl	* \relates KUrl
	* Compares URLs. They are parsed, split and compared.	* Compares URLs. They are parsed, split and compared.
	* Two malformed URLs with the same string representation	* Two malformed URLs with the same string representation
	* are nevertheless considered to be unequal.	* are nevertheless considered to be unequal.
	* That means no malformed URL equals anything else.	* That means no malformed URL equals anything else.
	*	*
	* @param _url1 A reference URL	* @param _url1 A reference URL
	* @param _url2 A URL that will be compared with the reference URL	* @param _url2 A URL that will be compared with the reference URL
	* @param options a set of KUrl::EqualsOption flags	* @param options a set of KUrl::EqualsOption flags

		* @deprecated use KUrl(_url1).equals(KUrl(_url2), options) instead.
	*/	*/

	KDECORE_EXPORT bool urlcmp( const QString& _url1, const QString& _url2, con st KUrl::EqualsOptions& options );	KDECORE_EXPORT_DEPRECATED bool urlcmp( const QString& _url1, const QString& _url2, const KUrl::EqualsOptions& options ); // KDE5: remove, KUrl::equals is better API

	KDECORE_EXPORT uint qHash(const KUrl& kurl);	KDECORE_EXPORT uint qHash(const KUrl& kurl);

	#endif	#endif

End of changes. 14 change blocks.
	12 lines changed or deleted	37 lines changed or added

	kurlnavigator.h	kurlnavigator.h
	/************************************************************************ *	/************************************************************************ *

	* Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at> *	* Copyright (C) 2006-2010 by Peter Penz <peter.penz@gmx.at> *
	* Copyright (C) 2006 by Aaron J. Seigo <aseigo@kde.org> *	* Copyright (C) 2006 by Aaron J. Seigo <aseigo@kde.org> *
	* Copyright (C) 2007 by Kevin Ottens <ervin@kde.org> *	* Copyright (C) 2007 by Kevin Ottens <ervin@kde.org> *
	* Copyright (C) 2007 by Urs Wolfer <uwolfer @ kde.org> *	* Copyright (C) 2007 by Urs Wolfer <uwolfer @ kde.org> *
	* *	* *
	* This library is free software; you can redistribute it and/or *	* This library is free software; you can redistribute it and/or *
	* modify it under the terms of the GNU Library General Public *	* modify it under the terms of the GNU Library General Public *

	* License version 2 as published by the Free Software Foundation.	* License as published by the Free Software Foundation; either
	*	*
		* 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. *
	* *	* *
	* 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 KURLNAVIGATOR_H	#ifndef KURLNAVIGATOR_H
	#define KURLNAVIGATOR_H	#define KURLNAVIGATOR_H

	#include <kfile_export.h>	#include <kfile_export.h>

	#include <kurl.h>	#include <kurl.h>
	#include <QtGui/QWidget>	#include <QtGui/QWidget>

		#include <QtCore/QByteArray>

	class KFilePlacesModel;	class KFilePlacesModel;
	class KUrlComboBox;	class KUrlComboBox;
	class QMouseEvent;	class QMouseEvent;

	/**	/**

	* @brief Allows to navigate through the paths of an URL.	* @brief Widget that allows to navigate through the paths of an URL.
	*	*
	* The URL navigator offers two modes:	* The URL navigator offers two modes:

	* - Editable: Represents the 'classic' mode, where the URL	* - Editable: Represents the 'classic' mode, where the URL of the loca tion
	* is editable inside a line editor. By pressing RETURN	* is editable inside a line editor. By pressing RETURN
	* the URL will get activated.	* the URL will get activated.

	* - Non editable ("breadcrumb view"): The URL is represented by a	* - Non editable ("breadcrumb view"): The URL of the location is represent
	* number of buttons, where each button represents a path	ed by
		* a number of buttons, where each button represents a path
	* of the URL. By clicking on a button the path will get	* of the URL. By clicking on a button the path will get
	* activated. This mode also supports drag and drop of item s.	* activated. This mode also supports drag and drop of item s.
	*	*
	* The mode can be changed by clicking on the empty area of the URL navigat or.	* The mode can be changed by clicking on the empty area of the URL navigat or.
	* It is recommended that the application remembers the setting	* It is recommended that the application remembers the setting
	* or allows to configure the default mode (see KUrlNavigator::setUrlEditab le()).	* or allows to configure the default mode (see KUrlNavigator::setUrlEditab le()).
	*	*
	* The URL navigator remembers the URL history during navigation and allows to go	* The URL navigator remembers the URL history during navigation and allows to go
	* back and forward within this history.	* back and forward within this history.
	*	*

	skipping to change at line 64	skipping to change at line 66
	* the full path should be shown. It is recommended that the application	* the full path should be shown. It is recommended that the application
	* remembers the setting or allows to configure the default mode (see	* remembers the setting or allows to configure the default mode (see
	* KUrlNavigator::setShowFullPath()).	* KUrlNavigator::setShowFullPath()).
	*	*
	* The typical usage of the KUrlNavigator is:	* The typical usage of the KUrlNavigator is:
	* - Create an instance providing a places model and an URL.	* - Create an instance providing a places model and an URL.
	* - Create an instance of QAbstractItemView which shows the content of the URL	* - Create an instance of QAbstractItemView which shows the content of the URL
	* given by the URL navigator.	* given by the URL navigator.
	* - Connect to the signal KUrlNavigator::urlChanged() and synchronize the content of	* - Connect to the signal KUrlNavigator::urlChanged() and synchronize the content of
	* QAbstractItemView with the URL given by the URL navigator.	* QAbstractItemView with the URL given by the URL navigator.

		*
		* It is recommended, that the application remembers the state of the QAbst
		ractItemView
		* when the URL has been changed. This allows to restore the view state whe
		n going back in history.
		* KUrlNavigator offers support for remembering the view state:
		* - The signal urlAboutToBeChanged() will be emitted before the URL change
		takes places.
		* This allows the application to store the view state by KUrlNavigator::
		saveLocationState().
		* - The signal urlChanged() will be emitted after the URL change took plac
		e. This allows
		* the application to restore the view state by getting the values from
		* KUrlNavigator::locationState().
	*/	*/
	class KFILE_EXPORT KUrlNavigator : public QWidget	class KFILE_EXPORT KUrlNavigator : public QWidget
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:

		/** @since 4.5 */
		KUrlNavigator(QWidget* parent = 0);

	/**	/**
	* @param placesModel Model for the places which are selectable insi de a	* @param placesModel Model for the places which are selectable insi de a
	* menu. A place can be a bookmark or a device. I f it is 0,	* menu. A place can be a bookmark or a device. I f it is 0,

	there is no places selector displayed.	* no places selector is displayed.
	* @param url URL which is used for the navigation or editin g.	* @param url URL which is used for the navigation or editin g.
	* @param parent Parent widget.	* @param parent Parent widget.
	*/	*/
	KUrlNavigator(KFilePlacesModel* placesModel, const KUrl& url, QWidget* parent);	KUrlNavigator(KFilePlacesModel* placesModel, const KUrl& url, QWidget* parent);
	virtual ~KUrlNavigator();	virtual ~KUrlNavigator();


	/** Returns the current URL. */	/**
	// KDE5: return 'KUrl' instead of 'const KUrl&'	* @return URL of the location given by the \a historyIndex. If \a hist
	const KUrl& url() const;	oryIndex
		* is smaller than 0, the URL of the current location is return
		ed.
		* @since 4.5
		*/
		KUrl locationUrl(int historyIndex = -1) const;

	/**	/**

	* Returns the currently entered, but not accepted URL.	* Saves the location state described by \a state for the current locat
	* Attention: It is possible that the returned URL is not valid!	ion. It is recommended
		* that at least the scroll position of a view is remembered and restor
		ed when traversing
		* through the history. Saving the location state should be done when t
		he signal
		* KUrlNavigator::urlAboutToBeChanged() has been emitted. Restoring the
		location state (see
		* KUrlNavigator::locationState()) should be done when the signal KUrlN
		avigator::urlChanged()
		* has been emitted.
		*
		* Example:
		* \code
		* QByteArray state;
		* QDataStream data(&state, QIODevice::WriteOnly);
		* data << QPoint(x, y);
		* data << ...;
		* ...
		* urlNavigator::saveLocationState(state);
		* \endcode
		*
		* @since 4.5
	*/	*/

	KUrl uncommittedUrl() const;	void saveLocationState(const QByteArray& state);

	/**	/**

	* Returns the portion of the current URL up to the path part given	* @return Location state given by \a historyIndex. If \a historyIndex
	* by \a index. Assuming that the current URL is /home/peter/Documents/	* is smaller than 0, the state of the current location is retu
	Music,	rned.
	* then the following URLs are returned for an index:	* @see KUrlNavigator::saveLocationState()
	* - index <= 0: /home	* @since 4.5
	* - index is 1: /home/peter
	* - index is 2: /home/peter/Documents
	* - index >= 3: /home/peter/Documents/Music
	*/	*/

	KUrl url(int index) const;	QByteArray locationState(int historyIndex = -1) const;

	/**	/**
	* Goes back one step in the URL history. The signals	* Goes back one step in the URL history. The signals

	* KUrlNavigator::urlChanged() and KUrlNavigator::historyChanged()	* KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::urlChanged() an
	* are emitted if true is returned. False is returned if the beginning	d
	* of the history has already been reached and hence going back was not	* KUrlNavigator::historyChanged() are emitted if true is returned. Fal
	* possible. The history index (see KUrlNavigator::historyIndex()) is	se is returned
		* if the beginning of the history has already been reached and hence g
		oing back was
		* not possible. The history index (see KUrlNavigator::historyIndex())
		is
	* increased by one if the operation was successful.	* increased by one if the operation was successful.
	*/	*/
	bool goBack();	bool goBack();

	/**	/**
	* Goes forward one step in the URL history. The signals	* Goes forward one step in the URL history. The signals

	* KUrlNavigator::urlChanged() and KUrlNavigator::historyChanged()	* KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::urlChanged() an
	* are emitted if true is returned. False is returned if the end	d
	* of the history has already been reached and hence going forward	* KUrlNavigator::historyChanged() are emitted if true is returned. Fal
		se is returned
		* if the end of the history has already been reached and hence going f
		orward
	* was not possible. The history index (see KUrlNavigator::historyIndex ()) is	* was not possible. The history index (see KUrlNavigator::historyIndex ()) is
	* decreased by one if the operation was successful.	* decreased by one if the operation was successful.
	*/	*/
	bool goForward();	bool goForward();

	/**	/**
	* Goes up one step of the URL path and remembers the old path	* Goes up one step of the URL path and remembers the old path

	* in the history. The signals KUrlNavigator::urlChanged() and	* in the history. The signals KUrlNavigator::urlAboutToBeChanged(),
	* KUrlNavigator::historyChanged() are emitted if true is returned.	* KUrlNavigator::urlChanged() and KUrlNavigator::historyChanged() are
	* False is returned if going up was not possible as the root has	* emitted if true is returned. False is returned if going up was not
	* been reached.	* possible as the root has been reached.
	*/	*/
	bool goUp();	bool goUp();

	/**	/**
	* Goes to the home URL and remembers the old URL in the history.	* Goes to the home URL and remembers the old URL in the history.

	* The signals KUrlNavigator::urlChanged()	* The signals KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::url Changed()
	* and KUrlNavigator::historyChanged() are emitted.	* and KUrlNavigator::historyChanged() are emitted.
	*	*
	* @see KUrlNavigator::setHomeUrl()	* @see KUrlNavigator::setHomeUrl()
	*/	*/
	void goHome();	void goHome();

	/**	/**
	* Sets the home URL used by KUrlNavigator::goHome(). If no	* Sets the home URL used by KUrlNavigator::goHome(). If no
	* home URL is set, the default home path of the user is used.	* home URL is set, the default home path of the user is used.

		* @since 4.5
	*/	*/

	void setHomeUrl(const QString& homeUrl);	void setHomeUrl(const KUrl& url);

		KUrl homeUrl() const;

	/**	/**
	* Allows to edit the URL of the navigation bar if \a editable	* Allows to edit the URL of the navigation bar if \a editable
	* is true, and sets the focus accordingly.	* is true, and sets the focus accordingly.
	* If \a editable is false, each part of	* If \a editable is false, each part of
	* the URL is presented by a button for a fast navigation ("breadcrumb view").	* the URL is presented by a button for a fast navigation ("breadcrumb view").
	*/	*/
	void setUrlEditable(bool editable);	void setUrlEditable(bool editable);

	/**	/**

	skipping to change at line 173	skipping to change at line 206
	* An URL like /home/user/Pictures/2008 is shown as [Pictures] > [2008]	* An URL like /home/user/Pictures/2008 is shown as [Pictures] > [2008]
	* in the breadcrumb view, if showing the full path is turned off. If	* in the breadcrumb view, if showing the full path is turned off. If
	* showing the full path is turned on, the URL is shown	* showing the full path is turned on, the URL is shown
	* as [/] > [home] > [Pictures] > [2008].	* as [/] > [home] > [Pictures] > [2008].
	* @since 4.2	* @since 4.2
	*/	*/
	void setShowFullPath(bool show);	void setShowFullPath(bool show);

	/**	/**
	* @return True, if the full path of the URL should be shown in the bre adcrumb view.	* @return True, if the full path of the URL should be shown in the bre adcrumb view.

	* @since 4.2	* @since 4.2
	*/	*/
	bool showFullPath() const;	bool showFullPath() const;

	/**	/**
	* Set the URL navigator to the active mode, if \a active	* Set the URL navigator to the active mode, if \a active
	* is true. The active mode is default. The inactive mode only differs	* is true. The active mode is default. The inactive mode only differs
	* visually from the active mode, no change of the behavior is given.	* visually from the active mode, no change of the behavior is given.
	*	*
	* Using the URL navigator in the inactive mode is useful when having s plit views,	* Using the URL navigator in the inactive mode is useful when having s plit views,
	* where the inactive view is indicated by an inactive URL	* where the inactive view is indicated by an inactive URL
	* navigator visually.	* navigator visually.
	*/	*/
	void setActive(bool active);	void setActive(bool active);

	/**	/**

	* Returns true, if the URL navigator is in the active mode.	* @return True, if the URL navigator is in the active mode.
	* @see KUrlNavigator::setActive()	* @see KUrlNavigator::setActive()
	*/	*/
	bool isActive() const;	bool isActive() const;

	/**	/**
	* Sets the places selector visible, if \a visible is true.	* Sets the places selector visible, if \a visible is true.
	* The places selector allows to select the places provided	* The places selector allows to select the places provided
	* by the places model passed in the constructor. Per default	* by the places model passed in the constructor. Per default
	* the places selector is visible.	* the places selector is visible.
	*/	*/
	void setPlacesSelectorVisible(bool visible);	void setPlacesSelectorVisible(bool visible);


	/** Returns true, if the places selector is visible. */	/** @return True, if the places selector is visible. */
	bool isPlacesSelectorVisible() const;	bool isPlacesSelectorVisible() const;


	/** Returns the amount of items in the history. */	/**
		* @return The currently entered, but not accepted URL.
		* It is possible that the returned URL is not valid.
		*/
		KUrl uncommittedUrl() const;

		/**
		* @return The amount of locations in the history. The data for each
		* location can be retrieved by KUrlNavigator::locationUrl() an
		d
		* KUrlNavigator::locationState().
		*/
	int historySize() const;	int historySize() const;

	/**	/**

	* Returns the history index of the current URL, where	* @return The history index of the current location, where
	* 0 <= history index < KUrlNavigator::historySize(). As long	* 0 <= history index < KUrlNavigator::historySize(). 0 is the
	* as KUrlNavigator::goBack() is not invoked, the history index	most
	* stays on 0.	* recent history entry.
	*/	*/
	int historyIndex() const;	int historyIndex() const;

	/**	/**

	* @return URL for the history element with the index \a historyIndex.	* @return The used editor when the navigator is in the edit mode
	* The history index 0 represents the most recent URL.	* @see KUrlNavigator::setUrlEditable()
	* @since 4.3
	*/	*/

	KUrl historyUrl(int historyIndex) const;	KUrlComboBox* editor() const;

	/**	/**

	* Returns the saved root URL for the current URL	* If an application supports only some special protocols, they can be
	* (see KUrlNavigator::saveRootUrl()).	set
		* with \a protocols .
	*/	*/

	// KDE5: return 'KUrl' instead of 'const KUrl&'	void setCustomProtocols(const QStringList& protocols);
	const KUrl& savedRootUrl() const;

	/**	/**

	* Returns the saved contents position of the upper left corner	* @return The custom protocols if they are set, QStringList() otherwis
	* for the current URL.	e.
	*/	*/

	QPoint savedPosition() const;	QStringList customProtocols() const;

	/**	/**

	* Returns the used editor when the navigator is in the edit mode	* @return The current URL of the location.
	* (see KUrlNavigator::setUrlEditable()).	* @deprecated Use KUrlNavigator::locationUrl() instead.
	*/	*/

	KUrlComboBox* editor() const;	KDE_DEPRECATED const KUrl& url() const;

	/**	/**

	* If an application supports only some special protocols, they can be	* @return The portion of the current URL up to the path part given
	set	* by \a index. Assuming that the current URL is /home/peter/Documents/
	* with \a protocols .	Music,
		* then the following URLs are returned for an index:
		* - index <= 0: /home
		* - index is 1: /home/peter
		* - index is 2: /home/peter/Documents
		* - index >= 3: /home/peter/Documents/Music
		* @deprecated It should not be necessary for a client of KUrlNavigator
		to query this information.
	*/	*/

	void setCustomProtocols(const QStringList &protocols);	KDE_DEPRECATED KUrl url(int index) const;

	/**	/**

	* Returns the custom protocols if they are set, QStringList() otherwis	* @return URL for the history element with the index \a historyIndex.
	e.	* The history index 0 represents the most recent URL.
		* @since 4.3
		* @deprecated Use KUrlNavigator::locationUrl(historyIndex) instead.
	*/	*/

	QStringList customProtocols() const;	KDE_DEPRECATED KUrl historyUrl(int historyIndex) const;

		/**
		* @return The saved root URL for the current URL (see KUrlNavigator::s
		aveRootUrl()).
		* @deprecated Use KUrlNavigator::locationState() instead.
		*/
		KDE_DEPRECATED const KUrl& savedRootUrl() const;

		/**
		* @return The saved contents position of the upper left corner
		* for the current URL.
		* @deprecated Use KUrlNavigator::locationState() instead.
		*/
		KDE_DEPRECATED QPoint savedPosition() const;

		/** @deprecated Use setHomeUrl(const KUrl& url) instead. */
		KDE_DEPRECATED void setHomeUrl(const QString& homeUrl);

	public Q_SLOTS:	public Q_SLOTS:
	/**	/**

	* Sets the active URL to \a url. The old URL is added to the history.	* Sets the location to \a url. The old URL is added to the history.
	* The signals KUrlNavigator::urlChanged() and KUrlNavigator::historyCh	* The signals KUrlNavigator::urlAboutToBeChanged(), KUrlNavigator::url
	anged()	Changed()
	* are emitted.	* and KUrlNavigator::historyChanged() are emitted. Use
		* KUrlNavigator::locationUrl() to read the location.
		* @since 4.5
	*/	*/

	void setUrl(const KUrl& url);	void setLocationUrl(const KUrl& url);

	/**	/**
	* Activates the URL navigator (KUrlNavigator::isActive() will return t rue)	* Activates the URL navigator (KUrlNavigator::isActive() will return t rue)
	* and emits the signal KUrlNavigator::activated().	* and emits the signal KUrlNavigator::activated().

		* @see KUrlNavigator::setActive()
	*/	*/
	void requestActivation();	void requestActivation();


		/* @see QWidget::setFocus() */
		void setFocus();

	/**	/**

	* Saves the used root URL of the content for the current history eleme	* Sets the location to \a url.
	nt.	* @deprecated Use KUrlNavigator::setLocationUrl(url).
	* Saving the root URL might be useful if the item view is represented
	by a tree or
	* columns, where it is mandatory to restore the root URL to iterating
	* through the history.
	*/	*/

	void saveRootUrl(const KUrl& url);	KDE_DEPRECATED void setUrl(const KUrl& url);

	/**	/**

	* Saves the coordinates of the contents for	* Saves the used root URL of the content for the current history eleme
	* the current history element. The contents of the URL is usually show	nt.
	n	* @deprecated Use KUrlNavigator::saveLocationState() instead.
	* inside an instance of QAbstractItemView. It is recommended to invoke
	this
	* slot whenever the upper left position of the QAbstractItemView has b
	een
	* changed to be able to restore the position when going back in histor
	y.
	*
	* @see KUrlNavigator::savedPosition()
	*/	*/

	void savePosition(int x, int y);	KDE_DEPRECATED void saveRootUrl(const KUrl& url);


	/* @see QWidget::setFocus() */	/**
	void setFocus();	* Saves the coordinates of the contents for the current history elemen
		t.
		* @deprecated Use KUrlNavigator::saveLocationState() instead.
		*/
		KDE_DEPRECATED void savePosition(int x, int y);

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Is emitted, if the URL navigator has been activated by	* Is emitted, if the URL navigator has been activated by

	* a user interaction.	* an user interaction
		* @see KUrlNavigator::setActive()
	*/	*/
	void activated();	void activated();

	/**	/**

	* Is emitted, if the URL has been changed e. g. by	* Is emitted, if the location URL has been changed e. g. by
	* the user.	* the user.
	* @see KUrlNavigator::setUrl()	* @see KUrlNavigator::setUrl()
	*/	*/
	void urlChanged(const KUrl& url);	void urlChanged(const KUrl& url);

	/**	/**

		* Is emitted, before the location URL is going to be changed to \a new
		Url.
		* The signal KUrlNavigator::urlChanged() will be emitted after the cha
		nge
		* has been done. Connecting to this signal is useful to save the state
		* of a view with KUrlNavigator::saveLocationState().
		* @since 4.5
		*/
		void urlAboutToBeChanged(const KUrl& newUrl);

		/**
	* Is emitted, if the editable state for the URL has been changed	* Is emitted, if the editable state for the URL has been changed
	* (see KUrlNavigator::setUrlEditable()).	* (see KUrlNavigator::setUrlEditable()).
	*/	*/
	void editableStateChanged(bool editable);	void editableStateChanged(bool editable);

	/**	/**
	* Is emitted, if the history has been changed. Usually	* Is emitted, if the history has been changed. Usually
	* the history is changed if a new URL has been selected.	* the history is changed if a new URL has been selected.
	*/	*/
	void historyChanged();	void historyChanged();

	/**	/**

	* Is emitted if the URLs \a urls have been dropped
	* to the destination \a destination.
	*/
	// KDE5: remove, as the signal has been replaced by
	// urlsDropped(const KUrl& destination, QDropEvent* event)
	void urlsDropped(const KUrl::List& urls,
	const KUrl& destination);

	/**
	* Is emitted if a dropping has been done above the destination	* Is emitted if a dropping has been done above the destination
	* \a destination. The receiver must accept the drop event if	* \a destination. The receiver must accept the drop event if
	* the dropped data can be handled.	* the dropped data can be handled.

	*
	* @since 4.2	* @since 4.2
	*/	*/
	void urlsDropped(const KUrl& destination, QDropEvent* event);	void urlsDropped(const KUrl& destination, QDropEvent* event);

	/**	/**
	* This signal is emitted when the Return or Enter key is pressed.	* This signal is emitted when the Return or Enter key is pressed.
	*/	*/
	void returnPressed();	void returnPressed();


		/**
		* Is emitted if the URL \a url should be opened in a new tab because
		* the user clicked on a breadcrumb with the middle mouse button.
		* @since 4.5
		*/
		void tabRequested(const KUrl& url);

		/**
		* Is emitted if the URLs \a urls have been dropped
		* to the destination \a destination.
		* @deprecated Use
		* KUrlNavigator::urlsDropped(const KUrl& destination, QDropEvent* even
		t)
		* instead.
		*/
		// KDE5: remove, as the signal has been replaced by
		// urlsDropped(const KUrl& destination, QDropEvent* event)
		KDE_DEPRECATED void urlsDropped(const KUrl::List& urls,
		const KUrl& destination);

	protected:	protected:
	/*	/*
	* If the Escape key is pressed, the navigation bar should switch	* If the Escape key is pressed, the navigation bar should switch
	* to the breadcrumb view.	* to the breadcrumb view.

	* @see QWidget::keyReleaseEvent()	* @see QWidget::keyPressEvent()
		*/
		virtual void keyPressEvent(QKeyEvent* event);

		/**
		* Reimplemented for internal purposes
	*/	*/
	virtual void keyReleaseEvent(QKeyEvent* event);	virtual void keyReleaseEvent(QKeyEvent* event);

	/*	/*
	* Paste the clipboard content as URL, if the middle mouse	* Paste the clipboard content as URL, if the middle mouse
	* button has been clicked.	* button has been clicked.
	* @see QWidget::mouseReleaseEvent()	* @see QWidget::mouseReleaseEvent()
	*/	*/
	virtual void mouseReleaseEvent(QMouseEvent* event);	virtual void mouseReleaseEvent(QMouseEvent* event);

	/* @see QWidget::resizeEvent() */	/* @see QWidget::resizeEvent() */
	virtual void resizeEvent(QResizeEvent* event);	virtual void resizeEvent(QResizeEvent* event);

	virtual bool eventFilter(QObject* watched, QEvent* event);	virtual bool eventFilter(QObject* watched, QEvent* event);

	private:	private:
	Q_PRIVATE_SLOT(d, void slotReturnPressed())	Q_PRIVATE_SLOT(d, void slotReturnPressed())

	Q_PRIVATE_SLOT(d, void slotRemoteHostActivated())
	Q_PRIVATE_SLOT(d, void slotProtocolChanged(const QString& protocol))	Q_PRIVATE_SLOT(d, void slotProtocolChanged(const QString& protocol))
	Q_PRIVATE_SLOT(d, void switchView())	Q_PRIVATE_SLOT(d, void switchView())
	Q_PRIVATE_SLOT(d, void dropUrls(const KUrl& destination, QDropEvent*))	Q_PRIVATE_SLOT(d, void dropUrls(const KUrl& destination, QDropEvent*))

		Q_PRIVATE_SLOT(d, void slotNavigatorButtonClicked(const KUrl& url, Qt::
		MouseButton button))
		Q_PRIVATE_SLOT(d, void openContextMenu())
	Q_PRIVATE_SLOT(d, void openPathSelectorMenu())	Q_PRIVATE_SLOT(d, void openPathSelectorMenu())
	Q_PRIVATE_SLOT(d, void updateButtonVisibility())	Q_PRIVATE_SLOT(d, void updateButtonVisibility())
	Q_PRIVATE_SLOT(d, void switchToBreadcrumbMode())	Q_PRIVATE_SLOT(d, void switchToBreadcrumbMode())

		Q_PRIVATE_SLOT(d, void slotPathBoxChanged(const QString& text))
	Q_PRIVATE_SLOT(d, void updateContent())	Q_PRIVATE_SLOT(d, void updateContent())

	private:	private:
	class Private;	class Private;
	Private* const d;	Private* const d;

	Q_DISABLE_COPY(KUrlNavigator)	Q_DISABLE_COPY(KUrlNavigator)
	};	};

	#endif	#endif

End of changes. 56 change blocks.
	106 lines changed or deleted	224 lines changed or added

	kwallet.h	kwallet.h

	skipping to change at line 498	skipping to change at line 498
	* @param handle the wallet's handle	* @param handle the wallet's handle
	*/	*/
	void walletAsyncOpened(int tId, int handle);	void walletAsyncOpened(int tId, int handle);

	/**	/**
	* @internal	* @internal
	* DBUS error slot.	* DBUS error slot.
	*/	*/
	void emitWalletAsyncOpenError();	void emitWalletAsyncOpenError();


	/**
	* @internal
	* Used to detect when the wallet service dies.
	*/
	void slotServiceOwnerChanged(const QString&,const QString&,c
	onst QString&);

	private:	private:
	class WalletPrivate;	class WalletPrivate;
	WalletPrivate* const d;	WalletPrivate* const d;

		Q_PRIVATE_SLOT(d, void walletServiceUnregistered())

	protected:	protected:
	/**	/**
	* @internal	* @internal
	*/	*/
	virtual void virtual_hook(int id, void *data);	virtual void virtual_hook(int id, void *data);
	};	};

	}	}


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

	kwebpage.h	kwebpage.h
	/*	/*
	* This file is part of the KDE project.	* This file is part of the KDE project.
	*	*
	* Copyright (C) 2008 Dirk Mueller <mueller@kde.org>	* Copyright (C) 2008 Dirk Mueller <mueller@kde.org>
	* Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>	* Copyright (C) 2008 Urs Wolfer <uwolfer @ kde.org>
	* Copyright (C) 2008 Michael Howell <mhowell123@gmail.com>	* Copyright (C) 2008 Michael Howell <mhowell123@gmail.com>

	* Copyright (C) 2009 Dawit Alemayehu <adawit @ kde.org>	* Copyright (C) 2009,2010 Dawit Alemayehu <adawit @ 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 129	skipping to change at line 129
	*	*
	* @see KWebWallet	* @see KWebWallet
	*/	*/
	void setWallet(KWebWallet* wallet);	void setWallet(KWebWallet* wallet);

	public Q_SLOTS:	public Q_SLOTS:
	/**	/**
	* Downloads @p request using KIO.	* Downloads @p request using KIO.
	*	*
	* This slot first prompts the user where to put/save the requested	* This slot first prompts the user where to put/save the requested

	* resource and then downloads using KIO::file_copy.	* resource and then downloads it using KIO.
	*/	*/
	virtual void downloadRequest(const QNetworkRequest &request);	virtual void downloadRequest(const QNetworkRequest &request);

	/**	/**
	* Downloads @p url using KIO.	* Downloads @p url using KIO.
	*	*
	* This slot first prompts the user where to put/save the requested	* This slot first prompts the user where to put/save the requested

	* resource and then downloads using KIO::file_copy.	* resource and then downloads it using KIO.
	*/	*/
	virtual void downloadUrl(const KUrl &url);	virtual void downloadUrl(const KUrl &url);


		/**
		* Downloads the resource specified by @p reply using KIO.
		*
		* This slot first prompts the user where to save the requested resourc
		e
		* and then downloads it using KIO.
		*
		* @since 4.5
		*/
		void downloadResponse(QNetworkReply *reply);

	protected:	protected:
	/**	/**
	* Returns the value of the permanent (per session) meta data for the g iven @p key.	* Returns the value of the permanent (per session) meta data for the g iven @p key.
	*	*
	* @see KIO::MetaData	* @see KIO::MetaData
	*/	*/
	QString sessionMetaData(const QString &key) const;	QString sessionMetaData(const QString &key) const;

	/**	/**
	* Returns the value of the temporary (per request) meta data for the g iven @p key.	* Returns the value of the temporary (per request) meta data for the g iven @p key.

	skipping to change at line 187	skipping to change at line 197
	* Remove session meta data associated with @p key.	* Remove session meta data associated with @p key.
	*/	*/
	void removeSessionMetaData(const QString &key);	void removeSessionMetaData(const QString &key);

	/**	/**
	* Remove request meta data associated with @p key.	* Remove request meta data associated with @p key.
	*/	*/
	void removeRequestMetaData(const QString &key);	void removeRequestMetaData(const QString &key);

	/**	/**

	* Reimplemented for internal reasons, the API is not affected.	* This function is re-implemented to provide KDE user-agent management
		* integration through KProtocolManager.
	*	*

		* @see KProtocolManager::userAgentForUrl.
	* @see QWebPage::userAgentForUrl.	* @see QWebPage::userAgentForUrl.

	* @internal
	*/	*/
	virtual QString userAgentForUrl(const QUrl& url) const;	virtual QString userAgentForUrl(const QUrl& url) const;

	/**	/**
	* Reimplemented for internal reasons, the API is not affected.	* Reimplemented for internal reasons, the API is not affected.
	*	*
	* @see QWebPage::acceptNavigationRequest.	* @see QWebPage::acceptNavigationRequest.
	* @internal	* @internal
	*/	*/
	virtual bool acceptNavigationRequest(QWebFrame * frame, const QNetworkR equest & request, NavigationType type);	virtual bool acceptNavigationRequest(QWebFrame * frame, const QNetworkR equest & request, NavigationType type);

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

	kwebpluginfactory.h	kwebpluginfactory.h

	skipping to change at line 36	skipping to change at line 36
	#include <kdewebkit_export.h>	#include <kdewebkit_export.h>

	#include <QtWebKit/QWebPluginFactory>	#include <QtWebKit/QWebPluginFactory>

	/**	/**
	* @short An enhanced QWebPluginFactory with integration into the KDE envir onment.	* @short An enhanced QWebPluginFactory with integration into the KDE envir onment.
	*	*
	* @author Michael Howell <mhowell123@gmail.com>	* @author Michael Howell <mhowell123@gmail.com>
	* @author Dawit Alemayehu <adawit@kde.org>	* @author Dawit Alemayehu <adawit@kde.org>
	*	*

		* @see QWebPluginFactory
	* @since 4.4	* @since 4.4
	*/	*/
	class KDEWEBKIT_EXPORT KWebPluginFactory : public QWebPluginFactory	class KDEWEBKIT_EXPORT KWebPluginFactory : public QWebPluginFactory
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	/**	/**
	* Constructs a KWebPluginFactory with parent @p parent.	* Constructs a KWebPluginFactory with parent @p parent.
	*/	*/
	KWebPluginFactory(QObject *parent);	KWebPluginFactory(QObject *parent);

	skipping to change at line 74	skipping to change at line 75
	* Reimplemented for internal reasons, the API is not affected.	* Reimplemented for internal reasons, the API is not affected.
	*	*
	* @see QWebPluginFactory::plugins	* @see QWebPluginFactory::plugins
	* @internal	* @internal
	*/	*/
	virtual QList<Plugin> plugins() const;	virtual QList<Plugin> plugins() const;

	private:	private:
	class KWebPluginFactoryPrivate;	class KWebPluginFactoryPrivate;
	KWebPluginFactoryPrivate* const d;	KWebPluginFactoryPrivate* const d;


		Q_PRIVATE_SLOT(d, void _k_slotMimeType(KIO::Job *, const QString &))
	};	};

	#endif // KWEBPLUGINFACTORY_H	#endif // KWEBPLUGINFACTORY_H

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

	kwebwallet.h	kwebwallet.h

	skipping to change at line 202	skipping to change at line 202
	* This signal is emitted whenever a save form data request is complete d.	* This signal is emitted whenever a save form data request is complete d.
	*	*
	* @p ok will be set to true if the save form data request for @p url w as	* @p ok will be set to true if the save form data request for @p url w as
	* completed successfully.	* completed successfully.
	*	*
	* @see saveFormDataRequested	* @see saveFormDataRequested
	*/	*/
	void saveFormDataCompleted(const QUrl &url, bool ok);	void saveFormDataCompleted(const QUrl &url, bool ok);

	/**	/**

		* This signal is emitted whenever a fill form data request is complete
		d.
		*
		* @p ok will be set to true if any forms were successfully filled with
		* cached data from the persistent storage.
		*
		* @see fillFormData
		* @since 4.5
		*/
		void fillFormRequestCompleted(bool ok);

		/**
	* This signal is emitted whenever the current wallet is closed.	* This signal is emitted whenever the current wallet is closed.
	*/	*/
	void walletClosed();	void walletClosed();

	protected:	protected:
	/**	/**
	* Returns a list of forms for @p url that are waiting to be filled.	* Returns a list of forms for @p url that are waiting to be filled.
	*	*
	* This function returns an empty list if there is no pending requests	* This function returns an empty list if there is no pending requests
	* for filling forms associated with @p url.	* for filling forms associated with @p url.

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

	label.h	label.h

	skipping to change at line 50	skipping to change at line 50
	class PLASMA_EXPORT Label : public QGraphicsProxyWidget	class PLASMA_EXPORT Label : 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(Qt::Alignment alignment READ alignment WRITE setAlignment)	Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
	Q_PROPERTY(bool hasScaledContents READ hasScaledContents WRITE setScale dContents)	Q_PROPERTY(bool hasScaledContents READ hasScaledContents WRITE setScale dContents)
	Q_PROPERTY(bool textSelectable READ textSelectable WRITE setTextSelecta ble)	Q_PROPERTY(bool textSelectable READ textSelectable WRITE setTextSelecta ble)

		Q_PROPERTY(bool wordWrap READ wordWrap WRITE setWordWrap)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(QLabel *nativeWidget READ nativeWidget)	Q_PROPERTY(QLabel *nativeWidget READ nativeWidget)

	public:	public:
	/**	/**
	* Constructs a label with word wrap on by default	* Constructs a label with word wrap on by default
	*	*
	* @arg parent the parent of this widget	* @arg parent the parent of this widget
	*/	*/
	explicit Label(QGraphicsWidget *parent = 0);	explicit Label(QGraphicsWidget *parent = 0);

	skipping to change at line 125	skipping to change at line 126
	*/	*/
	void setTextSelectable(bool enable);	void setTextSelectable(bool enable);

	/**	/**
	* @return true if the text is selectable with the mouse	* @return true if the text is selectable with the mouse
	* @since 4.4	* @since 4.4
	*/	*/
	bool textSelectable() const;	bool textSelectable() const;

	/**	/**

		* Sets if the text of the label can wrap in multiple lines
		*
		* @arg wrap multiple lines or not
		* @since 4.5
		*/
		void setWordWrap(bool wrap);

		/**
		* @return true if the label text can wrap in multiple lines if too lon
		g
		* @since 4.5
		*/
		bool wordWrap() const;

		/**
	* Sets the stylesheet used to control the visual display of this Label	* Sets the stylesheet used to control the visual display of this Label
	*	*
	* @arg stylesheet a CSS string	* @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 157	skipping to change at line 172

	protected:	protected:
	void resizeEvent(QGraphicsSceneResizeEvent *event);	void resizeEvent(QGraphicsSceneResizeEvent *event);
	void mousePressEvent(QGraphicsSceneMouseEvent *event);	void mousePressEvent(QGraphicsSceneMouseEvent *event);
	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	void paint(QPainter *painter,	void paint(QPainter *painter,
	const QStyleOptionGraphicsItem *option,	const QStyleOptionGraphicsItem *option,
	QWidget *widget);	QWidget *widget);
	void changeEvent(QEvent *event);	void changeEvent(QEvent *event);
	bool event(QEvent *event);	bool event(QEvent *event);

		QVariant itemChange(GraphicsItemChange change, const QVariant & value);
	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);

		QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const;

	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. 4 change blocks.
	0 lines changed or deleted	18 lines changed or added

	lineedit.h	lineedit.h

	skipping to change at line 46	skipping to change at line 46
	*	*
	* @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 clearButtonShown READ isClearButtonShown WRITE setClear ButtonShown)	Q_PROPERTY(bool clearButtonShown READ isClearButtonShown WRITE setClear ButtonShown)

		Q_PROPERTY(QString clickMessage READ clickMessage WRITE setClickMessage )
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_PROPERTY(KLineEdit *nativeWidget READ nativeWidget WRITE setNativeWid get)	Q_PROPERTY(KLineEdit *nativeWidget READ nativeWidget WRITE setNativeWid get)

	public:	public:
	explicit LineEdit(QGraphicsWidget *parent = 0);	explicit LineEdit(QGraphicsWidget *parent = 0);
	~LineEdit();	~LineEdit();

	/**	/**
	* Sets the display text for this LineEdit	* Sets the display text for this LineEdit
	*	*

	skipping to change at line 78	skipping to change at line 79
	*/	*/
	void setClearButtonShown(bool show);	void setClearButtonShown(bool show);

	/**	/**
	* @return true if the clear button is set to be shown	* @return true if the clear button is set to be shown
	* @since 4.3	* @since 4.3
	*/	*/
	bool isClearButtonShown() const;	bool isClearButtonShown() const;

	/**	/**

		* Sets a greyed out message that will go away after the user clicked t
		he line edit
		*
		* @param message the message
		* @since 4.5
		*/
		void setClickMessage(const QString &message);

		/**
		* @return the text of a greyed out message that will go away when clic
		ked
		* @since 4.5
		*/
		QString clickMessage() const;

		/**
	* Sets the stylesheet used to control the visual display of this LineE dit	* Sets the stylesheet used to control the visual display of this LineE dit
	*	*
	* @arg stylesheet a CSS string	* @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 107	skipping to change at line 122
	/**	/**
	* @return the native widget wrapped by this LineEdit	* @return the native widget wrapped by this LineEdit
	*/	*/
	KLineEdit *nativeWidget() const;	KLineEdit *nativeWidget() const;

	protected:	protected:
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	void changeEvent(QEvent *event);	void changeEvent(QEvent *event);
	void paint(QPainter painter, const QStyleOptionGraphicsItem option, Q Widget *widget);	void paint(QPainter painter, const QStyleOptionGraphicsItem option, Q Widget *widget);

		void mousePressEvent(QGraphicsSceneMouseEvent *event);
		void focusOutEvent(QFocusEvent *event);

	Q_SIGNALS:	Q_SIGNALS:
	void editingFinished();	void editingFinished();
	void returnPressed();	void returnPressed();
	void textEdited(const QString &text);	void textEdited(const QString &text);

	/**	/**
	* Emitted when the text changes	* Emitted when the text changes
	* @since 4.4	* @since 4.4
	*/	*/

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

	literalterm.h	literalterm.h

	skipping to change at line 65	skipping to change at line 65
	* As a term by itself %LiteralTerm will act like a traditional ful l text query and	* As a term by itself %LiteralTerm will act like a traditional ful l text query and
	* match all resources that contain the string value in some proper ty.	* match all resources that contain the string value in some proper ty.
	*	*
	* \code	* \code
	* LiteralTerm( "nepomuk" );	* LiteralTerm( "nepomuk" );
	* \endcode	* \endcode
	*	*
	* The example above will match all resources that have a property with a value containing	* The example above will match all resources that have a property with a value containing
	* the string "nepomuk".	* the string "nepomuk".
	*	*

		* \section literalterm_examples Examples
		*
		* <pre>LiteralTerm("nepomuk")</pre> searches for the term "nepomuk
		".
		*
		* <pre>LiteralTerm("'nepomuk*'")</pre> searches for the terms star
		ting with "nepomuk".
		*
		* <pre>LiteralTerm("'nepomuk kde'")</pre> searches for the term "n
		epomuk kde".
		*
		* <pre>LiteralTerm("'nepomuk* kde'")</pre> searches for terms matc
		hing "nepomuk* kde".
		*
		* %LiteralTerm always tries to normalize the query terms as best a
		s possible. This includes
		* automatically adding quotes as needed.
		*
		* \warning Be aware that the examples above apply to using %Litera
		lTerm as a stand-alone term
		* or in a ComparisonTerm::Contains term. When using ComparisonTerm
		::Regexp the test as specified
		* will be used as-is to create the regular expression.
		*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*	*
	* \since 4.4	* \since 4.4
	*/	*/
	class NEPOMUKQUERY_EXPORT LiteralTerm : public Term	class NEPOMUKQUERY_EXPORT LiteralTerm : public Term
	{	{
	public:	public:
	/**	/**
	* Copy constructor.	* Copy constructor.
	*/	*/

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

	meter.h	meter.h

	skipping to change at line 211	skipping to change at line 211
	*/	*/
	void setValue(int value);	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);

		QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF() ) const;

	private:	private:

	Q_PRIVATE_SLOT(d, void progressChanged(qreal))
	MeterPrivate *const d;	MeterPrivate *const d;
	};	};

	} // End of namepace	} // End of namepace

	#endif	#endif

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

	opticaldrive.h	opticaldrive.h

	skipping to change at line 157	skipping to change at line 157
	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* This signal is emitted when the eject button is pressed	* This signal is emitted when the eject button is pressed
	* on the drive.	* on the drive.
	*	*
	* Please note that some (broken) drives doesn't report this event.	* Please note that some (broken) drives doesn't report this event.
	* @param udi the UDI of the drive	* @param udi the UDI of the drive
	*/	*/
	void ejectPressed(const QString &udi);	void ejectPressed(const QString &udi);


		/**
		* This signal is emitted when the attempted eject process on this
		* drive is completed. The signal might be spontaneous, i.e.
		* it can be triggered by another process.
		*
		* @param error type of error that occurred, if any
		* @param errorData more information about the error, if any
		* @param udi the UDI of the volume
		*/
	void ejectDone(Solid::ErrorType error, QVariant errorData, const QS tring &udi);	void ejectDone(Solid::ErrorType error, QVariant errorData, const QS tring &udi);


		/**
		* This signal is emitted when eject on this drive is
		* requested. The signal might be spontaneous, i.e. it
		* can be triggered by another process.
		*
		* @param udi the UDI of the volume
		*/
		void ejectRequested(const QString &udi);

	};	};
	}	}

	Q_DECLARE_OPERATORS_FOR_FLAGS(Solid::OpticalDrive::MediumTypes)	Q_DECLARE_OPERATORS_FOR_FLAGS(Solid::OpticalDrive::MediumTypes)

	#endif // SOLID_OPTICALDRIVE_H	#endif // SOLID_OPTICALDRIVE_H

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

	packagemetadata.h	packagemetadata.h

	skipping to change at line 111	skipping to change at line 111
	*/	*/
	void setName(const QString &);	void setName(const QString &);

	/**	/**
	* Set the description used to provide some general	* Set the description used to provide some general
	* information what the package is about.	* information what the package is about.
	*/	*/
	void setDescription(const QString &);	void setDescription(const QString &);

	/**	/**

		* Returns the icon name associated with this package, or QString() if
		none
		* @since 4.5
		*/
		QString icon() const;

		/**
		* Set the icon name to be used with this package
		* @since 4.5
		*/
		void setIcon(const QString &icon);

		/**
	* Set the keywords used to provide search and categorizations	* Set the keywords used to provide search and categorizations
	* @param keywords the keywords to associate with this package	* @param keywords the keywords to associate with this package
	*/	*/
	void setKeywords(const QStringList &keywords);	void setKeywords(const QStringList &keywords);

	/**	/**
	* Set the service-type which defines the X-KDE-ServiceTypes	* Set the service-type which defines the X-KDE-ServiceTypes
	* type within the desktop file. If not defined this	* type within the desktop file. If not defined this
	* defaults to "Plasma/Applet,Plasma/Containment" in the	* defaults to "Plasma/Applet,Plasma/Containment" in the
	* desktop file.	* desktop file.

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

	paintutils.h	paintutils.h

	skipping to change at line 72	skipping to change at line 72
	int radius = 2);	int radius = 2);

	PLASMA_EXPORT void drawHalo(QPainter *painter, const QRectF &rect);	PLASMA_EXPORT void drawHalo(QPainter *painter, const QRectF &rect);

	/**	/**
	* Returns a nicely rounded rectanglular path for painting.	* Returns a nicely rounded rectanglular path for painting.
	*/	*/
	PLASMA_EXPORT QPainterPath roundedRectangle(const QRectF &rect, qreal radiu s);	PLASMA_EXPORT QPainterPath roundedRectangle(const QRectF &rect, qreal radiu s);

	/**	/**

		* center two pixmap together in the biggest rectangle
		* @since 4.5
		*/
		PLASMA_EXPORT void centerPixmaps(QPixmap &from, QPixmap &to);

		/**
	* 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);

	} // PaintUtils namespace	} // PaintUtils namespace

	} // Plasma namespace	} // Plasma namespace

	#endif	#endif

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

	plasma.h	plasma.h

	skipping to change at line 336	skipping to change at line 336
	*/	*/
	PLASMA_EXPORT QList<QAction> actionsFromMenu(QMenu menu,	PLASMA_EXPORT QList<QAction> actionsFromMenu(QMenu menu,
	const QString &prefix = QStri ng(),	const QString &prefix = QStri ng(),
	QObject *parent = 0);	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)

		Q_DECLARE_OPERATORS_FOR_FLAGS(Plasma::MessageButtons)

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

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

	plugin.h	plugin.h

	skipping to change at line 187	skipping to change at line 187
	* @return The plugin created from the library @p libname	* @return The plugin created from the library @p libname
	*/	*/
	KDE_DEPRECATED static Plugin* loadPlugin( QObject * parent, const QByte Array &libname );	KDE_DEPRECATED static Plugin* loadPlugin( QObject * parent, const QByte Array &libname );

	/**	/**
	* @internal	* @internal
	* @return The plugin created from the library @p libname	* @return The plugin created from the library @p libname
	*/	*/
	static Plugin* loadPlugin( QObject * parent, const QString &libname );	static Plugin* loadPlugin( QObject * parent, const QString &libname );


		static Plugin* loadPlugin( QObject * parent, const QString &libname, co
		nst QString &keyword );

	virtual void setComponentData(const KComponentData &instance);	virtual void setComponentData(const KComponentData &instance);

	private:	private:
	static bool hasPlugin( QObject* parent, const QString& library );	static bool hasPlugin( QObject* parent, const QString& library );
	class PluginPrivate;	class PluginPrivate;
	PluginPrivate* const d;	PluginPrivate* const d;
	};	};

	}	}


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

	pluginpage.h	pluginpage.h

	skipping to change at line 24	skipping to change at line 24
	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 KSETTINGS_PLUGINPAGE_H	#ifndef KSETTINGS_PLUGINPAGE_H
	#define KSETTINGS_PLUGINPAGE_H	#define KSETTINGS_PLUGINPAGE_H

	#include <kcmodule.h>	#include <kcmodule.h>

	#include <kutils_export.h>	#include <kcmutils_export.h>

	class KPluginSelector;	class KPluginSelector;

	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.
	*	*

	skipping to change at line 70	skipping to change at line 70
	X-KDE-FactoryName=MyAppPluginConfigFactory	X-KDE-FactoryName=MyAppPluginConfigFactory
	X-KDE-ParentApp=myapp	X-KDE-ParentApp=myapp
	X-KDE-ParentComponents=myapp	X-KDE-ParentComponents=myapp

	Name=Plugins	Name=Plugins
	Comment=Select and configure your plugins:	Comment=Select and configure your plugins:
	\endverbatim	\endverbatim
	*	*
	* @author Matthias Kretz <kretz@kde.org>	* @author Matthias Kretz <kretz@kde.org>
	*/	*/

	class KUTILS_EXPORT PluginPage : public KCModule	class KCMUTILS_EXPORT PluginPage : public KCModule
	{	{
	Q_OBJECT	Q_OBJECT
	Q_DECLARE_PRIVATE(PluginPage)	Q_DECLARE_PRIVATE(PluginPage)
	public:	public:
	/**	/**
	* Standard KCModule constructor.	* Standard KCModule constructor.
	* Automatically creates the KPluginSelector widget.	* Automatically creates the KPluginSelector widget.
	*/	*/
	explicit PluginPage( const KComponentData &componentData,	explicit PluginPage( const KComponentData &componentData,
	QWidget *parent = 0,	QWidget *parent = 0,

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

	popupapplet.h	popupapplet.h

	skipping to change at line 72	skipping to change at line 72
	* will provide an interface for when the PopupApplet is not showing	* will provide an interface for when the PopupApplet is not showing
	* the widget() or graphicsWidget() directly.	* the widget() or graphicsWidget() directly.
	*/	*/
	void setPopupIcon(const QIcon &icon);	void setPopupIcon(const QIcon &icon);

	/**	/**
	* @arg icon the icon that has to be displayed when the applet is in a panel.	* @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	* Passing in an empty QString() means that the popup applet itself
	* will provide an interface for when the PopupApplet is not showing	* will provide an interface for when the PopupApplet is not showing
	* the widget() or graphicsWidget() directly.	* the widget() or graphicsWidget() directly.


		* If you set a popup icon you must also set a minimum size of the appl
		et. When the applet
		* is smaller than this minimum size, it will be displayed as that icon
		.
	*/	*/
	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().
	* @return the widget that will get shown in either a layout, in the ap plet or in a Dialog,	* @return the widget that will get shown in either a layout, in the ap plet or in a Dialog,
	* depending on the form factor of the applet.	* depending on the form factor of the applet.
	*/	*/
	virtual QWidget *widget();	virtual QWidget *widget();
	void setWidget(QWidget * widget);	void setWidget(QWidget * widget);

	/**	/**
	* Implement either this function or widget().	* Implement either this function or widget().
	* @return the widget that will get shown in either a layout, in the ap plet or in a Dialog,	* @return the widget that will get shown in either a layout, in the ap plet or in a Dialog,
	* depending on the form factor of the applet.	* depending on the form factor of the applet.

		* If you set a popup icon you must also set a minimum size of the appl
		et. When the applet
		* is smaller than this minimum size, it will be displayed as that icon
		.
	*/	*/
	virtual QGraphicsWidget *graphicsWidget();	virtual QGraphicsWidget *graphicsWidget();
	void setGraphicsWidget(QGraphicsWidget * widget);	void setGraphicsWidget(QGraphicsWidget * widget);

	/**	/**
	* @return the placement of the popup relating to the icon	* @return the placement of the popup relating to the icon
	*/	*/
	Plasma::PopupPlacement popupPlacement() const;	Plasma::PopupPlacement popupPlacement() const;

	/**	/**

	skipping to change at line 147	skipping to change at line 152
	protected:	protected:
	/**	/**
	* This event handler can be reimplemented in a subclass to receive an	* This event handler can be reimplemented in a subclass to receive an
	* event before the popup is shown or hidden.	* event before the popup is shown or hidden.
	* @arg show true if the popup is going to be shown, false if the popup	* @arg show true if the popup is going to be shown, false if the popup
	* is going to be hidden.	* is going to be hidden.
	* Note that showing and hiding the popup on click is already done in P opupApplet.	* Note that showing and hiding the popup on click is already done in P opupApplet.
	*/	*/
	virtual void popupEvent(bool show);	virtual void popupEvent(bool show);


		/**
		* Reimplemented from QGraphicsLayoutItem
		*/
		QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint = QSizeF(
		)) const;

		/**
		* Reimplemented from QGraphicsLayoutItem
		*/
	void mousePressEvent(QGraphicsSceneMouseEvent *event);	void mousePressEvent(QGraphicsSceneMouseEvent *event);


		/**
		* Reimplemented from QGraphicsLayoutItem
		*/
	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);	void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);


		/**
		* Reimplemented from QGraphicsLayoutItem
		*/
	bool eventFilter(QObject watched, QEvent event);	bool eventFilter(QObject watched, QEvent event);


		/**
		* Reimplemented from QGraphicsLayoutItem
		*/
	void dragEnterEvent(QGraphicsSceneDragDropEvent *event);	void dragEnterEvent(QGraphicsSceneDragDropEvent *event);


		/**
		* Reimplemented from QGraphicsLayoutItem
		*/
	void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);	void dragLeaveEvent(QGraphicsSceneDragDropEvent *event);


		/**
		* Reimplemented from QGraphicsLayoutItem
		*/
	void dropEvent(QGraphicsSceneDragDropEvent *event);	void dropEvent(QGraphicsSceneDragDropEvent *event);

	private:	private:
	/**	/**
	* @internal This constructor is to be used with the Package loading sy stem.	* @internal This constructor is to be used with the Package loading sy stem.
	*	*
	* @param parent a QObject parent; you probably want to pass in 0	* @param parent a QObject parent; you probably want to pass in 0
	* @param args a list of strings containing two entries: the service id	* @param args a list of strings containing two entries: the service id
	* and the applet id	* and the applet id
	* @since 4.3	* @since 4.3
	*/	*/
	PopupApplet(const QString &packagePath, uint appletId, const QVariantLi st &args);	PopupApplet(const QString &packagePath, uint appletId, const QVariantLi st &args);

	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())

		Q_PRIVATE_SLOT(d, void appletActivated())
		Q_PRIVATE_SLOT(d, void iconSizeChanged(int))

	friend class Applet;	friend class Applet;
	friend class AppletPrivate;	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. 9 change blocks.
	0 lines changed or deleted	40 lines changed or added

	powermanagement.h	powermanagement.h

	skipping to change at line 99	skipping to change at line 99
	SOLID_EXPORT int beginSuppressingSleep(const QString &reason = QStr ing());	SOLID_EXPORT int beginSuppressingSleep(const QString &reason = QStr ing());

	/**	/**
	* Tell the power management that a particular sleep suppression is no longer needed. When	* Tell the power management that a particular sleep suppression is no longer needed. When
	* no more suppressions are active, the system will be free to slee p automatically	* no more suppressions are active, the system will be free to slee p automatically
	* @param cookie The cookie acquired when requesting sleep suppress ion	* @param cookie The cookie acquired when requesting sleep suppress ion
	* @return true if the suppression was stopped, false if an invalid cookie was given	* @return true if the suppression was stopped, false if an invalid cookie was given
	*/	*/
	SOLID_EXPORT bool stopSuppressingSleep(int cookie);	SOLID_EXPORT bool stopSuppressingSleep(int cookie);


	class Notifier : public QObject	class SOLID_EXPORT Notifier : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* This signal is emitted when the AC adapter is plugged or unp lugged.	* This signal is emitted when the AC adapter is plugged or unp lugged.
	*	*
	* @param newState the new state of the AC adapter, it's one of the	* @param newState the new state of the AC adapter, it's one of the
	* type @see Solid::PowerManager::AcAdapterState	* type @see Solid::PowerManager::AcAdapterState
	*/	*/
	void appShouldConserveResourcesChanged(bool newState);	void appShouldConserveResourcesChanged(bool newState);


		protected:
		Notifier();
	};	};

	SOLID_EXPORT Notifier *notifier();	SOLID_EXPORT Notifier *notifier();
	}	}
	}	}

	#endif	#endif

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

	predicateproperties.h	predicateproperties.h

	skipping to change at line 33	skipping to change at line 33
	#include <kio/kio_export.h>	#include <kio/kio_export.h>
	#include <QtCore/QSharedData>	#include <QtCore/QSharedData>
	#include <QtCore/QVariant>	#include <QtCore/QVariant>
	class QValidator;	class QValidator;

	/**	/**
	* A predicate is part of the RDF trinity: subject, predicate, object.	* A predicate is part of the RDF trinity: subject, predicate, object.
	* It is identified by URI and it defines the type of the relationship.	* It is identified by URI and it defines the type of the relationship.
	* For file metadata, a predicate can be seen as a fieldname.	* For file metadata, a predicate can be seen as a fieldname.
	* It has a data type, a description, a short id, a cardinality	* It has a data type, a description, a short id, a cardinality

		*
		* @deprecated use Nepomuk::Types::Property instead
	**/	**/

	class KIO_EXPORT PredicateProperties {	class KDE_DEPRECATED KIO_EXPORT PredicateProperties {
	friend class PredicatePropertyProvider;	friend class PredicatePropertyProvider;
	public:	public:
	PredicateProperties(const QString& predicate = QString());	PredicateProperties(const QString& predicate = QString());
	PredicateProperties(const PredicateProperties& p);	PredicateProperties(const PredicateProperties& p);
	~PredicateProperties();	~PredicateProperties();
	const PredicateProperties& operator=(const PredicateProperties& p);	const PredicateProperties& operator=(const PredicateProperties& p);
	/**	/**
	* This enum is used to specify some attributes that an item can have,	* This enum is used to specify some attributes that an item can have,
	* which fit neither in the Hint nor in the Unit enum.	* which fit neither in the Hint nor in the Unit enum.
	*/	*/

	skipping to change at line 99	skipping to change at line 101
	uint maxCardinality() const;	uint maxCardinality() const;
	const PredicateProperties& parent() const;	const PredicateProperties& parent() const;
	/**	/**
	* Return a url that identifies the unit in which this property	* Return a url that identifies the unit in which this property
	* is expressed.	* is expressed.
	**/	**/
	const QString& unit() const;	const QString& unit() const;
	bool isValid() const;	bool isValid() const;
	private:	private:
	class Private;	class Private;

	QSharedDataPointer<Private> p;	QSharedDataPointer<Private> d;
	};	};

	#endif	#endif

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

	previewjob.h	previewjob.h

	skipping to change at line 42	skipping to change at line 42
	namespace KIO {	namespace KIO {
	class PreviewJobPrivate;	class PreviewJobPrivate;
	/*!	/*!
	* This class catches a preview (thumbnail) for files.	* This class catches a preview (thumbnail) for files.
	* @short KIO Job to get a thumbnail picture	* @short KIO Job to get a thumbnail picture
	*/	*/
	class KIO_EXPORT PreviewJob : public KIO::Job	class KIO_EXPORT PreviewJob : public KIO::Job
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:

	/**	/**
	* Creates a new PreviewJob.	* Creates a new PreviewJob.
	* @param items a list of files to create previews for	* @param items a list of files to create previews for
	* @param width the desired width	* @param width the desired width
	* @param height the desired height, 0 to use the @p width	* @param height the desired height, 0 to use the @p width
	* @param iconSize the size of the mimetype icon to overlay over the	* @param iconSize the size of the mimetype icon to overlay over th
	* preview or zero to not overlay an icon. This has no effect if the	e
	* preview plugin that will be used doesn't use icon overlays.	* preview or zero to not overlay an icon. This has no effect if th
	* @param iconAlpha transparency to use for the icon overlay	e
	* @param scale if the image is to be scaled to the requested size o	* preview plugin that will be used doesn't use icon overlays.
	r	* @param iconAlpha transparency to use for the icon overlay
	* returned in its original size	* @param scale if the image is to be scaled to the requested size
	* @param save if the image should be cached for later use	or
	* @param enabledPlugins if non-zero, this points to a list containi	* returned in its original size
	ng	* @param save if the image should be cached for later use
	* the names of the plugins that may be used.	* @param enabledPlugins if non-zero, this points to a list contain
	*/	ing
		* the names of the plugins that may be used.
		*/
	PreviewJob( const KFileItemList& items, int width, int height,	PreviewJob( const KFileItemList& items, int width, int height,
	int iconSize, int iconAlpha, bool scale, bool save,	int iconSize, int iconAlpha, bool scale, bool save,
	const QStringList *enabledPlugins );	const QStringList *enabledPlugins );
	virtual ~PreviewJob();	virtual ~PreviewJob();

	/**	/**
	* Removes an item from preview processing. Use this if you passed	* Removes an item from preview processing. Use this if you passed
	* an item to filePreview and want to delete it now.	* an item to filePreview and want to delete it now.
	*	*
	* @param url the url of the item that should be removed from the p review queue	* @param url the url of the item that should be removed from the p review queue

	skipping to change at line 97	skipping to change at line 97
	* Returns the currently set sequence index	* Returns the currently set sequence index
	*	*
	* @since KDE 4.3	* @since KDE 4.3
	**/	**/
	int sequenceIndex() const;	int sequenceIndex() const;

	/**	/**
	* Returns a list of all available preview plugins. The list	* Returns a list of all available preview plugins. The list
	* contains the basenames of the plugins' .desktop files (no path,	* contains the basenames of the plugins' .desktop files (no path,
	* no .desktop).	* no .desktop).

	* @return the list of plugins	* @return the list of plugins
	*/	*/
	static QStringList availablePlugins();	static QStringList availablePlugins();

	/**	/**
	* Returns a list of all supported MIME types. The list can	* Returns a list of all supported MIME types. The list can
	* contain entries like text/ * (without the space).	* contain entries like text/ * (without the space).

	* @return the list of mime types	* @return the list of mime types
	*/	*/
	static QStringList supportedMimeTypes();	static QStringList supportedMimeTypes();

	/**	/**
	* Returns the default "maximum file size", in bytes, used by Previ ewJob.	* Returns the default "maximum file size", in bytes, used by Previ ewJob.
	* This is useful for applications providing a GUI for letting the user change the size.	* This is useful for applications providing a GUI for letting the user change the size.
	* @since 4.1	* @since 4.1

		* @deprecated PreviewJob uses different maximum file sizes depende
		nt on the URL since 4.5.
		* The returned file size is only valid for local URLs.
	*/	*/

	static KIO::filesize_t maximumFileSize();	KDE_DEPRECATED static KIO::filesize_t maximumFileSize();

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Emitted when a thumbnail picture for @p item has been successful ly	* Emitted when a thumbnail picture for @p item has been successful ly
	* retrieved.	* retrieved.

	* @param item the file of the preview	* @param item the file of the preview
	* @param preview the preview image	* @param preview the preview image
	*/	*/
	void gotPreview( const KFileItem& item, const QPixmap &preview );	void gotPreview( const KFileItem& item, const QPixmap &preview );
	/**	/**
	* Emitted when a thumbnail for @p item could not be created,	* Emitted when a thumbnail for @p item could not be created,
	* either because a ThumbCreator for its MIME type does not	* either because a ThumbCreator for its MIME type does not
	* exist, or because something went wrong.	* exist, or because something went wrong.

	* @param item the file that failed	* @param item the file that failed
	*/	*/
	void failed( const KFileItem& item );	void failed( const KFileItem& item );

	protected Q_SLOTS:	protected Q_SLOTS:
	virtual void slotResult( KJob *job );	virtual void slotResult( KJob *job );

	private:	private:
	Q_PRIVATE_SLOT(d_func(), void startPreview())	Q_PRIVATE_SLOT(d_func(), void startPreview())
	Q_PRIVATE_SLOT(d_func(), void slotThumbData(KIO::Job *, const QByte Array &))	Q_PRIVATE_SLOT(d_func(), void slotThumbData(KIO::Job *, const QByte Array &))
	Q_DECLARE_PRIVATE(PreviewJob)	Q_DECLARE_PRIVATE(PreviewJob)

End of changes. 7 change blocks.
	23 lines changed or deleted	28 lines changed or added

	qtest_kde.h	qtest_kde.h

	skipping to change at line 37	skipping to change at line 37
	#include <kcomponentdata.h>	#include <kcomponentdata.h>
	#include <kglobal.h>	#include <kglobal.h>
	#include <kurl.h>	#include <kurl.h>
	#include <QtGui/QApplication>	#include <QtGui/QApplication>
	#include <QtCore/QEventLoop>	#include <QtCore/QEventLoop>
	#include <QtTest/QSignalSpy>	#include <QtTest/QSignalSpy>

	namespace QTest	namespace QTest
	{	{
	/**	/**

	* Starts an event loop that runs until the given signal is received. O	* Starts an event loop that runs until the given signal is received.
	ptionally the event loop	* Optionally the event loop can return earlier on a timeout.
	* can return earlier on a timeout.	*
		* \param timeout the timeout in milliseconds
	*	*
	* \return \p true if the requested signal was received	* \return \p true if the requested signal was received
	* \p false on timeout	* \p false on timeout
	*/	*/
	KDECORE_EXPORT bool kWaitForSignal(QObject obj, const char signal, in t timeout = 0);	KDECORE_EXPORT bool kWaitForSignal(QObject obj, const char signal, in t timeout = 0);
	} // namespace QTest	} // namespace QTest

	// By default, unit tests get no gui.	// By default, unit tests get no gui.
	// Pass GUI if you use any GUI classes	// Pass GUI if you use any GUI classes
	enum KDEMainFlag { NoGUI = 0, GUI = 1 }; // bitfield, next item is 2!	enum KDEMainFlag { NoGUI = 0, GUI = 1 }; // bitfield, next item is 2!

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

	query.h	query.h
	/*	/*
	This file is part of the Nepomuk KDE project.	This file is part of the Nepomuk KDE project.

	Copyright (C) 2008-2009 Sebastian Trueg <trueg@kde.org>	Copyright (C) 2008-2010 Sebastian Trueg <trueg@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	License version 2 as published by the Free Software Foundation.

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


	skipping to change at line 34	skipping to change at line 34
	#include <QtCore/QList>	#include <QtCore/QList>
	#include <QtCore/QPair>	#include <QtCore/QPair>
	#include <QtCore/QDebug>	#include <QtCore/QDebug>

	#include <kurl.h>	#include <kurl.h>

	#include "property.h"	#include "property.h"

	#include "nepomukquery_export.h"	#include "nepomukquery_export.h"


		class QTextStream;

	namespace Nepomuk {	namespace Nepomuk {
	namespace Query {	namespace Query {

	class Term;	class Term;
	class QueryPrivate;	class QueryPrivate;

	/**	/**
	* \brief Convinience definition for request property mappings as u sed in	* \brief Convinience definition for request property mappings as u sed in
	* QueryServiceClient::sparqlQuery() and QueryServiceClient::blocki ngSparqlQuery().	* QueryServiceClient::sparqlQuery() and QueryServiceClient::blocki ngSparqlQuery().
	*/	*/

	skipping to change at line 67	skipping to change at line 69
	*	*
	* Queries can be easily converted to SPARQL via the toSparqlQuery( ) method or to	* Queries can be easily converted to SPARQL via the toSparqlQuery( ) method or to
	* search URLs ready for KIO::DirLister using toSearchUrl().	* search URLs ready for KIO::DirLister using toSearchUrl().
	*	*
	* The typical usage of a Query instance would be QueryServiceClien t::query().	* The typical usage of a Query instance would be QueryServiceClien t::query().
	* However one can also use toSparqlQuery() to convert it into a SP ARQL query	* However one can also use toSparqlQuery() to convert it into a SP ARQL query
	* string and use that string in QueryServiceClient::sparqlQuery() or even	* string and use that string in QueryServiceClient::sparqlQuery() or even
	* directly in Soprano::Model::executeQuery() via \p ResourceManage r::instance()->mainModel()	* directly in Soprano::Model::executeQuery() via \p ResourceManage r::instance()->mainModel()
	* or in a custom Model.	* or in a custom Model.
	*	*

	* \sa QueryParser	* \sa QueryParser, FileQuery
	*	*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*	*
	* \since 4.4	* \since 4.4
	*/	*/
	class NEPOMUKQUERY_EXPORT Query	class NEPOMUKQUERY_EXPORT Query
	{	{
	public:	public:
	/**	/**
	* Create an empty invalid query object.	* Create an empty invalid query object.
	*/	*/
	Query();	Query();

	/**	/**

	* Create a query of type PlainQuery based on	* Create a query with root term \a term.
	* \a term.
	*/	*/
	explicit Query( const Term& term );	explicit Query( const Term& term );

	/**	/**
	* Copy constructor.	* Copy constructor.
	*/	*/
	Query( const Query& );	Query( const Query& );

	/**	/**
	* Destructor	* Destructor
	*/	*/
	~Query();	~Query();

	/**	/**
	* Assignment operator	* Assignment operator
	*/	*/
	Query& operator=( const Query& );	Query& operator=( const Query& );

	/**	/**

		* Assignment operator. Assigns \p term to
		* this query without changing any other
		* properties.
		*
		* \since 4.5
		*/
		Query& operator=( const Term& term );

		/**
	* \return \p true if the query is valid, i.e.	* \return \p true if the query is valid, i.e.
	* it has a valid term().	* it has a valid term().
	*/	*/
	bool isValid() const;	bool isValid() const;

	/**	/**

		* \return \p true if this is a file query that will
		* only return files and folders.
		*
		* \sa FileQuery
		*
		* \since 4.5
		*/
		bool isFileQuery() const;

		/**
	* The root term of the query.	* The root term of the query.
	* This can be any type of term.	* This can be any type of term.
	*	*

	* \sa setTerm	* \sa setTerm()
	*/	*/
	Term term() const;	Term term() const;

	/**	/**
	* The maximum number of results that this query should yield.	* The maximum number of results that this query should yield.
	*	*

	* \sa setLimit	* \sa setLimit()
	*/	*/
	int limit() const;	int limit() const;

	/**	/**

		* The first result that should be retrieved.
		*
		* \sa setOffset()
		*
		* \since 4.5
		*/
		int offset() const;

		/**
	* Set the root term of the query.	* Set the root term of the query.
	*	*
	* \sa term	* \sa term
	*/	*/
	void setTerm( const Term& );	void setTerm( const Term& );

	/**	/**
	* Set the maximum number of results this query	* Set the maximum number of results this query
	* should yield.	* should yield.
	*	*
	* \sa limit	* \sa limit
	*/	*/
	void setLimit( int );	void setLimit( int );

	/**	/**

		* The first result that should be retrieved. This can be combi
		ned
		* with setLimit() to do paged results.
		*
		* \since 4.5
		*/
		void setOffset( int offset );

		/**
	* \class RequestProperty query.h Nepomuk/Query/Query	* \class RequestProperty query.h Nepomuk/Query/Query
	*	*
	* \brief A request property can be added to a Query to retriev e	* \brief A request property can be added to a Query to retriev e
	* additional information about the results.	* additional information about the results.
	*	*
	* Normally a query would simply yield a list of resources,	* Normally a query would simply yield a list of resources,
	* ie. URIs. Using RequestProperty one can request additional	* ie. URIs. Using RequestProperty one can request additional
	* fields such as the modification time or the label or whateve r	* fields such as the modification time or the label or whateve r
	* is of interest in the current context.	* is of interest in the current context.
	*	*

	skipping to change at line 204	skipping to change at line 241
	private:	private:
	class Private;	class Private;
	QSharedDataPointer<Private> d;	QSharedDataPointer<Private> d;
	};	};

	/**	/**
	* Add a property that should be reported with each search resu lt.	* Add a property that should be reported with each search resu lt.
	*	*
	* \param property The requested property.	* \param property The requested property.
	*	*

	* \sa setRequestProperties, requestProperties	* ComparisonTerm::setVariableName() provides a more flexible (
		but also
		* slightly more complicated) way to select additional results.
		*
		* \sa setRequestProperties, requestProperties, ComparisonTerm:
		:setVariableName()
	*/	*/
	void addRequestProperty( const RequestProperty& property );	void addRequestProperty( const RequestProperty& property );

	/**	/**
	* Set the properties that should be reported with each search result.	* Set the properties that should be reported with each search result.
	*	*
	* \param properties The requested properties.	* \param properties The requested properties.
	*	*

	* \sa addRequestProperty, requestProperties	* ComparisonTerm::setVariableName() provides a more flexible (
		but also
		* slightly more complicated) way to select additional results.
		*
		* \sa addRequestProperty, requestProperties, ComparisonTerm::s
		etVariableName()
	*/	*/
	void setRequestProperties( const QList<RequestProperty>& proper ties );	void setRequestProperties( const QList<RequestProperty>& proper ties );

	/**	/**
	* \return The list of RequestProperty instances set via addReq uestProperty	* \return The list of RequestProperty instances set via addReq uestProperty
	* and setRequestProperties.	* and setRequestProperties.
	*/	*/
	QList<RequestProperty> requestProperties() const;	QList<RequestProperty> requestProperties() const;

	/**	/**

	skipping to change at line 257	skipping to change at line 300
	};	};
	Q_DECLARE_FLAGS( SparqlFlags, SparqlFlag )	Q_DECLARE_FLAGS( SparqlFlags, SparqlFlag )

	/**	/**
	* Convert the query into a SPARQL query which can be used with the	* Convert the query into a SPARQL query which can be used with the
	* Nepomuk query service or directly in Soprano::Model::execute Query.	* Nepomuk query service or directly in Soprano::Model::execute Query.
	*	*
	* The resulting query will bind the results to variable \p 'r' . Request	* The resulting query will bind the results to variable \p 'r' . Request
	* properties will be bound to variables \p 'reqProp1' through \p 'reqPropN'.	* properties will be bound to variables \p 'reqProp1' through \p 'reqPropN'.
	*	*

		* If you are looking for a serialization of a Query which can
		be parsed again
		* use toString() instead.
		*
	* \warning The SPARQL queries created by this method contain S PARQL extensions	* \warning The SPARQL queries created by this method contain S PARQL extensions
	* from Virtuoso and will not work with other RDF storage solut ions!	* from Virtuoso and will not work with other RDF storage solut ions!
	*	*
	* \param flags Optional flags to change the query.	* \param flags Optional flags to change the query.
	*	*
	* \return The SPARQL representation of this query or an empty string	* \return The SPARQL representation of this query or an empty string
	* if the query could not be converted (invalid query.)	* if the query could not be converted (invalid query.)
	*	*

	* \sa toSearchUrl(), SparqlFlag	* \sa toString(), toSearchUrl(), SparqlFlag
	*/	*/
	QString toSparqlQuery( SparqlFlags flags = NoFlags ) const;	QString toSparqlQuery( SparqlFlags flags = NoFlags ) const;

	/**	/**
	* Convert the query into a URL which can be listed using KIO:: DirLister.	* Convert the query into a URL which can be listed using KIO:: DirLister.
	* The URL will use the \p nepomuksearch:/ KIO protocol to hand le the listing	* The URL will use the \p nepomuksearch:/ KIO protocol to hand le the listing
	* of search results.	* of search results.
	*	*

		* \param flags Optional flags to change the query. Query::Cre
		ateCountQuery is not
		* supported and will silently be dropped from \p flags.
		*
		* \return A URL which will list a virtual folder containing al
		l search results
		* from this query or an invalid URL in case this query is inva
		lid.
		*
		* \sa toSparqlQuery(), SparqlFlag
		*/
		KUrl toSearchUrl( SparqlFlags flags = NoFlags ) const;

		/**
		* Convert the query into a URL which can be listed using KIO::
		DirLister.
		* The URL will use the \p nepomuksearch:/ KIO protocol to hand
		le the listing
		* of search results.
		*
	* This is the perfect method for listing results in file manag ers or file	* This is the perfect method for listing results in file manag ers or file
	* dialogs.	* dialogs.
	*	*

		* \param customTitle An optional custom title that will be use
		d for the listing
		* of the results. This is achieved by setting the KIO::UDSEntr
		y::UDS_DISPLAY_NAME to
		* the customTitle value.
	* \param flags Optional flags to change the query. Query::Cre ateCountQuery is not	* \param flags Optional flags to change the query. Query::Cre ateCountQuery is not
	* supported and will silently be dropped from \p flags.	* supported and will silently be dropped from \p flags.
	*	*
	* \return A URL which will list a virtual folder containing al l search results	* \return A URL which will list a virtual folder containing al l search results
	* from this query or an invalid URL in case this query is inva lid.	* from this query or an invalid URL in case this query is inva lid.
	*	*
	* \sa toSparqlQuery(), SparqlFlag	* \sa toSparqlQuery(), SparqlFlag

		*
		* \since 4.5
	*/	*/

	KUrl toSearchUrl( SparqlFlags flags = NoFlags ) const;	KUrl toSearchUrl( const QString& customTitle, SparqlFlags flags = NoFlags ) const;

	/**	/**
	* Build a request property map as used in QueryServiceClient:: sparqlQuery()	* Build a request property map as used in QueryServiceClient:: sparqlQuery()
	* from the request properties set via addRequestProperty() and setRequestProperties().	* from the request properties set via addRequestProperty() and setRequestProperties().
	*	*
	* Be aware that in most situations it is much simpler to use Q ueryServiceClient::query().	* Be aware that in most situations it is much simpler to use Q ueryServiceClient::query().
	*/	*/
	RequestPropertyMap requestPropertyMap() const;	RequestPropertyMap requestPropertyMap() const;

	/**	/**
	* Comparison operator.	* Comparison operator.
	*	*
	* \return \p true if this query is equal to \p query.	* \return \p true if this query is equal to \p query.
	*/	*/
	bool operator==( const Query& query ) const;	bool operator==( const Query& query ) const;


		/**
		* Encode the Query in a string. Be aware that this does NOT cr
		eate a SPARQL
		* query. The returned string can be used to serialize queries
		that can later
		* be read via fromString().
		*
		* \sa fromString(), toSparqlQuery()
		*
		* \since 4.5
		*/
		QString toString() const;

		/**
		* Parse a Query that has been encoded as a string via toString
		().
		*
		* \warning This method can NOT parse SPARQL syntax.
		*
		* \sa toString()
		*
		* \since 4.5
		*/
		static Query fromString( const QString& queryString );

		/**
		* Extract a query from a nepomuksearch:/ query URL.
		*
		* \return The query that was encoded in \p url or an invalid q
		uery if
		* either \p url is not a nepomuksearch:/ URL or if it contains
		a pure SPARQL
		* query. In the latter case sparqlFromQueryUrl() can be used t
		o extract that
		* query.
		*
		* \sa sparqlFromQueryUrl()
		*
		* \since 4.5
		*/
		static Query fromQueryUrl( const KUrl& url );

		/**
		* Extract the SPARQL query from a nepomuksearch:/ query URL. A
		ll kinds of
		* nepomuksearch:/ URLs are supported.
		*
		* \return The SPARQL query string representing the query encod
		ed
		* in \p url.
		*
		* \sa fromQueryUrl()
		*
		* \since 4.5
		*/
		static QString sparqlFromQueryUrl( const KUrl& url );

		/**
		* Extact the title from a nepomuksearch:/ query URL. The title
		* is either a custom title which has been specified in
		* toSearchUrl(const QString&, SparqlFlags) or the user query s
		tring
		* in case of nepomuksearch:/myquery URLs.
		*
		* \return A title for the query \p url or an empty string
		* in case \p url is not a nepomuksearch:/ URL or a useful titl
		e
		* cannot be extracted.
		*
		* \since 4.5
		*/
		static QString titleFromQueryUrl( const KUrl& url );

	protected:	protected:

	/** \cond protected_error_members */	/** \cond protected_query_members */
	QSharedDataPointer<QueryPrivate> d;	QSharedDataPointer<QueryPrivate> d;

	friend class QueryParser;	friend class QueryParser;
	/** \endcond */	/** \endcond */
	};	};

	NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Query& );	NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Query& );
	}	}
	}	}


End of changes. 20 change blocks.
	11 lines changed or deleted	163 lines changed or added

	queryparser.h	queryparser.h

	skipping to change at line 101	skipping to change at line 101
	* Create a new query parser.	* Create a new query parser.
	*/	*/
	QueryParser();	QueryParser();

	/**	/**
	* Destructor	* Destructor
	*/	*/
	~QueryParser();	~QueryParser();

	/**	/**

		* Flags to change the behaviour of the parser.
		*
		* \since 4.5
		*/
		enum ParserFlag {
		/**
		* No flags. Default for parse()
		*/
		NoParserFlags = 0x0,

		/**
		* Make each full text term use a '*' wildcard
		* to match longer strings ('foobar' is matched
		* by 'foob*').
		*
		* Be aware that the query engine needs at least
		* 4 chars to do globbing though.
		*
		* This is disabled by default.
		*/
		QueryTermGlobbing = 0x1
		};
		Q_DECLARE_FLAGS( ParserFlags, ParserFlag )

		/**
	* Parse a user query.	* Parse a user query.
	*	*
	* \return The parsed query or an invalid Query object	* \return The parsed query or an invalid Query object
	* in case the parsing failed.	* in case the parsing failed.
	*/	*/
	Query parse( const QString& query ) const;	Query parse( const QString& query ) const;

	/**	/**

		* Parse a user query.
		*
		* \param query The query string to parse
		* \param flags a set of flags influencing the parsing process.
		*
		* \return The parsed query or an invalid Query object
		* in case the parsing failed.
		*
		* \since 4.5
		*/
		Query parse( const QString& query, ParserFlags flags ) const;

		/**
	* Try to match a field name as used in a query string to actua l	* Try to match a field name as used in a query string to actua l
	* properties.	* properties.
	*	*
	* The matching is cached inside the Query instance for fast	* The matching is cached inside the Query instance for fast
	* subsequent lookups.	* subsequent lookups.
	*	*
	* Example:	* Example:
	* \code	* \code
	* hastag:nepomuk	* hastag:nepomuk
	* \endcode	* \endcode

	skipping to change at line 142	skipping to change at line 180
	*/	*/
	static Query parseQuery( const QString& query );	static Query parseQuery( const QString& query );

	private:	private:
	class Private;	class Private;
	Private* const d;	Private* const d;
	};	};
	}	}
	}	}


		Q_DECLARE_OPERATORS_FOR_FLAGS( Nepomuk::Query::QueryParser::ParserFlags )

	#endif	#endif

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

	queryserviceclient.h	queryserviceclient.h

	skipping to change at line 51	skipping to change at line 51
	* \brief Convenience frontend to the %Nepomuk Query DBus Service	* \brief Convenience frontend to the %Nepomuk Query DBus Service
	*	*
	* The QueryServiceClient provides an easy way to access the %Nepom uk Query Service	* The QueryServiceClient provides an easy way to access the %Nepom uk Query Service
	* without having to deal with any communication details. By defaul t it monitors	* without having to deal with any communication details. By defaul t it monitors
	* queries for changes.	* queries for changes.
	*	*
	* Usage is simple: Create an instance of the client for each searc h you want to	* Usage is simple: Create an instance of the client for each searc h you want to
	* track. One instance may also be reused for subsequent queries if further updates	* track. One instance may also be reused for subsequent queries if further updates
	* of the persistent query are not necessary.	* of the persistent query are not necessary.
	*	*

		* For quick queries which do not require any updates one of the st
		atic query methods
		* can be used: syncQuery(), syncSparqlQuery(), or syncDesktopQuery
		().
		*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*	*
	* \since 4.4	* \since 4.4
	*/	*/
	class NEPOMUKQUERY_EXPORT QueryServiceClient : public QObject	class NEPOMUKQUERY_EXPORT QueryServiceClient : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	/**	/**

	skipping to change at line 77	skipping to change at line 80
	*/	*/
	~QueryServiceClient();	~QueryServiceClient();

	/**	/**
	* \brief Check if the Nepomuk query service is running.	* \brief Check if the Nepomuk query service is running.
	* \return \p true if the Nepomuk query service is running and could	* \return \p true if the Nepomuk query service is running and could
	* be contacted via DBus, \p false otherwise	* be contacted via DBus, \p false otherwise
	*/	*/
	static bool serviceAvailable();	static bool serviceAvailable();


		/**
		* Start a query using the Nepomuk query service.
		*
		* A local event loop will be started to block the method
		* call until all results have been listed, and results will be
		* returned. You can check if the query was successful through
		* the \p ok pointer.
		*
		* If updates to the query results are required an instance of
		QueryServiceClient
		* should be created and one of the non-static query methods be
		used.
		*
		* \param query the query to perform.
		* \param ok a valid boolean pointer, which will be set to \p t
		rue
		* if the query service was found and the query was started, \p
		false otherwise.
		* If you don't want to track errors, you can pass a null point
		er instead.
		*
		* \return a list of \p Result for the given query.
		*
		* \sa query(const Query&)
		*
		* \since 4.5
		*/
		static QList<Nepomuk::Query::Result> syncQuery( const Query& qu
		ery, bool *ok = 0 );

		/**
		* \overload
		*
		* \param query a SPARQL query which binds results to variable
		\p 'r'.
		* \param ok a valid boolean pointer, which will be set to \p t
		rue
		* if the query service was found and the query was started, \p
		false otherwise.
		* If you don't want to track errors, you can pass a null point
		er instead.
		* \param requestPropertyMap An optional mapping of variable bi
		nding names in \p query
		* to their corresponding properties. For details see sparqlQue
		ry.
		*
		* \sa sparqlQuery(const Query&)
		*
		* \since 4.5
		*/
		static QList<Nepomuk::Query::Result> syncSparqlQuery( const QSt
		ring& query,
		const Nepomuk::Query::RequestPropertyMap& reque
		stPropertyMap = Nepomuk::Query::RequestPropertyMap(),
		bool *ok = 0 );

		/**
		* \overload
		*
		* \param query a desktop query string which can be parsed by Q
		ueryParser.
		* \param ok a valid boolean pointer, which will be set to \p t
		rue
		* if the query service was found and the query was started, \p
		false otherwise.
		* If you don't want to track errors, you can pass a null point
		er instead.
		*
		* \sa desktopQuery(const QString&)
		*
		* \since 4.5
		*/
		static QList<Nepomuk::Query::Result> syncDesktopQuery( const QS
		tring& query, bool *ok = 0 );

	public Q_SLOTS:	public Q_SLOTS:
	/**	/**
	* Start a query using the Nepomuk query service.	* Start a query using the Nepomuk query service.
	*	*
	* Results will be reported via newEntries. All results	* Results will be reported via newEntries. All results
	* have been reported once finishedListing has been emitted.	* have been reported once finishedListing has been emitted.
	*	*
	* \param query the query to perform.	* \param query the query to perform.
	*	*
	* \return \p true if the query service was found and the query	* \return \p true if the query service was found and the query

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

	range.h	range.h
	/* This file is part of the KDE project	/* This file is part of the KDE project

	Copyright (C) 2003-2005 Hamish Rodda <rodda@kde.org>	* Copyright (C) 2003-2005 Hamish Rodda <rodda@kde.org>
	Copyright (C) 2001-2005 Christoph Cullmann <cullmann@kde.org>	* Copyright (C) 2001-2005 Christoph Cullmann <cullmann@kde.org>
	Copyright (C) 2002 Christian Couder <christian@kdevelop.org>	* Copyright (C) 2002 Christian Couder <christian@kdevelop.org>
	Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>	* Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
	Copyright (C) 1999 Jochen Wilhelmy <digisnap@cs.tu-berlin.de>	* Copyright (C) 1999 Jochen Wilhelmy <digisnap@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 as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,	*
	but WITHOUT ANY WARRANTY; without even the implied warranty of	* This library is distributed in the hope that it will be useful,
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	Library General Public License for more details.	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* 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 Licen
	along with this library; see the file COPYING.LIB. If not, write to	se
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* along with this library; see the file COPYING.LIB. If not, write to
	Boston, MA 02110-1301, USA.	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	*/	* Boston, MA 02110-1301, USA.
		*/

	#ifndef KDELIBS_KTEXTEDITOR_RANGE_H	#ifndef KDELIBS_KTEXTEDITOR_RANGE_H
	#define KDELIBS_KTEXTEDITOR_RANGE_H	#define KDELIBS_KTEXTEDITOR_RANGE_H

	#include <ktexteditor/ktexteditor_export.h>	#include <ktexteditor/ktexteditor_export.h>
	#include <ktexteditor/cursor.h>	#include <ktexteditor/cursor.h>

	namespace KTextEditor	namespace KTextEditor
	{	{
	class SmartRange;	class SmartRange;

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

	rangefeedback.h	rangefeedback.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries

	Copyright (C) 2009 Bernhard Beschow <bbeschow@cs.tu-berlin.de>	* 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 as published by the Free Software Foundation; either
		* version 2 of the License, or (at your option) any later version.
	This library is distributed in the hope that it will be useful,	*
	but WITHOUT ANY WARRANTY; without even the implied warranty of	* This library is distributed in the hope that it will be useful,
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	Library General Public License for more details.	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
		* 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 Licen
	along with this library; see the file COPYING.LIB. If not, write to	se
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	* along with this library; see the file COPYING.LIB. If not, write to
	Boston, MA 02110-1301, USA.	* the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	*/	* 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 "smartrangenotifier.h"	#include "smartrangenotifier.h"
	#include "smartrangewatcher.h"	#include "smartrangewatcher.h"

	#endif // KDELIBS_KTEXTEDITOR_RANGEFEEDBACK_H	#endif // KDELIBS_KTEXTEDITOR_RANGEFEEDBACK_H

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

	renamedialog.h	renamedialog.h

	skipping to change at line 32	skipping to change at line 32
	#ifndef KIO_RENAMEDIALOG_H	#ifndef KIO_RENAMEDIALOG_H
	#define KIO_RENAMEDIALOG_H	#define KIO_RENAMEDIALOG_H

	#include <kurl.h>	#include <kurl.h>
	#include <QtGui/QDialog>	#include <QtGui/QDialog>
	#include <QtCore/QString>	#include <QtCore/QString>
	#include <sys/types.h>	#include <sys/types.h>

	#include <kio/global.h>	#include <kio/global.h>


		class QScrollArea;
		class QLabel;
		class QPixmap;
		class KFileItem;

	namespace KIO {	namespace KIO {

	// KDE5: get rid of M_OVERWRITE_ITSELF, trigger it internally if src==dest	// KDE5: get rid of M_OVERWRITE_ITSELF, trigger it internally if src==dest
	// KDE5: get rid of M_SINGLE. If not multi, then single ;)	// KDE5: get rid of M_SINGLE. If not multi, then single ;)
	// KDE5: use QFlags to get rid of all the casting!	// KDE5: use QFlags to get rid of all the casting!
	/**	/**
	* M_OVERWRITE: We have an existing dest, show details about it and offer t o overwrite it.	* M_OVERWRITE: We have an existing dest, show details about it and offer t o overwrite it.
	* M_OVERWRITE_ITSELF: Warn that the current operation would overwrite a fi le with itself,	* M_OVERWRITE_ITSELF: Warn that the current operation would overwrite a fi le with itself,
	* which is not allowed.	* which is not allowed.
	* M_SKIP: Offer a "Skip" button, to skip other files too. Requires M_MULTI .	* M_SKIP: Offer a "Skip" button, to skip other files too. Requires M_MULTI .

	skipping to change at line 54	skipping to change at line 59
	* to offer buttons that apply the user's choice to all files/folders.	* to offer buttons that apply the user's choice to all files/folders.
	* M_RESUME: Offer a "Resume" button (plus "Resume All" if M_MULTI)	* M_RESUME: Offer a "Resume" button (plus "Resume All" if M_MULTI)
	* M_NORENAME: Don't offer a "Rename" button	* M_NORENAME: Don't offer a "Rename" button
	* M_ISDIR: The dest is a directory, so label the "overwrite" button someth ing like "merge" instead.	* M_ISDIR: The dest is a directory, so label the "overwrite" button someth ing like "merge" instead.
	*/	*/
	enum RenameDialog_Mode { M_OVERWRITE = 1, M_OVERWRITE_ITSELF = 2, M_SKIP = 4, M_SINGLE = 8, M_MULTI = 16, M_RESUME = 32, M_NORENAME = 64, M_ISDIR = 12 8 };	enum RenameDialog_Mode { M_OVERWRITE = 1, M_OVERWRITE_ITSELF = 2, M_SKIP = 4, M_SINGLE = 8, M_MULTI = 16, M_RESUME = 32, M_NORENAME = 64, M_ISDIR = 12 8 };

	/**	/**
	* The result of open_RenameDialog().	* The result of open_RenameDialog().
	*/	*/

	enum RenameDialog_Result { R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERWRITE_ALL = 5, R_SKIP = 2, R_AUTO_SKIP = 3, R_RENAME = 1, R_CANCEL = 0 };	enum RenameDialog_Result {R_RESUME = 6, R_RESUME_ALL = 7, R_OVERWRITE = 4, R_OVERWRITE_ALL = 5, R_SKIP = 2, R_AUTO_SKIP = 3, R_RENAME = 1, R_AUTO_RENA ME = 8, R_CANCEL = 0};

	/**	/**
	* The dialog shown when a CopyJob realizes that a destination file already exists,	* The dialog shown when a CopyJob realizes that a destination file already exists,
	* and wants to offer the user with the choice to either Rename, Overwrite, Skip;	* and wants to offer the user with the choice to either Rename, Overwrite, Skip;
	* this dialog is also used when a .part file exists and the user can choos e to	* this dialog is also used when a .part file exists and the user can choos e to
	* Resume a previous download.	* Resume a previous download.
	*/	*/
	class KIO_EXPORT RenameDialog : public QDialog	class KIO_EXPORT RenameDialog : public QDialog
	{	{
	Q_OBJECT	Q_OBJECT

	skipping to change at line 85	skipping to change at line 90
	* @param sizeDest size of destination file	* @param sizeDest size of destination file
	* @param ctimeSrc creation time of source file	* @param ctimeSrc creation time of source file
	* @param ctimeDest creation time of destination file	* @param ctimeDest creation time of destination file
	* @param mtimeSrc modification time of source file	* @param mtimeSrc modification time of source file
	* @param mtimeDest modification time of destination file	* @param mtimeDest modification time of destination file
	* @see RenameDialog_Mode	* @see RenameDialog_Mode
	*/	*/
	RenameDialog( QWidget *parent, const QString & caption,	RenameDialog( QWidget *parent, const QString & caption,
	const KUrl & src, const KUrl & dest,	const KUrl & src, const KUrl & dest,
	RenameDialog_Mode mode,	RenameDialog_Mode mode,

	KIO::filesize_t sizeSrc = (KIO::filesize_t) -1,	KIO::filesize_t sizeSrc = KIO::filesize_t(-1),
	KIO::filesize_t sizeDest = (KIO::filesize_t) -1,	KIO::filesize_t sizeDest = KIO::filesize_t(-1),
	time_t ctimeSrc = (time_t) -1,	time_t ctimeSrc = time_t(-1),
	time_t ctimeDest = (time_t) -1,	time_t ctimeDest = time_t(-1),
	time_t mtimeSrc = (time_t) -1,	time_t mtimeSrc = time_t(-1),
	time_t mtimeDest = (time_t) -1 );	time_t mtimeDest = time_t(-1) );
	~RenameDialog();	~RenameDialog();

	/**	/**
	* @return the new destination	* @return the new destination
	* valid only if RENAME was chosen	* valid only if RENAME was chosen
	*/	*/
	KUrl newDestUrl();	KUrl newDestUrl();

	/**	/**

		* @return an automatically renamed destination
		* @since 4.5
		* valid always
		*/
		KUrl autoDestUrl() const;

		/**
	* Given a directory path and a filename (which usually exists already),	* Given a directory path and a filename (which usually exists already),
	* this function returns a suggested name for a file that doesn't exist	* this function returns a suggested name for a file that doesn't exist
	* in that directory. The existence is only checked for local urls though .	* in that directory. The existence is only checked for local urls though .
	* The suggested file name is of the form foo_1 foo_2 etc.	* The suggested file name is of the form foo_1 foo_2 etc.
	*/	*/
	static QString suggestName(const KUrl& baseURL, const QString& oldName);	static QString suggestName(const KUrl& baseURL, const QString& oldName);

	public Q_SLOTS:	public Q_SLOTS:
	void cancelPressed();	void cancelPressed();
	void renamePressed();	void renamePressed();
	void skipPressed();	void skipPressed();
	void autoSkipPressed();	void autoSkipPressed();
	void overwritePressed();	void overwritePressed();
	void overwriteAllPressed();	void overwriteAllPressed();
	void resumePressed();	void resumePressed();
	void resumeAllPressed();	void resumeAllPressed();
	void suggestNewNamePressed();	void suggestNewNamePressed();

	protected Q_SLOTS:	protected Q_SLOTS:
	void enableRenameButton(const QString &);	void enableRenameButton(const QString &);

		private Q_SLOTS:
		void applyAllPressed();
		void showSrcIcon(const KFileItem &);
		void showDestIcon(const KFileItem &);
		void showSrcPreview(const KFileItem &, const QPixmap &);
		void showDestPreview(const KFileItem &, const QPixmap &);

	private:	private:

	class RenameDialogPrivate;	QScrollArea* createContainerLayout(QWidget* parent, const KFileItem& it
	RenameDialogPrivate* const d;	em, QLabel* preview);
	void pluginHandling( );	QLabel* createLabel(QWidget* parent, const QString& text);
		class RenameDialogPrivate;
		RenameDialogPrivate* const d;
	};	};

	}	}


	#endif	#endif

End of changes. 7 change blocks.
	10 lines changed or deleted	32 lines changed or added

	resource.h	resource.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 _NEPOMUK_RESOURCE_H_	#ifndef _NEPOMUK_RESOURCE_H_
	#define _NEPOMUK_RESOURCE_H_	#define _NEPOMUK_RESOURCE_H_

	#include <QtCore/QHash>	#include <QtCore/QHash>
	#include <QtCore/QStringList>	#include <QtCore/QStringList>

	#include <QtCore/QUrl>
		#include <kurl.h>

		#include "class.h"

	#include "nepomuk_export.h"	#include "nepomuk_export.h"

	namespace Nepomuk {	namespace Nepomuk {

	class ResourceManager;	class ResourceManager;
	class ResourceData;	class ResourceData;
	class Variant;	class Variant;
	class Tag;	class Tag;
	class Thing;	class Thing;

		namespace Types {
		class Property;
		}

	enum ErrorCode {	enum ErrorCode {
	NoError = 0,	NoError = 0,
	CommunicationError, /*< A communication error, i.e. connection fai lure /	CommunicationError, /*< A communication error, i.e. connection fai lure /
	InvalidType,	InvalidType,
	UnknownError	UnknownError
	};	};

	/**	/**
	* \return A human-readble string.	* \return A human-readble string.

	skipping to change at line 337	skipping to change at line 343
	* Check if property identified by \a uri is defined	* Check if property identified by \a uri is defined
	* for this resource.	* for this resource.
	*	*
	* \param uri The URI identifying the property.	* \param uri The URI identifying the property.
	*	*
	* \return true if property \a uri has a value set.	* \return true if property \a uri has a value set.
	*/	*/
	bool hasProperty( const QUrl& uri ) const;	bool hasProperty( const QUrl& uri ) const;

	/**	/**

		* Check if the resource has a property \p p with value \p v.
		*
		* \since 4.5
		*/
		bool hasProperty( const Types::Property& p, const Variant& v ) cons
		t;

		/**
	* \deprecated use hasProperty( const QUrl& ) const	* \deprecated use hasProperty( const QUrl& ) const
	*/	*/
	KDE_DEPRECATED bool hasProperty( const QString& uri ) const;	KDE_DEPRECATED bool hasProperty( const QString& uri ) const;

	/**	/**
	* Retrieve the value of property \a uri. If the property is not de fined for	* Retrieve the value of property \a uri. If the property is not de fined for
	* this resource an invalid, empty Variant object is returned.	* this resource an invalid, empty Variant object is returned.
	*	*
	* \param uri The URI identifying the property.	* \param uri The URI identifying the property.
	*/	*/

	skipping to change at line 662	skipping to change at line 675
	*/	*/
	void setRating( const quint32& value );	void setRating( const quint32& value );

	/**	/**
	* \return The URI of the property 'Rating'.	* \return The URI of the property 'Rating'.
	*/	*/
	static QString ratingUri();	static QString ratingUri();

	/**	/**
	* Get property 'Symbol'. Each resource can have a symbol assigned.	* Get property 'Symbol'. Each resource can have a symbol assigned.

	* For now this is a simple string which can either be the patch to	* For now this is a simple string which can either be the path to
	* an actual pixmap file or just the name of an icon as defined by	* an actual pixmap file or just the name of an icon as defined by
	* the freedesktop.org standard.	* the freedesktop.org standard.
	*/	*/
	QStringList symbols() const;	QStringList symbols() const;

	/**	/**
	* Set property 'Symbol'. Each resource can have a symbol assigned.	* Set property 'Symbol'. Each resource can have a symbol assigned.

	* For now this is a simple string which can either be the patch to	* For now this is a simple string which can either be the path to
	* an actual pixmap file or just the name of an icon as defined by	* an actual pixmap file or just the name of an icon as defined by
	* the freedesktop.org standard.	* the freedesktop.org standard.
	*/	*/
	void setSymbols( const QStringList& value );	void setSymbols( const QStringList& value );

	/**	/**
	* Add a value to property 'Symbol'. Each resource can have a symbo l	* Add a value to property 'Symbol'. Each resource can have a symbo l
	* assigned. For now this is a simple string which can either be	* assigned. For now this is a simple string which can either be

	* the patch to an actual pixmap file or just the name of an icon a s	* the path to an actual pixmap file or just the name of an icon as
	* defined by the freedesktop.org standard.	* defined by the freedesktop.org standard.
	*/	*/
	void addSymbol( const QString& value );	void addSymbol( const QString& value );

	/**	/**
	* \return The URI of the property 'Symbol'.	* \return The URI of the property 'Symbol'.
	*/	*/
	static QString symbolUri();	static QString symbolUri();

	/**	/**

	skipping to change at line 712	skipping to change at line 725
	* Retrieve a list of all available Resource resources. This list	* Retrieve a list of all available Resource resources. This list
	* consists of all resource of type Resource that are stored in	* consists of all resource of type Resource that are stored in
	* the local Nepomuk meta data storage and any changes made locally .	* the local Nepomuk meta data storage and any changes made locally .
	* Be aware that in some cases this list can get very big. Then it	* Be aware that in some cases this list can get very big. Then it
	* might be better to use libKNep directly.	* might be better to use libKNep directly.
	*	*
	* \sa ResourceManager::allResources	* \sa ResourceManager::allResources
	*/	*/
	static QList<Resource> allResources();	static QList<Resource> allResources();


		/**
		* \return The usage count stored for this resource.
		*
		* \sa increaseUsageCount()
		*
		* \since 4.5
		*/
		int usageCount() const;

		/**
		* Increase the usage count of this resource and also
		* update the last used date to the current date and time.
		*
		* \since 4.5
		*/
		void increaseUsageCount();

		/**
		* Allows to quickly load a resource from its resource URI without
		any
		* additional checks. This is mostly used for optimized code within
		Nepomuk.
		*
		* In most situations the construtor Resource( QUrl, QUrl ) is bett
		er suited.
		*
		* \since 4.5
		*/
		static Resource fromResourceUri( const KUrl& uri, const Nepomuk::Ty
		pes::Class& type = Nepomuk::Types::Class(), ResourceManager* manager = 0 );

	private:	private:

		/**
		* Determines the final ResourceData and updates m_data if
		* necessary. This will call ResourceData::determineUri()
		* and optionally merge with already loaded ResourceData
		* instances representing the same resource.
		*/
		void determineFinalResourceData() const;

	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 );	NEPOMUK_EXPORT uint qHash( const Resource& res );
	}	}

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

	resourcemanager.h	resourcemanager.h

	skipping to change at line 34	skipping to change at line 34
	#include "nepomuk_export.h"	#include "nepomuk_export.h"

	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include <QtCore/QUrl>	#include <QtCore/QUrl>

	namespace Soprano {	namespace Soprano {
	class Model;	class Model;
	}	}

	namespace Nepomuk {	namespace Nepomuk {

	namespace Middleware {
	class Registry;
	}

	class Resource;	class Resource;
	class Variant;	class Variant;
	class ResourceManagerHelper;	class ResourceManagerHelper;
	class ResourceManagerPrivate;	class ResourceManagerPrivate;

	/**	/**
	* \class ResourceManager resourcemanager.h Nepomuk/ResourceManager	* \class ResourceManager resourcemanager.h Nepomuk/ResourceManager
	*	*

	* \brief The ResourceManager is the central \a %KMetaData configuratio	* \brief The ResourceManager is the central \a %Nepomuk configuration
	n point.	point.
		*
		* Use the initialized() method to check the availabity of the %Nepomuk
		system.
		* Signals nepomukSystemStarted() and nepomukSystemStopped() can be use
		d to
		* enable or disable Nepomuk-specific GUI elements.
	*	*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*/	*/
	class NEPOMUK_EXPORT ResourceManager : public QObject	class NEPOMUK_EXPORT ResourceManager : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	static ResourceManager* instance();	static ResourceManager* instance();


	skipping to change at line 70	skipping to change at line 70
	* and destructor's access visibility could not be changed. Thus, i nstead of deleting	* and destructor's access visibility could not be changed. Thus, i nstead of deleting
	* a custom ResourceManager instance the standard way, one has to c all this	* a custom ResourceManager instance the standard way, one has to c all this
	* method or use QObject::deleteLater.	* method or use QObject::deleteLater.
	*	*
	* \since 4.3	* \since 4.3
	*/	*/
	void deleteInstance();	void deleteInstance();

	/**	/**
	* Initialize the Nepomuk framework. This method will initialize th e communication with	* Initialize the Nepomuk framework. This method will initialize th e communication with

	* the local Nepomuk-KDE services, ie. the data repository.	* the local Nepomuk-KDE services, ie. the data repository. It will
		trigger a reconnect
		* to the %Nepomuk database.
	*	*

	* When using multiple threads make sure to call this method in the	* There is normally no reason to call this method manually except
	main thread	when using multiple
		* threads. In that case it is highly recommended to call this meth
		od in the main thread
	* before doing anything else.	* before doing anything else.
	*	*
	* \return 0 if all necessary components could be found and -1 othe rwise.	* \return 0 if all necessary components could be found and -1 othe rwise.

	*
	* FIXME: introduce error codes and human readable translated error
	messages.
	*/	*/
	int init();	int init();

	/**	/**
	* \return true if init() has been called successfully, ie. the KMe taData system is connected	* \return true if init() has been called successfully, ie. the KMe taData system is connected
	* to the local RDF repository service and ready to work.	* to the local RDF repository service and ready to work.
	*/	*/
	bool initialized() const;	bool initialized() const;

	/**	/**

	skipping to change at line 261	skipping to change at line 261
	friend class Nepomuk::ResourceManagerHelper;	friend class Nepomuk::ResourceManagerHelper;
	friend class Nepomuk::Resource;	friend class Nepomuk::Resource;
	friend class Nepomuk::ResourceManagerPrivate;	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_storageServiceInitialized(bool) )

	Q_PRIVATE_SLOT( d, void _k_dbusServiceOwnerChanged(QString, QString , QString) )	Q_PRIVATE_SLOT( d, void _k_dbusServiceUnregistered(QString) )
	};	};
	}	}

	#endif	#endif

End of changes. 6 change blocks.
	13 lines changed or deleted	16 lines changed or added

	result.h	result.h
	/*	/*
	This file is part of the Nepomuk KDE project.	This file is part of the Nepomuk KDE project.

	Copyright (C) 2008-2009 Sebastian Trueg <trueg@kde.org>	Copyright (C) 2008-2010 Sebastian Trueg <trueg@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	License version 2 as published by the Free Software Foundation.

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


	skipping to change at line 29	skipping to change at line 29

	#ifndef _NEPOMUK_QUERY_RESULT_H_	#ifndef _NEPOMUK_QUERY_RESULT_H_
	#define _NEPOMUK_QUERY_RESULT_H_	#define _NEPOMUK_QUERY_RESULT_H_

	#include <QtCore/QSharedDataPointer>	#include <QtCore/QSharedDataPointer>
	#include <QtCore/QUrl>	#include <QtCore/QUrl>
	#include <QtCore/QList>	#include <QtCore/QList>
	#include <QtCore/QHash>	#include <QtCore/QHash>

	#include <Soprano/Statement>	#include <Soprano/Statement>

		#include <Soprano/BindingSet>

	#include "nepomukquery_export.h"	#include "nepomukquery_export.h"

	namespace Nepomuk {	namespace Nepomuk {

	class Resource;	class Resource;

		class Variant;
	namespace Types {	namespace Types {
	class Property;	class Property;
	}	}

	namespace Query {	namespace Query {
	/**	/**
	* \class Result result.h Nepomuk/Query/Result	* \class Result result.h Nepomuk/Query/Result
	*	*
	* \brief A single search result.	* \brief A single search result.
	*	*
	* A search via QueryServiceClient returns a set of Result object. A result consists	* A search via QueryServiceClient returns a set of Result object. A result consists
	* of a Nepomuk::Resource and an optional score.	* of a Nepomuk::Resource and an optional score.
	*	*

		* Additional bindings (variable values) as requested via Compariso
		nTerm::setVariableName()
		* can be retrieved using additionalBinding().
		*
	* \author Sebastian Trueg <trueg@kde.org>	* \author Sebastian Trueg <trueg@kde.org>
	*	*
	* \since 4.4	* \since 4.4
	*/	*/
	class NEPOMUKQUERY_EXPORT Result	class NEPOMUKQUERY_EXPORT Result
	{	{
	public:	public:
	/**	/**
	* Create an empty result.	* Create an empty result.
	*/	*/

	skipping to change at line 127	skipping to change at line 132
	/**	/**
	* Retrieve value of request property \p property.	* Retrieve value of request property \p property.
	*	*
	* \sa requestProperties, addRequestProperty	* \sa requestProperties, addRequestProperty
	*/	*/
	Soprano::Node operator[]( const Types::Property& property ) con st;	Soprano::Node operator[]( const Types::Property& property ) con st;

	/**	/**
	* Retrieve value of request property \p property.	* Retrieve value of request property \p property.
	*	*

	* \sa requestProperties, addRequestProperty	* \sa additionalBinding, requestProperties, addRequestProperty
	*/	*/
	Soprano::Node requestProperty( const Types::Property& property ) const;	Soprano::Node requestProperty( const Types::Property& property ) const;

	/**	/**

		* Set the additional bindings a query returned besides the res
		ult
		* itself and the request properties.
		*
		* Normally there is no need to call this method as the query s
		ervice
		* does set the bindings.
		*
		* \since 4.5
		*/
		void setAdditionalBindings( const Soprano::BindingSet& bindings
		);

		/**
		* Retrieve the set of additional bindings as set via setAdditi
		onalBindings().
		* Normally one would use additionalBinding() instead.
		*
		* \since 4.5
		*/
		Soprano::BindingSet additionalBindings() const;

		/**
		* Retrieve an additional binding as returned by the query. Typ
		ically
		* these bindings are created via ComparisonTerm::setVariableNa
		me().
		* But they could also stem from custom SPARQL queries. A simpl
		e
		* example would be:
		*
		* \code
		* select ?r ?rating where { ?r nao:numericRating ?rating . }
		* \endcode
		*
		* Here \p ?r would be used as the result's resource while
		* \p ?rating could be accessed via
		*
		* \code
		* additionalBinding( QLatin1String("rating") );
		* \endcode
		*
		* If for some reason one needs the plain binding values one
		* could use additionalBinding().
		*
		* \since 4.5
		*/
		Variant additionalBinding( const QString& name ) const;

		/**
	* Comparison operator	* Comparison operator
	*/	*/
	bool operator==( const Result& ) const;	bool operator==( const Result& ) const;

	private:	private:
	class Private;	class Private;
	QSharedDataPointer<Private> d;	QSharedDataPointer<Private> d;
	};	};
	}	}
	}	}

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

	runnermanager.h	runnermanager.h

	skipping to change at line 166	skipping to change at line 166

	/**	/**
	* Sets a whitelist for the plugins that can be loaded	* Sets a whitelist for the plugins that can be loaded
	*	*
	* @arg plugins the plugin names of allowed runners	* @arg plugins the plugin names of allowed runners
	* @since 4.4	* @since 4.4
	*/	*/
	void setAllowedRunners(const QStringList &runners);	void setAllowedRunners(const QStringList &runners);

	/**	/**

		* Attempts to add the AbstractRunner plugin represented
		* by the KService passed in. Usually one can simply let
		* the configuration of plugins handle loading Runner plugins,
		* but in cases where specific runners should be loaded this
		* allows for that to take place
		*
		* @arg service the service to use to load the plugin
		* @since 4.5
		*/
		void loadRunner(const KService::Ptr service);

		/**
		* Attempts to add the AbstractRunner from a Plasma::Package on dis
		k.
		* Usually one can simply let the configuration of plugins
		* handle loading Runner plugins, but in cases where specific
		* runners should be loaded this allows for that to take place
		*
		* @arg path the path to a Runner package to load
		* @since 4.5
		*/
		void loadRunner(const QString &path);

		/**
	* @return the list of allowed plugins	* @return the list of allowed plugins
	* @since 4.4	* @since 4.4
	*/	*/
	QStringList allowedRunners() const;	QStringList allowedRunners() const;


		/**
		* @return mime data of the specified match
		* @since 4.5
		*/
		QMimeData * mimeDataForMatch(const QueryMatch &match) const;

		/**
		* @return mime data of the specified match
		* @since 4.5
		*/
		QMimeData * mimeDataForMatch(const QString &id) const;

	public Q_SLOTS:	public Q_SLOTS:
	/**	/**
	* Call this method when the runners should be prepared for a query session.	* Call this method when the runners should be prepared for a query session.
	* Call matchSessionComplete when the query session is finished for the time	* Call matchSessionComplete when the query session is finished for the time
	* being.	* being.
	* @since 4.4	* @since 4.4
	* @see matchSessionComplete	* @see matchSessionComplete
	*/	*/
	void setupMatchSession();	void setupMatchSession();


	skipping to change at line 232	skipping to change at line 267
	* Reset the current data and stops the query	* Reset the current data and stops the query
	*/	*/
	void reset();	void reset();

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Emitted each time a new match is added to the list	* Emitted each time a new match is added to the list
	*/	*/
	void matchesChanged(const QList<Plasma::QueryMatch> &matches);	void matchesChanged(const QList<Plasma::QueryMatch> &matches);


		/**
		* Emitted when the launchQuery finish
		* @since 4.5
		*/
		void queryFinished();

	private:	private:
	Q_PRIVATE_SLOT(d, void scheduleMatchesChanged())	Q_PRIVATE_SLOT(d, void scheduleMatchesChanged())
	Q_PRIVATE_SLOT(d, void matchesChanged())	Q_PRIVATE_SLOT(d, void matchesChanged())
	Q_PRIVATE_SLOT(d, void jobDone(ThreadWeaver::Job*))	Q_PRIVATE_SLOT(d, void jobDone(ThreadWeaver::Job*))
	Q_PRIVATE_SLOT(d, void unblockJobs())	Q_PRIVATE_SLOT(d, void unblockJobs())

	RunnerManagerPrivate * const d;	RunnerManagerPrivate * const d;

	friend class RunnerManagerPrivate;	friend class RunnerManagerPrivate;
	};	};

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

	scheduler.h	scheduler.h

	skipping to change at line 124	skipping to change at line 124
	public:	public:
	/**	/**
	* Register @p job with the scheduler.	* Register @p job with the scheduler.
	* The default is to create a new slave for the job if no slave	* The default is to create a new slave for the job if no slave
	* is available. This can be changed by calling scheduleJob.	* is available. This can be changed by calling scheduleJob.
	* @param job the job to register	* @param job the job to register
	*/	*/
	static void doJob(SimpleJob *job);	static void doJob(SimpleJob *job);

	/**	/**

	* Calling ths function makes that @p job gets scheduled for later	* Schedules @p job scheduled for later
	* execution, if multiple jobs are registered it might wait for	* execution. This just sets the job's priority to 1 now.
	* other jobs to finish.
	* @param job the job to schedule	* @param job the job to schedule
	*/	*/

	static void scheduleJob(SimpleJob *job);	KDE_DEPRECATED static void scheduleJob(SimpleJob *job);

		/**
		* Changes the priority of @p job; jobs of the same priority run in
		the order in which
		* they were created. Jobs of lower numeric priority always run bef
		ore any
		* waiting jobs of higher numeric priority. The range of priority i
		s -10 to 10,
		* the default priority of jobs is 0.
		* @param job the job to change
		* @param priority new priority of @p job, lower runs earlier
		*/
		static void setJobPriority(SimpleJob *job, int priority);

	/**	/**
	* Stop the execution of a job.	* Stop the execution of a job.
	* @param job the job to cancel	* @param job the job to cancel
	*/	*/
	static void cancelJob(SimpleJob *job);	static void cancelJob(SimpleJob *job);

	/**	/**
	* Called when a job is done.	* Called when a job is done.
	* @param job the finished job	* @param job the finished job

	skipping to change at line 236	skipping to change at line 245
	* Unregisters the window registered by registerWindow().	* Unregisters the window registered by registerWindow().
	*/	*/
	static void unregisterWindow(QObject *wid);	static void unregisterWindow(QObject *wid);

	/**	/**
	* Function to connect signals emitted by the scheduler.	* Function to connect signals emitted by the scheduler.
	*	*
	* @see slaveConnected()	* @see slaveConnected()
	* @see slaveError()	* @see slaveError()
	*/	*/

		// KDE5: those methods should probably be removed, ugly and only ma rginally useful
	static bool connect( const char signal, const QObject receiver,	static bool connect( const char signal, const QObject receiver,
	const char *member);	const char *member);

	static bool connect( const QObject* sender, const char* signal,	static bool connect( const QObject* sender, const char* signal,
	const QObject* receiver, const char* member );	const QObject* receiver, const char* member );

	static bool disconnect( const QObject* sender, const char* signal,	static bool disconnect( const QObject* sender, const char* signal,
	const QObject* receiver, const char* member );	const QObject* receiver, const char* member );

	bool connect( const QObject sender, const char signal,	bool connect( const QObject sender, const char signal,

	skipping to change at line 278	skipping to change at line 288

	static Scheduler *self();	static Scheduler *self();

	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveDied(KIO::Slave *sla ve))	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveDied(KIO::Slave *sla ve))
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveStatus(pid_t pid, co nst QByteArray &protocol,	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveStatus(pid_t pid, co nst QByteArray &protocol,
	const QString &host, bool co nnected))	const QString &host, bool co nnected))

	// connected to D-Bus signal:	// connected to D-Bus signal:
	Q_PRIVATE_SLOT(schedulerPrivate, void slotReparseSlaveConfiguration (const QString &))	Q_PRIVATE_SLOT(schedulerPrivate, void slotReparseSlaveConfiguration (const QString &))


	Q_PRIVATE_SLOT(schedulerPrivate, void startStep())
	Q_PRIVATE_SLOT(schedulerPrivate, void slotCleanIdleSlaves())
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveConnected())	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveConnected())
	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveError(int error, con st QString &errorMsg))	Q_PRIVATE_SLOT(schedulerPrivate, void slotSlaveError(int error, con st QString &errorMsg))

	Q_PRIVATE_SLOT(schedulerPrivate, void slotScheduleCoSlave())
	Q_PRIVATE_SLOT(schedulerPrivate, void slotUnregisterWindow(QObject *))	Q_PRIVATE_SLOT(schedulerPrivate, void slotUnregisterWindow(QObject *))
	private:	private:
	friend class SchedulerPrivate;	friend class SchedulerPrivate;

	SchedulerPrivate * const d;	SchedulerPrivate *const d;
	};	};

	}	}
	#endif	#endif

End of changes. 6 change blocks.
	8 lines changed or deleted	18 lines changed or added

	scrollwidget.h	scrollwidget.h

	skipping to change at line 51	skipping to change at line 51
	*/	*/
	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(QPointF scrollPosition READ scrollPosition WRITE setScrollPo sition)
	Q_PROPERTY(QSizeF contentsSize READ contentsSize)	Q_PROPERTY(QSizeF contentsSize READ contentsSize)
	Q_PROPERTY(QRectF viewportGeometry READ viewportGeometry)	Q_PROPERTY(QRectF viewportGeometry READ viewportGeometry)

		Q_PROPERTY(QSizeF snapSize READ snapSize WRITE setSnapSize)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)

		Q_PROPERTY(Qt::Alignment alignment READ alignment WRITE setAlignment)
		Q_PROPERTY(bool overShoot READ hasOverShoot WRITE setOverShoot)

	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);	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,	* If the widget size policy allows for horizontal and/or vertical expa
	* it will be resized when possible, otherwise it will be keps to which	nsion,
	ever	* it will be resized when possible, otherwise it will be kept to which
		ever
	* width the widget resizes itself.	* width the widget resizes itself.

	* 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;

	/**	/**

		* Sets the alignment for the inner widget.
		* It is only meaningful if the inner widget is smaller
		* than the viewport.
		* @since 4.5
		*/
		void setAlignment(Qt::Alignment align);

		/**
		* @return currently set alignment for the inner widget
		* @since 4.5
		*/
		Qt::Alignment alignment() const;

		/**
		* Tells the scrollwidget whether the widget can scroll a little
		* beyond its boundaries and then automatically snap back or
		* whether the widget scrolling always stops at the edges.
		* @since 4.5
		*/
		void setOverShoot(bool enable);

		/**
		* @return true if overshoot is enabled
		* @since 4.5
		*/
		bool hasOverShoot() const;

		/**
	* Sets the horizontal scrollbar policy	* Sets the horizontal scrollbar policy
	*	*
	* @arg policy desired policy	* @arg policy desired policy
	*/	*/
	void setHorizontalScrollBarPolicy(const Qt::ScrollBarPolicy policy);	void setHorizontalScrollBarPolicy(const Qt::ScrollBarPolicy policy);

	/**	/**
	* @return the horizontal scrollbar policy	* @return the horizontal scrollbar policy
	*/	*/
	Qt::ScrollBarPolicy horizontalScrollBarPolicy() const;	Qt::ScrollBarPolicy horizontalScrollBarPolicy() const;

	skipping to change at line 128	skipping to change at line 158
	* @since 4.4	* @since 4.4
	*/	*/
	Q_INVOKABLE void ensureItemVisible(QGraphicsItem *item);	Q_INVOKABLE void ensureItemVisible(QGraphicsItem *item);

	/**	/**
	* Register an item as a drag handle, it means mouse events will pass t rough it	* 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.	* 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	* The item will still receive mouse clicks if the mouse didn't move
	* between press and release.	* between press and release.
	*	*

		* This function is no more necessary, since it's the authomatic behavi
		our
		* for all children items, the implementation has now no effect
		*
	* @param item the drag handle item. widget() must be an ancestor if it in	* @param item the drag handle item. widget() must be an ancestor if it in
	* the parent hierarchy. if item doesn't accept mose press events	* the parent hierarchy. if item doesn't accept mose press events
	* it's not necessary to call this function.	* it's not necessary to call this function.
	* @since 4.4	* @since 4.4
	*/	*/

	Q_INVOKABLE void registerAsDragHandle(QGraphicsWidget *item);	KDE_DEPRECATED Q_INVOKABLE void registerAsDragHandle(QGraphicsWidget *i tem);

	/**	/**
	* Unregister the given item as drag handle (if it was registered)	* Unregister the given item as drag handle (if it was registered)

		*
		* This function is no more necessary, since it's the authomatic behavi
		our
		* for all children items, the implementation has now no effect
		*
	* @since 4.4	* @since 4.4
	*/	*/

	Q_INVOKABLE void unregisterAsDragHandle(QGraphicsWidget *item);	KDE_DEPRECATED Q_INVOKABLE void unregisterAsDragHandle(QGraphicsWidget *item);

	/**	/**
	* The geometry of the viewport.	* The geometry of the viewport.
	* @since 4.4	* @since 4.4
	*/	*/
	QRectF viewportGeometry() const;	QRectF viewportGeometry() const;

	/**	/**
	* @return the size of the internal widget	* @return the size of the internal widget
	* @since 4.4	* @since 4.4

	skipping to change at line 166	skipping to change at line 203
	*/	*/
	void setScrollPosition(const QPointF &position);	void setScrollPosition(const QPointF &position);

	/**	/**
	* @return the position of the internal widget relative to this widget	* @return the position of the internal widget relative to this widget
	* @since 4.4	* @since 4.4
	*/	*/
	QPointF scrollPosition() const;	QPointF scrollPosition() const;

	/**	/**

		* Set the nap size of the kinetic scrolling:
		* the scrolling will always stop at multiples of that size.
		*
		* @arg the desired snap size
		* @since 4.5
		*/
		void setSnapSize(const QSizeF &size);

		/**
		* @return the snap size of the kinetic scrolling
		* @since 4.5
		*/
		QSizeF snapSize() const;

		/**
	* Sets the stylesheet used to control the visual display of this Scrol lWidget	* Sets the stylesheet used to control the visual display of this Scrol lWidget
	*	*
	* @arg stylesheet a CSS string	* @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:	Q_SIGNALS:

		/**
		* The widget started or stopped an animated scroll
		* @since 4.4
		*/
	void scrollStateChanged(QAbstractAnimation::State newState,	void scrollStateChanged(QAbstractAnimation::State newState,
	QAbstractAnimation::State oldState);	QAbstractAnimation::State oldState);


		/**
		* The viewport geomety changed, for instance due a widget resize
		*
		* @since 4.5
		*/
		void viewportGeometryChanged(const QRectF &geomety);

	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 mouseReleaseEvent(QGraphicsSceneMouseEvent *event);

		void keyPressEvent(QKeyEvent *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);	void focusInEvent(QFocusEvent *event);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;

		bool sceneEventFilter(QGraphicsItem i, QEvent e);

	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 makeRectVisible())
	Q_PRIVATE_SLOT(d, void makeItemVisible())	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 adjustScrollbars())

	Q_PRIVATE_SLOT(d, void scrollStateChanged(QGraphicsWidget *, QAbstractA	Q_PRIVATE_SLOT(d, void fixupX())
	nimation::State,	Q_PRIVATE_SLOT(d, void fixupY())
	QAbstractAnimation::State))	Q_PRIVATE_SLOT(d, void setScrollX())
		Q_PRIVATE_SLOT(d, void setScrollY())

	friend class ScrollWidgetPrivate;	friend class ScrollWidgetPrivate;
	};	};

	} // namespace Plasma	} // namespace Plasma

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

End of changes. 16 change blocks.
	10 lines changed or deleted	78 lines changed or added

	service.h	service.h

	skipping to change at line 76	skipping to change at line 76
	* Sample use might look like:	* Sample use might look like:
	*	*
	* @code	* @code
	* Plasma::DataEngine *twitter = dataEngine("twitter");	* Plasma::DataEngine *twitter = dataEngine("twitter");
	* 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

		*
		* Please remember, the service needs to be deleted when it will no longer
		be
		* used. This can be done manually or by these (perhaps easier) alternative
		s:
		*
		* If it is needed throughout the lifetime of the object:
		* @code
		* service->setParent(this);
		* @endcode
		*
		* If the service will not be used after just one operation call, use:
		* @code
		* connect(job, SIGNAL(finished(KJob*)), service, SLOT(deleteLater()));
		* @endcode
		*
	*/	*/
	class PLASMA_EXPORT Service : public QObject	class PLASMA_EXPORT Service : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_DECLARE_PRIVATE(Service)	Q_DECLARE_PRIVATE(Service)
	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 args a list of arguments to supply to the service plugin when
		loading it
		* @param parent the parent object, if any, for the service
		*
		* @return a Service object, guaranteed to be not null.
		* @since 4.5
		*/
		static Service *load(const QString &name, const QVariantList &args, QOb
		ject *parent = 0);

		/**
		* Used to load a given service from a plugin.
		*
		* @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	* Used to access a service from an url. Always check for the signal se rviceReady() that fires
	* when this service is actually ready for use.	* when this service is actually ready for use.
	*/	*/

End of changes. 2 change blocks.
	0 lines changed or deleted	30 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)	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 as published by the Free Software Foundation; either
		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.

	You should have received a copy of the GNU Library General Public Licens e	You should have received a copy of the GNU Library General Public Licens e
	along with this library; see the file COPYING.LIB. If not, write to	along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.	Boston, MA 02110-1301, USA.

	skipping to change at line 79	skipping to change at line 80
	* qobject_cast<KTextEditor::SessionConfigInterface*>( object );	* qobject_cast<KTextEditor::SessionConfigInterface*>( object );
	*	*
	* if( iface ) {	* if( iface ) {
	* // interface is supported	* // interface is supported
	* // do stuff	* // do stuff
	* }	* }
	* \endcode	* \endcode
	*	*
	* \see KTextEditor::Document, KTextEditor::View, KTextEditor::Plugin	* \see KTextEditor::Document, KTextEditor::View, KTextEditor::Plugin
	* \author Christoph Cullmann \<cullmann@kde.org\>	* \author Christoph Cullmann \<cullmann@kde.org\>

		* \note KDE5: Replace this interface with ParameterizedSessionConfigInterf ace
	*/	*/
	class KTEXTEDITOR_EXPORT SessionConfigInterface	class KTEXTEDITOR_EXPORT SessionConfigInterface
	{	{
	public:	public:
	SessionConfigInterface();	SessionConfigInterface();

	/**	/**
	* Virtual destructor.	* Virtual destructor.
	*/	*/
	virtual ~SessionConfigInterface();	virtual ~SessionConfigInterface();

	skipping to change at line 168	skipping to change at line 170
	* // object is of type KTextEditor::Document*	* // object is of type KTextEditor::Document*
	* KTextEditor::ParameterizedSessionConfigInterface *iface =	* KTextEditor::ParameterizedSessionConfigInterface *iface =
	* qobject_cast<KTextEditor::ParameterizedSessionConfigInterface*>( obj ect );	* qobject_cast<KTextEditor::ParameterizedSessionConfigInterface*>( obj ect );
	*	*
	* if( iface ) {	* if( iface ) {
	* // interface is supported	* // interface is supported
	* // do stuff	* // do stuff
	* }	* }
	* \endcode	* \endcode
	*	*

	* \see KTextEditor::Document	* \see KTextEditor::Document, KTextEditor::SessionConfigInterface
	*	*
	* \since 4.4	* \since 4.4

		* \note KDE5: Rename to SessionConfigInterface, delete old SessionConfigIn terface
	*/	*/
	class KTEXTEDITOR_EXPORT ParameterizedSessionConfigInterface	class KTEXTEDITOR_EXPORT ParameterizedSessionConfigInterface
	{	{
	public:	public:
	ParameterizedSessionConfigInterface();	ParameterizedSessionConfigInterface();

	/**	/**
	* Virtual destructor.	* Virtual destructor.
	*/	*/
	virtual ~ParameterizedSessionConfigInterface();	virtual ~ParameterizedSessionConfigInterface();

	public:	public:


		/**
		* Flags for session restore.
		*/
	enum SessionConfigParameter {	enum SessionConfigParameter {
	SkipNone = 0,	SkipNone = 0,
	SkipUrl = 1 << 0,	SkipUrl = 1 << 0,
	SkipMode = 1 << 1,	SkipMode = 1 << 1,
	SkipHighlighting = 1 << 2,	SkipHighlighting = 1 << 2,
	SkipEncoding = 1 << 3	SkipEncoding = 1 << 3
	};	};

	/**	/**
	* Read session settings from the given \p config excluding the setting s specified in	* Read session settings from the given \p config excluding the setting s specified in

	skipping to change at line 206	skipping to change at line 212
	* That means for example	* That means for example
	* - a Document should reload the file, restore all marks etc...	* - a Document should reload the file, restore all marks etc...
	* - a View should scroll to the last position and restore the cursor	* - a View should scroll to the last position and restore the cursor
	* position etc...	* position etc...
	* - a Plugin should restore session specific settings	* - 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	* - 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	* 'SkipUrl' is set, this function should emit ReadOnlyPart::complet ed
	*	*
	* \param config read the session settings from this KConfigGroup	* \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)	* \param parameters settings that should not be read (i.e. a combinati on of flags from SessionConfigParameter)

	* \see writeSessionConfig()	* \see writeParameterizedSessionConfig()
	*/	*/
	virtual void readParameterizedSessionConfig (const KConfigGroup& config ,	virtual void readParameterizedSessionConfig (const KConfigGroup& config ,
	unsigned long parameters) = 0;	unsigned long parameters) = 0;

	/**	/**
	* Write session settings to the \p config excluding the settings speci fied in	* Write session settings to the \p config excluding the settings speci fied in
	* \p parameters.	* \p parameters.
	* See readSessionConfig() for more details.	* See readSessionConfig() for more details.
	*	*
	* \param config write the session settings to this KConfigGroup	* \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)	* \param parameters settings that should not be written (i.e. a combin ation of flags from SessionConfigParameter)

	* \see readSessionConfig()	* \see readParameterizedSessionConfig()
	*/	*/
	virtual void writeParameterizedSessionConfig (KConfigGroup& config,	virtual void writeParameterizedSessionConfig (KConfigGroup& config,
	unsigned long parameters) = 0;	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")	Q_DECLARE_INTERFACE(KTextEditor::ParameterizedSessionConfigInterface, "org. kde.KTextEditor.ParameterizedSessionConfigInterface")


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

	slave.h	slave.h

	skipping to change at line 38	skipping to change at line 38
	#include <unistd.h>	#include <unistd.h>

	#include <QtCore/QObject>	#include <QtCore/QObject>

	#include <kurl.h>	#include <kurl.h>

	#include "kio/slaveinterface.h"	#include "kio/slaveinterface.h"

	namespace KIO {	namespace KIO {


	class SlavePrivate;	class SlavePrivate;
	// Attention developers: If you change the implementation of KIO::Slave	class SimpleJob;
	,	// Attention developers: If you change the implementation of KIO::Slave,
	// do not use connection() or slaveconn but the respective KIO::Slave	// do not use connection() or slaveconn but the respective KIO::Slave
	// accessor methods. Otherwise classes derived from Slave might break.	// accessor methods. Otherwise classes derived from Slave might break. (LS)
	(LS)	//
	//	// Do not use this class directly, outside of KIO. Only use the Slave point
	// Do not use this class directly, outside of KIO. Only use the Slave p	er
	ointer	// that is returned by the scheduler for passing it around.
	// that is returned by the scheduler for passing it around.	//
	//	// TODO: KDE5: Separate public API and private stuff for this better
	// TODO: KDE5: Separate public API and private stuff for this better	class KIO_SLAVE_EXPORT Slave : public KIO::SlaveInterface
	class KIO_SLAVE_EXPORT Slave : public KIO::SlaveInterface	{
	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	explicit Slave(const QString &protocol, QObject *parent = 0);	explicit Slave(const QString &protocol, QObject *parent = 0);


	virtual ~Slave();	virtual ~Slave();

	void setPID(pid_t);	void setPID(pid_t);


	int slave_pid();	int slave_pid();


	/**	void setJob(KIO::SimpleJob *job);
	* Force termination	KIO::SimpleJob *job() const;
	*/
	void kill();


	/**	/**
	* @return true if the slave survived the last mission.	* Force termination
	*/	*/
	bool isAlive();	void kill();


	/**	/**
	* Set host for url	* @return true if the slave survived the last mission.
	* @param host to connect to.	*/
	* @param port to connect to.	bool isAlive();
	* @param user to login as
	* @param passwd to login with
	*/
	virtual void setHost( const QString &host, quint16 port,
	const QString &user, const QString &passwd);


	/**	/**
	* Clear host info.	* Set host for url
	*/	* @param host to connect to.
	void resetHost();	* @param port to connect to.
		* @param user to login as
		* @param passwd to login with
		*/
		virtual void setHost( const QString &host, quint16 port,
		const QString &user, const QString &passwd);


	/**	/**
	* Configure slave	* Clear host info.
	*/	*/
	virtual void setConfig(const MetaData &config);	void resetHost();


	/**	/**
		* Configure slave
		*/
		virtual void setConfig(const MetaData &config);

		/**
	* The protocol this slave handles.	* The protocol this slave handles.
	*	*

	* @return name of protocol handled by this slave, as seen by the u	* @return name of protocol handled by this slave, as seen by the user
	ser	*/
	*/	QString protocol();
	QString protocol();


	void setProtocol(const QString & protocol);	void setProtocol(const QString & protocol);
	/**	/**
	* The actual protocol used to handle the request.	* The actual protocol used to handle the request.
	*	*
	* This method will return a different protocol than	* This method will return a different protocol than
	* the one obtained by using protocol() if a	* the one obtained by using protocol() if a
	* proxy-server is used for the given protocol. This	* proxy-server is used for the given protocol. This
	* usually means that this method will return "http"	* usually means that this method will return "http"
	* when the actuall request was to retrieve a resource	* when the actuall request was to retrieve a resource
	* from an "ftp" server by going through a proxy server.	* from an "ftp" server by going through a proxy server.
	*	*

	* @return the actual protocol (io-slave) that handled the request	* @return the actual protocol (io-slave) that handled the request
	*/	*/
	QString slaveProtocol();	QString slaveProtocol();


	/**	/**
	* @return Host this slave is (was?) connected to	* @return Host this slave is (was?) connected to
	*/	*/
	QString host();	QString host();


	/**	/**
	* @return port this slave is (was?) connected to	* @return port this slave is (was?) connected to
	*/	*/
	quint16 port();	quint16 port();


	/**	/**
	* @return User this slave is (was?) logged in as	* @return User this slave is (was?) logged in as
	*/	*/
	QString user();	QString user();


	/**	/**
	* @return Passwd used to log in	* @return Passwd used to log in
	*/	*/
	QString passwd();	QString passwd();

	/**	/**
	* Creates a new slave.	* Creates a new slave.
	*	*
	* @param protocol the protocol	* @param protocol the protocol
	* @param url is the url	* @param url is the url
	* @param error is the error code on failure and undefined else.	* @param error is the error code on failure and undefined else.
	* @param error_text is the error text on failure and undefined else .	* @param error_text is the error text on failure and undefined else .
	*	*
	* @return 0 on failure, or a pointer to a slave otherwise.	* @return 0 on failure, or a pointer to a slave otherwise.

	skipping to change at line 193	skipping to change at line 197
	/**	/**
	* @return The time this slave has been idle.	* @return The time this slave has been idle.
	*/	*/
	time_t idleTime();	time_t idleTime();

	/**	/**
	* Marks this slave as idle.	* Marks this slave as idle.
	*/	*/
	void setIdle();	void setIdle();


	/*	/*
	* @returns Whether the slave is connected	* @returns Whether the slave is connected
	* (Connection oriented slaves only)	* (Connection oriented slaves only)
	*/	*/
	bool isConnected();	bool isConnected();
	void setConnected(bool c);	void setConnected(bool c);


	void ref();	void ref();
	void deref();	void deref();


	public Q_SLOTS:	public Q_SLOTS:
	void accept();	void accept();
	void gotInput();	void gotInput();
	void timeout();	void timeout();

	Q_SIGNALS:
	void slaveDied(KIO::Slave *slave);


	private:	Q_SIGNALS:
	Q_DECLARE_PRIVATE(Slave)	void slaveDied(KIO::Slave *slave);
	};
		private:
		Q_DECLARE_PRIVATE(Slave)
		};

	}	}

	#undef KIO_SLAVE_EXPORT	#undef KIO_SLAVE_EXPORT

	#endif	#endif

End of changes. 22 change blocks.
	83 lines changed or deleted	86 lines changed or added

	spinbox.h	spinbox.h

	skipping to change at line 93	skipping to change at line 93
	* @return the native widget wrapped by this SpinBox	* @return the native widget wrapped by this SpinBox
	*/	*/
	KIntSpinBox *nativeWidget() const;	KIntSpinBox *nativeWidget() const;

	protected:	protected:
	void changeEvent(QEvent *event);	void changeEvent(QEvent *event);
	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);	void hoverEnterEvent(QGraphicsSceneHoverEvent *event);
	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);	void hoverLeaveEvent(QGraphicsSceneHoverEvent *event);
	void resizeEvent(QGraphicsSceneResizeEvent *event);	void resizeEvent(QGraphicsSceneResizeEvent *event);
	void paint(QPainter painter, const QStyleOptionGraphicsItem option, Q Widget *widget);	void paint(QPainter painter, const QStyleOptionGraphicsItem option, Q Widget *widget);

		void mousePressEvent(QGraphicsSceneMouseEvent *event);
		void focusOutEvent(QFocusEvent *event);

	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.
	*/	*/

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

	storageaccess.h	storageaccess.h

	skipping to change at line 35	skipping to change at line 35
	#include <solid/solidnamespace.h>	#include <solid/solidnamespace.h>
	#include <solid/deviceinterface.h>	#include <solid/deviceinterface.h>
	#include <QtCore/QVariant>	#include <QtCore/QVariant>

	namespace Solid	namespace Solid
	{	{
	class StorageAccessPrivate;	class StorageAccessPrivate;
	class Device;	class Device;

	/**	/**

	* This device interface is available on volume devices.	* This device interface is available on volume devices to access them
		* (i.e. mount or unmount them).
	*	*
	* A volume is anything that can contain data (partition, optical disc,	* A volume is anything that can contain data (partition, optical disc,
	* memory card). It's a particular kind of block device.	* memory card). It's a particular kind of block device.
	*/	*/
	class SOLID_EXPORT StorageAccess : public DeviceInterface	class SOLID_EXPORT StorageAccess : public DeviceInterface
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(bool accessible READ isAccessible)	Q_PROPERTY(bool accessible READ isAccessible)
	Q_PROPERTY(QString filePath READ filePath)	Q_PROPERTY(QString filePath READ filePath)
	Q_DECLARE_PRIVATE(StorageAccess)	Q_DECLARE_PRIVATE(StorageAccess)

	skipping to change at line 116	skipping to change at line 117
	* This signal is emitted when the accessiblity of this device	* This signal is emitted when the accessiblity of this device
	* has changed.	* has changed.
	*	*
	* @param accessible true if the volume is accessible, false otherw ise	* @param accessible true if the volume is accessible, false otherw ise
	* @param udi the UDI of the volume	* @param udi the UDI of the volume
	*/	*/
	void accessibilityChanged(bool accessible, const QString &udi);	void accessibilityChanged(bool accessible, const QString &udi);

	/**	/**
	* This signal is emitted when the attempted setting up of this	* This signal is emitted when the attempted setting up of this

	* device is completed.	* device is completed. The signal might be spontaneous i.e.
		* it can be triggered by another process.
	*	*
	* @param error type of error that occurred, if any	* @param error type of error that occurred, if any
	* @param errorData more information about the error, if any	* @param errorData more information about the error, if any
	* @param udi the UDI of the volume	* @param udi the UDI of the volume
	*/	*/
	void setupDone(Solid::ErrorType error, QVariant errorData, const QS tring &udi);	void setupDone(Solid::ErrorType error, QVariant errorData, const QS tring &udi);

	/**	/**
	* This signal is emitted when the attempted tearing down of this	* This signal is emitted when the attempted tearing down of this

	* device is completed.	* device is completed. The signal might be spontaneous i.e.
		* it can be triggered by another process.
	*	*
	* @param error type of error that occurred, if any	* @param error type of error that occurred, if any
	* @param errorData more information about the error, if any	* @param errorData more information about the error, if any
	* @param udi the UDI of the volume	* @param udi the UDI of the volume
	*/	*/
	void teardownDone(Solid::ErrorType error, QVariant errorData, const QString &udi);	void teardownDone(Solid::ErrorType error, QVariant errorData, const QString &udi);


		/**
		* This signal is emitted when a setup of this device is requested.
		* The signal might be spontaneous i.e. it can be triggered by
		* another process.
		*
		* @param udi the UDI of the volume
		*/
		void setupRequested(const QString &udi);

		/**
		* This signal is emitted when a teardown of this device is request
		ed.
		* The signal might be spontaneous i.e. it can be triggered by
		* another process
		*
		* @param udi the UDI of the volume
		*/
		void teardownRequested(const QString &udi);

	protected:	protected:
	/**	/**
	* @internal	* @internal
	*/	*/
	StorageAccess(StorageAccessPrivate &dd, QObject *backendObject);	StorageAccess(StorageAccessPrivate &dd, QObject *backendObject);
	};	};
	}	}

	#endif	#endif

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

	storagedrive.h	storagedrive.h

	skipping to change at line 46	skipping to change at line 46
	* hard disk, cdrom drive...). It's a particular kind of block device.	* hard disk, cdrom drive...). It's a particular kind of block device.
	*/	*/
	class SOLID_EXPORT StorageDrive : public DeviceInterface	class SOLID_EXPORT StorageDrive : public DeviceInterface
	{	{
	Q_OBJECT	Q_OBJECT
	Q_ENUMS(Bus DriveType)	Q_ENUMS(Bus DriveType)
	Q_PROPERTY(Bus bus READ bus)	Q_PROPERTY(Bus bus READ bus)
	Q_PROPERTY(DriveType driveType READ driveType)	Q_PROPERTY(DriveType driveType READ driveType)
	Q_PROPERTY(bool removable READ isRemovable)	Q_PROPERTY(bool removable READ isRemovable)
	Q_PROPERTY(bool hotpluggable READ isHotpluggable)	Q_PROPERTY(bool hotpluggable READ isHotpluggable)

		Q_PROPERTY(qulonglong size READ size)
	Q_DECLARE_PRIVATE(StorageDrive)	Q_DECLARE_PRIVATE(StorageDrive)
	friend class Device;	friend class Device;

	public:	public:
	/**	/**
	* This enum type defines the type of bus a storage device is attac hed to.	* This enum type defines the type of bus a storage device is attac hed to.
	*	*
	* - Ide : An Integrated Drive Electronics (IDE) bus, also known as ATA	* - Ide : An Integrated Drive Electronics (IDE) bus, also known as ATA
	* - Usb : An Universal Serial Bus (USB)	* - Usb : An Universal Serial Bus (USB)
	* - Ieee1394 : An Ieee1394 bus, also known as Firewire	* - Ieee1394 : An Ieee1394 bus, also known as Firewire

	skipping to change at line 137	skipping to change at line 138
	bool isRemovable() const;	bool isRemovable() const;

	/**	/**
	* Indicates if this storage device can be plugged or unplugged whi le	* Indicates if this storage device can be plugged or unplugged whi le
	* the computer is running.	* the computer is running.
	*	*
	* @return true if this storage supports hotplug, false otherwise	* @return true if this storage supports hotplug, false otherwise
	*/	*/
	bool isHotpluggable() const;	bool isHotpluggable() const;


		/**
		* Retrieves this drives size in bytes.
		*
		* @return the size of this drive
		*/
		qulonglong size() const;

	protected:	protected:
	/**	/**
	* @internal	* @internal
	*/	*/
	StorageDrive(StorageDrivePrivate &dd, QObject *backendObject);	StorageDrive(StorageDrivePrivate &dd, QObject *backendObject);
	};	};
	}	}

	#endif // SOLID_STORAGEDRIVE_H	#endif // SOLID_STORAGEDRIVE_H

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

	svgwidget.h	svgwidget.h

	skipping to change at line 52	skipping to change at line 52

	Q_PROPERTY(Plasma::Svg *svg READ svg WRITE setSvg)	Q_PROPERTY(Plasma::Svg *svg READ svg WRITE setSvg)
	Q_PROPERTY(QString elementID READ elementID WRITE setElementID)	Q_PROPERTY(QString elementID READ elementID WRITE setElementID)

	public:	public:
	explicit SvgWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0);	explicit SvgWidget(QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0);
	explicit SvgWidget(Svg *svg, const QString & elementID = QString(),	explicit SvgWidget(Svg *svg, const QString & elementID = QString(),
	QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0);	QGraphicsItem *parent = 0, Qt::WindowFlags wFlag s = 0);
	virtual ~SvgWidget();	virtual ~SvgWidget();


	virtual void mouseReleaseEvent ( QGraphicsSceneMouseEvent * event )
	;

	void setSvg(Svg *svg);	void setSvg(Svg *svg);
	Svg *svg() const;	Svg *svg() const;

	void setElementID(const QString &elementID);	void setElementID(const QString &elementID);
	QString elementID() const;	QString elementID() const;


		void mouseReleaseEvent(QGraphicsSceneMouseEvent * event);

	Q_SIGNALS:	Q_SIGNALS:
	void clicked(Qt::MouseButton);	void clicked(Qt::MouseButton);

	protected:	protected:
	void paint(QPainter painter, const QStyleOptionGraphicsItem optio n, QWidget *widget);	void paint(QPainter painter, const QStyleOptionGraphicsItem optio n, QWidget *widget);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) cons t;	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) cons t;

		void mousePressEvent(QGraphicsSceneMouseEvent * event);

	private:	private:
	SvgWidgetPrivate * const d;	SvgWidgetPrivate * const d;
	};	};

	} // Plasma namespace	} // Plasma namespace

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

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

	tabbar.h	tabbar.h

	skipping to change at line 236	skipping to change at line 236
	protected:	protected:
	void wheelEvent(QGraphicsSceneWheelEvent *event);	void wheelEvent(QGraphicsSceneWheelEvent *event);
	void resizeEvent(QGraphicsSceneResizeEvent * event);	void resizeEvent(QGraphicsSceneResizeEvent * event);
	void changeEvent(QEvent *event);	void changeEvent(QEvent *event);

	private:	private:
	TabBarPrivate * const d;	TabBarPrivate * const d;

	friend class TabBarPrivate;	friend class TabBarPrivate;


	Q_PRIVATE_SLOT(d, void slidingCompleted(QGraphicsItem *item))	Q_PRIVATE_SLOT(d, void slidingNewPageCompleted())
		Q_PRIVATE_SLOT(d, void slidingOldPageCompleted())
	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())	Q_PRIVATE_SLOT(d, void setPalette())
	};	};

	} // namespace Plasma	} // namespace Plasma

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

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

	templateinterface.h	templateinterface.h
	/* This file is part of the KDE libraries	/* This file is part of the KDE libraries

	Copyright (C) 2004 Joseph Wenninger <jowenn@kde.org>	Copyright (C) 2004, 2010 Joseph Wenninger <jowenn@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	License version 2 as published by the Free Software Foundation.

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


	skipping to change at line 68	skipping to change at line 68

	/**	/**
	* Inserts an interactive ediable template text at line "line", column "col".	* Inserts an interactive ediable template text at line "line", column "col".
	* \return true if inserting the string succeeded	* \return true if inserting the string succeeded
	*	*
	* Use insertTemplateText(lines(), ...) to append text at end of docume nt	* Use insertTemplateText(lines(), ...) to append text at end of docume nt
	* Template strings look like	* Template strings look like
	* "for( int ${index}=0;${index}<10;${index}++) { ${cursor} };"	* "for( int ${index}=0;${index}<10;${index}++) { ${cursor} };"
	* or "%{date}"	* or "%{date}"
	*	*

	* This syntax is somewhat similar to the one found in the Eclipse edit or.	* This syntax is somewhat similar to the one found in the Eclipse edit or or textmate.
	*	*
	* There are certain common placeholders (macros), which get assigned a	* There are certain common placeholders (macros), which get assigned a
	* default initialValue, If the second parameter does not a given value .	* default initialValue, If the second parameter does not a given value .
	* For all others the initial value is the name of the placeholder.	* For all others the initial value is the name of the placeholder.
	*	*
	* Placeholder names may only consist of a-zA-Z0-9_	* Placeholder names may only consist of a-zA-Z0-9_

		*
		* @since 4.5
		* if a placeholder is a mirror, the place holder name may contain addi
		tional information
		* ${something/regexp/replacement/} takes the value of the placeholder
		something and replaces the match with the replacement before inserting the
		mirrored value
		* ${something/regexp/replacement/g} like above, but for all occurences
		* The syntax of the regexp and the replacemen
		t are the ones from kateparts regexp search/replace
		* ${something/regexp/replacement/i} like above, but case insensitive
		* The syntax of the regexp and the replacemen
		t are the ones from kateparts regexp search/replace
		* Possible flags: g and i. Those flags can be combined too
		* If a literal / should appear in the regexp, it has to be escaped \/,
		* literal \ has to be escaped too
		*
		* If you have mirrored ranges and want another occurence than the firs
		t one as the master
		* you can add @ directly after the placeholder name.
		*
		* The interface2 version invokes the function specified by functionNam
		e within the script specified
		* by the scriptToken, if a placeholder is specified with backticks lik
		e
		* ${placeholder`functionName`}
		* The function has a global environment containing "view", "document"
		and "debug", at
		* least in the katepart implementation. The function invokation is not
		allowed to be mixed with other replacements
		*
		* If a / or ` replacement is done on a master the initial value is mod
		ified and therefor
		* also all mirrored placeholders are affected too, later on the replac
		ement is not done anymore on master ranges
		*
		*
		* The parameters for invoked javascript functions will be the followin
		g:
		* value of the master (or initial value), //to be done: placeholder na
		me, small wrapper around the template handler (to do more sophisticated thi
		ngs, like adding additional placehlder points, aattaching custom properties
		for state keeping, ....) you tell
		*
		*
		* Specification of initial values
		* You can specify initial values which are different from the placehol
		der name
		* this is done via, this makes only sense for $ placeholders, not for
		%
		* ${placeholder:some value} or ${placeholder@:some value}
		* It is not allowed to mix : and /
		* after the first colon, everything is interpreted as default value,
		} in
		* the default value have to be escaped (backslashes before } have to b
		e escaped themselves) and regexp searches are ignored. The : has to be
		* directly after the placeholder name or after an optional @ symbol.
		*
		*
	* Common placeholders and values are	* Common placeholders and values are
	*	*
	* - index: "i"	* - index: "i"
	* - loginname: The current users's loginname	* - loginname: The current users's loginname
	* - firstname: The current user's first name retrieved from kabc	* - firstname: The current user's first name retrieved from kabc
	* - lastname: The current user's last name retrieved from kabc	* - lastname: The current user's last name retrieved from kabc
	* - fullname: The current user's first and last name retrieved from ka bc	* - fullname: The current user's first and last name retrieved from ka bc
	* - email: The current user's primary email address retrieved from kab c	* - email: The current user's primary email address retrieved from kab c
	* - date: current date	* - date: current date
	* - time: current time	* - time: current time
	* - year: current year	* - year: current year
	* - month: current month	* - month: current month
	* - day: current day	* - day: current day
	* - hostname: hostname of the computer	* - hostname: hostname of the computer

		* - selection: The implementation should set this to the selected text , if any
	* - cursor: at this position the cursor will be after editing of the	* - cursor: at this position the cursor will be after editing of the
	* template has finished, this has to be taken care of by the actual	* template has finished, this has to be taken care of by the actual
	* implementation. The placeholder gets a value of "\|" assigned.	* implementation. The placeholder gets a value of "\|" assigned.
	*	*
	* If a macro is started with a % (persent sign) like "%{date}" it isn' t added	* If a macro is started with a % (persent sign) like "%{date}" it isn' t added
	* to the list editable strings ( for example TAB key navigation) if a value	* to the list editable strings ( for example TAB key navigation) if a value
	* differing from the macro name is found.	* differing from the macro name is found.
	*	*
	* If the editor supports some kind of smart indentation, the inserted code	* If the editor supports some kind of smart indentation, the inserted code
	* should be layouted by the indenter.	* should be layouted by the indenter.

		* @deprecated
	*/	*/

	bool insertTemplateText ( const Cursor &insertPosition, const QString & templateString, const QMap<QString,QString> &initialValues);	KDE_DEPRECATED bool insertTemplateText ( const Cursor &insertPosition, const QString &templateString, const QMap<QString,QString> &initialValues);

	protected:	protected:
	/**	/**
	* You must implement this, it is called by insertTemplateText, after a ll	* You must implement this, it is called by insertTemplateText, after a ll
	* default values are inserted. If you are implementing this interface,	* default values are inserted. If you are implementing this interface,
	* this method should work as described in the documentation for	* this method should work as described in the documentation for
	* insertTemplateText above.	* insertTemplateText above.
	* \return true if any text was inserted.	* \return true if any text was inserted.

		* @deprecated
	*/	*/

	virtual bool insertTemplateTextImplementation ( const Cursor &insertPos	virtual KDE_DEPRECATED bool insertTemplateTextImplementation ( const Cu
	ition, const QString &templateString, const QMap<QString,QString> &initialV	rsor &insertPosition, const QString &templateString, const QMap<QString,QSt
	alues)=0;	ring> &initialValues)=0;

		/**
		* DO NOT USE !!!! THIS IS USED INTERNALLY by the interface only !!!!!!
		* Behaviour might change !!!!!!!
		*/
		bool KTE_INTERNAL_setupIntialValues(const QString &templateString, QMap
		<QString,QString> *initialValues);

	private:	private:
	class TemplateInterfacePrivate* const d;	class TemplateInterfacePrivate* const d;
	};	};

	}	}

	Q_DECLARE_INTERFACE(KTextEditor::TemplateInterface,	Q_DECLARE_INTERFACE(KTextEditor::TemplateInterface,
	"org.kde.KTextEditor.TemplateInterface")	"org.kde.KTextEditor.TemplateInterface")


End of changes. 8 change blocks.
	6 lines changed or deleted	75 lines changed or added

	term.h	term.h
	/*	/*
	This file is part of the Nepomuk KDE project.	This file is part of the Nepomuk KDE project.

	Copyright (C) 2007-2009 Sebastian Trueg <trueg@kde.org>	Copyright (C) 2007-2010 Sebastian Trueg <trueg@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public
	License version 2 as published by the Free Software Foundation.	License version 2 as published by the Free Software Foundation.

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


	skipping to change at line 41	skipping to change at line 41
	namespace Nepomuk {	namespace Nepomuk {
	namespace Query {	namespace Query {

	class LiteralTerm;	class LiteralTerm;
	class ResourceTerm;	class ResourceTerm;
	class NegationTerm;	class NegationTerm;
	class AndTerm;	class AndTerm;
	class OrTerm;	class OrTerm;
	class ComparisonTerm;	class ComparisonTerm;
	class ResourceTypeTerm;	class ResourceTypeTerm;

		class OptionalTerm;

	class TermPrivate;	class TermPrivate;

	/**	/**
	* \class Term term.h Nepomuk/Query/Term	* \class Term term.h Nepomuk/Query/Term
	*	*
	* \brief The base class for all term types.	* \brief The base class for all term types.
	*	*
	* Queries are build from Term instances. A Term can have one of mu ltiple	* Queries are build from Term instances. A Term can have one of mu ltiple
	* types and subterms. See Term::Type for details on the different Term types.	* types and subterms. See Term::Type for details on the different Term types.

	skipping to change at line 119	skipping to change at line 120
	*	*
	* \sa ResourceTypeTerm	* \sa ResourceTypeTerm
	*/	*/
	ResourceType,	ResourceType,

	/**	/**
	* A negation term inverts the meaning of its sub term.	* A negation term inverts the meaning of its sub term.
	*	*
	* \sa NegationTerm	* \sa NegationTerm
	*/	*/

	Negation	Negation,

		/**
		* An optional term which marks its sub term as optional.
		*
		* \sa OptionalTerm
		*
		* \since 4.5
		*/
		Optional
	};	};

	/**	/**
	* Constructs an invalid term.	* Constructs an invalid term.
	*/	*/
	Term();	Term();

	/**	/**
	* Copy constructor.	* Copy constructor.
	*/	*/

	skipping to change at line 169	skipping to change at line 179
	* \return \p true if this term is a ResourceTerm.	* \return \p true if this term is a ResourceTerm.
	*/	*/
	bool isResourceTerm() const;	bool isResourceTerm() const;

	/**	/**
	* \return \p true if this term is a NegationTerm.	* \return \p true if this term is a NegationTerm.
	*/	*/
	bool isNegationTerm() const;	bool isNegationTerm() const;

	/**	/**

		* \return \p true if this term is a OptionalTerm.
		*
		* \since 4.5
		*/
		bool isOptionalTerm() const;

		/**
	* \return \p true if this term is an AndTerm.	* \return \p true if this term is an AndTerm.
	*/	*/
	bool isAndTerm() const;	bool isAndTerm() const;

	/**	/**
	* \return \p true if this term is an OrTerm.	* \return \p true if this term is an OrTerm.
	*/	*/
	bool isOrTerm() const;	bool isOrTerm() const;

	/**	/**

	skipping to change at line 213	skipping to change at line 230

	/**	/**
	* Interpret this term as a NegationTerm.	* Interpret this term as a NegationTerm.
	*	*
	* \return A copy of this term if its type	* \return A copy of this term if its type
	* is Negation, a new NegationTerm otherwise.	* is Negation, a new NegationTerm otherwise.
	*/	*/
	NegationTerm toNegationTerm() const;	NegationTerm toNegationTerm() const;

	/**	/**

		* Interpret this term as a OptionalTerm.
		*
		* \return A copy of this term if its type
		* is Optional, a new OptionalTerm otherwise.
		*
		* \since 4.5
		*/
		OptionalTerm toOptionalTerm() const;

		/**
	* Interpret this term as a AndTerm.	* Interpret this term as a AndTerm.
	*	*
	* \return A copy of this term if its type	* \return A copy of this term if its type
	* is And, a new AndTerm otherwise.	* is And, a new AndTerm otherwise.
	*/	*/
	AndTerm toAndTerm() const;	AndTerm toAndTerm() const;

	/**	/**
	* Interpret this term as a OrTerm.	* Interpret this term as a OrTerm.
	*	*

	skipping to change at line 272	skipping to change at line 299
	/**	/**
	* Convert this term into a NegationTerm.	* Convert this term into a NegationTerm.
	* If type is not Negation it will be changed	* If type is not Negation it will be changed
	* and the result is a new NegationTerm.	* and the result is a new NegationTerm.
	*	*
	* \return A reference to this term as a NegationTerm.	* \return A reference to this term as a NegationTerm.
	*/	*/
	NegationTerm& toNegationTerm();	NegationTerm& toNegationTerm();

	/**	/**

		* Convert this term into a OptionalTerm.
		* If type is not Optional it will be changed
		* and the result is a new OptionalTerm.
		*
		* \return A reference to this term as a OptionalTerm.
		*
		* \since 4.5
		*/
		OptionalTerm& toOptionalTerm();

		/**
	* Convert this term into a AndTerm.	* Convert this term into a AndTerm.
	* If type is not And it will be changed	* If type is not And it will be changed
	* and the result is a new AndTerm.	* and the result is a new AndTerm.
	*	*
	* \return A reference to this term as a AndTerm.	* \return A reference to this term as a AndTerm.
	*/	*/
	AndTerm& toAndTerm();	AndTerm& toAndTerm();

	/**	/**
	* Convert this term into a OrTerm.	* Convert this term into a OrTerm.

	skipping to change at line 308	skipping to change at line 346
	/**	/**
	* Convert this term into a ResourceTypeTerm.	* Convert this term into a ResourceTypeTerm.
	* If type is not ClassType it will be changed	* If type is not ClassType it will be changed
	* and the result is a new ResourceTypeTerm.	* and the result is a new ResourceTypeTerm.
	*	*
	* \return A reference to this term as a ResourceTypeTerm.	* \return A reference to this term as a ResourceTypeTerm.
	*/	*/
	ResourceTypeTerm& toResourceTypeTerm();	ResourceTypeTerm& toResourceTypeTerm();

	/**	/**

		* Encode the Term in a string. Be aware that this does NOT cre
		ate a SPARQL
		* query. The returned string can be used to serialize terms th
		at can later
		* be read via fromString().
		*
		* \sa fromString()
		*
		* \since 4.5
		*/
		QString toString() const;

		/**
		* Parse a Term that has been encoded as a string via toString(
		).
		*
		* \warning This method can NOT parse SPARQL syntax.
		*
		* \sa toString()
		*
		* \since 4.5
		*/
		static Term fromString( const QString& s );

		/**
	* Comparison operator.	* Comparison operator.
	*	*
	* \return \p true if this term is equal to \p term.	* \return \p true if this term is equal to \p term.
	*/	*/
	bool operator==( const Term& term ) const;	bool operator==( const Term& term ) const;

	// FIXME: the compiler does not find this operator!	// FIXME: the compiler does not find this operator!
	QDebug operator<<( QDebug ) const;	QDebug operator<<( QDebug ) const;


	/** \cond protected_error_members */	/** \cond protected_term_members */
	protected:	protected:
	Term( TermPrivate* );	Term( TermPrivate* );

	QSharedDataPointer<TermPrivate> d_ptr;	QSharedDataPointer<TermPrivate> d_ptr;

	friend class TermPrivate;	friend class TermPrivate;
	friend class GroupTermPrivate;	friend class GroupTermPrivate;
	friend class AndTermPrivate;	friend class AndTermPrivate;
	friend class OrTermPrivate;	friend class OrTermPrivate;
	friend class ComparisonTermPrivate;	friend class ComparisonTermPrivate;
	friend class NegationTermPrivate;	friend class NegationTermPrivate;

		friend class OptionalTermPrivate;
	friend class Query;	friend class Query;
	/** \endcond */	/** \endcond */
	};	};

	NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Term& );	NEPOMUKQUERY_EXPORT uint qHash( const Nepomuk::Query::Term& );
	}	}
	}	}

	// there is a hand written instantiation of clone()	// there is a hand written instantiation of clone()
	template<> Nepomuk::Query::TermPrivate* QSharedDataPointer<Nepomuk::Query:: TermPrivate>::clone();	template<> Nepomuk::Query::TermPrivate* QSharedDataPointer<Nepomuk::Query:: TermPrivate>::clone();

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

	textedit.h	textedit.h

	skipping to change at line 119	skipping to change at line 119

	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 changeEvent(QEvent *event);
	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);	void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);

		void mousePressEvent(QGraphicsSceneMouseEvent *event);
		void focusOutEvent(QFocusEvent *event);

	private:	private:
	TextEditPrivate * const d;	TextEditPrivate * const d;
	Q_PRIVATE_SLOT(d, void setPalette())	Q_PRIVATE_SLOT(d, void setPalette())
	};	};

	} // namespace Plasma	} // namespace Plasma

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

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

	theme.h	theme.h

	skipping to change at line 132	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;

	/**	/**

		* Retrieves the path for the script file that contains a given
		* Javascript animation.
		* @arg the name of the animation
		* @return the full path to the script file, or an emptry string on
		failure
		* @since 4.5
		*/
		Q_INVOKABLE QString animationPath(const QString &name) const;

		/**
	* Retrieves the default wallpaper associated with this theme.	* Retrieves the default wallpaper associated with this theme.
	*	*
	* @arg size the target height and width of the wallpaper; if an in valid size	* @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

	skipping to change at line 210	skipping to change at line 219
	*/	*/
	bool useGlobalSettings() const;	bool useGlobalSettings() const;

	/**	/**
	* @return true if the native widget styles should be used instead of themed	* @return true if the native widget styles should be used instead of themed
	* widgets. Defaults is false.	* widgets. Defaults is false.
	*/	*/
	bool useNativeWidgetStyle() const;	bool useNativeWidgetStyle() const;

	/**	/**

		* Provides a Plasma::Theme-themed stylesheet for hybrid (web / nat
		ive Plasma) widgets.
		*
		* You can use this method to retrieve a basic default stylesheet,
		or to theme your
		* custom stylesheet you use for example in Plasma::WebView. The QS
		tring you can pass
		* into this method does not have to be a valid stylesheet, in fact
		you can use this
		* method to replace color placeholders with the theme's color in a
		ny QString.
		*
		* In order to use this method with a custom stylesheet, just put f
		or example %textcolor
		* in your QString and it will be replaced with the theme's text (o
		r foreground) color.
		*
		* Just like in many other methods for retrieving theme information
		, do not forget to
		* update your stylesheet upon the themeChanged() signal.
		*
		* The following tags will be replaced by corresponding colors from
		Plasma::Theme:
		*
		* %textcolor
		* %backgroundcolor
		* %buttonbackgroundcolor
		*
		* %link
		* %activatedlink
		* %hoveredlink
		* %visitedlink
		*
		* %fontfamily
		* %fontsize
		* %smallfontsize
		*
		* @param css a stylesheet to theme, leave empty for a default styl
		esheet containing
		* theming for some commonly used elements, body text and links, fo
		r example.
		*
		* @return a piece of CSS that sets the most commonly used style el
		ements to a theme
		* matching Plasma::Theme.
		*
		* @since 4.5
		*/
		Q_INVOKABLE QString styleSheet(const QString &css = QString()) cons
		t;

		/**
	* Tries to load pixmap with the specified key from cache.	* Tries to load pixmap with the specified key from cache.
	*	*
	* @param key the name to use in the cache for this image	* @param key the name to use in the cache for this image
	* @param pix the pixmap object to populate with the resulting data if found	* @param pix the pixmap object to populate with the resulting data if found
	*	*
	* @return true when pixmap was found and loaded from cache, false otherwise	* @return true when pixmap was found and loaded from cache, false otherwise
	**/	**/
	bool findInCache(const QString &key, QPixmap &pix);	bool findInCache(const QString &key, QPixmap &pix);

	/**	/**

	skipping to change at line 255	skipping to change at line 303
	* If the cache already contains pixmap with the specified key then it is	* If the cache already contains pixmap with the specified key then it is
	* overwritten.	* overwritten.
	* The actual insert is delayed for optimization reasons and the id	* The actual insert is delayed for optimization reasons and the id
	* parameter is used to discard repeated inserts in the delay time, useful	* parameter is used to discard repeated inserts in the delay time, useful
	* when for instance the graphics to inser comes from a quickly res izing	* when for instance the graphics to inser comes from a quickly res izing
	* object: the frames between the start and destination sizes aren' t	* object: the frames between the start and destination sizes aren' t
	* useful in the cache and just cause overhead.	* useful in the cache and just cause overhead.
	*	*
	* @param key the name to use in the cache for this pixmap	* @param key the name to use in the cache for this pixmap
	* @param pix the pixmap data to store in the cache	* @param pix the pixmap data to store in the cache

	* @param id a name that identifies the caller class of this functi	* @param id a name that identifies the caller class of this functi
	on in an unique fashion	on in an unique fashion.
		* This is needed to limit disk writes of the cache.
		* If an image with the same id changes quickly,
		* only the last size where insertIntoCache was called is
		actually stored on disk
	* @since 4.3	* @since 4.3
	**/	**/
	void insertIntoCache(const QString& key, const QPixmap& pix, const QString& id);	void insertIntoCache(const QString& key, const QPixmap& pix, const QString& id);

	/**	/**
	* Sets the maximum size of the cache (in kilobytes). If cache gets bigger	* Sets the maximum size of the cache (in kilobytes). If cache gets bigger
	* the limit then some entries are removed	* the limit then some entries are removed
	* Setting cache limit to 0 disables automatic cache size limiting.	* Setting cache limit to 0 disables automatic cache size limiting.
	*	*
	* Note that the cleanup might not be done immediately, so the cach e might	* Note that the cleanup might not be done immediately, so the cach e might

	skipping to change at line 329	skipping to change at line 380

	private:	private:
	friend class ThemeSingleton;	friend class ThemeSingleton;
	friend class ThemePrivate;	friend class ThemePrivate;
	ThemePrivate *const d;	ThemePrivate *const d;

	Q_PRIVATE_SLOT(d, void compositingChanged())	Q_PRIVATE_SLOT(d, void compositingChanged())
	Q_PRIVATE_SLOT(d, void colorsChanged())	Q_PRIVATE_SLOT(d, void colorsChanged())
	Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &))	Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &))
	Q_PRIVATE_SLOT(d, void scheduledCacheUpdate())	Q_PRIVATE_SLOT(d, void scheduledCacheUpdate())

		Q_PRIVATE_SLOT(d, void onAppExitCleanup())
	};	};

	} // Plasma namespace	} // Plasma namespace

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

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

	toolbutton.h	toolbutton.h

	skipping to change at line 50	skipping to change at line 50
	{	{
	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)

		Q_PROPERTY(bool down READ isDown WRITE setDown)

		Q_PROPERTY(qreal animationUpdate READ animationUpdate WRITE setAnimatio
		nUpdate)

	public:	public:
	explicit ToolButton(QGraphicsWidget *parent = 0);	explicit ToolButton(QGraphicsWidget *parent = 0);
	~ToolButton();	~ToolButton();

	/**	/**
	* Sets if the toolbutton has an autoraise behaviour	* Sets if the toolbutton has an autoraise behaviour
	*	*
	* @arg raise	* @arg raise
	*/	*/

	skipping to change at line 102	skipping to change at line 105
	* @since 4.4	* @since 4.4
	*/	*/
	void setImage(const QString &path, const QString &elementid);	void setImage(const QString &path, const QString &elementid);

	/**	/**
	* @return the image path being displayed currently, or an empty string if none.	* @return the image path being displayed currently, or an empty string if none.
	*/	*/
	QString image() const;	QString image() const;

	/**	/**

		* Sets the status of the button to pressed
		*
		* @arg down
		* @since 4.5
		*/
		void setDown(bool down);

		/**
	* @return true if the button is pressed down	* @return true if the button is pressed down
	* @since 4.4	* @since 4.4
	*/	*/
	bool isDown() const;	bool isDown() const;

	/**	/**
	* Sets the stylesheet used to control the visual display of this ToolB utton	* Sets the stylesheet used to control the visual display of this ToolB utton
	*	*
	* @arg stylesheet a CSS string	* @arg stylesheet a CSS string
	*/	*/

	skipping to change at line 175	skipping to change at line 186
	void released();	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);	void changeEvent(QEvent *event);

		QVariant itemChange(GraphicsItemChange change, const QVariant &value);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;	QSizeF sizeHint(Qt::SizeHint which, const QSizeF & constraint) const;


		private slots:
		void setAnimationUpdate(qreal progress);
		qreal animationUpdate() 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 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;
	};	};

	} // namespace Plasma	} // namespace Plasma


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

	tools.h	tools.h

	skipping to change at line 36	skipping to change at line 36

	#include "variant.h"	#include "variant.h"
	#include "nepomuk_export.h"	#include "nepomuk_export.h"

	#include <soprano/node.h>	#include <soprano/node.h>

	#include <kdemacros.h>	#include <kdemacros.h>

	namespace Nepomuk {	namespace Nepomuk {
	/**	/**

	* \deprecated Has no effect anymore.
	*/
	KDE_DEPRECATED NEPOMUK_EXPORT void setDefaultRepository( const QString&
	s );

	/**
	* Used internally by Resource.	* Used internally by Resource.

	* \return The URI of the RDF graph meta data is stored in.	* Converts a Variant into a literal value to be used in the RDF store.
	*
	* \deprecated Use Nepomuk::ResourceManager::mainModel()
	*/
	KDE_DEPRECATED NEPOMUK_EXPORT QString defaultGraph();

	/**
	* Used internally by Resource.
	* \return The URI of the predicate used to state the type of a resourc
	e.
	*
	* \deprecated Use Soprano::Vocabulary::RDF::type()
	*/	*/

	KDE_DEPRECATED NEPOMUK_EXPORT QString typePredicate();	NEPOMUK_EXPORT QList<Soprano::Node> valuesToRDFNodes( const Variant& );

	/**	/**
	* Used internally by Resource.	* Used internally by Resource.

	* Converts a Variant into a literal value to be used in the RDF store.	* Converts a non-list Variant into a Soprano::Node.
	* Uses the language set in the current KDE session.
	*/	*/

	NEPOMUK_EXPORT QList<Soprano::Node> valuesToRDFNodes( const Variant& );
	NEPOMUK_EXPORT Soprano::Node valueToRDFNode( const Variant& );	NEPOMUK_EXPORT Soprano::Node valueToRDFNode( const Variant& );

	/**	/**
	* Used internally by Resource.	* Used internally by Resource.

	* Converts a literal value from the RDF store into a Variant.	* Convert a list of resources to a list of Ts where T needs to be a su
		bclass
		* of Resource.
		*
		* \return A list containing all resources in \p l represented as a T.
	*/	*/

	NEPOMUK_EXPORT Variant RDFLiteralToValue( const Soprano::Node& node );

	template<typename T> QList<T> convertResourceList( const QList<Resource >& l ) {	template<typename T> QList<T> convertResourceList( const QList<Resource >& l ) {
	QList<T> rl;	QList<T> rl;
	for( QList<Resource>::const_iterator it = l.constBegin();	for( QList<Resource>::const_iterator it = l.constBegin();
	it != l.constEnd(); ++it )	it != l.constEnd(); ++it )
	rl.append( T( *it ) );	rl.append( T( *it ) );
	return rl;	return rl;
	}	}


		/**
		* Used internally by Resource.
		* Convert a list of Ts to a list of Resources where T needs to be a su
		bclass
		* of Resource.
		*
		* \return A list containing all resources in \p l.
		*/
	template<typename T> QList<Resource> convertResourceList( const QList<T >& l ) {	template<typename T> QList<Resource> convertResourceList( const QList<T >& l ) {
	QList<Resource> rl;	QList<Resource> rl;

	Q_FOREACH( T r, l )	Q_FOREACH( const T& r, l )
	/* for( QList<T>::const_iterator it = l.constBegin(); */	rl.append( Resource( r ) );
	/* it != l.constEnd(); ++it ) */
	rl.append( Resource( r/it/ ) );
	return rl;	return rl;
	}	}

	/**	/**

		* \deprecated Use Variant::fromNode() instead.
		*/
		KDE_DEPRECATED NEPOMUK_EXPORT Variant RDFLiteralToValue( const Soprano:
		:Node& node );

		/**
		* \deprecated Has no effect anymore.
		*/
		KDE_DEPRECATED NEPOMUK_EXPORT void setDefaultRepository( const QString&
		s );

		/**
		* \return The name of the default Nepomuk repository ("main").
		*
		* \deprecated Use Nepomuk::ResourceManager::mainModel()
		*/
		KDE_DEPRECATED NEPOMUK_EXPORT QString defaultGraph();

		/**
		* \deprecated Use Soprano::Vocabulary::RDF::type()
		*/
		KDE_DEPRECATED NEPOMUK_EXPORT QString typePredicate();

		/**
	* \deprecated Use Soprano::Vocabulary::RDF::rdfNamepace()	* \deprecated Use Soprano::Vocabulary::RDF::rdfNamepace()
	*/	*/
	KDE_DEPRECATED NEPOMUK_EXPORT QString rdfNamepace();	KDE_DEPRECATED NEPOMUK_EXPORT QString rdfNamepace();

	/**	/**
	* \deprecated Use Soprano::Vocabulary::RDFS::rdfsNamepace()	* \deprecated Use Soprano::Vocabulary::RDFS::rdfsNamepace()
	*/	*/
	KDE_DEPRECATED NEPOMUK_EXPORT QString rdfsNamespace();	KDE_DEPRECATED NEPOMUK_EXPORT QString rdfsNamespace();

	/**	/**

End of changes. 10 change blocks.
	29 lines changed or deleted	42 lines changed or added

	unitcategory.h	unitcategory.h

	skipping to change at line 92	skipping to change at line 92
	UnitPtr unit(int unitId) const;	UnitPtr unit(int unitId) const;

	/**	/**
	* Return units in this category.	* Return units in this category.
	*	*
	* @return list of units.	* @return list of units.
	**/	**/
	QList<UnitPtr> units() const;	QList<UnitPtr> units() const;

	/**	/**

		* Return most common units in this category.
		*
		* @return list of units.
		**/
		QList<UnitPtr> mostCommonUnits() const;

		/**
	* Return all unit names, short names and unit synonyms in this categor y.	* Return all unit names, short names and unit synonyms in this categor y.
	*	*
	* @return list of units.	* @return list of units.
	**/	**/
	QStringList allUnits() const;	QStringList allUnits() const;

	/**	/**
	* Convert value to another unit.	* Convert value to another unit.
	*	*
	* @param value value to convert	* @param value value to convert

	skipping to change at line 123	skipping to change at line 130

	protected:	protected:
	void setName(const QString& name);	void setName(const QString& name);
	void setDefaultUnit(UnitPtr defaultUnit);	void setDefaultUnit(UnitPtr defaultUnit);
	void addUnitName(const QString& name);	void addUnitName(const QString& name);
	void addUnitMapValues(UnitPtr unit, const QString& names);	void addUnitMapValues(UnitPtr unit, const QString& names);
	void addIdMapValue(UnitPtr unit, int id);	void addIdMapValue(UnitPtr unit, int id);
	void setDescription(const QString& desc);	void setDescription(const QString& desc);
	void setUrl(const KUrl& url);	void setUrl(const KUrl& url);
	void setSymbolStringFormat(const KLocalizedString& symbolStringFormat);	void setSymbolStringFormat(const KLocalizedString& symbolStringFormat);

		void setMostCommonUnits(const QList<int>& units);
	KLocalizedString symbolStringFormat() const;	KLocalizedString symbolStringFormat() const;

	private:	private:
	friend class Unit;	friend class Unit;
	class Private;	class Private;
	Private* const d;	Private* const d;
	};	};

	} // KUnitConversion namespace	} // KUnitConversion namespace


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

	uploaddialog.h	uploaddialog.h
	/*	/*
	knewstuff3/ui/uploaddialog.h.	knewstuff3/ui/uploaddialog.h.
	Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>	Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org>
	Copyright (C) 2007 Josef Spillner <spillner@kde.org>	Copyright (C) 2007 Josef Spillner <spillner@kde.org>
	Copyright (C) 2009 Jeremy Whiting <jpwhiting@kde.org>	Copyright (C) 2009 Jeremy Whiting <jpwhiting@kde.org>

	Copyright (C) 2009 Frederik Gladhorn <gladhorn@kde.org>	Copyright (C) 2009-2010 Frederik Gladhorn <gladhorn@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.

	skipping to change at line 29	skipping to change at line 29
	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 KNEWSTUFF3_UI_UPLOADDIALOG_H	#ifndef KNEWSTUFF3_UI_UPLOADDIALOG_H
	#define KNEWSTUFF3_UI_UPLOADDIALOG_H	#define KNEWSTUFF3_UI_UPLOADDIALOG_H

	#include <kdialog.h>	#include <kdialog.h>
	#include <kurl.h>	#include <kurl.h>

	#include <knewstuff3/knewstuff_export.h>	#include <knewstuff3/knewstuff_export.h>


	class KComboBox;
	class KLineEdit;
	class KUrlRequester;
	class KTextEdit;

	namespace Attica {	namespace Attica {
	class BaseJob;	class BaseJob;
	class Provider;	class Provider;
	}	}


		// KDE5: this class should inherit from the wizard class - KAssistantDialog

	namespace KNS3	namespace KNS3
	{	{
	/**	/**
	* @short KNewStuff file upload dialog.	* @short KNewStuff file upload dialog.
	*	*
	* Using this dialog, data can easily be uploaded to the Hotstuff servers.	* Using this dialog, data can easily be uploaded to the Hotstuff servers.
	*	*
	* \par Maintainer:	* \par Maintainer:
	* Jeremy Whiting (jpwhiting@kde.org)	* Jeremy Whiting (jpwhiting@kde.org)
	*	*
	* @since 4.4	* @since 4.4
	*/	*/
	class KNEWSTUFF_EXPORT UploadDialog : public KDialog	class KNEWSTUFF_EXPORT UploadDialog : public KDialog
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	/**	/**

	Constructor.	Create a new upload dialog.

	@param parent the parent window	@param parent the parent window
	*/	*/
	explicit UploadDialog(QWidget *parent = 0);	explicit UploadDialog(QWidget *parent = 0);


		/**
		Create a new upload dialog.

		@param parent the parent window
		*/
	explicit UploadDialog(const QString& configFile, QWidget *parent = 0);	explicit UploadDialog(const QString& configFile, QWidget *parent = 0);

	/**	/**
	Destructor.	Destructor.
	*/	*/
	~UploadDialog();	~UploadDialog();

	/**	/**
	Set the file to be uploaded.	Set the file to be uploaded.

		This has to be set for the dialog to work, before displaying the dial og.

	@param payloadFile the payload data file	@param payloadFile the payload data file
	*/	*/
	void setUploadFile(const KUrl& payloadFile);	void setUploadFile(const KUrl& payloadFile);

	/**	/**

	Set the suggested name for the upload.	Set the suggested title for the upload.
	The application can suggest a title which can then be edited by the u ser before uploading.	The application can suggest a title which can then be edited by the u ser before uploading.
	The name field will be left empty if no title was set.	The name field will be left empty if no title was set.

	@param name the suggested name for the upload	@param name the suggested name for the upload
	*/	*/
	void setUploadName(const QString& name);	void setUploadName(const QString& name);


	public Q_SLOTS:	/**
	virtual void accept();	Set the suggested version displayed in the upload dialog.
		The user can still change this.
		@param version
		*/
		void setVersion(const QString& version);


	private Q_SLOTS:	/**
	void contentAdded(Attica::BaseJob*);	Set the suggested description displayed in the upload dialog.
		The user can still change this.
		@param description
		*/
		void setDescription(const QString& description);


	void fileUploadFinished(Attica::BaseJob*);	/**
		Set the suggested changelog displayed in the upload dialog.
		The user can still change this.
		@param version version
		*/
		void setChangelog(const QString& changelog);


	void doUpload(const QString& index, const QString& filePath);	/* *
		Set the suggested license displayed in the upload dialog.
		The user can still change this.
		@param version version
		*/
		// enum License {}; // see fd.o api spec
		// void setLicense(License license);


	void providerAdded(const Attica::Provider& provider);	/* *
	void categoriesLoaded(Attica::BaseJob* job);	Set the suggested version displayed in the upload dialog.
		The user can still change this.
		@param version version
		*/
		// void setPreviewImageFile(const KUrl& version);


	void previewChanged(const KUrl&);	/**
		Enable the UI to let the user to set a price for the uploaded item.
		@param enabled enable the price option - it is enabled by default
		@since 4.5
		*/
		void setPriceEnabled(bool enabled);


	void priceToggled(bool);	/**
		Set the suggested price displayed in the upload dialog.
		The user can still change this.
		@param version version
		*/
		void setPrice(double price);

		/**
		Set the suggested rationale why this item costs something to download
		.
		The user can still change this.
		@param version version
		*/
		void setPriceReason(const QString& reason);

		/**
		Set the suggested category for the upload.
		The .knsrc file may contain multiple upload categories, this sets whi
		ch one is pre-selected.
		It does not add any new category to the list of available categories.

		@param category the suggested category for the upload
		*/
		void selectCategory(const QString& category);

		public Q_SLOTS:
		virtual void accept();

	private:	private:
	bool init(const QString &configfile);	bool init(const QString &configfile);

	class Private;	class Private;
	Private *const d;	Private *const d;


		Q_PRIVATE_SLOT( d, void _k_nextPage() )
		Q_PRIVATE_SLOT( d, void _k_backPage() )
		Q_PRIVATE_SLOT( d, void _k_updatePage() )

		Q_PRIVATE_SLOT( d, void _k_providerChanged(QString) )
		Q_PRIVATE_SLOT( d, void _k_checkCredentialsFinished(bool) )
		Q_PRIVATE_SLOT( d, void _k_contentByCurrentUserLoaded(Attica::Content::
		List) )
		Q_PRIVATE_SLOT( d, void _k_providersLoaded(QStringList) )
		Q_PRIVATE_SLOT( d, void _k_categoriesLoaded(Attica::Category::List) )
		Q_PRIVATE_SLOT( d, void _k_licensesLoaded(Attica::License::List) )
		Q_PRIVATE_SLOT( d, void _k_currencyLoaded(QString) )
		Q_PRIVATE_SLOT( d, void _k_previewLoaded(int, QImage) )

		Q_PRIVATE_SLOT( d, void _k_changePreview1() )
		Q_PRIVATE_SLOT( d, void _k_changePreview2() )
		Q_PRIVATE_SLOT( d, void _k_changePreview3() )
		Q_PRIVATE_SLOT( d, void _k_priceToggled(bool) )
		Q_PRIVATE_SLOT( d, void _k_updateContentsToggled(bool update) )

		Q_PRIVATE_SLOT( d, void _k_startUpload() )
		Q_PRIVATE_SLOT( d, void _k_contentAdded(Attica::BaseJob*) )
		Q_PRIVATE_SLOT( d, void _k_fileUploadFinished(Attica::BaseJob*) )
		Q_PRIVATE_SLOT( d, void _k_preview1UploadFinished(Attica::BaseJob*) )
		Q_PRIVATE_SLOT( d, void _k_preview2UploadFinished(Attica::BaseJob*) )
		Q_PRIVATE_SLOT( d, void _k_preview3UploadFinished(Attica::BaseJob*) )

		Q_PRIVATE_SLOT( d, void _k_updatedContentFetched(Attica::Content) )
		Q_PRIVATE_SLOT( d, void _k_detailsLinkLoaded(QUrl) )

		Q_DISABLE_COPY( UploadDialog )
	};	};

	}	}

	#endif	#endif

End of changes. 15 change blocks.
	18 lines changed or deleted	108 lines changed or added

	variant.h	variant.h

	skipping to change at line 31	skipping to change at line 31
	#ifndef _NEPOMUK_VARIANT_H_	#ifndef _NEPOMUK_VARIANT_H_
	#define _NEPOMUK_VARIANT_H_	#define _NEPOMUK_VARIANT_H_

	#include "nepomuk_export.h"	#include "nepomuk_export.h"
	#include "resource.h"	#include "resource.h"

	#include <QtCore/QDateTime>	#include <QtCore/QDateTime>
	#include <QtCore/QUrl>	#include <QtCore/QUrl>
	#include <QtCore/QVariant>	#include <QtCore/QVariant>


		namespace Soprano {
		class Node;
		}

	namespace Nepomuk {	namespace Nepomuk {

	class Resource;	class Resource;

	/**	/**
	* \class Variant variant.h Nepomuk/Variant	* \class Variant variant.h Nepomuk/Variant
	*	*

	* The %Nepomuk Variant extends over QVariant by introducing	* \brief The %Nepomuk Variant extends over QVariant by introducing
	* direct support for Resource embedding, automatic list conversion	* direct support for Resource embedding, automatic list conversion
	* and a restricted set of supported types.	* and a restricted set of supported types.
	*	*
	* 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

	skipping to change at line 351	skipping to change at line 355
	*/	*/
	QList<Variant> toVariantList() const;	QList<Variant> toVariantList() const;

	/**	/**
	* Create a Variant object by parsing string \a value based on \a t ype.	* Create a Variant object by parsing string \a value based on \a t ype.
	* If \a type is unknown a simple string Variant object is returned	* If \a type is unknown a simple string Variant object is returned
	* containing the plain string \a value.	* containing the plain string \a value.
	*/	*/
	static Variant fromString( const QString& value, int type );	static Variant fromString( const QString& value, int type );


		/**
		* Create a Variant object from a Soprano::Node.
		*
		* \since 4.5
		*/
		static Variant fromNode( const Soprano::Node& node );

	private:	private:
	class Private;	class Private;
	Private* const d;	Private* const d;
	};	};
	}	}

	NEPOMUK_EXPORT QDebug operator<<( QDebug dbg, const Nepomuk::Variant& );	NEPOMUK_EXPORT QDebug operator<<( QDebug dbg, const Nepomuk::Variant& );

	Q_DECLARE_METATYPE(Nepomuk::Resource)	Q_DECLARE_METATYPE(Nepomuk::Resource)
	Q_DECLARE_METATYPE(QList<Nepomuk::Resource>)	Q_DECLARE_METATYPE(QList<Nepomuk::Resource>)

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

	wallpaper.h	wallpaper.h

	skipping to change at line 65	skipping to change at line 65
	class PLASMA_EXPORT Wallpaper : public QObject	class PLASMA_EXPORT Wallpaper : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(QRectF boundingRect READ boundingRect WRITE setBoundingRect)	Q_PROPERTY(QRectF boundingRect READ boundingRect WRITE setBoundingRect)
	Q_PROPERTY(QString name READ name)	Q_PROPERTY(QString name READ name)
	Q_PROPERTY(QString pluginName READ pluginName)	Q_PROPERTY(QString pluginName READ pluginName)
	Q_PROPERTY(QString icon READ icon)	Q_PROPERTY(QString icon READ icon)
	Q_PROPERTY(KServiceAction renderingMode READ renderingMode)	Q_PROPERTY(KServiceAction renderingMode READ renderingMode)
	Q_PROPERTY(QList<KServiceAction> listRenderingModes READ listRenderingM odes)	Q_PROPERTY(QList<KServiceAction> listRenderingModes READ listRenderingM odes)
	Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE se tUsingRenderingCache)	Q_PROPERTY(bool usingRenderingCache READ isUsingRenderingCache WRITE se tUsingRenderingCache)

		Q_PROPERTY(bool previewing READ isPreviewing WRITE setPreviewing)

	public:	public:
	/**	/**
	* Various resize modes supported by the built in image renderer	* Various resize modes supported by the built in image renderer
	*/	*/
	enum ResizeMethod {	enum ResizeMethod {
	ScaledResize /*< Scales the image to fit the full area/,	ScaledResize /*< Scales the image to fit the full area/,
	CenteredResize /*< Centers the image within the area /,	CenteredResize /*< Centers the image within the area /,
	ScaledAndCroppedResize /*< Scales and crops the image, preserv ing the aspect ratio /,	ScaledAndCroppedResize /*< Scales and crops the image, preserv ing the aspect ratio /,
	TiledResize /*< Tiles the image to fill the area /,	TiledResize /*< Tiles the image to fill the area /,

	skipping to change at line 332	skipping to change at line 333
	*	*
	* @since 4.3	* @since 4.3
	*/	*/
	void setTargetSizeHint(const QSizeF &targetSize);	void setTargetSizeHint(const QSizeF &targetSize);

	/**	/**
	* Returns a list of wallpaper contextual actions (nothing by defau lt)	* Returns a list of wallpaper contextual actions (nothing by defau lt)
	*/	*/
	QList<QAction*> contextualActions() const;	QList<QAction*> contextualActions() const;


		/**
		* @return true if in preview mode, such as in a configuation dialo
		g
		* @since 4.5
		*/
		bool isPreviewing() const;

		/**
		* Puts the wallpaper into preview mode
		* @since 4.5
		*/
		void setPreviewing(bool previewing);

	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 476	skipping to change at line 489

	/**	/**
	* Sets the contextual actions for this wallpaper.	* Sets the contextual actions for this wallpaper.
	*	*
	* @param actions A list of contextual actions for this wallpaper	* @param actions A list of contextual actions for this wallpaper
	*	*
	* @since 4.4	* @since 4.4
	**/	**/
	void setContextualActions(const QList<QAction*> &actions);	void setContextualActions(const QList<QAction*> &actions);


		//FIXME: KDE5, this must be moved to the dptr
	QList<QAction*> contextActions;	QList<QAction*> contextActions;

	private:	private:

	Q_PRIVATE_SLOT(d, void renderCompleted(int token, const QImage &ima ge,	Q_PRIVATE_SLOT(d, void renderCompleted(WallpaperRenderThread *rende rer, int token, const QImage &image,
	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())	Q_PRIVATE_SLOT(d, void initScript())

	friend class WallpaperPackage;	friend class WallpaperPackage;
	friend class WallpaperPrivate;	friend class WallpaperPrivate;
	friend class WallpaperScript;	friend class WallpaperScript;
	friend class WallpaperWithPaint;	friend class WallpaperWithPaint;
	friend class ContainmentPrivate;	friend class ContainmentPrivate;
	WallpaperPrivate *const d;	WallpaperPrivate *const d;

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

	webview.h	webview.h

	skipping to change at line 219	skipping to change at line 219
	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);
	QVariant itemChange(GraphicsItemChange change, const QVariant &valu e);	QVariant itemChange(GraphicsItemChange change, const QVariant &valu e);
	QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const ;	QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const ;

	private:	private:
	Q_PRIVATE_SLOT(d, void 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 scrollRequested(int dx, int dy, const QRect
	&scrollRect))

	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. 1 change blocks.
	3 lines changed or deleted	0 lines changed or added

	windoweffects.h	windoweffects.h

	skipping to change at line 44	skipping to change at line 44
	* @since 4.4	* @since 4.4
	*/	*/
	namespace WindowEffects	namespace WindowEffects
	{	{
	enum Effect {	enum Effect {
	Slide = 1,	Slide = 1,
	WindowPreview = 2,	WindowPreview = 2,
	PresentWindows = 3,	PresentWindows = 3,
	PresentWindowsGroup = 4,	PresentWindowsGroup = 4,
	HighlightWindows = 5,	HighlightWindows = 5,

	OverrideShadow = 6	OverrideShadow = 6,
		BlurBehind = 7
	};	};

	/**	/**
	* @return if an atom property is available	* @return if an atom property is available
	*	*
	* @param effect the effect we want to check	* @param effect the effect we want to check
	* @since 4.4	* @since 4.4
	*/	*/
	PLASMA_EXPORT bool isEffectAvailable(Effect effect);	PLASMA_EXPORT bool isEffectAvailable(Effect effect);

	/**	/**
	* Mark a window as sliding from screen edge	* Mark a window as sliding from screen edge
	*	*
	* @arg id of the window on which we want to apply the effect	* @arg id of the window on which we want to apply the effect

	* @arg location edge of the screen from which we want the slifing effe	* @arg location edge of the screen from which we want the sliding effe
	ct.	ct.
	* Desktop and FLoating won't have effect.	* Desktop and Floating won't have effect.
	* @arg offset distance in pixels from the screen edge defined by locat ion	* @arg offset distance in pixels from the screen edge defined by locat ion
	* @since 4.4	* @since 4.4
	*/	*/
	PLASMA_EXPORT void slideWindow(WId id, Plasma::Location location, int o ffset);	PLASMA_EXPORT void slideWindow(WId id, Plasma::Location location, int o ffset);

	/**	/**
	* Mark a window as sliding from screen edge	* Mark a window as sliding from screen edge
	* This is an overloaded member function provided for convenience	* This is an overloaded member function provided for convenience
	*	*
	* @arg widget QWidget corresponding to the top level window we want to animate	* @arg widget QWidget corresponding to the top level window we want to animate

	* @arg location edge of the screen from which we want the slifing effe	* @arg location edge of the screen from which we want the sliding effe
	ct.	ct.
	* Desktop and FLoating won't have effect.	* Desktop and Floating won't have effect.
	* @since 4.4	* @since 4.4
	*/	*/
	PLASMA_EXPORT void slideWindow(QWidget *widget, Plasma::Location locati on);	PLASMA_EXPORT void slideWindow(QWidget *widget, Plasma::Location locati on);

	/**	/**
	* @return dimension of all the windows passed as parameter	* @return dimension of all the windows passed as parameter
	*	*
	* @param ids all the windows we want the size	* @param ids all the windows we want the size
	* @since 4.4	* @since 4.4
	*/	*/

	skipping to change at line 119	skipping to change at line 120
	* Activate the Present Windows effect for the windows of the given desk top.	* Activate the Present Windows effect for the windows of the given desk top.
	*	*
	* @param controller The window which is the controller of this effect. The property	* @param controller The window which is the controller of this effect. The property
	* will be set on this window. It will be removed by t he effect	* will be set on this window. It will be removed by t he effect
	* @param desktop The desktop whose windows should be presented. -1 for all desktops	* @param desktop The desktop whose windows should be presented. -1 for all desktops
	* @since 4.4	* @since 4.4
	*/	*/
	PLASMA_EXPORT void presentWindows(WId controller, int desktop = -1);	PLASMA_EXPORT void presentWindows(WId controller, int desktop = -1);

	/**	/**

	* Highlight the selected windos, making all the others translucent	* Highlight the selected windows, making all the others translucent
	*	*
	* @param controller The window which is the controller of this effect. The property	* @param controller The window which is the controller of this effect. The property
	* will be set on this window. It will be removed by t he effect	* will be set on this window. It will be removed by t he effect
	* @param ids all the windows which should be highlighted.	* @param ids all the windows which should be highlighted.
	* @since 4.4	* @since 4.4
	*/	*/
	PLASMA_EXPORT void highlightWindows(WId controller, const QList<WId> &i ds);	PLASMA_EXPORT void highlightWindows(WId controller, const QList<WId> &i ds);

	/**	/**
	* Forbid te windowmanager to automatically generate a shadow for this window	* Forbid te windowmanager to automatically generate a shadow for this window
	* @param window the window that won't have shadow	* @param window the window that won't have shadow
	* @param override true if it won't have shadow, false enables it again	* @param override true if it won't have shadow, false enables it again
	*	*
	* @since 4.4	* @since 4.4
	*/	*/
	PLASMA_EXPORT void overrideShadow(WId window, bool override);	PLASMA_EXPORT void overrideShadow(WId window, bool override);


		/**
		* Instructs the window manager to blur the background in the specified
		region
		* behind the given window. Passing a null region will enable the blur
		effect
		* for the whole window. The region is relative to the top-left corner
		of the
		* client area.
		*
		* Note that you will usually want to set the region to the shape of th
		e window,
		* excluding any shadow or halo.
		*
		* @param window The window for which to enable the blur effect
		* @param enable Enable the effect if @a true, disable it if @false
		* @param region The region within the window where the background will
		be blurred
		* @since 4.5
		*/
		PLASMA_EXPORT void enableBlurBehind(WId window, bool enable = true, con
		st QRegion &region = QRegion());
	}	}

	} // namespace Plasma	} // namespace Plasma

	#endif	#endif

End of changes. 5 change blocks.
	8 lines changed or deleted	31 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/

	action.h	action.h

	skipping to change at line 341	skipping to change at line 341
	QVariant callFunction(const QString& name, const QVariantList& args = QVariantList());	QVariant callFunction(const QString& name, const QVariantList& args = QVariantList());

	/**	/**
	* Evaluate some scripting code.	* Evaluate some scripting code.
	*	*
	* Example how this can be used:	* Example how this can be used:
	* \code	* \code
	* Kross::Action* a = new Kross::Action(0, "MyScript");	* Kross::Action* a = new Kross::Action(0, "MyScript");
	* a->setInterpreter("python");	* a->setInterpreter("python");
	* a->setCode("def myFunc(x): return x");	* a->setCode("def myFunc(x): return x");

	* a->execute();	* a->trigger();
	* int three = a->evaluate("1+2").toInt(); // returns 3	* int three = a->evaluate("1+2").toInt(); // returns 3
	* int nine = a->evaluate("myFunc(9)").toInt(); // returns 9	* int nine = a->evaluate("myFunc(9)").toInt(); // returns 9
	* \endcode	* \endcode
	*	*
	* \param code The scripting code to evaluate.	* \param code The scripting code to evaluate.
	* \return The return value of the evaluation.	* \return The return value of the evaluation.
	*/	*/
	QVariant evaluate(const QByteArray& code);	QVariant evaluate(const QByteArray& code);

	Q_SIGNALS:	Q_SIGNALS:

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

	battery.h	battery.h

	skipping to change at line 58	skipping to change at line 58
	/**	/**
	* This enum type defines the type of the device holding the batter y	* This enum type defines the type of the device holding the batter y
	*	*
	* - PdaBattery : A battery in a Personal Digital Assistant	* - PdaBattery : A battery in a Personal Digital Assistant
	* - UpsBattery : A battery in an Uninterruptible Power Supply	* - UpsBattery : A battery in an Uninterruptible Power Supply
	* - PrimaryBattery : A primary battery for the system (for example laptop battery)	* - PrimaryBattery : A primary battery for the system (for example laptop battery)
	* - MouseBattery : A battery in a mouse	* - MouseBattery : A battery in a mouse
	* - KeyboardBattery : A battery in a keyboard	* - KeyboardBattery : A battery in a keyboard
	* - KeyboardMouseBattery : A battery in a combined keyboard and mo use	* - KeyboardMouseBattery : A battery in a combined keyboard and mo use
	* - CameraBattery : A battery in a camera	* - CameraBattery : A battery in a camera

		* - PhoneBattery : A battery in a phone
		* - MonitorBattery : A battery in a monitor
	* - UnknownBattery : A battery in an unknown device	* - UnknownBattery : A battery in an unknown device
	*/	*/
	enum BatteryType { UnknownBattery, PdaBattery, UpsBattery,	enum BatteryType { UnknownBattery, PdaBattery, UpsBattery,
	PrimaryBattery, MouseBattery, KeyboardBattery,	PrimaryBattery, MouseBattery, KeyboardBattery,

	KeyboardMouseBattery, CameraBattery };	KeyboardMouseBattery, CameraBattery,
		PhoneBattery, MonitorBattery };

	/**	/**
	* This enum type defines charge state of a battery	* This enum type defines charge state of a battery
	*	*
	* - NoCharge : Battery charge is stable, not charging or dischargi ng or	* - NoCharge : Battery charge is stable, not charging or dischargi ng or
	* the state is Unknown	* the state is Unknown
	* - Charging : Battery is charging	* - Charging : Battery is charging
	* - Discharging : Battery is discharging	* - Discharging : Battery is discharging
	*/	*/
	enum ChargeState { NoCharge, Charging, Discharging };	enum ChargeState { NoCharge, Charging, Discharging };

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 628	skipping to change at line 628
	*	*
	* @param global global coordinates where the popup should be shown	* @param global global coordinates where the popup should be shown
	* @param url the URL this popup applies to	* @param url the URL this popup applies to
	* @param mode the file type of the url (S_IFREG, S_IFDIR...)	* @param mode the file type of the url (S_IFREG, S_IFDIR...)
	* @param args OpenUrlArguments, set the mimetype of the URL using setMim eType()	* @param args OpenUrlArguments, set the mimetype of the URL using setMim eType()
	* @param browserArguments BrowserArguments, mostly for referrer	* @param browserArguments BrowserArguments, mostly for referrer
	* @param flags enables/disables certain builtin actions in the popupmenu	* @param flags enables/disables certain builtin actions in the popupmenu
	* @param actionGroups named groups of actions which should be inserted i nto the popup, see ActionGroupMap	* @param actionGroups named groups of actions which should be inserted i nto the popup, see ActionGroupMap
	*/	*/
	void popupMenu( const QPoint &global, const KUrl &url,	void popupMenu( const QPoint &global, const KUrl &url,

	mode_t mode = (mode_t)-1,	mode_t mode = static_cast<mode_t>(-1),
	const KParts::OpenUrlArguments &args = KParts::OpenUrlArg uments(),	const KParts::OpenUrlArguments &args = KParts::OpenUrlArg uments(),
	const KParts::BrowserArguments &browserArgs = KParts::Bro wserArguments(),	const KParts::BrowserArguments &browserArgs = KParts::Bro wserArguments(),
	KParts::BrowserExtension::PopupFlags flags = KParts::Brow serExtension::DefaultPopupItems,	KParts::BrowserExtension::PopupFlags flags = KParts::Brow serExtension::DefaultPopupItems,
	const KParts::BrowserExtension::ActionGroupMap& actionGro ups = ActionGroupMap() );	const KParts::BrowserExtension::ActionGroupMap& actionGro ups = ActionGroupMap() );

	/**	/**
	* Inform the hosting application about the current selection.	* Inform the hosting application about the current selection.
	* Used when a set of files/URLs is selected (with full information	* Used when a set of files/URLs is selected (with full information
	* about those URLs, including size, permissions etc.)	* about those URLs, including size, permissions etc.)
	*/	*/

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

	datacontainer.h	datacontainer.h

	skipping to change at line 91	skipping to change at line 91
	* Set a value for a key.	* Set a value for a key.
	*	*
	* This also marks this source as needing to signal an update.	* This also marks this source as needing to signal an update.
	*	*
	* If you call setData() directly on a DataContainer, you need to	* If you call setData() directly on a DataContainer, you need to
	* either trigger the scheduleSourcesUpdated() slot for the	* either trigger the scheduleSourcesUpdated() slot for the
	* data engine it belongs to or call checkForUpdate() on the	* data engine it belongs to or call checkForUpdate() on the
	* DataContainer.	* DataContainer.
	*	*
	* @param key a string used as the key for the data	* @param key a string used as the key for the data

	* @param value a QVariant holding the actual data. If a null or in valid	* @param value a QVariant holding the actual data. If a invalid
	* QVariant is passed in and the key currently exists in the	* QVariant is passed in and the key currently exists in the
	* data, then the data entry is removed	* data, then the data entry is removed
	**/	**/
	void setData(const QString &key, const QVariant &value);	void setData(const QString &key, const QVariant &value);

	/**	/**
	* Removes all data currently associated with this source	* Removes all data currently associated with this source
	*	*
	* If you call removeAllData() on a DataContainer, you need to	* If you call removeAllData() on a DataContainer, you need to
	* either trigger the scheduleSourcesUpdated() slot for the	* either trigger the scheduleSourcesUpdated() slot for the

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

	forwardingslavebase.h	forwardingslavebase.h

	skipping to change at line 130	skipping to change at line 130
	int permissions, JobFlags flags);	int permissions, JobFlags flags);

	virtual void del(const KUrl &url, bool isfile);	virtual void del(const KUrl &url, bool isfile);

	protected:	protected:
	/**	/**
	* Rewrite an url to its forwarded counterpart. It should return	* Rewrite an url to its forwarded counterpart. It should return
	* true if everything was ok, and false otherwise.	* true if everything was ok, and false otherwise.
	*	*
	* If a problem is detected it's up to this method to trigger error()	* If a problem is detected it's up to this method to trigger error()

	* before returning. Returning false silently cancel the current	* before returning. Returning false silently cancels the current
	* slave operation.	* slave operation.
	*	*
	* @param url The URL as given during the slave call	* @param url The URL as given during the slave call
	* @param newURL The new URL to forward the slave call to	* @param newURL The new URL to forward the slave call to
	* @return true if the given url could be correctly rewritten	* @return true if the given url could be correctly rewritten
	*/	*/
	virtual bool rewriteUrl(const KUrl &url, KUrl &newURL)=0;	virtual bool rewriteUrl(const KUrl &url, KUrl &newURL)=0;

	/**	/**

	* Allow to modify a UDSEntry before it's sent to the ioslave enpoint.	* Allow to modify a UDSEntry before it's sent to the ioslave endpoint.
	* This is the default implementation working in most case, but sometim	* This is the default implementation working in most cases, but someti
	es	mes
	* you could make use of more forwarding black magic (for example	* you could make use of more forwarding black magic (for example
	* dynamically transform any desktop file into a fake directory...)	* dynamically transform any desktop file into a fake directory...)
	*	*
	* @param entry the UDSEntry to post-process	* @param entry the UDSEntry to post-process
	* @param listing indicate if this entry it created during a listDir	* @param listing indicate if this entry it created during a listDir
	* operation	* operation
	*/	*/
	virtual void prepareUDSEntry(KIO::UDSEntry &entry,	virtual void prepareUDSEntry(KIO::UDSEntry &entry,
	bool listing=false) const;	bool listing=false) const;


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

	job.h	job.h

	skipping to change at line 390	skipping to change at line 390
	* @param dest Where to put the file.	* @param dest Where to put the file.
	* @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 Can be HideProgressInfo, Overwrite and Resume here. WAR NING:	* @param flags Can be HideProgressInfo, Overwrite and Resume here. WAR NING:
	* Setting Resume means that the data will be appended to @p dest if @p dest exists.	* Setting Resume means that the data will be appended to @p dest if @p dest exists.
	* @return the job handling the operation.	* @return the job handling the operation.
	*/	*/
	KIO_EXPORT FileCopyJob *file_copy( const KUrl& src, const KUrl& dest, i nt permissions=-1,	KIO_EXPORT FileCopyJob *file_copy( const KUrl& src, const KUrl& dest, i nt permissions=-1,
	JobFlags flags = DefaultFlags );	JobFlags flags = DefaultFlags );

	/**	/**

		* Overload for catching code mistakes. Do NOT call this method (it is
		not implemented),
		* insert a value for permissions (-1 by default) before the JobFlags.
		* @since 4.5
		*/
		FileCopyJob *file_copy( const KUrl& src, const KUrl& dest, JobFlags fla
		gs ); // not implemented - on purpose.

		/**
	* Move a single file.	* Move a single file.
	*	*
	* Use either SlaveBase::rename() if the slave supports that,	* Use either SlaveBase::rename() if the slave supports that,
	* or copy() and del() otherwise, or eventually get() & put() & del()	* or copy() and del() otherwise, or eventually get() & put() & del()
	* @param src Where to get the file.	* @param src Where to get the file.
	* @param dest Where to put the file.	* @param dest Where to put the file.
	* @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 Can be HideProgressInfo, Overwrite and Resume here. WAR NING:	* @param flags Can be HideProgressInfo, Overwrite and Resume here. WAR NING:
	* Setting Resume means that the data will be appended to @p dest if @p dest exists.	* Setting Resume means that the data will be appended to @p dest if @p dest exists.
	* @return the job handling the operation.	* @return the job handling the operation.

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

	kaboutdata.h	kaboutdata.h

	skipping to change at line 231	skipping to change at line 231
	* taken verbatim; the author information from addAuthor is not used.	* taken verbatim; the author information from addAuthor is not used.
	*	*
	* @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.
	*	*
	* @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 D-Bus registration.
	* @see setOrganizationDomain	* @see setOrganizationDomain
	*	*
	* @param bugsEmailAddress The bug report email address string.	* @param bugsEmailAddress The bug report email address string.
	* 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,

	skipping to change at line 521	skipping to change at line 521
	KAboutData &setBugAddress( const QByteArray &bugAddress );	KAboutData &setBugAddress( const QByteArray &bugAddress );

	/**	/**
	* Defines the Internet domain of the organization that wrote this appl ication.	* Defines the Internet domain of the organization that wrote this appl ication.
	* The domain is set to kde.org by default, or the domain of the homePa geAddress constructor argument,	* The domain is set to kde.org by default, or the domain of the homePa geAddress constructor argument,
	* if set.	* if set.
	*	*
	* Make sure to call setOrganizationDomain if your product is developed out of the	* Make sure to call setOrganizationDomain if your product is developed out of the
	* kde.org version-control system.	* kde.org version-control system.
	*	*

	* Used by the automatic registration to DBus done by KApplication and KUniqueApplication.	* Used by the automatic registration to D-Bus done by KApplication and KUniqueApplication.
	*	*
	* IMPORTANT: if the organization domain is set, the .desktop file that describes your	* IMPORTANT: if the organization domain is set, the .desktop file that describes your
	* application should have an entry like X-DBUS-ServiceName=reversed_do main.kmyapp	* application should have an entry like X-DBUS-ServiceName=reversed_do main.kmyapp
	* For instance kwrite passes "http://www.kate-editor.org" as the homeP ageAddress so it needs	* For instance kwrite passes "http://www.kate-editor.org" as the homeP ageAddress so it needs
	* X-DBUS-ServiceName=org.kate-editor.kwrite in its kwrite.desktop file .	* X-DBUS-ServiceName=org.kate-editor.kwrite in its kwrite.desktop file .
	*	*
	* @param domain the domain name, for instance kde.org, koffice.org, kd evelop.org, etc.	* @param domain the domain name, for instance kde.org, koffice.org, kd evelop.org, etc.
	*/	*/
	KAboutData &setOrganizationDomain( const QByteArray &domain );	KAboutData &setOrganizationDomain( const QByteArray &domain );


	skipping to change at line 566	skipping to change at line 566

	/**	/**
	* Returns the translated program name.	* Returns the translated program name.
	* @return the program name (translated).	* @return the program name (translated).
	*/	*/
	QString programName() const;	QString programName() const;

	/**	/**
	* Returns the domain name of the organization that wrote this applicat ion.	* Returns the domain name of the organization that wrote this applicat ion.
	*	*

	* Used by the automatic registration to DBus done by KApplication and KUniqueApplication.	* Used by the automatic registration to D-Bus done by KApplication and KUniqueApplication.
	*/	*/
	QString organizationDomain() const;	QString organizationDomain() const;

	/**	/**
	* @internal	* @internal
	* Provided for use by KCrash	* Provided for use by KCrash
	*/	*/
	const char* internalProgramName() const;	const char* internalProgramName() const;

	/**	/**
	* @internal	* @internal
	* Provided for use by KCrash	* Provided for use by KCrash
	*/	*/
	void translateInternalProgramName() const;	void translateInternalProgramName() const;

	/**	/**
	* Returns the program's icon name.	* Returns the program's icon name.
	*	*

	* The default value is @p appName .	* The default value is appName().
	* Use @p setProgramIconName if you need to have an icon	* Use setProgramIconName() if you need to have an icon
	* whose name is different from the internal application name.	* whose name is different from the internal application name.
	*	*
	* @return the program's icon name.	* @return the program's icon name.
	* @see setProgramIconName()	* @see setProgramIconName()
	* @since 4.1	* @since 4.1
	*/	*/
	QString programIconName() const;	QString programIconName() const;

	/**	/**
	* Returns the program logo image.	* Returns the program logo image.

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

	kauthactionreply.h	kauthactionreply.h

	skipping to change at line 47	skipping to change at line 47

	The solution is the caller/helper pattern. With this pattern, the privileg ed code is isolated in a small helper tool that runs as root. This tool inc ludes only the few lines of code that actually	The solution is the caller/helper pattern. With this pattern, the privileg ed code is isolated in a small helper tool that runs as root. This tool inc ludes only the few lines of code that actually
	need to be run with privileges, not the whole application logic. All the o ther parts of the application are run as a normal user, and the helper tool is called when needed, using a secure mechanism that	need to be run with privileges, not the whole application logic. All the o ther parts of the application are run as a normal user, and the helper tool is called when needed, using a secure mechanism that
	ensures that the user is authorized to do so. This pattern is not very eas y to implement, because the developer has to deal with a lot of details abo ut how to authorize the user, how to call the helper	ensures that the user is authorized to do so. This pattern is not very eas y to implement, because the developer has to deal with a lot of details abo ut how to authorize the user, how to call the helper
	with the right privileges, how to exchange data with the helper, etc.. Thi s is where the new KDE Authorization API becomes useful. Thanks to this new library, every developer can implement the	with the right privileges, how to exchange data with the helper, etc.. Thi s is where the new KDE Authorization API becomes useful. Thanks to this new library, every developer can implement the
	caller/helper pattern to write application that require high privileges, w ith a few lines of code in an easy, secure and cross-platform way.	caller/helper pattern to write application that require high privileges, w ith a few lines of code in an easy, secure and cross-platform way.

	Not only: the library can also be used to lock down some actions in your a pplication without using an helper but just checking for authorization and verifying if the user is allowed to perform it.	Not only: the library can also be used to lock down some actions in your a pplication without using an helper but just checking for authorization and verifying if the user is allowed to perform it.

	The KDE Authorization library uses different backends depending on the sys tem where it's built. As far as the user authorization is concerned, it cur rently uses PolicyKit on linux and Authorization Services	The KDE Authorization library uses different backends depending on the sys tem where it's built. As far as the user authorization is concerned, it cur rently uses PolicyKit on linux and Authorization Services

	on Mac OSX, and a Windows backend will eventually be written, too. At the communication layer, the library uses dbus on every supported platform.	on Mac OSX, and a Windows backend will eventually be written, too. At the communication layer, the library uses D-Bus on every supported platform.

	@section kauth_concepts Concepts	@section kauth_concepts Concepts
	There are a few concepts to understand when using the library. Much of tho se are carried from underlying APIs such as PolicyKit, so if you know somet hing about them there shouldn't be problems.	There are a few concepts to understand when using the library. Much of tho se are carried from underlying APIs such as PolicyKit, so if you know somet hing about them there shouldn't be problems.

	An <i>action</i> is a single task that needs to be done by the application . You refer to an action using an action identifier, which is a string in r everse domain name syntax (to avoid duplicates). For	An <i>action</i> is a single task that needs to be done by the application . You refer to an action using an action identifier, which is a string in r everse domain name syntax (to avoid duplicates). For
	example, if the date/time control center module needs to change the date, it would need an action like "org.kde.datatime.change". If your application has to perform more than one privileged task, you	example, if the date/time control center module needs to change the date, it would need an action like "org.kde.datatime.change". If your application has to perform more than one privileged task, you
	should configure more than one action. This allows system administrators t o fine tune the policies that allow users to perform your actions.	should configure more than one action. This allows system administrators t o fine tune the policies that allow users to perform your actions.

	The <i>authorization</i> is the process that is executed to decide if a us er can perform an action or not. In order to execute the helper as root, th e user has to be authorized. For example, on linux,	The <i>authorization</i> is the process that is executed to decide if a us er can perform an action or not. In order to execute the helper as root, th e user has to be authorized. For example, on linux,
	che policykit backend will look at the policykit policy database to see wh at requirements the user has to meet in order to execute the action you req uested. The policy set for that action could allow	che policykit backend will look at the policykit policy database to see wh at requirements the user has to meet in order to execute the action you req uested. The policy set for that action could allow

	skipping to change at line 399	skipping to change at line 399
	* The enumeration of the possible values of errorCode() when type() is ActionReply::KAuthError	* The enumeration of the possible values of errorCode() when type() is ActionReply::KAuthError
	*/	*/
	enum Error {	enum Error {
	NoError = 0, ///< No error.	NoError = 0, ///< No error.
	NoResponder, ///< The helper responder object hasn't been set. This shouldn't happen if you use the KDE4_AUTH_HELPER macro in the helper sourc e	NoResponder, ///< The helper responder object hasn't been set. This shouldn't happen if you use the KDE4_AUTH_HELPER macro in the helper sourc e
	NoSuchAction, ///< The action you tried to execute doesn't exist.	NoSuchAction, ///< The action you tried to execute doesn't exist.
	InvalidAction, ///< You tried to execute an invalid action object	InvalidAction, ///< You tried to execute an invalid action object
	AuthorizationDenied, ///< You don't have the authorization to execu te the action	AuthorizationDenied, ///< You don't have the authorization to execu te the action
	UserCancelled, ///< Action execution has been cancelled by the user	UserCancelled, ///< Action execution has been cancelled by the user
	HelperBusy, ///< The helper is busy executing another action (or gr oup of actions). Try later	HelperBusy, ///< The helper is busy executing another action (or gr oup of actions). Try later

	DBusError ///< An error from dbus occurred	DBusError ///< An error from D-Bus occurred
	};	};

	/// Default constructor. Sets type() to Success and errorCode() to zero .	/// Default constructor. Sets type() to Success and errorCode() to zero .
	ActionReply();	ActionReply();

	/**	/**
	* @brief Constructor to directly set the type.	* @brief Constructor to directly set the type.
	*	*
	* This constructor directly sets the reply type. You shouldn't need to	* This constructor directly sets the reply type. You shouldn't need to
	* directly call this constructor, because you can use the more conveni ent	* directly call this constructor, because you can use the more conveni ent

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

	kcmodulecontainer.h	kcmodulecontainer.h

	skipping to change at line 49	skipping to change at line 49
	* consisting of a tab widget where each tab contains one of the modules sp ecified via one of the	* consisting of a tab widget where each tab contains one of the modules sp ecified via one of the
	* constructors. KCModuleContainer can handle modules which requires root p ermissions. What you	* constructors. KCModuleContainer can handle modules which requires root p ermissions. What you
	* most likely want is the KCMODULECONTAINER macro. \n	* most likely want is the KCMODULECONTAINER macro. \n
	* Sometimes it is of interest to detect in runtime whether a module should be loaded or not. This	* Sometimes it is of interest to detect in runtime whether a module should be loaded or not. This
	* can be achieved by sub classing KCModuleContainer, doing the probing/tes ting checks and then manually	* can be achieved by sub classing KCModuleContainer, doing the probing/tes ting checks and then manually
	* call addModule for each module which should be displayed. When all calls to addModule is done, call	* call addModule for each module which should be displayed. When all calls to addModule is done, call
	* finalize() which performs some necessary final steps.	* finalize() which performs some necessary final steps.
	*	*
	* @author Frans Englich <frans.englich@telia.com>	* @author Frans Englich <frans.englich@telia.com>
	*/	*/

	class KUTILS_EXPORT KCModuleContainer : public KCModule	class KCMUTILS_EXPORT KCModuleContainer : public KCModule
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	/**	/**
	* Creates a KCModuleContainer with tabs, each one containin g one of the	* Creates a KCModuleContainer with tabs, each one containin g one of the
	* specified modules in @p mods.	* specified modules in @p mods.
	*	*
	* @param parent the parent QWidget.	* @param parent the parent QWidget.
	* @param mods The list of KCModules to be loaded. The name of each	* @param mods The list of KCModules to be loaded. The name of each
	* KCModule is its service name, that is the name of the des ktop file without	* KCModule is its service name, that is the name of the des ktop file without

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

	kcmoduleloader.h	kcmoduleloader.h

	skipping to change at line 75	skipping to change at line 75
	Both = 3	Both = 3
	};	};

	/**	/**
	* Loads a @ref KCModule. If loading fails a zero pointer is returned.	* Loads a @ref KCModule. If loading fails a zero pointer is returned.
	* @param module what module to load	* @param module what module to load
	* @param report see ErrorReporting	* @param report see ErrorReporting
	*	*
	* @return a pointer to the loaded @ref KCModule	* @return a pointer to the loaded @ref KCModule
	*/	*/

	KUTILS_EXPORT KCModule *loadModule(const KCModuleInfo &module, ErrorRep orting	KCMUTILS_EXPORT KCModule *loadModule(const KCModuleInfo &module, ErrorR eporting
	report, QWidget * parent = 0, const QStringList& args = QStringList () );	report, QWidget * parent = 0, const QStringList& args = QStringList () );

	/**	/**
	* Loads a @ref KCModule. If loading fails a zero pointer is returned.	* Loads a @ref KCModule. If loading fails a zero pointer is returned.
	*	*
	* @param module what module to load	* @param module what module to load
	* @param report see ErrorReporting	* @param report see ErrorReporting
	*	*
	* @return a pointer to the loaded @ref KCModule	* @return a pointer to the loaded @ref KCModule
	*/	*/

	KUTILS_EXPORT KCModule *loadModule( const QString &module, ErrorReporti ng report,	KCMUTILS_EXPORT KCModule *loadModule( const QString &module, ErrorRepor ting report,
	QWidget *parent = 0, const QStringList& args = QStringList() );	QWidget *parent = 0, const QStringList& args = QStringList() );

	/**	/**
	* Unloads the module's library	* Unloads the module's library
	* @param mod What module to unload for	* @param mod What module to unload for
	*/	*/

	KUTILS_EXPORT void unloadModule(const KCModuleInfo &mod);	KCMUTILS_EXPORT void unloadModule(const KCModuleInfo &mod);

	/**	/**
	* Display a message box explaining an error occurred and possible	* Display a message box explaining an error occurred and possible
	* reasons to why.	* reasons to why.
	*	*
	* @deprecated Use a constructor with ErrorReporting set to Dialog to s how a	* @deprecated Use a constructor with ErrorReporting set to Dialog to s how a
	* message box like this function did.	* message box like this function did.
	*/	*/

	KUTILS_EXPORT KDE_DEPRECATED void showLastLoaderError(QWidget *parent);	KCMUTILS_EXPORT KDE_DEPRECATED void showLastLoaderError(QWidget *parent );

	/**	/**
	* Returns a KCModule containing the messages @p report and @p text.	* Returns a KCModule containing the messages @p report and @p text.
	*	*
	* @param report the type of error reporting, see ErrorReporting	* @param report the type of error reporting, see ErrorReporting
	* @param text the main message	* @param text the main message
	* @param details any additional details	* @param details any additional details
	*	*
	* @internal	* @internal
	*/	*/

	KUTILS_EXPORT KCModule* reportError( ErrorReporting report, const QStri ng & text,	KCMUTILS_EXPORT KCModule* reportError( ErrorReporting report, const QSt ring & text,
	const QString &details, QWidget * parent );	const QString &details, QWidget * parent );

	}	}

	// vim: ts=2 sw=2 et	// vim: ts=2 sw=2 et
	#endif // KCMODULELOADER_H	#endif // KCMODULELOADER_H

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

	kdialog.h	kdialog.h

	skipping to change at line 155	skipping to change at line 155
	Close = 0x00000040, ///< Show Close-button. (this button closes the dialog)	Close = 0x00000040, ///< Show Close-button. (this button closes the dialog)
	No = 0x00000080, ///< Show No button. (this button closes the di alog and sets the result to KDialog::No)	No = 0x00000080, ///< Show No button. (this button closes the di alog and sets the result to KDialog::No)
	Yes = 0x00000100, ///< Show Yes button. (this button closes the d ialog and sets the result to KDialog::Yes)	Yes = 0x00000100, ///< Show Yes button. (this button closes the d ialog and sets the result to KDialog::Yes)
	Reset = 0x00000200, ///< Show Reset button	Reset = 0x00000200, ///< Show Reset button
	Details = 0x00000400, ///< Show Details button. (this button will sho w the detail widget set with setDetailsWidget)	Details = 0x00000400, ///< Show Details button. (this button will sho w the detail widget set with setDetailsWidget)
	User1 = 0x00001000, ///< Show User defined button 1.	User1 = 0x00001000, ///< Show User defined button 1.
	User2 = 0x00002000, ///< Show User defined button 2.	User2 = 0x00002000, ///< Show User defined button 2.
	User3 = 0x00004000, ///< Show User defined button 3.	User3 = 0x00004000, ///< Show User defined button 3.
	NoDefault = 0x00008000 ///< Used when specifying a default button; in dicates that no button should be marked by default.	NoDefault = 0x00008000 ///< Used when specifying a default button; in dicates that no button should be marked by default.
	};	};

		// TODO KDE5: remove NoDefault and use the value None instead
	Q_DECLARE_FLAGS(ButtonCodes, ButtonCode)	Q_DECLARE_FLAGS(ButtonCodes, ButtonCode)

	enum ButtonPopupMode	enum ButtonPopupMode
	{	{
	InstantPopup = 0,	InstantPopup = 0,
	DelayedPopup = 1	DelayedPopup = 1
	};	};
	Q_DECLARE_FLAGS(ButtonPopupModes, ButtonPopupMode)	Q_DECLARE_FLAGS(ButtonPopupModes, ButtonPopupMode)

	public:	public:

	skipping to change at line 228	skipping to change at line 229
	* Sets the button that will be activated when the Enter key	* Sets the button that will be activated when the Enter key
	* is pressed.	* is pressed.
	*	*
	* By default, this is the Ok button if it is present	* By default, this is the Ok button if it is present
	*	*
	* @param id The button code.	* @param id The button code.
	*/	*/
	void setDefaultButton( ButtonCode id );	void setDefaultButton( ButtonCode id );

	/**	/**

	* Returns the button code of the default button.	* Returns the button code of the default button,
		* or NoDefault if there is no default button.
	*/	*/
	ButtonCode defaultButton() const;	ButtonCode defaultButton() const;

	/**	/**
	* Hide or display the a separator line drawn between the action	* Hide or display the a separator line drawn between the action
	* buttons an the main widget.	* buttons an the main widget.
	*/	*/
	void showButtonSeparator( bool state );	void showButtonSeparator( bool state );

	/**	/**

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

	kfileplacesmodel.h	kfileplacesmodel.h

	skipping to change at line 71	skipping to change at line 71
	Solid::Device deviceForIndex(const QModelIndex &index) const;	Solid::Device deviceForIndex(const QModelIndex &index) const;
	KBookmark bookmarkForIndex(const QModelIndex &index) const;	KBookmark bookmarkForIndex(const QModelIndex &index) const;

	QAction *teardownActionForIndex(const QModelIndex &index) const;	QAction *teardownActionForIndex(const QModelIndex &index) const;
	QAction *ejectActionForIndex(const QModelIndex &index) const;	QAction *ejectActionForIndex(const QModelIndex &index) const;
	void requestTeardown(const QModelIndex &index);	void requestTeardown(const QModelIndex &index);
	void requestEject(const QModelIndex &index);	void requestEject(const QModelIndex &index);
	void requestSetup(const QModelIndex &index);	void requestSetup(const QModelIndex &index);

	void addPlace(const QString &text, const KUrl &url, const QString &icon Name = QString(), const QString &appName = QString());	void addPlace(const QString &text, const KUrl &url, const QString &icon Name = QString(), const QString &appName = QString());

		void addPlace(const QString &text, const KUrl &url, const QString &icon Name, const QString &appName, const QModelIndex &after);
	void editPlace(const QModelIndex &index, const QString &text, const KUr l &url, const QString &iconName = QString(), const QString &appName = QStri ng());	void editPlace(const QModelIndex &index, const QString &text, const KUr l &url, const QString &iconName = QString(), const QString &appName = QStri ng());
	void removePlace(const QModelIndex &index) const;	void removePlace(const QModelIndex &index) const;
	void setPlaceHidden(const QModelIndex &index, bool hidden);	void setPlaceHidden(const QModelIndex &index, bool hidden);

	int hiddenCount() const;	int hiddenCount() const;

	/**	/**
	* @brief Get a visible data based on Qt role for the given index.	* @brief Get a visible data based on Qt role for the given index.
	* Return the device information for the give index.	* Return the device information for the give index.
	*	*

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

	kfilepreviewgenerator.h	kfilepreviewgenerator.h

	skipping to change at line 122	skipping to change at line 122
	* Returns the list of enabled thumbnail plugins,	* Returns the list of enabled thumbnail plugins,
	* or an empty list if all plugins are enabled.	* or an empty list if all plugins are enabled.
	*	*
	* @see setEnabledPlugins	* @see setEnabledPlugins
	*/	*/
	QStringList enabledPlugins() const;	QStringList enabledPlugins() const;

	private:	private:
	class Private;	class Private;
	Private* const d; /// @internal	Private* const d; /// @internal

		class LayoutBlocker;
		class TileSet;

	Q_DISABLE_COPY(KFilePreviewGenerator)	Q_DISABLE_COPY(KFilePreviewGenerator)

	Q_PRIVATE_SLOT(d, void updateIcons(const KFileItemList&))	Q_PRIVATE_SLOT(d, void updateIcons(const KFileItemList&))
	Q_PRIVATE_SLOT(d, void updateIcons(const QModelIndex&, const QModelInde x&))	Q_PRIVATE_SLOT(d, void updateIcons(const QModelIndex&, const QModelInde x&))
	Q_PRIVATE_SLOT(d, void addToPreviewQueue(const KFileItem&, const QPixma p&))	Q_PRIVATE_SLOT(d, void addToPreviewQueue(const KFileItem&, const QPixma p&))
	Q_PRIVATE_SLOT(d, void slotPreviewJobFinished(KJob*))	Q_PRIVATE_SLOT(d, void slotPreviewJobFinished(KJob*))
	Q_PRIVATE_SLOT(d, void updateCutItems())	Q_PRIVATE_SLOT(d, void updateCutItems())
	Q_PRIVATE_SLOT(d, void dispatchIconUpdateQueue())	Q_PRIVATE_SLOT(d, void dispatchIconUpdateQueue())
	Q_PRIVATE_SLOT(d, void pauseIconUpdates())	Q_PRIVATE_SLOT(d, void pauseIconUpdates())
	Q_PRIVATE_SLOT(d, void resumeIconUpdates())	Q_PRIVATE_SLOT(d, void resumeIconUpdates())

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

	kglobal.h	kglobal.h

	skipping to change at line 446	skipping to change at line 446
	/**	/**
	* If refcounting reaches 0 (or less), and @p allowQuit is true, the in stance of the application	* If refcounting reaches 0 (or less), and @p allowQuit is true, the in stance of the application
	* will automatically be exited. Otherwise, the application will not ex it automatically.	* will automatically be exited. Otherwise, the application will not ex it automatically.
	*	*
	* This is used by KMainWindow to allow quitting after the first mainwi ndow is created,	* This is used by KMainWindow to allow quitting after the first mainwi ndow is created,
	* and is used by special applications like kfmclient, to allow quittin g even though	* and is used by special applications like kfmclient, to allow quittin g even though
	* no mainwindow was created.	* no mainwindow was created.
	*	*
	* However, don't try to call setAllowQuit(false) in applications, it d oesn't make sense.	* However, don't try to call setAllowQuit(false) in applications, it d oesn't make sense.
	* If you find that the application quits too early when closing a wind ow, then consider	* If you find that the application quits too early when closing a wind ow, then consider

	* _what_ is making your application still alive to the user (like a sy stray icon or a dbus object)	* _what_ is making your application still alive to the user (like a sy stray icon or a D-Bus object)
	* and use KGlobal::ref() + KGlobal::deref() in that object.	* and use KGlobal::ref() + KGlobal::deref() in that object.
	*	*
	* @since 4.1.1	* @since 4.1.1
	*/	*/
	KDECORE_EXPORT void setAllowQuit(bool allowQuit);	KDECORE_EXPORT void setAllowQuit(bool allowQuit);

	/**	/**
	* The component currently active (useful in a multi-component	* The component currently active (useful in a multi-component
	* application, such as a KParts application).	* application, such as a KParts application).
	* Don't use this - it's mainly for KAboutDialog and KBugReport.	* Don't use this - it's mainly for KAboutDialog and KBugReport.

	skipping to change at line 489	skipping to change at line 489
	/// @internal	/// @internal
	KDECORE_EXPORT QObject* findDirectChild_helper(const QObject* parent, c onst QMetaObject& mo);	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.	* 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.	* Unlike QObject::findChild, the search is NOT performed recursively.
	* @since 4.4	* @since 4.4
	*/	*/
	template<typename T>	template<typename T>
	inline T findDirectChild(const QObject* object) {	inline T findDirectChild(const QObject* object) {

	return static_cast<T>(findDirectChild_helper(object, ((T)0)->static MetaObject));	return static_cast<T>(findDirectChild_helper(object, (static_cast<T >(0))->staticMetaObject));
	}	}

	/**	/**
	* 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);
	}	}

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

	kmessagebox.h	kmessagebox.h

	skipping to change at line 687	skipping to change at line 687
	* widget, the message box becomes modal relative to parent .	* widget, the message box becomes modal relative to parent .
	* @param text Message string.	* @param text Message string.
	* @param details Detailed message string.	* @param details Detailed message string.
	* @param caption Message box title. The application name is added to	* @param caption Message box title. The application name is added to
	* the title. The default title is i18n("Error").	* the title. The default title is i18n("Error").
	* @param options see Options	* @param options see Options
	*	*
	* Your program messed up and now it's time to inform the user.	* Your program messed up and now it's time to inform the user.
	* To be used for important things like "Sorry, I deleted your hard disk."	* To be used for important things like "Sorry, I deleted your hard disk."
	*	*

	* The @p details message can conatin additional information about	* The @p details message can contain additional information about
	* the problem and can be shown on request to advanced/interested users.	* the problem and can be shown on request to advanced/interested users.
	*	*
	* If your program detects the action specified by the user is somehow	* If your program detects the action specified by the user is somehow
	* not allowed, this should never be reported with error(). Use sorry()	* not allowed, this should never be reported with error(). Use sorry()
	* instead to explain to the user that this action is not allowed.	* instead to explain to the user that this action is not allowed.
	*	*
	* The default button is "&OK". Pressing "Esc" selects the OK-button.	* The default button is "&OK". Pressing "Esc" selects the OK-button.
	*	*
	* NOTE: The OK button will always have the i18n'ed text '&OK'.	* NOTE: The OK button will always have the i18n'ed text '&OK'.
	*/	*/

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

	knewpassworddialog.h	knewpassworddialog.h

	skipping to change at line 42	skipping to change at line 42
	/**	/**
	* @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.
	*	*
	* \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"	* \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>
	*/	*/


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

	kpluginloader.h	kpluginloader.h

	skipping to change at line 51	skipping to change at line 51
	*	*
	*	*
	* This class is reentrant, you can load plugins from different threads. Yo u can also have multiple	* This class is reentrant, you can load plugins from different threads. Yo u can also have multiple
	* PluginLoaders for one library without negative effects.	* PluginLoaders for one library without negative effects.
	* The object obtained with factory() or the inherited method QPluginLoader ::instance() is	* The object obtained with factory() or the inherited method QPluginLoader ::instance() is
	* cached inside the library. If you call factory() or instance() multiple times, you will always get	* cached inside the library. If you call factory() or instance() multiple times, you will always get
	* the same object, even from different threads and different KPluginLoader instances.	* the same object, even from different threads and different KPluginLoader instances.
	* You can delete this object easily, a new one will be created if factory( ) or instance() is called	* You can delete this object easily, a new one will be created if factory( ) or instance() is called
	* afterwards. factory() uses instance() internally.	* afterwards. factory() uses instance() internally.
	*	*

	* KPluginLoader inherits QPluginLoader::unload(). It safe to call this met hod if you loaded a plugin	* KPluginLoader inherits QPluginLoader::unload(). It is safe to call this method if you loaded a plugin
	* and decide not to use it for some reason. But as soon as you start to us e the factory from the plugin,	* and decide not to use it for some reason. But as soon as you start to us e the factory from the plugin,
	* you should stay away from it. It's nearly impossible to keep track of al l objects created directly or	* you should stay away from it. It's nearly impossible to keep track of al l objects created directly or
	* indirectly from the plugin and all other pointers into plugin code. Usin g unload() in this case is asking	* indirectly from the plugin and all other pointers into plugin code. Usin g unload() in this case is asking
	* for trouble. If you really need to unload your plugins, you have to take care to convert the clipboard	* for trouble. If you really need to unload your plugins, you have to take care to convert the clipboard
	* content to text, because the plugin could have registered a custom mime source. You also have to delete	* content to text, because the plugin could have registered a custom mime source. You also have to delete
	* the factory of the plugin, otherwise you will create a leak.	* the factory of the plugin, otherwise you will create a leak.
	* The destructor of KPluginLoader doesn't call unload.	* The destructor of KPluginLoader doesn't call unload.
	*	*
	* Sample code:	* Sample code:
	* \code	* \code

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

	krun.h	krun.h

	skipping to change at line 144	skipping to change at line 144
	* object on the stack you must disable auto deletion.	* object on the stack you must disable auto deletion.
	* By default auto deletion is on.	* By default auto deletion is on.
	* @param b true to enable auto deletion, false to disable	* @param b true to enable auto deletion, false to disable
	*/	*/
	void setAutoDelete(bool b);	void setAutoDelete(bool b);

	/**	/**
	* Set the preferred service for opening this URL, after	* Set the preferred service for opening this URL, after
	* its mimetype will have been found by KRun. IMPORTANT: the service is	* its mimetype will have been found by KRun. IMPORTANT: the service is
	* only used if its configuration says it can handle this mimetype.	* only used if its configuration says it can handle this mimetype.

	* This is used for instance for the X-KDE-LastOpenedWith key, for	* This is used for instance for the X-KDE-LastOpenedWith key in
	* the recent documents list.	* the recent documents list, or for the app selection in
		* KParts::BrowserOpenOrSaveQuestion.
	* @param desktopEntryName the desktopEntryName of the service, e.g. "k ate".	* @param desktopEntryName the desktopEntryName of the service, e.g. "k ate".
	*/	*/
	void setPreferredService(const QString& desktopEntryName);	void setPreferredService(const QString& desktopEntryName);

	/**	/**
	* Sets whether executables, .desktop files or shell scripts should	* Sets whether executables, .desktop files or shell scripts should
	* be run by KRun. This is enabled by default.	* be run by KRun. This is enabled by default.
	* @param b whether to run executable files or not.	* @param b whether to run executable files or not.
	* @see isExecutable()	* @see isExecutable()
	*/	*/

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

	kshell.h	kshell.h

	skipping to change at line 68	skipping to change at line 68
	* executable exists for the named command).	* executable exists for the named command).
	*	*
	* Meta characters that cause a bail-out are the command separators	* Meta characters that cause a bail-out are the command separators
	* @c semicolon and @c ampersand, the redirection symbols @c less-t han,	* @c semicolon and @c ampersand, the redirection symbols @c less-t han,
	* @c greater-than and the @c pipe @c symbol and the grouping symbo ls	* @c greater-than and the @c pipe @c symbol and the grouping symbo ls
	* opening and closing @c parentheses.	* opening and closing @c parentheses.
	*	*
	* Further meta characters on *NIX are the grouping symbols	* Further meta characters on *NIX are the grouping symbols
	* opening and closing @c braces, the command substitution symbol	* opening and closing @c braces, the command substitution symbol
	* @c backquote, the generic substitution symbol @c dollar (if	* @c backquote, the generic substitution symbol @c dollar (if

	* not followed by an apostrophe), the wildcards @c asterisk and	* not followed by an apostrophe), the wildcards @c asterisk,
	* @c question @c mark and the comment symbol @c hash @c mark.	* @c question @c mark and opening and closing @c square @c bracket
		s
		* and the comment symbol @c hash @c mark.
	* Additionally, a variable assignment in the first word is recogni zed.	* Additionally, a variable assignment in the first word is recogni zed.
	*	*
	* A further meta character on Windows is the environment variable	* A further meta character on Windows is the environment variable
	* expansion symbol @c percent. Occurrences of @c \%PERCENT_SIGN% a s	* expansion symbol @c percent. Occurrences of @c \%PERCENT_SIGN% a s
	* inserted by quoteArg() are converted back and cause no bail-out,	* inserted by quoteArg() are converted back and cause no bail-out,
	* though.	* though.
	*/	*/
	AbortOnMeta = 2	AbortOnMeta = 2
	};	};
	Q_DECLARE_FLAGS(Options, Option)	Q_DECLARE_FLAGS(Options, Option)

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

	ktempdir.h	ktempdir.h

	skipping to change at line 59	skipping to change at line 59
	* @see KTemporaryFile	* @see KTemporaryFile
	* @author Joseph Wenninger <jowenn@kde.org>	* @author Joseph Wenninger <jowenn@kde.org>
	*/	*/
	class KDECORE_EXPORT KTempDir	class KDECORE_EXPORT KTempDir
	{	{
	public:	public:
	/**	/**
	* Creates a temporary directory with the name:	* Creates a temporary directory with the name:
	* \p \<directoryPrefix\>\<six letters\>	* \p \<directoryPrefix\>\<six letters\>
	*	*

	* The default \p directoryPrefix is "$KDEHOME/tmp-$HOST/appname"	* The default \p directoryPrefix is "$KDEHOME/tmp-$HOST/appname", i.e.
		* as returned by KStandardDirs::locateLocal("tmp", KGlobal::mainCompone
		nt().componentName())
		*
	* @param directoryPrefix the prefix of the file name, or	* @param directoryPrefix the prefix of the file name, or
	* QString() for the default value	* QString() for the default value
	* @param mode the file permissions,	* @param mode the file permissions,
	* almost always in octal. The first digit selects permissions for	* almost always in octal. The first digit selects permissions for
	* the user who owns the file: read (4), write (2), and execute	* the user who owns the file: read (4), write (2), and execute
	* (1); the second selects permissions for other users in the	* (1); the second selects permissions for other users in the
	* file's group, with the same values; and the third for other	* file's group, with the same values; and the third for other
	* users not in the file's group, with the same values.	* users not in the file's group, with the same values.
	*	*
	**/	**/

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

	ktoolinvocation.h	ktoolinvocation.h

	skipping to change at line 49	skipping to change at line 49
	* KToolInvocation: for starting other programs	* KToolInvocation: for starting other programs
	*	*
	* @section desktopfiles Desktop files for startServiceBy	* @section desktopfiles Desktop files for startServiceBy
	*	*
	* The way a service gets started depends on the 'X-DBUS-StartupType'	* The way a service gets started depends on the 'X-DBUS-StartupType'
	* entry in the desktop file of the service:	* entry in the desktop file of the service:
	*	*
	* There are three possibilities:	* There are three possibilities:
	* @li X-DBUS-StartupType=None (default)	* @li X-DBUS-StartupType=None (default)
	* Always start a new service,	* Always start a new service,

	* don't wait till the service registers with dbus.	* don't wait till the service registers with D-Bus.
	* @li X-DBUS-StartupType=Multi	* @li X-DBUS-StartupType=Multi
	* Always start a new service,	* Always start a new service,

	* wait until the service has registered with dbus.	* wait until the service has registered with D-Bus.
	* @li X-DBUS-StartupType=Unique	* @li X-DBUS-StartupType=Unique
	* Only start the service if it isn't already running,	* Only start the service if it isn't already running,

	* wait until the service has registered with dbus.	* wait until the service has registered with D-Bus.
	* The .desktop file can specify the name that the application will use whe n registering	* The .desktop file can specify the name that the application will use whe n registering
	* using X-DBUS-ServiceName=org.domain.mykapp. Otherwise org.kde.binaryname is assumed.	* using X-DBUS-ServiceName=org.domain.mykapp. Otherwise org.kde.binaryname is assumed.
	*	*
	* @section thread Multi-threading	* @section thread Multi-threading
	*	*
	* The static members (apart from self()), have to be called from the QAppl ication main thread.	* The static members (apart from self()), have to be called from the QAppl ication main thread.
	* Calls to members are only allowed if there is a Q(Core)Application objec t created	* Calls to members are only allowed if there is a Q(Core)Application objec t created
	* If you call the members with signal/slot connections across threads, you can't use the return values	* If you call the members with signal/slot connections across threads, you can't use the return values
	* If a function is called from the wrong thread and it has a return value -1 is returned	* If a function is called from the wrong thread and it has a return value -1 is returned

	* Investigate if this is really needed or if DBUS is threadsafe anyway	* Investigate if this is really needed or if D-Bus is threadsafe anyway
	*	*
	* For more details see <a	* For more details see <a
	* href="http://techbase.kde.org/Development/Architecture/KDE4/Starting_Oth er_Programs#KToolInvocation::startServiceByDesktopPath">techbase</a>.	* href="http://techbase.kde.org/Development/Architecture/KDE4/Starting_Oth er_Programs#KToolInvocation::startServiceByDesktopPath">techbase</a>.
	*	*
	*/	*/
	class KDECORE_EXPORT KToolInvocation : public QObject	class KDECORE_EXPORT KToolInvocation : public QObject
	{	{

	Q_OBJECT	Q_OBJECT
	private:	private:

	skipping to change at line 177	skipping to change at line 177
	* "" ( empty string ) is the default	* "" ( empty string ) is the default
	*	*
	* @since 4.1	* @since 4.1
	*/	*/
	static void invokeTerminal(const QString &command,	static void invokeTerminal(const QString &command,
	const QString& workdir = QString(),	const QString& workdir = QString(),
	const QByteArray &startup_id = "");	const QByteArray &startup_id = "");

	public:	public:
	/**	/**

	* Returns the DBus interface of the service launcher.	* Returns the D-Bus interface of the service launcher.
	* The returned object is owned by KApplication, do not delete it!	* The returned object is owned by KApplication, do not delete it!
	*/	*/
	static OrgKdeKLauncherInterface *klauncher();	static OrgKdeKLauncherInterface *klauncher();

	/**	/**
	* Starts a service based on the (translated) name of the service.	* Starts a service based on the (translated) name of the service.
	* E.g. "Web Browser"	* E.g. "Web Browser"
	*	*
	* @param _name the name of the service	* @param _name the name of the service
	* @param URL if not empty this URL is passed to the service	* @param URL if not empty this URL is passed to the service

	skipping to change at line 201	skipping to change at line 201
	* @param serviceName On success, serviceName contains the DCOP name	* @param serviceName On success, serviceName contains the DCOP name
	* under which this service is available. If empty, the service d oes	* under which this service is available. If empty, the service d oes
	* not provide DCOP services. If the pointer is 0 the argument	* not provide DCOP services. If the pointer is 0 the argument
	* will be ignored	* will be ignored
	* @param pid On success, the process id of the new service will be writt en	* @param pid On success, the process id of the new service will be writt en
	* here. If the pointer is 0, the argument will be ignored.	* here. If the pointer is 0, the argument will be ignored.
	* @param startup_id for app startup notification, "0" for none,	* @param startup_id for app startup notification, "0" for none,
	* "" ( empty string ) is the default	* "" ( empty string ) is the default
	* @param noWait if set, the function does not wait till the service is r unning.	* @param noWait if set, the function does not wait till the service is r unning.
	* @return an error code indicating success (== 0) or failure (> 0).	* @return an error code indicating success (== 0) or failure (> 0).

		* @deprecated Use startServiceByDesktopName or startServiceByDesktopPath
	*/	*/

	static int startServiceByName( const QString& _name, const QString &URL,	KDE_DEPRECATED static int startServiceByName( const QString& _name, const
	QString error=0, QString serviceName=0,	QString &URL,
	int *pid=0,	QString error=0, QString
	const QByteArray &startup_id = QByteArray(	serviceName=0, int *pid=0,
	), bool noWait = false );	const QByteArray &startup_i
		d = QByteArray(), bool noWait = false );

	/**	/**
	* Starts a service based on the (translated) name of the service.	* Starts a service based on the (translated) name of the service.
	* E.g. "Web Browser"	* E.g. "Web Browser"
	*	*
	* @param _name the name of the service	* @param _name the name of the service
	* @param URLs if not empty these URLs will be passed to the service	* @param URLs if not empty these URLs will be passed to the service
	* @param error On failure, @p error contains a description of the error	* @param error On failure, @p error contains a description of the error
	* that occurred. If the pointer is 0, the argument will be	* that occurred. If the pointer is 0, the argument will be
	* ignored	* ignored
	* @param serviceName On success, @p serviceName contains the DCOP name	* @param serviceName On success, @p serviceName contains the DCOP name
	* under which this service is available. If empty, the service d oes	* under which this service is available. If empty, the service d oes
	* not provide DCOP services. If the pointer is 0 the argument	* not provide DCOP services. If the pointer is 0 the argument
	* will be ignored	* will be ignored
	* @param pid On success, the process id of the new service will be writt en	* @param pid On success, the process id of the new service will be writt en
	* here. If the pointer is 0, the argument will be ignored.	* here. If the pointer is 0, the argument will be ignored.
	* @param startup_id for app startup notification, "0" for none,	* @param startup_id for app startup notification, "0" for none,
	* "" ( empty string ) is the default	* "" ( empty string ) is the default
	* @param noWait if set, the function does not wait till the service is r unning.	* @param noWait if set, the function does not wait till the service is r unning.
	* @return an error code indicating success (== 0) or failure (> 0).	* @return an error code indicating success (== 0) or failure (> 0).

		* @deprecated Use startServiceByDesktopName or startServiceByDesktopPath
	*/	*/

	static int startServiceByName( const QString& _name, const QStringList &U	KDE_DEPRECATED static int startServiceByName( const QString& _name, const
	RLs=QStringList(),	QStringList &URLs=QStringList(),
	QString error=0, QString serviceName=0, int *pid=0,	QString error=0, QString
	const QByteArray &startup_id = QByteArray(), bool noWait =	serviceName=0, int *pid=0,
	false );	const QByteArray &startup_i
		d = QByteArray(), bool noWait = false );

	/**	/**
	* Starts a service based on the desktop path of the service.	* Starts a service based on the desktop path of the service.
	* E.g. "Applications/konqueror.desktop" or "/home/user/bla/myfile.deskto p"	* E.g. "Applications/konqueror.desktop" or "/home/user/bla/myfile.deskto p"
	*	*
	* @param _name the path of the desktop file	* @param _name the path of the desktop file
	* @param URL if not empty this URL is passed to the service	* @param URL if not empty this URL is passed to the service
	* @param error On failure, @p error contains a description of the error	* @param error On failure, @p error contains a description of the error
	* that occurred. If the pointer is 0, the argument will be	* that occurred. If the pointer is 0, the argument will be
	* ignored	* ignored

End of changes. 9 change blocks.
	15 lines changed or deleted	19 lines changed or added

	kzip.h	kzip.h

	skipping to change at line 45	skipping to change at line 45
	* 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
	* @author Holger Schroeder <holger-kde@holgis.net>	* @author Holger Schroeder <holger-kde@holgis.net>
	*/	*/

	class KIO_EXPORT KZip : public KArchive	class KDECORE_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")
	*/	*/
	KZip( const QString& filename );	KZip( const QString& filename );


	skipping to change at line 168	skipping to change at line 168
	virtual void virtual_hook( int id, void* data );	virtual void virtual_hook( int id, void* data );

	private:	private:
	class KZipPrivate;	class KZipPrivate;
	KZipPrivate * const d;	KZipPrivate * const d;
	};	};

	/**	/**
	* A KZipFileEntry represents an file in a zip archive.	* A KZipFileEntry represents an file in a zip archive.
	*/	*/

	class KIO_EXPORT KZipFileEntry : public KArchiveFile	class KDECORE_EXPORT KZipFileEntry : public KArchiveFile
	{	{
	public:	public:
	/**	/**
	* Creates a new zip file entry. Do not call this, KZip takes care of i t.	* Creates a new zip file entry. Do not call this, KZip takes care of i t.
	*/	*/
	KZipFileEntry( KZip* zip, const QString& name, int access, int date,	KZipFileEntry( KZip* zip, const QString& name, int access, int date,
	const QString& user, const QString& group, const QString & symlink,	const QString& user, const QString& group, const QString & symlink,
	const QString& path, qint64 start, qint64 uncompressedSi ze,	const QString& path, qint64 start, qint64 uncompressedSi ze,
	int encoding, qint64 compressedSize);	int encoding, qint64 compressedSize);


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

	networking.h	networking.h

	skipping to change at line 73	skipping to change at line 73
	* Get the current networking status	* Get the current networking status
	* If the result is Unknown, the backend may be unconfigured or oth erwise in a state where	* If the result is Unknown, the backend may be unconfigured or oth erwise in a state where
	* it cannot report useful networking status @ref Solid::Networking ::Status.	* it cannot report useful networking status @ref Solid::Networking ::Status.
	*/	*/
	SOLID_EXPORT Status status();	SOLID_EXPORT Status status();

	/**	/**
	* Set a policy to manage the application's connect behaviour	* Set a policy to manage the application's connect behaviour
	* @param policy the new connection policy	* @param policy the new connection policy
	*/	*/

	void setConnectPolicy( ManagementPolicy policy );	SOLID_EXPORT void setConnectPolicy( ManagementPolicy policy );

	/**	/**
	* Retrieve a policy managing the application's connect behaviour	* Retrieve a policy managing the application's connect behaviour
	* @return the connection policy in use	* @return the connection policy in use
	*/	*/

	ManagementPolicy connectPolicy();	SOLID_EXPORT ManagementPolicy connectPolicy();

	/**	/**
	* Set a policy to manage the application's disconnect behaviour	* Set a policy to manage the application's disconnect behaviour
	* @param policy the new disconnection policy	* @param policy the new disconnection policy
	*/	*/

	void setDisconnectPolicy( ManagementPolicy policy );	SOLID_EXPORT void setDisconnectPolicy( ManagementPolicy policy );

	/**	/**
	* Retrieve a policy managing the application's disconnect behaviou r	* Retrieve a policy managing the application's disconnect behaviou r
	* @return the disconnection policy in use	* @return the disconnection policy in use
	*/	*/

	ManagementPolicy disconnectPolicy();	SOLID_EXPORT ManagementPolicy disconnectPolicy();

	/**	/**
	* This object emits signals, for use if your application requires notification	* This object emits signals, for use if your application requires notification
	* of changes to networking.	* of changes to networking.
	*/	*/

	class Notifier : public QObject	class SOLID_EXPORT Notifier : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Signals that the network status has changed	* Signals that the network status has changed
	* @param status the new status of the network status service	* @param status the new status of the network status service
	*/	*/
	void statusChanged( Solid::Networking::Status status );	void statusChanged( Solid::Networking::Status status );
	/**	/**
	* Signals that the system's network has become connected, so recei vers	* Signals that the system's network has become connected, so recei vers

	skipping to change at line 121	skipping to change at line 121
	*/	*/
	void shouldConnect();	void shouldConnect();
	/**	/**
	* Signals that the system's network has become disconnected,	* Signals that the system's network has become disconnected,
	* so receivers should adjust application state appropriately.	* so receivers should adjust application state appropriately.
	*	*
	* This signal is emitted according to the active disconnectPolicy.	* This signal is emitted according to the active disconnectPolicy.
	*/	*/
	void shouldDisconnect();	void shouldDisconnect();


		protected:
		Notifier();
	};	};

	SOLID_EXPORT Notifier *notifier();	SOLID_EXPORT Notifier *notifier();
	}	}

	} // Solid	} // Solid

	#endif	#endif

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

	smartinterface.h	smartinterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005 Hamish Rodda <rodda@kde.org>	Copyright (C) 2005 Hamish Rodda <rodda@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Library General Public

	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		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.

	You should have received a copy of the GNU Library General Public Licens e	You should have received a copy of the GNU Library General Public Licens e
	along with this library; see the file COPYING.LIB. If not, write to	along with this library; see the file COPYING.LIB. If not, write to
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.	Boston, MA 02110-1301, USA.

	skipping to change at line 111	skipping to change at line 112
	* // do stuff	* // do stuff
	* }	* }
	* \endcode	* \endcode
	*	*
	* \section smartiface_threadsafety Thread safety	* \section smartiface_threadsafety Thread safety
	* The smart interface is designed to be usable in multithreaded environmen ts.	* The smart interface is designed to be usable in multithreaded environmen ts.
	* If you use the interface from threads other than the main thread, you mu st	* If you use the interface from threads other than the main thread, you mu st
	* lock the smartMutex() whenever you are making a non-const call to a smar t object.	* lock the smartMutex() whenever you are making a non-const call to a smar t object.
	* This allows the text editor to guarantee that the objects will not chang e	* This allows the text editor to guarantee that the objects will not chang e
	* when it locks the mutex (for example, when performing layout or renderin g).	* when it locks the mutex (for example, when performing layout or renderin g).

		* The useRevision function has only effect for the thread calling it. It w
		ill
		* store the selected revision in a thread local storage to allow multiple
		threads
		* to have different views on the same document in respect to the smart int
		erface.
	*	*
	* \author Hamish Rodda \<rodda@kde.org\>	* \author Hamish Rodda \<rodda@kde.org\>
	*/	*/
	class KTEXTEDITOR_EXPORT SmartInterface	class KTEXTEDITOR_EXPORT SmartInterface
	{	{
	friend class Attribute;	friend class Attribute;

	public:	public:
	SmartInterface();	SmartInterface();
	virtual ~SmartInterface();	virtual ~SmartInterface();

	skipping to change at line 160	skipping to change at line 164
	*	*
	* \param clearOnReload set to true to enable clearing of the smart int erface on reload (the default).	* \param clearOnReload set to true to enable clearing of the smart int erface on reload (the default).
	*/	*/
	void setClearOnDocumentReload(bool clearOnReload);	void setClearOnDocumentReload(bool clearOnReload);

	//BEGIN New cursor methods	//BEGIN New cursor methods
	/**	/**
	* Retrieve a token representing the current version of the document. T his can	* Retrieve a token representing the current version of the document. T his can
	* be used later to create cursors and ranges as they would have been a t this revision.	* be used later to create cursors and ranges as they would have been a t this revision.
	*	*

	* Once you have finished with the token, release it with releaseRevisi on();	* Once you have finished with the token, release it with releaseRevisi on().
	*/	*/
	virtual int currentRevision() const = 0;	virtual int currentRevision() const = 0;

	/**	/**

	* Release a revision token provided by currentRevision(). You will no	* Release a revision token provided by currentRevision(). You will no
	longer be able to	longer be able to
	* create cursors and ranges agaist this revision.	* create cursors and ranges against this revision.
	*/	*/
	virtual void releaseRevision(int revision) const = 0;	virtual void releaseRevision(int revision) const = 0;

	/**	/**
	* Tell the smart interface to work against the given \a revision when creating cursors and	* Tell the smart interface to work against the given \a revision when creating cursors and

	* ranges.	* ranges. This has only an effect for the thread calling this function
		, as this property
		* is stored thread locally. This is not allowed to be called in the ma
		in gui thread.
		* If you call it in the main gui thread, fatal error will occur.
	*	*
	* \param revision the token representing a revision retrieved by curre ntRevision(), or -1 to	* \param revision the token representing a revision retrieved by curre ntRevision(), or -1 to
	* clear any previous setting and use the current docum ent revision.	* clear any previous setting and use the current docum ent revision.
	*/	*/
	virtual void useRevision(int revision) = 0;	virtual void useRevision(int revision) = 0;

	/**	/**
	* Clear any previous setting to use a specific revision.	* Clear any previous setting to use a specific revision.

		* Convenience wrapper for useRevision (-1).
	*/	*/
	void clearRevision();	void clearRevision();

	/**	/**
	* Translate the given \a cursor against the revision specified through useRevision(),	* Translate the given \a cursor against the revision specified through useRevision(),
	* using the given \a insertBehavior.	* using the given \a insertBehavior.
	*	*
	* If no revision is set, simply returns the cursor.	* If no revision is set, simply returns the cursor.
	*/	*/
	virtual KTextEditor::Cursor translateFromRevision(const KTextEditor::Cu rsor& cursor, KTextEditor::SmartCursor::InsertBehavior insertBehavior = KTe xtEditor::SmartCursor::StayOnInsert) const;	virtual KTextEditor::Cursor translateFromRevision(const KTextEditor::Cu rsor& cursor, KTextEditor::SmartCursor::InsertBehavior insertBehavior = KTe xtEditor::SmartCursor::StayOnInsert) const;

	skipping to change at line 404	skipping to change at line 411
	virtual const QList<SmartRange> viewHighlights(View view) const = 0;	virtual const QList<SmartRange> viewHighlights(View view) const = 0;

	/**	/**
	* Clear the highlight ranges from a View.	* Clear the highlight ranges from a View.
	*	*
	* \param view view to clear highlights from	* \param view view to clear highlights from
	*/	*/
	virtual void clearViewHighlights(View* view) = 0;	virtual void clearViewHighlights(View* view) = 0;
	//END	//END


	//BEGIN Action binding extension	//BEGIN Action binding extension - not implemented
	/**	/* not implemented
	* \}
	*
	* \name Action Binding
	*
	* The following functions allow for the processing of KAction%s bound
	to SmartRange%s.
	* \{
	*/
	/**
	* Register a SmartRange tree as providing bound actions,	* Register a SmartRange tree as providing bound actions,
	* and that they should interact with all of the views of a document.	* and that they should interact with all of the views of a document.
	*	*
	* \param topRange the top range of the tree to add	* \param topRange the top range of the tree to add
	*/	*/
	virtual void addActionsToDocument(SmartRange* topRange) = 0;	virtual void addActionsToDocument(SmartRange* topRange) = 0;


	/**	/* not implemented
	* Remove a SmartRange tree from providing bound actions	* Remove a SmartRange tree from providing bound actions
	* to all of the views of a document.	* to all of the views of a document.
	*	*
	* \param topRange the top range of the tree to remove	* \param topRange the top range of the tree to remove
	*/	*/
	virtual void removeActionsFromDocument(SmartRange* topRange) = 0;	virtual void removeActionsFromDocument(SmartRange* topRange) = 0;


	/**	/* not implemented
	* Return a list of SmartRange%s which are currently registered as	* Return a list of SmartRange%s which are currently registered as
	* providing bound actions to all of the views of a document.	* providing bound actions to all of the views of a document.
	*/	*/
	virtual const QList<SmartRange*> documentActions() const = 0;	virtual const QList<SmartRange*> documentActions() const = 0;


	/**	/* not implemented
	* Remove all bound SmartRange%s which provide actions to the document.	* Remove all bound SmartRange%s which provide actions to the document.
	*/	*/
	virtual void clearDocumentActions() = 0;	virtual void clearDocumentActions() = 0;


	/**	/* not implemented
	* Register a SmartRange tree as providing bound actions,	* Register a SmartRange tree as providing bound actions,
	* and that they should interact with the specified \p view.	* and that they should interact with the specified \p view.
	*	*
	* \param view view on which to use the actions	* \param view view on which to use the actions
	* \param topRange the top range of the tree to add	* \param topRange the top range of the tree to add
	*/	*/
	virtual void addActionsToView(View* view, SmartRange* topRange) = 0;	virtual void addActionsToView(View* view, SmartRange* topRange) = 0;


	/**	/* not implemented
	* Remove a SmartRange tree from providing bound actions	* Remove a SmartRange tree from providing bound actions
	* to the specified \p view.	* to the specified \p view.
	*	*
	* \note implementations should not take into account document-bound	* \note implementations should not take into account document-bound
	* action ranges when calling this function; it is intended solel y	* action ranges when calling this function; it is intended solel y
	* to be the counter of addActionsToView()	* to be the counter of addActionsToView()
	*	*
	* \param view view on which the actions were previously used	* \param view view on which the actions were previously used
	* \param topRange the top range of the tree to remove	* \param topRange the top range of the tree to remove
	*/	*/
	virtual void removeActionsFromView(View* view, SmartRange* topRange) = 0;	virtual void removeActionsFromView(View* view, SmartRange* topRange) = 0;


	/**	/* not implemented
	* Return a list of SmartRange%s which are currently registered as	* Return a list of SmartRange%s which are currently registered as
	* providing bound actions to the specified \p view.	* providing bound actions to the specified \p view.
	*	*
	* \note implementations should not take into account document-bound	* \note implementations should not take into account document-bound
	* action ranges when returning the list; it is intended solely	* action ranges when returning the list; it is intended solely
	* to show actions added via addActionsToView()	* to show actions added via addActionsToView()
	*	*
	* \param view view to query for the action list	* \param view view to query for the action list
	*/	*/
	virtual const QList<SmartRange> viewActions(View view) const = 0;	virtual const QList<SmartRange> viewActions(View view) const = 0;


	/**	/* not implemented
	* Remove all bound SmartRange%s which provide actions to the specified \p view.	* Remove all bound SmartRange%s which provide actions to the specified \p view.
	*	*
	* \param view view from which to remove actions	* \param view view from which to remove actions
	*/	*/
	virtual void clearViewActions(View* view) = 0;	virtual void clearViewActions(View* view) = 0;

	//!\}
	//END	//END

	protected:	protected:
	/**	/**
	* \internal	* \internal
	* Used to notify implementations that an Attribute has gained	* Used to notify implementations that an Attribute has gained
	* a dynamic component and needs to be included in mouse and/or cursor	* a dynamic component and needs to be included in mouse and/or cursor
	* tracking.	* tracking.
	*/	*/
	virtual void attributeDynamic(Attribute::Ptr a) = 0;	virtual void attributeDynamic(Attribute::Ptr a) = 0;

End of changes. 15 change blocks.
	25 lines changed or deleted	27 lines changed or added

	udsentry.h	udsentry.h

	skipping to change at line 184	skipping to change at line 184
	UDS_ACCESS_TIME = 11 \| UDS_TIME,	UDS_ACCESS_TIME = 11 \| UDS_TIME,
	/// The time the file was created	/// The time the file was created
	UDS_CREATION_TIME = 12 \| UDS_TIME,	UDS_CREATION_TIME = 12 \| UDS_TIME,
	/// File type, part of the mode returned by stat	/// File type, part of the mode returned by stat
	/// (for a link, this returns the file type of the pointed item )	/// (for a link, this returns the file type of the pointed item )
	/// check UDS_LINK_DEST to know if this is a link	/// check UDS_LINK_DEST to know if this is a link
	UDS_FILE_TYPE = 13 \| UDS_NUMBER,	UDS_FILE_TYPE = 13 \| UDS_NUMBER,
	/// Name of the file where the link points to	/// Name of the file where the link points to
	/// Allows to check for a symlink (don't use S_ISLNK !)	/// Allows to check for a symlink (don't use S_ISLNK !)
	UDS_LINK_DEST = 14 \| UDS_STRING,	UDS_LINK_DEST = 14 \| UDS_STRING,

	/// An alternative URL (If different from the caption)	/// An alternative URL (If different from the caption).
	/// WARNING: the use of UDS_URL is deprecated, since KDirModel	/// Can be used to mix different hierarchies.
	requires	///
	/// a hierarchical scheme in the urls used by kioslaves. Use UD	/// Use UDS_DISPLAY_NAME if you simply want to customize the us
	S_DISPLAY_NAME	er-visible filenames, or use
	/// if you simply want to customize the user-visible filenames,
	or use
	/// UDS_TARGET_URL if you want "links" to unrelated urls.	/// UDS_TARGET_URL if you want "links" to unrelated urls.
	UDS_URL = 15 \| UDS_STRING,	UDS_URL = 15 \| UDS_STRING,
	/// A mime type; the slave should set it if it's known.	/// A mime type; the slave should set it if it's known.
	UDS_MIME_TYPE = 16 \| UDS_STRING,	UDS_MIME_TYPE = 16 \| UDS_STRING,
	/// A mime type to be used for displaying only.	/// A mime type to be used for displaying only.
	/// But when 'running' the file, the mimetype is re-determined	/// But when 'running' the file, the mimetype is re-determined
	/// This is for special cases like symlinks in FTP; you probabl y don't want to use this one.	/// This is for special cases like symlinks in FTP; you probabl y don't want to use this one.
	UDS_GUESSED_MIME_TYPE = 17 \| UDS_STRING,	UDS_GUESSED_MIME_TYPE = 17 \| UDS_STRING,
	/// XML properties, e.g. for WebDAV	/// XML properties, e.g. for WebDAV
	UDS_XML_PROPERTIES = 18 \| UDS_STRING,	UDS_XML_PROPERTIES = 18 \| UDS_STRING,

	skipping to change at line 235	skipping to change at line 235
	/// is to provide the URI of the Nepomuk resource corresponding	/// is to provide the URI of the Nepomuk resource corresponding
	/// to a file in a search result	/// to a file in a search result
	/// Client applications should only provide annotations for	/// Client applications should only provide annotations for
	/// entries that provide this URI	/// entries that provide this URI
	///	///
	/// URIs need to be encoded using KUrl::url()	/// URIs need to be encoded using KUrl::url()
	///	///
	/// @since 4.4	/// @since 4.4
	UDS_NEPOMUK_URI = 25 \| UDS_STRING,	UDS_NEPOMUK_URI = 25 \| UDS_STRING,


		/// A comma-separated list of supplementary icon overlays
		/// which will be added to the list of overlays created
		/// by KFileItem.
		///
		/// @since 4.5
		UDS_ICON_OVERLAY_NAMES = 26 \| 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. 2 change blocks.
	7 lines changed or deleted	12 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.2.0"	#define PLASMA_VERSION_STRING "3.3.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 2	#define PLASMA_VERSION_MINOR 3
	/// @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

	videowidget.h	videowidget.h

	skipping to change at line 227	skipping to change at line 227

	Q_PRIVATE_SLOT(d, void playPause())	Q_PRIVATE_SLOT(d, void playPause())
	Q_PRIVATE_SLOT(d, void ticked(qint64 progress))	Q_PRIVATE_SLOT(d, void ticked(qint64 progress))
	Q_PRIVATE_SLOT(d, void totalTimeChanged(qint64 time))	Q_PRIVATE_SLOT(d, void totalTimeChanged(qint64 time))
	Q_PRIVATE_SLOT(d, void setPosition(int progress))	Q_PRIVATE_SLOT(d, void setPosition(int progress))
	Q_PRIVATE_SLOT(d, void setVolume(int value))	Q_PRIVATE_SLOT(d, void setVolume(int value))
	Q_PRIVATE_SLOT(d, void volumeChanged(qreal value))	Q_PRIVATE_SLOT(d, void volumeChanged(qreal value))
	Q_PRIVATE_SLOT(d, void showOpenFileDialog())	Q_PRIVATE_SLOT(d, void showOpenFileDialog())
	Q_PRIVATE_SLOT(d, void stateChanged(Phonon::State newState, Phonon::Sta te oldState))	Q_PRIVATE_SLOT(d, void stateChanged(Phonon::State newState, Phonon::Sta te oldState))
	Q_PRIVATE_SLOT(d, void hideControlWidget())	Q_PRIVATE_SLOT(d, void hideControlWidget())

	Q_PRIVATE_SLOT(d, void slidingCompleted(QGraphicsItem *item))	Q_PRIVATE_SLOT(d, void slidingCompleted())
	};	};

	} // namespace Plasma	} // namespace Plasma

	#endif // multiple inclusion guard	#endif // multiple inclusion guard

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