mapplication.h		mapplication.h
	skipping to change at line 254		skipping to change at line 254
	void prestartReleased();		void prestartReleased();
	/*!		/*!
	* Signal that is emitted when the application has been restored		* Signal that is emitted when the application has been restored
	* to the prestarted state.		* to the prestarted state.
	*/		*/
	void prestartRestored();		void prestartRestored();
	#ifdef Q_WS_X11		#ifdef Q_WS_X11
	/*!		/*!
			* Signal that is emitted when the application is being minimized to sw
			itcher
			* and the minimize animation started.
			*/
			void minimizing();
			/*!
			* Signal that is emitted when the application is being minimized to sw
			itcher
			* and the minimize animation finished.
			*/
			void minimized();
			/*!
			* Signal that is emitted when the application is being minimized to sw
			itcher
			* and the minimize animation was canceled (the window wasn't minimized
			).
			*
			* \note This signal is useful only when the window manager provides mi
			nimize animation
			* that's capable of being canceled.
			*/
			void minimizingCanceled();
			/*!
	* Signal application about a changed X pixmap		* Signal application about a changed X pixmap
	*/		*/
	void damageEvent(Qt::HANDLE &damage, short &x, short &y, unsigned short &width, unsigned short &height);		void damageEvent(Qt::HANDLE &damage, short &x, short &y, unsigned short &width, unsigned short &height);
	#endif		#endif
	protected:		protected:
	MApplication(MApplicationPrivate &dd, int &argc, char **argv, const QSt ring &appIdentifier = QString());		MApplication(MApplicationPrivate &dd, int &argc, char **argv, const QSt ring &appIdentifier = QString());
	MApplicationPrivate *const d_ptr;		MApplicationPrivate *const d_ptr;
	#ifdef Q_WS_X11		#ifdef Q_WS_X11
End of changes. 1 change blocks.
	0 lines changed or deleted		26 lines changed or added

	mapplicationmenuview.h		mapplicationmenuview.h
	skipping to change at line 115		skipping to change at line 115
	virtual void applyStyle();		virtual void applyStyle();
	//! \reimp_end		//! \reimp_end
	MApplicationMenuView(MApplicationMenuViewPrivate &dd, MApplicationMenu *controller);		MApplicationMenuView(MApplicationMenuViewPrivate &dd, MApplicationMenu *controller);
	private:		private:
	Q_DISABLE_COPY(MApplicationMenuView)		Q_DISABLE_COPY(MApplicationMenuView)
	Q_DECLARE_PRIVATE(MApplicationMenuView)		Q_DECLARE_PRIVATE(MApplicationMenuView)
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Pt_MApplicationMenu;		friend class Pt_MApplicationMenu;
			friend class Ut_MApplicationMenu;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	mapplicationpage.h		mapplicationpage.h
	skipping to change at line 375		skipping to change at line 375
	/*!		/*!
	\brief Area of the page whose content is not covered by any bar		\brief Area of the page whose content is not covered by any bar
	Returns the current value of MApplicationPage::exposedContentRect p roperty		Returns the current value of MApplicationPage::exposedContentRect p roperty
	\sa exposedContentRectChanged()		\sa exposedContentRectChanged()
	*/		*/
	QRectF exposedContentRect() const;		QRectF exposedContentRect() const;
			/*!
			\brief Sets custom content for the navigation bar
			If set with a valid widget (i.e., pointer different then 0), all navi
			gation
			bar content will be replaced by the given widget. This is useful for
			cases
			that demand more flexibility than what tool buttons added via MAction
			can
			provide.
			This means the application developer is responsible for adding any na
			vigation
			control (back button, close button, menu button, etc) himself.
			The navigation bar will then be composed by its regular background wi
			th
			\a navigationBarContent on top of it, taking the entire area of the n
			avigation
			bar.
			When a navigation bar has custom content, any MAction that would norm
			ally
			be represented by some widget on it (such as a tool button) will no l
			onger
			have any effect. MActions located in the application menu will still
			work, but
			you will have to summon the menu yourself by calling:
			\code
			applicationWindow()->openMenu()
			\endcode
			A typical \a customNavigationBarContent will be a widget with an inte
			rnal layout
			of subwidgets (such as buttons). If you want the text buttons of your
			custom
			navigation bar content to have a native look & feel you should set th
			eir
			syle names to "ToolBarLabelOnlyCommonButton".
			The custom navigation bar content of a page is fetched when that page
			is about to
			start appearing (i.e. transitioning from MSceneWindow::Disappeared to
			MSceneWindow::Appearing or from MSceneWindow::Disappeared to MSceneWi
			ndow::Appeared).
			Therefore you should have your customNavigationBarContent() set eithe
			r when your page
			is constructed or inside its createContent() method. Changing the
			customNavigationBarContent() of a page while it's being displayed (it
			s state is
			different than MSceneWindow::Disappeared) is not supported and leads
			to undefined
			behavior.
			While a page is being displayed, the widget returned by customNavigat
			ionBarContent()
			will be reparented to the navigation bar. When a page is leaving the
			screen,
			customNavigationBarContent() will be removed from the scene and will
			have its
			parent set to zero (null).
			The widget pointed by customNavigationBarContent() is deleted by MApp
			licationPage's
			destructor. Any previously set customNavigationBarContent will be del
			eted and
			replaced by \a customNavigationBarContent.
			\sa customNavigationBarContent()
			*/
			void setCustomNavigationBarContent(QGraphicsWidget *customNavigationBar
			Content);
			/*!
			\brief Returns the custom content for the navigation bar
			By default it returns 0 (null).
			\sa setCustomNavigationBarContent()
			*/
			QGraphicsWidget *customNavigationBarContent();
	Q_SIGNALS:		Q_SIGNALS:
	//! Signal emitted when back button called		//! Signal emitted when back button called
	void backButtonClicked();		void backButtonClicked();
	/*! \brief Signal emitted when close button is clicked.		/*! \brief Signal emitted when close button is clicked.
	* This can happen when escapeButtonMode() is set to MEscapeButtonPanel Model::CloseMode.		* This can happen when escapeButtonMode() is set to MEscapeButtonPanel Model::CloseMode.
	*		*
	* Note that the close() slot of the associated MApplicationWindow will also get called		* Note that the close() slot of the associated MApplicationWindow will also get called
	* when the close button is clicked.		* when the close button is clicked.
	*		*
	skipping to change at line 411		skipping to change at line 469
	disappears, which makes the exposed content area of the page bigger or smaller.		disappears, which makes the exposed content area of the page bigger or smaller.
	Appearance or disappearance of transient scene windows such as dial ogs and		Appearance or disappearance of transient scene windows such as dial ogs and
	notifications does not change the exposed content rectangle of the page.		notifications does not change the exposed content rectangle of the page.
	Overlays are also not considered.		Overlays are also not considered.
	\sa exposedContentRect()		\sa exposedContentRect()
	*/		*/
	void exposedContentRectChanged();		void exposedContentRectChanged();
			/*!
			\brief Emitted when a different custom navigation bar content widget
			is set.
			\sa setCustomNavigationBarContent()
			*/
			void customNavigationBarContentChanged();
	public Q_SLOTS:		public Q_SLOTS:
	/*!		/*!
	\brief Sets the MApplicationPage::autoMarginsForComponentsEnabled p roperty.		\brief Sets the MApplicationPage::autoMarginsForComponentsEnabled p roperty.
	*/		*/
	void setAutoMarginsForComponentsEnabled(bool enabled);		void setAutoMarginsForComponentsEnabled(bool enabled);
	/**		/**
	* \brief Sets the given widget to be the page's central widget.		* \brief Sets the given widget to be the page's central widget.
	* It's also possible to use the default widget, as a parent for all wi dgets		* It's also possible to use the default widget, as a parent for all wi dgets
	* using the centralWidget() function.		* using the centralWidget() function.
End of changes. 2 change blocks.
	0 lines changed or deleted		88 lines changed or added

	mapplicationwindow.h		mapplicationwindow.h
	skipping to change at line 132		skipping to change at line 132
	* \sa isChained()		* \sa isChained()
	*/		*/
	WId chainParentWinId() const;		WId chainParentWinId() const;
	/*!		/*!
	* Returns true if the window is chained otherwise false.		* Returns true if the window is chained otherwise false.
	*/		*/
	bool isChained() const;		bool isChained() const;
	#endif		#endif
			/*!
			Returns the style name of the application window.
			*/
			QString styleName() const;
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	This signal is emitted after \page has become shown.		This signal is emitted after \page has become shown.
	*/		*/
	void pageChanged(MApplicationPage *page);		void pageChanged(MApplicationPage *page);
	public Q_SLOTS:		public Q_SLOTS:
	/*!		/*!
	* Opens the application menu of the window, provided that there		* Opens the application menu of the window, provided that there
	skipping to change at line 163		skipping to change at line 168
	*/		*/
	void setWindowIconID(const QString &windowIconID);		void setWindowIconID(const QString &windowIconID);
	/**		/**
	* Sets the view type of the toolbar for the window.		* Sets the view type of the toolbar for the window.
	* \param view type of the toolbar; possible values are MToolBar::tabTy pe, MToolBar::defaultType		* \param view type of the toolbar; possible values are MToolBar::tabTy pe, MToolBar::defaultType
	* \sa MToolBar		* \sa MToolBar
	*/		*/
	void setToolbarViewType(const MTheme::ViewType& viewType);		void setToolbarViewType(const MTheme::ViewType& viewType);
			/*!
			Set the style name to \a name.
			This function sets the style name property of the application window
			to \a name
			and reloads application window style. The style name is used to selec
			t a style with
			a matching name from the theme.
			\sa styleName()
			*/
			void setStyleName(const QString &name);
	protected:		protected:
	//! \internal		//! \internal
	explicit MApplicationWindow(MApplicationWindowPrivate &dd, QWidget *par ent = 0);		explicit MApplicationWindow(MApplicationWindowPrivate &dd, QWidget *par ent = 0);
	explicit MApplicationWindow(MApplicationWindowPrivate &dd, MScene *scen e = 0, QWidget *parent = 0);		explicit MApplicationWindow(MApplicationWindowPrivate &dd, MScene *scen e = 0, QWidget *parent = 0);
	//! \internal_end		//! \internal_end
	//! \reimp		//! \reimp
	virtual bool event(QEvent *event);		virtual bool event(QEvent *event);
	virtual void closeEvent(QCloseEvent *event);		virtual void closeEvent(QCloseEvent *event);
	virtual void mousePressEvent(QMouseEvent *event);		virtual void mousePressEvent(QMouseEvent *event);
	skipping to change at line 199		skipping to change at line 215
	Q_PRIVATE_SLOT(d_func(), void _q_updateStatusBarVisibility())		Q_PRIVATE_SLOT(d_func(), void _q_updateStatusBarVisibility())
	#endif		#endif
	#ifdef M_OS_MAEMO5		#ifdef M_OS_MAEMO5
	Q_PRIVATE_SLOT(d_func(), void _q_exitAppView())		Q_PRIVATE_SLOT(d_func(), void _q_exitAppView())
	#endif //M_OS_MAEMO5		#endif //M_OS_MAEMO5
	Q_PRIVATE_SLOT(d_func(), void _q_updatePageEscapeAuto())		Q_PRIVATE_SLOT(d_func(), void _q_updatePageEscapeAuto())
	Q_PRIVATE_SLOT(d_func(), void _q_updatePageExposedContentRect())		Q_PRIVATE_SLOT(d_func(), void _q_updatePageExposedContentRect())
	Q_PRIVATE_SLOT(d_func(), void _q_navigationBarStateChanged(MSceneWindow ::SceneWindowState newState, MSceneWindow::SceneWindowState oldState))		Q_PRIVATE_SLOT(d_func(), void _q_navigationBarStateChanged(MSceneWindow ::SceneWindowState newState, MSceneWindow::SceneWindowState oldState))
	Q_PRIVATE_SLOT(d_func(), void _q_handleInSwitcherVisibilityChange())		Q_PRIVATE_SLOT(d_func(), void _q_handleInSwitcherVisibilityChange())
	Q_PRIVATE_SLOT(d_func(), void _q_updateStyle())		Q_PRIVATE_SLOT(d_func(), void _q_updateStyle())
			Q_PRIVATE_SLOT(d_func(), void _q_setupNavigationBarCustomContent())
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	0 lines changed or deleted		19 lines changed or added

	mbanner.h		mbanner.h
	skipping to change at line 45		skipping to change at line 45
	the notifications. Depending on the elements that you use when setting up an MBanner,		the notifications. Depending on the elements that you use when setting up an MBanner,
	the component will have different appearances.		the component will have different appearances.
	Although we haven't defined different views for the MBanner, we conside r those three types:		Although we haven't defined different views for the MBanner, we conside r those three types:
	\li An event banner is a MBanner with an icon, title and subtitle.		\li An event banner is a MBanner with an icon, title and subtitle.
	\li An information banner is a MBanner with a subtitle (only one label)		\li An information banner is a MBanner with a subtitle (only one label)
	\li An system banner is a MBanner with an icon an subtitle		\li An system banner is a MBanner with an icon an subtitle
	You should set the stylename through setStyleName() with one of the fo llowing names:		You should set the stylename through setStyleName() with one of the fo llowing names:
	-"EventBanner": used for events as emails, sms, etc.		\li "EventBanner": used for events as emails, sms, etc. Icon, title and
	-"InformationBanner": used to show generic information without icon		subtitle.
	s.		\li "InformationBanner": used to show generic information with icons.
	-"SystemBanner": reserved for system notifications as battery, USB,		\li "SystemBanner": reserved for system notifications, only text.
	updates, etc.
	If you create a MBanner without styleName it will have a default style.		If you create a MBanner without styleName it will have a default style,
			and it will have the
			capability to show any property: title, subtitle, etc.
	In case that your banner contains any combination above mentioned, the styleName will		In case that your banner contains any combination above mentioned, the styleName will
	be configured automatically by the library.		be configured automatically by the library.
			Due to the MBanner has the capability to be shown at the events/lock sc
			reen, it comes with two
			styles for this use case:
			\li EventScreen
			\li LockScreen
			MBanner can switch to different styles in anytime only switching the st
			ylename.
			Note that some styles contain some specific layouts in which some prope
			rties are not show.
			For instance if you create a Event Banner:
			\code
			MBanner *eventBanner = new MBanner();
			eventBanner->setStyleName("EventBanner");
			eventBanner->setIconID("icon-l-settings");
			eventBanner->setTitle("New updates waiting to install");
			eventBanner->setSubtitle("130 files");
			eventBanner->appear(scene(), MSceneWindow::DestroyWhenDone);
			\endcode
			If you want show the look and feel of this MBanner in the event screen
			you only need switch
			the stylename:
			\code
			eventBanner->setStyleName("EventScreen");
			\endcode
			The MBanner layout will be styled with the EventScreen's layout automat
			ically.
	Is highly recommended use a styleName contemplated in the mentioned cat egories. As		Is highly recommended use a styleName contemplated in the mentioned cat egories. As
	a good practice <b>you should setup one of the mentioned stylenames</b> to avoid conflicts		a good practice <b>you should setup one of the mentioned stylenames</b> to avoid conflicts
	in the look and feel.		in the look and feel.
	By default MBanner is dismissed automatically after a certain amount of time. This		By default MBanner is dismissed automatically after a certain amount of time. This
	parameter is defined in mbannerstyle.css under the name of disappear-ti meout.		parameter is defined in mbannerstyle.css under the name of disappear-ti meout.
	The whole MBanner is interactive. If you click the MBanner before the d iappear-timeout		The whole MBanner is interactive. If you click the MBanner before the d iappear-timeout
	is reached it will be dismissed.		is reached it will be dismissed.
	skipping to change at line 77		skipping to change at line 105
	\section MBannerExamples Examples		\section MBannerExamples Examples
	Here's how to launch an event banner from code:		Here's how to launch an event banner from code:
	\code		\code
	MBanner *eventBanner = new MBanner();		MBanner *eventBanner = new MBanner();
	eventBanner->setStyleName("EventBanner");		eventBanner->setStyleName("EventBanner");
	eventBanner->setIconID("icon-l-settings");		eventBanner->setIconID("icon-l-settings");
	eventBanner->setTitle("New updates waiting to install");		eventBanner->setTitle("New updates waiting to install");
	eventBanner->setSubtitle("130 files");		eventBanner->setSubtitle("130 files");
	eventBanner->appear(MSceneWindow::DestroyWhenDone);		eventBanner->appear(scene(), MSceneWindow::DestroyWhenDone);
	\endcode		\endcode
	Here's how to launch an information banner from code:		Here's how to launch an information banner from code:
	\code		\code
	MBanner *infoBanner = new MBanner();		MBanner *infoBanner = new MBanner();
	infoBanner->setStyleName("InformationBanner");		infoBanner->setStyleName("InformationBanner");
	infoBanner->setSubtitle("Info banner with so much information th		infoBanner->setIconID("icon-m-telephony-call-answer");
	at the text wraps in portrait");		infoBanner->setTitle("Info banner with so much information that
	infoBanner->appear(MSceneWindow::DestroyWhenDone);		the text wraps in portrait");
			infoBanner->appear(scene(), MSceneWindow::DestroyWhenDone);
	\endcode		\endcode
	Here's how to launch a system banner from code:		Here's how to launch a system banner from code:
	\code		\code
	MBanner *systemBanner = new MBanner();		MBanner *systemBanner = new MBanner();
	systemBanner->setStyleName("SystemBanner");		systemBanner->setStyleName("SystemBanner");
	systemBanner->setIconID("icon-m-telephony-call-answer");		systemBanner->setTitle("System banner");
	systemBanner->setSubtitle("System banner");		systemBanner->appear(scene(), MSceneWindow::DestroyWhenDone);
	systemBanner->appear(MSceneWindow::DestroyWhenDone);
	\endcode		\endcode
	\sa MNotification		\sa MNotification
	*/		*/
	class M_CORE_EXPORT MBanner : public MSceneWindow		class M_CORE_EXPORT MBanner : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MBanner)		M_CONTROLLER(MBanner)
	public:		public:
	/*!		/*!
	\property MInfoBanner::iconID		\property MBanner::iconID
	\brief Icon for banner.		\brief Icon for banner.
	*/		*/
	Q_PROPERTY(QString iconID READ iconID WRITE setIconID)		Q_PROPERTY(QString iconID READ iconID WRITE setIconID)
	/*!		/*!
	\property MContentItem::title		\property MBanner::title
	\brief See MContentItemModel::title		\brief MBanner has a title, is the primary text
	*/		*/
	Q_PROPERTY(QString title READ title WRITE setTitle)		Q_PROPERTY(QString title READ title WRITE setTitle)
	/*!		/*!
	\property MContentItem::subtitle		\property MBanner::subtitle
	\brief See MContentItemModel::subtitle		\brief MBanner can have a subtitle, is the secondary text
	*/		*/
	Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle)		Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle)
	/*!		/*!
	\property MContentItem::subtitle		\property MBanner::bannerTimeStamp
	\brief See MContentItemModel::subtitle		\brief MBanner can have a timestamp
	*/		*/
	Q_PROPERTY(QDateTime bannerTimeStamp READ bannerTimeStamp WRITE setBann erTimeStamp)		Q_PROPERTY(QDateTime bannerTimeStamp READ bannerTimeStamp WRITE setBann erTimeStamp)
			/*!
			\property MBanner::prefixTimeStamp
			\brief MBanner can have the capability to setup a prefix before the
			timestamp
			Example: Yesterday: 18:00 PM
			*/
			Q_PROPERTY(QString prefixTimeStamp READ prefixTimeStamp WRITE setPrefix
			TimeStamp)
	public:		public:
	/*!		/*!
	\brief Constructs a new banner		\brief Constructs a new banner
	*/		*/
	MBanner();		MBanner();
	/*!		/*!
	Destructor for banner object		Destructor for banner object
	*/		*/
	virtual ~MBanner();		virtual ~MBanner();
	/*!		/*!
	\brief Returns the icon ID of the banner		\brief Returns the icon ID of the banner
	*/		*/
	QString iconID() const;		QString iconID() const;
	/*!		/*!
	\brief clicks info banner		\brief clicks mbanner
	*/		*/
	void click();		void click();
	/*!		/*!
	\brief Get the title.		\brief Get the title.
	*/		*/
	QString title() const;		QString title() const;
	/*!		/*!
	\brief Get the subtitle.		\brief Get the subtitle.
	*/		*/
	QString subtitle() const;		QString subtitle() const;
	/*!		/*!
	\brief Get the subtitle.		\brief Get the timestamp.
	*/		*/
	QDateTime bannerTimeStamp() const;		QDateTime bannerTimeStamp() const;
			/*!
			\brief Get the prefix of the timestamp.
			*/
			QString prefixTimeStamp() const;
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	\brief This signal is emitted when the banner is activated.		\brief This signal is emitted when the banner is activated.
	*/		*/
	void clicked();		void clicked();
	public Q_SLOTS:		public Q_SLOTS:
	/*!		/*!
	\brief Sets the icon for the banner.		\brief Sets the icon for the banner.
	\param iconId Icon ID for the banner (for event banners)		\param iconId Icon ID for the banner (for event banners)
	*/		*/
	void setIconID(const QString &iconID);		void setIconID(const QString &iconID);
	/**		/**
	\brief Set title text. This is first line.		\brief Set title text. This is first line.
	\param text text.		\param Title text.
	*/		*/
	void setTitle(const QString &text);		void setTitle(const QString &text);
	/**		/**
	\brief Set subtitle text. This is second line.		\brief Set subtitle text. This is second line.
	\param text text.		\param Subtitle text.
	*/		*/
	void setSubtitle(const QString &text);		void setSubtitle(const QString &text);
	/**		/**
	\brief Set subtitle text. This is second line.		\brief Set timestamp text. This is third line.
	\param text text.		\param Timestamp QDateTime.
	*/		*/
	void setBannerTimeStamp(const QDateTime &date);		void setBannerTimeStamp(const QDateTime &date);
			/**
			\brief Set prefix timestamp text. This is third line before the tim
			estamp.
			\param Prefix text.
			*/
			void setPrefixTimeStamp(const QString &text);
	private:		private:
	Q_DISABLE_COPY(MBanner)		Q_DISABLE_COPY(MBanner)
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MBanner;		friend class Ut_MBanner;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 18 change blocks.
	26 lines changed or deleted		80 lines changed or added

	mbannermodel.h		mbannermodel.h
	skipping to change at line 32		skipping to change at line 32
	#include "mscenewindowmodel.h"		#include "mscenewindowmodel.h"
	#include <QDateTime>		#include <QDateTime>
	class M_CORE_EXPORT MBannerModel : public MSceneWindowModel		class M_CORE_EXPORT MBannerModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MBannerModel)		M_MODEL_INTERNAL(MBannerModel)
	/*!		/*!
	\property Icon in banner.		\property Icon in mbanner.
	*/		*/
	M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())		M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())
	/*!		/*!
	\property Title for event banner		\property Title for mbanner
	*/		*/
	M_MODEL_PROPERTY(QString, title, Title, true, QString())		M_MODEL_PROPERTY(QString, title, Title, true, QString())
	/*!		/*!
	\property Subtitle for event banner		\property Subtitle for mbanner
	*/		*/
	M_MODEL_PROPERTY(QString, subtitle, Subtitle, true, QString())		M_MODEL_PROPERTY(QString, subtitle, Subtitle, true, QString())
	/*!		/*!
	\property Datetime		\property Timestamp
	*/		*/
	M_MODEL_PROPERTY(QDateTime, bannerTimeStamp, BannerTimeStamp, true, QDa teTime())		M_MODEL_PROPERTY(QDateTime, bannerTimeStamp, BannerTimeStamp, true, QDa teTime())
			/*!
			\property Prefix timestamp mbanner
			*/
			M_MODEL_PROPERTY(QString, prefixTimeStamp, PrefixTimeStamp, true, QStri
			ng())
	};		};
	#endif		#endif
End of changes. 5 change blocks.
	4 lines changed or deleted		11 lines changed or added

	mbasiclayoutanimationstyle.h		mbasiclayoutanimationstyle.h
	skipping to change at line 39		skipping to change at line 39
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MBasicLayoutAnimationStyle)		M_STYLE_INTERNAL(MBasicLayoutAnimationStyle)
	M_STYLE_ATTRIBUTE(int, duration, Duration)		M_STYLE_ATTRIBUTE(int, duration, Duration)
	M_STYLE_ATTRIBUTE(QEasingCurve, xTranslationEasingCurve, XTranslationEa singCurve)		M_STYLE_ATTRIBUTE(QEasingCurve, xTranslationEasingCurve, XTranslationEa singCurve)
	M_STYLE_ATTRIBUTE(QEasingCurve, yTranslationEasingCurve, YTranslationEa singCurve)		M_STYLE_ATTRIBUTE(QEasingCurve, yTranslationEasingCurve, YTranslationEa singCurve)
	M_STYLE_ATTRIBUTE(QEasingCurve, opacityEasingCurve, OpacityEasingCurve)		M_STYLE_ATTRIBUTE(QEasingCurve, opacityEasingCurve, OpacityEasingCurve)
	M_STYLE_ATTRIBUTE(qreal, initialShowingOpacity, InitialShowingOpacity)		M_STYLE_ATTRIBUTE(qreal, initialShowingOpacity, InitialShowingOpacity)
	M_STYLE_ATTRIBUTE(qreal, finalHidingOpacity, FinalHidingOpacity)		M_STYLE_ATTRIBUTE(qreal, finalHidingOpacity, FinalHidingOpacity)
			M_STYLE_ATTRIBUTE(bool, animateOpacity, AnimateOpacity)
	};		};
	// TODO: get rid of this container		// TODO: get rid of this container
	class M_CORE_EXPORT MBasicLayoutAnimationStyleContainer : public MLayoutAni mationStyleContainer		class M_CORE_EXPORT MBasicLayoutAnimationStyleContainer : public MLayoutAni mationStyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MBasicLayoutAnimationStyle)		M_STYLE_CONTAINER_INTERNAL(MBasicLayoutAnimationStyle)
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	mbubbleitem.h		mbubbleitem.h
	skipping to change at line 290		skipping to change at line 290
	\sa removeInformationWidget();		\sa removeInformationWidget();
	*/		*/
	void addInformationWidget(QGraphicsWidget *widget);		void addInformationWidget(QGraphicsWidget *widget);
	/**		/**
	Removes the \a widget from the informational widgets stack.		Removes the \a widget from the informational widgets stack.
	Informational widgets are displayed as part of the message bubble mai n body.		Informational widgets are displayed as part of the message bubble mai n body.
	There are two pre-defined information widgets for the bubble: number of comments and thumbs up received.		There are two pre-defined information widgets for the bubble: number of comments and thumbs up received.
	The parent item of the widget in graphics hierarchy is set to NULL, s		The removed widget is removed from the scene hierarchy and the owners
	o the widget will not be displayed.		hip is transfered to caller.
	The ownership is transfered to caller.
	\sa informationWidgets()		\sa informationWidgets()
	\sa setCommentsString();		\sa setCommentsString();
	\sa setThumbsUpString();		\sa setThumbsUpString();
	\sa addInformationWidget();		\sa addInformationWidget();
	*/		*/
	void removeInformationWidget(QGraphicsWidget *widget);		void removeInformationWidget(QGraphicsWidget *widget);
	/**		/**
	Sets the string for number of comments received for the bubble item t o \a comments.		Sets the string for number of comments received for the bubble item t o \a comments.
End of changes. 1 change blocks.
	3 lines changed or deleted		2 lines changed or added

	mbuttongroup.h		mbuttongroup.h
	skipping to change at line 344		skipping to change at line 344
	protected:		protected:
	//! \internal		//! \internal
	MButtonGroupPrivate *const d_ptr;		MButtonGroupPrivate *const d_ptr;
	//! \internal_end		//! \internal_end
	private:		private:
	Q_DISABLE_COPY(MButtonGroup)		Q_DISABLE_COPY(MButtonGroup)
	Q_DECLARE_PRIVATE(MButtonGroup)		Q_DECLARE_PRIVATE(MButtonGroup)
	private:
	//! \internal
	void validateExclusivity();
	//! \internal_end
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	6 lines changed or deleted		0 lines changed or added

	mbuttonswitchstyle.h		mbuttonswitchstyle.h
	skipping to change at line 64		skipping to change at line 64
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, sliderImage, SliderImage)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, sliderImage, SliderImage)
	/*!		/*!
	\property MButtonSwitchStyle::sliderImageSelected		\property MButtonSwitchStyle::sliderImageSelected
	\brief Image for the sliding backgrouckground when it's selected.		\brief Image for the sliding backgrouckground when it's selected.
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, sliderImageSelected, SliderImag eSelected)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, sliderImageSelected, SliderImag eSelected)
	/*!		/*!
	\property MButtonSwitchStyle::sliderMask
	\brief Image for masking the sliding background.
	*/
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, sliderMask, SliderMask)
	/*!
	\property MButtonSwitchStyle::thumbImage		\property MButtonSwitchStyle::thumbImage
	\brief Image for the thumb of the switch.		\brief Image for the thumb of the switch.
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, thumbImage, ThumbImage)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, thumbImage, ThumbImage)
	/*!		/*!
			\property MButtonSwitchStyle::thumbImageShadow
			\brief Image for the shadow of the thumb of the switch.
			*/
			M_STYLE_PTR_ATTRIBUTE(MScalableImage *, thumbImageShadow, ThumbImageSh
			adow)
			/*!
			\property MButtonSwitchStyle::thumbShadowOffset
			\brief The offset of the shadow of the thumb of the switch.
			*/
			M_STYLE_ATTRIBUTE(QPointF, thumbShadowOffset, ThumbShadowOffset)
			/*!
	\property MButtonSwitchStyle::pressOnFeedback		\property MButtonSwitchStyle::pressOnFeedback
	\brief Feedback given when pressing a switch about to switch on		\brief Feedback given when pressing a switch about to switch on
	*/		*/
	M_STYLE_ATTRIBUTE(MFeedback, pressOnFeedback, PressOnFeedback)		M_STYLE_ATTRIBUTE(MFeedback, pressOnFeedback, PressOnFeedback)
	/*!		/*!
	\property MButtonSwitchStyle::pressOffFeedback		\property MButtonSwitchStyle::pressOffFeedback
	\brief Feedback given when pressing a switch about to switch off		\brief Feedback given when pressing a switch about to switch off
	*/		*/
	M_STYLE_ATTRIBUTE(MFeedback, pressOffFeedback, PressOffFeedback)		M_STYLE_ATTRIBUTE(MFeedback, pressOffFeedback, PressOffFeedback)
End of changes. 2 change blocks.
	6 lines changed or deleted		13 lines changed or added

	mbuttonswitchview.h		mbuttonswitchview.h
	skipping to change at line 114		skipping to change at line 113
	protected:		protected:
	//! \reimp		//! \reimp
	virtual void drawContents(QPainter *painter, const QStyleOptionGraphics Item *option) const;		virtual void drawContents(QPainter *painter, const QStyleOptionGraphics Item *option) const;
	virtual void applyStyle();		virtual void applyStyle();
	virtual void setupModel();		virtual void setupModel();
	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);		virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	virtual void cancelEvent(MCancelEvent *event);		virtual void cancelEvent(MCancelEvent *event);
	//! \reimp_end
	protected slots:
	//! \reimp
	virtual void updateData(const QList<const char *>& modifications);		virtual void updateData(const QList<const char *>& modifications);
	//! \reimp_end		//! \reimp_end
	private slots:
	private:		private:
			Q_PRIVATE_SLOT(d_func(), void _q_toggleCheck())
			private:
	Q_DISABLE_COPY(MButtonSwitchView)		Q_DISABLE_COPY(MButtonSwitchView)
	Q_DECLARE_PRIVATE(MButtonSwitchView)		Q_DECLARE_PRIVATE(MButtonSwitchView)
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MButtonSwitchView;		friend class Ut_MButtonSwitchView;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 5 change blocks.
	8 lines changed or deleted		2 lines changed or added

	mcomponentcache.h		mcomponentcache.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MCOMPONENTCACHE_H		#ifndef MCOMPONENTCACHE_H
	#define MCOMPONENTCACHE_H		#define MCOMPONENTCACHE_H
	#include "mexport.h"		#include "mexport.h"
	#include <QString>		#include <QString>
	class MApplication;		class MApplication;
	class MApplicationWindow;		class MApplicationWindow;
	class MApplicationService;		class MApplicationService;
	class QGLWidget;
	class QGLFormat;
	class MComponentCachePrivate;		class MComponentCachePrivate;
	/*!		/*!
	* \class MComponentCache		* \class MComponentCache
	* \brief MComponentCache contains objects instantiated before running main ().		* \brief MComponentCache contains objects instantiated before running main ().
	*		*
	* MComponentCache enables performance boost on application start-up		* MComponentCache enables performance boost on application start-up
	* times by offering a storage for objects instantiated and		* times by offering a storage for objects instantiated and
	* initialized before launching the application.		* initialized before launching the application.
	*		*
	skipping to change at line 89		skipping to change at line 87
	//! Populates cache for the use of an ordinary Meegotouch application, called by the launcher.		//! Populates cache for the use of an ordinary Meegotouch application, called by the launcher.
	static void populateForMApplication();		static void populateForMApplication();
	//! Populates cache for the use of a web runtime application, called by the launcher.		//! Populates cache for the use of a web runtime application, called by the launcher.
	static void populateForWRTApplication();		static void populateForWRTApplication();
	//! Returns true if cache is currently being populated, otherwise false .		//! Returns true if cache is currently being populated, otherwise false .
	static bool populating();		static bool populating();
	static void cleanupCache();
	protected:		protected:
	static MComponentCachePrivate* const d_ptr;		static MComponentCachePrivate* const d_ptr;
	private:		private:
	Q_DISABLE_COPY(MComponentCache)		Q_DISABLE_COPY(MComponentCache)
	MComponentCache();		MComponentCache();
	/* QGLWidget object returned by glWidget is owned by the caller */
	static QGLWidget* glWidget();
	static QGLWidget* glWidget(const QGLFormat& format);
	friend class MApplicationWindow;		friend class MApplicationWindow;
	friend class MGraphicsSystemHelper;		friend class MGraphicsSystemHelper;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MComponentCache;		friend class Ut_MComponentCache;
	#endif		#endif
	};		};
	#endif // MCOMPONENTCACHE_H		#endif // MCOMPONENTCACHE_H
End of changes. 3 change blocks.
	7 lines changed or deleted		0 lines changed or added

	mcontainer.h		mcontainer.h
	skipping to change at line 136		skipping to change at line 136
	*/		*/
	virtual ~MContainer();		virtual ~MContainer();
	/*!		/*!
	* \brief Returns the widget which is the 'container area'.		* \brief Returns the widget which is the 'container area'.
	*/		*/
	QGraphicsWidget *centralWidget();		QGraphicsWidget *centralWidget();
	/*!		/*!
	* \brief Sets the central widget for container.		* \brief Sets the central widget for container.
			* By default MContainer takes ownership of the centralWidget.
			*
			* If \a destroy is false, the old centralWidget is removed
			* from the scene and its ownership passed back to caller. If \a destro
			y
			* is true (default value), the old central widget is deleted.
	*/		*/
	void setCentralWidget(QGraphicsWidget *centralWidget, bool destroy = tr ue);		void setCentralWidget(QGraphicsWidget *centralWidget, bool destroy = tr ue);
	/*!		/*!
	* \brief Returns the title of the container.		* \brief Returns the title of the container.
	*/		*/
	QString title() const;		QString title() const;
	/*!		/*!
	* \brief Returns the text of the container.		* \brief Returns the text of the container.
End of changes. 1 change blocks.
	0 lines changed or deleted		6 lines changed or added

	mimagewidget.h		mimagewidget.h
	skipping to change at line 41		skipping to change at line 41
	\ingroup widgets		\ingroup widgets
	\section MImageWidgetOverview Overview		\section MImageWidgetOverview Overview
	Image allows the placement of images onto the UI. Images are genera lly non-interactive elements.		Image allows the placement of images onto the UI. Images are genera lly non-interactive elements.
	Various single and multiple touch interactions can be added to an I mage component if so wanted.		Various single and multiple touch interactions can be added to an I mage component if so wanted.
	Image supports scale, crop, zoom operations.		Image supports scale, crop, zoom operations.
	\section MImageWidgetUseGuidelines Usage guidelines		\section MImageWidgetUseGuidelines Usage guidelines
			NOTE: The images passed to MImageWidget are converted internally to
			OpenGL textures, thus their
			maximum size is limited by the GPU driver. Consult the documentatio
			n of the GPU unit for the actual
			maximum texture size. If the image exceeds the maximum supported si
			ze, it shall not be
			drawn.
	Images can be used by themselves to decorate the UI (background ima ges, frames etc.)		Images can be used by themselves to decorate the UI (background ima ges, frames etc.)
	and also combined as part of other components (grids, lists, button s etc.).		and also combined as part of other components (grids, lists, button s etc.).
	If the Image has interactive elements, the touch area size of the i nteractive element needs to be specified.		If the Image has interactive elements, the touch area size of the i nteractive element needs to be specified.
	The area can occupy the entire Image, and/or it can also fall outsi de the Image:		The area can occupy the entire Image, and/or it can also fall outsi de the Image:
	for instance in the case of an Image with a label, they are combine d to form one interactive area.		for instance in the case of an Image with a label, they are combine d to form one interactive area.
	An Image can be on top or below of other images and other component s (determined by the z-order).		An Image can be on top or below of other images and other component s (determined by the z-order).
	MImageWidget provides sizeHint(),		MImageWidget provides sizeHint(),
	default size will be the size which defined in CSS.		default size will be the size which defined in CSS.
End of changes. 1 change blocks.
	0 lines changed or deleted		8 lines changed or added

	minputwidgetrelocator.h		minputwidgetrelocator.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MINPUTWIDGETRELOCATOR_H		#ifndef MINPUTWIDGETRELOCATOR_H
	#define MINPUTWIDGETRELOCATOR_H		#define MINPUTWIDGETRELOCATOR_H
	#include "mnamespace.h"		#include "mnamespace.h"
	#include "mscenewindow.h"		#include "mscenewindow.h"
	#include <QObject>		#include <QObject>
	#include <QPointer>		#include <QPointer>
	#include <QRect>		#include <QRect>
	class MPannableViewport;		class MPannableViewport;
			class MRelocatorStyleContainer;
	class MSceneManager;		class MSceneManager;
	class QGraphicsItem;		class QGraphicsItem;
	class QGraphicsScene;		class QGraphicsScene;
	class QGraphicsWidget;		class QGraphicsWidget;
	enum PostponeRelocationFlag {		enum PostponeRelocationFlag {
	WaitForRotationFinished = 0x1,		WaitForRotationFinished = 0x1,
	WaitForAnimationsFinished = 0x2		WaitForAnimationsFinished = 0x2
	};		};
	Q_DECLARE_FLAGS(PostponeRelocationFlags, PostponeRelocationFlag)		Q_DECLARE_FLAGS(PostponeRelocationFlags, PostponeRelocationFlag)
	skipping to change at line 106		skipping to change at line 107
	signals:		signals:
	//! This signal requests immediate displacement of the given scene wind ow. The signal should be		//! This signal requests immediate displacement of the given scene wind ow. The signal should be
	//! connected to using Qt::DirectConnection, or similar, since after em itting it is assumed the		//! connected to using Qt::DirectConnection, or similar, since after em itting it is assumed the
	//! window has been moved.		//! window has been moved.
	void sceneWindowDislocationRequest(MSceneWindow *sceneWindow, const QPo intF &displacement);		void sceneWindowDislocationRequest(MSceneWindow *sceneWindow, const QPo intF &displacement);
	//! This signal requests undoing previous displacement of a given scene window.		//! This signal requests undoing previous displacement of a given scene window.
	void sceneWindowUndoDislocationRequest(MSceneWindow *sceneWindow);		void sceneWindowUndoDislocationRequest(MSceneWindow *sceneWindow);
			private slots:
			void handleKeyboardStateChange();
	private:		private:
	//! Supported relocation operation types.		//! Supported relocation operation types.
	enum RelocationOpType {		enum RelocationOpType {
	RelocationByMovingWindow,		RelocationByMovingWindow,
	RelocationByPanning		RelocationByPanning
	};		};
	//! Relocation operation describes relocation made by one delegate widg et.		//! Relocation operation describes relocation made by one delegate widg et.
	struct RelocationOp {		struct RelocationOp {
	RelocationOp(RelocationOpType type, QGraphicsWidget *delegate);		RelocationOp(RelocationOpType type, QGraphicsWidget *delegate);
	RelocationOpType type;		RelocationOpType type;
	QGraphicsWidget *delegate;		QGraphicsWidget *delegate;
	//! This and further operations should not be carried out if input widget is already visible.		//! This and further operations should not be carried out if input widget is already visible.
	bool stopIfVisible;		bool stopIfVisible;
	};		};
			const MRelocatorStyleContainer &style() const;
	//! \brief Gets area of the scene where the input widget can in theory be moved to.		//! \brief Gets area of the scene where the input widget can in theory be moved to.
	//! The rect is returned in rotated scene coordinates.		//! The rect is returned in rotated scene coordinates.
	const QRect &exposedContentRect();		const QRect &exposedContentRect();
	//! \brief Widgets optimal rectangle after relocating, in rotated scene coordinates.		//! \brief Widgets optimal rectangle after relocating, in rotated scene coordinates.
	void relocationRectangles(const QGraphicsWidget &inputWidget, const QRe ct &microFocusRect,		void relocationRectangles(const QGraphicsWidget &inputWidget, const QRe ct &microFocusRect,
	QRect &targetRect, QRect &localRect);		QRect &targetRect, QRect &localRect);
	void ensureTopmostViewportIsPannable();		void ensureTopmostViewportIsPannable();
	void ensureInputWidgetVisible(const QGraphicsWidget &inputWidget);		void ensureInputWidgetVisible(const QGraphicsWidget &inputWidget);
	skipping to change at line 162		skipping to change at line 168
	QGraphicsWidget *focusedWidget() const;		QGraphicsWidget *focusedWidget() const;
	//! Micro focus rectangle of the input widget in rotated scene coordina tes.		//! Micro focus rectangle of the input widget in rotated scene coordina tes.
	QRect microFocusRect() const;		QRect microFocusRect() const;
	//! Scene rectangle in rotated scene coordinates.		//! Scene rectangle in rotated scene coordinates.
	QRect visibleSceneRect() const;		QRect visibleSceneRect() const;
	void moveRectInsideArea(const QRect &area, QRect &rect) const;		void moveRectInsideArea(const QRect &area, QRect &rect) const;
			bool needsRelocating(const QGraphicsWidget &inputWidget, const QRect &l
			ocalRect);
	bool isObscured(const QGraphicsWidget &widget, const QRect &localRect);		bool isObscured(const QGraphicsWidget &widget, const QRect &localRect);
	void clearPostponeRelocationFlag(PostponeRelocationFlag flag);		void clearPostponeRelocationFlag(PostponeRelocationFlag flag);
	private:		private:
	const QGraphicsScene * const scene;		const QGraphicsScene * const scene;
	const QGraphicsItem * const rootElement;		const QGraphicsItem * const rootElement;
	M::Orientation orientation;		M::Orientation orientation;
	QPointer<MSceneWindow> currentPage;		QPointer<MSceneWindow> currentPage;
	skipping to change at line 188		skipping to change at line 196
	QList< QPointer<MPannableViewport> > pannablesToRestore;		QList< QPointer<MPannableViewport> > pannablesToRestore;
	QList< QPointer<MSceneWindow> > sceneWindowsToRestore;		QList< QPointer<MSceneWindow> > sceneWindowsToRestore;
	bool relocating;		bool relocating;
	bool updatePending;		bool updatePending;
	int numOfDisappearingSceneWindows;		int numOfDisappearingSceneWindows;
	int numOfAppearingSceneWindows;		int numOfAppearingSceneWindows;
	PostponeRelocationFlags postponeFlags;		PostponeRelocationFlags postponeFlags;
			QScopedPointer<MRelocatorStyleContainer> styleContainer;
	};		};
	//! \internal_end		//! \internal_end
	#endif // MINPUTWIDGETRELOCATOR_H		#endif // MINPUTWIDGETRELOCATOR_H
End of changes. 5 change blocks.
	0 lines changed or deleted		11 lines changed or added

	mlocale.h		mlocale.h
	skipping to change at line 40		skipping to change at line 40
	class QStringList;		class QStringList;
	class QDateTime;		class QDateTime;
	class QTranslator;		class QTranslator;
	class MCollator;		class MCollator;
	class MAbstractName;		class MAbstractName;
	class MCalendar;		class MCalendar;
	class MBreakIteratorPrivate;		class MBreakIteratorPrivate;
	class MLocalePrivate;		class MLocalePrivate;
	class MStaticLocaleDestroyer;		struct MStaticLocaleDestroyer;
	/*!		/*!
	* \class MLocale		* \class MLocale
	*		*
	* \brief MLocale is a class that implements locale dependent data formatti ng as well as translation, collation and calendar systems.		* \brief MLocale is a class that implements locale dependent data formatti ng as well as translation, collation and calendar systems.
	*		*
	* For more general information about Internationalization in libmeegotouch		* For more general information about Internationalization in libmeegotouch
	* see also the <a href="i18n.html">Internationalization Guidelines</a>		* see also the <a href="i18n.html">Internationalization Guidelines</a>
	*		*
	* The locale system in the MeeGo Touch UI Framework is separated into		* The locale system in the MeeGo Touch UI Framework is separated into
	skipping to change at line 1526		skipping to change at line 1526
	// global default locale		// global default locale
	static MLocale *s_systemDefault;		static MLocale *s_systemDefault;
	static QTranslator *s_ltrTranslator;		static QTranslator *s_ltrTranslator;
	static QTranslator *s_rtlTranslator;		static QTranslator *s_rtlTranslator;
	// private info is kept away from the public header		// private info is kept away from the public header
	MLocalePrivate *const d_ptr;		MLocalePrivate *const d_ptr;
	Q_DECLARE_PRIVATE(MLocale)		Q_DECLARE_PRIVATE(MLocale)
	friend class MCalendar;		friend class MCalendar;
	friend class MCollator;		friend class MCollator;
	friend class MStaticLocaleDestroyer;		friend struct MStaticLocaleDestroyer;
	friend class MIcuBreakIteratorPrivate;		friend class MIcuBreakIteratorPrivate;
	private Q_SLOTS:		private Q_SLOTS:
	void refreshSettings();		void refreshSettings();
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mnavigationbar.h		mnavigationbar.h
	skipping to change at line 99		skipping to change at line 99
	/*!		/*!
	\brief Returns true if escape button is enabled.		\brief Returns true if escape button is enabled.
	*/		*/
	bool escapeButtonEnabled() const;		bool escapeButtonEnabled() const;
	/*!		/*!
	\brief Returns true if escape button is visible.		\brief Returns true if escape button is visible.
	*/		*/
	bool escapeButtonVisible() const;		bool escapeButtonVisible() const;
			//! \internal
			void setCustomContent(QGraphicsWidget *customContent);
			QGraphicsWidget *customContent();
			//! \internal_end
	public Q_SLOTS:		public Q_SLOTS:
	/** \brief Trigger notification of the user via the navigation bar.		/** \brief Trigger notification of the user via the navigation bar.
	*		*
	* This slot asks the NavigationBarView to notify the user, e.g.		* This slot asks the NavigationBarView to notify the user, e.g.
	* by flashing the Home button.		* by flashing the Home button.
	*/		*/
	void notifyUser();		void notifyUser();
	/** \brief Dock a toolbar.		/** \brief Dock a toolbar.
	* \param toolbar The toolbar to dock.		* \param toolbar The toolbar to dock.
End of changes. 1 change blocks.
	0 lines changed or deleted		5 lines changed or added

	mnavigationbarmodel.h		mnavigationbarmodel.h
	skipping to change at line 52		skipping to change at line 52
	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 ())
	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)
	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
			M_MODEL_PTR_PROPERTY(QGraphicsWidget *, customContent, CustomContent, t
			rue, 0)
			//! \internal_end
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		5 lines changed or added

	mnavigationbarview.h		mnavigationbarview.h
	skipping to change at line 61		skipping to change at line 61
	//! \reimp_end		//! \reimp_end
	protected Q_SLOTS:		protected Q_SLOTS:
	//! \reimp		//! \reimp
	virtual void updateData(const QList<const char *>& modifications);		virtual void updateData(const QList<const char *>& modifications);
	//! \reimp_end		//! \reimp_end
	private:		private:
	Q_DISABLE_COPY(MNavigationBarView)		Q_DISABLE_COPY(MNavigationBarView)
	Q_DECLARE_PRIVATE(MNavigationBarView)		Q_DECLARE_PRIVATE(MNavigationBarView)
			friend class Ut_MNavigationBarView;
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	mnotification.h		mnotification.h
	skipping to change at line 120		skipping to change at line 120
	\brief The name of the image to be used in the notification.		\brief The name of the image to be used in the notification.
	*/		*/
	Q_PROPERTY(QString image READ image WRITE setImage)		Q_PROPERTY(QString image READ image WRITE setImage)
	/*!		/*!
	\property MNotification::count		\property MNotification::count
	\brief The number of items represented by this notification.		\brief The number of items represented by this notification.
	*/		*/
	Q_PROPERTY(uint count READ count WRITE setCount)		Q_PROPERTY(uint count READ count WRITE setCount)
			/*!
			\property MNotification::identifier
			\brief The identifier string of the notification. The identifier is e
			mpty by default.
			*/
			Q_PROPERTY(QString identifier READ identifier WRITE setIdentifier)
	public:		public:
	/*!		/*!
	* Predefined event types. These are just the known types; applications		* Predefined event types. These are just the known types; applications
	* may use other types as well if the event type string is known.		* may use other types as well if the event type string is known.
	*/		*/
	//! A generic device-related notification that doesn't fit into any oth er category.		//! A generic device-related notification that doesn't fit into any oth er category.
	static const QString DeviceEvent;		static const QString DeviceEvent;
	//! A device, such as a USB device, was added to the system.		//! A device, such as a USB device, was added to the system.
	static const QString DeviceAddedEvent;		static const QString DeviceAddedEvent;
	//! A device had some kind of error.		//! A device had some kind of error.
	skipping to change at line 270		skipping to change at line 276
	void setCount(uint count);		void setCount(uint count);
	/*!		/*!
	* Gets the number of items represented by this notification (cardinali ty).		* Gets the number of items represented by this notification (cardinali ty).
	*		*
	* \return the number of items represented by this notification		* \return the number of items represented by this notification
	*/		*/
	uint count() const;		uint count() const;
	/*!		/*!
			* Sets an identifier for the notification. Can be any string the appli
			cation
			* needs to identify this particular notification.
			*
			* \param id the identifier
			*/
			void setIdentifier(const QString &identifier);
			/*!
			* Gets the identifier of the notification.
			*
			* \return the identifier.
			*/
			QString identifier() const;
			/*!
	* Publishes the notification. If the notification has not yet been		* Publishes the notification. If the notification has not yet been
	* published a notification is created into the given notification		* published a notification is created into the given notification
	* group (if any) and is given an ID by the notification manager.		* group (if any) and is given an ID by the notification manager.
	* Otherwise the existing notification is updated.		* Otherwise the existing notification is updated.
	*		*
	* \return true if the publishing succeeded, false otherwise		* \return true if the publishing succeeded, false otherwise
	*/		*/
	virtual bool publish();		virtual bool publish();
	/*!		/*!
End of changes. 2 change blocks.
	0 lines changed or deleted		23 lines changed or added

	morientationtracker.h		morientationtracker.h
	skipping to change at line 64		skipping to change at line 64
	private:		private:
	MOrientationTracker();		MOrientationTracker();
	virtual ~MOrientationTracker();		virtual ~MOrientationTracker();
	Q_DISABLE_COPY(MOrientationTracker)		Q_DISABLE_COPY(MOrientationTracker)
	Q_DECLARE_PRIVATE(MOrientationTracker)		Q_DECLARE_PRIVATE(MOrientationTracker)
	friend class MDeviceProfile;		friend class MDeviceProfile;
	friend class MApplicationPrivate;		friend class MApplicationPrivate;
	friend class MWindow;		friend class MWindow;
			friend class MWindowPrivate;
	//! \reimp		//! \reimp
	virtual void childEvent(QChildEvent *event);		virtual void childEvent(QChildEvent *event);
	//! \reimp_end		//! \reimp_end
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MOrientationTracker;		friend class Ut_MOrientationTracker;
	#endif		#endif
			// For testing purposes
			void doUpdateOrientationAngle(M::OrientationAngle angle, bool isKeyboar
			dOpen,
			bool isDeviceFlat, bool tvIsConnected);
			#ifdef Q_WS_X11
			void handleCurrentAppWindowChange();
			void handleCurrentAppWindowOrientationAngleChange();
			#endif
	};		};
	//! \internal_end		//! \internal_end
	#endif // MORIENTATIONTRACKER_H		#endif // MORIENTATIONTRACKER_H
End of changes. 2 change blocks.
	0 lines changed or deleted		10 lines changed or added

	mpreeditinjectionevent.h		mpreeditinjectionevent.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MPREEDITINJECTIONEVENT_H		#ifndef MPREEDITINJECTIONEVENT_H
	#define MPREEDITINJECTIONEVENT_H		#define MPREEDITINJECTIONEVENT_H
	#include "mexport.h"		#include "mexport.h"
	#include <QEvent>		#include <QEvent>
	class MPreeditInjectionEventPrivate;		class MPreeditInjectionEventPrivate;
			/*!
			* \brief The MPreeditInjectionEvent class provides the information about p
			reedit text.
			*
			* MPreeditInjectionEvent should be sent from text edit to input context an
			d offer the word as preedit.
			*/
	class M_CORE_EXPORT MPreeditInjectionEvent : public QEvent		class M_CORE_EXPORT MPreeditInjectionEvent : public QEvent
	{		{
	public:		public:
			/*!
			* \brief Default constructor.
			* \param preedit The word offered as preedit.
			*/
	MPreeditInjectionEvent(const QString &preedit);		MPreeditInjectionEvent(const QString &preedit);
			/*!
			* \brief Constructor.
			* \param preedit The word offered as preedit.
			* \param eventCursorPosition The expected cursor position inside preed
			it. The valid value is from
			* 0 (at the beginning of the preedit) to the length of preedit (at the
			end of preedit).
			*/
			MPreeditInjectionEvent(const QString &preedit, int eventCursorPosition)
			;
			/*!
			*\brief Destructor
			*/
	virtual ~MPreeditInjectionEvent();		virtual ~MPreeditInjectionEvent();
			/*!
			* \brief Returns the offered preedit text.
			*/
	QString preedit() const;		QString preedit() const;
			/*!
			* \brief Returns the expected cursor position inside preedit.
			*
			* Note the eventCursorPosition is not the real cursor position, while
			it is the cursor position inside
			* preedit which this event expects. The input context will decide whet
			her and where to display cursor.
			* The valid value is from 0 (at the beginning of the preedit) to the l
			ength of preedit (at the end
			* of preedit). Other values indicate the cursor position unknown.
			*/
			int eventCursorPosition() const;
	static QEvent::Type eventNumber();		static QEvent::Type eventNumber();
	protected:		protected:
	MPreeditInjectionEventPrivate *const d_ptr;		MPreeditInjectionEventPrivate *const d_ptr;
	private:		private:
	Q_DECLARE_PRIVATE(MPreeditInjectionEvent)		Q_DECLARE_PRIVATE(MPreeditInjectionEvent)
	Q_DISABLE_COPY(MPreeditInjectionEvent)		Q_DISABLE_COPY(MPreeditInjectionEvent)
	};		};
End of changes. 5 change blocks.
	0 lines changed or deleted		42 lines changed or added

	mscalableimage.h		mscalableimage.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MSCALABLEIMAGE_H		#ifndef MSCALABLEIMAGE_H
	#define MSCALABLEIMAGE_H		#define MSCALABLEIMAGE_H
	#include <QObject>		#include <QObject>
	#include "mexport.h"		#include "mexport.h"
	class MScalableImagePrivate;		class MScalableImagePrivate;
	class QPoint;		class QPoint;
			class QPointF;
	class QSize;		class QSize;
			class QSizeF;
			class QRect;
			class QRectF;
	class QPainter;		class QPainter;
	class QPixmap;		class QPixmap;
	class QRect;
	/*!		/*!
	\class MScalableImage		\class MScalableImage
	\brief MScalableImage is a class for drawing scaled pixmaps into screen		\brief MScalableImage is a class for drawing scaled pixmaps into screen
	without breaking the boundaries of the image.		without breaking the boundaries of the image.
	The image is constructed from 9 blocks and it is scalable in every direct ion.		The image is constructed from 9 blocks and it is scalable in every direct ion.
	&lt;corner&gt; &lt;h_edge&gt; &lt;corner&gt;		&lt;corner&gt; &lt;h_edge&gt; &lt;corner&gt;
	&lt;v_edge&gt; &lt;center&gt; &lt;v_edge&gt;		&lt;v_edge&gt; &lt;center&gt; &lt;v_edge&gt;
	skipping to change at line 136		skipping to change at line 139
	*/		*/
	void draw(const QPoint &pos, const QSize &size, QPainter *painter) cons t;		void draw(const QPoint &pos, const QSize &size, QPainter *painter) cons t;
	/*!		/*!
	\brief Draws scalable image.		\brief Draws scalable image.
	\overload		\overload
	*/		*/
	void draw(const QRect &rect, QPainter *painter) const;		void draw(const QRect &rect, QPainter *painter) const;
	/*!		/*!
			\brief Draws scalable image.
			\overload
			*/
			void draw(qreal x, qreal y, qreal w, qreal h, QPainter *painter) const;
			/*!
			\brief Draws scalable image.
			\overload
			*/
			void draw(const QPointF &pos, const QSizeF &size, QPainter *painter) co
			nst;
			/*!
			\brief Draws scalable image.
			\overload
			*/
			void draw(const QRectF &rect, QPainter *painter) const;
			/*!
	\brief Enable/disable optimized rendering.		\brief Enable/disable optimized rendering.
	If \a enable is true, the image patches are packed into one vertex ar ray		If \a enable is true, the image patches are packed into one vertex ar ray
	and it is rendered with one glDrawArray call. If \a enable is false,		and it is rendered with one glDrawArray call. If \a enable is false,
	the image patches are rendered separately.		the image patches are rendered separately.
	\note This method is only for benchmarking purposes and may be remove d		\note This method is only for benchmarking purposes and may be remove d
	in the future.		in the future.
			\deprecated
	*/		*/
	void enableOptimizedRendering(bool enable);		void enableOptimizedRendering(bool enable);
	/*!		/*!
	\brief Draws the scalable image using color channel from pixmap and a lpha channel from scalable image.		\brief Draws the scalable image using color channel from pixmap and a lpha channel from scalable image.
	\param rect Target rectangle, where scalable image is drawn into.		\param rect Target rectangle, where scalable image is drawn into.
	\param pixmapOffset Start sampling offset of the pixmap to be fille d.		\param pixmapOffset Start sampling offset of the pixmap to be fille d.
	\param pixmap Pixmap to be used for filling the opaque areas of the scalable image, this can be NULL.		\param pixmap Pixmap to be used for filling the opaque areas of the scalable image, this can be NULL.
	\param painter Painter to be used for drawing.		\param painter Painter to be used for drawing.
	*/		*/
End of changes. 5 change blocks.
	1 lines changed or deleted		24 lines changed or added

	mscenemanager.h		mscenemanager.h
	skipping to change at line 58		skipping to change at line 58
	* appearance, disappearance and display orientation changes (e.g., from po rtrait		* appearance, disappearance and display orientation changes (e.g., from po rtrait
	* to landscape).		* to landscape).
	*		*
	* \sa MSceneWindow		* \sa MSceneWindow
	*/		*/
	class M_CORE_EXPORT MSceneManager : public QObject		class M_CORE_EXPORT MSceneManager : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	friend class MSceneWindow;		friend class MSceneWindow;
	friend class MWindow;		friend class MWindow;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MSceneManager;		friend class Ut_MSceneManager;
			friend class Ut_MApplicationWindow;
			friend class Ut_MComboBox;
	#endif		#endif
	public:		public:
	/*!		/*!
	* This enum is used to describe whether the orientation change		* This enum is used to describe whether the orientation change
	* invoked manually should be animated or not.		* invoked manually should be animated or not.
	*		*
	* \sa setOrientationAngle()		* \sa setOrientationAngle()
	*/		*/
	skipping to change at line 330		skipping to change at line 333
	Q_PRIVATE_SLOT(d_func(), void _q_changeGlobalOrientationAngle())		Q_PRIVATE_SLOT(d_func(), void _q_changeGlobalOrientationAngle())
	Q_PRIVATE_SLOT(d_func(), void _q_emitOrientationChangeFinished())		Q_PRIVATE_SLOT(d_func(), void _q_emitOrientationChangeFinished())
	Q_PRIVATE_SLOT(d_func(), void _q_unFreezeUI())		Q_PRIVATE_SLOT(d_func(), void _q_unFreezeUI())
	Q_PRIVATE_SLOT(d_func(), void _q_applySceneWindowTransitionsQueuedDueTo OrientationAnimation())		Q_PRIVATE_SLOT(d_func(), void _q_applySceneWindowTransitionsQueuedDueTo OrientationAnimation())
	Q_PRIVATE_SLOT(d_func(), void _q_triggerAsyncPendingOrientationChange() )		Q_PRIVATE_SLOT(d_func(), void _q_triggerAsyncPendingOrientationChange() )
	Q_PRIVATE_SLOT(d_func(), void _q_applyPendingOrientationChange())		Q_PRIVATE_SLOT(d_func(), void _q_applyPendingOrientationChange())
	Q_PRIVATE_SLOT(d_func(), void _q_onPageSwitchAnimationFinished())		Q_PRIVATE_SLOT(d_func(), void _q_onPageSwitchAnimationFinished())
	Q_PRIVATE_SLOT(d_func(), void _q_dislocateSceneWindow(MSceneWindow *, Q PointF))		Q_PRIVATE_SLOT(d_func(), void _q_dislocateSceneWindow(MSceneWindow *, Q PointF))
	Q_PRIVATE_SLOT(d_func(), void _q_undoSceneWindowDislocation(MSceneWindo w *sceneWindow))		Q_PRIVATE_SLOT(d_func(), void _q_undoSceneWindowDislocation(MSceneWindo w *sceneWindow))
	Q_PRIVATE_SLOT(d_func(), void _q_updateRootElementsPositions())		Q_PRIVATE_SLOT(d_func(), void _q_updateRootElementsPositions())
			Q_PRIVATE_SLOT(d_func(), void _q_updateOnDisplayVisibility())
	#ifdef Q_WS_X11		#ifdef Q_WS_X11
	Q_PRIVATE_SLOT(d_func(), void _q_updateDecoratorButtonsProperty())		Q_PRIVATE_SLOT(d_func(), void _q_updateDecoratorButtonsProperty())
	#endif		#endif
			/*
			Methods for testing purposes
			*/
			void fastForwardPageSwitchAnimation();
			void fastForwardOrientationChangeAnimation();
			void fastForwardSceneWindowTransitionAnimation(MSceneWindow *sceneWindo
			w);
			void addSceneWindow(MSceneWindow *sceneWindow);
			void removeSceneWindow(MSceneWindow *sceneWindow);
	};		};
	#endif		#endif
End of changes. 4 change blocks.
	0 lines changed or deleted		14 lines changed or added

	mtexteditmodel.h		mtexteditmodel.h
	skipping to change at line 93		skipping to change at line 93
	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)
	public:		public:
	void updateCursor() {		void updateCursor() {
	memberModified(MTextEditModel::Cursor);		memberModified(MTextEditModel::Cursor);
	}		}
	};		};
	#endif		#endif
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 537		skipping to change at line 537
	private:		private:
	Q_DISABLE_COPY(MWindow)		Q_DISABLE_COPY(MWindow)
	Q_DECLARE_PRIVATE(MWindow)		Q_DECLARE_PRIVATE(MWindow)
	Q_PRIVATE_SLOT(d_func(), void _q_onPixmapRequestsFinished())		Q_PRIVATE_SLOT(d_func(), void _q_onPixmapRequestsFinished())
	Q_PRIVATE_SLOT(d_func(), void _q_enablePaintUpdates())		Q_PRIVATE_SLOT(d_func(), void _q_enablePaintUpdates())
	Q_PRIVATE_SLOT(d_func(), void _q_exitDisplayStabilized())		Q_PRIVATE_SLOT(d_func(), void _q_exitDisplayStabilized())
	#ifdef HAVE_GCONF		#ifdef HAVE_GCONF
	Q_PRIVATE_SLOT(d_func(), void _q_updateMinimizedSoftwareSwitch())		Q_PRIVATE_SLOT(d_func(), void _q_updateMinimizedSoftwareSwitch())
	#endif		#endif
			/*
			For testing purposes.
			Returns a MSceneManager::TransitionMode
			*/
			int orientationChangeTransitionMode();
	friend class MApplicationPrivate;		friend class MApplicationPrivate;
	friend class MSceneManagerPrivate;		friend class MSceneManagerPrivate;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	// to call orientationAngleChanged()		// to call orientationAngleChanged()
	friend class Ut_MWindow;		friend class Ut_MWindow;
	friend class Ut_MSceneManager;		friend class Ut_MSceneManager;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		6 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/