kde-libs: headers diff between 4.7.0 and 4.7.1 versions

	declarativewidget.h	declarativewidget.h

	skipping to change at line 132	skipping to change at line 132
	* Emitted when the parsing and execution of the QML file is terminated	* Emitted when the parsing and execution of the QML file is terminated
	*/	*/
	void finished();	void finished();

	private:	private:
	friend class DeclarativeWidgetPrivate;	friend class DeclarativeWidgetPrivate;
	DeclarativeWidgetPrivate * const d;	DeclarativeWidgetPrivate * const d;

	Q_PRIVATE_SLOT(d, void finishExecute())	Q_PRIVATE_SLOT(d, void finishExecute())
	Q_PRIVATE_SLOT(d, void scheduleExecutionEnd())	Q_PRIVATE_SLOT(d, void scheduleExecutionEnd())

		Q_PRIVATE_SLOT(d, void minimumWidthChanged())
		Q_PRIVATE_SLOT(d, void minimumHeightChanged())
	};	};

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

	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.7.00 (4.7.0)"	#define KDE_VERSION_STRING "4.7.1 (4.7.1)"

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

	#define KDE_VERSION_RELEASE 00	#define KDE_VERSION_RELEASE 1

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


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

	kfinddialog.h	kfinddialog.h

	skipping to change at line 60	skipping to change at line 60
	* \code	* \code
	* if ( m_findDia )	* if ( m_findDia )
	* KWindowSystem::activateWindow( m_findDia->winId() );	* KWindowSystem::activateWindow( m_findDia->winId() );
	* else	* else
	* {	* {
	* m_findDia = new KFindDialog(false,...);	* m_findDia = new KFindDialog(false,...);
	* connect( m_findDia, SIGNAL(okClicked()), this, SLOT(findTextNext()) );	* connect( m_findDia, SIGNAL(okClicked()), this, SLOT(findTextNext()) );
	* }	* }
	* \endcode	* \endcode
	* Don't forget to delete and reset m_findDia when closed.	* Don't forget to delete and reset m_findDia when closed.

	* (But do NOT delete your KFind object at that point, it's needed for "Fin	* (But do NOT delete your KFind object at that point, it's needed for "Fin
	d Next")	d Next".)
		*
		* @note If using a non-modal find dialog, in the slot connected to the okC
		licked()
		* signal you need to check if a regular expression has been entered and if
		so,
		* whether it is valid. Otherwise, if it is invalid, the user will see an e
		rror
		* message followed unexpectedly by a search taking place.
		* \code
		* if ( (m_findDia->options() & KFind::RegularExpression)
		* && !QRegExp(m_findDia->pattern()).isValid() )
		* {
		* // Don't attempt to search
		* }
		* \endcode
	*	*
	* To use your own extensions: see findExtension().	* To use your own extensions: see findExtension().
	*	*
	* \image html kfinddialog.png "KDE Find Dialog"	* \image html kfinddialog.png "KDE Find Dialog"
	*/	*/
	class KDEUI_EXPORT KFindDialog:	class KDEUI_EXPORT KFindDialog:
	public KDialog	public KDialog
	{	{
	Q_OBJECT	Q_OBJECT


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

	kkeyserver.h	kkeyserver.h

	skipping to change at line 56	skipping to change at line 56
	* @return the user-readable string	* @return the user-readable string
	*/	*/
	KDEUI_EXPORT QString modToStringUser( uint mod );	KDEUI_EXPORT QString modToStringUser( uint mod );

	/**	/**
	* Converts the modifier given as user-readable string	* Converts the modifier given as user-readable string
	* to KKey::ModFlag modifier, or 0.	* to KKey::ModFlag modifier, or 0.
	* @internal	* @internal
	*/	*/
	KDEUI_EXPORT uint stringUserToMod( const QString& mod );	KDEUI_EXPORT uint stringUserToMod( const QString& mod );


		/**
		* Test if the shift modifier should be recorded for a given key.
		*
		* For example, if shift+5 produces '%' Qt wants ctrl+shift+5 recorde
		d as ctrl+% and
		* in that case this function would return false.
		*
		* @since 4.7.1
		*/
		KDEUI_EXPORT bool isShiftAsModifierAllowed( int keyQt );

	} // namespace KKeyServer	} // namespace KKeyServer

	#endif // !_KKEYSERVER_H	#endif // !_KKEYSERVER_H

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

	ksystemtimezone.h	ksystemtimezone.h

	skipping to change at line 240	skipping to change at line 240
	static bool isSimulated();	static bool isSimulated();

	/**	/**
	* Returns the location of the system time zone zoneinfo database.	* Returns the location of the system time zone zoneinfo database.
	*	*
	* @return path of directory containing the zoneinfo database	* @return path of directory containing the zoneinfo database
	*/	*/
	static QString zoneinfoDir();	static QString zoneinfoDir();

	/**	/**

	* Return whether the KDE time zone daemon, ktimezoned, is available. I	* Return whether the KDE time zone daemon, ktimezoned, appears to be
	f	* available and working. If not, UTC will be the only recognized time
	* not, UTC will be the only recognized time zone.	* zone.
	* @since 4.6	* @since 4.6
	*/	*/
	static bool isTimeZoneDaemonAvailable();	static bool isTimeZoneDaemonAvailable();

	private Q_SLOTS:	private Q_SLOTS:
	// Connected to D-Bus signals	// Connected to D-Bus signals
	void configChanged();	void configChanged();
	void zonetabChanged(const QString &zonetab);	void zonetabChanged(const QString &zonetab);
	void zoneDefinitionChanged(const QString &zone);	void zoneDefinitionChanged(const QString &zone);


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

	kurl.h	kurl.h

	skipping to change at line 171	skipping to change at line 171
	* list of strings.	* list of strings.
	* @param list the list containing the URLs as strings	* @param list the list containing the URLs as strings
	*/	*/
	List(const QStringList &list);	List(const QStringList &list);
	/**	/**
	* Creates a list that contains the URLs from the given QList<KUrl>.	* Creates a list that contains the URLs from the given QList<KUrl>.
	* @param list the list containing the URLs	* @param list the list containing the URLs
	*/	*/
	List(const QList<KUrl> &list);	List(const QList<KUrl> &list);
	/**	/**

		* Creates a list that contains the URLs from the given QList<KUrl>.
		* @param list the list containing the URLs
		* @since 4.7
		*/
		List(const QList<QUrl> &list);
		/**
	* Converts the URLs of this list to a list of strings.	* Converts the URLs of this list to a list of strings.
	* @return the list of strings	* @return the list of strings
	*/	*/
	QStringList toStringList() const;	QStringList toStringList() const;

	/**	/**
	* Converts the URLs of this list to a list of strings.	* Converts the URLs of this list to a list of strings.
	*	*
	* @param trailing use to add or remove a trailing slash to/from the path.	* @param trailing use to add or remove a trailing slash to/from the path.
	*	*

	skipping to change at line 194	skipping to change at line 200
	*/	*/
	QStringList toStringList(KUrl::AdjustPathOption trailing) const;	QStringList toStringList(KUrl::AdjustPathOption trailing) const;

	/**	/**
	* Converts this KUrl::List to a QVariant, this allows to use KUrl::L ist	* Converts this KUrl::List to a QVariant, this allows to use KUrl::L ist
	* in QVariant() constructor	* in QVariant() constructor
	*/	*/
	operator QVariant() const;	operator QVariant() const;

	/**	/**

		* Converts this KUrl::List into a list of QUrl instances.
		* @since 4.7
		*/
		operator QList<QUrl>() const;

		/**
	* Adds URLs data into the given QMimeData.	* Adds URLs data into the given QMimeData.
	*	*
	* By default, populateMimeData also exports the URLs as plain text, for e.g. dropping	* By default, populateMimeData also exports the URLs as plain text, for e.g. dropping
	* onto a text editor.	* onto a text editor.
	* But in some cases this might not be wanted, e.g. if adding other m ime data	* But in some cases this might not be wanted, e.g. if adding other m ime data
	* which provides better plain text data.	* which provides better plain text data.
	*	*
	* WARNING: do not call this method multiple times on the same mimeda ta object,	* WARNING: do not call this method multiple times on the same mimeda ta object,
	* you can add urls only once. But you can add other things, e.g. ima ges, XML...	* you can add urls only once. But you can add other things, e.g. ima ges, XML...
	*	*

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

	kwindowsystem.h	kwindowsystem.h

	skipping to change at line 623	skipping to change at line 623
	* The window changed somehow.	* The window changed somehow.
	* @param id the id of the window	* @param id the id of the window
	*/	*/
	void windowChanged(WId id);	void windowChanged(WId id);

	/**	/**
	* The state of showing the desktop has changed.	* The state of showing the desktop has changed.
	*/	*/
	void showingDesktopChanged( bool showing );	void showingDesktopChanged( bool showing );


		/**
		* Compositing was enabled or disabled.
		*
		* Note that this signal may be emitted before any compositing plugins
		* have been initialized in the window manager.
		*
		* If you need to check if a specific compositing plugin such as the
		* blur effect is enabled, you should track that separately rather
		* than test for it in a slot connected to this signal.
		*
		* @since 4.7.1
		*/
		void compositingChanged( bool enabled );

	protected:	protected:
	virtual void connectNotify( const char* signal );	virtual void connectNotify( const char* signal );

	private:	private:
	friend class KWindowSystemStaticContainer;	friend class KWindowSystemStaticContainer;

	KWindowSystem() {}	KWindowSystem() {}

	enum { INFO_BASIC=1, // desktop info, not per-window	enum { INFO_BASIC=1, // desktop info, not per-window
	INFO_WINDOWS=2 }; // also per-window info	INFO_WINDOWS=2 }; // also per-window info

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

	lineedit.h	lineedit.h

	skipping to change at line 136	skipping to change at line 136
	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
	*/	*/
	void textChanged(const QString &text);	void textChanged(const QString &text);

		/**
		* Emitted when the widget receives or loses focus
		* @since 4.7
		*/
		void focusChanged(bool focused);

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

	LineEditPrivate *const d;	LineEditPrivate *const d;
	};	};

	} // namespace Plasma	} // namespace Plasma

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

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

	scheduler.h	scheduler.h

	skipping to change at line 66	skipping to change at line 66
	* <h3>2. Scheduled</h3>	* <h3>2. Scheduled</h3>
	* If you create a lot of jobs, you might want not want to have a	* If you create a lot of jobs, you might want not want to have a
	* slave for each job. If you schedule a job, a maximum number	* slave for each job. If you schedule a job, a maximum number
	* of slaves will be created. When more jobs arrive, they will be	* of slaves will be created. When more jobs arrive, they will be
	* queued. When a slave is finished with a job, it will be assigned	* queued. When a slave is finished with a job, it will be assigned
	* a job from the queue.	* a job from the queue.
	*	*
	* Example:	* Example:
	* \code	* \code
	* TransferJob *job = KIO::get(KUrl("http://www.kde.org"));	* TransferJob *job = KIO::get(KUrl("http://www.kde.org"));

	* KIO::Scheduler::scheduleJob(job);	* KIO::Scheduler::setJobPriority(job, 1);
	* \endcode	* \endcode
	*	*
	* <h3>3. Connection Oriented</h3>	* <h3>3. Connection Oriented</h3>
	* For some operations it is important that multiple jobs use	* For some operations it is important that multiple jobs use
	* the same connection. This can only be ensured if all these jobs	* the same connection. This can only be ensured if all these jobs
	* use the same slave.	* use the same slave.
	*	*
	* You can ask the scheduler to open a slave for connection oriented	* You can ask the scheduler to open a slave for connection oriented
	* operations. You can then use the scheduler to assign jobs to this	* operations. You can then use the scheduler to assign jobs to this
	* slave. The jobs will be queued and the slave will handle these jobs	* slave. The jobs will be queued and the slave will handle these jobs

	skipping to change at line 117	skipping to change at line 117
	**/	**/

	class KIO_EXPORT Scheduler : public QObject	class KIO_EXPORT Scheduler : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_CLASSINFO("D-Bus Interface", "org.kde.KIO.Scheduler")	Q_CLASSINFO("D-Bus Interface", "org.kde.KIO.Scheduler")
	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 setJobPriority.
	* @param job the job to register	* @param job the job to register
	*/	*/
	static void doJob(SimpleJob *job);	static void doJob(SimpleJob *job);

	/**	/**

	* Schedules @p job scheduled for later	* Schedules @p job scheduled for later execution.
	* execution. This just sets the job's priority to 1 now.	* This method is deprecated and just sets the job's priority to 1.
		It is
		* recommended to replace calls to scheduleJob(job) with setJobPrio
		rity(job, 1).
	* @param job the job to schedule	* @param job the job to schedule
	*/	*/
	#ifndef KDE_NO_DEPRECATED	#ifndef KDE_NO_DEPRECATED
	KDE_DEPRECATED static void scheduleJob(SimpleJob *job);	KDE_DEPRECATED static void scheduleJob(SimpleJob *job);
	#endif	#endif

	/**	/**
	* Changes the priority of @p job; jobs of the same priority run in the order in which	* Changes the priority of @p job; jobs of the same priority run in the order in which
	* they were created. Jobs of lower numeric priority always run bef ore any	* they were created. Jobs of lower numeric priority always run bef ore any
	* waiting jobs of higher numeric priority. The range of priority i s -10 to 10,	* waiting jobs of higher numeric priority. The range of priority i s -10 to 10,

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

	sessionconfiginterface.h	sessionconfiginterface.h

	skipping to change at line 189	skipping to change at line 189

	/**	/**
	* Virtual destructor.	* Virtual destructor.
	*/	*/
	virtual ~ParameterizedSessionConfigInterface();	virtual ~ParameterizedSessionConfigInterface();

	public:	public:

	/**	/**
	* Flags for session restore.	* Flags for session restore.

		* These flags allow to skip some parts of the configuration from resto ration.
	*/	*/
	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,
		SkipFolding = 1 << 4
	};	};

	/**	/**
	* 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
	* \p parameters.	* \p parameters.
	*	*
	* 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...

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

	theme.h	theme.h

	skipping to change at line 81	skipping to change at line 81
	ButtonHoverColor = 64, /** color for hover effect on buttons */	ButtonHoverColor = 64, /** color for hover effect on buttons */
	ButtonFocusColor = 128, /** color for focus effect on buttons * /	ButtonFocusColor = 128, /** color for focus effect on buttons * /
	ViewTextColor = 256, /** text color for views */	ViewTextColor = 256, /** text color for views */
	ViewBackgroundColor = 512, /** background color for views */	ViewBackgroundColor = 512, /** background color for views */
	ViewHoverColor = 1024, /** color for hover effect on view */	ViewHoverColor = 1024, /** color for hover effect on view */
	ViewFocusColor = 2048 /** color for focus effect on view */	ViewFocusColor = 2048 /** color for focus effect on view */
	};	};

	enum FontRole {	enum FontRole {
	DefaultFont = 0, /*< The standard text font /	DefaultFont = 0, /*< The standard text font /

	DesktopFont /*< The standard text font /	DesktopFont, /*< The standard text font /
		SmallestFont /*< The smallest readable font /
	};	};

	/**	/**
	* Singleton pattern accessor	* Singleton pattern accessor
	**/	**/
	static Theme *defaultTheme();	static Theme *defaultTheme();

	/**	/**
	* Default constructor. Usually you want to use the singleton inste ad.	* Default constructor. Usually you want to use the singleton inste ad.
	* @see defaultTheme	* @see defaultTheme

	skipping to change at line 399	skipping to change at line 400
	* Notifies the Theme object that the theme settings have changed	* Notifies the Theme object that the theme settings have changed
	* and should be read from the config file	* and should be read from the config file
	**/	**/
	void settingsChanged();	void settingsChanged();

	private:	private:
	friend class ThemeSingleton;	friend class ThemeSingleton;
	friend class ThemePrivate;	friend class ThemePrivate;
	ThemePrivate *const d;	ThemePrivate *const d;


	Q_PRIVATE_SLOT(d, void compositingChanged())	Q_PRIVATE_SLOT(d, void compositingChanged(bool))
	Q_PRIVATE_SLOT(d, void colorsChanged())	Q_PRIVATE_SLOT(d, void colorsChanged())
	Q_PRIVATE_SLOT(d, void blurBehindChanged(bool blur))	Q_PRIVATE_SLOT(d, void blurBehindChanged(bool blur))
	Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &))	Q_PRIVATE_SLOT(d, void settingsFileChanged(const QString &))
	Q_PRIVATE_SLOT(d, void scheduledCacheUpdate())	Q_PRIVATE_SLOT(d, void scheduledCacheUpdate())
	Q_PRIVATE_SLOT(d, void onAppExitCleanup())	Q_PRIVATE_SLOT(d, void onAppExitCleanup())
	};	};

	} // Plasma namespace	} // Plasma namespace

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

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

	tooltipcontent.h	tooltipcontent.h

	skipping to change at line 125	skipping to change at line 125
	/**	/**
	* An icon to display	* An icon to display
	*/	*/
	QPixmap image() const;	QPixmap image() const;

	/**	/**
	* Sets the ID of the window to show a preview for.	* Sets the ID of the window to show a preview for.
	* @deprecated	* @deprecated
	* @see setWindowsToPreview	* @see setWindowsToPreview
	*/	*/

	void setWindowToPreview(WId id);	KDE_DEPRECATED void setWindowToPreview(WId id);

	/**	/**
	* Id of a window if you want to show a preview	* Id of a window if you want to show a preview
	* @deprecated	* @deprecated
	* @see windowsToPreview	* @see windowsToPreview
	*/	*/

	WId windowToPreview() const;	KDE_DEPRECATED WId windowToPreview() const;

	/**	/**
	* Sets the IDS of the windows to show a preview for	* Sets the IDS of the windows to show a preview for
	* @since 4.3	* @since 4.3
	*/	*/
	void setWindowsToPreview(const QList<WId> &ids);	void setWindowsToPreview(const QList<WId> &ids);

	/**	/**
	* Ids of a windows if you want to show a preview	* Ids of a windows if you want to show a preview
	* @since 4.3	* @since 4.3

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 58	skipping to change at line 58
	class PLASMA_EXPORT VideoWidget : public QGraphicsProxyWidget	class PLASMA_EXPORT VideoWidget : public QGraphicsProxyWidget
	{	{
	Q_OBJECT	Q_OBJECT

	Q_PROPERTY(QString url READ url WRITE setUrl)	Q_PROPERTY(QString url READ url WRITE setUrl)
	Q_PROPERTY(qint64 currentTime READ currentTime)	Q_PROPERTY(qint64 currentTime READ currentTime)
	Q_PROPERTY(qint64 totalTime READ totalTime)	Q_PROPERTY(qint64 totalTime READ totalTime)
	Q_PROPERTY(qint64 remainingTime READ remainingTime)	Q_PROPERTY(qint64 remainingTime READ remainingTime)
	Q_PROPERTY(Controls usedControls READ usedControls WRITE setUsedControl s)	Q_PROPERTY(Controls usedControls READ usedControls WRITE setUsedControl s)
	Q_PROPERTY(bool controlsVisible READ controlsVisible WRITE setControlsV isible)	Q_PROPERTY(bool controlsVisible READ controlsVisible WRITE setControlsV isible)

		Q_PROPERTY(qint32 tickInterval READ tickInterval WRITE setTickInterval)
	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)	Q_PROPERTY(QString styleSheet READ styleSheet WRITE setStyleSheet)
	Q_ENUMS(Control)	Q_ENUMS(Control)

	public:	public:
	enum Control {	enum Control {
	NoControls = 0,	NoControls = 0,
	Play = 1,	Play = 1,
	Pause = 2,	Pause = 2,
	Stop = 4,	Stop = 4,
	PlayPause = 8,	PlayPause = 8,

	skipping to change at line 146	skipping to change at line 147
	* @see setUsedControls()	* @see setUsedControls()
	*/	*/
	void setControlsVisible(bool visible);	void setControlsVisible(bool visible);

	/**	/**
	* @return true if the controls widget is being shown right now	* @return true if the controls widget is being shown right now
	*/	*/
	bool controlsVisible() const;	bool controlsVisible() const;

	/**	/**

		* @param interval milliseconds the tick signal will be emitted
		* @since 4.7.1
		*/
		void setTickInterval(qint64 interval);

		/**
		* @return milliseconds the tick signal will be emitted
		* @see tickInterval()
		* @since 4.7.1
		*/
		qint64 tickInterval() const;

		/**
	* Sets the stylesheet used to control the visual display of this Video Widget	* Sets the stylesheet used to control the visual display of this Video Widget
	*	*
	* @param stylesheet a CSS string	* @param stylesheet a CSS string
	*/	*/
	void setStyleSheet(const QString &stylesheet);	void setStyleSheet(const QString &stylesheet);

	/**	/**
	* @return the stylesheet currently used with this widget	* @return the stylesheet currently used with this widget
	*/	*/
	QString styleSheet();	QString styleSheet();

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

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/

	datacontainer.h	datacontainer.h

	skipping to change at line 60	skipping to change at line 60
	* DataEngine::addSource()), you normally just need to listen to the	* DataEngine::addSource()), you normally just need to listen to the
	* updateRequested() signal (as well as any other methods you might have of	* updateRequested() signal (as well as any other methods you might have of
	* being notified of new data) and call setData() to actually update the da ta.	* being notified of new data) and call setData() to actually update the da ta.
	* Then you need to either trigger the scheduleSourcesUpdated signal of the	* Then you need to either trigger the scheduleSourcesUpdated signal of the
	* parent DataEngine or call checkForUpdate() on the DataContainer.	* parent DataEngine or call checkForUpdate() on the DataContainer.
	*	*
	* You also need to set a suitable name for the source with setObjectName() .	* You also need to set a suitable name for the source with setObjectName() .
	* See DataEngine::addSource() for more information.	* See DataEngine::addSource() for more information.
	*	*
	* Note that there is normally no need to subclass DataContainer, except as	* Note that there is normally no need to subclass DataContainer, except as

	* a way of encapsulating the data retreival for a source, since all notifi cations	* a way of encapsulating the data retrieval for a source, since all notifi cations
	* are done via signals rather than virtual methods.	* are done via signals rather than virtual methods.
	**/	**/
	class PLASMA_EXPORT DataContainer : public QObject	class PLASMA_EXPORT DataContainer : public QObject
	{	{
	friend class DataEngine;	friend class DataEngine;
	friend class DataEnginePrivate;	friend class DataEnginePrivate;
	Q_OBJECT	Q_OBJECT

	public:	public:
	/**	/**

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

	kfontdialog.h	kfontdialog.h

	skipping to change at line 66	skipping to change at line 66
	class KDEUI_EXPORT KFontDialog : public KDialog {	class KDEUI_EXPORT KFontDialog : public KDialog {
	Q_OBJECT	Q_OBJECT

	public:	public:
	/**	/**
	* Constructs a font selection dialog.	* Constructs a font selection dialog.
	*	*
	* @param parent The parent widget of the dialog, if any.	* @param parent The parent widget of the dialog, if any.
	* @param flags Defines how the font chooser is displayed.	* @param flags Defines how the font chooser is displayed.
	* @see KFontChooser::DisplayFlags	* @see KFontChooser::DisplayFlags

	* @param onlyFixed only display fonts which have fixed-width
	* character sizes.
	* @param fontlist a list of fonts to display, in XLFD format. If	* @param fontlist a list of fonts to display, in XLFD format. If
	* no list is formatted, the internal KDE font list is used.	* no list is formatted, the internal KDE font list is used.
	* If that has not been created, X is queried, and all fonts	* If that has not been created, X is queried, and all fonts
	* available on the system are displayed.	* available on the system are displayed.

	* @param makeFrame Draws a frame with titles around the contents.
	* @param diff Display the difference version dialog. See getFontDiff().
	* @param sizeIsRelativeState If not zero the widget will show a	* @param sizeIsRelativeState If not zero the widget will show a
	* checkbox where the user may choose whether the font size	* checkbox where the user may choose whether the font size
	* is to be interpreted as relative size.	* is to be interpreted as relative size.
	* Initial state of this checkbox will be set according to	* Initial state of this checkbox will be set according to
	* *sizeIsRelativeState, user choice may be retrieved by	* *sizeIsRelativeState, user choice may be retrieved by
	* calling sizeIsRelative().	* calling sizeIsRelative().
	*	*
	*/	*/
	explicit KFontDialog( QWidget *parent = 0,	explicit KFontDialog( QWidget *parent = 0,
	const KFontChooser::DisplayFlags& flags =	const KFontChooser::DisplayFlags& flags =

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

	kpastetextaction.h	kpastetextaction.h

	skipping to change at line 54	skipping to change at line 54
	public:	public:
	/**	/**
	* Constructs an action with the specified parent.	* Constructs an action with the specified parent.
	*	*
	* @param parent The parent of this action.	* @param parent The parent of this action.
	*/	*/
	explicit KPasteTextAction(QObject *parent);	explicit KPasteTextAction(QObject *parent);

	/**	/**
	* Constructs an action with text; a shortcut may be specified by	* Constructs an action with text; a shortcut may be specified by

	* the ampersand character (e.g. "&Option" creates a shortcut with key \e O )	* the ampersand character (e.g. \"&Option\" creates a shortcut wit h key \e O )
	*	*
	* This is the most common KAction used when you do not have a	* This is the most common KAction used when you do not have a
	* corresponding icon (note that it won't appear in the current version	* corresponding icon (note that it won't appear in the current version
	* of the "Edit ToolBar" dialog, because an action needs an icon to be	* of the "Edit ToolBar" dialog, because an action needs an icon to be
	* plugged in a toolbar...).	* plugged in a toolbar...).
	*	*
	* @param text The text that will be displayed.	* @param text The text that will be displayed.
	* @param parent The parent of this action.	* @param parent The parent of this action.
	*/	*/
	KPasteTextAction(const QString &text, QObject *parent);	KPasteTextAction(const QString &text, QObject *parent);

	/**	/**
	* Constructs an action with text and an icon; a shortcut may be specif ied by	* Constructs an action with text and an icon; a shortcut may be specif ied by

	* the ampersand character (e.g. "&Option" creates a shortcut with key \e O )	* the ampersand character (e.g. \"&Option\" creates a shortcut wit h key \e O )
	*	*
	* This is the other common KAction used. Use it when you	* This is the other common KAction used. Use it when you
	* \e do have a corresponding icon.	* \e do have a corresponding icon.
	*	*
	* @param icon The icon to display.	* @param icon The icon to display.
	* @param text The text that will be displayed.	* @param text The text that will be displayed.
	* @param parent The parent of this action.	* @param parent The parent of this action.
	*/	*/
	KPasteTextAction(const KIcon &icon, const QString &text, QObject *paren t);	KPasteTextAction(const KIcon &icon, const QString &text, QObject *paren t);


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

	krecentfilesaction.h	krecentfilesaction.h

	skipping to change at line 62	skipping to change at line 62
	public:	public:
	/**	/**
	* Constructs an action with the specified parent.	* Constructs an action with the specified parent.
	*	*
	* @param parent The parent of this action.	* @param parent The parent of this action.
	*/	*/
	explicit KRecentFilesAction(QObject *parent);	explicit KRecentFilesAction(QObject *parent);

	/**	/**
	* Constructs an action with text; a shortcut may be specified by	* Constructs an action with text; a shortcut may be specified by

	* the ampersand character (e.g. "&Option" creates a shortcut with key \e O )	* the ampersand character (e.g. \"&Option\" creates a shortcut wit h key \e O )
	*	*
	* This is the most common KAction used when you do not have a	* This is the most common KAction used when you do not have a
	* corresponding icon (note that it won't appear in the current version	* corresponding icon (note that it won't appear in the current version
	* of the "Edit ToolBar" dialog, because an action needs an icon to be	* of the "Edit ToolBar" dialog, because an action needs an icon to be
	* plugged in a toolbar...).	* plugged in a toolbar...).
	*	*
	* @param text The text that will be displayed.	* @param text The text that will be displayed.
	* @param parent The parent of this action.	* @param parent The parent of this action.
	*/	*/
	KRecentFilesAction(const QString &text, QObject *parent);	KRecentFilesAction(const QString &text, QObject *parent);

	/**	/**
	* Constructs an action with text and an icon; a shortcut may be specif ied by	* Constructs an action with text and an icon; a shortcut may be specif ied by

	* the ampersand character (e.g. "&Option" creates a shortcut with key \e O )	* the ampersand character (e.g. \"&Option\" creates a shortcut wit h key \e O )
	*	*
	* This is the other common KAction used. Use it when you	* This is the other common KAction used. Use it when you
	* \e do have a corresponding icon.	* \e do have a corresponding icon.
	*	*
	* @param icon The icon to display.	* @param icon The icon to display.
	* @param text The text that will be displayed.	* @param text The text that will be displayed.
	* @param parent The parent of this action.	* @param parent The parent of this action.
	*/	*/
	KRecentFilesAction(const KIcon &icon, const QString &text, QObject *par ent);	KRecentFilesAction(const KIcon &icon, const QString &text, QObject *par ent);


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

	kselectaction.h	kselectaction.h

	skipping to change at line 75	skipping to change at line 75
	public:	public:
	/**	/**
	* Constructs a selection action with the specified parent.	* Constructs a selection action with the specified parent.
	*	*
	* @param parent The action's parent object.	* @param parent The action's parent object.
	*/	*/
	explicit KSelectAction(QObject *parent);	explicit KSelectAction(QObject *parent);

	/**	/**
	* Constructs a selection action with text; a shortcut may be specified by	* Constructs a selection action with text; a shortcut may be specified by

	* the ampersand character (e.g. "&Option" creates a shortcut with key \e O )	* the ampersand character (e.g. \"&Option\" creates a shortcut wit h key \e O )
	*	*
	* This is the most common KSelectAction used when you do not have a	* This is the most common KSelectAction used when you do not have a
	* corresponding icon (note that it won't appear in the current version	* corresponding icon (note that it won't appear in the current version
	* of the "Edit ToolBar" dialog, because an action needs an icon to be	* of the "Edit ToolBar" dialog, because an action needs an icon to be
	* plugged in a toolbar...).	* plugged in a toolbar...).
	*	*
	* @param text The text that will be displayed.	* @param text The text that will be displayed.
	* @param parent The action's parent object.	* @param parent The action's parent object.
	*/	*/
	KSelectAction(const QString& text, QObject *parent);	KSelectAction(const QString& text, QObject *parent);

	/**	/**
	* Constructs a selection action with text and an icon; a shortcut may be specified by	* Constructs a selection action with text and an icon; a shortcut may be specified by

	* the ampersand character (e.g. "&Option" creates a shortcut with key \e O )	* the ampersand character (e.g. \"&Option\" creates a shortcut wit h key \e O )
	*	*
	* This is the other common KSelectAction used. Use it when you	* This is the other common KSelectAction used. Use it when you
	* \e do have a corresponding icon.	* \e do have a corresponding icon.
	*	*
	* @param icon The icon to display.	* @param icon The icon to display.
	* @param text The text that will be displayed.	* @param text The text that will be displayed.
	* @param parent The action's parent object.	* @param parent The action's parent object.
	*/	*/
	KSelectAction(const KIcon& icon, const QString& text, QObject *parent);	KSelectAction(const KIcon& icon, const QString& text, QObject *parent);


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

	netaccess.h	netaccess.h

	skipping to change at line 258	skipping to change at line 258
	* @param source if true, we want to read from that URL.	* @param source if true, we want to read from that URL.
	* If false, we want to write to it.	* If false, we want to write to it.
	* IMPORTANT: see documentation for KIO::stat for more details about th is.	* IMPORTANT: see documentation for KIO::stat for more details about th is.
	* @param window main window associated with this job. This is used to	* @param window main window associated with this job. This is used to
	* automatically cache and discard authentication informa tion	* automatically cache and discard authentication informa tion
	* as needed. If NULL, authentication information will be	* as needed. If NULL, authentication information will be
	* cached only for a short duration after which the user will	* cached only for a short duration after which the user will
	* again be prompted for passwords as needed.	* again be prompted for passwords as needed.
	* @return true if the URL exists and we can do the operation specified by	* @return true if the URL exists and we can do the operation specified by
	* @p source, false otherwise	* @p source, false otherwise

		*
		* @deprecated use the StatSide enum instead of the bool source
	*/	*/
	#ifndef KDE_NO_DEPRECATED	#ifndef KDE_NO_DEPRECATED
	static KDE_DEPRECATED bool exists(const KUrl& url, bool source, QWidget * window);	static KDE_DEPRECATED bool exists(const KUrl& url, bool source, QWidget * window);
	#endif	#endif

	/**	/**
	* Tests whether a URL exists.	* Tests whether a URL exists.
	*	*
	* @param url the URL we are testing	* @param url the URL we are testing
	* @param statSide determines if we want to read or write.	* @param statSide determines if we want to read or write.

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

	plasma.h	plasma.h

	skipping to change at line 237	skipping to change at line 237
	/**	/**
	* The ComonentType enumeration refers to the various types of components,	* The ComonentType enumeration refers to the various types of components,
	* or plugins, supported by plasma.	* or plugins, supported by plasma.
	*/	*/
	enum ComponentType {	enum ComponentType {
	AppletComponent = 1, /< Plasma::Applet based plugins /	AppletComponent = 1, /< Plasma::Applet based plugins /
	DataEngineComponent = 2, /< Plasma::DataEngine based plugins /	DataEngineComponent = 2, /< Plasma::DataEngine based plugins /
	RunnerComponent = 4, /< Plasma::AbstractRunner based plugsin /	RunnerComponent = 4, /< Plasma::AbstractRunner based plugsin /
	AnimatorComponent = 8, /< Plasma::Animator based plugins /	AnimatorComponent = 8, /< Plasma::Animator based plugins /
	ContainmentComponent = 16,/< Plasma::Containment based plugins /	ContainmentComponent = 16,/< Plasma::Containment based plugins /

	WallpaperComponent = 32 /< Plasma::Wallpaper based plugins /	WallpaperComponent = 32, /< Plasma::Wallpaper based plugins /
		GenericComponent = 64 /** Generic repositories of files, usually t
		hey keep QML files and their assets **/
	};	};
	Q_DECLARE_FLAGS(ComponentTypes, ComponentType)	Q_DECLARE_FLAGS(ComponentTypes, ComponentType)

	enum MarginEdge {	enum MarginEdge {
	TopMargin = 0, /< The top margin /	TopMargin = 0, /< The top margin /
	BottomMargin, /< The bottom margin /	BottomMargin, /< The bottom margin /
	LeftMargin, /< The left margin /	LeftMargin, /< The left margin /
	RightMargin /< The right margin /	RightMargin /< The right margin /
	};	};


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

	kmessagebox.h		kmessagebox.h

	skipping to change at line 96		skipping to change at line 96
	Error = 8,		Error = 8,
	QuestionYesNoCancel = 9		QuestionYesNoCancel = 9
	};		};

	enum Option		enum Option
	{		{
	Notify = 1, ///< Emit a KNotify event		Notify = 1, ///< Emit a KNotify event
	AllowLink = 2, ///< The message may contain links.		AllowLink = 2, ///< The message may contain links.
	Dangerous = 4, ///< The action to be confirmed by the dialog is a po tentially destructive one. The default button will be set to Cancel or No, depending on which is available.		Dangerous = 4, ///< The action to be confirmed by the dialog is a po tentially destructive one. The default button will be set to Cancel or No, depending on which is available.
	PlainCaption = 8, ///< Do not use KApplication::makeStdCaption()		PlainCaption = 8, ///< Do not use KApplication::makeStdCaption()

	NoExec = 16 ///< Do not call exec() in createKMessageBox()		NoExec = 16, ///< Do not call exec() in createKMessageBox()
			WindowModal = 32 ///< The window is to be modal relative to its parent
			. By default, it is application modal.
	};		};

	Q_DECLARE_FLAGS(Options,Option)		Q_DECLARE_FLAGS(Options,Option)

	/**		/**
	* Display a simple "question" dialog.		* Display a simple "question" dialog.
	*		*

	* @param parent If @p parent is 0, then the message box becomes an		* @param parent Parent widget.
	* application-global modal dialog box. If @p parent is a
	* widget, the message box becomes modal relative to parent
	.
	* @param text Message string.		* @param text 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("Question").		* the title. The default title is i18n("Question").
	* @param buttonYes The text for the first button.		* @param buttonYes The text for the first button.
	* The default is KStandardGuiItem::yes().		* The default is KStandardGuiItem::yes().
	* @param buttonNo The text for the second button.		* @param buttonNo The text for the second button.
	* The default is KStandardGuiItem::no().		* The default is KStandardGuiItem::no().
	* @param dontAskAgainName If provided, a checkbox is added with which		* @param dontAskAgainName If provided, a checkbox is added with which
	* further confirmation can be turned off.		* further confirmation can be turned off.
	* The string is used to lookup and store the setting		* The string is used to lookup and store the setting

	skipping to change at line 152		skipping to change at line 151