mabstractcellcreator.h		mabstractcellcreator.h
	skipping to change at line 39		skipping to change at line 39
	\class MCellCreator		\class MCellCreator
	\brief Interface for creating and updating items (cells) for MList.		\brief Interface for creating and updating items (cells) for MList.
	\section MCellCreator Overview		\section MCellCreator Overview
	MCellCreator is a purely abstract class and should be implemented b y every class whose instances		MCellCreator is a purely abstract class and should be implemented b y every class whose instances
	are intended to create items for MList.		are intended to create items for MList.
	Main purpose of this interface is to create and update data of widg ets which has to be inserted		Main purpose of this interface is to create and update data of widg ets which has to be inserted
	into MList. Also MCellCreator returns size of a list item widget.		into MList. Also MCellCreator returns size of a list item widget.
	*/		*/
	class M_EXPORT MCellCreator		class M_CORE_EXPORT MCellCreator
	{		{
	public:		public:
	/*!		/*!
	Default virtual destructor.		Default virtual destructor.
	*/		*/
	virtual ~MCellCreator() {}		virtual ~MCellCreator() {}
	/*!		/*!
	\brief When MList needs a cell, it will call this function to get a p ointer to a widget.		\brief When MList needs a cell, it will call this function to get a p ointer to a widget.
	MList keeps ownership of a pointer and will delete object when it's n ot needed.		MList keeps ownership of a pointer and will delete object when it's n ot needed.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mabstractitemmodel.h		mabstractitemmodel.h
	skipping to change at line 32		skipping to change at line 32
	#include <MExport>		#include <MExport>
	#include <QAbstractItemModel>		#include <QAbstractItemModel>
	class MAbstractItemModelPrivate;		class MAbstractItemModelPrivate;
	/*!		/*!
	\class MAbstractItemModel		\class MAbstractItemModel
	\brief MAbstractItemModel implementation of a simple list data model.		\brief MAbstractItemModel implementation of a simple list data model.
	*/		*/
	class M_EXPORT MAbstractItemModel : public QAbstractItemModel		class M_CORE_EXPORT MAbstractItemModel : public QAbstractItemModel
	{		{
	Q_OBJECT		Q_OBJECT
	/*!		/*!
	\property MAbstractItemModel::grouped		\property MAbstractItemModel::grouped
	\brief True if the model is a grouped (tree) model, false if the mo del is		\brief True if the model is a grouped (tree) model, false if the mo del is
	a plain list model.		a plain list model.
	*/		*/
	Q_PROPERTY(bool grouped READ isGrouped WRITE setGrouped)		Q_PROPERTY(bool grouped READ isGrouped WRITE setGrouped)
	public:		public:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mabstractlayoutpolicy.h		mabstractlayoutpolicy.h
	skipping to change at line 155		skipping to change at line 155
	*		*
	* \section laying_out_item_in_custom_policy Laying out items in a custom p olicy		* \section laying_out_item_in_custom_policy Laying out items in a custom p olicy
	*		*
	* For each item in a policy, the policy should at least call the		* For each item in a policy, the policy should at least call the
	* QGraphicsLayoutItem::preferredSize() function to get the item's preferre d size.		* QGraphicsLayoutItem::preferredSize() function to get the item's preferre d size.
	* A well-behaved policy will also respect the QGraphicsLayoutItem::sizePol icy() so		* A well-behaved policy will also respect the QGraphicsLayoutItem::sizePol icy() so
	* that items can expand to take up all available space.		* that items can expand to take up all available space.
	*		*
	*/		*/
	class M_EXPORT MAbstractLayoutPolicy		class M_CORE_EXPORT MAbstractLayoutPolicy
	{		{
	public:		public:
	/** \brief Create a policy and associate it with the given layout		/** \brief Create a policy and associate it with the given layout
	*		*
	* The layout must not be NULL.		* The layout must not be NULL.
	* The layout takes ownership of the policy, deleting the policy when the layout is deleted. If the policy		* The layout takes ownership of the policy, deleting the policy when the layout is deleted. If the policy
	* is explicitly deleted, it will automatically be removed from the la yout.		* is explicitly deleted, it will automatically be removed from the la yout.
	*/		*/
	explicit MAbstractLayoutPolicy(MLayout *layout);		explicit MAbstractLayoutPolicy(MLayout *layout);
	skipping to change at line 398		skipping to change at line 398
	/*!		/*!
	* \brief Remove an item from the policy only.		* \brief Remove an item from the policy only.
	*		*
	* Convienence function		* Convienence function
	*		*
	* @param item The item to remove.		* @param item The item to remove.
	*/		*/
	void removeItem(const QGraphicsLayoutItem *item);		void removeItem(const QGraphicsLayoutItem *item);
	/*!		/*!
	* \brief Return whether this policy's height depends on its width.		* \brief Returns whether this policy's height depends on its width eve
	*		n if it does not contain any height-for-width items.
	* By default this returns false. Override in custom policies to retur
	n true if the sizeHint()
	* changes depending on the width.
	*/		*/
	virtual bool hasHeightForWidth() const {		virtual bool hasHeightForWidth() const;
	return false;
	}
	protected:		protected:
	/*!		/*!
	* \brief Shared d_ptr setup constructor.		* \brief Shared d_ptr setup constructor.
	*/		*/
	explicit MAbstractLayoutPolicy(MAbstractLayoutPolicyPrivate &);		explicit MAbstractLayoutPolicy(MAbstractLayoutPolicyPrivate &);
			/*! \brief Set whether this policy has a height which depends on its wi
			dth */
			void setHeightForWidth(bool hasHeightForWidth);
	/*!		/*!
	* \brief Insert an item in the policy at the given index.		* \brief Insert an item in the policy at the given index.
	*		*
	* Inserts @p item into the layout at @p index, or before any item that is currently at @p index.		* Inserts @p item into the layout at @p index, or before any item that is currently at @p index.
	*		*
	* The base class function is protected since this does not make sense for all policies. Policies can		* The base class function is protected since this does not make sense for all policies. Policies can
	* make this function public where it is suitable, or create their own API.		* make this function public where it is suitable, or create their own API.
	*		*
	* @param item The item to insert.		* @param item The item to insert.
	* @param index The index to place the item		* @param index The index to place the item
End of changes. 4 change blocks.
	9 lines changed or deleted		8 lines changed or added

	mabstractlayoutpolicystyle.h		mabstractlayoutpolicystyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MABSTRACTLAYOUTPOLICYSTYLE_H		#ifndef MABSTRACTLAYOUTPOLICYSTYLE_H
	#define MABSTRACTLAYOUTPOLICYSTYLE_H		#define MABSTRACTLAYOUTPOLICYSTYLE_H
	#include <mstyle.h>		#include <mstyle.h>
	/** \brief Defines a style for a MAbstractLayoutPolicy class and the polici es that inherit from this		/** \brief Defines a style for a MAbstractLayoutPolicy class and the polici es that inherit from this
	* This defines the attributes that are common to all MLayout policies		* This defines the attributes that are common to all MLayout policies
	*/		*/
	class M_EXPORT MAbstractLayoutPolicyStyle : public MStyle		class M_CORE_EXPORT MAbstractLayoutPolicyStyle : public MStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MAbstractLayoutPolicyStyle)		M_STYLE_INTERNAL(MAbstractLayoutPolicyStyle)
	///Sets the horizontal distances between items, where applicable.		///Sets the horizontal distances between items, where applicable.
	M_STYLE_ATTRIBUTE(qreal, horizontalSpacing, HorizontalSpacing)		M_STYLE_ATTRIBUTE(qreal, horizontalSpacing, HorizontalSpacing)
	///Sets the vertical distances between items, where applicable.		///Sets the vertical distances between items, where applicable.
	M_STYLE_ATTRIBUTE(qreal, verticalSpacing, VerticalSpacing)		M_STYLE_ATTRIBUTE(qreal, verticalSpacing, VerticalSpacing)
	///FIXME Convert these to int or, even better, QMargin		///FIXME Convert these to int or, even better, QMargin
	///The left contents margin of the layout for this policy. If this is not set explicitly (in code or css) it returns -1, indicating to use the ML ayout margin		///The left contents margin of the layout for this policy. If this is not set explicitly (in code or css) it returns -1, indicating to use the ML ayout margin
	M_STYLE_ATTRIBUTE(qreal, marginLeft, MarginLeft)		M_STYLE_ATTRIBUTE(qreal, marginLeft, MarginLeft)
	///The top contents margin of the layout for this policy. If this is n ot set explicitly (in code or css) it returns -1, indicating to use the MLa yout margin		///The top contents margin of the layout for this policy. If this is n ot set explicitly (in code or css) it returns -1, indicating to use the MLa yout margin
	M_STYLE_ATTRIBUTE(qreal, marginTop, MarginTop)		M_STYLE_ATTRIBUTE(qreal, marginTop, MarginTop)
	///The right contents margin of the layout for this policy. If this is not set explicitly (in code or css) it returns -1, indicating to use the M Layout margin		///The right contents margin of the layout for this policy. If this is not set explicitly (in code or css) it returns -1, indicating to use the M Layout margin
	M_STYLE_ATTRIBUTE(qreal, marginRight, MarginRight)		M_STYLE_ATTRIBUTE(qreal, marginRight, MarginRight)
	///The bottom contents margin of the layout for this policy. If this i s not set explicitly (in code or css) it returns -1, indicating to use the MLayout margin		///The bottom contents margin of the layout for this policy. If this i s not set explicitly (in code or css) it returns -1, indicating to use the MLayout margin
	M_STYLE_ATTRIBUTE(qreal, marginBottom, MarginBottom)		M_STYLE_ATTRIBUTE(qreal, marginBottom, MarginBottom)
	};		};
	class M_EXPORT MAbstractLayoutPolicyStyleContainer : public MStyleContainer		class M_CORE_EXPORT MAbstractLayoutPolicyStyleContainer : public MStyleCont ainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MAbstractLayoutPolicyStyle)		M_STYLE_CONTAINER_INTERNAL(MAbstractLayoutPolicyStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mabstractwidgetanimation.h		mabstractwidgetanimation.h
	skipping to change at line 33		skipping to change at line 33
	#include <mabstractwidgetanimationstyle.h>		#include <mabstractwidgetanimationstyle.h>
	#include <mparallelanimationgroup.h>		#include <mparallelanimationgroup.h>
	class MAbstractWidgetAnimationPrivate;		class MAbstractWidgetAnimationPrivate;
	/*!		/*!
	\class MAbstractWidgetAnimation		\class MAbstractWidgetAnimation
	\brief MAbstractWidgetAnimation class is a base class for all widget anim ations.		\brief MAbstractWidgetAnimation class is a base class for all widget anim ations.
	*/		*/
	class M_EXPORT MAbstractWidgetAnimation : public MParallelAnimationGroup		class M_CORE_EXPORT MAbstractWidgetAnimation : public MParallelAnimationGro up
	{		{
	Q_OBJECT		Q_OBJECT
	Q_DECLARE_PRIVATE(MAbstractWidgetAnimation)		Q_DECLARE_PRIVATE(MAbstractWidgetAnimation)
	M_ANIMATION_GROUP(MAbstractWidgetAnimationStyle)		M_ANIMATION_GROUP(MAbstractWidgetAnimationStyle)
	protected:		protected:
	/*!		/*!
	\brief Constructs the widget animation.		\brief Constructs the widget animation.
	This constructor is meant to be used inside the libmeegotouch to sh are the		This constructor is meant to be used inside the libmeegotouch to sh are the
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mabstractwidgetanimationstyle.h		mabstractwidgetanimationstyle.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MABSTRACTWIDGETANIMATIONSTYLE_H		#ifndef MABSTRACTWIDGETANIMATIONSTYLE_H
	#define MABSTRACTWIDGETANIMATIONSTYLE_H		#define MABSTRACTWIDGETANIMATIONSTYLE_H
	#include <manimationstyle.h>		#include <manimationstyle.h>
	#include <mexport.h>		#include <mexport.h>
	class M_EXPORT MAbstractWidgetAnimationStyle : public MAnimationStyle		class M_CORE_EXPORT MAbstractWidgetAnimationStyle : public MAnimationStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MAbstractWidgetAnimationStyle)		M_STYLE_INTERNAL(MAbstractWidgetAnimationStyle)
	M_STYLE_ATTRIBUTE(int, duration, Duration)		M_STYLE_ATTRIBUTE(int, duration, Duration)
	};		};
	class M_EXPORT MAbstractWidgetAnimationStyleContainer : public MAnimationSt yleContainer		class M_CORE_EXPORT MAbstractWidgetAnimationStyleContainer : public MAnimat ionStyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MAbstractWidgetAnimationStyle)		M_STYLE_CONTAINER_INTERNAL(MAbstractWidgetAnimationStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	maction.h		maction.h
	skipping to change at line 33		skipping to change at line 33
	#include "mexport.h"		#include "mexport.h"
	#include <QAction>		#include <QAction>
	class MActionPrivate;		class MActionPrivate;
	/**		/**
	\class MAction		\class MAction
	\brief MAction implements an extension of the QAction for libmeegotouch		\brief MAction implements an extension of the QAction for libmeegotouch
	*/		*/
	class M_EXPORT MAction : public QAction		class M_CORE_EXPORT MAction : public QAction
	{		{
	Q_OBJECT		Q_OBJECT
	/*!		/*!
	\ref logicalid "Logical ID" of the action icon.		\ref logicalid "Logical ID" of the action icon.
	*/		*/
	Q_PROPERTY(QString iconID READ iconID WRITE setIconID)		Q_PROPERTY(QString iconID READ iconID WRITE setIconID)
	Q_FLAGS(Locations)		Q_FLAGS(Locations)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	madvancedlistitem.h		madvancedlistitem.h
	skipping to change at line 32		skipping to change at line 32
	#include <MListItem>		#include <MListItem>
	class MAdvancedListItemPrivate;		class MAdvancedListItemPrivate;
	class MImageWidget;		class MImageWidget;
	class MLabel;		class MLabel;
	class MProgressIndicator;		class MProgressIndicator;
	class QGraphicsGridLayout;		class QGraphicsGridLayout;
	class M_EXPORT MAdvancedListItem : public MListItem		class M_CORE_EXPORT MAdvancedListItem : public MListItem
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QString title READ title WRITE setTitle)		Q_PROPERTY(QString title READ title WRITE setTitle)
	/*!		/*!
	\deprecated please use imageWidget property		\deprecated please use imageWidget property
	*/		*/
	Q_PROPERTY(MImageWidget* imagewidget READ imageWidget WRITE setImageWid get)		Q_PROPERTY(MImageWidget* imagewidget READ imageWidget WRITE setImageWid get)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	maggregatedataaccess.h		maggregatedataaccess.h
	skipping to change at line 53		skipping to change at line 53
	* MDataAccess& secondaryAccess;		* MDataAccess& secondaryAccess;
	* MDataAccess& tertiaryAccess;		* MDataAccess& tertiaryAccess;
	* MAggregateDataAccess* secondaryAggregate = new MAggregateDataAccess(seco ndaryAccess, tertiaryAccess);		* MAggregateDataAccess* secondaryAggregate = new MAggregateDataAccess(seco ndaryAccess, tertiaryAccess);
	* MAggregateDataAccess* aggregate = new MAggregateDataAccess(primaryAccess , *secondaryAggregate);		* MAggregateDataAccess* aggregate = new MAggregateDataAccess(primaryAccess , *secondaryAggregate);
	* \endcode		* \endcode
	*		*
	* Ownership of the primary and secondary data access are maintained on the caller. Caller needs to make sure that primary and secondary data access o bjects		* Ownership of the primary and secondary data access are maintained on the caller. Caller needs to make sure that primary and secondary data access o bjects
	* exist whenever MAggregateDataAccess exists. For instance, MAggregateData Access object has to be destroyed before associated primary and secondary		* exist whenever MAggregateDataAccess exists. For instance, MAggregateData Access object has to be destroyed before associated primary and secondary
	* data access objects are destroyed.		* data access objects are destroyed.
	*/		*/
	class M_EXPORT MAggregateDataAccess : public MDataAccess		class M_EXTENSIONS_EXPORT MAggregateDataAccess : public MDataAccess
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Default constructor.		* Default constructor.
	* \param primaryAccess Primary MDataAccess object. Values are set and accessed from this data access primarily.		* \param primaryAccess Primary MDataAccess object. Values are set and accessed from this data access primarily.
	* \param secondaryAccess Secondary MDataAccess object. Values are set and accessed from this data access only if values cannot be set or accessed from the primary access.		* \param secondaryAccess Secondary MDataAccess object. Values are set and accessed from this data access only if values cannot be set or accessed from the primary access.
	*/		*/
	MAggregateDataAccess(MDataAccess &primaryAccess, MDataAccess &secondary Access);		MAggregateDataAccess(MDataAccess &primaryAccess, MDataAccess &secondary Access);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	manimation.h		manimation.h
	skipping to change at line 90		skipping to change at line 90
	* virtual void updateCurrentTime (int currentTime ) {		* virtual void updateCurrentTime (int currentTime ) {
	* item->setOpacity(currentTime/1000.0);		* item->setOpacity(currentTime/1000.0);
	* }		* }
	* virtual int duration () const { return 1000; }		* virtual int duration () const { return 1000; }
	* protected:		* protected:
	* QGraphicsItem *item;		* QGraphicsItem *item;
	* };		* };
	* \endcode		* \endcode
	*		*
	*/		*/
	class M_EXPORT MAnimation : public QAbstractAnimation		class M_CORE_EXPORT MAnimation : public QAbstractAnimation
	{		{
	Q_OBJECT		Q_OBJECT
	Q_DECLARE_PRIVATE(MAnimation)		Q_DECLARE_PRIVATE(MAnimation)
	public:		public:
	/*! \brief Constructs the MAnimation base class, and passes		/*! \brief Constructs the MAnimation base class, and passes
	* \p parent to the QAbstractAnimation's constructor.		* \p parent to the QAbstractAnimation's constructor.
	*		*
	* \sa QAbstractAnimation, QAnimationGroup, QVariantAnimation, MGroupA nimation		* \sa QAbstractAnimation, QAnimationGroup, QVariantAnimation, MGroupA nimation
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	manimationcreator.h		manimationcreator.h
	skipping to change at line 36		skipping to change at line 36
	static const MAnimationCreator<ANIMATION> g_AnimationCreator(#ANIMATION );		static const MAnimationCreator<ANIMATION> g_AnimationCreator(#ANIMATION );
	// forward declarations		// forward declarations
	class QAbstractAnimation;		class QAbstractAnimation;
	/*!		/*!
	Interface for MAnimationCreators		Interface for MAnimationCreators
	you can implement your own creator or use MAnimationCreator template cla ss with		you can implement your own creator or use MAnimationCreator template cla ss with
	M_REGISTER_ANIMATION-macro.		M_REGISTER_ANIMATION-macro.
	*/		*/
	class M_EXPORT MAnimationCreatorBase		class M_CORE_EXPORT MAnimationCreatorBase
	{		{
	public:		public:
	/*!		/*!
	Constructor		Constructor
	Registers this creator instance to MClassFactory.		Registers this creator instance to MClassFactory.
	*/		*/
	MAnimationCreatorBase(const char *animationClassName);		MAnimationCreatorBase(const char *animationClassName);
	/*!		/*!
	Destructor		Destructor
	skipping to change at line 59		skipping to change at line 59
	virtual ~MAnimationCreatorBase();		virtual ~MAnimationCreatorBase();
	/*!		/*!
	Returns a new animation instance.		Returns a new animation instance.
	Ownership is transferred to caller.		Ownership is transferred to caller.
	*/		*/
	virtual QAbstractAnimation *create() const = 0;		virtual QAbstractAnimation *create() const = 0;
	};		};
	template<class ANIMATION>		template<class ANIMATION>
	class M_EXPORT MAnimationCreator : public MAnimationCreatorBase		class M_CORE_EXPORT MAnimationCreator : public MAnimationCreatorBase
	{		{
	public:		public:
	MAnimationCreator(const char *animationClassName) :		MAnimationCreator(const char *animationClassName) :
	MAnimationCreatorBase(animationClassName)		MAnimationCreatorBase(animationClassName)
	{}		{}
	virtual ~MAnimationCreator()		virtual ~MAnimationCreator()
	{}		{}
	virtual QAbstractAnimation *create() const {		virtual QAbstractAnimation *create() const {
	return new ANIMATION();		return new ANIMATION();
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	manimationstyle.h		manimationstyle.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 MANIMATIONSTYLE_H		#ifndef MANIMATIONSTYLE_H
	#define MANIMATIONSTYLE_H		#define MANIMATIONSTYLE_H
	#include <mstyle.h>		#include <mstyle.h>
	class M_EXPORT MAnimationStyle : public MStyle		class M_CORE_EXPORT MAnimationStyle : public MStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MAnimationStyle)		M_STYLE_INTERNAL(MAnimationStyle)
	};		};
	class M_EXPORT MAnimationStyleContainer : public MStyleContainer		class M_CORE_EXPORT MAnimationStyleContainer : public MStyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MAnimationStyle)		M_STYLE_CONTAINER_INTERNAL(MAnimationStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mappletalivemessagerequest.h		mappletalivemessagerequest.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MAPPLETALIVEMESSAGEREQUEST_H		#ifndef MAPPLETALIVEMESSAGEREQUEST_H
	#define MAPPLETALIVEMESSAGEREQUEST_H		#define MAPPLETALIVEMESSAGEREQUEST_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* Applet alive message.		* Applet alive message.
	*/		*/
	class M_EXPORT MAppletAliveMessageRequest : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletAliveMessageRequest : public MAppletMessag e
	{		{
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	*/		*/
	MAppletAliveMessageRequest();		MAppletAliveMessageRequest();
	/*!		/*!
	* Destructor.		* Destructor.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletalivemessageresponse.h		mappletalivemessageresponse.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MAPPLETALIVEMESSAGERESPONSE_H		#ifndef MAPPLETALIVEMESSAGERESPONSE_H
	#define MAPPLETALIVEMESSAGERESPONSE_H		#define MAPPLETALIVEMESSAGERESPONSE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* Applet alive message.		* Applet alive message.
	*/		*/
	class M_EXPORT MAppletAliveMessageResponse : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletAliveMessageResponse : public MAppletMessa ge
	{		{
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	*/		*/
	MAppletAliveMessageResponse();		MAppletAliveMessageResponse();
	/*!		/*!
	* Destructor.		* Destructor.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletcancelmessage.h		mappletcancelmessage.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLETCANCELMESSAGE_H		#ifndef MAPPLETCANCELMESSAGE_H
	#define MAPPLETCANCELMESSAGE_H		#define MAPPLETCANCELMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* Cancel message sent to the applet when the previously		* Cancel message sent to the applet when the previously
	* sent mouse press message needs to be cancelled.		* sent mouse press message needs to be cancelled.
	*/		*/
	class M_EXPORT MAppletCancelMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletCancelMessage : public MAppletMessage
	{		{
	public:		public:
	/*!		/*!
	* Cancel message constructor. The message does not contain		* Cancel message constructor. The message does not contain
	* any attributes, so no parameter is required.		* any attributes, so no parameter is required.
	*/		*/
	explicit MAppletCancelMessage();		explicit MAppletCancelMessage();
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletclient.h		mappletclient.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MAPPLETCLIENT_H_		#ifndef MAPPLETCLIENT_H_
	#define MAPPLETCLIENT_H_		#define MAPPLETCLIENT_H_
	#include "mexport.h"		#include "mexport.h"
	#include "mappletcommunicator.h"		#include "mappletcommunicator.h"
	/*!		/*!
	* The MAppletClient implements a client for interprocess communication		* The MAppletClient implements a client for interprocess communication
	* between two processes (a host application and an applet).		* between two processes (a host application and an applet).
	*/		*/
	class M_EXPORT MAppletClient : public MAppletCommunicator		class M_EXTENSIONS_EXPORT MAppletClient : public MAppletCommunicator
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Constructs a MAppletClient.		* Constructs a MAppletClient.
	*/		*/
	MAppletClient();		MAppletClient();
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletcommunicator.h		mappletcommunicator.h
	skipping to change at line 34		skipping to change at line 34
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <QLocalSocket>		#include <QLocalSocket>
	#include <QBuffer>		#include <QBuffer>
	class QDataStream;		class QDataStream;
	/*!		/*!
	* The MAppletCommunicator is a base class for implementing interprocess		* The MAppletCommunicator is a base class for implementing interprocess
	* communication between two processes (a host application and an applet).		* communication between two processes (a host application and an applet).
	*/		*/
	class M_EXPORT MAppletCommunicator : public QObject		class M_EXTENSIONS_EXPORT MAppletCommunicator : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Constructs an MAppletCommunicator.		* Constructs an MAppletCommunicator.
	*/		*/
	MAppletCommunicator();		MAppletCommunicator();
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappleticonchangedmessage.h		mappleticonchangedmessage.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLETICONCHANGEDMESSAGE_H		#ifndef MAPPLETICONCHANGEDMESSAGE_H
	#define MAPPLETICONCHANGEDMESSAGE_H		#define MAPPLETICONCHANGEDMESSAGE_H
	#include <QString>		#include <QString>
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* Applet icon changed message.		* Applet icon changed message.
	*/		*/
	class M_EXPORT MAppletIconChangedMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletIconChangedMessage : public MAppletMessage
	{		{
	private:		private:
	QString _icon;		QString _icon;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	*/		*/
	MAppletIconChangedMessage();		MAppletIconChangedMessage();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletinstallationsourceinterface.h		mappletinstallationsourceinterface.h
	skipping to change at line 53		skipping to change at line 53
	/**		/**
	* MAppletInstallationSourceInterface is the base class for applet installa tion source classes.		* MAppletInstallationSourceInterface is the base class for applet installa tion source classes.
	*		*
	* Applet installation source developers need to implement this interface i n a plugin library		* Applet installation source developers need to implement this interface i n a plugin library
	* and export their implementation from the library. The applet inventory w ill instantiate		* and export their implementation from the library. The applet inventory w ill instantiate
	* the available installation sources when needed.		* the available installation sources when needed.
	*		*
	* \see \ref appletinstallationsource		* \see \ref appletinstallationsource
	*/		*/
	class M_EXPORT MAppletInstallationSourceInterface : public MApplicationExte nsionInterface		class M_EXTENSIONS_EXPORT MAppletInstallationSourceInterface : public MAppl icationExtensionInterface
	{		{
	Q_INTERFACES(MApplicationExtensionInterface)		Q_INTERFACES(MApplicationExtensionInterface)
	public:		public:
	/*!		/*!
	* Destructor.		* Destructor.
	*/		*/
	virtual ~MAppletInstallationSourceInterface() {}		virtual ~MAppletInstallationSourceInterface() {}
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletinterface.h		mappletinterface.h
	skipping to change at line 42		skipping to change at line 42
	* MAppletInterface is the base class for desktop applet		* MAppletInterface is the base class for desktop applet
	* entry-point classes.		* entry-point classes.
	*		*
	* Applet developers need to implement this interface in their applet binar y		* Applet developers need to implement this interface in their applet binar y
	* and export their implementation from the binary. The host application wi ll maintain		* and export their implementation from the binary. The host application wi ll maintain
	* an inventory of available applets and instantiate them using this interf ace		* an inventory of available applets and instantiate them using this interf ace
	* when needed.		* when needed.
	*		*
	* \see \ref appletdevelopment		* \see \ref appletdevelopment
	*/		*/
	class M_EXPORT MAppletInterface		class M_EXTENSIONS_EXPORT MAppletInterface
	{		{
	public:		public:
	/*!		/*!
	* Destructor.		* Destructor.
	*/		*/
	virtual ~MAppletInterface() {}		virtual ~MAppletInterface() {}
	/**		/**
	* This method is called to construct a new applet widget instance.		* This method is called to construct a new applet widget instance.
	* Caller will maintain the ownership of the constructed widget and		* Caller will maintain the ownership of the constructed widget and
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletloader.h		mappletloader.h
	skipping to change at line 34		skipping to change at line 34
	class QGraphicsWidget;		class QGraphicsWidget;
	class MAppletMetaData;		class MAppletMetaData;
	class MDataStore;		class MDataStore;
	class MDataAccess;		class MDataAccess;
	//! \internal		//! \internal
	/*!		/*!
	* \brief A class that loads MeeGo Touch applets.		* \brief A class that loads MeeGo Touch applets.
	*/		*/
	class M_EXPORT MAppletLoader		class M_EXTENSIONS_EXPORT MAppletLoader
	{		{
	public:		public:
	/*!		/*!
	* Loads an applet according to an applet metadata object.		* Loads an applet according to an applet metadata object.
	* The ownership of the returned applet widget is transferred to the ca ller.		* The ownership of the returned applet widget is transferred to the ca ller.
	* \param metadata the metadata that is used to load the applet.		* \param metadata the metadata that is used to load the applet.
	* \param dataStore a data store object where applet instances can stor e their instance specific data.		* \param dataStore a data store object where applet instances can stor e their instance specific data.
	* \param settings a data store object that bundles applet settings to the applet.		* \param settings a data store object that bundles applet settings to the applet.
	* \return the applet widget or \c NULL in an error.		* \return the applet widget or \c NULL in an error.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletmessage.h		mappletmessage.h
	skipping to change at line 32		skipping to change at line 32
	#include "mexport.h"		#include "mexport.h"
	#include <QDataStream>		#include <QDataStream>
	/*!		/*!
	* An abstract base class for messages that are used for communicating betw een		* An abstract base class for messages that are used for communicating betw een
	* applets and the host process. Messages can be serialized to a byte strea m		* applets and the host process. Messages can be serialized to a byte strea m
	* so they can be communicated to another processes.		* so they can be communicated to another processes.
	*/		*/
	class M_EXPORT MAppletMessage		class M_EXTENSIONS_EXPORT MAppletMessage
	{		{
	public:		public:
	/*!		/*!
	* A type for the message.		* A type for the message.
	*/		*/
	enum MAppletMessageType {		enum MAppletMessageType {
	InvalidMessage = 0,		InvalidMessage = 0,
	VisibilityMessage,		VisibilityMessage,
	OrientationMessage,		OrientationMessage,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletmessagefactory.h		mappletmessagefactory.h
	skipping to change at line 39		skipping to change at line 39
	*		*
	* The factory class offers a service to create applet messages of the corr ect type.		* The factory class offers a service to create applet messages of the corr ect type.
	* The applet message type is passed as a parameter to the \c create() func tion and		* The applet message type is passed as a parameter to the \c create() func tion and
	* the function constructs and returns a correct message object. If an inva lid message		* the function constructs and returns a correct message object. If an inva lid message
	* type is requested, the factory returns \c NULL.		* type is requested, the factory returns \c NULL.
	*		*
	* \note The \c creator() function is \c static so you don't need an instan ce of the		* \note The \c creator() function is \c static so you don't need an instan ce of the
	* factory. Actually you can't even create instances of it since the constr uctor is		* factory. Actually you can't even create instances of it since the constr uctor is
	* hidden.		* hidden.
	*/		*/
	class M_EXPORT MAppletMessageFactory		class M_EXTENSIONS_EXPORT MAppletMessageFactory
	{		{
	private:		private:
	/// Hidden constructor to prevent instantiating.		/// Hidden constructor to prevent instantiating.
	MAppletMessageFactory();		MAppletMessageFactory();
	public:		public:
	/*!		/*!
	* Creates an applet message object of the requested type.		* Creates an applet message object of the requested type.
	*		*
	* The function constructs and returns a correct message object. If an invalid message		* The function constructs and returns a correct message object. If an invalid message
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletmetadata.h		mappletmetadata.h
	skipping to change at line 52		skipping to change at line 52
	*		*
	* // Make sure that applet metadata is valid before using it.		* // Make sure that applet metadata is valid before using it.
	* if(data.isValid())		* if(data.isValid())
	* {		* {
	* // Access metadata..		* // Access metadata..
	* }		* }
	* \endcode		* \endcode
	*		*
	* \see \ref appletdevelopment		* \see \ref appletdevelopment
	*/		*/
	class M_EXPORT MAppletMetaData : public MDesktopEntry		class M_EXTENSIONS_EXPORT MAppletMetaData : public MDesktopEntry
	{		{
	public:		public:
	/*!		/*!
	* Constructs a new instance of MAppletMetaData by reading the .desktop		* Constructs a new instance of MAppletMetaData by reading the .desktop
	* file in that is given as a construction parameter.		* file in that is given as a construction parameter.
	* \param filename Location of .desktop file to be read by constructed MAppletMetaData instance.		* \param filename Location of .desktop file to be read by constructed MAppletMetaData instance.
	*/		*/
	MAppletMetaData(const QString &filename);		MAppletMetaData(const QString &filename);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletmousemessage.h		mappletmousemessage.h
	skipping to change at line 32		skipping to change at line 32
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <QPointF>		#include <QPointF>
	/*!		/*!
	* A base class for mouse event related applet messages.		* A base class for mouse event related applet messages.
	*		*
	* A mouse event contains the position of the mouse pointer when the event occurred.		* A mouse event contains the position of the mouse pointer when the event occurred.
	*/		*/
	class M_EXPORT MAppletMouseMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletMouseMessage : public MAppletMessage
	{		{
	private:		private:
	/// Location of the mouse pointer in the event.		/// Location of the mouse pointer in the event.
	QPointF _position;		QPointF _position;
	/// Mouse button that triggered the event.		/// Mouse button that triggered the event.
	Qt::MouseButton _button;		Qt::MouseButton _button;
	/// State of mouse buttons when this event was triggered.		/// State of mouse buttons when this event was triggered.
	Qt::MouseButtons _buttons;		Qt::MouseButtons _buttons;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletobjectmenuactionselectedmessage.h		mappletobjectmenuactionselectedmessage.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLETOBJECTMENUACTIONSELECTEDMESSAGE_H		#ifndef MAPPLETOBJECTMENUACTIONSELECTEDMESSAGE_H
	#define MAPPLETOBJECTMENUACTIONSELECTEDMESSAGE_H		#define MAPPLETOBJECTMENUACTIONSELECTEDMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <mnamespace.h>		#include <mnamespace.h>
	/*!		/*!
	* Send Response to applet with index of action selected from context menu actions displayed in host process		* Send Response to applet with index of action selected from context menu actions displayed in host process
	*/		*/
	class M_EXPORT MAppletObjectMenuActionSelectedMessage : public MAppletMessa ge		class M_EXTENSIONS_EXPORT MAppletObjectMenuActionSelectedMessage : public M AppletMessage
	{		{
	private:		private:
	/// index of action selected.		/// index of action selected.
	uint actionIndex;		uint actionIndex;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletobjectmenumessage.h		mappletobjectmenumessage.h
	skipping to change at line 31		skipping to change at line 31
	#define MAPPLETOBJECTMENUMESSAGE_H		#define MAPPLETOBJECTMENUMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <mnamespace.h>		#include <mnamespace.h>
	class QAction;		class QAction;
	/*!		/*!
	* Object menu message which provides list of actions from applet.		* Object menu message which provides list of actions from applet.
	*/		*/
	class M_EXPORT MAppletObjectMenuMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletObjectMenuMessage : public MAppletMessage
	{		{
	private:		private:
	/// The list of action names.		/// The list of action names.
	QList<QString> actionNamesList;		QList<QString> actionNamesList;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	* List of QAction is given which are translated to list of QString and passed along.		* List of QAction is given which are translated to list of QString and passed along.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletobjectmenurequestmessage.h		mappletobjectmenurequestmessage.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLETOBJECTMENUREQUESTMESSAGE_H		#ifndef MAPPLETOBJECTMENUREQUESTMESSAGE_H
	#define MAPPLETOBJECTMENUREQUESTMESSAGE_H		#define MAPPLETOBJECTMENUREQUESTMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <mnamespace.h>		#include <mnamespace.h>
	/*!		/*!
	* Send Request to applet runner for a context menu.		* Send Request to applet runner for a context menu.
	*/		*/
	class M_EXPORT MAppletObjectMenuRequestMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletObjectMenuRequestMessage : public MAppletM essage
	{		{
	private:		private:
	/// position where the event occured		/// position where the event occured
	QPointF _pos ;		QPointF _pos ;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	* The point of event is a parameter.		* The point of event is a parameter.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletorientationmessage.h		mappletorientationmessage.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLETORIENTATIONMESSAGE_H		#ifndef MAPPLETORIENTATIONMESSAGE_H
	#define MAPPLETORIENTATIONMESSAGE_H		#define MAPPLETORIENTATIONMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <mnamespace.h>		#include <mnamespace.h>
	/*!		/*!
	* Screen orientation change applet message.		* Screen orientation change applet message.
	*/		*/
	class M_EXPORT MAppletOrientationMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletOrientationMessage : public MAppletMessage
	{		{
	private:		private:
	/// The new orientation.		/// The new orientation.
	M::Orientation _orientation;		M::Orientation _orientation;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	* The orientation can be set as a parameter. The default is \c M::Land scape.		* The orientation can be set as a parameter. The default is \c M::Land scape.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletpixmapmodifiedmessage.h		mappletpixmapmodifiedmessage.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MAPPLETPIXMAPMODIFIEDMESSAGE_H		#ifndef MAPPLETPIXMAPMODIFIEDMESSAGE_H
	#define MAPPLETPIXMAPMODIFIEDMESSAGE_H		#define MAPPLETPIXMAPMODIFIEDMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <QRectF>		#include <QRectF>
	/*!		/*!
	* An applet message for notifying the host that a part of the applet pixma p has been modified.		* An applet message for notifying the host that a part of the applet pixma p has been modified.
	*/		*/
	class M_EXPORT MAppletPixmapModifiedMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletPixmapModifiedMessage : public MAppletMess age
	{		{
	private:		private:
	//! The geometry of the modified region.		//! The geometry of the modified region.
	QRectF _geometry;		QRectF _geometry;
	public:		public:
	/*!		/*!
	* Constructs a MAppletPixmapModifiedMessage.		* Constructs a MAppletPixmapModifiedMessage.
	*		*
	* The geometry of the modified region can be set as a parameter.		* The geometry of the modified region can be set as a parameter.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletpixmaptakenintousemessage.h		mappletpixmaptakenintousemessage.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MAPPLETPIXMAPTAKENINTOUSEMESSAGE_H		#ifndef MAPPLETPIXMAPTAKENINTOUSEMESSAGE_H
	#define MAPPLETPIXMAPTAKENINTOUSEMESSAGE_H		#define MAPPLETPIXMAPTAKENINTOUSEMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* An applet message for notifying that the pixmap has been taken into use.		* An applet message for notifying that the pixmap has been taken into use.
	*/		*/
	class M_EXPORT MAppletPixmapTakenIntoUseMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletPixmapTakenIntoUseMessage : public MApplet Message
	{		{
	private:		private:
	//! The X pixmap handle.		//! The X pixmap handle.
	Qt::HANDLE _handle;		Qt::HANDLE _handle;
	public:		public:
	/*!		/*!
	* Constructs a MAppletPixmapTakenIntoUseMessage.		* Constructs a MAppletPixmapTakenIntoUseMessage.
	*		*
	* \param handle the pixmap handle		* \param handle the pixmap handle
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletserver.h		mappletserver.h
	skipping to change at line 32		skipping to change at line 32
	#include "mexport.h"		#include "mexport.h"
	#include "mappletcommunicator.h"		#include "mappletcommunicator.h"
	class QLocalServer;		class QLocalServer;
	/*!		/*!
	* The MAppletServer implements a server for interprocess communication		* The MAppletServer implements a server for interprocess communication
	* between two processes (a host application and an applet).		* between two processes (a host application and an applet).
	*/		*/
	class M_EXPORT MAppletServer : public MAppletCommunicator		class M_EXTENSIONS_EXPORT MAppletServer : public MAppletCommunicator
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Constructs a MAppletServer.		* Constructs a MAppletServer.
	*/		*/
	MAppletServer();		MAppletServer();
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletsetgeometrymessage.h		mappletsetgeometrymessage.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MAPPLETSETGEOMETRYMESSAGE_H		#ifndef MAPPLETSETGEOMETRYMESSAGE_H
	#define MAPPLETSETGEOMETRYMESSAGE_H		#define MAPPLETSETGEOMETRYMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <QRectF>		#include <QRectF>
	/*!		/*!
	* An applet message for setting the geometry of a \c QGraphicsLayoutItem.		* An applet message for setting the geometry of a \c QGraphicsLayoutItem.
	*/		*/
	class M_EXPORT MAppletSetGeometryMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletSetGeometryMessage : public MAppletMessage
	{		{
	private:		private:
	//! The geometry property of the message.		//! The geometry property of the message.
	QRectF _geometry;		QRectF _geometry;
	//! The X pixmap handle.		//! The X pixmap handle.
	Qt::HANDLE _handle;		Qt::HANDLE _handle;
	public:		public:
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletsettings.h		mappletsettings.h
	skipping to change at line 37		skipping to change at line 37
	class MAppletId;		class MAppletId;
	class MDataAccess;		class MDataAccess;
	class MDataStore;		class MDataStore;
	class MAppletSettingsPrivate;		class MAppletSettingsPrivate;
	/*!		/*!
	* \class MAppletSettings		* \class MAppletSettings
	* This class handles parsing of the applet instance and global settings fi les		* This class handles parsing of the applet instance and global settings fi les
	* and creation of settings binaries.		* and creation of settings binaries.
	*/		*/
	class M_EXPORT MAppletSettings		class M_EXTENSIONS_EXPORT MAppletSettings
	{		{
	public:		public:
	/*!		/*!
	* Constructs a MAppletSettings object.		* Constructs a MAppletSettings object.
	* \param metaDataFileName Name of the applet metadata file		* \param metaDataFileName Name of the applet metadata file
	* \param appletId The applet's id		* \param appletId The applet's id
	*/		*/
	MAppletSettings(const QString &metaDataFileName, const MAppletId &apple tId);		MAppletSettings(const QString &metaDataFileName, const MAppletId &apple tId);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletsettingsdialog.h		mappletsettingsdialog.h
	skipping to change at line 31		skipping to change at line 31
	#define MAPPLETSETTINGSDIALOG_H		#define MAPPLETSETTINGSDIALOG_H
	#include "mexport.h"		#include "mexport.h"
	#include "mappletsettings.h"		#include "mappletsettings.h"
	/*!		/*!
	* \class MAppletSettingsDialog		* \class MAppletSettingsDialog
	* \brief MAppletSettingsDialog implements the applet settings dialog.		* \brief MAppletSettingsDialog implements the applet settings dialog.
	* A dialog is constructed if an applet has any settings to show.		* A dialog is constructed if an applet has any settings to show.
	*/		*/
	class M_EXPORT MAppletSettingsDialog		class M_EXTENSIONS_EXPORT MAppletSettingsDialog
	{		{
	public:		public:
	/*!		/*!
	* Creates the applet settings dialog showing applet instance and globa l settings.		* Creates the applet settings dialog showing applet instance and globa l settings.
	* Uses the applet settings object received as an argument.		* Uses the applet settings object received as an argument.
	* \param settings the applet settings object to use.		* \param settings the applet settings object to use.
	*/		*/
	static void exec(const MAppletSettings& settings);		static void exec(const MAppletSettings& settings);
	private:		private:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletsharedmutex.h		mappletsharedmutex.h
	skipping to change at line 34		skipping to change at line 34
	class MAppletSharedMutexPrivate;		class MAppletSharedMutexPrivate;
	/*!		/*!
	* MAppletSharedMutex provides a POSIX mutex that is located in shared		* MAppletSharedMutex provides a POSIX mutex that is located in shared
	* memory. Initializing the shared mutex will create a shared memory segmen t		* memory. Initializing the shared mutex will create a shared memory segmen t
	* if one is not created yet. Otherwise the already existing shared memory		* if one is not created yet. Otherwise the already existing shared memory
	* segment is attached. Destroying the mutex will detach from the shared		* segment is attached. Destroying the mutex will detach from the shared
	* memory so that when all parties have detached the segment will be freed.		* memory so that when all parties have detached the segment will be freed.
	*/		*/
	class M_EXPORT MAppletSharedMutex		class M_EXTENSIONS_EXPORT MAppletSharedMutex
	{		{
	Q_DECLARE_PRIVATE(MAppletSharedMutex)		Q_DECLARE_PRIVATE(MAppletSharedMutex)
	public:		public:
	/*!		/*!
	* Creates a new shared mutex. The mutex must be initialized using		* Creates a new shared mutex. The mutex must be initialized using
	* init() before it can be used.		* init() before it can be used.
	*/		*/
	MAppletSharedMutex();		MAppletSharedMutex();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplettextchangedmessage.h		mapplettextchangedmessage.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLETTEXTCHANGEDMESSAGE_H		#ifndef MAPPLETTEXTCHANGEDMESSAGE_H
	#define MAPPLETTEXTCHANGEDMESSAGE_H		#define MAPPLETTEXTCHANGEDMESSAGE_H
	#include <QString>		#include <QString>
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* Applet text changed message.		* Applet text changed message.
	*/		*/
	class M_EXPORT MAppletTextChangedMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletTextChangedMessage : public MAppletMessage
	{		{
	private:		private:
	QString _text;		QString _text;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	*/		*/
	MAppletTextChangedMessage();		MAppletTextChangedMessage();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplettitlechangedmessage.h		mapplettitlechangedmessage.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLETTITLECHANGEDMESSAGE_H		#ifndef MAPPLETTITLECHANGEDMESSAGE_H
	#define MAPPLETTITLECHANGEDMESSAGE_H		#define MAPPLETTITLECHANGEDMESSAGE_H
	#include <QString>		#include <QString>
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* Applet title changed message.		* Applet title changed message.
	*/		*/
	class M_EXPORT MAppletTitleChangedMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletTitleChangedMessage : public MAppletMessag e
	{		{
	private:		private:
	QString _title;		QString _title;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	*/		*/
	MAppletTitleChangedMessage();		MAppletTitleChangedMessage();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletupdategeometrymessage.h		mappletupdategeometrymessage.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MAPPLETUPDATEGEOMETRYMESSAGE_H		#ifndef MAPPLETUPDATEGEOMETRYMESSAGE_H
	#define MAPPLETUPDATEGEOMETRYMESSAGE_H		#define MAPPLETUPDATEGEOMETRYMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	#include <QVector>		#include <QVector>
	#include <QSizeF>		#include <QSizeF>
	/*!		/*!
	* Update geometry message.		* Update geometry message.
	*/		*/
	class M_EXPORT MAppletUpdateGeometryMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletUpdateGeometryMessage : public MAppletMess age
	{		{
	private:		private:
	// Size hints		// Size hints
	QVector<QSizeF> _sizeHints;		QVector<QSizeF> _sizeHints;
	public:		public:
	/*!		/*!
	* Constructs a MAppletUpdateGeometryMessage.		* Constructs a MAppletUpdateGeometryMessage.
	*		*
	* \param sizeHints a vector containing size hints		* \param sizeHints a vector containing size hints
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mappletvisibilitymessage.h		mappletvisibilitymessage.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MAPPLETVISIBILITYMESSAGE_H		#ifndef MAPPLETVISIBILITYMESSAGE_H
	#define MAPPLETVISIBILITYMESSAGE_H		#define MAPPLETVISIBILITYMESSAGE_H
	#include "mappletmessage.h"		#include "mappletmessage.h"
	/*!		/*!
	* An applet message for telling an applet when it gets visible/invisible.		* An applet message for telling an applet when it gets visible/invisible.
	*/		*/
	class M_EXPORT MAppletVisibilityMessage : public MAppletMessage		class M_EXTENSIONS_EXPORT MAppletVisibilityMessage : public MAppletMessage
	{		{
	private:		private:
	//! Visible or invisible		//! Visible or invisible
	bool _visible;		bool _visible;
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*		*
	* The visibility property can be set as a parameter.		* The visibility property can be set as a parameter.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplication.h		mapplication.h
	skipping to change at line 78		skipping to change at line 78
	* 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.
	*/		*/
	class M_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
	* \param argv argument strings passed to the application from the comm and line		* \param argv argument strings passed to the application from the comm and line
	* \param appIdentifier an optional identifier for the application. Can		* \param appIdentifier an optional identifier for the application. Can
	* contain alphabetical characters, numbers, dashes and underscores. If		* contain alphabetical characters, numbers, dashes and underscores. If
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationextensionarea.h		mapplicationextensionarea.h
	skipping to change at line 39		skipping to change at line 39
	/*!		/*!
	* MApplicationExtensionArea is a widget which can be populated with		* MApplicationExtensionArea is a widget which can be populated with
	* application extensions. MApplicationExtensionArea can be placed on		* application extensions. MApplicationExtensionArea can be placed on
	* any view that wants to have application extension support.		* any view that wants to have application extension support.
	*		*
	* The MApplicationExtensionArea will load application extensions which		* The MApplicationExtensionArea will load application extensions which
	* implement the specified interface.		* implement the specified interface.
	*		*
	* \see \ref applicationextensions		* \see \ref applicationextensions
	*/		*/
	class M_EXPORT MApplicationExtensionArea : public MExtensionArea		class M_EXTENSIONS_EXPORT MApplicationExtensionArea : public MExtensionArea
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MApplicationExtensionArea)		M_CONTROLLER(MApplicationExtensionArea)
	public:		public:
	/*!		/*!
	* Constructs an application extension area. The area is not initialize d		* Constructs an application extension area. The area is not initialize d
	* until init() has been called.		* until init() has been called.
	*		*
	* \param interface the name of the interface the application extension s		* \param interface the name of the interface the application extension s
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationextensionareamodel.h		mapplicationextensionareamodel.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MAPPLICATIONEXTENSIONAREAMODEL_H_		#ifndef MAPPLICATIONEXTENSIONAREAMODEL_H_
	#define MAPPLICATIONEXTENSIONAREAMODEL_H_		#define MAPPLICATIONEXTENSIONAREAMODEL_H_
	#include <MWidgetModel>		#include <MWidgetModel>
	#include "mextensionareamodel.h"		#include "mextensionareamodel.h"
	/*!		/*!
	* MApplicationExtensionAreaModel is the model class for MApplicationExtens ionArea.		* MApplicationExtensionAreaModel is the model class for MApplicationExtens ionArea.
	*/		*/
	class M_EXPORT MApplicationExtensionAreaModel : public MExtensionAreaModel		class M_EXTENSIONS_EXPORT MApplicationExtensionAreaModel : public MExtensio nAreaModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MApplicationExtensionAreaModel)		M_MODEL_INTERNAL(MApplicationExtensionAreaModel)
	};		};
	#endif /* MAPPLICATIONEXTENSIONAREAMODEL_H_ */		#endif /* MAPPLICATIONEXTENSIONAREAMODEL_H_ */
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationextensionareastyle.h		mapplicationextensionareastyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MAPPLICATIONEXTENSIONAREASTYLE_H_		#ifndef MAPPLICATIONEXTENSIONAREASTYLE_H_
	#define MAPPLICATIONEXTENSIONAREASTYLE_H_		#define MAPPLICATIONEXTENSIONAREASTYLE_H_
	#include "mextensionareastyle.h"		#include "mextensionareastyle.h"
	/*!		/*!
	* MApplicationExtensionAreaStyle is the style class for MApplicationExtens ionArea.		* MApplicationExtensionAreaStyle is the style class for MApplicationExtens ionArea.
	*/		*/
	class M_EXPORT MApplicationExtensionAreaStyle : public MExtensionAreaStyle		class M_EXTENSIONS_EXPORT MApplicationExtensionAreaStyle : public MExtensio nAreaStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MApplicationExtensionAreaStyle)		M_STYLE(MApplicationExtensionAreaStyle)
	//! The orientation of the layout		//! The orientation of the layout
	M_STYLE_ATTRIBUTE(Qt::Orientation, layoutOrientation, LayoutOrientation )		M_STYLE_ATTRIBUTE(Qt::Orientation, layoutOrientation, LayoutOrientation )
	};		};
	/*!		/*!
	* MApplicationExtensionAreaStyleContainer is the style container class for MApplicationExtensionArea.		* MApplicationExtensionAreaStyleContainer is the style container class for MApplicationExtensionArea.
	*/		*/
	class M_EXPORT MApplicationExtensionAreaStyleContainer : public MExtensionA reaStyleContainer		class M_EXTENSIONS_EXPORT MApplicationExtensionAreaStyleContainer : public MExtensionAreaStyleContainer
	{		{
	M_STYLE_CONTAINER(MApplicationExtensionAreaStyle)		M_STYLE_CONTAINER(MApplicationExtensionAreaStyle)
	};		};
	#endif /* MAPPLICATIONEXTENSIONAREASTYLE_H_ */		#endif /* MAPPLICATIONEXTENSIONAREASTYLE_H_ */
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mapplicationextensionareaview.h		mapplicationextensionareaview.h
	skipping to change at line 34		skipping to change at line 34
	#include "mapplicationextensionareamodel.h"		#include "mapplicationextensionareamodel.h"
	#include "mapplicationextensionareastyle.h"		#include "mapplicationextensionareastyle.h"
	class MApplicationExtensionAreaViewPrivate;		class MApplicationExtensionAreaViewPrivate;
	class MApplicationExtensionArea;		class MApplicationExtensionArea;
	class MContainer;		class MContainer;
	/*!		/*!
	* A view class for the MApplicationExtensionArea.		* A view class for the MApplicationExtensionArea.
	*/		*/
	class M_EXPORT MApplicationExtensionAreaView : public MExtensionAreaView		class M_EXTENSIONS_EXPORT MApplicationExtensionAreaView : public MExtension AreaView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MApplicationExtensionAreaModel, MApplicationExtensionAreaStyle)		M_VIEW(MApplicationExtensionAreaModel, MApplicationExtensionAreaStyle)
	public:		public:
	/*!		/*!
	* Constructs a new view for MApplicationExtensionArea.		* Constructs a new view for MApplicationExtensionArea.
	*		*
	* \param controller the MApplicationExtensionArea controller for the v iew.		* \param controller the MApplicationExtensionArea controller for the v iew.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationextensioninterface.h		mapplicationextensioninterface.h
	skipping to change at line 45		skipping to change at line 45
	* implemented by the extensions.		* implemented by the extensions.
	*		*
	* Application extension developers need to implement the interface derived		* Application extension developers need to implement the interface derived
	* from this interface in their application extension binary and export the ir		* from this interface in their application extension binary and export the ir
	* implementation from the binary. The host application will maintain an		* implementation from the binary. The host application will maintain an
	* inventory of available extensions and instantiate them using this interf ace		* inventory of available extensions and instantiate them using this interf ace
	* when needed.		* when needed.
	*		*
	* \see \ref applicationextensions		* \see \ref applicationextensions
	*/		*/
	class M_EXPORT MApplicationExtensionInterface		class M_EXTENSIONS_EXPORT MApplicationExtensionInterface
	{		{
	public:		public:
	/*!		/*!
	* Destructor.		* Destructor.
	*/		*/
	virtual ~MApplicationExtensionInterface() {}		virtual ~MApplicationExtensionInterface() {}
	/**		/**
	* This method is called to initialize the application extension.		* This method is called to initialize the application extension.
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationextensionmetadata.h		mapplicationextensionmetadata.h
	skipping to change at line 50		skipping to change at line 50
	* // Instantiate metadata from an extension file relative to binary path.		* // Instantiate metadata from an extension file relative to binary path.
	* MApplicationExtensionMetaData data("filename.desktop");		* MApplicationExtensionMetaData data("filename.desktop");
	*		*
	* // Make sure that application extension metadata is valid before using i t.		* // Make sure that application extension metadata is valid before using i t.
	* if(data.isValid())		* if(data.isValid())
	* {		* {
	* // Access metadata..		* // Access metadata..
	* }		* }
	* \endcode		* \endcode
	*/		*/
	class M_EXPORT MApplicationExtensionMetaData : public MDesktopEntry		class M_EXTENSIONS_EXPORT MApplicationExtensionMetaData : public MDesktopEn try
	{		{
	public:		public:
	/*!		/*!
	* Constructs a new instance of MApplicationExtensionMetaData by readin g the .desktop		* Constructs a new instance of MApplicationExtensionMetaData by readin g the .desktop
	* file in that is given as a construction parameter.		* file in that is given as a construction parameter.
	* \param filename Location of .desktop file to be read by constructed MApplicationExtensionMetaData instance.		* \param filename Location of .desktop file to be read by constructed MApplicationExtensionMetaData instance.
	*/		*/
	explicit MApplicationExtensionMetaData(const QString &filename);		explicit MApplicationExtensionMetaData(const QString &filename);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationifadaptor.h		mapplicationifadaptor.h
	skipping to change at line 45		skipping to change at line 45
	class QStringList;		class QStringList;
	class QVariant;		class QVariant;
	/*!		/*!
	* \class MApplicationIfAdaptor		* \class MApplicationIfAdaptor
	* \brief Adaptor class for interface com.nokia.MApplicationIf		* \brief Adaptor class for interface com.nokia.MApplicationIf
	*		*
	* This is the adaptor for the MApplication QDBus service.		* This is the adaptor for the MApplication QDBus service.
	* Do not use this class directly.		* Do not use this class directly.
	*/		*/
	class M_EXPORT MApplicationIfAdaptor: public QDBusAbstractAdaptor		class M_CORE_EXPORT MApplicationIfAdaptor: public QDBusAbstractAdaptor
	{		{
	Q_OBJECT		Q_OBJECT
	Q_CLASSINFO("D-Bus Interface", "com.nokia.MApplicationIf")		Q_CLASSINFO("D-Bus Interface", "com.nokia.MApplicationIf")
	Q_CLASSINFO("D-Bus Introspection", ""		Q_CLASSINFO("D-Bus Introspection", ""
	" <interface name=\"com.nokia.MApplicationIf\" >\n"		" <interface name=\"com.nokia.MApplicationIf\" >\n"
	" <method name=\"launch\" >\n"		" <method name=\"launch\" >\n"
	" </method>\n"		" </method>\n"
	" <method name=\"launch\">\n"		" <method name=\"launch\">\n"
	" <arg direction=\"in\" type=\"as\" name=\"parameters\ "/>\n"		" <arg direction=\"in\" type=\"as\" name=\"parameters\ "/>\n"
	" </method>\n"		" </method>\n"
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationifproxy.h		mapplicationifproxy.h
	skipping to change at line 44		skipping to change at line 44
	#include <QtDBus/QtDBus>		#include <QtDBus/QtDBus>
	#include "mexport.h"		#include "mexport.h"
	/*!		/*!
	* \class MApplicationIfProxy		* \class MApplicationIfProxy
	* \brief Proxy class for interface com.nokia.MApplicationIf		* \brief Proxy class for interface com.nokia.MApplicationIf
	*		*
	* This is the proxy for the MApplication QDBus service.		* This is the proxy for the MApplication QDBus service.
	*/		*/
	class M_EXPORT MApplicationIfProxy: public QDBusAbstractInterface		class M_CORE_EXPORT MApplicationIfProxy: public QDBusAbstractInterface
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	MApplicationIfProxy(const QString &service, QObject *parent = 0);		MApplicationIfProxy(const QString &service, QObject *parent = 0);
	~MApplicationIfProxy();		~MApplicationIfProxy();
	public Q_SLOTS: // METHODS		public Q_SLOTS: // METHODS
	QDBusPendingReply<> close();		QDBusPendingReply<> close();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationmenu.h		mapplicationmenu.h
	skipping to change at line 115		skipping to change at line 115
	the Close button is available there.		the Close button is available there.
	- the order of these items should be from the top of the menu d ownwards: Settings, Help, Exit		- the order of these items should be from the top of the menu d ownwards: Settings, Help, Exit
	\section MApplicationMenuVariants Variants		\section MApplicationMenuVariants Variants
	\li \link MApplicationMenuView Default application menu view \endli nk		\li \link MApplicationMenuView Default application menu view \endli nk
	\sa MApplicationMenuModel MApplicationMenuStyle		\sa MApplicationMenuModel MApplicationMenuStyle
	*/		*/
	class M_EXPORT MApplicationMenu : public MSceneWindow		class M_CORE_EXPORT MApplicationMenu : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MApplicationMenu)		M_CONTROLLER(MApplicationMenu)
	public:		public:
	/*!		/*!
	\brief Constructs menu containing no actions with optional \a viewT ype		\brief Constructs menu containing no actions with optional \a viewT ype
	*/		*/
	explicit MApplicationMenu(const QString &viewType = QString());		explicit MApplicationMenu(const QString &viewType = QString());
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationmenubuttonstyle.h		mapplicationmenubuttonstyle.h
	skipping to change at line 39		skipping to change at line 39
	\code		\code
	MApplicationMenuButtonStyle {		MApplicationMenuButtonStyle {
	arrow-icon: "arrow-icon";		arrow-icon: "arrow-icon";
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MApplicationMenuButtonStyleContainer MButtonStyle \ref styling MApp licationMenuButton MApplicationMenuButtonView		\sa MApplicationMenuButtonStyleContainer MButtonStyle \ref styling MApp licationMenuButton MApplicationMenuButtonView
	*/		*/
	class M_EXPORT MApplicationMenuButtonStyle : public MButtonStyle		class M_VIEWS_EXPORT MApplicationMenuButtonStyle : public MButtonStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MApplicationMenuButtonStyle)		M_STYLE_INTERNAL(MApplicationMenuButtonStyle)
	/*!		/*!
	\property MApplicationMenuButtonStyle::arrowIcon		\property MApplicationMenuButtonStyle::arrowIcon
	\brief Id of arrow icon		\brief Id of arrow icon
	*/		*/
	M_STYLE_ATTRIBUTE(QString, arrowIcon, ArrowIcon)		M_STYLE_ATTRIBUTE(QString, arrowIcon, ArrowIcon)
	skipping to change at line 64		skipping to change at line 64
	M_STYLE_ATTRIBUTE(QSize, arrowIconSize, ArrowIconSize)		M_STYLE_ATTRIBUTE(QSize, arrowIconSize, ArrowIconSize)
	};		};
	/*!		/*!
	\class MApplicationMenuButtonStyleContainer		\class MApplicationMenuButtonStyleContainer
	\brief Style mode container class for MApplicationMenuButtonStyle.		\brief Style mode container class for MApplicationMenuButtonStyle.
	\ingroup styles		\ingroup styles
	\sa MApplicationMenuButtonStyle		\sa MApplicationMenuButtonStyle
	*/		*/
	class M_EXPORT MApplicationMenuButtonStyleContainer : public MButtonStyleCo ntainer		class M_VIEWS_EXPORT MApplicationMenuButtonStyleContainer : public MButtonS tyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MApplicationMenuButtonStyle)		M_STYLE_CONTAINER_INTERNAL(MApplicationMenuButtonStyle)
	};		};
	//! \internal_end		//! \internal_end
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mapplicationmenumodel.h		mapplicationmenumodel.h
	skipping to change at line 33		skipping to change at line 33
	#include <mscenewindowmodel.h>		#include <mscenewindowmodel.h>
	/*!		/*!
	\class MApplicationMenuModel		\class MApplicationMenuModel
	\brief Data model class for MApplicationMenu.		\brief Data model class for MApplicationMenu.
	\ingroup models		\ingroup models
	\sa MApplicationMenu		\sa MApplicationMenu
	*/		*/
	class M_EXPORT MApplicationMenuModel : public MSceneWindowModel		class M_CORE_EXPORT MApplicationMenuModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MApplicationMenuModel)		M_MODEL_INTERNAL(MApplicationMenuModel)
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationmenustyle.h		mapplicationmenustyle.h
	skipping to change at line 55		skipping to change at line 55
	gap-height: 1;		gap-height: 1;
	gap-color: #F9A427;		gap-color: #F9A427;
	gap-opacity: 1.0;		gap-opacity: 1.0;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MApplicationMenuStyleContainer MSceneWindowStyle \ref styling MAppl icationMenu MApplicationMenuView		\sa MApplicationMenuStyleContainer MSceneWindowStyle \ref styling MAppl icationMenu MApplicationMenuView
	*/		*/
	class M_EXPORT MApplicationMenuStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MApplicationMenuStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MApplicationMenuStyle)		M_STYLE_INTERNAL(MApplicationMenuStyle)
	/*!		/*!
	\property MApplicationMenuStyle::canvasImage		\property MApplicationMenuStyle::canvasImage
	\brief Image for the menu canvas.		\brief Image for the menu canvas.
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, canvasImage, CanvasIm age)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, canvasImage, CanvasIm age)
	skipping to change at line 140		skipping to change at line 140
	M_STYLE_ATTRIBUTE(qreal, gapOpacity, GapOpac ity)		M_STYLE_ATTRIBUTE(qreal, gapOpacity, GapOpac ity)
	};		};
	/*!		/*!
	\class MApplicationMenuStyleContainer		\class MApplicationMenuStyleContainer
	\brief Style mode container class for MApplicationMenuStyle.		\brief Style mode container class for MApplicationMenuStyle.
	\ingroup styles		\ingroup styles
	\sa MApplicationMenuStyle		\sa MApplicationMenuStyle
	*/		*/
	class M_EXPORT MApplicationMenuStyleContainer : public MSceneWindowStyleCon tainer		class M_VIEWS_EXPORT MApplicationMenuStyleContainer : public MSceneWindowSt yleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MApplicationMenuStyle)		M_STYLE_CONTAINER_INTERNAL(MApplicationMenuStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mapplicationmenuview.h		mapplicationmenuview.h
	skipping to change at line 79		skipping to change at line 79
	- The view can be closed by tapping anywhere outside the menu (anyw here in the dimmed area)		- The view can be closed by tapping anywhere outside the menu (anyw here in the dimmed area)
	- The view can also be closed from the top of screen (from the appl ication menu title, or the top right corner)		- The view can also be closed from the top of screen (from the appl ication menu title, or the top right corner)
	- Selecting an action command from the application menu closes the menu		- Selecting an action command from the application menu closes the menu
	- Selecting a view style command closes the application menu and se ts the view and its contents in		- Selecting a view style command closes the application menu and se ts the view and its contents in
	the newly selected style.		the newly selected style.
	\sa MApplicationMenu MApplicationMenuModel MApplicationMenuStyle		\sa MApplicationMenu MApplicationMenuModel MApplicationMenuStyle
	*/		*/
	class M_EXPORT MApplicationMenuView : public MSceneWindowView		class M_VIEWS_EXPORT MApplicationMenuView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MApplicationMenuModel, MApplicationMenuStyle)		M_VIEW(MApplicationMenuModel, MApplicationMenuStyle)
	protected:		protected:
	MApplicationMenuViewPrivate *const d_ptr;		MApplicationMenuViewPrivate *const d_ptr;
	public:		public:
	/*!		/*!
	\brief Constructs MApplicationMenuView with a pointer to the contro ller		\brief Constructs MApplicationMenuView with a pointer to the contro ller
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationpage.h		mapplicationpage.h
	skipping to change at line 118		skipping to change at line 118
	To implement a different behavior for the escape button you have set th e escapeMode of the page to either		To implement a different behavior for the escape button you have set th e escapeMode of the page to either
	MApplicationPageModel::EscapeManualBack or MApplicationPageModel::Escap eCloseWindow.		MApplicationPageModel::EscapeManualBack or MApplicationPageModel::Escap eCloseWindow.
	You can also check and manually modify the page navigation history of y our application using the methods		You can also check and manually modify the page navigation history of y our application using the methods
	MSceneManager::pageHistory() and MSceneManager::setPageHistory().		MSceneManager::pageHistory() and MSceneManager::setPageHistory().
	For information on this and other navigational patterns see \subpage pa genavigation.		For information on this and other navigational patterns see \subpage pa genavigation.
	*/		*/
	class M_EXPORT MApplicationPage : public MSceneWindow		class M_CORE_EXPORT MApplicationPage : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MApplicationPage)		M_CONTROLLER(MApplicationPage)
	/*!		/*!
	\property MApplicationPage::autoMarginsForComponentsEnabled		\property MApplicationPage::autoMarginsForComponentsEnabled
	\brief Whether extra margins will be automatically added around the central		\brief Whether extra margins will be automatically added around the central
	widget to avoid occlusion by other components.		widget to avoid occlusion by other components.
	If enabled, extra margins will be automatically added around the ce ntral		If enabled, extra margins will be automatically added around the ce ntral
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationpagemodel.h		mapplicationpagemodel.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 MAPPLICATIONPAGEMODEL_H		#ifndef MAPPLICATIONPAGEMODEL_H
	#define MAPPLICATIONPAGEMODEL_H		#define MAPPLICATIONPAGEMODEL_H
	#include <mscenewindowmodel.h>		#include <mscenewindowmodel.h>
	class M_EXPORT MApplicationPageModel : public MSceneWindowModel		class M_CORE_EXPORT MApplicationPageModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MApplicationPageModel)		M_MODEL_INTERNAL(MApplicationPageModel)
	public:		public:
	/*!		/*!
	This enum specifies the display mode of a component.		This enum specifies the display mode of a component.
	*/		*/
	enum ComponentDisplayMode {		enum ComponentDisplayMode {
	Show,		Show,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationpagestyle.h		mapplicationpagestyle.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 MAPPLICATIONPAGESTYLE_H		#ifndef MAPPLICATIONPAGESTYLE_H
	#define MAPPLICATIONPAGESTYLE_H		#define MAPPLICATIONPAGESTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MApplicationPageStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MApplicationPageStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MApplicationPageStyle)		M_STYLE_INTERNAL(MApplicationPageStyle)
	/*!		/*!
	\property MApplicationPageStyle::hasTitleLabel		\property MApplicationPageStyle::hasTitleLabel
	\brief Controls whether the title Label should be visible or not.		\brief Controls whether the title Label should be visible or not.
	*/		*/
	M_STYLE_ATTRIBUTE(bool, hasTitleLabel, HasTitleLabel)		M_STYLE_ATTRIBUTE(bool, hasTitleLabel, HasTitleLabel)
	};		};
	class M_EXPORT MApplicationPageStyleContainer : public MSceneWindowStyleCon tainer		class M_VIEWS_EXPORT MApplicationPageStyleContainer : public MSceneWindowSt yleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MApplicationPageStyle)		M_STYLE_CONTAINER_INTERNAL(MApplicationPageStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mapplicationpageview.h		mapplicationpageview.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MAPPLICATIONPAGEVIEW_H		#ifndef MAPPLICATIONPAGEVIEW_H
	#define MAPPLICATIONPAGEVIEW_H		#define MAPPLICATIONPAGEVIEW_H
	#include "mscenewindowview.h"		#include "mscenewindowview.h"
	#include <mapplicationpagestyle.h>		#include <mapplicationpagestyle.h>
	#include <mapplicationpagemodel.h>		#include <mapplicationpagemodel.h>
	class MApplicationPage;		class MApplicationPage;
	class MApplicationPageViewPrivate;		class MApplicationPageViewPrivate;
	class M_EXPORT MApplicationPageView : public MSceneWindowView		class M_VIEWS_EXPORT MApplicationPageView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MApplicationPageModel, MApplicationPageStyle)		M_VIEW(MApplicationPageModel, MApplicationPageStyle)
	public:		public:
	MApplicationPageView(MApplicationPage *controller);		MApplicationPageView(MApplicationPage *controller);
	virtual ~MApplicationPageView();		virtual ~MApplicationPageView();
	protected:		protected:
	MApplicationPageViewPrivate *const d_ptr;		MApplicationPageViewPrivate *const d_ptr;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationservice.h		mapplicationservice.h
	skipping to change at line 57		skipping to change at line 57
	* Here is a code sample that allows multiple instances, each with its own		* Here is a code sample that allows multiple instances, each with its own
	* DBus service :		* DBus service :
	* \dontinclude multipleinstances/main.cpp		* \dontinclude multipleinstances/main.cpp
	* \skip class MyApplicationService		* \skip class MyApplicationService
	* \until MApplication app		* \until MApplication app
	*		*
	* Tip: You can use qdbusviewer from the qt4-dev-tools package to see the		* Tip: You can use qdbusviewer from the qt4-dev-tools package to see the
	* services appearing and disappearing when you run/kill multiple instances .		* services appearing and disappearing when you run/kill multiple instances .
	*		*
	*/		*/
	class M_EXPORT MApplicationService : public QObject		class M_CORE_EXPORT MApplicationService : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	MApplicationService(const QString &serviceName, QObject *parent = 0);		MApplicationService(const QString &serviceName, QObject *parent = 0);
	virtual ~MApplicationService();		virtual ~MApplicationService();
	public Q_SLOTS: // METHODS		public Q_SLOTS: // METHODS
	/**		/**
	* \brief Launch the application.		* \brief Launch the application.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mapplicationwindow.h		mapplicationwindow.h
	skipping to change at line 76		skipping to change at line 76
	\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().
	*/		*/
	class M_EXPORT MApplicationWindow : public MWindow		class M_CORE_EXPORT MApplicationWindow : public MWindow
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(MTheme::ViewType toolbarViewType READ toolbarViewType WRITE setToolbarViewType)		Q_PROPERTY(MTheme::ViewType toolbarViewType READ toolbarViewType WRITE setToolbarViewType)
	public:		public:
	/*!		/*!
	Creates an application window. A scene and scene manager are created a utomatically.		Creates an application window. A scene and scene manager are created a utomatically.
	*/		*/
	explicit MApplicationWindow(QWidget *parent = 0);		explicit MApplicationWindow(QWidget *parent = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	massembly.h		massembly.h
	skipping to change at line 36		skipping to change at line 36
	// forward declarations		// forward declarations
	class MAssemblyPrivate;		class MAssemblyPrivate;
	class MWidgetController;		class MWidgetController;
	class MStyleSheet;		class MStyleSheet;
	class MLogicalValues;		class MLogicalValues;
	/*!		/*!
	\class MAssembly		\class MAssembly
	\brief This class provides the assembly information to MTheme which uses it to load the correct .css & .conf files.		\brief This class provides the assembly information to MTheme which uses it to load the correct .css & .conf files.
	*/		*/
	class M_EXPORT MAssembly		class M_CORE_EXPORT MAssembly
	{		{
	MAssemblyPrivate *const d_ptr;		MAssemblyPrivate *const d_ptr;
	public:		public:
	/*!		/*!
	\brief Constructs the MAssembly object.		\brief Constructs the MAssembly object.
	*/		*/
	MAssembly(const QString &assemblyName);		MAssembly(const QString &assemblyName);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbackgroundtiles.h		mbackgroundtiles.h
	skipping to change at line 36		skipping to change at line 36
	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.		M::Position documents all the variations.
	\sa M::Position		\sa M::Position
	*/		*/
	class M_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;
	bool operator == (const MBackgroundTiles& other) const;		bool operator == (const MBackgroundTiles& other) const;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbanner.h		mbanner.h
	skipping to change at line 100		skipping to change at line 100
	MBanner *systemBanner = new MBanner();		MBanner *systemBanner = new MBanner();
	systemBanner->setStyleName("SystemBanner");		systemBanner->setStyleName("SystemBanner");
	systemBanner->setIconID("icon-m-telephony-call-answer");		systemBanner->setIconID("icon-m-telephony-call-answer");
	systemBanner->setSubtitle("System banner");		systemBanner->setSubtitle("System banner");
	systemBanner->appear(MSceneWindow::DestroyWhenDone);		systemBanner->appear(MSceneWindow::DestroyWhenDone);
	\endcode		\endcode
	\sa MNotification		\sa MNotification
	*/		*/
	class M_EXPORT MBanner : public MSceneWindow		class M_CORE_EXPORT MBanner : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MBanner)		M_CONTROLLER(MBanner)
	public:		public:
	/*!		/*!
	\property MInfoBanner::iconID		\property MInfoBanner::iconID
	\brief Icon for banner.		\brief Icon for banner.
	*/		*/
	Q_PROPERTY(QString iconID READ iconID WRITE setIconID)		Q_PROPERTY(QString iconID READ iconID WRITE setIconID)
	skipping to change at line 124		skipping to change at line 124
	\brief See MContentItemModel::title		\brief See MContentItemModel::title
	*/		*/
	Q_PROPERTY(QString title READ title WRITE setTitle)		Q_PROPERTY(QString title READ title WRITE setTitle)
	/*!		/*!
	\property MContentItem::subtitle		\property MContentItem::subtitle
	\brief See MContentItemModel::subtitle		\brief See MContentItemModel::subtitle
	*/		*/
	Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle)		Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle)
			/*!
			\property MContentItem::subtitle
			\brief See MContentItemModel::subtitle
			*/
			Q_PROPERTY(QDateTime bannerTimeStamp READ bannerTimeStamp WRITE setBann
			erTimeStamp)
	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 157		skipping to change at line 163
	/*!		/*!
	\brief Get the title.		\brief Get the title.
	*/		*/
	QString title() const;		QString title() const;
	/*!		/*!
	\brief Get the subtitle.		\brief Get the subtitle.
	*/		*/
	QString subtitle() const;		QString subtitle() const;
			/*!
			\brief Get the subtitle.
			*/
			QDateTime bannerTimeStamp() 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 184		skipping to change at line 195
	\param text text.		\param text text.
	*/		*/
	void setTitle(const QString &text);		void setTitle(const QString &text);
	/**		/**
	\brief Set subtitle text. This is second line.		\brief Set subtitle text. This is second line.
	\param text text.		\param text text.
	*/		*/
	void setSubtitle(const QString &text);		void setSubtitle(const QString &text);
			/**
			\brief Set subtitle text. This is second line.
			\param text text.
			*/
			void setBannerTimeStamp(const QDateTime &date);
	private:		private:
	Q_DISABLE_COPY(MBanner)		Q_DISABLE_COPY(MBanner)
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MBanner;		friend class Ut_MBanner;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 4 change blocks.
	1 lines changed or deleted		19 lines changed or added

	mbannermodel.h		mbannermodel.h
	skipping to change at line 24		skipping to change at line 24
	** License version 2.1 as published by the Free Software Foundation		** License version 2.1 as published by the Free Software Foundation
	** 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 MBANNERMODEL_H		#ifndef MBANNERMODEL_H
	#define MBANNERMODEL_H		#define MBANNERMODEL_H
	#include "mscenewindowmodel.h"		#include "mscenewindowmodel.h"
			#include <QDateTime>
	class M_EXPORT MBannerModel : public MSceneWindowModel		class M_CORE_EXPORT MBannerModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MBannerModel)		M_MODEL_INTERNAL(MBannerModel)
	/*!		/*!
	\property Icon in banner.		\property Icon in banner.
	*/		*/
	M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())		M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())
	/*!		/*!
	skipping to change at line 47		skipping to change at line 48
	*/		*/
	M_MODEL_PROPERTY(QString, title, Title, true, QString())		M_MODEL_PROPERTY(QString, title, Title, true, QString())
	/*!		/*!
	\property Subtitle for event banner		\property Subtitle for event banner
	*/		*/
	M_MODEL_PROPERTY(QString, subtitle, Subtitle, true, QString())		M_MODEL_PROPERTY(QString, subtitle, Subtitle, true, QString())
			/*!
			\property Datetime
			*/
			M_MODEL_PROPERTY(QDateTime, bannerTimeStamp, BannerTimeStamp, true, QDa
			teTime())
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	1 lines changed or deleted		8 lines changed or added

	mbannerstyle.h		mbannerstyle.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 MBANNERSTYLE_H		#ifndef MBANNERSTYLE_H
	#define MBANNERSTYLE_H		#define MBANNERSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_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)
	};		};
	class M_EXPORT MBannerStyleContainer : public MSceneWindowStyleContainer		class M_VIEWS_EXPORT MBannerStyleContainer : public MSceneWindowStyleContai ner
	{		{
	M_STYLE_CONTAINER(MBannerStyle)		M_STYLE_CONTAINER(MBannerStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mbannerview.h		mbannerview.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MBannerView_H		#ifndef MBannerView_H
	#define MBannerView_H		#define MBannerView_H
	#include "mscenewindowview.h"		#include "mscenewindowview.h"
	#include "mbannermodel.h"		#include "mbannermodel.h"
	#include "mbannerstyle.h"		#include "mbannerstyle.h"
	class MBanner;		class MBanner;
	class MBannerViewPrivate;		class MBannerViewPrivate;
	class M_EXPORT MBannerView : public MSceneWindowView		class M_VIEWS_EXPORT MBannerView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MBannerModel, MBannerStyle)		M_VIEW(MBannerModel, MBannerStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	\param controller Pointer to the banner's controller		\param controller Pointer to the banner's controller
	*/		*/
	MBannerView(MBanner *controller);		MBannerView(MBanner *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbasiclayoutanimation.h		mbasiclayoutanimation.h
	skipping to change at line 34		skipping to change at line 34
	#include "mbasiclayoutanimationstyle.h"		#include "mbasiclayoutanimationstyle.h"
	#include "manimation.h"		#include "manimation.h"
	class MBasicLayoutAnimationPrivate;		class MBasicLayoutAnimationPrivate;
	/*!		/*!
	* The MBasicLayoutAnimation provides a simple animation of items for a MLa yout.		* The MBasicLayoutAnimation provides a simple animation of items for a MLa yout.
	* It animates the items geometry and opacity in a linear way, with every a nimation		* It animates the items geometry and opacity in a linear way, with every a nimation
	* taking the same amount of time.		* taking the same amount of time.
	*/		*/
	class M_EXPORT MBasicLayoutAnimation : public MLayoutAnimation		class M_CORE_EXPORT MBasicLayoutAnimation : public MLayoutAnimation
	{		{
	M_ANIMATION(MBasicLayoutAnimationStyle)		M_ANIMATION(MBasicLayoutAnimationStyle)
	public:		public:
	/** \brief Construct a basic layout animator.		/** \brief Construct a basic layout animator.
	*/		*/
	MBasicLayoutAnimation(MLayout *layout);		MBasicLayoutAnimation(MLayout *layout);
	/** \brief Destructor. */		/** \brief Destructor. */
	virtual ~MBasicLayoutAnimation();		virtual ~MBasicLayoutAnimation();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

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

	mbasiclistitem.h		mbasiclistitem.h
	skipping to change at line 65		skipping to change at line 65
	Title, subtitle and icon are using styles provided by common layout.		Title, subtitle and icon are using styles provided by common layout.
	\li title - CommonSingleTitle and CommonTitle depending on the item sty le.		\li title - CommonSingleTitle and CommonTitle depending on the item sty le.
	\li subTitle - CommonSubTitle		\li subTitle - CommonSubTitle
	\li icon - CommonMainIcon		\li icon - CommonMainIcon
	Another way is to inherit MBasicListItem and override:		Another way is to inherit MBasicListItem and override:
	\li createLayout()		\li createLayout()
	\li clearLayout()		\li clearLayout()
	*/		*/
	class M_EXPORT MBasicListItem : public MListItem		class M_CORE_EXPORT MBasicListItem : public MListItem
	{		{
	Q_OBJECT		Q_OBJECT
	/*!		/*!
	\property MBasicListIte::title		\property MBasicListIte::title
	\brief Contains title text.		\brief Contains title text.
	*/		*/
	Q_PROPERTY(QString title READ title WRITE setTitle)		Q_PROPERTY(QString title READ title WRITE setTitle)
	/*!		/*!
	\property MBasicListItem::subtitle		\property MBasicListItem::subtitle
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbreakiterator.h		mbreakiterator.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MBREAKITERATOR_H		#ifndef MBREAKITERATOR_H
	#define MBREAKITERATOR_H		#define MBREAKITERATOR_H
	#include "mexport.h"		#include "mexport.h"
	#include "mlocale.h"		#include "mlocale.h"
	#include <QString>		#include <QString>
	class MBreakIteratorPrivate;		class MBreakIteratorPrivate;
	class M_EXPORT MBreakIterator		class M_CORE_EXPORT MBreakIterator
	{		{
	public:		public:
	enum Type {LineIterator, WordIterator}; // would also be supported: cha racter, sentence, title		enum Type {LineIterator, WordIterator}; // would also be supported: cha racter, sentence, title
	MBreakIterator(const MLocale &locale, const QString &text, Type type = WordIterator);		MBreakIterator(const MLocale &locale, const QString &text, Type type = WordIterator);
	explicit MBreakIterator(const QString &text, Type type = WordIterator);		explicit MBreakIterator(const QString &text, Type type = WordIterator);
	virtual ~MBreakIterator();		virtual ~MBreakIterator();
	// java-style iterator interface:		// java-style iterator interface:
	bool hasNext() const;		bool hasNext() const;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbubbleitem.h		mbubbleitem.h
	skipping to change at line 41		skipping to change at line 41
	\brief MBubbleItem is a speech bubble like widget for conversation views.		\brief MBubbleItem is a speech bubble like widget for conversation views.
	MBubbleItem, MListItem and MContentItem can usually be used for the same		MBubbleItem, MListItem and MContentItem can usually be used for the same
	type of purposes, however the MBubbleItem API is message-centric and ther efore		type of purposes, however the MBubbleItem API is message-centric and ther efore
	better suited for messaging applications. When several bubble items are p ut into		better suited for messaging applications. When several bubble items are p ut into
	a layout the visual impression is that of a back and forth conversation.		a layout the visual impression is that of a back and forth conversation.
	The speech bubble supports avatar images, separate styling for incoming a nd		The speech bubble supports avatar images, separate styling for incoming a nd
	outgoing messages, as well as an area for application specific widgets.		outgoing messages, as well as an area for application specific widgets.
	*/		*/
	class M_EXPORT MBubbleItem : public MWidgetController		class M_CORE_EXPORT MBubbleItem : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MBubbleItem)		M_CONTROLLER(MBubbleItem)
	public:		public:
	/*!		/*!
	\property MBubbleItem::senderName		\property MBubbleItem::senderName
	Name of the message sender.		Name of the message sender.
	*/		*/
	skipping to change at line 274		skipping to change at line 274
	\sa centralWidget()		\sa centralWidget()
	*/		*/
	void setCentralWidget(QGraphicsWidget* centralWidget);		void setCentralWidget(QGraphicsWidget* centralWidget);
	/**		/**
	Adds the \a widget to the informational widgets stack.		Adds the \a widget to the informational widgets stack.
	Informational widgets are displayed as part of the message bubble mai n body.		Informational widgets are displayed as part of the message bubble mai n body.
	There are two pre-defined information widgets for the bubble: number of comments and thumbs up received.		There are two pre-defined information widgets for the bubble: number of comments and thumbs up received.
	Memory ownership of widget is not automatically transfered. Set the		The ownership of the widget is transfered to the item. If the widget
	QGraphicsObject::parentItem() to this bubble item		must not be deleted by the item the
	to have the widget automatically deleted when removed or when this bu		caller must invoke removeInformationWidget() to remove the widget fro
	bble item is deleted.		m the graphics hierarchy.
	\sa informationWidgets()		\sa informationWidgets();
	\sa setCommentsString();		\sa setCommentsString();
	\sa setThumbsUpString();		\sa setThumbsUpString();
			\sa removeInformationWidget();
	*/		*/
	void addInformationWidget(QGraphicsWidget *widget);		void addInformationWidget(QGraphicsWidget *widget);
	/**		/**
	Removes the \a widget from the informational widgets stack.		Removes the \a widget from the informational widgets stack.
	Informational widgets are displayed as part of the message bubble mai n body.		Informational widgets are displayed as part of the message bubble mai n body.
	There are two pre-defined information widgets for the bubble: number of comments and thumbs up received.		There are two pre-defined information widgets for the bubble: number of comments and thumbs up received.
			The parent item of the widget in graphics hierarchy is set to NULL, s
			o the widget will not be displayed.
			The ownership is transfered to caller.
	\sa informationWidgets()		\sa informationWidgets()
	\sa setCommentsString();		\sa setCommentsString();
	\sa setThumbsUpString();		\sa setThumbsUpString();
			\sa addInformationWidget();
	*/		*/
	void removeInformationWidget(QGraphicsWidget *widget);		void removeInformationWidget(QGraphicsWidget *widget);
	/**		/**
	Sets the string for number of comments received for the bubble item t o \a comments.		Sets the string for number of comments received for the bubble item t o \a comments.
	This is a convenience method that creates widgets on the informationW idgets() stack		This is a convenience method that creates widgets on the informationW idgets() stack
	for showing the number of comments attached to the bubble item. An ex ample of		for showing the number of comments attached to the bubble item. An ex ample of
	a string could "+3", but it is up to the application to determine how the string		a string could "+3", but it is up to the application to determine how the string
	is formatted.		is formatted.
End of changes. 6 change blocks.
	6 lines changed or deleted		12 lines changed or added

	mbubbleitembackgroundstyle.h		mbubbleitembackgroundstyle.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MBUBBLEITEMBACKGROUNDSTYLE_H		#ifndef MBUBBLEITEMBACKGROUNDSTYLE_H
	#define MBUBBLEITEMBACKGROUNDSTYLE_H		#define MBUBBLEITEMBACKGROUNDSTYLE_H
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	/*!		/*!
	* \internal		* \internal
	*/		*/
	class M_EXPORT MBubbleItemBackgroundStyle : public MWidgetStyle		class M_VIEWS_EXPORT MBubbleItemBackgroundStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MBubbleItemBackgroundStyle)		M_STYLE(MBubbleItemBackgroundStyle)
	M_STYLE_ATTRIBUTE(QString, mirroredObjectName, Mirrore dObjectName)		M_STYLE_ATTRIBUTE(QString, mirroredObjectName, Mirrore dObjectName)
	};		};
	class M_EXPORT MBubbleItemBackgroundStyleContainer : public MWidgetStyleCon tainer		class M_VIEWS_EXPORT MBubbleItemBackgroundStyleContainer : public MWidgetSt yleContainer
	{		{
	M_STYLE_CONTAINER(MBubbleItemBackgroundStyle)		M_STYLE_CONTAINER(MBubbleItemBackgroundStyle)
	M_STYLE_MODE(Outgoing)		M_STYLE_MODE(Outgoing)
	M_STYLE_MODE(OutgoingPressed)		M_STYLE_MODE(OutgoingPressed)
	M_STYLE_MODE(Incoming)		M_STYLE_MODE(Incoming)
	M_STYLE_MODE(IncomingPressed)		M_STYLE_MODE(IncomingPressed)
	};		};
	/*! \internal_end */		/*! \internal_end */
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mbubbleitemmodel.h		mbubbleitemmodel.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MBUBBLEITEMMODEL_H__		#ifndef MBUBBLEITEMMODEL_H__
	#define MBUBBLEITEMMODEL_H__		#define MBUBBLEITEMMODEL_H__
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	#include <QStack>		#include <QStack>
	class QPixmap;		class QPixmap;
	class QGraphicsWidget;		class QGraphicsWidget;
	class MImageWidget;		class MImageWidget;
	class M_EXPORT MBubbleItemModel : public MWidgetModel		class M_CORE_EXPORT MBubbleItemModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MBubbleItemModel)		M_MODEL_INTERNAL(MBubbleItemModel)
	public:		public:
	/*!		/*!
	\property MBubbleItemModel::avatar		\property MBubbleItemModel::avatar
	\brief Avatar.		\brief Avatar.
	*/		*/
	M_MODEL_PTR_PROPERTY(MImageWidget *, avatar, Avatar, true, 0)		M_MODEL_PTR_PROPERTY(MImageWidget *, avatar, Avatar, true, 0)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbubbleitemstyle.h		mbubbleitemstyle.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MBUBBLEITEMSTYLE_H		#ifndef MBUBBLEITEMSTYLE_H
	#define MBUBBLEITEMSTYLE_H		#define MBUBBLEITEMSTYLE_H
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	/*!		/*!
	* \internal		* \internal
	*/		*/
	class M_EXPORT MBubbleItemStyle : public MWidgetStyle		class M_VIEWS_EXPORT MBubbleItemStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MBubbleItemStyle)		M_STYLE(MBubbleItemStyle)
	M_STYLE_ATTRIBUTE(QFont, font, Fon t)		M_STYLE_ATTRIBUTE(QFont, font, Fon t)
	M_STYLE_ATTRIBUTE(QColor, textColor, Tex tColor)		M_STYLE_ATTRIBUTE(QColor, textColor, Tex tColor)
	M_STYLE_ATTRIBUTE(QFont, timestampFont, Tim estampFont)		M_STYLE_ATTRIBUTE(QFont, timestampFont, Tim estampFont)
	M_STYLE_ATTRIBUTE(QColor, timestampTextColor, Tim estampTextColor)		M_STYLE_ATTRIBUTE(QColor, timestampTextColor, Tim estampTextColor)
	M_STYLE_ATTRIBUTE(QString, avatarObjectName, AvatarObj ectName)		M_STYLE_ATTRIBUTE(QString, avatarObjectName, AvatarObj ectName)
	M_STYLE_ATTRIBUTE(QString, bubbleObjectName, BubbleObj ectName)		M_STYLE_ATTRIBUTE(QString, bubbleObjectName, BubbleObj ectName)
	};		};
	class M_EXPORT MBubbleItemStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MBubbleItemStyleContainer : public MWidgetStyleContain er
	{		{
	M_STYLE_CONTAINER(MBubbleItemStyle)		M_STYLE_CONTAINER(MBubbleItemStyle)
	M_STYLE_MODE(Outgoing)		M_STYLE_MODE(Outgoing)
	};		};
	/*! \internal_end */		/*! \internal_end */
	#endif // MBUBBLEITEMSTYLE_H		#endif // MBUBBLEITEMSTYLE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mbubbleitemview.h		mbubbleitemview.h
	skipping to change at line 44		skipping to change at line 44
	\class MBubbleItemView		\class MBubbleItemView
	\brief View class for MBubbleItem.		\brief View class for MBubbleItem.
	\ingroup views		\ingroup views
	\section MBubbleItemView Overview		\section MBubbleItemView Overview
	MBubbleItemView draws a MBubbleItem in 2 text lines and an avatar, and a speech bubble in the background.		MBubbleItemView draws a MBubbleItem in 2 text lines and an avatar, and a speech bubble in the background.
	\image html bubble-item.png		\image html bubble-item.png
	*/		*/
	class M_EXPORT MBubbleItemView : public MWidgetView		class M_VIEWS_EXPORT MBubbleItemView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MBubbleItemModel, MBubbleItemStyle)		M_VIEW(MBubbleItemModel, MBubbleItemStyle)
	public:		public:
	MBubbleItemView(MBubbleItem *controller);		MBubbleItemView(MBubbleItem *controller);
	virtual ~MBubbleItemView();		virtual ~MBubbleItemView();
	protected slots:		protected slots:
	virtual void updateData(const QList<const char *> &modifications);		virtual void updateData(const QList<const char *> &modifications);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbutton.h		mbutton.h
	skipping to change at line 142		skipping to change at line 142
	connect(checkable, SIGNAL(clicked(bool)), this, SLOT(checkableC licked(bool)));		connect(checkable, SIGNAL(clicked(bool)), this, SLOT(checkableC licked(bool)));
	connect(checkable, SIGNAL(toggled(bool)), this, SLOT(checkableT oggled(bool)));		connect(checkable, SIGNAL(toggled(bool)), this, SLOT(checkableT oggled(bool)));
	\endcode		\endcode
	Connecting to user input signals:		Connecting to user input signals:
	\code		\code
	\endcode		\endcode
	\sa MButtonModel MButtonStyle MButtonGroup		\sa MButtonModel MButtonStyle MButtonGroup
	*/		*/
	class M_EXPORT MButton : public MWidgetController		class M_CORE_EXPORT MButton : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MButton)		M_CONTROLLER(MButton)
	/*!		/*!
	\property MButton::text		\property MButton::text
	\brief See MButtonModel::text		\brief See MButtonModel::text
	*/		*/
	Q_PROPERTY(QString text READ text WRITE setText)		Q_PROPERTY(QString text READ text WRITE setText)
	skipping to change at line 417		skipping to change at line 417
	void setTextVisible(bool);		void setTextVisible(bool);
	protected:		protected:
	//! \internal		//! \internal
	MButton(MButtonPrivate *dd, MButtonModel *model, QGraphicsItem *parent) ;		MButton(MButtonPrivate *dd, MButtonModel *model, QGraphicsItem *parent) ;
	void setGroup(MButtonGroup *group);		void setGroup(MButtonGroup *group);
	//! \internal_end		//! \internal_end
	//! \reimp		//! \reimp
	virtual void setupModel();		virtual void setupModel();
			virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event);
	//! \reimp_end		//! \reimp_end
	protected Q_SLOTS:		protected Q_SLOTS:
	//! \reimp		//! \reimp
	virtual void updateData(const QList<const char *>& modifications);		virtual void updateData(const QList<const char *>& modifications);
	//! \reimp_end		//! \reimp_end
	void modelClick();		void modelClick();
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	mbuttongroup.h		mbuttongroup.h
	skipping to change at line 195		skipping to change at line 195
	//not properly supported yet		//not properly supported yet
	/*		/*
	Multiselection group:		Multiselection group:
	\code		\code
	//create non-exclusive buttongroup		//create non-exclusive buttongroup
	MButtonGroup* buttonGroup = new MButtonGroup();		MButtonGroup* buttonGroup = new MButtonGroup();
	buttonGroup->setExclusive(false);		buttonGroup->setExclusive(false);
	\endcode		\endcode
	*/		*/
	class M_EXPORT MButtonGroup : public QObject		class M_CORE_EXPORT MButtonGroup : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(bool exclusive READ exclusive WRITE setExclusive)		Q_PROPERTY(bool exclusive READ exclusive WRITE setExclusive)
	public:		public:
	/*!		/*!
	\brief Constructs a new, empty button group with the given \a paren t.		\brief Constructs a new, empty button group with the given \a paren t.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbuttoniconstyle.h		mbuttoniconstyle.h
	skipping to change at line 44		skipping to change at line 44
	glow-radius: 8;		glow-radius: 8;
	shrink-duration: 100;		shrink-duration: 100;
	shrink-factor: 0.2;		shrink-factor: 0.2;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MButtonIconStyleContainer MWidgetStyle MButtonStyle \ref styling MB utton MButtonIconView		\sa MButtonIconStyleContainer MWidgetStyle MButtonStyle \ref styling MB utton MButtonIconView
	*/		*/
	class M_EXPORT MButtonIconStyle : public MButtonStyle		class M_VIEWS_EXPORT MButtonIconStyle : public MButtonStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MButtonIconStyle)		M_STYLE_INTERNAL(MButtonIconStyle)
	/*!		/*!
	\property MButtonIconStyle::glowColor		\property MButtonIconStyle::glowColor
	\brief Color of the glow effect.		\brief Color of the glow effect.
	*/		*/
	M_STYLE_ATTRIBUTE(QColor, glowColor, GlowColor)		M_STYLE_ATTRIBUTE(QColor, glowColor, GlowColor)
	skipping to change at line 89		skipping to change at line 89
	M_STYLE_ATTRIBUTE(qreal, shrinkFactor, ShrinkFactor)		M_STYLE_ATTRIBUTE(qreal, shrinkFactor, ShrinkFactor)
	};		};
	/*!		/*!
	\class MButtonIconStyleContainer		\class MButtonIconStyleContainer
	\brief Style mode container class for MButtonIconStyle.		\brief Style mode container class for MButtonIconStyle.
	\ingroup styles		\ingroup styles
	\sa MButtonIconStyle		\sa MButtonIconStyle
	*/		*/
	class M_EXPORT MButtonIconStyleContainer : public MButtonStyleContainer		class M_VIEWS_EXPORT MButtonIconStyleContainer : public MButtonStyleContain er
	{		{
	M_STYLE_CONTAINER_INTERNAL(MButtonIconStyle)		M_STYLE_CONTAINER_INTERNAL(MButtonIconStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mbuttoniconview.h		mbuttoniconview.h
	skipping to change at line 67		skipping to change at line 67
	\section MButtonIconViewInteractions Interactions		\section MButtonIconViewInteractions Interactions
	See \ref MButtonViewInteractions.		See \ref MButtonViewInteractions.
	\section MButtonIconViewOpenIssues Open issues		\section MButtonIconViewOpenIssues Open issues
	- The outlook of the whole icon button: are glow and shrinking real ly		- The outlook of the whole icon button: are glow and shrinking real ly
	used in this?		used in this?
	\sa MButton MButtonView MButtonIconStyle		\sa MButton MButtonView MButtonIconStyle
	*/		*/
	class M_EXPORT MButtonIconView : public MButtonView		class M_VIEWS_EXPORT MButtonIconView : public MButtonView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MButtonModel, MButtonIconStyle)		M_VIEW(MButtonModel, MButtonIconStyle)
	public:		public:
	/*!		/*!
	\brief Constructs the view.		\brief Constructs the view.
	\param Pointer to the controller.		\param Pointer to the controller.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbuttonmodel.h		mbuttonmodel.h
	skipping to change at line 37		skipping to change at line 37
	\class MButtonModel		\class MButtonModel
	\brief Data model class for MButton.		\brief Data model class for MButton.
	\ingroup models		\ingroup models
	\sa MButton		\sa MButton
	*/		*/
	//We need this to due to MOC generator limitations:		//We need this to due to MOC generator limitations:
	using M::ButtonRole;		using M::ButtonRole;
	class M_EXPORT MButtonModel : public MWidgetModel		class M_CORE_EXPORT MButtonModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MButtonModel)		M_MODEL_INTERNAL(MButtonModel)
	/*!		/*!
	\property MButtonModel::iconID		\property MButtonModel::iconID
	\brief ID of the icon that is displayed for a non-toggled button.		\brief ID of the icon that is displayed for a non-toggled button.
	*/		*/
	M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())		M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbuttonstyle.h		mbuttonstyle.h
	skipping to change at line 56		skipping to change at line 56
	text-margin-left: 5;		text-margin-left: 5;
	text-margin-top: 0;		text-margin-top: 0;
	text-margin-right: 5;		text-margin-right: 5;
	text-margin-bottom: 0;		text-margin-bottom: 0;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MButtonStyleContainer MWidgetStyle \ref styling MButton MButtonView		\sa MButtonStyleContainer MWidgetStyle \ref styling MButton MButtonView
	*/		*/
	class M_EXPORT MButtonStyle : public MWidgetStyle		class M_VIEWS_EXPORT MButtonStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MButtonStyle)		M_STYLE(MButtonStyle)
	/*!		/*!
	\property MButtonStyle::font		\property MButtonStyle::font
	\brief Font for the button text.		\brief Font for the button text.
	*/		*/
	M_STYLE_ATTRIBUTE(QFont, font, Fon t)		M_STYLE_ATTRIBUTE(QFont, font, Fon t)
	skipping to change at line 166		skipping to change at line 166
	M_STYLE_ATTRIBUTE(int, pressTimeout, PressTi meout)		M_STYLE_ATTRIBUTE(int, pressTimeout, PressTi meout)
	};		};
	/*!		/*!
	\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_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)
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mbuttonswitchstyle.h		mbuttonswitchstyle.h
	skipping to change at line 46		skipping to change at line 46
	slider-mask: "mbutton-switch-mask" 15px 15px 15px 15px;		slider-mask: "mbutton-switch-mask" 15px 15px 15px 15px;
	// thumb is the sliding part, should slide across the whole are a		// thumb is the sliding part, should slide across the whole are a
	thumb-image: "mbutton-switch-thumb" 15px 15px 15px 15px;		thumb-image: "mbutton-switch-thumb" 15px 15px 15px 15px;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MButtonSwitchStyleContainer MWidgetStyle MButtonStyle \ref styling MButton MButtonSwitchView		\sa MButtonSwitchStyleContainer MWidgetStyle MButtonStyle \ref styling MButton MButtonSwitchView
	*/		*/
	class M_EXPORT MButtonSwitchStyle : public MButtonStyle		class M_VIEWS_EXPORT MButtonSwitchStyle : public MButtonStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MButtonSwitchStyle)		M_STYLE_INTERNAL(MButtonSwitchStyle)
	/*!		/*!
	\property MButtonSwitchStyle::sliderImage		\property MButtonSwitchStyle::sliderImage
	\brief Image for the sliding background of the switch.		\brief Image for the sliding background of the switch.
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, sliderImage, SliderImage)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, sliderImage, SliderImage)
	skipping to change at line 109		skipping to change at line 109
	M_STYLE_ATTRIBUTE(int, thumbMargin, ThumbMargin)		M_STYLE_ATTRIBUTE(int, thumbMargin, ThumbMargin)
	};		};
	/*!		/*!
	\class MButtonSwitchStyleContainer		\class MButtonSwitchStyleContainer
	\brief Style mode container class for MButtonSwitchStyle.		\brief Style mode container class for MButtonSwitchStyle.
	\ingroup styles		\ingroup styles
	\sa MButtonSwitchStyle		\sa MButtonSwitchStyle
	*/		*/
	class M_EXPORT MButtonSwitchStyleContainer : public MButtonStyleContainer		class M_VIEWS_EXPORT MButtonSwitchStyleContainer : public MButtonStyleConta iner
	{		{
	M_STYLE_CONTAINER_INTERNAL(MButtonSwitchStyle)		M_STYLE_CONTAINER_INTERNAL(MButtonSwitchStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mbuttonswitchview.h		mbuttonswitchview.h
	skipping to change at line 83		skipping to change at line 83
	- <b>Tap and drag</b>: Toggles the state of the switch.		- <b>Tap and drag</b>: Toggles the state of the switch.
	- <b>Tap down and drag finger out of the switch, release finger</ b>:		- <b>Tap down and drag finger out of the switch, release finger</ b>:
	Cancels the press and does not change the state.		Cancels the press and does not change the state.
	- <b>Tap down and drag finger to scroll UI</b>: Cancels the press		- <b>Tap down and drag finger to scroll UI</b>: Cancels the press
	and does not change the state.		and does not change the state.
	\section MButtonSwitchViewOpenIssues Open issues		\section MButtonSwitchViewOpenIssues Open issues
	\sa MButton MButtonView MButtonSwitchStyle		\sa MButton MButtonView MButtonSwitchStyle
	*/		*/
	class M_EXPORT MButtonSwitchView : public MButtonView		class M_VIEWS_EXPORT MButtonSwitchView : public MButtonView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MButtonModel, MButtonSwitchStyle)		M_VIEW(MButtonModel, MButtonSwitchStyle)
	public:		public:
	/*!		/*!
	\brief Constructs the view.		\brief Constructs the view.
	\param Pointer to the controller.		\param Pointer to the controller.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mbuttonview.h		mbuttonview.h
	skipping to change at line 105		skipping to change at line 105
	press.		press.
	\section MButtonViewOpenIssues Open issues		\section MButtonViewOpenIssues Open issues
	- There should be a informative banner telling why the button is di sabled,		- There should be a informative banner telling why the button is di sabled,
	unless the reason is very self evident.		unless the reason is very self evident.
	- The Button labels should follow the truncation rules of the Label widget.		- The Button labels should follow the truncation rules of the Label widget.
	\sa MButton MButtonView MButtonStyle		\sa MButton MButtonView MButtonStyle
	*/		*/
	class M_EXPORT MButtonView : public MWidgetView		class M_VIEWS_EXPORT MButtonView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MButtonModel, MButtonStyle)		M_VIEW(MButtonModel, MButtonStyle)
	public:		public:
	/*!		/*!
	\brief Constructs the view.		\brief Constructs the view.
	\param Pointer to the controller.		\param Pointer to the controller.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcalendar.h		mcalendar.h
	skipping to change at line 32		skipping to change at line 32
	#include <QDateTime>		#include <QDateTime>
	#include "mlocale.h"		#include "mlocale.h"
	#include "mexport.h"		#include "mexport.h"
	class MCalendarPrivate;		class MCalendarPrivate;
	class QDateTime;		class QDateTime;
	class QDate;		class QDate;
	class M_EXPORT MCalendar		class M_CORE_EXPORT MCalendar
	{		{
	public:		public:
	explicit MCalendar(MLocale::CalendarType calendarType = MLocale::Defaul tCalendar,		explicit MCalendar(MLocale::CalendarType calendarType = MLocale::Defaul tCalendar,
	const QString &timezone = QString());		const QString &timezone = QString());
	explicit MCalendar(const MLocale &mLocale, const QString &timezone = QS tring());		explicit MCalendar(const MLocale &mLocale, const QString &timezone = QS tring());
	MCalendar(const MCalendar &other);		MCalendar(const MCalendar &other);
	virtual ~MCalendar();		virtual ~MCalendar();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcancelevent.h		mcancelevent.h
	skipping to change at line 37		skipping to change at line 37
	/*!		/*!
	* Class instantiated when the result of previously sent event		* Class instantiated when the result of previously sent event
	* should be cancelled.		* should be cancelled.
	* The cancel event can for example be sent when the user presses		* The cancel event can for example be sent when the user presses
	* the touchscreen and starts to move his/her finger to pan the view.		* the touchscreen and starts to move his/her finger to pan the view.
	* At the moment of first press event the mousePressEvent is sent		* At the moment of first press event the mousePressEvent is sent
	* to the widgets below pannable viewport, but it needs to be		* to the widgets below pannable viewport, but it needs to be
	* "cancelled" if the user wanted to pan the viewport.		* "cancelled" if the user wanted to pan the viewport.
	*/		*/
	class M_EXPORT MCancelEvent : public QGraphicsSceneEvent		class M_CORE_EXPORT MCancelEvent : public QGraphicsSceneEvent
	{		{
	public:		public:
	/*!		/*!
	* \brief Cancel Event definition.		* \brief Cancel Event definition.
	*/		*/
	static QEvent::Type eventNumber();		static QEvent::Type eventNumber();
	/*!		/*!
	* \brief Default constructor, no need for any parameters.		* \brief Default constructor, no need for any parameters.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcheckboxstyle.h		mcheckboxstyle.h
	skipping to change at line 39		skipping to change at line 39
	\code		\code
	MCheckboxStyle {		MCheckboxStyle {
	checkmark-image: mbutton-checkbox-checkmark 0 0 0 0;		checkmark-image: mbutton-checkbox-checkmark 0 0 0 0;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MCheckboxStyleContainer MWidgetStyle MButtonStyle \ref styling MBut ton MCheckboxView		\sa MCheckboxStyleContainer MWidgetStyle MButtonStyle \ref styling MBut ton MCheckboxView
	*/		*/
	class M_EXPORT MCheckboxStyle : public MButtonStyle		class M_VIEWS_EXPORT MCheckboxStyle : public MButtonStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MCheckboxStyle)		M_STYLE_INTERNAL(MCheckboxStyle)
	/*!		/*!
	\property MButtonSwitchStyle::checkmarkImage		\property MButtonSwitchStyle::checkmarkImage
	\brief Pixmap for the checkmark of the checkbox.		\brief Pixmap for the checkmark of the checkbox.
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(QPixmap *, checkmarkImage, CheckmarkImage)		M_STYLE_PTR_ATTRIBUTE(QPixmap *, checkmarkImage, CheckmarkImage)
	skipping to change at line 82		skipping to change at line 82
	M_STYLE_ATTRIBUTE(MFeedback, releaseOffFeedback, ReleaseOffFeedback)		M_STYLE_ATTRIBUTE(MFeedback, releaseOffFeedback, ReleaseOffFeedback)
	};		};
	/*!		/*!
	\class MCheckboxStyleContainer		\class MCheckboxStyleContainer
	\brief Style mode container class for MCheckboxStyle.		\brief Style mode container class for MCheckboxStyle.
	\ingroup styles		\ingroup styles
	\sa MCheckboxStyle		\sa MCheckboxStyle
	*/		*/
	class M_EXPORT MCheckboxStyleContainer : public MButtonStyleContainer		class M_VIEWS_EXPORT MCheckboxStyleContainer : public MButtonStyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MCheckboxStyle)		M_STYLE_CONTAINER_INTERNAL(MCheckboxStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mcheckboxview.h		mcheckboxview.h
	skipping to change at line 69		skipping to change at line 69
	Cancels the press and does not change the state.		Cancels the press and does not change the state.
	- <b>Tap down and drag finger to scroll UI</b>: Cancels the press		- <b>Tap down and drag finger to scroll UI</b>: Cancels the press
	and does not change the state.		and does not change the state.
	\section MCheckboxViewOpenIssues Open issues		\section MCheckboxViewOpenIssues Open issues
	- Checkbox should include a text label describing the setting or va riable		- Checkbox should include a text label describing the setting or va riable
	in question. This label has the same interactions as the Checkbox b utton itself.		in question. This label has the same interactions as the Checkbox b utton itself.
	\sa MButton MButtonView MCheckboxStyle		\sa MButton MButtonView MCheckboxStyle
	*/		*/
	class M_EXPORT MCheckboxView : public MButtonView		class M_VIEWS_EXPORT MCheckboxView : public MButtonView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MButtonModel, MCheckboxStyle)		M_VIEW(MButtonModel, MCheckboxStyle)
	public:		public:
	/*!		/*!
	\brief Constructs the view.		\brief Constructs the view.
	\param Pointer to the controller.		\param Pointer to the controller.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcity.h		mcity.h
	skipping to change at line 37		skipping to change at line 37
	#include <unicode/datefmt.h>		#include <unicode/datefmt.h>
	#include <unicode/dtfmtsym.h>		#include <unicode/dtfmtsym.h>
	#include "micuconversions.h"		#include "micuconversions.h"
	#endif		#endif
	#include "mexport.h"		#include "mexport.h"
	#include "mcountry.h"		#include "mcountry.h"
	class MCityPrivate;		class MCityPrivate;
	class M_EXPORT MCity		class M_CORE_EXPORT MCity
	{		{
	public:		public:
	MCity();		MCity();
	MCity(const MCity&);		MCity(const MCity&);
	virtual ~MCity();		virtual ~MCity();
	MCity& operator=(const MCity&);		MCity& operator=(const MCity&);
	/**		/**
	* \brief returns the unique key for the city		* \brief returns the unique key for the city
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcollator.h		mcollator.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MCOLLATOR_H		#ifndef MCOLLATOR_H
	#define MCOLLATOR_H		#define MCOLLATOR_H
	#include "mexport.h"		#include "mexport.h"
	#include "mlocale.h"		#include "mlocale.h"
	class QString;		class QString;
	class MCollatorPrivate;		class MCollatorPrivate;
	class M_EXPORT MCollator		class M_CORE_EXPORT MCollator
	{		{
	public:		public:
	MCollator();		MCollator();
	MCollator(const MLocale &locale);		MCollator(const MLocale &locale);
	MCollator(const MCollator &other);		MCollator(const MCollator &other);
	virtual ~MCollator();		virtual ~MCollator();
	bool operator()(const QString &s1, const QString &s2) const;		bool operator()(const QString &s1, const QString &s2) const;
	static MLocale::Comparison compare(const QString &first, const QString &second);		static MLocale::Comparison compare(const QString &first, const QString &second);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcombobox.h		mcombobox.h
	skipping to change at line 72		skipping to change at line 72
	MComboBox *combobox = new MComboBox();		MComboBox *combobox = new MComboBox();
	combobox->setTitle("Select an item");		combobox->setTitle("Select an item");
	combobox->setIconID("icon-l-gallery");		combobox->setIconID("icon-l-gallery");
	QStringList stringList;		QStringList stringList;
	stringList << "Item 1" << "Item 2";		stringList << "Item 1" << "Item 2";
	combobox->addItems(stringList);		combobox->addItems(stringList);
	\endcode		\endcode
	*/		*/
	class M_EXPORT MComboBox : public MWidgetController		class M_CORE_EXPORT MComboBox : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MComboBox)		M_CONTROLLER(MComboBox)
	/**		/**
	\property MComboBox::iconID		\property MComboBox::iconID
	\brief See MComboBoxModel::iconID		\brief See MComboBoxModel::iconID
	*/		*/
	Q_PROPERTY(QString iconID READ iconID WRITE setIconID)		Q_PROPERTY(QString iconID READ iconID WRITE setIconID)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcomboboxmodel.h		mcomboboxmodel.h
	skipping to change at line 36		skipping to change at line 36
	class QAbstractItemModel;		class QAbstractItemModel;
	/*!		/*!
	\class MComboBoxModel		\class MComboBoxModel
	\brief Data model class for MComboBox.		\brief Data model class for MComboBox.
	\ingroup models		\ingroup models
	\sa MComboBox		\sa MComboBox
	*/		*/
	class M_EXPORT MComboBoxModel : public MWidgetModel		class M_CORE_EXPORT MComboBoxModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MComboBoxModel)		M_MODEL_INTERNAL(MComboBoxModel)
	/*!		/*!
	\property MComboBoxModel::iconID		\property MComboBoxModel::iconID
	\brief Id of the icon that is displayed on the ComboBox		\brief Id of the icon that is displayed on the ComboBox
	*/		*/
	M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())		M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcomboboxstyle.h		mcomboboxstyle.h
	skipping to change at line 32		skipping to change at line 32
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	/*!		/*!
	\class MComboBoxStyle		\class MComboBoxStyle
	\brief Style class for MComoBox.		\brief Style class for MComoBox.
	\ingroup styles		\ingroup styles
	\sa MComboBoxStyleContainer MWidgetStyle \ref styling MComboBox MComboB oxView		\sa MComboBoxStyleContainer MWidgetStyle \ref styling MComboBox MComboB oxView
	*/		*/
	class M_EXPORT MComboBoxStyle : public MWidgetStyle		class M_VIEWS_EXPORT MComboBoxStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MComboBoxStyle)		M_STYLE(MComboBoxStyle)
	/*!		/*!
	\deprecated do not use		\deprecated do not use
	*/		*/
	M_STYLE_ATTRIBUTE(int, itemMode, ItemMode)		M_STYLE_ATTRIBUTE(int, itemMode, ItemMode)
	/*!		/*!
	skipping to change at line 103		skipping to change at line 103
	M_STYLE_ATTRIBUTE(QString, popupListType, PopupListType)		M_STYLE_ATTRIBUTE(QString, popupListType, PopupListType)
	};		};
	/*!		/*!
	\class MComboBoxStyleContainer		\class MComboBoxStyleContainer
	\brief Style mode container class for MComboBoxStyle.		\brief Style mode container class for MComboBoxStyle.
	\ingroup styles		\ingroup styles
	\sa MComboBoxStyle		\sa MComboBoxStyle
	*/		*/
	class M_EXPORT MComboBoxStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MComboBoxStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MComboBoxStyle)		M_STYLE_CONTAINER(MComboBoxStyle)
	/*!		/*!
	\brief Style mode for a pressed comboBox.		\brief Style mode for a pressed comboBox.
	Mode is activated when a comboBox is pressed down and deactivated w hen		Mode is activated when a comboBox is pressed down and deactivated w hen
	comboBox is released.		comboBox is released.
	*/		*/
	M_STYLE_MODE(Pressed)		M_STYLE_MODE(Pressed)
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mcomboboxview.h		mcomboboxview.h
	skipping to change at line 41		skipping to change at line 41
	\class MComboBoxView		\class MComboBoxView
	\brief View class for MComboBox.		\brief View class for MComboBox.
	\ingroup views		\ingroup views
	MComboBoxView is used to visualize comboBox.		MComboBoxView is used to visualize comboBox.
	\sa MComboBox MComboBoxStyle		\sa MComboBox MComboBoxStyle
	*/		*/
	class M_EXPORT MComboBoxView : public MWidgetView		class M_VIEWS_EXPORT MComboBoxView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MComboBoxModel, MComboBoxStyle)		M_VIEW(MComboBoxModel, MComboBoxStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	\param controller Pointer to the controller		\param controller Pointer to the controller
	*/		*/
	MComboBoxView(MComboBox *controller);		MComboBoxView(MComboBox *controller);
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 112		skipping to change at line 112
	* completer->setCharactersToTrim(QString("<>"));		* completer->setCharactersToTrim(QString("<>"));
	* \endcode		* \endcode
	*/		*/
	class MWidget;		class MWidget;
	class MTextEdit;		class MTextEdit;
	class MCompleterPrivate;		class MCompleterPrivate;
	class MApplicationWindow;		class MApplicationWindow;
	class QAbstractItemModel;		class QAbstractItemModel;
	class QModelIndex;		class QModelIndex;
	class M_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)
	public:		public:
	/*!		/*!
	* \brief Creates an instance without any completion candidates.		* \brief Creates an instance without any completion candidates.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcompletermodel.h		mcompletermodel.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MCOMPLETERMODEL_H		#ifndef MCOMPLETERMODEL_H
	#define MCOMPLETERMODEL_H		#define MCOMPLETERMODEL_H
	#include <QStringList>		#include <QStringList>
	#include "mscenewindowmodel.h"		#include "mscenewindowmodel.h"
	class QAbstractItemModel;		class QAbstractItemModel;
	class MWidget;		class MWidget;
	class M_EXPORT MCompleterModel : public MSceneWindowModel		class M_CORE_EXPORT MCompleterModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MCompleterModel)		M_MODEL_INTERNAL(MCompleterModel)
	private:		private:
	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)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcompleterstyle.h		mcompleterstyle.h
	skipping to change at line 27		skipping to change at line 27
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MCOMPLETERSTYLE_H		#ifndef MCOMPLETERSTYLE_H
	#define MCOMPLETERSTYLE_H		#define MCOMPLETERSTYLE_H
	#include <QColor>		#include <QColor>
	#include <QFont>		#include <QFont>
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MCompleterStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MCompleterStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MCompleterStyle)		M_STYLE_INTERNAL(MCompleterStyle)
	M_STYLE_ATTRIBUTE(QColor, highlightColor, HighlightColor)		M_STYLE_ATTRIBUTE(QColor, highlightColor, HighlightColor)
	M_STYLE_ATTRIBUTE(int, height, Height)		M_STYLE_ATTRIBUTE(int, height, Height)
	M_STYLE_ATTRIBUTE(int, displayBorder, DisplayBorder)		M_STYLE_ATTRIBUTE(int, displayBorder, DisplayBorder)
	M_STYLE_ATTRIBUTE(int, labelMargin, LabelMargin)		M_STYLE_ATTRIBUTE(int, labelMargin, LabelMargin)
	M_STYLE_ATTRIBUTE(int, buttonMargin, ButtonMargin)		M_STYLE_ATTRIBUTE(int, buttonMargin, ButtonMargin)
	M_STYLE_ATTRIBUTE(int, buttonWidth, ButtonWidth)		M_STYLE_ATTRIBUTE(int, buttonWidth, ButtonWidth)
	M_STYLE_ATTRIBUTE(int, yPositionOffset, YPositionOffset)		M_STYLE_ATTRIBUTE(int, yPositionOffset, YPositionOffset)
	};		};
	class M_EXPORT MCompleterStyleContainer : public MSceneWindowStyleContainer		class M_VIEWS_EXPORT MCompleterStyleContainer : public MSceneWindowStyleCon tainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MCompleterStyle)		M_STYLE_CONTAINER_INTERNAL(MCompleterStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mcompleterview.h		mcompleterview.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MCOMPLETERVIEW_H		#ifndef MCOMPLETERVIEW_H
	#define MCOMPLETERVIEW_H		#define MCOMPLETERVIEW_H
	#include "mscenewindowview.h"		#include "mscenewindowview.h"
	#include "mcompletermodel.h"		#include "mcompletermodel.h"
	#include "mcompleterstyle.h"		#include "mcompleterstyle.h"
	class MCompleter;		class MCompleter;
	class MCompleterViewPrivate;		class MCompleterViewPrivate;
	class M_EXPORT MCompleterView : public MSceneWindowView		class M_VIEWS_EXPORT MCompleterView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MCompleterModel, MCompleterStyle)		M_VIEW(MCompleterModel, MCompleterStyle)
	public:		public:
	MCompleterView(MCompleter *controller);		MCompleterView(MCompleter *controller);
	virtual ~MCompleterView();		virtual ~MCompleterView();
	//! \reimp		//! \reimp
	virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;		virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcomponentcache.h		mcomponentcache.h
	skipping to change at line 64		skipping to change at line 64
	* As a consequence, this prevents inheriting MApplication in		* As a consequence, this prevents inheriting MApplication in
	* applications that use MComponentCache.		* applications that use MComponentCache.
	*		*
	* If the launcher has not populated the cache, this will create a new		* If the launcher has not populated the cache, this will create a new
	* MApplication instance. Thus the same application work with and		* MApplication instance. Thus the same application work with and
	* without the launcher.		* without the launcher.
	*		*
	* The ownership of the objects returned from the cache is passed to		* The ownership of the objects returned from the cache is passed to
	* the caller.		* the caller.
	*/		*/
	class M_EXPORT MComponentCache		class M_CORE_EXPORT MComponentCache
	{		{
	public:		public:
	//! Returns MApplication instance from the cache or creates a new one.		//! Returns MApplication instance from the cache or creates a new one.
	/*!		/*!
	* Parameters are the same as in MApplication::MApplication().		* Parameters are the same as in MApplication::MApplication().
	* Ownership of the returned object is passed to the caller.		* Ownership of the returned object is passed to the caller.
	*/		*/
	static MApplication* mApplication(int &argc, char **argv, const QString &appIdentifier = QString(), MApplicationService *service = 0);		static MApplication* mApplication(int &argc, char **argv, const QString &appIdentifier = QString(), MApplicationService *service = 0);
	//! Returns MApplicationWindow instance from the cache or creates a new one.		//! Returns MApplicationWindow instance from the cache or creates a new one.
	skipping to change at line 105		skipping to change at line 105
	private:		private:
	Q_DISABLE_COPY(MComponentCache)		Q_DISABLE_COPY(MComponentCache)
	MComponentCache();		MComponentCache();
	/* QGLWidget object returned by glWidget is owned by the caller */		/* QGLWidget object returned by glWidget is owned by the caller */
	static QGLWidget* glWidget();		static QGLWidget* glWidget();
	static QGLWidget* glWidget(const QGLFormat& format);		static QGLWidget* glWidget(const QGLFormat& format);
	friend class MApplicationWindow;		friend class MApplicationWindow;
	friend class MWindowPrivate;		friend class MGraphicsSystemHelper;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MComponentCache;		friend class Ut_MComponentCache;
	#endif		#endif
	};		};
	#endif // MCOMPONENTCACHE_H		#endif // MCOMPONENTCACHE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mcomponentdata.h		mcomponentdata.h
	skipping to change at line 72		skipping to change at line 72
	* 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 MComponentData to		* MApplicationService and provide a pointer to that in the constructor for MComponentData 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
	* MComponentDataSerivce and change the behaviour of the application's inte rface.		* MComponentDataSerivce and change the behaviour of the application's inte rface.
	*		*
	* For some applications, it is necessary to implement a custom MApplicatio nService. See		* For some applications, it is necessary to implement a custom MApplicatio nService. See
	* MApplicationService for more information.		* MApplicationService for more information.
	*		*
	*/		*/
	class M_EXPORT MComponentData : public QObject		class M_CORE_EXPORT MComponentData : public QObject
	{		{
	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
	* \param argv argument strings passed to the application from the comm and line		* \param argv argument strings passed to the application from the comm and line
	* \param appIdentifier an optional identifier for the application. Can		* \param appIdentifier an optional identifier for the application. Can
	* contain alphabetical characters, numbers, dashes and underscores. If		* contain alphabetical characters, numbers, dashes and underscores. If
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcontainer.h		mcontainer.h
	skipping to change at line 89		skipping to change at line 89
	* Titles can be either text, an icon or both of them. This is set by the		* Titles can be either text, an icon or both of them. This is set by the
	* application or the applet, as well as their values. If not, the title is		* application or the applet, as well as their values. If not, the title is
	* empty. If the title is too long it will be truncated.		* empty. If the title is too long it will be truncated.
	* The application/applet also defines the usage of the additional label an d		* The application/applet also defines the usage of the additional label an d
	* its content. If it doesn't specify it, it will be empty. The additional		* its content. If it doesn't specify it, it will be empty. The additional
	* label truncates.		* label truncates.
	*		*
	* \sa MContainerModel, MContainerView, \see \ref appletdevelopment		* \sa MContainerModel, MContainerView, \see \ref appletdevelopment
	*/		*/
	class M_EXPORT MContainer : public MWidgetController		class M_CORE_EXPORT MContainer : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MContainer)		M_CONTROLLER(MContainer)
	//! \brief Current widget in the container		//! \brief Current widget in the container
	Q_PROPERTY(QGraphicsWidget *centralWidget READ centralWidget WRITE setC entralWidget)		Q_PROPERTY(QGraphicsWidget *centralWidget READ centralWidget WRITE setC entralWidget)
	//! \brief Title of the container		//! \brief Title of the container
	Q_PROPERTY(QString title READ title WRITE setTitle)		Q_PROPERTY(QString title READ title WRITE setTitle)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcontainerheaderstyle.h		mcontainerheaderstyle.h
	skipping to change at line 31		skipping to change at line 31
	#define MCONTAINERHEADERSTYLE_H		#define MCONTAINERHEADERSTYLE_H
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	#include <QSize>		#include <QSize>
	/*!		/*!
	* \internal		* \internal
	*/		*/
	class M_EXPORT MContainerHeaderStyle : public MWidgetStyle		class M_VIEWS_EXPORT MContainerHeaderStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MContainerHeaderStyle)		M_STYLE(MContainerHeaderStyle)
	};		};
	class M_EXPORT MContainerHeaderStyleContainer : public MWidgetStyleContaine r		class M_VIEWS_EXPORT MContainerHeaderStyleContainer : public MWidgetStyleCo ntainer
	{		{
	M_STYLE_CONTAINER(MContainerHeaderStyle)		M_STYLE_CONTAINER(MContainerHeaderStyle)
	M_STYLE_MODE(Pressed)		M_STYLE_MODE(Pressed)
	};		};
	/*! \internal_end */		/*! \internal_end */
	#endif // MCONTAINERHEADERSTYLE_H		#endif // MCONTAINERHEADERSTYLE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mcontainermodel.h		mcontainermodel.h
	skipping to change at line 34		skipping to change at line 34
	class QGraphicsWidget;		class QGraphicsWidget;
	/*!		/*!
	* \class MContainerModel		* \class MContainerModel
	* \brief The model class of MContainer.		* \brief The model class of MContainer.
	*		*
	* \sa MContainer, MContainerView		* \sa MContainer, MContainerView
	*/		*/
	class M_EXPORT MContainerModel : public MWidgetModel		class M_CORE_EXPORT MContainerModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MContainerModel)		M_MODEL_INTERNAL(MContainerModel)
	private:		private:
	M_MODEL_PROPERTY(QString, title, Title, true, QString())		M_MODEL_PROPERTY(QString, title, Title, true, QString())
	M_MODEL_PROPERTY(QString, text, Text, true, QString())		M_MODEL_PROPERTY(QString, text, Text, true, QString())
	M_MODEL_PROPERTY(QString, icon, Icon, true, QString())		M_MODEL_PROPERTY(QString, icon, Icon, true, QString())
	M_MODEL_PROPERTY(bool, headerVisible, HeaderVisible, true, true)		M_MODEL_PROPERTY(bool, headerVisible, HeaderVisible, true, true)
	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)		M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcontainerstyle.h		mcontainerstyle.h
	skipping to change at line 27		skipping to change at line 27
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MCONTAINERSTYLE_H		#ifndef MCONTAINERSTYLE_H
	#define MCONTAINERSTYLE_H		#define MCONTAINERSTYLE_H
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	#include <QSize>		#include <QSize>
	class M_EXPORT MContainerStyle : public MWidgetStyle		class M_VIEWS_EXPORT MContainerStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MContainerStyle)		M_STYLE(MContainerStyle)
	M_STYLE_ATTRIBUTE(QSize, iconSize, IconSize)		M_STYLE_ATTRIBUTE(QSize, iconSize, IconSize)
	M_STYLE_ATTRIBUTE(int, internalMargins, InternalMargins)		M_STYLE_ATTRIBUTE(int, internalMargins, InternalMargins)
	M_STYLE_ATTRIBUTE(int, internalItemSpacing, InternalItemSpacing)		M_STYLE_ATTRIBUTE(int, internalItemSpacing, InternalItemSpacing)
	};		};
	class M_EXPORT MContainerStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MContainerStyleContainer : public MWidgetStyleContaine r
	{		{
	M_STYLE_CONTAINER(MContainerStyle)		M_STYLE_CONTAINER(MContainerStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mcontainerview.h		mcontainerview.h
	skipping to change at line 48		skipping to change at line 48
	* boundaries. The minimum height is the minimum height of the header which is		* boundaries. The minimum height is the minimum height of the header which is
	* 5.06mm. There is no maximum height of the container.		* 5.06mm. There is no maximum height of the container.
	*		*
	* \section MContainerViewInteractions Interactions		* \section MContainerViewInteractions Interactions
	* Supported interactions: Long tap. User of the component can specify obje ct		* Supported interactions: Long tap. User of the component can specify obje ct
	* menu for content items in native application views. Long tap for applet' s		* menu for content items in native application views. Long tap for applet' s
	* content items, not currently implemented.		* content items, not currently implemented.
	*		*
	* \sa MContainer, MContainerModel		* \sa MContainer, MContainerModel
	*/		*/
	class M_EXPORT MContainerView : public MWidgetView		class M_VIEWS_EXPORT MContainerView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MContainerModel, MContainerStyle)		M_VIEW(MContainerModel, MContainerStyle)
	public:		public:
	/*!		/*!
	* \brief Constructor		* \brief Constructor
	* \param controller Pointer to the container's controller		* \param controller Pointer to the container's controller
	*/		*/
	MContainerView(MContainer *controller);		MContainerView(MContainer *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcontentitem.h		mcontentitem.h
	skipping to change at line 57		skipping to change at line 57
	\li MContentItem::IconAndSingleTextLabelVertical		\li MContentItem::IconAndSingleTextLabelVertical
	\li MContentItem::IconAndTwoTextLabelsVertical		\li MContentItem::IconAndTwoTextLabelsVertical
	\li MContentItem::TwoIconsTwoWidgets		\li MContentItem::TwoIconsTwoWidgets
	MContentItem can be in one of the modes provided by ContentItemMode enumeration.		MContentItem can be in one of the modes provided by ContentItemMode enumeration.
	For each mode there is a dedicated graphics which is up to the view to show. The purpose of mode is to indicate		For each mode there is a dedicated graphics which is up to the view to show. The purpose of mode is to indicate
	logical position of item so that correct background can be used. Fo r more details take a look at MContentItemView.		logical position of item so that correct background can be used. Fo r more details take a look at MContentItemView.
	\sa MContentItemView		\sa MContentItemView
	*/		*/
	class M_EXPORT MContentItem : public MWidgetController		class M_CORE_EXPORT MContentItem : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MContentItem)		M_CONTROLLER(MContentItem)
	public:		public:
	/*!		/*!
	ContentItemStyle indicates how text and thumbnail should be shown. Th ere are 8 predefined layouts.		ContentItemStyle indicates how text and thumbnail should be shown. Th ere are 8 predefined layouts.
	Exact look and feel depends on the view.		Exact look and feel depends on the view.
	\sa MContentItemView		\sa MContentItemView
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcontentitemmodel.h		mcontentitemmodel.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MCONTENTITEMMODEL_H__		#ifndef MCONTENTITEMMODEL_H__
	#define MCONTENTITEMMODEL_H__		#define MCONTENTITEMMODEL_H__
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	class QPixmap;		class QPixmap;
	class QImage;		class QImage;
	class M_EXPORT MContentItemModel : public MWidgetModel		class M_CORE_EXPORT MContentItemModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MContentItemModel)		M_MODEL_INTERNAL(MContentItemModel)
	public:		public:
	/*!		/*!
	\property MContentItemModel::title		\property MContentItemModel::title
	\brief Title of item.		\brief Title of item.
	*/		*/
	M_MODEL_PROPERTY(QString, title, Title, true, QString())		M_MODEL_PROPERTY(QString, title, Title, true, QString())
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcontentitemstyle.h		mcontentitemstyle.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 MCONTENTITEMSTYLE_H		#ifndef MCONTENTITEMSTYLE_H
	#define MCONTENTITEMSTYLE_H		#define MCONTENTITEMSTYLE_H
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	class M_EXPORT MContentItemStyle : public MWidgetStyle		class M_VIEWS_EXPORT MContentItemStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MContentItemStyle)		M_STYLE(MContentItemStyle)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageTopLeft, Bac kgroundImageTopLeft)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageTopLeft, Bac kgroundImageTopLeft)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageTop, Backgro undImageTop)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageTop, Backgro undImageTop)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageTopRight, Ba ckgroundImageTopRight)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageTopRight, Ba ckgroundImageTopRight)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageLeft, Backgr oundImageLeft)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageLeft, Backgr oundImageLeft)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageCenter, Back groundImageCenter)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageCenter, Back groundImageCenter)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageRight, Backg roundImageRight)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageRight, Backg roundImageRight)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageBottomLeft, BackgroundImageBottomLeft)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageBottomLeft, BackgroundImageBottomLeft)
	skipping to change at line 55		skipping to change at line 55
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageSinglecolumnBot tom, BackgroundImageSinglecolumnBottom)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageSinglecolumnBot tom, BackgroundImageSinglecolumnBottom)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageSingle, Backgrou ndImageSingle)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, backgroundImageSingle, Backgrou ndImageSingle)
	M_STYLE_ATTRIBUTE(QString, titleObjectName, TitleObjectName)		M_STYLE_ATTRIBUTE(QString, titleObjectName, TitleObjectName)
	M_STYLE_ATTRIBUTE(QString, subtitleObjectName, SubtitleObjectName)		M_STYLE_ATTRIBUTE(QString, subtitleObjectName, SubtitleObjectName)
	M_STYLE_ATTRIBUTE(QString, imageObjectName, ImageObjectName)		M_STYLE_ATTRIBUTE(QString, imageObjectName, ImageObjectName)
	M_STYLE_ATTRIBUTE(QString, optionalImageObjectName, OptionalImageObject Name)		M_STYLE_ATTRIBUTE(QString, optionalImageObjectName, OptionalImageObject Name)
	};		};
	class M_EXPORT MContentItemStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MContentItemStyleContainer : public MWidgetStyleContai ner
	{		{
	M_STYLE_CONTAINER(MContentItemStyle)		M_STYLE_CONTAINER(MContentItemStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mcontentitemview.h		mcontentitemview.h
	skipping to change at line 48		skipping to change at line 48
	on the style.		on the style.
	MContentItemView supports 4 different layouts for text and thumnbai l. They have to be set through MContentItem::setItemStyle().		MContentItemView supports 4 different layouts for text and thumnbai l. They have to be set through MContentItem::setItemStyle().
	\image html content-item-styles.png		\image html content-item-styles.png
	MContentItemView supports different modes which has to be set throu gh MContentItem::setItemMode()		MContentItemView supports different modes which has to be set throu gh MContentItem::setItemMode()
	\image html content-item-modes.png		\image html content-item-modes.png
	*/		*/
	class M_EXPORT MContentItemView : public MWidgetView		class M_VIEWS_EXPORT MContentItemView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MContentItemModel, MContentItemStyle)		M_VIEW(MContentItemModel, MContentItemStyle)
	public:		public:
	MContentItemView(MContentItem *controller);		MContentItemView(MContentItem *controller);
	virtual ~MContentItemView();		virtual ~MContentItemView();
	protected slots:		protected slots:
	virtual void updateData(const QList<const char *> &modifications);		virtual void updateData(const QList<const char *> &modifications);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mcountry.h		mcountry.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MCOUNTRY_H		#ifndef MCOUNTRY_H
	#define MCOUNTRY_H		#define MCOUNTRY_H
	#include <QString>		#include <QString>
	#include "mexport.h"		#include "mexport.h"
	class MCountryPrivate;		class MCountryPrivate;
	class M_EXPORT MCountry		class M_CORE_EXPORT MCountry
	{		{
	public:		public:
	MCountry();		MCountry();
	MCountry(const MCountry&);		MCountry(const MCountry&);
	virtual ~MCountry();		virtual ~MCountry();
	MCountry& operator=(const MCountry&);		MCountry& operator=(const MCountry&);
	/**		/**
	* \brief returns the unique key for the country		* \brief returns the unique key for the country
	*		*
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mdataaccess.h		mdataaccess.h
	skipping to change at line 35		skipping to change at line 35
	#include <QString>		#include <QString>
	#include <QVariant>		#include <QVariant>
	#include <QStringList>		#include <QStringList>
	/*!		/*!
	* \brief Interface for reading and storing key values.		* \brief Interface for reading and storing key values.
	*		*
	* Users can read and write key values using this interface. The user		* Users can read and write key values using this interface. The user
	* also get notified when changes happen in the key values.		* also get notified when changes happen in the key values.
	*/		*/
	class M_EXPORT MDataAccess : public QObject		class M_CORE_EXPORT MDataAccess : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Destroys the MDataAccess.		* Destroys the MDataAccess.
	*/		*/
	virtual ~MDataAccess() {}		virtual ~MDataAccess() {}
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mdatastore.h		mdatastore.h
	skipping to change at line 32		skipping to change at line 32
	#include "mdataaccess.h"		#include "mdataaccess.h"
	#include "mexport.h"		#include "mexport.h"
	/*!		/*!
	* Interface for reading and storing data.		* Interface for reading and storing data.
	*		*
	* The difference between this class and \c MDataAccess is that this interf ace		* The difference between this class and \c MDataAccess is that this interf ace
	* can also be used to create and remove keys.		* can also be used to create and remove keys.
	*/		*/
	class M_EXPORT MDataStore : public MDataAccess		class M_CORE_EXPORT MDataStore : public MDataAccess
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Destroys the MDataStore.		* Destroys the MDataStore.
	*/		*/
	virtual ~MDataStore() {}		virtual ~MDataStore() {}
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mdefaultfonts.h		mdefaultfonts.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MDEFAULTFONTS_H		#ifndef MDEFAULTFONTS_H
	#define MDEFAULTFONTS_H		#define MDEFAULTFONTS_H
	#include <QFont>		#include <QFont>
	#include "mexport.h"		#include "mexport.h"
	class MDefaultFontsPrivate;		class MDefaultFontsPrivate;
	class MLogicalValues;		class MLogicalValues;
	class M_EXPORT MDefaultFonts		class M_CORE_EXPORT MDefaultFonts
	{		{
	public:		public:
	MDefaultFonts(const MLogicalValues &);		MDefaultFonts(const MLogicalValues &);
	~MDefaultFonts();		~MDefaultFonts();
	const QFont &extraSmallFont() const;		const QFont &extraSmallFont() const;
	const QFont &smallFont() const;		const QFont &smallFont() const;
	const QFont &defaultFont() const;		const QFont &defaultFont() const;
	const QFont &largeFont() const;		const QFont &largeFont() const;
	const QFont &extraLargeFont() const;		const QFont &extraLargeFont() const;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mdesktopentry.h		mdesktopentry.h
	skipping to change at line 43		skipping to change at line 43
	* MDesktopEntry object reads desktop file data from the desktop file given as		* MDesktopEntry object reads desktop file data from the desktop file given as
	* a construction parameter.		* a construction parameter.
	*		*
	* The isValid() method determines whether the input desktop file conforms to the		* The isValid() method determines whether the input desktop file conforms to the
	* standard defined by freedesktop.org.		* standard defined by freedesktop.org.
	*		*
	* For more information see:		* For more information see:
	* http://standards.freedesktop.org/desktop-entry-spec/latest/index.html		* http://standards.freedesktop.org/desktop-entry-spec/latest/index.html
	*		*
	*/		*/
	class M_EXPORT MDesktopEntry		class M_CORE_EXPORT MDesktopEntry
	{		{
	public:		public:
	/*!		/*!
	* Reads input desktop file and constructs new MDesktopEntry object		* Reads input desktop file and constructs new MDesktopEntry object
	* of it.		* of it.
	*		*
	* \param fileName the name of the file to read the desktop entry from		* \param fileName the name of the file to read the desktop entry from
	*/		*/
	MDesktopEntry(const QString &fileName);		MDesktopEntry(const QString &fileName);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mdetailedlistitem.h		mdetailedlistitem.h
	skipping to change at line 32		skipping to change at line 32
	#include "mlistitem.h"		#include "mlistitem.h"
	class MDetailedListItemPrivate;		class MDetailedListItemPrivate;
	class MImageWidget;		class MImageWidget;
	class MLabel;		class MLabel;
	class MStylableWidget;		class MStylableWidget;
	class QGraphicsGridLayout;		class QGraphicsGridLayout;
	class M_EXPORT MDetailedListItem : public MListItem		/*!
			\class MDetailedListItem
			\brief MDetailedListItem implementation of a detailed widget which can
			be used with MList.
			\ingroup widgets
			\section MDetailedListItem Overview
			MDetailedListItem can show several lines of text, main icon and two ico
			ns or one top icon and sub label
			on left side of the item. The main icon can have two styles, as Icon an
			d as Thumbnail.
			Exact layout depends on the style and can be set in:
			\li MDetailedListItem(MDetailedListItem::ItemStyle, QGraphicsItem)
			\li setItemStyle(ItemStyle)
			Text and icon can be set using following functions:
			\li setImageWidget()
			\li setTitle()
			\li setSubTitle()
			\section MDetailedListItem Customizing appearance
			MDetailedListItem appearance can be customized in 2 ways.
			Title, subtitle, main icon, side icons and side label are using styles
			provided by common layout.
			\li title - CommonTitle and CommonSingleTitle depending on the item st
			yle.
			\li subTitle - CommonSubTitle.
			\li bottomLabel - CommonItemInfo
			\li icon - CommonMainIcon and CommonMainThumbnail depending on the item
			style.
			\li sideTopIcon - CommonSubIconTop.
			\li sideBottomIcon - CommonSubIconBottom.
			Another way is to inherit MDetailedListItem and override:
			\li createLayout()
			\li clearLayout()
			*/
			class M_CORE_EXPORT MDetailedListItem : public MListItem
	{		{
	public:		public:
	Q_OBJECT		Q_OBJECT
			/*!
			\property MDetailedListItem::title
			\brief Contains title text.
			*/
	Q_PROPERTY(QString title READ title WRITE setTitle)		Q_PROPERTY(QString title READ title WRITE setTitle)
			/*!
			\property MDetailedListItem::subtitle
			\brief Contains subtitle text.
			*/
	Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle)		Q_PROPERTY(QString subtitle READ subtitle WRITE setSubtitle)
			/*!
			\property MDetailedListItem::sideBottomTitle
			\brief Contains side bottom label text.
			*/
	Q_PROPERTY(QString sideBottomTitle READ sideBottomTitle WRITE setSideBo ttomTitle)		Q_PROPERTY(QString sideBottomTitle READ sideBottomTitle WRITE setSideBo ttomTitle)
			/*!
			\property MDetailedListItem::imageWidget
			\brief Contains pointer to main icon MImageWidget.
			*/
	Q_PROPERTY(MImageWidget* imageWidget READ imageWidget WRITE setImageWid get)		Q_PROPERTY(MImageWidget* imageWidget READ imageWidget WRITE setImageWid get)
			/*!
			\property MDetailedListItem::sideTopImageWidget
			\brief Contains pointer to side top icon MImageWidget.
			*/
	Q_PROPERTY(MImageWidget* sideTopImageWidget READ sideTopImageWidget)		Q_PROPERTY(MImageWidget* sideTopImageWidget READ sideTopImageWidget)
			/*!
			\property MDetailedListItem::sideBottomImageWidget
			\brief Contains pointer to side bottom icon MImageWidget.
			*/
	Q_PROPERTY(MImageWidget* sideBottomImageWidget READ sideBottomImageWidg et)		Q_PROPERTY(MImageWidget* sideBottomImageWidget READ sideBottomImageWidg et)
	public:		public:
			/*!
			\brief Specifies layout of MDetailedListItem
			*/
	enum ItemStyle {		enum ItemStyle {
			//! \brief Defines style which contains a main icon, title with sub title and two icons on the side.
	IconTitleSubtitleAndTwoSideIcons,		IconTitleSubtitleAndTwoSideIcons,
			//! \brief Defines style which contains a main icon, title with sub title and small icon with a sublabel on the side.
	IconTitleSubtitleAndSideIconWithLabel,		IconTitleSubtitleAndSideIconWithLabel,
			//! \brief Defines style which contains a main thumbnail, title wit h subtitle and two icons on the side.
	ThumbnailTitleSubtitleAndTwoSideIcons,		ThumbnailTitleSubtitleAndTwoSideIcons,
			//! \brief Defines style which contains a main thumbnail, a single title and two icons on the side.
	ThumbnailTitleAndTwoSideIcons		ThumbnailTitleAndTwoSideIcons
	};		};
			//! \brief Specifies main icon styles for MDetailedListItem
	enum IconStyle {		enum IconStyle {
			//! \brief Defines main icon style as an icon with margins.
	Icon,		Icon,
			//! \brief Defines main icon styles as a thumbnail without margins.
	Thumbnail		Thumbnail
	};		};
	public:		public:
			/*!
			\brief MDetailedListItem constructor.
			\param style The style of item to be initialized with, defaults to MD
			etailedListItem::IconTitleSubtitleAndTwoSideIcons.
			\param parent The item parent.
			\sa MDetailedListItem::ItemStyle
			\sa MDetailedListItem::setItemStyle()
			*/
	MDetailedListItem(MDetailedListItem::ItemStyle style = IconTitleSubtitl eAndTwoSideIcons, QGraphicsItem *parent = NULL);		MDetailedListItem(MDetailedListItem::ItemStyle style = IconTitleSubtitl eAndTwoSideIcons, QGraphicsItem *parent = NULL);
			/*!
			\brief MDetailedListItem destructor.
			*/
	virtual ~MDetailedListItem();		virtual ~MDetailedListItem();
	/*!		/*!
	\deprecated The method is no longer required to be called after const ructing the item.		\deprecated The method is no longer required to be called after const ructing the item.
	There shouldn't be any need for this function.		There shouldn't be any need for this function.
	*/		*/
	void initLayout();		void initLayout();
			/*!
			\brief Sets item style.
			\sa MDetailedListItem::ItemStyle
			\sa MDetailedListItem::itemStyle()
			*/
	void setItemStyle(ItemStyle itemStyle);		void setItemStyle(ItemStyle itemStyle);
			/*!
			\brief Returns current item style.
			\sa MDetailedListItem::setItemStyle()
			*/
	ItemStyle itemStyle() const;		ItemStyle itemStyle() const;
			/*!
			\brief Sets main icon style.
			\sa MDetailedListItem::IconStyle
			\sa MDetailedListItem::iconStyle()
			*/
	void setIconStyle(IconStyle style);		void setIconStyle(IconStyle style);
			/*!
			\brief Returns current main icon style.
			\sa MDetailedListItem::setIconStyle()
			*/
	IconStyle iconStyle() const;		IconStyle iconStyle() const;
			/*!
			\brief Sets item icon widget. Ownership is transfered to the item.
			\sa MDetailedListItem::imageWidget()
			*/
	void setImageWidget(MImageWidget *icon);		void setImageWidget(MImageWidget *icon);
			/*!
			\brief Creates or returns already created pointer to an item icon wid
			get.
			\sa MDetailedListItem::setImageWidget()
			*/
	MImageWidget *imageWidget();		MImageWidget *imageWidget();
			/*!
			\brief Creates or returns already created pointer to an item side top
			icon widget.
			*/
	MImageWidget *sideTopImageWidget();		MImageWidget *sideTopImageWidget();
			/*!
			\brief Creates or returns already created pointer to an item side bot
			tom icon widget.
			*/
	MImageWidget *sideBottomImageWidget();		MImageWidget *sideBottomImageWidget();
			/*!
			\brief Sets the item title text.
			\sa MDetailedListItem::title()
			*/
	void setTitle(const QString &title);		void setTitle(const QString &title);
			/*!
			\brief Returns the item title text.
			\sa MDetailedListItem::setTitle()
			*/
	QString title();		QString title();
			/*!
			\brief Sets the item subtitle text.
			\sa MDetailedListItem::subtitle()
			*/
	void setSubtitle(const QString &subtitle);		void setSubtitle(const QString &subtitle);
			/*!
			\brief Returns the item subtitle text.
			\sa MDetailedListItem::setSubtitle()
			*/
	QString subtitle();		QString subtitle();
			/*!
			\brief Sets the item bottom side title text.
			\sa MDetailedListItem::sideBottomTitle()
			*/
	void setSideBottomTitle(const QString &text);		void setSideBottomTitle(const QString &text);
			/*!
			\brief Returns the item bottom side title text.
			\sa MDetailedListItem::setSideBottomTitle()
			*/
	QString sideBottomTitle();		QString sideBottomTitle();
	protected:		protected:
			/*!
			\brief Creates or returns already created title widget.
			\sa MDetailedListItem::setTitle()
			\sa MDetailedListItem::title()
			*/
	MLabel *titleLabelWidget();		MLabel *titleLabelWidget();
			/*!
			\brief Creates or returns already created subtitle widget.
			\sa MDetailedListItem::setSubtitle()
			\sa MDetailedListItem::subtitle()
			*/
	MLabel *subtitleLabelWidget();		MLabel *subtitleLabelWidget();
			/*!
			\brief Creates or returns already created bottom side title widget.
			\sa MDetailedListItem::setSideBottomTitle()
			\sa MDetailedListItem::sideBottomTitle()
			*/
	MLabel *sideBottomLabelWidget();		MLabel *sideBottomLabelWidget();
			/*!
			\brief Returns layout which will be assigned to MDetailedListItem.
			Can be called several times, so it should clear layout which was alre
			ady created.
			\sa MDetailedListItem::titleLabelWidget()
			\sa MDetailedListItem::subtitleLabelWidget()
			\sa MDetailedListItem::sideBottomLabelWidget()
			\sa MDetailedListItem::imageWidget()
			\sa MDetailedListItem::sideTopImageWidget()
			\sa MDetailedListItem::sideBottomImageWidget()
			*/
	virtual QGraphicsLayout *createLayout();		virtual QGraphicsLayout *createLayout();
			/*!
			\brief Clears layout created by createLayout() function.
			*/
	virtual void clearLayout();		virtual void clearLayout();
			//! \internal
	virtual void resizeEvent(QGraphicsSceneResizeEvent *event);		virtual void resizeEvent(QGraphicsSceneResizeEvent *event);
			//! \internal_end
	private:		private:
	Q_DECLARE_PRIVATE(MDetailedListItem)		Q_DECLARE_PRIVATE(MDetailedListItem)
	MDetailedListItemPrivate *d_ptr;		MDetailedListItemPrivate *d_ptr;
	};		};
	#endif // MDETAILEDLISTITEM_H		#endif // MDETAILEDLISTITEM_H
End of changes. 38 change blocks.
	1 lines changed or deleted		199 lines changed or added

	mdeviceprofile.h		mdeviceprofile.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"
	#include <QObject>		#include <QObject>
	class QSize;		class QSize;
	class MDeviceProfilePrivate;		class MDeviceProfilePrivate;
	/*! \brief The MDeviceProfile class holds physical and simulated properties of the target device		/*! \brief The MDeviceProfile class holds physical and simulated properties of the target device
	*/		*/
	class M_EXPORT MDeviceProfile : public QObject		class M_CORE_EXPORT MDeviceProfile : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	//! Default constructor. Only used by MApplication class.		//! Default constructor. Only used by MApplication class.
	//! Client classes should be using MDeviceProfile::instance() method.		//! Client classes should be using MDeviceProfile::instance() method.
	MDeviceProfile(QObject *parent = 0);		MDeviceProfile(QObject *parent = 0);
	//! Default destructor.		//! Default destructor.
	virtual ~MDeviceProfile();		virtual ~MDeviceProfile();
	skipping to change at line 66		skipping to change at line 66
	//! Returns true if orientation angle is supported for given keyboard s tate.		//! Returns true if orientation angle is supported for given keyboard s tate.
	bool orientationAngleIsSupported(M::OrientationAngle angle, bool isKeyb oardOpen) const;		bool orientationAngleIsSupported(M::OrientationAngle angle, bool isKeyb oardOpen) const;
	//! Returns the number of pixels required to display a length of \a mm millimeters on this device.		//! Returns the number of pixels required to display a length of \a mm millimeters on this device.
	int mmToPixels(qreal mm);		int mmToPixels(qreal mm);
	//! Returns the number of pixels required to display a length of \a mm millimeters on this device using floating point precision.		//! Returns the number of pixels required to display a length of \a mm millimeters on this device using floating point precision.
	qreal mmToPixelsF(qreal mm);		qreal mmToPixelsF(qreal mm);
			//! Returns point size in pixels on this device.
			int ptToPixels(qreal pt);
			//! Returns point size in pixels using floating point precision on this
			device.
			qreal ptToPixelsF(qreal pt);
	protected:		protected:
	MDeviceProfilePrivate *const d_ptr;		MDeviceProfilePrivate *const d_ptr;
	private:		private:
	Q_DISABLE_COPY(MDeviceProfile)		Q_DISABLE_COPY(MDeviceProfile)
	Q_DECLARE_PRIVATE(MDeviceProfile)		Q_DECLARE_PRIVATE(MDeviceProfile)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		8 lines changed or added

	mdevicestyle.h		mdevicestyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MDEVICESTYLE_H		#ifndef MDEVICESTYLE_H
	#define MDEVICESTYLE_H		#define MDEVICESTYLE_H
	#include <mstyle.h>		#include <mstyle.h>
	#include <QObject>		#include <QObject>
	#include <QSize>		#include <QSize>
	class M_EXPORT MDeviceStyle : public MStyle		class M_VIEWS_EXPORT MDeviceStyle : public MStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MDeviceStyle)		M_STYLE(MDeviceStyle)
	M_STYLE_ATTRIBUTE(QSize, resolution, Resolution)		M_STYLE_ATTRIBUTE(QSize, resolution, Resolution)
	M_STYLE_ATTRIBUTE(QSize, pixelsPerInch, PixelsPerInch)		M_STYLE_ATTRIBUTE(QSize, pixelsPerInch, PixelsPerInch)
	};		};
	class M_EXPORT MDeviceStyleContainer : public MStyleContainer		class M_VIEWS_EXPORT MDeviceStyleContainer : public MStyleContainer
	{		{
	M_STYLE_CONTAINER(MDeviceStyle)		M_STYLE_CONTAINER(MDeviceStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mdialog.h		mdialog.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MDIALOG_H		#ifndef MDIALOG_H
	#define MDIALOG_H		#define MDIALOG_H
	#include "mscenewindow.h"		#include "mscenewindow.h"
	#include "mdialogmodel.h"		#include "mdialogmodel.h"
	#include <mnamespace.h>		#include <mnamespace.h>
			#include "mpannablewidget.h"
	class MButton;		class MButton;
	class MDialogPrivate;		class MDialogPrivate;
	class MDismissEvent;		class MDismissEvent;
	/*!		/*!
	\class MDialog		\class MDialog
	\brief The MDialog class is the base class of dialog windows.		\brief The MDialog class is the base class of dialog windows.
	\ingroup widgets		\ingroup widgets
	skipping to change at line 164		skipping to change at line 165
	addButton(M::OkButton);		addButton(M::OkButton);
	addButton(M::CancelButton);		addButton(M::CancelButton);
	\\The third is custom button with positive role		\\The third is custom button with positive role
	addButton("Custom Action", M::ActionRole);		addButton("Custom Action", M::ActionRole);
	\endcode		\endcode
	Order of buttons will be: Ok, Custom Action, Cancel.		Order of buttons will be: Ok, Custom Action, Cancel.
	\sa MDialogView, MDialogStyle		\sa MDialogView, MDialogStyle
	*/		*/
	class M_EXPORT MDialog : public MSceneWindow		class M_CORE_EXPORT MDialog : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MDialog)		M_CONTROLLER(MDialog)
	Q_PROPERTY(int result READ result WRITE setResult NOTIFY finished USER true)		Q_PROPERTY(int result READ result WRITE setResult NOTIFY finished USER true)
	Q_PROPERTY(bool buttonBoxVisible READ isButtonBoxVisible WRITE setButto nBoxVisible)		Q_PROPERTY(bool buttonBoxVisible READ isButtonBoxVisible WRITE setButto nBoxVisible)
	/*!		/*!
	\property MDialog::closeButtonVisible		\property MDialog::closeButtonVisible
	skipping to change at line 212		skipping to change at line 213
	Q_PROPERTY(bool titleBarVisible READ isTitleBarVisible WRITE setTitleBa rVisible)		Q_PROPERTY(bool titleBarVisible READ isTitleBarVisible WRITE setTitleBa rVisible)
	Q_PROPERTY(QString title READ title WRITE setTitle)		Q_PROPERTY(QString title READ title WRITE setTitle)
	Q_PROPERTY(bool system READ isSystem WRITE setSystem)		Q_PROPERTY(bool system READ isSystem WRITE setSystem)
	Q_PROPERTY(bool modal READ isModal WRITE setModal)		Q_PROPERTY(bool modal READ isModal WRITE setModal)
	//! \internal		//! \internal
	Q_PROPERTY(bool systemModal READ isSystemModal WRITE setSystemModal)		Q_PROPERTY(bool systemModal READ isSystemModal WRITE setSystemModal)
	//! \internal_end		//! \internal_end
	Q_PROPERTY(bool progressIndicatorVisible READ isProgressIndicatorVisibl e WRITE setProgressIndicatorVisible)		Q_PROPERTY(bool progressIndicatorVisible READ isProgressIndicatorVisibl e WRITE setProgressIndicatorVisible)
			/*!
			\property MDialog::contentsVerticalPanningPolicy
			\brief Panning policy for the dialog's contents.
			The contents of a dialog are normally put inside a pannable viewpor
			t since they can
			exceed the maximum height of a dialog.
			This property defines the vertical panning policy to be used when a
			pannable
			viewport is holding the dialog's contents.
			By default its value is MPannableWidget::PanningAsNeeded.
			*/
			Q_PROPERTY(MPannableWidget::PanningPolicy contentsVerticalPanningPolicy
			READ contentsVerticalPanningPolicy WRITE setContentsVerticalPanningPolicy)
	public:		public:
	/*!		/*!
	* \brief This enum provides values that can be returned by a call to e xec() method.		* \brief This enum provides values that can be returned by a call to e xec() method.
	*		*
	* When a dialog is closed with either accept() or reject(), the equiva lent enum values		* When a dialog is closed with either accept() or reject(), the equiva lent enum values
	* are returned by exec().		* are returned by exec().
	*		*
	* \sa exec()		* \sa exec()
	*/		*/
	skipping to change at line 506		skipping to change at line 521
	* \brief Sets the given widget to be the page's central widget.		* \brief Sets the given widget to be the page's central widget.
	*		*
	* It's also possible to use the default widget, as a parent for all wi dgets using the		* It's also possible to use the default widget, as a parent for all wi dgets using the
	* centralWidget() function.		* centralWidget() function.
	*		*
	* \b NOTE: MDialog takes ownership of the widget pointer and deletes i t when needed.		* \b NOTE: MDialog takes ownership of the widget pointer and deletes i t when needed.
	* \param centralWidget the central widget.		* \param centralWidget the central widget.
	*/		*/
	void setCentralWidget(QGraphicsWidget *centralWidget);		void setCentralWidget(QGraphicsWidget *centralWidget);
			/**
			* \brief Returns current vertical panning policy of dialog's contents
			* \sa setContentsVerticalPanningPolicy()
			*/
			MPannableWidget::PanningPolicy contentsVerticalPanningPolicy() const;
			/**
			* \brief Sets vertical panning policy of dialog's contents
			*
			* \param policy Vertical panning policy
			* \sa contentsVerticalPanningPolicy()
			*/
			void setContentsVerticalPanningPolicy(MPannableWidget::PanningPolicy po
			licy);
	public Q_SLOTS:		public Q_SLOTS:
	/*!		/*!
	* Shows the dialog on the currently active window and registers it in the		* Shows the dialog on the currently active window and registers it in the
	* associated MSceneManager. Uses an animation to show the window.		* associated MSceneManager. Uses an animation to show the window.
	*		*
	* If systemModal property is true, it will be displayed as a separate top level		* If systemModal property is true, it will be displayed as a separate top level
	* MWindow regardless of whether there's an active window and the user		* MWindow regardless of whether there's an active window and the user
	* won't be able to switch to any other application or to the home scre en until		* won't be able to switch to any other application or to the home scre en until
	* the dialog is closed (the home button won't be accessible).		* the dialog is closed (the home button won't be accessible).
	*		*
	skipping to change at line 670		skipping to change at line 699
	//! \reimp_end		//! \reimp_end
	private:		private:
	Q_DECLARE_PRIVATE(MDialog)		Q_DECLARE_PRIVATE(MDialog)
	Q_DISABLE_COPY(MDialog)		Q_DISABLE_COPY(MDialog)
	Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked(QObject *))		Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked(QObject *))
	Q_PRIVATE_SLOT(d_func(), void _q_onStandAloneDialogDisappeared())		Q_PRIVATE_SLOT(d_func(), void _q_onStandAloneDialogDisappeared())
	friend class MDialogView;		friend class MDialogView;
	friend class MDialogViewPrivate;		friend class MDialogViewPrivate;
			friend class Ut_MDialog;
	};		};
	#endif		#endif
End of changes. 5 change blocks.
	1 lines changed or deleted		35 lines changed or added

	mdialogmodel.h		mdialogmodel.h
	skipping to change at line 24		skipping to change at line 24
	** License version 2.1 as published by the Free Software Foundation		** License version 2.1 as published by the Free Software Foundation
	** 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 MDIALOGMODEL_H		#ifndef MDIALOGMODEL_H
	#define MDIALOGMODEL_H		#define MDIALOGMODEL_H
	#include "mscenewindowmodel.h"		#include "mscenewindowmodel.h"
			#include "mpannablewidget.h"
	#include <mnamespace.h>		#include <mnamespace.h>
	#include <QList>		#include <QList>
	class MButtonModel;		class MButtonModel;
	typedef QList<MButtonModel *> MDialogButtonsList;		typedef QList<MButtonModel *> MDialogButtonsList;
	class M_EXPORT MDialogModel : public MSceneWindowModel		class M_CORE_EXPORT MDialogModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MDialogModel)		M_MODEL_INTERNAL(MDialogModel)
	M_MODEL_CUSTOM_DESTRUCTOR		M_MODEL_CUSTOM_DESTRUCTOR
	private:		private:
	M_MODEL_PROPERTY(int, resultCode, ResultCode, true, 0)		M_MODEL_PROPERTY(int, resultCode, ResultCode, true, 0)
	/*!		/*!
	skipping to change at line 64		skipping to change at line 65
	*/		*/
	M_MODEL_PROPERTY(bool, titleBarVisible, TitleBarVisible, true, true)		M_MODEL_PROPERTY(bool, titleBarVisible, TitleBarVisible, true, true)
	M_MODEL_PROPERTY(QString, title, Title, true, QString())		M_MODEL_PROPERTY(QString, title, Title, true, QString())
	M_MODEL_PROPERTY(bool, system, System, true, false)		M_MODEL_PROPERTY(bool, system, System, true, false)
	M_MODEL_PROPERTY(bool, modal, Modal, true, true)		M_MODEL_PROPERTY(bool, modal, Modal, true, true)
	M_MODEL_PROPERTY(bool, systemModal, SystemModal, true, false)		M_MODEL_PROPERTY(bool, systemModal, SystemModal, true, false)
	M_MODEL_PROPERTY(bool, alwaysPannable, AlwaysPannable, true, true)		M_MODEL_PROPERTY(bool, alwaysPannable, AlwaysPannable, true, true)
	/*!		/*!
			\property MDialogModel::contentsVerticalPanningPolicy
			\brief Vertical panning policy for MDialog's contents
			\sa MPannableWidget::PanningPolicy
			*/
			M_MODEL_PROPERTY(MPannableWidget::PanningPolicy, contentsVerticalPannin
			gPolicy, ContentsVerticalPanningPolicy, true, MPannableWidget::PanningAsNee
			ded)
			/*!
	\property MDialogModel::progressIndicatorVisible		\property MDialogModel::progressIndicatorVisible
	\brief Whether the progress indicator on the title bar is visible.		\brief Whether the progress indicator on the title bar is visible.
	*/		*/
	M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)		M_MODEL_PROPERTY(bool, progressIndicatorVisible, ProgressIndicatorVisib le, true, false)
	/*!		/*!
	\property MDialogModel::centralWidget		\property MDialogModel::centralWidget
	\brief Central widget for the dialog.		\brief Central widget for the dialog.
	*/		*/
	M_MODEL_PTR_PROPERTY(QGraphicsWidget *, centralWidget, CentralWidget, t rue, new MWidget)		M_MODEL_PTR_PROPERTY(QGraphicsWidget *, centralWidget, CentralWidget, t rue, new MWidget)
End of changes. 3 change blocks.
	1 lines changed or deleted		12 lines changed or added

	mdialogstyle.h		mdialogstyle.h
	skipping to change at line 57		skipping to change at line 57
	button-box-centered: false;		button-box-centered: false;
	has-close-button: true;		has-close-button: true;
	has-title-bar: true;		has-title-bar: true;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MWidgetStyle MDialog MDialogView		\sa MWidgetStyle MDialog MDialogView
	*/		*/
	class M_EXPORT MDialogStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MDialogStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MDialogStyle)		M_STYLE_INTERNAL(MDialogStyle)
	/*!		/*!
	\property MDialogStyle::verticalSpacing		\property MDialogStyle::verticalSpacing
	\brief Vertical spacing between dialog contents and button box.		\brief Vertical spacing between dialog contents and button box.
	*/		*/
	M_STYLE_ATTRIBUTE(qreal, verticalSpacing, VerticalSpacing)		M_STYLE_ATTRIBUTE(qreal, verticalSpacing, VerticalSpacing)
	skipping to change at line 194		skipping to change at line 194
	M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton)		M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton)
	};		};
	/*!		/*!
	\class MDialogStyleContainer		\class MDialogStyleContainer
	\brief Style mode container class for MDialogStyle.		\brief Style mode container class for MDialogStyle.
	\ingroup styles		\ingroup styles
	\sa MDialogStyle		\sa MDialogStyle
	*/		*/
	class M_EXPORT MDialogStyleContainer : public MSceneWindowStyleContainer		class M_VIEWS_EXPORT MDialogStyleContainer : public MSceneWindowStyleContai ner
	{		{
	M_STYLE_CONTAINER_INTERNAL(MDialogStyle)		M_STYLE_CONTAINER_INTERNAL(MDialogStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mdialogview.h		mdialogview.h
	skipping to change at line 85		skipping to change at line 85
	MButtonStyle[first].Portrait:pressed {		MButtonStyle[first].Portrait:pressed {
	background-image: "mdialog-top-button-background-pressed" 1 0px 10px 10px 10px;		background-image: "mdialog-top-button-background-pressed" 1 0px 10px 10px 10px;
	}		}
	...		...
	\endcode		\endcode
	\sa MDialog, MDialogStyle		\sa MDialog, MDialogStyle
	*/		*/
	class M_EXPORT MDialogView : public MSceneWindowView		class M_VIEWS_EXPORT MDialogView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MDialogModel, MDialogStyle)		M_VIEW(MDialogModel, MDialogStyle)
	public:		public:
	MDialogView(MDialog *controller);		MDialogView(MDialog *controller);
	virtual ~MDialogView();		virtual ~MDialogView();
	protected:		protected:
	MDialogView(MDialogViewPrivate &dd, MDialog *controller);		MDialogView(MDialogViewPrivate &dd, MDialog *controller);
	skipping to change at line 124		skipping to change at line 124
	//! \reimp		//! \reimp
	virtual QPainterPath shape() const;		virtual QPainterPath shape() const;
	virtual void applyStyle();		virtual void applyStyle();
	virtual void setupModel();		virtual void setupModel();
	protected slots:		protected slots:
	virtual void updateData(const QList<const char *>& modifications);		virtual void updateData(const QList<const char *>& modifications);
	//! \reimp_end		//! \reimp_end
	private:		private:
	Q_PRIVATE_SLOT(d_func(), void _q_updatePanning())
	Q_DECLARE_PRIVATE(MDialogView)		Q_DECLARE_PRIVATE(MDialogView)
	Q_DISABLE_COPY(MDialogView)		Q_DISABLE_COPY(MDialogView)
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MDialog;		friend class Ut_MDialog;
	friend class Ut_MDialogView;		friend class Ut_MDialogView;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		1 lines changed or added

	mdismissevent.h		mdismissevent.h
	skipping to change at line 63		skipping to change at line 63
	*		*
	* QObjects emits the destroyed() signal when they are deleted.		* QObjects emits the destroyed() signal when they are deleted.
	*		*
	* The isAccepted() method returns true if the event's receiver has agreed to		* The isAccepted() method returns true if the event's receiver has agreed to
	* dismiss the scene window; call accept() to agree to dismiss the scene wi ndow		* dismiss the scene window; call accept() to agree to dismiss the scene wi ndow
	* and call ignore() if the receiver of this event does not want the scene window		* and call ignore() if the receiver of this event does not want the scene window
	* to be closed.		* to be closed.
	*		*
	* \sa MSceneWindow::dismiss()		* \sa MSceneWindow::dismiss()
	*/		*/
	class M_EXPORT MDismissEvent : public QEvent		class M_CORE_EXPORT MDismissEvent : public QEvent
	{		{
	public:		public:
	/*!		/*!
	* \brief Default constructor, no need for any parameters.		* \brief Default constructor, no need for any parameters.
	*/		*/
	explicit MDismissEvent();		explicit MDismissEvent();
	/*!		/*!
	* \brief Event type for MDismissEvent.		* \brief Event type for MDismissEvent.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mdockwidgetstyle.h		mdockwidgetstyle.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MDOCKWIDGETSTYLE_H		#ifndef MDOCKWIDGETSTYLE_H
	#define MDOCKWIDGETSTYLE_H		#define MDOCKWIDGETSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	//! \internal		//! \internal
	class M_EXPORT MDockWidgetStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MDockWidgetStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MDockWidgetStyle)		M_STYLE_INTERNAL(MDockWidgetStyle)
	};		};
	class M_EXPORT MDockWidgetStyleContainer : public MSceneWindowStyleContaine r		class M_VIEWS_EXPORT MDockWidgetStyleContainer : public MSceneWindowStyleCo ntainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MDockWidgetStyle)		M_STYLE_CONTAINER_INTERNAL(MDockWidgetStyle)
	};		};
	//! \internal_end		//! \internal_end
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	meffectcreator.h		meffectcreator.h
	skipping to change at line 36		skipping to change at line 36
	static const MEffectCreator<EFFECT> g_EffectCreator(#EFFECT);		static const MEffectCreator<EFFECT> g_EffectCreator(#EFFECT);
	// forward declarations		// forward declarations
	class QGraphicsEffect;		class QGraphicsEffect;
	/*!		/*!
	Interface for MEffectCreators		Interface for MEffectCreators
	you can implement your own creator or use MEffectCreator template class with		you can implement your own creator or use MEffectCreator template class with
	M_REGISTER_EFFECT-macro.		M_REGISTER_EFFECT-macro.
	*/		*/
	class M_EXPORT MEffectCreatorBase		class M_CORE_EXPORT MEffectCreatorBase
	{		{
	public:		public:
	/*!		/*!
	Constructor		Constructor
	Registers this creator instance to MClassFactory.		Registers this creator instance to MClassFactory.
	*/		*/
	MEffectCreatorBase(const char *effectClassName);		MEffectCreatorBase(const char *effectClassName);
	/*!		/*!
	Destructor		Destructor
	skipping to change at line 59		skipping to change at line 59
	virtual ~MEffectCreatorBase();		virtual ~MEffectCreatorBase();
	/*!		/*!
	Returns a new graphics effect instance.		Returns a new graphics effect instance.
	Ownership is transferred to caller.		Ownership is transferred to caller.
	*/		*/
	virtual QGraphicsEffect *create() const = 0;		virtual QGraphicsEffect *create() const = 0;
	};		};
	template<class EFFECT>		template<class EFFECT>
	class M_EXPORT MEffectCreator : public MEffectCreatorBase		class MEffectCreator : public MEffectCreatorBase
	{		{
	public:		public:
	MEffectCreator(const char *effectClassName) :		MEffectCreator(const char *effectClassName) :
	MEffectCreatorBase(effectClassName)		MEffectCreatorBase(effectClassName)
	{}		{}
	virtual ~MEffectCreator()		virtual ~MEffectCreator()
	{}		{}
	virtual QGraphicsEffect *create() const {		virtual QGraphicsEffect *create() const {
	return new EFFECT();		return new EFFECT();
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mescapebuttonpanel.h		mescapebuttonpanel.h
	skipping to change at line 37		skipping to change at line 37
	* \class MEscapeButtonPanel		* \class MEscapeButtonPanel
	* \brief The MEscapeButtonPanel class displays an escape button.		* \brief The MEscapeButtonPanel class displays an escape button.
	*		*
	* The escape button can be displayed regardless of the navigation bar and provides		* The escape button can be displayed regardless of the navigation bar and provides
	* three display modes described by MEscapeButtonModel::EscapeMode. In cont rast to		* three display modes described by MEscapeButtonModel::EscapeMode. In cont rast to
	* the home button (provided by MHomeButtonPanel), it does not stand above all GUI		* the home button (provided by MHomeButtonPanel), it does not stand above all GUI
	* elements, i.e. can be covered by modal dialogs, and MOverlay class insta nces.		* elements, i.e. can be covered by modal dialogs, and MOverlay class insta nces.
	*		*
	* \sa MHomeButtonPanel		* \sa MHomeButtonPanel
	*/		*/
	class M_EXPORT MEscapeButtonPanel : public MSceneWindow		class M_CORE_EXPORT MEscapeButtonPanel : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MEscapeButtonPanel)		M_CONTROLLER(MEscapeButtonPanel)
	Q_PROPERTY(MEscapeButtonPanelModel::EscapeMode escapeMode READ escapeMo de WRITE setEscapeMode)		Q_PROPERTY(MEscapeButtonPanelModel::EscapeMode escapeMode READ escapeMo de WRITE setEscapeMode)
	public:		public:
	/*!		/*!
	* \brief Constructs the escape button with the given \a parent.		* \brief Constructs the escape button with the given \a parent.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mescapebuttonpanelmodel.h		mescapebuttonpanelmodel.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 MESCAPEBUTTONPANELMODEL_H		#ifndef MESCAPEBUTTONPANELMODEL_H
	#define MESCAPEBUTTONPANELMODEL_H		#define MESCAPEBUTTONPANELMODEL_H
	#include <mscenewindowmodel.h>		#include <mscenewindowmodel.h>
	class M_EXPORT MEscapeButtonPanelModel : public MSceneWindowModel		class M_CORE_EXPORT MEscapeButtonPanelModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MEscapeButtonPanelModel)		M_MODEL_INTERNAL(MEscapeButtonPanelModel)
	public:		public:
	/*!		/*!
	* \brief Provides display modes for the escape button.		* \brief Provides display modes for the escape button.
	*/		*/
	enum EscapeMode {		enum EscapeMode {
	BackMode, /*!< The button is a back button, i.e. connects to		BackMode, /*!< The button is a back button, i.e. connects to
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mescapebuttonpanelstyle.h		mescapebuttonpanelstyle.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 MESCAPEBUTTONPANELSTYLE_H		#ifndef MESCAPEBUTTONPANELSTYLE_H
	#define MESCAPEBUTTONPANELSTYLE_H		#define MESCAPEBUTTONPANELSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MEscapeButtonPanelStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MEscapeButtonPanelStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MEscapeButtonPanelStyle)		M_STYLE_INTERNAL(MEscapeButtonPanelStyle)
	M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton)		M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton)
	M_STYLE_ATTRIBUTE(int, buttonAnimationLength, ButtonAnimationLength)		M_STYLE_ATTRIBUTE(int, buttonAnimationLength, ButtonAnimationLength)
	M_STYLE_ATTRIBUTE(QString, backButtonObjectName, BackButtonObjectName)		M_STYLE_ATTRIBUTE(QString, backButtonObjectName, BackButtonObjectName)
	M_STYLE_ATTRIBUTE(QString, closeButtonObjectName, CloseButtonObjectName )		M_STYLE_ATTRIBUTE(QString, closeButtonObjectName, CloseButtonObjectName )
	M_STYLE_ATTRIBUTE(QString, backButtonIconId, BackButtonIconId)		M_STYLE_ATTRIBUTE(QString, backButtonIconId, BackButtonIconId)
	M_STYLE_ATTRIBUTE(QString, closeButtonIconId, CloseButtonIconId)		M_STYLE_ATTRIBUTE(QString, closeButtonIconId, CloseButtonIconId)
	};		};
	class M_EXPORT MEscapeButtonPanelStyleContainer : public MSceneWindowStyleC ontainer		class M_VIEWS_EXPORT MEscapeButtonPanelStyleContainer : public MSceneWindow StyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MEscapeButtonPanelStyle)		M_STYLE_CONTAINER_INTERNAL(MEscapeButtonPanelStyle)
	M_STYLE_MODE(Fullscreen)		M_STYLE_MODE(Fullscreen)
	};		};
	#endif // MESCAPEBUTTONPANELSTYLE_H		#endif // MESCAPEBUTTONPANELSTYLE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mescapebuttonpanelview.h		mescapebuttonpanelview.h
	skipping to change at line 36		skipping to change at line 36
	class MEscapeButtonPanelViewPrivate;		class MEscapeButtonPanelViewPrivate;
	class MEscapeButtonPanel;		class MEscapeButtonPanel;
	/*!		/*!
	* \class MEscapeButtonPanelView		* \class MEscapeButtonPanelView
	* \brief The MEscapeButtonPanelView class just draws an escape button.		* \brief The MEscapeButtonPanelView class just draws an escape button.
	*		*
	* It just draws an escape button on an otherwise empty scene window.		* It just draws an escape button on an otherwise empty scene window.
	*/		*/
	class M_EXPORT MEscapeButtonPanelView : public MSceneWindowView		class M_VIEWS_EXPORT MEscapeButtonPanelView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MEscapeButtonPanelModel, MEscapeButtonPanelStyle)		M_VIEW(MEscapeButtonPanelModel, MEscapeButtonPanelStyle)
	public:		public:
	MEscapeButtonPanelView(MEscapeButtonPanel *controller);		MEscapeButtonPanelView(MEscapeButtonPanel *controller);
	virtual ~MEscapeButtonPanelView();		virtual ~MEscapeButtonPanelView();
	protected:		protected:
	MEscapeButtonPanelViewPrivate *const d_ptr;		MEscapeButtonPanelViewPrivate *const d_ptr;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mexport.h		mexport.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 MEXPORT_H		#ifndef MEXPORT_H
	#define MEXPORT_H		#define MEXPORT_H
	#include <QtCore/QtGlobal>		#include <QtCore/QtGlobal>
			// the M_EXPORT define is deprecated. it does not
			// make any sense to use it. we just keep it here
			// so that projects that are using it continue to
			// work as before.
	#if defined(M_EXPORTS)		#if defined(M_EXPORTS)
			# define M_EXPORT Q_DECL_EXPORT
			#else
			# if defined (Q_OS_WIN)
			# define M_EXPORT Q_DECL_IMPORT
			# else
	# define M_EXPORT Q_DECL_EXPORT		# define M_EXPORT Q_DECL_EXPORT
			# endif
			#endif
			#ifdef M_BUILD_CORE
			# define M_CORE_EXPORT Q_DECL_EXPORT
	#else		#else
	# if defined (Q_OS_WIN)		# define M_CORE_EXPORT Q_DECL_IMPORT
	# define M_EXPORT Q_DECL_IMPORT		#endif
	# else
	# define M_EXPORT Q_DECL_EXPORT		#ifdef M_BUILD_VIEWS
	# endif		# define M_VIEWS_EXPORT Q_DECL_EXPORT
			#else
			# define M_VIEWS_EXPORT Q_DECL_IMPORT
			#endif
			#ifdef M_BUILD_SETTINGS
			# define M_SETTINGS_EXPORT Q_DECL_EXPORT
			#else
			# define M_SETTINGS_EXPORT Q_DECL_IMPORT
			#endif
			#ifdef M_BUILD_EXTENSIONS
			# define M_EXTENSIONS_EXPORT Q_DECL_EXPORT
			#else
			# define M_EXTENSIONS_EXPORT Q_DECL_IMPORT
	#endif		#endif
	#if defined(Q_OS_WIN) && defined (Q_CC_MSVC)		#if defined(Q_OS_WIN) && defined (Q_CC_MSVC)
	# ifndef __func__		# ifndef __func__
	# define __func__ __FUNCTION__		# define __func__ __FUNCTION__
	# endif		# endif
	# ifndef __PRETTY_FUNCTION__		# ifndef __PRETTY_FUNCTION__
	# define __PRETTY_FUNCTION__ __FUNCTION__		# define __PRETTY_FUNCTION__ __FUNCTION__
	# endif		# endif
	#endif		#endif
End of changes. 4 change blocks.
	5 lines changed or deleted		33 lines changed or added

	mextendingbackgroundstyle.h		mextendingbackgroundstyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MEXTENDINGBACKGROUNDSTYLE_H		#ifndef MEXTENDINGBACKGROUNDSTYLE_H
	#define MEXTENDINGBACKGROUNDSTYLE_H		#define MEXTENDINGBACKGROUNDSTYLE_H
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	/*!		/*!
	* Style class for MExtendingBackgroundView		* Style class for MExtendingBackgroundView
	*/		*/
	class M_EXPORT MExtendingBackgroundStyle : public MWidgetStyle		class M_VIEWS_EXPORT MExtendingBackgroundStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MExtendingBackgroundStyle)		M_STYLE(MExtendingBackgroundStyle)
	//! The direction where to extend the background beyond the screen edge s (left/right/top/bottom)		//! The direction where to extend the background beyond the screen edge s (left/right/top/bottom)
	M_STYLE_ATTRIBUTE(QString, extendDirection, ExtendDirection)		M_STYLE_ATTRIBUTE(QString, extendDirection, ExtendDirection)
	};		};
	class M_EXPORT MExtendingBackgroundStyleContainer : public MWidgetStyleCont ainer		class M_VIEWS_EXPORT MExtendingBackgroundStyleContainer : public MWidgetSty leContainer
	{		{
	M_STYLE_CONTAINER(MExtendingBackgroundStyle)		M_STYLE_CONTAINER(MExtendingBackgroundStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mextendingbackgroundview.h		mextendingbackgroundview.h
	skipping to change at line 33		skipping to change at line 33
	#include <MWidgetView>		#include <MWidgetView>
	#include <MWidgetModel>		#include <MWidgetModel>
	#include "mextendingbackgroundstyle.h"		#include "mextendingbackgroundstyle.h"
	class MExtendingBackgroundViewPrivate;		class MExtendingBackgroundViewPrivate;
	/*!		/*!
	* The extending background view draws a background that can extend beyond		* The extending background view draws a background that can extend beyond
	* the edges of the bounding rectangle.		* the edges of the bounding rectangle.
	*/		*/
	class M_EXPORT MExtendingBackgroundView : public MWidgetView		class M_VIEWS_EXPORT MExtendingBackgroundView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MWidgetModel, MExtendingBackgroundStyle)		M_VIEW(MWidgetModel, MExtendingBackgroundStyle)
	public:		public:
	/*!		/*!
	* Constructs an MExtendingBackgroundView.		* Constructs an MExtendingBackgroundView.
	*		*
	* \param controller the MWidgetController to be used		* \param controller the MWidgetController to be used
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mextensionarea.h		mextensionarea.h
	skipping to change at line 32		skipping to change at line 32
	#include <MWidgetController>		#include <MWidgetController>
	#include "mextensionareamodel.h"		#include "mextensionareamodel.h"
	class MDataStore;		class MDataStore;
	class MExtensionAreaPrivate;		class MExtensionAreaPrivate;
	/*!		/*!
	* MExtensionArea is a baseclass for widgets that can load application exte nsions		* MExtensionArea is a baseclass for widgets that can load application exte nsions
	*/		*/
	class M_EXPORT MExtensionArea : public MWidgetController		class M_EXTENSIONS_EXPORT MExtensionArea : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MExtensionArea)		M_CONTROLLER(MExtensionArea)
	public:		public:
	/*!		/*!
	* Default constructor		* Default constructor
	* \param parent Optional Object's parent		* \param parent Optional Object's parent
	*/		*/
	explicit MExtensionArea(QGraphicsItem *parent = NULL);		explicit MExtensionArea(QGraphicsItem *parent = NULL);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mextensionareamodel.h		mextensionareamodel.h
	skipping to change at line 32		skipping to change at line 32
	#include <MWidgetModel>		#include <MWidgetModel>
	class MDataStore;		class MDataStore;
	typedef QMap<QGraphicsWidget *, MDataStore *> DataStoreMap;		typedef QMap<QGraphicsWidget *, MDataStore *> DataStoreMap;
	/*!		/*!
	* MExtensionAreaModel is the model class for MExtensionArea.		* MExtensionAreaModel is the model class for MExtensionArea.
	*/		*/
	class M_EXPORT MExtensionAreaModel : public MWidgetModel		class M_EXTENSIONS_EXPORT MExtensionAreaModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MExtensionAreaModel)		M_MODEL_INTERNAL(MExtensionAreaModel)
	public:		public:
	//! A map of widgets and the associated datastores		//! A map of widgets and the associated datastores
	M_MODEL_PTR_PROPERTY(DataStoreMap *, dataStores, DataStores, true, NULL )		M_MODEL_PTR_PROPERTY(DataStoreMap *, dataStores, DataStores, true, NULL )
	public:		public:
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mextensionareastyle.h		mextensionareastyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MEXTENSIONAREASTYLE_H_		#ifndef MEXTENSIONAREASTYLE_H_
	#define MEXTENSIONAREASTYLE_H_		#define MEXTENSIONAREASTYLE_H_
	#include <MWidgetStyle>		#include <MWidgetStyle>
	/*!		/*!
	* MExtensionAreaStyle is the style class for MExtensionArea.		* MExtensionAreaStyle is the style class for MExtensionArea.
	*/		*/
	class M_EXPORT MExtensionAreaStyle : public MWidgetStyle		class M_EXTENSIONS_EXPORT MExtensionAreaStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MExtensionAreaStyle)		M_STYLE(MExtensionAreaStyle)
	//! Whether the applets on this mashup canvas should be inside containe rs or not		//! Whether the applets on this mashup canvas should be inside containe rs or not
	M_STYLE_ATTRIBUTE(bool, containerMode, ContainerMode)		M_STYLE_ATTRIBUTE(bool, containerMode, ContainerMode)
	};		};
	/*!		/*!
	* MExtensionAreaStyleContainer is the style container class for MExtension Area.		* MExtensionAreaStyleContainer is the style container class for MExtension Area.
	*/		*/
	class M_EXPORT MExtensionAreaStyleContainer : public MWidgetStyleContainer		class M_EXTENSIONS_EXPORT MExtensionAreaStyleContainer : public MWidgetStyl eContainer
	{		{
	M_STYLE_CONTAINER(MExtensionAreaStyle)		M_STYLE_CONTAINER(MExtensionAreaStyle)
	};		};
	#endif /* MEXTENSIONAREASTYLE_H_ */		#endif /* MEXTENSIONAREASTYLE_H_ */
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mextensionareaview.h		mextensionareaview.h
	skipping to change at line 33		skipping to change at line 33
	#include <MWidgetView>		#include <MWidgetView>
	#include "mextensionareamodel.h"		#include "mextensionareamodel.h"
	#include "mextensionareastyle.h"		#include "mextensionareastyle.h"
	class MExtensionAreaViewPrivate;		class MExtensionAreaViewPrivate;
	class MExtensionArea;		class MExtensionArea;
	/*!		/*!
	* A view class for the MExtensionArea.		* A view class for the MExtensionArea.
	*/		*/
	class M_EXPORT MExtensionAreaView : public MWidgetView		class M_EXTENSIONS_EXPORT MExtensionAreaView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MExtensionAreaModel, MExtensionAreaStyle)		M_VIEW(MExtensionAreaModel, MExtensionAreaStyle)
	public:		public:
	/*!		/*!
	* Constructs a new view for MExtensionArea.		* Constructs a new view for MExtensionArea.
	*		*
	* \param controller the MExtensionArea controller for the view.		* \param controller the MExtensionArea controller for the view.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mextensionrunner.h		mextensionrunner.h
	skipping to change at line 55		skipping to change at line 55
	//! \internal		//! \internal
	/**		/**
	* MExtensionRunner is a class that is used to start and run oop (out of pr ocess)		* MExtensionRunner is a class that is used to start and run oop (out of pr ocess)
	* extension widgets.		* extension widgets.
	*		*
	* W A R N I N G		* W A R N I N G
	* -------------		* -------------
	* This file is not part of the libmeegotouch API. It should only be used b y applet runner developers.		* This file is not part of the libmeegotouch API. It should only be used b y applet runner developers.
	*/		*/
	class M_EXPORT MExtensionRunner : public QObject		class M_EXTENSIONS_EXPORT MExtensionRunner : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* MExtensionRunner constructor		* MExtensionRunner constructor
	*/		*/
	MExtensionRunner();		MExtensionRunner();
	//! MExtensionRunner destructor		//! MExtensionRunner destructor
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mfeedback.h		mfeedback.h
	skipping to change at line 40		skipping to change at line 40
	/*!		/*!
	* \class MFeedback		* \class MFeedback
	* \brief Used to easily play non-graphical input feedbacks.		* \brief Used to easily play non-graphical input feedbacks.
	*		*
	* This class can be used to play non-graphical input feedbacks such as		* This class can be used to play non-graphical input feedbacks such as
	* vibra, audio or tactile effects. MFeedback has a name which is used		* vibra, audio or tactile effects. MFeedback has a name which is used
	* to play the correct feedback(s) when play() function is called.		* to play the correct feedback(s) when play() function is called.
	*		*
	* \sa MFeedbackPlayer		* \sa MFeedbackPlayer
	*/		*/
	class M_EXPORT MFeedback : public QObject		class M_CORE_EXPORT MFeedback : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* \brief Default constructor		* \brief Default constructor
	*		*
	* Creates a MFeedback with no name.		* Creates a MFeedback with no name.
	*		*
	* \note Calling play() for MFeedback with no name causes no feedback		* \note Calling play() for MFeedback with no name causes no feedback
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mfeedbackplayer.h		mfeedbackplayer.h
	skipping to change at line 48		skipping to change at line 48
	* You use it as way to add supporting instantaneous feedback for your		* You use it as way to add supporting instantaneous feedback for your
	* graphical user interface (such as a "button pressing" tactile feedback w hen the		* graphical user interface (such as a "button pressing" tactile feedback w hen the
	* user pokes your custom widget on a touchscreen)		* user pokes your custom widget on a touchscreen)
	*		*
	* MFeedbackPlayer also ensures that the instantaneous feedback given is go ing		* MFeedbackPlayer also ensures that the instantaneous feedback given is go ing
	* to comply with the system's current "look and feel" (more especifically, to the		* to comply with the system's current "look and feel" (more especifically, to the
	* "feel" part) and will also be in harmony with the context/situation at h and.		* "feel" part) and will also be in harmony with the context/situation at h and.
	*		*
	* \deprecated Please use class MFeedback to play input feedbacks. Since 0. 20.43		* \deprecated Please use class MFeedback to play input feedbacks. Since 0. 20.43
	*/		*/
	class M_EXPORT MFeedbackPlayer : public QObject		class M_CORE_EXPORT MFeedbackPlayer : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	/*!		/*!
	* \brief Constructor		* \brief Constructor
	* \param parent Parent object		* \param parent Parent object
	*/		*/
	explicit MFeedbackPlayer(QObject *parent = 0);		explicit MFeedbackPlayer(QObject *parent = 0);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mfiledatastore.h		mfiledatastore.h
	skipping to change at line 31		skipping to change at line 31
	#define MFILEDATASTORE_H		#define MFILEDATASTORE_H
	#include "mdatastore.h"		#include "mdatastore.h"
	class MFileDataStorePrivate;		class MFileDataStorePrivate;
	/*!		/*!
	* Concrete implementation of \c MDataStore interface. This class stores th e data to the		* Concrete implementation of \c MDataStore interface. This class stores th e data to the
	* filesystem. The file name is given as a constructor parameter.		* filesystem. The file name is given as a constructor parameter.
	*/		*/
	class M_EXPORT MFileDataStore : public MDataStore		class M_CORE_EXPORT MFileDataStore : public MDataStore
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	* \param filePath Absolute path to the file that the settings will be written to and read from.		* \param filePath Absolute path to the file that the settings will be written to and read from.
	*/		*/
	explicit MFileDataStore(const QString &filePath);		explicit MFileDataStore(const QString &filePath);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mflowlayoutpolicy.h		mflowlayoutpolicy.h
	skipping to change at line 59		skipping to change at line 59
	* \sa \ref layout-mflowlayoutpolicy		* \sa \ref layout-mflowlayoutpolicy
	*		*
	* \section mbuttonsInFlowLayout Using MButton in a MFlowLayoutPolicy		* \section mbuttonsInFlowLayout Using MButton in a MFlowLayoutPolicy
	*		*
	* In the default CSS theme, a MButton has a fixed \link QGraphicsLayoutIt em::preferredWidth() preferredWidth()\endlink,		* In the default CSS theme, a MButton has a fixed \link QGraphicsLayoutIt em::preferredWidth() preferredWidth()\endlink,
	* which does not depend on the text inside of it. This makes sense norma lly for buttons,		* which does not depend on the text inside of it. This makes sense norma lly for buttons,
	* but does not usually produce the desired behaviour in a flow layout.		* but does not usually produce the desired behaviour in a flow layout.
	* Every MButton in a MFlowLayoutPolicy will have the same width.		* Every MButton in a MFlowLayoutPolicy will have the same width.
	*		*
	*/		*/
	class M_EXPORT MFlowLayoutPolicy : public MAbstractLayoutPolicy		class M_CORE_EXPORT MFlowLayoutPolicy : public MAbstractLayoutPolicy
	{		{
	public:		public:
	/*!		/*!
	* \brief Constructs a flow layout policy.		* \brief Constructs a flow layout policy.
	*/		*/
	explicit MFlowLayoutPolicy(MLayout *);		explicit MFlowLayoutPolicy(MLayout *);
	/*!		/*!
	* \brief Destroys a flow layout policy.		* \brief Destroys a flow layout policy.
	*		*
	skipping to change at line 127		skipping to change at line 127
	void setAlignment( QGraphicsLayoutItem * item, Qt::Alignment alignment );		void setAlignment( QGraphicsLayoutItem * item, Qt::Alignment alignment );
	/*! \reimp */		/*! \reimp */
	virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;		virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
	virtual void addItem(QGraphicsLayoutItem *item);		virtual void addItem(QGraphicsLayoutItem *item);
	virtual void insertItem(int index, QGraphicsLayoutItem *item);		virtual void insertItem(int index, QGraphicsLayoutItem *item);
	virtual void removeAt(int index);		virtual void removeAt(int index);
	virtual void invalidate();		virtual void invalidate();
	protected:		protected:
	virtual void relayout();		virtual void relayout();
	virtual bool hasHeightForWidth() const {
	return true;
	}
	/*! \reimp_end */		/*! \reimp_end */
	private:		private:
	Q_DISABLE_COPY(MFlowLayoutPolicy)		Q_DISABLE_COPY(MFlowLayoutPolicy)
	Q_DECLARE_PRIVATE(MFlowLayoutPolicy)		Q_DECLARE_PRIVATE(MFlowLayoutPolicy)
	};		};
	#endif // Header Guard		#endif // Header Guard
End of changes. 2 change blocks.
	4 lines changed or deleted		1 lines changed or added

	mfreestylelayoutpolicy.h		mfreestylelayoutpolicy.h
	skipping to change at line 46		skipping to change at line 46
	*		*
	* \dontinclude mfreestylelayoutpolicy/mfreestylelayoutpolicy.cpp		* \dontinclude mfreestylelayoutpolicy/mfreestylelayoutpolicy.cpp
	* \skip Create a MLayout		* \skip Create a MLayout
	* \until }		* \until }
	*		*
	* The result, with appropriate CSS styling, looks like:		* The result, with appropriate CSS styling, looks like:
	* \image html mfreestylelayoutpolicy.jpg		* \image html mfreestylelayoutpolicy.jpg
	*		*
	* \sa \link layout-mfreestylelayoutpolicy MFreestyleLayoutPolicy Example \ endlink		* \sa \link layout-mfreestylelayoutpolicy MFreestyleLayoutPolicy Example \ endlink
	*/		*/
	class M_EXPORT MFreestyleLayoutPolicy : public MAbstractLayoutPolicy		class M_CORE_EXPORT MFreestyleLayoutPolicy : public MAbstractLayoutPolicy
	{		{
	public:		public:
	/*!		/*!
	* \brief Constructs a freestyle layout policy		* \brief Constructs a freestyle layout policy
	*/		*/
	explicit MFreestyleLayoutPolicy(MLayout *layout);		explicit MFreestyleLayoutPolicy(MLayout *layout);
	/*!		/*!
	* \brief Destroys the freestyle layout policy.		* \brief Destroys the freestyle layout policy.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgconfdatastore.h		mgconfdatastore.h
	skipping to change at line 44		skipping to change at line 44
	* of any subdirectories of the path. For example, the following code will		* of any subdirectories of the path. For example, the following code will
	* create the datastore with the GConf path <tt>/example</tt> and set a		* create the datastore with the GConf path <tt>/example</tt> and set a
	* value of the key called <tt>userKey</tt> under that path:		* value of the key called <tt>userKey</tt> under that path:
	*		*
	* \code		* \code
	* MGConfDataStore dataStore("/example");		* MGConfDataStore dataStore("/example");
	* dataStore.setValue("userKey", 123);		* dataStore.setValue("userKey", 123);
	* \endcode		* \endcode
	*		*
	*/		*/
	class M_EXPORT MGConfDataStore : public MDataStore		class M_EXTENSIONS_EXPORT MGConfDataStore : public MDataStore
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	* \param keyPath The gconf path in which the datastore operates.		* \param keyPath The gconf path in which the datastore operates.
	*/		*/
	MGConfDataStore(const QString &keyPath);		MGConfDataStore(const QString &keyPath);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgconfitem.h		mgconfitem.h
	skipping to change at line 65		skipping to change at line 65
	QVariant::Double, QVariant::Bool, or QVariant::String. (A list of		QVariant::Double, QVariant::Bool, or QVariant::String. (A list of
	strings is returned as a QVariant::StringList, however, when you		strings is returned as a QVariant::StringList, however, when you
	get it back.)		get it back.)
	- Any other QVariant or GConf value is essentially ignored.		- Any other QVariant or GConf value is essentially ignored.
	\warning MGConfItem is as thread-safe as GConf.		\warning MGConfItem is as thread-safe as GConf.
	*/		*/
	class M_EXPORT MGConfItem : public QObject		class M_CORE_EXPORT MGConfItem : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*! Initializes a MGConfItem to access the GConf key denoted by		/*! Initializes a MGConfItem to access the GConf key denoted by
	\a key. Key names should follow the normal GConf conventions		\a key. Key names should follow the normal GConf conventions
	like "/myapp/settings/first".		like "/myapp/settings/first".
	\param key The name of the key.		\param key The name of the key.
	\param parent Parent object		\param parent Parent object
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgles2renderer.h		mgles2renderer.h
	skipping to change at line 70		skipping to change at line 70
	attribute highp vec4 vertex; //object space vertex coordinate		attribute highp vec4 vertex; //object space vertex coordinate
	attribute lowp vec2 texCoord; //texture coordinates of the vertex		attribute lowp vec2 texCoord; //texture coordinates of the vertex
	uniform highp mat4 matProj; //projection matrix		uniform highp mat4 matProj; //projection matrix
	uniform highp mat4 matWorld; //world transformation matrix		uniform highp mat4 matWorld; //world transformation matrix
	uniform highp vec2 invSize; //inversed size of rendered quad		uniform highp vec2 invSize; //inversed size of rendered quad
	//fragment shader variables		//fragment shader variables
	uniform sampler2D textureX; //textures for each texture unit (eg. textu re0, texture1 ...)		uniform sampler2D textureX; //textures for each texture unit (eg. textu re0, texture1 ...)
	\endcode		\endcode
	*/		*/
	class M_EXPORT MGLES2Renderer		class M_CORE_EXPORT MGLES2Renderer
	{		{
	public:		public:
	/*!		/*!
	\brief Destructor.		\brief Destructor.
	*/		*/
	virtual ~MGLES2Renderer();		virtual ~MGLES2Renderer();
	/*!		/*!
	\brief Returns instance of MGLES2Renderer object for the specified QGLContext.		\brief Returns instance of MGLES2Renderer object for the specified QGLContext.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgraphicseffect.h		mgraphicseffect.h
	skipping to change at line 53		skipping to change at line 53
	This class is not meant to be used directly, instead it serves as a base c lass for		This class is not meant to be used directly, instead it serves as a base c lass for
	other widget effects. Classes deriving from MGraphicsEffect should impleme nt		other widget effects. Classes deriving from MGraphicsEffect should impleme nt
	a style derived from MGraphicsEffectStyle that describes the style propert ies of the		a style derived from MGraphicsEffectStyle that describes the style propert ies of the
	effects in the group.		effects in the group.
	Classes inheriting MGraphicsEffect need to include the M_GRAPHICS_EFFECT		Classes inheriting MGraphicsEffect need to include the M_GRAPHICS_EFFECT
	macro in the class definiton, specifying the classname of the style to be used.		macro in the class definiton, specifying the classname of the style to be used.
	*/		*/
	class M_EXPORT MGraphicsEffect : public QGraphicsEffect		class M_CORE_EXPORT MGraphicsEffect : public QGraphicsEffect
	{		{
	public:		public:
	MGraphicsEffect(QObject *parent=0);		MGraphicsEffect(QObject *parent=0);
	virtual ~MGraphicsEffect();		virtual ~MGraphicsEffect();
	protected:		protected:
	/*! \brief Returns a style container object for this graphics effect.		/*! \brief Returns a style container object for this graphics effect.
	The M_GRAPHICS_EFFECT macro, added to inheriting classes, overrides this		The M_GRAPHICS_EFFECT macro, added to inheriting classes, overrides this
	method to return the correct type.		method to return the correct type.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgraphicseffectstyle.h		mgraphicseffectstyle.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 MGRAPHICSEFFECTSTYLE_H		#ifndef MGRAPHICSEFFECTSTYLE_H
	#define MGRAPHICSEFFECTSTYLE_H		#define MGRAPHICSEFFECTSTYLE_H
	#include "mstyle.h"		#include "mstyle.h"
	class M_EXPORT MGraphicsEffectStyle : public MStyle		class M_CORE_EXPORT MGraphicsEffectStyle : public MStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MGraphicsEffectStyle)		M_STYLE(MGraphicsEffectStyle)
	};		};
	class M_EXPORT MGraphicsEffectStyleContainer : public MStyleContainer		class M_CORE_EXPORT MGraphicsEffectStyleContainer : public MStyleContainer
	{		{
	M_STYLE_CONTAINER(MGraphicsEffectStyle)		M_STYLE_CONTAINER(MGraphicsEffectStyle)
	};		};
	#endif // MGRAPHICSEFFECTSTYLE_H		#endif // MGRAPHICSEFFECTSTYLE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mgriditem.h		mgriditem.h
	skipping to change at line 51		skipping to change at line 51
	MImage, set imageVisible = true, titleVisible = fals e, subtitleVisible = false		MImage, set imageVisible = true, titleVisible = fals e, subtitleVisible = false
	MLabel, set imageVisible = false, titleVisible = true , subtitleVisible = false		MLabel, set imageVisible = false, titleVisible = true , subtitleVisible = false
	MImage+MLabel, set imageVisible = true, titleVisible = true, subtitleVisible = false		MImage+MLabel, set imageVisible = true, titleVisible = true, subtitleVisible = false
	MImage+2 MLabel, set imageVisible = true, titleVisible = true, subtitleVisible = true		MImage+2 MLabel, set imageVisible = true, titleVisible = true, subtitleVisible = true
	You can change the image alignment to LeftAlign/RightAlign by modif y CSS		You can change the image alignment to LeftAlign/RightAlign by modif y CSS
	\deprecated Please use MContentItem, MBasicListItem, MAdvancedListItem , MDetailedListItem		\deprecated Please use MContentItem, MBasicListItem, MAdvancedListItem , MDetailedListItem
	*/		*/
	class M_EXPORT MGridItem: public MWidgetController		class M_CORE_EXPORT MGridItem: public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MGridItem)		M_CONTROLLER(MGridItem)
	public:		public:
	/**		/**
	\property MGridItem::image		\property MGridItem::image
	\brief See MGridItemModel::image		\brief See MGridItemModel::image
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgriditemmodel.h		mgriditemmodel.h
	skipping to change at line 32		skipping to change at line 32
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	/*!		/*!
	\class MGridItemModel		\class MGridItemModel
	\brief Data model class for MGridItem.		\brief Data model class for MGridItem.
	\ingroup models		\ingroup models
	\sa MGridItem		\sa MGridItem
	*/		*/
	class M_EXPORT MGridItemModel : public MWidgetModel		class M_CORE_EXPORT MGridItemModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MGridItemModel)		M_MODEL_INTERNAL(MGridItemModel)
	public:		public:
	/*!		/*!
	\property MGridItemModel::image		\property MGridItemModel::image
	\brief Id of the image.		\brief Id of the image.
	*/		*/
	M_MODEL_PROPERTY(QString, image, Image, true, QString())		M_MODEL_PROPERTY(QString, image, Image, true, QString())
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgriditemstyle.h		mgriditemstyle.h
	skipping to change at line 40		skipping to change at line 40
	MGridItemStyle {		MGridItemStyle {
	icon-align: left;		icon-align: left;
	icon-size: 64px 64px;		icon-size: 64px 64px;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MGridItemStyleContainer MWidgetStyle \ref styling MGridItem MGridIt emView		\sa MGridItemStyleContainer MWidgetStyle \ref styling MGridItem MGridIt emView
	*/		*/
	class M_EXPORT MGridItemStyle : public MWidgetStyle		class M_VIEWS_EXPORT MGridItemStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MGridItemStyle)		M_STYLE(MGridItemStyle)
	/*!		/*!
	\property MGridItemStyle::iconAlign		\property MGridItemStyle::iconAlign
	\brief Alignmentation of the icon.		\brief Alignmentation of the icon.
	*/		*/
	M_STYLE_ATTRIBUTE(Qt::Alignment, iconAlign, Ico nAlign)		M_STYLE_ATTRIBUTE(Qt::Alignment, iconAlign, Ico nAlign)
	skipping to change at line 65		skipping to change at line 65
	M_STYLE_ATTRIBUTE(QSize, iconSize, Ico nSize)		M_STYLE_ATTRIBUTE(QSize, iconSize, Ico nSize)
	};		};
	/*!		/*!
	\class MGridItemStyleContainer		\class MGridItemStyleContainer
	\brief Style mode container class for MGridItemStyle.		\brief Style mode container class for MGridItemStyle.
	\ingroup styles		\ingroup styles
	\sa MGridItemStyle		\sa MGridItemStyle
	*/		*/
	class M_EXPORT MGridItemStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MGridItemStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MGridItemStyle)		M_STYLE_CONTAINER(MGridItemStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mgriditemview.h		mgriditemview.h
	skipping to change at line 42		skipping to change at line 42
	\brief View class for MGridItem.		\brief View class for MGridItem.
	\ingroup views		\ingroup views
	\section MGridItemViewOverview Overview		\section MGridItemViewOverview Overview
	MGridItemView implements a view for the MGridItem widget.		MGridItemView implements a view for the MGridItem widget.
	\deprecated		\deprecated
	*/		*/
	class M_EXPORT MGridItemView : public MWidgetView		class M_VIEWS_EXPORT MGridItemView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MGridItemModel, MGridItemStyle)		M_VIEW(MGridItemModel, MGridItemStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	\param controller Pointer to the controller		\param controller Pointer to the controller
	*/		*/
	MGridItemView(MGridItem *controller);		MGridItemView(MGridItem *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgridlayoutpolicy.h		mgridlayoutpolicy.h
	skipping to change at line 73		skipping to change at line 73
	*		*
	* If you do not need animations or multiple policies, you can use QGraphic sGridLayout for same effect in less code.		* If you do not need animations or multiple policies, you can use QGraphic sGridLayout for same effect in less code.
	* For example:		* For example:
	*		*
	* \dontinclude qgraphicsgridlayout/qgraphicsgridlayout.cpp		* \dontinclude qgraphicsgridlayout/qgraphicsgridlayout.cpp
	* \skip Create a grid layout		* \skip Create a grid layout
	* \until }		* \until }
	*		*
	* \sa \ref layout-qgraphicsgridlayout		* \sa \ref layout-qgraphicsgridlayout
	*/		*/
	class M_EXPORT MGridLayoutPolicy : public MAbstractLayoutPolicy		class M_CORE_EXPORT MGridLayoutPolicy : public MAbstractLayoutPolicy
	{		{
	public:		public:
	/*!		/*!
	* \brief Constructs a grid layout policy.		* \brief Constructs a grid layout policy.
	*		*
	* @param layout The layout to associate with.		* @param layout The layout to associate with.
	*/		*/
	explicit MGridLayoutPolicy(MLayout *layout);		explicit MGridLayoutPolicy(MLayout *layout);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgroupanimation.h		mgroupanimation.h
	skipping to change at line 31		skipping to change at line 31
	#define MGROUPANIMATION_H		#define MGROUPANIMATION_H
	#include <manimation.h>		#include <manimation.h>
	#include <mgroupanimationstyle.h>		#include <mgroupanimationstyle.h>
	class MGroupAnimationPrivate;		class MGroupAnimationPrivate;
	/*! \brief MGroupAnimation provides an base class for groups of animations.		/*! \brief MGroupAnimation provides an base class for groups of animations.
	*/		*/
	class M_EXPORT MGroupAnimation : public MAnimation		class M_CORE_EXPORT MGroupAnimation : public MAnimation
	{		{
	Q_OBJECT		Q_OBJECT
	Q_DECLARE_PRIVATE(MGroupAnimation)		Q_DECLARE_PRIVATE(MGroupAnimation)
	M_ANIMATION(MGroupAnimationStyle)		M_ANIMATION(MGroupAnimationStyle)
	public:		public:
	enum Type {		enum Type {
	Parallel,		Parallel,
	Sequential		Sequential
	};		};
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mgroupanimationstyle.h		mgroupanimationstyle.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 MGROUPANIMATIONSTYLE_H		#ifndef MGROUPANIMATIONSTYLE_H
	#define MGROUPANIMATIONSTYLE_H		#define MGROUPANIMATIONSTYLE_H
	#include <manimationstyle.h>		#include <manimationstyle.h>
	class M_EXPORT MGroupAnimationStyle : public MAnimationStyle		class M_CORE_EXPORT MGroupAnimationStyle : public MAnimationStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MGroupAnimationStyle)		M_STYLE_INTERNAL(MGroupAnimationStyle)
	};		};
	class M_EXPORT MGroupAnimationStyleContainer : public MAnimationStyleContai ner		class M_CORE_EXPORT MGroupAnimationStyleContainer : public MAnimationStyleC ontainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MGroupAnimationStyle)		M_STYLE_CONTAINER_INTERNAL(MGroupAnimationStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mhomebuttonpanel.h		mhomebuttonpanel.h
	skipping to change at line 33		skipping to change at line 33
	#include "mscenewindow.h"		#include "mscenewindow.h"
	#include "mscenewindowmodel.h"		#include "mscenewindowmodel.h"
	/*!		/*!
	* \class MHomeButtonPanel		* \class MHomeButtonPanel
	* \brief The MHomeButtonPanel class displays a home button on top of all G UI.		* \brief The MHomeButtonPanel class displays a home button on top of all G UI.
	*		*
	* The home button is always visible and accessible, standing on top of all		* The home button is always visible and accessible, standing on top of all
	* application GUI, including MOverlay instances and modal dialogs.		* application GUI, including MOverlay instances and modal dialogs.
	*/		*/
	class M_EXPORT MHomeButtonPanel : public MSceneWindow		class M_CORE_EXPORT MHomeButtonPanel : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSceneWindow)		M_CONTROLLER(MSceneWindow)
	public:		public:
	/*!		/*!
	* \brief Constructs a widget with the given \a parent.		* \brief Constructs a widget with the given \a parent.
	*/		*/
	MHomeButtonPanel(QGraphicsItem *parent = 0);		MHomeButtonPanel(QGraphicsItem *parent = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mhomebuttonpanelstyle.h		mhomebuttonpanelstyle.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 MHOMEBUTTONPANELSTYLE_H		#ifndef MHOMEBUTTONPANELSTYLE_H
	#define MHOMEBUTTONPANELSTYLE_H		#define MHOMEBUTTONPANELSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MHomeButtonPanelStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MHomeButtonPanelStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MHomeButtonPanelStyle)		M_STYLE_INTERNAL(MHomeButtonPanelStyle)
	M_STYLE_ATTRIBUTE(QString, homeButtonObjectName, HomeButtonObjectName)		M_STYLE_ATTRIBUTE(QString, homeButtonObjectName, HomeButtonObjectName)
	M_STYLE_ATTRIBUTE(QString, homeButtonIconId, HomeButtonIconId)		M_STYLE_ATTRIBUTE(QString, homeButtonIconId, HomeButtonIconId)
	};		};
	class M_EXPORT MHomeButtonPanelStyleContainer : public MSceneWindowStyleCon tainer		class M_VIEWS_EXPORT MHomeButtonPanelStyleContainer : public MSceneWindowSt yleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MHomeButtonPanelStyle)		M_STYLE_CONTAINER_INTERNAL(MHomeButtonPanelStyle)
	M_STYLE_MODE(Fullscreen)		M_STYLE_MODE(Fullscreen)
	};		};
	#endif // MHOMEBUTTONPANELSTYLE_H		#endif // MHOMEBUTTONPANELSTYLE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mhomebuttonpanelview.h		mhomebuttonpanelview.h
	skipping to change at line 35		skipping to change at line 35
	class MHomeButtonPanel;		class MHomeButtonPanel;
	class MHomeButtonPanelViewPrivate;		class MHomeButtonPanelViewPrivate;
	/*!		/*!
	* \class MHomeButtonPanelView		* \class MHomeButtonPanelView
	* \brief The MHomeButtonPanelView class just draws a home button.		* \brief The MHomeButtonPanelView class just draws a home button.
	*		*
	* It just draws a home button on an otherwise empty scene window.		* It just draws a home button on an otherwise empty scene window.
	*/		*/
	class M_EXPORT MHomeButtonPanelView : public MSceneWindowView		class M_VIEWS_EXPORT MHomeButtonPanelView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MSceneWindowModel, MHomeButtonPanelStyle)		M_VIEW(MSceneWindowModel, MHomeButtonPanelStyle)
	public:		public:
	MHomeButtonPanelView(MHomeButtonPanel *controller);		MHomeButtonPanelView(MHomeButtonPanel *controller);
	virtual ~MHomeButtonPanelView();		virtual ~MHomeButtonPanelView();
	protected:		protected:
	MHomeButtonPanelViewPrivate *const d_ptr;		MHomeButtonPanelViewPrivate *const d_ptr;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mimagewidget.h		mimagewidget.h
	skipping to change at line 88		skipping to change at line 88
	\code		\code
	QImage img(path);		QImage img(path);
	MImageWidget* image = new MImageWidget(&img);		MImageWidget* image = new MImageWidget(&img);
	image->setAspectRatioMode(Qt::IgnoreAspectRatio);		image->setAspectRatioMode(Qt::IgnoreAspectRatio);
	\endcode		\endcode
	\sa MImageWidgetModel MImageWidgetStyle		\sa MImageWidgetModel MImageWidgetStyle
	*/		*/
	class M_EXPORT MImageWidget : public MWidgetController		class M_CORE_EXPORT MImageWidget : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MImageWidget)		M_CONTROLLER(MImageWidget)
	/**		/**
	\property MImageWidget::crop		\property MImageWidget::crop
	\brief See MImageWidgetModel::crop		\brief See MImageWidgetModel::crop
	*/		*/
	Q_PROPERTY(QRectF crop READ crop WRITE setCrop)		Q_PROPERTY(QRectF crop READ crop WRITE setCrop)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mimagewidgetmodel.h		mimagewidgetmodel.h
	skipping to change at line 33		skipping to change at line 33
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	/*!		/*!
	\class MImageWidgetModel		\class MImageWidgetModel
	\brief Data model class for MImageWidget.		\brief Data model class for MImageWidget.
	\ingroup models		\ingroup models
	\sa MImageWidget		\sa MImageWidget
	*/		*/
	class M_EXPORT MImageWidgetModel : public MWidgetModel		class M_CORE_EXPORT MImageWidgetModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MImageWidgetModel)		M_MODEL_INTERNAL(MImageWidgetModel)
	/*!		/*!
	\property MImageWidgetModel::zoomFactorX		\property MImageWidgetModel::zoomFactorX
	\brief image zoom factor in width		\brief image zoom factor in width
	*/		*/
	M_MODEL_PROPERTY(qreal, zoomFactorX, ZoomFactorX, true, 0.0)		M_MODEL_PROPERTY(qreal, zoomFactorX, ZoomFactorX, true, 0.0)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mimagewidgetstyle.h		mimagewidgetstyle.h
	skipping to change at line 45		skipping to change at line 45
	border-right: 0;		border-right: 0;
	border-color: #FFFFFF;		border-color: #FFFFFF;
	border-opacity: 1.0;		border-opacity: 1.0;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MImageWidgetStyleContainer MWidgetStyle \ref styling MImageWidget M ImageWidgetView		\sa MImageWidgetStyleContainer MWidgetStyle \ref styling MImageWidget M ImageWidgetView
	*/		*/
	class M_EXPORT MImageWidgetStyle : public MWidgetStyle		class M_VIEWS_EXPORT MImageWidgetStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MImageWidgetStyle)		M_STYLE(MImageWidgetStyle)
	/*!		/*!
	\property MImageWidgetStyle::borderTop		\property MImageWidgetStyle::borderTop
	\brief top border of MImageWidget.		\brief top border of MImageWidget.
	*/		*/
	M_STYLE_ATTRIBUTE(int, borderTop, BorderTop)		M_STYLE_ATTRIBUTE(int, borderTop, BorderTop)
	skipping to change at line 94		skipping to change at line 94
	M_STYLE_ATTRIBUTE(qreal, borderOpacity, BorderOpacity)		M_STYLE_ATTRIBUTE(qreal, borderOpacity, BorderOpacity)
	};		};
	/*!		/*!
	\class MImageWidgetStyleContainer		\class MImageWidgetStyleContainer
	\brief Style mode container class for MImageWidgetStyle.		\brief Style mode container class for MImageWidgetStyle.
	\ingroup styles		\ingroup styles
	\sa MImageWidgetStyle		\sa MImageWidgetStyle
	*/		*/
	class M_EXPORT MImageWidgetStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MImageWidgetStyleContainer : public MWidgetStyleContai ner
	{		{
	M_STYLE_CONTAINER(MImageWidgetStyle)		M_STYLE_CONTAINER(MImageWidgetStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mimagewidgetview.h		mimagewidgetview.h
	skipping to change at line 50		skipping to change at line 50
	MImageWidgetView draws a fixed width and color border surround the image.		MImageWidgetView draws a fixed width and color border surround the image.
	When image is cropped, the cropped edge will have no border.		When image is cropped, the cropped edge will have no border.
	The border of image can be changed using the styling attributes def ined		The border of image can be changed using the styling attributes def ined
	in MImageWidgetStyle. MImageWidgetStyle::borderTop, MImageWidgetSty le::borderLeft,		in MImageWidgetStyle. MImageWidgetStyle::borderTop, MImageWidgetSty le::borderLeft,
	MImageWidgetStyle::borderRight, MImageWidgetStyle::borderBottom,		MImageWidgetStyle::borderRight, MImageWidgetStyle::borderBottom,
	MImageWidgetStyle::borderColor and MImageWidgetStyle::borderOpacity		MImageWidgetStyle::borderColor and MImageWidgetStyle::borderOpacity
	*/		*/
	class M_EXPORT MImageWidgetView : public MWidgetView		class M_VIEWS_EXPORT MImageWidgetView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MImageWidgetModel, MImageWidgetStyle)		M_VIEW(MImageWidgetModel, MImageWidgetStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	\param controller Pointer to the MImageWidget		\param controller Pointer to the MImageWidget
	*/		*/
	MImageWidgetView(MImageWidget *controller);		MImageWidgetView(MImageWidget *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	minfobanner.h		minfobanner.h
	skipping to change at line 87		skipping to change at line 87
	connect(infoBanner, SIGNAL(buttonClicked()), this, SLOT(openMes sageBox()));		connect(infoBanner, SIGNAL(buttonClicked()), this, SLOT(openMes sageBox()));
	infoBanner->appear(MSceneWindow::DestroyWhenDone);		infoBanner->appear(MSceneWindow::DestroyWhenDone);
	QTimer::singleShot(3000, infoBanner, SLOT(disappear()));		QTimer::singleShot(3000, infoBanner, SLOT(disappear()));
	\endcode		\endcode
	\sa MNotification		\sa MNotification
	\deprecated MInfoBanner is deprecated, use MBanner for any component wi th banner requirements		\deprecated MInfoBanner is deprecated, use MBanner for any component wi th banner requirements
	*/		*/
	class M_EXPORT MInfoBanner : public MSceneWindow		class M_CORE_EXPORT MInfoBanner : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MInfoBanner)		M_CONTROLLER(MInfoBanner)
	public:		public:
	/*!		/*!
	\property MInfoBanner::iconID		\property MInfoBanner::iconID
	\brief Icon for banner.		\brief Icon for banner.
	*/		*/
	Q_PROPERTY(QString iconID READ iconID WRITE setIconID)		Q_PROPERTY(QString iconID READ iconID WRITE setIconID)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	minfobannereventview.h		minfobannereventview.h
	skipping to change at line 83		skipping to change at line 83
	<TR><TD>Single tap on the notification</TD>		<TR><TD>Single tap on the notification</TD>
	<TD>Open item in new task</TD>		<TD>Open item in new task</TD>
	<TD>Transition showing a new task opening</TD>		<TD>Transition showing a new task opening</TD>
	<TD>Press, release</TD>		<TD>Press, release</TD>
	<TD>Press, release</TD></TR>		<TD>Press, release</TD></TR>
	</TABLE>		</TABLE>
	\sa MNotification		\sa MNotification
	*/		*/
	class M_EXPORT MInfoBannerEventView : public MSceneWindowView		class M_VIEWS_EXPORT MInfoBannerEventView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MInfoBannerModel, MInfoBannerStyle)		M_VIEW(MInfoBannerModel, MInfoBannerStyle)
	protected:		protected:
	MInfoBannerEventViewPrivate *const d_ptr;		MInfoBannerEventViewPrivate *const d_ptr;
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	minfobannerinformationview.h		minfobannerinformationview.h
	skipping to change at line 115		skipping to change at line 115
	<TD>Press, release</TD></TR>		<TD>Press, release</TD></TR>
	<TR><TD>Click on the interactive status banner (outside the button) </TD>		<TR><TD>Click on the interactive status banner (outside the button) </TD>
	<TD>Disappear from the screen</TD>		<TD>Disappear from the screen</TD>
	<TD>Fading to the background</TD>		<TD>Fading to the background</TD>
	<TD>No feedback</TD>		<TD>No feedback</TD>
	<TD>No feedback</TD></TR>		<TD>No feedback</TD></TR>
	</TABLE>		</TABLE>
	\sa MNotification		\sa MNotification
	*/		*/
	class M_EXPORT MInfoBannerInformationView : public MSceneWindowView		class M_VIEWS_EXPORT MInfoBannerInformationView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MInfoBannerModel, MInfoBannerStyle)		M_VIEW(MInfoBannerModel, MInfoBannerStyle)
	protected:		protected:
	MInfoBannerInformationViewPrivate *const d_ptr;		MInfoBannerInformationViewPrivate *const d_ptr;
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	minfobannermodel.h		minfobannermodel.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 MINFOBANNERMODEL_H		#ifndef MINFOBANNERMODEL_H
	#define MINFOBANNERMODEL_H		#define MINFOBANNERMODEL_H
	#include "mscenewindowmodel.h"		#include "mscenewindowmodel.h"
	class M_EXPORT MInfoBannerModel : public MSceneWindowModel		class M_CORE_EXPORT MInfoBannerModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MInfoBannerModel)		M_MODEL_INTERNAL(MInfoBannerModel)
	private:		private:
	/*!		/*!
	\property Icon in banner.		\property Icon in banner.
	*/		*/
	M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())		M_MODEL_PROPERTY(QString, iconID, IconID, true, QString())
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	minfobannerstyle.h		minfobannerstyle.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 MINFOBANNERSTYLE_H		#ifndef MINFOBANNERSTYLE_H
	#define MINFOBANNERSTYLE_H		#define MINFOBANNERSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MInfoBannerStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MInfoBannerStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MInfoBannerStyle)		M_STYLE_INTERNAL(MInfoBannerStyle)
	M_STYLE_ATTRIBUTE(QSize, imageSize, Ima geSize)		M_STYLE_ATTRIBUTE(QSize, imageSize, Ima geSize)
	M_STYLE_ATTRIBUTE(QSize, iconSize, Ico nSize)		M_STYLE_ATTRIBUTE(QSize, iconSize, Ico nSize)
	};		};
	class M_EXPORT MInfoBannerStyleContainer : public MSceneWindowStyleContaine r		class M_VIEWS_EXPORT MInfoBannerStyleContainer : public MSceneWindowStyleCo ntainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MInfoBannerStyle)		M_STYLE_CONTAINER_INTERNAL(MInfoBannerStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	minputmethodstate.h		minputmethodstate.h
	skipping to change at line 43		skipping to change at line 43
	/*!		/*!
	* \brief A mediator between MInputContext and applications/libmeegotouch t hat use it		* \brief A mediator between MInputContext and applications/libmeegotouch t hat use it
	*		*
	* This class allows MInputContext (technically other input contexts too) t o		* This class allows MInputContext (technically other input contexts too) t o
	* communicate input method area on display to the application and applicat ion		* communicate input method area on display to the application and applicat ion
	* to communicate its active window's orientation and custom toolbar to the input context.		* to communicate its active window's orientation and custom toolbar to the input context.
	* The application can be a M application or a plain Qt application (which needs		* The application can be a M application or a plain Qt application (which needs
	* to link against libmeegotouch to get access to this class). The input m ethod area		* to link against libmeegotouch to get access to this class). The input m ethod area
	* can be used by the application to avoid obstructing the input method.		* can be used by the application to avoid obstructing the input method.
	*/		*/
	class M_EXPORT MInputMethodState : public QObject		class M_CORE_EXPORT MInputMethodState : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	//! \brief Get singleton instance		//! \brief Get singleton instance
	//! \return singleton instance		//! \return singleton instance
	static MInputMethodState *instance();		static MInputMethodState *instance();
	//! \brief Get current input method area		//! \brief Get current input method area
	//! \return current input method area		//! \return current input method area
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mkeyboardstatetracker.h		mkeyboardstatetracker.h
	skipping to change at line 34		skipping to change at line 34
	#include <QObject>		#include <QObject>
	class MKeyboardStateTrackerPrivate;		class MKeyboardStateTrackerPrivate;
	/*!		/*!
	* Class responsible for tracking the hardware keyboard properties and sign aling events.		* Class responsible for tracking the hardware keyboard properties and sign aling events.
	* It is designed as singleton. Using isPresent() can query whether the dev ice supports		* It is designed as singleton. Using isPresent() can query whether the dev ice supports
	* hardware keyboard or not. If hardware keyboard is supported, using isOpe n() to query		* hardware keyboard or not. If hardware keyboard is supported, using isOpe n() to query
	* its current state. Signal stateChanged will be emitted when hardware key board state is changed.		* its current state. Signal stateChanged will be emitted when hardware key board state is changed.
	*/		*/
	class M_EXPORT MKeyboardStateTracker : public QObject		class M_CORE_EXPORT MKeyboardStateTracker : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* \brief Returns singleton MKeyboardStateTracker object.		* \brief Returns singleton MKeyboardStateTracker object.
	*/		*/
	static MKeyboardStateTracker *instance();		static MKeyboardStateTracker *instance();
	/*!		/*!
	* \brief Returns true if the device has a hardware keyboard.		* \brief Returns true if the device has a hardware keyboard.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlabel.h		mlabel.h
	skipping to change at line 122		skipping to change at line 122
	\code		\code
	//create label with a link		//create label with a link
	QString text = "Rich label can contain <a href=\"http://www.nok ia.com\"> links </a>.";		QString text = "Rich label can contain <a href=\"http://www.nok ia.com\"> links </a>.";
	MLabel* label = new MLabel(styledText);		MLabel* label = new MLabel(styledText);
	//connect to signal to receive notification when user clicks a link in label		//connect to signal to receive notification when user clicks a link in label
	connect(label, SIGNAL(linkActivated(QString)), this, SLOT(linkA ctivated(QString)));		connect(label, SIGNAL(linkActivated(QString)), this, SLOT(linkA ctivated(QString)));
	\endcode		\endcode
	\sa MLabelModel MLabelStyle <a href="http://doc.trolltech.com/richtext- html-subset.html"> Supported HTML Subset</a>		\sa MLabelModel MLabelStyle <a href="http://doc.trolltech.com/richtext- html-subset.html"> Supported HTML Subset</a>
	*/		*/
	class M_EXPORT MLabel : public MWidgetController		class M_CORE_EXPORT MLabel : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MLabel)		M_CONTROLLER(MLabel)
	/*!		/*!
	\property MLabel::alignment		\property MLabel::alignment
	\brief Alignmentation of the label.		\brief Alignmentation of the label.
	See MLabelModel::alignment for details.		See MLabelModel::alignment for details.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlabelhighlighter.h		mlabelhighlighter.h
	skipping to change at line 40		skipping to change at line 40
	Class is used to highlight text fragments from MLabel with the color sp ecified in MLabel style.		Class is used to highlight text fragments from MLabel with the color sp ecified in MLabel style.
	Class will also receive user interaction events when clicking and long pressing a highlighted		Class will also receive user interaction events when clicking and long pressing a highlighted
	piece of text.		piece of text.
	\ingroup widgets		\ingroup widgets
	\sa MLabelStyle::highlightColor		\sa MLabelStyle::highlightColor
	\sa MLabelStyle::activeHighlightColor		\sa MLabelStyle::activeHighlightColor
	*/		*/
	class M_EXPORT MLabelHighlighter		class M_CORE_EXPORT MLabelHighlighter
	{		{
	public:		public:
	/*!		/*!
	\brief Destructs MLabelHighlighter.		\brief Destructs MLabelHighlighter.
	*/		*/
	virtual ~MLabelHighlighter();		virtual ~MLabelHighlighter();
	/*!		/*!
	\brief Returns regular expression for highlighting text fragments.		\brief Returns regular expression for highlighting text fragments.
	skipping to change at line 84		skipping to change at line 84
	/*!		/*!
	\class MCommonLabelHighlighter		\class MCommonLabelHighlighter
	\brief Common highlighter class for easily highlighting items from MLab el without inheriting own classes.		\brief Common highlighter class for easily highlighting items from MLab el without inheriting own classes.
	Inherits MLabelHighlighter and emits signals for the click and longPres s interactions.		Inherits MLabelHighlighter and emits signals for the click and longPres s interactions.
	\ingroup widgets		\ingroup widgets
	*/		*/
	class MCommonLabelHighlighterPrivate;		class MCommonLabelHighlighterPrivate;
	class M_EXPORT MCommonLabelHighlighter : public QObject, public MLabelHighl ighter		class M_CORE_EXPORT MCommonLabelHighlighter : public QObject, public MLabel Highlighter
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	\brief Constructs common highlighter class.		\brief Constructs common highlighter class.
	*/		*/
	MCommonLabelHighlighter(const QRegExp &regExp);		MCommonLabelHighlighter(const QRegExp &regExp);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mlabelmodel.h		mlabelmodel.h
	skipping to change at line 38		skipping to change at line 38
	class MLabelHighlighter;		class MLabelHighlighter;
	Q_DECLARE_METATYPE(QTextOption::WrapMode)		Q_DECLARE_METATYPE(QTextOption::WrapMode)
	/*!		/*!
	\class MLabelModel		\class MLabelModel
	\brief Model class for MLabel.		\brief Model class for MLabel.
	\ingroup models		\ingroup models
	\sa MLabel		\sa MLabel
	*/		*/
	class M_EXPORT MLabelModel : public MWidgetModel		class M_CORE_EXPORT MLabelModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MLabelModel)		M_MODEL_INTERNAL(MLabelModel)
	/*!		/*!
	\property MLabelModel::text		\property MLabelModel::text
	\brief The text of the label.		\brief The text of the label.
	*/		*/
	M_MODEL_PROPERTY(QString, text, Text, true, QString())		M_MODEL_PROPERTY(QString, text, Text, true, QString())
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlabelstyle.h		mlabelstyle.h
	skipping to change at line 41		skipping to change at line 41
	\code		\code
	MLabelStyle {		MLabelStyle {
	color: blue;		color: blue;
	font: arial 12;		font: arial 12;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MLabelStyleContainer MWidgetStyle \ref styling MLabel		\sa MLabelStyleContainer MWidgetStyle \ref styling MLabel
	*/		*/
	class M_EXPORT MLabelStyle : public MWidgetStyle		class M_VIEWS_EXPORT MLabelStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MLabelStyle)		M_STYLE(MLabelStyle)
	/*!		/*!
	\property MLabelStyle::color		\property MLabelStyle::color
	\brief Label font color.		\brief Label font color.
	See QColor::setNamedColor for possbile values.		See QColor::setNamedColor for possbile values.
	*/		*/
	skipping to change at line 84		skipping to change at line 84
	M_STYLE_ATTRIBUTE(QColor, activeHighlightColor, ActiveHighlightColor)		M_STYLE_ATTRIBUTE(QColor, activeHighlightColor, ActiveHighlightColor)
	};		};
	/*!		/*!
	\class MLabelStyleContainer		\class MLabelStyleContainer
	\brief Style mode container class for MLabelStyle.		\brief Style mode container class for MLabelStyle.
	\ingroup styles		\ingroup styles
	\sa MLabelStyle		\sa MLabelStyle
	*/		*/
	class M_EXPORT MLabelStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MLabelStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MLabelStyle)		M_STYLE_CONTAINER(MLabelStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mlabelview.h		mlabelview.h
	skipping to change at line 73		skipping to change at line 73
	is totally non-interactive.		is totally non-interactive.
	\section MLabelViewOpenIssues Open issues		\section MLabelViewOpenIssues Open issues
	- Rich label should support text selection.		- Rich label should support text selection.
	- Graphics: Appearance of the link, text selection needs to be defi ned. Does the link have icon + styled text, or only styled text?		- Graphics: Appearance of the link, text selection needs to be defi ned. Does the link have icon + styled text, or only styled text?
	- Guidelines for truncating phone number, localized strings, rich l abel beginning truncation maybe needed later.		- Guidelines for truncating phone number, localized strings, rich l abel beginning truncation maybe needed later.
	\sa MLabelStyle MWidgetView		\sa MLabelStyle MWidgetView
	*/		*/
	class M_EXPORT MLabelView : public MWidgetView		class M_VIEWS_EXPORT MLabelView : public MWidgetView
	{		{
	//FIXME		//FIXME
	//Temporary remove this when proper longPressEvents are coming to view.		//Temporary remove this when proper longPressEvents are coming to view.
	friend class MLabel;		friend class MLabel;
	Q_OBJECT		Q_OBJECT
	M_VIEW(MLabelModel, MLabelStyle)		M_VIEW(MLabelModel, MLabelStyle)
	public:		public:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlayout.h		mlayout.h
	skipping to change at line 148		skipping to change at line 148
	* \link QGraphicsLayoutItem::sizePolicy() sizePolicy \endlink would be \li nk QSizePolicy QSizePolicy::Expanding \endlink		* \link QGraphicsLayoutItem::sizePolicy() sizePolicy \endlink would be \li nk QSizePolicy QSizePolicy::Expanding \endlink
	* in both directions.		* in both directions.
	*		*
	* \sa \ref laying_out_item_in_custom_policy		* \sa \ref laying_out_item_in_custom_policy
	*		*
	* \section examples Examples		* \section examples Examples
	* There are many \ref layouts-example "provided examples" of using layouts to help you use layouts easily and effectively.		* There are many \ref layouts-example "provided examples" of using layouts to help you use layouts easily and effectively.
	*		*
	* \sa \ref layouts, \ref layout-inside-layout, \ref example-calculator		* \sa \ref layouts, \ref layout-inside-layout, \ref example-calculator
	*/		*/
	class M_EXPORT MLayout : public QGraphicsLayout		class M_CORE_EXPORT MLayout : public QGraphicsLayout
	{		{
	public:		public:
	/*!		/*!
	* \brief Constructs the layout.		* \brief Constructs the layout.
	*/		*/
	explicit MLayout(QGraphicsLayoutItem *parent = 0);		explicit MLayout(QGraphicsLayoutItem *parent = 0);
	/*!		/*!
	* \brief Destructs the layout.		* \brief Destructs the layout.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlayoutanimation.h		mlayoutanimation.h
	skipping to change at line 37		skipping to change at line 37
	/*!		/*!
	* \class MLayoutAnimation		* \class MLayoutAnimation
	* \brief Animation interface for animating adding and removing of items an d animating		* \brief Animation interface for animating adding and removing of items an d animating
	* switching between policies in a MLayout.		* switching between policies in a MLayout.
	*		*
	* Note that the item to animate will only be inherited from QGraphicsWidge t. Non-widgets are not animated.		* Note that the item to animate will only be inherited from QGraphicsWidge t. Non-widgets are not animated.
	*		*
	* \section custom_animation How to write a custom animation		* \section custom_animation How to write a custom animation
	*/		*/
	class M_EXPORT MLayoutAnimation : public MAnimation		class M_CORE_EXPORT MLayoutAnimation : public MAnimation
	{		{
	public:		public:
	/*!		/*!
	* \brief Construct the layout animator.		* \brief Construct the layout animator.
	*/		*/
	explicit MLayoutAnimation(MLayout *layout);		explicit MLayoutAnimation(MLayout *layout);
	/*!		/*!
	* \brief Destroys the layout animator.		* \brief Destroys the layout animator.
	*/		*/
	virtual ~MLayoutAnimation();		virtual ~MLayoutAnimation();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlayoutanimationstyle.h		mlayoutanimationstyle.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 MLAYOUTANIMATIONSTYLE_H		#ifndef MLAYOUTANIMATIONSTYLE_H
	#define MLAYOUTANIMATIONSTYLE_H		#define MLAYOUTANIMATIONSTYLE_H
	#include <manimationstyle.h>		#include <manimationstyle.h>
	class M_EXPORT MLayoutAnimationStyle : public MAnimationStyle		class M_CORE_EXPORT MLayoutAnimationStyle : public MAnimationStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MLayoutAnimationStyle)		M_STYLE_INTERNAL(MLayoutAnimationStyle)
	};		};
	// TODO: get rid of this container		// TODO: get rid of this container
	class M_EXPORT MLayoutAnimationStyleContainer : public MAnimationStyleConta iner		class M_CORE_EXPORT MLayoutAnimationStyleContainer : public MAnimationStyle Container
	{		{
	M_STYLE_CONTAINER_INTERNAL(MLayoutAnimationStyle)		M_STYLE_CONTAINER_INTERNAL(MLayoutAnimationStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mlibrary.h		mlibrary.h
	skipping to change at line 52		skipping to change at line 52
	\brief This class provides the library information to MTheme which uses it to load the correct css files.		\brief This class provides the library information to MTheme which uses it to load the correct css files.
	This class should not be used manually, but with M_LIBRARY macro. The m acro will use		This class should not be used manually, but with M_LIBRARY macro. The m acro will use
	M_LIBRARY_NAME as the name of the library. M_LIBRARY_NAME is automatica lly defined by m.prf when .pro file		M_LIBRARY_NAME as the name of the library. M_LIBRARY_NAME is automatica lly defined by m.prf when .pro file
	has CONFIG += m.		has CONFIG += m.
	You must use M_LIBRARY macro in one of your library source files to ins tantiate the static		You must use M_LIBRARY macro in one of your library source files to ins tantiate the static
	MLibrary object. This object will be instantiated while the library get s loaded, and destroyed when		MLibrary object. This object will be instantiated while the library get s loaded, and destroyed when
	the library gets unloaded.		the library gets unloaded.
	*/		*/
	class M_EXPORT MLibrary : public MAssembly		class M_CORE_EXPORT MLibrary : public MAssembly
	{		{
	public:		public:
	/*!		/*!
	\brief Constructs the MLibrary object and registers it to MTheme.		\brief Constructs the MLibrary object and registers it to MTheme.
	*/		*/
	MLibrary(const QString &libraryName);		MLibrary(const QString &libraryName);
	/*!		/*!
	\brief Destructs the MLibrary object and unregisters it from MTheme.		\brief Destructs the MLibrary object and unregisters it from MTheme.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlinearlayoutpolicy.h		mlinearlayoutpolicy.h
	skipping to change at line 58		skipping to change at line 58
	* \section using_qt_instead Using QGraphicsLinearLayout instead		* \section using_qt_instead Using QGraphicsLinearLayout instead
	*		*
	* If you do not need animations or multiple policies, you can use QGraphic sLinearLayout for same effect in less code.		* If you do not need animations or multiple policies, you can use QGraphic sLinearLayout for same effect in less code.
	* For example:		* For example:
	*		*
	* \dontinclude qgraphicslinearlayout/qgraphicslinearlayout.cpp		* \dontinclude qgraphicslinearlayout/qgraphicslinearlayout.cpp
	* \skip Create a linear layout		* \skip Create a linear layout
	* \until }		* \until }
	* \sa \ref layout-qgraphicslinearlayout, \ref layout-qgraphicslayout		* \sa \ref layout-qgraphicslinearlayout, \ref layout-qgraphicslayout
	*/		*/
	class M_EXPORT MLinearLayoutPolicy : public MAbstractLayoutPolicy		class M_CORE_EXPORT MLinearLayoutPolicy : public MAbstractLayoutPolicy
	{		{
	public:		public:
	/*!		/*!
	* \brief Constructs a linear layout policy.		* \brief Constructs a linear layout policy.
	*		*
	* The initial @p orientation is required by the constructor, but can b e changed at any time		* The initial @p orientation is required by the constructor, but can b e changed at any time
	* with setOrientation().		* with setOrientation().
	*		*
	* @param layout The layout to associate with.		* @param layout The layout to associate with.
	* @param orientation The orientation to use for this layout.		* @param orientation The orientation to use for this layout.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlist.h		mlist.h
	skipping to change at line 126		skipping to change at line 126
	MList * list = new MList(panel);		MList * list = new MList(panel);
	MContentItemCreator * cellCreator = new MContentItemCreator;		MContentItemCreator * cellCreator = new MContentItemCreator;
	list->setCellCreator(cellCreator);		list->setCellCreator(cellCreator);
	TestModel * model = new TestModel;		TestModel * model = new TestModel;
	list->setItemModel(model);		list->setItemModel(model);
	\endcode		\endcode
	See also MListView, MWidgetFactory.		See also MListView, MWidgetFactory.
	*/		*/
	class M_EXPORT MList : public MWidgetController		class M_CORE_EXPORT MList : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MList)		M_CONTROLLER(MList)
	/*!		/*!
	\property MList::showGroups set to true to make group headers visib le		\property MList::showGroups set to true to make group headers visib le
	*/		*/
	Q_PROPERTY(bool showGroups READ showGroups WRITE setShowGroups)		Q_PROPERTY(bool showGroups READ showGroups WRITE setShowGroups)
	/*!		/*!
	skipping to change at line 208		skipping to change at line 208
	and disappears when panning is stopped.		and disappears when panning is stopped.
	*/		*/
	Auto,		Auto,
	/*!		/*!
	\brief The list index appears on tapping		\brief The list index appears on tapping
	right area of the list.		right area of the list.
	*/		*/
	Floating		Floating
	};		};
			enum ListOptimizationFlag {
			/*!
			MAbstractCellCreator::createCell() will be called only on new ite
			ms. If items receives update
			only MAbstractCellCreate::updateCell() will be called. Enabled by
			default.
			*/
			DontCallCreateCellDuringUpdate = 0x1
			};
			Q_DECLARE_FLAGS(ListOptimizationFlags, ListOptimizationFlag)
	/*!		/*!
	* \brief Constructor for creating an empty object.		* \brief Constructor for creating an empty object.
	* \param parent Parent object.		* \param parent Parent object.
	*/		*/
	MList(QGraphicsItem *parent = 0);		MList(QGraphicsItem *parent = 0);
	/*!		/*!
	* \brief Destructor.		* \brief Destructor.
	*/		*/
	virtual ~MList();		virtual ~MList();
	skipping to change at line 361		skipping to change at line 370
	\return Returns the status of the list index availability.		\return Returns the status of the list index availability.
	\deprecated Please use indexDisplayMode()		\deprecated Please use indexDisplayMode()
	*/		*/
	bool indexVisible();		bool indexVisible();
	/*!		/*!
	\return filter which implements live filtering of list contents.		\return filter which implements live filtering of list contents.
	*/		*/
	MListFilter *filtering() const;		MListFilter *filtering() const;
			/*!
			\return list's optimization flags.
			*/
			ListOptimizationFlags optimizationFlags() const;
			/*!
			\brief Sets one optimization flag to enabled if \a enabled is true, o
			therwise to disabled.
			*/
			void setOptimizationFlag(ListOptimizationFlag optimizationFlag, bool en
			abled = true);
			/*!
			\brief Sets the list optimization flags to \a flags. All flags in \a
			flags are enabled
			and the others are disabled.
			*/
			void setOptimizationFlags(ListOptimizationFlags optimizationFlags);
	public Q_SLOTS:		public Q_SLOTS:
	/*!		/*!
	\brief Convenience function - Select the given item.		\brief Convenience function - Select the given item.
	If index is not valid, the current selection is not changed.		If index is not valid, the current selection is not changed.
	*/		*/
	void selectItem(const QModelIndex &index);		void selectItem(const QModelIndex &index);
	/*!		/*!
	\brief Convenience function - Emits a long tap event for an item.		\brief Convenience function - Emits a long tap event for an item.
	\deprecated Use MList::longTapItem(QModelIndex, QPointF) instead.		\deprecated Use MList::longTapItem(QModelIndex, QPointF) instead.
	skipping to change at line 481		skipping to change at line 506
	Handler of notifications of receivers disconnecting from MList signa ls.		Handler of notifications of receivers disconnecting from MList signa ls.
	*/		*/
	virtual void disconnectNotify(const char *signal);		virtual void disconnectNotify(const char *signal);
	private:		private:
	Q_DECLARE_PRIVATE(MList)		Q_DECLARE_PRIVATE(MList)
	Q_DISABLE_COPY(MList)		Q_DISABLE_COPY(MList)
	friend class MListView;		friend class MListView;
	};		};
			Q_DECLARE_OPERATORS_FOR_FLAGS(MList::ListOptimizationFlags)
	#endif		#endif
End of changes. 4 change blocks.
	1 lines changed or deleted		33 lines changed or added

	mlistfilter.h		mlistfilter.h
	skipping to change at line 61		skipping to change at line 61
	* void MListPage::liveFilteringTextChanged()		* void MListPage::liveFilteringTextChanged()
	* {		* {
	* QRegExp regExp(list->filtering()->proxy()->filterRegExp());		* QRegExp regExp(list->filtering()->proxy()->filterRegExp());
	* regExp.setPattern('^' + list->filtering()->editor()->text());		* regExp.setPattern('^' + list->filtering()->editor()->text());
	* list->filtering()->proxy()->setFilterRegExp(regExp);		* list->filtering()->proxy()->setFilterRegExp(regExp);
	* ...		* ...
	*		*
	* \endcode		* \endcode
	*		*
	*/		*/
	class M_EXPORT MListFilter : public QObject		class M_CORE_EXPORT MListFilter : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	This enumerated type is used by MListFilter to indicate how it filter s items.		This enumerated type is used by MListFilter to indicate how it filter s items.
	*/		*/
	enum FilterMode {		enum FilterMode {
	/*!		/*!
	Items are filtered to match text edit content as a substring		Items are filtered to match text edit content as a substring
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlistitem.h		mlistitem.h
	skipping to change at line 39		skipping to change at line 39
	/*!		/*!
	\class MListItem		\class MListItem
	\brief MListItem is a simple widget for displaying content with basic f unctionality		\brief MListItem is a simple widget for displaying content with basic f unctionality
	like background rendering with differend object modes.		like background rendering with differend object modes.
	\ingroup widgets		\ingroup widgets
	\sa MListItemView		\sa MListItemView
	*/		*/
	class M_EXPORT MListItem : public MWidgetController		class M_CORE_EXPORT MListItem : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MListItem)		M_CONTROLLER(MListItem)
	public:		public:
	/*!		/*!
	\brief Constructs a MListItem with a \a parent.		\brief Constructs a MListItem with a \a parent.
	\param parent Parent object.		\param parent Parent object.
	*/		*/
	MListItem(QGraphicsItem *parent = 0);		MListItem(QGraphicsItem *parent = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlistitemmodel.h		mlistitemmodel.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 MLISTITEMMODEL_H		#ifndef MLISTITEMMODEL_H
	#define MLISTITEMMODEL_H		#define MLISTITEMMODEL_H
	#include <MWidgetModel>		#include <MWidgetModel>
	class M_EXPORT MListItemModel : public MWidgetModel		class M_CORE_EXPORT MListItemModel : public MWidgetModel
	{		{
	M_MODEL(MListItemModel)		M_MODEL(MListItemModel)
	};		};
	#endif // MLISTITEMMODEL_H		#endif // MLISTITEMMODEL_H
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlistitemstyle.h		mlistitemstyle.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 MLISTITEMSTYLE_H		#ifndef MLISTITEMSTYLE_H
	#define MLISTITEMSTYLE_H		#define MLISTITEMSTYLE_H
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	class M_EXPORT MListItemStyle : public MWidgetStyle		class M_VIEWS_EXPORT MListItemStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MListItemStyle)		M_STYLE(MListItemStyle)
	M_STYLE_ATTRIBUTE(QString, downStateEffect, DownStateEffect)		M_STYLE_ATTRIBUTE(QString, downStateEffect, DownStateEffect)
	};		};
	class M_EXPORT MListItemStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MListItemStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MListItemStyle)		M_STYLE_CONTAINER(MListItemStyle)
	};		};
	#endif // MLISTITEMSTYLE_H		#endif // MLISTITEMSTYLE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mlistitemview.h		mlistitemview.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MLISTITEMVIEW_H		#ifndef MLISTITEMVIEW_H
	#define MLISTITEMVIEW_H		#define MLISTITEMVIEW_H
	#include <MWidgetView>		#include <MWidgetView>
	#include <mlistitemmodel.h>		#include <mlistitemmodel.h>
	#include <mlistitemstyle.h>		#include <mlistitemstyle.h>
	class MListItemViewPrivate;		class MListItemViewPrivate;
	class M_EXPORT MListItemView : public MWidgetView		class M_VIEWS_EXPORT MListItemView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MListItemModel, MListItemStyle)		M_VIEW(MListItemModel, MListItemStyle)
	public:		public:
	MListItemView(MWidgetController *controller);		MListItemView(MWidgetController *controller);
	protected:		protected:
	/*! \reimp */		/*! \reimp */
	void mouseMoveEvent(QGraphicsSceneMouseEvent *event);		void mouseMoveEvent(QGraphicsSceneMouseEvent *event);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlistmodel.h		mlistmodel.h
	skipping to change at line 39		skipping to change at line 39
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	#include "mabstractcellcreator.h"		#include "mabstractcellcreator.h"
	/*!		/*!
	\class MListModel		\class MListModel
	\brief Data model class for MList.		\brief Data model class for MList.
	\ingroup models		\ingroup models
	\sa MList		\sa MList
	*/		*/
	class M_EXPORT MListModel : public MWidgetModel		class M_CORE_EXPORT MListModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MListModel)		M_MODEL_INTERNAL(MListModel)
	private:		private:
	/*!		/*!
	\property MListModel::itemModel		\property MListModel::itemModel
	\brief Pointer to an item model.		\brief Pointer to an item model.
	*/		*/
	M_MODEL_PTR_PROPERTY(QAbstractItemModel *, itemModel, ItemModel, true, 0)		M_MODEL_PTR_PROPERTY(QAbstractItemModel *, itemModel, ItemModel, true, 0)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mliststyle.h		mliststyle.h
	skipping to change at line 45		skipping to change at line 45
	#myOwnGroupHeaderStyle		#myOwnGroupHeaderStyle
	{		{
	color : #ff0000;		color : #ff0000;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MLabelStyleContainer MWidgetStyle MLabelStyle \ref styling MList		\sa MLabelStyleContainer MWidgetStyle MLabelStyle \ref styling MList
	*/		*/
	class M_EXPORT MListStyle : public MWidgetStyle		class M_VIEWS_EXPORT MListStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MListStyle)		M_STYLE(MListStyle)
	/*!		/*!
	\property MListStyle::groupHeaderObjectName		\property MListStyle::groupHeaderObjectName
	\brief Sets object name for a group header widget		\brief Sets object name for a group header widget
	Sets object name for a group header widget. Group header supports a ll styles		Sets object name for a group header widget. Group header supports a ll styles
	which MLabel supports.		which MLabel supports.
	skipping to change at line 86		skipping to change at line 86
	/*!		/*!
	\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)
	};		};
	class M_EXPORT MListStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MListStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MListStyle)		M_STYLE_CONTAINER(MListStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mlistview.h		mlistview.h
	skipping to change at line 37		skipping to change at line 37
	class MController;		class MController;
	class MPannableViewport;		class MPannableViewport;
	class MList;		class MList;
	class MListModel;		class MListModel;
	class MListViewPrivate;		class MListViewPrivate;
	class MPlainMultiColumnListViewPrivate;		class MPlainMultiColumnListViewPrivate;
	class MGroupHeaderListViewPrivate;		class MGroupHeaderListViewPrivate;
	class MMultiColumnListViewPrivate;		class MMultiColumnListViewPrivate;
	class M_EXPORT MListView : public MWidgetView		class M_VIEWS_EXPORT MListView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MListModel, MListStyle)		M_VIEW(MListModel, MListStyle)
	public:		public:
	MListView(MWidgetController *controller);		MListView(MWidgetController *controller);
	virtual ~MListView();		virtual ~MListView();
	/*! \reimp */		/*! \reimp */
	virtual void setGeometry(const QRectF &rect);		virtual void setGeometry(const QRectF &rect);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlocale.h		mlocale.h
	skipping to change at line 91		skipping to change at line 91
	* is not generated from code, but rather generated by some other		* is not generated from code, but rather generated by some other
	* means (e.g from the UI specification).		* means (e.g from the UI specification).
	*		*
	* If one wants to react when the locale settings are changed, one can		* If one wants to react when the locale settings are changed, one can
	* connect to the settingsChanged() signal by using the		* connect to the settingsChanged() signal by using the
	* connectSettings() method.		* connectSettings() method.
	*		*
	* \note The methods are not thread-safe. For number/string formatting etc. the class is re-entrant. If one needs to have formatting in multiple threa ds it is suggested to create separate locales.		* \note The methods are not thread-safe. For number/string formatting etc. the class is re-entrant. If one needs to have formatting in multiple threa ds it is suggested to create separate locales.
	*/		*/
	class M_EXPORT MLocale : public QObject		class M_CORE_EXPORT MLocale : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* \brief enum for Date formatting.		* \brief enum for Date formatting.
	*		*
	* This correlates closely with the <a		* This correlates closely with the <a
	* href="http://userguide.icu-project.org/formatparse/datetime#TOC-Prod ucing-Normal-Date-Formats-for-a">		* href="http://userguide.icu-project.org/formatparse/datetime#TOC-Prod ucing-Normal-Date-Formats-for-a">
	* date type in ICU</a> and Unicode CLDR		* date type in ICU</a> and Unicode CLDR
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mlocationdatabase.h		mlocationdatabase.h
	skipping to change at line 32		skipping to change at line 32
	#include "mexport.h"		#include "mexport.h"
	#include <QList>		#include <QList>
	#include "mcity.h"		#include "mcity.h"
	#include "mcountry.h"		#include "mcountry.h"
	class MLocationDatabasePrivate;		class MLocationDatabasePrivate;
	class M_EXPORT MLocationDatabase		class M_CORE_EXPORT MLocationDatabase
	{		{
	public:		public:
	MLocationDatabase();		MLocationDatabase();
	virtual ~MLocationDatabase();		virtual ~MLocationDatabase();
	/**		/**
	* \brief returns a list with all known countries		* \brief returns a list with all known countries
	*/		*/
	QList<MCountry> countries();		QList<MCountry> countries();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmashupcanvas.h		mmashupcanvas.h
	skipping to change at line 90		skipping to change at line 90
	* Every MMashupCanvas has to be identified by a unique identifier that is passed in through		* Every MMashupCanvas has to be identified by a unique identifier that is passed in through
	* the constructor. The user of this class should ensure that they use uniq ue identifiers for the		* the constructor. The user of this class should ensure that they use uniq ue identifiers for the
	* mashup canvases they construct. If the user of this class fails to provi de unique identifiers,		* mashup canvases they construct. If the user of this class fails to provi de unique identifiers,
	* unpredictable side effects may occur because the implementation ensures that every mashup canvas has a		* unpredictable side effects may occur because the implementation ensures that every mashup canvas has a
	* unique identifier. The unexpected side effects may include, but isn't li mited to:		* unique identifier. The unexpected side effects may include, but isn't li mited to:
	* - mixing of the contents of the canvases		* - mixing of the contents of the canvases
	* - missing applets from the canvases upon restart of the application		* - missing applets from the canvases upon restart of the application
	*		*
	* \see \ref appletdevelopment		* \see \ref appletdevelopment
	*/		*/
	class M_EXPORT MMashupCanvas : public MExtensionArea		class M_EXTENSIONS_EXPORT MMashupCanvas : public MExtensionArea
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MMashupCanvas)		M_CONTROLLER(MMashupCanvas)
	public:		public:
	/*!		/*!
	* Constructor		* Constructor
	* \param identifier A unique identifier of this mashup canvas. The dat a of the instantiated		* \param identifier A unique identifier of this mashup canvas. The dat a of the instantiated
	* applets is stored and restored based on this identifier.		* applets is stored and restored based on this identifier.
	\param parent Optional Object's parent		\param parent Optional Object's parent
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmashupcanvasmodel.h		mmashupcanvasmodel.h
	skipping to change at line 32		skipping to change at line 32
	#include "mextensionareamodel.h"		#include "mextensionareamodel.h"
	#include <QStringList>		#include <QStringList>
	class MWidget;		class MWidget;
	class MDataStore;		class MDataStore;
	/*!		/*!
	* MMashupCanvasModel is the model class for MMashupCanvas.		* MMashupCanvasModel is the model class for MMashupCanvas.
	*/		*/
	class M_EXPORT MMashupCanvasModel : public MExtensionAreaModel		class M_EXTENSIONS_EXPORT MMashupCanvasModel : public MExtensionAreaModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MMashupCanvasModel)		M_MODEL_INTERNAL(MMashupCanvasModel)
	public:		public:
	//! A list of names of the applet categories to show in this mashup can vas		//! A list of names of the applet categories to show in this mashup can vas
	M_MODEL_PROPERTY(QStringList, categories, Categories, true, QStringList ())		M_MODEL_PROPERTY(QStringList, categories, Categories, true, QStringList ())
	};		};
	#endif /* MMASHUPCANVASMODEL_H_ */		#endif /* MMASHUPCANVASMODEL_H_ */
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmashupcanvasstyle.h		mmashupcanvasstyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MMASHUPCANVASSTYLE_H_		#ifndef MMASHUPCANVASSTYLE_H_
	#define MMASHUPCANVASSTYLE_H_		#define MMASHUPCANVASSTYLE_H_
	#include <MWidgetStyle>		#include <MWidgetStyle>
	/*!		/*!
	* MMashupCanvasStyle is the style class for MMashupCanvas.		* MMashupCanvasStyle is the style class for MMashupCanvas.
	*/		*/
	class M_EXPORT MMashupCanvasStyle : public MWidgetStyle		class M_EXTENSIONS_EXPORT MMashupCanvasStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MMashupCanvasStyle)		M_STYLE(MMashupCanvasStyle)
	//! Whether the applets on this mashup canvas should be inside containe rs or not		//! Whether the applets on this mashup canvas should be inside containe rs or not
	M_STYLE_ATTRIBUTE(bool, containerMode, ContainerMode)		M_STYLE_ATTRIBUTE(bool, containerMode, ContainerMode)
	};		};
	/*!		/*!
	* MMashupCanvasStyleContainer is the style container class for MMashupCanv as.		* MMashupCanvasStyleContainer is the style container class for MMashupCanv as.
	*/		*/
	class M_EXPORT MMashupCanvasStyleContainer : public MWidgetStyleContainer		class M_EXTENSIONS_EXPORT MMashupCanvasStyleContainer : public MWidgetStyle Container
	{		{
	M_STYLE_CONTAINER(MMashupCanvasStyle)		M_STYLE_CONTAINER(MMashupCanvasStyle)
	};		};
	#endif /* MMASHUPCANVASSTYLE_H_ */		#endif /* MMASHUPCANVASSTYLE_H_ */
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mmashupcanvasview.h		mmashupcanvasview.h
	skipping to change at line 35		skipping to change at line 35
	#include "mmashupcanvasmodel.h"		#include "mmashupcanvasmodel.h"
	#include "mmashupcanvasstyle.h"		#include "mmashupcanvasstyle.h"
	class MMashupCanvasViewPrivate;		class MMashupCanvasViewPrivate;
	class MMashupCanvas;		class MMashupCanvas;
	class MContainer;		class MContainer;
	/*!		/*!
	* A view class for the MMashupCanvas.		* A view class for the MMashupCanvas.
	*/		*/
	class M_EXPORT MMashupCanvasView : public MExtensionAreaView		class M_EXTENSIONS_EXPORT MMashupCanvasView : public MExtensionAreaView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MMashupCanvasModel, MMashupCanvasStyle)		M_VIEW(MMashupCanvasModel, MMashupCanvasStyle)
	public:		public:
	/*!		/*!
	* Constructs a new view for MMashupCanvas.		* Constructs a new view for MMashupCanvas.
	*		*
	* \param controller the MMashupCanvas controller for the view.		* \param controller the MMashupCanvas controller for the view.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmenuobjectview.h		mmenuobjectview.h
	skipping to change at line 36		skipping to change at line 36
	#include <mnamespace.h>		#include <mnamespace.h>
	class MApplicationMenu;		class MApplicationMenu;
	class MMenuObjectViewPrivate;		class MMenuObjectViewPrivate;
	/*!		/*!
	* \class MMenuObjectView		* \class MMenuObjectView
	* \brief MMenuObjectView implements an object view for the MMenu widget		* \brief MMenuObjectView implements an object view for the MMenu widget
	*/		*/
	class M_EXPORT MMenuObjectView : public MSceneWindowView		class M_VIEWS_EXPORT MMenuObjectView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MApplicationMenuModel, MApplicationMenuStyle)		M_VIEW(MApplicationMenuModel, MApplicationMenuStyle)
	protected:		protected:
	MMenuObjectViewPrivate *const d_ptr;		MMenuObjectViewPrivate *const d_ptr;
	public:		public:
	/*!		/*!
	* \brief Constructor		* \brief Constructor
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmessagebox.h		mmessagebox.h
	skipping to change at line 38		skipping to change at line 38
	/*!		/*!
	\class MMessageBox		\class MMessageBox
	\brief MMessageBox provides a dialog for informing the user or for asking the user a question.		\brief MMessageBox provides a dialog for informing the user or for asking the user a question.
	A MMessageBox is a MDialog that displays text in its central area.		A MMessageBox is a MDialog that displays text in its central area.
	By default a MMessageBox has no central widget, but just the message text in its place.		By default a MMessageBox has no central widget, but just the message text in its place.
	You can still add a central widget to it though, by calling setCentralWid get(). It will		You can still add a central widget to it though, by calling setCentralWid get(). It will
	then be placed between the title bar and the message text.		then be placed between the title bar and the message text.
	*/		*/
	class M_EXPORT MMessageBox : public MDialog		class M_CORE_EXPORT MMessageBox : public MDialog
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MMessageBox)		M_CONTROLLER(MMessageBox)
	Q_PROPERTY(QString text READ text WRITE setText)		Q_PROPERTY(QString text READ text WRITE setText)
	Q_PROPERTY(QString iconId READ iconId WRITE setIconId)		Q_PROPERTY(QString iconId READ iconId WRITE setIconId)
	public:		public:
	/*!		/*!
	* \brief Constructs a message box with the given \a text and set of s tandard \a buttons.		* \brief Constructs a message box with the given \a text and set of s tandard \a buttons.
	skipping to change at line 115		skipping to change at line 115
	//! \reimp		//! \reimp
	virtual void dismissEvent(MDismissEvent *event);		virtual void dismissEvent(MDismissEvent *event);
	//! \reimp_end		//! \reimp_end
	private:		private:
	Q_DECLARE_PRIVATE(MMessageBox)		Q_DECLARE_PRIVATE(MMessageBox)
	Q_DISABLE_COPY(MMessageBox)		Q_DISABLE_COPY(MMessageBox)
	friend class MMessageBoxView;		friend class MMessageBoxView;
	friend class MMessageBoxViewPrivate;		friend class MMessageBoxViewPrivate;
			friend class Ut_MMessageBox;
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	mmessageboxmodel.h		mmessageboxmodel.h
	skipping to change at line 27		skipping to change at line 27
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MMESSAGEBOXMODEL_H		#ifndef MMESSAGEBOXMODEL_H
	#define MMESSAGEBOXMODEL_H		#define MMESSAGEBOXMODEL_H
	#include <mdialogmodel.h>		#include <mdialogmodel.h>
	#include <QMessageBox>		#include <QMessageBox>
	class M_EXPORT MMessageBoxModel : public MDialogModel		class M_CORE_EXPORT MMessageBoxModel : public MDialogModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MMessageBoxModel)		M_MODEL_INTERNAL(MMessageBoxModel)
	public:		public:
	private:		private:
	M_MODEL_PROPERTY(QString, text, Text, true, QString())		M_MODEL_PROPERTY(QString, text, Text, true, QString())
	M_MODEL_PROPERTY(QString, iconId, IconId, true, QString())		M_MODEL_PROPERTY(QString, iconId, IconId, true, QString())
	};		};
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmessageboxstyle.h		mmessageboxstyle.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 MMESSAGEBOXSTYLE_H		#ifndef MMESSAGEBOXSTYLE_H
	#define MMESSAGEBOXSTYLE_H		#define MMESSAGEBOXSTYLE_H
	#include <mdialogstyle.h>		#include <mdialogstyle.h>
	class M_EXPORT MMessageBoxStyle : public MDialogStyle		class M_VIEWS_EXPORT MMessageBoxStyle : public MDialogStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MMessageBoxStyle)		M_STYLE_INTERNAL(MMessageBoxStyle)
	};		};
	class M_EXPORT MMessageBoxStyleContainer : public MDialogStyleContainer		class M_VIEWS_EXPORT MMessageBoxStyleContainer : public MDialogStyleContain er
	{		{
	M_STYLE_CONTAINER_INTERNAL(MMessageBoxStyle)		M_STYLE_CONTAINER_INTERNAL(MMessageBoxStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mmessageboxview.h		mmessageboxview.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MMESSAGEBOXVIEW_H		#ifndef MMESSAGEBOXVIEW_H
	#define MMESSAGEBOXVIEW_H		#define MMESSAGEBOXVIEW_H
	#include "mdialogview.h"		#include "mdialogview.h"
	#include "mmessageboxmodel.h"		#include "mmessageboxmodel.h"
	#include <mmessageboxstyle.h>		#include <mmessageboxstyle.h>
	class MMessageBox;		class MMessageBox;
	class MMessageBoxViewPrivate;		class MMessageBoxViewPrivate;
	class M_EXPORT MMessageBoxView : public MDialogView		class M_VIEWS_EXPORT MMessageBoxView : public MDialogView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MMessageBoxModel, MMessageBoxStyle)		M_VIEW(MMessageBoxModel, MMessageBoxStyle)
	public:		public:
	MMessageBoxView(MMessageBox *controller);		MMessageBoxView(MMessageBox *controller);
	virtual ~MMessageBoxView();		virtual ~MMessageBoxView();
	protected:		protected:
	//! \reimp		//! \reimp
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmodalscenewindow.h		mmodalscenewindow.h
	skipping to change at line 42		skipping to change at line 42
	*		*
	* A modalscenewindow is a top-level scene window which can be used to		* A modalscenewindow is a top-level scene window which can be used to
	* create custom, modal scene windows. It has modality and a layer		* create custom, modal scene windows. It has modality and a layer
	* effect which visually blocks the scene windows with lower z		* effect which visually blocks the scene windows with lower z
	* value. It shares the z value with dialogs.		* value. It shares the z value with dialogs.
	*		*
	* A typical way of using modalscenewindow is to style its size,		* A typical way of using modalscenewindow is to style its size,
	* alignment and offset, instantiate it, set a layout to it and		* alignment and offset, instantiate it, set a layout to it and
	* populate the layout with any components the use case requires.		* populate the layout with any components the use case requires.
	*/		*/
	class M_EXPORT MModalSceneWindow : public MSceneWindow		class M_CORE_EXPORT MModalSceneWindow : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MModalSceneWindow)		M_CONTROLLER(MModalSceneWindow)
	public:		public:
	/*!		/*!
	* \brief Constructs a modalscenewindow.		* \brief Constructs a modalscenewindow.
	*/		*/
	MModalSceneWindow();		MModalSceneWindow();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmodalscenewindowmodel.h		mmodalscenewindowmodel.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 MMODALSCENEWINDOWMODEL_H		#ifndef MMODALSCENEWINDOWMODEL_H
	#define MMODALSCENEWINDOWMODEL_H		#define MMODALSCENEWINDOWMODEL_H
	#include "mscenewindowmodel.h"		#include "mscenewindowmodel.h"
	class M_EXPORT MModalSceneWindowModel : public MSceneWindowModel		class M_CORE_EXPORT MModalSceneWindowModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MModalSceneWindowModel)		M_MODEL_INTERNAL(MModalSceneWindowModel)
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mmodalscenewindowstyle.h		mmodalscenewindowstyle.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 MMODALSCENEWINDOWSTYLE_H		#ifndef MMODALSCENEWINDOWSTYLE_H
	#define MMODALSCENEWINDOWSTYLE_H		#define MMODALSCENEWINDOWSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MModalSceneWindowStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MModalSceneWindowStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MModalSceneWindowStyle)		M_STYLE_INTERNAL(MModalSceneWindowStyle)
	};		};
	class M_EXPORT MModalSceneWindowStyleContainer : public MSceneWindowStyleCo ntainer		class M_VIEWS_EXPORT MModalSceneWindowStyleContainer : public MSceneWindowS tyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MModalSceneWindowStyle)		M_STYLE_CONTAINER_INTERNAL(MModalSceneWindowStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mmodalscenewindowview.h		mmodalscenewindowview.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MMODALSCENEWINDOWVIEW_H		#ifndef MMODALSCENEWINDOWVIEW_H
	#define MMODALSCENEWINDOWVIEW_H		#define MMODALSCENEWINDOWVIEW_H
	#include <mmodalscenewindowstyle.h>		#include <mmodalscenewindowstyle.h>
	#include "mscenewindowview.h"		#include "mscenewindowview.h"
	#include "mmodalscenewindowmodel.h"		#include "mmodalscenewindowmodel.h"
	class MModalSceneWindow;		class MModalSceneWindow;
	class MModalSceneWindowViewPrivate;		class MModalSceneWindowViewPrivate;
	class M_EXPORT MModalSceneWindowView : public MSceneWindowView		class M_VIEWS_EXPORT MModalSceneWindowView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MModalSceneWindowModel, MModalSceneWindowStyle)		M_VIEW(MModalSceneWindowModel, MModalSceneWindowStyle)
	public:		public:
	MModalSceneWindowView(MModalSceneWindow *controller);		MModalSceneWindowView(MModalSceneWindow *controller);
	virtual ~MModalSceneWindowView();		virtual ~MModalSceneWindowView();
	protected:		protected:
	MModalSceneWindowView(MModalSceneWindowViewPrivate &dd, MModalSceneWind ow *controller);		MModalSceneWindowView(MModalSceneWindowViewPrivate &dd, MModalSceneWind ow *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mnamespace.h		mnamespace.h
	skipping to change at line 40		skipping to change at line 40
	enum AssemblyType {		enum AssemblyType {
	Library,		Library,
	Application,		Application,
	AssemblyNone		AssemblyNone
	};		};
	/*!		/*!
	* setting a dynamic porperty to any QWidget or QApplication will cause the object		* setting a dynamic porperty to any QWidget or QApplication will cause the object
	* not to be styled like M does.		* not to be styled like M does.
	*/		*/
	M_EXPORT extern const char* NoMStyle;		M_CORE_EXPORT extern const char* NoMStyle;
	/*!		/*!
	* setting a dynamic property to QApplication named NoMNavigationBar wi ll hide the		* setting a dynamic property to QApplication named NoMNavigationBar wi ll hide the
	* navigationbar from qt maemo 6 style		* navigationbar from qt maemo 6 style
	*/		*/
	M_EXPORT extern const char* NoMNavigationBar;		M_CORE_EXPORT extern const char* NoMNavigationBar;
	/*!		/*!
	* setting a dynamic property to QApplication named NoMStatusBar will h ide the		* setting a dynamic property to QApplication named NoMStatusBar will h ide the
	* statusbar from qt maemo 6 style		* statusbar from qt maemo 6 style
	*/		*/
	M_EXPORT extern const char* NoMStatusBar;		M_CORE_EXPORT extern const char* NoMStatusBar;
	/*!		/*!
	* This enum contains values of the orientation angle of windows in the application.		* This enum contains values of the orientation angle of windows in the application.
	*		*
	* \sa Orientation		* \sa Orientation
	*/		*/
	enum OrientationAngle {		enum OrientationAngle {
	Angle0 = 0,		Angle0 = 0,
	Angle90 = 90,		Angle90 = 90,
	Angle180 = 180,		Angle180 = 180,
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	mnavigationbar.h		mnavigationbar.h
	skipping to change at line 38		skipping to change at line 38
	/*!		/*!
	* \class MNavigationBar		* \class MNavigationBar
	* \brief MNavigationBar implements a navigation bar with viewmenu		* \brief MNavigationBar implements a navigation bar with viewmenu
	*		*
	* MNavigationBar doesn't have that many parameters which are read from		* MNavigationBar doesn't have that many parameters which are read from
	* theme. The theming is done changing the items which lay inside the		* theme. The theming is done changing the items which lay inside the
	* navigation bar.		* navigation bar.
	*/		*/
	class M_EXPORT MNavigationBar : public MSceneWindow		class M_CORE_EXPORT MNavigationBar : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MNavigationBar)		M_CONTROLLER(MNavigationBar)
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MNavigationBar;		friend class Ut_MNavigationBar;
	#endif // UNIT_TEST		#endif // UNIT_TEST
	/*!		/*!
	\property MNavigationBar::escapeButtonMode		\property MNavigationBar::escapeButtonMode
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mnavigationbarmodel.h		mnavigationbarmodel.h
	skipping to change at line 27		skipping to change at line 27
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MNAVIGATIONBARMODEL_H		#ifndef MNAVIGATIONBARMODEL_H
	#define MNAVIGATIONBARMODEL_H		#define MNAVIGATIONBARMODEL_H
	#include <mscenewindowmodel.h>		#include <mscenewindowmodel.h>
	class MToolBar;		class MToolBar;
	class M_EXPORT MNavigationBarModel : public MSceneWindowModel		class M_CORE_EXPORT MNavigationBarModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MNavigationBarModel)		M_MODEL_INTERNAL(MNavigationBarModel)
	public:		public:
	/*!		/*!
	This enum specifies the possible modes of the escape button.		This enum specifies the possible modes of the escape button.
	*/		*/
	enum EscapeButtonModeEnum {		enum EscapeButtonModeEnum {
	EscapeButtonBack, /*!< The escape button is a back button.*/		EscapeButtonBack, /*!< The escape button is a back button.*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mnavigationbarstyle.h		mnavigationbarstyle.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 MNAVIGATIONBARSTYLE_H		#ifndef MNAVIGATIONBARSTYLE_H
	#define MNAVIGATIONBARSTYLE_H		#define MNAVIGATIONBARSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MNavigationBarStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MNavigationBarStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MNavigationBarStyle)		M_STYLE_INTERNAL(MNavigationBarStyle)
	M_STYLE_ATTRIBUTE(int, itemSpacing, ItemSpacing)		M_STYLE_ATTRIBUTE(int, itemSpacing, ItemSpacing)
	M_STYLE_ATTRIBUTE(int, buttonAnimationLength, ButtonAnimationLength)		M_STYLE_ATTRIBUTE(int, buttonAnimationLength, ButtonAnimationLength)
	M_STYLE_ATTRIBUTE(int, height, Height)		M_STYLE_ATTRIBUTE(int, height, Height)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage*, dropShadowImage, DropShadowImage )		M_STYLE_PTR_ATTRIBUTE(MScalableImage*, dropShadowImage, DropShadowImage )
	M_STYLE_ATTRIBUTE(bool, hasTitle, HasTitle)		M_STYLE_ATTRIBUTE(bool, hasTitle, HasTitle)
	M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton)		M_STYLE_ATTRIBUTE(bool, hasCloseButton, HasCloseButton)
	M_STYLE_ATTRIBUTE(QString, menuButtonStyleName, MenuButtonStyleName)		M_STYLE_ATTRIBUTE(QString, menuButtonStyleName, MenuButtonStyleName)
	M_STYLE_ATTRIBUTE(QString, escapeButtonSlotStyleName, EscapeButtonSlotS tyleName)		M_STYLE_ATTRIBUTE(QString, escapeButtonSlotStyleName, EscapeButtonSlotS tyleName)
	M_STYLE_ATTRIBUTE(QString, backButtonStyleName, BackButtonStyleName)		M_STYLE_ATTRIBUTE(QString, backButtonStyleName, BackButtonStyleName)
	M_STYLE_ATTRIBUTE(QString, closeButtonStyleName, CloseButtonStyleName)		M_STYLE_ATTRIBUTE(QString, closeButtonStyleName, CloseButtonStyleName)
	};		};
	class M_EXPORT MNavigationBarStyleContainer : public MSceneWindowStyleConta iner		class M_VIEWS_EXPORT MNavigationBarStyleContainer : public MSceneWindowStyl eContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MNavigationBarStyle)		M_STYLE_CONTAINER_INTERNAL(MNavigationBarStyle)
	M_STYLE_MODE(Fullscreen)		M_STYLE_MODE(Fullscreen)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mnavigationbarview.h		mnavigationbarview.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MNAVIGATIONBARVIEW_H		#ifndef MNAVIGATIONBARVIEW_H
	#define MNAVIGATIONBARVIEW_H		#define MNAVIGATIONBARVIEW_H
	#include "mscenewindowview.h"		#include "mscenewindowview.h"
	#include "mnavigationbarmodel.h"		#include "mnavigationbarmodel.h"
	#include "mnavigationbarstyle.h"		#include "mnavigationbarstyle.h"
	class MNavigationBarViewPrivate;		class MNavigationBarViewPrivate;
	class MNavigationBar;		class MNavigationBar;
	class M_EXPORT MNavigationBarView : public MSceneWindowView		class M_VIEWS_EXPORT MNavigationBarView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MNavigationBarModel, MNavigationBarStyle)		M_VIEW(MNavigationBarModel, MNavigationBarStyle)
	public:		public:
	MNavigationBarView(MNavigationBar *controller);		MNavigationBarView(MNavigationBar *controller);
	virtual ~MNavigationBarView();		virtual ~MNavigationBarView();
	//! \reimp		//! \reimp
	virtual QRectF boundingRect() const;		virtual QRectF boundingRect() const;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mnotification.h		mnotification.h
	skipping to change at line 92		skipping to change at line 92
	\section MNotificationPersistence Persistence		\section MNotificationPersistence Persistence
	Notifications created as persistent are stored by the notification system and are returned by the		Notifications created as persistent are stored by the notification system and are returned by the
	MNotification::notifications() even after a reboot. It should be no ted that currently all properties		MNotification::notifications() even after a reboot. It should be no ted that currently all properties
	of such notifications need to be set before publishing changes to t he notification. Otherwise the		of such notifications need to be set before publishing changes to t he notification. Otherwise the
	properties of the notification will be lost.		properties of the notification will be lost.
	\note A QCoreApplication instance must be created before creating a ny persistent notifications.		\note A QCoreApplication instance must be created before creating a ny persistent notifications.
	*/		*/
	class M_EXPORT MNotification : public QObject		class M_CORE_EXPORT MNotification : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	/*!		/*!
	\property MNotification::summary		\property MNotification::summary
	\brief The summary text to be used in the notification.		\brief The summary text to be used in the notification.
	*/		*/
	Q_PROPERTY(QString summary READ summary WRITE setSummary)		Q_PROPERTY(QString summary READ summary WRITE setSummary)
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mnotificationgroup.h		mnotificationgroup.h
	skipping to change at line 50		skipping to change at line 50
	A notification group is not created or updated until the publish() function		A notification group is not created or updated until the publish() function
	is called. A notification group must be published before notificati ons are		is called. A notification group must be published before notificati ons are
	placed into it.		placed into it.
	A list of notification groups already created can be requested.		A list of notification groups already created can be requested.
	A QCoreApplication must be created before doing the request.		A QCoreApplication must be created before doing the request.
	\sa \ref MNotification		\sa \ref MNotification
	\sa \ref notifications		\sa \ref notifications
	*/		*/
	class M_EXPORT MNotificationGroup : public MNotification		class M_CORE_EXPORT MNotificationGroup : public MNotification
	{		{
	public:		public:
	/*!		/*!
	* Creates a new representation of a notification group. The notificati on		* Creates a new representation of a notification group. The notificati on
	* group will not be published until publish() is called. Only the even t		* group will not be published until publish() is called. Only the even t
	* type needs to be defined. If no summary or body text is defined the		* type needs to be defined. If no summary or body text is defined the
	* notification group will not have a visual representation.		* notification group will not have a visual representation.
	*		*
	* \param eventType the event type of the notification group		* \param eventType the event type of the notification group
	* \param summary the summary text to be used in the notification. Can be omitted (defaults to no summary text).		* \param summary the summary text to be used in the notification. Can be omitted (defaults to no summary text).
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mobjectmenu.h		mobjectmenu.h
	skipping to change at line 116		skipping to change at line 116
	(Exceptions can be made in certain cases.)		(Exceptions can be made in certain cases.)
	\section MObjectMenuVariants Variants		\section MObjectMenuVariants Variants
	\li \link MObjectMenuView Generic view \endlink		\li \link MObjectMenuView Generic view \endlink
	\section MObjectMenuWidgetOpenIssues Open issues		\section MObjectMenuWidgetOpenIssues Open issues
	\sa MObjectMenuModel MObjectMenuStyle		\sa MObjectMenuModel MObjectMenuStyle
	*/		*/
	class M_EXPORT MObjectMenu : public MSceneWindow		class M_CORE_EXPORT MObjectMenu : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	Q_DISABLE_COPY(MObjectMenu)		Q_DISABLE_COPY(MObjectMenu)
	M_CONTROLLER(MObjectMenu)		M_CONTROLLER(MObjectMenu)
	Q_PROPERTY(QPointF cursorPosition READ cursorPosition WRITE setCursorPo sition)		Q_PROPERTY(QPointF cursorPosition READ cursorPosition WRITE setCursorPo sition)
	public:		public:
	/*!		/*!
	\brief Constructs an object menu.		\brief Constructs an object menu.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mobjectmenumodel.h		mobjectmenumodel.h
	skipping to change at line 37		skipping to change at line 37
	typedef QList<MAction *> MActionList;		typedef QList<MAction *> MActionList;
	/*!		/*!
	\class MObjectMenuModel		\class MObjectMenuModel
	\brief MObjectMenuModel contains a number of object menu actions relate d to one widget.		\brief MObjectMenuModel contains a number of object menu actions relate d to one widget.
	\ingroup models		\ingroup models
	\sa MObjectMenu		\sa MObjectMenu
	*/		*/
	class M_EXPORT MObjectMenuModel : public MSceneWindowModel		class M_CORE_EXPORT MObjectMenuModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MObjectMenuModel)		M_MODEL_INTERNAL(MObjectMenuModel)
	/*!		/*!
	\property MObjectMenuModel::actions		\property MObjectMenuModel::actions
	\brief A list of object menu actions.		\brief A list of object menu actions.
	This property contains all object menu actions.		This property contains all object menu actions.
	This list is modified by MObjectMenu via addAction(), removeAction( ) and modifyAction() and is always up to date.		This list is modified by MObjectMenu via addAction(), removeAction( ) and modifyAction() and is always up to date.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mobjectmenustyle.h		mobjectmenustyle.h
	skipping to change at line 27		skipping to change at line 27
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MOBJECTMENUSTYLE_H		#ifndef MOBJECTMENUSTYLE_H
	#define MOBJECTMENUSTYLE_H		#define MOBJECTMENUSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class MScalableImage;		class MScalableImage;
	class M_EXPORT MObjectMenuStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MObjectMenuStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MObjectMenuStyle)		M_STYLE_INTERNAL(MObjectMenuStyle)
	};		};
	class M_EXPORT MObjectMenuStyleContainer : public MSceneWindowStyleContaine r		class M_VIEWS_EXPORT MObjectMenuStyleContainer : public MSceneWindowStyleCo ntainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MObjectMenuStyle)		M_STYLE_CONTAINER_INTERNAL(MObjectMenuStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mobjectmenuview.h		mobjectmenuview.h
	skipping to change at line 37		skipping to change at line 37
	class MObjectMenu;		class MObjectMenu;
	class QGraphicsSceneMouseEvent;		class QGraphicsSceneMouseEvent;
	class MObjectMenuViewPrivate;		class MObjectMenuViewPrivate;
	/*!		/*!
	* \class MObjectMenuView		* \class MObjectMenuView
	* \brief MObjectMenuView implements an object view "frogfoot" for the MApp licationMenu widget		* \brief MObjectMenuView implements an object view "frogfoot" for the MApp licationMenu widget
	*/		*/
	class M_EXPORT MObjectMenuView : public MSceneWindowView		class M_VIEWS_EXPORT MObjectMenuView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	Q_DISABLE_COPY(MObjectMenuView)		Q_DISABLE_COPY(MObjectMenuView)
	Q_DECLARE_PRIVATE(MObjectMenuView)		Q_DECLARE_PRIVATE(MObjectMenuView)
	M_VIEW(MObjectMenuModel, MObjectMenuStyle)		M_VIEW(MObjectMenuModel, MObjectMenuStyle)
	protected:		protected:
	MObjectMenuView(MObjectMenuViewPrivate &dd, MObjectMenu *controller);		MObjectMenuView(MObjectMenuViewPrivate &dd, MObjectMenu *controller);
	MObjectMenuViewPrivate *const d_ptr;		MObjectMenuViewPrivate *const d_ptr;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mondisplaychangeevent.h		mondisplaychangeevent.h
	skipping to change at line 35		skipping to change at line 35
	class MOnDisplayChangeEventPrivate;		class MOnDisplayChangeEventPrivate;
	/*!		/*!
	* This event is sent to a MWidget so that it can notify subscribers		* This event is sent to a MWidget so that it can notify subscribers
	* about changes on its presence on display. The event can be triggered by		* about changes on its presence on display. The event can be triggered by
	* e.g. panning or switching a MApplicationPage or obscuring the MApplicati onWindow		* e.g. panning or switching a MApplicationPage or obscuring the MApplicati onWindow
	* with another window. Note that this differs from Qt's explicit hide()/sh ow()		* with another window. Note that this differs from Qt's explicit hide()/sh ow()
	* semantics. MWidget forwards this event to its children.		* semantics. MWidget forwards this event to its children.
	*/		*/
	class M_EXPORT MOnDisplayChangeEvent : public QGraphicsSceneEvent		class M_CORE_EXPORT MOnDisplayChangeEvent : public QGraphicsSceneEvent
	{		{
	public:		public:
	/*!		/*!
	* \brief Possible visibility states.		* \brief Possible visibility states.
	*/		*/
	enum State {FullyOnDisplay = 0, /*!< Widget is definitely fully on disp lay */		enum State {FullyOnDisplay = 0, /*!< Widget is definitely fully on disp lay */
	FullyOffDisplay, /*!< Widget is definitely fully off dis play */		FullyOffDisplay, /*!< Widget is definitely fully off dis play */
	MustBeResolved, /*!< Widget must use viewRect to verif y its presence on the display,		MustBeResolved, /*!< Widget must use viewRect to verif y its presence on the display,
	as well as of all its children. * /		as well as of all its children. * /
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	morientationchangeevent.h		morientationchangeevent.h
	skipping to change at line 44		skipping to change at line 44
	* when changing angle e.g. from 0 directly to 180 degrees). It is also sen t to MApplicationPage		* when changing angle e.g. from 0 directly to 180 degrees). It is also sen t to MApplicationPage
	* when it is about to be shown for the first time - MApplicationPage::appe ar().		* when it is about to be shown for the first time - MApplicationPage::appe ar().
	*		*
	* It is used to notify widgets about the orientation change. It can be ask ed		* It is used to notify widgets about the orientation change. It can be ask ed
	* about the new orientation of the viewport. You can handle this event		* about the new orientation of the viewport. You can handle this event
	* either by catching it in QGraphicsItem::event() or reimplementing		* either by catching it in QGraphicsItem::event() or reimplementing
	* MWidget::orientationChangeEvent().		* MWidget::orientationChangeEvent().
	*		*
	* \sa MWidget::orientationChangeEvent()		* \sa MWidget::orientationChangeEvent()
	*/		*/
	class M_EXPORT MOrientationChangeEvent : public QGraphicsSceneEvent		class M_CORE_EXPORT MOrientationChangeEvent : public QGraphicsSceneEvent
	{		{
	public:		public:
	/*!		/*!
	* Orientation change event definition. Used to identify the type of th e event.		* Orientation change event definition. Used to identify the type of th e event.
	*/		*/
	static QEvent::Type eventNumber();		static QEvent::Type eventNumber();
	/*!		/*!
	* Creates a new orientation change event with the orientation specifie d by \a newOrientation.		* Creates a new orientation change event with the orientation specifie d by \a newOrientation.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	morientationtracker.h		morientationtracker.h
	skipping to change at line 39		skipping to change at line 39
	//! \internal		//! \internal
	/*!		/*!
	* Class responsible for tracking the accelerometer properties and signalin g events		* Class responsible for tracking the accelerometer properties and signalin g events
	* when the device should change it's orientation.		* when the device should change it's orientation.
	* At the moment this is not a part of M api - use MDeviceProfile for the i nformation.		* At the moment this is not a part of M api - use MDeviceProfile for the i nformation.
	* Initially designed as singleton as MDeviceProfile might need to access s ome more information about		* Initially designed as singleton as MDeviceProfile might need to access s ome more information about
	* the concrete phone position, that is not available from fired events.		* the concrete phone position, that is not available from fired events.
	*/		*/
	class M_EXPORT MOrientationTracker: public QObject		class M_CORE_EXPORT MOrientationTracker: public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	static MOrientationTracker *instance();		static MOrientationTracker *instance();
	M::OrientationAngle orientationAngle() const;		M::OrientationAngle orientationAngle() const;
	Q_SIGNALS:		Q_SIGNALS:
	void faceFlippedDown();		void faceFlippedDown();
	void faceUp();		void faceUp();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	moverlay.h		moverlay.h
	skipping to change at line 41		skipping to change at line 41
	*		*
	* MOverlay class enables creation and displaying of a widget on top of the		* MOverlay class enables creation and displaying of a widget on top of the
	* current viewport. It provides a widget which is ready for use out of the box.		* current viewport. It provides a widget which is ready for use out of the box.
	* It follows the idea used for MApplication's centralWidget(), i.e. it can be		* It follows the idea used for MApplication's centralWidget(), i.e. it can be
	* used as a panel (can have a layout applied and filled with other widgets ) or		* used as a panel (can have a layout applied and filled with other widgets ) or
	* simply substituted with another widget. The widget can be positioned ins ide		* simply substituted with another widget. The widget can be positioned ins ide
	* the scene using alignment and offset defined in stylesheet.		* the scene using alignment and offset defined in stylesheet.
	*		*
	* \sa MApplicationPage		* \sa MApplicationPage
	*/		*/
	class M_EXPORT MOverlay : public MSceneWindow		class M_CORE_EXPORT MOverlay : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSceneWindow)		M_CONTROLLER(MSceneWindow)
	public:		public:
	/*!		/*!
	* \brief Constructs a widget with the given \a parent.		* \brief Constructs a widget with the given \a parent.
	*/		*/
	MOverlay(QGraphicsItem *parent = 0);		MOverlay(QGraphicsItem *parent = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	moverlaystyle.h		moverlaystyle.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 MOVERLAYSTYLE_H		#ifndef MOVERLAYSTYLE_H
	#define MOVERLAYSTYLE_H		#define MOVERLAYSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MOverlayStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MOverlayStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MOverlayStyle)		M_STYLE_INTERNAL(MOverlayStyle)
	};		};
	class M_EXPORT MOverlayStyleContainer : public MSceneWindowStyleContainer		class M_VIEWS_EXPORT MOverlayStyleContainer : public MSceneWindowStyleConta iner
	{		{
	M_STYLE_CONTAINER_INTERNAL(MOverlayStyle)		M_STYLE_CONTAINER_INTERNAL(MOverlayStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	moverlayview.h		moverlayview.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MOVERLAYVIEW_H		#ifndef MOVERLAYVIEW_H
	#define MOVERLAYVIEW_H		#define MOVERLAYVIEW_H
	#include <moverlaystyle.h>		#include <moverlaystyle.h>
	#include "mscenewindowview.h"		#include "mscenewindowview.h"
	class MOverlay;		class MOverlay;
	class M_EXPORT MOverlayView : public MSceneWindowView		class M_VIEWS_EXPORT MOverlayView : public MSceneWindowView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MSceneWindowModel, MOverlayStyle)		M_VIEW(MSceneWindowModel, MOverlayStyle)
	public:		public:
	MOverlayView(MOverlay *controller);		MOverlayView(MOverlay *controller);
	virtual ~MOverlayView();		virtual ~MOverlayView();
	private:		private:
	Q_DISABLE_COPY(MOverlayView)		Q_DISABLE_COPY(MOverlayView)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpalette.h		mpalette.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MPALETTE_H		#ifndef MPALETTE_H
	#define MPALETTE_H		#define MPALETTE_H
	#include <QColor>		#include <QColor>
	#include "mexport.h"		#include "mexport.h"
	class MPalettePrivate;		class MPalettePrivate;
	class MLogicalValues;		class MLogicalValues;
	class M_EXPORT MPalette		class M_CORE_EXPORT MPalette
	{		{
	public:		public:
	MPalette(const MLogicalValues &);		MPalette(const MLogicalValues &);
	~MPalette();		~MPalette();
	const QColor &foregroundColor() const;		const QColor &foregroundColor() const;
	const QColor &secondaryForegroundColor() const;		const QColor &secondaryForegroundColor() const;
	const QColor &backgroundColor() const;		const QColor &backgroundColor() const;
	const QColor &invertedForegroundColor() const;		const QColor &invertedForegroundColor() const;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpannableviewport.h		mpannableviewport.h
	skipping to change at line 72		skipping to change at line 72
	* \code		* \code
	* MPannableViewport* viewport = new MPannableViewport(parent);		* MPannableViewport* viewport = new MPannableViewport(parent);
	* viewport->setMinimumSize(100,100);		* viewport->setMinimumSize(100,100);
	* MImage* image = new MImage("myimage.png");		* MImage* image = new MImage("myimage.png");
	* viewport->setWidget(image);		* viewport->setWidget(image);
	* \endcode		* \endcode
	*		*
	* \sa MPannableWidget MPannableWidgetStyle		* \sa MPannableWidget MPannableWidgetStyle
	*		*
	*/		*/
	class M_EXPORT MPannableViewport : public MPannableWidget		class M_CORE_EXPORT MPannableViewport : public MPannableWidget
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MPannableViewport)		M_CONTROLLER(MPannableViewport)
	//! \brief Enable status of autoRange feature		//! \brief Enable status of autoRange feature
	Q_PROPERTY(bool autoRange READ autoRange WRITE setAutoRange)		Q_PROPERTY(bool autoRange READ autoRange WRITE setAutoRange)
	//! \brief Current panning range		//! \brief Current panning range
	Q_PROPERTY(QRectF range READ range WRITE setRange)		Q_PROPERTY(QRectF range READ range WRITE setRange)
	//! \brief Current panned widget		//! \brief Current panned widget
	Q_PROPERTY(QGraphicsWidget *widget READ widget WRITE setWidget)		Q_PROPERTY(QGraphicsWidget *widget READ widget WRITE setWidget)
	skipping to change at line 138		skipping to change at line 138
	* Ownership of the widget is transferred to pannable viewport.		* Ownership of the widget is transferred to pannable viewport.
	*/		*/
	void setWidget(QGraphicsWidget *widget);		void setWidget(QGraphicsWidget *widget);
	/*!		/*!
	* \brief Returns the widget which is currently panned.		* \brief Returns the widget which is currently panned.
	*/		*/
	QGraphicsWidget *widget() const;		QGraphicsWidget *widget() const;
	/*!		/*!
	* \brief If autoRange is disabled, manually sets the range of the
	* panning.
	*
	* This method overrides the method in MPannableWidget. Note
	* that in MPannableViewport the meaning of the range is
	* different from MPannableWidget (range is not the range of the
	* physics (i.e. allowed movement) but it is the range of the area
	* that can be panned over).
	*/
	void setRange(const QRectF &range);
	/*!
	* \brief Returns the current panning range.
	*/
	virtual QRectF range() const;
	/*!
	* \brief Sets the \a positionIndicator which will be used instead		* \brief Sets the \a positionIndicator which will be used instead
	* of the current one.		* of the current one.
	*		*
	* Ownership of the indicator is transferred to pannable viewport.		* Ownership of the indicator is transferred to pannable viewport.
	*/		*/
	void setPositionIndicator(MPositionIndicator *positionIndicator);		void setPositionIndicator(MPositionIndicator *positionIndicator);
	/*!		/*!
	* \brief Returns the position indicator which is currently used.		* \brief Returns the position indicator which is currently used.
	*/		*/
	MPositionIndicator *positionIndicator() const;		MPositionIndicator *positionIndicator() const;
	//! \reimp		//! \reimp
	void setPanDirection(const Qt::Orientations &panDirection);		void setPanDirection(const Qt::Orientations &panDirection);
	void resizeEvent(QGraphicsSceneResizeEvent *event);		void resizeEvent(QGraphicsSceneResizeEvent *event);
	void updateGeometry();		void updateGeometry();
	void updateData(const QList<const char *> &modifications);		void updateData(const QList<const char *> &modifications);
			void setRange(const QRectF &range);
			QRectF range() const;
	//! \reimp_end		//! \reimp_end
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	* \brief When viewport size changes this signal is emitted.		* \brief When viewport size changes this signal is emitted.
	*/		*/
	void viewportSizeChanged(const QSizeF &viewportSize);		void viewportSizeChanged(const QSizeF &viewportSize);
	public Q_SLOTS:		public Q_SLOTS:
	skipping to change at line 197		skipping to change at line 182
	* This slot should only be used by physics engine.		* This slot should only be used by physics engine.
	*/		*/
	virtual void updatePosition(const QPointF &position);		virtual void updatePosition(const QPointF &position);
	private:		private:
	Q_DISABLE_COPY(MPannableViewport)		Q_DISABLE_COPY(MPannableViewport)
	Q_DECLARE_PRIVATE(MPannableViewport)		Q_DECLARE_PRIVATE(MPannableViewport)
	Q_PRIVATE_SLOT(d_func(), void _q_resolvePannedWidgetIsOnDisplay())		Q_PRIVATE_SLOT(d_func(), void _q_resolvePannedWidgetIsOnDisplay())
	Q_PRIVATE_SLOT(d_func(), void _q_positionIndicatorEnabledChanged())		Q_PRIVATE_SLOT(d_func(), void _q_positionIndicatorEnabledChanged())
	Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetGeometryChanged())		Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetGeometryChanged())
			Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetWidthOutOfViewport())
			Q_PRIVATE_SLOT(d_func(), void _q_pannedWidgetHeightOutOfViewport())
			Q_PRIVATE_SLOT(d_func(), void _q_ensureFocusedPannedWidgetIsVisible())
	#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_MPannableViewport;		friend class Ut_MPannableViewport;
	#endif		#endif
	friend class MInputWidgetRelocator;		friend class MInputWidgetRelocator;
	};		};
	#endif		#endif
End of changes. 4 change blocks.
	18 lines changed or deleted		6 lines changed or added

	mpannableviewportmodel.h		mpannableviewportmodel.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 MPANNABLEVIEWPORTMODEL_H		#ifndef MPANNABLEVIEWPORTMODEL_H
	#define MPANNABLEVIEWPORTMODEL_H		#define MPANNABLEVIEWPORTMODEL_H
	#include <mpannablewidgetmodel.h>		#include <mpannablewidgetmodel.h>
	class M_EXPORT MPannableViewportModel : public MPannableWidgetModel		class M_CORE_EXPORT MPannableViewportModel : public MPannableWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MPannableViewportModel)		M_MODEL_INTERNAL(MPannableViewportModel)
	M_MODEL_PROPERTY(bool, autoRange, AutoRange, true, true)		M_MODEL_PROPERTY(bool, autoRange, AutoRange, true, true)
	M_MODEL_PROPERTY(bool, clipWidget, ClipWidget, true, true)		M_MODEL_PROPERTY(bool, clipWidget, ClipWidget, true, true)
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpannablewidget.h		mpannablewidget.h
	skipping to change at line 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 MPANNABLEWIDGET_H		#ifndef MPANNABLEWIDGET_H
	#define MPANNABLEWIDGET_H		#define MPANNABLEWIDGET_H
	#include "mwidgetcontroller.h"		#include "mwidgetcontroller.h"
	#include "mphysics2dpanning.h"		#include "mphysics2dpanning.h"
	#include <mpannablewidgetmodel.h>		#include "mpannablewidgetmodel.h"
	class QTimerEvent;		class QTimerEvent;
	class QGraphicsSceneMouseEvent;		class QGraphicsSceneMouseEvent;
	class QPanGesture;		class QPanGesture;
	class MPannableWidgetPrivate;		class MPannableWidgetPrivate;
	class MOnDisplayChangeEvent;		class MOnDisplayChangeEvent;
	/*!		/*!
	* \class MPannableWidget		* \class MPannableWidget
	* \brief Base class which adds support for panning gesture		* \brief Base class which adds support for panning gesture
	skipping to change at line 55		skipping to change at line 55
	* In order to change the current position of the viewport the user		* In order to change the current position of the viewport the user
	* can call setPosition() method. When this is done, integration engine		* can call setPosition() method. When this is done, integration engine
	* is started and in case that the position is outside specified bounds,		* is started and in case that the position is outside specified bounds,
	* the physics engine will start spring action to move the viewport to		* the physics engine will start spring action to move the viewport to
	* the allowed borders.		* the allowed borders.
	*		*
	* The physics engine object can be obtained by calling physics() method.		* The physics engine object can be obtained by calling physics() method.
	*		*
	* \sa MPhysics2DPanning, MPannableViewport		* \sa MPhysics2DPanning, MPannableViewport
	*/		*/
	class M_EXPORT MPannableWidget : public MWidgetController		class M_CORE_EXPORT MPannableWidget : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MPannableWidget)		M_CONTROLLER(MPannableWidget)
	//! \brief Enabled status		//! \brief Vertical panning policy status
	Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)		Q_PROPERTY(PanningPolicy verticalPanningPolicy READ verticalPanningPoli
			cy WRITE setVerticalPanningPolicy)
			//! \brief Horizontal panning policy status
			Q_PROPERTY(PanningPolicy horizontalPanningPolicy READ horizontalPanning
			Policy WRITE setHorizontalPanningPolicy)
	//! \brief Enabled panning directions		//! \brief Enabled panning directions
	Q_PROPERTY(Qt::Orientations panDirection READ panDirection WRITE setPan Direction)		Q_PROPERTY(Qt::Orientations panDirection READ panDirection WRITE setPan Direction)
	//! \brief Panning range		//! \brief Panning range
	Q_PROPERTY(QRectF range READ range WRITE setRange)		Q_PROPERTY(QRectF range READ range WRITE setRange)
	//! \brief Panning position		//! \brief Panning position
	Q_PROPERTY(QPointF position READ position WRITE setPosition NOTIFY posi tionChanged USER true)		Q_PROPERTY(QPointF position READ position WRITE setPosition NOTIFY posi tionChanged USER true)
	//! \brief Panning threshold		//! \brief Panning threshold
	Q_PROPERTY(qreal panThreshold READ panThreshold WRITE setPanThreshold)		Q_PROPERTY(qreal panThreshold READ panThreshold WRITE setPanThreshold)
	public:		public:
			/*!
			* This enum contains possible values of a panning policy.
			*
			* \li PanningAlwaysOn - the pannable widget will always react to pan g
			esture
			* \li PanningAlwaysOff - the pannable widget will never react to pan g
			esture
			* \li PanningAsNeeded - the pannable widget will only react to pan ges
			ture if the panned
			* widget is bigger than the viewport.
			*
			* \sa setHorizontalPanningPolicy, setVerticalPanningPolicy.
			*/
			enum PanningPolicy {
			PanningAlwaysOn,
			PanningAlwaysOff,
			PanningAsNeeded
			};
	/*!		/*!
	* \brief Constructs a pannable widget with a \a parent.		* \brief Constructs a pannable widget with a \a parent.
	*/		*/
	MPannableWidget(QGraphicsItem *parent = 0);		MPannableWidget(QGraphicsItem *parent = 0);
	/*!		/*!
	* \brief Destroys the pannable widget.		* \brief Destroys the pannable widget.
	*/		*/
	virtual ~MPannableWidget();		virtual ~MPannableWidget();
	skipping to change at line 101		skipping to change at line 120
	*		*
	* This method can be used to modify the behaviour of the widget		* This method can be used to modify the behaviour of the widget
	* so that the kinetic panning effect is different than default.		* so that the kinetic panning effect is different than default.
	*		*
	* The MPannableWidget will take ownership of the physics engine		* The MPannableWidget will take ownership of the physics engine
	* object.		* object.
	*/		*/
	void setPhysics(MPhysics2DPanning *physics);		void setPhysics(MPhysics2DPanning *physics);
	/*!		/*!
	* \brief Sets the enabled status of the pannable widget.		* \brief Sets the vertical panning policy of the pannable widget.
			*
			* This method allows for finegrained control over the panning
			* functionality in the MPannableWidget. The policy argument
			* will define the result of a vertical pan gesture executed
			* over pannable widget.
			*
			* This method does not reset horizontal panning policy.
			*
			* \sa verticalPanningPolicy and setPanDirection.
	*/		*/
	void setEnabled(bool enabled);		void setVerticalPanningPolicy(PanningPolicy policy);
	/*!		/*!
	* \brief Returns the enabled status of the pannable widget.		* \brief Sets the horizontal panning policy of the pannable widget.
			*
			* This method allows for finegrained control over the panning
			* functionality in the MPannableWidget. The policy argument
			* will define the result of a horizontal pan gesture executed
			* over pannable widget.
			*
			* This method does not reset vertical panning policy.
			*
			* \sa horizontalPanningPolicy and setPanDirection.
	*/		*/
	bool isEnabled();		void setHorizontalPanningPolicy(PanningPolicy policy);
	/*!		/*!
	* \brief Sets the \a range of the panning.		* \brief Returns the vertical interactivity policy of the pannable wid
	*		get.
	* When range is zero along some axis, user can still make a		*/
	* panning gesture on that direction but the position snaps back		PanningPolicy verticalPanningPolicy() const;
	* to 0.0. If the range is shrank so that the current position
	* goes to border, the border springs are activated.		/*!
			* \brief Returns the interactivity policy of the pannable widget.
			*/
			PanningPolicy horizontalPanningPolicy() const;
			/*!
			* \brief Sets the \a range of panning.
	*		*
	* By default, the range is QRectF(0,0).		* \sa range.
	*/		*/
	virtual void setRange(const QRectF &range);		virtual void setRange(const QRectF &range);
	/*!		/*!
	* \brief Returns the range of the panning.		* \brief Returns the range of panning.
			*
			* The range of panning defines the allowed positions of
			* the viewport over the panned widget. The panning range
			* is smaller than the panned widget size by the size of
			* the viewport.
			*
			* \note When range is zero along some axis, user can still make a
			* panning gesture on that direction but the position snaps back
			* to 0.0. If the range is shrank so that the current position
			* goes to border, the border springs are activated.
			*
	*/		*/
	virtual QRectF range() const;		virtual QRectF range() const;
	/*!		/*!
	* \brief Sets the \a position of the panning.		* \brief Sets the \a position of the panning.
	*		*
	* If the new position is in the border, the border springs are		* If the new position is in the border, the border springs are
	* activated.		* activated.
	*		*
	* By default, the position is QPointF(0,0).		* By default, the position is QPointF(0,0).
	skipping to change at line 145		skipping to change at line 198
	virtual void setPosition(const QPointF &position);		virtual void setPosition(const QPointF &position);
	/*!		/*!
	* \brief Returns the current position of the panning.		* \brief Returns the current position of the panning.
	*/		*/
	virtual QPointF position() const;		virtual QPointF position() const;
	/*!		/*!
	* \brief Sets the enabled panning directions.		* \brief Sets the enabled panning directions.
	*		*
			* This method allows enabling or disabling panning directions
			* of the pannable widget. It is an equivalent of methods
			* for setting panning policies: enabling a panning direction
			* has the same effect as setting PanningAlwaysOn policy for that
			* direction.Disabling a panning direction is exactly the same
			* as setting PanningAlwaysOff policy.
			*
	* The accepted values are Qt::Horizontal and/or Qt::Vertical.		* The accepted values are Qt::Horizontal and/or Qt::Vertical.
			*
			* \sa setVerticalPanningPolicy and setHorizontalPanningPolicy.
	*/		*/
	virtual void setPanDirection(const Qt::Orientations &panDirection);		virtual void setPanDirection(const Qt::Orientations &panDirection);
	/*!		/*!
	* \brief Returns the enabled panning directions.		* \brief Returns the enabled panning directions.
	*		*
			* A panning direction is enabled if the policy of panning for
			* that direction is either PanningAlwaysOn or PanningAsNeeded.
			*
	* By default, the panning is enabled in Qt::Vertical direction.		* By default, the panning is enabled in Qt::Vertical direction.
	*/		*/
	Qt::Orientations panDirection();		Qt::Orientations panDirection();
	/*!		/*!
	* \brief Deprecated since 0.20		* \brief Deprecated since 0.20
	*/		*/
	void setPanThreshold(qreal value);		void setPanThreshold(qreal value);
	/*!		/*!
	* \brief Deprecated since 0.20.		* \brief Deprecated since 0.20.
	*/		*/
	qreal panThreshold();		qreal panThreshold();
			//! \reimp
			void setEnabled(bool enabled);
			bool isEnabled();
			//! \reimp_end
	public Q_SLOTS:		public Q_SLOTS:
	/*!		/*!
	* \brief Virtual slot for receiving position changes from		* \brief Virtual slot for receiving position changes from
	* physics.		* physics.
	*/		*/
	virtual void updatePosition(const QPointF &position);		virtual void updatePosition(const QPointF &position);
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	skipping to change at line 207		skipping to change at line 277
	* Protected constructor for derived classes.		* Protected constructor for derived classes.
	*/		*/
	MPannableWidget(MPannableWidgetPrivate *dd, MPannableWidgetModel *model ,		MPannableWidget(MPannableWidgetPrivate *dd, MPannableWidgetModel *model ,
	QGraphicsItem *parent);		QGraphicsItem *parent);
	//! \reimp		//! \reimp
	virtual void cancelEvent(MCancelEvent *event);		virtual void cancelEvent(MCancelEvent *event);
	virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);		virtual void onDisplayChangeEvent(MOnDisplayChangeEvent *event);
	virtual void panGestureEvent(QGestureEvent *event, QPanGesture* state);		virtual void panGestureEvent(QGestureEvent *event, QPanGesture* state);
	virtual void tapAndHoldGestureEvent(QGestureEvent *event, QTapAndHoldGe sture *gesture);		virtual void tapAndHoldGestureEvent(QGestureEvent *event, QTapAndHoldGe sture *gesture);
			virtual void orientationChangeEvent(MOrientationChangeEvent *event);
	//! \reimp_end		//! \reimp_end
	private:		private:
	Q_DISABLE_COPY(MPannableWidget)		Q_DISABLE_COPY(MPannableWidget)
	Q_DECLARE_PRIVATE(MPannableWidget)		Q_DECLARE_PRIVATE(MPannableWidget)
	/*!		/*!
	* \brief Method for handling the press events from the glass.		* \brief Method for handling the press events from the glass.
	*/		*/
	void glassMousePressEvent(QGraphicsSceneMouseEvent *event);		void glassMousePressEvent(QGraphicsSceneMouseEvent *event);
End of changes. 16 change blocks.
	16 lines changed or deleted		93 lines changed or added

	mpannablewidgetmodel.h		mpannablewidgetmodel.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 MPANNABLEWIDGETMODEL_H		#ifndef MPANNABLEWIDGETMODEL_H
	#define MPANNABLEWIDGETMODEL_H		#define MPANNABLEWIDGETMODEL_H
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	class M_EXPORT MPannableWidgetModel : public MWidgetModel		class M_CORE_EXPORT MPannableWidgetModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MPannableWidgetModel)		M_MODEL_INTERNAL(MPannableWidgetModel)
	M_MODEL_PROPERTY(bool, enabled, Enabled, true, true)		M_MODEL_PROPERTY(bool, enabled, Enabled, true, true)
			M_MODEL_PROPERTY(int, verticalPanningPolicy, VerticalPanningPolicy, tru
			e, 0)
			M_MODEL_PROPERTY(int, horizontalPanningPolicy, HorizontalPanningPolicy,
			true, 1)
			//Deprecated:
	M_MODEL_PROPERTY(qreal, panThreshold, PanThreshold, true, 10.0)		M_MODEL_PROPERTY(qreal, panThreshold, PanThreshold, true, 10.0)
	M_MODEL_PROPERTY(qreal, panClickThreshold, PanClickThreshold, true, 0.2 )		M_MODEL_PROPERTY(qreal, panClickThreshold, PanClickThreshold, true, 0.2 )
	M_MODEL_PROPERTY(Qt::Orientations, panDirection, PanDirection, true, Qt ::Vertical)		M_MODEL_PROPERTY(Qt::Orientations, panDirection, PanDirection, true, Qt ::Vertical)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		7 lines changed or added

	mpannablewidgetstyle.h		mpannablewidgetstyle.h
	skipping to change at line 50		skipping to change at line 50
	the finger and the view is moved by physics.		the finger and the view is moved by physics.
	\li border-spring-k - friction constant used when the view was moved		\li border-spring-k - friction constant used when the view was moved
	beyond normal range by user and needs to return to the correct bo unds.		beyond normal range by user and needs to return to the correct bo unds.
	\li border-friction-c - friction constant used when the view was move d		\li border-friction-c - friction constant used when the view was move d
	beyond normal range by user and needs to return to the correct bo unds.		beyond normal range by user and needs to return to the correct bo unds.
	\li maximum-velocity - maximum speed that the panning of the pannable viewport		\li maximum-velocity - maximum speed that the panning of the pannable viewport
	can reach.		can reach.
	\sa MPannableWidget MWidgetStyle		\sa MPannableWidget MWidgetStyle
	*/		*/
	class M_EXPORT MPannableWidgetStyle : public MWidgetStyle		class M_VIEWS_EXPORT MPannableWidgetStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MPannableWidgetStyle)		M_STYLE(MPannableWidgetStyle)
	M_STYLE_ATTRIBUTE(qreal, panThreshold, PanThreshold)		M_STYLE_ATTRIBUTE(qreal, panThreshold, PanThreshold)
	M_STYLE_ATTRIBUTE(qreal, pointerSpringK, PointerSpringK)		M_STYLE_ATTRIBUTE(qreal, pointerSpringK, PointerSpringK)
	M_STYLE_ATTRIBUTE(qreal, frictionC, FrictionC)		M_STYLE_ATTRIBUTE(qreal, frictionC, FrictionC)
	M_STYLE_ATTRIBUTE(qreal, slidingFrictionC, SlidingFrictionC)		M_STYLE_ATTRIBUTE(qreal, slidingFrictionC, SlidingFrictionC)
	M_STYLE_ATTRIBUTE(qreal, borderSpringK, BorderSpringK)		M_STYLE_ATTRIBUTE(qreal, borderSpringK, BorderSpringK)
	M_STYLE_ATTRIBUTE(qreal, borderFrictionC, BorderFrictionC)		M_STYLE_ATTRIBUTE(qreal, borderFrictionC, BorderFrictionC)
	M_STYLE_ATTRIBUTE(qreal, panClickThreshold, PanClickThreshold)		M_STYLE_ATTRIBUTE(qreal, panClickThreshold, PanClickThreshold)
	M_STYLE_ATTRIBUTE(qreal, maximumVelocity, MaximumVelocity)		M_STYLE_ATTRIBUTE(qreal, maximumVelocity, MaximumVelocity)
	};		};
	class M_EXPORT MPannableWidgetStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MPannableWidgetStyleContainer : public MWidgetStyleCon tainer
	{		{
	M_STYLE_CONTAINER(MPannableWidgetStyle)		M_STYLE_CONTAINER(MPannableWidgetStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mpannablewidgetview.h		mpannablewidgetview.h
	skipping to change at line 34		skipping to change at line 34
	#include <mpannablewidgetmodel.h>		#include <mpannablewidgetmodel.h>
	#include <mpannablewidgetstyle.h>		#include <mpannablewidgetstyle.h>
	class MPannableWidgetViewPrivate;		class MPannableWidgetViewPrivate;
	class MPannableWidget;		class MPannableWidget;
	/*!		/*!
	* \class MPannableWidgetView		* \class MPannableWidgetView
	* \brief MPannableWidgetView implements the view for pannable widget		* \brief MPannableWidgetView implements the view for pannable widget
	*/		*/
	class M_EXPORT MPannableWidgetView : public MWidgetView		class M_VIEWS_EXPORT MPannableWidgetView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MPannableWidgetModel, MPannableWidgetStyle)		M_VIEW(MPannableWidgetModel, MPannableWidgetStyle)
	public:		public:
	MPannableWidgetView(MPannableWidget *controller);		MPannableWidgetView(MPannableWidget *controller);
	virtual ~MPannableWidgetView();		virtual ~MPannableWidgetView();
	protected:		protected:
	//! \reimp		//! \reimp
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mparallelanimationgroup.h		mparallelanimationgroup.h
	skipping to change at line 85		skipping to change at line 85
	opacityAnimation->setDuration(style()->duration());		opacityAnimation->setDuration(style()->duration());
	opacityAnimation->setEndValue(0.0);		opacityAnimation->setEndValue(0.0);
	opacityAnimation->setTargetObject(item);		opacityAnimation->setTargetObject(item);
	addAnimation(opacityAnimation);		addAnimation(opacityAnimation);
	}		}
	};		};
	\endcode		\endcode
	*/		*/
	class M_EXPORT MParallelAnimationGroup : public QParallelAnimationGroup		class M_CORE_EXPORT MParallelAnimationGroup : public QParallelAnimationGrou p
	{		{
	Q_OBJECT		Q_OBJECT
	Q_DECLARE_PRIVATE(MParallelAnimationGroup)		Q_DECLARE_PRIVATE(MParallelAnimationGroup)
	public:		public:
	/*! \brief Constructs the MParallelAnimationGroup base class, and passe s		/*! \brief Constructs the MParallelAnimationGroup base class, and passe s
	\p parent to the QParallelAnimationGroup's constructor.		\p parent to the QParallelAnimationGroup's constructor.
	\sa QParallelAnimationGroup, QAnimationGroup, QVariantAnimation		\sa QParallelAnimationGroup, QAnimationGroup, QVariantAnimation
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mphysics2dpanning.h		mphysics2dpanning.h
	skipping to change at line 56		skipping to change at line 56
	* spring. Additional forces come into play if the position goes		* spring. Additional forces come into play if the position goes
	* outside the range (border springs are applied). There are various		* outside the range (border springs are applied). There are various
	* friction constants slowing down the movement		* friction constants slowing down the movement
	*		*
	* The kinetic action of the springs can be disabled with setEnabled()		* The kinetic action of the springs can be disabled with setEnabled()
	* methods. In case the physics is disabled, the viewport will not		* methods. In case the physics is disabled, the viewport will not
	* keep panning after the pointer is released.		* keep panning after the pointer is released.
	*		*
	* By default, the kinetic action of the springs is enabled.		* By default, the kinetic action of the springs is enabled.
	*/		*/
	class M_EXPORT MPhysics2DPanning : public QObject		class M_CORE_EXPORT MPhysics2DPanning : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	//! \brief Current enabled/disabled state.		//! \brief Current enabled/disabled state.
	Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)		Q_PROPERTY(bool enabled READ enabled WRITE setEnabled)
	//! \brief Current panning orientations		//! \brief Current panning orientations
	Q_PROPERTY(Qt::Orientations panDirection READ panDirection WRITE setPan Direction)		Q_PROPERTY(Qt::Orientations panDirection READ panDirection WRITE setPan Direction)
	//! \brief Current panning range		//! \brief Current panning range
	Q_PROPERTY(QRectF range READ range WRITE setRange)		Q_PROPERTY(QRectF range READ range WRITE setRange)
	//! \brief Current pointer spring K constant value		//! \brief Current pointer spring K constant value
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpopuplist.h		mpopuplist.h
	skipping to change at line 92		skipping to change at line 92
	QStringList stringList;		QStringList stringList;
	stringList << "Item 1" << "Item 2";		stringList << "Item 1" << "Item 2";
	model->setStringList(stringList);		model->setStringList(stringList);
	popuplist->setItemModel(model);		popuplist->setItemModel(model);
	popuplist->appear();		popuplist->appear();
	\endcode		\endcode
	\sa MPopupListModel MPopupListStyle		\sa MPopupListModel MPopupListStyle
	*/		*/
	class M_EXPORT MPopupList : public MDialog		class M_CORE_EXPORT MPopupList : public MDialog
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MPopupList)		M_CONTROLLER(MPopupList)
	public:		public:
	/**		/**
	Constructs a new popuplist with no content		Constructs a new popuplist with no content
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpopuplistmodel.h		mpopuplistmodel.h
	skipping to change at line 36		skipping to change at line 36
	class QAbstractItemModel;		class QAbstractItemModel;
	/*!		/*!
	\class MPopupListModel		\class MPopupListModel
	\brief Data model class for MPopupList.		\brief Data model class for MPopupList.
	\ingroup models		\ingroup models
	\sa MPopupListModel		\sa MPopupListModel
	*/		*/
	class M_EXPORT MPopupListModel : public MDialogModel		class M_CORE_EXPORT MPopupListModel : public MDialogModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MPopupListModel)		M_MODEL_INTERNAL(MPopupListModel)
	/*!		/*!
	\property MPopupListModel::itemModel		\property MPopupListModel::itemModel
	\brief QAbstractItemModel which used by MPopupList		\brief QAbstractItemModel which used by MPopupList
	*/		*/
	M_MODEL_PTR_PROPERTY(QAbstractItemModel *, itemModel, ItemModel, true, 0)		M_MODEL_PTR_PROPERTY(QAbstractItemModel *, itemModel, ItemModel, true, 0)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpopupliststyle.h		mpopupliststyle.h
	skipping to change at line 35		skipping to change at line 35
	/*!		/*!
	\class MPopupListStyle		\class MPopupListStyle
	\brief Style class for standard MPopupList.		\brief Style class for standard MPopupList.
	MPopupListStyle is derived from MDialogStyle.		MPopupListStyle is derived from MDialogStyle.
	\ingroup styles		\ingroup styles
	\sa MPopupListStyleContainer MDialogStyle \ref styling MPopupList MPopu pListView		\sa MPopupListStyleContainer MDialogStyle \ref styling MPopupList MPopu pListView
	*/		*/
	class M_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)
	};		};
	/*!		/*!
	\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_EXPORT MPopupListStyleContainer : public MDialogStyleContainer		class M_VIEWS_EXPORT MPopupListStyleContainer : public MDialogStyleContaine r
	{		{
	M_STYLE_CONTAINER_INTERNAL(MPopupListStyle)		M_STYLE_CONTAINER_INTERNAL(MPopupListStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mpopuplistview.h		mpopuplistview.h
	skipping to change at line 43		skipping to change at line 43
	/*!		/*!
	\class MPopupListView		\class MPopupListView
	\brief View class for standard MPopupList.		\brief View class for standard MPopupList.
	\ingroup views		\ingroup views
	MPopupListView is used to visualize popupList.		MPopupListView is used to visualize popupList.
	*/		*/
	class M_EXPORT MPopupListView : public MDialogView		class M_VIEWS_EXPORT MPopupListView : public MDialogView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MPopupListModel, MPopupListStyle)		M_VIEW(MPopupListModel, MPopupListStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	\param controller Pointer to the button's controller		\param controller Pointer to the button's controller
	*/		*/
	MPopupListView(MPopupList *controller);		MPopupListView(MPopupList *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpositionindicator.h		mpositionindicator.h
	skipping to change at line 46		skipping to change at line 46
	* it only draws on the area near the edges of its area.		* it only draws on the area near the edges of its area.
	*		*
	* MPositionIndicator slots setViewportSize, setRange and setPosition		* MPositionIndicator slots setViewportSize, setRange and setPosition
	* need to be called when size of viewport, panned area inside		* need to be called when size of viewport, panned area inside
	* the viewport or panning position changes.		* the viewport or panning position changes.
	*		*
	* MPositionIndicator is a non-interactive widget. It only shows the		* MPositionIndicator is a non-interactive widget. It only shows the
	* current position, and it doesn't react to mouse events.		* current position, and it doesn't react to mouse events.
	*/		*/
	class M_EXPORT MPositionIndicator : public MWidgetController		class M_CORE_EXPORT MPositionIndicator : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MPositionIndicator)		M_CONTROLLER(MPositionIndicator)
	Q_PROPERTY(QSizeF viewportSize READ viewportSize WRITE setViewportSize)		Q_PROPERTY(QSizeF viewportSize READ viewportSize WRITE setViewportSize)
	Q_PROPERTY(QRectF range READ range WRITE setRange)		Q_PROPERTY(QRectF range READ range WRITE setRange)
	Q_PROPERTY(QPointF position READ position WRITE setPosition)		Q_PROPERTY(QPointF position READ position WRITE setPosition)
	public:		public:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpositionindicatormodel.h		mpositionindicatormodel.h
	skipping to change at line 30		skipping to change at line 30
	#ifndef MPOSITIONINDICATORMODEL_H		#ifndef MPOSITIONINDICATORMODEL_H
	#define MPOSITIONINDICATORMODEL_H		#define MPOSITIONINDICATORMODEL_H
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	#include <QHash>		#include <QHash>
	#include <QSizeF>		#include <QSizeF>
	#include <QRectF>		#include <QRectF>
	#include <QPointF>		#include <QPointF>
	class M_EXPORT MPositionIndicatorModel : public MWidgetModel		class M_CORE_EXPORT MPositionIndicatorModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MPositionIndicatorModel)		M_MODEL_INTERNAL(MPositionIndicatorModel)
	M_MODEL_PROPERTY(QSizeF, viewportSize, ViewportSize, true, QSizeF())		M_MODEL_PROPERTY(QSizeF, viewportSize, ViewportSize, true, QSizeF())
	M_MODEL_PROPERTY(QRectF, range, Range, true, QRectF())		M_MODEL_PROPERTY(QRectF, range, Range, true, QRectF())
	M_MODEL_PROPERTY(QPointF, position, Position, true, QPointF())		M_MODEL_PROPERTY(QPointF, position, Position, true, QPointF())
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpositionindicatorstyle.h		mpositionindicatorstyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MPOSITIONINDICATORSTYLE_H		#ifndef MPOSITIONINDICATORSTYLE_H
	#define MPOSITIONINDICATORSTYLE_H		#define MPOSITIONINDICATORSTYLE_H
	#include <QFont>		#include <QFont>
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	class QPixmap;		class QPixmap;
	class M_EXPORT MPositionIndicatorStyle : public MWidgetStyle		class M_VIEWS_EXPORT MPositionIndicatorStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MPositionIndicatorStyle)		M_STYLE(MPositionIndicatorStyle)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, indicatorImage, IndicatorImage)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, indicatorImage, IndicatorImage)
	M_STYLE_ATTRIBUTE(int, minIndicatorSize, MinIndicatorSize)		M_STYLE_ATTRIBUTE(int, minIndicatorSize, MinIndicatorSize)
	M_STYLE_ATTRIBUTE(int, hideTimeout, HideTimeout)		M_STYLE_ATTRIBUTE(int, hideTimeout, HideTimeout)
	};		};
	class M_EXPORT MPositionIndicatorStyleContainer : public MWidgetStyleContai ner		class M_VIEWS_EXPORT MPositionIndicatorStyleContainer : public MWidgetStyle Container
	{		{
	M_STYLE_CONTAINER(MPositionIndicatorStyle)		M_STYLE_CONTAINER(MPositionIndicatorStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mpositionindicatorview.h		mpositionindicatorview.h
	skipping to change at line 44		skipping to change at line 44
	\brief MPositionIndicatorView implements a view for MPositionIndicator		\brief MPositionIndicatorView implements a view for MPositionIndicator
	This class draws indicators on the right edge of a pannable viewport		This class draws indicators on the right edge of a pannable viewport
	(vertical panning), on the bottom edge (horizontal panning), or		(vertical panning), on the bottom edge (horizontal panning), or
	both. Position indicators are drawn only when the panned widget is		both. Position indicators are drawn only when the panned widget is
	moving, and the indicator hides itself when the panned widget stops		moving, and the indicator hides itself when the panned widget stops
	moving.		moving.
	*/		*/
	class M_EXPORT MPositionIndicatorView : public MWidgetView		class M_VIEWS_EXPORT MPositionIndicatorView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MPositionIndicatorModel, MPositionIndicatorStyle)		M_VIEW(MPositionIndicatorModel, MPositionIndicatorStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	*/		*/
	MPositionIndicatorView(MPositionIndicator *controller);		MPositionIndicatorView(MPositionIndicator *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mpreeditinjectionevent.h		mpreeditinjectionevent.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MPREEDITINJECTIONEVENT_H		#ifndef MPREEDITINJECTIONEVENT_H
	#define MPREEDITINJECTIONEVENT_H		#define MPREEDITINJECTIONEVENT_H
	#include "mexport.h"		#include "mexport.h"
	#include <QEvent>		#include <QEvent>
	class MPreeditInjectionEventPrivate;		class MPreeditInjectionEventPrivate;
	class M_EXPORT MPreeditInjectionEvent : public QEvent		class M_CORE_EXPORT MPreeditInjectionEvent : public QEvent
	{		{
	public:		public:
	MPreeditInjectionEvent(const QString &preedit);		MPreeditInjectionEvent(const QString &preedit);
	virtual ~MPreeditInjectionEvent();		virtual ~MPreeditInjectionEvent();
	QString preedit() const;		QString preedit() const;
	static QEvent::Type eventNumber();		static QEvent::Type eventNumber();
	protected:		protected:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mprogressindicator.h		mprogressindicator.h
	skipping to change at line 81		skipping to change at line 81
	indicator still shows the current status of the operation. How to? Depends on the selected type		indicator still shows the current status of the operation. How to? Depends on the selected type
	of the indicator.		of the indicator.
	\li Operation duration + haptic feedback: after the indicator has b een shown for long enough		\li Operation duration + haptic feedback: after the indicator has b een shown for long enough
	(current assumption: 8 seconds), a tacticon (=small vibra indic ator) should be presented		(current assumption: 8 seconds), a tacticon (=small vibra indic ator) should be presented
	when the indicator goes away. This enables the user to turn his /her attention back on the		when the indicator goes away. This enables the user to turn his /her attention back on the
	device when it becomes usable again.		device when it becomes usable again.
	\sa MProgressIndicatorModel MProgressIndicatorStyle		\sa MProgressIndicatorModel MProgressIndicatorStyle
	*/		*/
	class M_EXPORT MProgressIndicator : public MWidgetController		class M_CORE_EXPORT MProgressIndicator : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MProgressIndicator)		M_CONTROLLER(MProgressIndicator)
	/*!		/*!
	\property MProgressIndicator::minimum		\property MProgressIndicator::minimum
	\brief This property holds the progress indicator's minimum value.		\brief This property holds the progress indicator's minimum value.
	When setting this property, the \l maximum is adjusted if necessary to ensure that the range remains		When setting this property, the \l maximum is adjusted if necessary to ensure that the range remains
	valid. If the current value falls outside the new range, the progre ss bar is reset with reset().		valid. If the current value falls outside the new range, the progre ss bar is reset with reset().
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mprogressindicatorbarview.h		mprogressindicatorbarview.h
	skipping to change at line 67		skipping to change at line 67
	\section ProgressIndicatorBarViewOpenIssues Open issues		\section ProgressIndicatorBarViewOpenIssues Open issues
	\li Progress indicator shape, visualization, animation, size and po ssible subcomponents such		\li Progress indicator shape, visualization, animation, size and po ssible subcomponents such
	as label and error notification? Nothing yet decided by UI/Grap hics team, so far only concepting		as label and error notification? Nothing yet decided by UI/Grap hics team, so far only concepting
	has been done.		has been done.
	\li Layout: where to display the current status (%, time, data byte s) of the progress indication?		\li Layout: where to display the current status (%, time, data byte s) of the progress indication?
	\li Graphics		\li Graphics
	\sa MProgressIndicator MProgressIndicatorModel MProgressIndicatorStyle		\sa MProgressIndicator MProgressIndicatorModel MProgressIndicatorStyle
	*/		*/
	class M_EXPORT MProgressIndicatorBarView : public MWidgetView		class M_VIEWS_EXPORT MProgressIndicatorBarView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MProgressIndicatorModel, MProgressIndicatorStyle)		M_VIEW(MProgressIndicatorModel, MProgressIndicatorStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	\param controller Pointer to the progressindicator's controller		\param controller Pointer to the progressindicator's controller
	*/		*/
	MProgressIndicatorBarView(MProgressIndicator *controller);		MProgressIndicatorBarView(MProgressIndicator *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mprogressindicatormodel.h		mprogressindicatormodel.h
	skipping to change at line 33		skipping to change at line 33
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	/*!		/*!
	\class MProgressIndicatorModel		\class MProgressIndicatorModel
	\brief This is the data model class for progress indicator.		\brief This is the data model class for progress indicator.
	\ingroup models		\ingroup models
	\sa MProgressIndicator		\sa MProgressIndicator
	*/		*/
	class M_EXPORT MProgressIndicatorModel : public MWidgetModel		class M_CORE_EXPORT MProgressIndicatorModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MProgressIndicatorModel)		M_MODEL_INTERNAL(MProgressIndicatorModel)
	/*!		/*!
	* \property MProgressIndicatorModel::value		* \property MProgressIndicatorModel::value
	* \brief This property holds the progress indicator's current value.		* \brief This property holds the progress indicator's current value.
	*/		*/
	M_MODEL_PROPERTY(int, value, Value, true, 0)		M_MODEL_PROPERTY(int, value, Value, true, 0)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mprogressindicatorstyle.h		mprogressindicatorstyle.h
	skipping to change at line 32		skipping to change at line 32
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	/*!		/*!
	\class MProgressIndicatorStyle		\class MProgressIndicatorStyle
	\brief Style for progress indicator.		\brief Style for progress indicator.
	\ingroup styles		\ingroup styles
	\sa MProgressIndicatorStyleContainer		\sa MProgressIndicatorStyleContainer
	*/		*/
	class M_EXPORT MProgressIndicatorStyle : public MWidgetStyle		class M_VIEWS_EXPORT MProgressIndicatorStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MProgressIndicatorStyle)		M_STYLE(MProgressIndicatorStyle)
	/*!		/*!
	\property MProgressIndicatorStyle::progressBarBackground		\property MProgressIndicatorStyle::progressBarBackground
	\brief Background image of the progress bar.		\brief Background image of the progress bar.
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(MScalableImage *, progressBarBackground, Progress BarBackground)		M_STYLE_PTR_ATTRIBUTE(MScalableImage *, progressBarBackground, Progress BarBackground)
	skipping to change at line 118		skipping to change at line 118
	M_STYLE_ATTRIBUTE(int, refreshRate, RefreshRate)		M_STYLE_ATTRIBUTE(int, refreshRate, RefreshRate)
	};		};
	/*!		/*!
	\class MProgressIndicatorStyleContainer		\class MProgressIndicatorStyleContainer
	\brief This class groups all the styling modes for progress indicator.		\brief This class groups all the styling modes for progress indicator.
	\ingroup styles		\ingroup styles
	\sa MProgressIndicatorStyle		\sa MProgressIndicatorStyle
	*/		*/
	class M_EXPORT MProgressIndicatorStyleContainer : public MWidgetStyleContai ner		class M_VIEWS_EXPORT MProgressIndicatorStyleContainer : public MWidgetStyle Container
	{		{
	M_STYLE_CONTAINER(MProgressIndicatorStyle)		M_STYLE_CONTAINER(MProgressIndicatorStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mremoteaction.h		mremoteaction.h
	skipping to change at line 34		skipping to change at line 34
	#include <MExport>		#include <MExport>
	class MRemoteActionPrivate;		class MRemoteActionPrivate;
	/*!		/*!
	* \class MRemoteAction		* \class MRemoteAction
	*		*
	* \brief MRemoteAction implements a MAction that executes a D-Bus call whe n triggered.		* \brief MRemoteAction implements a MAction that executes a D-Bus call whe n triggered.
	* The D-Bus related parameters can be serialized and unserialized i nto a string.		* The D-Bus related parameters can be serialized and unserialized i nto a string.
	*/		*/
	class M_EXPORT MRemoteAction : public MAction		class M_CORE_EXPORT MRemoteAction : public MAction
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* \brief Constructs a MRemoteAction from a D-Bus service path, object path, interface and arguments.		* \brief Constructs a MRemoteAction from a D-Bus service path, object path, interface and arguments.
	*		*
	* \param serviceName the service path of the D-Bus object to be called		* \param serviceName the service path of the D-Bus object to be called
	* \param objectPath the object path of the D-Bus object to be called		* \param objectPath the object path of the D-Bus object to be called
	* \param interface the interface of the D-Bus object to be called		* \param interface the interface of the D-Bus object to be called
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mrichtextedit.h		mrichtextedit.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MRICHTEXTEDIT_H		#ifndef MRICHTEXTEDIT_H
	#define MRICHTEXTEDIT_H		#define MRICHTEXTEDIT_H
	#include <MTextEdit>		#include <MTextEdit>
	#include <QTextCharFormat>		#include <QTextCharFormat>
	class MRichTextEditPrivate;		class MRichTextEditPrivate;
	class M_EXPORT MRichTextEdit : public MTextEdit		class M_CORE_EXPORT MRichTextEdit : public MTextEdit
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* \brief Default constructor. Creates a textEdit field containing the specified text and line mode with rich text support.		* \brief Default constructor. Creates a textEdit field containing the specified text and line mode with rich text support.
	* \param type widget type (single line or multiline).		* \param type widget type (single line or multiline).
	* \param text optional text.		* \param text optional text.
	* \param parent optional parent.		* \param parent optional parent.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mrichtexteditstyle.h		mrichtexteditstyle.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MRICHTEXTEDITSTYLE_H		#ifndef MRICHTEXTEDITSTYLE_H
	#define MRICHTEXTEDITSTYLE_H		#define MRICHTEXTEDITSTYLE_H
	#include <QFont>		#include <QFont>
	#include <QColor>		#include <QColor>
	#include <QString>		#include <QString>
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	#include "mtexteditstyle.h"		#include "mtexteditstyle.h"
	class M_EXPORT MRichTextEditStyle : public MTextEditStyle		class M_VIEWS_EXPORT MRichTextEditStyle : public MTextEditStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MRichTextEditStyle)		M_STYLE(MRichTextEditStyle)
	};		};
	class M_EXPORT MRichTextEditStyleContainer : public MTextEditStyleContainer		class M_VIEWS_EXPORT MRichTextEditStyleContainer : public MTextEditStyleCon tainer
	{		{
	M_STYLE_CONTAINER(MRichTextEditStyle)		M_STYLE_CONTAINER(MRichTextEditStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mscalableimage.h		mscalableimage.h
	skipping to change at line 53		skipping to change at line 53
	The scalable area of the image is defined using the left, right, top and bottom		The scalable area of the image is defined using the left, right, top and bottom
	border parameters. The borders are defined as pixels and they cannot be l arger		border parameters. The borders are defined as pixels and they cannot be l arger
	the used source pixmap.		the used source pixmap.
	The corner blocks are not scaled at all. The horizontal edges (h_edge) ar e		The corner blocks are not scaled at all. The horizontal edges (h_edge) ar e
	scaled only horizontally and the vertical edges (v_edge) only vertically. The		scaled only horizontally and the vertical edges (v_edge) only vertically. The
	center block is scaled vertically and horizontally if needed. The size in putted		center block is scaled vertically and horizontally if needed. The size in putted
	into one the draw() methods cannot be smaller than the defined borders.		into one the draw() methods cannot be smaller than the defined borders.
	*/		*/
	class M_EXPORT MScalableImage : public QObject		class M_CORE_EXPORT MScalableImage : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	\brief Default constructor. Initiates pixmap and borders to 0.		\brief Default constructor. Initiates pixmap and borders to 0.
	*/		*/
	MScalableImage();		MScalableImage();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mscene.h		mscene.h
	skipping to change at line 58		skipping to change at line 58
	- Bounding rectangles, toggled by <Ctrl>-<Shift>-B		- Bounding rectangles, toggled by <Ctrl>-<Shift>-B
	- Margins, toggled by <Ctrl>-<Shift>-M		- Margins, toggled by <Ctrl>-<Shift>-M
	- Positions, toggled by <Ctrl>-<Shift>-P		- Positions, toggled by <Ctrl>-<Shift>-P
	- Sizes, toggled by <Ctrl>-<Shift>-S		- Sizes, toggled by <Ctrl>-<Shift>-S
	- Object names, toggled by <Ctrl>-<Shift>-N		- Object names, toggled by <Ctrl>-<Shift>-N
	- Frames per second, toggled by <Ctrl>-<Shift>-F		- Frames per second, toggled by <Ctrl>-<Shift>-F
	- Take screenshot, triggered by <Ctrl>-<Shift>-T		- Take screenshot, triggered by <Ctrl>-<Shift>-T
	\sa MWindow, MApplicationWindow		\sa MWindow, MApplicationWindow
	*/		*/
	class M_EXPORT MScene : public QGraphicsScene		class M_CORE_EXPORT MScene : public QGraphicsScene
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	Constructs a MScene.		Constructs a MScene.
	*/		*/
	explicit MScene(QObject *parent = 0);		explicit MScene(QObject *parent = 0);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mscenelayereffectdimstyle.h		mscenelayereffectdimstyle.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MSCENELAYEREFFECTDIMSTYLE_H		#ifndef MSCENELAYEREFFECTDIMSTYLE_H
	#define MSCENELAYEREFFECTDIMSTYLE_H		#define MSCENELAYEREFFECTDIMSTYLE_H
	#include <QEasingCurve>		#include <QEasingCurve>
	#include <mscenelayereffectstyle.h>		#include <mscenelayereffectstyle.h>
	class M_EXPORT MSceneLayerEffectDimStyle : public MSceneLayerEffectStyle		class M_VIEWS_EXPORT MSceneLayerEffectDimStyle : public MSceneLayerEffectSt yle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MSceneLayerEffectDimStyle)		M_STYLE_INTERNAL(MSceneLayerEffectDimStyle)
	M_STYLE_ATTRIBUTE(qreal, opacity, Opacity)		M_STYLE_ATTRIBUTE(qreal, opacity, Opacity)
	M_STYLE_ATTRIBUTE(QEasingCurve, easingCurve, EasingCurve)		M_STYLE_ATTRIBUTE(QEasingCurve, easingCurve, EasingCurve)
	M_STYLE_ATTRIBUTE(int, fadeDuration, FadeDuration)		M_STYLE_ATTRIBUTE(int, fadeDuration, FadeDuration)
	};		};
	class M_EXPORT MSceneLayerEffectDimStyleContainer : public MSceneLayerEffec tStyleContainer		class M_VIEWS_EXPORT MSceneLayerEffectDimStyleContainer : public MSceneLaye rEffectStyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MSceneLayerEffectDimStyle)		M_STYLE_CONTAINER_INTERNAL(MSceneLayerEffectDimStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mscenelayereffectmodel.h		mscenelayereffectmodel.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 MSCENELAYEREFFECTMODEL_H		#ifndef MSCENELAYEREFFECTMODEL_H
	#define MSCENELAYEREFFECTMODEL_H		#define MSCENELAYEREFFECTMODEL_H
	#include <mscenewindowmodel.h>		#include <mscenewindowmodel.h>
	class M_EXPORT MSceneLayerEffectModel : public MSceneWindowModel		class M_CORE_EXPORT MSceneLayerEffectModel : public MSceneWindowModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MSceneLayerEffectModel)		M_MODEL_INTERNAL(MSceneLayerEffectModel)
	M_MODEL_PROPERTY(bool, enabled, Enabled, true, false)		M_MODEL_PROPERTY(bool, enabled, Enabled, true, false)
	};		};
	#endif		#endif
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mscenelayereffectstyle.h		mscenelayereffectstyle.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 MSCENELAYEREFFECTSTYLE_H		#ifndef MSCENELAYEREFFECTSTYLE_H
	#define MSCENELAYEREFFECTSTYLE_H		#define MSCENELAYEREFFECTSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_EXPORT MSceneLayerEffectStyle : public MSceneWindowStyle		class M_VIEWS_EXPORT MSceneLayerEffectStyle : public MSceneWindowStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MSceneLayerEffectStyle)		M_STYLE_INTERNAL(MSceneLayerEffectStyle)
	};		};
	class M_EXPORT MSceneLayerEffectStyleContainer : public MSceneWindowStyleCo ntainer		class M_VIEWS_EXPORT MSceneLayerEffectStyleContainer : public MSceneWindowS tyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MSceneLayerEffectStyle)		M_STYLE_CONTAINER_INTERNAL(MSceneLayerEffectStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mscenemanager.h		mscenemanager.h
	skipping to change at line 53		skipping to change at line 53
	* MSceneManager ensures that the MSceneWindows of a MScene are correctly		* MSceneManager ensures that the MSceneWindows of a MScene are correctly
	* positioned and stacked, similarly to what a window manager does for top level		* positioned and stacked, similarly to what a window manager does for top level
	* windows in a tradicional windowing system.		* windows in a tradicional windowing system.
	*		*
	* MSceneManager also orchestrates MSceneWindow's transitions such as		* MSceneManager also orchestrates MSceneWindow's transitions such as
	* appearance, disappearance and display orientation changes (e.g., from po rtrait		* appearance, disappearance and display orientation changes (e.g., from po rtrait
	* to landscape).		* to landscape).
	*		*
	* \sa MSceneWindow		* \sa MSceneWindow
	*/		*/
	class M_EXPORT MSceneManager : public QObject		class M_CORE_EXPORT MSceneManager : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	friend class MSceneWindow;		friend class MSceneWindow;
			friend class MWindow;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MSceneManager;		friend class Ut_MSceneManager;
	#endif		#endif
	public:		public:
	/*!		/*!
	* This enum is used to describe whether the orientation change		* This enum is used to describe whether the orientation change
	* invoked manually should be animated or not.		* invoked manually should be animated or not.
	*		*
End of changes. 2 change blocks.
	1 lines changed or deleted		2 lines changed or added

	mscenewindow.h		mscenewindow.h
	skipping to change at line 86		skipping to change at line 86
	* attributes will also be under scene manager control:		* attributes will also be under scene manager control:
	* - pos()		* - pos()
	* - size()		* - size()
	* - geometry()		* - geometry()
	*		*
	* Manually changing attributes that are under the control of a scene manag er		* Manually changing attributes that are under the control of a scene manag er
	* is not supported and can lead to unpredictable behavior.		* is not supported and can lead to unpredictable behavior.
	*		*
	* \sa MSceneManager		* \sa MSceneManager
	*/		*/
	class M_EXPORT MSceneWindow : public MWidgetController		class M_CORE_EXPORT MSceneWindow : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSceneWindow)		M_CONTROLLER(MSceneWindow)
	Q_PROPERTY(bool managedManually READ isManagedManually WRITE setManaged Manually)		Q_PROPERTY(bool managedManually READ isManagedManually WRITE setManaged Manually)
	public:		public:
	/*!		/*!
	* This enum defines how to handle scene window after hiding it using d isappear() or dismiss().		* This enum defines how to handle scene window after hiding it using d isappear() or dismiss().
	*/		*/
	skipping to change at line 269		skipping to change at line 269
	* This slot will first send a MDismissEvent to the widget, which may o r may		* This slot will first send a MDismissEvent to the widget, which may o r may
	* not accept the event. If the event was ignored, nothing happens. If the event		* not accept the event. If the event was ignored, nothing happens. If the event
	* was accepted, it will disappear() the scene window.		* was accepted, it will disappear() the scene window.
	*		*
	* If DestroyWhenDone was used on the last appear() call and		* If DestroyWhenDone was used on the last appear() call and
	* the event was accepted, the scene window will be deleted after its		* the event was accepted, the scene window will be deleted after its
	* disappearance is finished.		* disappearance is finished.
	*		*
	* Please refer to MDismissEvent documentation for more information.		* Please refer to MDismissEvent documentation for more information.
	*		*
	* \sa dismissNow(), dismissEvent(), disappear(), deleteWhenDone(),		* \sa dismissEvent(), disappear(), deleteWhenDone(),
	* MSceneManager::dismissSceneWindow()		* MSceneManager::dismissSceneWindow()
	*/		*/
	bool dismiss();		bool dismiss();
	public:		public:
	/*!		/*!
	* Returns the currently active deletion policy of this window.		* Returns the currently active deletion policy of this window.
	* \return Deletion policy of this window, KeepWhenDone as a default.		* \return Deletion policy of this window, KeepWhenDone as a default.
	* \sa DeletionPolicy		* \sa DeletionPolicy
	*/		*/
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mscenewindowanimationstyle.h		mscenewindowanimationstyle.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MSCENEWINDOWANIMATIONSTYLE_H		#ifndef MSCENEWINDOWANIMATIONSTYLE_H
	#define MSCENEWINDOWANIMATIONSTYLE_H		#define MSCENEWINDOWANIMATIONSTYLE_H
	#include <manimationstyle.h>		#include <manimationstyle.h>
	//#include <QEasingCurve>		//#include <QEasingCurve>
	class M_EXPORT MSceneWindowAnimationStyle : public MAnimationStyle		class M_CORE_EXPORT MSceneWindowAnimationStyle : public MAnimationStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MSceneWindowAnimationStyle)		M_STYLE_INTERNAL(MSceneWindowAnimationStyle)
	M_STYLE_ATTRIBUTE(int, showDuration, ShowDuration)		M_STYLE_ATTRIBUTE(int, showDuration, ShowDuration)
	M_STYLE_ATTRIBUTE(int, hideDuration, HideDuration)		M_STYLE_ATTRIBUTE(int, hideDuration, HideDuration)
	M_STYLE_ATTRIBUTE(int, moveDuration, MoveDuration)		M_STYLE_ATTRIBUTE(int, moveDuration, MoveDuration)
	//M_STYLE_ATTRIBUTE(QEasingCurve, showCurve, ShowCurve)		//M_STYLE_ATTRIBUTE(QEasingCurve, showCurve, ShowCurve)
	//M_STYLE_ATTRIBUTE(QEasingCurve, hideCurve, HideCurve)		//M_STYLE_ATTRIBUTE(QEasingCurve, hideCurve, HideCurve)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mscenewindowmodel.h		mscenewindowmodel.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 MSCENEWINDOWMODEL_H		#ifndef MSCENEWINDOWMODEL_H
	#define MSCENEWINDOWMODEL_H		#define MSCENEWINDOWMODEL_H
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	class M_EXPORT MSceneWindowModel : public MWidgetModel		class M_CORE_EXPORT MSceneWindowModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MSceneWindowModel)		M_MODEL_INTERNAL(MSceneWindowModel)
	/*!		/*!
	* \property The scene window will disappear after a timeout		* \property The scene window will disappear after a timeout
	*/		*/
	M_MODEL_PROPERTY(int, disappearTimeout, DisappearTimeout, true, 0)		M_MODEL_PROPERTY(int, disappearTimeout, DisappearTimeout, true, 0)
	};		};
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mscenewindowstyle.h		mscenewindowstyle.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MSCENEWINDOWSTYLE_H		#ifndef MSCENEWINDOWSTYLE_H
	#define MSCENEWINDOWSTYLE_H		#define MSCENEWINDOWSTYLE_H
	#include <QPointF>		#include <QPointF>
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	class M_EXPORT MSceneWindowStyle : public MWidgetStyle		class M_VIEWS_EXPORT MSceneWindowStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MSceneWindowStyle)		M_STYLE(MSceneWindowStyle)
	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)
	};		};
	class M_EXPORT MSceneWindowStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MSceneWindowStyleContainer : public MWidgetStyleContai ner
	{		{
	M_STYLE_CONTAINER(MSceneWindowStyle)		M_STYLE_CONTAINER(MSceneWindowStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mscenewindowview.h		mscenewindowview.h
	skipping to change at line 42		skipping to change at line 42
	* \brief This is a default view class for MSceneWindow.		* \brief This is a default view class for MSceneWindow.
	*		*
	* The MSceneWindowView provides an interface to notify		* The MSceneWindowView provides an interface to notify
	* the scene manager about changes in scene window's		* the scene manager about changes in scene window's
	* geometry-related style attributes. It is the preferred		* geometry-related style attributes. It is the preferred
	* base class for views of all types of scene windows.		* base class for views of all types of scene windows.
	* Once its style changes, it emits a geometryAttributesChanged()		* Once its style changes, it emits a geometryAttributesChanged()
	* signal, which is propagated to the MSceneManager instance,		* signal, which is propagated to the MSceneManager instance,
	* causing the window geometry and position to be recalculated.		* causing the window geometry and position to be recalculated.
	*/		*/
	class M_EXPORT MSceneWindowView : public MWidgetView		class M_VIEWS_EXPORT MSceneWindowView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MSceneWindowModel, MSceneWindowStyle)		M_VIEW(MSceneWindowModel, MSceneWindowStyle)
	Q_PROPERTY(Qt::Alignment alignment READ alignment)		Q_PROPERTY(Qt::Alignment alignment READ alignment)
	Q_PROPERTY(QPointF offset READ offset)		Q_PROPERTY(QPointF offset READ offset)
	public:		public:
	/*!		/*!
	* \brief Creates a new instance of the view for the given /a controlle r.		* \brief Creates a new instance of the view for the given /a controlle r.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mseekbar.h		mseekbar.h
	skipping to change at line 53		skipping to change at line 53
	loadedContentMaximum = playerSeekBar->value();		loadedContentMaximum = playerSeekBar->value();
	playerSeekBar->setLoadedContentMinimum(loadedContentMinimum );		playerSeekBar->setLoadedContentMinimum(loadedContentMinimum );
	playerSeekBar->setLoadedContentMaximum(loadedContentMaximum );		playerSeekBar->setLoadedContentMaximum(loadedContentMaximum );
	}		}
	\endcode		\endcode
	\sa MSeekBarModel MSliderStyle		\sa MSeekBarModel MSliderStyle
	*/		*/
	class M_EXPORT MSeekBar : public MSlider		class M_CORE_EXPORT MSeekBar : public MSlider
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSeekBar)		M_CONTROLLER(MSeekBar)
	/*!		/*!
	\property MSlider::loadedContentMinimum		\property MSlider::loadedContentMinimum
	\brief Minimum value in seekbar loaded content range.		\brief Minimum value in seekbar loaded content range.
	See MSeekBarModel::loadedContentMin for details.		See MSeekBarModel::loadedContentMin for details.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mseekbarmodel.h		mseekbarmodel.h
	skipping to change at line 32		skipping to change at line 32
	#include <mslidermodel.h>		#include <mslidermodel.h>
	/*!		/*!
	\class MSliderModel		\class MSliderModel
	\brief Model class for MSlider.		\brief Model class for MSlider.
	\ingroup models		\ingroup models
	\sa MSlider		\sa MSlider
	*/		*/
	class M_EXPORT MSeekBarModel : public MSliderModel		class M_CORE_EXPORT MSeekBarModel : public MSliderModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MSeekBarModel)		M_MODEL_INTERNAL(MSeekBarModel)
	private:		private:
	/*!		/*!
	\property MSeekBarModel::loadedContentMin		\property MSeekBarModel::loadedContentMin
	\brief Minimum value of seekbar loaded content range.		\brief Minimum value of seekbar loaded content range.
	*/		*/
	M_MODEL_PROPERTY(int, loadedContentMin, LoadedContentMin, true, 0)		M_MODEL_PROPERTY(int, loadedContentMin, LoadedContentMin, true, 0)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mseparator.h		mseparator.h
	skipping to change at line 33		skipping to change at line 33
	#include <MWidgetController>		#include <MWidgetController>
	#include <mexport.h>		#include <mexport.h>
	#include "mseparatormodel.h"		#include "mseparatormodel.h"
	class MSeparatorPrivate;		class MSeparatorPrivate;
	/*!		/*!
	* \class MSeparator		* \class MSeparator
	* \brief MSeparator is a generic separator widget.		* \brief MSeparator is a generic separator widget.
	*/		*/
	class M_EXPORT MSeparator : public MWidgetController		class M_CORE_EXPORT MSeparator : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSeparator)		M_CONTROLLER(MSeparator)
	/*!		/*!
	\property MSeparator::orientation		\property MSeparator::orientation
	\brief See MSeparatorModel::orientation		\brief See MSeparatorModel::orientation
	*/		*/
	Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)		Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrient ation)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mseparatormodel.h		mseparatormodel.h
	skipping to change at line 33		skipping to change at line 33
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	/*!		/*!
	\class MSeparatorModel		\class MSeparatorModel
	\brief Data model class for MSeparator		\brief Data model class for MSeparator
	\ingroup models		\ingroup models
	\sa MSeparator		\sa MSeparator
	*/		*/
	class M_EXPORT MSeparatorModel : public MWidgetModel		class M_CORE_EXPORT MSeparatorModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MSeparatorModel)		M_MODEL_INTERNAL(MSeparatorModel)
	/*!		/*!
	\property MSeparatorModel::orientation		\property MSeparatorModel::orientation
	\brief display orientation		\brief display orientation
	*/		*/
	M_MODEL_PROPERTY(Qt::Orientation, orientation, Orientation, true, Qt::H orizontal)		M_MODEL_PROPERTY(Qt::Orientation, orientation, Orientation, true, Qt::H orizontal)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mseparatorstyle.h		mseparatorstyle.h
	skipping to change at line 39		skipping to change at line 39
	\code		\code
	MSeparatorStyle {		MSeparatorStyle {
	span: 0.6mm;		span: 0.6mm;
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MSeparatorStyleContainer MWidgetStyle \ref styling MSeparator		\sa MSeparatorStyleContainer MWidgetStyle \ref styling MSeparator
	*/		*/
	class M_EXPORT MSeparatorStyle : public MWidgetStyle		class M_VIEWS_EXPORT MSeparatorStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MSeparatorStyle)		M_STYLE(MSeparatorStyle)
	/*!		/*!
	\property MSeparatorStyle::span		\property MSeparatorStyle::span
	\brief separator span.		\brief separator span.
	*/		*/
	M_STYLE_ATTRIBUTE(int, span, Span)		M_STYLE_ATTRIBUTE(int, span, Span)
	};		};
	/*!		/*!
	\class MSeparatorStyleContainer		\class MSeparatorStyleContainer
	\brief Style mode container class for MSeparatorStyle.		\brief Style mode container class for MSeparatorStyle.
	\ingroup styles		\ingroup styles
	\sa MSeparatorStyle		\sa MSeparatorStyle
	*/		*/
	class M_EXPORT MSeparatorStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MSeparatorStyleContainer : public MWidgetStyleContaine r
	{		{
	M_STYLE_CONTAINER(MSeparatorStyle)		M_STYLE_CONTAINER(MSeparatorStyle)
	M_STYLE_MODE(Horizontal)		M_STYLE_MODE(Horizontal)
	M_STYLE_MODE(Vertical)		M_STYLE_MODE(Vertical)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mseparatorview.h		mseparatorview.h
	skipping to change at line 35		skipping to change at line 35
	#include <mseparatorstyle.h>		#include <mseparatorstyle.h>
	class MSeparatorViewPrivate;		class MSeparatorViewPrivate;
	class MSeparator;		class MSeparator;
	/*!		/*!
	\class MSeparatorView		\class MSeparatorView
	\brief MSeparatorView implements a view for the MSeparator		\brief MSeparatorView implements a view for the MSeparator
	*/		*/
	class M_EXPORT MSeparatorView : public MWidgetView		class M_VIEWS_EXPORT MSeparatorView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MSeparatorModel, MSeparatorStyle)		M_VIEW(MSeparatorModel, MSeparatorStyle)
	public:		public:
	/*!		/*!
	\brief Constructor		\brief Constructor
	\param controller Pointer to the separator's controller		\param controller Pointer to the separator's controller
	*/		*/
	MSeparatorView(MSeparator *controller);		MSeparatorView(MSeparator *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mserviceaction.h		mserviceaction.h
	skipping to change at line 32		skipping to change at line 32
	#include "maction.h"		#include "maction.h"
	#include "mexport.h"		#include "mexport.h"
	class MServiceActionPrivate;		class MServiceActionPrivate;
	/*!		/*!
	* Base class for actions that can be used to launch services.		* Base class for actions that can be used to launch services.
	*/		*/
	class M_EXPORT MServiceAction : public MAction		class M_CORE_EXPORT MServiceAction : public MAction
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*/		*/
	explicit MServiceAction(QObject *parent);		explicit MServiceAction(QObject *parent);
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mservicefwbaseif.h		mservicefwbaseif.h
	skipping to change at line 46		skipping to change at line 46
	* \author Max Waterman		* \author Max Waterman
	* \brief The base class from which all service interface classes are be de rived.		* \brief The base class from which all service interface classes are be de rived.
	*		*
	* Service Interface classes are autogenerated and so there is no need		* Service Interface classes are autogenerated and so there is no need
	* for developers to directly reference this class.		* for developers to directly reference this class.
	*		*
	* MServiceFwBaseIf hides the servicefw machanisms from the derived class,		* MServiceFwBaseIf hides the servicefw machanisms from the derived class,
	* including service discovery and underlying IPC methods.		* including service discovery and underlying IPC methods.
	*/		*/
	class M_EXPORT MServiceFwBaseIf : public QObject		class M_CORE_EXPORT MServiceFwBaseIf : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	* \brief Constructs a base interface		* \brief Constructs a base interface
	* \param iface Interface to which to connect		* \param iface Interface to which to connect
	* \param parent Parent object		* \param parent Parent object
	*/		*/
	explicit MServiceFwBaseIf(const QString &iface, QObject *parent = 0);		explicit MServiceFwBaseIf(const QString &iface, QObject *parent = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mserviceinvoker.h		mserviceinvoker.h
	skipping to change at line 29		skipping to change at line 29
	#ifndef MSERVICEINVOKER_H		#ifndef MSERVICEINVOKER_H
	#define MSERVICEINVOKER_H		#define MSERVICEINVOKER_H
	#include <QObject>		#include <QObject>
	#include <mexport.h>		#include <mexport.h>
	/*!		/*!
	* A helper service that invokes service actions.		* A helper service that invokes service actions.
	*/		*/
	class M_EXPORT MServiceInvoker : public QObject		class M_CORE_EXPORT MServiceInvoker : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	private:		private:
	/*!		/*!
	* Hidden default constructor		* Hidden default constructor
	*/		*/
	MServiceInvoker();		MServiceInvoker();
	Q_DISABLE_COPY(MServiceInvoker)		Q_DISABLE_COPY(MServiceInvoker)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	msettingslanguagebinary.h		msettingslanguagebinary.h
	skipping to change at line 33		skipping to change at line 33
	#include <QList>		#include <QList>
	#include "mexport.h"		#include "mexport.h"
	#include "msettingslanguagesettings.h"		#include "msettingslanguagesettings.h"
	/*!		/*!
	* \brief The root class for the settings binary interface.		* \brief The root class for the settings binary interface.
	*		*
	* This is the central access point class for the settings binary		* This is the central access point class for the settings binary
	* interface.		* interface.
	*/		*/
	class M_EXPORT MSettingsLanguageBinary : public MSettingsLanguageSettings		class M_SETTINGS_EXPORT MSettingsLanguageBinary : public MSettingsLanguageS ettings
	{		{
	public:		public:
	/*!		/*!
	* Constructor.		* Constructor.
	*/		*/
	MSettingsLanguageBinary();		MSettingsLanguageBinary();
	/*!		/*!
	* Destructor.		* Destructor.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	msettingslanguageparser.h		msettingslanguageparser.h
	skipping to change at line 37		skipping to change at line 37
	#include "msettingslanguagebinary.h"		#include "msettingslanguagebinary.h"
	class MSettingsLanguageParserPrivate;		class MSettingsLanguageParserPrivate;
	/*!		/*!
	* \brief Parser class for the settings language.		* \brief Parser class for the settings language.
	*		*
	* This class can be used to read in a settings language description		* This class can be used to read in a settings language description
	* and transfer it into a binary representation.		* and transfer it into a binary representation.
	*/		*/
	class M_EXPORT MSettingsLanguageParser		class M_SETTINGS_EXPORT MSettingsLanguageParser
	{		{
	public:		public:
	/*!		/*!
	* Constructs a parser.		* Constructs a parser.
	*/		*/
	MSettingsLanguageParser();		MSettingsLanguageParser();
	/*!		/*!
	* Destructor.		* Destructor.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	msettingslanguagesettingsfactorystyle.h		msettingslanguagesettingsfactorystyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MSETTINGSLANGUAGESETTINGSFACTORYSTYLE_H_		#ifndef MSETTINGSLANGUAGESETTINGSFACTORYSTYLE_H_
	#define MSETTINGSLANGUAGESETTINGSFACTORYSTYLE_H_		#define MSETTINGSLANGUAGESETTINGSFACTORYSTYLE_H_
	#include <MWidgetStyle>		#include <MWidgetStyle>
	/*!		/*!
	* MSettingsLanguageSettingsFactoryStyle is the style class for MSettingsLa nguageSettingFactory.		* MSettingsLanguageSettingsFactoryStyle is the style class for MSettingsLa nguageSettingFactory.
	*/		*/
	class M_EXPORT MSettingsLanguageSettingsFactoryStyle : public MWidgetStyle		class M_SETTINGS_EXPORT MSettingsLanguageSettingsFactoryStyle : public MWid getStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MSettingsLanguageSettingsFactoryStyle)		M_STYLE(MSettingsLanguageSettingsFactoryStyle)
	//! The image ID of the content indicator to be shown next to clickable items		//! The image ID of the content indicator to be shown next to clickable items
	M_STYLE_ATTRIBUTE(QString, contentIndicator, ContentIndicator)		M_STYLE_ATTRIBUTE(QString, contentIndicator, ContentIndicator)
	//! The size of the content indicator		//! The size of the content indicator
	M_STYLE_ATTRIBUTE(QSize, contentIndicatorSize, ContentIndicatorSize)		M_STYLE_ATTRIBUTE(QSize, contentIndicatorSize, ContentIndicatorSize)
	skipping to change at line 59		skipping to change at line 59
	//! The right margin of the content indicator when it is not inside a M Container		//! The right margin of the content indicator when it is not inside a M Container
	M_STYLE_ATTRIBUTE(qreal, contentIndicatorRightMargin, ContentIndicatorR ightMargin)		M_STYLE_ATTRIBUTE(qreal, contentIndicatorRightMargin, ContentIndicatorR ightMargin)
	//! The bottom margin of the content indicator when it is not inside a MContainer		//! The bottom margin of the content indicator when it is not inside a MContainer
	M_STYLE_ATTRIBUTE(qreal, contentIndicatorBottomMargin, ContentIndicator BottomMargin)		M_STYLE_ATTRIBUTE(qreal, contentIndicatorBottomMargin, ContentIndicator BottomMargin)
	};		};
	/*!		/*!
	* MSettingsLanguageSettingsFactoryStyleContainer is the style container cl ass for MSettingsLanguageSettingFactory.		* MSettingsLanguageSettingsFactoryStyleContainer is the style container cl ass for MSettingsLanguageSettingFactory.
	*/		*/
	class M_EXPORT MSettingsLanguageSettingsFactoryStyleContainer : public MWid getStyleContainer		class M_SETTINGS_EXPORT MSettingsLanguageSettingsFactoryStyleContainer : pu blic MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MSettingsLanguageSettingsFactoryStyle)		M_STYLE_CONTAINER(MSettingsLanguageSettingsFactoryStyle)
	};		};
	#endif /* MSETTINGSLANGUAGESETTINGSFACTORYSTYLE_H_ */		#endif /* MSETTINGSLANGUAGESETTINGSFACTORYSTYLE_H_ */
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	msettingslanguagewidget.h		msettingslanguagewidget.h
	skipping to change at line 31		skipping to change at line 31
	#define MSETTINGSLANGUAGEWIDGET_H_		#define MSETTINGSLANGUAGEWIDGET_H_
	#include <MWidgetController>		#include <MWidgetController>
	#include "mexport.h"		#include "mexport.h"
	typedef MWidgetModel MSettingsLanguageWidgetModel;		typedef MWidgetModel MSettingsLanguageWidgetModel;
	/*!		/*!
	* MSettingsLanguageWidget is a UI component that represents a MSettingsLan guageBinary node.		* MSettingsLanguageWidget is a UI component that represents a MSettingsLan guageBinary node.
	*/		*/
	class M_EXPORT MSettingsLanguageWidget : public MWidgetController		class M_SETTINGS_EXPORT MSettingsLanguageWidget : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSettingsLanguageWidget)		M_CONTROLLER(MSettingsLanguageWidget)
	public:		public:
	/*!		/*!
	* Constructs a new MSettingsLanguageWidget.		* Constructs a new MSettingsLanguageWidget.
	*		*
	* \param parent the parent for the menu item		* \param parent the parent for the menu item
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	msettingslanguagewidgetfactory.h		msettingslanguagewidgetfactory.h
	skipping to change at line 34		skipping to change at line 34
	#include <QString>		#include <QString>
	class MWidget;		class MWidget;
	class MSettingsLanguageWidget;		class MSettingsLanguageWidget;
	class MSettingsLanguageBinary;		class MSettingsLanguageBinary;
	class MDataStore;		class MDataStore;
	/*!		/*!
	* A factory for translating settings binaries to widgets.		* A factory for translating settings binaries to widgets.
	*/		*/
	class M_EXPORT MSettingsLanguageWidgetFactory		class M_SETTINGS_EXPORT MSettingsLanguageWidgetFactory
	{		{
	/*!		/*!
	* Private constructor to prevent construction.		* Private constructor to prevent construction.
	*/		*/
	MSettingsLanguageWidgetFactory() {}		MSettingsLanguageWidgetFactory() {}
	Q_DISABLE_COPY(MSettingsLanguageWidgetFactory)		Q_DISABLE_COPY(MSettingsLanguageWidgetFactory)
	public:		public:
	/*!		/*!
	* \brief Creates a widget from a MSettingsLanguageBinary representatio n.		* \brief Creates a widget from a MSettingsLanguageBinary representatio n.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mshareddata.h		mshareddata.h
	skipping to change at line 80		skipping to change at line 80
	QString str;		QString str;
	QVariant color;		QVariant color;
	*shm >> str >> color;		*shm >> str >> color;
	shm->close();		shm->close();
	\endcode		\endcode
	*/		*/
	class MSharedDataPrivate;		class MSharedDataPrivate;
	class M_EXPORT MSharedData : public QObject		class M_CORE_EXPORT MSharedData : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(int pageSize READ pageSize WRITE setPageSize)		Q_PROPERTY(int pageSize READ pageSize WRITE setPageSize)
	Q_ENUMS(OpenMode)		Q_ENUMS(OpenMode)
	public:		public:
	enum OpenMode { ReadOnly, Write };		enum OpenMode { ReadOnly, Write };
	/*!		/*!
	skipping to change at line 171		skipping to change at line 171
	* Writes QVariant to shared memory		* Writes QVariant to shared memory
	*/		*/
	MSharedData &operator<< (QVariant v);		MSharedData &operator<< (QVariant v);
	/*!		/*!
	* Writes QString to shared memory		* Writes QString to shared memory
	*/		*/
	MSharedData &operator<< (QString str);		MSharedData &operator<< (QString str);
	/*!		/*!
			* Writes QByteArray to shared memory
			*/
			MSharedData &operator<< (QByteArray array);
			/*!
	* Reads integer from shared memory		* Reads integer from shared memory
	*/		*/
	MSharedData &operator>> (int &i);		MSharedData &operator>> (int &i);
	/*!		/*!
	* Reads boolean from shared memory		* Reads boolean from shared memory
	*/		*/
	MSharedData &operator>> (bool &i);		MSharedData &operator>> (bool &i);
	/*!		/*!
	skipping to change at line 200		skipping to change at line 205
	/*!		/*!
	* Reads QVariant from shared memory		* Reads QVariant from shared memory
	*/		*/
	MSharedData &operator>> (QVariant &v);		MSharedData &operator>> (QVariant &v);
	/*!		/*!
	* Reads QString from shared memory		* Reads QString from shared memory
	*/		*/
	MSharedData &operator>> (QString &str);		MSharedData &operator>> (QString &str);
			/*!
			* Reads QByteArray from shared memory
			*/
			MSharedData &operator>> (QByteArray &array);
	protected:		protected:
	MSharedDataPrivate *const d_ptr;		MSharedDataPrivate *const d_ptr;
	private:		private:
	Q_DISABLE_COPY(MSharedData)		Q_DISABLE_COPY(MSharedData)
	Q_DECLARE_PRIVATE(MSharedData)		Q_DECLARE_PRIVATE(MSharedData)
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	1 lines changed or deleted		11 lines changed or added

	mslider.h		mslider.h
	skipping to change at line 68		skipping to change at line 68
	//modifySliderValue		//modifySliderValue
	void SliderTesterPage::modifySliderValue(int newValue)		void SliderTesterPage::modifySliderValue(int newValue)
	{		{
	slider->setHandleLabel(QString::number(newValue));		slider->setHandleLabel(QString::number(newValue));
	}		}
	\endcode		\endcode
	\sa MSliderModel MSliderStyle		\sa MSliderModel MSliderStyle
	*/		*/
	class M_EXPORT MSlider : public MWidgetController		class M_CORE_EXPORT MSlider : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSlider)		M_CONTROLLER(MSlider)
	/*!		/*!
	\property MSlider::state		\property MSlider::state
	\brief Slider state (pressed or released).		\brief Slider state (pressed or released).
	See MSliderModel::state for details.		See MSliderModel::state for details.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mslidermodel.h		mslidermodel.h
	skipping to change at line 32		skipping to change at line 32
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	/*!		/*!
	\class MSliderModel		\class MSliderModel
	\brief Model class for MSlider.		\brief Model class for MSlider.
	\ingroup models		\ingroup models
	\sa MSlider		\sa MSlider
	*/		*/
	class M_EXPORT MSliderModel : public MWidgetModel		class M_CORE_EXPORT MSliderModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MSliderModel)		M_MODEL_INTERNAL(MSliderModel)
	public:		public:
	/*!		/*!
	\brief Defined whether slider handle is pressed (MSliderModel::Presse d)		\brief Defined whether slider handle is pressed (MSliderModel::Presse d)
	or released (MSliderModel::Released).		or released (MSliderModel::Released).
	*/		*/
	enum SliderState {		enum SliderState {
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	msliderstyle.h		msliderstyle.h
	skipping to change at line 39		skipping to change at line 39
	class QPixmap;		class QPixmap;
	class MScalableImage;		class MScalableImage;
	/*!		/*!
	\class MSliderStyle		\class MSliderStyle
	\brief Style class for MSlider and MSeekBar.		\brief Style class for MSlider and MSeekBar.
	\ingroup styles		\ingroup styles
	\sa MSliderStyleContainer MWidgetStyle \ref styling MSliderView		\sa MSliderStyleContainer MWidgetStyle \ref styling MSliderView
	*/		*/
	class M_EXPORT MSliderStyle : public MWidgetStyle		class M_VIEWS_EXPORT MSliderStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MSliderStyle)		M_STYLE(MSliderStyle)
	/*!		/*!
	\property MSliderStyle::handlePixmap		\property MSliderStyle::handlePixmap
	\brief Handle image for released status of horizontal slider.		\brief Handle image for released status of horizontal slider.
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(QPixmap *, handlePixmap, HandlePixmap)		M_STYLE_PTR_ATTRIBUTE(QPixmap *, handlePixmap, HandlePixmap)
	/*!		/*!
	skipping to change at line 151		skipping to change at line 151
	\brief Minimum time between haptic feedbacks when moving slider (in milliseconds)		\brief Minimum time between haptic feedbacks when moving slider (in milliseconds)
	*/		*/
	M_STYLE_ATTRIBUTE(int, minimumFeedbackInterval, MinimumFeedbackInterval )		M_STYLE_ATTRIBUTE(int, minimumFeedbackInterval, MinimumFeedbackInterval )
	/*!		/*!
	\property MSlider::stepsPerFeedback		\property MSlider::stepsPerFeedback
	\brief Steps needed before giving haptic feedback when moving slide r		\brief Steps needed before giving haptic feedback when moving slide r
	*/		*/
	M_STYLE_ATTRIBUTE(int, stepsPerFeedback, StepsPerFeedback)		M_STYLE_ATTRIBUTE(int, stepsPerFeedback, StepsPerFeedback)
	};		};
	class M_EXPORT MSliderStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MSliderStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MSliderStyle)		M_STYLE_CONTAINER(MSliderStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	msliderview.h		msliderview.h
	skipping to change at line 58		skipping to change at line 58
	Slider value is changed by draging slider handle to required place.		Slider value is changed by draging slider handle to required place.
	If slider groove is tapped, slider thumb will be moved to that plac e		If slider groove is tapped, slider thumb will be moved to that plac e
	and slider will fall into Pressed state.		and slider will fall into Pressed state.
	\section MSliderViewOpenIssues Open issues		\section MSliderViewOpenIssues Open issues
	- Animated slider handle moving (when dragging or tapping slider gr oove) not supported yet.		- Animated slider handle moving (when dragging or tapping slider gr oove) not supported yet.
	\sa MSliderStyle MWidgetView		\sa MSliderStyle MWidgetView
	*/		*/
	class M_EXPORT MSliderView : public MWidgetView		class M_VIEWS_EXPORT MSliderView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MSliderModel, MSliderStyle)		M_VIEW(MSliderModel, MSliderStyle)
			//! \internal
			Q_PROPERTY(int position READ position WRITE setPosition)
			//! \internal_end
	public:		public:
	/*!		/*!
	\brief Constructs toolbar view.		\brief Constructs toolbar view.
	\param controller Pointer to the controller.		\param controller Pointer to the controller.
	*/		*/
	MSliderView(MSlider *controller);		MSliderView(MSlider *controller);
	/*!		/*!
	\brief Destructs the view.		\brief Destructs the view.
	*/		*/
	skipping to change at line 158		skipping to change at line 162
	Called when timer event occures.		Called when timer event occures.
	*/		*/
	virtual void hideEvent(QHideEvent* event);		virtual void hideEvent(QHideEvent* event);
	MSliderViewPrivate *const d_ptr;		MSliderViewPrivate *const d_ptr;
	private:		private:
	Q_DISABLE_COPY(MSliderView)		Q_DISABLE_COPY(MSliderView)
	Q_DECLARE_PRIVATE(MSliderView)		Q_DECLARE_PRIVATE(MSliderView)
			//! \internal
			int position() const;
			void setPosition(int position);
			//! \internal_end
	private Q_SLOTS:		private Q_SLOTS:
	/*!		/*!
	\brief Lowers slider handle indicator		\brief Lowers slider handle indicator
	*/		*/
	void lowerSliderHandleIndicator();		void lowerSliderHandleIndicator();
	/*!		/*!
	\brief Called when underlying controller object visibility changed		\brief Called when underlying controller object visibility changed
	*/		*/
	void changeSliderHandleIndicatorVisibility();		void changeSliderHandleIndicatorVisibility();
End of changes. 3 change blocks.
	1 lines changed or deleted		10 lines changed or added

	msortfilterproxymodel.h		msortfilterproxymodel.h
	skipping to change at line 32		skipping to change at line 32
	#include <MExport>		#include <MExport>
	#include <QSortFilterProxyModel>		#include <QSortFilterProxyModel>
	/*!		/*!
	\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_EXPORT MSortFilterProxyModel : public QSortFilterProxyModel		class M_CORE_EXPORT MSortFilterProxyModel : public QSortFilterProxyModel
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	\brief Constructor.		\brief Constructor.
	\param parent Model owner.		\param parent Model owner.
	*/		*/
	MSortFilterProxyModel(QObject *parent = NULL);		MSortFilterProxyModel(QObject *parent = NULL);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mspinnerstyle.h		mspinnerstyle.h
	skipping to change at line 32		skipping to change at line 32
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	/*!		/*!
	\class MSpinnerStyle		\class MSpinnerStyle
	\brief Style for progress indicator.		\brief Style for progress indicator.
	\ingroup styles		\ingroup styles
	\sa MSpinnerStyleContainer		\sa MSpinnerStyleContainer
	*/		*/
	class M_EXPORT MSpinnerStyle : public MWidgetStyle		class M_VIEWS_EXPORT MSpinnerStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MSpinnerStyle)		M_STYLE(MSpinnerStyle)
	/*!		/*!
	\property MSpinnerStyle:bgImage		\property MSpinnerStyle:bgImage
	\brief Image of background of spinner		\brief Image of background of spinner
	*/		*/
	M_STYLE_PTR_ATTRIBUTE(QPixmap *, bgPixmap, BgPixmap)		M_STYLE_PTR_ATTRIBUTE(QPixmap *, bgPixmap, BgPixmap)
	skipping to change at line 69		skipping to change at line 69
	M_STYLE_ATTRIBUTE(int, refreshRate, RefreshRate)		M_STYLE_ATTRIBUTE(int, refreshRate, RefreshRate)
	};		};
	/*!		/*!
	\class MSpinnerStyleContainer		\class MSpinnerStyleContainer
	\brief This class groups all the styling modes for progress indicator.		\brief This class groups all the styling modes for progress indicator.
	\ingroup styles		\ingroup styles
	\sa MSpinnerStyle		\sa MSpinnerStyle
	*/		*/
	class M_EXPORT MSpinnerStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MSpinnerStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MSpinnerStyle)		M_STYLE_CONTAINER(MSpinnerStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mspinnerview.h		mspinnerview.h
	skipping to change at line 62		skipping to change at line 62
	\section SpinnerOpenIssues Open issues		\section SpinnerOpenIssues Open issues
	\li Progress indicator shape, visualization, animation, size and po ssible subcomponents such		\li Progress indicator shape, visualization, animation, size and po ssible subcomponents such
	as label and error notification? Nothing yet decided by UI/Grap hics team, so far only concepting		as label and error notification? Nothing yet decided by UI/Grap hics team, so far only concepting
	has been done.		has been done.
	\li Layout: where to display the current status (%, time, data byte s) of the progress indication?		\li Layout: where to display the current status (%, time, data byte s) of the progress indication?
	\li Graphics		\li Graphics
	\sa MProgressIndicator MProgressIndicatorModel MSpinnerStyle		\sa MProgressIndicator MProgressIndicatorModel MSpinnerStyle
	*/		*/
	class M_EXPORT MSpinnerView : public MWidgetView		class M_VIEWS_EXPORT MSpinnerView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MProgressIndicatorModel, MSpinnerStyle)		M_VIEW(MProgressIndicatorModel, MSpinnerStyle)
	Q_PROPERTY(int angle READ angle WRITE setAngle)		Q_PROPERTY(int angle READ angle WRITE setAngle)
	public:		public:
	/*!		/*!
	* \brief Constructor		* \brief Constructor
	*		*
	* \param controller Pointer to the progressindicator's controller		* \param controller Pointer to the progressindicator's controller
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mstatusbar.h		mstatusbar.h
	skipping to change at line 37		skipping to change at line 37
	/*!		/*!
	* \class MStatusBar		* \class MStatusBar
	* \brief A status bar that shows essential information on overall system s tatus.		* \brief A status bar that shows essential information on overall system s tatus.
	*		*
	* Most applications shouldn't use this class directly as MApplicationWindo w provides one already.		* Most applications shouldn't use this class directly as MApplicationWindo w provides one already.
	* On the other hand, if an application is using an MWindow instead, a stat us bar may be added to		* On the other hand, if an application is using an MWindow instead, a stat us bar may be added to
	* its GUI by utilizing this class.		* its GUI by utilizing this class.
	*		*
	* MSceneManager does not accept more than one MStatusBar instance.		* MSceneManager does not accept more than one MStatusBar instance.
	*/		*/
	class M_EXPORT MStatusBar : public MSceneWindow		class M_CORE_EXPORT MStatusBar : public MSceneWindow
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MSceneWindow)		M_CONTROLLER(MSceneWindow)
	public:		public:
	/*!		/*!
	* \brief Default constructor.		* \brief Default constructor.
	*/		*/
	MStatusBar();		MStatusBar();
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mstatusbarstyle.h		mstatusbarstyle.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 MSTATUSBARSTYLE_H		#ifndef MSTATUSBARSTYLE_H
	#define MSTATUSBARSTYLE_H		#define MSTATUSBARSTYLE_H
	#include <mscenewindowstyle.h>		#include <mscenewindowstyle.h>
	class M_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)
	};		};
	class M_EXPORT MStatusBarStyleContainer : public MSceneWindowStyleContainer		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. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mstylablewidget.h		mstylablewidget.h
	skipping to change at line 93		skipping to change at line 93
	virtual void drawContents(QPainter* painter, const QStyleOption GraphicsItem* option) const;		virtual void drawContents(QPainter* painter, const QStyleOption GraphicsItem* option) const;
	private:		private:
	M_STYLABLE_WIDGET(MyStyle)		M_STYLABLE_WIDGET(MyStyle)
	};		};
	\endcode		\endcode
	MyStyle class should follow typical style declaration:		MyStyle class should follow typical style declaration:
	\code		\code
	#include <MWidgetStyle>		#include <MWidgetStyle>
	class M_EXPORT MyStyle : public MWidgetStyle		class M_CORE_EXPORT MyStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MyStyle)		M_STYLE(MyStyle)
	M_STYLE_ATTRIBUTE(bool, drawTiledHorizontal, DrawTiledHorizo ntal)		M_STYLE_ATTRIBUTE(bool, drawTiledHorizontal, DrawTiledHorizo ntal)
	M_STYLE_ATTRIBUTE(QString, imageHorizontal, ImageHorizontal)		M_STYLE_ATTRIBUTE(QString, imageHorizontal, ImageHorizontal)
	M_STYLE_ATTRIBUTE(QString, imageVertical, ImageVertical)		M_STYLE_ATTRIBUTE(QString, imageVertical, ImageVertical)
	};		};
	class M_EXPORT MyStyleContainer : public MWidgetStyleContainer		class M_CORE_EXPORT MyStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MyStyle)		M_STYLE_CONTAINER(MyStyle)
	};		};
	\endcode		\endcode
	Please note, that paint() should NOT be overridden in order to draw the contents of the widget.		Please note, that paint() should NOT be overridden in order to draw the contents of the widget.
	Following methods should be used instead: drawBackground() drawContents () drawForeground().		Following methods should be used instead: drawBackground() drawContents () drawForeground().
	When calculating the area to which the widget should be drawn, please t ake		When calculating the area to which the widget should be drawn, please t ake
	margins into consideration:		margins into consideration:
	\code		\code
	QRectF paintingRect = QRectF( QPointF(style()->marginLeft(), style()-> marginTop()),		QRectF paintingRect = QRectF( QPointF(style()->marginLeft(), style()-> marginTop()),
	size() - QSizeF(style()->marginRight(),s tyle()->marginBottom()));		size() - QSizeF(style()->marginRight(),s tyle()->marginBottom()));
	\endcode		\endcode
	*/		*/
	class M_EXPORT MStylableWidget : public MWidgetController		class M_CORE_EXPORT MStylableWidget : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	friend class MStylableWidgetView;		friend class MStylableWidgetView;
	public:		public:
	/*!		/*!
	* \brief Constructor that sets up the widget.		* \brief Constructor that sets up the widget.
	* \param parent Parent widget.		* \param parent Parent widget.
	*/		*/
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	mstylablewidgetstyle.h		mstylablewidgetstyle.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 MSTYLABLEWIDGETSTYLE_H		#ifndef MSTYLABLEWIDGETSTYLE_H
	#define MSTYLABLEWIDGETSTYLE_H		#define MSTYLABLEWIDGETSTYLE_H
	#include <MWidgetStyle>		#include <MWidgetStyle>
	class M_EXPORT MStylableWidgetStyle : public MWidgetStyle		class M_VIEWS_EXPORT MStylableWidgetStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MStylableWidgetStyle)		M_STYLE(MStylableWidgetStyle)
	};		};
	class M_EXPORT MStylableWidgetStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MStylableWidgetStyleContainer : public MWidgetStyleCon tainer
	{		{
	M_STYLE_CONTAINER(MStylableWidgetStyle)		M_STYLE_CONTAINER(MStylableWidgetStyle)
	};		};
	#endif // MSTYLABLEWIDGETSTYLE_H		#endif // MSTYLABLEWIDGETSTYLE_H
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mstyle.h		mstyle.h
	skipping to change at line 104		skipping to change at line 104
	Q_DECLARE_PRIVATE(STYLE_CLASS##Container)		Q_DECLARE_PRIVATE(STYLE_CLASS##Container)
	// style mode macro		// style mode macro
	#define M_STYLE_MODE(MODE) \		#define M_STYLE_MODE(MODE) \
	public: \		public: \
	void setMode##MODE();		void setMode##MODE();
	class MWidgetController;		class MWidgetController;
	class MWidgetViewPrivate;		class MWidgetViewPrivate;
	class M_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();
	friend class MStyleSheet;		friend class MStyleSheet;
	friend class MStyleSheetPrivate;		friend class MStyleSheetPrivate;
	friend class MThemePrivate;		friend class MThemePrivate;
	};		};
	class M_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;
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mstylecreator.h		mstylecreator.h
	skipping to change at line 45		skipping to change at line 45
	#endif		#endif
	// forward declarations		// forward declarations
	class MStyle;		class MStyle;
	class MStyleCreatorBasePrivate;		class MStyleCreatorBasePrivate;
	// interface for MStyleGenerators		// interface for MStyleGenerators
	// you can implement your own creator or use MStyleCreator template class w ith		// you can implement your own creator or use MStyleCreator template class w ith
	// M_REGISTER_STYLE-macro.		// M_REGISTER_STYLE-macro.
	class M_EXPORT MStyleCreatorBase		class M_CORE_EXPORT MStyleCreatorBase
	{		{
	public:		public:
	/*!		/*!
	Constructor will register this creator to MClassFactory.		Constructor will register this creator to MClassFactory.
	*/		*/
	MStyleCreatorBase(const char *styleClassName,		MStyleCreatorBase(const char *styleClassName,
	const char *styleAssemblyName,		const char *styleAssemblyName,
	M::AssemblyType styleAssemblyType);		M::AssemblyType styleAssemblyType);
	/*!		/*!
	skipping to change at line 91		skipping to change at line 91
	/*!		/*!
	Returns meta object of the style.		Returns meta object of the style.
	*/		*/
	virtual const QMetaObject *metaObject() const = 0;		virtual const QMetaObject *metaObject() const = 0;
	private:		private:
	MStyleCreatorBasePrivate *const d_ptr;		MStyleCreatorBasePrivate *const d_ptr;
	};		};
	template<class STYLE>		template<class STYLE>
	class M_EXPORT MStyleCreator : public MStyleCreatorBase		class MStyleCreator : public MStyleCreatorBase
	{		{
	public:		public:
	MStyleCreator(const char *styleClassName,		MStyleCreator(const char *styleClassName,
	const char *styleAssemblyName,		const char *styleAssemblyName,
	M::AssemblyType styleAssemblyType) :		M::AssemblyType styleAssemblyType) :
	MStyleCreatorBase(styleClassName, styleAssemblyName, styleAssemblyT ype)		MStyleCreatorBase(styleClassName, styleAssemblyName, styleAssemblyT ype)
	{}		{}
	virtual ~MStyleCreator()		virtual ~MStyleCreator()
	{}		{}
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	msubdatastore.h		msubdatastore.h
	skipping to change at line 34		skipping to change at line 34
	/*!		/*!
	* MSubDataStore takes another DataStore object and gives a limited view to it.		* MSubDataStore takes another DataStore object and gives a limited view to it.
	*		*
	* MSubDataStore doesn't store any data by itself but instead it uses anoth er DataStore		* MSubDataStore doesn't store any data by itself but instead it uses anoth er DataStore
	* object for this. MSubDataStore offers a limited view to the keys of the underlying DataStore.		* object for this. MSubDataStore offers a limited view to the keys of the underlying DataStore.
	* It only allows access to keys with a given prefix. This can be seen as a namespace limitation.		* It only allows access to keys with a given prefix. This can be seen as a namespace limitation.
	* The prefix or namespace as well as the underlying DataStore object are g iven at		* The prefix or namespace as well as the underlying DataStore object are g iven at
	* construction time and they can't be changed after that.		* construction time and they can't be changed after that.
	*/		*/
	class M_EXPORT MSubDataStore : public MDataStore		class M_EXTENSIONS_EXPORT MSubDataStore : public MDataStore
	{		{
	Q_OBJECT		Q_OBJECT
	//! The prefix of the sub data store.		//! The prefix of the sub data store.
	QString _prefix;		QString _prefix;
	//! The length of the prefix string. Calculated only once for efficienc y.		//! The length of the prefix string. Calculated only once for efficienc y.
	int _prefixLength;		int _prefixLength;
	//! The base data store object this object uses.		//! The base data store object this object uses.
	MDataStore &_baseStore;		MDataStore &_baseStore;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mtextedit.h		mtextedit.h
	skipping to change at line 57		skipping to change at line 57
	* if that is not enough, contents can be scrolled horizontally.		* if that is not enough, contents can be scrolled horizontally.
	*		*
	* Caution: please do not use setInputMethodHints(Qt::InputMethodHints) wit h		* Caution: please do not use setInputMethodHints(Qt::InputMethodHints) wit h
	* objects of this class, you have to use setContentType, setInputMethodCor rectionEnabled,		* objects of this class, you have to use setContentType, setInputMethodCor rectionEnabled,
	* setMaskedInput and other similar function instead.		* setMaskedInput and other similar function instead.
	*		*
	* If you just need to display a small text snippet then you should use		* If you just need to display a small text snippet then you should use
	* MLabel instead.		* MLabel instead.
	*		*
	*/		*/
	class M_EXPORT MTextEdit : public MWidgetController		class M_CORE_EXPORT MTextEdit : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MTextEdit)		M_CONTROLLER(MTextEdit)
	Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true)		Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged USER true)
	// TODO: following type should be M::TextContentType, unfortunately due to a moc bug,		// TODO: following type should be M::TextContentType, unfortunately due to a moc bug,
	// such code doesn't compile with the current Qt. Need to change this w hen it works.		// such code doesn't compile with the current Qt. Need to change this w hen it works.
	Q_PROPERTY(TextContentType contentType READ contentType WRITE setConten tType)		Q_PROPERTY(TextContentType contentType READ contentType WRITE setConten tType)
	Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInter actionFlags WRITE setTextInteractionFlags)		Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInter actionFlags WRITE setTextInteractionFlags)
	Q_PROPERTY(QString prompt READ prompt WRITE setPrompt)		Q_PROPERTY(QString prompt READ prompt WRITE setPrompt)
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mtexteditmodel.h		mtexteditmodel.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MTEXTEDITMODEL_H		#ifndef MTEXTEDITMODEL_H
	#define MTEXTEDITMODEL_H		#define MTEXTEDITMODEL_H
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	#include <limits>		#include <limits>
	#include <QTextDocument>		#include <QTextDocument>
	#include "mnamespace.h"		#include "mnamespace.h"
	class M_EXPORT MTextEditModel : public MWidgetModel		class M_CORE_EXPORT MTextEditModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MTextEditModel)		M_MODEL_INTERNAL(MTextEditModel)
	public:		public:
	//! Edit mode for MTextEdit		//! Edit mode for MTextEdit
	enum EditMode {		enum EditMode {
	//! The main mode of operation, no selection or preedit		//! The main mode of operation, no selection or preedit
	EditModeBasic,		EditModeBasic,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mtexteditstyle.h		mtexteditstyle.h
	skipping to change at line 28		skipping to change at line 28
	*************************************************************************** */		*************************************************************************** */
	#ifndef MTEXTEDITSTYLE_H		#ifndef MTEXTEDITSTYLE_H
	#define MTEXTEDITSTYLE_H		#define MTEXTEDITSTYLE_H
	#include <QFont>		#include <QFont>
	#include <QColor>		#include <QColor>
	#include <QString>		#include <QString>
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	class M_EXPORT MTextEditStyle : public MWidgetStyle		class M_VIEWS_EXPORT MTextEditStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MTextEditStyle)		M_STYLE(MTextEditStyle)
	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)
	skipping to change at line 76		skipping to change at line 76
	*/		*/
	M_STYLE_ATTRIBUTE(MFeedback, releaseWordFeedback, ReleaseWordFeedback)		M_STYLE_ATTRIBUTE(MFeedback, releaseWordFeedback, ReleaseWordFeedback)
	/*!		/*!
	\property MTextEditStyle::changeSelectionFeedback		\property MTextEditStyle::changeSelectionFeedback
	\brief Feedback given when finger movement changes text selection		\brief Feedback given when finger movement changes text selection
	*/		*/
	M_STYLE_ATTRIBUTE(MFeedback, changeSelectionFeedback, ChangeSelectionFe edback)		M_STYLE_ATTRIBUTE(MFeedback, changeSelectionFeedback, ChangeSelectionFe edback)
	};		};
	class M_EXPORT MTextEditStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MTextEditStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MTextEditStyle)		M_STYLE_CONTAINER(MTextEditStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mtexteditview.h		mtexteditview.h
	skipping to change at line 34		skipping to change at line 34
	#include <mtexteditmodel.h>		#include <mtexteditmodel.h>
	#include <mtexteditstyle.h>		#include <mtexteditstyle.h>
	class MTextEdit;		class MTextEdit;
	class MTextEditViewPrivate;		class MTextEditViewPrivate;
	/*!		/*!
	* \class MTextEditView		* \class MTextEditView
	* \brief Standard view for MTextEdit widget		* \brief Standard view for MTextEdit widget
	*/		*/
	class M_EXPORT MTextEditView : public MWidgetView		class M_VIEWS_EXPORT MTextEditView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MTextEditModel, MTextEditStyle)		M_VIEW(MTextEditModel, MTextEditStyle)
	public:		public:
	/*!		/*!
	* \brief Constructor		* \brief Constructor
	* \param controller MTextEdit widget which this view shows		* \param controller MTextEdit widget which this view shows
	*/		*/
	MTextEditView(MTextEdit *controller);		MTextEditView(MTextEdit *controller);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mtheme.h		mtheme.h
	skipping to change at line 62		skipping to change at line 62
	graphical assets in the form of QPixmaps and MScalableImages, as well as s tyle and view		graphical assets in the form of QPixmaps and MScalableImages, as well as s tyle and view
	instances for the widgets.		instances for the widgets.
	MTheme communicates with a theme server whenever a graphical asset		MTheme communicates with a theme server whenever a graphical asset
	is requested. The theme server is responsible for loading the graphics (ei ther from		is requested. The theme server is responsible for loading the graphics (ei ther from
	static image files, by rasterizing SVG or through procedural generation) a nd sharing them.		static image files, by rasterizing SVG or through procedural generation) a nd sharing them.
	The sharing of graphics assets is platform specific, MeeGo Touch ships wit h a reference theme		The sharing of graphics assets is platform specific, MeeGo Touch ships wit h a reference theme
	server called \a mthemedaemon that shares assets using the X11 system. In case a theme server		server called \a mthemedaemon that shares assets using the X11 system. In case a theme server
	is not available, no sharing occurs and each graphical asset is duplicated for each application.		is not available, no sharing occurs and each graphical asset is duplicated for each application.
	*/		*/
	class M_EXPORT MTheme : public QObject		class M_CORE_EXPORT MTheme : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	ViewTypes are standardized widget variant names, as defined by the widg ets themselves. For example,		ViewTypes are standardized widget variant names, as defined by the widg ets themselves. For example,
	MButton::checkboxType can be expected to be implemented by each theme, while a random non-standard		MButton::checkboxType can be expected to be implemented by each theme, while a random non-standard
	type is unlikely to be. There is a mapping of view types to view implem entation class names in the		type is unlikely to be. There is a mapping of view types to view implem entation class names in the
	theme configurations.		theme configurations.
	skipping to change at line 348		skipping to change at line 348
	/*!		/*!
	Returns the name of the current theme in use.		Returns the name of the current theme in use.
	*/		*/
	static QString currentTheme();		static QString currentTheme();
	/*!		/*!
	Returns true if there are pending asynchronous pixmap requests in the system.		Returns true if there are pending asynchronous pixmap requests in the system.
	*/		*/
	static bool hasPendingRequests();		static bool hasPendingRequests();
			static void cleanupGarbage();
	Q_SIGNALS:		Q_SIGNALS:
	/*!		/*!
	This signal is emitted when all pixmap requests have finished.		This signal is emitted when all pixmap requests have finished.
	The signal is emitted regardless of if the request was successfull or not.		The signal is emitted regardless of if the request was successfull or not.
	Note that for regular applications, listening for this signal is		Note that for regular applications, listening for this signal is
	not necessary, since any change automatically triggers an update of		not necessary, since any change automatically triggers an update of
	the interface.		the interface.
	skipping to change at line 401		skipping to change at line 403
	//! \internal		//! \internal
	MThemePrivate *const d_ptr;		MThemePrivate *const d_ptr;
	//! \internal_end		//! \internal_end
	private:		private:
	Q_DISABLE_COPY(MTheme)		Q_DISABLE_COPY(MTheme)
	Q_DECLARE_PRIVATE(MTheme)		Q_DECLARE_PRIVATE(MTheme)
	#ifndef UNIT_TEST		#ifndef UNIT_TEST
	Q_PRIVATE_SLOT(d_func(), void themeChangedSlot(const QStringList &, con		Q_PRIVATE_SLOT(d_func(), void themeChangedSlot(QStringList,QStringList)
	st QStringList &))		)
	Q_PRIVATE_SLOT(d_func(), void pixmapCreatedOrChangedSlot(const QString		Q_PRIVATE_SLOT(d_func(), void pixmapCreatedOrChangedSlot(QString,QSize,
	&, const QSize &, Qt::HANDLE))		MPixmapHandle))
	Q_PRIVATE_SLOT(d_func(), void localeChangedSlot())		Q_PRIVATE_SLOT(d_func(), void localeChangedSlot())
	#endif		#endif
	friend class MApplicationPrivate;		friend class MApplicationPrivate;
	friend class MComponentData;		friend class MComponentData;
	friend class MWidgetController;		friend class MWidgetController;
	friend class MStyle;		friend class MStyle;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	//! Test unit is defined as a friend of production code to access priva te members		//! Test unit is defined as a friend of production code to access priva te members
End of changes. 3 change blocks.
	5 lines changed or deleted		7 lines changed or added

	mtimestamp.h		mtimestamp.h
	skipping to change at line 26		skipping to change at line 26
	** of this file.		** of this file.
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MTIMESTAMP_H		#ifndef MTIMESTAMP_H
	#define MTIMESTAMP_H		#define MTIMESTAMP_H
	#include <QString>		#include <QString>
	#include "mexport.h"		#include "mexport.h"
	void M_EXPORT mTimestampStream(const QString &module, const QString &file, const QString &scope, const QString &msg);		void M_CORE_EXPORT mTimestampStream(const QString &module, const QString &f ile, const QString &scope, const QString &msg);
	#if defined(QT_NO_WARNING_OUTPUT) || !defined(M_TIMESTAMP)		#if defined(QT_NO_WARNING_OUTPUT) || !defined(M_TIMESTAMP)
	#define mTimestamp(x, msg)		#define mTimestamp(x, msg)
	#else		#else
	/**		/**
	* Prints debug message with timestamp.		* Prints debug message with timestamp.
	* This function do nothing if macro M_TIMESTAMP is not defined.		* This function do nothing if macro M_TIMESTAMP is not defined.
	*		*
	* Example:		* Example:
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mtoolbar.h		mtoolbar.h
	skipping to change at line 116		skipping to change at line 116
	\section MToolBarVariants Variants		\section MToolBarVariants Variants
	\li \link MToolBarView Default toolbar view. \endlink View is used		\li \link MToolBarView Default toolbar view. \endlink View is used
	to visualize buttons and text input field.		to visualize buttons and text input field.
	\li \link MToolbarTabView tab view. \endlink View is used to		\li \link MToolbarTabView tab view. \endlink View is used to
	visualize mutually exclusive latch-down type of buttons		visualize mutually exclusive latch-down type of buttons
	\section MToolBarOpenIssues Open issues		\section MToolBarOpenIssues Open issues
	\sa MToolbarStyle		\sa MToolbarStyle
	*/		*/
	class M_EXPORT MToolBar : public MWidgetController		class M_CORE_EXPORT MToolBar : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/*!		/*!
	\brief Variable that defines id for tab variant of the toolbar.		\brief Variable that defines id for tab variant of the toolbar.
	*/		*/
	static const MTheme::ViewType tabType;		static const MTheme::ViewType tabType;
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mtoolbarstyle.h		mtoolbarstyle.h
	skipping to change at line 33		skipping to change at line 33
	#include <mwidgetstyle.h>		#include <mwidgetstyle.h>
	/*!		/*!
	\class MToolbarStyle		\class MToolbarStyle
	\brief Style class for m toolbar.		\brief Style class for m toolbar.
	\ingroup styles		\ingroup styles
	\sa MToolbarStyleContainer MWidgetStyle \ref styling MToolBar MToolBarV iew		\sa MToolbarStyleContainer MWidgetStyle \ref styling MToolBar MToolBarV iew
	*/		*/
	class M_EXPORT MToolbarStyle : public MWidgetStyle		class M_VIEWS_EXPORT MToolbarStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MToolbarStyle)		M_STYLE(MToolbarStyle)
	M_STYLE_PTR_ATTRIBUTE(MScalableImage*, dropShadowImage, DropShadowImage )		M_STYLE_PTR_ATTRIBUTE(MScalableImage*, dropShadowImage, DropShadowImage )
	/*!		/*!
	* \brief Max number of slots in the bar (-1 = unlimited)		* \brief Max number of slots in the bar (-1 = unlimited)
	*/		*/
	M_STYLE_ATTRIBUTE(int, capacity, Capacity)		M_STYLE_ATTRIBUTE(int, capacity, Capacity)
	skipping to change at line 59		skipping to change at line 59
	/*!		/*!
	* \brief Tool bar buttons have text label or not		* \brief Tool bar buttons have text label or not
	*/		*/
	M_STYLE_ATTRIBUTE(bool, hasLabels, HasLabels)		M_STYLE_ATTRIBUTE(bool, hasLabels, HasLabels)
	/*!		/*!
	* \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.
			*/
			M_STYLE_ATTRIBUTE(bool, labelOnlyAsCommonButton, LabelOnlyAsCommonButto
			n)
	};		};
	/*!		/*!
	\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_EXPORT MToolbarStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MToolbarStyleContainer : public MWidgetStyleContainer
	{		{
	M_STYLE_CONTAINER(MToolbarStyle)		M_STYLE_CONTAINER(MToolbarStyle)
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	2 lines changed or deleted		9 lines changed or added

	mtoolbartabstyle.h		mtoolbartabstyle.h
	skipping to change at line 33		skipping to change at line 33
	#include <mtoolbarstyle.h>		#include <mtoolbarstyle.h>
	/*!		/*!
	\class MToolbarTabStyle		\class MToolbarTabStyle
	\brief Style class for m toolbar with tab mode.		\brief Style class for m toolbar with tab mode.
	\ingroup styles		\ingroup styles
	\sa MToolbarTabStyleContainer MWidgetStyle \ref styling MToolBar MToolb arTabView		\sa MToolbarTabStyleContainer MWidgetStyle \ref styling MToolBar MToolb arTabView
	*/		*/
	class M_EXPORT MToolbarTabStyle : public MToolbarStyle		class M_VIEWS_EXPORT MToolbarTabStyle : public MToolbarStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MToolbarTabStyle)		M_STYLE_INTERNAL(MToolbarTabStyle)
	};		};
	/*!		/*!
	\class MToolbarTabStyleContainer		\class MToolbarTabStyleContainer
	\brief Style mode container class for MToolbarTabStyle.		\brief Style mode container class for MToolbarTabStyle.
	\ingroup styles		\ingroup styles
	\sa MToolbarTabStyle		\sa MToolbarTabStyle
	*/		*/
	class M_EXPORT MToolbarTabStyleContainer : public MToolbarStyleContainer		class M_VIEWS_EXPORT MToolbarTabStyleContainer : public MToolbarStyleContai ner
	{		{
	M_STYLE_CONTAINER_INTERNAL(MToolbarTabStyle)		M_STYLE_CONTAINER_INTERNAL(MToolbarTabStyle)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mtoolbartabview.h		mtoolbartabview.h
	skipping to change at line 55		skipping to change at line 55
	- The toolbar has currently no interactions by itself: the interact ions are		- The toolbar has currently no interactions by itself: the interact ions are
	determined by the UI controls that are placed inside the toolbar.		determined by the UI controls that are placed inside the toolbar.
	- The toolbar can be affected by possible interactions of going to and from the		- The toolbar can be affected by possible interactions of going to and from the
	full screen mode; this would set the visibility of the toolbar on and off.		full screen mode; this would set the visibility of the toolbar on and off.
	- Setting the visibility of the toolbar on/off should be accompanie d by a		- Setting the visibility of the toolbar on/off should be accompanie d by a
	(sliding) transition, hiding and revealing the toolbar.		(sliding) transition, hiding and revealing the toolbar.
	\sa MToolBar MToolbarTabStyle		\sa MToolBar MToolbarTabStyle
	*/		*/
	class M_EXPORT MToolbarTabView : public MToolBarView		class M_VIEWS_EXPORT MToolbarTabView : public MToolBarView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MWidgetModel, MToolbarTabStyle)		M_VIEW(MWidgetModel, MToolbarTabStyle)
	Q_DECLARE_PRIVATE(MToolbarTabView)		Q_DECLARE_PRIVATE(MToolbarTabView)
	public:		public:
	/*!		/*!
	\brief Constructs toolbar tab view.		\brief Constructs toolbar tab view.
	\param Pointer to the controller.		\param Pointer to the controller.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mtoolbarview.h		mtoolbarview.h
	skipping to change at line 57		skipping to change at line 57
	full screen mode; this would set the visibility of the toolbar on and off.		full screen mode; this would set the visibility of the toolbar on and off.
	- Setting the visibility of the toolbar on/off should be accompanie d by a		- Setting the visibility of the toolbar on/off should be accompanie d by a
	(sliding) transition, hiding and revealing the toolbar.		(sliding) transition, hiding and revealing the toolbar.
	\section MToolBarOpenIssues Open issues		\section MToolBarOpenIssues Open issues
	- Sliding transitions for hiding and revealing the toolbar are not supported yet.		- Sliding transitions for hiding and revealing the toolbar are not supported yet.
	\sa MToolBar MToolbarStyle		\sa MToolBar MToolbarStyle
	*/		*/
	class M_EXPORT MToolBarView : public MWidgetView		class M_VIEWS_EXPORT MToolBarView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MWidgetModel, MToolbarStyle)		M_VIEW(MWidgetModel, MToolbarStyle)
	public:		public:
	/*!		/*!
	\brief Constructs toolbar view.		\brief Constructs toolbar view.
	\param Pointer to the controller.		\param Pointer to the controller.
	*/		*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mvideo.h		mvideo.h
	skipping to change at line 23		skipping to change at line 23
	* This material also contains confidential information which may not be		* This material also contains confidential information which may not be
	* disclosed to others without the prior written consent of Nokia.		* disclosed to others without the prior written consent of Nokia.
	*/		*/
	#ifndef MVIDEO_H		#ifndef MVIDEO_H
	#define MVIDEO_H		#define MVIDEO_H
	#include <QObject>		#include <QObject>
	#include <QSize>		#include <QSize>
	#include <MExport>		#include <MExport>
	class M_EXPORT MVideo : public QObject		class M_CORE_EXPORT MVideo : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	//! Supported raw video data formats.		//! Supported raw video data formats.
	enum DataFormat {		enum DataFormat {
	//! 24bit RGB		//! 24bit RGB
	RGB = 0,		RGB = 0,
	//BGR,		//BGR,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mvideowidget.h		mvideowidget.h
	skipping to change at line 56		skipping to change at line 56
	\section MVideoWidgetVariants Variants		\section MVideoWidgetVariants Variants
	\li \link MVideoWidgetView Default view. \endlink Standard view for		\li \link MVideoWidgetView Default view. \endlink Standard view for
	displaying video frames without any visual controls.		displaying video frames without any visual controls.
	\section MVideoWidgetOpenIssues Open issues		\section MVideoWidgetOpenIssues Open issues
	\section MVideoWidgetExamples Examples		\section MVideoWidgetExamples Examples
	\sa MVideoWidgetModel		\sa MVideoWidgetModel
	*/		*/
	class M_EXPORT MVideoWidget : public MWidgetController		class M_CORE_EXPORT MVideoWidget : public MWidgetController
	{		{
	Q_OBJECT		Q_OBJECT
	M_CONTROLLER(MVideoWidget)		M_CONTROLLER(MVideoWidget)
	public:		public:
	/*!		/*!
	\brief Constructs a video widget.		\brief Constructs a video widget.
	*/		*/
	MVideoWidget(QGraphicsItem *parent = 0, MVideoWidgetModel* model = 0);		MVideoWidget(QGraphicsItem *parent = 0, MVideoWidgetModel* model = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mvideowidgetmodel.h		mvideowidgetmodel.h
	skipping to change at line 28		skipping to change at line 28
	#include <mwidgetmodel.h>		#include <mwidgetmodel.h>
	#include "mvideo.h"		#include "mvideo.h"
	/*!		/*!
	\class MVideoWidgetModel		\class MVideoWidgetModel
	\brief Data model class for MVideoWidget.		\brief Data model class for MVideoWidget.
	\ingroup models		\ingroup models
	\sa MVideoWidget		\sa MVideoWidget
	*/		*/
	class M_EXPORT MVideoWidgetModel : public MWidgetModel		class M_CORE_EXPORT MVideoWidgetModel : public MWidgetModel
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_INTERNAL(MVideoWidgetModel)		M_MODEL_INTERNAL(MVideoWidgetModel)
	public:		public:
	enum Scale		enum Scale
	{		{
	ScaleDisabled,		ScaleDisabled,
	ScaleToFit		ScaleToFit
	};		};
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mvideowidgetstyle.h		mvideowidgetstyle.h
	skipping to change at line 38		skipping to change at line 38
	\brief Style class for video widget.		\brief Style class for video widget.
	\code		\code
	MVideoWidgetStyle {		MVideoWidgetStyle {
	}		}
	\endcode		\endcode
	\ingroup styles		\ingroup styles
	\sa MVideoWidgetStyleContainer MWidgetStyle \ref styling MVideoWidget M VideoWidgetView		\sa MVideoWidgetStyleContainer MWidgetStyle \ref styling MVideoWidget M VideoWidgetView
	*/		*/
	class M_EXPORT MVideoWidgetStyle : public MWidgetStyle		class M_VIEWS_EXPORT MVideoWidgetStyle : public MWidgetStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE(MVideoWidgetStyle)		M_STYLE(MVideoWidgetStyle)
	/*!		/*!
	\property MVideoWidgetStyle::colorKey		\property MVideoWidgetStyle::colorKey
	\brief Color key.		\brief Color key.
	*/		*/
	M_STYLE_ATTRIBUTE(QColor, colorKey, ColorKey)		M_STYLE_ATTRIBUTE(QColor, colorKey, ColorKey)
	};		};
	/*!		/*!
	\class MVideoWidgetStyleContainer		\class MVideoWidgetStyleContainer
	\brief Style mode container class for MVideoWidgetStyle.		\brief Style mode container class for MVideoWidgetStyle.
	\ingroup styles		\ingroup styles
	\sa MVideoWidgetStyle		\sa MVideoWidgetStyle
	*/		*/
	class M_EXPORT MVideoWidgetStyleContainer : public MWidgetStyleContainer		class M_VIEWS_EXPORT MVideoWidgetStyleContainer : public MWidgetStyleContai ner
	{		{
	M_STYLE_CONTAINER(MVideoWidgetStyle)		M_STYLE_CONTAINER(MVideoWidgetStyle)
	/*!		/*!
	\brief Style mode for a fullscreen video widget.		\brief Style mode for a fullscreen video widget.
	Mode is activated when video widget is set to fullscreen mode using		Mode is activated when video widget is set to fullscreen mode using
	MVideoWidget::setFullscreen() method.		MVideoWidget::setFullscreen() method.
	*/		*/
	M_STYLE_MODE(Fullscreen)		M_STYLE_MODE(Fullscreen)
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mvideowidgetview.h		mvideowidgetview.h
	skipping to change at line 43		skipping to change at line 43
	\section MVideoWidgetViewOverview Overview		\section MVideoWidgetViewOverview Overview
	Standard view for displaying video frames without any other graphic al		Standard view for displaying video frames without any other graphic al
	components.		components.
	\section MVideoWidgetViewInteractions Interactions		\section MVideoWidgetViewInteractions Interactions
	\section MVideoWidgetViewOpenIssues Open issues		\section MVideoWidgetViewOpenIssues Open issues
	\sa MVideoWidget MVideoWidgetStyle		\sa MVideoWidget MVideoWidgetStyle
	*/		*/
	class M_EXPORT MVideoWidgetView : public MWidgetView		class M_VIEWS_EXPORT MVideoWidgetView : public MWidgetView
	{		{
	Q_OBJECT		Q_OBJECT
	M_VIEW(MVideoWidgetModel, MVideoWidgetStyle)		M_VIEW(MVideoWidgetModel, MVideoWidgetStyle)
	public:		public:
	/*!		/*!
	\brief Constructs the view.		\brief Constructs the view.
	\param Pointer to the controller.		\param Pointer to the controller.
	*/		*/
	skipping to change at line 93		skipping to change at line 93
	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(MVideoWidgetView)		Q_DISABLE_COPY(MVideoWidgetView)
	Q_DECLARE_PRIVATE(MVideoWidgetView)		Q_DECLARE_PRIVATE(MVideoWidgetView)
	Q_PRIVATE_SLOT(d_func(), void videoReady())		Q_PRIVATE_SLOT(d_func(), void videoReady())
	Q_PRIVATE_SLOT(d_func(), void frameReady())		Q_PRIVATE_SLOT(d_func(), void frameReady())
	Q_PRIVATE_SLOT(d_func(), void stateChanged())		Q_PRIVATE_SLOT(d_func(), void stateChanged())
			Q_PRIVATE_SLOT(d_func(), void _q_enableVisualUpdates())
			Q_PRIVATE_SLOT(d_func(), void _q_disableVisualUpdates())
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	1 lines changed or deleted		4 lines changed or added

	mviewcreator.h		mviewcreator.h
	skipping to change at line 39		skipping to change at line 39
	#define M_REGISTER_VIEW(VIEW, CONTROLLER) \		#define M_REGISTER_VIEW(VIEW, CONTROLLER) \
	static const MViewCreator<VIEW,CONTROLLER> g_ViewCreator(#VIEW);		static const MViewCreator<VIEW,CONTROLLER> g_ViewCreator(#VIEW);
	// forward declarations		// forward declarations
	class MWidgetView;		class MWidgetView;
	class MWidgetController;		class MWidgetController;
	// base class for MViewCreators		// base class for MViewCreators
	// you can implement your own creator or use MViewCreator template class wi th		// you can implement your own creator or use MViewCreator template class wi th
	// M_REGISTER_VIEW-macro.		// M_REGISTER_VIEW-macro.
	class M_EXPORT MViewCreatorBase		class M_CORE_EXPORT MViewCreatorBase
	{		{
	public:		public:
	MViewCreatorBase(const char *viewClassName);		MViewCreatorBase(const char *viewClassName);
	virtual ~MViewCreatorBase();		virtual ~MViewCreatorBase();
	/*!		/*!
	Returns new style instance.		Returns new style instance.
	Ownership is transferred to caller.		Ownership is transferred to caller.
	*/		*/
	virtual MWidgetView *create(const MWidgetController *controller) const = 0;		virtual MWidgetView *create(const MWidgetController *controller) const = 0;
	/*!		/*!
	Returns the type of the style the view uses.		Returns the type of the style the view uses.
	*/		*/
	virtual const char *styleType() const = 0;		virtual const char *styleType() const = 0;
	};		};
	template<class VIEW, class CONTROLLER>		template<class VIEW, class CONTROLLER>
	class M_EXPORT MViewCreator : public MViewCreatorBase		class MViewCreator : public MViewCreatorBase
	{		{
	public:		public:
	MViewCreator(const char *viewClassName) :		MViewCreator(const char *viewClassName) :
	MViewCreatorBase(viewClassName)		MViewCreatorBase(viewClassName)
	{}		{}
	virtual ~MViewCreator()		virtual ~MViewCreator()
	{}		{}
	virtual MWidgetView *create(const MWidgetController *controller) const {		virtual MWidgetView *create(const MWidgetController *controller) const {
	return new VIEW((CONTROLLER *)controller);		return new VIEW((CONTROLLER *)controller);
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mwidget.h		mwidget.h
	skipping to change at line 43		skipping to change at line 43
	class QSwipeGesture;		class QSwipeGesture;
	class QGraphicsItem;		class QGraphicsItem;
	class MWidgetPrivate;		class MWidgetPrivate;
	class MCancelEvent;		class MCancelEvent;
	class MOnDisplayChangeEvent;		class MOnDisplayChangeEvent;
	class MOrientationChangeEvent;		class MOrientationChangeEvent;
	class MSceneManager;		class MSceneManager;
	class MApplicationPage;		class MApplicationPage;
	class M_EXPORT MWidget : public QGraphicsWidget		class M_CORE_EXPORT MWidget : public QGraphicsWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(QSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy)		Q_PROPERTY(QSizePolicy sizePolicy READ sizePolicy WRITE setSizePolicy)
	Q_PROPERTY(bool selected READ isSelected WRITE setSelected)		Q_PROPERTY(bool selected READ isSelected WRITE setSelected)
	Q_PROPERTY(bool onDisplay READ isOnDisplay)		Q_PROPERTY(bool onDisplay READ isOnDisplay)
	Q_PROPERTY(QPointF paintOffset READ paintOffset WRITE setPaintOffset)		Q_PROPERTY(QPointF paintOffset READ paintOffset WRITE setPaintOffset)
	public:		public:
	MWidget(QGraphicsItem *parent = 0);		MWidget(QGraphicsItem *parent = 0);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mwidgetaction.h		mwidgetaction.h
	skipping to change at line 45		skipping to change at line 45
	supports MWidgetAction. If a MWidgetAction is added to two toolbars (e. g.) at the		supports MWidgetAction. If a MWidgetAction is added to two toolbars (e. g.) at the
	same time then the widget is shown only in the first toolbar the actio n was added		same time then the widget is shown only in the first toolbar the actio n was added
	to. MWidgetAction takes over ownership of the widget.		to. MWidgetAction takes over ownership of the widget.
	Note that it is up to the widget to activate the action, for example by		Note that it is up to the widget to activate the action, for example by
	reimplementing mouse event handlers and calling MAction::trigger().		reimplementing mouse event handlers and calling MAction::trigger().
	\sa MAction		\sa MAction
	*/		*/
	class M_EXPORT MWidgetAction : public MAction		class M_CORE_EXPORT MWidgetAction : public MAction
	{		{
	Q_OBJECT		Q_OBJECT
	public:		public:
	/**		/**
	\brief Default constructor		\brief Default constructor
	\param parent Pointer to parent object		\param parent Pointer to parent object
	*/		*/
	explicit MWidgetAction(QObject *parent);		explicit MWidgetAction(QObject *parent);
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mwidgetcontroller.h		mwidgetcontroller.h
	skipping to change at line 51		skipping to change at line 51
	MWidgetController is the base class of all components that implement the Model-View-Controller pattern for widgets.		MWidgetController is the base class of all components that implement the Model-View-Controller pattern for widgets.
	In a widget, the controller serves as the public interface to the applica tion developer. The controller internally		In a widget, the controller serves as the public interface to the applica tion developer. The controller internally
	stores the widget's state in the model and delegates painting and event h andling to the view.		stores the widget's state in the model and delegates painting and event h andling to the view.
	Although the controller provides methods to set the view and model compon ents, widgets derived from MWidgetController		Although the controller provides methods to set the view and model compon ents, widgets derived from MWidgetController
	always provide an already initialised model while a view is constructed a t the time it is needed unless otherwise explicitly		always provide an already initialised model while a view is constructed a t the time it is needed unless otherwise explicitly
	set.		set.
	*/		*/
	class M_EXPORT MWidgetController : public MWidget		class M_CORE_EXPORT MWidgetController : public MWidget
	{		{
	Q_OBJECT		Q_OBJECT
	Q_PROPERTY(MTheme::ViewType viewType READ viewType WRITE setViewType)		Q_PROPERTY(MTheme::ViewType viewType READ viewType WRITE setViewType)
	Q_PROPERTY(bool active READ isActive WRITE setActive)		Q_PROPERTY(bool active READ isActive WRITE setActive)
	Q_PROPERTY(QString styleName READ styleName WRITE setStyleName)		Q_PROPERTY(QString styleName READ styleName WRITE setStyleName)
	public:		public:
	/*!		/*!
	Default widget view type.		Default widget view type.
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mwidgetcreator.h		mwidgetcreator.h
	skipping to change at line 49		skipping to change at line 49
	#endif		#endif
	// forward declarations		// forward declarations
	class MWidgetController;		class MWidgetController;
	class MWidgetCreatorBasePrivate;		class MWidgetCreatorBasePrivate;
	/*!		/*!
	\brief Interface for MWidgetGenerators, you can implement your own crea tor or use		\brief Interface for MWidgetGenerators, you can implement your own crea tor or use
	MWidgetCreator template class with M_REGISTER_WIDGET-macro.		MWidgetCreator template class with M_REGISTER_WIDGET-macro.
	*/		*/
	class M_EXPORT MWidgetCreatorBase		class M_CORE_EXPORT MWidgetCreatorBase
	{		{
	public:		public:
	/*!		/*!
	Constructor will register this creator to MClassFactory.		Constructor will register this creator to MClassFactory.
	*/		*/
	MWidgetCreatorBase(const char *widgetClassName,		MWidgetCreatorBase(const char *widgetClassName,
	const char *widgetAssemblyName,		const char *widgetAssemblyName,
	M::AssemblyType widgetAssemblyType);		M::AssemblyType widgetAssemblyType);
	skipping to change at line 91		skipping to change at line 91
	/*!		/*!
	Returns meta object of the widget.		Returns meta object of the widget.
	*/		*/
	virtual const QMetaObject *metaObject() const = 0;		virtual const QMetaObject *metaObject() const = 0;
	private:		private:
	MWidgetCreatorBasePrivate *const d_ptr;		MWidgetCreatorBasePrivate *const d_ptr;
	};		};
	template<class WIDGET>		template<class WIDGET>
	class M_EXPORT MWidgetCreator : public MWidgetCreatorBase		class MWidgetCreator : public MWidgetCreatorBase
	{		{
	public:		public:
	MWidgetCreator(const char *widgetClassName,		MWidgetCreator(const char *widgetClassName,
	const char *widgetAssemblyName,		const char *widgetAssemblyName,
	M::AssemblyType widgetAssemblyType) :		M::AssemblyType widgetAssemblyType) :
	MWidgetCreatorBase(widgetClassName, widgetAssemblyName, widgetAssem blyType)		MWidgetCreatorBase(widgetClassName, widgetAssemblyName, widgetAssem blyType)
	{}		{}
	virtual ~MWidgetCreator()		virtual ~MWidgetCreator()
	skipping to change at line 114		skipping to change at line 114
	virtual MWidgetController *create() const {		virtual MWidgetController *create() const {
	return new WIDGET();		return new WIDGET();
	}		}
	virtual const QMetaObject *metaObject() const {		virtual const QMetaObject *metaObject() const {
	return &WIDGET::staticMetaObject;		return &WIDGET::staticMetaObject;
	}		}
	};		};
	template<class WIDGET>		template<class WIDGET>
	class M_EXPORT MWidgetNullCreator : public MWidgetCreatorBase		class MWidgetNullCreator : public MWidgetCreatorBase
	{		{
	public:		public:
	MWidgetNullCreator(const char *widgetClassName,		MWidgetNullCreator(const char *widgetClassName,
	const char *widgetAssemblyName,		const char *widgetAssemblyName,
	M::AssemblyType widgetAssemblyType) :		M::AssemblyType widgetAssemblyType) :
	MWidgetCreatorBase(widgetClassName, widgetAssemblyName, widgetAssem blyType)		MWidgetCreatorBase(widgetClassName, widgetAssemblyName, widgetAssem blyType)
	{}		{}
	virtual ~MWidgetNullCreator()		virtual ~MWidgetNullCreator()
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	mwidgetfadeanimationstyle.h		mwidgetfadeanimationstyle.h
	skipping to change at line 27		skipping to change at line 27
	**		**
	*************************************************************************** */		*************************************************************************** */
	#ifndef MWIDGETFADEANIMATIONSTYLE_H		#ifndef MWIDGETFADEANIMATIONSTYLE_H
	#define MWIDGETFADEANIMATIONSTYLE_H		#define MWIDGETFADEANIMATIONSTYLE_H
	#include <mabstractwidgetanimationstyle.h>		#include <mabstractwidgetanimationstyle.h>
	#include <QEasingCurve>		#include <QEasingCurve>
	//! \internal		//! \internal
	class M_EXPORT MWidgetFadeAnimationStyle : public MAbstractWidgetAnimationS tyle		class M_CORE_EXPORT MWidgetFadeAnimationStyle : public MAbstractWidgetAnima tionStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MWidgetFadeAnimationStyle)		M_STYLE_INTERNAL(MWidgetFadeAnimationStyle)
	M_STYLE_ATTRIBUTE(int, delay, Delay)		M_STYLE_ATTRIBUTE(int, delay, Delay)
	M_STYLE_ATTRIBUTE(qreal, opacity, Opacity)		M_STYLE_ATTRIBUTE(qreal, opacity, Opacity)
	M_STYLE_ATTRIBUTE(QEasingCurve, easingCurve, EasingCurve)		M_STYLE_ATTRIBUTE(QEasingCurve, easingCurve, EasingCurve)
	};		};
	class MWidgetFadeAnimationStyleContainer : public MAbstractWidgetAnimationS tyleContainer		class MWidgetFadeAnimationStyleContainer : public MAbstractWidgetAnimationS tyleContainer
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mwidgetmodel.h		mwidgetmodel.h
	skipping to change at line 109		skipping to change at line 109
	static const char* const CAMELNAME; \		static const char* const CAMELNAME; \
	TYPE NAME() const; \		TYPE NAME() const; \
	void set##CAMELNAME(TYPE NAME); \		void set##CAMELNAME(TYPE NAME); \
	private:		private:
	/*!		/*!
	\class MWidgetModel		\class MWidgetModel
	\brief MWidgetModel implements a base class for MVC		\brief MWidgetModel implements a base class for MVC
	*/		*/
	class M_EXPORT MWidgetModel : public QObject		class M_CORE_EXPORT MWidgetModel : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	M_MODEL_WITH_PRIVATE(MWidgetModel)		M_MODEL_WITH_PRIVATE(MWidgetModel)
	M_MODEL_PROPERTY(QString, objectName, ObjectName, true, QString::null)		M_MODEL_PROPERTY(QString, objectName, ObjectName, true, QString::null)
	M_MODEL_PROPERTY(QString, styleName, StyleName, true, QString::null)		M_MODEL_PROPERTY(QString, styleName, StyleName, true, QString::null)
	M_MODEL_PROPERTY(MTheme::ViewType, viewType, ViewType, true, MWidgetCon troller::defaultType)		M_MODEL_PROPERTY(MTheme::ViewType, viewType, ViewType, true, MWidgetCon troller::defaultType)
	M_MODEL_PROPERTY(QPointF, position, Position, true, QPointF(0.0, 0.0))		M_MODEL_PROPERTY(QPointF, position, Position, true, QPointF(0.0, 0.0))
	M_MODEL_PROPERTY(QSizeF, size, Size, true, QSizeF(0.0, 0.0))		M_MODEL_PROPERTY(QSizeF, size, Size, true, QSizeF(0.0, 0.0))
	M_MODEL_PROPERTY(qreal, opacity, Opacity, true, 1.0)		M_MODEL_PROPERTY(qreal, opacity, Opacity, true, 1.0)
	M_MODEL_PROPERTY(M::Position, layoutPosition, LayoutPosition, true, M:: DefaultPosition)		M_MODEL_PROPERTY(M::Position, layoutPosition, LayoutPosition, true, M:: DefaultPosition)
	skipping to change at line 140		skipping to change at line 140
	void modified(const QList<const char *>& members);		void modified(const QList<const char *>& members);
	protected:		protected:
	void memberModified(const char *const member);		void memberModified(const char *const member);
	private:		private:
	/* Do not call setParent on this QObject, but instead use		/* Do not call setParent on this QObject, but instead use
	* increaseRefenceCount() and decreaseReferenceCount() */		* increaseRefenceCount() and decreaseReferenceCount() */
	void setParent ( QObject * parent ) {Q_UNUSED(parent);}		void setParent ( QObject * parent ) {Q_UNUSED(parent);}
	friend M_EXPORT QDataStream &operator<<(QDataStream &stream, const MWid		friend M_CORE_EXPORT QDataStream &operator<<(QDataStream &stream, const
	getModel &model);		MWidgetModel &model);
	friend M_EXPORT QDataStream &operator>>(QDataStream &stream, MWidgetMod		friend M_CORE_EXPORT QDataStream &operator>>(QDataStream &stream, MWidg
	el &model);		etModel &model);
	};		};
	M_EXPORT QDataStream &operator<<(QDataStream &stream, const MWidgetModel &m		M_CORE_EXPORT QDataStream &operator<<(QDataStream &stream, const MWidgetMod
	odel);		el &model);
	M_EXPORT QDataStream &operator>>(QDataStream &stream, MWidgetModel &model);		M_CORE_EXPORT QDataStream &operator>>(QDataStream &stream, MWidgetModel &mo
			del);
	#endif		#endif
End of changes. 3 change blocks.
	8 lines changed or deleted		9 lines changed or added

	mwidgetrecycler.h		mwidgetrecycler.h
	skipping to change at line 74		skipping to change at line 74
	....		....
	recycler->recycle(someItem); // item is not needed anymore, saving for fu ture use		recycler->recycle(someItem); // item is not needed anymore, saving for fu ture use
	...		...
	\endcode		\endcode
	MWidgetRecycler will delete widgets if there is not enough space. To chan ge maximum number of		MWidgetRecycler will delete widgets if there is not enough space. To chan ge maximum number of
	widgets in recycler check setMaxItemsPerClass(int).		widgets in recycler check setMaxItemsPerClass(int).
	*/		*/
	class M_EXPORT MWidgetRecycler		class M_CORE_EXPORT MWidgetRecycler
	{		{
	public:		public:
	static const char * RecycledObjectIdentifier;		static const char * RecycledObjectIdentifier;
	/*!		/*!
	\brief Returns the unique instance of MWidgetRecycler.		\brief Returns the unique instance of MWidgetRecycler.
	*/		*/
	static MWidgetRecycler *instance();		static MWidgetRecycler *instance();
	/*!		/*!
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mwidgetstyle.h		mwidgetstyle.h
	skipping to change at line 39		skipping to change at line 39
	#include <mbackgroundtiles.h>		#include <mbackgroundtiles.h>
	class QPixmap;		class QPixmap;
	class MScalableImage;		class MScalableImage;
	/*!		/*!
	\class MWidgetStyle		\class MWidgetStyle
	\brief MWidgetStyle implements a base for style objects for MVC views		\brief MWidgetStyle implements a base for style objects for MVC views
	*/		*/
	class M_EXPORT MWidgetStyle : public MStyle		class M_CORE_EXPORT MWidgetStyle : public MStyle
	{		{
	Q_OBJECT		Q_OBJECT
	M_STYLE_INTERNAL(MWidgetStyle)		M_STYLE_INTERNAL(MWidgetStyle)
	M_STYLE_ATTRIBUTE(int, marginLeft, MarginLeft)		M_STYLE_ATTRIBUTE(int, marginLeft, MarginLeft)
	M_STYLE_ATTRIBUTE(int, marginTop, MarginTop)		M_STYLE_ATTRIBUTE(int, marginTop, MarginTop)
	M_STYLE_ATTRIBUTE(int, marginRight, MarginRight)		M_STYLE_ATTRIBUTE(int, marginRight, MarginRight)
	M_STYLE_ATTRIBUTE(int, marginBottom, MarginBottom)		M_STYLE_ATTRIBUTE(int, marginBottom, MarginBottom)
	M_STYLE_ATTRIBUTE(int, paddingLeft, PaddingLeft)		M_STYLE_ATTRIBUTE(int, paddingLeft, PaddingLeft)
	M_STYLE_ATTRIBUTE(int, paddingTop, PaddingTop)		M_STYLE_ATTRIBUTE(int, paddingTop, PaddingTop)
	skipping to change at line 73		skipping to change at line 73
	M_STYLE_ATTRIBUTE(QSize, preferredSize, PreferredSize)		M_STYLE_ATTRIBUTE(QSize, preferredSize, PreferredSize)
	M_STYLE_ATTRIBUTE(QSize, minimumSize, MinimumSize)		M_STYLE_ATTRIBUTE(QSize, minimumSize, MinimumSize)
	M_STYLE_ATTRIBUTE(QSize, maximumSize, MaximumSize)		M_STYLE_ATTRIBUTE(QSize, maximumSize, MaximumSize)
	M_STYLE_ATTRIBUTE(MFeedback, pressFeedback, PressFeedback)		M_STYLE_ATTRIBUTE(MFeedback, pressFeedback, PressFeedback)
	M_STYLE_ATTRIBUTE(MFeedback, releaseFeedback, ReleaseFeedback)		M_STYLE_ATTRIBUTE(MFeedback, releaseFeedback, ReleaseFeedback)
	M_STYLE_ATTRIBUTE(MFeedback, cancelFeedback, CancelFeedback)		M_STYLE_ATTRIBUTE(MFeedback, cancelFeedback, CancelFeedback)
	};		};
	class M_EXPORT MWidgetStyleContainer : public MStyleContainer		class M_CORE_EXPORT MWidgetStyleContainer : public MStyleContainer
	{		{
	M_STYLE_CONTAINER_INTERNAL(MWidgetStyle)		M_STYLE_CONTAINER_INTERNAL(MWidgetStyle)
	M_STYLE_MODE(Disabled)		M_STYLE_MODE(Disabled)
	M_STYLE_MODE(Selected)		M_STYLE_MODE(Selected)
	M_STYLE_MODE(Active)		M_STYLE_MODE(Active)
	M_STYLE_MODE(Pressed)		M_STYLE_MODE(Pressed)
	};		};
	#endif		#endif
End of changes. 2 change blocks.
	2 lines changed or deleted		2 lines changed or added

	mwidgetview.h		mwidgetview.h
	skipping to change at line 72		skipping to change at line 72
	inline const STYLE##Container& style() const { return static_cast<const STYLE##Container&>(MWidgetView::style()); }		inline const STYLE##Container& style() const { return static_cast<const STYLE##Container&>(MWidgetView::style()); }
	/*!		/*!
	* \class MWidgetView		* \class MWidgetView
	* \brief MWidgetView provides an abstract base class for MVC views		* \brief MWidgetView provides an abstract base class for MVC views
	*		*
	* MWidgetView provides an abstract base class from which widgets		* MWidgetView provides an abstract base class from which widgets
	* using MVC pattern can inherit their views		* using MVC pattern can inherit their views
	*/		*/
	class M_EXPORT MWidgetView : public QObject		class M_CORE_EXPORT MWidgetView : public QObject
	{		{
	Q_OBJECT		Q_OBJECT
	friend class MWidgetController;		friend class MWidgetController;
	friend class MWidgetControllerPrivate;		friend class MWidgetControllerPrivate;
	friend class MAbstractWidgetAnimation;		friend class MAbstractWidgetAnimation;
	friend class MTheme;		friend class MTheme;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	friend class Ut_MWidgetView;		friend class Ut_MWidgetView;
	friend class Ut_MWidgetController;		friend class Ut_MWidgetController;
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	mwindow.h		mwindow.h
	skipping to change at line 78		skipping to change at line 78
	MWindow window;		MWindow window;
	MSceneWindow *sceneWindow = new MMessageBox("Hello World!");		MSceneWindow *sceneWindow = new MMessageBox("Hello World!");
	window.show();		window.show();
	sceneWindow->appear(&window);		sceneWindow->appear(&window);
	app.exec();		app.exec();
	\endcode		\endcode
	*/		*/
	class M_EXPORT MWindow : public QGraphicsView		class M_CORE_EXPORT MWindow : public QGraphicsView
	{		{
	Q_OBJECT		Q_OBJECT
	/*!		/*!
	\property orientationAngleLocked		\property orientationAngleLocked
	Is the orientation angle locked		Is the orientation angle locked
	*/		*/
	Q_PROPERTY(bool orientationAngleLocked READ isOrientationAngleLocked WR ITE setOrientationAngleLocked)		Q_PROPERTY(bool orientationAngleLocked READ isOrientationAngleLocked WR ITE setOrientationAngleLocked)
	/*!		/*!
	\property orientationLocked		\property orientationLocked
	skipping to change at line 538		skipping to change at line 538
	Q_DISABLE_COPY(MWindow)		Q_DISABLE_COPY(MWindow)
	Q_DECLARE_PRIVATE(MWindow)		Q_DECLARE_PRIVATE(MWindow)
	Q_PRIVATE_SLOT(d_func(), void _q_onPixmapRequestsFinished())		Q_PRIVATE_SLOT(d_func(), void _q_onPixmapRequestsFinished())
	Q_PRIVATE_SLOT(d_func(), void _q_enablePaintUpdates())		Q_PRIVATE_SLOT(d_func(), void _q_enablePaintUpdates())
	Q_PRIVATE_SLOT(d_func(), void _q_exitDisplayStabilized())		Q_PRIVATE_SLOT(d_func(), void _q_exitDisplayStabilized())
	#ifdef HAVE_GCONF		#ifdef HAVE_GCONF
	Q_PRIVATE_SLOT(d_func(), void _q_updateMinimizedSoftwareSwitch())		Q_PRIVATE_SLOT(d_func(), void _q_updateMinimizedSoftwareSwitch())
	#endif		#endif
	friend class MApplicationPrivate;		friend class MApplicationPrivate;
			friend class MSceneManagerPrivate;
	#ifdef UNIT_TEST		#ifdef UNIT_TEST
	// to call orientationAngleChanged()		// to call orientationAngleChanged()
	friend class Ut_MWindow;		friend class Ut_MWindow;
			friend class Ut_MSceneManager;
	#endif		#endif
	};		};
	#endif		#endif
End of changes. 3 change blocks.
	1 lines changed or deleted		3 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/