maliit: headers diff between 0.80.4 and 0.80.5 versions

	mabstractinputmethodhost.h	mabstractinputmethodhost.h

	skipping to change at line 31	skipping to change at line 31

	#include <QRect>	#include <QRect>
	#include <QObject>	#include <QObject>
	#include <QPixmap>	#include <QPixmap>

	class QString;	class QString;
	class QRegion;	class QRegion;
	class QKeyEvent;	class QKeyEvent;

	class MImPluginDescription;	class MImPluginDescription;

		class MImSubViewDescription;
	class MAbstractInputMethodHostPrivate;	class MAbstractInputMethodHostPrivate;

	/*!	/*!
	* \brief Provides an interface for input method instances to connect to th e environment.	* \brief Provides an interface for input method instances to connect to th e environment.
	*	*
	* MAbstractInputMethodHost provides methods MAbstractInputMethod instances can use	* MAbstractInputMethodHost provides methods MAbstractInputMethod instances can use
	* for interacting with the application that is using input method services and	* for interacting with the application that is using input method services and
	* the input method framework state itself.	* the input method framework state itself.
	* Note: this is not meant to be derived by the input method framework user s.	* Note: this is not meant to be derived by the input method framework user s.
	*	*

	skipping to change at line 264	skipping to change at line 265
	virtual void setOrientationAngleLocked(bool lock) = 0;	virtual void setOrientationAngleLocked(bool lock) = 0;

	public:	public:
	/*!	/*!
	* \brief Return information about loaded input method plugins which co uld work in specified \a state.	* \brief Return information about loaded input method plugins which co uld work in specified \a state.
	*	*
	* \sa MImPluginDesription	* \sa MImPluginDesription
	*/	*/
	virtual QList<MImPluginDescription> pluginDescriptions(MInputMethod::Ha ndlerState state) const = 0;	virtual QList<MImPluginDescription> pluginDescriptions(MInputMethod::Ha ndlerState state) const = 0;


		/*!
		* \brief returns the current cursor position within the preedit region
		*/
		virtual int preeditClickPos(bool &valid) const { Q_UNUSED(valid); retur
		n 0; }

		/*!
		* \brief Return information about enabled subviews which are neighbors
		* (previous and next) of current active subview.
		*
		* Previous subview is described by first list item, next
		* subview is defined by last list item.
		* Returned list is empty if there is exactly one enabled subview.
		*
		* \sa MImSubViewDescription
		*/
		virtual QList<MImSubViewDescription> surroundingSubViewDescriptions(MIn
		putMethod::HandlerState state) const;

	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. 2 change blocks.
	0 lines changed or deleted	20 lines changed or added

	mimpluginmanager.h	mimpluginmanager.h

	skipping to change at line 27	skipping to change at line 27
	#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 "minputmethodnamespace.h"	#include "minputmethodnamespace.h"
	#include "mimplugindescription.h"	#include "mimplugindescription.h"
	#include "mattributeextensionid.h"	#include "mattributeextensionid.h"

		#include "mimsubviewdescription.h"

	class QRegion;	class QRegion;
	class MIMPluginManagerPrivate;	class MIMPluginManagerPrivate;
	class MAttributeExtensionId;	class MAttributeExtensionId;
	class MAbstractInputMethod;	class MAbstractInputMethod;
	class MImRemoteWindow;	class MImRemoteWindow;
	class MImRotationAnimation;	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

	skipping to change at line 58	skipping to change at line 59

	//! 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.
	QList<MImPluginDescription> pluginDescriptions(MInputMethod::HandlerSta te state) const;	QList<MImPluginDescription> pluginDescriptions(MInputMethod::HandlerSta te state) const;


		//! \brief Return information about previous, current and next subviews
		.
		//!
		//! \sa MAbstractInputMethodHost::surroundingSubViewDescriptions()
		QList<MImSubViewDescription> surroundingSubViewDescriptions(MInputMetho
		d::HandlerState state) const;

	//! Returns names of activated plugins	//! Returns names of activated plugins
	QStringList activePluginsNames() const;	QStringList activePluginsNames() const;

	//! Returns names of activated plugin for \a state	//! Returns names of activated plugin for \a state
	QString activePluginsName(MInputMethod::HandlerState state) const;	QString activePluginsName(MInputMethod::HandlerState state) const;

	//! Returns all subviews (IDs and titles) of loaded plugins which suppo rt \a state.	//! Returns all subviews (IDs and titles) of loaded plugins which suppo rt \a state.
	QMap<QString, QString> availableSubViews(const QString &plugin,	QMap<QString, QString> availableSubViews(const QString &plugin,
	MInputMethod::HandlerState sta te	MInputMethod::HandlerState sta te
	= MInputMethod::OnScreen) con st;	= MInputMethod::OnScreen) con st;

	skipping to change at line 118	skipping to change at line 124
	void updateRegion(const QRegion &region);	void updateRegion(const QRegion &region);

	private slots:	private 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(const MAttributeExtensionId &id);	void updateKeyOverrides();

	protected:	protected:
	MIMPluginManagerPrivate *const d_ptr;	MIMPluginManagerPrivate *const d_ptr;

	private:	private:
	Q_DISABLE_COPY(MIMPluginManager)	Q_DISABLE_COPY(MIMPluginManager)
	Q_DECLARE_PRIVATE(MIMPluginManager)	Q_DECLARE_PRIVATE(MIMPluginManager)
	Q_PRIVATE_SLOT(d_func(), void _q_syncHandlerMap(int));	Q_PRIVATE_SLOT(d_func(), void _q_syncHandlerMap(int));
	Q_PRIVATE_SLOT(d_func(), void _q_setActiveSubView(const QString &, MInp utMethod::HandlerState));	Q_PRIVATE_SLOT(d_func(), void _q_setActiveSubView(const QString &, MInp utMethod::HandlerState));
	Q_PRIVATE_SLOT(d_func(), void _q_ensureEmptyRegionWhenHidden());	Q_PRIVATE_SLOT(d_func(), void _q_ensureEmptyRegionWhenHidden());

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

	minputmethodnamespace.h	minputmethodnamespace.h

	skipping to change at line 148	skipping to change at line 148
	//! Paste button is accessible	//! Paste button is accessible
	InputMethodPaste	InputMethodPaste
	};	};

	/*!	/*!
	* This enum defines direction of plugin switching	* This enum defines direction of plugin switching
	*/	*/
	enum SwitchDirection {	enum SwitchDirection {
	SwitchUndefined, //!< Special value for uninitialized variables	SwitchUndefined, //!< Special value for uninitialized variables
	SwitchForward, //!< Activate next plugin	SwitchForward, //!< Activate next plugin

	SwitchBackward //!< Activate previous plugin	SwitchBackward, //!< Activate previous plugin
		SwitchPreparationForward, //!< Prepare to switch to next plugin
		SwitchPreparationBackward, //!< Prepare to switch to previous plugi
		n
		SwitchCanceled //!< Previous SwitchPreparation* is canceled, plugin
		will not be switched
	};	};

	enum PreeditFace {	enum PreeditFace {
	PreeditDefault,	PreeditDefault,
	PreeditNoCandidates,	PreeditNoCandidates,

	PreeditKeyPress //! Used for displaying the hwkbd key jus	PreeditKeyPress, //!< Used for displaying the hwkbd key just p
	t pressed	ressed
		PreeditUnconvertible, //!< Inactive preedit region, not clickable
		PreeditActive, //!< Preedit region with active suggestions

	};	};

	enum HandlerState {	enum HandlerState {
	OnScreen,	OnScreen,
	Hardware,	Hardware,
	Accessory	Accessory
	};	};

	/// \brief Key event request type for \a MInputContext::keyEvent().	/// \brief Key event request type for \a MInputContext::keyEvent().
	enum EventRequestType {	enum EventRequestType {

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