mapplication.h		mapplication.h
	skipping to change at line 42		skipping to change at line 42
	class MWindow;		class MWindow;
	class MApplicationWindow;		class MApplicationWindow;
	class MApplicationService;		class MApplicationService;
	class MFeedbackPlayer;		class MFeedbackPlayer;
	class MSceneWindow;		class MSceneWindow;
	/*!		/*!
	* \class MApplication		* \class MApplication
	* \brief MApplication manages the GUI application's control flow and main settings.		* \brief MApplication manages the GUI application's control flow and main settings.
	*		*
	* MApplication instance automatically extracts application name from the a		* The MApplication instance automatically extracts the application name fr
	rguments		om the arguments
	* given in the constructor. It also loads css - stylesheet, svg file and a		* given in the constructor. It also loads the CSS stylesheet and the SVG f
	dds application		ile and adds application
	* specific image paths to the pixmap search paths used by the current MThe me instance.		* specific image paths to the pixmap search paths used by the current MThe me instance.
	*		*
	* CSS and SVG files are searched for in order from the following places:		* CSS and SVG files are searched for in order from the following places:
	* <ol>		* <ol>
	* <li>Directory in which application was launched.</li>		* <li>The directory in which the application was launched.</li>
	* <li>Application specific theme path (global theme path appended with t he application name)</li>		* <li>Application specific theme path (global theme path appended with t he application name)</li>
	* <li>Global theme path (Qt data path appended by themes/m)</li>		* <li>Global theme path (Qt data path appended by themes/m)</li>
	* </ol>		* </ol>
	* When first instance of CSS or SVG file is found it is loaded to the curr		* When the first instance of the CSS or SVG file is found, it is loaded to
	ent MTheme.		the current MTheme.
	* Also image - subdirectory of each of the aforementioned paths is appende		* Also the image subdirectory of each of the aforementioned paths is appen
	d to the pixmap search		ded to the pixmap search
	* paths used by MTheme.		* paths used by MTheme.
	*		*
	* MApplication will also create a QDBus service with name made by prependi ng 'com.nokia.' to		* MApplication will also create a QDBus service with a name made by prepen ding 'com.nokia.' to
	* the application name provided in the constructor (or the binary name if no name is provided		* the application name provided in the constructor (or the binary name if no name is provided
	* in the constructor). It will provide an interface called MApplicationIf which calls service		* in the constructor). It will provide an interface called MApplicationIf which calls service
	* methods in an instance of MApplicationService. By default, MApplication will construct an		* methods in an instance of MApplicationService. By default, MApplication will construct an
	* instance of MApplicationService, but the application programmer can deri ve a class from		* instance of MApplicationService, but the application programmer can deri ve a class from
	* MApplicationService and provide a pointer to that in the constructor for MApplication to		* MApplicationService and provide a pointer to that in the constructor for MApplication to
	* use instead. This way, the application programmer can override the metho ds in		* use instead. This way, the application programmer can override the metho ds in
	* MApplicationService and change the behaviour of the application's interf ace.		* MApplicationService and change the behaviour of the application's interf ace.
	*		*
	* The default behaviour is to only allow a single instance of any		* The default behaviour is to only allow a single instance of any
	* application. When an application is launched, it attempts to register		* application. When an application is launched, it attempts to register
	* itself as a dbus service (as above). Only the first instance of the		* itself as a DBUS service (as above). Only the first instance of the
	* application will be successful, and subsequent attempts will fail. When		* application will be successful, and subsequent attempts will fail. When
	* dbus registration fails, the default behaviour is to call the first		* DBUS registration fails, the default behaviour is to call the first
	* instance's MApplicationService launch() method, and then quit. This		* instance's MApplicationService launch() method, and then quit. This
	* causes the first instance to become visible (raises the window).		* causes the first instance to become visible (raises the window).
	*		*
	* If other behaviour is required, for example if you want multiple		* If other behaviour is required, for example if you want multiple
	* instances of an application, then it is necessary to derive a class from		* instances of an application, then it is necessary to derive a class from
	* MApplicationService and override its methods.		* MApplicationService and override its methods.
			*
			* Notice that it is not supported to create, delete and again create an MA
			pplication instance
			* in the same program.
	*/		*/
	class M_CORE_EXPORT MApplication : public QApplication		class M_CORE_EXPORT MApplication : public QApplication
	{		{
	Q_OBJECT		Q_OBJECT
	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
End of changes. 7 change blocks.
	12 lines changed or deleted		16 lines changed or added

	mapplicationmenuview.h		mapplicationmenuview.h
	skipping to change at line 113		skipping to change at line 113
	protected:		protected:
	//! \reimp		//! \reimp
	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)
	Q_PRIVATE_SLOT(d_func(), void _q_displayEntered())
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Pt_MApplicationMenu;		friend class Pt_MApplicationMenu;
	friend class Ut_MApplicationMenu;		friend class Ut_MApplicationMenu;
			friend class Ut_MApplicationMenuView;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		1 lines changed or added

	mapplicationwindow.h		mapplicationwindow.h
	skipping to change at line 66		skipping to change at line 66
	return application.exec();		return application.exec();
	}		}
	\endcode		\endcode
	To insert content into the window, a MApplicationPage has to be created and shown.		To insert content into the window, a MApplicationPage has to be created and shown.
	In contrast to MWindow, MApplicationWindow already contains a QGraphicsS cene and MSceneManager,		In contrast to MWindow, MApplicationWindow already contains a QGraphicsS cene and MSceneManager,
	so that orientation changes and in-scene windows such as MDialog and MAp plicationPage windows are		so that orientation changes and in-scene windows such as MDialog and MAp plicationPage windows are
	automatically managed.		automatically managed.
			Also MApplicationWindows, unlike plain MWindows, have rounded corners en
			abled by default.
			Check MWindow::roundedCornersEnabled property for more information.
	\section MApplicationWindowFullScreenMode Full screen mode		\section MApplicationWindowFullScreenMode Full screen mode
	When an application window is in full screen mode (see QWidget::showFull Screen())		When an application window is in full screen mode (see QWidget::showFull Screen())
	it loses its status bar. To have the status bar again you have to go bac k to normal mode		it loses its status bar. To have the status bar again you have to go bac k to normal mode
	(see QWidget::Normal()).		(see QWidget::Normal()).
	Please note that the full screen mode of an application window is orthog onal to the		Please note that the full screen mode of an application window is orthog onal to the
	presence of the navigation bar and navigation controls (home button and escape button).		presence of the navigation bar and navigation controls (home button and escape button).
	The presence of those is set via MApplicationPage::setComponentsDisplayM ode().		The presence of those is set via MApplicationPage::setComponentsDisplayM ode().
	*/		*/
	skipping to change at line 208		skipping to change at line 211
	//! \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);
	virtual void mouseReleaseEvent(QMouseEvent *event);		virtual void mouseReleaseEvent(QMouseEvent *event);
	//! \reimp_end		//! \reimp_end
	private:		private:
			void reinit();
	friend class MSceneManagerPrivate;		friend class MSceneManagerPrivate;
	friend class MInputWidgetRelocator;		friend class MInputWidgetRelocator;
	friend class Ut_MApplicationWindow;		friend class Ut_MApplicationWindow;
			friend class MComponentCachePrivate;
	Q_DISABLE_COPY(MApplicationWindow)		Q_DISABLE_COPY(MApplicationWindow)
	Q_DECLARE_PRIVATE(MApplicationWindow)		Q_DECLARE_PRIVATE(MApplicationWindow)
	Q_PRIVATE_SLOT(d_func(), void _q_actionUpdated(QActionEvent *))		Q_PRIVATE_SLOT(d_func(), void _q_actionUpdated(QActionEvent *))
	Q_PRIVATE_SLOT(d_func(), void _q_placeToolBar())		Q_PRIVATE_SLOT(d_func(), void _q_placeToolBar())
	Q_PRIVATE_SLOT(d_func(), void _q_handlePageModelModifications(const QLi st<const char *>&))		Q_PRIVATE_SLOT(d_func(), void _q_handlePageModelModifications(const QLi st<const char *>&))
	Q_PRIVATE_SLOT(d_func(), void _q_menuAppeared())		Q_PRIVATE_SLOT(d_func(), void _q_menuAppeared())
	Q_PRIVATE_SLOT(d_func(), void _q_menuDisappeared())		Q_PRIVATE_SLOT(d_func(), void _q_menuDisappeared())
	#ifdef HAVE_CONTEXTSUBSCRIBER		#ifdef HAVE_CONTEXTSUBSCRIBER
	Q_PRIVATE_SLOT(d_func(), void _q_updateStatusBarVisibility())		Q_PRIVATE_SLOT(d_func(), void _q_updateStatusBarVisibility())
End of changes. 3 change blocks.
	0 lines changed or deleted		8 lines changed or added

	mapplicationwindowstyle.h		mapplicationwindowstyle.h
	skipping to change at line 25		skipping to change at line 25
	** and appearing in the file LICENSE.LGPL included in the packaging		** and appearing in the file LICENSE.LGPL included in the packaging
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MAPPLICATIONWINDOWSTYLE_H		#ifndef MAPPLICATIONWINDOWSTYLE_H
	#define MAPPLICATIONWINDOWSTYLE_H		#define MAPPLICATIONWINDOWSTYLE_H
	#include <mstyle.h>		#include <mstyle.h>
			#include <QColor>
	/** \brief Defines a style for a MApplicationWindowStyle class.		/** \brief Defines a style for a MApplicationWindowStyle class.
	* This class defines default style values for application window.		* This class defines default style values for application window.
	*/		*/
	class MApplicationWindowStyle : public MStyle		class MApplicationWindowStyle : public MStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MApplicationWindowStyle)		M_STYLE_INTERNAL(MApplicationWindowStyle)
	/*!		/*!
	\brief A time threshold which is used as a delay for		\brief A time threshold which is used as a delay for
	skipping to change at line 50		skipping to change at line 52
	\brief Whether the tool bar prefers to be displayed as a separate, in dependent, scene window.		\brief Whether the tool bar prefers to be displayed as a separate, in dependent, scene window.
	*/		*/
	M_STYLE_ATTRIBUTE(bool, floatableToolBar, FloatableToolBar)		M_STYLE_ATTRIBUTE(bool, floatableToolBar, FloatableToolBar)
	/*!		/*!
	\brief Whether the tab bar prefers to be displayed as a separate, ind ependent, scene window.		\brief Whether the tab bar prefers to be displayed as a separate, ind ependent, scene window.
	*/		*/
	M_STYLE_ATTRIBUTE(bool, floatableTabBar, FloatableTabBar)		M_STYLE_ATTRIBUTE(bool, floatableTabBar, FloatableTabBar)
	/*!		/*!
	\brief This allows to customize the style of navigation bar for an sp ecific app		\brief This allows to customize the style of navigation bar for a spe cific app
	*/		*/
	M_STYLE_ATTRIBUTE(QString, navigationBarStyleName, NavigationBarStyleNa me)		M_STYLE_ATTRIBUTE(QString, navigationBarStyleName, NavigationBarStyleNa me)
	/*!		/*!
	\brief This allows to customize the style of the toolbar for an speci fic app		\brief This allows to customize the style of the toolbar for a specif ic app
	*/		*/
	M_STYLE_ATTRIBUTE(QString, toolBarStyleName, ToolBarStyleName)		M_STYLE_ATTRIBUTE(QString, toolBarStyleName, ToolBarStyleName)
	/*!		/*!
	\brief This allows to customize the style of the toolbar tabs for an specific app		\brief This allows to customize the style of the toolbar tabs for a s pecific app
	*/		*/
	M_STYLE_ATTRIBUTE(QString, tabBarStyleName, TabBarStyleName)		M_STYLE_ATTRIBUTE(QString, tabBarStyleName, TabBarStyleName)
			/*!
			\brief This allows to customize the style of the status bar for a spe
			cific app
			*/
			M_STYLE_ATTRIBUTE(QString, statusBarStyleName, StatusBarStyleName)
			/*!
			\brief This allows to customize application window background color.
			*/
			M_STYLE_ATTRIBUTE(QColor, backgroundColor, BackgroundColor)
	};		};
	class MApplicationWindowStyleContainer : public MStyleContainer		class MApplicationWindowStyleContainer : public MStyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MApplicationWindowStyle)		M_STYLE_CONTAINER_INTERNAL(MApplicationWindowStyle)
	};		};
	#endif // MAPPLICATIONWINDOWSTYLE_H		#endif // MAPPLICATIONWINDOWSTYLE_H
End of changes. 5 change blocks.
	3 lines changed or deleted		16 lines changed or added

	mbackgroundtiles.h		mbackgroundtiles.h
	skipping to change at line 33		skipping to change at line 33
	#include <mexport.h>		#include <mexport.h>
	#include <mnamespace.h>		#include <mnamespace.h>
	class MScalableImage;		class MScalableImage;
	class MBackgroundTilesPrivate;		class MBackgroundTilesPrivate;
	/*!		/*!
	\class MBackgroundTiles		\class MBackgroundTiles
	\brief This class holds 16 pieces of scalable images which represent ever y possible position in a layout		\brief This class holds 16 pieces of scalable images which represent ever y possible position in a layout
	M::Position documents all the variations.		All 16 pieces are fetched from MTheme with different suffixes. For exampl
			e if you use imageId 'bg'
			this class will fetch the following images corresponding to M::Position:
			\li M::DefaultPosition => 'bg'
			\li M::TopLeftPosition => 'bg-top-left'
			\li M::TopCenterPosition => 'bg-top-center'
			\li M::TopRightPosition => 'bg-top-right'
			\li M::CenterLeftPosition => 'bg-center-left'
			\li M::CenterPosition => 'bg-center'
			\li M::CenterRightPosition => 'bg-center-right'
			\li M::BottomLeftPosition => 'bg-bottom-left'
			\li M::BottomCenterPosition => 'bg-bottom-center'
			\li M::BottomRightPosition => 'bg-bottom-right'
			\li M::HorizontalLeftPosition => 'bg-horizontal-left'
			\li M::HorizontalCenterPosition => 'bg-horizontal-center'
			\li M::HorizontalRightPosition => 'bg-horizontal-right'
			\li M::VerticalTopPosition => 'bg-vertical-top'
			\li M::VerticalCenterPosition => 'bg-vertical-center'
			\li M::VerticalBottomPosition => 'bg-vertical-bottom'
			This class is mainly meant to be used with the style system, so that the
			imageId can be given from css,
			and the M::Position from application code. A working example is the backg
			round of any widget.
			MWidgetStyle::backgroundTiles defines the id and the margins while MWidge
			tController::setLayoutPosition can be
			used for defining which tile is the one to be rendered. Some layout polic
			ies have this functionality to automatically
			set the correct position for each widget, e.g. MLinearLayoutPolicy::setNo
			tifyWidgetsOfLayoutPositionEnabled.
	\sa M::Position		\sa M::Position
	*/		*/
	class M_CORE_EXPORT MBackgroundTiles		class M_CORE_EXPORT MBackgroundTiles
	{		{
	public:		public:
	MBackgroundTiles();		MBackgroundTiles();
	MBackgroundTiles(const MBackgroundTiles& other);		MBackgroundTiles(const MBackgroundTiles& other);
	MBackgroundTiles(const QString& imageId, int left, int right, int top, int bottom);		MBackgroundTiles(const QString& imageId, int left, int right, int top, int bottom);
	virtual ~MBackgroundTiles();		virtual ~MBackgroundTiles();
	const MScalableImage* operator [] (M::Position tile) const;		const MScalableImage* operator [] (M::Position tile) const;
End of changes. 2 change blocks.
	1 lines changed or deleted		35 lines changed or added

	mbanner.h		mbanner.h
	skipping to change at line 181		skipping to change at line 181
	*/		*/
	Q_PROPERTY(QDateTime bannerTimeStamp READ bannerTimeStamp WRITE setBann erTimeStamp)		Q_PROPERTY(QDateTime bannerTimeStamp READ bannerTimeStamp WRITE setBann erTimeStamp)
	/*!		/*!
	\property MBanner::prefixTimeStamp		\property MBanner::prefixTimeStamp
	\brief MBanner can have the capability to setup a prefix before the timestamp		\brief MBanner can have the capability to setup a prefix before the timestamp
	Example: Yesterday: 18:00 PM		Example: Yesterday: 18:00 PM
	*/		*/
	Q_PROPERTY(QString prefixTimeStamp READ prefixTimeStamp WRITE setPrefix TimeStamp)		Q_PROPERTY(QString prefixTimeStamp READ prefixTimeStamp WRITE setPrefix TimeStamp)
			/*!
			\property MBanner::down
			\brief See MBannerModel::down
			*/
			Q_PROPERTY(bool down READ isDown WRITE setDown DESIGNABLE false)
	public:		public:
	/*!		/*!
	\brief Constructs a new banner		\brief Constructs a new banner
	*/		*/
	MBanner();		MBanner();
	/*!		/*!
	Destructor for banner object		Destructor for banner object
	skipping to change at line 229		skipping to change at line 235
	/*!		/*!
	\brief Get the prefix of the timestamp.		\brief Get the prefix of the timestamp.
	*/		*/
	QString prefixTimeStamp() const;		QString prefixTimeStamp() const;
	/*!		/*!
	\brief Get the pixmap of the mbanner		\brief Get the pixmap of the mbanner
	*/		*/
	QPixmap pixmap() const;		QPixmap pixmap() const;
			/*!
			\brief Returns true if the banner is pressed down.
			*/
			bool isDown() 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:
	/*!		/*!
	skipping to change at line 274		skipping to change at line 285
	\param Prefix text.		\param Prefix text.
	*/		*/
	void setPrefixTimeStamp(const QString &text);		void setPrefixTimeStamp(const QString &text);
	/**		/**
	\brief Sets a pixmap for the banner.		\brief Sets a pixmap for the banner.
	\param pixmap		\param pixmap
	*/		*/
	void setPixmap(const QPixmap &pixmap);		void setPixmap(const QPixmap &pixmap);
			/*!
			\brief Set the banner down state.
			*/
			void setDown(bool);
	private:		private:
	Q_DISABLE_COPY(MBanner)		Q_DISABLE_COPY(MBanner)
	Q_DECLARE_PRIVATE(MBanner)		Q_DECLARE_PRIVATE(MBanner)
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MBanner;		friend class Ut_MBanner;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	0 lines changed or deleted		17 lines changed or added

	mbannermodel.h		mbannermodel.h
	skipping to change at line 65		skipping to change at line 65
	\property Prefix timestamp mbanner		\property Prefix timestamp mbanner
	*/		*/
	M_MODEL_PROPERTY(QString, prefixTimeStamp, PrefixTimeStamp, true, QStri ng())		M_MODEL_PROPERTY(QString, prefixTimeStamp, PrefixTimeStamp, true, QStri ng())
	/*!		/*!
	\property Pixmap in MBanner		\property Pixmap in MBanner
	*/		*/
	M_MODEL_PROPERTY(QPixmap, pixmap, Pixmap, false, QPixmap())		M_MODEL_PROPERTY(QPixmap, pixmap, Pixmap, false, QPixmap())
			/*!
			\property MBannerModel::down
			\brief Boolean value that defines whether button is currently press
			ed down or not.
			*/
			M_MODEL_PROPERTY(bool, down, Down, true, false)
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		7 lines changed or added

	mbannerview.h		mbannerview.h
	skipping to change at line 78		skipping to change at line 78
	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_DECLARE_PRIVATE(MBannerView)		Q_DECLARE_PRIVATE(MBannerView)
	Q_DISABLE_COPY(MBannerView)		Q_DISABLE_COPY(MBannerView)
			#ifdef UNIT_TEST
			friend class Ut_MBannerView;
			#endif
			#ifdef M_TEST_CLASS
			M_TEST_CLASS
			#endif
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		7 lines changed or added

	mbuttonstyle.h		mbuttonstyle.h
	skipping to change at line 163		skipping to change at line 163
	\brief timeout for button press.		\brief timeout for button press.
	*/		*/
	M_STYLE_ATTRIBUTE(int, pressTimeout, PressTi meout)		M_STYLE_ATTRIBUTE(int, pressTimeout, PressTi meout)
	/*!		/*!
	\property MButtonStyle::contentOpacity		\property MButtonStyle::contentOpacity
	\brief Content opacity.		\brief Content opacity.
	*/		*/
	M_STYLE_ATTRIBUTE(qreal, contentOpacity, contentOpacity)		M_STYLE_ATTRIBUTE(qreal, contentOpacity, contentOpacity)
			/*!
			\property MButtonStyle::transition
			\brief name of the animation used for the transition
			Supported values: "default", "expanding-background" and "imploding-
			background"
			*/
			M_STYLE_ATTRIBUTE(QString, transition, Tra
			nsition)
	};		};
	/*!		/*!
	\class MButtonStyleContainer		\class MButtonStyleContainer
	\brief Style mode container class for MButtonStyle.		\brief Style mode container class for MButtonStyle.
	\ingroup styles		\ingroup styles
	\sa MButtonStyle		\sa MButtonStyle
	*/		*/
	class M_VIEWS_EXPORT MButtonStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MButtonStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MButtonStyle)		M_STYLE_CONTAINER(MButtonStyle)
	/*!		/*!
	\brief Style mode for a pressed button.		\brief Style mode for a pressed button.
	Mode is activated when a button is pressed down and deactivated whe n		Mode is activated when a button is pressed down and deactivated whe n
	button is released.		button is released.
	*/		*/
	M_STYLE_MODE(Pressed)		M_STYLE_MODE(Pressed)
			/*!
			\brief Style mode for a selected and disabled button.
			Mode is activated when a button is activated and disabled.
			*/
			M_STYLE_MODE(DisabledSelected)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	0 lines changed or deleted		17 lines changed or added

	mbuttonview.h		mbuttonview.h
	skipping to change at line 125		skipping to change at line 125
	*/		*/
	MButtonView(MButton *controller);		MButtonView(MButton *controller);
	/*!		/*!
	\brief Destructs the view.		\brief Destructs the view.
	*/		*/
	virtual ~MButtonView();		virtual ~MButtonView();
	//! \reimp		//! \reimp
	virtual void resizeEvent(QGraphicsSceneResizeEvent *event);		virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
			virtual void setGeometry(const QRectF &rect);
	//! \reimp_end		//! \reimp_end
	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 drawBackground(QPainter *painter, const QStyleOptionGraphi csItem *option) const;
	virtual void applyStyle();		virtual void applyStyle();
	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);		virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
	virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);		virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	virtual void setupModel();		virtual void setupModel();
	virtual void cancelEvent(MCancelEvent *event);		virtual void cancelEvent(MCancelEvent *event);
	virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;		virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
	virtual void setGeometry(const QRectF &rect);		virtual void notifyItemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value);
	//! \reimp_end		//! \reimp_end
	/*!		/*!
	\brief Draws the button icon (toggled or normal depending on the st ate		\brief Draws the button icon (toggled or normal depending on the st ate
	of the button) into the given \a iconRect.		of the button) into the given \a iconRect.
	*/		*/
	virtual void drawIcon(QPainter *painter, const QRectF &iconRect) const;		virtual void drawIcon(QPainter *painter, const QRectF &iconRect) const;
	//! \internal		//! \internal
	MButtonView(MButtonViewPrivate &dd, MButton *controller);		MButtonView(MButtonViewPrivate &dd, MButton *controller);
	//! \internal_end		//! \internal_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(MButtonView)		Q_DISABLE_COPY(MButtonView)
	Q_DECLARE_PRIVATE(MButtonView)		Q_DECLARE_PRIVATE(MButtonView)
	Q_PRIVATE_SLOT(d_func(), void _q_applyQueuedStyleModeChange())
	Q_PRIVATE_SLOT(d_func(), void _q_finishBlinkEffect())
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MButtonView;		friend class Ut_MButtonView;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 4 change blocks.
	3 lines changed or deleted		3 lines changed or added

	mcharsetdetector.h		mcharsetdetector.h
	skipping to change at line 156		skipping to change at line 156
	* \sa setText(const QByteArray &ba)		* \sa setText(const QByteArray &ba)
	*/		*/
	MCharsetDetector(const char *data, int size);		MCharsetDetector(const char *data, int size);
	/*!		/*!
	* \brief destructor for MCharsetDetector		* \brief destructor for MCharsetDetector
	*/		*/
	virtual ~MCharsetDetector();		virtual ~MCharsetDetector();
	/*!		/*!
	* \brief checks whether an error occured during the last action		* \brief checks whether an error occurred during the last action
	*		*
	* \sa clearError()		* \sa clearError()
	* \sa errorString()		* \sa errorString()
	*/		*/
	bool hasError() const;		bool hasError() const;
	/*!		/*!
	* \brief clears any error which might have occured during previous act ion		* \brief clears any error which might have occurred during previous ac tion
	*		*
	* Useful if one wants to ignore an error and continue.		* Useful if one wants to ignore an error and continue.
	*		*
	* \sa hasError()		* \sa hasError()
	* \sa errorString()		* \sa errorString()
	*/		*/
	void clearError();		void clearError();
	/*!		/*!
	* \brief text describing the error occured during the last action		* \brief text describing the error occurred during the last action
	*		*
	* Example:		* Example:
	*		*
	* \code		* \code
	* MCharsetDetector detector;		* MCharsetDetector detector;
	* if(detector.hasError())		* if(detector.hasError())
	* qWarning() << detector.errorString();		* qWarning() << detector.errorString();
	* \endcode		* \endcode
	*		*
	* \sa hasError()		* \sa hasError()
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	mcharsetmatch.h		mcharsetmatch.h
	skipping to change at line 53		skipping to change at line 53
	/*!		/*!
	* \brief constructor for MCharsetMatch		* \brief constructor for MCharsetMatch
	* \param name name of the charset. For example "UTF-8", "ISO-8859-1", ...		* \param name name of the charset. For example "UTF-8", "ISO-8859-1", ...
	* \param language RFC 3066 code of the language like "en", "zh", ...		* \param language RFC 3066 code of the language like "en", "zh", ...
	* \param confidence number between 0 and 100 for the quality of the ma tch		* \param confidence number between 0 and 100 for the quality of the ma tch
	*		*
	* Constructs an MCharsetMatch object setting a name of the		* Constructs an MCharsetMatch object setting a name of the
	* charset a language, and a confidence.		* charset a language, and a confidence.
	*/		*/
	MCharsetMatch(const QString name, const QString language = QString(), c onst qint32 confidence = 0);		explicit MCharsetMatch(const QString name, const QString language = QSt ring(), const qint32 confidence = 0);
	/*!		/*!
	* \brief copy constructor for MCharsetMatch		* \brief copy constructor for MCharsetMatch
	*/		*/
	MCharsetMatch(const MCharsetMatch &other);		MCharsetMatch(const MCharsetMatch &other);
	/*!		/*!
	* \brief destructor for MCharsetMatch		* \brief destructor for MCharsetMatch
	*/		*/
	virtual ~MCharsetMatch();		virtual ~MCharsetMatch();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcompleter.h		mcompleter.h
	skipping to change at line 119		skipping to change at line 119
	class QAbstractItemModel;		class QAbstractItemModel;
	class QModelIndex;		class QModelIndex;
	class M_CORE_EXPORT MCompleter : public MSceneWindow		class M_CORE_EXPORT MCompleter : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MCompleter)		M_CONTROLLER(MCompleter)
	Q_PROPERTY(bool acceptMultipleEntries READ acceptMultipleEntries WRITE setAcceptMultipleEntries)		Q_PROPERTY(bool acceptMultipleEntries READ acceptMultipleEntries WRITE setAcceptMultipleEntries)
	Q_PROPERTY(QString charactersToTrimForCompletionPrefix READ charactersT oTrimForCompletionPrefix WRITE setCharactersToTrimForCompletionPrefix)		Q_PROPERTY(QString charactersToTrimForCompletionPrefix READ charactersT oTrimForCompletionPrefix WRITE setCharactersToTrimForCompletionPrefix)
			Q_PROPERTY(QString completionTitle READ completionTitle WRITE setComple
			tionTitle)
	public:		public:
	/*!		/*!
	* \brief Creates an instance without any completion candidates.		* \brief Creates an instance without any completion candidates.
	*/		*/
	MCompleter();		MCompleter();
	/*!		/*!
	* \brief Creates an instance with the specified list of possible compl etion candidates.		* \brief Creates an instance with the specified list of possible compl etion candidates.
	* \param[in] completionCandidates list of completion candidates.		* \param[in] completionCandidates list of completion candidates.
	skipping to change at line 250		skipping to change at line 252
	* \code		* \code
	* // if the text which contains cursor and betweens two delimiters i s " text to be trimmed\t\r ".		* // if the text which contains cursor and betweens two delimiters i s " text to be trimmed\t\r ".
	* completer->setCharactersToTrimForCompletionPrefix(QString(" \t\r") );		* completer->setCharactersToTrimForCompletionPrefix(QString(" \t\r") );
	* // completionPrefix() == "to be trimmed";		* // completionPrefix() == "to be trimmed";
	* \endcode		* \endcode
	*		*
	* \sa charactersToTrimForCompletionPrefix().		* \sa charactersToTrimForCompletionPrefix().
	*/		*/
	void setCharactersToTrimForCompletionPrefix(const QString &str);		void setCharactersToTrimForCompletionPrefix(const QString &str);
			/*!
			* \brief Set title for completions
			*/
			void setCompletionTitle(const QString &title);
			/*!
			* \brief Returns title for completions
			*/
			QString completionTitle() const;
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	* This signal is emitted before starting matching the completion candi dates.		* This signal is emitted before starting matching the completion candi dates.
	* Application can customize its own completion rule, by connecting its		* Application can customize its own completion rule, by connecting its
	* customized match rule slot to this signal, and calling setCompletion s,		* customized match rule slot to this signal, and calling setCompletion s,
	* setMatchedCompletions inside the slot's implementation.		* setMatchedCompletions inside the slot's implementation.
	*/		*/
	void startCompleting(const QString &prefix);		void startCompleting(const QString &prefix);
	/*!		/*!
End of changes. 2 change blocks.
	0 lines changed or deleted		13 lines changed or added

	mcompletermodel.h		mcompletermodel.h
	skipping to change at line 44		skipping to change at line 44
	M_MODEL_PTR_PROPERTY(MWidget *, textWidget, TextWidget, true, NULL)		M_MODEL_PTR_PROPERTY(MWidget *, textWidget, TextWidget, true, NULL)
	M_MODEL_PROPERTY(QString, completionPrefix, CompletionPrefix, true, QSt ring())		M_MODEL_PROPERTY(QString, completionPrefix, CompletionPrefix, true, QSt ring())
	M_MODEL_PTR_PROPERTY(QAbstractItemModel *, matchedModel, MatchedModel, true, NULL)		M_MODEL_PTR_PROPERTY(QAbstractItemModel *, matchedModel, MatchedModel, true, NULL)
	M_MODEL_PROPERTY(int, valueColumnIndex, ValueColumnIndex, true, 0)		M_MODEL_PROPERTY(int, valueColumnIndex, ValueColumnIndex, true, 0)
	M_MODEL_PROPERTY(int, matchedIndex, MatchedIndex, true, -1)		M_MODEL_PROPERTY(int, matchedIndex, MatchedIndex, true, -1)
	M_MODEL_PROPERTY(bool, active, Active, true, false)		M_MODEL_PROPERTY(bool, active, Active, true, false)
	M_MODEL_PROPERTY(bool, popupActive, PopupActive, true, false)		M_MODEL_PROPERTY(bool, popupActive, PopupActive, true, false)
	M_MODEL_PROPERTY(bool, acceptMultipleEntries, AcceptMultipleEntries, tr ue, true)		M_MODEL_PROPERTY(bool, acceptMultipleEntries, AcceptMultipleEntries, tr ue, true)
	M_MODEL_PROPERTY(QString, charactersToTrim, CharactersToTrim, true, QSt ring(" "))		M_MODEL_PROPERTY(QString, charactersToTrim, CharactersToTrim, true, QSt ring(" "))
	M_MODEL_PROPERTY(QString, charactersToTrimForCompletionPrefix, Characte rsToTrimForCompletionPrefix, true, QString())		M_MODEL_PROPERTY(QString, charactersToTrimForCompletionPrefix, Characte rsToTrimForCompletionPrefix, true, QString())
			M_MODEL_PROPERTY(QString, completionTitle, CompletionTitle, true, QStri ng())
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcomponentdata.h		mcomponentdata.h
	skipping to change at line 238		skipping to change at line 238
	static bool chainDataStackIsEmpty();		static bool chainDataStackIsEmpty();
	#endif // Q_WS_X11		#endif // Q_WS_X11
	//! \internal_end		//! \internal_end
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	* \brief Signal emitted when the default system locale changes.		* \brief Signal emitted when the default system locale changes.
	*/		*/
	void localeSettingsChanged();		void localeSettingsChanged();
			void chainTaskDataChanged();
	protected:		protected:
	MComponentData(MComponentDataPrivate &dd, int &argc, char **argv, const QString &appIdentifier = QString());		MComponentData(MComponentDataPrivate &dd, int &argc, char **argv, const QString &appIdentifier = QString());
	MComponentDataPrivate *const d_ptr;		MComponentDataPrivate *const d_ptr;
	private:		private:
	static MComponentData *self;		static MComponentData *self;
	static void registerWindow(MWindow *);		static void registerWindow(MWindow *);
	static void unregisterWindow(MWindow *);		static void unregisterWindow(MWindow *);
	static void setActiveWindow(MWindow *);		static void setActiveWindow(MWindow *);
	void reinit(int &argc, char **argv, const QString &appIdentifier = QStr ing(), MApplicationService *service = 0);		void reinit(int &argc, char **argv, const QString &appIdentifier = QStr ing(), MApplicationService *service = 0);
	Q_DECLARE_PRIVATE(MComponentData)		Q_DECLARE_PRIVATE(MComponentData)
	Q_DISABLE_COPY(MComponentData)		Q_DISABLE_COPY(MComponentData)
			#ifdef HAVE_GCONF
			Q_PRIVATE_SLOT(d_func(), void _q_updateDebugOptionsFromGConfValues())
			#endif
	Q_PRIVATE_SLOT(d_func(), void _q_notifyInputMethodActiveWindowOrientati onChangeStarted())		Q_PRIVATE_SLOT(d_func(), void _q_notifyInputMethodActiveWindowOrientati onChangeStarted())
	Q_PRIVATE_SLOT(d_func(), void _q_notifyInputMethodActiveWindowOrientati onChangeFinished())		Q_PRIVATE_SLOT(d_func(), void _q_notifyInputMethodActiveWindowOrientati onChangeFinished())
	friend class MWindow;		friend class MWindow;
	friend class MApplicationWindow;		friend class MApplicationWindow;
	friend class MSceneWindow;		friend class MSceneWindow;
	friend class MTheme;		friend class MTheme;
	friend class MDeviceProfile;		friend class MDeviceProfile;
	friend class MComponentCachePrivate;		friend class MComponentCachePrivate;
	};		};
End of changes. 2 change blocks.
	0 lines changed or deleted		5 lines changed or added

	mgles2renderer.h		mgles2renderer.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MGLES2RENDERER_H		#ifndef MGLES2RENDERER_H
	#define MGLES2RENDERER_H		#define MGLES2RENDERER_H
	#include <QList>		#include <QList>
	#include <QSize>		#include <QSize>
	#include <QString>		#include <QString>
			#include <QtOpenGL>
	#include "mexport.h"		#include "mexport.h"
	#include <QGLWidget>
	class QGLContext;		class QGLContext;
	class MGLES2RendererPrivate;		class MGLES2RendererPrivate;
	class QGLShader;		class QGLShader;
	class QGLShaderProgram;		class QGLShaderProgram;
	class QPainter;		class QPainter;
	class QPixmap;		class QPixmap;
	class QRect;		class QRect;
	//some definitions to enable building without gles2 libraries
	#ifdef QT_OPENGL_LIB
	# include <QtOpenGL>
	# ifdef QT_OPENGL_ES_2
	// TODO: It does not seem kosher to define a macro with global effect
	// in this place.
	# define M_USE_OPENGL
	# endif
	#endif
	/*!		/*!
	\class MGLES2Renderer		\class MGLES2Renderer
	\brief A singleton class for rendering textured quads with custom shade rs.		\brief A singleton class for rendering textured quads with custom shade rs.
	MGLES2Renderer class implements and provides an easy interface for		MGLES2Renderer class implements and provides an easy interface for
	compiling and setuping glsl shaders. The class also provides functional ity		compiling and setuping glsl shaders. The class also provides functional ity
	for rendering textured quads directly with GLES2. Class caches the comp iled		for rendering textured quads directly with GLES2. Class caches the comp iled
	shaders so that they can used inside a process without always recompili ng		shaders so that they can used inside a process without always recompili ng
	them. Following uniforms and attributes are considered default and they are		them. Following uniforms and attributes are considered default and they are
	initialized by the MGLES2Renderer class automatically:		initialized by the MGLES2Renderer class automatically:
	skipping to change at line 174		skipping to change at line 164
	Uses the Nokia texture from pixmap extension to ensure that same		Uses the Nokia texture from pixmap extension to ensure that same
	pixmap in memory is used as a texture. Returns a texture id that		pixmap in memory is used as a texture. Returns a texture id that
	can be drawn with drawTexture() or in later glBindTexture() calls.		can be drawn with drawTexture() or in later glBindTexture() calls.
	The texture that is generated is cached, so multiple calls to		The texture that is generated is cached, so multiple calls to
	bindPixmap() with the same X pixmap will return the same texture		bindPixmap() with the same X pixmap will return the same texture
	id. Ideally, this function should be called once as soon as the		id. Ideally, this function should be called once as soon as the
	pixmap id is obtained. Before drawing the contents of the texture,		pixmap id is obtained. Before drawing the contents of the texture,
	ensure updateX11Pixmap() is called to update its contents.		ensure updateX11Pixmap() is called to update its contents.
	\param pixmap specifies the X pixmap to be bound as a texture		\param pixmap specifies the X pixmap to be bound as a texture
			\deprecated There is no replacing functionality
	*/		*/
	quint32 bindX11Pixmap(Qt::HANDLE pixmap);		quint32 bindX11Pixmap(Qt::HANDLE pixmap);
	/*!		/*!
	\brief Unbind the texture from an X pixmap.		\brief Unbind the texture from an X pixmap.
	Deletes the texture cache as well. Call this to free the resources		Deletes the texture cache as well. Call this to free the resources
	of the pixmap bound as a texture		of the pixmap bound as a texture
	\param pixmap specifies the X pixmap to be bound as a texture		\param pixmap specifies the X pixmap to be bound as a texture
			\deprecated There is no replacing functionality
	*/		*/
	void unbindX11Pixmap(Qt::HANDLE pixmap);		void unbindX11Pixmap(Qt::HANDLE pixmap);
	/*!		/*!
	\brief Updates the contents of bound X pixmap.		\brief Updates the contents of bound X pixmap.
	Call this every time the contents of the pixmap changes i.e. from X		Call this every time the contents of the pixmap changes i.e. from X
	Damage events.		Damage events.
	\param pixmap specifies the X pixmap to be bound as a texture		\param pixmap specifies the X pixmap to be bound as a texture
			\deprecated There is no replacing functionality
	*/		*/
	void updateX11Pixmap(Qt::HANDLE pixmap);		void updateX11Pixmap(Qt::HANDLE pixmap);
	/*!		/*!
	\brief Begin painting with MGLES2Renderer using default program.		\brief Begin painting with MGLES2Renderer using default program.
	If \a painter is not NULL, renderer will extract opacity and		If \a painter is not NULL, renderer will extract opacity and
	transformation and use those when rendering pixmaps into screen.		transformation and use those when rendering pixmaps into screen.
	The renderer will also cache the current state of the painter, the		The renderer will also cache the current state of the painter, the
	state will be restored when calling the ::end() method.		state will be restored when calling the ::end() method.
End of changes. 6 change blocks.
	11 lines changed or deleted		4 lines changed or added

	mimagewidgetview.h		mimagewidgetview.h
	skipping to change at line 78		skipping to change at line 78
	virtual void resizeEvent(QGraphicsSceneResizeEvent *event);		virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
	//! \reimp_end		//! \reimp_end
	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 QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;		virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
	virtual void setGeometry(const QRectF &rect);		virtual void setGeometry(const QRectF &rect);
	virtual void applyStyle();		virtual void applyStyle();
	virtual void updateData(const QList<const char *> &modifications);		virtual void updateData(const QList<const char *> &modifications);
			void updateGeometry();
	//! \reimp_end		//! \reimp_end
	//! \internal		//! \internal
	MImageWidgetView(MImageWidgetViewPrivate &dd, MImageWidget *controller) ;		MImageWidgetView(MImageWidgetViewPrivate &dd, MImageWidget *controller) ;
	//! \internal_end		//! \internal_end
	private:		private:
	QSize imageDataSize();		QSize imageDataSize();
	Q_DECLARE_PRIVATE(MImageWidgetView)		Q_DECLARE_PRIVATE(MImageWidgetView)
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	minputmethodstate.h		minputmethodstate.h
	skipping to change at line 189		skipping to change at line 189
	const QString &attribute, const QVariant &val ue);		const QString &attribute, const QVariant &val ue);
	/*!		/*!
	* \brief Returns the attribute extension definition file name which is registered with the unique identifier \id.		* \brief Returns the attribute extension definition file name which is registered with the unique identifier \id.
	* \param id the unique identifier of a registered attribute extension.		* \param id the unique identifier of a registered attribute extension.
	* \return the file name of the attribute extension, or empty QString i f \a id is invalid.		* \return the file name of the attribute extension, or empty QString i f \a id is invalid.
	*/		*/
	QString attributeExtensionFile(int id) const;		QString attributeExtensionFile(int id) const;
	Q_SIGNALS:		Q_SIGNALS:
	//! Emitted when input method area is changed		/*! \brief Emitted when input method area is changed
	//! \param region new input method area		*
			* If applications want to react to this signal by changing their layo
			ut (e.g. to
			* one that works better when a input method panel is around) they hav
			e to do their
			* layout changes immediately upon invocation of this signal. Therefor
			e queued
			* connections (like Qt::QueuedConnection) should not be used for that
			purpose.
			*
			* \param region new input method area
			*/
	void inputMethodAreaChanged(const QRect &region);		void inputMethodAreaChanged(const QRect &region);
	/*!		/*!
	* \brief This signal is emitted before the orientation angle of the ap plication's active window is changed.		* \brief This signal is emitted before the orientation angle of the ap plication's active window is changed.
	* \param orientationAngle New orientation angle which is about to chan ge.		* \param orientationAngle New orientation angle which is about to chan ge.
	*		*
	* \note It is emitted at the start of the rotation animation.		* \note It is emitted at the start of the rotation animation.
	*/		*/
	void activeWindowOrientationAngleAboutToChange(M::OrientationAngle orie ntationAngle);		void activeWindowOrientationAngleAboutToChange(M::OrientationAngle orie ntationAngle);
End of changes. 1 change blocks.
	2 lines changed or deleted		13 lines changed or added

	mlabelview.h		mlabelview.h
	skipping to change at line 141		skipping to change at line 141
	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(MLabelView)		Q_DISABLE_COPY(MLabelView)
	Q_DECLARE_PRIVATE(MLabelView)		Q_DECLARE_PRIVATE(MLabelView)
			Q_PRIVATE_SLOT(d_func(), void _q_highlighterUpdateTimerExceeded())
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Pt_MLabel;		friend class Pt_MLabel;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		2 lines changed or added

	mlocale.h		mlocale.h
	skipping to change at line 820		skipping to change at line 820
	*		*
	* \sa language()		* \sa language()
	* \sa script()		* \sa script()
	* \sa country()		* \sa country()
	* \sa variant()		* \sa variant()
	*/		*/
	QString name() const;		QString name() const;
	/*!		/*!
	* \brief Returns the text direction of the locale		* \brief Returns the text direction of the locale
			*
			* \sa directionForText()
	*/		*/
	Qt::LayoutDirection textDirection() const;		Qt::LayoutDirection textDirection() const;
	/*!		/*!
	* \brief Returns the language code of the locale category in ISO-639 f ormat		* \brief Returns the language code of the locale category in ISO-639 f ormat
	*		*
	* same as language(), only for a specific category.		* same as language(), only for a specific category.
	*		*
	* \sa categoryName()		* \sa categoryName()
	* \sa categoryScript()		* \sa categoryScript()
	skipping to change at line 1076		skipping to change at line 1078
	* success by setting *ok to true.		* success by setting *ok to true.
	*		*
	* \sa formatNumber(float i) const		* \sa formatNumber(float i) const
	*/		*/
	float toFloat(const QString &s, bool *ok = 0) const;		float toFloat(const QString &s, bool *ok = 0) const;
	/*!		/*!
	* \brief Returns the string representation of a number as percentage		* \brief Returns the string representation of a number as percentage
	* \param i number to format		* \param i number to format
	* \param decimals number of digits shown after decimal separator		* \param decimals number of digits shown after decimal separator
			*
			* Example:
			*
			* \code
			* MLocale locale; // gets the current system default locale
			* QString percentString = locale.formatPercent(0.0123, 2);
			* \endcode
			*
			* <table border="1">
			* <caption>
			* <big><b>Examples of formatPercent results</b></big>
			* </caption>
			* <tr>
			* <th>locale</th><th>double value</th><th>decimals</th><th>result</th
			>
			* </tr>
			* <tr>
			* <td>en_US</td><td>0.0123</td><td>2</td><td>1.23%</td>
			* </tr>
			* <tr>
			* <td>en_US</td><td>12.3456789</td><td>4</td><td>1,234.5679%</td>
			* </tr>
			* <tr>
			* <td>de_CH</td><td>12.3456789</td><td>4</td><td>1'234.5679%</td>
			* </tr>
			* <tr>
			* <td>tr_TR</td><td>12.3456789</td><td>4</td><td>% 1.234,5679</td>
			* </tr>
			* </table>
	*/		*/
	QString formatPercent(double i, int decimals = 0) const;		QString formatPercent(double i, int decimals = 0) const;
	/*!		/*!
	* \brief Formats an amount of currency		* \brief Formats an amount of currency
	* \param amount amount to format		* \param amount amount to format
	* \param currency three letter currency code in ISO-4217 format, e.g. EUR or USD		* \param currency three letter currency code in ISO-4217 format, e.g. EUR or USD
	*/		*/
	QString formatCurrency(double amount, const QString &currency) const;		QString formatCurrency(double amount, const QString &currency) const;
	skipping to change at line 1147		skipping to change at line 1177
	*		*
	* \code		* \code
	* QString formattedDateTime;		* QString formattedDateTime;
	* QDateTime current = QDateTime::currentDateTime();		* QDateTime current = QDateTime::currentDateTime();
	* MLocale locale;		* MLocale locale;
	* MCalendar calendar;		* MCalendar calendar;
	* calendar.setDateTime(current);		* calendar.setDateTime(current);
	* formattedDateTime = locale.formatDateTime(calendar, MLocale::DateMed ium, MLocale::TimeMedium);		* formattedDateTime = locale.formatDateTime(calendar, MLocale::DateMed ium, MLocale::TimeMedium);
	* // Make the first letter uppercase:		* // Make the first letter uppercase:
	* if (!formattedDateTime.isEmpty())		* if (!formattedDateTime.isEmpty())
	* formattedDateTime[0] = formattedDateTime.at(0).toUpper();		* formattedDateTime[0] = locale.toUpper(formattedDateTime.at(0))[0] ;
	* \endcode		* \endcode
	*		*
	* If many dates and times need to be formatted, this method		* If many dates and times need to be formatted, this method
	* should be preferred over		* should be preferred over
	* formatDateTime(const QDateTime &dateTime, DateType dateType = DateLo ng, TimeType timeType = TimeLong, CalendarType calendarType = DefaultCalend ar) const		* formatDateTime(const QDateTime &dateTime, DateType dateType = DateLo ng, TimeType timeType = TimeLong, CalendarType calendarType = DefaultCalend ar) const
	* because the latter one creates an MCalendar and sets it to the QDate Time.		* because the latter one creates an MCalendar and sets it to the QDate Time.
	* It is wasteful to create a new MCalendar many times, it is better		* It is wasteful to create a new MCalendar many times, it is better
	* to create the MCalendar only once, change the date and time of this		* to create the MCalendar only once, change the date and time of this
	* calendar as needed and use this MCalendar for formatting.		* calendar as needed and use this MCalendar for formatting.
	* Example:		* Example:
	skipping to change at line 1688		skipping to change at line 1718
	*/		*/
	static QString localeScript(const QString &locale);		static QString localeScript(const QString &locale);
	/*!		/*!
	* \brief Static method to obtain endonym for locale.		* \brief Static method to obtain endonym for locale.
	* Can be used to obtain endonym without instantiating MLocale, useful		* Can be used to obtain endonym without instantiating MLocale, useful
	* when obtaining a list of endonyms for a lot of languages.		* when obtaining a list of endonyms for a lot of languages.
	*/		*/
	static QString languageEndonym(const QString &locale);		static QString languageEndonym(const QString &locale);
			/*!
			* \brief Static method to obtain the text direction for a given text.
			*
			* This returns the text direction for a (paragraph) of text
			* according to the rules to determine the <a
			* href="http://unicode.org/reports/tr9/#The_Paragraph_Level">
			* Paragraph Level in the Unicode Bidirectional Algorithm</a>.
			* I.e. it looks for the first character of L, AL, or R in the
			* paragraph, if such a character is found and it is of type AL or
			* R, the text direction is Qt::RightToLeft else Qt::LeftToRight.
			*
			* If the text is empty or if it only contains digits, whitespace,
			* punctuation characters or other characters with no strong text
			* direction, this function returns Qt::LayoutDirectionAuto.
			*
			* Notice that this will only work well for plain text; rich text
			* might contain markup tags (e.g., \<b\>) that might also be
			* detected as having a meaningful text direction.
			*
			* \sa textDirection() const
			*/
			static Qt::LayoutDirection directionForText(const QString & text);
	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:
	/*!		/*!
	skipping to change at line 1709		skipping to change at line 1762
	*/		*/
	static MLocale &getDefault();		static MLocale &getDefault();
	private:		private:
	// not implemented now		// not implemented now
	bool operator==(const MLocale &other) const;		bool operator==(const MLocale &other) const;
	bool operator!=(const MLocale &other) const;		bool operator!=(const MLocale &other) const;
	// global default locale		// global default locale
	static MLocale *s_systemDefault;		static MLocale *s_systemDefault;
	static QTranslator *s_ltrTranslator;
	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 struct MStaticLocaleDestroyer;		friend struct MStaticLocaleDestroyer;
	friend class MIcuBreakIteratorPrivate;		friend class MIcuBreakIteratorPrivate;
	private Q_SLOTS:		private Q_SLOTS:
End of changes. 5 change blocks.
	3 lines changed or deleted		55 lines changed or added

	mlocationdatabase.h		mlocationdatabase.h
	skipping to change at line 62		skipping to change at line 62
	/**		/**
	* \brief returns a list with all cities in a time zone		* \brief returns a list with all cities in a time zone
	* \param timeZoneId the Olson id of the timezone		* \param timeZoneId the Olson id of the timezone
	*		*
	* Time zone ids are “canonicalized” when comparing, i.e.		* Time zone ids are “canonicalized” when comparing, i.e.
	* citiesInTimeZone("US/Pacific") and		* citiesInTimeZone("US/Pacific") and
	* citiesInTimeZone("America/Los_Angeles") will return the same		* citiesInTimeZone("America/Los_Angeles") will return the same
	* list.		* list.
	*		*
			* I.e. this lists all cities which have the same canonical
			* timezone id as the id given as parameter.
			*
			* It tries to put the “most important” city for this timezone id
			* first in the list of cities returned. Currently it does this
			* by putting a city first if it happens to have the same name
			* as the part of the canonical timezone id after the last “/”.
			*
	* For invalid time zone ids like "Oz/Emerald_City", an empty list		* For invalid time zone ids like "Oz/Emerald_City", an empty list
	* is returned.		* is returned.
	*/		*/
	QList<MCity> citiesInTimeZone(const QString& timeZoneId);		QList<MCity> citiesInTimeZone(const QString& timeZoneId);
	/**		/**
	* \brief returns a list with all cities that contain the given searchS tring		* \brief returns a list with all cities that contain the given searchS tring
	*/		*/
	QList<MCity> matchingCities( const QString& searchString );		QList<MCity> matchingCities( const QString& searchString );
End of changes. 1 change blocks.
	0 lines changed or deleted		8 lines changed or added

	mnotificationgroup.h		mnotificationgroup.h
	skipping to change at line 103		skipping to change at line 103
	/*!		/*!
	* Creates a copy of an existing representation of a notification group .		* Creates a copy of an existing representation of a notification group .
	* This constructor should only be used for populating the notification		* This constructor should only be used for populating the notification
	* group list from D-Bus structures.		* group list from D-Bus structures.
	*		*
	* \param group the notification representation to a create copy of		* \param group the notification representation to a create copy of
	*/		*/
	explicit MNotificationGroup(const MNotificationGroup &group);		explicit MNotificationGroup(const MNotificationGroup &group);
			/*!
			* Returns amount of notifications in a given group
			*
			* \param groupId the group ID
			* \return amount of notifications in given group
			*/
			uint notificationCount();
	friend QDBusArgument &operator<<(QDBusArgument &, const MNotificationGr oup &);		friend QDBusArgument &operator<<(QDBusArgument &, const MNotificationGr oup &);
	friend const QDBusArgument &operator>>(const QDBusArgument &, MNotifica tionGroup &);		friend const QDBusArgument &operator>>(const QDBusArgument &, MNotifica tionGroup &);
	protected:		protected:
	/*!		/*!
	* Creates a representation of an existing notification group.		* Creates a representation of an existing notification group.
	* Should be used to get a handle to an existing notification group		* Should be used to get a handle to an existing notification group
	* with a known ID.		* with a known ID.
	*		*
	* \param id the ID of the existing notification group		* \param id the ID of the existing notification group
End of changes. 1 change blocks.
	0 lines changed or deleted		8 lines changed or added

	mobjectmenuview.h		mobjectmenuview.h
	skipping to change at line 75		skipping to change at line 75
	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 slots:		protected slots:
	void actionAdded(MAction *action);		void actionAdded(MAction *action);
	void actionModified(MAction *action);		void actionModified(MAction *action);
	void actionRemoved(MAction *action);		void actionRemoved(MAction *action);
	private:		private:
	Q_PRIVATE_SLOT(d_func(), void contentActionTriggered())		Q_PRIVATE_SLOT(d_func(), void contentActionTriggered())
			#ifdef UNIT_TEST
			friend class Ut_MObjectMenuView;
			#endif
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		4 lines changed or added

	mpopuplistview.h		mpopuplistview.h
	skipping to change at line 85		skipping to change at line 85
	//! \internal_end		//! \internal_end
	//! \reimp		//! \reimp
	virtual void setupModel();		virtual void setupModel();
	virtual void applyStyle();		virtual void applyStyle();
	//! \reimp_end		//! \reimp_end
	private:		private:
	Q_DISABLE_COPY(MPopupListView)		Q_DISABLE_COPY(MPopupListView)
	Q_DECLARE_PRIVATE(MPopupListView)		Q_DECLARE_PRIVATE(MPopupListView)
	Q_PRIVATE_SLOT(d_func(), void _q_scrollOnFirstAppearance())
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	2 lines changed or deleted		0 lines changed or added

	mscenemanager.h		mscenemanager.h
	skipping to change at line 60		skipping to change at line 60
	*		*
	* \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;
	friend class MWindowPrivate;		friend class MWindowPrivate;
	friend class MApplicationWindowPrivate;		friend class MApplicationWindowPrivate;
			friend class MSheetPrivate;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MSceneManager;		friend class Ut_MSceneManager;
	friend class Ut_MApplicationWindow;		friend class Ut_MApplicationWindow;
	friend class Ut_MComboBox;		friend class Ut_MComboBox;
	#endif		#endif
	public:		public:
	/*!		/*!
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	mscenemanagerstyle.h		mscenemanagerstyle.h
	skipping to change at line 41		skipping to change at line 41
	M_STYLE_ATTRIBUTE(QString, dialogAnimation, DialogAnimation)		M_STYLE_ATTRIBUTE(QString, dialogAnimation, DialogAnimation)
	M_STYLE_ATTRIBUTE(QString, notificationInformationAnimation, Notificati onInformationAnimation)		M_STYLE_ATTRIBUTE(QString, notificationInformationAnimation, Notificati onInformationAnimation)
	M_STYLE_ATTRIBUTE(QString, notificationEventAnimation, NotificationEven tAnimation)		M_STYLE_ATTRIBUTE(QString, notificationEventAnimation, NotificationEven tAnimation)
	M_STYLE_ATTRIBUTE(QString, applicationMenuAnimation, ApplicationMenuAni mation)		M_STYLE_ATTRIBUTE(QString, applicationMenuAnimation, ApplicationMenuAni mation)
	M_STYLE_ATTRIBUTE(QString, popupListAnimation, PopupListAnimation)		M_STYLE_ATTRIBUTE(QString, popupListAnimation, PopupListAnimation)
	M_STYLE_ATTRIBUTE(QString, messageBoxAnimation, MessageBoxAnimation)		M_STYLE_ATTRIBUTE(QString, messageBoxAnimation, MessageBoxAnimation)
	M_STYLE_ATTRIBUTE(QString, statusBarAnimation, StatusBarAnimation)		M_STYLE_ATTRIBUTE(QString, statusBarAnimation, StatusBarAnimation)
	M_STYLE_ATTRIBUTE(QString, objectMenuAnimation, ObjectMenuAnimation)		M_STYLE_ATTRIBUTE(QString, objectMenuAnimation, ObjectMenuAnimation)
	M_STYLE_ATTRIBUTE(QString, navigationBarAnimation, NavigationBarAnimati on)		M_STYLE_ATTRIBUTE(QString, navigationBarAnimation, NavigationBarAnimati on)
	M_STYLE_ATTRIBUTE(QString, systemBannerAnimation, SystemBannerAnimation )		M_STYLE_ATTRIBUTE(QString, systemBannerAnimation, SystemBannerAnimation )
			M_STYLE_ATTRIBUTE(QString, sheetAnimation, SheetAnimation)
	};		};
	class MSceneManagerStyleContainer : public MStyleContainer		class MSceneManagerStyleContainer : public MStyleContainer
	{		{
	M_STYLE_CONTAINER(MSceneManagerStyle)		M_STYLE_CONTAINER(MSceneManagerStyle)
	};		};
	#endif // MSCENEMANAGERSTYLE_H		#endif // MSCENEMANAGERSTYLE_H
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	mscenewindow.h		mscenewindow.h
	skipping to change at line 144		skipping to change at line 144
	ApplicationMenu, // MApplicationMenu		ApplicationMenu, // MApplicationMenu
	ObjectMenu, // MObjectMenu		ObjectMenu, // MObjectMenu
	ModalSceneWindow, // MModalSceneWindow		ModalSceneWindow, // MModalSceneWindow
	PopupList, // MPopupList		PopupList, // MPopupList
	NotificationInformation, // MNotification - Information		NotificationInformation, // MNotification - Information
	NotificationEvent, // MNotification - Event		NotificationEvent, // MNotification - Event
	Overlay, // MOverlay		Overlay, // MOverlay
	Completer, // MCompleter		Completer, // MCompleter
	HomeButtonPanel, // MHomeButtonPanel		HomeButtonPanel, // MHomeButtonPanel
	PlainSceneWindow, // MSceneWindow		PlainSceneWindow, // MSceneWindow
	StatusBar // MStatusBar		StatusBar, // MStatusBar
			Sheet, // MSheet
			BorderDecoration // MBorderDecoration
	};		};
	/*!		/*!
	* This enum describes the possible states of a scene window.		* This enum describes the possible states of a scene window.
	* \sa sceneWindowState(), sceneWindowStateChanged(), appeared(), disap peared()		* \sa sceneWindowState(), sceneWindowStateChanged(), appeared(), disap peared()
	*/		*/
	enum SceneWindowState {		enum SceneWindowState {
	Appearing, /*!< An appearance animation is running on the scene win dow.		Appearing, /*!< An appearance animation is running on the scene win dow.
	A scene window enters this appearance state when ap pear()		A scene window enters this appearance state when ap pear()
	is called from Disappeared state. */		is called from Disappeared state. */
End of changes. 1 change blocks.
	1 lines changed or deleted		3 lines changed or added

	mscenewindowstyle.h		mscenewindowstyle.h
	skipping to change at line 41		skipping to change at line 41
	M_STYLE_ATTRIBUTE(Qt::Alignment, horizontalAlign, HorizontalAlign )		M_STYLE_ATTRIBUTE(Qt::Alignment, horizontalAlign, HorizontalAlign )
	M_STYLE_ATTRIBUTE(Qt::Alignment, verticalAlign, VerticalAlign)		M_STYLE_ATTRIBUTE(Qt::Alignment, verticalAlign, VerticalAlign)
	M_STYLE_ATTRIBUTE(QPointF, offset, Offset)		M_STYLE_ATTRIBUTE(QPointF, offset, Offset)
	M_STYLE_ATTRIBUTE(int, disappearTimeout, DisappearTimeou t)		M_STYLE_ATTRIBUTE(int, disappearTimeout, DisappearTimeou t)
	/*!		/*!
	\property MSceneWindowStyle::appearFeedback		\property MSceneWindowStyle::appearFeedback
	\brief Feedback given when scene window reaches the Appearing state .		\brief Feedback given when scene window reaches the Appearing state .
	*/		*/
	M_STYLE_ATTRIBUTE(MFeedback, appearFeedback, AppearFeedback)		M_STYLE_ATTRIBUTE(MFeedback, appearFeedback, AppearFeedback)
			/*!
			\property MSceneWindowStyle::appearanceAnimation
			\brief Appearance animation to be used.
			Format: class name
			E.g. "MWidgetSlideAnimation"
			If not set (left empty), the animation will be taken from the appro
			priate
			property in MSceneManagerStyle, according to the scene window type.
			*/
			M_STYLE_ATTRIBUTE(QString, appearanceAnimation, AppearanceAnimation)
			/*!
			\property MSceneWindowStyle::disappearanceAnimation
			\brief Disappearance animation to be used.
			Format: class name
			E.g. "MWidgetSlideAnimation"
			If not set (left empty), the animation will be taken from the appro
			priate
			property in MSceneManagerStyle, according to the scene window type.
			*/
			M_STYLE_ATTRIBUTE(QString, disappearanceAnimation, DisappearanceAnimati
			on)
	};		};
	class M_VIEWS_EXPORT MSceneWindowStyleContainer : public MWidgetStyleContai ner		class M_VIEWS_EXPORT MSceneWindowStyleContainer : public MWidgetStyleContai ner
	{		{
	M_STYLE_CONTAINER(MSceneWindowStyle)		M_STYLE_CONTAINER(MSceneWindowStyle)
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	0 lines changed or deleted		25 lines changed or added

	mslider.h		mslider.h
	skipping to change at line 388		skipping to change at line 388
	/*!		/*!
	\brief Sets the value range for slider.		\brief Sets the value range for slider.
	\param minimum value in slider value range		\param minimum value in slider value range
	\param maximum value in slider value range		\param maximum value in slider value range
	*/		*/
	void setRange(int minimum, int maximum);		void setRange(int minimum, int maximum);
	/*!		/*!
	\brief Set number of value steps for slider.		\brief Set number of value steps for slider.
	\param value steps to be set (for 0 there will not be steps)\n		\param value steps to be set (for 0 there will not be steps)\n
	If there are steps slider values are limited to integer mult		If there are steps slider will work in discrete mode being s
	iples of step values.		teps the number of allowed positions (besides min value).
			For example, setting 4 steps to a slider with a minimum valu
			e of 0 and a maximum value of 100 will make it to
			move only among the (0, 25, 50, 75, 100) set of values.
	*/		*/
	void setSteps(int steps);		void setSteps(int steps);
	/*!		/*!
	\brief Set a new value for slider.		\brief Set a new value for slider.
	\param value a value to be set (value is bounded into slider value range)		\param value a value to be set (value is bounded into slider value range)
	*/		*/
	virtual void setValue(int value);		virtual void setValue(int value);
	Q_SIGNALS:		Q_SIGNALS:
End of changes. 1 change blocks.
	2 lines changed or deleted		5 lines changed or added

	msortfilterproxymodel.h		msortfilterproxymodel.h
	skipping to change at line 50		skipping to change at line 50
	\brief Constructor.		\brief Constructor.
	\param parent Model owner.		\param parent Model owner.
	*/		*/
	MSortFilterProxyModel(QObject *parent = NULL);		MSortFilterProxyModel(QObject *parent = NULL);
	/*!		/*!
	\brief Destructor.		\brief Destructor.
	*/		*/
	virtual ~MSortFilterProxyModel();		virtual ~MSortFilterProxyModel();
			/*!
			\brief Enable or disable locale-aware sorting.
			Sorting string data that are visible to the user should be done local
			e-aware since there are
			different sorting rules in different languages. For example, in Czech
			, words starting with
			"ch" are sorted after words starting with "h". By default, MSortFilte
			rProxyModel does
			this. This function can turn this off (or on again).
			Disabling locale-aware sorting could be useful if there are only non-
			string data to be sorted,
			for example numbers, dates or times. This can improve performance sli
			ghtly.
			*/
			void enableLocaleAwareSorting(bool enable=true);
			/*!
			\brief Check if locale-aware sorting is enabled.
			*/
			bool isLocaleAwareSortingEnabled() const;
	//! \reimp		//! \reimp
	virtual bool filterAcceptsRow(int source_row, const QModelIndex &source _parent) const;		virtual bool filterAcceptsRow(int source_row, const QModelIndex &source _parent) const;
	virtual void setSourceModel(QAbstractItemModel *sourceModel);		virtual void setSourceModel(QAbstractItemModel *sourceModel);
			virtual bool lessThan(const QModelIndex &left, const QModelIndex &right ) const;
	//! \reimp_end		//! \reimp_end
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	\param parent Parent index in which the rows were inserted.		\param parent Parent index in which the rows were inserted.
	\param first First inserted row index.		\param first First inserted row index.
	\param last Last inserted row index.		\param last Last inserted row index.
	\param animated Flag that shows if the insert operation was with anim ations or not.		\param animated Flag that shows if the insert operation was with anim ations or not.
	*/		*/
	void rowsInserted(const QModelIndex &parent, int first, int last, bool animated);		void rowsInserted(const QModelIndex &parent, int first, int last, bool animated);
End of changes. 2 change blocks.
	0 lines changed or deleted		24 lines changed or added

	mstyle.h		mstyle.h
	skipping to change at line 114		skipping to change at line 114
	class M_CORE_EXPORT MStyle : public QObject		class M_CORE_EXPORT MStyle : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MStyle)		M_STYLE(MStyle)
	protected:		protected:
	int references() const;		int references() const;
	int addReference();		int addReference();
	int removeReference();		int removeReference();
			bool isOrientationDependent() const;
			void setOrientationDependent(bool orientationDependent);
	friend class MStyleSheet;		friend class MStyleSheet;
	friend class MStyleSheetPrivate;		friend class MStyleSheetPrivate;
	friend class MThemePrivate;		friend class MThemePrivate;
			friend class MStyleContainer;
			friend class MStyleSheetAttribute;
	};		};
	class M_CORE_EXPORT MStyleContainer		class M_CORE_EXPORT MStyleContainer
	{		{
	M_STYLE_CONTAINER(MStyle)		M_STYLE_CONTAINER(MStyle)
	M_STYLE_MODE(Default)		M_STYLE_MODE(Default)
	public:		public:
	void initialize(const QString &objectName, const QString &type, const M WidgetController *parent);		void initialize(const QString &objectName, const QString &type, const M WidgetController *parent);
	void setObjectName(const QString &objectName);		void setObjectName(const QString &objectName);
	void setType(const QString &type);		void setType(const QString &type);
	QString objectName() const;		QString objectName() const;
	QString type() const;		QString type() const;
	void setParent(const MWidgetController *parent);		void setParent(const MWidgetController *parent);
	const MWidgetController *parent() const;		const MWidgetController *parent() const;
	void setSceneManager(MSceneManager *sceneManager);		void setSceneManager(MSceneManager *sceneManager);
	const MSceneManager *sceneManager() const;		const MSceneManager *sceneManager() const;
			void updateCurrentStyle() const;
	protected:		protected:
	void reloadStyles();		void reloadStyles();
	const MStyle *currentStyle() const;		const MStyle *currentStyle() const;
	void setCurrentMode(const QString &mode);		void setCurrentMode(const QString &mode);
	QString currentMode() const;		QString currentMode() const;
	friend class MTheme;		friend class MTheme;
	friend class MWidgetViewPrivate; // it needs to call reloadStyles()		friend class MWidgetViewPrivate; // it needs to call reloadStyles()
	};		};
End of changes. 3 change blocks.
	0 lines changed or deleted		7 lines changed or added

	mtextedit.h		mtextedit.h
	skipping to change at line 526		skipping to change at line 526
	void lostFocus(Qt::FocusReason);		void lostFocus(Qt::FocusReason);
	/**		/**
	* \brief A signal which is emitted whenever the text has been changed .		* \brief A signal which is emitted whenever the text has been changed .
	*/		*/
	void textChanged();		void textChanged();
	//! \brief This signal is emitted whenever the selection changes		//! \brief This signal is emitted whenever the selection changes
	void selectionChanged();		void selectionChanged();
	//! \brief A signal to be emitted when the cursor position changes		//! \brief A signal to be emitted when the cursor position changes.
			//!
			//! Preedit cursor (as defined by the MTextEditModel) changes also
			//! cause this signal to be emitted.
	void cursorPositionChanged();		void cursorPositionChanged();
	//! \brief This signal is emitted when text is selected or de-selected in the text edit.		//! \brief This signal is emitted when text is selected or de-selected in the text edit.
	// When text is selected this signal will be emitted with yes set to tr ue.		// When text is selected this signal will be emitted with yes set to tr ue.
	// If no text has been selected or if the selected text is de-selected this signal is emitted with yes set to false.		// If no text has been selected or if the selected text is de-selected this signal is emitted with yes set to false.
	void copyAvailable(bool yes);		void copyAvailable(bool yes);
	/*!		/*!
	* \brief This signal is emitted when paste is failed and nothing was i nserted		* \brief This signal is emitted when paste is failed and nothing was i nserted
	*/		*/
	skipping to change at line 562		skipping to change at line 565
	virtual void inputMethodEvent(QInputMethodEvent *);		virtual void inputMethodEvent(QInputMethodEvent *);
	virtual void changeEvent(QEvent *event);		virtual void changeEvent(QEvent *event);
	virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;		virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
	virtual QVariant itemChange(GraphicsItemChange change, const QVariant & value);		virtual QVariant itemChange(GraphicsItemChange change, const QVariant & value);
	/*! \reimp_end */		/*! \reimp_end */
	private:		private:
	Q_DECLARE_PRIVATE(MTextEdit)		Q_DECLARE_PRIVATE(MTextEdit)
	Q_DISABLE_COPY(MTextEdit)		Q_DISABLE_COPY(MTextEdit)
	friend class MCompleter;		friend class MCompleterViewPrivate;
			friend class MTextEditViewPrivate;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MTextEdit;		friend class Ut_MTextEdit;
	friend class Ut_MTextEditView;		friend class Ut_MTextEditView;
	#endif		#endif
	Q_PRIVATE_SLOT(d_func(), void _q_confirmCompletion(const QString &))		Q_PRIVATE_SLOT(d_func(), void _q_confirmCompletion(const QString &))
			Q_PRIVATE_SLOT(d_func(), void _q_updatePasteActionState())
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	2 lines changed or deleted		7 lines changed or added

	mtexteditstyle.h		mtexteditstyle.h
	skipping to change at line 42		skipping to change at line 42
	M_STYLE_ATTRIBUTE(QFont, font, Font)		M_STYLE_ATTRIBUTE(QFont, font, Font)
	M_STYLE_ATTRIBUTE(QColor, textColor, TextColor)		M_STYLE_ATTRIBUTE(QColor, textColor, TextColor)
	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(QFont, promptFont, PromptFont)
	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)		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)
End of changes. 1 change blocks.
	0 lines changed or deleted		1 lines changed or added

	mtheme.h		mtheme.h
	skipping to change at line 183		skipping to change at line 183
	*/		*/
	static void releaseStyle(const MStyle *style);		static void releaseStyle(const MStyle *style);
	/*!		/*!
	Adds a directory to the theme service search path for this application .		Adds a directory to the theme service search path for this application .
	The theme service will look for PNG and SVG files in the location spec ified by		The theme service will look for PNG and SVG files in the location spec ified by
	\a directoryName, which can be either an relative or absolute path. If \a mode		\a directoryName, which can be either an relative or absolute path. If \a mode
	is defined as Recursive, subdirectories of the specified directory are searched as well.		is defined as Recursive, subdirectories of the specified directory are searched as well.
	The default is not to search subdirectories.		The default is not to search subdirectories.
			Note: A custom pixmap directory path must be added prior requesting a
			pixmap from it,
			otherwise an invalid pixmap will be displayed.
			\sa pixmap
	*/		*/
	static bool addPixmapDirectory(const QString &directoryName, M::Recursi onMode mode = M::NonRecursive);		static bool addPixmapDirectory(const QString &directoryName, M::Recursi onMode mode = M::NonRecursive);
	/*!		/*!
	Clear all pixmap directories from the theme service search path for th is application.		Clear all pixmap directories from the theme service search path for th is application.
	*/		*/
	static void clearPixmapDirectories();		static void clearPixmapDirectories();
	/*!		/*!
	Returns the singleton MTheme instance.		Returns the singleton MTheme instance.
	*/		*/
	static MTheme *instance();		static MTheme *instance();
	/*!		/*!
	Returns a QPixmap that contains the graphical asset specified by the \ ref logicalid "logical ID".		Returns a QPixmap that contains the graphical asset specified by the \ ref logicalid "logical ID".
	Note: While loading the graphics the application UI thread is blocked. In case the graphics is large or		Note: While loading the graphics the application UI thread is blocked. In case the graphics is large or
	you do not need to immediately know the final size of the requested gr aphics, consider using the		you do not need to immediately know the final size of the requested gr aphics, consider using the
	asyncPixmap() method instead to keep the UI responsive.		asyncPixmap() method instead to keep the UI responsive.
			Prior requesting a pixmap from a custom path, the path must be added t
			hrough addPixmapDirectory() method.
	The \a id is a logical identifier for a single graphical theme asset.		The \a id is a logical identifier for a single graphical theme asset.
	The source format of the graphics is abstracted and determined by the theme service. The default		The source format of the graphics is abstracted and determined by the theme service. The default
	graphics loading policy is as follows:		graphics loading policy is as follows:
	- Static images such as PNG have a higher priority than assets which a re dynamic or require		- Static images such as PNG have a higher priority than assets which a re dynamic or require
	rasterization (SVG), thus allowing for static caching of assets. For s tatic images the		rasterization (SVG), thus allowing for static caching of assets. For s tatic images the
	id is the filename without the filetype suffix.		id is the filename without the filetype suffix.
	- Application supplied assets have higher priority than base theme ass ets, while assets in		- Application supplied assets have higher priority than base theme ass ets, while assets in
	a theme for a specific application has higher priority than assets sup plied by the application itself.		a theme for a specific application has higher priority than assets sup plied by the application itself.
	The \a size parameter determines the size of the returned pixmap. The default \a size of QSize(0,0) marks		The \a size parameter determines the size of the returned pixmap. The default \a size of QSize(0,0) marks
	that the original source graphics size should be used.		that the original source graphics size should be used.
	The returned pixmap is owned by the theme and should be freed with rel easePixmap() when no longer needed.		The returned pixmap is owned by the theme and should be freed with rel easePixmap() when no longer needed.
	\sa releasePixmap		\sa releasePixmap
	\sa asyncPixmap		\sa asyncPixmap
			\sa addPixmapDirectory
	*/		*/
	static const QPixmap *pixmap(const QString &id, const QSize &size = QSi ze(0, 0));		static const QPixmap *pixmap(const QString &id, const QSize &size = QSi ze(0, 0));
	/*!		/*!
	Returns a QPixmap that contains the graphical asset specified by the \ ref logicalid "logical ID".		Returns a QPixmap that contains the graphical asset specified by the \ ref logicalid "logical ID".
	Loads the pixmap specified by \a id of size \a size.		Loads the pixmap specified by \a id of size \a size.
			Note: Prior requesting a pixmap from a custom path, the path must be a
			dded through addPixmapDirectory() method.
	The requested pixmap is loaded asynchronously. The returned pixmap can be one of the following:		The requested pixmap is loaded asynchronously. The returned pixmap can be one of the following:
	- The real pixmap if the pixmap was already loaded by the system.		- The real pixmap if the pixmap was already loaded by the system.
	- A transparent (or green, if GConf key /meegotouch/debug/show_async_r equests is set to true),		- A transparent (or green, if GConf key /meegotouch/debug/show_async_r equests is set to true),
	\a size sized (QSize(0,0) by default) pixmap, serving as a placehold er while the pixmap data is loading.		\a size sized (QSize(0,0) by default) pixmap, serving as a placehold er while the pixmap data is loading.
	- A red pixmap of 50x50 size, indicating that the pixmap with the requ ested id was not found in the theme.		- A red pixmap of 50x50 size, indicating that the pixmap with the requ ested id was not found in the theme.
	In the first two cases, the pixmap data can be changed at any time by the theme. This may happen when		In the first two cases, the pixmap data can be changed at any time by the theme. This may happen when
	the theme changes, as pixmaps are updated, pixmaps finish loading or f or any other reason.		the theme changes, as pixmaps are updated, pixmaps finish loading or f or any other reason.
	The returned pixmap is owned by the theme and should be freed with rel easePixmap() when no longer needed.		The returned pixmap is owned by the theme and should be freed with rel easePixmap() when no longer needed.
	\sa pixmap		\sa pixmap
	\sa releasePixmap		\sa releasePixmap
			\sa addPixmapDirectory
	*/		*/
	static const QPixmap *asyncPixmap(const QString &id, const QSize &size = QSize(0, 0));		static const QPixmap *asyncPixmap(const QString &id, const QSize &size = QSize(0, 0));
	/*!		/*!
	Returns a copy of the graphical asset with the given \ref logicalid "l ogical ID".		Returns a copy of the graphical asset with the given \ref logicalid "l ogical ID".
	Loads the pixmap specified by \a id of size \a size synchronously and returns a copy to the caller.		Loads the pixmap specified by \a id of size \a size synchronously and returns a copy to the caller.
	This method can be very slow, use the pixmap() or asyncPixmap() method s instead if possible.		This method can be very slow, use the pixmap() or asyncPixmap() method s instead if possible.
			Note: Prior requesting a pixmap from a custom path, the path must be a
			dded through addPixmapDirectory() method.
	The ownership of the returned pixmap is transferred to caller, and the pixmap may be modified.		The ownership of the returned pixmap is transferred to caller, and the pixmap may be modified.
	\sa pixmap		\sa pixmap
	\sa asyncPixmap		\sa asyncPixmap
			\sa addPixmapDirectory
	*/		*/
	static QPixmap *pixmapCopy(const QString &id, const QSize &size = QSize (0, 0));		static QPixmap *pixmapCopy(const QString &id, const QSize &size = QSize (0, 0));
	/*!		/*!
	Returns a MScalableImage that contains the graphical asset specified b y the \ref logicalid "logical ID".		Returns a MScalableImage that contains the graphical asset specified b y the \ref logicalid "logical ID".
	The logic for acquiring a scalable image is the same as that for a reg ular pixmap.		The logic for acquiring a scalable image is the same as that for a reg ular pixmap.
	The \a left, \a right, \a top and \a bottom parameters specify the non -scaled border values of the		The \a left, \a right, \a top and \a bottom parameters specify the non -scaled border values of the
	image.		image.
End of changes. 7 change blocks.
	0 lines changed or deleted		19 lines changed or added

	mwindow.h		mwindow.h
	skipping to change at line 111		skipping to change at line 111
	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		\property notificationPreviewsVisible
	Are notification preview banners shown on top of the window.		Are notification preview banners shown on top of the window.
	*/		*/
	Q_PROPERTY(bool notificationPreviewsVisible READ notificationPreviewsVi sible WRITE setNotificationPreviewsVisible)		Q_PROPERTY(bool notificationPreviewsVisible READ notificationPreviewsVi sible WRITE setNotificationPreviewsVisible)
			/*!
			\property MWindow::roundedCornersEnabled
			\brief This property defines whether the window should have rounded co
			rners.
			By default this property is false.
			Get its current value with isRoundedCornersEnabled() and set it with
			setRoundedCornersEnabled();
			\note Setting it to true will incur the creation of a scene manager
			and scene if the window doesn't have them yet.
			*/
			Q_PROPERTY(bool roundedCornersEnabled READ isRoundedCornersEnabled WRIT
			E setRoundedCornersEnabled)
	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 391		skipping to change at line 405
	* 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.		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.		\note System notifications (e.g. battery low) are still shown regardl ess of the property.
	*/		*/
	void setNotificationPreviewsVisible(bool visible);		void setNotificationPreviewsVisible(bool visible);
	/*!		/*!
	* Returns true if application notification preview banners are shown o ver		* Returns true if application notification preview banners are shown o ver
	* this window		* this window
	*		*
	* The value is true by default.		* The value is true by default.
	*/		*/
	bool notificationPreviewsVisible() const;		bool notificationPreviewsVisible() const;
			/*!
			\brief Returns whether the window has/draws rounded corners.
			\sa setRoundedCornersEnabled()
			*/
			bool isRoundedCornersEnabled() const;
			/*!
			\brief Sets whether the window should have/draw rounded corners.
			\sa isRoundedCornersEnabled()
			*/
			void setRoundedCornersEnabled(bool enabled);
	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 587		skipping to change at line 613
	MWindowPrivate *const d_ptr;		MWindowPrivate *const d_ptr;
	//! \internal_end		//! \internal_end
	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
	Q_PRIVATE_SLOT(d_func(), void _q_updateMinimizedSoftwareSwitch())		/**
	#endif		* Is invoked by MComponentCache in case if an application is
			* prestarted.
			*/
			void prestartedInit();
	/*		/*
	For testing purposes.		For testing purposes.
	Returns a MSceneManager::TransitionMode		Returns a MSceneManager::TransitionMode
	*/		*/
	int orientationChangeTransitionMode();		int orientationChangeTransitionMode();
	#ifdef Q_WS_X11		#ifdef Q_WS_X11
	/*		/*
	For testing purposes.		For testing purposes.
	Sets variables set by MApplication while processing x		Sets variables set by MApplication while processing x
	property events.		property events.
	*/		*/
	void setWindowIconicState(bool isIconic);		void setWindowIconicState(bool isIconic);
	void setWindowAlwaysMapped(bool alwaysMapped);		void setWindowAlwaysMapped(bool alwaysMapped);
	#endif		#endif
	friend class MApplicationPrivate;		friend class MApplicationPrivate;
	friend class MSceneManagerPrivate;		friend class MSceneManagerPrivate;
	friend class MOrientationTrackerPrivate;		friend class MOrientationTrackerPrivate;
			friend class MComponentCachePrivate; // Calls MWindow::prestartedInit()
	#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;
	friend class Ut_MOrientationTracker;		friend class Ut_MOrientationTracker;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 5 change blocks.
	4 lines changed or deleted		36 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/