maliit: headers diff between 0.80.5 and 0.80.6 versions

	inputmethod.h	inputmethod.h

	skipping to change at line 53	skipping to change at line 53
	//! \return current input method area	//! \return current input method area
	QRect area() const;	QRect area() const;

	//! \brief Get the orientation of application's active window	//! \brief Get the orientation of application's active window
	//! \return orientation of application's active window	//! \return orientation of application's active window
	Maliit::OrientationAngle orientationAngle() const;	Maliit::OrientationAngle orientationAngle() const;

	//! \internal	//! \internal
	void emitKeyPress(const QKeyEvent &event);	void emitKeyPress(const QKeyEvent &event);
	void emitKeyRelease(const QKeyEvent &event);	void emitKeyRelease(const QKeyEvent &event);

		void setLanguage(const QString &language);
	//! \internal_end	//! \internal_end


		//! \brief Current language of active input method
		const QString &language() const;

	public Q_SLOTS:	public Q_SLOTS:
	/*!	/*!
	* \brief Application's active window start to rotate to \a newOrientat ionAngle.	* \brief Application's active window start to rotate to \a newOrientat ionAngle.
	*	*
	* \note This method should be called when active window start rotation animation.	* \note This method should be called when active window start rotation animation.
	*/	*/
	void startOrientationAngleChange(Maliit::OrientationAngle newOrientatio nAngle);	void startOrientationAngleChange(Maliit::OrientationAngle newOrientatio nAngle);

	/*!	/*!
	* \brief Set the orientation angle of application's active window to \ a newOrientationAngle	* \brief Set the orientation angle of application's active window to \ a newOrientationAngle

	skipping to change at line 107	skipping to change at line 111
	* \note It's emitted with every orientation angle change finished.	* \note It's emitted with every orientation angle change finished.
	*/	*/
	void orientationAngleChanged(Maliit::OrientationAngle orientationAngle) ;	void orientationAngleChanged(Maliit::OrientationAngle orientationAngle) ;

	//! Can be emitted by input method to notify about raw key press event it receives.	//! Can be emitted by input method to notify about raw key press event it receives.
	void keyPress(const QKeyEvent &);	void keyPress(const QKeyEvent &);

	//! Can be emitted by input method to notify about raw key release even t it receives.	//! Can be emitted by input method to notify about raw key release even t it receives.
	void keyRelease(const QKeyEvent &);	void keyRelease(const QKeyEvent &);


		/*!
		* \brief Emitted on input method language change.
		* \sa language()
		*/
		void languageChanged(const QString &language);

	private:	private:
	InputMethod();	InputMethod();
	~InputMethod();	~InputMethod();
	Q_DISABLE_COPY(InputMethod)	Q_DISABLE_COPY(InputMethod)

	const QScopedPointer<InputMethodPrivate> d_ptr;	const QScopedPointer<InputMethodPrivate> d_ptr;

	Q_DECLARE_PRIVATE(InputMethod)	Q_DECLARE_PRIVATE(InputMethod)
	};	};


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

	mimpluginmanager.h	mimpluginmanager.h

	skipping to change at line 23	skipping to change at line 23
	* and appearing in the file LICENSE.LGPL included in the packaging	* and appearing in the file LICENSE.LGPL included in the packaging
	* of this file.	* of this file.
	*/	*/

	#ifndef MIMPLUGINMANAGER_H	#ifndef MIMPLUGINMANAGER_H
	#define MIMPLUGINMANAGER_H	#define MIMPLUGINMANAGER_H

	#include <QObject>	#include <QObject>
	#include <QMap>	#include <QMap>
	#include <QList>	#include <QList>

		#include <tr1/memory>

	#include "minputmethodnamespace.h"	#include "minputmethodnamespace.h"
	#include "mimplugindescription.h"	#include "mimplugindescription.h"
	#include "mattributeextensionid.h"	#include "mattributeextensionid.h"
	#include "mimsubviewdescription.h"	#include "mimsubviewdescription.h"

		#include "minputcontextconnection.h"

	class QRegion;	class QRegion;
	class MIMPluginManagerPrivate;	class MIMPluginManagerPrivate;
	class MAttributeExtensionId;	class MAttributeExtensionId;
	class MAbstractInputMethod;	class MAbstractInputMethod;

	class MImRemoteWindow;
	class MImRotationAnimation;

	//! Note: this class is not considered stable API	//! Note: this class is not considered stable API
	class MIMPluginManager: public QObject	class MIMPluginManager: public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_CLASSINFO("D-Bus Interface", "com.meego.inputmethodpluginmanager1")	Q_CLASSINFO("D-Bus Interface", "com.meego.inputmethodpluginmanager1")

	public:	public:
	/*!	/*!
	* \Brief Constructs object MIMPluginManager	* \Brief Constructs object MIMPluginManager
	*/	*/

	explicit MIMPluginManager(MImRotationAnimation* rotationAnimation = 0);	explicit MIMPluginManager(std::tr1::shared_ptr<MInputContextConnection> icConnection);

	virtual ~MIMPluginManager();	virtual ~MIMPluginManager();

	//! Returns names of loaded plugins	//! Returns names of loaded plugins
	QStringList loadedPluginsNames() const;	QStringList loadedPluginsNames() const;

	//! Returns names of loaded plugins which support \a state	//! Returns names of loaded plugins which support \a state
	QStringList loadedPluginsNames(MInputMethod::HandlerState state) const;	QStringList loadedPluginsNames(MInputMethod::HandlerState state) const;

	//! \brief Return information about loaded input method plugins which c ould work in specified \a state.	//! \brief Return information about loaded input method plugins which c ould work in specified \a state.

	skipping to change at line 93	skipping to change at line 93

	//! Returns true if the connection to D-Bus is valid and the object is properly usable	//! Returns true if the connection to D-Bus is valid and the object is properly usable
	bool isDBusConnectionValid() const;	bool isDBusConnectionValid() const;

	//! Switches plugin in according to given \a direction	//! Switches plugin in according to given \a direction
	void switchPlugin(MInputMethod::SwitchDirection direction, MAbstractInp utMethod *initiator);	void switchPlugin(MInputMethod::SwitchDirection direction, MAbstractInp utMethod *initiator);

	//! Switches active plugin to inactive plugin with given \a name	//! Switches active plugin to inactive plugin with given \a name
	void switchPlugin(const QString &name, MAbstractInputMethod *initiator) ;	void switchPlugin(const QString &name, MAbstractInputMethod *initiator) ;


	signals:	Q_SIGNALS:
	//!	//!
	// This signal is emitted when the whole painting area of the	// This signal is emitted when the whole painting area of the
	// widget is changed.	// widget is changed.
	void regionUpdated(const QRegion &region);	void regionUpdated(const QRegion &region);

	//! This signal is emitted when input method plugins are loaded, unload ed,	//! This signal is emitted when input method plugins are loaded, unload ed,
	//! enabled or disabled	//! enabled or disabled
	void pluginsChanged();	void pluginsChanged();


	public slots:	public Q_SLOTS:
	//! Show active plugins.	//! Show active plugins.
	void showActivePlugins();	void showActivePlugins();

	//! Hide active plugins.	//! Hide active plugins.
	void hideActivePlugins();	void hideActivePlugins();


	//! Hide on window gone.
	void hideActivePluginsIfWindowGone(MImRemoteWindow* window);

	//! Updates the whole painting area for input method objects.	//! Updates the whole painting area for input method objects.
	void updateRegion(const QRegion &region);	void updateRegion(const QRegion &region);


	private slots:	private Q_SLOTS:
	//! Update and activate input source.	//! Update and activate input source.
	void updateInputSource();	void updateInputSource();

	//! Set toolbar to active plugin with given \a id	//! Set toolbar to active plugin with given \a id
	void setToolbar(const MAttributeExtensionId &id);	void setToolbar(const MAttributeExtensionId &id);

	//! Update the key overrides for active plugin.	//! Update the key overrides for active plugin.
	void updateKeyOverrides();	void updateKeyOverrides();

	protected:	protected:

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

	minputmethodquick.h	minputmethodquick.h

	skipping to change at line 75	skipping to change at line 75
	//! \param mainWindow should be used to install plugin's UI into it. Ma naged by framework.	//! \param mainWindow should be used to install plugin's UI into it. Ma naged by framework.
	//! \param qmlFileName the QML file that will be loaded.	//! \param qmlFileName the QML file that will be loaded.
	explicit MInputMethodQuick(MAbstractInputMethodHost *host,	explicit MInputMethodQuick(MAbstractInputMethodHost *host,
	QWidget *mainWindow,	QWidget *mainWindow,
	const QString &qmlFileName);	const QString &qmlFileName);
	virtual ~MInputMethodQuick();	virtual ~MInputMethodQuick();

	//! \reimp	//! \reimp
	virtual void show();	virtual void show();
	virtual void hide();	virtual void hide();

	virtual void setToolbar(QSharedPointer<const MToolbarData> toolbar);	virtual void handleVisualizationPriorityChange(bool priority);
		virtual void handleClientChange();
	virtual void handleAppOrientationChanged(int angle);	virtual void handleAppOrientationChanged(int angle);

		virtual void setState(const QSet<MInputMethod::HandlerState> &state);

		virtual void setToolbar(QSharedPointer<const MToolbarData> toolbar);
		virtual void handleFocusChange(bool focusIn);
	//! \reimp_end	//! \reimp_end

	//! Propagates screen size to QML components.	//! Propagates screen size to QML components.
	void propagateScreenSize();	void propagateScreenSize();

	//! Returns screen height.	//! Returns screen height.
	int screenHeight() const;	int screenHeight() const;

	//! Returns screen width.	//! Returns screen width.
	int screenWidth() const;	int screenWidth() const;

	skipping to change at line 98	skipping to change at line 103
	//! Returns application orientation.	//! Returns application orientation.
	int appOrientation() const;	int appOrientation() const;

	//! Returns input method area.	//! Returns input method area.
	QRect inputMethodArea() const;	QRect inputMethodArea() const;

	//! Sets input method area. Called by QML components.	//! Sets input method area. Called by QML components.
	//! area the area consumed by the QML input method.	//! area the area consumed by the QML input method.
	Q_INVOKABLE void setInputMethodArea(const QRect &area);	Q_INVOKABLE void setInputMethodArea(const QRect &area);


	signals:	Q_SIGNALS:
	//! Emitted when screen height changes.	//! Emitted when screen height changes.
	void screenHeightChanged(int height);	void screenHeightChanged(int height);

	//! Emitted when screen width changes.	//! Emitted when screen width changes.
	void screenWidthChanged(int width);	void screenWidthChanged(int width);

	//! Emitted when application orientation changes.	//! Emitted when application orientation changes.
	void appOrientationChanged(int angle);	void appOrientationChanged(int angle);

	//! Emitted when input method area changes.	//! Emitted when input method area changes.
	void inputMethodAreaChanged(const QRect &area);	void inputMethodAreaChanged(const QRect &area);


	public slots:	public Q_SLOTS:
	//! Sends preedit string. Called by QML components.	//! Sends preedit string. Called by QML components.
	//! \param text the preedit string.	//! \param text the preedit string.
	void sendPreedit(const QString &text);	void sendPreedit(const QString &text);

	//! Sends commit string. Called by QML components.	//! Sends commit string. Called by QML components.
	//! \param text the commit string.	//! \param text the commit string.
	void sendCommit(const QString &text);	void sendCommit(const QString &text);

	//! Tells the framework to switch plugins. Called by QML components.	//! Tells the framework to switch plugins. Called by QML components.
	void pluginSwitchRequired(int switchDirection);	void pluginSwitchRequired(int switchDirection);

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

	mkeyoverride.h	mkeyoverride.h

	skipping to change at line 87	skipping to change at line 87

	//! Returns icon name	//! Returns icon name
	QString icon() const;	QString icon() const;

	//! Return true if the key is highlighted; otherwise return false.	//! Return true if the key is highlighted; otherwise return false.
	bool highlighted() const;	bool highlighted() const;

	//! Return true if the key is enabled; otherwise return false.	//! Return true if the key is enabled; otherwise return false.
	bool enabled() const;	bool enabled() const;


	public slots:	public Q_SLOTS:
	//! Sets text for the key	//! Sets text for the key
	void setLabel(const QString &label);	void setLabel(const QString &label);

	//! Sets icon name	//! Sets icon name
	void setIcon(const QString &icon);	void setIcon(const QString &icon);

	/*!	/*!
	* \brief Set highlighted state for item	* \brief Set highlighted state for item
	*	*
	*/	*/
	void setHighlighted(bool highlighted);	void setHighlighted(bool highlighted);

	/*!	/*!
	* \brief If \a enabled is true, the key is enabled; otherwise, it is disabled.	* \brief If \a enabled is true, the key is enabled; otherwise, it is disabled.
	*	*
	*/	*/
	void setEnabled(bool enabled);	void setEnabled(bool enabled);


	signals:	Q_SIGNALS:
	/*!	/*!
	* \brief Emitted when some attributes of the key are changed	* \brief Emitted when some attributes of the key are changed
	* \param keyId, the key id.	* \param keyId, the key id.
	* \param changedAttributes Specifies the changed attributes. \sa KeyOv errideAttribute	* \param changedAttributes Specifies the changed attributes. \sa KeyOv errideAttribute
	*/	*/
	void keyAttributesChanged(const QString &keyId, const MKeyOverride::Key OverrideAttributes changedAttributes);	void keyAttributesChanged(const QString &keyId, const MKeyOverride::Key OverrideAttributes changedAttributes);

	private:	private:
	Q_DECLARE_PRIVATE(MKeyOverride)	Q_DECLARE_PRIVATE(MKeyOverride)


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

	mtoolbaritem.h	mtoolbaritem.h

	skipping to change at line 216	skipping to change at line 216
	//! Return highlighted state for the item.	//! Return highlighted state for the item.
	bool highlighted() const;	bool highlighted() const;

	bool isCustom() const;	bool isCustom() const;

	void setCustom(bool custom);	void setCustom(bool custom);

	//! Return true if item is enabled; otherwise return false.	//! Return true if item is enabled; otherwise return false.
	bool enabled() const;	bool enabled() const;


	public slots:	public Q_SLOTS:
	//! Sets new text for item	//! Sets new text for item
	void setText(const QString &text);	void setText(const QString &text);

	//! Sets text id for item	//! Sets text id for item
	void setTextId(const QString &textId);	void setTextId(const QString &textId);

	/*!	/*!
	* \brief Sets presseed state for item	* \brief Sets presseed state for item
	*	*
	* This attribute is applicable for toggle buttons only.	* This attribute is applicable for toggle buttons only.

	skipping to change at line 249	skipping to change at line 249
	*	*
	* This attribute is applicable for buttons only.	* This attribute is applicable for buttons only.
	*/	*/
	void setEnabled(bool enabled);	void setEnabled(bool enabled);

	/*!	/*!
	* \brief Explictly set the visiblity for the item.	* \brief Explictly set the visiblity for the item.
	*/	*/
	void setVisible(bool newVisible);	void setVisible(bool newVisible);


	signals:	Q_SIGNALS:
	/*!	/*!
	* \brief Emitted when some property is changed	* \brief Emitted when some property is changed
	* \param propertyName Specifies name of changed property	* \param propertyName Specifies name of changed property
	*/	*/
	void propertyChanged(const QString &propertyName);	void propertyChanged(const QString &propertyName);

	protected:	protected:
	//! Remove all actions from this item	//! Remove all actions from this item
	void clearActions();	void clearActions();


End of changes. 2 change blocks.
	2 lines changed or deleted	2 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/

	mabstractinputmethod.h	mabstractinputmethod.h

	skipping to change at line 266	skipping to change at line 266
	*	*
	* Must return true if event is handled, otherwise false.	* Must return true if event is handled, otherwise false.
	* Extensions can be registered on the application side, and will be pa ssed through to	* Extensions can be registered on the application side, and will be pa ssed through to
	* the input method, allowing to add integration points between applica tion and input method.	* the input method, allowing to add integration points between applica tion and input method.
	* Reimplementing this method is optional.	* Reimplementing this method is optional.
	*	*
	* \param event event to handle	* \param event event to handle
	*/	*/
	virtual bool imExtensionEvent(MImExtensionEvent *event);	virtual bool imExtensionEvent(MImExtensionEvent *event);


	signals:	Q_SIGNALS:
	/*!	/*!
	* \brief Inform that active subview is changed to \a subViewId for \a state.	* \brief Inform that active subview is changed to \a subViewId for \a state.
	*	*
	* Must be emitted when plugin changes the active subview for specified state.	* Must be emitted when plugin changes the active subview for specified state.
	*	*
	* \param subViewId the identifier of the new subview.	* \param subViewId the identifier of the new subview.
	* \param state the state which \a subViewId belongs to.	* \param state the state which \a subViewId belongs to.
	*/	*/
	void activeSubViewChanged(const QString &subViewId,	void activeSubViewChanged(const QString &subViewId,
	MInputMethod::HandlerState state = MInputMeth od::OnScreen);	MInputMethod::HandlerState state = MInputMeth od::OnScreen);

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

	mabstractinputmethodhost.h	mabstractinputmethodhost.h

	skipping to change at line 121	skipping to change at line 121
	* \brief returns the selecting text	* \brief returns the selecting text
	*/	*/
	virtual QString selection(bool &valid) = 0;	virtual QString selection(bool &valid) = 0;

	/*!	/*!
	* \brief returns a pixmap that needs to be drawn as the background of the	* \brief returns a pixmap that needs to be drawn as the background of the
	* input method. Pixmap contains the application's window conten ts.	* input method. Pixmap contains the application's window conten ts.
	*/	*/
	QPixmap background() const;	QPixmap background() const;


	signals:	Q_SIGNALS:
	//! This signal is emitted when input method plugins are loaded or unlo aded	//! This signal is emitted when input method plugins are loaded or unlo aded
	void pluginsChanged();	void pluginsChanged();


	public slots:	public Q_SLOTS:
	/*!	/*!
	* \brief Updates pre-edit string in the application widget	* \brief Updates pre-edit string in the application widget
	*	*
	* \param string The new pre-edit string	* \param string The new pre-edit string
	* \param preeditFormats Selects visual stylings for each part of preed it	* \param preeditFormats Selects visual stylings for each part of preed it
	* \param replacementStart The position at which characters are to be r eplaced relative	* \param replacementStart The position at which characters are to be r eplaced relative
	* from the start of the preedit string.	* from the start of the preedit string.
	* \param replacementLength The number of characters to be replaced in the preedit string.	* \param replacementLength The number of characters to be replaced in the preedit string.
	* \param cursorPos The cursur position inside preedit	* \param cursorPos The cursur position inside preedit
	*/	*/

	skipping to change at line 282	skipping to change at line 282
	* (previous and next) of current active subview.	* (previous and next) of current active subview.
	*	*
	* Previous subview is described by first list item, next	* Previous subview is described by first list item, next
	* subview is defined by last list item.	* subview is defined by last list item.
	* Returned list is empty if there is exactly one enabled subview.	* Returned list is empty if there is exactly one enabled subview.
	*	*
	* \sa MImSubViewDescription	* \sa MImSubViewDescription
	*/	*/
	virtual QList<MImSubViewDescription> surroundingSubViewDescriptions(MIn putMethod::HandlerState state) const;	virtual QList<MImSubViewDescription> surroundingSubViewDescriptions(MIn putMethod::HandlerState state) const;


		/*!
		* \brief Sets current input method language.
		* \param language ICU format locale ID string
		*
		* This can be used as a hint to determine text direction in input fiel
		ds, for example.
		*/
		virtual void setLanguage(const QString &language);

	private:	private:
	Q_DISABLE_COPY(MAbstractInputMethodHost)	Q_DISABLE_COPY(MAbstractInputMethodHost)
	Q_DECLARE_PRIVATE(MAbstractInputMethodHost)	Q_DECLARE_PRIVATE(MAbstractInputMethodHost)

	MAbstractInputMethodHostPrivate *d;	MAbstractInputMethodHostPrivate *d;
	};	};

	#endif	#endif

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