libmeegotouch: headers diff between 0.20.71.5 and 0.20.72.1 versions

	mcompleterview.h	mcompleterview.h

	skipping to change at line 49	skipping to change at line 49
	//! \reimp	//! \reimp
	virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;	virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
	//! \reimp_end	//! \reimp_end

	protected:	protected:
	//! \reimp	//! \reimp
	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	//! \reimp_end	//! \reimp_end


		protected Q_SLOTS:

		//! \reimp
		virtual void updateData(const QList<const char *>& modifications);
		//! \reimp_end

	private:	private:
	MCompleterViewPrivate *const d_ptr;	MCompleterViewPrivate *const d_ptr;

	Q_DISABLE_COPY(MCompleterView)	Q_DISABLE_COPY(MCompleterView)
	Q_DECLARE_PRIVATE(MCompleterView)	Q_DECLARE_PRIVATE(MCompleterView)
	};	};

	#endif	#endif

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

	mcomponentdata.h	mcomponentdata.h

	skipping to change at line 86	skipping to change at line 86
	public:	public:
	//! Initializes the window system and constructs an application object.	//! Initializes the window system and constructs an application object.
	/*!	/*!
	* \param argc number of arguments passed to the application from the c ommand line	* \param argc number of arguments passed to the application from the c ommand line
	* \param argv argument strings passed to the application from the comm and line	* \param argv argument strings passed to the application from the comm and line
	* \param appIdentifier an optional identifier for the application. Can	* \param appIdentifier an optional identifier for the application. Can
	* contain alphabetical characters, numbers, dashes and underscores. If	* contain alphabetical characters, numbers, dashes and underscores. If
	* an empty string is given (the default) the application binary file	* an empty string is given (the default) the application binary file
	* name is used.	* name is used.
	*/	*/

		// \deprecated Ctor is deprecated for public usage and should be made p rotected during next API break.
	MComponentData(int &argc, char *argv, const QString &appIdentifier = Q String(), MApplicationService service = 0);	MComponentData(int &argc, char *argv, const QString &appIdentifier = Q String(), MApplicationService service = 0);
	explicit MComponentData(MApplicationService *service);	explicit MComponentData(MApplicationService *service);

	//! Cleans up any window system resources that were allocated by this a pplication.	//! Cleans up any window system resources that were allocated by this a pplication.
	virtual ~MComponentData();	virtual ~MComponentData();


	//! returns the MComponentData instance	//! returns the MComponentData instance or 0 if no instance is created
		yet
		/*!
		* \see createInstance()
		*/
	static MComponentData *instance();	static MComponentData *instance();


		//! returns the MComponentData instance
		/*!
		* always returns a MComponentData pointer
		* if no instance was created yet, it creates a new instance and return
		s the pointer
		* if an instance was already created it returns the pointer to the exi
		sting instance
		* \see instance()
		*/
		static MComponentData* createInstance(int &argc, char **argv, const QSt
		ring &appIdentifier = QString(), MApplicationService *service = 0);
		static MComponentData* createInstance(MApplicationService *service);

	//! Target device name	//! Target device name
	static QString deviceName();	static QString deviceName();
	//! Software rendering command line option set	//! Software rendering command line option set
	static bool softwareRendering();	static bool softwareRendering();
	//! Full screen command line option set	//! Full screen command line option set
	static bool fullScreen();	static bool fullScreen();
	//! Show bounding rectangles command line option set	//! Show bounding rectangles command line option set
	static bool showBoundingRect();	static bool showBoundingRect();
	//! Show frame rate command line option set	//! Show frame rate command line option set
	static bool showFps();	static bool showFps();

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

	mlocale.h	mlocale.h

	skipping to change at line 1655	skipping to change at line 1655
	*/	*/
	void connectSettings();	void connectSettings();

	/*!	/*!
	* \brief Disconnects from change monitoring in settings	* \brief Disconnects from change monitoring in settings
	* After calling this method, all changes in the settings	* After calling this method, all changes in the settings
	* will no longer emit settingsChanged() signal	* will no longer emit settingsChanged() signal
	*/	*/
	void disconnectSettings();	void disconnectSettings();


		/*!
		* \brief Static method to obtain primary script of locale.
		* Can be used to obtain primary script without instantiating MLocale,
		* useful when obtaining a list of scripts for a lot of languages. Prim
		ary
		* script means a script returned by script() or first item in
		* languageScripts().
		*/
		static QString localeScript(const QString &locale);

		/*!
		* \brief Static method to obtain endonym for locale.
		* Can be used to obtain endonym without instantiating MLocale, useful
		* when obtaining a list of endonyms for a lot of languages.
		*/
		static QString languageEndonym(const QString &locale);

	Q_SIGNALS:	Q_SIGNALS:
	void settingsChanged();	void settingsChanged();
	/*!	/*!
	* \brief Signal emitted when the default system locale changes.	* \brief Signal emitted when the default system locale changes.
	*/	*/
	void localeSettingsChanged();	void localeSettingsChanged();

	protected:	protected:

	/*!	/*!

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

	mnavigationbarmodel.h	mnavigationbarmodel.h

	skipping to change at line 49	skipping to change at line 49
	};	};

	private:	private:
	M_MODEL_PROPERTY(bool, notifyUser, NotifyUser, true, false)	M_MODEL_PROPERTY(bool, notifyUser, NotifyUser, true, false)
	M_MODEL_PROPERTY(QString, viewMenuDescription, ViewMenuDescription, tru e, "Menu")	M_MODEL_PROPERTY(QString, viewMenuDescription, ViewMenuDescription, tru e, "Menu")
	M_MODEL_PROPERTY(QString, viewMenuIconID, ViewMenuIconID, true, QString ())	M_MODEL_PROPERTY(QString, viewMenuIconID, ViewMenuIconID, true, QString ())
	//! \deprecated do not use	//! \deprecated do not use
	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)
	M_MODEL_PROPERTY(bool, arrowIconVisible, ArrowIconVisible, true, false)	M_MODEL_PROPERTY(bool, arrowIconVisible, ArrowIconVisible, true, false)
	M_MODEL_PTR_PROPERTY(MToolBar *, toolBar, ToolBar, true, 0)	M_MODEL_PTR_PROPERTY(MToolBar *, toolBar, ToolBar, true, 0)

		// in the line above we should have something like:
		// M_MODEL_PROPERTY(QPointer<MToolbar>, toolBar, ToolBar, true, 0)
		// but it causes a potential ABI break.
	M_MODEL_PROPERTY(MNavigationBarModel::EscapeButtonModeEnum, escapeButto nMode, EscapeButtonMode, true,	M_MODEL_PROPERTY(MNavigationBarModel::EscapeButtonModeEnum, escapeButto nMode, EscapeButtonMode, true,
	MNavigationBarModel::EscapeButtonClose)	MNavigationBarModel::EscapeButtonClose)
	M_MODEL_PROPERTY(bool, escapeButtonEnabled, EscapeButtonEnabled, true, true)	M_MODEL_PROPERTY(bool, escapeButtonEnabled, EscapeButtonEnabled, true, true)
	M_MODEL_PROPERTY(bool, escapeButtonVisible, EscapeButtonVisible, true, true)	M_MODEL_PROPERTY(bool, escapeButtonVisible, EscapeButtonVisible, true, true)

	//! \internal	//! \internal
	M_MODEL_PTR_PROPERTY(QGraphicsWidget *, customContent, CustomContent, t rue, 0)	M_MODEL_PTR_PROPERTY(QGraphicsWidget *, customContent, CustomContent, t rue, 0)
	//! \internal_end	//! \internal_end
	};	};


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

	mtexteditmodel.h	mtexteditmodel.h

	skipping to change at line 26	skipping to change at line 26
	** of this file.	** of this file.
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef MTEXTEDITMODEL_H	#ifndef MTEXTEDITMODEL_H
	#define MTEXTEDITMODEL_H	#define MTEXTEDITMODEL_H

	#include <mwidgetmodel.h>	#include <mwidgetmodel.h>
	#include <limits>	#include <limits>
	#include <QTextDocument>	#include <QTextDocument>

		#include <QTextCharFormat>
	#include "mnamespace.h"	#include "mnamespace.h"


		class MTextEditFormatRange
		{
		public:
		bool operator ==(const MTextEditFormatRange& other) const
		{
		return (start == other.start && length == other.length && format ==
		other.format);
		}

		int start;
		int length;
		QTextCharFormat format;
		};

	class M_CORE_EXPORT MTextEditModel : public MWidgetModel	class M_CORE_EXPORT MTextEditModel : public MWidgetModel
	{	{
	Q_OBJECT	Q_OBJECT
	M_MODEL_INTERNAL(MTextEditModel)	M_MODEL_INTERNAL(MTextEditModel)

	public:	public:

	//! Edit mode for MTextEdit	//! Edit mode for MTextEdit
	enum EditMode {	enum EditMode {
	//! The main mode of operation, no selection or preedit	//! The main mode of operation, no selection or preedit

	skipping to change at line 92	skipping to change at line 106
	M_MODEL_PROPERTY(bool, isReadOnly, ReadOnly, true, false)	M_MODEL_PROPERTY(bool, isReadOnly, ReadOnly, true, false)
	M_MODEL_PROPERTY(bool, inputMethodAutoCapitalizationEnabled, InputMetho dAutoCapitalizationEnabled, true, true)	M_MODEL_PROPERTY(bool, inputMethodAutoCapitalizationEnabled, InputMetho dAutoCapitalizationEnabled, true, true)
	M_MODEL_PROPERTY(bool, autoSelectionEnabled, AutoSelectionEnabled, true , false)	M_MODEL_PROPERTY(bool, autoSelectionEnabled, AutoSelectionEnabled, true , false)
	M_MODEL_PROPERTY(bool, inputMethodPredictionEnabled, InputMethodPredict ionEnabled, true, false)	M_MODEL_PROPERTY(bool, inputMethodPredictionEnabled, InputMethodPredict ionEnabled, true, false)
	M_MODEL_PROPERTY(int, maxLength, MaxLength, true, std::numeric_limits< int>::max())	M_MODEL_PROPERTY(int, maxLength, MaxLength, true, std::numeric_limits< int>::max())
	M_MODEL_PROPERTY(QString, prompt, Prompt, true, QString())	M_MODEL_PROPERTY(QString, prompt, Prompt, true, QString())
	M_MODEL_PROPERTY(QString, toolbar, Toolbar, true, QString())	M_MODEL_PROPERTY(QString, toolbar, Toolbar, true, QString())
	M_MODEL_PROPERTY(int, toolbarId, ToolbarId, true, -1)	M_MODEL_PROPERTY(int, toolbarId, ToolbarId, true, -1)
	M_MODEL_PROPERTY(MTextEditModel::EchoMode, echo, Echo, true, MTextEditM odel::Normal)	M_MODEL_PROPERTY(MTextEditModel::EchoMode, echo, Echo, true, MTextEditM odel::Normal)
	M_MODEL_PROPERTY(bool, isAutoSipEnabled, AutoSipEnabled, true, true)	M_MODEL_PROPERTY(bool, isAutoSipEnabled, AutoSipEnabled, true, true)


	M_MODEL_PROPERTY(int, preeditCursor, PreeditCursor, true, -1)	M_MODEL_PROPERTY(int, preeditCursor, PreeditCursor, true, -1)

		M_MODEL_PROPERTY(QList<MTextEditFormatRange>, additionalFormats, Additi onalFormats, true, QList<MTextEditFormatRange>())
	public:	public:
	void updateCursor() {	void updateCursor() {
	memberModified(MTextEditModel::Cursor);	memberModified(MTextEditModel::Cursor);
	}	}
	};	};

	#endif	#endif

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

	mtextmagnifier.h	mtextmagnifier.h

	skipping to change at line 27	skipping to change at line 27
	**	**
	*************************************************************************** */	*************************************************************************** */
	#ifndef MTEXTMAGNIFIER_H	#ifndef MTEXTMAGNIFIER_H
	#define MTEXTMAGNIFIER_H	#define MTEXTMAGNIFIER_H

	#include "mstylablewidget.h"	#include "mstylablewidget.h"
	#include "mtextmagnifierstyle.h"	#include "mtextmagnifierstyle.h"

	#include <MOverlay>	#include <MOverlay>


		#include <MSceneManager>
		#include <QDebug>
		#include <QPanGesture>

	//! \internal	//! \internal


		//! Overlay widget to allow magnifier to stay on top of other widgets.
		class MagnifierOverlay : public MOverlay
		{
		public:
		MagnifierOverlay();
		bool isAppeared() const;

		protected:
		virtual void panGestureEvent(QGestureEvent event, QPanGesture panGest
		ure);
		friend class Ut_MTextMagnifier;
		};

	/*! \brief Magnifier widget to magnify text.	/*! \brief Magnifier widget to magnify text.
	*	*
	* The class magnifies contents of a certain source item.	* The class magnifies contents of a certain source item.
	* Position of the magnification is set by calling \a setMagnifiedPosition .	* Position of the magnification is set by calling \a setMagnifiedPosition .
	* Size of the magnification is determined entirely by style defined amoun t	* Size of the magnification is determined entirely by style defined amoun t
	* of magnification, and the size of the magnifier widget. Size of the wid get	* of magnification, and the size of the magnifier widget. Size of the wid get
	* on the other hand is defined by its frame image, read from style.	* on the other hand is defined by its frame image, read from style.
	*	*
	* To be always on top of other widgets in scene this magnifier uses	* To be always on top of other widgets in scene this magnifier uses
	* MOverlay internally as a parent scene window.	* MOverlay internally as a parent scene window.

	skipping to change at line 77	skipping to change at line 94

	private:	private:
	MTextMagnifier();	MTextMagnifier();

	void prepareOffscreenSurface(const QSize &size);	void prepareOffscreenSurface(const QSize &size);

	const QGraphicsItem &sourceItem;	const QGraphicsItem &sourceItem;
	QScopedPointer<QPixmap> offscreenSurface;	QScopedPointer<QPixmap> offscreenSurface;
	QScopedPointer<QBitmap> mask;	QScopedPointer<QBitmap> mask;


	MOverlay overlay;	MagnifierOverlay overlay;

	M_STYLABLE_WIDGET(MTextMagnifierStyle)	M_STYLABLE_WIDGET(MTextMagnifierStyle)


		friend class Ut_MTextMagnifier;
	};	};


	//! \internal_end	//! \internal_end

	#endif	#endif

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

	mtoolbarview.h	mtoolbarview.h

	skipping to change at line 79	skipping to change at line 79

	/*!	/*!
	\brief Destructs the view.	\brief Destructs the view.
	*/	*/
	virtual ~MToolBarView();	virtual ~MToolBarView();

	MWidget getWidget(QAction action) const;	MWidget getWidget(QAction action) const;

	//! \reimp	//! \reimp
	virtual QRectF boundingRect() const;	virtual QRectF boundingRect() const;

		virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
	//! \reimp_end	//! \reimp_end

	protected:	protected:
	//! \reimp	//! \reimp
	virtual void drawBackground(QPainter painter, const QStyleOptionGraphi csItem option) const;	virtual void drawBackground(QPainter painter, const QStyleOptionGraphi csItem option) const;
	virtual void applyStyle();	virtual void applyStyle();
	//! \reimp_end	//! \reimp_end

	/*!	/*!
	\brief protected constructor	\brief protected constructor

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

	mwindow.h	mwindow.h

	skipping to change at line 105	skipping to change at line 105
	The global alpha of the hardware graphics overlay for use by this wind ow.	The global alpha of the hardware graphics overlay for use by this wind ow.
	*/	*/
	Q_PROPERTY(qreal globalAlpha READ globalAlpha WRITE setGlobalAlpha)	Q_PROPERTY(qreal globalAlpha READ globalAlpha WRITE setGlobalAlpha)

	/*!	/*!
	\property videoGlobalAlpha	\property videoGlobalAlpha
	The global alpha of the hardware video overlay for use by this window.	The global alpha of the hardware video overlay for use by this window.
	*/	*/
	Q_PROPERTY(qreal videoGlobalAlpha READ videoGlobalAlpha WRITE setVideoG lobalAlpha)	Q_PROPERTY(qreal videoGlobalAlpha READ videoGlobalAlpha WRITE setVideoG lobalAlpha)


		/*!
		\property notificationPreviewsVisible
		Are notification preview banners shown on top of the window.
		*/
		Q_PROPERTY(bool notificationPreviewsVisible READ notificationPreviewsVi
		sible WRITE setNotificationPreviewsVisible)

	public:	public:
	/*!	/*!
	\brief Creates a MWindow without a scene manager.	\brief Creates a MWindow without a scene manager.

	\a parent is passed to QGraphicsView's constructor.	\a parent is passed to QGraphicsView's constructor.

	By default MWindow doesn't create a scene manager. It can be assigned	By default MWindow doesn't create a scene manager. It can be assigned
	later by calling setSceneManager(). Also, a default scene manager	later by calling setSceneManager(). Also, a default scene manager
	will be automatically created as needed unless explicitly set whenever	will be automatically created as needed unless explicitly set whenever
	any scene management is required (adding a managed class like MDialog	any scene management is required (adding a managed class like MDialog

	skipping to change at line 360	skipping to change at line 366

	window.show();	window.show();

	return app.exec();	return app.exec();
	\endcode	\endcode

	\sa lockOrientationAngle(), unlockOrientationAngle()	\sa lockOrientationAngle(), unlockOrientationAngle()
	*/	*/
	void setOrientationLocked(bool locked);	void setOrientationLocked(bool locked);


	//! Returns the current visibility state of the window.	/*! Returns true if user can see the window.
		* This is different from QWidget::isVisible(), which is always
		* explicitly set in the application. QWidget::isVisible() doesn't
		* know if the window is e.g. covered by another window and cannot be
		* seen.
		*/
	bool isOnDisplay() const;	bool isOnDisplay() const;

	/*! Returns true if the window is currently minimized to the switcher.	/*! Returns true if the window is currently minimized to the switcher.
	* It doesn't matter whether the window is visible or not in the	* It doesn't matter whether the window is visible or not in the
	* switcher.	* switcher.
	*/	*/
	bool isInSwitcher() const;	bool isInSwitcher() const;

	/*!	/*!
	* Allows to force close instead of hide during lazy shutdown.	* Allows to force close instead of hide during lazy shutdown.
	*/	*/
	void setCloseOnLazyShutdown(bool enable);	void setCloseOnLazyShutdown(bool enable);

	//! Returns true if window closes on lazy shutdown.	//! Returns true if window closes on lazy shutdown.
	bool closeOnLazyShutdown() const;	bool closeOnLazyShutdown() const;


		/*!
		Controls whether notification preview banners are shown on top of the
		window.

		\note Banners for system notifications (e.g. battery low) are not dis
		abled.
		*/
		void setNotificationPreviewsVisible(bool visible);

		/*!
		* Returns true if application notification preview banners are shown o
		ver
		* this window
		*
		* The value is true by default.
		*/
		bool notificationPreviewsVisible() const;

	public Q_SLOTS:	public Q_SLOTS:
	/*!	/*!
	Sets the orientation \a angle of the window.	Sets the orientation \a angle of the window.

	If the window is hidden or it hasn't been shown yet, the orientation a ngle change	If the window is hidden or it hasn't been shown yet, the orientation a ngle change
	is immediate (i.e. without an rotation animation), otherwise there may be an	is immediate (i.e. without an rotation animation), otherwise there may be an
	animated transition.	animated transition.
	*/	*/
	void setOrientationAngle(M::OrientationAngle angle);	void setOrientationAngle(M::OrientationAngle angle);


	skipping to change at line 439	skipping to change at line 465
	*/	*/
	void lockOrientation();	void lockOrientation();

	/*!	/*!
	Unlocks window's orientation changes. Equal to calling setOrientation Locked(false).	Unlocks window's orientation changes. Equal to calling setOrientation Locked(false).

	\sa setOrientationLocked(), lockOrientation()	\sa setOrientationLocked(), lockOrientation()
	*/	*/
	void unlockOrientation();	void unlockOrientation();


		/*!
		Allows notification preview banners to appear over this window. Equal
		to calling setNotificationPreviewsVisible(true).

		\sa setNotificationPreviewsVisible(), notificationPreviewsVisible()
		*/
		void enableNotificationPreviews();

		/*!
		Prevents notification preview banners from appearing over this window.
		Equal to calling setNotificationPreviewsVisible(false).

		\sa setNotificationPreviewsVisible(), notificationPreviewsVisible()
		*/
		void disableNotificationPreviews();

	Q_SIGNALS:	Q_SIGNALS:
	/*!	/*!
	Emitted after the scene geometry has changed during rotation.	Emitted after the scene geometry has changed during rotation.

	This is for widgets that need to react when the orientation is about t o change,	This is for widgets that need to react when the orientation is about t o change,
	and is emitted after the scene geometry has changed and the rotation a nimation	and is emitted after the scene geometry has changed and the rotation a nimation
	is about to start.	is about to start.

	\note This signal is emitted at start of the rotation animation.	\note This signal is emitted at start of the rotation animation.
	\sa orientationChanged()	\sa orientationChanged()

	skipping to change at line 478	skipping to change at line 518
	If window doesn't have the scene manager, this signal is emitted toget her with	If window doesn't have the scene manager, this signal is emitted toget her with
	orientationChanged().	orientationChanged().

	\note This signal is emitted with every orientation angle change.	\note This signal is emitted with every orientation angle change.

	\sa orientationChanged()	\sa orientationChanged()
	*/	*/
	void orientationChangeFinished(M::Orientation);	void orientationChangeFinished(M::Orientation);

	/*!	/*!

	This signal is emitted when the window is shown or is not obscured any	This signal is emitted when:
	more by another window.	- the window becomes visible
		- is not obscured anymore by another window


	Note: this is different from Qt's visibilityChanged(), which is emitte	Calling show() will emit displayEntered() when the window becomes
	d due to show() and hide().	visible.
	*/	*/
	void displayEntered();	void displayEntered();

	/*!	/*!

	A signal that is emitted when the window gets obscured by another wind	A signal that is emitted when:
	ow.	- the window has been obscured by another window approximately for one
		second
		- the window gets hidden
		- the window gets closed


	Note: this is different from Qt's visibilityChanged(), which is emitte d due to show() and hide().	Calling close() will immediately emit displayExited().
	*/	*/
	void displayExited();	void displayExited();

	/*!	/*!
	This signal is emitted when the window has entered the task switcer.	This signal is emitted when the window has entered the task switcer.
	*/	*/
	void switcherEntered();	void switcherEntered();

	/*!	/*!
	This signal is emitted when the window has exited the task switcer.	This signal is emitted when the window has exited the task switcer.

	skipping to change at line 516	skipping to change at line 562

	/*!	/*!
	This event handler allows a window to notify subscribers about	This event handler allows a window to notify subscribers about
	changes in its presence on the display. enterDisplayEvent() and exitDi splayEvent()	changes in its presence on the display. enterDisplayEvent() and exitDi splayEvent()
	convenience handlers are called by the default implementation. MOnDisp layChangeEvent	convenience handlers are called by the default implementation. MOnDisp layChangeEvent
	is sent e.g. if the window gets obscured by another window.	is sent e.g. if the window gets obscured by another window.
	*/	*/
	virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);	virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);

	/*!	/*!

	A handler that is called when the window is shown or is not obscured a	* A handler that is called just before displayEntered() is emitted.
	nymore by another window.

	Note: this is different from Qt's visibilityChanged(), which is emitte
	d due to show() and hide().
	*/	*/
	virtual void enterDisplayEvent();	virtual void enterDisplayEvent();

	/*!	/*!

	A handler that is called when the window gets obscured by another wind	* A handler that is called just before displayExited() is emitted.
	ow.

	Note: this is different from Qt's visibilityChanged(), which is emitte
	d due to show() and hide().
	*/	*/
	virtual void exitDisplayEvent();	virtual void exitDisplayEvent();

	//! \internal	//! \internal
	explicit MWindow(MWindowPrivate &dd, QWidget *parent = 0);	explicit MWindow(MWindowPrivate &dd, QWidget *parent = 0);
	explicit MWindow(MWindowPrivate &dd, MScene scene, QWidget parent = 0 );	explicit MWindow(MWindowPrivate &dd, MScene scene, QWidget parent = 0 );
	explicit MWindow(MWindowPrivate &dd, MSceneManager sceneManager, QWidg et parent = 0);	explicit MWindow(MWindowPrivate &dd, MSceneManager sceneManager, QWidg et parent = 0);

	virtual void setVisible(bool visible);	virtual void setVisible(bool visible);


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

	minputmethodstate.h	minputmethodstate.h

	skipping to change at line 101	skipping to change at line 101
	public Q_SLOTS:	public Q_SLOTS:
	//! \brief Set the orientation of application's active window to \a new Orientation	//! \brief Set the orientation of application's active window to \a new Orientation
	void setActiveWindowOrientationAngle(M::OrientationAngle newOrientation );	void setActiveWindowOrientationAngle(M::OrientationAngle newOrientation );

	//! \brief Set input method area to \a newRegion	//! \brief Set input method area to \a newRegion
	void setInputMethodArea(const QRect &newRegion);	void setInputMethodArea(const QRect &newRegion);

	/*!	/*!
	* \brief Register an input method toolbar which is defined in \a fileN ame.	* \brief Register an input method toolbar which is defined in \a fileN ame.
	* \param \a fileName is the absolute file name of a custom toolbar, o r the relative file under	* \param \a fileName is the absolute file name of a custom toolbar, o r the relative file under

	* /usr/share/meegotouch/imtoolbars/.	* /usr/share/meegoimframework/imtoolbars/ (relative path deprecat ed).
	* \return the registered unique identifier of this toolbar.	* \return the registered unique identifier of this toolbar.
	*/	*/
	int registerToolbar(const QString &fileName);	int registerToolbar(const QString &fileName);

	/*!	/*!
	* \brief Unregister an input method toolbar which unique id \a id.	* \brief Unregister an input method toolbar which unique id \a id.
	* \param \a id is the unique identifier of the registered toolbar.	* \param \a id is the unique identifier of the registered toolbar.
	*/	*/
	void unregisterToolbar(int id);	void unregisterToolbar(int id);


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

	mpannablewidget.h	mpannablewidget.h

	skipping to change at line 290	skipping to change at line 290
	*/	*/
	MPannableWidget(MPannableWidgetPrivate dd, MPannableWidgetModel model ,	MPannableWidget(MPannableWidgetPrivate dd, MPannableWidgetModel model ,
	QGraphicsItem *parent);	QGraphicsItem *parent);

	//! \reimp	//! \reimp
	virtual void cancelEvent(MCancelEvent *event);	virtual void cancelEvent(MCancelEvent *event);
	virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);	virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);
	virtual void panGestureEvent(QGestureEvent event, QPanGesture state);	virtual void panGestureEvent(QGestureEvent event, QPanGesture state);
	virtual void tapAndHoldGestureEvent(QGestureEvent event, QTapAndHoldGe sture gesture);	virtual void tapAndHoldGestureEvent(QGestureEvent event, QTapAndHoldGe sture gesture);
	virtual void orientationChangeEvent(MOrientationChangeEvent *event);	virtual void orientationChangeEvent(MOrientationChangeEvent *event);

		virtual QVariant itemChange(GraphicsItemChange change, const QVariant & value);
	//! \reimp_end	//! \reimp_end

	private:	private:
	Q_DISABLE_COPY(MPannableWidget)	Q_DISABLE_COPY(MPannableWidget)
	Q_DECLARE_PRIVATE(MPannableWidget)	Q_DECLARE_PRIVATE(MPannableWidget)


		Q_PRIVATE_SLOT(d_func(), void _q_resetPhysics())

	#ifdef UNIT_TEST	#ifdef UNIT_TEST
	// Test unit is defined as a friend of production code to access privat e members	// Test unit is defined as a friend of production code to access privat e members
	friend class Ut_MPannableWidget;	friend class Ut_MPannableWidget;
	#endif	#endif

	friend class MPannableWidgetGlass;	friend class MPannableWidgetGlass;

	// We are using a hack which will allow reimplementing the panGestureEv ent	// We are using a hack which will allow reimplementing the panGestureEv ent
	// method in the pannable widget without recompilation of all client ap plications.	// method in the pannable widget without recompilation of all client ap plications.
	// This needs to be deleted when API unfreeze will finally happen.	// This needs to be deleted when API unfreeze will finally happen.

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

	mtextedit.h	mtextedit.h

	skipping to change at line 401	skipping to change at line 401
	* input panel will be requested.	* input panel will be requested.
	*/	*/
	void setAutoSipEnabled(bool enabled);	void setAutoSipEnabled(bool enabled);

	//! \sa setAutoSipEnabled	//! \sa setAutoSipEnabled
	bool isAutoSipEnabled() const;	bool isAutoSipEnabled() const;

	/*!	/*!
	* \brief Attaches a custom toolbar named \a name.	* \brief Attaches a custom toolbar named \a name.
	* \param name is the absolute file name of a custom toolbar, or the r elative file under	* \param name is the absolute file name of a custom toolbar, or the r elative file under

	* /usr/share/meegotouch/imtoolbars/.	* /usr/share/meegoimframework/imtoolbars/ (relative path deprecat ed).
	* Note if another toolbar is already attached, detachToolbar() will be automatically called.	* Note if another toolbar is already attached, detachToolbar() will be automatically called.
	*	*
	* This method is provided for convenience. Equals with widget uses MIn putMethodState::registerToolbar()	* This method is provided for convenience. Equals with widget uses MIn putMethodState::registerToolbar()
	* to register a toolbar and obtain its identifier, then calls attachTo olbar(int) to attach.	* to register a toolbar and obtain its identifier, then calls attachTo olbar(int) to attach.
	* The registered toolbar is valid until this widget attaches to anothe r toolbar, or calls detachToolbar(),	* The registered toolbar is valid until this widget attaches to anothe r toolbar, or calls detachToolbar(),
	* or widget is deleted.	* or widget is deleted.
	* \sa attachToolbar(int), MInputMethodState::registerToolbar()	* \sa attachToolbar(int), MInputMethodState::registerToolbar()
	*/	*/
	void attachToolbar(const QString &name);	void attachToolbar(const QString &name);


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

	mtexteditstyle.h	mtexteditstyle.h

	skipping to change at line 45	skipping to change at line 45
	M_STYLE_ATTRIBUTE(QColor, selectionTextColor, SelectionText Color)	M_STYLE_ATTRIBUTE(QColor, selectionTextColor, SelectionText Color)
	M_STYLE_ATTRIBUTE(QColor, selectionBackgroundColor, SelectionBack groundColor)	M_STYLE_ATTRIBUTE(QColor, selectionBackgroundColor, SelectionBack groundColor)
	M_STYLE_ATTRIBUTE(qreal, selectionThreshold, SelectionThre shold)	M_STYLE_ATTRIBUTE(qreal, selectionThreshold, SelectionThre shold)
	M_STYLE_ATTRIBUTE(bool, allowViewReposition, AllowViewRepo sition)	M_STYLE_ATTRIBUTE(bool, allowViewReposition, AllowViewRepo sition)
	M_STYLE_ATTRIBUTE(bool, disableMagnifier, DisableMagnif ier)	M_STYLE_ATTRIBUTE(bool, disableMagnifier, DisableMagnif ier)
	M_STYLE_ATTRIBUTE(QString, maskString, MaskString)	M_STYLE_ATTRIBUTE(QString, maskString, MaskString)
	M_STYLE_ATTRIBUTE(QColor, promptColor, PromptColor)	M_STYLE_ATTRIBUTE(QColor, promptColor, PromptColor)
	M_STYLE_ATTRIBUTE(QString, pasteFailedIcon, PasteFailedIc on)	M_STYLE_ATTRIBUTE(QString, pasteFailedIcon, PasteFailedIc on)
	M_STYLE_ATTRIBUTE(int, pasteFailedDuration, PasteFailedDu ration)	M_STYLE_ATTRIBUTE(int, pasteFailedDuration, PasteFailedDu ration)
	M_STYLE_ATTRIBUTE(int, maskingDelay, MaskingDelay)	M_STYLE_ATTRIBUTE(int, maskingDelay, MaskingDelay)

		M_STYLE_ATTRIBUTE(int, cursorWidth, CursorWidth)

	/*!	/*!
	\property MTextEditStyle::pressBoundaryFeedback	\property MTextEditStyle::pressBoundaryFeedback
	\brief Feedback given when pressing between words	\brief Feedback given when pressing between words
	*/	*/
	M_STYLE_ATTRIBUTE(MFeedback, pressBoundaryFeedback, PressBoundaryFeedba ck)	M_STYLE_ATTRIBUTE(MFeedback, pressBoundaryFeedback, PressBoundaryFeedba ck)

	/*!	/*!
	\property MTextEditStyle::releaseBoundaryFeedback	\property MTextEditStyle::releaseBoundaryFeedback
	\brief Feedback given when releasing between words	\brief Feedback given when releasing between words

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