libmeegotouch: headers diff between 0.20.79.2 and 0.20.81.2 versions

	mabstractitemmodel.h	mabstractitemmodel.h

	skipping to change at line 133	skipping to change at line 133
	void rowsInserted(const QModelIndex &parent, int first, int last, bool animated);	void rowsInserted(const QModelIndex &parent, int first, int last, bool animated);

	/*!	/*!
	\param parent Parent index in which the rows were removed.	\param parent Parent index in which the rows were removed.
	\param first First removed row index.	\param first First removed row index.
	\param last Last removed row index.	\param last Last removed row index.
	\param animated Flag that shows if the remove operation was with anim ations or not.	\param animated Flag that shows if the remove operation was with anim ations or not.
	*/	*/
	void rowsRemoved(const QModelIndex &parent, int first, int last, bool a nimated);	void rowsRemoved(const QModelIndex &parent, int first, int last, bool a nimated);


		/*!
		\param The signal is emitted if the layout change shall be animated.
		*/
		void layoutAboutToBeAnimated();

	private:	private:
	Q_DISABLE_COPY(MAbstractItemModel)	Q_DISABLE_COPY(MAbstractItemModel)
	Q_DECLARE_PRIVATE(MAbstractItemModel)	Q_DECLARE_PRIVATE(MAbstractItemModel)


	//! \internal	//! \internal
	MAbstractItemModelPrivate *const d_ptr;	MAbstractItemModelPrivate *const d_ptr;


		Q_PRIVATE_SLOT(d_func(), void _q_rowsInsertAnimated(QModelIndex,int,int
		))
		Q_PRIVATE_SLOT(d_func(), void _q_rowsRemoveAnimated(QModelIndex,int,int
		))
		Q_PRIVATE_SLOT(d_func(), void _q_layoutChanged())
	//! \internal_end	//! \internal_end

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

	#endif // MABSTRACTITEMMODEL_H	#endif // MABSTRACTITEMMODEL_H

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

	mapplicationwindowstyle.h	mapplicationwindowstyle.h

	skipping to change at line 50	skipping to change at line 50
	\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 toolbar for an specific app	\brief This allows to customize the style of navigation bar for an sp ecific 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
		*/
		M_STYLE_ATTRIBUTE(QString, toolBarStyleName, ToolBarStyleName)

		/*!
		\brief This allows to customize the style of the toolbar tabs for an
		specific app
		*/
		M_STYLE_ATTRIBUTE(QString, tabBarStyleName, TabBarStyleName)
	};	};

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

	mbannerstyle.h	mbannerstyle.h

	skipping to change at line 31	skipping to change at line 31
	#define MBANNERSTYLE_H	#define MBANNERSTYLE_H

	#include <mscenewindowstyle.h>	#include <mscenewindowstyle.h>

	class M_VIEWS_EXPORT MBannerStyle : public MSceneWindowStyle	class M_VIEWS_EXPORT MBannerStyle : public MSceneWindowStyle
	{	{
	Q_OBJECT	Q_OBJECT
	M_STYLE(MBannerStyle)	M_STYLE(MBannerStyle)

	M_STYLE_ATTRIBUTE(QSize,iconSize,IconSize)	M_STYLE_ATTRIBUTE(QSize,iconSize,IconSize)

		M_STYLE_ATTRIBUTE(qreal, pressDimFactor, PressDimFactor)
	};	};

	class M_VIEWS_EXPORT MBannerStyleContainer : public MSceneWindowStyleContai ner	class M_VIEWS_EXPORT MBannerStyleContainer : public MSceneWindowStyleContai ner
	{	{
	M_STYLE_CONTAINER(MBannerStyle)	M_STYLE_CONTAINER(MBannerStyle)
	};	};

	#endif	#endif

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

	mbannerview.h	mbannerview.h

	skipping to change at line 59	skipping to change at line 59
	/*!	/*!
	\brief Constructor for derived classes	\brief Constructor for derived classes
	\param dd Private class implementation	\param dd Private class implementation
	\param controller Pointer to the banner's controller	\param controller Pointer to the banner's controller
	*/	*/
	MBannerView(MBannerViewPrivate &dd, MBanner *controller);	MBannerView(MBannerViewPrivate &dd, MBanner *controller);

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

		virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
		virtual void cancelEvent(MCancelEvent *event);
	virtual void setupModel();	virtual void setupModel();
	virtual void applyStyle();	virtual void applyStyle();
	virtual void drawForeground(QPainter painter, const QStyleOptionGraphi csItem option) const;	virtual void drawForeground(QPainter painter, const QStyleOptionGraphi csItem option) const;
	//! \reimp_end	//! \reimp_end

	MBannerViewPrivate *const d_ptr;	MBannerViewPrivate *const d_ptr;

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

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

	mextensionrunner.h	mextensionrunner.h

	skipping to change at line 150	skipping to change at line 150
	QList<QAction *> widgetObjectMenuActions;	QList<QAction *> widgetObjectMenuActions;

	#ifdef HAVE_CONTEXTSUBSCRIBER	#ifdef HAVE_CONTEXTSUBSCRIBER
	//! Context property for getting the screen blanking status	//! Context property for getting the screen blanking status
	ContextProperty *screenBlankProperty;	ContextProperty *screenBlankProperty;
	#endif	#endif

	//! True if the display is currently blanked	//! True if the display is currently blanked
	bool displayBlanked;	bool displayBlanked;


	#ifdef QT_OPENGL_LIB
	//! OpenGL context
	QGLContext *context;
	#endif

	//! Timer for checking that the host process is alive	//! Timer for checking that the host process is alive
	QTimer *aliveTimer;	QTimer *aliveTimer;

	//! Shared mutex for locking the pixmap	//! Shared mutex for locking the pixmap
	MAppletSharedMutex *pixmapMutex;	MAppletSharedMutex *pixmapMutex;

	//! Combined changed rect for the scene	//! Combined changed rect for the scene
	QRectF changedRect;	QRectF changedRect;

	//! Visibility status of the extension	//! Visibility status of the extension

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

	mliststyle.h	mliststyle.h

	skipping to change at line 84	skipping to change at line 84
	*/	*/
	M_STYLE_ATTRIBUTE(QString, verticalSeparatorObjectName, VerticalSeparat orObjectName)	M_STYLE_ATTRIBUTE(QString, verticalSeparatorObjectName, VerticalSeparat orObjectName)

	/*!	/*!
	\property MListStyle::groupSeparatorObjectName	\property MListStyle::groupSeparatorObjectName
	\brief Sets object name for a group separator widget	\brief Sets object name for a group separator widget

	Sets object name for a group separator widget.	Sets object name for a group separator widget.
	*/	*/
	M_STYLE_ATTRIBUTE(QString, groupSeparatorObjectName, GroupSeparatorObje ctName)	M_STYLE_ATTRIBUTE(QString, groupSeparatorObjectName, GroupSeparatorObje ctName)


		/*!
		\property MListStyle::listDeleteItemAnimation
		\brief Sets object name for delete item animation

		Sets object name for delete item animation.
		*/
		M_STYLE_ATTRIBUTE(QString, deleteItemAnimation, DeleteItemAnimation)
	};	};

	class M_VIEWS_EXPORT MListStyleContainer : public MWidgetStyleContainer	class M_VIEWS_EXPORT MListStyleContainer : public MWidgetStyleContainer
	{	{
	M_STYLE_CONTAINER(MListStyle)	M_STYLE_CONTAINER(MListStyle)
	};	};

	#endif	#endif

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

	mnavigationbar.h	mnavigationbar.h

	skipping to change at line 63	skipping to change at line 63
	\sa MNavigationBarModel::EscapeButtonModeEnum, escapeButtonClicked( ).	\sa MNavigationBarModel::EscapeButtonModeEnum, escapeButtonClicked( ).
	*/	*/
	Q_PROPERTY(MNavigationBarModel::EscapeButtonModeEnum escapeButtonMode R EAD escapeButtonMode WRITE setEscapeButtonMode)	Q_PROPERTY(MNavigationBarModel::EscapeButtonModeEnum escapeButtonMode R EAD escapeButtonMode WRITE setEscapeButtonMode)

	public:	public:
	/*!	/*!
	* \brief Default constructor. Creates a navigation bar.	* \brief Default constructor. Creates a navigation bar.
	*/	*/
	MNavigationBar();	MNavigationBar();


		MNavigationBar(QGraphicsItem *parent);

	/*!	/*!
	\brief Destroys the navigation bar.	\brief Destroys the navigation bar.
	*/	*/
	virtual ~MNavigationBar();	virtual ~MNavigationBar();

	/**	/**
	* Returns the iconID of the icon of the application menu button.	* Returns the iconID of the icon of the application menu button.
	*/	*/
	QString viewMenuIconID() const;	QString viewMenuIconID() const;


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

	mpopupliststyle.h	mpopupliststyle.h

	skipping to change at line 42	skipping to change at line 42
	\sa MPopupListStyleContainer MDialogStyle \ref styling MPopupList MPopu pListView	\sa MPopupListStyleContainer MDialogStyle \ref styling MPopupList MPopu pListView
	*/	*/

	class M_VIEWS_EXPORT MPopupListStyle : public MDialogStyle	class M_VIEWS_EXPORT MPopupListStyle : public MDialogStyle
	{	{
	Q_OBJECT	Q_OBJECT
	M_STYLE_INTERNAL(MPopupListStyle)	M_STYLE_INTERNAL(MPopupListStyle)

	M_STYLE_ATTRIBUTE(QString, itemStyleName, ItemStyleName)	M_STYLE_ATTRIBUTE(QString, itemStyleName, ItemStyleName)
	M_STYLE_ATTRIBUTE(QString, contentsViewportStyleName, ContentsViewportS tyleName)	M_STYLE_ATTRIBUTE(QString, contentsViewportStyleName, ContentsViewportS tyleName)

		M_STYLE_ATTRIBUTE(bool, itemWordWrap, ItemWordWrap)
	};	};

	/*!	/*!
	\class MPopupListStyleContainer	\class MPopupListStyleContainer
	\brief Style mode container class for MPopupListStyle.	\brief Style mode container class for MPopupListStyle.

	\ingroup styles	\ingroup styles
	\sa MPopupListStyle	\sa MPopupListStyle
	*/	*/
	class M_VIEWS_EXPORT MPopupListStyleContainer : public MDialogStyleContaine r	class M_VIEWS_EXPORT MPopupListStyleContainer : public MDialogStyleContaine r

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

	msortfilterproxymodel.h	msortfilterproxymodel.h

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

	#ifndef MSORTFILTERPROXYMODEL_H	#ifndef MSORTFILTERPROXYMODEL_H
	#define MSORTFILTERPROXYMODEL_H	#define MSORTFILTERPROXYMODEL_H

	#include <MExport>	#include <MExport>
	#include <QSortFilterProxyModel>	#include <QSortFilterProxyModel>


		class MSortFilterProxyModelPrivate;

	/*!	/*!
	\class MSortFilterProxyModel	\class MSortFilterProxyModel
	\brief MSortFilterProxyModel reimplementation of a custom sort/filter p roxy data model.	\brief MSortFilterProxyModel reimplementation of a custom sort/filter p roxy data model.
	In case of filtering does not filter out the group headers (opos ite to default	In case of filtering does not filter out the group headers (opos ite to default
	QSortFilterProxyModel behavior).	QSortFilterProxyModel behavior).
	*/	*/
	class M_CORE_EXPORT MSortFilterProxyModel : public QSortFilterProxyModel	class M_CORE_EXPORT MSortFilterProxyModel : public QSortFilterProxyModel
	{	{
	Q_OBJECT	Q_OBJECT


	skipping to change at line 50	skipping to change at line 52
	*/	*/
	MSortFilterProxyModel(QObject *parent = NULL);	MSortFilterProxyModel(QObject *parent = NULL);

	/*!	/*!
	\brief Destructor.	\brief Destructor.
	*/	*/
	virtual ~MSortFilterProxyModel();	virtual ~MSortFilterProxyModel();

	//! \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);
	//! \reimp_end	//! \reimp_end


		Q_SIGNALS:
		/*!
		\param parent Parent index in which the rows were inserted.
		\param first First inserted row index.
		\param last Last inserted row index.
		\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);

		/*!
		\param parent Parent index in which the rows were removed.
		\param first First removed row index.
		\param last Last removed row index.
		\param animated Flag that shows if the remove operation was with anim
		ations or not.
		*/
		void rowsRemoved(const QModelIndex &parent, int first, int last, bool a
		nimated);

		/*!
		\param The signal is emitted if the layout change shall be animated.
		*/
		void layoutAboutToBeAnimated();

	private:	private:
	bool filterAcceptsGroup(const QModelIndex &source_index) const;	bool filterAcceptsGroup(const QModelIndex &source_index) const;


		Q_PRIVATE_SLOT(d_func(), void _q_layoutAboutToBeAnimated())
		Q_PRIVATE_SLOT(d_func(), void _q_rowsInserted(QModelIndex,int,int))
		Q_PRIVATE_SLOT(d_func(), void _q_rowsRemoved(QModelIndex,int,int))

		Q_PRIVATE_SLOT(d_func(), void _q_layoutChanged())

		private:
		MSortFilterProxyModelPrivate *d_ptr;
		Q_DECLARE_PRIVATE(MSortFilterProxyModel)
	};	};

	#endif // MSORTFILTERPROXYMODEL_H	#endif // MSORTFILTERPROXYMODEL_H

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

	mstatusbar.h	mstatusbar.h

	skipping to change at line 48	skipping to change at line 48
	{	{
	Q_OBJECT	Q_OBJECT
	M_CONTROLLER(MSceneWindow)	M_CONTROLLER(MSceneWindow)

	public:	public:
	/*!	/*!
	* \brief Default constructor.	* \brief Default constructor.
	*/	*/
	MStatusBar();	MStatusBar();


		MStatusBar(QGraphicsItem *parent);

	/*!	/*!
	\brief Destroys the status bar.	\brief Destroys the status bar.
	*/	*/
	virtual ~MStatusBar();	virtual ~MStatusBar();

	//! \reimp	//! \reimp
	bool sceneEvent(QEvent *event);	bool sceneEvent(QEvent *event);
	//! \reimp_end	//! \reimp_end

	private:	private:

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

	mstatusbarstyle.h	mstatusbarstyle.h

	skipping to change at line 33	skipping to change at line 33
	#include <mscenewindowstyle.h>	#include <mscenewindowstyle.h>

	class M_VIEWS_EXPORT MStatusBarStyle : public MSceneWindowStyle	class M_VIEWS_EXPORT MStatusBarStyle : public MSceneWindowStyle
	{	{
	Q_OBJECT	Q_OBJECT
	M_STYLE(MStatusBarStyle)	M_STYLE(MStatusBarStyle)

	M_STYLE_ATTRIBUTE(bool, useSwipeGesture, UseSwipeGesture)	M_STYLE_ATTRIBUTE(bool, useSwipeGesture, UseSwipeGesture)
	M_STYLE_ATTRIBUTE(int, swipeThreshold, SwipeThreshold)	M_STYLE_ATTRIBUTE(int, swipeThreshold, SwipeThreshold)
	M_STYLE_ATTRIBUTE(qreal, pressDimFactor, PressDimFactor)	M_STYLE_ATTRIBUTE(qreal, pressDimFactor, PressDimFactor)

		M_STYLE_ATTRIBUTE(bool, enableStatusIndicatorMenu, EnableStatusIndicato rMenu)
	};	};

	class M_VIEWS_EXPORT MStatusBarStyleContainer : public MSceneWindowStyleCon tainer	class M_VIEWS_EXPORT MStatusBarStyleContainer : public MSceneWindowStyleCon tainer
	{	{
	M_STYLE_CONTAINER(MStatusBarStyle)	M_STYLE_CONTAINER(MStatusBarStyle)
	};	};

	#endif // MSTATUSBARSTYLE_H	#endif // MSTATUSBARSTYLE_H

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

	mtexteditview.h	mtexteditview.h

	skipping to change at line 68	skipping to change at line 68
	//! \reimp	//! \reimp
	virtual void drawContents(QPainter painter, const QStyleOptionGraphics Item option) const;	virtual void drawContents(QPainter painter, const QStyleOptionGraphics Item option) const;
	virtual void applyStyle();	virtual void applyStyle();
	virtual void setupModel();	virtual void setupModel();
	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);	virtual void mousePressEvent(QGraphicsSceneMouseEvent *event);
	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);	virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event);
	virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);	virtual void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
	virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;	virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
	virtual void changeEvent(QEvent *event);	virtual void changeEvent(QEvent *event);
	virtual void cancelEvent(MCancelEvent *event);	virtual void cancelEvent(MCancelEvent *event);

		virtual void notifyItemChange(QGraphicsItem::GraphicsItemChange change,
		const QVariant &value);
	//! \reimp_end	//! \reimp_end

	//! \brief Notifies this and possibly derived views about the need for redraw.	//! \brief Notifies this and possibly derived views about the need for redraw.
	virtual void doUpdate();	virtual void doUpdate();

	//! \brief Gets the last mouse position.	//! \brief Gets the last mouse position.
	const QPointF &mouseTarget() const;	const QPointF &mouseTarget() const;

	//! \brief Updates cursor position based on mouse \a event.	//! \brief Updates cursor position based on mouse \a event.
	//! \param event Event that contains the mouse position, buttons, etc.	//! \param event Event that contains the mouse position, buttons, etc.

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

	mtextmagnifier.h	mtextmagnifier.h

	skipping to change at line 34	skipping to change at line 34

	#include <MOverlay>	#include <MOverlay>

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

	//! \internal	//! \internal

	//! Overlay widget to allow magnifier to stay on top of other widgets.	//! Overlay widget to allow magnifier to stay on top of other widgets.

	class MagnifierOverlay : public MOverlay	class MagnifierOverlay : public QGraphicsWidget
	{	{

		Q_OBJECT
	public:	public:

	MagnifierOverlay();	explicit MagnifierOverlay(const MSceneManager *sceneManager);
	bool isAppeared() const;	bool isAppeared() const;

	protected:	protected:

		//! \reimp
	virtual void panGestureEvent(QGestureEvent event, QPanGesture panGest ure);	virtual void panGestureEvent(QGestureEvent event, QPanGesture panGest ure);

		//! \reimp_end

		private slots:
		void rotateAndResizeToFullscreen(M::OrientationAngle angle);

		private:
		const MSceneManager * const sceneManager;

	friend class Ut_MTextMagnifier;	friend class Ut_MTextMagnifier;
	};	};

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

	explicit MTextMagnifier(const QGraphicsItem &sourceItem);	/*! \brief Constructs magnifier that magnifies \a sourceWidget.
		* \param sourceWidget The contents of this widget is magnified.
		* \param keepVisibleSize Size of centered rectangle in magnifier
		* which is guaranteed to be kept within screen limits. This is
		* given in unmagnified, \a sourceWidget, units.
		*/
		explicit MTextMagnifier(const MWidget &sourceWidget,
		const QSizeF &keepVisibleSize);
	virtual ~MTextMagnifier();	virtual ~MTextMagnifier();

	//! Show the magnifier. You should call \a setMagnifiedPosition before this.	//! Show the magnifier. You should call \a setMagnifiedPosition before this.
	void appear();	void appear();

	//! Hide magnifier.	//! Hide magnifier.
	void disappear();	void disappear();

	//! Set magnified position in source item coordinates.	//! Set magnified position in source item coordinates.
	//! Magnifier is drawn at this position unless offset is defined in sty le.	//! Magnifier is drawn at this position unless offset is defined in sty le.

	void setMagnifiedPosition(const QPointF &sourceItemPos);	void setMagnifiedPosition(const QPointF &sourceWidgetPos);

	//! Tells whether magnifier is visible at the moment.	//! Tells whether magnifier is visible at the moment.
	bool isAppeared() const;	bool isAppeared() const;

	protected:	protected:
	//! \reimp	//! \reimp
	virtual void drawContents(QPainter *painter,	virtual void drawContents(QPainter *painter,
	const QStyleOptionGraphicsItem *option) const ;	const QStyleOptionGraphicsItem *option) const ;
	virtual void applyStyle();	virtual void applyStyle();
	virtual void resizeEvent(QGraphicsSceneResizeEvent *event);	virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
	virtual QRectF boundingRect() const;	virtual QRectF boundingRect() const;
	//! \reimp_end	//! \reimp_end

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

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

		QSizeF frameSize() const;
		void updateMagnifierOffset();


	const QGraphicsItem &sourceItem;	const MWidget &sourceWidget;
		const QSizeF keepVisibleSize;
		QPointF offsetFromCenter;
	QScopedPointer<QPixmap> offscreenSurface;	QScopedPointer<QPixmap> offscreenSurface;

	QScopedPointer<QBitmap> mask;

	MagnifierOverlay overlay;	MagnifierOverlay overlay;

	M_STYLABLE_WIDGET(MTextMagnifierStyle)	M_STYLABLE_WIDGET(MTextMagnifierStyle)

	friend class Ut_MTextMagnifier;	friend class Ut_MTextMagnifier;
	};	};

	//! \internal_end	//! \internal_end


End of changes. 10 change blocks.
	6 lines changed or deleted	26 lines changed or added

	mtoolbarstyle.h	mtoolbarstyle.h

	skipping to change at line 64	skipping to change at line 64

	/*!	/*!
	* \brief Tool bar buttons have spacers between them to layout them equ ally in the available space	* \brief Tool bar buttons have spacers between them to layout them equ ally in the available space
	*/	*/
	M_STYLE_ATTRIBUTE(bool, hasSpaces, HasSpaces)	M_STYLE_ATTRIBUTE(bool, hasSpaces, HasSpaces)

	/*!	/*!
	* \brief Tool bar actions that have only text applied are handled with default button view instead of custom tool or tab bar views.	* \brief Tool bar actions that have only text applied are handled with default button view instead of custom tool or tab bar views.
	*/	*/
	M_STYLE_ATTRIBUTE(bool, labelOnlyAsCommonButton, LabelOnlyAsCommonButto n)	M_STYLE_ATTRIBUTE(bool, labelOnlyAsCommonButton, LabelOnlyAsCommonButto n)


		/*!
		* \brief Enable tool bar widget centering to scene window parent of th
		e tool bar
		*/
		M_STYLE_ATTRIBUTE(bool, centerToParent, CenterToParent)

		/*!
		* \brief Enable just common (default view based) button centering to s
		cene window parent of the tool bar
		*/
		M_STYLE_ATTRIBUTE(bool, centerCommonButtonsToParent, CenterCommonButton
		sToParent)

		/*!
		* \brief Margin that is applied according to widget alignment:
		Left side of the tool bar when widgets/buttons are aligned to the le
		ft.
		Right side of the tool bar when widgets/buttons are aligned to the r
		ight.
		Both sides when alignment is justify.
		Neither side on HCenter alignment.
		*/
		M_STYLE_ATTRIBUTE(int, alignmentMargins, AlignmentMargins)

		/*!
		* \brief Style name for label only button that are based on common sty
		le
		*/
		M_STYLE_ATTRIBUTE(QString, labelOnlyCommonButtonStyleName, LabelOnlyCom
		monButtonStyleName)

		/*!
		* \brief Style name for tool bar specific label only button
		*/
		M_STYLE_ATTRIBUTE(QString, labelOnlyButtonStyleName, LabelOnlyButtonSty
		leName)

		/*!
		* \brief Style name for button containing just icon
		*/
		M_STYLE_ATTRIBUTE(QString, iconButtonStyleName, IconButtonStyleName)

		/*!
		* \brief Style name for button containing both icon and label
		*/
		M_STYLE_ATTRIBUTE(QString, iconLabelButtonStyleName, IconLabelButtonSty
		leName)
	};	};

	/*!	/*!
	\class MToolbarStyleContainer	\class MToolbarStyleContainer
	\brief Style mode container class for MToolbarStyle.	\brief Style mode container class for MToolbarStyle.

	\ingroup styles	\ingroup styles
	\sa MToolbarStyle	\sa MToolbarStyle
	*/	*/
	class M_VIEWS_EXPORT MToolbarStyleContainer : public MWidgetStyleContainer	class M_VIEWS_EXPORT MToolbarStyleContainer : public MWidgetStyleContainer

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

	mdialoganimationstyle.h	mdialoganimationstyle.h

	skipping to change at line 42	skipping to change at line 42
	M_STYLE_ATTRIBUTE(QString, titleBarObjectName, TitleBarObjectName)	M_STYLE_ATTRIBUTE(QString, titleBarObjectName, TitleBarObjectName)
	M_STYLE_ATTRIBUTE(QString, contentsViewportObjectName, ContentsViewport ObjectName)	M_STYLE_ATTRIBUTE(QString, contentsViewportObjectName, ContentsViewport ObjectName)
	M_STYLE_ATTRIBUTE(QString, buttonBoxObjectName, ButtonBoxObjectName)	M_STYLE_ATTRIBUTE(QString, buttonBoxObjectName, ButtonBoxObjectName)

	M_STYLE_ATTRIBUTE(int, titleBarAnimationDelay, TitleBarAnimationDelay)	M_STYLE_ATTRIBUTE(int, titleBarAnimationDelay, TitleBarAnimationDelay)
	M_STYLE_ATTRIBUTE(int, contentsViewportAnimationDelay, ContentsViewport AnimationDelay)	M_STYLE_ATTRIBUTE(int, contentsViewportAnimationDelay, ContentsViewport AnimationDelay)
	M_STYLE_ATTRIBUTE(int, buttonBoxAnimationDelay, ButtonBoxAnimationDelay )	M_STYLE_ATTRIBUTE(int, buttonBoxAnimationDelay, ButtonBoxAnimationDelay )

	M_STYLE_ATTRIBUTE(int, titleBarAnimationDuration, TitleBarAnimationDura tion)	M_STYLE_ATTRIBUTE(int, titleBarAnimationDuration, TitleBarAnimationDura tion)
	M_STYLE_ATTRIBUTE(qreal, titleBarAnimationDistance, TitleBarAnimationDi stance)	M_STYLE_ATTRIBUTE(qreal, titleBarAnimationDistance, TitleBarAnimationDi stance)

		M_STYLE_ATTRIBUTE(QEasingCurve, titleBarAnimationEasingCurve, TitleBarA nimationEasingCurve)

	M_STYLE_ATTRIBUTE(int, contentsViewportOpacityAnimationDuration, Conten tsViewportOpacityAnimationDuration)	M_STYLE_ATTRIBUTE(int, contentsViewportOpacityAnimationDuration, Conten tsViewportOpacityAnimationDuration)
	M_STYLE_ATTRIBUTE(QEasingCurve, contentsViewportOpacityAnimationEasingC urve, ContentsViewportOpacityAnimationEasingCurve)	M_STYLE_ATTRIBUTE(QEasingCurve, contentsViewportOpacityAnimationEasingC urve, ContentsViewportOpacityAnimationEasingCurve)

	M_STYLE_ATTRIBUTE(int, contentsViewportScaleAnimationDuration, Contents ViewportScaleAnimationDuration)	M_STYLE_ATTRIBUTE(int, contentsViewportScaleAnimationDuration, Contents ViewportScaleAnimationDuration)
	M_STYLE_ATTRIBUTE(QEasingCurve, contentsViewportScaleAnimationEasingCur ve, ContentsViewportScaleAnimationEasingCurve)	M_STYLE_ATTRIBUTE(QEasingCurve, contentsViewportScaleAnimationEasingCur ve, ContentsViewportScaleAnimationEasingCurve)

	M_STYLE_ATTRIBUTE(int, buttonBoxAnimationDuration, ButtonBoxAnimationDu ration)	M_STYLE_ATTRIBUTE(int, buttonBoxAnimationDuration, ButtonBoxAnimationDu ration)
	M_STYLE_ATTRIBUTE(qreal, buttonBoxAnimationDistance, ButtonBoxAnimation Distance)	M_STYLE_ATTRIBUTE(qreal, buttonBoxAnimationDistance, ButtonBoxAnimation Distance)

		M_STYLE_ATTRIBUTE(QEasingCurve, buttonBoxAnimationEasingCurve, ButtonBo xAnimationEasingCurve)

	M_STYLE_ATTRIBUTE(qreal, scale, Scale)	M_STYLE_ATTRIBUTE(qreal, scale, Scale)
	M_STYLE_ATTRIBUTE(qreal, opacity, Opacity)	M_STYLE_ATTRIBUTE(qreal, opacity, Opacity)
	};	};

	class MDialogAnimationStyleContainer : public MAnimationStyleContainer	class MDialogAnimationStyleContainer : public MAnimationStyleContainer
	{	{
	M_STYLE_CONTAINER_INTERNAL(MDialogAnimationStyle)	M_STYLE_CONTAINER_INTERNAL(MDialogAnimationStyle)
	};	};
	//! \internal_end	//! \internal_end

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