qt-mobility: headers diff between 1.0.0 and 1.1.0 versions

	qaccelerometer.h	qaccelerometer.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QACCELEROMETER_H	#ifndef QACCELEROMETER_H
	#define QACCELEROMETER_H	#define QACCELEROMETER_H

	#include "qsensor.h"	#include "qsensor.h"

	skipping to change at line 90	skipping to change at line 84
	bool filter(QSensorReading reading) { return filter(static_cast<QAccel erometerReading>(reading)); }	bool filter(QSensorReading reading) { return filter(static_cast<QAccel erometerReading>(reading)); }
	};	};

	class Q_SENSORS_EXPORT QAccelerometer : public QSensor	class Q_SENSORS_EXPORT QAccelerometer : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	explicit QAccelerometer(QObject *parent = 0) : QSensor(QAccelerometer:: type, parent) {}	explicit QAccelerometer(QObject *parent = 0) : QSensor(QAccelerometer:: type, parent) {}
	virtual ~QAccelerometer() {}	virtual ~QAccelerometer() {}
	QAccelerometerReading reading() const { return static_cast<QAccelerome terReading>(QSensor::reading()); }	QAccelerometerReading reading() const { return static_cast<QAccelerome terReading>(QSensor::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qambientlightsensor.h	qambientlightsensor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QAMBIENTLIGHTSENSOR_H	#ifndef QAMBIENTLIGHTSENSOR_H
	#define QAMBIENTLIGHTSENSOR_H	#define QAMBIENTLIGHTSENSOR_H

	#include "qsensor.h"	#include "qsensor.h"

	skipping to change at line 92	skipping to change at line 86
	bool filter(QSensorReading reading) { return filter(static_cast<QAmbie ntLightReading>(reading)); }	bool filter(QSensorReading reading) { return filter(static_cast<QAmbie ntLightReading>(reading)); }
	};	};

	class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor	class Q_SENSORS_EXPORT QAmbientLightSensor : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	explicit QAmbientLightSensor(QObject *parent = 0) : QSensor(QAmbientLig htSensor::type, parent) {}	explicit QAmbientLightSensor(QObject *parent = 0) : QSensor(QAmbientLig htSensor::type, parent) {}
	virtual ~QAmbientLightSensor() {}	virtual ~QAmbientLightSensor() {}
	QAmbientLightReading reading() const { return static_cast<QAmbientLigh tReading>(QSensor::reading()); }	QAmbientLightReading reading() const { return static_cast<QAmbientLigh tReading>(QSensor::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qaudiocapturesource.h	qaudiocapturesource.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QAUDIOCAPTURESOURCE_H	#ifndef QAUDIOCAPTURESOURCE_H
	#define QAUDIOCAPTURESOURCE_H	#define QAUDIOCAPTURESOURCE_H

	#include <QtCore/qstringlist.h>	#include <QtCore/qstringlist.h>
	#include <QtCore/qpair.h>	#include <QtCore/qpair.h>
	#include <QtCore/qsize.h>	#include <QtCore/qsize.h>


	#include <QtMultimedia/qaudioformat.h>	#include <qaudioformat.h>

	#include "qmediarecorder.h"	#include "qmediarecorder.h"
	#include "qmediacontrol.h"	#include "qmediacontrol.h"
	#include "qmediaobject.h"	#include "qmediaobject.h"
	#include "qmediaservice.h"	#include "qmediaservice.h"

	#include "qmediaserviceprovider.h"	#include "qmediaserviceprovider.h"

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QAudioCaptureSourcePrivate;	class QAudioCaptureSourcePrivate;


	class Q_MEDIA_EXPORT QAudioCaptureSource : public QMediaObject	class Q_MULTIMEDIA_EXPORT QAudioCaptureSource : public QMediaObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	QAudioCaptureSource(QObject parent = 0, QMediaServiceProvider service = QMediaServiceProvider::defaultServiceProvider());	QAudioCaptureSource(QObject parent = 0, QMediaServiceProvider service = QMediaServiceProvider::defaultServiceProvider());

	QAudioCaptureSource(QMediaObject mediaObject, QObject parent = 0);

	~QAudioCaptureSource();	~QAudioCaptureSource();

	bool isAvailable() const;	bool isAvailable() const;

	QtMediaServices::AvailabilityError availabilityError() const;	QtMultimediaKit::AvailabilityError availabilityError() const;

	QList<QString> audioInputs() const;	QList<QString> audioInputs() const;

	QString audioDescription(const QString& name) const;	QString audioDescription(const QString& name) const;
	QString defaultAudioInput() const;	QString defaultAudioInput() const;
	QString activeAudioInput() const;	QString activeAudioInput() const;

	public Q_SLOTS:	public Q_SLOTS:
	void setAudioInput(const QString& name);	void setAudioInput(const QString& name);

	Q_SIGNALS:	Q_SIGNALS:
	void activeAudioInputChanged(const QString& name);	void activeAudioInputChanged(const QString& name);
	void availableAudioInputsChanged();	void availableAudioInputsChanged();


	private slots:	private Q_SLOTS:
	void statusChanged();	void statusChanged();

	private:	private:
	Q_DECLARE_PRIVATE(QAudioCaptureSource)	Q_DECLARE_PRIVATE(QAudioCaptureSource)
	};	};

	QT_END_NAMESPACE	QT_END_NAMESPACE

	#endif // QAUDIOCAPTURESOURCE_H	#endif // QAUDIOCAPTURESOURCE_H

End of changes. 8 change blocks.
	15 lines changed or deleted	7 lines changed or added

	qaudioencodercontrol.h	qaudioencodercontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QAUDIOENCODERCONTROL_H	#ifndef QAUDIOENCODERCONTROL_H
	#define QAUDIOENCODERCONTROL_H	#define QAUDIOENCODERCONTROL_H

	#include "qmediacontrol.h"	#include "qmediacontrol.h"

	skipping to change at line 63	skipping to change at line 57
	#include <QtCore/qlist.h>	#include <QtCore/qlist.h>
	#include <QtCore/qpair.h>	#include <QtCore/qpair.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QStringList;	class QStringList;
	class QAudioFormat;	class QAudioFormat;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	class Q_MEDIA_EXPORT QAudioEncoderControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QAudioEncoderControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	virtual ~QAudioEncoderControl();	virtual ~QAudioEncoderControl();

	virtual QStringList supportedAudioCodecs() const = 0;	virtual QStringList supportedAudioCodecs() const = 0;
	virtual QString codecDescription(const QString &codecName) const = 0;	virtual QString codecDescription(const QString &codecName) const = 0;

	virtual QList<int> supportedSampleRates(const QAudioEncoderSettings &se ttings,	virtual QList<int> supportedSampleRates(const QAudioEncoderSettings &se ttings,

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

	qcompass.h	qcompass.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCOMPASS_H	#ifndef QCOMPASS_H
	#define QCOMPASS_H	#define QCOMPASS_H

	#include "qsensor.h"	#include "qsensor.h"

	skipping to change at line 86	skipping to change at line 80
	bool filter(QSensorReading reading) { return filter(static_cast<QCompa ssReading>(reading)); }	bool filter(QSensorReading reading) { return filter(static_cast<QCompa ssReading>(reading)); }
	};	};

	class Q_SENSORS_EXPORT QCompass : public QSensor	class Q_SENSORS_EXPORT QCompass : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	explicit QCompass(QObject *parent = 0) : QSensor(QCompass::type, parent ) {}	explicit QCompass(QObject *parent = 0) : QSensor(QCompass::type, parent ) {}
	virtual ~QCompass() {}	virtual ~QCompass() {}
	QCompassReading reading() const { return static_cast<QCompassReading> (QSensor::reading()); }	QCompassReading reading() const { return static_cast<QCompassReading> (QSensor::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qcontact.h	qcontact.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACT_H	#ifndef QCONTACT_H
	#define QCONTACT_H	#define QCONTACT_H

	#include <QVariant>	#include <QVariant>

	skipping to change at line 60	skipping to change at line 54

	#include <QVariant>	#include <QVariant>
	#include <QString>	#include <QString>
	#include <QPair>	#include <QPair>
	#include <QMultiMap>	#include <QMultiMap>
	#include <QList>	#include <QList>
	#include <QDateTime>	#include <QDateTime>
	#include <QSharedDataPointer>	#include <QSharedDataPointer>

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"


	#include "qcontactdetail.h"	#include "qcontactdetail.h"

		#include "qcontactrelationship.h"

	#include "qcontactdetaildefinition.h"	#include "qcontactdetaildefinition.h"
	#include "qcontactdisplaylabel.h"	#include "qcontactdisplaylabel.h"

	#include "qcontactrelationship.h"
	#include "qcontactrelationshipfilter.h"	#include "qcontactrelationshipfilter.h"
	#include "qcontacttype.h"	#include "qcontacttype.h"


		class QDataStream;

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QContactManager;	class QContactManager;
	class QContactData;	class QContactData;
	class QContactName;	class QContactName;

		class QContactAction;
		class QContactActionDescriptor;

		// MSVC needs the function declared before the friend declaration
		class QContact;
		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContact&
		contact);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContact& contac
		t);
		#endif

	class Q_CONTACTS_EXPORT QContact	class Q_CONTACTS_EXPORT QContact
	{	{
	public:	public:
	QContact();	QContact();

	~QContact();	~QContact();

	QContact(const QContact& other);	QContact(const QContact& other);
	QContact& operator=(const QContact& other);	QContact& operator=(const QContact& other);

	skipping to change at line 97	skipping to change at line 102
	/* Unique ID */	/* Unique ID */
	QContactId id() const;	QContactId id() const;
	void setId(const QContactId& id);	void setId(const QContactId& id);
	QContactLocalId localId() const;	QContactLocalId localId() const;

	/* Type - contact, group, metacontact, ... */	/* Type - contact, group, metacontact, ... */
	QString type() const;	QString type() const;
	void setType(const QString& type);	void setType(const QString& type);
	void setType(const QContactType& type);	void setType(const QContactType& type);


	/* The (backend synthesized) display label of the contact */	/* The (backend synthesized, or set with QCME::setContactDisplayLabel() ) display label of the contact */
	QString displayLabel() const;	QString displayLabel() const;

	/* Is this an empty contact? */	/* Is this an empty contact? */
	bool isEmpty() const;	bool isEmpty() const;
	void clearDetails();	void clearDetails();


		/* Access details of particular type */
	QContactDetail detail(const QString& definitionId) const;	QContactDetail detail(const QString& definitionId) const;
	QList<QContactDetail> details(const QString& definitionId = QString()) const;	QList<QContactDetail> details(const QString& definitionId = QString()) const;

	QList<QContactDetail> details(const QString& definitionName, const QStr ing& fieldName, const QString& value) const;	QList<QContactDetail> details(const QString& definitionName, const QStr ing& fieldName, const QString& value) const;

	QContactDetail detail(const char* definitionId) const;	QContactDetail detail(const char* definitionId) const;
	QList<QContactDetail> details(const char* definitionId) const;	QList<QContactDetail> details(const char* definitionId) const;
	QList<QContactDetail> details(const char* definitionId, const char* fie ldName, const QString& value) const;	QList<QContactDetail> details(const char* definitionId, const char* fie ldName, const QString& value) const;

	/* Templated retrieval for definition names */	/* Templated retrieval for definition names */

	skipping to change at line 138	skipping to change at line 144
	{	{
	return details(definitionName.latin1(), fieldName.latin1(), value);	return details(definitionName.latin1(), fieldName.latin1(), value);
	}	}
	#endif	#endif

	/* Templated (type-specific) detail retrieval */	/* Templated (type-specific) detail retrieval */
	template<typename T> QList<T> details() const	template<typename T> QList<T> details() const
	{	{
	QList<QContactDetail> props = details(T::DefinitionName.latin1());	QList<QContactDetail> props = details(T::DefinitionName.latin1());
	QList<T> ret;	QList<T> ret;

	foreach(QContactDetail prop, props)	for (int i=0; i<props.count(); i++)
	ret.append(T(prop));	ret.append(T(props.at(i)));
	return ret;	return ret;
	}	}

	/* Templated (type-specific) detail retrieval base on given detail fiel d name and field value */	/* Templated (type-specific) detail retrieval base on given detail fiel d name and field value */
	template<typename T> QList<T> details(const QString& fieldName, const Q String& value) const	template<typename T> QList<T> details(const QString& fieldName, const Q String& value) const
	{	{
	QList<QContactDetail> props = details(T::DefinitionName, fieldName, value);	QList<QContactDetail> props = details(T::DefinitionName, fieldName, value);
	QList<T> ret;	QList<T> ret;

	foreach(QContactDetail prop, props)	for (int i=0; i<props.count(); i++)
	ret.append(T(prop));	ret.append(T(props.at(i)));
	return ret;	return ret;
	}	}

	template<typename T> QList<T> details(const char* fieldName, const QStr ing& value) const	template<typename T> QList<T> details(const char* fieldName, const QStr ing& value) const
	{	{
	QList<QContactDetail> props = details(T::DefinitionName.latin1(), f ieldName, value);	QList<QContactDetail> props = details(T::DefinitionName.latin1(), f ieldName, value);
	QList<T> ret;	QList<T> ret;

	foreach(QContactDetail prop, props)	for (int i=0; i<props.count(); i++)
	ret.append(T(prop));	ret.append(T(props.at(i)));
	return ret;	return ret;
	}	}

	template<typename T> T detail() const	template<typename T> T detail() const
	{	{
	return T(detail(T::DefinitionName.latin1()));	return T(detail(T::DefinitionName.latin1()));
	}	}

	/* generic detail addition/removal functions */	/* generic detail addition/removal functions */

	bool saveDetail(QContactDetail* detail); // modifies the detail - set	bool saveDetail(QContactDetail* detail);
	s its ID if detail already exists	bool removeDetail(QContactDetail* detail);
	bool removeDetail(QContactDetail* detail); // modifies the detail - uns
	ets its ID

	/* Relationships that this contact was involved in when it was retrieve d from the manager */	/* Relationships that this contact was involved in when it was retrieve d from the manager */
	QList<QContactRelationship> relationships(const QString& relationshipTy pe = QString()) const;	QList<QContactRelationship> relationships(const QString& relationshipTy pe = QString()) const;
	QList<QContactId> relatedContacts(const QString& relationshipType = QSt ring(), QContactRelationship::Role role = QContactRelationship::Either) con st;	QList<QContactId> relatedContacts(const QString& relationshipType = QSt ring(), QContactRelationship::Role role = QContactRelationship::Either) con st;


		/* Actions available to be performed on this contact */
		QList<QContactActionDescriptor> availableActions(const QString& service
		Name = QString()) const;

		/* Preferences (eg, set a particular detail preferred for the SMS actio
		n) - subject to change! */
		bool setPreferredDetail(const QString& actionName, const QContactDetail
		& preferredDetail);
		bool isPreferredDetail(const QString& actionName, const QContactDetail&
		detail) const;
		QContactDetail preferredDetail(const QString& actionName) const;
		QMap<QString, QContactDetail> preferredDetails() const;

	private:	private:

		friend class QContactData;
	friend class QContactManager;	friend class QContactManager;
	friend class QContactManagerData;	friend class QContactManagerData;
	friend class QContactManagerEngine;	friend class QContactManagerEngine;

		Q_CONTACTS_EXPORT friend QDataStream& operator<<(QDataStream& out, cons
		t QContact& contact);
		Q_CONTACTS_EXPORT friend QDataStream& operator>>(QDataStream& in, QCont
		act& contact);

	QSharedDataPointer<QContactData> d;	QSharedDataPointer<QContactData> d;
	};	};

	Q_CONTACTS_EXPORT uint qHash(const QContact& key);	Q_CONTACTS_EXPORT uint qHash(const QContact& key);
	#ifndef QT_NO_DEBUG_STREAM	#ifndef QT_NO_DEBUG_STREAM
	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContact& contact);	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContact& contact);
	#endif	#endif

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

End of changes. 17 change blocks.
	22 lines changed or deleted	46 lines changed or added

	qcontactabstractrequest.h	qcontactabstractrequest.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTABSTRACTREQUEST_H	#ifndef QCONTACTABSTRACTREQUEST_H
	#define QCONTACTABSTRACTREQUEST_H	#define QCONTACTABSTRACTREQUEST_H

	#include "qcontactmanager.h"	#include "qcontactmanager.h"

	skipping to change at line 90	skipping to change at line 84
	InvalidRequest = 0,	InvalidRequest = 0,
	ContactFetchRequest,	ContactFetchRequest,
	ContactLocalIdFetchRequest,	ContactLocalIdFetchRequest,
	ContactRemoveRequest,	ContactRemoveRequest,
	ContactSaveRequest,	ContactSaveRequest,
	DetailDefinitionFetchRequest,	DetailDefinitionFetchRequest,
	DetailDefinitionRemoveRequest,	DetailDefinitionRemoveRequest,
	DetailDefinitionSaveRequest,	DetailDefinitionSaveRequest,
	RelationshipFetchRequest,	RelationshipFetchRequest,
	RelationshipRemoveRequest,	RelationshipRemoveRequest,

	RelationshipSaveRequest	RelationshipSaveRequest,
		ContactFetchByIdRequest
	};	};

	RequestType type() const;	RequestType type() const;

	/* Which manager we want to perform the asynchronous request */	/* Which manager we want to perform the asynchronous request */
	QContactManager* manager() const;	QContactManager* manager() const;
	void setManager(QContactManager* manager);	void setManager(QContactManager* manager);

	public Q_SLOTS:	public Q_SLOTS:
	/* Verbs */	/* Verbs */

	skipping to change at line 119	skipping to change at line 114
	void resultsAvailable();	void resultsAvailable();

	protected:	protected:
	QContactAbstractRequest(QContactAbstractRequestPrivate* otherd, QObject * parent = 0);	QContactAbstractRequest(QContactAbstractRequestPrivate* otherd, QObject * parent = 0);
	QContactAbstractRequestPrivate* d_ptr;	QContactAbstractRequestPrivate* d_ptr;

	private:	private:
	QContactAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr(0 ) {}	QContactAbstractRequest(QObject* parent = 0) : QObject(parent), d_ptr(0 ) {}
	Q_DISABLE_COPY(QContactAbstractRequest)	Q_DISABLE_COPY(QContactAbstractRequest)
	friend class QContactManagerEngine;	friend class QContactManagerEngine;

		friend class QContactManagerEngineV2;
		friend class QContactManagerEngineV2Wrapper;
		friend class QContactAbstractRequestPrivate;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

End of changes. 5 change blocks.
	10 lines changed or deleted	8 lines changed or added

	qcontactbirthday.h	qcontactbirthday.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTBIRTHDAY_H	#ifndef QCONTACTBIRTHDAY_H
	#define QCONTACTBIRTHDAY_H	#define QCONTACTBIRTHDAY_H

	#include <QString>	#include <QString>

	skipping to change at line 66	skipping to change at line 60

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	/* Leaf class */	/* Leaf class */
	class Q_CONTACTS_EXPORT QContactBirthday : public QContactDetail	class Q_CONTACTS_EXPORT QContactBirthday : public QContactDetail
	{	{
	public:	public:
	#ifdef Q_QDOC	#ifdef Q_QDOC
	static const QLatin1Constant DefinitionName;	static const QLatin1Constant DefinitionName;
	static const QLatin1Constant FieldBirthday;	static const QLatin1Constant FieldBirthday;

		static const QLatin1Constant FieldCalendarId;
	#else	#else
	Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactBirthday, "Birthday")	Q_DECLARE_CUSTOM_CONTACT_DETAIL(QContactBirthday, "Birthday")
	Q_DECLARE_LATIN1_CONSTANT(FieldBirthday, "Birthday");	Q_DECLARE_LATIN1_CONSTANT(FieldBirthday, "Birthday");

		Q_DECLARE_LATIN1_CONSTANT(FieldCalendarId, "CalendarId");
	#endif	#endif

	void setDate(const QDate& date) {setValue(FieldBirthday, date);}	void setDate(const QDate& date) {setValue(FieldBirthday, date);}
	QDate date() const {return value<QDate>(FieldBirthday);}	QDate date() const {return value<QDate>(FieldBirthday);}

		void setDateTime(const QDateTime& dateTime) {setValue(FieldBirthday, da
		teTime);}
		QDateTime dateTime() const {return value<QDateTime>(FieldBirthday);}
		void setCalendarId(const QString& calendarId) {setValue(FieldCalendarId
		, calendarId);}
		QString calendarId() const {return value(FieldCalendarId);}
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

End of changes. 6 change blocks.
	9 lines changed or deleted	11 lines changed or added

	qcontactdetail.h	qcontactdetail.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTDETAIL_H	#ifndef QCONTACTDETAIL_H
	#define QCONTACTDETAIL_H	#define QCONTACTDETAIL_H

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"

	#include <QSharedDataPointer>	#include <QSharedDataPointer>
	#include <QStringList>	#include <QStringList>
	#include <QVariant>	#include <QVariant>


		class QDataStream;

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE


		class QContactActionDescriptor;
	class QContactDetailPrivate;	class QContactDetailPrivate;


		// MSVC needs the function declared before the friend declaration
		class QContactDetail;
		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactD
		etail& detail);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetail&
		detail);
		#endif

	class Q_CONTACTS_EXPORT QContactDetail	class Q_CONTACTS_EXPORT QContactDetail
	{	{
	public:	public:
	QContactDetail();	QContactDetail();
	explicit QContactDetail(const char* definitionName); // possibly intern al	explicit QContactDetail(const char* definitionName); // possibly intern al
	explicit QContactDetail(const QString& definitionName);	explicit QContactDetail(const QString& definitionName);
	~QContactDetail();	~QContactDetail();

	QContactDetail(const QContactDetail& other);	QContactDetail(const QContactDetail& other);
	QContactDetail& operator=(const QContactDetail& other);	QContactDetail& operator=(const QContactDetail& other);

	skipping to change at line 211	skipping to change at line 216

	protected:	protected:
	QContactDetail(const QContactDetail &other, const QString& expectedDefi nitionId);	QContactDetail(const QContactDetail &other, const QString& expectedDefi nitionId);
	QContactDetail& assign(const QContactDetail &other, const QString& expe ctedDefinitionId);	QContactDetail& assign(const QContactDetail &other, const QString& expe ctedDefinitionId);
	QContactDetail(const QContactDetail &other, const char* expectedDefinit ionId);	QContactDetail(const QContactDetail &other, const char* expectedDefinit ionId);
	QContactDetail& assign(const QContactDetail &other, const char* expecte dDefinitionId);	QContactDetail& assign(const QContactDetail &other, const char* expecte dDefinitionId);

	private:	private:
	friend class QContact;	friend class QContact;
	friend class QContactDetailPrivate;	friend class QContactDetailPrivate;

		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT friend QDataStream& operator>>(QDataStream& in, QCont
		actDetail& detail);
		#endif
	QSharedDataPointer<QContactDetailPrivate> d;	QSharedDataPointer<QContactDetailPrivate> d;
	};	};

	Q_CONTACTS_EXPORT uint qHash(const QContactDetail& key);	Q_CONTACTS_EXPORT uint qHash(const QContactDetail& key);
	#ifndef QT_NO_DEBUG_STREAM	#ifndef QT_NO_DEBUG_STREAM
	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactDetail& detai l);	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactDetail& detai l);
	#endif	#endif

	Q_DECLARE_OPERATORS_FOR_FLAGS(QContactDetail::AccessConstraints);	Q_DECLARE_OPERATORS_FOR_FLAGS(QContactDetail::AccessConstraints);


End of changes. 7 change blocks.
	9 lines changed or deleted	20 lines changed or added

	qcontactdetaildefinition.h	qcontactdetaildefinition.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTDETAILDEFINITION_H	#ifndef QCONTACTDETAILDEFINITION_H
	#define QCONTACTDETAILDEFINITION_H	#define QCONTACTDETAILDEFINITION_H

	#include <QStringList>	#include <QStringList>

	skipping to change at line 100	skipping to change at line 94
	/* Mapping of field key to fields allowed in details of this definition */	/* Mapping of field key to fields allowed in details of this definition */
	void setFields(const QMap<QString, QContactDetailFieldDefinition>& fiel ds);	void setFields(const QMap<QString, QContactDetailFieldDefinition>& fiel ds);
	QMap<QString, QContactDetailFieldDefinition> fields() const;	QMap<QString, QContactDetailFieldDefinition> fields() const;
	void insertField(const QString& key, const QContactDetailFieldDefinitio n& field);	void insertField(const QString& key, const QContactDetailFieldDefinitio n& field);
	void removeField(const QString& key);	void removeField(const QString& key);

	private:	private:
	QSharedDataPointer<QContactDetailDefinitionData> d;	QSharedDataPointer<QContactDetailDefinitionData> d;
	};	};


		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactD
		etailDefinition& definition);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetailDe
		finition& definition);
		#endif

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactDetailDefinition), Q_MOVAB LE_TYPE);	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactDetailDefinition), Q_MOVAB LE_TYPE);

	#endif	#endif

End of changes. 4 change blocks.
	9 lines changed or deleted	10 lines changed or added

	qcontactdetailfielddefinition.h	qcontactdetailfielddefinition.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTDETAILFIELDDEFINITION_H	#ifndef QCONTACTDETAILFIELDDEFINITION_H
	#define QCONTACTDETAILFIELDDEFINITION_H	#define QCONTACTDETAILFIELDDEFINITION_H

	#include <QList>	#include <QList>

	skipping to change at line 82	skipping to change at line 76
	QVariantList allowableValues() const;	QVariantList allowableValues() const;
	void setAllowableValues(const QVariantList values);	void setAllowableValues(const QVariantList values);

	bool operator==(const QContactDetailFieldDefinition& other) const;	bool operator==(const QContactDetailFieldDefinition& other) const;
	bool operator!=(const QContactDetailFieldDefinition& other) const;	bool operator!=(const QContactDetailFieldDefinition& other) const;

	private:	private:
	QSharedDataPointer<QContactDetailFieldDefinitionPrivate> d;	QSharedDataPointer<QContactDetailFieldDefinitionPrivate> d;
	};	};


		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactD
		etailFieldDefinition& definition);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactDetailFi
		eldDefinition& definition);
		#endif

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactDetailFieldDefinition), Q_ MOVABLE_TYPE);	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactDetailFieldDefinition), Q_ MOVABLE_TYPE);

	#endif	#endif

End of changes. 4 change blocks.
	9 lines changed or deleted	10 lines changed or added

	qcontactdetails.h	qcontactdetails.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTDETAILS_H	#ifndef QCONTACTDETAILS_H
	#define QCONTACTDETAILS_H	#define QCONTACTDETAILS_H

	// this file includes all of the leaf detail classes	// this file includes all of the leaf detail classes
	// provided by the Qt Contacts API.	// provided by the Qt Contacts API.

	#include "qcontactaddress.h"	#include "qcontactaddress.h"
	#include "qcontactanniversary.h"	#include "qcontactanniversary.h"
	#include "qcontactavatar.h"	#include "qcontactavatar.h"
	#include "qcontactbirthday.h"	#include "qcontactbirthday.h"
	#include "qcontactdisplaylabel.h"	#include "qcontactdisplaylabel.h"
	#include "qcontactemailaddress.h"	#include "qcontactemailaddress.h"
	#include "qcontactfamily.h"	#include "qcontactfamily.h"

		#include "qcontactfavorite.h"
	#include "qcontactgender.h"	#include "qcontactgender.h"
	#include "qcontactgeolocation.h"	#include "qcontactgeolocation.h"
	#include "qcontactglobalpresence.h"	#include "qcontactglobalpresence.h"
	#include "qcontactguid.h"	#include "qcontactguid.h"

		#include "qcontacthobby.h"
	#include "qcontactname.h"	#include "qcontactname.h"
	#include "qcontactnickname.h"	#include "qcontactnickname.h"
	#include "qcontactnote.h"	#include "qcontactnote.h"
	#include "qcontactonlineaccount.h"	#include "qcontactonlineaccount.h"
	#include "qcontactorganization.h"	#include "qcontactorganization.h"
	#include "qcontactphonenumber.h"	#include "qcontactphonenumber.h"
	#include "qcontactpresence.h"	#include "qcontactpresence.h"
	#include "qcontactringtone.h"	#include "qcontactringtone.h"
	#include "qcontactsynctarget.h"	#include "qcontactsynctarget.h"
	#include "qcontacttag.h"	#include "qcontacttag.h"

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

	qcontactfetchhint.h	qcontactfetchhint.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTFETCHHINT_H	#ifndef QCONTACTFETCHHINT_H
	#define QCONTACTFETCHHINT_H	#define QCONTACTFETCHHINT_H

	#include <QVariant>	#include <QVariant>
	#include <QList>	#include <QList>
	#include <QSharedData>	#include <QSharedData>

		#include <QSize>

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"
	#include "qcontactdetaildefinition.h"	#include "qcontactdetaildefinition.h"

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QContactFetchHintPrivate;	class QContactFetchHintPrivate;
	class Q_CONTACTS_EXPORT QContactFetchHint {	class Q_CONTACTS_EXPORT QContactFetchHint {
	public:	public:
	QContactFetchHint();	QContactFetchHint();
	QContactFetchHint(const QContactFetchHint& other);	QContactFetchHint(const QContactFetchHint& other);
	~QContactFetchHint();	~QContactFetchHint();
	QContactFetchHint& operator=(const QContactFetchHint& other);	QContactFetchHint& operator=(const QContactFetchHint& other);

	QStringList detailDefinitionsHint() const;	QStringList detailDefinitionsHint() const;
	void setDetailDefinitionsHint(const QStringList& definitionNames);	void setDetailDefinitionsHint(const QStringList& definitionNames);

	QStringList relationshipTypesHint() const;	QStringList relationshipTypesHint() const;
	void setRelationshipTypesHint(const QStringList& relationshipTypes);	void setRelationshipTypesHint(const QStringList& relationshipTypes);


		QSize preferredImageSize() const;
		void setPreferredImageSize(const QSize& size);

	enum OptimizationHint {	enum OptimizationHint {
	AllRequired = 0x0,	AllRequired = 0x0,
	NoRelationships = 0x1,	NoRelationships = 0x1,
	NoActionPreferences = 0x2,	NoActionPreferences = 0x2,
	NoBinaryBlobs = 0x4	NoBinaryBlobs = 0x4
	// any other optimization hints?	// any other optimization hints?
	};	};
	Q_DECLARE_FLAGS(OptimizationHints, OptimizationHint)	Q_DECLARE_FLAGS(OptimizationHints, OptimizationHint)

	OptimizationHints optimizationHints() const;	OptimizationHints optimizationHints() const;
	void setOptimizationHints(OptimizationHints hints);	void setOptimizationHints(OptimizationHints hints);

	private:	private:
	QSharedDataPointer<QContactFetchHintPrivate> d;	QSharedDataPointer<QContactFetchHintPrivate> d;
	};	};


		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactF
		etchHint& hint);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactFetchHin
		t& hint);
		#endif

		Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFetchHint::OptimizationHints);

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

End of changes. 6 change blocks.
	9 lines changed or deleted	16 lines changed or added

	qcontactfilter.h	qcontactfilter.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTFILTER_H	#ifndef QCONTACTFILTER_H
	#define QCONTACTFILTER_H	#define QCONTACTFILTER_H

	#include <QVariant>	#include <QVariant>

	skipping to change at line 68	skipping to change at line 62
	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	/* Manual Q_DECLARE_CONTACTFILTER_PRIVATE macro */	/* Manual Q_DECLARE_CONTACTFILTER_PRIVATE macro */

	#define Q_DECLARE_CONTACTFILTER_PRIVATE(Class) \	#define Q_DECLARE_CONTACTFILTER_PRIVATE(Class) \
	inline Class##Private* d_func(); \	inline Class##Private* d_func(); \
	inline const Class##Private* d_func() const; \	inline const Class##Private* d_func() const; \
	friend class Class##Private;	friend class Class##Private;

	class QContactFilterPrivate;	class QContactFilterPrivate;


		// MSVC needs the function declared before the friend declaration
		class QContactFilter;
		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactF
		ilter& filter);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactFilter&
		filter);
		#endif

	class Q_CONTACTS_EXPORT QContactFilter	class Q_CONTACTS_EXPORT QContactFilter
	{	{
	public:	public:
	QContactFilter();	QContactFilter();
	~QContactFilter();	~QContactFilter();
	QContactFilter(const QContactFilter& other);	QContactFilter(const QContactFilter& other);
	QContactFilter& operator=(const QContactFilter& other);	QContactFilter& operator=(const QContactFilter& other);

	enum FilterType {	enum FilterType {
	InvalidFilter,	InvalidFilter,

	skipping to change at line 112	skipping to change at line 114
	Q_DECLARE_FLAGS(MatchFlags, MatchFlag)	Q_DECLARE_FLAGS(MatchFlags, MatchFlag)

	bool operator==(const QContactFilter& other) const;	bool operator==(const QContactFilter& other) const;
	bool operator!=(const QContactFilter& other) const {return !operator==( other);}	bool operator!=(const QContactFilter& other) const {return !operator==( other);}

	protected:	protected:
	explicit QContactFilter(QContactFilterPrivate* d);	explicit QContactFilter(QContactFilterPrivate* d);

	protected:	protected:
	friend class QContactFilterPrivate;	friend class QContactFilterPrivate;

		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT friend QDataStream& operator<<(QDataStream& out, cons
		t QContactFilter& filter);
		Q_CONTACTS_EXPORT friend QDataStream& operator>>(QDataStream& in, QCont
		actFilter& filter);
		#endif
	QSharedDataPointer<QContactFilterPrivate> d_ptr;	QSharedDataPointer<QContactFilterPrivate> d_ptr;
	};	};


		Q_DECLARE_OPERATORS_FOR_FLAGS(QContactFilter::MatchFlags);

	const Q_CONTACTS_EXPORT QContactFilter operator&(const QContactFilter& left , const QContactFilter& right);	const Q_CONTACTS_EXPORT QContactFilter operator&(const QContactFilter& left , const QContactFilter& right);
	const Q_CONTACTS_EXPORT QContactFilter operator\|(const QContactFilter& left , const QContactFilter& right);	const Q_CONTACTS_EXPORT QContactFilter operator\|(const QContactFilter& left , const QContactFilter& right);

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactFilter), Q_MOVABLE_TYPE);	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactFilter), Q_MOVABLE_TYPE);

	#endif	#endif

End of changes. 6 change blocks.
	9 lines changed or deleted	21 lines changed or added

	qcontactid.h	qcontactid.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTID_H	#ifndef QCONTACTID_H
	#define QCONTACTID_H	#define QCONTACTID_H

	#include <QString>	#include <QString>
	#include <QSharedDataPointer>	#include <QSharedDataPointer>

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"


		class QDataStream;
	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	typedef quint32 QContactLocalId;	typedef quint32 QContactLocalId;

	class QContactIdPrivate;	class QContactIdPrivate;
	class Q_CONTACTS_EXPORT QContactId	class Q_CONTACTS_EXPORT QContactId
	{	{
	public:	public:
	QContactId();	QContactId();
	~QContactId();	~QContactId();

	skipping to change at line 88	skipping to change at line 83
	void setLocalId(const QContactLocalId& id);	void setLocalId(const QContactLocalId& id);

	private:	private:
	QSharedDataPointer<QContactIdPrivate> d;	QSharedDataPointer<QContactIdPrivate> d;
	};	};

	Q_CONTACTS_EXPORT uint qHash(const QContactId& key);	Q_CONTACTS_EXPORT uint qHash(const QContactId& key);
	#ifndef QT_NO_DEBUG_STREAM	#ifndef QT_NO_DEBUG_STREAM
	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactId& id);	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactId& id);
	#endif	#endif

		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactI
		d& id);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactId& id);
		#endif

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactId), Q_MOVABLE_TYPE);	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactId), Q_MOVABLE_TYPE);

	#endif	#endif

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

	qcontactlocalidfilter.h	qcontactlocalidfilter.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTLOCALIDFILTER_H	#ifndef QCONTACTLOCALIDFILTER_H
	#define QCONTACTLOCALIDFILTER_H	#define QCONTACTLOCALIDFILTER_H

	#include "qcontactfilter.h"	#include "qcontactfilter.h"

	skipping to change at line 65	skipping to change at line 59

	class QContactLocalIdFilterPrivate;	class QContactLocalIdFilterPrivate;
	class Q_CONTACTS_EXPORT QContactLocalIdFilter : public QContactFilter	class Q_CONTACTS_EXPORT QContactLocalIdFilter : public QContactFilter
	{	{
	public:	public:
	QContactLocalIdFilter();	QContactLocalIdFilter();
	QContactLocalIdFilter(const QContactFilter& other);	QContactLocalIdFilter(const QContactFilter& other);

	/* Mutators */	/* Mutators */
	void setIds(const QList<QContactLocalId>& ids);	void setIds(const QList<QContactLocalId>& ids);

		void add(const QContactLocalId& id);
		void remove(const QContactLocalId& id);
		void clear();

	/* Accessors */	/* Accessors */
	QList<QContactLocalId> ids() const;	QList<QContactLocalId> ids() const;

	private:	private:
	Q_DECLARE_CONTACTFILTER_PRIVATE(QContactLocalIdFilter)	Q_DECLARE_CONTACTFILTER_PRIVATE(QContactLocalIdFilter)
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE


End of changes. 4 change blocks.
	9 lines changed or deleted	6 lines changed or added

	qcontactmanager.h	qcontactmanager.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTMANAGER_H	#ifndef QCONTACTMANAGER_H
	#define QCONTACTMANAGER_H	#define QCONTACTMANAGER_H

	#include <QObject>	#include <QObject>

	skipping to change at line 65	skipping to change at line 59
	#include <QStringList>	#include <QStringList>
	#include <QList>	#include <QList>
	#include <QDateTime>	#include <QDateTime>

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"
	#include "qcontact.h"	#include "qcontact.h"
	#include "qcontactid.h"	#include "qcontactid.h"
	#include "qcontactrelationship.h"	#include "qcontactrelationship.h"
	#include "qcontactsortorder.h"	#include "qcontactsortorder.h"
	#include "qcontactfetchhint.h"	#include "qcontactfetchhint.h"

		#include "qcontacttype.h"

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QContactFilter;	class QContactFilter;

		class QContactAction;

	class QContactManagerData;	class QContactManagerData;
	class Q_CONTACTS_EXPORT QContactManager : public QObject	class Q_CONTACTS_EXPORT QContactManager : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	#if Q_QDOC // qdoc's parser fails to recognise the default map argument	#if Q_QDOC // qdoc's parser fails to recognise the default map argument
	explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);	explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
	QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = 0, QObject* parent = 0);	QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = 0, QObject* parent = 0);
	#else	#else
	explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* p arent = 0);	explicit QContactManager(const QString& managerName = QString(), const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObject* p arent = 0);
	QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObj ect* parent = 0);	QContactManager(const QString& managerName, int implementationVersion, const QMap<QString, QString>& parameters = (QMap<QString, QString>()), QObj ect* parent = 0);
	#endif	#endif
	explicit QContactManager(QObject* parent);	explicit QContactManager(QObject* parent);


		#if Q_QDOC
		static const QLatin1Constant ParameterSignalSources;
		static const QLatin1Constant ParameterSignalDefinitions;
		static const QLatin1Constant ParameterValueOnlyOtherProcesses;
		static const QLatin1Constant ParameterValueOnlyOtherManagers;
		#else
		Q_DECLARE_LATIN1_CONSTANT(ParameterSignalSources, "SignalSources");
		Q_DECLARE_LATIN1_CONSTANT(ParameterSignalDefinitions, "SignalDefinition
		s");
		Q_DECLARE_LATIN1_CONSTANT(ParameterValueOnlyOtherProcesses, "OnlyOtherP
		rocesses");
		Q_DECLARE_LATIN1_CONSTANT(ParameterValueOnlyOtherManagers, "OnlyOtherMa
		nagers");
		#endif

	static QContactManager* fromUri(const QString& uri, QObject* parent = 0 );	static QContactManager* fromUri(const QString& uri, QObject* parent = 0 );
	~QContactManager(); // dtor	~QContactManager(); // dtor

	QString managerName() const; // e.g. "Symbian"	QString managerName() const; // e.g. "Symbian"
	QMap<QString, QString> managerParameters() const; // e.g. "filename=pr ivate.db"	QMap<QString, QString> managerParameters() const; // e.g. "filename=pr ivate.db"
	QString managerUri() const; // managerName + man agerParameters	QString managerUri() const; // managerName + man agerParameters
	int managerVersion() const;	int managerVersion() const;


	static bool parseUri(const QString& uri, QString* managerName, QMap<QSt ring, QString>* params); // replaces the above.	static bool parseUri(const QString& uri, QString* managerName, QMap<QSt ring, QString>* params);
	static QString buildUri(const QString& managerName, const QMap<QString, QString>& params, int implementationVersion = -1);	static QString buildUri(const QString& managerName, const QMap<QString, QString>& params, int implementationVersion = -1);

	/* The values of the Error enum are still to be decided! */	/* The values of the Error enum are still to be decided! */
	enum Error {	enum Error {
	NoError = 0,	NoError = 0,
	DoesNotExistError,	DoesNotExistError,
	AlreadyExistsError,	AlreadyExistsError,
	InvalidDetailError,	InvalidDetailError,
	InvalidRelationshipError,	InvalidRelationshipError,
	LockedError,	LockedError,

	skipping to change at line 116	skipping to change at line 125
	NotSupportedError,	NotSupportedError,
	BadArgumentError,	BadArgumentError,
	UnspecifiedError,	UnspecifiedError,
	VersionMismatchError,	VersionMismatchError,
	LimitReachedError,	LimitReachedError,
	InvalidContactTypeError	InvalidContactTypeError
	};	};

	/* Error reporting */	/* Error reporting */
	QContactManager::Error error() const;	QContactManager::Error error() const;

		QMap<int, QContactManager::Error> errorMap() const;

	/* Contacts - Accessors and Mutators */	/* Contacts - Accessors and Mutators */
	QList<QContactLocalId> contactIds(const QList<QContactSortOrder>& sortO rders = QList<QContactSortOrder>()) const;	QList<QContactLocalId> contactIds(const QList<QContactSortOrder>& sortO rders = QList<QContactSortOrder>()) const;
	QList<QContactLocalId> contactIds(const QContactFilter& filter, const Q List<QContactSortOrder>& sortOrders = QList<QContactSortOrder>()) const;	QList<QContactLocalId> contactIds(const QContactFilter& filter, const Q List<QContactSortOrder>& sortOrders = QList<QContactSortOrder>()) const;


	QList<QContact> contacts(const QList<QContactSortOrder>& sortOrders = Q List<QContactSortOrder>(), const QContactFetchHint& fetchHint = QContactFet chHint()) const;	QList<QContact> contacts(const QList<QContactSortOrder>& sortOrders = Q List<QContactSortOrder>(), const QContactFetchHint& fetchHint = QContactFet chHint()) const;
	QList<QContact> contacts(const QContactFilter& filter, const QList<QCon tactSortOrder>& sortOrders = QList<QContactSortOrder>(), const QContactFetc hHint& fetchHint = QContactFetchHint()) const;	QList<QContact> contacts(const QContactFilter& filter, const QList<QCon tactSortOrder>& sortOrders = QList<QContactSortOrder>(), const QContactFetc hHint& fetchHint = QContactFetchHint()) const;

		QList<QContact> contacts(const QList<QContactLocalId>& localIds, const
		QContactFetchHint& fetchHint = QContactFetchHint(), QMap<int, QContactManag
		er::Error>* errorMap = 0) const;

	QContact contact(const QContactLocalId& contactId, const QContactFetchH int& fetchHint = QContactFetchHint()) const; // retrieve a contact	QContact contact(const QContactLocalId& contactId, const QContactFetchH int& fetchHint = QContactFetchHint()) const; // retrieve a contact

	bool saveContact(QContact* contact); // note: MODIFIES contact (sets the contactId)	bool saveContact(QContact* contact); // note: MODIFIES contact (sets the contactId)
	bool removeContact(const QContactLocalId& contactId); // remove th e contact from the persistent store	bool removeContact(const QContactLocalId& contactId); // remove th e contact from the persistent store

	bool saveContacts(QList<QContact>* contacts, QMap<int, QContactManager:
	:Error>* errorMap); // batch API - save.	bool saveContacts(QList<QContact>* contacts, QMap<int, QContactManager:
	bool removeContacts(const QList<QContactLocalId>& contactIds, QMap<int,	:Error>* errorMap = 0); // batch API - save.
	QContactManager::Error>* errorMap); // batch API - remove.	bool saveContacts(QList<QContact>* contacts, const QStringList& definit
		ionMask, QMap<int, QContactManager::Error>* errorMap = 0); // Partial save
		bool removeContacts(const QList<QContactLocalId>& contactIds, QMap<int,
		QContactManager::Error>* errorMap = 0); // batch API - remove.

	/* Return a pruned or modified contact which is valid and can be saved in the manager */	/* Return a pruned or modified contact which is valid and can be saved in the manager */

	QContact compatibleContact(const QContact& original); // Preliminary fu nction!	QContact compatibleContact(const QContact& original);

	/* Synthesize the display label of a contact */	/* Synthesize the display label of a contact */
	QString synthesizedContactDisplayLabel(const QContact& contact) const;	QString synthesizedContactDisplayLabel(const QContact& contact) const;
	void synthesizeContactDisplayLabel(QContact* contact) const;	void synthesizeContactDisplayLabel(QContact* contact) const;

	/* "Self" contact id (MyCard) */	/* "Self" contact id (MyCard) */
	bool setSelfContactId(const QContactLocalId& contactId);	bool setSelfContactId(const QContactLocalId& contactId);
	QContactLocalId selfContactId() const;	QContactLocalId selfContactId() const;

	/* Relationships */	/* Relationships */
	QList<QContactRelationship> relationships(const QContactId& participant Id, QContactRelationship::Role role = QContactRelationship::Either) const;	QList<QContactRelationship> relationships(const QContactId& participant Id, QContactRelationship::Role role = QContactRelationship::Either) const;
	QList<QContactRelationship> relationships(const QString& relationshipTy pe = QString(), const QContactId& participantId = QContactId(), QContactRel ationship::Role role = QContactRelationship::Either) const;	QList<QContactRelationship> relationships(const QString& relationshipTy pe = QString(), const QContactId& participantId = QContactId(), QContactRel ationship::Role role = QContactRelationship::Either) const;
	bool saveRelationship(QContactRelationship* relationship);	bool saveRelationship(QContactRelationship* relationship);

	bool saveRelationships(QList<QContactRelationship>* relationships, QMap <int, QContactManager::Error>* errorMap);	bool saveRelationships(QList<QContactRelationship>* relationships, QMap <int, QContactManager::Error>* errorMap = 0);
	bool removeRelationship(const QContactRelationship& relationship);	bool removeRelationship(const QContactRelationship& relationship);

	bool removeRelationships(const QList<QContactRelationship>& relationshi ps, QMap<int, QContactManager::Error>* errorMap);	bool removeRelationships(const QList<QContactRelationship>& relationshi ps, QMap<int, QContactManager::Error>* errorMap = 0);

	/* Definitions - Accessors and Mutators */	/* Definitions - Accessors and Mutators */
	QMap<QString, QContactDetailDefinition> detailDefinitions(const QString & contactType = QContactType::TypeContact) const;	QMap<QString, QContactDetailDefinition> detailDefinitions(const QString & contactType = QContactType::TypeContact) const;
	QContactDetailDefinition detailDefinition(const QString& definitionName , const QString& contactType = QContactType::TypeContact) const;	QContactDetailDefinition detailDefinition(const QString& definitionName , const QString& contactType = QContactType::TypeContact) const;
	bool saveDetailDefinition(const QContactDetailDefinition& def, const QS tring& contactType = QContactType::TypeContact);	bool saveDetailDefinition(const QContactDetailDefinition& def, const QS tring& contactType = QContactType::TypeContact);
	bool removeDetailDefinition(const QString& definitionName, const QStrin g& contactType = QContactType::TypeContact);	bool removeDetailDefinition(const QString& definitionName, const QStrin g& contactType = QContactType::TypeContact);

	/* Functionality reporting */	/* Functionality reporting */
	enum ManagerFeature {	enum ManagerFeature {

	Groups = 0, // backend supports QContactType::TypeGro up type contacts (convenience for clients... should be deprecated)	Groups = 0, // backend supports QContactType::TypeGro up type contacts (convenience for clients)
	ActionPreferences, // per-contact action preferences	ActionPreferences, // per-contact action preferences
	MutableDefinitions,	MutableDefinitions,
	Relationships,	Relationships,
	ArbitraryRelationshipTypes,	ArbitraryRelationshipTypes,
	DetailOrdering,	DetailOrdering,
	SelfContact,	SelfContact,
	Anonymous,	Anonymous,
	ChangeLogs	ChangeLogs
	};	};
	bool hasFeature(QContactManager::ManagerFeature feature, const QString& contactType = QContactType::TypeContact) const;	bool hasFeature(QContactManager::ManagerFeature feature, const QString& contactType = QContactType::TypeContact) const;

	bool isRelationshipTypeSupported(const QString& relationshipType, const QString& contactType = QContactType::TypeContact) const; // replaces the a bove	bool isRelationshipTypeSupported(const QString& relationshipType, const QString& contactType = QContactType::TypeContact) const;
	QList<QVariant::Type> supportedDataTypes() const;	QList<QVariant::Type> supportedDataTypes() const;
	bool isFilterSupported(const QContactFilter& filter) const;	bool isFilterSupported(const QContactFilter& filter) const;
	QStringList supportedContactTypes() const;	QStringList supportedContactTypes() const;

	/* return a list of available backends for which a QContactManager can be constructed. */	/* return a list of available backends for which a QContactManager can be constructed. */
	static QStringList availableManagers();	static QStringList availableManagers();

	Q_SIGNALS:	Q_SIGNALS:
	void dataChanged();	void dataChanged();
	void contactsAdded(const QList<QContactLocalId>& contactIds);	void contactsAdded(const QList<QContactLocalId>& contactIds);

End of changes. 16 change blocks.
	19 lines changed or deleted	40 lines changed or added

	qcontactmanagerengine.h	qcontactmanagerengine.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTMANAGERENGINE_H	#ifndef QCONTACTMANAGERENGINE_H
	#define QCONTACTMANAGERENGINE_H	#define QCONTACTMANAGERENGINE_H

	#include <QSharedData>	#include <QSharedData>

	skipping to change at line 138	skipping to change at line 132
	virtual bool waitForRequestFinished(QContactAbstractRequest* req, int m secs);	virtual bool waitForRequestFinished(QContactAbstractRequest* req, int m secs);

	/* Capabilities reporting */	/* Capabilities reporting */
	virtual bool hasFeature(QContactManager::ManagerFeature feature, const QString& contactType) const;	virtual bool hasFeature(QContactManager::ManagerFeature feature, const QString& contactType) const;
	virtual bool isRelationshipTypeSupported(const QString& relationshipTyp e, const QString& contactType) const;	virtual bool isRelationshipTypeSupported(const QString& relationshipTyp e, const QString& contactType) const;
	virtual bool isFilterSupported(const QContactFilter& filter) const;	virtual bool isFilterSupported(const QContactFilter& filter) const;
	virtual QList<QVariant::Type> supportedDataTypes() const;	virtual QList<QVariant::Type> supportedDataTypes() const;
	virtual QStringList supportedContactTypes() const;	virtual QStringList supportedContactTypes() const;

	/* Reports the built-in definitions from the schema */	/* Reports the built-in definitions from the schema */

	static QMap<QString, QMap<QString, QContactDetailDefinition> > schemaDe	static QMap<QString, QMap<QString, QContactDetailDefinition> > schemaDe
	finitions();	finitions(); // returns version 1 of the schema
		static QMap<QString, QMap<QString, QContactDetailDefinition> > schemaDe
		finitions(int schemaVersion); // returns schema of the specified version

	Q_SIGNALS:	Q_SIGNALS:
	void dataChanged();	void dataChanged();
	void contactsAdded(const QList<QContactLocalId>& contactIds);	void contactsAdded(const QList<QContactLocalId>& contactIds);
	void contactsChanged(const QList<QContactLocalId>& contactIds);	void contactsChanged(const QList<QContactLocalId>& contactIds);
	void contactsRemoved(const QList<QContactLocalId>& contactIds);	void contactsRemoved(const QList<QContactLocalId>& contactIds);
	void relationshipsAdded(const QList<QContactLocalId>& affectedContactId s);	void relationshipsAdded(const QList<QContactLocalId>& affectedContactId s);
	void relationshipsRemoved(const QList<QContactLocalId>& affectedContact Ids);	void relationshipsRemoved(const QList<QContactLocalId>& affectedContact Ids);
	void selfContactIdChanged(const QContactLocalId& oldId, const QContactL ocalId& newId);	void selfContactIdChanged(const QContactLocalId& oldId, const QContactL ocalId& newId);


	skipping to change at line 183	skipping to change at line 178
	static bool testFilter(const QContactFilter& filter, const QContact& co ntact);	static bool testFilter(const QContactFilter& filter, const QContact& co ntact);
	static QList<QContactLocalId> sortContacts(const QList<QContact>& conta cts, const QList<QContactSortOrder>& sortOrders);	static QList<QContactLocalId> sortContacts(const QList<QContact>& conta cts, const QList<QContactSortOrder>& sortOrders);

	static QContactFilter canonicalizedFilter(const QContactFilter& filter) ;	static QContactFilter canonicalizedFilter(const QContactFilter& filter) ;

	private:	private:
	/* QContactChangeSet is a utility class used to emit the appropriate si gnals */	/* QContactChangeSet is a utility class used to emit the appropriate si gnals */
	friend class QContactChangeSet;	friend class QContactChangeSet;
	};	};


		class QContactLocalIdFetchRequest;
		class QContactFetchRequest;
		class QContactSaveRequest;
		class QContactRemoveRequest;
		class QContactDetailDefinitionFetchRequest;
		class QContactDetailDefinitionRemoveRequest;
		class QContactDetailDefinitionSaveRequest;
		class QContactRelationshipFetchRequest;
		class QContactRelationshipSaveRequest;
		class QContactRelationshipRemoveRequest;

		class Q_CONTACTS_EXPORT QContactManagerEngineV2 : public QContactManagerEng
		ine
		{
		Q_OBJECT
		public:
		QContactManagerEngineV2() : QContactManagerEngine() {}

		// This is the V1 function - c++ overloading rules require this here, o
		r to use "using"
		bool saveContacts(QList<QContact>* contacts, QMap<int, QContactManager:
		:Error>* errorMap, QContactManager::Error* error);
		virtual bool saveContacts(QList<QContact>* contacts, const QStringList
		& definitionMask, QMap<int, QContactManager::Error>* errorMap, QContactMana
		ger::Error* error);

		// Again, this is the v1 function
		QList<QContact> contacts(const QContactFilter& filter, const QList<QCon
		tactSortOrder>& sortOrders, const QContactFetchHint& fetchHint, QContactMan
		ager::Error* error) const;
		virtual QList<QContact> contacts(const QList<QContactLocalId>& localIds
		, const QContactFetchHint& fetchHint, QMap<int, QContactManager::Error>* er
		rorMap, QContactManager::Error* error) const;

		static void updateContactFetchByIdRequest(QContactFetchByIdRequest* req
		, const QList<QContact>& result, QContactManager::Error error, const QMap<i
		nt, QContactManager::Error>& errorMap, QContactAbstractRequest::State);
		};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE


		QT_BEGIN_NAMESPACE
		#define QT_CONTACTS_ENGINEV2_INTERFACE "com.nokia.qt.mobility.contacts.engi
		ne/2.0"
		Q_DECLARE_INTERFACE(QtMobility::QContactManagerEngineV2, QT_CONTACTS_ENGINE
		V2_INTERFACE);
		QT_END_NAMESPACE
	#endif	#endif

End of changes. 6 change blocks.
	11 lines changed or deleted	52 lines changed or added

	qcontactrelationship.h	qcontactrelationship.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTRELATIONSHIP_H	#ifndef QCONTACTRELATIONSHIP_H
	#define QCONTACTRELATIONSHIP_H	#define QCONTACTRELATIONSHIP_H

	#include <QString>	#include <QString>
	#include <QList>	#include <QList>
	#include <QPair>	#include <QPair>
	#include <QSharedDataPointer>	#include <QSharedDataPointer>

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"
	#include "qcontactid.h"	#include "qcontactid.h"


		class QDataStream;

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QContactRelationshipPrivate;	class QContactRelationshipPrivate;

	class Q_CONTACTS_EXPORT QContactRelationship	class Q_CONTACTS_EXPORT QContactRelationship
	{	{
	public:	public:
	#ifdef Q_QDOC	#ifdef Q_QDOC
	static const QLatin1Constant HasMember;	static const QLatin1Constant HasMember;
	static const QLatin1Constant Aggregates;	static const QLatin1Constant Aggregates;

	static const QLatin1Constant Is;
	static const QLatin1Constant IsSameAs;	static const QLatin1Constant IsSameAs;
	static const QLatin1Constant HasAssistant;	static const QLatin1Constant HasAssistant;
	static const QLatin1Constant HasManager;	static const QLatin1Constant HasManager;
	static const QLatin1Constant HasSpouse;	static const QLatin1Constant HasSpouse;
	#else	#else
	Q_DECLARE_LATIN1_CONSTANT(HasMember, "HasMember");	Q_DECLARE_LATIN1_CONSTANT(HasMember, "HasMember");
	Q_DECLARE_LATIN1_CONSTANT(Aggregates, "Aggregates");	Q_DECLARE_LATIN1_CONSTANT(Aggregates, "Aggregates");
	Q_DECLARE_LATIN1_CONSTANT(IsSameAs, "IsSameAs");	Q_DECLARE_LATIN1_CONSTANT(IsSameAs, "IsSameAs");
	Q_DECLARE_LATIN1_CONSTANT(HasAssistant, "HasAssistant");	Q_DECLARE_LATIN1_CONSTANT(HasAssistant, "HasAssistant");
	Q_DECLARE_LATIN1_CONSTANT(HasManager, "HasManager");	Q_DECLARE_LATIN1_CONSTANT(HasManager, "HasManager");

	skipping to change at line 113	skipping to change at line 108
	};	};

	private:	private:
	QSharedDataPointer<QContactRelationshipPrivate> d;	QSharedDataPointer<QContactRelationshipPrivate> d;
	};	};

	Q_CONTACTS_EXPORT uint qHash(const QContactRelationship& key);	Q_CONTACTS_EXPORT uint qHash(const QContactRelationship& key);
	#ifndef QT_NO_DEBUG_STREAM	#ifndef QT_NO_DEBUG_STREAM
	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactRelationship& rel);	Q_CONTACTS_EXPORT QDebug operator<<(QDebug dbg, const QContactRelationship& rel);
	#endif	#endif

		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactR
		elationship& rel);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactRelation
		ship& rel);
		#endif

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qcontactsaverequest.h	qcontactsaverequest.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTSAVEREQUEST_H	#ifndef QCONTACTSAVEREQUEST_H
	#define QCONTACTSAVEREQUEST_H	#define QCONTACTSAVEREQUEST_H

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"

	skipping to change at line 66	skipping to change at line 60

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QContactSaveRequestPrivate;	class QContactSaveRequestPrivate;
	class Q_CONTACTS_EXPORT QContactSaveRequest : public QContactAbstractReques t	class Q_CONTACTS_EXPORT QContactSaveRequest : public QContactAbstractReques t
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	QContactSaveRequest(QObject* parent = 0);	QContactSaveRequest(QObject* parent = 0);

		~QContactSaveRequest();

	/* Selection */	/* Selection */
	void setContact(const QContact& contact);	void setContact(const QContact& contact);
	void setContacts(const QList<QContact>& contacts);	void setContacts(const QList<QContact>& contacts);


		void setDefinitionMask(const QStringList& definitionMask);
		QStringList definitionMask() const;

	/* Results */	/* Results */
	QList<QContact> contacts() const;	QList<QContact> contacts() const;
	QMap<int, QContactManager::Error> errorMap() const;	QMap<int, QContactManager::Error> errorMap() const;

	private:	private:
	Q_DISABLE_COPY(QContactSaveRequest)	Q_DISABLE_COPY(QContactSaveRequest)
	friend class QContactManagerEngine;	friend class QContactManagerEngine;
	Q_DECLARE_PRIVATE_D(d_ptr, QContactSaveRequest)	Q_DECLARE_PRIVATE_D(d_ptr, QContactSaveRequest)
	};	};


End of changes. 5 change blocks.
	9 lines changed or deleted	7 lines changed or added

	qcontactsortorder.h	qcontactsortorder.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTSORTORDER_H	#ifndef QCONTACTSORTORDER_H
	#define QCONTACTSORTORDER_H	#define QCONTACTSORTORDER_H

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"

	skipping to change at line 99	skipping to change at line 93
	bool operator==(const QContactSortOrder& other) const;	bool operator==(const QContactSortOrder& other) const;
	bool operator!=(const QContactSortOrder& other) const {return !operator ==(other);}	bool operator!=(const QContactSortOrder& other) const {return !operator ==(other);}

	/* Convenience cast */	/* Convenience cast */
	operator QList<QContactSortOrder>() const {return QList<QContactSortOrd er>() << *this;}	operator QList<QContactSortOrder>() const {return QList<QContactSortOrd er>() << *this;}

	private:	private:
	QSharedDataPointer<QContactSortOrderPrivate> d;	QSharedDataPointer<QContactSortOrderPrivate> d;
	};	};


		#ifndef QT_NO_DATASTREAM
		Q_CONTACTS_EXPORT QDataStream& operator<<(QDataStream& out, const QContactS
		ortOrder& sortOrder);
		Q_CONTACTS_EXPORT QDataStream& operator>>(QDataStream& in, QContactSortOrde
		r& sortOrder);
		#endif

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactSortOrder), Q_MOVABLE_TYPE );	Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactSortOrder), Q_MOVABLE_TYPE );

	#endif	#endif

End of changes. 4 change blocks.
	9 lines changed or deleted	10 lines changed or added

	qcontacttag.h	qcontacttag.h

	skipping to change at line 13	skipping to change at line 12
	**	**
	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 37	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTTAG_H	#ifndef QCONTACTTAG_H
	#define QCONTACTTAG_H	#define QCONTACTTAG_H

	#include <QString>	#include <QString>

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

	qcontacttype.h	qcontacttype.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QCONTACTTYPE_H	#ifndef QCONTACTTYPE_H
	#define QCONTACTTYPE_H	#define QCONTACTTYPE_H

	#include <QString>	#include <QString>

	#include "qtcontactsglobal.h"	#include "qtcontactsglobal.h"
	#include "qcontactdetail.h"	#include "qcontactdetail.h"

	#include "qcontact.h"

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	/* Leaf class */	/* Leaf class */
	class Q_CONTACTS_EXPORT QContactType : public QContactDetail	class Q_CONTACTS_EXPORT QContactType : public QContactDetail
	{	{
	public:	public:
	#ifdef Q_QDOC	#ifdef Q_QDOC
	static const QLatin1Constant DefinitionName;	static const QLatin1Constant DefinitionName;
	static const QLatin1Constant FieldType;	static const QLatin1Constant FieldType;

End of changes. 4 change blocks.
	10 lines changed or deleted	3 lines changed or added

	qgeoareamonitor.h	qgeoareamonitor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */
	#ifndef QGEOAREAMONITOR_H	#ifndef QGEOAREAMONITOR_H
	#define QGEOAREAMONITOR_H	#define QGEOAREAMONITOR_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"
	#include "qgeocoordinate.h"	#include "qgeocoordinate.h"

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

	qgeocoordinate.h	qgeocoordinate.h

	skipping to change at line 12	skipping to change at line 12
	**	**
	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */
	#ifndef QGEOCOORDINATE_H	#ifndef QGEOCOORDINATE_H
	#define QGEOCOORDINATE_H	#define QGEOCOORDINATE_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"


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

	qgeopositioninfo.h	qgeopositioninfo.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */
	#ifndef QGEOPOSITIONINFO_H	#ifndef QGEOPOSITIONINFO_H
	#define QGEOPOSITIONINFO_H	#define QGEOPOSITIONINFO_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"
	#include "qgeocoordinate.h"	#include "qgeocoordinate.h"

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

	qgraphicsvideoitem.h	qgraphicsvideoitem.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QGRAPHICSVIDEOITEM_H	#ifndef QGRAPHICSVIDEOITEM_H
	#define QGRAPHICSVIDEOITEM_H	#define QGRAPHICSVIDEOITEM_H

	#include <QtGui/qgraphicsitem.h>	#include <QtGui/qgraphicsitem.h>


	#include "qvideowidget.h"	#include <qvideowidget.h>
		#include <qmediabindableinterface.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QVideoSurfaceFormat;	class QVideoSurfaceFormat;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QGraphicsVideoItemPrivate;	class QGraphicsVideoItemPrivate;

	class Q_MEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject	class Q_MULTIMEDIA_EXPORT QGraphicsVideoItem : public QGraphicsObject, publ ic QMediaBindableInterface
	{	{
	Q_OBJECT	Q_OBJECT

		Q_INTERFACES(QMediaBindableInterface)
	Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObj ect)	Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObj ect)
	Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRI TE setAspectRatioMode)	Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRI TE setAspectRatioMode)
	Q_PROPERTY(QPointF offset READ offset WRITE setOffset)	Q_PROPERTY(QPointF offset READ offset WRITE setOffset)
	Q_PROPERTY(QSizeF size READ size WRITE setSize)	Q_PROPERTY(QSizeF size READ size WRITE setSize)
	Q_PROPERTY(QSizeF nativeSize READ nativeSize NOTIFY nativeSizeChanged)	Q_PROPERTY(QSizeF nativeSize READ nativeSize NOTIFY nativeSizeChanged)
	public:	public:
	QGraphicsVideoItem(QGraphicsItem *parent = 0);	QGraphicsVideoItem(QGraphicsItem *parent = 0);
	~QGraphicsVideoItem();	~QGraphicsVideoItem();

	QMediaObject *mediaObject() const;	QMediaObject *mediaObject() const;

	void setMediaObject(QMediaObject *object);

	Qt::AspectRatioMode aspectRatioMode() const;	Qt::AspectRatioMode aspectRatioMode() const;
	void setAspectRatioMode(Qt::AspectRatioMode mode);	void setAspectRatioMode(Qt::AspectRatioMode mode);

	QPointF offset() const;	QPointF offset() const;
	void setOffset(const QPointF &offset);	void setOffset(const QPointF &offset);

	QSizeF size() const;	QSizeF size() const;
	void setSize(const QSizeF &size);	void setSize(const QSizeF &size);


	skipping to change at line 99	skipping to change at line 94

	void paint(QPainter painter, const QStyleOptionGraphicsItem option, Q Widget *widget = 0);	void paint(QPainter painter, const QStyleOptionGraphicsItem option, Q Widget *widget = 0);

	Q_SIGNALS:	Q_SIGNALS:
	void nativeSizeChanged(const QSizeF &size);	void nativeSizeChanged(const QSizeF &size);

	protected:	protected:
	void timerEvent(QTimerEvent *event);	void timerEvent(QTimerEvent *event);
	QVariant itemChange(GraphicsItemChange change, const QVariant &value);	QVariant itemChange(GraphicsItemChange change, const QVariant &value);


		bool setMediaObject(QMediaObject *object);

	QGraphicsVideoItemPrivate *d_ptr;	QGraphicsVideoItemPrivate *d_ptr;

	private:	private:
	Q_DECLARE_PRIVATE(QGraphicsVideoItem)	Q_DECLARE_PRIVATE(QGraphicsVideoItem)
	Q_PRIVATE_SLOT(d_func(), void _q_present())	Q_PRIVATE_SLOT(d_func(), void _q_present())

	Q_PRIVATE_SLOT(d_func(), void _q_formatChanged(const QVideoSurfaceForma t &))	Q_PRIVATE_SLOT(d_func(), void _q_updateNativeSize())
	Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed())	Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed())

	Q_PRIVATE_SLOT(d_func(), void _q_mediaObjectDestroyed())
	};	};

	QT_END_NAMESPACE	QT_END_NAMESPACE

	#endif	#endif

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

	qimageencodercontrol.h	qimageencodercontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QIMAGEENCODERCONTROL_H	#ifndef QIMAGEENCODERCONTROL_H
	#define QIMAGEENCODERCONTROL_H	#define QIMAGEENCODERCONTROL_H

	#include "qmediacontrol.h"	#include "qmediacontrol.h"

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

	#include <QtCore/qsize.h>	#include <QtCore/qsize.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QByteArray;	class QByteArray;
	class QStringList;	class QStringList;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	class Q_MEDIA_EXPORT QImageEncoderControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QImageEncoderControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	virtual ~QImageEncoderControl();	virtual ~QImageEncoderControl();

	virtual QStringList supportedImageCodecs() const = 0;	virtual QStringList supportedImageCodecs() const = 0;
	virtual QString imageCodecDescription(const QString &codecName) const = 0;	virtual QString imageCodecDescription(const QString &codecName) const = 0;

	virtual QList<QSize> supportedResolutions(const QImageEncoderSettings & settings,	virtual QList<QSize> supportedResolutions(const QImageEncoderSettings & settings,

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

	qmagnetometer.h	qmagnetometer.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMAGNETOMETER_H	#ifndef QMAGNETOMETER_H
	#define QMAGNETOMETER_H	#define QMAGNETOMETER_H

	#include "qsensor.h"	#include "qsensor.h"

	#include <QtGlobal>
	#include <QSharedData>
	#include "qsensorbackend.h"

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QMagnetometerReadingPrivate;	class QMagnetometerReadingPrivate;

	class Q_SENSORS_EXPORT QMagnetometerReading : public QSensorReading	class Q_SENSORS_EXPORT QMagnetometerReading : public QSensorReading
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(qreal x READ x)	Q_PROPERTY(qreal x READ x)
	Q_PROPERTY(qreal y READ y)	Q_PROPERTY(qreal y READ y)

	skipping to change at line 100	skipping to change at line 91
	class Q_SENSORS_EXPORT QMagnetometer : public QSensor	class Q_SENSORS_EXPORT QMagnetometer : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	#ifdef Q_QDOC	#ifdef Q_QDOC
	Q_PROPERTY(bool returnGeoValues)	Q_PROPERTY(bool returnGeoValues)
	#endif	#endif
	public:	public:
	explicit QMagnetometer(QObject *parent = 0) : QSensor(QMagnetometer::ty pe, parent) {}	explicit QMagnetometer(QObject *parent = 0) : QSensor(QMagnetometer::ty pe, parent) {}
	virtual ~QMagnetometer() {}	virtual ~QMagnetometer() {}
	QMagnetometerReading reading() const { return static_cast<QMagnetomete rReading>(QSensor::reading()); }	QMagnetometerReading reading() const { return static_cast<QMagnetomete rReading>(QSensor::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

End of changes. 5 change blocks.
	13 lines changed or deleted	4 lines changed or added

	qmediacontent.h	qmediacontent.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIACONTENT_H	#ifndef QMEDIACONTENT_H
	#define QMEDIACONTENT_H	#define QMEDIACONTENT_H

	#include <QtCore/qmetatype.h>	#include <QtCore/qmetatype.h>
	#include <QtCore/qshareddata.h>	#include <QtCore/qshareddata.h>

	#include "qmediaresource.h"	#include "qmediaresource.h"

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaContentPrivate;	class QMediaContentPrivate;

	class Q_MEDIA_EXPORT QMediaContent	class Q_MULTIMEDIA_EXPORT QMediaContent
	{	{
	public:	public:
	QMediaContent();	QMediaContent();
	QMediaContent(const QUrl &contentUrl);	QMediaContent(const QUrl &contentUrl);
	QMediaContent(const QNetworkRequest &contentRequest);	QMediaContent(const QNetworkRequest &contentRequest);
	QMediaContent(const QMediaResource &contentResource);	QMediaContent(const QMediaResource &contentResource);
	QMediaContent(const QMediaResourceList &resources);	QMediaContent(const QMediaResourceList &resources);
	QMediaContent(const QMediaContent &other);	QMediaContent(const QMediaContent &other);
	~QMediaContent();	~QMediaContent();


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

	qmediacontrol.h	qmediacontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QABSTRACTMEDIACONTROL_H	#ifndef QABSTRACTMEDIACONTROL_H
	#define QABSTRACTMEDIACONTROL_H	#define QABSTRACTMEDIACONTROL_H

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>

	#include <QtCore/qobject.h>	#include <QtCore/qobject.h>
	#include <QtCore/qstring.h>	#include <QtCore/qstring.h>
	#include <QtCore/qvariant.h>	#include <QtCore/qvariant.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaControlPrivate;	class QMediaControlPrivate;

	class Q_MEDIA_EXPORT QMediaControl : public QObject	class Q_MULTIMEDIA_EXPORT QMediaControl : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	~QMediaControl();	~QMediaControl();

	protected:	protected:
	QMediaControl(QObject *parent = 0);	QMediaControl(QObject *parent = 0);
	QMediaControl(QMediaControlPrivate &dd, QObject *parent = 0);	QMediaControl(QMediaControlPrivate &dd, QObject *parent = 0);


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

	qmediaencodersettings.h	qmediaencodersettings.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIAENCODERSETTINGS_H	#ifndef QMEDIAENCODERSETTINGS_H
	#define QMEDIAENCODERSETTINGS_H	#define QMEDIAENCODERSETTINGS_H

	#include <QtCore/qsharedpointer.h>	#include <QtCore/qsharedpointer.h>
	#include <QtCore/qstring.h>	#include <QtCore/qstring.h>
	#include <QtCore/qsize.h>	#include <QtCore/qsize.h>
	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>
	#include "qtmedianamespace.h"	#include "qtmedianamespace.h"

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QAudioEncoderSettingsPrivate;	class QAudioEncoderSettingsPrivate;

	class Q_MEDIA_EXPORT QAudioEncoderSettings	class Q_MULTIMEDIA_EXPORT QAudioEncoderSettings
	{	{
	public:	public:
	QAudioEncoderSettings();	QAudioEncoderSettings();
	QAudioEncoderSettings(const QAudioEncoderSettings& other);	QAudioEncoderSettings(const QAudioEncoderSettings& other);

	~QAudioEncoderSettings();	~QAudioEncoderSettings();

	QAudioEncoderSettings& operator=(const QAudioEncoderSettings &other);	QAudioEncoderSettings& operator=(const QAudioEncoderSettings &other);
	bool operator==(const QAudioEncoderSettings &other) const;	bool operator==(const QAudioEncoderSettings &other) const;
	bool operator!=(const QAudioEncoderSettings &other) const;	bool operator!=(const QAudioEncoderSettings &other) const;

	bool isNull() const;	bool isNull() const;


	QtMediaServices::EncodingMode encodingMode() const;	QtMultimediaKit::EncodingMode encodingMode() const;
	void setEncodingMode(QtMediaServices::EncodingMode);	void setEncodingMode(QtMultimediaKit::EncodingMode);

	QString codec() const;	QString codec() const;
	void setCodec(const QString& codec);	void setCodec(const QString& codec);

	int bitRate() const;	int bitRate() const;
	void setBitRate(int bitrate);	void setBitRate(int bitrate);

	int channelCount() const;	int channelCount() const;
	void setChannelCount(int channels);	void setChannelCount(int channels);

	int sampleRate() const;	int sampleRate() const;
	void setSampleRate(int rate);	void setSampleRate(int rate);


	QtMediaServices::EncodingQuality quality() const;	QtMultimediaKit::EncodingQuality quality() const;
	void setQuality(QtMediaServices::EncodingQuality quality);	void setQuality(QtMultimediaKit::EncodingQuality quality);

	private:	private:
	QSharedDataPointer<QAudioEncoderSettingsPrivate> d;	QSharedDataPointer<QAudioEncoderSettingsPrivate> d;
	};	};

	class QVideoEncoderSettingsPrivate;	class QVideoEncoderSettingsPrivate;

	class Q_MEDIA_EXPORT QVideoEncoderSettings	class Q_MULTIMEDIA_EXPORT QVideoEncoderSettings
	{	{
	public:	public:
	QVideoEncoderSettings();	QVideoEncoderSettings();
	QVideoEncoderSettings(const QVideoEncoderSettings& other);	QVideoEncoderSettings(const QVideoEncoderSettings& other);

	~QVideoEncoderSettings();	~QVideoEncoderSettings();

	QVideoEncoderSettings& operator=(const QVideoEncoderSettings &other);	QVideoEncoderSettings& operator=(const QVideoEncoderSettings &other);
	bool operator==(const QVideoEncoderSettings &other) const;	bool operator==(const QVideoEncoderSettings &other) const;
	bool operator!=(const QVideoEncoderSettings &other) const;	bool operator!=(const QVideoEncoderSettings &other) const;

	bool isNull() const;	bool isNull() const;


	QtMediaServices::EncodingMode encodingMode() const;	QtMultimediaKit::EncodingMode encodingMode() const;
	void setEncodingMode(QtMediaServices::EncodingMode);	void setEncodingMode(QtMultimediaKit::EncodingMode);

	QString codec() const;	QString codec() const;
	void setCodec(const QString &);	void setCodec(const QString &);

	QSize resolution() const;	QSize resolution() const;
	void setResolution(const QSize &);	void setResolution(const QSize &);
	void setResolution(int width, int height);	void setResolution(int width, int height);

	qreal frameRate() const;	qreal frameRate() const;
	void setFrameRate(qreal rate);	void setFrameRate(qreal rate);

	int bitRate() const;	int bitRate() const;
	void setBitRate(int bitrate);	void setBitRate(int bitrate);


	QtMediaServices::EncodingQuality quality() const;	QtMultimediaKit::EncodingQuality quality() const;
	void setQuality(QtMediaServices::EncodingQuality quality);	void setQuality(QtMultimediaKit::EncodingQuality quality);

	private:	private:
	QSharedDataPointer<QVideoEncoderSettingsPrivate> d;	QSharedDataPointer<QVideoEncoderSettingsPrivate> d;
	};	};

	class QImageEncoderSettingsPrivate;	class QImageEncoderSettingsPrivate;

	class Q_MEDIA_EXPORT QImageEncoderSettings	class Q_MULTIMEDIA_EXPORT QImageEncoderSettings
	{	{
	public:	public:
	QImageEncoderSettings();	QImageEncoderSettings();
	QImageEncoderSettings(const QImageEncoderSettings& other);	QImageEncoderSettings(const QImageEncoderSettings& other);

	~QImageEncoderSettings();	~QImageEncoderSettings();

	QImageEncoderSettings& operator=(const QImageEncoderSettings &other);	QImageEncoderSettings& operator=(const QImageEncoderSettings &other);
	bool operator==(const QImageEncoderSettings &other) const;	bool operator==(const QImageEncoderSettings &other) const;
	bool operator!=(const QImageEncoderSettings &other) const;	bool operator!=(const QImageEncoderSettings &other) const;

	bool isNull() const;	bool isNull() const;

	QString codec() const;	QString codec() const;
	void setCodec(const QString &);	void setCodec(const QString &);

	QSize resolution() const;	QSize resolution() const;
	void setResolution(const QSize &);	void setResolution(const QSize &);
	void setResolution(int width, int height);	void setResolution(int width, int height);


	QtMediaServices::EncodingQuality quality() const;	QtMultimediaKit::EncodingQuality quality() const;
	void setQuality(QtMediaServices::EncodingQuality quality);	void setQuality(QtMultimediaKit::EncodingQuality quality);

	private:	private:
	QSharedDataPointer<QImageEncoderSettingsPrivate> d;	QSharedDataPointer<QImageEncoderSettingsPrivate> d;
	};	};

	QT_END_NAMESPACE	QT_END_NAMESPACE

	#endif	#endif

End of changes. 11 change blocks.
	22 lines changed or deleted	16 lines changed or added

	qmediaimageviewer.h	qmediaimageviewer.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIAIMAGEVIEWER_H	#ifndef QMEDIAIMAGEVIEWER_H
	#define QMEDIAIMAGEVIEWER_H	#define QMEDIAIMAGEVIEWER_H

	#include "qmediaobject.h"	#include "qmediaobject.h"
	#include "qmediacontent.h"	#include "qmediacontent.h"

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		class QGraphicsVideoItem;
		class QMediaPlaylist;
		class QVideoWidget;

	class QMediaImageViewerPrivate;	class QMediaImageViewerPrivate;

	class Q_MEDIA_EXPORT QMediaImageViewer : public QMediaObject	class Q_MULTIMEDIA_EXPORT QMediaImageViewer : public QMediaObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(State state READ state NOTIFY stateChanged)	Q_PROPERTY(State state READ state NOTIFY stateChanged)
	Q_PROPERTY(MediaStatus mediaStatus READ mediaStatus NOTIFY mediaStatusC hanged)	Q_PROPERTY(MediaStatus mediaStatus READ mediaStatus NOTIFY mediaStatusC hanged)
	Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaCh anged)	Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaCh anged)
	Q_PROPERTY(int timeout READ timeout WRITE setTimeout)	Q_PROPERTY(int timeout READ timeout WRITE setTimeout)
	Q_PROPERTY(int elapsedTime READ elapsedTime NOTIFY elapsedTimeChanged)	Q_PROPERTY(int elapsedTime READ elapsedTime NOTIFY elapsedTimeChanged)
	Q_ENUMS(State MediaStatus)	Q_ENUMS(State MediaStatus)

	public:	public:

	skipping to change at line 90	skipping to change at line 88
	InvalidMedia	InvalidMedia
	};	};

	explicit QMediaImageViewer(QObject *parent = 0);	explicit QMediaImageViewer(QObject *parent = 0);
	~QMediaImageViewer();	~QMediaImageViewer();

	State state() const;	State state() const;
	MediaStatus mediaStatus() const;	MediaStatus mediaStatus() const;

	QMediaContent media() const;	QMediaContent media() const;

		QMediaPlaylist *playlist() const;

	int timeout() const;	int timeout() const;
	int elapsedTime() const;	int elapsedTime() const;


	void bind(QObject *);	void setVideoOutput(QVideoWidget *widget);
		void setVideoOutput(QGraphicsVideoItem *item);

		bool bind(QObject *);
	void unbind(QObject *);	void unbind(QObject *);

	public Q_SLOTS:	public Q_SLOTS:
	void setMedia(const QMediaContent &media);	void setMedia(const QMediaContent &media);

		void setPlaylist(QMediaPlaylist *playlist);

	void play();	void play();
	void pause();	void pause();
	void stop();	void stop();

	void setTimeout(int timeout);	void setTimeout(int timeout);

	Q_SIGNALS:	Q_SIGNALS:
	void stateChanged(QMediaImageViewer::State state);	void stateChanged(QMediaImageViewer::State state);
	void mediaStatusChanged(QMediaImageViewer::MediaStatus status);	void mediaStatusChanged(QMediaImageViewer::MediaStatus status);

End of changes. 8 change blocks.
	11 lines changed or deleted	14 lines changed or added

	qmediaobject.h	qmediaobject.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QABSTRACTMEDIAOBJECT_H	#ifndef QABSTRACTMEDIAOBJECT_H
	#define QABSTRACTMEDIAOBJECT_H	#define QABSTRACTMEDIAOBJECT_H

	#include <QtCore/qobject.h>	#include <QtCore/qobject.h>
	#include <QtCore/qstringlist.h>	#include <QtCore/qstringlist.h>

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>
	#include "qtmedianamespace.h"	#include "qtmedianamespace.h"

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaService;	class QMediaService;

		class QMediaBindableInterface;

	class QMediaObjectPrivate;	class QMediaObjectPrivate;

	class Q_MEDIA_EXPORT QMediaObject : public QObject	class Q_MULTIMEDIA_EXPORT QMediaObject : public QObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterv al NOTIFY notifyIntervalChanged)	Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterv al NOTIFY notifyIntervalChanged)

	Q_PROPERTY(bool metaDataAvailable READ isMetaDataAvailable NOTIFY metaD
	ataAvailableChanged)
	Q_PROPERTY(bool metaDataWritable READ isMetaDataWritable NOTIFY metaDat
	aWritableChanged)
	public:	public:
	~QMediaObject();	~QMediaObject();

	virtual bool isAvailable() const;	virtual bool isAvailable() const;

	virtual QtMediaServices::AvailabilityError availabilityError() const;	virtual QtMultimediaKit::AvailabilityError availabilityError() const;

	virtual QMediaService* service() const;	virtual QMediaService* service() const;

	int notifyInterval() const;	int notifyInterval() const;
	void setNotifyInterval(int milliSeconds);	void setNotifyInterval(int milliSeconds);


	virtual void bind(QObject*);	virtual bool bind(QObject *);
	virtual void unbind(QObject*);	virtual void unbind(QObject *);

	bool isMetaDataAvailable() const;	bool isMetaDataAvailable() const;

	bool isMetaDataWritable() const;


	QVariant metaData(QtMediaServices::MetaData key) const;	QVariant metaData(QtMultimediaKit::MetaData key) const;
	void setMetaData(QtMediaServices::MetaData key, const QVariant &value);	QList<QtMultimediaKit::MetaData> availableMetaData() const;
	QList<QtMediaServices::MetaData> availableMetaData() const;

	QVariant extendedMetaData(const QString &key) const;	QVariant extendedMetaData(const QString &key) const;

	void setExtendedMetaData(const QString &key, const QVariant &value);
	QStringList availableExtendedMetaData() const;	QStringList availableExtendedMetaData() const;

	Q_SIGNALS:	Q_SIGNALS:
	void notifyIntervalChanged(int milliSeconds);	void notifyIntervalChanged(int milliSeconds);

	void metaDataAvailableChanged(bool available);	void metaDataAvailableChanged(bool available);

	void metaDataWritableChanged(bool writable);
	void metaDataChanged();	void metaDataChanged();

	void availabilityChanged(bool available);	void availabilityChanged(bool available);

	protected:	protected:
	QMediaObject(QObject parent, QMediaService service);	QMediaObject(QObject parent, QMediaService service);
	QMediaObject(QMediaObjectPrivate &dd, QObject parent, QMediaService s ervice);	QMediaObject(QMediaObjectPrivate &dd, QObject parent, QMediaService s ervice);

	void addPropertyWatch(QByteArray const &name);	void addPropertyWatch(QByteArray const &name);
	void removePropertyWatch(QByteArray const &name);	void removePropertyWatch(QByteArray const &name);

End of changes. 12 change blocks.
	23 lines changed or deleted	10 lines changed or added

	qmediaplayer.h	qmediaplayer.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIAPLAYER_H	#ifndef QMEDIAPLAYER_H
	#define QMEDIAPLAYER_H	#define QMEDIAPLAYER_H

	#include "qmediaserviceprovider.h"	#include "qmediaserviceprovider.h"
	#include "qmediaobject.h"	#include "qmediaobject.h"
	#include "qmediacontent.h"	#include "qmediacontent.h"

	QT_BEGIN_HEADER	QT_BEGIN_HEADER

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaPlaylist;	class QMediaPlaylist;

		class QVideoWidget;
		class QGraphicsVideoItem;

	class QMediaPlayerPrivate;	class QMediaPlayerPrivate;

	class Q_MEDIA_EXPORT QMediaPlayer : public QMediaObject	class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaObject
	{	{
	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaCh anged)	Q_PROPERTY(QMediaContent media READ media WRITE setMedia NOTIFY mediaCh anged)

		Q_PROPERTY(QMediaPlaylist * playlist READ playlist WRITE setPlaylist)
	Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)	Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)
	Q_PROPERTY(qint64 position READ position WRITE setPosition NOTIFY posit ionChanged)	Q_PROPERTY(qint64 position READ position WRITE setPosition NOTIFY posit ionChanged)
	Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged)	Q_PROPERTY(int volume READ volume WRITE setVolume NOTIFY volumeChanged)
	Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)	Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
	Q_PROPERTY(int bufferStatus READ bufferStatus NOTIFY bufferStatusChange d)	Q_PROPERTY(int bufferStatus READ bufferStatus NOTIFY bufferStatusChange d)
	Q_PROPERTY(bool audioAvailable READ isAudioAvailable NOTIFY audioAvaila bleChanged)	Q_PROPERTY(bool audioAvailable READ isAudioAvailable NOTIFY audioAvaila bleChanged)
	Q_PROPERTY(bool videoAvailable READ isVideoAvailable NOTIFY videoAvaila bleChanged)	Q_PROPERTY(bool videoAvailable READ isVideoAvailable NOTIFY videoAvaila bleChanged)
	Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)	Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged)
	Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate N OTIFY playbackRateChanged)	Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate N OTIFY playbackRateChanged)
	Q_PROPERTY(State state READ state NOTIFY stateChanged)	Q_PROPERTY(State state READ state NOTIFY stateChanged)

	skipping to change at line 122	skipping to change at line 119
	ResourceError,	ResourceError,
	FormatError,	FormatError,
	NetworkError,	NetworkError,
	AccessDeniedError,	AccessDeniedError,
	ServiceMissingError	ServiceMissingError
	};	};

	QMediaPlayer(QObject parent = 0, Flags flags = 0, QMediaServiceProvide r provider = QMediaServiceProvider::defaultServiceProvider());	QMediaPlayer(QObject parent = 0, Flags flags = 0, QMediaServiceProvide r provider = QMediaServiceProvider::defaultServiceProvider());
	~QMediaPlayer();	~QMediaPlayer();


	static QtMediaServices::SupportEstimate hasSupport(const QString &mimeT ype,	static QtMultimediaKit::SupportEstimate hasSupport(const QString &mimeT ype,
	const QStringList& codecs = QSt ringList(),	const QStringList& codecs = QSt ringList(),
	Flags flags = 0);	Flags flags = 0);
	static QStringList supportedMimeTypes(Flags flags = 0);	static QStringList supportedMimeTypes(Flags flags = 0);


		void setVideoOutput(QVideoWidget *);
		void setVideoOutput(QGraphicsVideoItem *);

	QMediaContent media() const;	QMediaContent media() const;
	const QIODevice *mediaStream() const;	const QIODevice *mediaStream() const;

		QMediaPlaylist *playlist() const;

	State state() const;	State state() const;
	MediaStatus mediaStatus() const;	MediaStatus mediaStatus() const;

	qint64 duration() const;	qint64 duration() const;
	qint64 position() const;	qint64 position() const;

	int volume() const;	int volume() const;
	bool isMuted() const;	bool isMuted() const;
	bool isAudioAvailable() const;	bool isAudioAvailable() const;

	skipping to change at line 161	skipping to change at line 162
	void pause();	void pause();
	void stop();	void stop();

	void setPosition(qint64 position);	void setPosition(qint64 position);
	void setVolume(int volume);	void setVolume(int volume);
	void setMuted(bool muted);	void setMuted(bool muted);

	void setPlaybackRate(qreal rate);	void setPlaybackRate(qreal rate);

	void setMedia(const QMediaContent &media, QIODevice *stream = 0);	void setMedia(const QMediaContent &media, QIODevice *stream = 0);

		void setPlaylist(QMediaPlaylist *playlist);

	Q_SIGNALS:	Q_SIGNALS:
	void mediaChanged(const QMediaContent &media);	void mediaChanged(const QMediaContent &media);

	void stateChanged(QMediaPlayer::State newState);	void stateChanged(QMediaPlayer::State newState);
	void mediaStatusChanged(QMediaPlayer::MediaStatus status);	void mediaStatusChanged(QMediaPlayer::MediaStatus status);

	void durationChanged(qint64 duration);	void durationChanged(qint64 duration);
	void positionChanged(qint64 position);	void positionChanged(qint64 position);


	skipping to change at line 184	skipping to change at line 186
	void videoAvailableChanged(bool videoAvailable);	void videoAvailableChanged(bool videoAvailable);

	void bufferStatusChanged(int percentFilled);	void bufferStatusChanged(int percentFilled);

	void seekableChanged(bool seekable);	void seekableChanged(bool seekable);
	void playbackRateChanged(qreal rate);	void playbackRateChanged(qreal rate);

	void error(QMediaPlayer::Error error);	void error(QMediaPlayer::Error error);

	public:	public:

	virtual void bind(QObject*);	virtual bool bind(QObject *);
	virtual void unbind(QObject*);	virtual void unbind(QObject *);

	private:	private:
	Q_DISABLE_COPY(QMediaPlayer)	Q_DISABLE_COPY(QMediaPlayer)
	Q_DECLARE_PRIVATE(QMediaPlayer)	Q_DECLARE_PRIVATE(QMediaPlayer)
	Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(QMediaPlayer::State))	Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(QMediaPlayer::State))
	Q_PRIVATE_SLOT(d_func(), void _q_mediaStatusChanged(QMediaPlayer::Media Status))	Q_PRIVATE_SLOT(d_func(), void _q_mediaStatusChanged(QMediaPlayer::Media Status))
	Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))	Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))
	Q_PRIVATE_SLOT(d_func(), void _q_updateMedia(const QMediaContent&))	Q_PRIVATE_SLOT(d_func(), void _q_updateMedia(const QMediaContent&))
	Q_PRIVATE_SLOT(d_func(), void _q_playlistDestroyed())	Q_PRIVATE_SLOT(d_func(), void _q_playlistDestroyed())
	};	};

End of changes. 11 change blocks.
	13 lines changed or deleted	15 lines changed or added

	qmediaplayercontrol.h	qmediaplayercontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIAPLAYERCONTROL_H	#ifndef QMEDIAPLAYERCONTROL_H
	#define QMEDIAPLAYERCONTROL_H	#define QMEDIAPLAYERCONTROL_H

	#include "qmediacontrol.h"	#include "qmediacontrol.h"
	#include "qmediaplayer.h"	#include "qmediaplayer.h"
	#include "qmediatimerange.h"	#include "qmediatimerange.h"

	#include <QtCore/qpair.h>	#include <QtCore/qpair.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaPlaylist;	class QMediaPlaylist;


	class Q_MEDIA_EXPORT QMediaPlayerControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QMediaPlayerControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	~QMediaPlayerControl();	~QMediaPlayerControl();

	virtual QMediaPlayer::State state() const = 0;	virtual QMediaPlayer::State state() const = 0;

	virtual QMediaPlayer::MediaStatus mediaStatus() const = 0;	virtual QMediaPlayer::MediaStatus mediaStatus() const = 0;


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

	qmediaplaylist.h	qmediaplaylist.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIAPLAYLIST_H	#ifndef QMEDIAPLAYLIST_H
	#define QMEDIAPLAYLIST_H	#define QMEDIAPLAYLIST_H

	#include <QtCore/qobject.h>	#include <QtCore/qobject.h>


	#include "qmediacontent.h"	#include <qmediacontent.h>
	#include "qmediaobject.h"	#include <qmediaobject.h>
		#include <qmediabindableinterface.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaPlaylistProvider;	class QMediaPlaylistProvider;

	class QMediaPlaylistPrivate;	class QMediaPlaylistPrivate;

	class Q_MEDIA_EXPORT QMediaPlaylist : public QObject	class Q_MULTIMEDIA_EXPORT QMediaPlaylist : public QObject, public QMediaBin dableInterface
	{	{
	Q_OBJECT	Q_OBJECT

		Q_INTERFACES(QMediaBindableInterface)
	Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged)	Q_PROPERTY(QMediaPlaylist::PlaybackMode playbackMode READ playbackMode WRITE setPlaybackMode NOTIFY playbackModeChanged)
	Q_PROPERTY(QMediaContent currentMedia READ currentMedia NOTIFY currentM ediaChanged)	Q_PROPERTY(QMediaContent currentMedia READ currentMedia NOTIFY currentM ediaChanged)
	Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOT IFY currentIndexChanged)	Q_PROPERTY(int currentIndex READ currentIndex WRITE setCurrentIndex NOT IFY currentIndexChanged)
	Q_ENUMS(PlaybackMode Error)	Q_ENUMS(PlaybackMode Error)

	public:	public:

	enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Linear, Loop, R andom };	enum PlaybackMode { CurrentItemOnce, CurrentItemInLoop, Sequential, Loo p, Random };
	enum Error { NoError, FormatError, FormatNotSupportedError, NetworkErro r, AccessDeniedError };	enum Error { NoError, FormatError, FormatNotSupportedError, NetworkErro r, AccessDeniedError };

	QMediaPlaylist(QObject *parent = 0);	QMediaPlaylist(QObject *parent = 0);
	virtual ~QMediaPlaylist();	virtual ~QMediaPlaylist();

	QMediaObject *mediaObject() const;	QMediaObject *mediaObject() const;

	void setMediaObject(QMediaObject *object);

	PlaybackMode playbackMode() const;	PlaybackMode playbackMode() const;
	void setPlaybackMode(PlaybackMode mode);	void setPlaybackMode(PlaybackMode mode);

	int currentIndex() const;	int currentIndex() const;
	QMediaContent currentMedia() const;	QMediaContent currentMedia() const;

	int nextIndex(int steps = 1) const;	int nextIndex(int steps = 1) const;
	int previousIndex(int steps = 1) const;	int previousIndex(int steps = 1) const;


	skipping to change at line 134	skipping to change at line 129
	void mediaAboutToBeInserted(int start, int end);	void mediaAboutToBeInserted(int start, int end);
	void mediaInserted(int start, int end);	void mediaInserted(int start, int end);
	void mediaAboutToBeRemoved(int start, int end);	void mediaAboutToBeRemoved(int start, int end);
	void mediaRemoved(int start, int end);	void mediaRemoved(int start, int end);
	void mediaChanged(int start, int end);	void mediaChanged(int start, int end);

	void loaded();	void loaded();
	void loadFailed();	void loadFailed();

	protected:	protected:

		bool setMediaObject(QMediaObject *object);
	QMediaPlaylistPrivate *d_ptr;	QMediaPlaylistPrivate *d_ptr;

	private:	private:
	Q_DECLARE_PRIVATE(QMediaPlaylist)	Q_DECLARE_PRIVATE(QMediaPlaylist)
	Q_PRIVATE_SLOT(d_func(), void _q_loadFailed(QMediaPlaylist::Error, cons t QString &))	Q_PRIVATE_SLOT(d_func(), void _q_loadFailed(QMediaPlaylist::Error, cons t QString &))
	};	};

	QT_END_NAMESPACE	QT_END_NAMESPACE

	Q_DECLARE_METATYPE(QMediaPlaylist::PlaybackMode)	Q_DECLARE_METATYPE(QMediaPlaylist::PlaybackMode)

End of changes. 9 change blocks.
	14 lines changed or deleted	10 lines changed or added

	qmediarecorder.h	qmediarecorder.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIARECORDER_H	#ifndef QMEDIARECORDER_H
	#define QMEDIARECORDER_H	#define QMEDIARECORDER_H


	#include "qmediaobject.h"	#include <qmediaobject.h>
	#include "qmediaserviceprovider.h"	#include <qmediaserviceprovider.h>
	#include "qmediaencodersettings.h"	#include <qmediaencodersettings.h>
		#include <qmediabindableinterface.h>

	#include <QtCore/qpair.h>	#include <QtCore/qpair.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QUrl;	class QUrl;
	class QSize;	class QSize;
	class QAudioFormat;	class QAudioFormat;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaRecorderService;	class QMediaRecorderService;
	class QAudioEncoderSettings;	class QAudioEncoderSettings;
	class QVideoEncoderSettings;	class QVideoEncoderSettings;

	class QMediaRecorderPrivate;	class QMediaRecorderPrivate;

	class Q_MEDIA_EXPORT QMediaRecorder : public QMediaObject	class Q_MULTIMEDIA_EXPORT QMediaRecorder : public QObject, public QMediaBin dableInterface
	{	{
	Q_OBJECT	Q_OBJECT

		Q_INTERFACES(QMediaBindableInterface)
	Q_ENUMS(State)	Q_ENUMS(State)
	Q_ENUMS(Error)	Q_ENUMS(Error)
	Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)	Q_PROPERTY(qint64 duration READ duration NOTIFY durationChanged)
	Q_PROPERTY(QUrl outputLocation READ outputLocation WRITE setOutputLocat ion)	Q_PROPERTY(QUrl outputLocation READ outputLocation WRITE setOutputLocat ion)

		Q_PROPERTY(bool muted READ isMuted WRITE setMuted NOTIFY mutedChanged)
		Q_PROPERTY(bool metaDataAvailable READ isMetaDataAvailable NOTIFY metaD
		ataAvailableChanged)
		Q_PROPERTY(bool metaDataWritable READ isMetaDataWritable NOTIFY metaDat
		aWritableChanged)
	public:	public:

	enum State	enum State
	{	{
	StoppedState,	StoppedState,
	RecordingState,	RecordingState,
	PausedState	PausedState
	};	};

	enum Error	enum Error
	{	{
	NoError,	NoError,
	ResourceError,	ResourceError,
	FormatError	FormatError
	};	};

	QMediaRecorder(QMediaObject mediaObject, QObject parent = 0);	QMediaRecorder(QMediaObject mediaObject, QObject parent = 0);
	~QMediaRecorder();	~QMediaRecorder();


		QMediaObject *mediaObject() const;

	bool isAvailable() const;	bool isAvailable() const;

	QtMediaServices::AvailabilityError availabilityError() const;	QtMultimediaKit::AvailabilityError availabilityError() const;

	QUrl outputLocation() const;	QUrl outputLocation() const;
	bool setOutputLocation(const QUrl &location);	bool setOutputLocation(const QUrl &location);

	State state() const;	State state() const;

	Error error() const;	Error error() const;
	QString errorString() const;	QString errorString() const;

	qint64 duration() const;	qint64 duration() const;


		bool isMuted() const;

	QStringList supportedContainers() const;	QStringList supportedContainers() const;
	QString containerDescription(const QString &containerMimeType) const;	QString containerDescription(const QString &containerMimeType) const;

	QStringList supportedAudioCodecs() const;	QStringList supportedAudioCodecs() const;
	QString audioCodecDescription(const QString &codecName) const;	QString audioCodecDescription(const QString &codecName) const;

	QList<int> supportedAudioSampleRates(const QAudioEncoderSettings &setti ngs = QAudioEncoderSettings(),	QList<int> supportedAudioSampleRates(const QAudioEncoderSettings &setti ngs = QAudioEncoderSettings(),
	bool *continuous = 0) const;	bool *continuous = 0) const;

	QStringList supportedVideoCodecs() const;	QStringList supportedVideoCodecs() const;

	skipping to change at line 135	skipping to change at line 138
	bool *continuous = 0) const;	bool *continuous = 0) const;

	QAudioEncoderSettings audioSettings() const;	QAudioEncoderSettings audioSettings() const;
	QVideoEncoderSettings videoSettings() const;	QVideoEncoderSettings videoSettings() const;
	QString containerMimeType() const;	QString containerMimeType() const;

	void setEncodingSettings(const QAudioEncoderSettings &audioSettings,	void setEncodingSettings(const QAudioEncoderSettings &audioSettings,
	const QVideoEncoderSettings &videoSettings = Q VideoEncoderSettings(),	const QVideoEncoderSettings &videoSettings = Q VideoEncoderSettings(),
	const QString &containerMimeType = QString());	const QString &containerMimeType = QString());


		bool isMetaDataAvailable() const;
		bool isMetaDataWritable() const;

		QVariant metaData(QtMultimediaKit::MetaData key) const;
		void setMetaData(QtMultimediaKit::MetaData key, const QVariant &value);
		QList<QtMultimediaKit::MetaData> availableMetaData() const;

		QVariant extendedMetaData(const QString &key) const;
		void setExtendedMetaData(const QString &key, const QVariant &value);
		QStringList availableExtendedMetaData() const;

	public Q_SLOTS:	public Q_SLOTS:
	void record();	void record();
	void pause();	void pause();
	void stop();	void stop();

		void setMuted(bool muted);

	Q_SIGNALS:	Q_SIGNALS:
	void stateChanged(QMediaRecorder::State state);	void stateChanged(QMediaRecorder::State state);
	void durationChanged(qint64 duration);	void durationChanged(qint64 duration);

		void mutedChanged(bool muted);

	void error(QMediaRecorder::Error error);	void error(QMediaRecorder::Error error);


		void metaDataAvailableChanged(bool available);
		void metaDataWritableChanged(bool writable);
		void metaDataChanged();

		protected:
		bool setMediaObject(QMediaObject *object);

	private:	private:

		QMediaRecorderPrivate *d_ptr;
	Q_DISABLE_COPY(QMediaRecorder)	Q_DISABLE_COPY(QMediaRecorder)
	Q_DECLARE_PRIVATE(QMediaRecorder)	Q_DECLARE_PRIVATE(QMediaRecorder)
	Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(QMediaRecorder::State))	Q_PRIVATE_SLOT(d_func(), void _q_stateChanged(QMediaRecorder::State))
	Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))	Q_PRIVATE_SLOT(d_func(), void _q_error(int, const QString &))

		Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed())
		Q_PRIVATE_SLOT(d_func(), void _q_notify())
		Q_PRIVATE_SLOT(d_func(), void _q_updateNotifyInterval(int))
	};	};

	QT_END_NAMESPACE	QT_END_NAMESPACE

	Q_DECLARE_METATYPE(QMediaRecorder::State)	Q_DECLARE_METATYPE(QMediaRecorder::State)
	Q_DECLARE_METATYPE(QMediaRecorder::Error)	Q_DECLARE_METATYPE(QMediaRecorder::Error)

	#endif // QMEDIARECORDER_H	#endif // QMEDIARECORDER_H

End of changes. 16 change blocks.
	14 lines changed or deleted	43 lines changed or added

	qmediarecordercontrol.h	qmediarecordercontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIARECORDERCONTROL_H	#ifndef QMEDIARECORDERCONTROL_H
	#define QMEDIARECORDERCONTROL_H	#define QMEDIARECORDERCONTROL_H

	#include "qmediacontrol.h"	#include "qmediacontrol.h"
	#include "qmediarecorder.h"	#include "qmediarecorder.h"

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QUrl;	class QUrl;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	class Q_MEDIA_EXPORT QMediaRecorderControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QMediaRecorderControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	virtual ~QMediaRecorderControl();	virtual ~QMediaRecorderControl();

	virtual QUrl outputLocation() const = 0;	virtual QUrl outputLocation() const = 0;
	virtual bool setOutputLocation(const QUrl &location) = 0;	virtual bool setOutputLocation(const QUrl &location) = 0;

	virtual QMediaRecorder::State state() const = 0;	virtual QMediaRecorder::State state() const = 0;

	virtual qint64 duration() const = 0;	virtual qint64 duration() const = 0;


		virtual bool isMuted() const = 0;

	virtual void applySettings() = 0;	virtual void applySettings() = 0;

	Q_SIGNALS:	Q_SIGNALS:
	void stateChanged(QMediaRecorder::State state);	void stateChanged(QMediaRecorder::State state);
	void durationChanged(qint64 position);	void durationChanged(qint64 position);

		void mutedChanged(bool muted);
	void error(int error, const QString &errorString);	void error(int error, const QString &errorString);

	public Q_SLOTS:	public Q_SLOTS:
	virtual void record() = 0;	virtual void record() = 0;
	virtual void pause() = 0;	virtual void pause() = 0;
	virtual void stop() = 0;	virtual void stop() = 0;

		virtual void setMuted(bool muted) = 0;

	protected:	protected:
	QMediaRecorderControl(QObject* parent = 0);	QMediaRecorderControl(QObject* parent = 0);
	};	};

	#define QMediaRecorderControl_iid "com.nokia.Qt.QMediaRecorderControl/1.0"	#define QMediaRecorderControl_iid "com.nokia.Qt.QMediaRecorderControl/1.0"
	Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)	Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid)

	QT_END_NAMESPACE	QT_END_NAMESPACE


End of changes. 7 change blocks.
	10 lines changed or deleted	8 lines changed or added

	qmediaresource.h	qmediaresource.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIARESOURCE_H	#ifndef QMEDIARESOURCE_H
	#define QMEDIARESOURCE_H	#define QMEDIARESOURCE_H

	#include <QtCore/qmap.h>	#include <QtCore/qmap.h>
	#include <QtCore/qmetatype.h>	#include <QtCore/qmetatype.h>
	#include <QtNetwork/qnetworkrequest.h>	#include <QtNetwork/qnetworkrequest.h>

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	class Q_MEDIA_EXPORT QMediaResource	class Q_MULTIMEDIA_EXPORT QMediaResource
	{	{
	public:	public:
	QMediaResource();	QMediaResource();
	QMediaResource(const QUrl &url, const QString &mimeType = QString());	QMediaResource(const QUrl &url, const QString &mimeType = QString());
	QMediaResource(const QNetworkRequest &request, const QString &mimeType = QString());	QMediaResource(const QNetworkRequest &request, const QString &mimeType = QString());
	QMediaResource(const QMediaResource &other);	QMediaResource(const QMediaResource &other);
	QMediaResource &operator =(const QMediaResource &other);	QMediaResource &operator =(const QMediaResource &other);
	~QMediaResource();	~QMediaResource();

	bool isNull() const;	bool isNull() const;

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

	qmediaservice.h	qmediaservice.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QABSTRACTMEDIASERVICE_H	#ifndef QABSTRACTMEDIASERVICE_H
	#define QABSTRACTMEDIASERVICE_H	#define QABSTRACTMEDIASERVICE_H

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>
	#include <QtCore/qobject.h>	#include <QtCore/qobject.h>
	#include <QtCore/qstringlist.h>	#include <QtCore/qstringlist.h>

	#include "qmediacontrol.h"	#include "qmediacontrol.h"

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaServicePrivate;	class QMediaServicePrivate;

	class Q_MEDIA_EXPORT QMediaService : public QObject	class Q_MULTIMEDIA_EXPORT QMediaService : public QObject
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	~QMediaService();	~QMediaService();


	virtual QMediaControl* control(const char *name) const = 0;	virtual QMediaControl* requestControl(const char *name) = 0;

	#ifndef QT_NO_MEMBER_TEMPLATES	#ifndef QT_NO_MEMBER_TEMPLATES

	template <typename T> inline T control() const {	template <typename T> inline T requestControl() {
	if (QObject *object = control(qmediacontrol_iid<T>())) {	if (QMediaControl *control = requestControl(qmediacontrol_iid<T>())
	return qobject_cast<T>(object);	) {
		if (T typedControl = qobject_cast<T>(control))
		return typedControl;
		releaseControl(control);
	}	}
	return 0;	return 0;
	}	}
	#endif	#endif


		virtual void releaseControl(QMediaControl *control) = 0;

	protected:	protected:
	QMediaService(QObject* parent);	QMediaService(QObject* parent);
	QMediaService(QMediaServicePrivate &dd, QObject *parent);	QMediaService(QMediaServicePrivate &dd, QObject *parent);

	QMediaServicePrivate *d_ptr;	QMediaServicePrivate *d_ptr;

	private:	private:
	Q_DECLARE_PRIVATE(QMediaService)	Q_DECLARE_PRIVATE(QMediaService)
	};	};


End of changes. 7 change blocks.
	14 lines changed or deleted	13 lines changed or added

	qmediatimerange.h	qmediatimerange.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QMEDIATIMERANGE_H	#ifndef QMEDIATIMERANGE_H
	#define QMEDIATIMERANGE_H	#define QMEDIATIMERANGE_H

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>
	#include "qtmedianamespace.h"	#include "qtmedianamespace.h"
	#include <QtCore/qshareddata.h>	#include <QtCore/qshareddata.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaTimeRangePrivate;	class QMediaTimeRangePrivate;


	class Q_MEDIA_EXPORT QMediaTimeInterval	class Q_MULTIMEDIA_EXPORT QMediaTimeInterval
	{	{
	public:	public:
	QMediaTimeInterval();	QMediaTimeInterval();
	QMediaTimeInterval(qint64 start, qint64 end);	QMediaTimeInterval(qint64 start, qint64 end);
	QMediaTimeInterval(const QMediaTimeInterval&);	QMediaTimeInterval(const QMediaTimeInterval&);

	qint64 start() const;	qint64 start() const;
	qint64 end() const;	qint64 end() const;

	bool contains(qint64 time) const;	bool contains(qint64 time) const;

	skipping to change at line 83	skipping to change at line 77
	QMediaTimeInterval translated(qint64 offset) const;	QMediaTimeInterval translated(qint64 offset) const;

	private:	private:
	friend class QMediaTimeRangePrivate;	friend class QMediaTimeRangePrivate;
	friend class QMediaTimeRange;	friend class QMediaTimeRange;

	qint64 s;	qint64 s;
	qint64 e;	qint64 e;
	};	};


	Q_MEDIA_EXPORT bool operator==(const QMediaTimeInterval&, const QMediaTimeI	Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeInterval&, const QMedia
	nterval&);	TimeInterval&);
	Q_MEDIA_EXPORT bool operator!=(const QMediaTimeInterval&, const QMediaTimeI	Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeInterval&, const QMedia
	nterval&);	TimeInterval&);


	class Q_MEDIA_EXPORT QMediaTimeRange	class Q_MULTIMEDIA_EXPORT QMediaTimeRange
	{	{
	public:	public:

	QMediaTimeRange();	QMediaTimeRange();
	QMediaTimeRange(qint64 start, qint64 end);	QMediaTimeRange(qint64 start, qint64 end);
	QMediaTimeRange(const QMediaTimeInterval&);	QMediaTimeRange(const QMediaTimeInterval&);
	QMediaTimeRange(const QMediaTimeRange &range);	QMediaTimeRange(const QMediaTimeRange &range);
	~QMediaTimeRange();	~QMediaTimeRange();

	QMediaTimeRange &operator=(const QMediaTimeRange&);	QMediaTimeRange &operator=(const QMediaTimeRange&);

	skipping to change at line 127	skipping to change at line 121
	QMediaTimeRange& operator+=(const QMediaTimeInterval&);	QMediaTimeRange& operator+=(const QMediaTimeInterval&);
	QMediaTimeRange& operator-=(const QMediaTimeRange&);	QMediaTimeRange& operator-=(const QMediaTimeRange&);
	QMediaTimeRange& operator-=(const QMediaTimeInterval&);	QMediaTimeRange& operator-=(const QMediaTimeInterval&);

	void clear();	void clear();

	private:	private:
	QSharedDataPointer<QMediaTimeRangePrivate> d;	QSharedDataPointer<QMediaTimeRangePrivate> d;
	};	};


	Q_MEDIA_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTimeRang	Q_MULTIMEDIA_EXPORT bool operator==(const QMediaTimeRange&, const QMediaTim
	e&);	eRange&);
	Q_MEDIA_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTimeRang	Q_MULTIMEDIA_EXPORT bool operator!=(const QMediaTimeRange&, const QMediaTim
	e&);	eRange&);
	Q_MEDIA_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const QMed	Q_MULTIMEDIA_EXPORT QMediaTimeRange operator+(const QMediaTimeRange&, const
	iaTimeRange&);	QMediaTimeRange&);
	Q_MEDIA_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const QMed	Q_MULTIMEDIA_EXPORT QMediaTimeRange operator-(const QMediaTimeRange&, const
	iaTimeRange&);	QMediaTimeRange&);

	QT_END_NAMESPACE	QT_END_NAMESPACE

	#endif // QMEDIATIMERANGE_H	#endif // QMEDIATIMERANGE_H

End of changes. 7 change blocks.
	23 lines changed or deleted	17 lines changed or added

	qmobilityglobal.h	qmobilityglobal.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */
	#ifndef QMOBILITYGLOBAL_H	#ifndef QMOBILITYGLOBAL_H
	#define QMOBILITYGLOBAL_H	#define QMOBILITYGLOBAL_H


	#define QTM_VERSION_STR "1.0.0"	#define QTM_VERSION_STR "1.1.0"
	/*	/*
	QTM_VERSION is (major << 16) + (minor << 8) + patch.	QTM_VERSION is (major << 16) + (minor << 8) + patch.
	*/	*/

	#define QTM_VERSION 0x010000	#define QTM_VERSION 0x010100
	/*	/*

	can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 0, 0))	can be used like #if (QTM_VERSION >= QTM_VERSION_CHECK(1, 1, 0))
	*/	*/
	#define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)\|(minor<<8)\|(pat ch))	#define QTM_VERSION_CHECK(major, minor, patch) ((major<<16)\|(minor<<8)\|(pat ch))


	#define QTM_PACKAGEDATE_STR "2010-04-22"	#define QTM_PACKAGEDATE_STR "2010-11-01"


	#define QTM_PACKAGE_TAG "91205131c9ebed43140c86b8885e9e680bc89cc1"	#define QTM_PACKAGE_TAG "fbbf8dad1046695fa14713f08ecdd19b81c67ea6"


	#if defined(QTM_BUILD_UNITTESTS)
	# include <qconfig.h>
	# if !defined(QT_BUILD_INTERNAL)
	# define QT_BUILD_INTERNAL
	# endif
	#endif
	#include <QtCore/qglobal.h>	#include <QtCore/qglobal.h>

		#if defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) \|\| defined(Q_OS_SYMB
	#if defined(SYMBIAN_DATABASEMANAGER_SERVER)	IAN)) && defined(QT_MAKEDLL)
	# define Q_SERVICEFW_EXPORT	# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT
		#elif defined(QTM_BUILD_UNITTESTS) && (defined(Q_OS_WIN) \|\| defined(Q_OS_SY
		MBIAN)) && defined(QT_DLL)
		# define QM_AUTOTEST_EXPORT Q_DECL_IMPORT
		#elif defined(QTM_BUILD_UNITTESTS) && !(defined(Q_OS_WIN) \|\| defined(Q_OS_S
		YMBIAN)) && defined(QT_SHARED)
		# define QM_AUTOTEST_EXPORT Q_DECL_EXPORT
	#else	#else

	# if defined(Q_OS_WIN) \|\| defined(Q_OS_SYMBIAN)	# define QM_AUTOTEST_EXPORT
	# if defined(QT_NODLL)	#endif
	# undef QT_MAKEDLL
		#if defined(Q_OS_WIN) \|\| defined(Q_OS_SYMBIAN)
		# if defined(QT_NODLL)
		# undef QT_MAKEDLL
		# undef QT_DLL
		# elif defined(QT_MAKEDLL)
		# if defined(QT_DLL)
	# undef QT_DLL	# undef QT_DLL

	# elif defined(QT_MAKEDLL)
	# if defined(QT_DLL)
	# undef QT_DLL
	# endif
	# if defined(QT_BUILD_BEARER_LIB)
	# define Q_BEARER_EXPORT Q_DECL_EXPORT
	# else
	# define Q_BEARER_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_CFW_LIB)
	# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT
	# else
	# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_CONTACTS_LIB)
	# define Q_CONTACTS_EXPORT Q_DECL_EXPORT
	# else
	# define Q_CONTACTS_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_VERSIT_LIB)
	# define Q_VERSIT_EXPORT Q_DECL_EXPORT
	# else
	# define Q_VERSIT_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_LOCATION_LIB)
	# define Q_LOCATION_EXPORT Q_DECL_EXPORT
	# else
	# define Q_LOCATION_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_MESSAGING_LIB)
	# define Q_MESSAGING_EXPORT Q_DECL_EXPORT
	# else
	# define Q_MESSAGING_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_MEDIA_LIB)
	# define Q_MEDIA_EXPORT Q_DECL_EXPORT
	# else
	# define Q_MEDIA_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_SFW_LIB)
	# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT
	# else
	# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_SYSINFO_LIB)
	# define Q_SYSINFO_EXPORT Q_DECL_EXPORT
	# else
	# define Q_SYSINFO_EXPORT Q_DECL_IMPORT
	# endif
	# if defined(QT_BUILD_SENSORS_LIB)
	# define Q_SENSORS_EXPORT Q_DECL_EXPORT
	# else
	# define Q_SENSORS_EXPORT Q_DECL_IMPORT
	# endif
	# elif defined(QT_DLL) /* use a Qt DLL library */
	# define Q_BEARER_EXPORT Q_DECL_IMPORT
	# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT
	# define Q_CONTACTS_EXPORT Q_DECL_IMPORT
	# define Q_VERSIT_EXPORT Q_DECL_IMPORT
	# define Q_LOCATION_EXPORT Q_DECL_IMPORT
	# define Q_MEDIA_EXPORT Q_DECL_IMPORT
	# define Q_MESSAGING_EXPORT Q_DECL_IMPORT
	# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT
	# define Q_SYSINFO_EXPORT Q_DECL_IMPORT
	# define Q_SENSORS_EXPORT Q_DECL_IMPORT
	# endif	# endif

	# else	# if defined(QT_BUILD_BEARER_LIB)
	# endif
	# if !defined(Q_SERVICEFW_EXPORT)
	# if defined(QT_SHARED)
	# define Q_BEARER_EXPORT Q_DECL_EXPORT	# define Q_BEARER_EXPORT Q_DECL_EXPORT

		# else
		# define Q_BEARER_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_CFW_LIB)
	# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT	# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT

		# else
		# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_CONTACTS_LIB)
	# define Q_CONTACTS_EXPORT Q_DECL_EXPORT	# define Q_CONTACTS_EXPORT Q_DECL_EXPORT

		# else
		# define Q_CONTACTS_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_VERSIT_LIB)
	# define Q_VERSIT_EXPORT Q_DECL_EXPORT	# define Q_VERSIT_EXPORT Q_DECL_EXPORT

		# else
		# define Q_VERSIT_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_VERSIT_ORGANIZER_LIB)
		# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_EXPORT
		# else
		# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_LOCATION_LIB)
	# define Q_LOCATION_EXPORT Q_DECL_EXPORT	# define Q_LOCATION_EXPORT Q_DECL_EXPORT

	# define Q_MEDIA_EXPORT Q_DECL_EXPORT	# else
		# define Q_LOCATION_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_MESSAGING_LIB)
	# define Q_MESSAGING_EXPORT Q_DECL_EXPORT	# define Q_MESSAGING_EXPORT Q_DECL_EXPORT

		# else
		# define Q_MESSAGING_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_MULTIMEDIA_LIB)
		# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
		# else
		# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_SFW_LIB)
	# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT	# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT

		# else
		# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_SYSINFO_LIB)
	# define Q_SYSINFO_EXPORT Q_DECL_EXPORT	# define Q_SYSINFO_EXPORT Q_DECL_EXPORT

		# else
		# define Q_SYSINFO_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_SENSORS_LIB)
	# define Q_SENSORS_EXPORT Q_DECL_EXPORT	# define Q_SENSORS_EXPORT Q_DECL_EXPORT
	# else	# else

	# define Q_BEARER_EXPORT	# define Q_SENSORS_EXPORT Q_DECL_IMPORT
	# define Q_PUBLISHSUBSCRIBE_EXPORT	# endif
	# define Q_CONTACTS_EXPORT	# if defined(QT_BUILD_FEEDBACK_LIB)
	# define Q_VERSIT_EXPORT	# define Q_FEEDBACK_EXPORT Q_DECL_EXPORT
	# define Q_LOCATION_EXPORT	# else
	# define Q_MEDIA_EXPORT	# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT
	# define Q_MESSAGING_EXPORT	# endif
		# if defined(QT_BUILD_GALLERY_LIB)
		# define Q_GALLERY_EXPORT Q_DECL_EXPORT
		# else
		# define Q_GALLERY_EXPORT Q_DECL_IMPORT
		# endif
		# if defined(QT_BUILD_ORGANIZER_LIB)
		# define Q_ORGANIZER_EXPORT Q_DECL_EXPORT
		# else
		# define Q_ORGANIZER_EXPORT Q_DECL_IMPORT
		# endif
		# elif defined(QT_DLL) /* use a Qt DLL library */
		# define Q_BEARER_EXPORT Q_DECL_IMPORT
		# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT
		# define Q_CONTACTS_EXPORT Q_DECL_IMPORT
		# define Q_VERSIT_EXPORT Q_DECL_IMPORT
		# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_IMPORT
		# define Q_LOCATION_EXPORT Q_DECL_IMPORT
		# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT
		# define Q_MESSAGING_EXPORT Q_DECL_IMPORT
		# if QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER
	# define Q_SERVICEFW_EXPORT	# define Q_SERVICEFW_EXPORT

	# define Q_SYSINFO_EXPORT	# else
	# define Q_SENSORS_EXPORT	# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT
	# endif	# endif

		# define Q_SYSINFO_EXPORT Q_DECL_IMPORT
		# define Q_SENSORS_EXPORT Q_DECL_IMPORT
		# define Q_FEEDBACK_EXPORT Q_DECL_IMPORT
		# define Q_GALLERY_EXPORT Q_DECL_IMPORT
		# define Q_ORGANIZER_EXPORT Q_DECL_IMPORT
		# endif
		#endif

		#if !defined(Q_SERVICEFW_EXPORT)
		# if defined(QT_SHARED)
		# define Q_BEARER_EXPORT Q_DECL_EXPORT
		# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT
		# define Q_CONTACTS_EXPORT Q_DECL_EXPORT
		# define Q_VERSIT_EXPORT Q_DECL_EXPORT
		# define Q_VERSIT_ORGANIZER_EXPORT Q_DECL_EXPORT
		# define Q_LOCATION_EXPORT Q_DECL_EXPORT
		# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT
		# define Q_MESSAGING_EXPORT Q_DECL_EXPORT
		# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT
		# define Q_SYSINFO_EXPORT Q_DECL_EXPORT
		# define Q_SENSORS_EXPORT Q_DECL_EXPORT
		# define Q_FEEDBACK_EXPORT Q_DECL_EXPORT
		# define Q_GALLERY_EXPORT Q_DECL_EXPORT
		# define Q_ORGANIZER_EXPORT Q_DECL_EXPORT
		# else
		# define Q_BEARER_EXPORT
		# define Q_PUBLISHSUBSCRIBE_EXPORT
		# define Q_CONTACTS_EXPORT
		# define Q_VERSIT_EXPORT
		# define Q_VERSIT_ORGANIZER_EXPORT
		# define Q_LOCATION_EXPORT
		# define Q_MULTIMEDIA_EXPORT
		# define Q_MESSAGING_EXPORT
		# define Q_SERVICEFW_EXPORT
		# define Q_SYSINFO_EXPORT
		# define Q_SENSORS_EXPORT
		# define Q_FEEDBACK_EXPORT
		# define Q_GALLERY_EXPORT
		# define Q_ORGANIZER_EXPORT
	# endif	# endif
	#endif	#endif


		#ifdef QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER
		# ifdef Q_SERVICEFW_EXPORT
		# undef Q_SERVICEFW_EXPORT
		# endif
		# define Q_SERVICEFW_EXPORT
		# ifdef QM_AUTOTEST_EXPORT
		# undef QM_AUTOTEST_EXPORT
		# endif
		# define QM_AUTOTEST_EXPORT
		#endif

	// The namespace is hardcoded as moc has issues resolving	// The namespace is hardcoded as moc has issues resolving
	// macros which would be a prerequisite for a dynmamic namespace	// macros which would be a prerequisite for a dynmamic namespace
	#define QTM_NAMESPACE QtMobility	#define QTM_NAMESPACE QtMobility

	#ifdef QTM_NAMESPACE	#ifdef QTM_NAMESPACE
	# define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name	# define QTM_PREPEND_NAMESPACE(name) ::QTM_NAMESPACE::name
	# define QTM_BEGIN_NAMESPACE namespace QTM_NAMESPACE {	# define QTM_BEGIN_NAMESPACE namespace QTM_NAMESPACE {
	# define QTM_END_NAMESPACE }	# define QTM_END_NAMESPACE }
	# define QTM_USE_NAMESPACE using namespace QTM_NAMESPACE;	# define QTM_USE_NAMESPACE using namespace QTM_NAMESPACE;
	#else	#else

End of changes. 25 change blocks.
	105 lines changed or deleted	148 lines changed or added

	qorientationsensor.h	qorientationsensor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QORIENTATIONSENSOR_H	#ifndef QORIENTATIONSENSOR_H
	#define QORIENTATIONSENSOR_H	#define QORIENTATIONSENSOR_H

	#include "qsensor.h"	#include "qsensor.h"

	skipping to change at line 93	skipping to change at line 87
	bool filter(QSensorReading reading) { return filter(static_cast<QOrien tationReading>(reading)); }	bool filter(QSensorReading reading) { return filter(static_cast<QOrien tationReading>(reading)); }
	};	};

	class Q_SENSORS_EXPORT QOrientationSensor : public QSensor	class Q_SENSORS_EXPORT QOrientationSensor : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	explicit QOrientationSensor(QObject *parent = 0) : QSensor(QOrientation Sensor::type, parent) {}	explicit QOrientationSensor(QObject *parent = 0) : QSensor(QOrientation Sensor::type, parent) {}
	virtual ~QOrientationSensor() {}	virtual ~QOrientationSensor() {}
	QOrientationReading reading() const { return static_cast<QOrientationR eading>(QSensor::reading()); }	QOrientationReading reading() const { return static_cast<QOrientationR eading>(QSensor::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qproximitysensor.h	qproximitysensor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QPROXIMITYSENSOR_H	#ifndef QPROXIMITYSENSOR_H
	#define QPROXIMITYSENSOR_H	#define QPROXIMITYSENSOR_H

	#include "qsensor.h"	#include "qsensor.h"

	skipping to change at line 82	skipping to change at line 76
	bool filter(QSensorReading reading) { return filter(static_cast<QProxi mityReading>(reading)); }	bool filter(QSensorReading reading) { return filter(static_cast<QProxi mityReading>(reading)); }
	};	};

	class Q_SENSORS_EXPORT QProximitySensor : public QSensor	class Q_SENSORS_EXPORT QProximitySensor : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	public:	public:
	explicit QProximitySensor(QObject *parent = 0) : QSensor(QProximitySens or::type, parent) {}	explicit QProximitySensor(QObject *parent = 0) : QSensor(QProximitySens or::type, parent) {}
	virtual ~QProximitySensor() {}	virtual ~QProximitySensor() {}
	QProximityReading reading() const { return static_cast<QProximityReadi ng>(QSensor::reading()); }	QProximityReading reading() const { return static_cast<QProximityReadi ng>(QSensor::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qrotationsensor.h	qrotationsensor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QROTATIONSENSOR_H	#ifndef QROTATIONSENSOR_H
	#define QROTATIONSENSOR_H	#define QROTATIONSENSOR_H

	#include "qsensor.h"	#include "qsensor.h"

	skipping to change at line 93	skipping to change at line 87
	class Q_SENSORS_EXPORT QRotationSensor : public QSensor	class Q_SENSORS_EXPORT QRotationSensor : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	#ifdef Q_QDOC	#ifdef Q_QDOC
	Q_PROPERTY(bool hasZ)	Q_PROPERTY(bool hasZ)
	#endif	#endif
	public:	public:
	explicit QRotationSensor(QObject *parent = 0) : QSensor(QRotationSensor ::type, parent) {}	explicit QRotationSensor(QObject *parent = 0) : QSensor(QRotationSensor ::type, parent) {}
	virtual ~QRotationSensor() {}	virtual ~QRotationSensor() {}
	QRotationReading reading() const { return static_cast<QRotationReading >(QSensor::reading()); }	QRotationReading reading() const { return static_cast<QRotationReading >(QSensor::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qsensor.h	qsensor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QSENSOR_H	#ifndef QSENSOR_H
	#define QSENSOR_H	#define QSENSOR_H

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>

	#include <QObject>	#include <QtCore/QObject>
	#include <QByteArray>	#include <QtCore/QByteArray>
	#include <QMetaType>	#include <QtCore/QMetaType>
	#include <QVariant>	#include <QtCore/QVariant>
	#include <QPair>	#include <QtCore/QPair>

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QSensorPrivate;	class QSensorPrivate;
	class QSensorBackend;	class QSensorBackend;
	class QSensorReading;	class QSensorReading;
	class QSensorReadingPrivate;	class QSensorReadingPrivate;
	class QSensorFilter;	class QSensorFilter;

	#ifdef Q_QDOC	#ifdef Q_QDOC

	skipping to change at line 102	skipping to change at line 96
	friend class QSensorBackend;	friend class QSensorBackend;

	Q_OBJECT	Q_OBJECT
	Q_PROPERTY(QByteArray sensorid READ identifier WRITE setIdentifier)	Q_PROPERTY(QByteArray sensorid READ identifier WRITE setIdentifier)
	Q_PROPERTY(QByteArray type READ type)	Q_PROPERTY(QByteArray type READ type)
	Q_PROPERTY(bool connectedToBackend READ isConnectedToBackend)	Q_PROPERTY(bool connectedToBackend READ isConnectedToBackend)
	Q_PROPERTY(QtMobility::qrangelist availableDataRates READ availableData Rates)	Q_PROPERTY(QtMobility::qrangelist availableDataRates READ availableData Rates)
	Q_PROPERTY(int dataRate READ dataRate WRITE setDataRate)	Q_PROPERTY(int dataRate READ dataRate WRITE setDataRate)
	Q_PROPERTY(QSensorReading* reading READ reading NOTIFY readingChanged)	Q_PROPERTY(QSensorReading* reading READ reading NOTIFY readingChanged)
	Q_PROPERTY(bool busy READ isBusy)	Q_PROPERTY(bool busy READ isBusy)

	Q_PROPERTY(bool active READ isActive)	Q_PROPERTY(bool active READ isActive WRITE setActive NOTIFY activeChang ed)
	Q_PROPERTY(QtMobility::qoutputrangelist outputRanges READ outputRanges)	Q_PROPERTY(QtMobility::qoutputrangelist outputRanges READ outputRanges)
	Q_PROPERTY(int outputRange READ outputRange WRITE setOutputRange)	Q_PROPERTY(int outputRange READ outputRange WRITE setOutputRange)
	Q_PROPERTY(QString description READ description)	Q_PROPERTY(QString description READ description)
	Q_PROPERTY(int error READ error NOTIFY sensorError)	Q_PROPERTY(int error READ error NOTIFY sensorError)
	public:	public:
	explicit QSensor(const QByteArray &type, QObject *parent = 0);	explicit QSensor(const QByteArray &type, QObject *parent = 0);
	virtual ~QSensor();	virtual ~QSensor();

	QByteArray identifier() const;	QByteArray identifier() const;
	void setIdentifier(const QByteArray &identifier);	void setIdentifier(const QByteArray &identifier);

	QByteArray type() const;	QByteArray type() const;

	Q_INVOKABLE bool connectToBackend();	Q_INVOKABLE bool connectToBackend();
	bool isConnectedToBackend() const;	bool isConnectedToBackend() const;

	bool isBusy() const;	bool isBusy() const;


		void setActive(bool active);
	bool isActive() const;	bool isActive() const;

	qrangelist availableDataRates() const;	qrangelist availableDataRates() const;
	int dataRate() const;	int dataRate() const;
	void setDataRate(int rate);	void setDataRate(int rate);

	qoutputrangelist outputRanges() const;	qoutputrangelist outputRanges() const;
	int outputRange() const;	int outputRange() const;
	void setOutputRange(int index);	void setOutputRange(int index);


	skipping to change at line 155	skipping to change at line 151

	public Q_SLOTS:	public Q_SLOTS:
	// Start receiving values from the sensor	// Start receiving values from the sensor
	bool start();	bool start();

	// Stop receiving values from the sensor	// Stop receiving values from the sensor
	void stop();	void stop();

	Q_SIGNALS:	Q_SIGNALS:
	void busyChanged();	void busyChanged();

		void activeChanged();
	void readingChanged();	void readingChanged();
	void sensorError(int error);	void sensorError(int error);

	protected:	protected:
	// called by the back end	// called by the back end
	QSensorPrivate *d_func() const { return d.data(); }	QSensorPrivate *d_func() const { return d.data(); }

	private:	private:
	QScopedPointer<QSensorPrivate> d;	QScopedPointer<QSensorPrivate> d;
	Q_DISABLE_COPY(QSensor)	Q_DISABLE_COPY(QSensor)

	skipping to change at line 198	skipping to change at line 195
	qtimestamp timestamp() const;	qtimestamp timestamp() const;
	void setTimestamp(qtimestamp timestamp);	void setTimestamp(qtimestamp timestamp);

	// Access properties of sub-classes by numeric index	// Access properties of sub-classes by numeric index
	// For name-based access use QObject::property()	// For name-based access use QObject::property()
	int valueCount() const;	int valueCount() const;
	QVariant value(int index) const;	QVariant value(int index) const;

	protected:	protected:
	explicit QSensorReading(QObject parent, QSensorReadingPrivate d);	explicit QSensorReading(QObject parent, QSensorReadingPrivate d);

	QScopedPointer<QSensorReadingPrivate> *d_ptr() { return &d; }	virtual void copyValuesFrom(QSensorReading *other);
	virtual void copyValuesFrom(QSensorReading *other) = 0;

	private:	private:
	QScopedPointer<QSensorReadingPrivate> d;	QScopedPointer<QSensorReadingPrivate> d;
	Q_DISABLE_COPY(QSensorReading)	Q_DISABLE_COPY(QSensorReading)
	};	};


	template <typename T>
	class qTypedWrapper
	{
	public:
	qTypedWrapper(QScopedPointer<QSensorReadingPrivate> *_ptr)
	: ptr(_ptr)
	{
	}

	T *operator->() const
	{
	return static_cast<T*>(ptr->data());
	}

	private:
	QScopedPointer<QSensorReadingPrivate> *ptr;
	};

	#define DECLARE_READING(classname)\	#define DECLARE_READING(classname)\
	DECLARE_READING_D(classname, classname ## Private)	DECLARE_READING_D(classname, classname ## Private)

	#define DECLARE_READING_D(classname, pclassname)\	#define DECLARE_READING_D(classname, pclassname)\
	public:\	public:\
	classname(QObject *parent = 0);\	classname(QObject *parent = 0);\
	virtual ~classname();\	virtual ~classname();\
	void copyValuesFrom(QSensorReading *other);\	void copyValuesFrom(QSensorReading *other);\
	private:\	private:\

	qTypedWrapper<pclassname> d;	QScopedPointer<pclassname> d;

	#define IMPLEMENT_READING(classname)\	#define IMPLEMENT_READING(classname)\
	IMPLEMENT_READING_D(classname, classname ## Private)	IMPLEMENT_READING_D(classname, classname ## Private)

	#define IMPLEMENT_READING_D(classname, pclassname)\	#define IMPLEMENT_READING_D(classname, pclassname)\
	classname::classname(QObject *parent)\	classname::classname(QObject *parent)\

	: QSensorReading(parent, new pclassname)\	: QSensorReading(parent, 0)\
	, d(d_ptr())\	, d(new pclassname)\
	{}\	{}\
	classname::~classname() {}\	classname::~classname() {}\
	void classname::copyValuesFrom(QSensorReading *_other)\	void classname::copyValuesFrom(QSensorReading *_other)\
	{\	{\
	/* No need to verify types, only called by QSensorBackend */\	/* No need to verify types, only called by QSensorBackend */\
	classname other = static_cast<classname >(_other);\	classname other = static_cast<classname >(_other);\

	pclassname my_ptr = static_cast<pclassname>(d_ptr()->data());\	pclassname *my_ptr = d.data();\
	pclassname other_ptr = static_cast<pclassname>(other->d_ptr()->da	pclassname *other_ptr = other->d.data();\
	ta());\
	/* Do a direct copy of the private class */\	/* Do a direct copy of the private class */\
	(my_ptr) = (other_ptr);\	(my_ptr) = (other_ptr);\

		/* We need to copy the parent too */\
		QSensorReading::copyValuesFrom(_other);\
	}	}

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	Q_DECLARE_METATYPE(QtMobility::qtimestamp)	Q_DECLARE_METATYPE(QtMobility::qtimestamp)
	Q_DECLARE_METATYPE(QtMobility::qrange)	Q_DECLARE_METATYPE(QtMobility::qrange)
	Q_DECLARE_METATYPE(QtMobility::qrangelist)	Q_DECLARE_METATYPE(QtMobility::qrangelist)
	Q_DECLARE_METATYPE(QtMobility::qoutputrangelist)	Q_DECLARE_METATYPE(QtMobility::qoutputrangelist)

	#endif	#endif

End of changes. 13 change blocks.
	41 lines changed or deleted	20 lines changed or added

	qsensormanager.h	qsensormanager.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QSENSORMANAGER_H	#ifndef QSENSORMANAGER_H
	#define QSENSORMANAGER_H	#define QSENSORMANAGER_H

	#include "qsensor.h"	#include "qsensor.h"

	#include <QHash>

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QSensorBackend;	class QSensorBackend;
	class QSensorBackendFactory;	class QSensorBackendFactory;
	class QSensorPluginInterface;	class QSensorPluginInterface;

	typedef QSensorPluginInterface (CreatePluginFunc)();	typedef QSensorPluginInterface (CreatePluginFunc)();

	class Q_SENSORS_EXPORT QSensorManager	class Q_SENSORS_EXPORT QSensorManager

End of changes. 4 change blocks.
	10 lines changed or deleted	3 lines changed or added

	qservice.h	qservice.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef Q_SERVICE_H	#ifndef Q_SERVICE_H
	#define Q_SERVICE_H	#define Q_SERVICE_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"


		QT_BEGIN_HEADER

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE


		//QTM_SYNC_HEADER_EXPORT QService
	namespace QService	namespace QService
	{	{
	enum Scope {	enum Scope {
	UserScope = 0,	UserScope = 0,
	SystemScope	SystemScope
	};	};


		enum UnrecoverableIPCError {
		ErrorUnknown = 0,
		ErrorServiceNoLongerAvailable,
		ErrorOutofMemory,
		ErrorPermissionDenied,
		ErrorInvalidArguments
		};

		enum Type {
		Plugin = 0,
		InterProcess
		};
	}	}

	QTM_END_NAMESPACE	QTM_END_NAMESPACE


		QT_END_HEADER
	#endif //Q_SERVICE_H	#endif //Q_SERVICE_H

End of changes. 7 change blocks.
	9 lines changed or deleted	20 lines changed or added

	qservicecontext.h	qservicecontext.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QSERVICECONTEXT_H	#ifndef QSERVICECONTEXT_H
	#define QSERVICECONTEXT_H	#define QSERVICECONTEXT_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

	skipping to change at line 82	skipping to change at line 76
	QServiceContext(QObject* parent = 0);	QServiceContext(QObject* parent = 0);
	virtual ~QServiceContext();	virtual ~QServiceContext();

	virtual void notify( ContextType type, const QVariant& variant) = 0;	virtual void notify( ContextType type, const QVariant& variant) = 0;

	QString clientId() const;	QString clientId() const;
	void setClientId(const QString& clientId);	void setClientId(const QString& clientId);

	QString clientName() const;	QString clientName() const;
	void setClientName(const QString& name);	void setClientName(const QString& name);


		QVariant clientData(const QString& key) const;
		void setClientData(const QString& key, const QVariant& value);
		void resetClientData();

	private:	private:
	QString m_id;	QString m_id;
	QString m_displayName;	QString m_displayName;

	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	QT_END_HEADER	QT_END_HEADER
	#endif //QSERVICECONTEXT_H	#endif //QSERVICECONTEXT_H

End of changes. 4 change blocks.
	9 lines changed or deleted	8 lines changed or added

	qservicefilter.h	qservicefilter.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QSERVICEFILTER_H	#ifndef QSERVICEFILTER_H
	#define QSERVICEFILTER_H	#define QSERVICEFILTER_H


	#include <QStringList>

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

		#include <QStringList>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QDataStream;	class QDataStream;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_HEADER	QT_BEGIN_HEADER

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE


		#ifdef QT_SFW_SERVICEDATABASE_GENERATE
		#undef Q_SERVICEFW_EXPORT
		#define Q_SERVICEFW_EXPORT
		#endif

	class QServiceFilterPrivate;	class QServiceFilterPrivate;
	class Q_SERVICEFW_EXPORT QServiceFilter	class Q_SERVICEFW_EXPORT QServiceFilter
	{	{
	public:	public:
	enum VersionMatchRule {	enum VersionMatchRule {
	ExactVersionMatch = 0,	ExactVersionMatch = 0,
	MinimumVersionMatch	MinimumVersionMatch
	};	};

	enum CapabilityMatchRule {	enum CapabilityMatchRule {

End of changes. 6 change blocks.
	11 lines changed or deleted	9 lines changed or added

	qserviceinterfacedescriptor.h	qserviceinterfacedescriptor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QSERVICEINTERFACEDESCRIPTOR_H	#ifndef QSERVICEINTERFACEDESCRIPTOR_H
	#define QSERVICEINTERFACEDESCRIPTOR_H	#define QSERVICEINTERFACEDESCRIPTOR_H


		#include "qmobilityglobal.h"
	#include <QString>	#include <QString>
	#include <QVariant>	#include <QVariant>
	#include "qservice.h"	#include "qservice.h"

	QT_USE_NAMESPACE	QT_USE_NAMESPACE

	#ifdef SERVICE_XML_GENERATOR	#ifdef SERVICE_XML_GENERATOR
	#undef Q_SERVICEFW_EXPORT	#undef Q_SERVICEFW_EXPORT
	#define Q_SERVICEFW_EXPORT	#define Q_SERVICEFW_EXPORT
	#endif	#endif

	skipping to change at line 80	skipping to change at line 75
	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QServiceInterfaceDescriptorPrivate;	class QServiceInterfaceDescriptorPrivate;
	class Q_SERVICEFW_EXPORT QServiceInterfaceDescriptor	class Q_SERVICEFW_EXPORT QServiceInterfaceDescriptor
	{	{
	public:	public:
	enum Attribute {	enum Attribute {
	Capabilities = 0,	Capabilities = 0,
	Location,	Location,
	ServiceDescription,	ServiceDescription,

	InterfaceDescription	InterfaceDescription,
		ServiceType
	};	};

	QServiceInterfaceDescriptor();	QServiceInterfaceDescriptor();
	QServiceInterfaceDescriptor(const QServiceInterfaceDescriptor& other);	QServiceInterfaceDescriptor(const QServiceInterfaceDescriptor& other);
	~QServiceInterfaceDescriptor();	~QServiceInterfaceDescriptor();

	QServiceInterfaceDescriptor& operator=(const QServiceInterfaceDescripto r& other);	QServiceInterfaceDescriptor& operator=(const QServiceInterfaceDescripto r& other);
	bool operator==(const QServiceInterfaceDescriptor& other) const;	bool operator==(const QServiceInterfaceDescriptor& other) const;
	inline bool operator!=(const QServiceInterfaceDescriptor& other) const	inline bool operator!=(const QServiceInterfaceDescriptor& other) const
	{ return !operator==(other); }	{ return !operator==(other); }

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

	qsysteminfo.h	qsysteminfo.h
	/************************************************************************	/************************************************************************

	**	**
	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:BSD$
	** Commercial Usage	** You may use this file under the terms of the BSD license as follows:
	** Licensees holding valid Qt Commercial licenses may use this file in	**
	** accordance with the Qt Solutions Commercial License Agreement provided	** "Redistribution and use in source and binary forms, with or without
	** with the Software or, alternatively, in accordance with the terms	** modification, are permitted provided that the following conditions a
	** contained in a written agreement between you and Nokia.	re
	**	** met:
	** GNU Lesser General Public License Usage	** * Redistributions of source code must retain the above copyright
	** Alternatively, this file may be used under the terms of the GNU Lesser	** notice, this list of conditions and the following disclaimer.
	** General Public License version 2.1 as published by the Free Software	** * Redistributions in binary form must reproduce the above copyrigh
	** Foundation and appearing in the file LICENSE.LGPL included in the	t
	** packaging of this file. Please review the following information to	** notice, this list of conditions and the following disclaimer in
	** ensure the GNU Lesser General Public License version 2.1 requirements	** the documentation and/or other materials provided with the
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** distribution.
	**	** * Neither the name of Nokia Corporation and its Subsidiary(-ies) n
	** In addition, as a special exception, Nokia gives you certain additional	or
	** rights. These rights are described in the Nokia Qt LGPL Exception	** the names of its contributors may be used to endorse or promote
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** products derived from this software without specific prior writt
	**	en
	** GNU General Public License Usage	** permission.
	** Alternatively, this file may be used under the terms of the GNU	**
	** General Public License version 3.0 as published by the Free Software	** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
	** Foundation and appearing in the file LICENSE.GPL included in the	** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
	** packaging of this file. Please review the following information to	** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FO
	** ensure the GNU General Public License version 3.0 requirements will be	R
	** met: http://www.gnu.org/copyleft/gpl.html.	** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
	**	** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL
	** Please note Third Party Software included with Qt Solutions may impose	,
	** additional restrictions and it is the user's responsibility to ensure	** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
	** that they have met the licensing requirements of the GPL, LGPL, or Qt	** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE
	** Solutions Commercial license and the relevant license of the Third	,
	** Party Software they are using.	** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON AN
	**	Y
	** If you are unsure which license is appropriate for your use, please	** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
	** contact the sales department at qt-sales@nokia.com.	** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE US
	** $QT_END_LICENSE$	E
	**	** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
	***************************************************************************	"
	*/	** $QT_END_LICENSE$
		**
		***********************************************************************
		*****/

	#ifndef QSYSTEMINFO_H	#ifndef QSYSTEMINFO_H
	#define QSYSTEMINFO_H	#define QSYSTEMINFO_H

	#include "qmobilityglobal.h"	#include "qsystemgeneralinfo.h"
		#include "qsystemdeviceinfo.h"
	#include <QObject>	#include "qsystemdisplayinfo.h"
	#include <QSize>	#include "qsystemnetworkinfo.h"
	#include <QPair>	#include "qsystemscreensaver.h"
	#include <QString>	#include "qsystemstorageinfo.h"
	#include <QStringList>	#endif
	#include <QNetworkInterface>

	QT_BEGIN_HEADER
	QTM_BEGIN_NAMESPACE

	class QSystemInfoPrivate;
	class QSystemNetworkInfoPrivate;
	class QSystemStorageInfoPrivate;
	class QSystemDeviceInfoPrivate;
	class QSystemDisplayInfoPrivate;

	class Q_SYSINFO_EXPORT QSystemInfo : public QObject
	{
	Q_OBJECT
	Q_PROPERTY(QString currentLanguage READ currentLanguage NOTIFY currentL
	anguageChanged)
	Q_PROPERTY(QStringList availableLanguages READ availableLanguages)
	Q_PROPERTY(QString currentCountryCode READ currentCountryCode)
	Q_ENUMS(Version)
	Q_ENUMS(Feature)

	public:

	QSystemInfo(QObject *parent = 0);
	virtual ~QSystemInfo();

	QString currentLanguage(); // 2 letter ISO 639-1 //signal
	QStringList availableLanguages(); // 2 letter ISO 639-1
	QString currentCountryCode(); //2 letter ISO 3166-1
	enum Version {
	Os = 1,
	QtCore,
	Firmware
	};

	QString version(QSystemInfo::Version type, const QString &parameter = Q
	String());

	enum Feature {
	BluetoothFeature=0,
	CameraFeature,
	FmradioFeature,
	IrFeature,
	LedFeature,
	MemcardFeature,
	UsbFeature,
	VibFeature,
	WlanFeature,
	SimFeature,
	LocationFeature,
	VideoOutFeature,
	HapticsFeature
	};

	bool hasFeatureSupported(QSystemInfo::Feature feature);

	Q_SIGNALS:
	void currentLanguageChanged(const QString &);
	private:
	QSystemInfoPrivate *d;
	};

	class Q_SYSINFO_EXPORT QSystemNetworkInfo : public QObject
	{
	Q_OBJECT
	Q_ENUMS(NetworkStatus)
	Q_ENUMS(NetworkMode)
	Q_PROPERTY(int cellId READ cellId)
	Q_PROPERTY(int locationAreaCode READ locationAreaCode)
	Q_PROPERTY(QString currentMobileCountryCode READ currentMobileCountryCo
	de NOTIFY currentMobileCountryCodeChanged)
	Q_PROPERTY(QString currentMobileNetworkCode READ currentMobileNetworkCo
	de NOTIFY currentMobileNetworkCodeChanged)
	Q_PROPERTY(QString homeMobileCountryCode READ homeMobileCountryCode CON
	STANT)
	Q_PROPERTY(QString homeMobileNetworkCode READ homeMobileNetworkCode CON
	STANT)
	Q_PROPERTY(QSystemNetworkInfo::NetworkMode currentMode READ currentMode
	)

	public:

	QSystemNetworkInfo(QObject *parent = 0);
	~QSystemNetworkInfo();

	enum NetworkStatus {
	UndefinedStatus = 0,
	NoNetworkAvailable,
	EmergencyOnly,
	Searching,
	Busy,
	Connected,
	HomeNetwork,
	Denied,
	Roaming
	};

	enum NetworkMode {
	UnknownMode=0,
	GsmMode,
	CdmaMode,
	WcdmaMode,
	WlanMode,
	EthernetMode,
	BluetoothMode,
	WimaxMode
	};
	Q_DECLARE_FLAGS(NetworkModes, NetworkMode)

	Q_INVOKABLE QSystemNetworkInfo::NetworkStatus networkStatus(QSystemNetw
	orkInfo::NetworkMode mode);
	Q_INVOKABLE static int networkSignalStrength(QSystemNetworkInfo::Networ
	kMode mode);
	QString macAddress(QSystemNetworkInfo::NetworkMode mode);
	QSystemNetworkInfo::NetworkMode currentMode();

	int cellId();
	int locationAreaCode();

	QString currentMobileCountryCode();
	QString currentMobileNetworkCode();
	QString homeMobileCountryCode();
	QString homeMobileNetworkCode();
	Q_INVOKABLE static QString networkName(QSystemNetworkInfo::NetworkMode
	mode);
	QNetworkInterface interfaceForMode(QSystemNetworkInfo::NetworkMode mode
	);

	Q_SIGNALS:
	void networkStatusChanged(QSystemNetworkInfo::NetworkMode, QSystemNetwor
	kInfo::NetworkStatus);
	void networkSignalStrengthChanged(QSystemNetworkInfo::NetworkMode, int);
	void currentMobileCountryCodeChanged(const QString &);
	void currentMobileNetworkCodeChanged(const QString &);
	void networkNameChanged(QSystemNetworkInfo::NetworkMode,const QString &)
	;
	void networkModeChanged(QSystemNetworkInfo::NetworkMode);

	protected:
	virtual void connectNotify(const char *signal);
	virtual void disconnectNotify(const char *signal);

	private:
	QSystemNetworkInfoPrivate *d;
	};

	class Q_SYSINFO_EXPORT QSystemDisplayInfo : public QObject
	{
	Q_OBJECT

	public:

	QSystemDisplayInfo(QObject *parent = 0);
	~QSystemDisplayInfo();

	static int displayBrightness(int screen);
	static int colorDepth(int screen);
	};

	class Q_SYSINFO_EXPORT QSystemStorageInfo : public QObject
	{
	Q_OBJECT
	Q_PROPERTY(QStringList logicalDrives READ logicalDrives)
	Q_ENUMS(DriveType)

	public:

	QSystemStorageInfo(QObject *parent = 0);
	~QSystemStorageInfo();

	enum DriveType {
	NoDrive = 0,
	InternalDrive,
	RemovableDrive,
	RemoteDrive,
	CdromDrive
	};

	Q_INVOKABLE qlonglong totalDiskSpace(const QString &driveVolume);
	Q_INVOKABLE qlonglong availableDiskSpace(const QString &driveVolume);
	static QStringList logicalDrives();

	Q_INVOKABLE QSystemStorageInfo::DriveType typeForDrive(const QString &d
	riveVolume);

	};

	class Q_SYSINFO_EXPORT QSystemDeviceInfo : public QObject
	{
	Q_OBJECT
	Q_PROPERTY(Profile currentProfile READ currentProfile NOTIFY currentPro
	fileChanged)
	Q_PROPERTY(PowerState currentPowerState READ currentPowerState NOTIFY p
	owerStateChanged)
	Q_PROPERTY(SimStatus simStatus READ simStatus CONSTANT)
	Q_PROPERTY(BatteryStatus batteryStatus READ batteryStatus NOTIFY batter
	yStatusChanged)
	Q_PROPERTY(InputMethodFlags inputMethodType READ inputMethodType)

	Q_PROPERTY(QString imei READ imei CONSTANT)
	Q_PROPERTY(QString imsi READ imsi CONSTANT)
	Q_PROPERTY(QString manufacturer READ manufacturer CONSTANT)
	Q_PROPERTY(QString model READ model CONSTANT)
	Q_PROPERTY(QString productName READ productName CONSTANT)
	Q_PROPERTY(int batteryLevel READ batteryLevel NOTIFY batteryLevelChange
	d)
	Q_PROPERTY(bool isDeviceLocked READ isDeviceLocked)

	Q_ENUMS(BatteryStatus)
	Q_ENUMS(PowerState)
	Q_FLAGS(InputMethod InputMethodFlags)
	Q_ENUMS(SimStatus)
	Q_ENUMS(Profile)

	public:

	QSystemDeviceInfo(QObject *parent = 0);
	virtual ~QSystemDeviceInfo();

	enum BatteryStatus {
	NoBatteryLevel = 0,
	BatteryCritical,
	BatteryVeryLow,
	BatteryLow,
	BatteryNormal
	};

	enum PowerState {
	UnknownPower = 0,
	BatteryPower,
	WallPower,
	WallPowerChargingBattery
	};

	enum InputMethod {
	Keys = 0x0000001,
	Keypad = 0x0000002,
	Keyboard = 0x0000004,
	SingleTouch = 0x0000008,
	MultiTouch = 0x0000010,
	Mouse = 0x0000020
	};

	Q_DECLARE_FLAGS(InputMethodFlags, InputMethod)

	QSystemDeviceInfo::InputMethodFlags inputMethodType();

	QString imei();
	QString imsi();
	QString manufacturer();
	QString model();
	QString productName();
	int batteryLevel() const;
	QSystemDeviceInfo::BatteryStatus batteryStatus();

	enum Profile {
	UnknownProfile = 0,
	SilentProfile,
	NormalProfile,
	LoudProfile,
	VibProfile,
	OfflineProfile,
	PowersaveProfile,
	CustomProfile
	};

	enum SimStatus {
	SimNotAvailable = 0,
	SingleSimAvailable,
	DualSimAvailable,
	SimLocked
	};

	bool isDeviceLocked();
	QSystemDeviceInfo::SimStatus simStatus();
	QSystemDeviceInfo::Profile currentProfile();
	QSystemDeviceInfo::PowerState currentPowerState();

	Q_SIGNALS:
	void batteryLevelChanged(int);
	void batteryStatusChanged(QSystemDeviceInfo::BatteryStatus );
	void powerStateChanged(QSystemDeviceInfo::PowerState);
	void currentProfileChanged(QSystemDeviceInfo::Profile);
	void bluetoothStateChanged(bool);

	private:
	QSystemDeviceInfoPrivate *d;
	};

	Q_DECLARE_OPERATORS_FOR_FLAGS(QSystemDeviceInfo::InputMethodFlags )

	class QSystemScreenSaverPrivate;
	class Q_SYSINFO_EXPORT QSystemScreenSaver : public QObject
	{
	Q_OBJECT
	Q_ENUMS(ScreenSaverState)
	Q_PROPERTY(bool screenSaverInhibited READ screenSaverInhibited)

	public:

	QSystemScreenSaver(QObject *parent = 0);
	~QSystemScreenSaver();

	bool screenSaverInhibited();
	Q_INVOKABLE bool setScreenSaverInhibit();

	private:
	bool screenSaverIsInhibited;
	QSystemScreenSaverPrivate *d;
	};

	QTM_END_NAMESPACE

	QT_END_HEADER

	#endif /QSYSTEMSINFO_H/

	// End of file

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

	qtapsensor.h	qtapsensor.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QTAPSENSOR_H	#ifndef QTAPSENSOR_H
	#define QTAPSENSOR_H	#define QTAPSENSOR_H

	#include "qsensor.h"	#include "qsensor.h"

	skipping to change at line 103	skipping to change at line 97
	class Q_SENSORS_EXPORT QTapSensor : public QSensor	class Q_SENSORS_EXPORT QTapSensor : public QSensor
	{	{
	Q_OBJECT	Q_OBJECT
	#ifdef Q_QDOC	#ifdef Q_QDOC
	Q_PROPERTY(bool returnDoubleTapEvents)	Q_PROPERTY(bool returnDoubleTapEvents)
	#endif	#endif
	public:	public:
	explicit QTapSensor(QObject *parent = 0) : QSensor(QTapSensor::type, pa rent) {}	explicit QTapSensor(QObject *parent = 0) : QSensor(QTapSensor::type, pa rent) {}
	virtual ~QTapSensor() {}	virtual ~QTapSensor() {}
	QTapReading reading() const { return static_cast<QTapReading>(QSensor ::reading()); }	QTapReading reading() const { return static_cast<QTapReading>(QSensor ::reading()); }

	static const char *type;	static char const * const type;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif	#endif

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

	qtcontactsglobal.h	qtcontactsglobal.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QTCONTACTSGLOBAL_H	#ifndef QTCONTACTSGLOBAL_H
	#define QTCONTACTSGLOBAL_H	#define QTCONTACTSGLOBAL_H

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>

	#include <QString>	#include <qlatin1constant.h>
	#include <QVariant>

	#define QTCONTACTS_VERSION_NAME "com.nokia.qt.mobility.contacts.api.version "	#define QTCONTACTS_VERSION_NAME "com.nokia.qt.mobility.contacts.api.version "
	#define QTCONTACTS_IMPLEMENTATION_VERSION_NAME "com.nokia.qt.mobility.conta cts.implementation.version"	#define QTCONTACTS_IMPLEMENTATION_VERSION_NAME "com.nokia.qt.mobility.conta cts.implementation.version"
	#define QTCONTACTS_VERSION 1	#define QTCONTACTS_VERSION 1


	QTM_BEGIN_NAMESPACE

	/*
	* QLatin1Constant
	*
	* The idea of the QLatin1Constant is to provide a POD-esque container
	* for constant strings which are defined in various places
	* (e.g., detail leaf class definition names, field keys, constant field va
	lues, etc).
	* We would ideally like these to be stored in the .rodata section to allow
	* sharing / minimise footprint.
	*
	* Given that the declare/define macros are const anyway, we changed the
	* member to a char array from a const char array, in order to squash
	* the compiler warning regarding uninitialised const value without
	* initialiser list in default ctor (POD requires default ctor).
	*/

	template <int N> struct QLatin1Constant
	{
	char chars[N];

	bool operator ==(const QLatin1Constant& other) const {return (chars ==
	other.chars) \|\| (qstrcmp(chars, other.chars) == 0);}
	bool operator !=(const QLatin1Constant& other) const {return !operator=
	=(other);}

	inline const char * latin1() const {return chars;}

	operator QLatin1String() const {return QLatin1String(chars);}
	operator QString() const {return QString::fromLatin1(chars, N-1);}
	operator QVariant() const {return QVariant(operator QString());}
	};

	/* Hash - this comes from qhash.cpp >.> */
	template<int N> uint qHash(const QLatin1Constant<N>& a)
	{
	uint h = 0;
	uint g;
	int n = N - 1;
	const register ucharp = (const uchar)a.chars;

	while (n--) {
	h = (h << 4) + *p++;
	if ((g = (h & 0xf0000000)) != 0)
	h ^= g >> 23;
	h &= ~g;
	}
	return h;
	}

	/* Operators for QLatin1Constant */
	template<int N, int M> bool operator==(const QLatin1Constant<N>&, const QLa
	tin1Constant<M>&)
	{
	// For N != M, this is always false
	// For N == M, the member function gets called
	return false;
	}
	template<int N, int M> bool operator!=(const QLatin1Constant<N>&, const QLa
	tin1Constant<M>&)
	{
	// If N != M, this is always true
	// For N == M, the member function again gets called
	return true;
	}

	template<int N, int M> bool operator <(const QLatin1Constant<N>& a, const Q
	Latin1Constant<M>& b)
	{
	return qstrcmp(a.chars, b.chars) < 0;
	}

	/* Operators for QLatin1String */
	template<int N> bool operator==(const QLatin1Constant<N>& a, const QLatin1S
	tring& b)
	{
	return (a.chars == b.latin1()) \|\| (qstrcmp(a.chars, b.latin1()) == 0);
	}

	template<int N> bool operator==(const QLatin1String& b, const QLatin1Consta
	nt<N>& a)
	{
	return (a.chars == b.latin1()) \|\| (qstrcmp(a.chars, b.latin1()) == 0);
	}

	template<int N> bool operator!=(const QLatin1Constant<N>& a, const QLatin1S
	tring& b)
	{
	return (a.chars != b.latin1()) && (qstrcmp(a.chars, b.latin1()) != 0);
	}

	template<int N> bool operator!=(const QLatin1String& b, const QLatin1Consta
	nt<N>& a)
	{
	return (a.chars != b.latin1()) && (qstrcmp(a.chars, b.latin1()) != 0);
	}

	/* Operators for QString */
	template<int N> bool operator==(const QLatin1Constant<N>& a, const QString&
	b)
	{
	return b == QLatin1String(a.chars);
	}

	template<int N> bool operator==(const QString& b, const QLatin1Constant<N>&
	a)
	{
	return b == QLatin1String(a.chars);
	}

	template<int N> bool operator!=(const QLatin1Constant<N>& a, const QString&
	b)
	{
	return b != QLatin1String(a.chars);
	}

	template<int N> bool operator!=(const QString& b, const QLatin1Constant<N>&
	a)
	{
	return b != QLatin1String(a.chars);
	}

	#define Q_DECLARE_LATIN1_CONSTANT(varname, str) static const QLatin1Constan
	t<sizeof(str)> varname
	#define Q_DEFINE_LATIN1_CONSTANT(varname, str) const QLatin1Constant<sizeof
	(str)> varname = {str}

	QTM_END_NAMESPACE

	// Not needed since this is a typedef, and qglobal already does this for th e base type	// Not needed since this is a typedef, and qglobal already does this for th e base type
	// Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactLocalId), Q_PRIMITIVE_T YPE);	// Q_DECLARE_TYPEINFO(QTM_PREPEND_NAMESPACE(QContactLocalId), Q_PRIMITIVE_T YPE);


	// Workaround for unannounced SC break
	#include "qcontactid.h"

	#endif	#endif

End of changes. 6 change blocks.
	144 lines changed or deleted	4 lines changed or added

	qtmedianamespace.h	qtmedianamespace.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QTMEDIANAMESPACE_H	#ifndef QTMEDIANAMESPACE_H
	#define QTMEDIANAMESPACE_H	#define QTMEDIANAMESPACE_H

	#include <QtCore/qpair.h>	#include <QtCore/qpair.h>
	#include <QtCore/qmetatype.h>	#include <QtCore/qmetatype.h>

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	namespace QtMediaServices	namespace QtMultimediaKit
	{	{
	enum MetaData	enum MetaData
	{	{
	// Common	// Common
	Title,	Title,
	SubTitle,	SubTitle,
	Author,	Author,
	Comment,	Comment,
	Description,	Description,
	Category,	Category,

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

	qvaluespace.h	qvaluespace.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVALUESPACE_H	#ifndef QVALUESPACE_H
	#define QVALUESPACE_H	#define QVALUESPACE_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

	#include <QList>	#include <QList>
	#include <QUuid>	#include <QUuid>

	QT_BEGIN_HEADER	QT_BEGIN_HEADER

	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE


		//QTM_SYNC_HEADER_EXPORT QValueSpace

	namespace QValueSpace {	namespace QValueSpace {
	enum LayerOption {	enum LayerOption {
	UnspecifiedLayer = 0x0000,	UnspecifiedLayer = 0x0000,
	PermanentLayer = 0x0001,	PermanentLayer = 0x0001,
	TransientLayer = 0x0002,	TransientLayer = 0x0002,
	// UnspecifiedLayerPermanence = 0x0000,	// UnspecifiedLayerPermanence = 0x0000,
	// InvalidLayerPermanence = 0x0003,	// InvalidLayerPermanence = 0x0003,
	WritableLayer = 0x0004,	WritableLayer = 0x0004,
	ReadOnlyLayer = 0x0008,	ReadOnlyLayer = 0x0008,
	// UnspecifiedLayerWriteability = 0x0000,	// UnspecifiedLayerWriteability = 0x0000,
	// InvalidLayerWriteability = 0x000C,	// InvalidLayerWriteability = 0x000C,
	};	};

	Q_DECLARE_FLAGS(LayerOptions, LayerOption);	Q_DECLARE_FLAGS(LayerOptions, LayerOption)

	Q_PUBLISHSUBSCRIBE_EXPORT void initValueSpaceServer();	Q_PUBLISHSUBSCRIBE_EXPORT void initValueSpaceServer();

	Q_PUBLISHSUBSCRIBE_EXPORT QList<QUuid> availableLayers();	Q_PUBLISHSUBSCRIBE_EXPORT QList<QUuid> availableLayers();
	}	}

	Q_DECLARE_OPERATORS_FOR_FLAGS(QValueSpace::LayerOptions);	Q_DECLARE_OPERATORS_FOR_FLAGS(QValueSpace::LayerOptions);

	#define QVALUESPACE_SHAREDMEMORY_LAYER QUuid(0xd81199c1, 0x6f60, 0x4432, 0x 93, 0x4e, \	#define QVALUESPACE_SHAREDMEMORY_LAYER QUuid(0xd81199c1, 0x6f60, 0x4432, 0x 93, 0x4e, \
	0x0c, 0xe4, 0xd3, 0x7e, 0xf2, 0x52)	0x0c, 0xe4, 0xd3, 0x7e, 0xf2, 0x52)

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

	qvaluespacesubscriber.h	qvaluespacesubscriber.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVALUESPACESUBSCRIBER_H	#ifndef QVALUESPACESUBSCRIBER_H
	#define QVALUESPACESUBSCRIBER_H	#define QVALUESPACESUBSCRIBER_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

	skipping to change at line 95	skipping to change at line 89

	void cd(const QString &path);	void cd(const QString &path);
	void cdUp();	void cdUp();

	bool isConnected() const;	bool isConnected() const;

	QStringList subPaths() const;	QStringList subPaths() const;

	QVariant value(const QString &subPath = QString(), const QVariant &def = QVariant()) const;	QVariant value(const QString &subPath = QString(), const QVariant &def = QVariant()) const;


	signals:	Q_SIGNALS:
	void contentsChanged();	void contentsChanged();

	protected:	protected:
	virtual void connectNotify(const char *signal);	virtual void connectNotify(const char *signal);
	virtual void disconnectNotify(const char *signal);	virtual void disconnectNotify(const char *signal);

	private:	private:
	QVariant valuex(const QVariant &def = QVariant()) const;	QVariant valuex(const QVariant &def = QVariant()) const;

	private:	private:

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

	qversitcontactexporter.h	qversitcontactexporter.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVERSITCONTACTEXPORTER_H	#ifndef QVERSITCONTACTEXPORTER_H
	#define QVERSITCONTACTEXPORTER_H	#define QVERSITCONTACTEXPORTER_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

	skipping to change at line 74	skipping to change at line 68
	{	{
	public:	public:
	virtual ~QVersitContactExporterDetailHandler() {}	virtual ~QVersitContactExporterDetailHandler() {}
	virtual bool preProcessDetail(const QContact& contact,	virtual bool preProcessDetail(const QContact& contact,
	const QContactDetail& detail,	const QContactDetail& detail,
	QVersitDocument* document) = 0;	QVersitDocument* document) = 0;
	virtual bool postProcessDetail(const QContact& contact,	virtual bool postProcessDetail(const QContact& contact,
	const QContactDetail& detail,	const QContactDetail& detail,
	bool alreadyProcessed,	bool alreadyProcessed,
	QVersitDocument* document) = 0;	QVersitDocument* document) = 0;


		};

		class Q_VERSIT_EXPORT QVersitContactExporterDetailHandlerV2
		{
		public:
		virtual ~QVersitContactExporterDetailHandlerV2() {}

		virtual void detailProcessed(const QContact& contact,
		const QContactDetail& detail,
		const QVersitDocument& document,
		QSet<QString>* processedFields,
		QList<QVersitProperty>* toBeRemoved,
		QList<QVersitProperty>* toBeAdded) = 0;
		virtual void contactProcessed(const QContact& contact,
		QVersitDocument* document) = 0;
	};	};

	class Q_VERSIT_EXPORT QVersitContactExporter	class Q_VERSIT_EXPORT QVersitContactExporter
	{	{
	public:	public:
	enum Error {	enum Error {
	NoError = 0,	NoError = 0,
	EmptyContactError,	EmptyContactError,
	NoNameError	NoNameError
	};	};

	QVersitContactExporter();	QVersitContactExporter();

		explicit QVersitContactExporter(const QString& profile);
		explicit QVersitContactExporter(const QStringList& profile);
	~QVersitContactExporter();	~QVersitContactExporter();

	bool exportContacts(const QList<QContact>& contacts,	bool exportContacts(const QList<QContact>& contacts,

	QVersitDocument::VersitType versitType);	QVersitDocument::VersitType versitType = QVersitDocument::VCard 30Type);
	QList<QVersitDocument> documents() const;	QList<QVersitDocument> documents() const;

	QMap<int, Error> errors() const;	QMap<int, Error> errorMap() const;


	void setDetailHandler(QVersitContactExporterDetailHandler* handler);	void setDetailHandler(QVersitContactExporterDetailHandlerV2* handler);
	QVersitContactExporterDetailHandler* detailHandler() const;

	void setResourceHandler(QVersitResourceHandler* handler);	void setResourceHandler(QVersitResourceHandler* handler);
	QVersitResourceHandler* resourceHandler() const;	QVersitResourceHandler* resourceHandler() const;


		/* deprecated */
		QMap<int, Error> errors() const;
		void setDetailHandler(QVersitContactExporterDetailHandler* handler);
		QVersitContactExporterDetailHandler* detailHandler() const;

	private:	private:
	QVersitContactExporterPrivate* d;	QVersitContactExporterPrivate* d;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif // QVERSITCONTACTEXPORTER_H	#endif // QVERSITCONTACTEXPORTER_H

End of changes. 9 change blocks.
	13 lines changed or deleted	29 lines changed or added

	qversitcontactimporter.h	qversitcontactimporter.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVERSITCONTACTIMPORTER_H	#ifndef QVERSITCONTACTIMPORTER_H
	#define QVERSITCONTACTIMPORTER_H	#define QVERSITCONTACTIMPORTER_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

	skipping to change at line 79	skipping to change at line 73
	const QVersitProperty& property,	const QVersitProperty& property,
	int contactIndex,	int contactIndex,
	QContact* contact) = 0;	QContact* contact) = 0;
	virtual bool postProcessProperty(const QVersitDocument& document,	virtual bool postProcessProperty(const QVersitDocument& document,
	const QVersitProperty& property,	const QVersitProperty& property,
	bool alreadyProcessed,	bool alreadyProcessed,
	int contactIndex,	int contactIndex,
	QContact* contact) = 0;	QContact* contact) = 0;
	};	};


		class Q_VERSIT_EXPORT QVersitContactImporterPropertyHandlerV2
		{
		public:
		virtual ~QVersitContactImporterPropertyHandlerV2() {}
		virtual void propertyProcessed(const QVersitDocument& document,
		const QVersitProperty& property,
		const QContact& contact,
		bool *alreadyProcessed,
		QList<QContactDetail>* updatedDetails) =
		0;
		virtual void documentProcessed(const QVersitDocument& document,
		QContact* contact) = 0;
		};

	class Q_VERSIT_EXPORT QVersitContactImporter	class Q_VERSIT_EXPORT QVersitContactImporter
	{	{
	public:	public:
	enum Error {	enum Error {
	NoError = 0,	NoError = 0,
	InvalidDocumentError,	InvalidDocumentError,
	EmptyDocumentError	EmptyDocumentError
	};	};

	QVersitContactImporter();	QVersitContactImporter();

		explicit QVersitContactImporter(const QString& profile);
		explicit QVersitContactImporter(const QStringList& profiles);
	~QVersitContactImporter();	~QVersitContactImporter();

	bool importDocuments(const QList<QVersitDocument>& documents);	bool importDocuments(const QList<QVersitDocument>& documents);
	QList<QContact> contacts() const;	QList<QContact> contacts() const;

	QMap<int, Error> errors() const;	QMap<int, Error> errorMap() const;


	void setPropertyHandler(QVersitContactImporterPropertyHandler* handler)	void setPropertyHandler(QVersitContactImporterPropertyHandlerV2* handle
	;	r);
	QVersitContactImporterPropertyHandler* propertyHandler() const;

	void setResourceHandler(QVersitResourceHandler* handler);	void setResourceHandler(QVersitResourceHandler* handler);
	QVersitResourceHandler* resourceHandler() const;	QVersitResourceHandler* resourceHandler() const;


		/* deprecated */
		QMap<int, Error> errors() const;
		void setPropertyHandler(QVersitContactImporterPropertyHandler* handler)
		;
		QVersitContactImporterPropertyHandler* propertyHandler() const;

	private:	private:
	QVersitContactImporterPrivate* d;	QVersitContactImporterPrivate* d;
	};	};

	QTM_END_NAMESPACE	QTM_END_NAMESPACE

	#endif // QVERSITCONTACTIMPORTER_H	#endif // QVERSITCONTACTIMPORTER_H

End of changes. 8 change blocks.
	13 lines changed or deleted	28 lines changed or added

	qversitdocument.h	qversitdocument.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVERSITDOCUMENT_H	#ifndef QVERSITDOCUMENT_H
	#define QVERSITDOCUMENT_H	#define QVERSITDOCUMENT_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

	skipping to change at line 72	skipping to change at line 66
	QTM_BEGIN_NAMESPACE	QTM_BEGIN_NAMESPACE

	class QVersitDocumentPrivate;	class QVersitDocumentPrivate;
	class QVersitProperty;	class QVersitProperty;

	class Q_VERSIT_EXPORT QVersitDocument	class Q_VERSIT_EXPORT QVersitDocument
	{	{
	public:	public:
	enum VersitType {	enum VersitType {
	InvalidType,	InvalidType,

	VCard21Type, // vCard version 2.1	VCard21Type, // vCard version 2.1
	VCard30Type // vCard version 3.0 (RFC 2426)	VCard30Type, // vCard version 3.0 (RFC 2426)
		VCard40Type, // vCard version 4.0
		ICalendar20Type,// iCalendar version 2.0 (RFC 2445/5545)
	};	};

	QVersitDocument();	QVersitDocument();
	QVersitDocument(const QVersitDocument& other);	QVersitDocument(const QVersitDocument& other);
	QVersitDocument(VersitType type);	QVersitDocument(VersitType type);
	~QVersitDocument();	~QVersitDocument();

	QVersitDocument& operator=(const QVersitDocument& other);	QVersitDocument& operator=(const QVersitDocument& other);
	bool operator==(const QVersitDocument& other) const;	bool operator==(const QVersitDocument& other) const;
	bool operator!=(const QVersitDocument& other) const;	bool operator!=(const QVersitDocument& other) const;


	// metadata about the versit document itself.	// Metadata about the versit document
		// The type determines the format for serialization
	void setType(VersitType type);	void setType(VersitType type);
	VersitType type() const;	VersitType type() const;


		// The componentType is the value of the BEGIN property
		void setComponentType(QString componentType);
		QString componentType() const;

		// The content
	void addProperty(const QVersitProperty& property);	void addProperty(const QVersitProperty& property);
	void removeProperty(const QVersitProperty& property);	void removeProperty(const QVersitProperty& property);
	void removeProperties(const QString& name);	void removeProperties(const QString& name);

		void setProperties(const QList<QVersitProperty>& properties);
	QList<QVersitProperty> properties() const;	QList<QVersitProperty> properties() const;


		void addSubDocument(const QVersitDocument& subdocument);
		void removeSubDocument(const QVersitDocument& subdocument);
		void setSubDocuments(const QList<QVersitDocument>& documents);
		QList<QVersitDocument> subDocuments() const;

	bool isEmpty() const;	bool isEmpty() const;
	void clear();	void clear();

	private:	private:

	QSharedDataPointer<QVersitDocumentPrivate> d;	QSharedDataPointer<QVersitDocumentPrivate> d;
	};	};

	Q_VERSIT_EXPORT uint qHash(const QVersitDocument& key);	Q_VERSIT_EXPORT uint qHash(const QVersitDocument& key);
	#ifndef QT_NO_DEBUG_STREAM	#ifndef QT_NO_DEBUG_STREAM

End of changes. 8 change blocks.
	12 lines changed or deleted	20 lines changed or added

	qversitproperty.h	qversitproperty.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVERSITPROPERTY_H	#ifndef QVERSITPROPERTY_H
	#define QVERSITPROPERTY_H	#define QVERSITPROPERTY_H

	#include "qmobilityglobal.h"	#include "qmobilityglobal.h"

	skipping to change at line 75	skipping to change at line 69
	class QVersitPropertyPrivate;	class QVersitPropertyPrivate;

	class Q_VERSIT_EXPORT QVersitProperty	class Q_VERSIT_EXPORT QVersitProperty
	{	{
	public:	public:
	enum ValueType {	enum ValueType {
	PlainType,	PlainType,
	CompoundType,	CompoundType,
	ListType,	ListType,
	BinaryType,	BinaryType,

	VersitDocumentType	VersitDocumentType,
		PreformattedType
	};	};

	QVersitProperty();	QVersitProperty();
	QVersitProperty(const QVersitProperty& other);	QVersitProperty(const QVersitProperty& other);
	~QVersitProperty();	~QVersitProperty();

	QVersitProperty& operator=(const QVersitProperty& other);	QVersitProperty& operator=(const QVersitProperty& other);
	bool operator==(const QVersitProperty& other) const;	bool operator==(const QVersitProperty& other) const;
	bool operator!=(const QVersitProperty& other) const;	bool operator!=(const QVersitProperty& other) const;


End of changes. 4 change blocks.
	10 lines changed or deleted	5 lines changed or added

	qversitwriter.h	qversitwriter.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVERSITWRITER_H	#ifndef QVERSITWRITER_H
	#define QVERSITWRITER_H	#define QVERSITWRITER_H

	#include "qversitdocument.h"	#include "qversitdocument.h"

	skipping to change at line 100	skipping to change at line 94

	void setDefaultCodec(QTextCodec* codec);	void setDefaultCodec(QTextCodec* codec);
	QTextCodec* defaultCodec() const;	QTextCodec* defaultCodec() const;

	State state() const;	State state() const;
	Error error() const;	Error error() const;

	// writing:	// writing:
	public Q_SLOTS:	public Q_SLOTS:
	bool startWriting(const QList<QVersitDocument>& input);	bool startWriting(const QList<QVersitDocument>& input);

		bool startWriting(const QList<QVersitDocument>& input, QVersitDocument:
		:VersitType type);
		bool startWriting(const QVersitDocument& input);
		bool startWriting(const QVersitDocument& input, QVersitDocument::Versit
		Type type);
	void cancel();	void cancel();
	public:	public:
	Q_INVOKABLE bool waitForFinished(int msec = -1);	Q_INVOKABLE bool waitForFinished(int msec = -1);

	Q_SIGNALS:	Q_SIGNALS:
	void stateChanged(QVersitWriter::State state);	void stateChanged(QVersitWriter::State state);

	private: // data	private: // data
	QVersitWriterPrivate* d;	QVersitWriterPrivate* d;
	};	};

End of changes. 4 change blocks.
	9 lines changed or deleted	8 lines changed or added

	qvideoencodercontrol.h	qvideoencodercontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVIDEOENCODERCONTROL_H	#ifndef QVIDEOENCODERCONTROL_H
	#define QVIDEOENCODERCONTROL_H	#define QVIDEOENCODERCONTROL_H

	#include "qmediacontrol.h"	#include "qmediacontrol.h"

	skipping to change at line 64	skipping to change at line 58
	#include <QtCore/qpair.h>	#include <QtCore/qpair.h>
	#include <QtCore/qsize.h>	#include <QtCore/qsize.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QByteArray;	class QByteArray;
	class QStringList;	class QStringList;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	class Q_MEDIA_EXPORT QVideoEncoderControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QVideoEncoderControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	virtual ~QVideoEncoderControl();	virtual ~QVideoEncoderControl();

	virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings & settings,	virtual QList<QSize> supportedResolutions(const QVideoEncoderSettings & settings,
	bool *continuous = 0) const = 0;	bool *continuous = 0) const = 0;

	virtual QList<qreal> supportedFrameRates(const QVideoEncoderSettings &s ettings,	virtual QList<qreal> supportedFrameRates(const QVideoEncoderSettings &s ettings,

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

	qvideorenderercontrol.h	qvideorenderercontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVIDEORENDERERCONTROL_H	#ifndef QVIDEORENDERERCONTROL_H
	#define QVIDEORENDERERCONTROL_H	#define QVIDEORENDERERCONTROL_H

	#include "qmediacontrol.h"	#include "qmediacontrol.h"

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE
	class QAbstractVideoSurface;	class QAbstractVideoSurface;
	QT_END_NAMESPACE	QT_END_NAMESPACE

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	class Q_MEDIA_EXPORT QVideoRendererControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QVideoRendererControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	~QVideoRendererControl();	~QVideoRendererControl();

	virtual QAbstractVideoSurface *surface() const = 0;	virtual QAbstractVideoSurface *surface() const = 0;
	virtual void setSurface(QAbstractVideoSurface *surface) = 0;	virtual void setSurface(QAbstractVideoSurface *surface) = 0;

	protected:	protected:

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

	qvideowidget.h	qvideowidget.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVIDEOWIDGET_H	#ifndef QVIDEOWIDGET_H
	#define QVIDEOWIDGET_H	#define QVIDEOWIDGET_H

	#include <QtGui/qwidget.h>	#include <QtGui/qwidget.h>

	#include <qmobilityglobal.h>	#include <qmobilityglobal.h>

		#include <qmediabindableinterface.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QMediaObject;	class QMediaObject;

	class QVideoWidgetPrivate;	class QVideoWidgetPrivate;

	class Q_MEDIA_EXPORT QVideoWidget : public QWidget	class Q_MULTIMEDIA_EXPORT QVideoWidget : public QWidget, public QMediaBinda bleInterface
	{	{
	Q_OBJECT	Q_OBJECT

		Q_INTERFACES(QMediaBindableInterface)
	Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObj ect)	Q_PROPERTY(QMediaObject* mediaObject READ mediaObject WRITE setMediaObj ect)
	Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged)	Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen NOTIFY fullScreenChanged)

	Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRI TE setAspectRatioMode NOTIFY aspectRatioModeChanged)	Q_PROPERTY(Qt::AspectRatioMode aspectRatioMode READ aspectRatioMode WRI TE setAspectRatioMode)
	Q_PROPERTY(int brightness READ brightness WRITE setBrightness NOTIFY br ightnessChanged)	Q_PROPERTY(int brightness READ brightness WRITE setBrightness NOTIFY br ightnessChanged)
	Q_PROPERTY(int contrast READ contrast WRITE setContrast NOTIFY contrast Changed)	Q_PROPERTY(int contrast READ contrast WRITE setContrast NOTIFY contrast Changed)
	Q_PROPERTY(int hue READ hue WRITE setHue NOTIFY hueChanged)	Q_PROPERTY(int hue READ hue WRITE setHue NOTIFY hueChanged)
	Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY sa turationChanged)	Q_PROPERTY(int saturation READ saturation WRITE setSaturation NOTIFY sa turationChanged)

	public:	public:
	QVideoWidget(QWidget *parent = 0);	QVideoWidget(QWidget *parent = 0);
	~QVideoWidget();	~QVideoWidget();

	QMediaObject *mediaObject() const;	QMediaObject *mediaObject() const;

	void setMediaObject(QMediaObject *object);

	#ifdef Q_QDOC	#ifdef Q_QDOC
	bool isFullScreen() const;	bool isFullScreen() const;
	#endif	#endif

	Qt::AspectRatioMode aspectRatioMode() const;	Qt::AspectRatioMode aspectRatioMode() const;

	int brightness() const;	int brightness() const;
	int contrast() const;	int contrast() const;
	int hue() const;	int hue() const;

	skipping to change at line 114	skipping to change at line 109
	void saturationChanged(int saturation);	void saturationChanged(int saturation);

	protected:	protected:
	bool event(QEvent *event);	bool event(QEvent *event);
	void showEvent(QShowEvent *event);	void showEvent(QShowEvent *event);
	void hideEvent(QHideEvent *event);	void hideEvent(QHideEvent *event);
	void resizeEvent(QResizeEvent *event);	void resizeEvent(QResizeEvent *event);
	void moveEvent(QMoveEvent *event);	void moveEvent(QMoveEvent *event);
	void paintEvent(QPaintEvent *event);	void paintEvent(QPaintEvent *event);


	protected:	bool setMediaObject(QMediaObject *object);

		#if defined(Q_WS_WIN)
		bool winEvent(MSG message, long result);
		#endif

		QVideoWidget(QVideoWidgetPrivate &dd, QWidget *parent);
	QVideoWidgetPrivate *d_ptr;	QVideoWidgetPrivate *d_ptr;

	private:	private:
	Q_DECLARE_PRIVATE(QVideoWidget)	Q_DECLARE_PRIVATE(QVideoWidget)
	Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed())	Q_PRIVATE_SLOT(d_func(), void _q_serviceDestroyed())

	Q_PRIVATE_SLOT(d_func(), void _q_mediaObjectDestroyed())
	Q_PRIVATE_SLOT(d_func(), void _q_brightnessChanged(int))	Q_PRIVATE_SLOT(d_func(), void _q_brightnessChanged(int))
	Q_PRIVATE_SLOT(d_func(), void _q_contrastChanged(int))	Q_PRIVATE_SLOT(d_func(), void _q_contrastChanged(int))
	Q_PRIVATE_SLOT(d_func(), void _q_hueChanged(int))	Q_PRIVATE_SLOT(d_func(), void _q_hueChanged(int))
	Q_PRIVATE_SLOT(d_func(), void _q_saturationChanged(int))	Q_PRIVATE_SLOT(d_func(), void _q_saturationChanged(int))
	Q_PRIVATE_SLOT(d_func(), void _q_fullScreenChanged(bool))	Q_PRIVATE_SLOT(d_func(), void _q_fullScreenChanged(bool))

	Q_PRIVATE_SLOT(d_func(), void _q_dimensionsChanged());	Q_PRIVATE_SLOT(d_func(), void _q_dimensionsChanged())
	};	};

	QT_END_NAMESPACE	QT_END_NAMESPACE

	#endif	#endif

End of changes. 11 change blocks.
	15 lines changed or deleted	15 lines changed or added

	qvideowidgetcontrol.h	qvideowidgetcontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVIDEOWIDGETCONTROL_H	#ifndef QVIDEOWIDGETCONTROL_H
	#define QVIDEOWIDGETCONTROL_H	#define QVIDEOWIDGETCONTROL_H

	#include "qvideowidget.h"	#include "qvideowidget.h"
	#include "qmediacontrol.h"	#include "qmediacontrol.h"

	#include <QtGui/qwidget.h>	#include <QtGui/qwidget.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QVideoWidgetControlPrivate;	class QVideoWidgetControlPrivate;


	class Q_MEDIA_EXPORT QVideoWidgetControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QVideoWidgetControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	virtual ~QVideoWidgetControl();	virtual ~QVideoWidgetControl();

	virtual QWidget *videoWidget() = 0;	virtual QWidget *videoWidget() = 0;

	virtual Qt::AspectRatioMode aspectRatioMode() const = 0;	virtual Qt::AspectRatioMode aspectRatioMode() const = 0;
	virtual void setAspectRatioMode(Qt::AspectRatioMode mode) = 0;	virtual void setAspectRatioMode(Qt::AspectRatioMode mode) = 0;

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

	qvideowindowcontrol.h	qvideowindowcontrol.h
	/************************************************************************	/************************************************************************
	**	**

	** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).	** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
	** All rights reserved.	** All rights reserved.
	** Contact: Nokia Corporation (qt-info@nokia.com)	** Contact: Nokia Corporation (qt-info@nokia.com)
	**	**
	** This file is part of the Qt Mobility Components.	** This file is part of the Qt Mobility Components.
	**	**
	** $QT_BEGIN_LICENSE:LGPL$	** $QT_BEGIN_LICENSE:LGPL$
	** Commercial Usage	** Commercial Usage
	** Licensees holding valid Qt Commercial licenses may use this file in	** Licensees holding valid Qt Commercial licenses may use this file in

	** accordance with the Qt Solutions Commercial License Agreement provided	** accordance with the Qt Commercial License Agreement provided with
	** with the Software or, alternatively, in accordance with the terms	** the Software or, alternatively, in accordance with the terms
	** contained in a written agreement between you and Nokia.	** contained in a written agreement between you and Nokia.
	**	**
	** GNU Lesser General Public License Usage	** GNU Lesser General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU Lesser	** Alternatively, this file may be used under the terms of the GNU Lesser
	** General Public License version 2.1 as published by the Free Software	** General Public License version 2.1 as published by the Free Software
	** Foundation and appearing in the file LICENSE.LGPL included in the	** Foundation and appearing in the file LICENSE.LGPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU Lesser General Public License version 2.1 requirements	** ensure the GNU Lesser General Public License version 2.1 requirements
	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.	** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
	**	**

	skipping to change at line 36	skipping to change at line 36
	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.	** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
	**	**
	** GNU General Public License Usage	** GNU General Public License Usage
	** Alternatively, this file may be used under the terms of the GNU	** Alternatively, this file may be used under the terms of the GNU
	** General Public License version 3.0 as published by the Free Software	** General Public License version 3.0 as published by the Free Software
	** Foundation and appearing in the file LICENSE.GPL included in the	** Foundation and appearing in the file LICENSE.GPL included in the
	** packaging of this file. Please review the following information to	** packaging of this file. Please review the following information to
	** ensure the GNU General Public License version 3.0 requirements will be	** ensure the GNU General Public License version 3.0 requirements will be
	** met: http://www.gnu.org/copyleft/gpl.html.	** met: http://www.gnu.org/copyleft/gpl.html.
	**	**

	** Please note Third Party Software included with Qt Solutions may impose
	** additional restrictions and it is the user's responsibility to ensure
	** that they have met the licensing requirements of the GPL, LGPL, or Qt
	** Solutions Commercial license and the relevant license of the Third
	** Party Software they are using.
	**
	** If you are unsure which license is appropriate for your use, please	** If you are unsure which license is appropriate for your use, please
	** contact the sales department at qt-sales@nokia.com.	** contact the sales department at qt-sales@nokia.com.
	** $QT_END_LICENSE$	** $QT_END_LICENSE$
	**	**
	*************************************************************************** */	*************************************************************************** */

	#ifndef QVIDEOWINDOWCONTROL_H	#ifndef QVIDEOWINDOWCONTROL_H
	#define QVIDEOWINDOWCONTROL_H	#define QVIDEOWINDOWCONTROL_H

	#include "qmediacontrol.h"	#include "qmediacontrol.h"
	#include "qvideowidget.h"	#include "qvideowidget.h"

	#include <QtGui/qwidget.h>	#include <QtGui/qwidget.h>

	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


	class Q_MEDIA_EXPORT QVideoWindowControl : public QMediaControl	class Q_MULTIMEDIA_EXPORT QVideoWindowControl : public QMediaControl
	{	{
	Q_OBJECT	Q_OBJECT

	public:	public:
	~QVideoWindowControl();	~QVideoWindowControl();

	virtual WId winId() const = 0;	virtual WId winId() const = 0;
	virtual void setWinId(WId id) = 0;	virtual void setWinId(WId id) = 0;

	virtual QRect displayRect() const = 0;	virtual QRect displayRect() const = 0;

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